From 89b6e0164fa770333755b11504e19a4232b1a2d4 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 25 Feb 2021 11:26:29 -0700
Subject: [PATCH] Squashed 'lib/vscode/' changes from 3e344b17b7b..622cb03f7e0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

622cb03f7e0 Merge pull request #116444 from microsoft/alex/stable-fix-116060
5933e313e5d Fixes #116060: Clone minimap options before changing them
f3a12e053e1 Pick up TS 4.1.5 (#116380)
3b9cef2b8d1 Bump Emmet (#116230)
8757f67bcda fix #116049 (#116319)
73c0a56bbd2 Merge pull request #116311 from microsoft/joh/fix/116094
5cf34afa107 Use weak shell quoting for npm tasks with -- (#116309)
6635ca9a64e Merge pull request #116245 from microsoft/connor4312/debug-repl-fix
65406fcea58 fix https://github.com/microsoft/vscode/issues/116094
43e11faf4ee fix: CreateFile ERROR_FILE_NOT_FOUND from crashpad handler (#116256)
17d65083f6c debug: replace element when appending text to ensure updates in repl
9d194eac0d7 This reverts us to the previous distro commit (#116218)
1fe57f42761 Merge pull request #115789 from microsoft/rebornix/fix-notebook-runstate
d63ab6acdbd bump version to 1.53.2 (#116228)
4aff7304539 Merge pull request #115772 from microsoft/misolori/1.53/create-pr-icon
678843ff3ad fixes #115810 (#115943)
e1ec11f5183 always fallback to plain text (#115860) (#116177)
615ea78d96a status - update background color (#115886) (#116181)
00d7f953055 add changes (#116223)
3c19fc731cb Pick up the official TS 4.1.4 build (#116222)
5d424b828ad Pick up new distro version and bump version (#116149)
ee2c947e064 ci: update newer 11.2.1 for CVE-2021-21148 (#115951)
e23884b9476 re #115717
5da053f081f Update Codicons: add 'git-pull-request-create' https://github.com/microsoft/vscode-codicons/commit/686357b7174e7b3113640fea20db7efc84d8d1d4
7f04ecd68be use PersistKeySet (#115744)
8490d3dde47 Merge pull request #115701 from microsoft/sandy081/fix115699
1d6c8826375 Fix #115699
f84decb78f3 Merge pull request #115686 from microsoft/isidorn/openEditorsCollapsed
203b86d14c5 fixes 115685
83f7a99bd95 Azure DevOps - Add global variable for VSCODE_QUALITY (#115636) (#115673)
e1c818a1711 Merge pull request #115655 from microsoft/rebornix/fix-jupyter-activation
761dd469c13 chore: bump distro
8d779a4fada Merge pull request #115609 from microsoft/joh/fix115353
30fe91131c9 Merge pull request #115611 from microsoft/isidorn/selectForCompareUntitled
8dbf3d717b2 Revert do not show compare for markdown preivew
bc38ed1b5a3 fix https://github.com/microsoft/vscode/issues/115353
65006668d07 Merge pull request #115547 from microsoft/aeschli/installProductIconTheme
b99487f4168 Fix keybinding for Search view missing from view and sidebar (#115558)
feda473d978 Enable 'Install Additional Product Icon Themes'
565dc9704f2 Use label as tooltip fallback properly (#115537)
c02643e3c95 Properly set port label from ports attributes
ae05392454a Merge pull request #115536 from microsoft/isidorn/debugConsoleCheckmark
e4a65573a89 render "Debug Console" action after a separator
a62c65bdb74 ignore focus when toggling debug console visibility
4d98741552d debug: do not render checkmark in view menu for the debug console
ad232b0ac13 Fix #115509, register a separate action for opening serch editor from view (#115514)
4eb39372949 Fix #115511 Search Mode setting does not open editors unless search view is visible (#115513)
861a88ebadb Fixes #114201
da2adf433d8 Fixes microsoft/monaco-editor#2327
52f437953d5 add my paper cuts
090200d5aea fix https://github.com/microsoft/vscode/issues/115402
b36f9993162 Revert "fixes #114908"
99c406699ff fix mixed cells
384ef202510 :up: vscode-gulp-watch (fixes high CPU on Apple SI)
e5b02b0610c liberate papercut usages
5a52bc29d5e Update working for default external opener
d27b3130d92 Center notebook actions (run, stop, renderer, collapse, etc.) fixes #115087
38783a261a6 update version
36cabc4c123 🕺 One more time (refs #114219)
9934dea6888 Fixes microsoft/monaco-editor#2175: Improve hit testing code on FF
9d9aebd2e64 Add vscode-emmet-helper and restrict some labels
76adcde8743 Add `onDidChangeMarkers` (fixes microsoft/monaco-editor#313)
de3b3ac5496 Don't exclude all unless there are no includes at all
791930308f0 Fixes microsoft/monaco-editor#2171
29c5c523023 Also apply #114709 to the extension editor
8c5e805d3a5 Fix spelling
662a698ef9e Skip failing test #115244
4d0a3637f29 Fix #115318: Getting started "Tweak My Settings" resets the getting started page
f54b4fe5771 Fixes microsoft/monaco-editor#2168
d7821d5fb05 Remove console log
ed4bd04c904 add other duplicate label to my endgame notebook
3fe4b0eb2f7 fix #115293, #113933
a7c0b43e1b5 Fix notebook action descriptions
d045bc6ed1d Update color name for 'notebook.inactiveFocusCellBorder' (refs #114219)
660d6b82f85 Use unix style paths in includes always
4a338fd0d44 Merge pull request #115269 from microsoft/misolori/notebook-inactive-focus
588c3c49509 Merge branch 'master' into misolori/notebook-inactive-focus
12b56d878be Update color token name 'notebook.inactiveFocusedCellBorder' => 'notebook.inactiveFocus'
7ce63bef177 fix #115290
cbcfaa00f45 fixes #114914
8e22ecf4c85 fic unnecessary import
e86befc8a9f Status bar: setting invalid color sets opacity 100%. Fixes #115292
b8bff49c9ae update distro
33e804f211f update milestone
3b87c36e2dc fix https://github.com/microsoft/vscode/issues/115207
631802d5cec comment out arm snaps
8aab6bc62d7 fixes #115219
3da57861612 fixes #114908
bb226913c5f Fix #115240
c8a90a48267 Merge pull request #115302 from microsoft/sandy081/remoteCLI
b2a34770f01 #115294 also handle medium exe tip
724888adc76 Fix #115294
05568474922 remote cli: show host label
f10dc2a548e more polish
4d3b15fda09 make sure to cancel continuation of `_handleEditorChanged`, related to https://github.com/microsoft/vscode/issues/115219, fyi @joaomoreno
971fa2cc9c6 Fixes #115304
0a943766a5f Fix monaco checks
9545d582360 Do not use the global `monaco` inside the editor
bb841e3bbee fix https://github.com/microsoft/vscode/issues/115301
2ce26643d85 have a separate setting code cells in breadcrumbs, hide code cells in outline by default
17c617039b1 Squashed commit of the following:
3a287ee1eae Fixes microsoft/monaco-editor#2302: Only define global monaco if asked to do so or if using AMD
a2bcb0608f1 fixes #114804
9519a5cb5a5 :lipstick: clean nuget.config file
dcf0c56a796 node-debug@1.44.16
1d15b2fe17a use final DAP spec 1.44
6be5904d199 polish
1c1df3eaee5 fix #115050 flickering tabs when wrapped (#115273)
bb931908832 fixes #113703
5d63134de9e web - fix compile
4b5a9c4b5f0 change remote cli to manage only remtoe
19cbd870aaf web api - expose env as API from facade (#115295)
ee4516a4851 always on trusted-types for yarn web, fyi @bpasero
03902d48417 Revert "fix #113933."
70de88696c0 d'oh, forgot to adjust anyScore to new data format of FuzzyScore, fixes https://github.com/microsoft/vscode/issues/115250
7a9e56510d2 Not requiring NPM for typings (fixes #115228)
fb5bc5dd2ce fix typo: ResourcEditorInput → ResourceEditorInput (#115208)
f73c011ae3f fix: disable rosetta option for universal build (#115280)
ee7e0ad0933 fix #115107.
5e5f2f3b6ba feat: add identifier for universal app in issue reporter and about dialog (#115277)
d42bed7957a fix #113933.
d09508d9cb8 re #115012.
e48b3d3cad5 Update codespace-related getting started images & wording
64c4f7f49c8 feature insights for notebook.
5aac4f44562 fixes #115267
014aaa1047f Fix #115271: Search in Open Editors triggers errors when done without files
848896a75eb update distro
98da2b151c1 Remove unused variable
dfb86c5fa13 Add 'notebook.inactiveFocusedCellBorder' color token
b1ba0c70eaf Fixes #114172: adopt latest loader
4febf1e6c38 Add missing class to fix view items For microsoft/vssaas-planning#2286
4378b7f0201 fix #115169.
e6d5a209440 Fixes `getBranch` when name is fully qualified
ba428fe1029 fix #114225.
ed8043effb7 Save only open editors toggle state
8dcebbaf54f path => fsPath again
949a20d14f7 Merge pull request #115253 from microsoft:jackson/open-editors-fix
20f8e59d696 fixes #112347
a1bdcf6aed3 fixes #115121
3d66ab98eb9 path => fsPath
e3b0eae7403 Test fix for #114795
22960ca0155 fixes #115073
e375d137174 fixes #114869
cdbc22a9cbd Fix #115234: Cannot view search results when one is in an Untitled editor
977b2f6a1ca fix https://github.com/microsoft/vscode/issues/115201
ff27ea9437d Fixes #115148: Indent new line when using `IndentOutdent` and `appendText`
e4f1833d79b Use x64 node for darwin-arm64. Fixes #115009
96fa81bb74a Forward arguments when click is invoked via `makeContextAwareClickHandler` (fixes #115026)
4bd2d367e7c Remote smoketest timeout (fixes #115159)
e4022fb0e27 Expose a `TestCodeEditor` that could be used by the workbench tests
030c9d52233 cap notebook outline elements at 64 characters, fixes https://github.com/microsoft/vscode/issues/115199
ee65f21c4f7 use marked lexer to find headings, render MD as plain text before, fixes https://github.com/microsoft/vscode/issues/115205, fixes https://github.com/microsoft/vscode/issues/115206, fixes https://github.com/microsoft/vscode/issues/115118
c789c22efa7 Fixes #115224: Adopt Trusted Types in DiffReview
a552ebc1f8b Revert "diffReview: use insertAdajentText instead of insertAdjacentHTML"
eb1cf4b0bae diffReview: use insertAdajentText instead of insertAdjacentHTML
e06ef891b70 Fix #114379
096d70ce18e fixes #114990
35c5689d292 fixes #114914
0f59f684a1a Fix #114982
bb6014df3b4 tabs - let the overflow gradient not draw over borders (#115129)
676e8d62a3e chore: remove universal build from its separate stage (#115203)
99e7aea4a82 PR template - remove pull requests link full stop (#115090)
c246b5704f7 fix https://github.com/microsoft/vscode/issues/115124
7b0cfdd04ad fix git askpass
93830fbe3d2 cleanup #113562
8e68e0c4331 log source
f434f853aaf pfs - workaround broken reparse points on windows (fix #115113)
1718be68d0f Fallback to default opener when selected
5662b3b6a25 Log exceptions and continue in calls to ExternalOpener.canOpen
9ee751e859d Error if registering an unsupported scheme for external opener
9421e50aa8e Improve documentation for ExternalUriOpenerPriority
c4c5f45ce0e fix #115150.
39d9b04f2c3 re #115018.
a56bc0c6711 Don't write preferredLocation into workspace settings for find file references
0ede5243261 Reword multiple external opener error
e5c4f426fee Fix setting decription and remove unused setting
d9e4f5cf97b Add new icon for open editors view
005db8394c4 throw an error with a clear message when a notebook document is missing, https://github.com/microsoft/vscode/issues/115018
0a0537961c7 tree: do not break fully when you can not collapse an unexisting node
bdd2f1628e2 callStack view: set callStackItemType context properly
b7e87c1bf27 :lipstick:
9788e81e98d Log individual events because `extensionIds` gets clamped sometimes
d5bdb0efb21 fix #115011.
c3746fa0aed Fixes #114983
21e970473c3 Fixes #114998: Fall back to a document range semantic tokens provider
58624bfcb16 Fixes #115032: Add description
db92af7429d Fixes #115033: respect indent action when using appendText
774f887a985 update notebook
578e2dc4ee7 Fixes #115026: Adopt `KeyboardEvent.triggeredByAccelerator`
c1afd7c238b Add `_debugComposition` flag
9e07bfd5946 related to #115037
75ff8b11310 fixes #115037
1f1ed78f7db Use ;; instead of ; for line comments (#115036)
960a93f0e2e add unit test for #114971
09ef3735975 Merge pull request #114972 from enagic/master
371629106b3 #114031 fix user data sync tests
08a2f9c5e36 fix enablement handler
0540478dc72 Reduce getting started for codespaces
1a9dd758530 Don't error out on unknown provider.
25f6e3e2540 debug: update js-debug
a331c2b515e Revert test changes
684459c8dc6 Refactor searching in open editors logic
17685a9db95 fix #108950.
a46fd0ee934 fix: update `isUri()` to compare `fsPath` as `string`
8fa1417e309 run oss too 1.53, update distro
88af66bceed testing: accessibility round 2
500d514ecfa Add fall back to default option for when external uri opener fails
8b1feaed3e6 Documentation clean up for ExternalUriOpener
0e5b47fa43c Use object instead of array for `workbench.externalUriOpeners`
ed98eb19685 Fix spelling
ae8bd3216f0 :guard: tests for selecting kernel.
2f6c928b209 Fixes `getBranch` issue with remote branches Improves perf by reducing git calls from 3 to 1
748b2e5a854 Remove `#` from typescript deprecation warnings (#114787)
60f3919b26a fix #114959.
7e3d5a0ce0f fix #114048. do not update active kernel if kernel is executed.
c7cf663d0c4 fix #106362. Keep runstate when undo/redo cell.
b112052169c fix #114171
8d7740fe3b3 Merge pull request #114944 from microsoft/merogge/integration
fd1ba8c9692 chore: bump electron@11.2.1
2433b0eaf3c update distro
f21a3b95e6a Merge pull request #114854 from susiwen8/hover-scroll
a3131249625 update distro
58e88ff3ac0 testing: accessibility in explorer round 1
72172ed06c6 Merge branch 'master' into hover-scroll
68b7e79867e fix test-product icon
89e152635ab Limit spin to sync and loading (for #112298)
4ae47297a3e Merge branch 'master' into merogge/integration
bd7dff7f071 testing: add test result to proposed api, ids for correlation
ff08b2509f6 testing: fix not subscribing to first open workspace document
cb69f5c9bca testing: add line background decorations
582ea371c2b [microsoft-authentication] Extend authentication session to return id tokens (#114675)
5a3fedf0c45 Merge pull request #114628 from microsoft/alex/python-language-configuration
dac8d916d56 fix #110936
62093ff022b [html/json/css] update services & dependencies
d877e86bdd3 Merge branch 'master' into alex/python-language-configuration
e451364da15 Update Codicons version
51d19635946 reset template display when switching models.
b18634fe902 fix #111587 Apply enablement to command links in welcome views (#113841)
07c3e907eb6 Improve glob module to support OS separator agnostic matching (#114810)
7468a060129 Revert "fix #114171."
c708e3d5cf0 Move `workbench.startupEditor` to RESOURCE settings to allow setting to gettingStarted on a per repo basis Make sure to disallow setting to readme via workspace settings to prevent tracking attempts.
644d108f0d9 Do not reveal `FindOptionsWidget` all the time (fixes #114630)
f3136a25fab Merge pull request #114934 from microsoft/merogge/terminalDimensions
60bce0f6287 feat: add macos universal build ci config (#114446)
19d87449a7b Add option to override 'pinned' when setting list selection Fix #114651
88fd9d9d178 fix #107239, set terminal dimensions
d21d85a3fc2 Fix precommit hook on Windows
c79a0282da3 Fixes microsoft/monaco-editor#2301
95227b3e10d Fixes microsoft/monaco-editor#2311
bf93e45b9c6 files - document file modes we use
1eb89d7da18 Add telemetry in the area of reconnection
3b03189afae Restore extensions in core (#114921)
5fcd9f74845 update distro
1aa795f2ff1 update jsdoc for #114908
415398e3995 tests - only use 'junction' for folders
604e231d371 fix strictEqual problem
7a89df95922 some more strict asserting tests
3cb3624be97 fix build
b2242cc5ebf rename notebook outline settings to `notebook.outline.showCodeCells`
fa7d5e7def0 fix `breadcrumbs.symbolPath` setting
830a7589e2a tests - enable symlink tests for windows again via 'junction' that do not require admin privilges
14cc5263711  Cannot open a remote workspace via --remote syntax. Fixes #114900
e60e0eab352 Cleanup some file related unit tests (#114895)
a38cc82a154 fix mock, fixes tests
5592ed02fb3 rsource -> resource (#114837)
bc3a770b78e perf - suggest status shouldn't listen when hidden
dcda88e5a69 fix https://github.com/microsoft/vscode/issues/114798
eb5f9becd90 make SubmenuEntryActionViewItem not eagerly fetch/create the actual actions
137b6f5a464 Update endgame notebooks
da0a04fffb9 Copy function fails over dangling symbolic links (fix #111621)
c8ff3471b59 Do not attempt to open a workspace/folder that no longer exists when reloading window (fix #110982)
d2cbc66835f Add empty problem matchers to build tasks so they don't ask me questions
1f8b429635d chore: custom protocols will also be intercepted by webRequest
62fcf3cce7e chore: cleanup webrequest filter for svg files
228459cc63a Fix: show hover when mouse control hover scroll
79be0a07248 Fix #114794
7b317afd931 Fix starting scroll for URIs with fragment (#111126)
98ec233c77e Fix: release note don't use editor style (#114709)
e91fd3bd40b Updated Getting Started images with transparency instead of blur
f0bd7eee100 only create processEnvironment once, now tests pass Co-authored by: Daniel Imms <daimms@microsoft.com>
4300e6c7d2c Fix #105177 get terminal environment variable to show up in remote container
a095d7fcf74 Make sure altClickMovesCursor gets refreshed
c2d09aaeac1 Open Language Mode picker for new file (fixes #110330)
885e66edf9e Open Language Mode picker for new file (fixes #110330)
cd6fa35fb94 fix #114233.
add5b32d959 testing: initial implementation of test decorations
3e55989cca8 testing: move test filter to action bar
2c19f7fb988 Fix #105177 get terminal environment variable to show up in remote co… (#114721)
d8a3c5f61c8 fix integration tests.
88d66caf686 fix #114782
ed72c64b87e Remove unused constant
de11a7dec60 Rename `isEdge` to `isEdgeLegacy` (see https://support.microsoft.com/en-us/help/4533505/what-is-microsoft-edge-legacy)
007f704eaa9 Remove IME special cases for Edge Legacy
4fac328d03d ok I'm out
86d96faaaf8 extract menu entry view item creation logic, fyi @joaomoreno prep for https://github.com/microsoft/vscode/issues/114123
bd929b33de6 logging - put storage tracing behind a flag to reduce spam
b9c67304807 add some docs for workaround for #114227
a07327a430d better default for PeekViewWidget#_getActionBarOptions
3f3b4136060 maybe this is it
4b7f41a732e Merge pull request #114544 from microsoft/aeschli/114542
67c9ab0d514 test all extensions if system/builtin
a4a9a5e69db debt - use css variables instead of dynamically injected style sheets
534d5b08948 :lipstick:
89855f0fcdb web - editor context menu sometimes wrong (#109166)
7bb55c99943 Merge pull request #112169 from chenjigeng/fix/debug-auto-decode-link
da48ddc5fea upgrade gulp-atom-electron
b57017797cf debt - adopt some strictEqual in tests
f123c904b17 remote cli: do not sync installed extensions
5809e9eb031 testresolver: support server extensions
dcc1e9df991 workspaces - shuffle some code around
b3807b04f22 Merge branch 'master' into fix/debug-auto-decode-link
ebf351d04b3 workspaces code cleanup
4937aee5ed5 repl: on debugConsole.wordWrap change recreate the tree, do not require a restart
1e0f94f9009 Fixes #114468
6f9c818900d :lipstick:
0d8ec8f09fe Ports attributes open -> openBrowser
1be6d22ebca add setting `outline.showNotebookCodeCells` to control if code cells should show or not
37c162ed6df revert
37a4b96ae18 simplify FuzzyScore structure, fix high, low match
9939537ea44 debt - use main in main side services consistently (workspaces)
d7ddcd1e08c debt - cleanup WebFileSystemAccess#supported
6b1675af7e7 Open Language Mode picker for new file (fixes #110330)
affac2b5ae0 Fixes #104004: Do not attempt to run extension tests in web worker extension host
2ef14cf785a fix workspace tests on windows
1848d3111fc Add workaround for #114227
ed00aebc389 Link names
98b4661b002 :lipstick:
fed0eb5fd9a web - remove old API interfaces
c7cb19ed216 Merge pull request #114749 from microsoft/ben/folder-id
e5dd4b6e4b1 Add mock support for public ports to test resolver
4c0a4179e6e workspace - more tests for identifiers
106f26b27bc bulkEditService: dispose of listener in finally
1285843e55e When a tree resource has a tooltip it takes precedent
3ee49fa3f86 explorer: when new file system provider registered set whole explorer input
05bf7b0afcf Merge branch 'master' into ben/folder-id
ec337988dd6 parseUri/Path => resolveUri/Path
f9d16c3b3c2 fix tests
3f26fd17ba5 workspaces - some final :lipstick:
cf4c4a0ece7 drop gulp-cssnano, use gulp-postcss
b87d56c5332 distro
2e5034a74b2 Retry downloading playwright when hitting ECONNRESET
f1e62c1190f upgrade dev dependencies
9321b2f141b bulkEditService: veto shutdown if bulkEdit is in progress
dca2d81c652 upgrade build azure-storage
70a3118892b Allow svg files to load from Schemas.vscodeRemoteResource
4f2341834e6 fix nls problem, fyi @JacksonKearl
70f4451001a remove unwanted #region comment from vscode.d.ts
2fd18ac793f workspaces - reduce stat calls
e61d0ba267c mark secretState field as private
4b9ccf578c3 fix #114727. load preloads when switching kernels.
167b920831c Enable searchInOpenEditors by default when not in stable
7e55fa0c543 Search In Open Editors (#107756)
9f9d1a76d97 support kernel id and extension
a8145f67dcc testing: polyfill test heirarchies (#114601)
572bc1810dc Make sure we dispose of the open with picker after an item is selected
542de8e0093 Move schemes to opener metadata
885585c7f87 Remove test math formula from readme
793f2e06af4 Fix weight of terminal search workspace keybinding
3d641d9d35b fix #111889.
d972bfc3266 Update elliptic and nwmatcher (#114670)
7310b17e25f Merge pull request #114669 from microsoft/merogge/altClick
dec03c4a714 Improve doc wording
219d323100f improve setting description and make setting true by default and add ===
821afe5e929 fix #111885. avoid duplicated execution placeholder status bar item on split editors
59fac4862da Merge pull request #114665 from microsoft/sana-gettingstarted
3003bde2214 revert "Open" to "Focus Terminal"
4b9b2ab9a60 Fix #114707
dbd4ede23f8 add api lint rule for region comments
41d8bb26110 Merge branch 'master' into sana-gettingstarted
e7d3eb87cb0 :lipstick:
565f3a59e6c @ for CI failures
98ee1c6efda update distro
3ec90672006 Simplify local port logic in test resolver + OS check
f2b2854a6b2 (for now) have tab decoration off by default, https://github.com/microsoft/vscode/issues/49382
67f1ada71a6 chore - a few more strict assertions in tests
e8f6c273819 Use random port if privileged in test resolver
bdc3b07f428 Fixes microsoft/monaco-editor#2305: Account for padding when computing the content height and having scroll beyond last line enabled
fcccc85ff97 Add more to test resolver tunnel factory and fix port filtering
ad437ef958c Fixes microsoft/monaco-editor#2313: navigator.clipboard is not defined when loading not secure, via http
d3fbbece829 :lipstick:
5a95cd26e4f Fix #114708
3ad7af3ab6b :lipstick:
9b7323a7efe cleanup types
d8831220ff1 Update showCandidatePort for test resolver
f6490bfa5fc :lipstick: getFolderId
758f66b5986 workspaces - actually use workspace
79230501646 Don't await remote env before setting up process manager
9ca50fbb47c Merge pull request #114702 from microsoft/tyriar/109600
4877478fb6e Hook up alt buffer active ctx key
b5f36a24b63 testresolver: start a test server
a49455b5286 :lipstick: isCurrentWorkspace
af915f0bc4c Create terminalAltBufferActive ctx key
6755b6bb3e9 electron - need to check if window is destroyed before accessing webcontents
b1cb3b1cbb1 Merge branch 'master' into ben/folder-id
37ea1d82847 Merge pull request #114660 from microsoft/isidorn/async-tree-diffIdentity
19e390d5b58 polish
04ca5c80d3f Merge pull request #114593 from jeanp413/fix-111572
0249c31a59b testResolve: more tunnelservice fixes
c735c8b2913 Merge branch 'master' into alex/python-language-configuration
67bf6577b4d testResolver: fix for tunnel server
b6f19ccf3fa CI notifications
7d5052a8fce Merge pull request #114687 from microsoft/alex/ci-windows-cache
15e58cea4d3 test resolver: add tunnel server
18c8a3f0482 workspaces - compute workspace ID and check for existance in window service
e9967519db1 chore - strict asserting in snippet tests
515f179c98a decrease repl refresh timeout
f63310750f6 Even more tunnel provider logging
44e020ac02b Trigger CI
05e4d593c23 workspaces - move id computation to main
f5d760b48f3 Merge branch 'master' into isidorn/async-tree-diffIdentity
831d1942874 Create .build directory
e8473247567 distro
4f98d9c0be7 no double reveal of notebook symbols
232052d7e63 Create our own node modules archive (#114516)
33789a59919 workspaces - drop duplicated payload interfaces
dd84387f9e6 window - merge workspace and folderUri into one
0c02f245f07 bust node module caches
914d8dff29e add notebook for notebook paper cuts
c71edb7d883 get marketplace extensions in `yarn web`
f4a0c209bea formatting
c8ce53e492e window - reduce to one property for opened workspace
f19f4a1b908 Fix Keep activity bar icons stable on reload (Web & Remote window) #114144
9cfba546810 move build/dependencies.js to typescript
acaed317263 workspaces - add identifier to single folder identifier
7e2d8b48e36 Merge pull request #114581 from microsoft/chrisdias/solongsofar
3207692dbbd Merge branch 'master' into chrisdias/solongsofar
44eb775d1db further remove single workspace identifier traces
46b964b1b7c workspaces - remove ISingleFolderWorkspaceIdentifier requirement from workspace service
47a6682df6f fix: allow svg from devtools scheme
eaaf647c8c5 workspaces - remove ISingleFolderWorkspaceIdentifier requirement from history
aa774aeeb79 :lipstick: regions
71feb05bfba :lipstick: workspace payload
6b241a6845d Closes #111210 - adds openRepository api
5bcd2220750 Fixes checking for rebase against wrong branch Refs: #1866
1a4b35c2023 :guard:
26aaaeb11ca re #114583.
6e56202803c pin notebook editor when execution triggered.
ece4eeb0647 only handle override when id is provided.
a2830f41653 execute notebook with args
1c755a4fca2 fix #114674.
9a55eff36fa testing: make filtering work correctly
847c52e69fa testing: add hover titles for items
0e9e4e46774 testing: show stats about the last test run
aa14d823df5 testing: show badge for running/failed tests
c2a2e9cabf8 testing: show test progress, implement result service
48c7596e909 testing: fix swapped run and debug actions
c6e62500779 Merge branch 'master' into chrisdias/solongsofar
1123ea5791b set false by default and consider multiCursor
de24392e690 fix #114583.
79ec33ab1eb Merge branch 'master' into chrisdias/solongsofar
f087f82a3b8 allow reopen notebook with another view type if not dirty.
559a63373fc fix active notebook editor in repen with quick pick
3fef8c795c5 Update gettingStartedContent.ts
d591739670c Fix #97564 (#114438)
5717c0396ad update distro
1509770d10d Fixes #58440: Finalize `OnEnterRule.previousLineText` API
aab5336e534 polish
9b1d85bad8c repl and explorer adopt diffIdentityProvider
be4d10efa1b async tree pass on diffIdentityProvider to regular tree
28b221faa8b Bump concat-with-sourcemaps from 1.0.4 to 1.1.0 (#114648)
2e40c684ecf Bump fstream from 1.0.11 to 1.0.12 (#114649)
bc3a873ee6f Bump macaddress from 0.2.8 to 0.2.9 (#114647)
f9109f4464c Bump sshpk from 1.13.1 to 1.16.1 (#114645)
d3965a2b4dd Finalize secrets API, closes #112249
699b02d3ae3 Bump hoek from 4.2.0 to 4.2.1 (#114643)
93ae815ba14 Feedback on secrets API #112249
64fa272029d Bump stringstream from 0.0.5 to 0.0.6 (#114618)
1266a4e4d05 Support git-cmd.exe as a git bash shell
cbbf2d09904 Correctly resolve mapped drive on Windows
7139a93a8c7 Bump mixin-deep from 1.3.1 to 1.3.2 (#114619)
a011dab93e6 Fix #114639
ec1eda0d96c Rename `OnEnterRule.oneLineAboveText` to `previousLineText` after API call feedback (#58440)
38c051bf865 Catch errors in tunnel providers and log
947626dfa4b fixes #114616
bab7a83909b shared process - check for destroyed webcontents before calling postMessage
b0883ec87a9 Properly call dispose in tunnel factory We really need a lint rule or something for awaiting/not calling functions
02f7983156e More tunnel logging
a7980b630c0 some initial :lipstick:
0b038406a95 :up: distro
6c4203f7482 Modernize CLI main (#114623)
aaf5a7fee3b Merge pull request #110912 from Wscats/enoyao-Environemt2Environment
e2bce32da4b #114627 complete fix
0fbab387483 :lipstick: strict assertions in extHost, mainThread tests
5cec4e2da6e don't expand outline tree when just updating, fixes https://github.com/microsoft/vscode/issues/114386
845a4d4268d add new rule to enforce Thenable over Promise, adopt in vscode.d.ts and vscode.proposed.d.ts
dfc8f5ab91b comment-out console.log fyi @connor4312
e9263cc8269 some API proposal for open editors
543af670531 fixes #114607
2d5f7fd0726 Move `onEnterRules` to `language-configuration.json`
87dba0db6b2 Fix #114627
368c03fdc8a Fixes #114348: Allow `onEnterRules` to be defined in the language configuration file
390dac56a51 debug dynamic configs: Use the type of the provider, not of the config since config sometimes have subtypes
f9f87fb6fa1 Add logging for tunnel creation
37c4d4b0a83 fix https://github.com/microsoft/vscode/issues/114621
b675fa18cb4 'Resolving your shell environement is taking very long' shown in every window (fix #114622)
06ab012baa5 state service - actually implement interface
9deba1b10ae code catchup
4d0d36c6ab1 update distro
b31660dccc7 update distro
f3c865334d4 use real tsec instead of vscode-tsec fork
c0a0a35a87c more clarifying comments for shell env resolve
6effd9dce9c better fix #114564
a16beb16509 testing: fix run all tests command
b50bd5d0944 Close #114342
1f8643ef760 Refresh Images In Markdown Preview On Change (#114083)
686cd7df530 testing: clean up actions, add run/debug all, rm duplication
bb1c05e62e2 testing: unify testing view
f37dd663235 Revert "window - do not send IPC messages to destroyed windows (fix #114563)"
16ea22eea19 Update Codicons: Add 'combine' icon
7f4d67c94cb Fix #110812 (#114553)
049735e8d96 A case for 'Shift+Insert' added. Fixes #114103 (#114520)
a11dd7cd48d fixes #114199
3ed456050c7 Fixes #111572
6d6fec82092 Finalize product icon theme contributions. Fixes #113828
c42b385bcea Disable contributed openers by default in calls to openExternal
fe81f9f5b26 Add link opening getting started task action. Closes #114582
3e4552ffcc7 Remove unneeded mapping from cintainers to disposableStore
3411ae55cc8 Allow splitting gettingStarted editors fixes #114321
fa2dbc16ca8 spacing
82a21e5a032 :evergreen_tree:
239213eaeb1 push it real good
3c4f06dc98a update distro
010e1d0e4a3 open in new tab
74f31a68598 Fix #111299 (#114441)
36cb0bde33a ci: disable exploration sync on PRs
aef623dc1d3 remove "so far" from Problems message (which assumes you'll have problems later)
eba7c23da0c trees: rename option to diffDepth
b32d137681d Merge branch 'test-tree-testing'
c100b5c26ac add clearUnacknowledgedChars flow control
6815e754602 Merge pull request #114237 from microsoft/smarter-indexed-setchildren
bc84f07dc53 navigationActions: remove dependency to notebooks
81ec098e60e Merge remote-tracking branch 'origin/master' into smarter-indexed-setchildren
88835344408 trees: don't use diff identity provider for resort
7ae39d955d4 fix https://github.com/microsoft/vscode/issues/114576
ee4f4dbf97a make trusted types policy strict
bcb5f3c77b7 update mkdirp
fe1fdf0b4fe Use correct value to enable port finding
616fb1cfed2 Merge pull request #112317 from plainerman/fix-99072
c0c033ff4f7 Use port auto forwarding setting to disable port finding (#114574)
b0b4bc4e338 add grammars scripts
15a285fd5ae Change "Requires Sudo" to "May Require Sudo"
c6145fc3065 ext (un)link
4ff784e1fbf promise :lipstick:
cf4111f6f89 show a modal dialog when no default formatter is configured, https://github.com/microsoft/vscode/issues/113903
dbf36e4cfb6 Change aria label when attaching
f8df6a7e47d oops do not have .only
5a4d90a550a window - do not send IPC messages to destroyed windows (fix #114564)
635d7af6385 update ext types
7a34c6d6227 update tests
36929d3b59e exception widget: allow to tab over each link, enter to navigate to link
3c49afeaafa fix hygiene
867a52fc090 ext each: allowUnknownOption
ff393a3349e add open tunnels to test resolver
af2bcd4d461 bring back vscode-colorize-tests
0e7f3d0d8cb Revert "remove colorize-tests extension usage"
971190e4d0f fix region comment
81eccfbf68e cleanup native modules test
28ad78e7dc8 fix https://github.com/microsoft/vscode/issues/114537
af59db28c8d stream - some cleanup of observer
78d5286adb9 Bump sshpk from 1.13.1 to 1.16.1 in /build (#114534)
9af9580bf0a Bump stringstream from 0.0.5 to 0.0.6 in /build (#114533)
b165e20587d InlineHint#hoverMessage becomes description (maybe better tooltip?) and support string OR markdown strings
b47aa19443c FileService improvements (#114428)
2d9a0d12131 inline hints: tweak colors, react to theme change, add rounded corners to hints
d29bb624a40 Merge pull request #113285 from Kingwl/signaure_arguments_label
caa87e0b523 editor status :lipstick:
2472798cd57 Fix: selecting entry should focus back to editor (#114493)
32b28f6f8f9 And again bump distro
ce106c3924a Bump distro again.
ced398d18a8 Bump distro
30f17c9572a Merge branch 'master' into signaure_arguments_label
dc588389507 remote install-extension with VSIX
18aa3199c23 Avoid `ERR_STREAM_WRITE_AFTER_END`
847300e49a9 support vsix for install-extension
92083ed3e18 yarn ext
085317e932e dev: ls
d6ca7769f42 create extension workspaces
bcf514160be uninstall-extension should remove both local and remote extension
a40b4e72d08 add API command `vscode.executeInlineHintProvider` and some end-to-end tests
ac85fb8a74b fixes #112045
7a938679f82 clamp font size at editor font size, don't go bigger
d65ab8dcd9a use all of context decoration as decoration type key
4af282ea26d explorer: download report progress in the explorer due to rich download progress to not get double notifications
1d3b03bd551 padding should depend on font size too
4651f66cca1 simpler decoration type management (rely on internal ref counting)
dab702a135e extManCliService: Sort listExtensions, fix output
f101028176c Fixes #114299: Add commands for invoking semantic tokens provider
5087b08c6d1 :lipstick:
1981776d0f9 less state inside InlineHintsController-type, only have one type of decorations, and much :lipstick:
d427deac780 explorer: adopt confirmBeforeUndo
74f272fbb7d update distro
c27642c76d6 Merge pull request #114421 from microsoft/aeschli/remoteCLIExtensionsManagement
0d4bf785b6c remove hover (should come via decoration) and action/menu (should be self contained if at all)
97f237272c9 rename remote commands to _remoteCLI
ae67879ed5d don't propose new API on ThemableDecorationAttachmentRenderOptions
756337d48af Merge branch 'master' into signaure_arguments_label
2bb41a14025 dev script
2388c80c74c Add `confirmBeforeUndo` option on the undo redo element
407557ca234 Save file dialog: sort file types alphabetically (#114487)
bf90bd15185 cliProgressMain: add LocalizationsService to ServiceCollection
911a54273ce Merge branch 'joao/fix-web'
9995d128240 missing build output
09bc6fc64b1 Migrate to new deb repo (#114527)
ed8655201ae fix web extensions
7fa8f1aa7fb Remove plug icon from ports view Part of https://github.com/microsoft/vscode-internalbacklog/issues/1689
667e41626f1 explorer: if you can not undo, pass undo to editor
85f1501c861 update distro
d3611cbb634 fix toString
2ef04b24f42 :lipstick:
c208ec384c9 :lipstick: move all scoring logic into _doScore
9441f1c6457 Add support for npm scripts with a space (#113840)
253d99a16f8 update distro
84865c05ecc Merge branch 'master' into aeschli/remoteCLIExtensionsManagement
22e02e00804 use URI for VSIX paths
96001455045 Fix tunnel creation in web
1c131cf2657 Avoid extra fields
ebac10e0a56 Avoid conflict error
3c2c937f991 Merge branch 'master' into signaure_arguments_label
fcc00b29f5e Avoid ts changes (#2)
08f3bcec33d fix https://github.com/microsoft/vscode/issues/114518
c16956439b3 Bust node module cache
5560c9f4da0 Fix #114455
0a2b6d4a1c6 inline collapse all actions
141b275c41f Merge pull request #114260 from microsoft/sandy081/comments/fix92038
ff309d2a239 Merge branch 'master' into sandy081/comments/fix92038
39edf4351b9 Trigger GH CI
12ef541b365 :up: distro
ff9fbcb077b telemetry - lift some helpers to electron-sandbox
93b5a0591f7 sandbox - lift remote agent service to electron-sandbox
9cea4954aa5 notifications :lipstick:
691951c3b1c editor title - no need to update menu onDidRegisterExtensions
ec5d1c2ab93 debt - push more window related things to window helper class
eaa959d34b8 fix #114273
253e9e32261 shared process - consolidate services
0c8cf08b44b shared process - drop management service
1caaf1b2dbd :lipstick: path labels
61312f3708d Remove instantiation service accessor
2e89c2d4ba5 Add 'key' to onDidChange of secrets API, #112249
c5f0bac2a81 Create issue directly if signed in, fixes #95165
0faf1550289 Disable on enter test
48b726e39e7 Fix regex
5f6acfb68e1 Move jsdoc completion tests to smoke tests
800e173c403 Split ts into unit and smoke tests
b813d5dd300 Leave the local extension host running when connection is lost to the remote extension host
3a9daf3e34a Adopt new vscode-userdata path format
bec5afa2923 fix: remove unnessary asar files from mac arm64
a31b0617e24 expose altClickMovesCursor as setting (#114429)
b2575665d82 Emmet wrap update, fixes #113930
21c11ba864c Fixes #114433 - adds setting to avoid git config
79cfca5aa29 fix #114416 LabelService.getUriLabel bad relative path if in root workspace (#114419)
5a25a566959 workbench.action.debug.start => workbench.action.debug.selectandstart
a3febc56143 Potential new formatter for userdata in serverless. (#114296)
663532c3173 Skipping unreliable test
a68f1326e87 Update built markdown preview code
308a4f6a484 Make sure ts extension has loaded before running on-enter tests
d87041eddef Downgrade simple browser to prompt instead of being the default on web
3310d3ac2d4 sort notebook content providers in the list.
03dd7bf1d91 testing: polish and unit tests for the test tree
337b3e8d055 turn on flow control by default
7c4248780c8 adopt useCustom for permanent connection failure
2137a7f8508 implement useCustom in dialogService
5b8f78a1570 Move sync-enabled trigger to gettingStartedService
67c988005f9 Do not wait for the first reconnection attempt in the reconnection loop
b64a4ae1aa3 Scaffold `MessageOptions.useCustom`
6d50c71f41c add editor command, fyi @dbaeumer
ff042e9fa40 fixes #114203
381b99f6415 Also run the output based auto port forwarding (#114424)
f7e7a95479e Merge branch 'joao/remove-grammar-extensions'
bf764f1ce6a wip: sync-extensions dev script
c198925570c extensionsManagement for remote CLI
4974a335112 smoke tests are tests too
f745a912ae1 fixes #114420
62bb9b3d3fd shared process - adopt toggle method from management service
65582ba33d4 Fix #114326
0442b734227 remove devops ci badge
d472f9d503c remove devops continuous build
f8dbf7dd079 Merge pull request #114359 from microsoft/ben/shared-process-message-port
4af3c1c0576 get grammar extensions from marketplace
217aab28fac breakpoint polish condition context keys
6ca430e6a6f Merge branch 'master' into ben/shared-process-message-port
55325988a07 shared process - basic message port tests
d952c818176 Fix #114379
6f9f6f806c1 Azure DevOps pipeline artifacts (#114405)
d577c4b18da remove colorize-tests extension usage
bc7d3c9ea6d remove grammar extensions
be2732570ac Include tunnel service canElevate check
6889ed3ab17 Notification for elevating when using privileged port from openTunnel
25a9fcdb918 Merge pull request #114388 from jeanp413/watch-copy-value-selection
98acb74149d shared process - fix --status invocation
addb6b9b53a :lipstick:
55e10fd785a shared process - introduce a separate service for management
22c1c0b486d update distro again
ba7f5c60a5e update distro
5d620dc8466 Update Linux publish script
45e8d6ebc65 Update distro commit
c082930a439 shared process - introduce platform/sharedProcess
ec2a8e5b9ee shared process - rely on "close" event for disconnects
9e1863ec2dc shared process - :lipstick:
98d2d74ba07 Revert "Publish scripts update (#114375)"
99f0ab9f732 Publish scripts update (#114375)
2bf5b56f115 shared process - move the shared process back to IPC folder
8dff4cfa55d Expanding Getting Started text based on first round of feedback.
bcb33ef6290 Merge branch 'master' into ben/shared-process-message-port
9c7128d8fab Fixes #114384 - recheck resources after save/add
746c455458c Respect multi selection when Copy value in Watch Expression View. Fix #114353
1894765dd17 Merge branch 'master' into smarter-indexed-setchildren
1a6eef3170b Update image ref
54cb0ed544e Clean up settings sync entry
4207c4ee13e Move defaultExternalUriOpenerId into configuration to avoid cycle
5c39159acb4 Fix cycle
4566eebe4fa Fix typo in markdown sanitizer (#111258)
a34e751b017 Fix scrolling of markdown preview. Close #65504 (#111094)
64496f82196 Allow using 'default' to force fall back to VS Code's default opener
6cceb4eab08 Remove enabled setting and try to open simple browser to side of current editor
1e3a23b4e0a Fix simple browser button color for light themes
cc5e8b22faf Continue work on url opener api
a590d4fac36 Only show "Open in VSCode..." when isWeb.
67c889e3941 Merge and restructure menu (#114383)
56a6279a1c8 Don't use getActions in search view #92038
856277c8590 Github Login => Setting Sync
ad3974ad88a :lipstick:
e32e353bfde fix #114171.
255853d1714 Remove emptyWorkspaceSupport when conditions
11d18c2c094 `remoteName == codespaces` for codespaces section
9f3832dc688 Bust the node module cache
5029b4f362d Fixes #112552: Set server marks to `ITimerService`
9cb4f1e2ae4 update distro
43d111c0a48 Getting started content (#114305)
a4b13661009 Add performance marks to `IRemoteAgentEnvironmentDTO`
cbb94cfb607 Revert "fixes #114203"
8dfc81fedc1 Small tweaks
ff7aabe3fca fix #114215
c8a6ddba9d0 Enable forceConsistentCasingInFileNames flag (#114334)
6525b42f479 remove unused file
e12a9d74a62 #114144 fix remote explorer icon flickering
d03490f3532 fixes #114203
f34a3ace3f9 update distro
55960b7d61e add flowControl to terminalConfig
7ae54ca2d6f breakpoint widget: use same mode for coloring as the underlying editor
835a1ce6efd allow execution against a hidden notebook editor.
5d6cba5cbc2 Reworking external opener implementation to allow configured openers to be called directly without a canOpen check
5b1e59c636c explorer: hide open editors for new users
e1d8b926583 update distro
30f61c2449b part of #114214 serverSpawn=true
c4d5b055d37 Merge pull request #114269 from microsoft/alex/fuzzy-score-improvements
d4f993de63e Saving an untitled file closes it (fix #114272)
e44fb4ab927 update distro
526f826ac14 fix #114192
634ebecb8b7 Refactor code to use `await`
3e6535d882c shared process - implement message port connections and wire in
d6f27b92719 Polishing/fixing/addressing feedback for portsAttributes Includes: - fix in json schema - use object instead of array - change label of already forwarded ports when setting changed - fix for merging ranges
c972009ef68 Merge pull request #114214 from microsoft/tyriar/flow_control
cc8c9a2230d No need to store scores
a79276dc649 Move to log service
f8ec60aa06f Add flow control setting, remove fake latency
98038a8835d Merge pull request #114208 from gjsjohnmurray/fix-37570
065f0e46405 Auto forwarding fix
7a9bb5a44f9 breakpoints: inline action to edit condition. Render conditions for function breakpoints. Allow to edit conditions for function breakpoints
e9f6c35c17c Fixes #114146: Increase max BracketSelectionRangeProvider duration to 5s in unit tests
4e4d2484a74 Extract `TestTextResourcePropertiesService` to its own file
00f8540d793 Fixes #114332
f1cb1b27f3e format
40e3106e5fa fix list drag affordance
7899bfe3eee Merge pull request #113315 from qchateau/fix-semantic-highlight
db30147068f Add test for case to assert that fetch should be scheduled again when a text buffer change occurs while the provider runs and the provider returns null
44278132f4f fix peek view alignment
cd906568752 shared process - document electron IPC
96b44121f98 shared process - add error handler and graceful-fs
2964fcbb846 shared process - extract more cleanup helpers to contrib
f1c510b4a88 Merge branch 'master' into ben/shared-process-message-ports
c265dff48a2 chore: bump electron@11.2.0
a8dd7f60a62 update collapsible when children change
710846866f7 Activate extension on simpleBrowser.api.open
b7f9eddf043 Allow passing viewColumn to simpleBrowser.api.open
9b83eb6eb50 smarter depth selection
a1d5ea876c3 Polish, also fix #113930
2b5ae783bf6 testing: add full json reporter to show more complete output
d39eefd1b0d update distro
59891debcf0 Wait for outstanding zlib flushes when draining a WebSocketNodeSocket (#114314)
ea13176ee96 Enable image preview for avif images
7da421d99bd fixup! make it work for compressed trees, recurse
6c4a00ce747 Make default text editor replace existing editors for resource (#112848)
a59f30011c1 Add a 30min cap to CI jobs
e7aa009ac3c Remove enabledHosts setting
61ec57016c4 Fix spelling
47aa3ad09ab Continue work on opener service
d6936dd524c Add mechanism for snippets to overwrite Auto-closing pairs in some cases (#114235)
2ca7b5426a7 :lipstick:
fb6a9b4824b fix #114289. notebook.selectKernel takes kernel id.
2156b8cc758 check and ignore not found error
31a15b5b9a3 Add command to kill server and trigger handled error
23be24d8289 Allow theming getting started page progress bars closes #114303
2774f79df3f Do not show "Cannot reconnect. Please reload the window" if the cause is a handled RemoteAuthorityResolverError
56e05127690 move to browser namespace
e5e791003f4 Merge remote-tracking branch 'origin/master' into smarter-indexed-setchildren
2d892ae9c7f Fix arch check for PowerShell enumeration (#114292)
3ca55d031b1 Update Codicons: increase gap around plus icon (fixes #114016)
b903748b833 Fix candidate filter and auto forwarding wiring (#114290)
d66db5cc754 fix https://github.com/microsoft/vscode/issues/114220
c88a51e10a8 Merge branch 'master' into fix/debug-auto-decode-link
4450e1d827d Azure DevOps - publish Windows artifacts (#114285)
42d7d3a47d7 breakpoints view: render edit action inline for exception breakpoints
40d6f79875b MenuItemAction: make sure to respec item.icon
a198be16f93 shared process - some :lipstick:
67f8c0ca5a2 Merge branch 'master' into ben/shared-process-message-ports
daa7afebd06 remove undefined from outline data source
cf03ef33f45 allow to clear input of data trees, fyi @joaomoreno
0ecb7735496 shared process - more cleanup
dea0095e83e Add icon for public vs private ports
212a9434541 Merge remote-tracking branch 'origin/master' into alex/fuzzy-score-improvements
36a9cb8645e Improve `fuzzyScore`
475d3464e87 Have single outline config and let outline creator know for what they create outlines
9266fc49839 mock a label service to avoid breaking layers in tests
9af036b8274 Fix comments
b4e4bd16421 Allow tunnel providers to support making a tunnel public
9853c8fe6d7 Fix cr issues
a4f9e607619 fix https://github.com/microsoft/vscode/issues/114266
2376bed71e1 :lipstick: some region-comment polish
64f32932c68 debug console: fix error in console, do not bind to same htmlelement a scoped context key service
75ea87a2636 shared process - introduce platform/sharedprocess
dcce02644ea fix https://github.com/microsoft/vscode/issues/109658
5ce7b02b6e8 refresh the remote indicator when actions change
5db4708e99d shared process - avoid payload IPC roundtrip and enable console based logger
6fef673683f update distro
de4463874c4 callStack: do not use getActions()
152d0ec8f05 finalize CancellationError API, fixes https://github.com/microsoft/vscode/issues/93686
adb037b74d8 fixes #114137
e59dc77d0d2 shared process - more cleanup
3f37b664fcb adhere to DAP spec; fixes #114229
e776f87e140 fix --builtin
7285f791ee5 Use menu
1fae5211635 shared process - more cleanup
9bfa4c1d558 Merge branch 'joao/extract-extensions/themes'
9c6e10497b5 use in-mem fsp
7eb52e75e08 shared process - more renames
eba7707d382 shared process - clean up some types and imports
675e5da76b1 shared process - expose methods for message channel API
d0749f8c9a3 use in-mem fsp
936e77761b5 include error into startup error dialog (#112846)
68ba207260a List still dirty files when backup fails (#114064)
d4be66da200 Fixes #112487 - avoid using stale cache for render
d78fad382aa skip failing test on win32 (#114248)
fd0a3a12e7b Update wrapper class name for paramter hints
8f384b51a93 Fixes #114204 - always renders the input box
27b824b32c8 Adds ability to pass remote/refspec to pushTo cmds
d076ee1b943 Adds force push mode to push api
02380e70149 Removes repo hint from args
7f489f589d8 Hide warnings for settings groups that have dynamically registered settings Fix #113747
d7d5f20047c Fix #114218
145bcd3a732 Insert new code cell should always use available languages.
d536903a2b0 :lipstick:
d88b60ceca6 languages in notebook document metadata.
8a2b9e9047d trees: add diffIdentityProvider for efficient setChildren updates
b6435bc4240 Remove unused import
47a135e715e Rework opener api proposal
6184addcd1d fall back to homepath if home unset. closes #112775
b3d57e69b02 Update PHP grammar, fix #113185
92833fca559 fix #114233.
04efea43fa3 testing: peek diff test outputs
989f2eb812e setImmediate => setTimeout
02276814922 Add new external uri opener service
22c88cfaaeb Batch ack events coming from client
3232112f9ba Only resume if it's paused
60e46eb8756 Delay animating until content is prepared to prevent weird flying elements.
0738f76daca pull themes from the marketplace
0a19f7702a9 Rename ackId to charCount
bf52d50a0a3 Remove ackId from data events going to client
7aee462b8a3 Use char count instead of ack ids
7e5c01208dd Start of low-high watermark flow control
69a6e6ac937 #113757 show panel move and hide actions only for panel views
3a4dcf4890d Fix unit test for Win32 release (#114212)
a04802f5865 #113757 show panel move and hide actions on view context menu
f29502563bb #113757 allign reset location action
f1ee68fc468 add tests for RELATIVE_FILEPATH snippet variable
c6c7ddd4437 Merge branch 'master' into tyriar/flow_control
6430ee1efce Basic flow control for ext host processes
9d39f4e6cb7 don't auto insert semicolons
169269a3f07 fix tests
3767f97bc32 Adds onDidPublish to Git api
8832366467e Closes #110881 - adds possibly rebased warning
eba4da27278 #113757 show sidebar actions only on sidebar views
2e279d37e7e Property preview text wraps lines in debug console
554ae13fa9a Fix address for port open attribute Part of https://github.com/microsoft/vscode-remote-release/issues/4046
b7b36bb1908 remove some tests
9ecba1b468e Merge pull request #114039 from microsoft/isidorn/bulkFileEditsUseTextFileService
1e9b86da1f9 Finalize adding a cancellation token to resolveTreeItem Fixes #111614
161ce44ddae Azure DevOps - Move release into a separate stage (#114205)
d3e4bdb6177 Merge branch 'master' into joao/wsl
c644f3788d0 revert wsl and distro
3a1c42c150e textFileService make getEncodedReadable public
67f9988bdc4 Support to define additional attributes for ports Part of microsoft/vscode-remote-release#4046
53be807cb4d throw nice error (and prevent stackoverflow) when instantiating services recrusively
3653f34dbab Do not instantiate hover widgets in the `onModelDecorationsChanged` event
0a28ec7fb14 fix #37570 add RELATIVE_FILEPATH snippet variable
868271067e6 filter perf marks that don't start with 'code/'
675638196d2 debt - remove duplicate drive letter implementations
4816a253eaa Revert "use PerformanceObserver in node's perf-util"
05c4659e096 use PerformanceObserver in node's perf-util
e500f76d9cc remove test dependency on theme extensions
0324150670f Merge branch 'master' into isidorn/bulkFileEditsUseTextFileService
d88c1b4a64c Merge branch 'master' into isidorn/bulkFileEditsUseTextFileService
22bd999e86b debt - use provider extUri in file service
4b3ab7048fc :lipstick:
b90166177bf reuse stats collector for EchoRunner, fix missing titlePath-property, fixes https://github.com/microsoft/vscode/issues/114190
7a8c7f57312 activity bar - use IAction in more places
b5b160e015e activity bar - show a "Hide" entry for accounts and home indicator (fix #113757)
7ab5c2a90ae activity bar - consistently show right click menu everywhere (#113757)
f675564c5dc fix #114028
e17aea136d3 Fix #114189 - disable caching
b9aaba047c6 activity bar - remove "Hide" from left click menus (#113757)
2b0132d09f1 activity bar - update order of entries to reflect visual order (#113757)
b33b28dd078 Activate onStartupFinished (#110031)
d61eb64745c activity bar - change visibility of entries to checkboxes (#113757)
6dc779565e1 :up: distro
913fff96a3c testing: fix error when test view is hidden after showing
f5665378fd2 testing: start of diff peek view
09d99f7d71b resolve kernel providers and kernels.
732d4ff89e8 Make PowerShell 7 default if available and show in choose shell menu (#112768)
74038b7e0d8 do not use file scheme
c88ab9e0b63 use in-mem fsp - remote folder config tests
506ae4a53e7 use in-mem fsp - multi root workspace config tests
da3a21ee4e6 Merge pull request #112602 from microsoft/rebornix/output-view-model
041a5c3b6b9 fix tests - do not use file scheme
f92251d8e61 use in-mem fsp - workspace folder config tests
1e44ae5da86 Merge branch 'master' into rebornix/output-view-model
03450bf0941 Update Codicons: Update '+' modifier location (fixes #114016)
84f2cf6449a use in-mem fsp - workspace init tests
722a6664f84 use in-mem fsp - workspace editing tests
a2efefd3713 use in-mem fsp - workspace tests
e3b18fa3efb testing: add filter box
676bb6b100e Merge pull request #114127 from shskwmt/fix/113603
990906a1655 Adopt strict assertions
00a781f926e debug: use mnemonicTitle and avoid dupliacte registration
c38c1f497f2 use in-mem fsp - workspace folder tests
42221c900ba Set override to false when reopening editors after dragging them to a different editor group. This fixes #109000. (#114093)
31e33c478e5 Fixes #114042: Use Buffer only when it is available
cef7004a46a activate search result extension onLanguage:search-result #110031
39619a136b6 minor polish
e8fb4fd30da bulkFileEdits: use textFileService only for creating empty files
c85297669ee Move id, label, and options to authentication provider registration
e9ae0082963 use in-mem fsp in tests
3f3e35bf17e Add boundary for right arrow typeahead and fix bug with resetting Terminal (#113863)
61c6334a3f8 Fixes #112373: The hover should always consume mouse wheel events
3d500ebd8b4 Adopt proposed `CancellationError` (#93686)
5c1543b556c File name in editor tab reverts casing on save (fix #114096)
76c22d48c82 Merge branch 'master' into fix-semantic-highlight
e149bdb42ac Merge pull request #113837 from HaoboGu/HaoboGu/issue113404
1551d1f1ff0 Fixes microsoft/vscode-remote-release#1485: Make sure to only render Reload Window prompt once
c9bae24fb70 More UX feedback
7cf2ad082f9 Render remote name when reconnecting
cba1d1b1848 Prefix all `performance.mark` calls with `code/`
64947067ab7 :lipstick: unit tests
533d094020f Allow logging FS access with stacks
8ec95fa3b7a tests - improve ext path tests
55bd92dd538 tests - extpath tasks are flaky
ea7b8ddda3e Can't open, rename or delete files that contains ":" on linux (fix microsoft/vscode-remote-release#4227)
e3f5b3dfe47 Merge branch 'master' into HaoboGu/issue113404
bd5c20448c5 Merge pull request #114129 from microsoft/alex/configuration-editing-tests-improvements
c173fb7d72a #114144 revert showing cached theme icons
088304c9968 #114144 - Do not cache only uri icon
efb833ab7c7 Merge branch 'master' into HaoboGu/issue113404
5755d943ca6 Tests must be compiled even when `yarn` is executed
acb0a35629d cache icon paths in web
73b4dabb2d4 Make lint happy
d1cfec44472 :lipstick:
8b288893a92 Merge pull request #114101 from shskwmt/fix/113807_parse_args
d541d7c64c6 make SubmenuAction strict: don't allow changing its properties, make it not disposable
ea756907598 - Make cached configurations not disposables - use workspace configuration disposables
31a53bb2427 :lipstick:
43310230886 Merge branch 'master' into signaure_arguments_label
175e2c0b1d1 `yarn` is already installed (fixes #114140)
b57739f4a24 tests - more use of getRandomTestPath
64a14963f7b Expose actions to duplicate editor groups (fix #114132)
60bc00ff63d webpack config typing fix
f6bbc8b68d4 update tsec tool
cfb2ad879a3 Update src/vs/workbench/services/configuration/browser/configuration.ts
e25cbb45e7a Dispose all Disposables from tests (fixes #114125)
2fd00ba9fef Add a way to troubleshoot fs calls
57c405c24c3 Change reason for moveWordCommand to CursorChangeReason.Explicit
7c3aacb40aa Add a mechanism to track disposables from unit tests
11ac71b2722 editors - cache previously used layout and return it
03cb2d2a236 Dispose `PieceTreeTextBuffer` instances
e114a24d9f9 Improve usage of Disposable
e71f31abe9c editors - copied group is missing to register editor listeners
313f4bfecdc fix #113620
db701d281f7 Fixed not to skip determination of option type starting with "_"
3ceb3a100ed tabs - improve logic of previously used dimensions and relayout
6bd7b70515d Revert "Enable webview tests (#114059)"
0a3a9ce7bb9 State of tabs is not fully updated when toggling workbench.editor.wrapTabs (fix #113808)
b0e96922417 tests - selectively enable some previously skipped tests
ea1b3f27db4 Fixes window border causes webviews to be positioned slightly off (#114061)
01c6003c295 Enable webview tests (#114059)
a12a996d780 Retry idb tests. Ref #114025.
7a7d11fcc6d Merge branch 'testing-group-by-result'
5f2036033c0 testing: improve projection logic, add state grouping
e3509b62fe6 Add search.mode option to control default search experience (#114015)
d110d503425 Remove webviewHasOwnEditFunctions context
50dd2dd3f9e Add context for when the webview  supports find
d8a3dd44be1 Removed unused param
0fafaab62e2 mnemonicTitle in native menubarControl
d95e22d0a8d make menubarControl prefer mnemonicTitle, make MenuItemAction only implement IAction
8d8ee957418 options for getActions() are optional
c88c207e6c0 fixes #114028
6828ae1ab50 Removes trim & fixes regex
c45eac1a819 tests - use explicit skip over handling within test
8d46328a407 more :lipstick:
832afd1276d :lipstick:
15cd2a1abd2 #115025 hash the uri and create css rule
aa5064d4fd4 Lift some tests to browser (#114041)
d6a63fc79ea FS improvements for unit tests (#114026)
a2251a3b6b9 do not use mnemonicTitle for all action titles, #102361
3898af5db3d typos
10592747998 refs #102361 mnemonic as command model property
8ae693bee2c bulk file edits: make sure to use textFileService when creating files
bebd0664073 Fix gulp task provider so that it doesn't always try to run
29e0cfd8beb Always elevate (if needed) for openTunnel API
e7c84aab5b1 Fix privileged port elevation flow from UI
61187660af3 Fix #114031
114e38f175e suggest - add min height when persisting widget height
2042a0e4c23 Add new terminal link text for tunnels (#114033)
174259eec8f Log when lsof fails and return initial
fe175afdb80 list widget should not remove rows from DOM when reusing
91a0d07f3e7 Improve `canTunnel` Part of microsoft/vscode-internalbacklog#1709
288e8c233a8 Fix #110525
5ed73f6e850 don't theme icon for MD elements
6d2e0aa21d3 rename tsc config file for better intellisense
ec4c9f4c8f7 Merge pull request #112833 from homebysix/list-extensions
7b16f15d005 Merge branch 'master' into list-extensions
a5a0c1527d1 add tsec config and exemption file (defunct?)
ca6a7a69989 :lipstick:
5adcd2521e9 Fix #113257
ed6c343edb7 gracefull fallback for TrustedFunction
44c9b4bb7f3 use TrustedFunction workaround when loading extension sources inside web worker
eb940d4ed6d Fix #113988
adc68dc3561 Add `canTunnel` to tunnel service Part of microsoft/vscode-internalbacklog#1709
128987f575e remove duplicate step
4c42e6c111b Fix #114013
35766c616cb #113757 show sidebar actions also on view title context menu
e4dc7b4d796 Clarify OpenDialogOptions note (#113831) (#113998)
eb409622888 tests (unit, electron) - set forbidOnly when running on build machine
691da329d66 Revert "refs: mnemonic as command model property #102361"
96e2981c91c skip failing test (#113882)
82dc292811a Merge branch 'master' into HaoboGu/issue113404
0949d5b794f Remove unused var
acda4aed821 Make the external opener a two phase process
aa73c2d435d Fix random focus lost issues on CTRL+1/2 for a webview (#111676)
045b0fc4c09 Fixes #110509 - handles markdown escaping & spaces
31d5e48d92a Fixes #114002: Finish writing any outstanding messages before disposing
d36b3616e70 Change Emmet to onStartupFinished #110031
b041f460ce6 Show a disconnection dialog only after 40-50 seconds
455b029ad1a Render "Reconnecting..." in status bar and use "Disconnected" only for permanent disconnection
5d9e867aa4f refs: mnemonic as command model property #102361
3dc0203e021 testing: auto reveal selected tests
e2c305f3a3b Allow registering additional external uri openers
bdf57b45ced Remove button background in simple browser
aa85ab9d03e Make sure we also log event when creating a iframe based webview
d964664da29 Disable dynamic cwd resolution on Big Sur
d68056d9072 Improvements to batched testing. Ref #113911, #109271
8c3f5dd3fad Support to start multiple debug sessions from a single launch config
80f369b7bee reduce number of entires in test batch. ref #113911
2b20162d227 Avoid hostname resolution in lsof
70e37bec1be Fix #113920: Codicon => ThemeIcon
16452c54f38 Merge pull request #113938 from microsoft/alex/terminal-exthost-improvements
98cc02c097d change default zenMode.restore to true
bbb0aadc87d enable trusted types by keep a yelling default policy for a day to two, https://github.com/microsoft/vscode/issues/103699
23ac286dccc #113975 use insance to remove svgs tags
e803459d4ad fixes #113921
8ad08b04f5e Do not compile `/test/` and `/build/` scripts during postinstall, the scripts get compiled explicitly during CI
fa701a373b7 update references viewlet
aa48a4eff7b `monaco-compile-check` is covered by the GitHub CI
b1877cd33e2 Merge pull request #112033 from solomatov/error-handling-in-terminal-start
a7cf03de2db Add elevation message to ports UI (#113990)
efd298ccbdb Fix #113760
a78fffbdb01 remove unused eslint mocha
72572c59cfb bust the node modules cache
578c3d5374e fix #113781
d4c32800737 tabs - polish how to detect that scrollbar needs update
683a30f74c4 Revert "better fix for https://github.com/microsoft/vscode/issues/113852"
7222c005ca9 update loader, event better fix for https://github.com/microsoft/vscode/issues/113852
c1930b6baf6 make default policy strict, https://github.com/microsoft/vscode/issues/113975
cdb373186cd refince CSP for trusted types but don't yet enable it, https://github.com/microsoft/vscode/issues/103699
a9dc6d28fde use default tt policy to workaround electron webview innerHTML-usage, https://github.com/microsoft/vscode/issues/113975
d5fc23ce6ce Wrapping tabs: editor toolbar bleeds into tab when space is limited (fix #113926)
14bb2fdc128 Tunnels from a tunnel factory can have async dispose
a84603f49ff fix condition
f2dd0954925 add (disabled but almost ready) CSP for trusted types, https://github.com/microsoft/vscode/issues/103699
4aff4b99239 trusted types - loader should use trusted script url when using script tags, https://github.com/microsoft/vscode/issues/103699
de9e9c414ef fix path in tsec-compile-check
df10825f69e fix yaml
5e673678ebd Merge branch 'joao/build/single-compile-job'
575f87306f9 Merge branch 'joao/build/esbuild'
fb4a88e4037 rename
ab3297dd136 only run terrapin on cache miss
11b79ba7ebb parameters
d495358b01d add parameter display names
d944b91cd1b remove no-exclusive-tests
39810d812ef Sandbox: adopt forcefullyCrashRenderer when reloading unhealthy renderer (fix #112485)
2b7435c389c window - focus() window that opens from protocolHandler
af5adb530a3 Revert "add arch to cached data path, https://github.com/microsoft/vscode/issues/113852"
d687818f8e1 better fix for https://github.com/microsoft/vscode/issues/113852
2d114755e83 update distro
4149b09417d parallelize eslint and hygiene in product-compile
a4f9970924b Merge pull request #113826 from nrayburn-tech/issue-109438
74bc1d2672e re-enable test for https://github.com/microsoft/vscode/issues/111867
c6ceb1ab2ea isolate eslint from hygiene
519f8691bad fix typo
935cbe6aff3 update test cases
3759568789d support more unicode chars in isSeparatorAtPos
685999bcf35 Merge branch 'master' into HaoboGu/issue113404
e269e5e2c6c revert back using switch for isSeparatorAtPos, add several cases
f3b2680ee3a Merge branch 'master' into alex/terminal-exthost-improvements
01089c0a505 testing: fix unit tests
e2c91378410 testing: fix unit tests
59091157571 testing: code lens and diagnostic information for tests
3d8888779d9 Fixes #112446: Avoid timeouts in mirroring terminals to the extension host by assigning a temporary UUID to terminals created on the extension host side
f1151f84ff7 Adds userAgent to clone, pull, fetch - #111909 Changes to use env
6802a656e26 Use cast instead of generic
271d9b8c007 better hygiene task definition
809d2f63d0e Added show options to simple browser open command
2fed7ba374d Adding settings to control which schemes simple browser is enabled for
ba67d1bea44 Add more explicit type for TS 4.2
af6d164f73e single compile job
cb67fffb94b improve hygiene glob patterns
27e26536f12 :lipstick:
e4fe157544f equal => strictEqual
f489602633a Merge pull request #113919 from microsoft/isidorn/workingCopyFileService
4aca944132c make sure to not fire any events for empty opertaions array
4f109404604 minor polish
de8b6772761 Skip batching test due to failing on build machines. Ref #113911.
ac10e57f6cf fix: The git commit message field is cropped with negative zoom (#112316)
a7267aa0935 Update distro
e8edff5eb7e xterm@4.10.0-beta.39
3259985c7af rename random_uuid to just uuid
1ace7e34995 remove console.error on commands for noisy tests
6763d82fdd1 also filter before debouncing when menus change
6c12d89415b :lipstick:
9293f64e937 :perf: first filter and only then debounce event handling
43aebefbf62 use Date.now() in stop watch
c8d91038302 :lipstick:
39dbcfcfbce Set remote.restoreForwardedPorts default to true
c6cc7d61401 workginCopyFileService: only one event for multiple operations
4d4b9225d2c Fixes #113917: Add square brackets around ipv6 addresses
83b4d6c8ce0 :lipstick:
7a27b248841 fixes #113815
8389f072696 Azure Pipeline - Adopt pipeline parameters in favour of pipeline variables (#113902)
bb4cbce9699 Revert "publish linux builds"
c49ef6df61d [html] update auto-rename-tag to linkedEditing migration
4fe3f75c6d3 Use `nodeSocketFactory` for tunnels for now (#113914)
1228854b4ae Adds support for gulpfiles using ESM. (#113505)
169a0ec047f sandbox - allow to enable vscode-file protocol via argv or environment (#98682)
b1659198f62 fix incomplete stub, fixes tests
448d0497e68 Revisit how activity bar items and status bar items can be hidden by the user (fix #113757)
ca2e7d8527f publish linux builds
0cb7dad36f0 adopt creation of N resources at once, https://github.com/microsoft/vscode/issues/111867
b99e9bc2990 apply file edits in bulks of equal edits, https://github.com/microsoft/vscode/issues/111867
841f6c9938e align source-map dependencies
c8ef4ecd835 remove deprecated settings sync settings
27ff5760893 :up: playwright
f054767eb4e remove unnecessary line
22b9a2b1e8b update esbuild
f8a07fa6a9d Revert "build on mac11.1: upgrade version of playwright to 1.7.1 (#113906)"
63a0638d4cf build on mac11.1: upgrade version of playwright to 1.7.1 (#113906)
983bd69effc Update problemMatcher.ts (#113834)
0402f76ace4 Workbench has white background, then flashes black, then flashes white again. Fixes #112816
c6a1eda3315 themes: add ThemeSettingTarget
d51e1fa4718 workingCopyFileService: create and createFolder support multiple resources
e153ed6b3fc :lipstick:
16da2c5f0e5 change create, delete, copy, and rename operations so that they can handle multiple files at once, https://github.com/microsoft/vscode/issues/111867
fa593d83ad1 use vscode-tsec instead of tsec
007eb56ca84 yarn.lock leftover
6503475091f chore: bump chokidar@3.5.0 (#113886)
72095f86036 add arch to cached data path, https://github.com/microsoft/vscode/issues/113852
5ed76e3da7b Merge pull request #113842 from nrayburn-tech/issue-113809
296ba5464ba Remove obsolete chrome debugger recommendation
aaa8fa92c67 empty
f1a0aa9378d Fixes #113866 - removes transform optimization
9b6aaf1e86c Fixes #112481 - missing refs (because of trim)
4167837cb85 Show hover for comments, fixes #108396
dc5a3da3abd Upgrade to latest Emmet (#113848)
6f56b47c696 fix typeahead regex for move (#113850)
98f1ed6c758 Fix rewriteWorkspaceFileForNewLocation test. Fixes #113762
20950d65268 testing: update old import
cfc8c5d3d77 extension webpack: do not copy .ts files as resources
ed3989b069d Add some recovery from a missing compositionend event (#112621)
2c5c0a3be14 testing: fix loading indicators, add progress during initial test discovery
2112a99fd9d testing: migrate from actions to menu contributions
52bdc14cc6d Copy of translated errors for js/ts web build
d29388d2554 Reenable test, fix #113768
485c5fc0093 Revert "extension webpack: do not copy .ts files as resources"
3aa41899aaf Unable to change to another theme if the theme file does not exist. Fixes #113661
66482b368eb Sequencer.queue: support failing tasks (for #113661)
63deed1c6e0 :lipstick:
41d01ec14e9 don't leak emitters of context key services
87d2b3d07cb add support for event profiling
45f79f85735 Scope gitignore out* pattern microsoft/vscode#113823
9be7f7fb655 file name incrementing for files without extensions
ced3bb4bb9e Secrets API feedback
037708a33f6 Avoid textual codicon references in gettingStarted Fixes #112657
c8fbf3aca54 Fix #112735
0319fedae10 add lint rule for missing cancellation token in resolve and provide methods, fyi @alexr00 please remove surpression comment
eed13efcc36 fixes #111413
d0f68b3ec9a IndexedDbFSP Perf/Correctness Improvements & Tests (#109271)
76dd27c3be1 fix https://github.com/microsoft/vscode/issues/113829
064fc7a5267 api comments, fyi @RMacfarlane
265bd0b5b9a Open Editor Sorting: fix issue when untitled editor changes name and list does not resort
c1274981145 Fix #101738
3f435ff6c1f fix #113404
ab1aeb6b73d extension webpack: do not copy .ts files as resources
0a3e23a5b2f new html settings not it in the settings UI
c41302c5ab1 Relax worker.onerror after a successful worker start
6c95b041ea6 test: add tests for #113403
c907b8fff85 no vscode-imports
b99faeeb3ce fix minification target
51ea16966b6 :lipstick: remove appendChildren infavor of append, fyi @bpasero
c46eca1dd34 Merge pull request #113518 from nrayburn-tech/update-dom
37b0d344c7b add a RANDOM_UUID snippet variable
2d1b63d6a3e Fix showing views submenu when view is merged with view container and view has secondary actions.
48dbb328998 fix https://github.com/microsoft/vscode/issues/113819
e8ad195f3e0 Revert "revert pool"
13e313c2b58 fix compile and hygiene cache miss
f06ebe74253 :lipstick:
f90c518b03c debug: remove enableBreakpointsFor since php-debug now moved to new api
e008e41d27b fixes #113242
0652b9cbec2 debug toolbar docked actions only appear in debug viewlet
750948b7b5c fix hygiene as well
dd9e52a40d9 libs
a96a29b7535 pkg-config
035e15b7712 revert pool
cefe06d375f build-essential
09e281c091a Fix #113732
7449d86b89c use esbuild for minification
ded513b20b2 Make cancellation token in resolveTreeItem required Part of #111614
7814ffc41ec Fix #112663
699d736d785 distro
82b99b3286f skip flaky test (#113620)
a9ed4e9b0a4 Fix quick input button height Fixes #113745
c4aeb68a68a debt - introduce and adopt flakySuite
174bfe9b528 simplify gitignore
008f8dcdeea missing compilation
503a2458dc4 Merge branch 'joao/build/agentpool'
b5ccd30c95d css - less generic rules to prevent leaks
f64cf2922f9 Fix remote explorer views getting changed across windows (#113237)
c4ea0b55906 fix some spelling mistakes
6659f8dfe58 use compile agent pool
fe795313d8e Revert "parallelize hygiene"
bdbd644c27d parallelize hygiene
a1760b1a6c2 Merge branch 'master' into update-dom
998e5e2ea67 onDidChangePassword -> onDidChange in secrets API
1bb2ae0e365 Allow ResourceCommandResolver.getRightResource() to return undefined (#113364)
7db413d4c10 Move secrets API to extension context
a48ef56fbf7 Fix compile for current TS version
3ed300eb9db Add simple browser extension (#109276)
69dfa670ef1 Fix compile error if using older ts version
4d8895c7b72 Just kidding, keep proposed onDidChangeAuthenticationProviders API for now
942c3bad6b8 Sort contribitions
b565c422aa3 Add find all references command for JS/TS
0f9ee988467 Remove deprecated parts of proposed auth provider API
13317a96944 Merge pull request #113618 from shskwmt/113318-diff-empty-files
87c2cf1b590 Merge the Monaco Editor job into the hygiene and layering check job
604e2466d90 Merge branch 'master' into 113318-diff-empty-files
48742bd3a10 Update ts grammar pinning tests
3bdf2825d07 parallelize
79fd01a78b4 use yarn task again
74623bc93c5 Update JS/TS grammars
2b040e87633 Unskip tests Fix #113761
714f85fc189 update build pool
fee7cdacf72 add provider naming rule
4649e1205f0 fixes #113725
726acc51308 use vscode build agent pool
9d5f04fa0bd #100700 remove the skipped test
e4bb3ff7295 fix #113217
414a4c0f511 list added view descriptors in ascending order in the event
8a0058b9e3b Merge pull request #113549 from nrayburn-tech/issue-107028
fc4b40b6338 fix type casts
f4ab083c28e update todos
ca370bdb0ae update my work query
f93a2b62ef0 fix cr issues
00181ad8951 Fixes microsoft/monaco-editor#2292: `model.dispose()` should work just as well as `modelService.destroyModel()`
f02af16530c Remove sync property
d883d379d11 Merge pull request #113303 from microsoft/joh/toc
ceb8da0be04 tabs - disable badge decorations for compact sticky tabs that have fixed width
4f34edadd65 Merge branch 'master' into joh/toc
b62ec5c0eeb move shared config key into workbench layer
dce7b0cd63b simplify outline model again
ea51fb1bddf fix tests
b948e42373c :up: distro
64eb716d57e env - fully qualify our own variables
c03bc427cf7 some :lipstick: and refactorings
1e5b337c02b move document symbols command to right contrib
fd23a8e3280 Have condition of test publishing match the condition for test execution
8986870317a Merge branch 'master' into joh/toc
9b66dc4ad2c debug console: to string of simple values should duplicate value for each count
baf15f1041a Allow tabs to wrap to multi-line (#106448)
8ed509056a9 Merge pull request #113710 from mitsuhiko/patch-1
0490bb1e9ae Merge pull request #113716 from noritada/doc-fix
5bf42c9acd8 Merge branch 'master' into joh/toc
b6c601b4fc8 Remove duplicate 'the's
8fc5e370f65 Fix a typo in a log message in extHostCommands.ts
98106c48a07 No need to create fake workspace folder for query builder Fix #111348
3283ade7649 Don't use 'expandPatterns' for workspaceContains search Fix #110510
da4784eaa84 Don't miss creating a new default terminal when reconnection is disabled Fix #113564
4e7e21233e3 Have `computeSync` return an array of results
5edb6102629 Extract all MarkdownHover computation to MarkdownHoverParticipant
408539d8fa5 More cleanup
18982d441bb Fix compilation error
d3b643c8a48 :lipstick:
923f34a80d1 Extract `MarkdownHoverParticipant` from the editor hover
2f817caf6e7 Move more marker specific logic to markerHoverParticipant
28795976207 Extract `MarkerHoverParticipant` to its own file
765947c205a Extract marker related hover logic to `MarkerHoverParticipant`
7e7775705ee Fixes #113318: Show having no change  when diffing two empty files
72420829833 Fixes #112834: Ensure the markdown link provider is registered before invoking `vscode.executeLinkProvider`
262a7157ab5 revert webview preload changes.
56c808a66a9 Emmet flatten DocumentStreamReader (#113602)
b84858babef Emmet remove dependency on vscode-html-languageservice (#113599)
94facfcf06a Merge `ModesContentHoverWidget` and `ContentHoverWidget`
3564f180616 Fixes #40926: Inherit visibility from the previous line
95cfa9ede4e Fixes microsoft/monaco-editor#2276: Check pixel ratio after each render
19b5e736fa7 :lipstick:
689fbbd9607 Increase timeouts
5cc0aa28496 Add support for including line feeds at the end of lines (microsoft/monaco-editor#2265)
4a121608e8c Add test for microsoft/monaco-editor#1235
92d4b14e293 Update rust grammar
afb6a0c56ef Fix CSP
15561c41399 Emmet polish
15ba9aee0e9 Emmet improve Expand Abbreviation perf (#113558)
b5cd082cd47 Emmet refactor toggle comment (#113557)
f1ea605a695 Use blob urls instead of data: to maintain current origin
e6daf340852 Better simulate real-life CORS in code-web server
58852eaa854 Add a timeout to the editor tests step
5ea96ec9cd7 Fix `_colorMapOverride` usage before initialization
67bff68034c Add `monaco.editor.setColorMap`
433833fbe02 Emmet refactor reflect CSS and update image commands (#113550)
a6bb30b41f7 lazier loading of windowsProcessTree
c1bf6e0307b no need to update api
05be32f0551 turn on renderer view
7c11754ad4f avoid duplicated text model.
6a7f07f8b61 update height without scrolling the view
ebb316a2881 Fix incorrect icon hiding for files in tree view
5dbfe32be31 Allow tree item command to be resolved later Part of #110498
3a70241a0bf Merge pull request #113536 from microsoft/alex/build-compile-no-container
3e945d092c2 Trigger build
321b407de55 No need to use containers for compilation and hygiene jobs
5b75a42575f Cancellation proposal for resolveTreeItem
d746f2d2772 Fixes microsoft/monaco-editor#2220
0dc7faff87e Fixes microsoft/monaco-editor#2222
cbea242dcbb Fixes microsoft/monaco-editor#2236: Avoid using `wrapper` as a css class name
7c937a7a383 Fixes microsoft/monaco-editor#2237: Add API to register commands
0439aef7b3c update dom to use newer methods
c44b7d25d91 Refactor Emmet merge lines and select item commands (#113516)
c7dbab59ff4 Emmet create new html-matcher override instead of using LS (#113508)
a1ea4df9596 Empty output view style update and layout change
4b6280aa8ce Skip webkit
9945754a620 Add editor smoke test (ported from `monaco-editor`)
4df5d59e021 force update metadata diff editor for the first time.
cd836bb54f6 Fix process explorer styling issues, fixes #113399
3c518e43d39 Update distro
f19eb28477e Avoid installing typescript
2ca3e67f32d Rearrange CI jobs
802a36b0970 Add typings validation
4df5991023a Adopt latest setup-node action
cead2666633 Align all yarn caching steps
2a8140c5e8a Let debug wait for tasks to get input Fixes #108443
ffef9abe924 Hide auto forwarded port notification
82fe1e7d0df Avoid touching passed in options object (fixes microsoft/monaco-editor#2210) and avoid deep cloning overflowWidgetsDomNode (fixes microsoft/monaco-editor#2184)
da8549b7323 Merge pull request #113376 from microsoft/alex/use-builtin-cache-action
4804bbcdff7 Tunnel factory can return undefined (#113232)
1c0efed5a67 Test cached node modules
9c9e1075826 Fix semantic highlight scheduling
413b5d47057 Avoid ts changes
b4789ecf849 Fix typo
2b380bf8c34 Support whitespace options
d20f8ed37d4 Add style controls
4b3d54ceb32 Avoid changes
7222b357f75 Fix cr issues
d26dbae6cdd Adjust request schedule
0c697b2e334 Merge branch 'master' into alex/use-builtin-cache-action
ddb88dac9b8 Avoid touching continuous-build-*
4248e3f7e82 Add Download Playwright step
2697a42ee71 add range WIP
2db89c75e6f rename to inline hints
1954e938504 Adjust hint label styles
df24d0153d8 Trigger a build to test caching
1b713df9b61 One more try
941b3513c91 fix view state being stored after picking an element
ff5245ea45a Enable playwright debugging
0d671ccb2a7 remove unused context keys
a747b66c1ec naming: Outline -> DocumentSymbol when it's a symbol, some cleanup
86dd04ecfc4 fix some outline settings so that they are also language overridable
fcba2ef5891 simplify filter updates
61965e6bc50 Use fast 7z compression level
674877fc173 properly implement `revealFocusedFromTreeAside` command
5162c8e8563 Add "Loading..." to custom tree hover Fixes #111615
4468307af3a Fix themeIcon + resource in tree view Fixes #113374
ed87c35de9a Show more port cmdline when wide And add pid. Fixes #112796, microsoft/vscode-remote-release#4120
0b1892f877e Start candidate finding later (#113377)
5b9ea8d3780 fix/workaround rendering issues with codicons and quick pick
02b72216d7c Merge branch 'master' into joh/toc
ce02917f666 change cell uri fragment format so that opener service doesn't interpret it as line number, also throw error when trying to resolve a cell as notebook, https://github.com/microsoft/vscode/issues/113307
7b6bca0bf59 modes hover must not bread fragments, https://github.com/microsoft/vscode/issues/113307,  fyi @sandy081
bbaff3d568b Adopt `Cache@2` for node modules caching
97ae453378e honour outline problems settings in notebook outline
88bafd443d1 Merge branch 'master' into joh/toc
d24ab0a201a Improve comments and code style
ff8ae0b93ff Avoid changes
bf4e2371d4e Avoid generated file
a6fd2cc1088 Use utils type converter
caaf2a07a94 Merge pull request #113341 from microsoft/alex/node-modules-cache-key
8b7c6622339 also use outline view state for qiuck pick
4140affee2c breadcrumbs picker must restore view state when being dismissed
7cc87833199 trim MD headings syntax from outline element
adc8c296ee8 move more things into outlinePane-land
1b8be429cda properly cleanup notebook outline marker
b884f75fa6f fix stale breadcrumbs issue
cb020e68a04 tweak (reused) rendering for breadcrumbs
4fa97186146 fix and tweak sorting
9c861dc5fd5 update outline as soon as it becomes visible
871f167341c add IOutlineComparator as concept, remove `outline.symbolSortOrder`
68257573641 More tweaks
382a8740a91 Fix that `VSCODE_ARCH` is not taken into account on Windows
40fb699b6f4 style tweaks
63acd85f702 render markers with outline elements
7728010c73b Invoke `mkdir` with `-Force`
05a5209b4c5 Fix candidate port finding (more async, better timing) (#113342)
f23ed65688e Compute node modules cache key in JS to avoid globbing
a5360f21b81 Merge branch 'master' into joh/toc
fe70487f14b :lipstick:
d75115ee9c7 breadcrumbs - make sure to dispose current outline when editor changes
f39f31d2ca3 protect breadcrumbs widget from rendering bugs
c459ca37441 Merge pull request #113332 from microsoft/alex/modules-list
3de96fd2372 Simplify code
b7a5fcdc6d5 show a default entry when a cell is empty
ea633831d49 workaround https://github.com/microsoft/vscode/issues/113333
07b28e284ba Bust the node modules cache
76c974bfebd Have a clear list of directories where yarn should be executed
1d7fb0e757b notebooks quick pick should contain all elements
698ed864114 fix issues when user state changes
25709313284 make notebooks outline a tree (using folding logic), also fix notebook outline icons
9f5cfc246bf Add dummy support
434f63192e8 Revert "Avoid generated files"
96b889a113b pre calcuate output height.
ec3f4088e71 restore view state
df64bfe7f7c avoid view state npe
f98fabae6ce Merge pull request #113279 from microsoft/alex/remote-websocket
9a7e8372ea6 update distro
102e69c975b Merge pull request #113311 from microsoft/alex/gulp-lazy-load
da802ca8909 style polish
98e05820b89 update distro
1ee7a0e015f Merge remote-tracking branch 'origin/master' into alex/gulp-lazy-load
1630db29bf8 indexOf
baac11d5f58 Merge pull request #113296 from microsoft/alex/gulp-no-respawn
c1eb24b027f Load expensive node modules lazily
11e600ce2c1 remove console.log
d14c8de672f event dispatcher for cell layout.
4afc1ee4406 retore awol feature and fix tests with that
52c1cce2597 Add controller
6fa83ab26d9 move deprecated style into IconLabel, move/rename outlineTree to outline
54da36d181b proper disposing of outline objects
d7644dc25ad replace IOutline#resource with #outlineKind
a54c02aedd4 add setting: outline.symbolSortOrder
515550212b4 move sort order
088b21038e8 properly layout tree
661c741c302 make sure outline is all expanded
277a8262e0e Avoid gulp having to respawn
310a9ff90fa Merge branch 'master' into joh/toc
22c5527f96c fix compilo
9699993f161 use outline service in outline pane
cfccae30dbf Fix layer breaker
fd8b68457b5 Exit immediately when a cycle is found and running on the build
9c2a1dc473c Don't restore ports that are already detected Part of microsoft/vscode-remote-release#4112
741a568bfd5 Avoid generated files
8476ff1a9de WIP
d2ee88ba3fd add config per UX (breadcrumb, tree, quick pick)
1922771f2e8 move delay "after big change" heuristic to new outline model
1478078ee30 Update task services doc link (fixes #112591) (#113170)
445f259e34c Add sorting to npm scripts (#112725)
297567be0c1 move document symbols breadcrumbs logic into its own data source
f2fd0ec094e Use the browser's WebSocket for remote connections
17573d22216 move outline view state into its own file
ca08df3de54 fix compilo
1844c541870 testing: forgotten push to enable debugging
84903a3f400 revert outputs should trigger output rerender.
64c38324e65 no outputs to render
ede4de744d9 vertical alignment
23658cc8753 empty cell outputs placeholder
597ec5f0573 padding polish for mimetype switcher
d345d1bd827 mime type switcher
8b23b938a38 split point takes renderOverviewRuler into account
cb5f9b5294d Merge remote-tracking branch 'origin/master' into rebornix/output-view-model
6f11d34f677 resolveNotebook API command takes no argument
9ac5131833c Have the `TunnelService` use `IRemoteAgentService.socketFactory`
11f838c144c fix #112747.
af92a731fa0 Fix #113250
0e2a0f9013c Prompt when there is an AMD module cycle
d63aa232d93 update distro
e8bb7a938ee fix #113243.
f0376ac1312 Add `permessage-deflate` support
609d547db1f also show cell-file icons in quick pick
7593c56fdd8 use file icon (if applicable) for cells, otherwise use default icons
5ebbd9a77cf re-use css classes for better icon support
19cf2d424e0 render highlights in breadcrumbs picker
68da4f16d67 remove onDidChangeActive-event
358f3909620 simplify model, add keyboard nav support for notebooks
822a45f6072 add outline target and adjust sorting, filtering for document symbols outline accordingly
cece1a4fcf4 use identity provider, some cleanup
88c271c3f71 remove ITableOfContentsProvider, remove duplicated code, add quick picks to IOutline
4d47c40dde4 delete old tocProvider
7cc71d65361 Fix broken remote explorer drop down Partial fix for https://github.com/microsoft/vscode/issues/112750
513055e2e0d show a root element where there is outline-breadcrumbs but none are currently selected
ebb69237016 reveal vs expand folder vs select folder...
c51830e8efa better revealing and previewing
48c2ad6493b Temporary workaround for #112843
add8753c74c Only terminate after 3 EPERM errors
dee0c84e7f0 update distro
a512c86f10e Revert "fixes #112750"
57e3aba4e16 Have `/build/` compilation and `createAsset.js` be runnable independent of the root `package.json`
baadb591bd0 update nb breadcrumbs as you type
c6f70a3a019 :lipstick:
c2f1a367ef0 Adjust node module path
29f556a724c styles for notebook outline elements
ec6087fe180 Merge pull request #112837 from microsoft/alex/node-modules-build2
a8d9a5eedc7 Merge remote-tracking branch 'origin/master' into alex/node-modules-build2
5c1ff8158b7 Avoid lookbehind (not supported in Safari)
b71972bbb00 Support open in background for 'open with'
f0c758bdcc9 Support open to side from the 'open editor with' quick pick
64888cafe07 Merge remote-tracking branch 'origin/master' into alex/node-modules-build2
09ca712fe7f Fix compilation errors
d78c8689d0a Give browser unit tests even more time, the build agents are having a bad day
36d09208f19 Fix whitespace issues from github merge UI
72cf134322e Don't transform viewColumn used when creating extHostWebviewPanel programatically
32d935ebf4f Extract type guard
186792cadbb #27498 restore extension editor webview scroll positions (#85982)
fc35c4275f8 fix #112778.
768cd308c62 typeahead: fix invalidation on 2nd char in zsh
aa8962f5dcd Fixes #112353
54dc2d786e1 Merge pull request #112384 from myovan/master
25212c95eba Merge remote-tracking branch 'origin/master' into alex/node-modules-build2
563664f3491 Increase macOS browser unit test time because it continuously times out
16c2193e3ff eng: avoid duplicate prelaunch task runs
afafd5e8358 Merge remote-tracking branch 'origin/master' into rebornix/output-view-model
a207b50937d dispose webview scroll event when switching models.
4fa0f309ab8 webview cover.
9970299016a dispose webviews after switching models.
361877735ce :lipstick:
71a733b4aa0 finally fixed the OutputViewModel leak
eb154856a38 fixes #112366
87629065098 :lipstick:
6ad37a351ff cache metadata and output height.
11d5c625d1f fixes #112750
20831dd3df4 Keep only `@types/*` deps in `/build/` and share `terser` (#112718)
8fdb44467c7 update distro
273a5cdf5aa Emmet comment spacing fixup, fixes #112835
a8cadd39129 Merge pull request #112812 from microsoft/alex/node-modules-build
b4a22eba377 recompute output height in diff view model.
6ad2dccc786 Emmet Toggle Comment HTML :lipstick:
775bf46bad4 Adjust references to --list-extensions option
ea15eb4e5ab Strengthen sameNodes check :muscle: fixes #112829
94fbbb38ae6 tricky selection listening
58985749f9a memory leak
e064043f7a8 wire up outline service with breadcrumbs control, WIP
202a8fa3eb0 Merge pull request #110961 from a5hk/snake
d5bed1d4a7c fixes #112792
db27c552056 Adopt `ICodeEditor.executeEdits`
c2044d680f4 bust the node module cache
dc169ce06df Merge remote-tracking branch 'origin/master' into alex/node-modules-build
da4192d2879 Leave sorting deps up to yarn
3e8b2d86d17 bring back css integration tests
6d552620316 update vscode-uri
c1b988bcf86 Merge remote-tracking branch 'origin/master' into pr/a5hk/110961
2df64d27dd2 Merge pull request #112777 from microsoft/alex/prof-v8-extensions
f294e4a9cc4 Merge pull request #112810 from microsoft/alex/node-modules-types
ff744b4fa8a fixes #112281
7cd137263a8 Fixes #112382: Assume that control characters are wide
ec9ba0edb68 debug: Focus child session instead if it is stopped
02443d02f5a Fixes #112412: update comments to match placeholders
b0af35c8104 Merge remote-tracking branch 'origin/master' into alex/node-modules-types
711ec31c7ea Make sure to call done() from unit test
8c5966fc770 Merge remote-tracking branch 'origin/master' into alex/node-modules-build
75fc5cf5258 update distro
14cb2089dc2 update distro
2c4988b7639 Fixes #112301: Wrapped lines contain the wrapping whitespace in the line content
295912f7d50 update distro
4fc14314b69 Fix compilation problem
3bff49d2468 More tweaks to Windows cache exclusions
b3e390baa7f Merge pull request #112760 from microsoft/isidorn/workingCopyServiceMulti
c78bd5bd783 createFile and createFolder only allow single operation until there are more use cases
60c263ce1ce Merge remote-tracking branch 'origin/master' into alex/node-modules-build
318ff7e94a8 Merge remote-tracking branch 'origin/master' into alex/node-modules-types
8dc8025cd48 comment out css tests on windows
4efb4a2e8db decorations - show them next to the editor label when tabs and breadcrumbs disabled
edd37076b4b Adopt new mocha types
7971d627ce8 first version of outline service, outline creators, and implementations for document symbols and notebooks
db82bc13aa6 Move /build/ dev dependencies to root (#112718)
f74ad9692f6 Align `@types/*` dev dependencies (#112718)
9034b769fa8 fix #112805
0adc15c4bb8 configureCrashReporter should check whether we are on Electron
b069dbe0aeb Tab decorations need to update scrollbar (fix #112799)
9c30a0e98cc null guard
780ae767608 workingCopyService: create and createFolder also use IOperation interfaces
e588e04b5ef Merge pull request #112803 from thebinarysearchtree/master
34f1e7ae207 Revert 0d14d3e38a8aba6e2bcd6d5dd729c4d47b3d4f97
1585a290afc Merge remote-tracking branch 'origin/master' into pr/thebinarysearchtree/112803
4db298aab63 Avoid text flickering, just render &nbsp; to have a height
eb3cfcda015 chore: bump electron@11.1.0
d4e98289a34 [css] revert changes to test runner
5d6f7a65d38 Use IFileOperationUndoRedoInfo
abf082cf74a Log more details when exiting
65c59b509b6 Merge pull request #112798 from microsoft/alex/node-modules-types-keytar
3d9d6b34204 trigger layout when resource labels have rendered, fixes https://github.com/microsoft/vscode/issues/112799
daad75c2c6b [css] update to vscode-uri@3.0
d6a6b44a130 Remove all `yarn` warnings
aa2864d53f7 Remove most of the `yarn` license warnings
90f9a7de885 Execute `yarn --ignore-engines` for extensions
1141224b80f Remove debug console log
13ea3e08a1e Fix hover widget.
1324dcf085c fix #110982
63d49f6a135 don't disable the current remote resolve when bisect'ing extensions, fixes https://github.com/microsoft/vscode/issues/112473
2dd359c7153 Use the root typings for keytar since we are loading the root node module (#112718)
2c83509a154 Fixes #112666: Recompute minimap options (which hold the background color) when the tokens color change
df53f46ac2e Merge pull request #112670 from chenjigeng/fix/hover-link-encode-unnecessary
98166ea0b19 update distro
0d14d3e38a8 Fixes #112391: (Re)layout the hover widget after adding async content
7f1af9efb1f remove more unused code
5e865477065 only show render style switcher when the property is expanded
141572a2b21 render outputs in text by default.
d46abd43537 avoid plain/text being rendered multiple times
71d63c7f741 no transform for ITransformOutput
3337693651f dedup.
8d5b2904fa2 :lipstick:
1c2d88e68ba fewer weird as cast
6d378dbadea no more casting for Single/SidebySide diff view model.
819161c7bca DiffSide enum to replace boolean.
6dd6d4e5138 Add `--prof-v8-extensions` flag (see #112393)
681a3e413d0 :build:
c927a8015b9 Merge pull request #112771 from microsoft/alex/node-modules-vscode
e48a21c44bd :lipstick:
e9abb31537a Reduce height of notebook add new cell toolbar
2292bb0283f Make notebook add new cell toolbar visible on hover/focus
25cb0d70d4a Update removeTag command
d03c18661cb Windows CI: Do not cache symbol files
fee6dbf4e0e Merge remote-tracking branch 'origin/master' into alex/node-modules-vscode
e461782061e Fix compilation problem
5e3dfd3bb8c Merge pull request #112765 from microsoft/alex/node-modules-typescript
7ca71e763d6 Move away from deprecated 'vscode' node module (#112718)
c5d42b27722 renderers layout update
88f32df1d71 Merge branch 'mocha-update'
e0498f0cdd3 Share typescript node module (#112718)
dadb18c39e8 Upgrade Emmet removetag perf + behaviour, fixes #104173
04d74117859 eng: update mocha 2 -> 8
877dad976eb load renderers.
bcef72ddd01 hygiene: switch to terrapin
434bbbde983 workingCopyService: take options alongside each argument
710360b7db4 resolveNotebookContentProviders does not take arguments.
cb2167fdb22 Output transformers take ICommonNotebookEditor
3551968d69a update distro
2b25e675eb7 Merge pull request #112722 from microsoft/alex/node-modules-webpack
6112cc76f79 Move asClassNameArray/asClassName/asCSSSelector to CSSIcon
03a3e114151 No more spinning of loading progress. Fixes #112711
e42440bd357 Merge remote-tracking branch 'origin/master' into alex/node-modules-webpack
3072f2dd5cc Merge pull request #112719 from microsoft/alex/node-modules-mocha
fba51d8422c :lipstick: async-await
ebb94b4795e remove unused code
65e1707d19d format js/ts on save
3697925e5bc Use menuService across all views for context menus. Breakpoints.
a341f800668 fix https://github.com/microsoft/vscode/issues/112745
d5d6096b65c tweak wording for participants https://github.com/microsoft/vscode/issues/111878
5ff434d97f1 debt - use localized string for bisect title
79d6bf6ca82 allow commands to specific a mnemonic title in additon to "normal" title
6efbb251b5a debt - tool tip never has a non localized variant
b34a71e2279 Fix view order in remote explorer Fixes #112200
cbc47b1d7be Do not share `terser`
14440356e52 Merge remote-tracking branch 'origin/master' into alex/node-modules-mocha
438feb87d58 Merge remote-tracking branch 'origin/master' into alex/node-modules-webpack
4fae21b64d3 don't show dialogs when running tests
0e68af72989 fixes #112603
5c386371d8f Merge branch 'joao/build/compile-artifact'
d981cf5b81b Revert "Revert "Merge branch 'joao/build/compile-artifact'""
804c90cc49f Adopt more breaking changes from copy-webpack-plugin
77f4fb49952 Do not upgrade mocha
49962373131 fix tar
d07422ec301 rename workspace action for duplicate
b7aa0f7d406 fix template usage
af42aa5bff8 show diaglog when extensions participate in file operations, have "don't show again" option and command to reset choice, add logging
2aa92c6e83b Adopt copy-webpack-plugin breaking change
3c4de451b48 ux - distinguish folders from workspaces when opening (#77718)
4f4ba928851 debug console: use menuService
29eb3fbc6a1 build: tarball compilation output first
6de06bc8c86 update distro
fd85ae4f4a2 Avoid recompiling remote native node modules (#112644)
1cada18542a Share webpack related node modules (#112718)
ed19f6082f3 Share mocha related node modules (#112718)
83c47f90d0d debug: move Debug Console action to the `...` menu
adf764617e9 remove unused keybinding id
e3612f789be Use registerAction2 in markers view
bb157721fbb `/build/` and `/test/` should only have `devDependencies`
0929ea86cd3 don't suppress preview when handling onWill-events anymore, https://github.com/microsoft/vscode/issues/111878
a7fbcc27b75 Merge pull request #111222 from microsoft/joh/tabDecorations
a09cbd1b118 timer mark sources must not be unique, fixes https://github.com/microsoft/vscode/issues/112708
834488bd7a1 merge last stages into Publish
c757f9c70a1 merge macos jobs into same stage
c8aaeb75137 Revert "Merge branch 'joao/build/compile-artifact'"
6d683afb84f build: compile smoke tests
2445f698949 fix hygiene
7aee2c7d45e Fixed issue -filtering by extension in Change Language Mode (#112435)
d8a7c31aba3 testing: structural and perf improvements
cf94178b897 testing: improved test explorer, cancellation
201112e9948 testing: continued work on test explorer
732c73ef796 diffBrowser.
7c4757dd0ce private _
0055e658c99 style polish
d6e8feb7744 Check in additional file for uri opener api  change
13770874831 Ignore case while checking pressed keys in webview
ecd2325f863 Escape backslashes in keybindings for release notes
423076ab493 Pass schemes to main thread
a28b7022e0b Emmet fix edit point commands #112691
ae1077255c1 adjust test for removed process env key
1248ddadb8c fix #112683
bd38c65afc7 Add workspace tagging for java (#111303)
847fd19b026 Merge branch 'joao/build/compile-artifact'
21b1da3fb08 absolute layout for side by side output diffing
bd131b85785 dynamic .artifactignore
a8b4e9817f5 finish compile artifact
581ae611c2b debug: watch expression use menus
483bd40550d Update several Emmet commands (#112597)
2156931d38b Better side scrolling
41f450129ff fix: hover link encode unnecessarily
9474102e7b2 debug: more transition to commands, get rid of StartAction
bffa4045489 Have TentativeBoundary trigger rollback (#112510)
9f27d99af01 Update isVSO check with new remote authority
af7edd782e1 move progress and cancellation of file operation participants into its only customer so that progress stop when applying a workspace edit and showing its preview
6a342fe0a47 update original webview based on original text model.
cee8cbd9f29 fix cyclic dependency
b8ddffe7b41 rename setting
fc6bf56844a Fix executeTask for composite tasks Fixes #112545
e5e25a027e3 Update src/vs/workbench/browser/parts/editor/media/titlecontrol.css
c78bc564604 update references viewlet
3776ba6be2f Fix activity badge on ports view not going away
7d0d3835e6e cleanup hygien
fb2a5e18bb2 fix build
df0eda5adbb build
24a98f06442 debug viewlet: use registerAction2 and restructure the whole debug toolbar
cda701edbd7 debug: move colors to debugColors.ts from debugToolBar
d14fb9da0fb fix build
6236a5bf8b5 compile: use artifacts instead of cache
ad362089bea add proposal of CancellationError, https://github.com/microsoft/vscode/issues/93686
b4b8bcda479 tweak padding-right for decorations
d5a632e6fcf empty
0cee1531f79 Merge branch 'joao/build/remove-postinstall'
7db8e3b08c0 fix https://github.com/microsoft/vscode/issues/112418
ce1ffe0e7f8 link webkit issue for missing timeOrigin support
a780c7d4515 spell out GDPR types instead of using mapped types
018b924fee2 add logging for #112649
3b5cdf3a0eb backup - move progress reporting into place where save actually happens
c7d468d8ee3 empty
6260e655bc6 codicons -> iconLabels
a1b6de93363 Fix markdown span style filter Fixes #112606
1abefb9be2a Fixes #112652: A disposed IPC channel should reject all requests with a canceled error, not resolve them
39bd9df739f Show a clear dialog on web when the remote connection fails
aaf73920aea Ensure task executions get cleaned up Fixes #112247
6f08397de0f Enable fileWorkspaceFolder variable for remote tasks Fixes #112514
78fc9abd92e explain why ::after "inherits" italic rendering
21c8c9f768e Merge branch 'master' into joh/tabDecorations
f75e0388adc remove passing user target
8fbe27ae9aa Do not touch the perf marks names
ec2d8d67725 Try to give a good stack trace in case loading code fails
ac7eb534b82 Increase web worker extension host timeout from 10s to 60s
1100f276812 fix build
77221e5f604 Allow strings as host name for port forwarding
af519ea93f7 Merge branch 'joao/build/merge-distro-directly'
9fe0d3c372f Merge branch 'joao/build/child-concurrency'
2f8dee4d87c Add logging for calls of `process.exit` in the extension host
20920160792 don't show loader stats in perf view editor anymore
25d6642db52 debug: preserve focus in editor when integrated terminal is shown so match debug console behavior and to make sense for accessibility
d833f8bc10d quick pick - use Alt as modifier to open to side
3229991032c :lipstick:
083d38475c9 Tab bar not rendered on first load of only a welcome editor (fix #112618)
ede8d447025 Bump distro
8a2ec350bd9 Restore terminal UI state and layout when reconnecting to remote terminals Fix microsoft/vscode#109244
fd6debbde2b hide inset and update layout for the left webview.
1741bbf7e6f render deleted output
2118388b0e1 two webviews
fec4672c27a output diff container css class clearing
09d72bfaec8 :guard:
d2aebcd2c58 absolute positioned borders elements
f91b8f2e7ae More scrolling in getting started
01b04218586 Take ownership of workbench-welcome
03081f5a3a8 Polish skip location
6d3c2e68355 Adding proposed external uri opener API
542670762fd Make sure we dispose of webview revivers when the main thread extension host is disposed of
03c528450f3 Small formatting cleanup
bd8e81d122e Merge remote-tracking branch 'origin/master' into rebornix/output-view-model
f6a796b6693 grouping types in notebookBrowser
86838823e3b move genericTypes into notebookBrowser
706b8ddf983 single backlayerwebview!
05f69f7bbd3 share the logic for renderers in webview
64f7c1b0444 :lipstick:
b56da5e92aa align backlayer 1 and 2
c7616704115 fix build errors
fa464a731cc :guard:
9694d9f5c96 move output layout update logic out of back layer webview.
e2458c2d705 Fixes #112483: Use `JSON.parse` and fall back to the tolerant parser only to extract better errors
9c70421d476 IDisplayOutputLayoutUpdateRequest.
a7cac806230 no need to pass in cell for updateViewScrollTop. it only talks about output and offsets.
e3cf33470d6 link clicking in the output webview
65bc4153aed support scroll position syncing.
15ba91d098c Massage mark name to align
fbe4aa28ff4 Collect and deliver perf marks from extension hosts (#112552)
691a2ce4ecd add timeOrigin as implict mark whenever possible
976b9b5cda2 :lipstick:
0ff71d32138 update output in webview position when list view layout change.
c782b708b18 cell body height to 0 so I can click into the webview
adaa7d6d638 Update codicons: use new loading icon and animation (fixes #112593) https://github.com/microsoft/vscode-codicons/commit/ca2658d7973430426109b97f9f57c9f50b4f1717
7284389d4bc Update Codicons: Make circle-large-outline 1px outline (fixes #112310) https://github.com/microsoft/vscode-codicons/commit/7a530b493aadaaadee5ae62e33a90235795dfc09
bd67f0d0cab :lipstick:
ff02224c1bc move output layout info into genericCellViewModel shared by notebook and diff.
179adc5f7fd support removing a setting from all targets
284ace0bb6f Cleqn up codicons
35be51e43d9 open editors: adopt registerAction2
bbb797d3e4d clear static outputs when collapse outputs panel
caa595fc066 absolute position of mixed static and dynamic webview
3080c3e88c4 webview output first load
f158da4d7c4 Fix microsoft/vscode-remote-release/issues/1801
063ecfe0768 explorer: adopt registerAction2
66bf5744fa5 :up: distro
5b33fdd6507 API: finalize status bar backgroundColor (#110214)
2daa49098b1 Catch all localhost duplicates when forwarding a port Part of #112571
41628e33267 merge distro in a single command
dfeaeb5740a debug: check if languageIds is there
e2f6cc5a965 breakpoints: use registerAction2
d79f4e7b887 add test timeouts
208380cf766 Dispose a permanent failed connection and fail any further requests through a disposed `ChannelClient` (#112278 , #112568)
834b2b1570f bump cache salt
b7d648a8739 remove CHILD_CONCURRENCY=1 for all except windows
9293efd7e7d build: remove postinstall script invocation
be2d9834342 debug console: use registerAction2
c97d5e10337 build: use PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD
5ae66f37a89 build: use ELECTRON_SKIP_BINARY_DOWNLOAD
e135eee1f1d add perf mark when file systems are registered, fyi @bpasero
d782f11c7b2 do not restore theme if setting has changed
6aa034b1ca4 fix build
43c613c7009 timer mark event should also include unix timestamp
02bf5807169 remove migrating sync settings
3a8b161dcc8 #103869 remove user value if set to default and target is not passed
181d5dafba6 editors - show progress when waiting for auto save to complete to take long (fix #112278)
175c1298b84 remove all usage of concurrently
7743d971b10 concurrently -> run-run-all
d444826441a Revert "debug: stop supporting enableBreakpointsFor"
6c5916cafe1 web api - document some methods I forgot
607a0b8f133 in addition to file watching, use text file service onDidSave, fixes https://github.com/microsoft/vscode/issues/112477
0716eb086a6 Merge pull request #112306 from microsoft/aeschli/remoteIcons
0f56b9b6868 add embedder API to retrieve (startup) performance marks
6eb9b8938fc debug watch: use registerAction2
092b1365c76 variables view: use registerAction2
8ddbdd338a1 Merge branch 'master' into joh/tabDecorations
690e9f1e02f add ITimerService#whenReady
bee1e648979 Fix Configure Task for workspace w/ 0 folders Fixes #111815
aa587fe40a3 Catch bad progress location in extension trees Fixes #112211
b54f979ccbb Merge branch 'master' into aeschli/remoteIcons
05b94398d5a update distro
27cefc2a818 Rename `Protocol.onClose` to `Protocol.onDidDispose`
9cc0fb57434 windows - add helper method to know used window
460b6e720ef in browsers perf util is just a wrapper around native performance
1537b5bcc25 windows - cleanup hack for empty windows when restoring
afbd2e826c7 Remove Build jobs for now
c42e44e756b :lipstick: settings descriptions referencing other settings
a1f815a4c9a add option for preview navigation behavior (#112389)
f3e95ede9e4 Remove unused import
29e3f670384 config - careful with undefined/null config props
6b950b3d685 :lipstick:
d36f19d1d3d quick pick - configure openEditorPinned properly
f9bb8e62001 fix #112467
5114f5d76a1 Merge remote-tracking branch 'origin/master' into rebornix/output-view-model
89fd7be7fbd test
9ca7b4ed4df DiffElement
cbf9234d4fd hook modified webview
a9c5d7cc3c6 chore: fix CXX export
6361cfab60c Add scrolling to getting started page (#112500)
b2c0291c254 expose notebook text diff editor list row container
cf242ccaa83 prep for webview renderers
ca4601deba4 no unnecessary as any
f656636cc38 :lipstick:
14b7df48c39 do not restore default theme
dcda9032e78 output height calculation in view model by reading folding state.
239c211326d positioning for dynamic height output
4d0195152fa Add a slice to fix compilation
f76b1c25e7e remove quotes since we don't spawn shell
79a42e72217 use menu registry for sidebar actions
9565cf54c63 chore: bump electron@11.0.5
b44750d551d use menu registry for views visibility actions
387f4f4b112 Skip electron binary download
7989b98326e separate side by side and single side viewmodel
428008f3a56 Align versions across `package.json` files
d6e0a5424f2 Use directly `yarn compile`
3ba967fd7eb ext: log errors running contributed commands to the console for debugger vis
d583e26cd09 fix show view submenu in debug
0f33afa9f96 fix #112217 by replacing look behinds
42e31e92e29 cursor and user select update for output
5431ddb506f Bump distro
4263025dcdd Merge pull request #112279 from chenjigeng/feat/builtin-extension-report-issue
287137afbcf fixes #112415
8fca5328ac5 Merge branch 'roblou/shellEnvVar'
dce22cf74b5 Fall back on node API when $SHELL is not set, for user shell and shell environment discovery See github/codespaces#1639
8fbaf86e4b1 fixes #112413
3ee9eb9be4a fixes #112417
a22b5d54ad4 [json/css/html] adopt lsp 316
c2a8940127b simpler perf mark for didLoadExtensions
17c777b1119 update distro
e2ba0809426 fix typo per #112437
29edd0d2a90 Use panel title context menu for contextMenu actions
d766e6baa8d =revert changes to themes.contribution.ts
6d8f5bf363a Merge remote-tracking branch 'origin/master'
f7d9fe9b720 no trigger specification
8876c6debba enable master ci for production build
5b2015c9a00 telemetry for raw timer marks
72e82ba7b25 Make simple file dialog more predictable for screen readers Fixes #109722
9ac0fc87902 remove unused/duplicated perf.mark
a6f2524e4a8 - introduce panel title menu id - move view container menu acitons
43017777275 Update grammars
c87c95a1a04 prefix our performance marks with `code/`, e.g `code/didStartRenderer` etc
7381f53fd18 windows - move out more state code into separate class
f9b89066c7a remove dependencies stage
5f31a6ddc66 Revert "fix yaml"
064e1d19dfd fix yaml
2f2004f5fa8 faster dependencies check
d67e33f0b0d split compile & hygiene
2af62a03fe3 simplify continuous build
b1524d6b34e build: VSCODE_PUBLISH
200d60cc13c Do not create issue on failure
c7df7d91f42 Move actual gulpfile logic to `/build/`
ac6cadf8ee2 Fix gulpfile
e56597ab7a6 Save 1.5 seconds from `gulp` startup time
5f20ce95815 Increase yarn's network timeout
7d4c5a2c0fb Add a dedicated `Build: macOS Node Modules` job
90f0cf5b313 Force cacheNodeModules to fail
28776ec1a28 Cache yarn cache directory
704393a57cf fixes #112410
7168a1bf157 remove unused measure `ellapsedTimersToTimersComputed`
8b5984e7b83 Windows state deprecations. Fixes #112443
4df387f5ad1 add a way to read marks with source, adopt in perf view editor
c666c1d72f2 Save remote Help&Feedback enablement globally Fixes microsoft/vscode-remote-release#4165
3aa342ff68e Remove use of `getActions` from tunnelView.ts Part of #92038
4ba273fddaa name marks with source when importing them
51a3943093b Delete PR workflow stub
814bf82b853 Split compilation job into core compilation and extensions compilation
672216afdab Fix auto-generated link
c7319db91ce Remove use of getActions in remote.ts
16e715dc38e Bump ini from 1.3.4 to 1.3.7 (#112276)
45c7cae914d Bump ini from 1.3.5 to 1.3.7 in /extensions/markdown-language-features (#112275)
d1fff1a0836 Check in `.js` files from the `/build/` folder to improve build speeds
ec5da6d09c1 remove direct writes to `globalThis.MonacoPerformanceMarks`, use native performance instead, import native performance entries into timer service, fyi @bpasero
4b88174158f notebook: use icon names in  registerThemingParticipant
d55a3f0bcaf Merge pull request #112296 from yeswolf/master
71aa067bbd3 Fix intentional failing test
e25373f16ea One last try at automatic issue creation
eeded3b8c45 fix #112447
614e183e9a2 Attempt to avoid skipping steps on failure
cb84c32f5ac fix #112448
db4264eb3f8 Fix variable
b7f7b9fb8bd Intentionally fail to test issue creation
a861e22c7cc Switch to using `github.sha`
b742a4c8ea1 Create issue on test failure
707afc26d6f Skip compilation if the cache is hit
36b48f49849 milestone update
f413b81fcda windows - move state handling into own class
75eeac01049 Split Linux Build, add macOS jobs
6f08741eb91 separate viewPane and viewPaneContainer
a4206d19b0d rework perf-util, only allow for marks, separate perf-marks from renderer and main process (and future other processes)
24b18f1bd1f add perfEntries2
75f3a503fc1 create and dispose menu for context menu actions
18ded3c91b2 windows - shuffle state interfaces over
9489147837e Re-enable build jobs
51f18c087dd windows main service :lipstick:
d8a48910053 windows - first cut cleanup of windows finding logic
1a1db8f00e7 bootstrap - add more typing info
1a2132f16ee web - show dispose dialog only upon user interaction
28964872e7b lifecycle - log long running operations preventing shutdown (for #112278)
87b4380045d Merge branch 'master' into master
96b426ef1da Remove dupe context key service registration in cell Fix #111280
873f23dc4cf Fix line highlight when navigating to search results Fix #106209
7e16a1e72ed Fixed issue with dragging to select text on Hover should not hide it
fad4717a787 Fix issue with dragging to select text on Hover should not hide it
5954c8366d9 Fix #112267 - Revert listener inside Submenu action - Create listner for submenu action changes in view menu actions
ced21a0abcc :lipstick:
fd44d15c223 fix #112337.
fe4f9a9e6fb testing: add to i18n
91bb3857ac9 Use tree widget in the process explorer, fixes #104013
75dd72eeff5 move layout info into diff cell view model.
a9bf16e0019 testing: base test explorer
f30948328de update distro
70a67a1b844 Convert to use `for ... of`
c5c6c824113 Add Windows
7ae944e4b04 load static renderers
70355b66765 Add macOS
374e7487bd2 Run unit tests concurrently
58e88100755 Try `yarn concurrently`
73c050511b5 Avoid respawning
ba16f865b22 Remove compile and linux build for now
44b918b6248 Avoid "&"
0059c4cbfe0 Tweak combined step
072d922c450 Revert "Revert "Pick up offical TS build for web server""
5b8a6ee21b4 Add more logging to resource loading for webviews
771068e9978 Remove unused function
3bad41ff3c3 Attempt to run things in parallel
0dd9cdbb45f Fix env variable usages
e2e23aeb777 Add a compile and a linux build step
f79e3aea635 Fix notebook status bar icon colors (fixes #112323)
e3e3f8802ff Abandon composite actions since they cannot actually compose on other actions
d1d4143971a Attempt using absolute path
7e7c1de5697 Follow the expected naming scheme
623440c55c1 Extract cached yarn logic to a separate file
01ea0ecc098 Remove playwright caching
eb5c4388c74 Revert "Pick up offical TS build for web server"
92723a8a2c8 Bump markdown-it and highlight versions
52d2132e8d9 Move valid layers check together with the hygiene check
4942f242050 quick fix for setting description typo (#112327)
641abd4170d Extract the hygiene check to its own job
0ec1755aa9b Simplify caching strategy
d819caf1d27 Fix if condition
c7fa4ef0218 Troubleshoot expression
b2444f539bc Open Search Editor Action Bar item should clone search view's config Closes #112209
e1bc069d6ab Push workflow stub file
e8922b83b11 Update arial-label when renaming a terminal. Fixes #99072
baacaaca3e1 feat: use baseUrl first
fd45ba86b05 chore: remove git suffix
c197be4ef74 externalize remote icons
76436a4d435 Cache the /build/ folder compilation
2554c8c14e0 Remove the `linux-node-modules` job
a0122361111 Define `path` for the Cache node modules step
dc99b1ab774 Add the key property to the Cache node modules action
5e6152dcb39 Introduce a `linux-node-modules` job
50d0d5f0d25 Theme icon modifiers should work everywhere. Fixes #112298
2fc36a7d386 enum all breakpoint icons, avoid css selectors with patterns
824df4da78f Fix duplicate name
00c3a0bc9dc Gotta love yaml
b95feff0398 Fix indentation
27dee688674 Attempt to revive linux github action
b9b1b6156f9 Run compile on the `/build/` folder if the node_modules cache is hit
ed584f486eb use tt policy for nested workers, https://github.com/microsoft/vscode/issues/108400
d39671e7cb1 Convert to use `for ... of`
6d79a70a362 Add more frequently-used Ruby filenames to Ruby bundle (based on the actual TextMate bundle)
8f78f153fe0 Fix #112221
bfaaca632f3 Fix array syntax
d9f2b49323c Attempt to cache all node_modules folders
8af387dddd7 Fix #112287
b857599fb9b Attempt to cache root node modules
887bc527439 remove extra separator
684ceea0ed6 :up: distro
c350d8b4238 #92038 Move panel actions to use menu registry
f211a2bbe96 clarify docs, fixes https://github.com/microsoft/vscode/issues/111686
fff6f7414f0 :lipstick: remove commented code
eea0681288d adopt `actions/setup-node@v2-beta`
af74fd420bf nuke getSecondaryActions from outline, https://github.com/microsoft/vscode/issues/92038
56e35cf038f #92038 Create view and viewPaneContainer util actions
136df0d897d nuke getActions in outline pane, https://github.com/microsoft/vscode/issues/92038
d94ba914134 #92038 dispose actions on change
84e5cdec293 #92038 Use menu registry
a029dda2fe7 move suppress logic, https://github.com/microsoft/vscode/issues/111878
0a2cb7630f3 apply workspace edit from onWill-handler from within renderer, https://github.com/microsoft/vscode/issues/111878
61af2b26daa feat: support Report Issue capability for built-in module
1d5611c9d8f No need to install anything
f201645d8f7 Do not configure `xvfb`
019b5ab4c99 Remove yarn `CHILD_CONCURRENCY` limit
124b4bd151d Try newer `actions/checkout@v2`
3b34ea9f163 Update commands.ts (#112222)
32cc71c4a73 web - do not ask for clipboard access in ext tests (fix #112264)
bb68097d15f add extra check to understand https://github.com/microsoft/vscode/issues/112263
fdbd7bf6bbc web - tweak dispose dialog
86deb14fd3c make slow timeout event slower, fixes https://github.com/microsoft/vscode/issues/112262
6a03e96bfe3 Merge pull request #112206 from engelsdamien/master
69edf83c14d Merge pull request #112224 from microsoft/joh/worker
38a89809051 Avoids triggering autofetch unless setting changes
83f43bee1d5 Changing autofetch to a string config which has "current", "all" and (#111090)
39f78228fa6 Add missing file to commit
4d4f3a305c2 Observe the confirmBeforeClose setting for webviews
08e6047a050 Remove extra lines
0370a6ebf5f add explicit jsdoc types
618bf22ca5e remove !.
ed0634933e2 :lipstick:
29bc5baadc9 Only prompt if input (#112113)
4586eb012f9 renders all deal with output view model.
a416c1534bb #92038 Use menu to register actions - Extensions View
996c3495b49 #92038 use menu registry to provide view actions
f46cb57055d move picked mimetype to its view model.
a5f84617e22 chore: fix run-on values for snap build (#112248)
6424b09b2c8 Fixes #111909 - adds user agent to push
42cdda5ab0f Erase types to avoid using lib.dom.ts types from `/common/`
92adef0bac1 Fixes #108822: Do not render the minimap shadow on Safari
c503386ee3c refs #111463
41c6b79537b [GettingStarted] Slow down animation when expanding/collapsing items on sublists
9823eb0bf34 Avoid endless loop (fixes #110392)
d8fce51aed8 Tweak getting started
354d5ff8cd4 Tweak get started detail pane (#111840)
50ada457c55 change name back
308e723e181 yet another tweak to startup timer telemetry
de2c02eb504 use css variables for code lens font, https://github.com/microsoft/vscode-internalbacklog/issues/1674
10e40063d9d Delete is no longer irreverisible
ed04ea29d3a print nested worker errors onto console
1fb86647518 support nested worker when running without iframe
4dce67232d7 add failing Worker ctor inside nested polyfill worker
32ba217a5b0 support https-iframe
b3d95fea2ab web - inform user if workbench gets shutdown
91f00c7c285 web - allow to retry clipboard access (#112089)
61995eab4aa fix linux deb repo pointer
e6d238e251a web - clipboard warning when failing access
86a23116059 Set tunnel information for embedders Fixes #112213
e5664f1678e restore and update CSP header
49b84b4bd97 :lipstick:
d90179bef2f some simplifications
b44f2b3db2b Merge pull request #112144 from microsoft/isidorn/replFontFamily
4a76840f7f1 fix setting --vscode-relp-font-family variable
caf0943a994 Merge branch 'master' into joh/worker
bc95e893efa web - fix window open
90f2d386c82 Updates tsec to latest version using TS4.1.2
6c9dab1259f web - register external opener to prevent unload on expected href changes
039f15a0f93 :lipstick:
c7fa31fc926 [bot] make *duplicates link to a query for issues with matching tags. Closes #111903. Closes #49912.
5fe4f5583cb fix yarn.lock leftover
d2965c18bf6 Prompt web users when they try using ctrl+w/cmd+w when focused on a webview
04ec120e2c3 Exclude dist from eslint and hygine
ee64fdae8b7 Use dispose directly instead of loop
c3d8989b24e Enable going to stdlib on serverless
582f8f6bb0a Bump Static version of web TS version
e6a13fb134b Remove work around for TS not supporting paths on its own
71fad5aa411 Enable preferConst in TS project
16334048831 Remove unused types
45283df1fda Merge pull request #112176 from microsoft/rebornix/nb-diff-perf
f29a3cabc47 Pick up offical TS build for web server
79557ebbd2f Make sure markdown preview is updated if on disk file is updated
6ad6905f981 Re-enable *.integrationTest on windows
542fa93eae7 Pick up new TS version for building VS Code
864e80dc480 fix #112178.
4fe04b10a4c Assign rzhao271 to emmet tasks
1f528e7de40 :lipstick:
2c9bcb8b14c Merge remote-tracking branch 'origin/master' into rebornix/nb-diff-perf
9ccbebed752 revert change to grooming notebook
a33e1d617e8 Revert "Fixes #104004: Only run tests if the tests belong to a known extension"
f9134083e5d delay cell text model disposing.
4fefd1030ac limit editor contribs in notebook diff view
daca95ea065 fix: disable shm usage in container builds (#111787)
31d11a37299 fix memory leak
180506d8844 feat: support open local file
b36ec60ac4e notebook: adopt trusted types for renderer scripts
b1e7f915d49 notebook: adopt trusted types for renderer
90724cd823a Use `trustedTypes` where using `new Worker()` (#108400)
f9d6df8ea1e Fix port forwarded nofication showing for the wrong port Fixes #112159
83993fb92c5 Fix run npm script in folder command Fixes #112152
52cc4e6a0d5 #108793 check casing and use proper extUri
8b9b8df0247 explorer: smarter handling of file events
ea7bed08f1b debt - escape quotes
9ce3f9462d2 disable proposed API checks on top-level getters
1aa76d792f6 repl: improve height estimate
b8101e698c2 Fixes #106581: Do not react to Win/Super key for mouse wheel zoom on Linux
7951e1f9138 :up: web dev
e24db417b2e update my-work notebook
2c74aeb5b6b fix #112146
eec97b824f0 Use the future scroll position to compute the scroll top and reuse the current smooth scrolling animation (#104144, #107704, #104284)
5df492ff594 up references-viewlet
db2d6820b19 introduce vscode-repl-font-family
a0cbecb188c Merge pull request #112069 from engelsdamien/master
c6f4565a203 notebook.selectedCellBorder: fix typo
e6fc328247b update iconRegistry doc generation
785097e4618 Merge pull request #111644 from chenjigeng/master
49dc593a83e Merge branch 'master' into master
b3c053d44b2 Preserve whitespace in tree hover Part of #112124
59ba6494b9e Better timing for multiple lock files warning Fixes #111635
6643750275a Fix #108647
bdb0ef4d489 Fix #108793
5ee430bf26d Deduce secondary host from the request if possible
aef539adfca Remove unused import 'UriIdentityService'. (#112112)
bdd890380ef Fix #112121.
82974e8cda6 exthost: use marker to avoid duplicating written log messages
7491d391907 Merge remote-tracking branch 'origin/master' into connor4312/native-exthost-log
d66e65fcdd9 fix: Param helper hover getting cut off at bottom (#112019)
3c9a4554702 no longer render overview ruler.
f86fd13b2c6 fix #110357.
c643c433e82 Remove extra whitespace in dom.ts
759375429eb refs #110392
1cc1f166170 Use uriIdentityService to compare uris, fixes #107779
9ee7e1e87a7 Fix #111871, 'openReporter' should resolve
353227400a9 fix: Debug Console Linker automatically decodes link
71ba241fb01 Merge pull request #111897 from microsoft/alex/111128
2ef8227aacd Log extensions query telemetry data
838b3949ec8 Add workaround for #101754
ad10dc75901 Improve `writeFileIfDifferent` logic
88f09bd5f25 Move `getElectronAcceleratorForKeyBinding` to `WindowsKeyboardMapper` (#101754)
2add9e300c7 Uncomment test
3a47fc387a5 bug fix, see  #112013 (#112015)
b2eedd8ee09 Add `wss:` / `ws:` to the CSP
affd21e65ac tabs - partially take changes from PR 106448 to reduce diff
b3a3dc9c0a5 Debt: Test findPorts (#112092)
5e5ae15b22c debug: show the hover not so eagarly (do it twice as slow as editor hover)
768bcf45422 Fixed tab switching too fast when wheeling/scrolling (#112034)
c8b592a57a3 debug editor decorations: always decorate top stack frame, and decorate focused stack frame if it is not the top stack frame
92d6f00d6e2 debug console: color the debug group elements
9edc69706f8 Just set textContent for custom hover Fixes #111643
46ee31fce0f Try to fix markdown tooltip for Safari #111756
208bfc9970c fixes #112046
66f5e9294e3 path lib usage :lipstick:
08e29d24b4b Remove duplicate (case sensitive) recent workspace/folder names on the welcome screen (fix #111954)
bb480d2c4f6 Merge pull request #111916 from microsoft/alex/104004
861e7bcc1b2 Wait for the remote configuration before creating remote terminal processes
0e885aaf70c retry all cosmosdb ops
3212ddbc76f multibyteAwareBtoa - add commented out failing test for #112013
a6946159d4e :lipstick: layers checker
6f5448afac5 Include candidate pull requests
5865aeaa7b9 Rewrites Trusted Types sink assignements
2c937725db0 Updates tsec
aa18ca68276 Unable to find the registered languages while saving the file. (fix #111788)
91c7834e926 debug: update js-debug
f79bb79d2b6 Suggest a different description (#112049)
3655a82edcb add log to createAsset retry
3136ecb1d31 Do not ignore errors from $spawnExtHostProcess
ab8c8dbd8e5 Fix #112030
cf8ed37206e fixes #111850
c2de3a602e8 Tweak candidates notebook query
4250e343e0f use proper repos for linux arm
d0475711090 Prompt to save untitled file before run/debug
de22e951f9e more cleanup for #111177
ffdc1096fa5 Windows - Taskbar entry context menu is empty (fix #111177)
36628d73b91 add exponential backoff
66aab34216f retry createAsset sproc due to ECONNRESET
c4d77ea6193 #89559 Set logsPath in window configuration
3835563e123 Fix #112012
64f63a3dd70 Fix #108266
ea0b7fd29af Revert "build: create asset should still try to add asset"
267188e90de highlightModifiedTabs and pinned tabs issue (fix #111641)
04b9a571b84 fix #111898 on master
878bf135043 debt - shuffle some electron-main code to better layers
25cbe382515 proxy - rename proxy2 to proxy
428d5b1d302 proxy - remove old proxy auth dialog
f5da8e346fc :lipsticky: async
fc9ff5d569b ci: avoid overwriting CC variables for arm arch
eeed0fd5692 update distro
eb189c703c7 Fix #111946
86d779284b6 ci: fix condition for linux builds
7a7d27397a3 chore: fix cache condition for native modules
b0d4a08e3e0 chore: bump distro
94142bd7e0d chore: bump electron@11.0.3 (#111931)
962bedc4f47 Update version to 1.53.0
423bdb2e263 Fixes #104004: Only run tests if the tests belong to a known extension
707ca0a06c6 nested worker in worker
b8aa4141d28 Fixes #111128: Do not touch current line's indentation when pressing Enter
c8e490e5e68 chore: optimized code
3e22e6f4120 feat: add the rename test cases of html-language-features
8f712866cf3 fix: check canRename before findRenameLocations
81610ca5b61 bootstrap tweaks
cc502ffc10b Merge branch 'master' into joh/worker
5458e760b98 wip
94b2772f8c2 feat: add rename symbol within <script> tags
2c306f762bf Merge branch 'master' into joh/tabDecorations
8298927b3e2 add settings to toggle/tweak editor tab file decorations
f7a2368ae8e tweak padding of file decorations in editor titles
6da3c138aa4 apply no tab background style on container, not label
4858682abd5 render file decorations italic when main label is italic
2eef0d6288f Merge branch 'master' into joh/tabDecorations
a53d75097a1 add file decorations to editor titles (tab and no tab)
206fbe0bb38 debug: use native logging in extension host
fc393cae1bb readability and test improvements
43418e212de update selection, better multiline support
3182ea7f89a snake case
2926b2c1f19 use latest wsl
4e32124f9f3 Merge commit 'a36c68b9ec3d6a0aca9799d7a10be741a6658a51' into joao/wsl
13612c3cdb1 DisabledByEnvironment
26b51b5fb53 Merge branch 'master' into joao/wsl
46b61186de0 Merge branch 'master' into joao/wsl
2e2b0d1895a distro
adb24c6486a use clientOnly for remote wsl extension
9f9c0e71ad6 distro
357fe395aef fix buil
44c81d3c33d Merge remote-tracking branch 'origin/master' into joao/wsl
8a5f6fa5ce5 include remote-wsl by default
8836c8bfeee reuse source code editor
3b796c62129 allow init dimension for the diff editor and left/right side editors.
REVERT: 3e344b17b7b Remove extrenuous file. (#113825)
REVERT: 36f9eaf1e7b Merge pull request #113596 from Ry0taK/release/1.52
REVERT: e73a6b082cd Create ryotak.txt
REVERT: ea3859d4ba2 Bump version number to 1.52.1 (#112659)
REVERT: 608dfc13634 Catch all localhost duplicates when forwarding a port (#112575)
REVERT: 8b5ece7c203 Merge pull request #112431 from microsoft/misolori/notebook-color-icons
REVERT: c11e9282d8f Merge pull request #112565 from microsoft/isidorn/enableBreakpointsFor
REVERT: 2b6973a35d2 debug: check for existence of enableBreakpointsFor.languageIds
REVERT: 374d05c17cf Revert "debug: stop supporting enableBreakpointsFor"
REVERT: f93c8a0386a Fix notebook status bar icon colors (fixes #112323)
REVERT: 940b5f4bb5f chore: fix run-on values for snap build (#112245)
REVERT: dbbf7079b20 Make sure that tunnel information isn't set on desktop (#112228)
REVERT: 99edf4ff0fe fix linux deb repo pointer (#112226)
REVERT: 91a50e30223 Set tunnel information for embedders (#112215)
REVERT: c6cb5415399 Fix port forwarded nofication showing for the wrong port (#112160)
REVERT: 6caba069206 Merge pull request #112141 from microsoft/joh/fix/111913
REVERT: cb971b8ffd8 Preserve whitespace in tree hover (#112133)
REVERT: e4af2d8ad65 disable proposed API checks on top-level getters
REVERT: 6f933020e8d Just set textContent for custom hover (#112075)
REVERT: d66e3740a4a Merge pull request #112054 from microsoft/connor4312/js-debug-1.52.2
REVERT: b4ec131cff7 retry all cosmosdb ops (#112072)
REVERT: 5e585c5fb4f use proper repos for linux arm (#112026)
REVERT: 37c2de252eb debug: bump js-debug
REVERT: bc13785d3dd Retry createAsset sproc due to ECONNRESET (#112020)
REVERT: 559a78eaaa9 Mitigate #109728 (#112008)
REVERT: 62d6b82a6f9 Revert "build: create asset should still try to add asset" (#112009)
REVERT: 30e0c5784b3 fix #111898 (#111928)

git-subtree-dir: lib/vscode
git-subtree-split: 622cb03f7e070a9670c94bae1a45d78d7181fbd4
---
 .eslintignore                                 |    1 +
 .eslintrc.json                                | 2036 +++---
 .github/actions/build-chat/.gitignore         |    2 +
 .github/actions/build-chat/action.yml         |   10 +
 .github/actions/build-chat/package.json       |   23 +
 .github/actions/build-chat/src/main.ts        |  217 +
 .github/actions/build-chat/tsconfig.json      |   18 +
 .github/actions/build-chat/yarn.lock          |  728 +++
 .github/classifier.json                       |    4 +-
 .github/commands.json                         |    2 +-
 .github/pull_request_template.md              |    2 +-
 .github/workflows/author-verified.yml         |    2 +-
 .github/workflows/build-chat.yml              |   36 +
 .github/workflows/ci.yml                      |  373 +-
 .github/workflows/commands.yml                |    2 +-
 .github/workflows/deep-classifier-monitor.yml |    2 +-
 .github/workflows/deep-classifier-runner.yml  |    2 +-
 .github/workflows/deep-classifier-scraper.yml |    2 +-
 .github/workflows/english-please.yml          |    2 +-
 .github/workflows/feature-request.yml         |    2 +-
 .github/workflows/latest-release-monitor.yml  |    2 +-
 .github/workflows/locker.yml                  |    2 +-
 .github/workflows/needs-more-info-closer.yml  |    2 +-
 .github/workflows/on-label.yml                |    2 +-
 .github/workflows/on-open.yml                 |    2 +-
 .../workflows/release-pipeline-labeler.yml    |    2 +-
 .../workflows/test-plan-item-validator.yml    |    2 +-
 .gitignore                                    |   22 +-
 .vscode/extensions.json                       |    3 +-
 .vscode/launch.json                           |   22 +-
 .vscode/notebooks/api.github-issues           |    2 +-
 .vscode/notebooks/endgame.github-issues       |    8 +-
 .vscode/notebooks/my-endgame.github-issues    |   10 +-
 .vscode/notebooks/my-work.github-issues       |   20 +-
 .vscode/notebooks/papercuts.github-issues     |   44 +
 .vscode/notebooks/verification.github-issues  |    2 +-
 .vscode/settings.json                         |    6 +-
 .vscode/tasks.json                            |    8 +-
 .yarnrc                                       |    2 +-
 README.md                                     |    1 -
 ThirdPartyNotices.txt                         |   10 +-
 azure-pipelines.yml                           |   23 -
 build/.cachesalt                              |    2 +-
 build/.gitignore                              |    3 -
 build/azure-pipelines/common/.gitignore       |    2 -
 .../common/computeNodeModulesCacheKey.js      |   25 +
 .../common/computeNodeModulesCacheKey.ts      |   32 +
 build/azure-pipelines/common/createAsset.js   |   94 +
 build/azure-pipelines/common/createBuild.js   |   51 +
 .../common/extract-telemetry.sh               |    4 +-
 .../common/installPlaywright.js               |   14 +
 .../common/installPlaywright.ts               |   15 +
 .../azure-pipelines/common/listNodeModules.js |   40 +
 .../azure-pipelines/common/listNodeModules.ts |   46 +
 .../azure-pipelines/common/publish-webview.js |   71 +
 build/azure-pipelines/common/releaseBuild.js  |   50 +
 build/azure-pipelines/common/retry.js         |   25 +
 build/azure-pipelines/common/sync-mooncake.js |   87 +
 .../darwin/continuous-build-darwin.yml        |   79 -
 .../darwin/helper-plugin-entitlements.plist   |   10 -
 .../darwin/product-build-darwin.yml           |  190 +-
 build/azure-pipelines/darwin/publish.sh       |    1 +
 build/azure-pipelines/distro-build.yml        |    2 +-
 build/azure-pipelines/exploration-build.yml   |    3 +-
 build/azure-pipelines/linux/alpine/publish.sh |    2 +-
 .../linux/continuous-build-linux.yml          |   92 -
 .../linux/product-build-alpine.yml            |  103 +-
 .../linux/product-build-linux.yml             |  167 +-
 build/azure-pipelines/linux/publish.sh        |   15 +
 .../linux/snap-build-linux.yml                |   10 +-
 build/azure-pipelines/mixin.js                |   58 +
 build/azure-pipelines/product-build.yml       |  438 +-
 build/azure-pipelines/product-compile.yml     |  157 +-
 .../azure-pipelines/publish-types/.gitignore  |    2 -
 .../publish-types/check-version.js            |   36 +
 .../publish-types/publish-types.yml           |    2 +-
 .../publish-types/update-types.js             |   72 +
 build/azure-pipelines/sync-mooncake.yml       |    2 +-
 build/azure-pipelines/upload-cdn.js           |   35 +
 build/azure-pipelines/upload-sourcemaps.js    |   55 +
 build/azure-pipelines/upload-sourcemaps.ts    |    2 +-
 .../azure-pipelines/web/product-build-web.yml |   96 +-
 .../win32/ESRPClient/NuGet.config             |   12 +-
 .../win32/continuous-build-win32.yml          |   87 -
 .../win32/import-esrp-auth-cert.ps1           |    2 +-
 .../win32/product-build-win32.yml             |  152 +-
 build/builtin/browser-main.js                 |   17 +-
 build/builtin/main.js                         |   15 +-
 build/darwin/create-universal-app.js          |   58 +
 build/darwin/create-universal-app.ts          |   66 +
 build/darwin/sign.js                          |   58 +
 build/darwin/sign.ts                          |   10 -
 build/eslint.js                               |   36 +
 build/ext.js                                  |  207 +
 build/filters.js                              |  151 +
 build/gulpfile.compile.js                     |    9 +-
 build/gulpfile.editor.js                      |    5 +-
 build/gulpfile.extensions.js                  |   58 +-
 build/gulpfile.hygiene.js                     |   64 +-
 build/gulpfile.js                             |   41 +
 build/gulpfile.reh.js                         |    8 +-
 build/gulpfile.vscode.js                      |   37 +-
 build/gulpfile.vscode.linux.js                |    4 -
 build/hygiene.js                              |  191 +-
 build/lib/asar.js                             |  118 +
 build/lib/builtInExtensions.js                |  120 +
 build/lib/builtInExtensions.ts                |   10 +
 build/lib/bundle.js                           |  464 ++
 build/lib/compilation.js                      |  174 +
 build/lib/compilation.ts                      |   10 +-
 build/lib/dependencies.js                     |   60 +
 .../{dependencies.js => lib/dependencies.ts}  |   40 +-
 build/lib/electron.js                         |  111 +
 build/lib/electron.ts                         |    6 +-
 build/lib/eslint/code-import-patterns.js      |   59 +
 build/lib/eslint/code-layering.js             |   68 +
 .../code-no-nls-in-standalone-editor.js       |   38 +
 build/lib/eslint/code-no-standalone-editor.js |   41 +
 .../eslint/code-no-unexternalized-strings.js  |  111 +
 .../lib/eslint/code-no-unused-expressions.js  |  122 +
 build/lib/eslint/code-translation-remind.js   |   57 +
 build/lib/eslint/utils.js                     |   37 +
 build/lib/eslint/vscode-dts-cancellation.js   |   33 +
 build/lib/eslint/vscode-dts-cancellation.ts   |   38 +
 build/lib/eslint/vscode-dts-create-func.js    |   35 +
 build/lib/eslint/vscode-dts-event-naming.js   |   87 +
 .../lib/eslint/vscode-dts-interface-naming.js |   30 +
 .../lib/eslint/vscode-dts-literal-or-types.js |   27 +
 .../lib/eslint/vscode-dts-provider-naming.js  |   38 +
 .../lib/eslint/vscode-dts-provider-naming.ts  |   45 +
 .../lib/eslint/vscode-dts-region-comments.js  |   35 +
 .../lib/eslint/vscode-dts-region-comments.ts  |   41 +
 build/lib/eslint/vscode-dts-use-thenable.js   |   24 +
 build/lib/eslint/vscode-dts-use-thenable.ts   |   30 +
 build/lib/extensions.js                       |  330 +
 build/lib/extensions.ts                       |   26 +-
 build/lib/git.js                              |   54 +
 build/lib/i18n.js                             | 1204 ++++
 build/lib/i18n.resources.json                 |   12 +
 build/lib/layersChecker.js                    |  283 +
 build/lib/layersChecker.ts                    |    2 -
 build/lib/monaco-api.js                       |  628 ++
 build/lib/monaco-api.ts                       |   70 +-
 build/lib/nls.js                              |  348 ++
 build/lib/nls.ts                              |   60 +-
 build/lib/node.js                             |   17 +
 build/lib/node.ts                             |   10 +-
 build/lib/optimize.js                         |  202 +
 build/lib/optimize.ts                         |   97 +-
 build/lib/preLaunch.js                        |   55 +
 build/lib/reporter.js                         |  102 +
 build/lib/snapshotLoader.js                   |   55 +
 build/lib/standalone.js                       |  322 +
 build/lib/standalone.ts                       |    5 +-
 build/lib/stats.js                            |  137 +
 build/lib/stats.ts                            |    2 +-
 build/lib/task.js                             |   97 +
 build/lib/test/i18n.test.js                   |   40 +
 build/lib/treeshaking.js                      |  780 +++
 build/lib/treeshaking.ts                      |   59 +-
 build/lib/typings/gulp-cssnano.d.ts           |   12 -
 build/lib/util.js                             |  276 +
 .../lib/watch/index.js                        |   10 +-
 build/lib/watch/package.json                  |    2 +-
 build/lib/watch/watch-win32.js                |  100 +
 build/lib/watch/watch-win32.ts                |    4 +-
 build/lib/watch/yarn.lock                     |  453 +-
 build/monaco/monaco.d.ts.recipe               |    1 +
 build/monaco/package.json                     |    2 +-
 build/npm/dirs.js                             |   51 +
 build/npm/postinstall.js                      |   56 +-
 build/npm/preinstall.js                       |   34 +
 build/npm/update-theme.js                     |   82 -
 build/package.json                            |   42 +-
 build/yarn.lock                               | 2552 +-------
 cgmanifest.json                               |   16 +-
 .../clojure/language-configuration.json       |    2 +-
 extensions/configuration-editing/package.json |    2 +-
 .../src/configurationEditingMain.ts           |    4 +-
 .../src/extensionsProposals.ts                |    4 +-
 .../src/settingsDocumentHelper.ts             |   11 +-
 extensions/configuration-editing/yarn.lock    |    8 +-
 extensions/cpp/cgmanifest.json                |    4 +-
 extensions/cpp/syntaxes/c.tmLanguage.json     |    8 +-
 .../cpp.embedded.macro.tmLanguage.json        |    8 +-
 extensions/cpp/syntaxes/cpp.tmLanguage.json   |    8 +-
 .../client/src/customData.ts                  |    6 +-
 .../client/src/node/nodeFs.ts                 |    4 +-
 .../client/src/requests.ts                    |   64 +-
 extensions/css-language-features/package.json |   11 +-
 .../css-language-features/server/package.json |   18 +-
 .../server/src/node/nodeFs.ts                 |    4 +-
 .../server/src/requests.ts                    |   82 +-
 .../server/src/test/requests.test.ts          |   62 -
 .../server/src/utils/documentContext.ts       |    4 +-
 .../server/src/utils/runner.ts                |    4 +-
 .../css-language-features/server/yarn.lock    |  854 +--
 extensions/css-language-features/yarn.lock    |  743 +--
 extensions/debug-auto-launch/package.json     |    2 +-
 extensions/debug-auto-launch/yarn.lock        |    8 +-
 extensions/debug-server-ready/package.json    |    3 +-
 extensions/debug-server-ready/yarn.lock       |    8 +-
 extensions/emmet/package.json                 |   13 +-
 extensions/emmet/src/abbreviationActions.ts   |  311 +-
 extensions/emmet/src/balance.ts               |   82 +-
 extensions/emmet/src/bufferStream.ts          |   81 +-
 .../emmet/src/defaultCompletionProvider.ts    |   72 +-
 extensions/emmet/src/editPoint.ts             |    2 +-
 extensions/emmet/src/emmetCommon.ts           |   19 +-
 .../emmet/src/evaluateMathExpression.ts       |    6 +-
 extensions/emmet/src/imageSizeHelper.ts       |    1 -
 extensions/emmet/src/matchTag.ts              |   38 +-
 extensions/emmet/src/mergeLines.ts            |   40 +-
 extensions/emmet/src/parseDocument.ts         |   46 +
 extensions/emmet/src/reflectCssValue.ts       |   17 +-
 extensions/emmet/src/removeTag.ts             |   90 +-
 extensions/emmet/src/selectItem.ts            |   18 +-
 extensions/emmet/src/selectItemHTML.ts        |  126 +-
 extensions/emmet/src/selectItemStylesheet.ts  |  102 +-
 extensions/emmet/src/splitJoinTag.ts          |   37 +-
 .../test/editPointSelectItemBalance.test.ts   |    8 +-
 extensions/emmet/src/test/index.ts            |   33 +-
 .../src/test/partialParsingStylesheet.test.ts |    9 +-
 extensions/emmet/src/test/tagActions.test.ts  |    2 +-
 .../emmet/src/test/toggleComment.test.ts      |  177 +-
 .../emmet/src/test/updateImageSize.test.ts    |  275 +-
 .../src/test/wrapWithAbbreviation.test.ts     |  125 +-
 extensions/emmet/src/toggleComment.ts         |  131 +-
 .../emmet/src/typings/EmmetFlatNode.d.ts      |   89 +
 .../src/typings/emmetio__css-parser.d.ts      |    2 +
 .../src/typings/emmetio__html-matcher.d.ts    |    2 +
 extensions/emmet/src/updateImageSize.ts       |   94 +-
 extensions/emmet/src/updateTag.ts             |   51 +-
 extensions/emmet/src/util.ts                  |  298 +-
 extensions/emmet/yarn.lock                    | 2450 +-------
 extensions/extension-editing/package.json     |    2 +-
 extensions/extension-editing/yarn.lock        |    8 +-
 extensions/fsharp/cgmanifest.json             |    2 +-
 extensions/fsharp/package.json                |    2 +-
 .../fsharp/syntaxes/fsharp.tmLanguage.json    |    9 +-
 extensions/git-ui/package.json                |    3 +-
 extensions/git-ui/yarn.lock                   |    8 +-
 extensions/git/package.json                   |   44 +-
 extensions/git/package.nls.json               |    5 +-
 extensions/git/src/api/api1.ts                |   15 +-
 extensions/git/src/api/git.d.ts               |   15 +-
 extensions/git/src/askpass-main.ts            |    2 +-
 extensions/git/src/autofetch.ts               |   34 +-
 extensions/git/src/commands.ts                |   84 +-
 extensions/git/src/git.ts                     |  119 +-
 extensions/git/src/main.ts                    |   15 +-
 extensions/git/src/model.ts                   |   10 +-
 extensions/git/src/repository.ts              |   91 +-
 extensions/git/src/test/index.ts              |    2 +-
 extensions/git/src/test/smoke.test.ts         |   27 +
 extensions/git/src/timelineProvider.ts        |    4 +-
 extensions/git/yarn.lock                      |  819 +--
 extensions/github-authentication/package.json |    9 +-
 .../src/common/keychain.ts                    |    9 +-
 .../github-authentication/src/extension.ts    |    9 +-
 .../github-authentication/src/github.ts       |   16 +-
 extensions/github-authentication/yarn.lock    |  463 +-
 extensions/github/package.json                |    3 +-
 extensions/github/yarn.lock                   |    8 +-
 extensions/grunt/package.json                 |    2 +-
 extensions/grunt/yarn.lock                    |    8 +-
 extensions/gulp/package.json                  |    2 +-
 extensions/gulp/src/main.ts                   |  118 +-
 extensions/gulp/yarn.lock                     |    8 +-
 .../client/src/htmlClient.ts                  |   70 +-
 .../client/src/requests.ts                    |    6 +-
 .../html-language-features/package.json       |   13 +-
 .../server/package.json                       |   20 +-
 .../server/src/htmlServer.ts                  |   32 +-
 .../server/src/modes/javascriptMode.ts        |   22 +
 .../server/src/modes/semanticTokens.ts        |    8 +-
 .../server/src/requests.ts                    |    6 +-
 .../server/src/test/rename.test.ts            |  205 +
 .../server/src/utils/runner.ts                |    4 +-
 .../html-language-features/server/yarn.lock   | 1068 +---
 extensions/html-language-features/yarn.lock   |   96 +-
 extensions/image-preview/package.json         |    2 +-
 extensions/jake/package.json                  |    2 +-
 extensions/jake/yarn.lock                     |    8 +-
 .../syntaxes/JavaScript.tmLanguage.json       |  243 +-
 .../syntaxes/JavaScriptReact.tmLanguage.json  |  243 +-
 .../client/src/jsonClient.ts                  |   19 +-
 .../json-language-features/package.json       |   17 +-
 .../server/package.json                       |   10 +-
 .../server/src/jsonServer.ts                  |   10 +-
 .../server/src/utils/runner.ts                |    4 +-
 .../json-language-features/server/yarn.lock   |   74 +-
 extensions/json-language-features/yarn.lock   |   96 +-
 extensions/log/cgmanifest.json                |    4 +-
 extensions/log/syntaxes/log.tmLanguage.json   |    6 +-
 extensions/markdown-basics/cgmanifest.json    |    6 +-
 .../syntaxes/markdown.tmLanguage.json         |    4 +-
 .../markdown-language-features/media/index.js |    2 +-
 .../markdown-language-features/media/pre.js   |    2 +-
 .../markdown-language-features/package.json   |   17 +-
 .../preview-src/index.ts                      |   42 +-
 .../preview-src/scroll-sync.ts                |    1 +
 .../src/commands/renderDocument.ts            |    2 +-
 .../src/features/preview.ts                   |   51 +-
 .../src/features/previewContentProvider.ts    |   17 +-
 .../src/features/previewManager.ts            |    7 +-
 .../src/features/smartSelect.ts               |   25 +-
 .../src/markdownEngine.ts                     |   44 +-
 .../src/test/documentLink.test.ts             |    5 +
 .../src/test/engine.test.ts                   |   23 +-
 .../src/test/index.ts                         |    2 +-
 .../src/test/urlToUri.test.ts                 |   39 +
 .../src/util/url.ts                           |   25 +
 .../markdown-language-features/yarn.lock      | 4904 +--------------
 extensions/merge-conflict/package.json        |    4 +-
 extensions/merge-conflict/yarn.lock           |    8 +-
 .../microsoft-authentication/package.json     |    7 +-
 .../microsoft-authentication/src/AADHelper.ts |   46 +-
 .../microsoft-authentication/src/extension.ts |    9 +-
 .../microsoft-authentication/src/keychain.ts  |   11 +-
 .../src/microsoft-authentication.d.ts         |   16 +
 extensions/microsoft-authentication/yarn.lock |  437 +-
 extensions/npm/package.json                   |    2 +-
 extensions/npm/src/commands.ts                |    7 +-
 extensions/npm/src/npmView.ts                 |   39 +-
 extensions/npm/src/scriptHover.ts             |    2 +-
 extensions/npm/src/tasks.ts                   |   57 +-
 extensions/npm/yarn.lock                      |    8 +-
 extensions/package.json                       |    3 +-
 extensions/php-language-features/package.json |    2 +-
 .../src/features/phpGlobalFunctions.ts        |    2 +-
 extensions/php-language-features/yarn.lock    |    8 +-
 extensions/php/cgmanifest.json                |    4 +-
 extensions/php/syntaxes/php.tmLanguage.json   |  590 +-
 extensions/python/.vscodeignore               |    5 -
 extensions/python/language-configuration.json |    8 +-
 extensions/python/package.json                |    5 -
 extensions/ruby/package.json                  |    2 +-
 extensions/rust/cgmanifest.json               |    4 +-
 extensions/rust/syntaxes/rust.tmLanguage.json |   54 +-
 extensions/search-result/package.json         |    2 +-
 extensions/search-result/src/extension.ts     |   26 +-
 extensions/shared.tsconfig.json               |    3 +-
 extensions/shared.webpack.config.js           |   18 +-
 extensions/simple-browser/.vscodeignore       |   12 +
 extensions/simple-browser/README.md           |    3 +
 .../extension-browser.webpack.config.js       |    5 +-
 .../extension.webpack.config.js               |    5 +-
 extensions/simple-browser/media/index.js      |  210 +
 extensions/simple-browser/media/index.js.map  |    1 +
 extensions/simple-browser/media/main.css      |  115 +
 .../simple-browser/media/preview-dark.svg     |    3 +
 .../simple-browser/media/preview-light.svg    |    3 +
 extensions/simple-browser/package.json        |   69 +
 extensions/simple-browser/package.nls.json    |    5 +
 .../simple-browser/preview-src/events.ts      |   15 +-
 .../simple-browser/preview-src/index.ts       |   97 +
 .../simple-browser/preview-src/tsconfig.json  |   12 +
 extensions/simple-browser/src/dispose.ts      |   42 +
 extensions/simple-browser/src/extension.ts    |   74 +
 .../src/simpleBrowserManager.ts               |   38 +
 .../simple-browser/src/simpleBrowserView.ts   |  154 +
 .../src/typings/ref.d.ts                      |    3 +-
 extensions/simple-browser/tsconfig.json       |   10 +
 .../webpack.config.js}                        |   29 +-
 extensions/simple-browser/yarn.lock           | 2732 ++++++++
 .../swift/syntaxes/swift.tmLanguage.json      |   23 +-
 .../.vscodeignore                             |    6 +
 .../testing-editor-contributions/README.md    |    5 +
 .../extension-browser.webpack.config.js       |   22 +
 .../extension.webpack.config.js               |   20 +
 .../testing-editor-contributions/package.json |   48 +
 .../package.nls.json                          |   19 +
 .../src/extension.ts                          |  412 ++
 .../src/typings/refs.d.ts                     |    5 +-
 .../tsconfig.json                             |    4 +-
 .../testing-editor-contributions/yarn.lock    |    8 +
 .../theme-seti/icons/vs-seti-icon-theme.json  |    5 +-
 extensions/typescript-basics/cgmanifest.json  |    2 +-
 .../syntaxes/TypeScript.tmLanguage.json       |  243 +-
 .../syntaxes/TypeScriptReact.tmLanguage.json  |  243 +-
 .../.eslintrc.json                            |    5 +
 .../extension-browser.webpack.config.js       |   31 +-
 .../typescript-language-features/package.json |   55 +-
 .../package.nls.json                          |    7 +-
 .../src/extension.browser.ts                  |    2 +-
 .../src/languageFeatures/completions.ts       |    2 +-
 .../src/languageFeatures/fileReferences.ts    |   94 +
 .../src/languageFeatures/jsDocCompletions.ts  |    4 +-
 .../languageFeatures/languageConfiguration.ts |    2 +-
 .../src/languageFeatures/refactor.ts          |    6 +-
 .../src/languageFeatures/semanticTokens.ts    |    6 +-
 .../src/languageProvider.ts                   |   13 +-
 .../src/lazyClientHost.ts                     |    2 +-
 .../src/protocol.d.ts                         |   18 +
 .../src/test-all.ts                           |   28 +
 .../src/test/index.ts                         |    2 +-
 .../src/test/{ => smoke}/completions.test.ts  |   11 +-
 .../src/test/{ => smoke}/fixAll.test.ts       |   11 +-
 .../src/test/smoke/index.ts                   |   28 +
 .../test/{ => smoke}/jsDocCompletions.test.ts |    9 +-
 .../src/test/{ => smoke}/quickFix.test.ts     |   11 +-
 .../{ => smoke}/referencesCodeLens.test.ts    |    7 +-
 .../test/{ => unit}/cachedResponse.test.ts    |    6 +-
 .../{ => unit}/functionCallSnippet.test.ts    |    2 +-
 .../src/test/unit/index.ts                    |   28 +
 .../src/test/{ => unit}/jsdocSnippet.test.ts  |   12 +-
 .../src/test/{ => unit}/onEnter.test.ts       |   20 +-
 .../src/test/{ => unit}/previewer.test.ts     |    2 +-
 .../src/test/{ => unit}/requestQueue.test.ts  |    2 +-
 .../src/test/{ => unit}/server.test.ts        |   18 +-
 .../src/tsServer/serverProcess.electron.ts    |    8 +-
 .../src/typeScriptServiceClientHost.ts        |    4 +-
 .../src/typescriptService.ts                  |    1 +
 .../src/typescriptServiceClient.ts            |   15 +-
 .../src/utils/api.ts                          |    3 +-
 .../tsconfig.json                             |    4 +-
 .../typescript-language-features/yarn.lock    |  807 +--
 extensions/vscode-api-tests/package.json      |    8 +-
 .../src/singlefolder-tests/index.ts           |    2 +-
 .../src/singlefolder-tests/webview.test.ts    |   34 +-
 .../src/singlefolder-tests/workspace.test.ts  |   80 +-
 .../src/workspace-tests/index.ts              |    2 +-
 extensions/vscode-api-tests/yarn.lock         | 2026 +-----
 extensions/vscode-colorize-tests/package.json |    5 +-
 .../producticons/test-product-icon-theme.json |    2 +-
 .../src/colorizer.test.ts                     |   42 +-
 extensions/vscode-colorize-tests/src/index.ts |    2 +-
 .../test/colorize-fixtures/12750.html         |    0
 .../test/colorize-fixtures/13448.html         |    0
 .../test/colorize-fixtures/14119.less         |    0
 .../test/colorize-fixtures/25920.html         |    0
 .../test/colorize-fixtures/Dockerfile         |    0
 .../test/colorize-fixtures/basic.java         |    0
 .../test/colorize-fixtures/issue-1550.yaml    |    0
 .../test/colorize-fixtures/issue-28354.php    |    0
 .../test/colorize-fixtures/issue-4008.yaml    |    0
 .../test/colorize-fixtures/issue-6303.yaml    |    0
 .../test/colorize-fixtures/issue-76997.php    |    0
 .../test/colorize-fixtures/makefile           |    0
 .../test/colorize-fixtures/test-13777.go      |    0
 .../test/colorize-fixtures/test-23630.cpp     |    0
 .../test/colorize-fixtures/test-23850.cpp     |    0
 .../test/colorize-fixtures/test-33886.md      |    0
 .../test/colorize-fixtures/test-4287.pug      |    0
 .../test/colorize-fixtures/test-6611.rs       |    0
 .../test/colorize-fixtures/test-7115.xml      |    0
 .../test/colorize-fixtures/test-78769.cpp     |    0
 .../test/colorize-fixtures/test-80644.cpp     |    0
 .../test/colorize-fixtures/test-92369.cpp     |    0
 .../test/colorize-fixtures/test-brackets.tsx  |    0
 .../colorize-fixtures/test-cssvariables.less  |    0
 .../colorize-fixtures/test-cssvariables.scss  |    0
 .../colorize-fixtures/test-embedding.html     |    0
 .../colorize-fixtures/test-freeze-56476.ps1   |    0
 .../colorize-fixtures/test-function-inv.ts    |    0
 .../test/colorize-fixtures/test-issue11.ts    |    0
 .../test/colorize-fixtures/test-issue5431.ts  |    0
 .../test/colorize-fixtures/test-issue5465.ts  |    0
 .../test/colorize-fixtures/test-issue5566.ts  |    0
 .../test-jsdoc-multiline-type.ts              |    0
 .../test/colorize-fixtures/test-keywords.ts   |    0
 .../test/colorize-fixtures/test-members.ts    |    0
 .../colorize-fixtures/test-object-literals.ts |    0
 .../test/colorize-fixtures/test-regex.coffee  |    0
 .../test/colorize-fixtures/test-strings.ts    |    0
 .../test/colorize-fixtures/test-this.ts       |    0
 .../test/colorize-fixtures/test-variables.css |    0
 .../test/colorize-fixtures/test.bat           |    0
 .../test/colorize-fixtures/test.c             |    0
 .../test/colorize-fixtures/test.cc            |    0
 .../test/colorize-fixtures/test.clj           |    0
 .../test/colorize-fixtures/test.coffee        |    0
 .../test/colorize-fixtures/test.cpp           |    0
 .../test/colorize-fixtures/test.cs            |    0
 .../test/colorize-fixtures/test.cshtml        |    0
 .../test/colorize-fixtures/test.css           |    0
 .../test/colorize-fixtures/test.fs            |    0
 .../test/colorize-fixtures/test.go            |    0
 .../test/colorize-fixtures/test.groovy        |    0
 .../test/colorize-fixtures/test.handlebars    |    0
 .../test/colorize-fixtures/test.hbs           |    0
 .../test/colorize-fixtures/test.hlsl          |    0
 .../test/colorize-fixtures/test.html          |    0
 .../test/colorize-fixtures/test.ini           |    0
 .../test/colorize-fixtures/test.js            |    0
 .../test/colorize-fixtures/test.json          |    0
 .../test/colorize-fixtures/test.jsx           |    0
 .../test/colorize-fixtures/test.less          |    0
 .../test/colorize-fixtures/test.log           |    0
 .../test/colorize-fixtures/test.lua           |    0
 .../test/colorize-fixtures/test.m             |    0
 .../test/colorize-fixtures/test.md            |    0
 .../test/colorize-fixtures/test.mm            |    0
 .../test/colorize-fixtures/test.php           |    0
 .../test/colorize-fixtures/test.pl            |    0
 .../test/colorize-fixtures/test.ps1           |    0
 .../test/colorize-fixtures/test.pug           |    0
 .../test/colorize-fixtures/test.r             |    0
 .../test/colorize-fixtures/test.rb            |    0
 .../test/colorize-fixtures/test.rs            |    0
 .../test/colorize-fixtures/test.scss          |    0
 .../test/colorize-fixtures/test.sh            |    0
 .../test/colorize-fixtures/test.shader        |    0
 .../test/colorize-fixtures/test.sql           |    0
 .../test/colorize-fixtures/test.swift         |    0
 .../test/colorize-fixtures/test.ts            |    0
 .../test/colorize-fixtures/test.vb            |    0
 .../test/colorize-fixtures/test.xml           |    0
 .../test/colorize-fixtures/test.yaml          |    0
 .../test/colorize-fixtures/test2.pl           |    0
 .../test/colorize-fixtures/test6916.js        |    0
 .../test/colorize-fixtures/tsconfig_off.json  |    0
 .../test/colorize-results/12750_html.json     |    0
 .../test/colorize-results/13448_html.json     |    0
 .../test/colorize-results/14119_less.json     |    0
 .../test/colorize-results/25920_html.json     |    0
 .../test/colorize-results/Dockerfile.json     |    0
 .../test/colorize-results/basic_java.json     |    0
 .../colorize-results/issue-1550_yaml.json     |    0
 .../colorize-results/issue-28354_php.json     |    0
 .../colorize-results/issue-4008_yaml.json     |    0
 .../colorize-results/issue-6303_yaml.json     |    0
 .../colorize-results/issue-76997_php.json     |    0
 .../test/colorize-results/makefile.json       |    0
 .../test/colorize-results/test-13777_go.json  |    0
 .../test/colorize-results/test-23630_cpp.json |    0
 .../test/colorize-results/test-23850_cpp.json |    0
 .../test/colorize-results/test-33886_md.json  |    0
 .../test/colorize-results/test-4287_pug.json  |    0
 .../test/colorize-results/test-6611_rs.json   |   96 +-
 .../test/colorize-results/test-7115_xml.json  |    0
 .../test/colorize-results/test-78769_cpp.json |    0
 .../test/colorize-results/test-80644_cpp.json |    0
 .../test/colorize-results/test-92369_cpp.json |    0
 .../colorize-results/test-brackets_tsx.json   |    0
 .../test-cssvariables_less.json               |    0
 .../test-cssvariables_scss.json               |    0
 .../colorize-results/test-embedding_html.json |    0
 .../test-freeze-56476_ps1.json                |    0
 .../test-function-inv_ts.json                 |    8 +-
 .../colorize-results/test-issue11_ts.json     |    0
 .../colorize-results/test-issue5431_ts.json   |    0
 .../colorize-results/test-issue5465_ts.json   |    0
 .../colorize-results/test-issue5566_ts.json   |    0
 .../test-jsdoc-multiline-type_ts.json         |    0
 .../colorize-results/test-keywords_ts.json    |    8 +-
 .../colorize-results/test-members_ts.json     |    0
 .../test-object-literals_ts.json              |    0
 .../colorize-results/test-regex_coffee.json   |    0
 .../colorize-results/test-strings_ts.json     |    0
 .../test/colorize-results/test-this_ts.json   |    0
 .../colorize-results/test-variables_css.json  |    0
 .../test/colorize-results/test2_pl.json       |    0
 .../test/colorize-results/test6916_js.json    |    0
 .../test/colorize-results/test_bat.json       |    0
 .../test/colorize-results/test_c.json         |    0
 .../test/colorize-results/test_cc.json        |    0
 .../test/colorize-results/test_clj.json       |    0
 .../test/colorize-results/test_coffee.json    |    0
 .../test/colorize-results/test_cpp.json       |    0
 .../test/colorize-results/test_cs.json        |    0
 .../test/colorize-results/test_cshtml.json    |    0
 .../test/colorize-results/test_css.json       |    0
 .../test/colorize-results/test_fs.json        |    0
 .../test/colorize-results/test_go.json        |    0
 .../test/colorize-results/test_groovy.json    |    0
 .../colorize-results/test_handlebars.json     |    0
 .../test/colorize-results/test_hbs.json       |    0
 .../test/colorize-results/test_hlsl.json      |    0
 .../test/colorize-results/test_html.json      |    0
 .../test/colorize-results/test_ini.json       |    0
 .../test/colorize-results/test_js.json        |    0
 .../test/colorize-results/test_json.json      |    0
 .../test/colorize-results/test_jsx.json       |    0
 .../test/colorize-results/test_less.json      |    0
 .../test/colorize-results/test_log.json       |    0
 .../test/colorize-results/test_lua.json       |    0
 .../test/colorize-results/test_m.json         |    0
 .../test/colorize-results/test_md.json        |    0
 .../test/colorize-results/test_mm.json        |    0
 .../test/colorize-results/test_php.json       |    0
 .../test/colorize-results/test_pl.json        |    0
 .../test/colorize-results/test_ps1.json       |    0
 .../test/colorize-results/test_pug.json       |    0
 .../test/colorize-results/test_r.json         |    0
 .../test/colorize-results/test_rb.json        |    0
 .../test/colorize-results/test_rs.json        |   24 +-
 .../test/colorize-results/test_scss.json      |    0
 .../test/colorize-results/test_sh.json        |    0
 .../test/colorize-results/test_shader.json    |    0
 .../test/colorize-results/test_sql.json       |    0
 .../test/colorize-results/test_swift.json     |    0
 .../test/colorize-results/test_ts.json        |   36 +-
 .../test/colorize-results/test_vb.json        |    0
 .../test/colorize-results/test_xml.json       |    0
 .../test/colorize-results/test_yaml.json      |    0
 .../colorize-results/tsconfig_off_json.json   |    0
 extensions/vscode-colorize-tests/yarn.lock    | 2011 +-----
 .../vscode-custom-editor-tests/package.json   |    8 +-
 .../src/test/index.ts                         |    2 +-
 .../vscode-custom-editor-tests/yarn.lock      |  488 +-
 extensions/vscode-notebook-tests/package.json |    7 +-
 extensions/vscode-notebook-tests/src/index.ts |    2 +-
 .../src/notebook.test.ts                      |  109 +-
 .../src/notebookTestMain.ts                   |   63 +-
 extensions/vscode-notebook-tests/yarn.lock    |  793 +--
 extensions/vscode-test-resolver/package.json  |   54 +-
 .../vscode-test-resolver/src/download.ts      |   21 +-
 .../vscode-test-resolver/src/extension.ts     |  165 +-
 .../src/util/processes.ts                     |    4 +-
 extensions/vscode-test-resolver/yarn.lock     | 1879 +-----
 extensions/yarn.lock                          |    8 +-
 gulpfile.js                                   |   39 +-
 package.json                                  |  106 +-
 product.json                                  |    6 +-
 remote/.yarnrc                                |    2 +-
 remote/package.json                           |   11 +-
 remote/web/package.json                       |    3 +-
 remote/web/yarn.lock                          |    8 +-
 remote/yarn.lock                              |   52 +-
 resources/completions/zsh/_code               |    4 +-
 resources/linux/debian/postinst.template      |    7 +-
 resources/web/code-web.js                     |   59 +-
 scripts/test-integration.bat                  |    8 +-
 scripts/test-integration.sh                   |   32 +-
 scripts/test.sh                               |    4 +-
 src/bootstrap-amd.js                          |    2 +
 src/bootstrap-fork.js                         |   56 +-
 src/bootstrap-node.js                         |    2 +-
 src/bootstrap-window.js                       |   74 +-
 src/main.js                                   |   67 +-
 src/tsconfig.tsec.json                        |   16 +
 src/tsec.exemptions.json                      |    5 +
 src/typings/require.d.ts                      |    1 +
 src/vs/base/browser/browser.ts                |    6 +-
 src/vs/base/browser/canIUse.ts                |    2 +-
 src/vs/base/browser/contextmenu.ts            |    2 +-
 src/vs/base/browser/dom.ts                    |   81 +-
 src/vs/base/browser/hash.ts                   |    9 +-
 src/vs/base/browser/markdownRenderer.ts       |   26 +-
 .../base/browser/ui/actionbar/actionbar.css   |    4 -
 .../ui/breadcrumbs/breadcrumbsWidget.ts       |   28 +-
 src/vs/base/browser/ui/button/button.ts       |   28 +-
 src/vs/base/browser/ui/checkbox/checkbox.ts   |    8 +-
 .../ui/codicons/codicon/codicon-modifiers.css |   30 +
 .../browser/ui/codicons/codicon/codicon.ttf   |  Bin 62836 -> 64268 bytes
 .../base/browser/ui/codicons/codiconStyles.ts |    3 +-
 src/vs/base/browser/ui/dialog/dialog.ts       |   10 +-
 src/vs/base/browser/ui/dropdown/dropdown.ts   |    8 +-
 .../ui/dropdown/dropdownActionViewItem.ts     |    8 +-
 src/vs/base/browser/ui/findinput/findInput.ts |    4 +
 .../ui/highlightedlabel/highlightedLabel.ts   |   10 +-
 src/vs/base/browser/ui/hover/hover.css        |    7 +-
 src/vs/base/browser/ui/hover/hoverWidget.ts   |    4 +-
 .../browser/ui/iconLabel/iconHoverDelegate.ts |    1 +
 src/vs/base/browser/ui/iconLabel/iconLabel.ts |   66 +-
 .../iconLabel/iconLabels.ts}                  |   17 +-
 .../base/browser/ui/iconLabel/iconlabel.css   |   14 +
 .../simpleIconLabel.ts}                       |    6 +-
 src/vs/base/browser/ui/inputbox/inputBox.css  |   18 +-
 src/vs/base/browser/ui/inputbox/inputBox.ts   |    6 +-
 src/vs/base/browser/ui/list/list.css          |    7 +-
 src/vs/base/browser/ui/list/listView.ts       |  143 +-
 src/vs/base/browser/ui/list/rowCache.ts       |    3 +-
 src/vs/base/browser/ui/menu/menu.ts           |    5 +-
 src/vs/base/browser/ui/menu/menubar.ts        |    6 +-
 .../browser/ui/scrollbar/abstractScrollbar.ts |   16 +-
 .../ui/scrollbar/horizontalScrollbar.ts       |    4 +-
 .../browser/ui/scrollbar/scrollableElement.ts |   31 +-
 .../ui/scrollbar/scrollableElementOptions.ts  |    6 +
 .../browser/ui/scrollbar/scrollbarArrow.ts    |    2 +-
 .../browser/ui/scrollbar/scrollbarState.ts    |   12 +-
 .../scrollbarVisibilityController.ts          |    4 +-
 .../browser/ui/scrollbar/verticalScrollbar.ts |    4 +-
 src/vs/base/browser/ui/toolbar/toolbar.ts     |    2 +-
 src/vs/base/browser/ui/tree/asyncDataTree.ts  |   32 +-
 .../ui/tree/compressedObjectTreeModel.ts      |   62 +-
 src/vs/base/browser/ui/tree/dataTree.ts       |   10 +-
 src/vs/base/browser/ui/tree/indexTreeModel.ts |  116 +-
 src/vs/base/browser/ui/tree/objectTree.ts     |   29 +-
 .../base/browser/ui/tree/objectTreeModel.ts   |   32 +-
 src/vs/base/common/actions.ts                 |   53 +-
 src/vs/base/common/async.ts                   |   76 +-
 src/vs/base/common/buffer.ts                  |    5 +-
 src/vs/base/common/codicon.ts                 |  135 -
 src/vs/base/common/codicons.ts                |   83 +-
 src/vs/base/common/errors.ts                  |    9 +
 src/vs/base/common/event.ts                   |   68 +-
 src/vs/base/common/extpath.ts                 |   17 +-
 src/vs/base/common/filters.ts                 |  389 +-
 src/vs/base/common/fuzzyScorer.ts             |    2 +-
 src/vs/base/common/glob.ts                    |   23 +-
 src/vs/base/common/htmlContent.ts             |   11 +-
 src/vs/base/common/iconLabels.ts              |  161 +
 src/vs/base/common/iterator.ts                |   33 +
 src/vs/base/common/labels.ts                  |   21 +-
 src/vs/base/common/lifecycle.ts               |   67 +-
 src/vs/base/common/network.ts                 |   44 +-
 src/vs/base/common/path.ts                    |    4 +-
 src/vs/base/common/performance.d.ts           |   12 +-
 src/vs/base/common/performance.js             |  111 +-
 src/vs/base/common/platform.ts                |   23 +
 src/vs/base/common/processes.ts               |    1 -
 src/vs/base/common/scrollable.ts              |   33 +-
 src/vs/base/common/stopwatch.ts               |    2 +-
 src/vs/base/common/stream.ts                  |   72 +-
 src/vs/base/common/uri.ts                     |    2 +-
 src/vs/base/node/languagePacks.js             |    8 +-
 src/vs/base/node/pfs.ts                       |  104 +-
 src/vs/base/node/powershell.ts                |  316 +
 src/vs/base/node/processes.ts                 |   12 +-
 src/vs/base/node/shell.ts                     |   93 +
 src/vs/base/parts/ipc/browser/ipc.mp.ts       |   22 +
 src/vs/base/parts/ipc/common/ipc.electron.ts  |    7 +-
 src/vs/base/parts/ipc/common/ipc.mp.ts        |   78 +
 src/vs/base/parts/ipc/common/ipc.net.ts       |   20 +-
 src/vs/base/parts/ipc/common/ipc.ts           |    8 +
 .../{ipc.electron-main.ts => ipc.electron.ts} |   10 +-
 src/vs/base/parts/ipc/electron-main/ipc.mp.ts |   57 +
 ...pc.electron-sandbox.ts => ipc.electron.ts} |   16 +-
 .../base/parts/ipc/electron-sandbox/ipc.mp.ts |   51 +
 src/vs/base/parts/ipc/node/ipc.net.ts         |  188 +-
 .../parts/ipc/test/browser/ipc.mp.test.ts     |   58 +
 .../ipc/test/electron-sandbox/ipc.mp.test.ts  |   28 +
 .../base/parts/ipc/test/node/ipc.cp.test.ts   |    2 +-
 .../base/parts/ipc/test/node/ipc.net.test.ts  |   56 +-
 .../quickinput/browser/media/quickInput.css   |    2 +-
 .../parts/quickinput/browser/quickInput.ts    |    8 +-
 .../quickinput/browser/quickInputList.ts      |   25 +-
 .../parts/quickinput/common/quickInput.ts     |    1 +
 .../parts/sandbox/common/electronTypes.ts     |    8 +-
 .../parts/sandbox/electron-browser/preload.js |   12 +
 .../sandbox/electron-sandbox/electronTypes.ts |   96 +-
 .../parts/sandbox/electron-sandbox/globals.ts |   10 +-
 src/vs/base/parts/storage/common/storage.ts   |   22 +-
 src/vs/base/parts/storage/node/storage.ts     |    8 +-
 .../parts/storage/test/node/storage.test.ts   |  346 +-
 src/vs/base/test/browser/actionbar.test.ts    |   22 +-
 src/vs/base/test/browser/comparers.test.ts    |   10 +-
 src/vs/base/test/browser/dom.test.ts          |    5 +-
 .../{codicons.test.ts => iconLabels.test.ts}  |   30 +-
 .../ui/scrollbar/scrollableElement.test.ts    |   16 +-
 .../ui/scrollbar/scrollbarState.test.ts       |   64 +-
 .../ui/tree/compressedObjectTreeModel.test.ts |   47 +-
 .../browser/ui/tree/indexTreeModel.test.ts    |  207 +-
 .../test/browser/ui/tree/objectTree.test.ts   |  168 +-
 src/vs/base/test/common/arrays.test.ts        |  174 +-
 src/vs/base/test/common/async.test.ts         |  211 +-
 .../base/test/{node => common}/buffer.test.ts |  142 +-
 src/vs/base/test/common/cancellation.test.ts  |   24 +-
 src/vs/base/test/common/charCode.test.ts      |    2 +-
 src/vs/base/test/common/codicon.test.ts       |   78 -
 .../test/{node => common}/console.test.ts     |    2 +-
 src/vs/base/test/common/diff/diff.test.ts     |   14 +-
 src/vs/base/test/common/extpath.test.ts       |  184 +-
 src/vs/base/test/common/filters.perf.test.ts  |    7 +-
 src/vs/base/test/common/filters.test.ts       |   27 +-
 src/vs/base/test/common/fuzzyScorer.test.ts   |  650 +-
 .../base/test/{node => common}/glob.test.ts   |   10 +-
 src/vs/base/test/common/iconLabels.test.ts    |   74 +
 src/vs/base/test/common/keyCodes.test.ts      |    2 +-
 src/vs/base/test/common/labels.test.ts        |  167 +-
 src/vs/base/test/common/linkedList.test.ts    |   14 +-
 src/vs/base/test/common/map.test.ts           |  488 +-
 .../base/test/common/markdownString.test.ts   |   18 +-
 src/vs/base/test/common/mime.test.ts          |   50 +-
 src/vs/base/test/common/network.test.ts       |    4 +-
 src/vs/base/test/common/paging.test.ts        |    1 -
 .../base/test/{node => common}/path.test.ts   |    8 +-
 src/vs/base/test/common/processes.test.ts     |    1 -
 src/vs/base/test/common/resources.test.ts     |  256 +-
 src/vs/base/test/common/scrollable.test.ts    |    2 +-
 src/vs/base/test/common/skipList.test.ts      |   45 +-
 src/vs/base/test/common/stream.test.ts        |  113 +-
 src/vs/base/test/common/strings.test.ts       |  124 +-
 src/vs/base/test/common/troubleshooting.ts    |   48 +
 src/vs/base/test/common/types.test.ts         |   18 +-
 src/vs/base/test/common/uri.test.ts           |  496 +-
 src/vs/base/test/common/utils.ts              |   39 +-
 src/vs/base/test/common/uuid.test.ts          |    4 +-
 src/vs/base/test/node/crypto.test.ts          |   23 +-
 src/vs/base/test/node/decoder.test.ts         |   14 +-
 src/vs/base/test/node/extpath.test.ts         |   68 +-
 src/vs/base/test/node/id.test.ts              |   21 +-
 src/vs/base/test/node/keytar.test.ts          |   42 +-
 src/vs/base/test/node/pfs/pfs.test.ts         |  468 +-
 src/vs/base/test/node/port.test.ts            |   10 +-
 src/vs/base/test/node/powershell.test.ts      |   83 +
 .../test/node/processes/processes.test.ts     |   12 +-
 src/vs/base/test/node/testUtils.ts            |   16 +
 src/vs/base/test/node/zip/zip.test.ts         |   33 +-
 src/vs/base/worker/defaultWorkerFactory.ts    |    7 +-
 .../code/browser/workbench/workbench-dev.html |    5 +-
 src/vs/code/browser/workbench/workbench.html  |    5 +-
 src/vs/code/browser/workbench/workbench.ts    |    1 -
 .../contrib/deprecatedExtensionsCleaner.ts    |   25 +
 .../contrib/localizationsUpdater.ts           |   23 +
 .../sharedProcess/sharedProcess.js            |    5 +-
 .../sharedProcess/sharedProcessMain.ts        |  432 +-
 .../electron-browser/workbench/workbench.html |    3 +-
 .../electron-browser/workbench/workbench.js   |   41 +-
 src/vs/code/electron-main/app.ts              |  156 +-
 src/vs/code/electron-main/auth.ts             |  250 +-
 src/vs/code/electron-main/auth2.ts            |  242 -
 src/vs/code/electron-main/main.ts             |   36 +-
 src/vs/code/electron-main/protocol.ts         |   10 +-
 src/vs/code/electron-main/sharedProcess.ts    |  267 +-
 src/vs/code/electron-main/window.ts           |  226 +-
 .../issue/issueReporterMain.ts                |   75 +-
 .../processExplorer/media/processExplorer.css |   39 +-
 .../processExplorer/processExplorer.html      |    2 +-
 .../processExplorer/processExplorerMain.ts    |  482 +-
 src/vs/code/electron-sandbox/proxy/auth.html  |   83 -
 src/vs/code/electron-sandbox/proxy/auth.js    |   48 -
 .../electron-sandbox/workbench/workbench.html |    3 +-
 .../electron-sandbox/workbench/workbench.js   |   30 +-
 src/vs/code/node/cli.ts                       |   30 +-
 src/vs/code/node/cliProcessMain.ts            |  505 +-
 src/vs/code/node/shellEnv.ts                  |    8 +-
 src/vs/editor/browser/config/configuration.ts |   52 +-
 .../editor/browser/controller/mouseHandler.ts |    7 +-
 .../editor/browser/controller/mouseTarget.ts  |   32 +-
 .../browser/controller/textAreaHandler.ts     |   12 +-
 .../browser/controller/textAreaInput.ts       |   92 +-
 .../browser/controller/textAreaState.ts       |   24 +-
 .../editor/browser/core/markdownRenderer.ts   |    6 +-
 src/vs/editor/browser/editorBrowser.ts        |   15 +-
 .../browser/services/bulkEditService.ts       |    2 +-
 .../browser/services/codeEditorServiceImpl.ts |    5 +-
 .../editor/browser/services/openerService.ts  |   46 +-
 .../browser/view/domLineBreaksComputer.ts     |    4 +-
 src/vs/editor/browser/view/viewImpl.ts        |   26 +-
 src/vs/editor/browser/view/viewLayer.ts       |   14 +-
 .../currentLineHighlight.ts                   |    4 +-
 .../browser/viewParts/lines/viewLine.ts       |    2 +-
 .../browser/viewParts/minimap/minimap.css     |    5 +
 .../browser/viewParts/minimap/minimap.ts      |    1 +
 .../viewParts/selections/selections.ts        |    2 +-
 .../editor/browser/widget/codeEditorWidget.ts |   19 +-
 .../editor/browser/widget/diffEditorWidget.ts |  126 +-
 src/vs/editor/browser/widget/diffReview.ts    |   18 +-
 .../widget/embeddedCodeEditorWidget.ts        |    2 +-
 .../common/config/commonEditorConfig.ts       |   11 +-
 src/vs/editor/common/config/editorOptions.ts  |   82 +-
 src/vs/editor/common/config/fontInfo.ts       |   21 +-
 src/vs/editor/common/controller/cursor.ts     |    6 +-
 .../common/controller/cursorMoveOperations.ts |   11 +-
 .../common/controller/cursorTypeOperations.ts |   11 +-
 src/vs/editor/common/diff/diffComputer.ts     |    7 +
 src/vs/editor/common/editorCommon.ts          |    8 +-
 src/vs/editor/common/editorContextKeys.ts     |    1 +
 src/vs/editor/common/model.ts                 |    8 +-
 .../pieceTreeTextBufferBuilder.ts             |    6 +-
 src/vs/editor/common/model/textModel.ts       |   25 +-
 src/vs/editor/common/model/textModelTokens.ts |   10 +-
 src/vs/editor/common/modes.ts                 |   33 +-
 .../common/modes/languageConfiguration.ts     |    2 +-
 .../modes/languageConfigurationRegistry.ts    |   12 +-
 src/vs/editor/common/modes/modesRegistry.ts   |    3 +-
 .../editor/common/modes/supports/onEnter.ts   |    6 +-
 .../common/modes/textToHtmlTokenizer.ts       |    6 +-
 .../common/services/getSemanticTokens.ts      |  160 +
 .../services/markerDecorationsServiceImpl.ts  |    8 +-
 .../services/markersDecorationService.ts      |    5 +-
 src/vs/editor/common/services/modeService.ts  |    2 +-
 .../editor/common/services/modeServiceImpl.ts |   11 +-
 .../common/services/modelServiceImpl.ts       |  158 +-
 .../common/services}/semanticTokensDto.ts     |    0
 .../common/standalone/standaloneEnums.ts      |   11 +-
 src/vs/editor/common/viewLayout/viewLayout.ts |    2 +-
 .../viewModel/monospaceLineBreaksComputer.ts  |   17 +
 .../common/viewModel/splitLinesCollection.ts  |   11 +-
 .../editor/common/viewModel/viewModelImpl.ts  |    4 +-
 .../test/bracketMatching.test.ts              |   56 +-
 src/vs/editor/contrib/clipboard/clipboard.ts  |    5 +-
 .../contrib/codelens/codelensController.ts    |    5 +-
 .../editor/contrib/codelens/codelensWidget.ts |    4 +-
 .../contrib/colorPicker/colorContributions.ts |    2 +-
 .../comment/test/lineCommentCommand.test.ts   |   64 +-
 .../cursorUndo/test/cursorUndo.test.ts        |   14 +-
 src/vs/editor/contrib/dnd/dnd.ts              |    5 +-
 .../documentSymbols.ts                        |   50 +-
 .../editor/contrib/documentSymbols/outline.ts |   18 -
 .../contrib/documentSymbols/outlineModel.ts   |   43 +-
 src/vs/editor/contrib/find/findWidget.css     |   10 +-
 src/vs/editor/contrib/find/findWidget.ts      |    2 +-
 src/vs/editor/contrib/find/test/find.test.ts  |   18 +-
 .../contrib/find/test/findController.test.ts  |   68 +-
 .../contrib/find/test/findModel.test.ts       |  302 +-
 .../contrib/find/test/replacePattern.test.ts  |   18 +-
 .../contrib/gotoError/gotoErrorWidget.ts      |   19 +-
 .../contrib/gotoSymbol/referencesModel.ts     |    2 +-
 src/vs/editor/contrib/hover/hover.ts          |   84 +-
 src/vs/editor/contrib/hover/hoverWidgets.ts   |  161 +-
 .../contrib/hover/markdownHoverParticipant.ts |  126 +
 .../contrib/hover/markerHoverParticipant.ts   |  257 +
 .../editor/contrib/hover/modesContentHover.ts |  600 +-
 .../inlineHints/inlineHintsController.ts      |  227 +
 .../linesOperations/linesOperations.ts        |   48 +-
 .../linesOperations/moveLinesCommand.ts       |    6 +-
 .../test/copyLinesCommand.test.ts             |    4 +-
 .../test/linesOperations.test.ts              |  387 +-
 src/vs/editor/contrib/links/links.ts          |    4 +-
 .../editor/contrib/multicursor/multicursor.ts |    6 -
 .../multicursor/test/multicursor.test.ts      |   86 +-
 .../contrib/parameterHints/parameterHints.css |    2 +-
 .../parameterHints/parameterHintsWidget.ts    |   23 +-
 .../parameterHints/provideSignatureHelp.ts    |   20 +-
 src/vs/editor/contrib/peekView/peekView.ts    |   24 +-
 .../quickAccess/commandsQuickAccess.ts        |    4 +-
 .../quickAccess/gotoSymbolQuickAccess.ts      |   49 +-
 .../contrib/smartSelect/bracketSelections.ts  |    2 +-
 .../smartSelect/test/smartSelect.test.ts      |   12 +-
 .../contrib/snippet/snippetVariables.ts       |   21 +-
 .../test/snippetController2.old.test.ts       |  112 +-
 .../snippet/test/snippetController2.test.ts   |   18 +-
 .../snippet/test/snippetParser.test.ts        |    4 +-
 .../snippet/test/snippetSession.test.ts       |  130 +-
 .../snippet/test/snippetVariables.test.ts     |   74 +-
 src/vs/editor/contrib/suggest/suggestModel.ts |    8 +-
 .../editor/contrib/suggest/suggestWidget.ts   |   34 +-
 .../contrib/suggest/suggestWidgetRenderer.ts  |    2 +-
 .../contrib/suggest/suggestWidgetStatus.ts    |   46 +-
 .../suggest/test/suggestController.test.ts    |    1 +
 .../contrib/suggest/test/suggestModel.test.ts |    2 +-
 .../viewportSemanticTokens.ts                 |    8 +-
 .../test/wordOperations.test.ts               |  162 +-
 .../contrib/wordOperations/wordOperations.ts  |    2 +-
 .../test/wordPartOperations.test.ts           |   22 +-
 src/vs/editor/editor.all.ts                   |    3 +-
 src/vs/editor/editor.api.ts                   |   10 +-
 src/vs/editor/standalone/browser/colorizer.ts |    6 +-
 .../browser/inspectTokens/inspectTokens.ts    |   10 +-
 .../standalone/browser/simpleServices.ts      |   10 +-
 .../standalone/browser/standalone-tokens.css  |   13 +
 .../browser/standaloneCodeEditor.ts           |   62 +-
 .../standalone/browser/standaloneEditor.ts    |   55 +-
 .../standalone/browser/standaloneLanguages.ts |   26 +-
 .../browser/standaloneThemeServiceImpl.ts     |   26 +-
 .../common/monarch/monarchCommon.ts           |    1 +
 .../common/monarch/monarchCompile.ts          |    2 +
 .../standalone/common/monarch/monarchLexer.ts |   46 +-
 .../standalone/common/monarch/monarchTypes.ts |    5 +
 .../common/standaloneThemeService.ts          |    4 +
 src/vs/editor/standalone/common/themes.ts     |    2 +-
 .../test/browser/standaloneLanguages.test.ts  |   11 +-
 .../standalone/test/monarch/monarch.test.ts   |  143 +-
 .../browser/commands/shiftCommand.test.ts     |    4 +-
 .../test/browser/commands/sideEditing.test.ts |    6 +-
 .../trimTrailingWhitespaceCommand.test.ts     |    4 +-
 .../test/browser/controller/cursor.test.ts    |  773 ++-
 .../controller/cursorMoveCommand.test.ts      |    4 +-
 .../browser/controller/textAreaState.test.ts  |   26 +-
 .../test/browser/core/editorState.test.ts     |   12 +-
 .../services/decorationRenderOptions.test.ts  |   14 +-
 src/vs/editor/test/browser/testCodeEditor.ts  |    9 +-
 .../browser/view/minimapCharRenderer.test.ts  |    4 +-
 .../test/browser/view/viewLayer.test.ts       |   10 +-
 .../common/config/commonEditorConfig.test.ts  |   40 +-
 .../controller/cursorMoveHelper.test.ts       |   60 +-
 .../common/core/characterClassifier.test.ts   |   34 +-
 .../test/common/core/lineTokens.test.ts       |  106 +-
 src/vs/editor/test/common/core/range.test.ts  |  100 +-
 .../test/common/diff/diffComputer.test.ts     |    9 +-
 .../test/common/mocks/testConfiguration.ts    |    1 +
 .../common/model/benchmark/benchmarkUtils.ts  |    2 +-
 .../common/model/editableTextModel.test.ts    |   22 +-
 .../test/common/model/intervalTree.test.ts    |    8 +-
 .../linesTextBuffer/linesTextBuffer.test.ts   |    6 +-
 .../linesTextBufferBuilder.test.ts            |    8 +-
 .../textBufferAutoTestUtils.ts                |   21 +-
 .../test/common/model/model.line.test.ts      |    6 +-
 .../test/common/model/model.modes.test.ts     |   10 +-
 src/vs/editor/test/common/model/model.test.ts |  190 +-
 .../common/model/modelDecorations.test.ts     |   68 +-
 .../common/model/modelEditOperation.test.ts   |   18 +-
 .../pieceTreeTextBuffer.test.ts               |  358 +-
 .../test/common/model/textChange.test.ts      |    4 +-
 .../test/common/model/textModel.test.ts       |  440 +-
 .../test/common/model/textModelSearch.test.ts |   30 +-
 .../common/model/textModelWithTokens.test.ts  |   30 +-
 .../test/common/model/tokensStore.test.ts     |   16 +-
 .../modes/languageConfiguration.test.ts       |   80 +-
 .../common/modes/languageSelector.test.ts     |   90 +-
 .../test/common/modes/linkComputer.test.ts    |    4 +-
 .../modes/supports/characterPair.test.ts      |  104 +-
 .../modes/supports/electricCharacter.test.ts  |    6 +-
 .../modes/supports/javascriptOnEnterRules.ts  |    2 +-
 .../common/modes/supports/onEnter.test.ts     |   18 +-
 .../modes/supports/richEditBrackets.test.ts   |   38 +-
 .../modes/supports/tokenization.test.ts       |   46 +-
 .../common/modes/textToHtmlTokenizer.test.ts  |   28 +-
 .../services/editorSimpleWorker.test.ts       |   39 +-
 .../common/services/languagesRegistry.test.ts |  136 +-
 .../test/common/services/modelService.test.ts |  165 +-
 .../services}/semanticTokensDto.test.ts       |    6 +-
 .../testTextResourcePropertiesService.ts      |   27 +
 .../common/view/overviewZoneManager.test.ts   |    6 +-
 .../viewLayout/editorLayoutProvider.test.ts   |    2 +-
 .../common/viewLayout/lineDecorations.test.ts |   22 +-
 .../common/viewLayout/linesLayout.test.ts     | 1666 ++---
 .../viewLayout/viewLineRenderer.test.ts       |   82 +-
 .../monospaceLineBreaksComputer.test.ts       |   66 +-
 .../viewModel/prefixSumComputer.test.ts       |  206 +-
 .../viewModel/splitLinesCollection.test.ts    |  235 +-
 .../viewModel/viewModelDecorations.test.ts    |  228 +-
 .../common/viewModel/viewModelImpl.test.ts    |   50 +-
 .../node/classification/typescript.test.ts    |    2 +-
 src/vs/loader.js                              |   20 +-
 src/vs/monaco.d.ts                            |   88 +-
 .../browser/menuEntryActionViewItem.css       |   14 +
 .../browser/menuEntryActionViewItem.ts        |  129 +-
 src/vs/platform/actions/common/actions.ts     |   80 +-
 src/vs/platform/actions/common/menuService.ts |   56 +-
 .../electron-main/backupMainService.test.ts   |  250 +-
 .../common/configurationModels.ts             |    5 +-
 .../common/configurationRegistry.ts           |    7 +
 .../common/configurationService.ts            |    3 +-
 .../contextkey/browser/contextKeyService.ts   |   44 +-
 .../platform/contextkey/common/contextkey.ts  |    4 +-
 .../test/browser/contextkey.test.ts           |    8 +-
 .../contextkey/test/common/contextkey.test.ts |   30 +-
 .../contextview/browser/contextMenuHandler.ts |    2 +-
 .../debug/common/extensionHostDebug.ts        |    9 -
 .../debug/common/extensionHostDebugIpc.ts     |   16 +-
 .../electron-main/extensionHostDebugIpc.ts    |    3 +-
 .../diagnostics/node/diagnosticsService.ts    |    8 +-
 src/vs/platform/dialogs/common/dialogs.ts     |    1 +
 .../{dialogs.ts => dialogMainService.ts}      |    0
 src/vs/platform/environment/common/argv.ts    |    1 +
 src/vs/platform/environment/node/argv.ts      |    9 +-
 .../test/node/environmentService.test.ts      |   48 +-
 .../test/node/nativeModules.test.ts           |    7 +-
 .../common/extensionGalleryService.ts         |  110 +-
 .../common/extensionManagement.ts             |   16 +
 .../common/extensionManagementCLIService.ts   |  347 ++
 .../common/extensionManagementUtil.ts         |    6 +-
 .../electron-sandbox/extensionTipsService.ts  |   14 +
 .../common/extensionGalleryService.test.ts    |   48 +
 .../test/node/extensionGalleryService.test.ts |   67 -
 .../common/extensionRecommendations.ts        |    9 +
 .../browser/indexedDBFileSystemProvider.ts    |  385 +-
 src/vs/platform/files/common/fileService.ts   |  145 +-
 src/vs/platform/files/common/files.ts         |    6 +-
 src/vs/platform/files/common/io.ts            |    7 +-
 .../files/node/diskFileSystemProvider.ts      |    2 +-
 .../node/watcher/nsfw/nsfwWatcherService.ts   |   24 +-
 .../nsfw/test/nsfwWatcherService.test.ts      |   28 +-
 .../files/node/watcher/nsfw/watcherService.ts |    6 +-
 .../watcher/unix/chokidarWatcherService.ts    |    9 +-
 .../unix/test/chockidarWatcherService.test.ts |    6 +-
 .../files/node/watcher/unix/watcherService.ts |    6 +-
 .../files/test/browser/fileService.test.ts    |   48 +-
 .../test/browser/indexedDBFileService.test.ts |  344 +-
 .../electron-browser/diskFileService.test.ts  |  706 +--
 .../test/electron-browser/normalizer.test.ts  |   12 +-
 .../common/instantiationService.ts            |   21 +-
 .../electron-browser/sharedProcessService.ts  |   56 +-
 .../electron-main/sharedProcessMainService.ts |   36 -
 .../electron-sandbox/mainProcessService.ts    |   35 +-
 src/vs/platform/issue/common/issue.ts         |    2 +-
 .../issue/electron-main/issueMainService.ts   |  198 +-
 .../keybinding/common/keybindingResolver.ts   |   36 -
 .../common/abstractKeybindingService.test.ts  |  110 +-
 .../test/common/keybindingLabels.test.ts      |    8 +-
 .../test/common/keybindingResolver.test.ts    |   44 +-
 src/vs/platform/label/common/label.ts         |    4 +-
 .../launch/electron-main/launchMainService.ts |   86 +-
 .../electron-main/lifecycleMainService.ts     |    2 +-
 src/vs/platform/list/browser/listService.ts   |   16 +-
 .../localizations/common/localizations.ts     |    2 +
 src/vs/platform/log/node/loggerService.ts     |    6 +-
 .../platform/markers/common/markerService.ts  |    7 +-
 .../platform/menubar/electron-main/menubar.ts |   44 +-
 src/vs/platform/native/common/native.ts       |    3 +-
 .../electron-main/nativeHostMainService.ts    |   29 +-
 src/vs/platform/opener/browser/link.ts        |   29 +-
 src/vs/platform/opener/common/opener.ts       |   32 +-
 src/vs/platform/product/common/product.ts     |    2 +-
 .../platform/product/common/productService.ts |    2 +
 .../remote/browser/browserSocketFactory.ts    |    2 +-
 .../remote/common/remoteAgentConnection.ts    |  272 +-
 .../remote/common/remoteAgentEnvironment.ts   |    2 +
 src/vs/platform/remote/common/remoteHosts.ts  |    2 +-
 src/vs/platform/remote/common/tunnel.ts       |  189 +-
 .../platform/remote/node/nodeSocketFactory.ts |    2 +-
 src/vs/platform/remote/node/tunnelService.ts  |   33 +-
 .../sharedProcess/node/sharedProcess.ts       |   34 +
 src/vs/platform/state/node/state.ts           |    2 +
 src/vs/platform/state/node/stateService.ts    |    2 +-
 src/vs/platform/state/test/node/state.test.ts |   42 +-
 src/vs/platform/storage/node/storageIpc.ts    |    4 +-
 .../platform/storage/node/storageService.ts   |   19 +-
 .../test/common/storageService.test.ts        |   38 +-
 .../test/electron-browser/storage.test.ts     |   39 +-
 .../storage/test/node/storageService.test.ts  |   46 +-
 .../{node => common}/commonProperties.ts      |   33 +-
 .../{node => common}/telemetryIpc.ts          |    0
 src/vs/platform/theme/common/colorRegistry.ts |    6 +
 src/vs/platform/theme/common/iconRegistry.ts  |   30 +-
 src/vs/platform/theme/common/themeService.ts  |   49 +-
 .../theme/test/common/testThemeService.ts     |    9 +-
 src/vs/platform/undoRedo/common/undoRedo.ts   |    8 +
 .../undoRedo/common/undoRedoService.ts        |   51 +-
 .../test/common/undoRedoService.test.ts       |  158 +-
 .../electron-main/updateService.darwin.ts     |    8 +-
 .../electron-main/updateService.win32.ts      |    2 +-
 .../common/extensionsStorageSync.ts           |    3 +-
 .../userDataSync/common/extensionsSync.ts     |  101 +-
 .../userDataSync/common/userDataSync.ts       |   15 +-
 .../common/userDataSyncService.ts             |  214 +-
 .../common/userDataSyncStoreService.ts        |    9 +-
 .../test/common/synchronizer.test.ts          |  102 +-
 .../common/userDataAutoSyncService.test.ts    |   32 +-
 .../test/common/userDataSyncClient.ts         |   24 +-
 .../common/userDataSyncStoreService.test.ts   |    6 +-
 .../platform/webview/common/resourceLoader.ts |   22 +-
 .../webview/common/webviewPortMapping.ts      |   10 +-
 .../electron-main/webviewMainService.ts       |    4 +-
 .../electron-main/webviewProtocolProvider.ts  |   57 +-
 src/vs/platform/windows/common/windows.ts     |  115 +-
 .../platform/windows/electron-main/windows.ts |   39 +-
 .../windows/electron-main/windowsFinder.ts    |   79 +
 .../electron-main/windowsMainService.ts       | 1124 ++--
 .../electron-main/windowsStateHandler.ts      |  450 ++
 .../electron-main/windowsStateStorage.ts      |   93 -
 src/vs/platform/windows/node/window.ts        |  150 -
 .../windows/{common => node}/windowTracker.ts |    0
 .../windows/test/electron-main/window.test.ts |  109 +
 ...ge.test.ts => windowsStateHandler.test.ts} |  106 +-
 .../platform/windows/test/node/window.test.ts |  127 -
 src/vs/platform/workspace/common/workspace.ts |   85 +-
 .../workspace/test/common/workspace.test.ts   |   23 +-
 .../platform/workspaces/common/workspaces.ts  |  239 +-
 .../workspacesHistoryMainService.ts           |  171 +-
 .../electron-main/workspacesMainService.ts    |  338 +-
 .../workspacesManagementMainService.ts        |  394 ++
 .../electron-main/workspacesService.ts        |   81 -
 .../workspaces/test/common/workspaces.test.ts |   32 +
 .../workspacesHistoryStorage.test.ts          |   17 +-
 ...> workspacesManagementMainService.test.ts} |  165 +-
 src/vs/vscode.d.ts                            |  109 +-
 src/vs/vscode.proposed.d.ts                   |  508 +-
 .../api/browser/extensionHost.contribution.ts |    4 +
 .../api/browser/mainThreadAuthentication.ts   |   56 +-
 .../api/browser/mainThreadBulkEdits.ts        |   34 +-
 .../api/browser/mainThreadCLICommands.ts      |  108 +
 .../api/browser/mainThreadConsole.ts          |   11 +-
 .../api/browser/mainThreadCustomEditors.ts    |    9 +-
 .../api/browser/mainThreadDebugService.ts     |    2 +-
 .../api/browser/mainThreadEditorTabs.ts       |   79 +
 .../api/browser/mainThreadEditors.ts          |    2 +-
 .../api/browser/mainThreadExtensionService.ts |   36 +-
 .../mainThreadFileSystemEventService.ts       |  161 +-
 .../api/browser/mainThreadLanguageFeatures.ts |   30 +-
 .../api/browser/mainThreadMessageService.ts   |    6 +-
 .../api/browser/mainThreadNotebook.ts         |   17 +-
 .../api/browser/mainThreadSecretState.ts      |   73 +
 .../workbench/api/browser/mainThreadTask.ts   |   12 +-
 .../api/browser/mainThreadTerminalService.ts  |  122 +-
 .../api/browser/mainThreadTesting.ts          |   60 +-
 .../api/browser/mainThreadTreeViews.ts        |    4 +-
 .../api/browser/mainThreadTunnelService.ts    |   80 +-
 .../api/browser/mainThreadUriOpeners.ts       |  132 +
 .../api/browser/mainThreadWebviewPanels.ts    |    8 +-
 .../api/browser/mainThreadWebviews.ts         |    2 +-
 .../workbench/api/browser/mainThreadWindow.ts |    6 +-
 .../api/browser/mainThreadWorkspace.ts        |   24 +-
 .../api/browser/viewsExtensionPoint.ts        |   84 +-
 src/vs/workbench/api/common/apiCommands.ts    |    9 +-
 .../workbench/api/common/exHostSecretState.ts |   38 +
 .../workbench/api/common/extHost.api.impl.ts  |   72 +-
 .../api/common/extHost.common.services.ts     |    2 +
 .../workbench/api/common/extHost.protocol.ts  |  124 +-
 .../api/common/extHostApiCommands.ts          |   67 +-
 .../api/common/extHostAuthentication.ts       |  118 +-
 .../workbench/api/common/extHostCommands.ts   |   11 +-
 .../api/common/extHostCustomEditors.ts        |   12 +-
 .../api/common/extHostDebugService.ts         |    2 +-
 .../workbench/api/common/extHostEditorTabs.ts |   39 +
 .../api/common/extHostExtensionService.ts     |   37 +-
 .../common/extHostFileSystemEventService.ts   |   45 +-
 .../api/common/extHostLanguageFeatures.ts     |   55 +-
 .../api/common/extHostMessageService.ts       |    6 +
 .../workbench/api/common/extHostNotebook.ts   |   45 +-
 .../api/common/extHostNotebookDocument.ts     |    9 +-
 .../api/common/extHostRequireInterceptor.ts   |    3 +
 src/vs/workbench/api/common/extHostSecrets.ts |   43 +
 .../workbench/api/common/extHostStatusBar.ts  |   18 +-
 .../api/common/extHostTerminalService.ts      |  207 +-
 src/vs/workbench/api/common/extHostTesting.ts |  452 +-
 .../workbench/api/common/extHostTreeViews.ts  |   24 +-
 .../api/common/extHostTunnelService.ts        |   24 +-
 .../api/common/extHostTypeConverters.ts       |   33 +-
 src/vs/workbench/api/common/extHostTypes.ts   |   56 +-
 .../workbench/api/common/extHostUriOpener.ts  |   74 +
 .../api/common/extHostWebviewPanels.ts        |    4 +-
 .../workbench/api/common/extHostWorkspace.ts  |   36 +-
 .../api/common/shared/workspaceContains.ts    |    3 +-
 src/vs/workbench/api/node/extHostCLIServer.ts |   38 +-
 .../workbench/api/node/extHostDebugService.ts |    2 +-
 .../api/node/extHostExtensionService.ts       |   13 +-
 src/vs/workbench/api/node/extHostTask.ts      |    7 +-
 .../api/node/extHostTerminalService.ts        |   21 +-
 .../api/node/extHostTunnelService.ts          |  285 +-
 .../api/worker/extHostExtensionService.ts     |   68 +-
 .../browser/actions/layoutActions.ts          |  216 +-
 .../browser/actions/navigationActions.ts      |   15 +-
 .../browser/actions/textInputActions.ts       |   29 +-
 .../browser/actions/windowActions.ts          |   38 +-
 .../browser/actions/workspaceActions.ts       |    6 +-
 .../editor/editorWidgets.ts => codeeditor.ts} |  114 +-
 src/vs/workbench/browser/composite.ts         |   16 +-
 src/vs/workbench/browser/contextkeys.ts       |   16 +-
 src/vs/workbench/browser/dnd.ts               |    2 +-
 src/vs/workbench/browser/editor.ts            |    1 -
 src/vs/workbench/browser/labels.ts            |   35 +-
 src/vs/workbench/browser/layout.ts            |   77 +-
 src/vs/workbench/browser/menuActions.ts       |   99 +
 src/vs/workbench/browser/panecomposite.ts     |   30 +-
 src/vs/workbench/browser/panel.ts             |   63 +-
 src/vs/workbench/browser/part.ts              |    2 +-
 .../parts/activitybar/activitybarActions.ts   |  121 +-
 .../parts/activitybar/activitybarPart.ts      |  282 +-
 .../workbench/browser/parts/compositeBar.ts   |   38 +-
 .../browser/parts/compositeBarActions.ts      |   29 +-
 .../workbench/browser/parts/compositePart.ts  |   12 -
 .../parts/dialogs/dialog.web.contribution.ts  |    4 +-
 .../parts/editor/breadcrumbsControl.ts        |  321 +-
 .../browser/parts/editor/breadcrumbsModel.ts  |  260 +-
 .../browser/parts/editor/breadcrumbsPicker.ts |  283 +-
 .../parts/editor/editor.contribution.ts       |    8 +-
 .../browser/parts/editor/editorActions.ts     |  104 +-
 .../browser/parts/editor/editorCommands.ts    |   18 +-
 .../browser/parts/editor/editorDropTarget.ts  |    3 +-
 .../browser/parts/editor/editorGroupView.ts   |   20 +-
 .../browser/parts/editor/editorStatus.ts      |  157 +-
 .../parts/editor/media/notabstitlecontrol.css |   37 +-
 .../parts/editor/media/tabstitlecontrol.css   |  126 +-
 .../parts/editor/media/titlecontrol.css       |   14 +-
 .../parts/editor/noTabsTitleControl.ts        |   28 +-
 .../browser/parts/editor/rangeDecorations.ts  |  121 -
 .../browser/parts/editor/tabsTitleControl.ts  |  328 +-
 .../browser/parts/editor/textDiffEditor.ts    |    8 +-
 .../browser/parts/editor/textEditor.ts        |    1 -
 .../browser/parts/editor/titleControl.ts      |   79 +-
 .../notifications/notificationsCenter.ts      |    4 +-
 .../parts/notifications/notificationsList.ts  |    4 +-
 .../notifications/notificationsViewer.ts      |    4 +-
 .../browser/parts/panel/panelActions.ts       |  190 +-
 .../browser/parts/panel/panelPart.ts          |   73 +-
 .../parts/sidebar/media/sidebarpart.css       |    5 -
 .../browser/parts/sidebar/sidebarPart.ts      |    5 +-
 .../browser/parts/statusbar/statusbarPart.ts  |   42 +-
 .../parts/titlebar/media/titlebarpart.css     |   25 +-
 .../browser/parts/titlebar/menubarControl.ts  |  108 +-
 .../browser/parts/titlebar/titlebarPart.ts    |   48 +-
 .../workbench/browser/parts/views/treeView.ts |   59 +-
 .../browser/parts/views/viewMenuActions.ts    |  105 -
 .../workbench/browser/parts/views/viewPane.ts |  642 ++
 .../browser/parts/views/viewPaneContainer.ts  |  749 +--
 .../browser/parts/views/viewsService.ts       |   28 +-
 .../browser/parts/views/viewsViewlet.ts       |   19 +-
 src/vs/workbench/browser/style.ts             |    4 +-
 src/vs/workbench/browser/viewlet.ts           |   98 +-
 src/vs/workbench/browser/web.main.ts          |  111 +-
 src/vs/workbench/browser/window.ts            |  161 +
 .../browser/workbench.contribution.ts         |   40 +-
 src/vs/workbench/browser/workbench.ts         |   23 +-
 src/vs/workbench/common/actions.ts            |    1 +
 src/vs/workbench/common/composite.ts          |    5 +
 src/vs/workbench/common/dialogs.ts            |    2 +
 src/vs/workbench/common/editor.ts             |   20 +-
 .../common/editor/diffEditorInput.ts          |    8 +-
 .../common/editor/diffEditorModel.ts          |   12 +-
 src/vs/workbench/common/editor/editorGroup.ts |    7 +
 .../common/editor/resourceEditorInput.ts      |    2 +-
 .../common/editor/resourceEditorModel.ts      |    2 +-
 .../common/editor/textDiffEditorModel.ts      |   14 +-
 .../common/editor/textEditorModel.ts          |    6 +-
 .../common/editor/textResourceEditorInput.ts  |   15 +-
 src/vs/workbench/common/panel.ts              |    2 +
 src/vs/workbench/common/theme.ts              |    4 +-
 src/vs/workbench/common/views.ts              |   35 +-
 .../contrib/backup/common/backupTracker.ts    |    4 +-
 .../backup/electron-sandbox/backupTracker.ts  |   69 +-
 .../backupRestorer.test.ts                    |   81 +-
 .../backup/test/browser/backupTracker.test.ts |  155 +
 .../electron-browser/backupTracker.test.ts    |  204 +-
 .../bulkEdit/browser/bulkEditService.ts       |   32 +-
 .../contrib/bulkEdit/browser/bulkFileEdits.ts |  302 +-
 .../bulkEdit/browser/preview/bulkEditPane.ts  |    2 +-
 .../bulkEdit/browser/preview/bulkEditTree.ts  |   16 +-
 .../browser/callHierarchyPeek.ts              |    8 -
 .../browser/accessibility/accessibility.ts    |    2 +-
 .../codeEditor/browser/diffEditorHelper.ts    |    8 +-
 .../languageConfigurationExtensionPoint.ts    |  287 +-
 .../browser/largeFileOptimizations.ts         |    2 +-
 .../browser/outline/documentSymbolsOutline.ts |  429 ++
 .../browser/outline/documentSymbolsTree.css}  |   13 +-
 .../browser/outline/documentSymbolsTree.ts}   |  189 +-
 .../quickaccess/gotoLineQuickAccess.ts        |    8 +-
 .../quickaccess/gotoSymbolQuickAccess.ts      |  134 +-
 .../test/browser/saveParticipant.test.ts      |   28 +-
 .../comments/browser/commentThreadWidget.ts   |   13 +-
 .../comments/browser/commentsTreeViewer.ts    |    1 +
 .../contrib/comments/browser/commentsView.ts  |   58 +-
 .../customEditor/browser/customEditors.ts     |   26 +-
 .../browser/breakpointEditorContribution.ts   |   42 +-
 .../contrib/debug/browser/breakpointWidget.ts |    3 +
 .../contrib/debug/browser/breakpointsView.ts  |  645 +-
 .../browser/callStackEditorContribution.ts    |   20 +-
 .../contrib/debug/browser/callStackView.ts    |   97 +-
 .../debug/browser/debug.contribution.ts       |  162 +-
 .../debug/browser/debugActionViewItems.ts     |    8 +-
 .../contrib/debug/browser/debugActions.ts     |  421 --
 .../debug/browser/debugAdapterManager.ts      |    5 -
 .../contrib/debug/browser/debugColors.ts      |  128 +-
 .../contrib/debug/browser/debugCommands.ts    |  104 +-
 .../debug/browser/debugEditorActions.ts       |   90 +-
 .../debug/browser/debugEditorContribution.ts  |    6 +-
 .../contrib/debug/browser/debugHover.ts       |    2 +-
 .../contrib/debug/browser/debugIcons.ts       |   44 +-
 .../contrib/debug/browser/debugQuickAccess.ts |    3 +-
 .../contrib/debug/browser/debugService.ts     |   45 +-
 .../contrib/debug/browser/debugSession.ts     |   17 +-
 .../contrib/debug/browser/debugTaskRunner.ts  |    8 +-
 .../contrib/debug/browser/debugToolBar.ts     |  219 +-
 .../contrib/debug/browser/debugViewlet.ts     |  270 +-
 .../contrib/debug/browser/linkDetector.ts     |   52 +-
 .../debug/browser/loadedScriptsView.ts        |    2 +-
 .../debug/browser/media/debugViewlet.css      |   14 +-
 .../contrib/debug/browser/media/repl.css      |    4 +
 .../contrib/debug/browser/rawDebugSession.ts  |    4 +
 .../workbench/contrib/debug/browser/repl.ts   |  349 +-
 .../contrib/debug/browser/replViewer.ts       |   33 +-
 .../contrib/debug/browser/variablesView.ts    |   93 +-
 .../debug/browser/watchExpressionsView.ts     |  165 +-
 .../contrib/debug/browser/welcomeView.ts      |   12 +-
 .../workbench/contrib/debug/common/debug.ts   |   20 +-
 .../contrib/debug/common/debugModel.ts        |   24 +-
 .../contrib/debug/common/debugProtocol.d.ts   |   11 +-
 .../contrib/debug/common/debugViewModel.ts    |   22 +-
 .../contrib/debug/common/replModel.ts         |   14 +-
 .../contrib/debug/node/debugHelperService.ts  |    6 +-
 .../contrib/debug/node/telemetryApp.ts        |    2 +-
 .../workbench/contrib/debug/node/terminals.ts |    6 +-
 .../debug/test/browser/breakpoints.test.ts    |    4 +-
 .../debug/test/browser/callStack.test.ts      |   47 +-
 .../debugANSIHandling.test.ts                 |    0
 .../debug/test/browser/linkDetector.test.ts   |   10 +-
 .../contrib/debug/test/browser/mockDebug.ts   |  126 +-
 .../contrib/debug/test/browser/repl.test.ts   |   14 +-
 .../contrib/debug/test/node/debugger.test.ts  |    2 +-
 .../abstractRuntimeExtensionsEditor.ts        |   33 +-
 .../extensions/browser/extensionEditor.ts     |   60 +-
 ...ensionRecommendationNotificationService.ts |   18 +-
 .../browser/extensions.contribution.ts        | 1506 ++---
 .../extensions/browser/extensionsActions.ts   |  726 +--
 .../extensions/browser/extensionsViewlet.ts   |  161 +-
 .../extensions/browser/extensionsViews.ts     |  126 +-
 .../browser/extensionsWorkbenchService.ts     |   24 +-
 .../extensions/browser/media/extension.css    |    4 +
 .../browser/remoteExtensionsInstaller.ts      |   59 -
 .../contrib/extensions/common/extensions.ts   |   15 +-
 .../extensions.contribution.ts                |    4 +-
 .../reportExtensionIssueAction.ts             |    8 +-
 .../extensionRecommendationsService.test.ts   |   51 +-
 .../extensionsActions.test.ts                 |   82 +-
 .../electron-browser/extensionsViews.test.ts  |    5 +-
 .../extensionsWorkbenchService.test.ts        |    5 +-
 .../externalUriOpener/common/configuration.ts |   73 +
 .../common/contributedOpeners.ts              |   86 +
 .../common/externalUriOpener.contribution.ts  |   15 +
 .../common/externalUriOpenerService.ts        |  216 +
 .../common/externalUriOpenerService.test.ts   |  128 +
 .../files/browser/editors/binaryFileEditor.ts |   10 +-
 .../files/browser/editors/textFileEditor.ts   |   26 +-
 .../contrib/files/browser/explorerService.ts  |   44 +-
 .../contrib/files/browser/explorerViewlet.ts  |   11 +-
 .../files/browser/fileActions.contribution.ts |    9 +-
 .../contrib/files/browser/fileActions.ts      |  148 +-
 .../contrib/files/browser/fileCommands.ts     |   17 +-
 .../files/browser/files.contribution.ts       |   10 +-
 .../workbench/contrib/files/browser/files.ts  |    3 +-
 .../files/browser/media/explorerviewlet.css   |    2 +-
 .../contrib/files/browser/views/emptyView.ts  |    2 +-
 .../files/browser/views/explorerView.ts       |  147 +-
 .../files/browser/views/explorerViewer.ts     |    4 +-
 .../files/browser/views/openEditorsView.ts    |  125 +-
 .../contrib/files/common/workspaceWatcher.ts  |    2 +-
 .../files/electron-sandbox/textFileEditor.ts  |   28 +-
 .../files/test/browser/editorAutoSave.test.ts |    4 +-
 .../files/test/browser/fileActions.test.ts    |   32 +-
 .../test/browser/fileEditorInput.test.ts      |   54 +-
 .../test/browser/fileOnDiskProvider.test.ts   |    6 +-
 .../files/test/browser/textFileEditor.test.ts |    5 +-
 .../browser/textFileEditorTracker.test.ts     |    8 +-
 .../format/browser/formatActionsMultiple.ts   |   31 +-
 .../issue/electron-sandbox/issueService.ts    |   14 +-
 .../browser/localizations.contribution.ts     |    2 +-
 .../markers/browser/markers.contribution.ts   |  275 +-
 .../contrib/markers/browser/markers.ts        |   20 +
 .../contrib/markers/browser/markersModel.ts   |    1 +
 .../markers/browser/markersTreeViewer.ts      |   30 +-
 .../contrib/markers/browser/markersView.ts    |   86 +-
 .../markers/browser/markersViewActions.ts     |   58 +-
 .../contrib/markers/browser/messages.ts       |    4 +-
 .../contrib/notebook/browser/constants.ts     |    4 +-
 .../notebook/browser/contrib/coreActions.ts   |  241 +-
 .../browser/contrib/find/findController.ts    |    4 +-
 .../contrib/outline/notebookOutline.css       |   45 +
 .../contrib/outline/notebookOutline.ts        |  607 ++
 .../browser/contrib/status/editorStatus.ts    |   58 +-
 .../browser/contrib/toc/tocProvider.ts        |   72 -
 .../notebook/browser/diff/cellComponents.ts   | 1091 ----
 .../browser/diff/celllDiffViewModel.ts        |   48 -
 .../contrib/notebook/browser/diff/common.ts   |   31 -
 .../notebook/browser/diff/diffComponents.ts   | 1463 +++++
 .../browser/diff/diffElementOutputs.ts        |  361 ++
 .../browser/diff/diffElementViewModel.ts      |  498 ++
 .../browser/diff/diffNestedCellViewModel.ts   |  123 +
 .../notebook/browser/diff/eventDispatcher.ts  |   58 +
 .../notebook/browser/diff/notebookDiff.css    |  155 +-
 .../browser/diff/notebookDiffActions.ts       |   85 +-
 .../browser/diff/notebookDiffEditorBrowser.ts |  117 +
 .../browser/diff/notebookTextDiffEditor.ts    |  489 +-
 .../browser/diff/notebookTextDiffList.ts      |  270 +-
 .../notebook/browser/media/notebook.css       |   44 +-
 .../notebook/browser/notebook.contribution.ts |  183 +-
 .../notebook/browser/notebookBrowser.ts       |  145 +-
 .../notebook/browser/notebookEditor.ts        |   29 +-
 .../notebook/browser/notebookEditorWidget.ts  |  224 +-
 .../browser/notebookEditorWidgetService.ts    |  143 +-
 .../notebookEditorWidgetServiceImpl.ts        |  149 +
 .../contrib/notebook/browser/notebookIcons.ts |    1 +
 .../notebook/browser/notebookRegistry.ts      |    6 +-
 .../notebook/browser/notebookServiceImpl.ts   |   38 +-
 .../notebook/browser/view/notebookCellList.ts |  118 +-
 .../browser/view/output/outputRenderer.ts     |   15 +-
 .../view/output/transforms/errorTransform.ts  |    9 +-
 .../view/output/transforms/richTransform.ts   |   58 +-
 .../view/output/transforms/streamTransform.ts |    9 +-
 .../view/output/transforms/textHelper.ts      |   29 +-
 .../view/renderers/backLayerWebView.ts        |  144 +-
 .../browser/view/renderers/cellActionView.ts  |    4 +-
 .../browser/view/renderers/cellContextKeys.ts |    7 +-
 .../browser/view/renderers/cellOutput.ts      |  152 +-
 .../browser/view/renderers/cellRenderer.ts    |   45 +-
 .../browser/view/renderers/cellWidgets.ts     |   12 +-
 .../browser/view/renderers/codeCell.ts        |    3 +-
 .../browser/view/renderers/markdownCell.ts    |   18 +-
 .../browser/view/renderers/webviewPreloads.ts |   38 +-
 .../browser/viewModel/cellOutputViewModel.ts  |   57 +
 .../browser/viewModel/codeCellViewModel.ts    |   22 +-
 .../browser/viewModel/eventDispatcher.ts      |   20 -
 .../viewModel/markdownCellViewModel.ts        |   23 +-
 .../common/model/notebookCellTextModel.ts     |   10 +-
 .../common/model/notebookTextModel.ts         |   21 +-
 .../contrib/notebook/common/notebookCommon.ts |   75 +-
 .../notebookEditorModelResolverService.ts     |   20 +-
 .../notebook/common/notebookService.ts        |    5 +-
 .../common/services/notebookSimpleWorker.ts   |    2 +-
 .../electron-browser/notebook.contribution.ts |    2 +-
 .../notebook/test/notebookViewModel.test.ts   |    6 +-
 .../notebook/test/testNotebookEditor.ts       |   28 +-
 .../outline/browser/outline.contribution.ts   |   13 +-
 .../contrib/outline/browser/outlinePane.ts    |  824 +--
 .../outline/browser/outlineViewState.ts       |   87 +
 .../output/browser/output.contribution.ts     |   19 +-
 .../contrib/output/browser/outputView.ts      |    2 +-
 .../output/common/outputChannelModel.ts       |    2 +-
 .../performance/browser/perfviewEditor.ts     |   76 +-
 .../electron-browser/startupTimings.ts        |    6 +-
 .../preferences/browser/keybindingsEditor.ts  |   26 +-
 .../browser/keybindingsEditorContribution.ts  |    2 +-
 .../browser/preferences.contribution.ts       |   25 +-
 .../preferences/browser/preferencesEditor.ts  |    2 +-
 .../browser/preferencesRenderers.ts           |    2 +-
 .../preferences/browser/settingsEditor2.ts    |    2 +-
 .../preferences/browser/settingsLayout.ts     |    2 +-
 .../preferences/browser/settingsTree.ts       |   16 +-
 .../contrib/preferences/common/preferences.ts |    1 +
 .../browser/commandsQuickAccess.ts            |    5 +-
 .../browser/relauncher.contribution.ts        |   14 -
 .../remote/browser/explorerViewItems.ts       |   57 +-
 .../contrib/remote/browser/remote.ts          |  295 +-
 .../contrib/remote/browser/remoteExplorer.ts  |  223 +-
 .../contrib/remote/browser/remoteIcons.ts     |   25 +
 .../contrib/remote/browser/remoteIndicator.ts |   94 +-
 .../contrib/remote/browser/tunnelView.ts      |  258 +-
 .../contrib/remote/browser/urlFinder.ts       |    4 +-
 .../remote/common/remote.contribution.ts      |   40 +-
 .../contrib/remote/common/showCandidate.ts    |    6 +-
 .../contrib/remote/common/tunnelFactory.ts    |   56 +-
 .../electron-sandbox/remote.contribution.ts   |    6 +-
 .../workbench/contrib/scm/browser/activity.ts |    4 +-
 .../contrib/scm/browser/media/scm.css         |    4 +-
 .../scm/browser/scmRepositoriesViewPane.ts    |    2 +-
 .../contrib/scm/browser/scmViewPane.ts        |   39 +-
 src/vs/workbench/contrib/scm/browser/util.ts  |    4 +-
 .../search/browser/anythingQuickAccess.ts     |   21 +-
 .../search/browser/media/searchEditor.css     |   14 +-
 .../search/browser/media/searchview.css       |   12 +-
 .../search/browser/patternInputWidget.ts      |   67 +-
 .../search/browser/search.contribution.ts     |  297 +-
 .../contrib/search/browser/searchActions.ts   |  326 +-
 .../contrib/search/browser/searchView.ts      |  304 +-
 .../contrib/search/browser/searchWidget.ts    |    4 +-
 .../search/browser/symbolsQuickAccess.ts      |   12 +-
 .../contrib/search/common/constants.ts        |    5 +-
 .../contrib/search/common/queryBuilder.ts     |  153 +-
 .../workbench/contrib/search/common/search.ts |    9 +
 .../contrib/search/common/searchModel.ts      |    2 +-
 .../search/test/browser/queryBuilder.test.ts  |   72 +-
 .../search/test/common/cacheState.test.ts     |    2 +-
 .../search/test/common/searchModel.test.ts    |    3 +-
 .../browser/media/searchEditor.css            |   14 +-
 .../browser/searchEditor.contribution.ts      |   33 +-
 .../searchEditor/browser/searchEditor.ts      |   34 +-
 .../browser/searchEditorActions.ts            |   67 +-
 .../searchEditor/browser/searchEditorInput.ts |    3 +-
 .../browser/searchEditorSerialization.ts      |    4 +
 .../contrib/snippets/browser/insertSnippet.ts |    2 +-
 .../browser/snippetCompletionProvider.ts      |   24 +-
 .../snippets/browser/snippetsService.ts       |    7 +
 .../snippets/test/browser/snippetFile.test.ts |   18 +-
 .../test/browser/snippetsRegistry.test.ts     |    2 +-
 .../test/browser/snippetsRewrite.test.ts      |   10 +-
 .../test/browser/snippetsService.test.ts      |  175 +-
 .../partsSplash.contribution.ts               |    2 +-
 .../contrib/tags/common/javaWorkspaceTags.ts  |   48 +
 .../electron-browser/workspaceTagsService.ts  |   65 +-
 .../tasks/browser/abstractTaskService.ts      |   12 +-
 .../tasks/browser/terminalTaskSystem.ts       |   12 +-
 .../contrib/tasks/common/problemMatcher.ts    |    2 +-
 .../workbench/contrib/tasks/common/tasks.ts   |    3 +-
 .../tasks/electron-browser/taskService.ts     |    2 +-
 .../tasks/test/common/configuration.test.ts   |    5 +-
 .../browser/links/terminalLinkManager.ts      |   38 +-
 .../terminalValidatedLocalLinkProvider.ts     |    7 +-
 .../terminal/browser/remoteTerminalService.ts |   33 +-
 .../contrib/terminal/browser/terminal.ts      |   16 +-
 .../browser/terminal.web.contribution.ts      |    4 +-
 .../terminal/browser/terminalActions.ts       |    8 +-
 .../terminal/browser/terminalInstance.ts      |   82 +-
 .../browser/terminalProcessExtHostProxy.ts    |    6 +
 .../browser/terminalProcessManager.ts         |  109 +-
 .../terminal/browser/terminalService.ts       |  119 +-
 .../contrib/terminal/browser/terminalTab.ts   |   61 +-
 .../browser/terminalTypeAheadAddon.ts         |   78 +-
 .../contrib/terminal/browser/terminalView.ts  |    2 +-
 .../terminal/common/remoteTerminalChannel.ts  |   52 +-
 .../contrib/terminal/common/terminal.ts       |   82 +-
 .../terminal/common/terminalConfiguration.ts  |   43 +-
 .../terminal/common/terminalEnvironment.ts    |    8 +-
 .../electron-browser/terminal.contribution.ts |    5 +-
 .../terminalInstanceService.ts                |    6 +-
 .../electron-browser/windowsShellHelper.ts    |    9 +-
 .../contrib/terminal/node/terminal.ts         |   90 +-
 .../contrib/terminal/node/terminalProcess.ts  |   71 +-
 .../test/browser/terminalTypeahead.test.ts    |  113 +-
 .../terminalEnvironment.test.ts               |   10 +-
 .../hierarchalByLocation.ts                   |  176 +
 .../explorerProjections/hierarchalByName.ts   |  160 +
 .../explorerProjections/hierarchalNodes.ts    |  146 +
 .../browser/explorerProjections/index.ts      |   93 +
 .../explorerProjections/locationStore.ts      |   80 +
 .../browser/explorerProjections/nodeHelper.ts |  147 +
 .../explorerProjections/stateByLocation.ts    |  321 +
 .../explorerProjections/stateByName.ts        |  289 +
 .../browser/explorerProjections/stateNodes.ts |   35 +
 .../contrib/testing/browser/icons.ts          |   49 +
 .../contrib/testing/browser/media/testing.css |  107 +
 .../testing/browser/testExplorerActions.ts    |  473 ++
 .../testing/browser/testing.contribution.ts   |  113 +
 .../testing/browser/testingDecorations.ts     |  326 +
 .../testing/browser/testingExplorerFilter.ts  |  179 +
 .../testing/browser/testingExplorerView.ts    |  841 +++
 .../testing/browser/testingOutputPeek.ts      |  374 ++
 .../browser/testingViewPaneContainer.ts       |   49 +
 .../contrib/testing/browser/theme.ts          |  132 +
 .../contrib/testing/common/constants.ts       |   36 +
 .../testing/common/ownedTestCollection.ts     |  230 +
 .../contrib/testing/common/storedValue.ts     |   79 +
 .../contrib/testing/common/testCollection.ts  |   60 +-
 .../testing/common/testResultService.ts       |  245 +
 .../contrib/testing/common/testService.ts     |   93 +-
 .../contrib/testing/common/testServiceImpl.ts |  302 +-
 .../contrib/testing/common/testStubs.ts       |   28 +
 .../testing/common/testingContentProvider.ts  |   73 +
 .../testing/common/testingContextKeys.ts      |   18 +
 .../contrib/testing/common/testingStates.ts   |   41 +
 .../contrib/testing/common/testingUri.ts      |  123 +
 .../common/workspaceTestCollectionService.ts  |  230 +
 .../hierarchalByLocation.test.ts              |   93 +
 .../hierarchalByName.test.ts                  |  129 +
 .../stateByLocation.test.ts                   |  154 +
 .../explorerProjections/stateByName.test.ts   |  122 +
 .../testing/test/browser/testObjectTree.ts    |  104 +
 .../test/common/ownedTestCollection.ts        |   37 +
 .../testing/test/common/testingUri.test.ts    |   25 +
 .../themes/browser/themes.contribution.ts     |   23 +-
 .../contrib/timeline/browser/timelinePane.ts  |   18 +-
 .../update/browser/releaseNotesEditor.ts      |   42 +-
 .../contrib/update/browser/update.ts          |   35 +-
 .../url/browser/trustedDomainsValidator.ts    |   87 +-
 .../workbench/contrib/url/common/urlGlob.ts   |   88 +
 .../browser/userDataSync.contribution.ts      |   27 -
 .../userDataSync/browser/userDataSync.ts      |   71 +-
 .../browser/userDataSyncMergesView.ts         |    2 +-
 .../browser/userDataSyncTrigger.ts            |    2 +-
 .../userDataSync/browser/userDataSyncViews.ts |   52 +-
 .../contrib/watermark/browser/watermark.ts    |    4 +-
 .../webview/browser/baseWebviewElement.ts     |    1 +
 .../browser/dynamicWebviewEditorOverlay.ts    |   15 +-
 .../contrib/webview/browser/pre/host.js       |   83 +-
 .../contrib/webview/browser/pre/main.js       |    7 +-
 .../contrib/webview/browser/webview.ts        |    4 +-
 .../contrib/webview/browser/webviewElement.ts |   45 +-
 .../electron-browser/pre/electron-index.js    |   12 -
 .../electron-browser/webviewElement.ts        |   16 +-
 .../electron-sandbox/iframeWebviewElement.ts  |    2 +-
 .../electron-sandbox/resourceLoading.ts       |   11 +-
 .../webviewPanel/browser/webviewCommands.ts   |    4 +-
 .../webviewView/browser/webviewViewPane.ts    |    2 +-
 .../common/viewsWelcomeExtensionPoint.ts      |    2 +-
 .../browser/gettingStarted.contribution.ts    |    9 +-
 .../gettingStarted/browser/gettingStarted.css |  144 +-
 .../gettingStarted/browser/gettingStarted.ts  |  233 +-
 .../browser/gettingStartedIcons.ts            |   10 +
 .../browser/vs_code_editor_getting_started.ts |   30 +-
 .../page/browser/welcomePage.contribution.ts  |    4 +-
 .../welcome/page/browser/welcomePage.ts       |   33 +-
 .../welcome/page/browser/welcomePageColors.ts |    9 +-
 .../editor/vs_code_editor_walkthrough.ts      |   13 +-
 .../walkThrough/browser/walkThroughInput.ts   |   10 +-
 .../walkThrough/browser/walkThroughPart.ts    |   30 +-
 .../common/walkThroughContentProvider.ts      |    2 +-
 .../actions/developerActions.ts               |   28 -
 .../electron-browser/desktop.main.ts          |  129 +-
 .../actions/developerActions.ts               |  107 +-
 .../electron-sandbox/actions/windowActions.ts |   38 +-
 .../electron-sandbox/desktop.contribution.ts  |  150 +-
 .../electron-sandbox/desktop.main.ts          |   86 +-
 .../parts/dialogs/dialog.contribution.ts      |    2 +-
 .../parts/dialogs/dialogHandler.ts            |    8 +-
 .../parts/titlebar/menubarControl.ts          |  216 +
 .../parts/titlebar/titlebarPart.ts            |   11 +-
 .../sandbox.simpleservices.ts                 |   46 +-
 src/vs/workbench/electron-sandbox/window.ts   |  309 +-
 .../backupFileService.test.ts                 |  404 +-
 .../clipboard/browser/clipboardService.ts     |   59 +-
 .../configuration/browser/configuration.ts    |  101 +-
 .../browser/configurationService.ts           |  159 +-
 .../configuration/common/configuration.ts     |   11 +
 .../common/configurationEditingService.ts     |   11 +-
 .../configurationCache.ts                     |   53 +-
 .../configurationEditingService.test.ts       |  395 ++
 .../test/browser/configurationService.test.ts | 1985 ++++++
 .../configurationEditingService.test.ts       |  394 --
 .../configurationService.test.ts              | 2114 -------
 .../electron-sandbox/contextmenuService.ts    |    8 +-
 .../credentials/browser/credentialsService.ts |    8 +-
 .../credentials/common/credentials.ts         |    7 +-
 .../electron-sandbox/credentialsService.ts    |    4 +-
 .../browser/abstractFileDialogService.ts      |   11 +-
 .../dialogs/browser/simpleFileDialog.ts       |   16 +-
 .../editor/browser/codeEditorService.ts       |   10 +-
 .../services/editor/browser/editorService.ts  |   27 +-
 .../services/editor/common/editorOpenWith.ts  |  159 +-
 .../services/editor/common/editorService.ts   |    7 +-
 .../test/browser/editorGroupsService.test.ts  |  636 +-
 .../editor/test/browser/editorService.test.ts |  328 +-
 .../test/browser/editorsObserver.test.ts      |  440 +-
 .../browser/extensionBisect.ts                |   34 +-
 .../browser/extensionEnablementService.ts     |    6 +-
 .../common/extensionManagement.ts             |    2 +-
 .../common/extensionManagementService.ts      |   52 +-
 .../extensionEnablementService.test.ts        |    2 +-
 .../common/workspaceExtensionsConfig.ts       |    6 +-
 .../extensions/browser/extensionService.ts    |    4 +-
 .../browser/webWorkerExtensionHost.ts         |   58 +-
 .../common/abstractExtensionService.ts        |   13 +-
 .../extensions/common/extensionHostMain.ts    |   21 +-
 .../extensions/common/extensionHostManager.ts |    7 +-
 .../common/extensionHostProtocol.ts           |    4 +-
 .../extensions/common/extensionsRegistry.ts   |    5 +
 .../common/polyfillNestedWorker.protocol.ts   |   18 +
 .../extensions/common/remoteExtensionHost.ts  |    9 +-
 .../electron-browser/extensionService.ts      |   18 +
 .../localProcessExtensionHost.ts              |   79 +-
 .../node/extensionHostProcessSetup.ts         |   34 +-
 .../extensions/node/extensionPoints.ts        |   15 +-
 .../services/extensions/node/proxyResolver.ts |    4 +-
 .../test/browser/extensionService.test.ts     |   88 +
 .../test/common/extensionsUtil.test.ts        |    2 +-
 .../test/common/rpcProtocol.test.ts           |   32 +-
 .../electron-browser/extensionService.test.ts |   88 -
 .../extensions/worker/extensionHostWorker.ts  |   29 +-
 .../httpWebWorkerExtensionHostIframe.html     |   28 +-
 .../httpsWebWorkerExtensionHostIframe.html    |   28 +-
 .../extensions/worker/polyfillNestedWorker.ts |  133 +
 .../common/gettingStartedContent.ts           |  260 +-
 .../common/gettingStartedRegistry.ts          |    9 +-
 .../common/gettingStartedService.ts           |   19 +-
 .../common/media/ColorTheme.jpg               |  Bin 101006 -> 0 bytes
 .../common/media/Extensions.jpg               |  Bin 103983 -> 0 bytes
 .../gettingStarted/common/media/Languages.jpg |  Bin 101550 -> 0 bytes
 .../common/media/OpenFolder.jpg               |  Bin 103714 -> 0 bytes
 .../common/media/colorTheme.png               |  Bin 0 -> 48327 bytes
 .../common/media/commandPalette.png           |  Bin 0 -> 32283 bytes
 .../common/media/extensions.png               |  Bin 0 -> 77651 bytes
 .../common/media/forwardPorts.png             |  Bin 0 -> 31517 bytes
 .../gettingStarted/common/media/github.png    |  Bin 0 -> 38564 bytes
 .../common/media/languageExtensions.png       |  Bin 0 -> 85147 bytes
 .../common/media/openFolder.png               |  Bin 0 -> 35888 bytes
 .../gettingStarted/common/media/openVSC.png   |  Bin 0 -> 16170 bytes
 .../common/media/pullRequests.png             |  Bin 0 -> 44364 bytes
 .../common/media/remoteTerminal.png           |  Bin 0 -> 42347 bytes
 .../common/media/runProject.png               |  Bin 0 -> 100705 bytes
 .../gettingStarted/common/media/settings.png  |  Bin 0 -> 26205 bytes
 .../common/media/settingsSync.png             |  Bin 0 -> 36021 bytes
 .../gettingStarted/common/media/terminal.png  |  Bin 0 -> 25762 bytes
 .../common/media/tutorialVideo.png            |  Bin 0 -> 51891 bytes
 .../host/browser/browserHostService.ts        |    6 +-
 .../keybinding/browser/keybindingService.ts   |    3 +-
 .../keybinding/browser/unboundCommands.ts     |   52 +
 .../common/windowsKeyboardMapper.ts           |   70 +-
 .../browserKeyboardMapper.test.ts             |   22 +-
 .../test/browser/keybindingEditing.test.ts    |  315 +
 .../keybindingIO.test.ts                      |   16 +-
 .../keybindingEditing.test.ts                 |  330 -
 .../keyboardMapperTestUtils.ts                |    7 +-
 .../macLinuxKeyboardMapper.test.ts            |    4 +-
 .../windowsKeyboardMapper.test.ts             |   10 +-
 .../services/label/common/labelService.ts     |   85 +-
 .../services/label/test/browser/label.test.ts |   60 +-
 .../label/test/electron-browser/label.test.ts |   10 +-
 .../services/layout/browser/layoutService.ts  |   14 +-
 .../lifecycle/browser/lifecycleService.ts     |   38 +-
 .../services/lifecycle/common/lifecycle.ts    |   10 +-
 .../lifecycle/common/lifecycleService.ts      |    2 +-
 .../electron-sandbox/lifecycleService.ts      |   78 +-
 .../log/electron-browser/logService.ts        |    2 +-
 .../common/notificationService.ts             |    4 +-
 .../services/outline/browser/outline.ts       |   95 +
 .../outline/browser/outlineService.ts         |   52 +
 .../keybindingsEditorModel.ts                 |   47 +-
 .../preferencesEditorInput.ts                 |    2 +-
 .../preferences/browser/preferencesService.ts |    4 +-
 .../preferences/common/preferences.ts         |   39 +-
 .../keybindingsEditorModel.test.ts            |    3 +-
 .../test/browser/progressIndicator.test.ts    |    1 +
 .../remote/browser/remoteAgentServiceImpl.ts  |   68 +-
 .../remote/browser/tunnelServiceImpl.ts       |   36 +
 .../common/abstractRemoteAgentService.ts      |   30 +-
 .../common/remoteAgentEnvironmentChannel.ts   |    5 +-
 .../remote/common/remoteExplorerService.ts    |  262 +-
 ...entServiceImpl.ts => tunnelServiceImpl.ts} |   30 +-
 .../remoteAgentServiceImpl.ts                 |   71 +
 .../services/search/common/search.ts          |   40 +-
 .../services/search/common/searchService.ts   |   43 +-
 .../search/electron-browser/searchService.ts  |    6 +-
 .../search/node/ripgrepTextSearchEngine.ts    |   12 +-
 .../electron-browser/rawSearchService.test.ts |   14 +-
 .../test/node/fileSearch.integrationTest.ts   |    4 +-
 .../test/node/ripgrepFileSearch.test.ts       |   12 +-
 .../services/search/test/node/search.test.ts  |   95 +-
 .../test/node/textSearch.integrationTest.ts   |    4 +-
 .../electron-browser/sharedProcessService.ts  |   50 -
 .../electron-browser/telemetryService.ts      |    8 +-
 .../workbenchCommonProperties.ts              |    7 +-
 .../electron-browser/commonProperties.test.ts |   30 +-
 .../browser/abstractTextMateService.ts        |    4 +-
 .../browser/browserTextFileService.ts         |    6 +-
 .../textfile/browser/textFileService.ts       |   26 +-
 .../textfile/common/textFileEditorModel.ts    |    3 +
 .../services/textfile/common/textfiles.ts     |   10 +-
 .../electron-browser/nativeTextFileService.ts |    4 +-
 .../test/browser/textFileEditorModel.test.ts  |  108 +-
 .../textFileEditorModelManager.test.ts        |   50 +-
 .../test/browser/textFileService.test.ts      |   22 +-
 .../test/common/textFileService.io.test.ts    |  190 +-
 .../nativeTextFileService.io.test.ts          |   25 +-
 .../test/node/encoding/encoding.test.ts       |   72 +-
 .../browser/textModelResolverService.test.ts  |   24 +-
 .../themes/browser/workbenchThemeService.ts   |   28 +-
 .../services/themes/common/colorThemeData.ts  |    2 +-
 .../themes/common/themeConfiguration.ts       |   15 +-
 .../themes/common/themeExtensionPoints.ts     |    7 +-
 .../themes/common/workbenchThemeService.ts    |    8 +-
 .../test/electron-browser/color-theme.json    |   50 +
 .../tokenStyleResolving.test.ts               |  128 +-
 .../services/timer/browser/timerService.ts    |  194 +-
 .../timer/electron-sandbox/timerService.ts    |    3 +-
 .../test/browser/untitledTextEditor.test.ts   |  114 +-
 .../services/userData/browser/userDataInit.ts |    8 +-
 .../fileUserDataProvider.test.ts              |   52 +-
 .../userDataAutoSyncEnablementService.ts      |    9 +-
 .../browser/userDataSyncWorkbenchService.ts   |    5 +-
 .../views/browser/viewDescriptorService.ts    |  119 +-
 .../views/common/viewContainerModel.ts        |   20 +-
 .../test/browser/viewContainerModel.test.ts   |   51 +
 .../workingCopyFileOperationParticipant.ts    |   59 +-
 .../common/workingCopyFileService.ts          |  130 +-
 .../browser/workingCopyFileService.test.ts    |  133 +-
 .../test/common/workingCopyService.test.ts    |   92 +-
 .../abstractWorkspaceEditingService.ts        |    9 +-
 .../services/workspaces/browser/workspaces.ts |   23 +-
 .../workspaces/browser/workspacesService.ts   |    5 +-
 .../workspaceEditingService.ts                |   36 +-
 .../test/browser/workspaces.test.ts           |   19 +
 .../browser/api/extHostApiCommands.test.ts    |  386 +-
 .../test/browser/api/extHostBulkEdits.test.ts |    6 +-
 .../test/browser/api/extHostCommands.test.ts  |   16 +-
 .../browser/api/extHostConfiguration.test.ts  |  260 +-
 .../browser/api/extHostDecorations.test.ts    |   10 +-
 .../browser/api/extHostDiagnostics.test.ts    |  114 +-
 .../browser/api/extHostDocumentData.test.ts   |  118 +-
 .../extHostDocumentSaveParticipant.test.ts    |   43 +-
 .../api/extHostDocumentsAndEditors.test.ts    |    2 +-
 .../api/extHostFileSystemEventService.test.ts |   12 +-
 .../api/extHostLanguageFeatures.test.ts       |  236 +-
 .../api/extHostMessagerService.test.ts        |   20 +-
 .../test/browser/api/extHostNotebook.test.ts  |   38 +-
 .../api/extHostNotebookConcatDocument.test.ts |   84 +-
 .../test/browser/api/extHostTesting.test.ts   |  236 +-
 .../browser/api/extHostTextEditor.test.ts     |   78 +-
 .../test/browser/api/extHostTreeViews.test.ts |  128 +-
 .../browser/api/extHostTypeConverter.test.ts  |   40 +-
 .../test/browser/api/extHostTypes.test.ts     |  196 +-
 .../test/browser/api/extHostWorkspace.test.ts |  326 +-
 .../browser/api/mainThreadCommands.test.ts    |   18 +-
 .../api/mainThreadConfiguration.test.ts       |   38 +-
 .../browser/api/mainThreadDiagnostics.test.ts |    6 +-
 ...mainThreadDocumentContentProviders.test.ts |    4 +-
 .../browser/api/mainThreadDocuments.test.ts   |   10 +-
 .../api/mainThreadDocumentsAndEditors.test.ts |   86 +-
 .../browser/api/mainThreadEditors.test.ts     |   54 +-
 .../browser/api/mainThreadTreeViews.test.ts   |    2 +
 .../test/browser/api/testRPCProtocol.ts       |    5 +-
 ...Decorations.test.ts => codeeditor.test.ts} |    2 +-
 .../parts/editor/breadcrumbModel.test.ts      |   11 +-
 .../test/browser/parts/editor/editor.test.ts  |  100 +-
 .../browser/parts/editor/editorGroups.test.ts | 1239 ++--
 .../browser/parts/editor/editorInput.test.ts  |   10 +-
 .../browser/parts/editor/editorModel.test.ts  |    6 +-
 .../browser/parts/editor/editorPane.test.ts   |   24 +-
 .../parts/editor/resourceEditorInput.test.ts  |    6 +-
 .../test/browser/quickAccess.test.ts          |  114 +-
 src/vs/workbench/test/browser/viewlet.test.ts |    2 +-
 .../test/browser/workbenchTestServices.ts     |  165 +-
 src/vs/workbench/test/common/memento.test.ts  |   44 +-
 .../test/common/notifications.test.ts         |  140 +-
 .../test/common/workbenchTestServices.ts      |   19 +-
 .../api/extHostSearch.test.ts                 |    6 +-
 .../electron-browser/workbenchTestServices.ts |    6 +-
 .../node/api/extHostTunnelService.test.ts     |  266 +
 src/vs/workbench/workbench.common.main.ts     |    5 +
 src/vs/workbench/workbench.desktop.main.ts    |   13 +-
 src/vs/workbench/workbench.web.api.ts         |  123 +-
 src/vs/workbench/workbench.web.main.ts        |    3 +-
 test/.mocharc.json                            |    5 +
 test/automation/package.json                  |   20 +-
 test/automation/src/application.ts            |    2 +-
 test/automation/src/code.ts                   |    5 +-
 test/automation/yarn.lock                     |  329 +-
 test/integration/browser/package.json         |   10 +-
 test/integration/browser/yarn.lock            |   18 +-
 test/integration/electron/testrunner.js       |   48 +
 test/mocha.opts                               |    2 -
 test/monaco/.gitignore                        |    3 +
 test/monaco/.mocharc.json                     |    5 +
 test/monaco/README.md                         |   13 +
 test/monaco/core.js                           |   30 +
 test/monaco/dist/core.html                    |   10 +
 test/monaco/monaco.test.ts                    |  147 +
 test/monaco/package.json                      |   16 +
 test/monaco/runner.js                         |   52 +
 test/monaco/tsconfig.json                     |   21 +
 test/monaco/webpack.config.js                 |   55 +
 test/monaco/yarn.lock                         |   52 +
 test/smoke/package.json                       |   19 +-
 .../src/areas/extensions/extensions.test.ts   |    8 +
 .../smoke/src/areas/notebook/notebook.test.ts |    2 +-
 test/smoke/src/areas/search/search.test.ts    |    3 +-
 test/smoke/src/areas/workbench/launch.test.ts |    4 +-
 .../src/areas/workbench/localization.test.ts  |    2 +-
 test/smoke/src/main.ts                        |   15 +-
 test/smoke/src/utils.ts                       |    6 +-
 test/smoke/yarn.lock                          |  699 +--
 test/unit/browser/index.js                    |    6 +-
 test/unit/browser/renderer.html               |    3 +-
 test/unit/electron/index.js                   |   37 +-
 test/unit/electron/renderer.html              |    3 +-
 test/unit/electron/renderer.js                |   57 +-
 test/unit/fullJsonStreamReporter.js           |   52 +
 yarn.lock                                     | 5544 ++++++++---------
 1900 files changed, 82419 insertions(+), 66188 deletions(-)
 create mode 100644 .github/actions/build-chat/.gitignore
 create mode 100644 .github/actions/build-chat/action.yml
 create mode 100644 .github/actions/build-chat/package.json
 create mode 100644 .github/actions/build-chat/src/main.ts
 create mode 100644 .github/actions/build-chat/tsconfig.json
 create mode 100644 .github/actions/build-chat/yarn.lock
 create mode 100644 .github/workflows/build-chat.yml
 create mode 100644 .vscode/notebooks/papercuts.github-issues
 delete mode 100644 azure-pipelines.yml
 delete mode 100644 build/.gitignore
 delete mode 100644 build/azure-pipelines/common/.gitignore
 create mode 100644 build/azure-pipelines/common/computeNodeModulesCacheKey.js
 create mode 100644 build/azure-pipelines/common/computeNodeModulesCacheKey.ts
 create mode 100644 build/azure-pipelines/common/createAsset.js
 create mode 100644 build/azure-pipelines/common/createBuild.js
 create mode 100644 build/azure-pipelines/common/installPlaywright.js
 create mode 100644 build/azure-pipelines/common/installPlaywright.ts
 create mode 100644 build/azure-pipelines/common/listNodeModules.js
 create mode 100644 build/azure-pipelines/common/listNodeModules.ts
 create mode 100644 build/azure-pipelines/common/publish-webview.js
 create mode 100644 build/azure-pipelines/common/releaseBuild.js
 create mode 100644 build/azure-pipelines/common/retry.js
 create mode 100644 build/azure-pipelines/common/sync-mooncake.js
 delete mode 100644 build/azure-pipelines/darwin/continuous-build-darwin.yml
 delete mode 100644 build/azure-pipelines/darwin/helper-plugin-entitlements.plist
 delete mode 100644 build/azure-pipelines/linux/continuous-build-linux.yml
 create mode 100644 build/azure-pipelines/mixin.js
 delete mode 100644 build/azure-pipelines/publish-types/.gitignore
 create mode 100644 build/azure-pipelines/publish-types/check-version.js
 create mode 100644 build/azure-pipelines/publish-types/update-types.js
 create mode 100644 build/azure-pipelines/upload-cdn.js
 create mode 100644 build/azure-pipelines/upload-sourcemaps.js
 delete mode 100644 build/azure-pipelines/win32/continuous-build-win32.yml
 create mode 100644 build/darwin/create-universal-app.js
 create mode 100644 build/darwin/create-universal-app.ts
 create mode 100644 build/darwin/sign.js
 create mode 100644 build/eslint.js
 create mode 100644 build/ext.js
 create mode 100644 build/filters.js
 create mode 100644 build/gulpfile.js
 create mode 100644 build/lib/asar.js
 create mode 100644 build/lib/builtInExtensions.js
 create mode 100644 build/lib/bundle.js
 create mode 100644 build/lib/compilation.js
 create mode 100644 build/lib/dependencies.js
 rename build/{dependencies.js => lib/dependencies.ts} (64%)
 create mode 100644 build/lib/electron.js
 create mode 100644 build/lib/eslint/code-import-patterns.js
 create mode 100644 build/lib/eslint/code-layering.js
 create mode 100644 build/lib/eslint/code-no-nls-in-standalone-editor.js
 create mode 100644 build/lib/eslint/code-no-standalone-editor.js
 create mode 100644 build/lib/eslint/code-no-unexternalized-strings.js
 create mode 100644 build/lib/eslint/code-no-unused-expressions.js
 create mode 100644 build/lib/eslint/code-translation-remind.js
 create mode 100644 build/lib/eslint/utils.js
 create mode 100644 build/lib/eslint/vscode-dts-cancellation.js
 create mode 100644 build/lib/eslint/vscode-dts-cancellation.ts
 create mode 100644 build/lib/eslint/vscode-dts-create-func.js
 create mode 100644 build/lib/eslint/vscode-dts-event-naming.js
 create mode 100644 build/lib/eslint/vscode-dts-interface-naming.js
 create mode 100644 build/lib/eslint/vscode-dts-literal-or-types.js
 create mode 100644 build/lib/eslint/vscode-dts-provider-naming.js
 create mode 100644 build/lib/eslint/vscode-dts-provider-naming.ts
 create mode 100644 build/lib/eslint/vscode-dts-region-comments.js
 create mode 100644 build/lib/eslint/vscode-dts-region-comments.ts
 create mode 100644 build/lib/eslint/vscode-dts-use-thenable.js
 create mode 100644 build/lib/eslint/vscode-dts-use-thenable.ts
 create mode 100644 build/lib/extensions.js
 create mode 100644 build/lib/git.js
 create mode 100644 build/lib/i18n.js
 create mode 100644 build/lib/layersChecker.js
 create mode 100644 build/lib/monaco-api.js
 create mode 100644 build/lib/nls.js
 create mode 100644 build/lib/node.js
 create mode 100644 build/lib/optimize.js
 create mode 100644 build/lib/preLaunch.js
 create mode 100644 build/lib/reporter.js
 create mode 100644 build/lib/snapshotLoader.js
 create mode 100644 build/lib/standalone.js
 create mode 100644 build/lib/stats.js
 create mode 100644 build/lib/task.js
 create mode 100644 build/lib/test/i18n.test.js
 create mode 100644 build/lib/treeshaking.js
 delete mode 100644 build/lib/typings/gulp-cssnano.d.ts
 create mode 100644 build/lib/util.js
 rename src/vs/editor/contrib/documentSymbols/media/symbol-icons.css => build/lib/watch/index.js (64%)
 create mode 100644 build/lib/watch/watch-win32.js
 create mode 100644 build/npm/dirs.js
 delete mode 100644 build/npm/update-theme.js
 delete mode 100644 extensions/css-language-features/server/src/test/requests.test.ts
 create mode 100644 extensions/emmet/src/parseDocument.ts
 create mode 100644 extensions/emmet/src/typings/EmmetFlatNode.d.ts
 create mode 100644 extensions/html-language-features/server/src/test/rename.test.ts
 create mode 100644 extensions/markdown-language-features/src/test/urlToUri.test.ts
 create mode 100644 extensions/markdown-language-features/src/util/url.ts
 create mode 100644 extensions/microsoft-authentication/src/microsoft-authentication.d.ts
 create mode 100644 extensions/simple-browser/.vscodeignore
 create mode 100644 extensions/simple-browser/README.md
 rename extensions/{python => simple-browser}/extension-browser.webpack.config.js (87%)
 rename extensions/{python => simple-browser}/extension.webpack.config.js (85%)
 create mode 100644 extensions/simple-browser/media/index.js
 create mode 100644 extensions/simple-browser/media/index.js.map
 create mode 100644 extensions/simple-browser/media/main.css
 create mode 100644 extensions/simple-browser/media/preview-dark.svg
 create mode 100644 extensions/simple-browser/media/preview-light.svg
 create mode 100644 extensions/simple-browser/package.json
 create mode 100644 extensions/simple-browser/package.nls.json
 rename src/vs/base/browser/ui/codicons/codicon/codicon-animations.css => extensions/simple-browser/preview-src/events.ts (62%)
 create mode 100644 extensions/simple-browser/preview-src/index.ts
 create mode 100644 extensions/simple-browser/preview-src/tsconfig.json
 create mode 100644 extensions/simple-browser/src/dispose.ts
 create mode 100644 extensions/simple-browser/src/extension.ts
 create mode 100644 extensions/simple-browser/src/simpleBrowserManager.ts
 create mode 100644 extensions/simple-browser/src/simpleBrowserView.ts
 rename extensions/{python => simple-browser}/src/typings/ref.d.ts (74%)
 create mode 100644 extensions/simple-browser/tsconfig.json
 rename extensions/{python/src/pythonMain.ts => simple-browser/webpack.config.js} (50%)
 create mode 100644 extensions/simple-browser/yarn.lock
 create mode 100644 extensions/testing-editor-contributions/.vscodeignore
 create mode 100644 extensions/testing-editor-contributions/README.md
 create mode 100644 extensions/testing-editor-contributions/extension-browser.webpack.config.js
 create mode 100644 extensions/testing-editor-contributions/extension.webpack.config.js
 create mode 100644 extensions/testing-editor-contributions/package.json
 create mode 100644 extensions/testing-editor-contributions/package.nls.json
 create mode 100644 extensions/testing-editor-contributions/src/extension.ts
 rename src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css => extensions/testing-editor-contributions/src/typings/refs.d.ts (74%)
 rename extensions/{python => testing-editor-contributions}/tsconfig.json (80%)
 create mode 100644 extensions/testing-editor-contributions/yarn.lock
 create mode 100644 extensions/typescript-language-features/.eslintrc.json
 create mode 100644 extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
 create mode 100644 extensions/typescript-language-features/src/test-all.ts
 rename extensions/typescript-language-features/src/test/{ => smoke}/completions.test.ts (97%)
 rename extensions/typescript-language-features/src/test/{ => smoke}/fixAll.test.ts (91%)
 create mode 100644 extensions/typescript-language-features/src/test/smoke/index.ts
 rename extensions/typescript-language-features/src/test/{ => smoke}/jsDocCompletions.test.ts (84%)
 rename extensions/typescript-language-features/src/test/{ => smoke}/quickFix.test.ts (94%)
 rename extensions/typescript-language-features/src/test/{ => smoke}/referencesCodeLens.test.ts (92%)
 rename extensions/typescript-language-features/src/test/{ => unit}/cachedResponse.test.ts (96%)
 rename extensions/typescript-language-features/src/test/{ => unit}/functionCallSnippet.test.ts (99%)
 create mode 100644 extensions/typescript-language-features/src/test/unit/index.ts
 rename extensions/typescript-language-features/src/test/{ => unit}/jsdocSnippet.test.ts (83%)
 rename extensions/typescript-language-features/src/test/{ => unit}/onEnter.test.ts (74%)
 rename extensions/typescript-language-features/src/test/{ => unit}/previewer.test.ts (96%)
 rename extensions/typescript-language-features/src/test/{ => unit}/requestQueue.test.ts (98%)
 rename extensions/typescript-language-features/src/test/{ => unit}/server.test.ts (83%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-fixtures/12750.html (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-fixtures/13448.html (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-fixtures/14119.less (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-fixtures/25920.html (100%)
 rename extensions/{docker => vscode-colorize-tests}/test/colorize-fixtures/Dockerfile (100%)
 rename extensions/{java => vscode-colorize-tests}/test/colorize-fixtures/basic.java (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-fixtures/issue-1550.yaml (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-fixtures/issue-28354.php (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-fixtures/issue-4008.yaml (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-fixtures/issue-6303.yaml (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-fixtures/issue-76997.php (100%)
 rename extensions/{make => vscode-colorize-tests}/test/colorize-fixtures/makefile (100%)
 rename extensions/{go => vscode-colorize-tests}/test/colorize-fixtures/test-13777.go (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test-23630.cpp (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test-23850.cpp (100%)
 rename extensions/{markdown-basics => vscode-colorize-tests}/test/colorize-fixtures/test-33886.md (100%)
 rename extensions/{pug => vscode-colorize-tests}/test/colorize-fixtures/test-4287.pug (100%)
 rename extensions/{rust => vscode-colorize-tests}/test/colorize-fixtures/test-6611.rs (100%)
 rename extensions/{xml => vscode-colorize-tests}/test/colorize-fixtures/test-7115.xml (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test-78769.cpp (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test-80644.cpp (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test-92369.cpp (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-brackets.tsx (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-fixtures/test-cssvariables.less (100%)
 rename extensions/{scss => vscode-colorize-tests}/test/colorize-fixtures/test-cssvariables.scss (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-fixtures/test-embedding.html (100%)
 rename extensions/{powershell => vscode-colorize-tests}/test/colorize-fixtures/test-freeze-56476.ps1 (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-function-inv.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-issue11.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-issue5431.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-issue5465.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-issue5566.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-jsdoc-multiline-type.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-keywords.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-members.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-object-literals.ts (100%)
 rename extensions/{coffeescript => vscode-colorize-tests}/test/colorize-fixtures/test-regex.coffee (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-strings.ts (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test-this.ts (100%)
 rename extensions/{css => vscode-colorize-tests}/test/colorize-fixtures/test-variables.css (100%)
 rename extensions/{bat => vscode-colorize-tests}/test/colorize-fixtures/test.bat (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test.c (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test.cc (100%)
 rename extensions/{clojure => vscode-colorize-tests}/test/colorize-fixtures/test.clj (100%)
 rename extensions/{coffeescript => vscode-colorize-tests}/test/colorize-fixtures/test.coffee (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-fixtures/test.cpp (100%)
 rename extensions/{csharp => vscode-colorize-tests}/test/colorize-fixtures/test.cs (100%)
 rename extensions/{razor => vscode-colorize-tests}/test/colorize-fixtures/test.cshtml (100%)
 rename extensions/{css => vscode-colorize-tests}/test/colorize-fixtures/test.css (100%)
 rename extensions/{fsharp => vscode-colorize-tests}/test/colorize-fixtures/test.fs (100%)
 rename extensions/{go => vscode-colorize-tests}/test/colorize-fixtures/test.go (100%)
 rename extensions/{groovy => vscode-colorize-tests}/test/colorize-fixtures/test.groovy (100%)
 rename extensions/{handlebars => vscode-colorize-tests}/test/colorize-fixtures/test.handlebars (100%)
 rename extensions/{handlebars => vscode-colorize-tests}/test/colorize-fixtures/test.hbs (100%)
 rename extensions/{hlsl => vscode-colorize-tests}/test/colorize-fixtures/test.hlsl (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-fixtures/test.html (100%)
 rename extensions/{ini => vscode-colorize-tests}/test/colorize-fixtures/test.ini (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-fixtures/test.js (100%)
 rename extensions/{json => vscode-colorize-tests}/test/colorize-fixtures/test.json (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-fixtures/test.jsx (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-fixtures/test.less (100%)
 rename extensions/{log => vscode-colorize-tests}/test/colorize-fixtures/test.log (100%)
 rename extensions/{lua => vscode-colorize-tests}/test/colorize-fixtures/test.lua (100%)
 rename extensions/{objective-c => vscode-colorize-tests}/test/colorize-fixtures/test.m (100%)
 rename extensions/{markdown-basics => vscode-colorize-tests}/test/colorize-fixtures/test.md (100%)
 rename extensions/{objective-c => vscode-colorize-tests}/test/colorize-fixtures/test.mm (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-fixtures/test.php (100%)
 rename extensions/{perl => vscode-colorize-tests}/test/colorize-fixtures/test.pl (100%)
 rename extensions/{powershell => vscode-colorize-tests}/test/colorize-fixtures/test.ps1 (100%)
 rename extensions/{pug => vscode-colorize-tests}/test/colorize-fixtures/test.pug (100%)
 rename extensions/{r => vscode-colorize-tests}/test/colorize-fixtures/test.r (100%)
 rename extensions/{ruby => vscode-colorize-tests}/test/colorize-fixtures/test.rb (100%)
 rename extensions/{rust => vscode-colorize-tests}/test/colorize-fixtures/test.rs (100%)
 rename extensions/{scss => vscode-colorize-tests}/test/colorize-fixtures/test.scss (100%)
 rename extensions/{shellscript => vscode-colorize-tests}/test/colorize-fixtures/test.sh (100%)
 rename extensions/{shaderlab => vscode-colorize-tests}/test/colorize-fixtures/test.shader (100%)
 rename extensions/{sql => vscode-colorize-tests}/test/colorize-fixtures/test.sql (100%)
 rename extensions/{swift => vscode-colorize-tests}/test/colorize-fixtures/test.swift (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/test.ts (100%)
 rename extensions/{vb => vscode-colorize-tests}/test/colorize-fixtures/test.vb (100%)
 rename extensions/{xml => vscode-colorize-tests}/test/colorize-fixtures/test.xml (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-fixtures/test.yaml (100%)
 rename extensions/{perl => vscode-colorize-tests}/test/colorize-fixtures/test2.pl (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-fixtures/test6916.js (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-fixtures/tsconfig_off.json (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-results/12750_html.json (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-results/13448_html.json (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-results/14119_less.json (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-results/25920_html.json (100%)
 rename extensions/{docker => vscode-colorize-tests}/test/colorize-results/Dockerfile.json (100%)
 rename extensions/{java => vscode-colorize-tests}/test/colorize-results/basic_java.json (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-results/issue-1550_yaml.json (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-results/issue-28354_php.json (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-results/issue-4008_yaml.json (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-results/issue-6303_yaml.json (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-results/issue-76997_php.json (100%)
 rename extensions/{make => vscode-colorize-tests}/test/colorize-results/makefile.json (100%)
 rename extensions/{go => vscode-colorize-tests}/test/colorize-results/test-13777_go.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test-23630_cpp.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test-23850_cpp.json (100%)
 rename extensions/{markdown-basics => vscode-colorize-tests}/test/colorize-results/test-33886_md.json (100%)
 rename extensions/{pug => vscode-colorize-tests}/test/colorize-results/test-4287_pug.json (100%)
 rename extensions/{rust => vscode-colorize-tests}/test/colorize-results/test-6611_rs.json (94%)
 rename extensions/{xml => vscode-colorize-tests}/test/colorize-results/test-7115_xml.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test-78769_cpp.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test-80644_cpp.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test-92369_cpp.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-brackets_tsx.json (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-results/test-cssvariables_less.json (100%)
 rename extensions/{scss => vscode-colorize-tests}/test/colorize-results/test-cssvariables_scss.json (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-results/test-embedding_html.json (100%)
 rename extensions/{powershell => vscode-colorize-tests}/test/colorize-results/test-freeze-56476_ps1.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-function-inv_ts.json (95%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-issue11_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-issue5431_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-issue5465_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-issue5566_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-jsdoc-multiline-type_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-keywords_ts.json (96%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-members_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-object-literals_ts.json (100%)
 rename extensions/{coffeescript => vscode-colorize-tests}/test/colorize-results/test-regex_coffee.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-strings_ts.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test-this_ts.json (100%)
 rename extensions/{css => vscode-colorize-tests}/test/colorize-results/test-variables_css.json (100%)
 rename extensions/{perl => vscode-colorize-tests}/test/colorize-results/test2_pl.json (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-results/test6916_js.json (100%)
 rename extensions/{bat => vscode-colorize-tests}/test/colorize-results/test_bat.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test_c.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test_cc.json (100%)
 rename extensions/{clojure => vscode-colorize-tests}/test/colorize-results/test_clj.json (100%)
 rename extensions/{coffeescript => vscode-colorize-tests}/test/colorize-results/test_coffee.json (100%)
 rename extensions/{cpp => vscode-colorize-tests}/test/colorize-results/test_cpp.json (100%)
 rename extensions/{csharp => vscode-colorize-tests}/test/colorize-results/test_cs.json (100%)
 rename extensions/{razor => vscode-colorize-tests}/test/colorize-results/test_cshtml.json (100%)
 rename extensions/{css => vscode-colorize-tests}/test/colorize-results/test_css.json (100%)
 rename extensions/{fsharp => vscode-colorize-tests}/test/colorize-results/test_fs.json (100%)
 rename extensions/{go => vscode-colorize-tests}/test/colorize-results/test_go.json (100%)
 rename extensions/{groovy => vscode-colorize-tests}/test/colorize-results/test_groovy.json (100%)
 rename extensions/{handlebars => vscode-colorize-tests}/test/colorize-results/test_handlebars.json (100%)
 rename extensions/{handlebars => vscode-colorize-tests}/test/colorize-results/test_hbs.json (100%)
 rename extensions/{hlsl => vscode-colorize-tests}/test/colorize-results/test_hlsl.json (100%)
 rename extensions/{html => vscode-colorize-tests}/test/colorize-results/test_html.json (100%)
 rename extensions/{ini => vscode-colorize-tests}/test/colorize-results/test_ini.json (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-results/test_js.json (100%)
 rename extensions/{json => vscode-colorize-tests}/test/colorize-results/test_json.json (100%)
 rename extensions/{javascript => vscode-colorize-tests}/test/colorize-results/test_jsx.json (100%)
 rename extensions/{less => vscode-colorize-tests}/test/colorize-results/test_less.json (100%)
 rename extensions/{log => vscode-colorize-tests}/test/colorize-results/test_log.json (100%)
 rename extensions/{lua => vscode-colorize-tests}/test/colorize-results/test_lua.json (100%)
 rename extensions/{objective-c => vscode-colorize-tests}/test/colorize-results/test_m.json (100%)
 rename extensions/{markdown-basics => vscode-colorize-tests}/test/colorize-results/test_md.json (100%)
 rename extensions/{objective-c => vscode-colorize-tests}/test/colorize-results/test_mm.json (100%)
 rename extensions/{php => vscode-colorize-tests}/test/colorize-results/test_php.json (100%)
 rename extensions/{perl => vscode-colorize-tests}/test/colorize-results/test_pl.json (100%)
 rename extensions/{powershell => vscode-colorize-tests}/test/colorize-results/test_ps1.json (100%)
 rename extensions/{pug => vscode-colorize-tests}/test/colorize-results/test_pug.json (100%)
 rename extensions/{r => vscode-colorize-tests}/test/colorize-results/test_r.json (100%)
 rename extensions/{ruby => vscode-colorize-tests}/test/colorize-results/test_rb.json (100%)
 rename extensions/{rust => vscode-colorize-tests}/test/colorize-results/test_rs.json (97%)
 rename extensions/{scss => vscode-colorize-tests}/test/colorize-results/test_scss.json (100%)
 rename extensions/{shellscript => vscode-colorize-tests}/test/colorize-results/test_sh.json (100%)
 rename extensions/{shaderlab => vscode-colorize-tests}/test/colorize-results/test_shader.json (100%)
 rename extensions/{sql => vscode-colorize-tests}/test/colorize-results/test_sql.json (100%)
 rename extensions/{swift => vscode-colorize-tests}/test/colorize-results/test_swift.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/test_ts.json (99%)
 rename extensions/{vb => vscode-colorize-tests}/test/colorize-results/test_vb.json (100%)
 rename extensions/{xml => vscode-colorize-tests}/test/colorize-results/test_xml.json (100%)
 rename extensions/{yaml => vscode-colorize-tests}/test/colorize-results/test_yaml.json (100%)
 rename extensions/{typescript-basics => vscode-colorize-tests}/test/colorize-results/tsconfig_off_json.json (100%)
 create mode 100644 src/tsconfig.tsec.json
 create mode 100644 src/tsec.exemptions.json
 create mode 100644 src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
 rename src/vs/base/browser/{codicons.ts => ui/iconLabel/iconLabels.ts} (58%)
 rename src/vs/base/browser/ui/{codicons/codiconLabel.ts => iconLabel/simpleIconLabel.ts} (76%)
 delete mode 100644 src/vs/base/common/codicon.ts
 create mode 100644 src/vs/base/common/iconLabels.ts
 create mode 100644 src/vs/base/node/powershell.ts
 create mode 100644 src/vs/base/node/shell.ts
 create mode 100644 src/vs/base/parts/ipc/browser/ipc.mp.ts
 create mode 100644 src/vs/base/parts/ipc/common/ipc.mp.ts
 rename src/vs/base/parts/ipc/electron-main/{ipc.electron-main.ts => ipc.electron.ts} (90%)
 create mode 100644 src/vs/base/parts/ipc/electron-main/ipc.mp.ts
 rename src/vs/base/parts/ipc/electron-sandbox/{ipc.electron-sandbox.ts => ipc.electron.ts} (71%)
 create mode 100644 src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
 create mode 100644 src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
 create mode 100644 src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
 rename src/vs/base/test/browser/{codicons.test.ts => iconLabels.test.ts} (61%)
 rename src/vs/base/test/{node => common}/buffer.test.ts (70%)
 delete mode 100644 src/vs/base/test/common/codicon.test.ts
 rename src/vs/base/test/{node => common}/console.test.ts (99%)
 rename src/vs/base/test/{node => common}/glob.test.ts (98%)
 create mode 100644 src/vs/base/test/common/iconLabels.test.ts
 rename src/vs/base/test/{node => common}/path.test.ts (99%)
 create mode 100644 src/vs/base/test/common/troubleshooting.ts
 create mode 100644 src/vs/base/test/node/powershell.test.ts
 create mode 100644 src/vs/code/electron-browser/sharedProcess/contrib/deprecatedExtensionsCleaner.ts
 create mode 100644 src/vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater.ts
 delete mode 100644 src/vs/code/electron-main/auth2.ts
 delete mode 100644 src/vs/code/electron-sandbox/proxy/auth.html
 delete mode 100644 src/vs/code/electron-sandbox/proxy/auth.js
 create mode 100644 src/vs/editor/common/services/getSemanticTokens.ts
 rename src/vs/{workbench/api/common/shared => editor/common/services}/semanticTokensDto.ts (100%)
 rename src/vs/editor/contrib/{gotoSymbol => documentSymbols}/documentSymbols.ts (54%)
 delete mode 100644 src/vs/editor/contrib/documentSymbols/outline.ts
 create mode 100644 src/vs/editor/contrib/hover/markdownHoverParticipant.ts
 create mode 100644 src/vs/editor/contrib/hover/markerHoverParticipant.ts
 create mode 100644 src/vs/editor/contrib/inlineHints/inlineHintsController.ts
 rename src/vs/{workbench/test/common/api => editor/test/common/services}/semanticTokensDto.test.ts (95%)
 create mode 100644 src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
 create mode 100644 src/vs/platform/actions/browser/menuEntryActionViewItem.css
 rename src/vs/platform/dialogs/electron-main/{dialogs.ts => dialogMainService.ts} (100%)
 create mode 100644 src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts
 create mode 100644 src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
 delete mode 100644 src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts
 delete mode 100644 src/vs/platform/ipc/electron-main/sharedProcessMainService.ts
 create mode 100644 src/vs/platform/sharedProcess/node/sharedProcess.ts
 rename src/vs/platform/telemetry/{node => common}/commonProperties.ts (78%)
 rename src/vs/platform/telemetry/{node => common}/telemetryIpc.ts (100%)
 create mode 100644 src/vs/platform/windows/electron-main/windowsFinder.ts
 create mode 100644 src/vs/platform/windows/electron-main/windowsStateHandler.ts
 delete mode 100644 src/vs/platform/windows/electron-main/windowsStateStorage.ts
 delete mode 100644 src/vs/platform/windows/node/window.ts
 rename src/vs/platform/windows/{common => node}/windowTracker.ts (100%)
 create mode 100644 src/vs/platform/windows/test/electron-main/window.test.ts
 rename src/vs/platform/windows/test/electron-main/{windowsStateStorage.test.ts => windowsStateHandler.test.ts} (68%)
 delete mode 100644 src/vs/platform/windows/test/node/window.test.ts
 create mode 100644 src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
 delete mode 100644 src/vs/platform/workspaces/electron-main/workspacesService.ts
 create mode 100644 src/vs/platform/workspaces/test/common/workspaces.test.ts
 rename src/vs/platform/workspaces/test/electron-main/{workspacesMainService.test.ts => workspacesManagementMainService.test.ts} (77%)
 create mode 100644 src/vs/workbench/api/browser/mainThreadCLICommands.ts
 create mode 100644 src/vs/workbench/api/browser/mainThreadEditorTabs.ts
 create mode 100644 src/vs/workbench/api/browser/mainThreadSecretState.ts
 create mode 100644 src/vs/workbench/api/browser/mainThreadUriOpeners.ts
 create mode 100644 src/vs/workbench/api/common/exHostSecretState.ts
 create mode 100644 src/vs/workbench/api/common/extHostEditorTabs.ts
 create mode 100644 src/vs/workbench/api/common/extHostSecrets.ts
 create mode 100644 src/vs/workbench/api/common/extHostUriOpener.ts
 rename src/vs/workbench/browser/{parts/editor/editorWidgets.ts => codeeditor.ts} (60%)
 create mode 100644 src/vs/workbench/browser/menuActions.ts
 delete mode 100644 src/vs/workbench/browser/parts/editor/rangeDecorations.ts
 delete mode 100644 src/vs/workbench/browser/parts/views/viewMenuActions.ts
 create mode 100644 src/vs/workbench/browser/parts/views/viewPane.ts
 create mode 100644 src/vs/workbench/browser/window.ts
 rename src/vs/workbench/contrib/backup/test/{electron-browser => browser}/backupRestorer.test.ts (56%)
 create mode 100644 src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
 create mode 100644 src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
 rename src/vs/{editor/contrib/documentSymbols/media/outlineTree.css => workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css} (77%)
 rename src/vs/{editor/contrib/documentSymbols/outlineTree.ts => workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts} (82%)
 delete mode 100644 src/vs/workbench/contrib/debug/browser/debugActions.ts
 rename src/vs/workbench/contrib/debug/test/{electron-browser => browser}/debugANSIHandling.test.ts (100%)
 delete mode 100644 src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts
 create mode 100644 src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
 create mode 100644 src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
 create mode 100644 src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
 create mode 100644 src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
 create mode 100644 src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.css
 create mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/toc/tocProvider.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/diff/cellComponents.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/diff/common.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetServiceImpl.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
 create mode 100644 src/vs/workbench/contrib/outline/browser/outlineViewState.ts
 create mode 100644 src/vs/workbench/contrib/remote/browser/remoteIcons.ts
 create mode 100644 src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
 rename src/vs/workbench/contrib/terminal/test/{node => common}/terminalEnvironment.test.ts (97%)
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/locationStore.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/stateByName.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/explorerProjections/stateNodes.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/icons.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/media/testing.css
 create mode 100644 src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/testingDecorations.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
 create mode 100644 src/vs/workbench/contrib/testing/browser/theme.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/constants.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/ownedTestCollection.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/storedValue.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testResultService.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testStubs.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testingContentProvider.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testingContextKeys.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testingStates.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/testingUri.ts
 create mode 100644 src/vs/workbench/contrib/testing/common/workspaceTestCollectionService.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByName.test.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByLocation.test.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByName.test.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/common/ownedTestCollection.ts
 create mode 100644 src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
 create mode 100644 src/vs/workbench/contrib/url/common/urlGlob.ts
 create mode 100644 src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons.ts
 delete mode 100644 src/vs/workbench/electron-browser/actions/developerActions.ts
 create mode 100644 src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
 rename src/vs/workbench/services/configuration/{electron-browser => electron-sandbox}/configurationCache.ts (54%)
 create mode 100644 src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts
 create mode 100644 src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
 delete mode 100644 src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
 delete mode 100644 src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
 create mode 100644 src/vs/workbench/services/extensions/common/polyfillNestedWorker.protocol.ts
 create mode 100644 src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
 delete mode 100644 src/vs/workbench/services/extensions/test/electron-browser/extensionService.test.ts
 create mode 100644 src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
 delete mode 100644 src/vs/workbench/services/gettingStarted/common/media/ColorTheme.jpg
 delete mode 100644 src/vs/workbench/services/gettingStarted/common/media/Extensions.jpg
 delete mode 100644 src/vs/workbench/services/gettingStarted/common/media/Languages.jpg
 delete mode 100644 src/vs/workbench/services/gettingStarted/common/media/OpenFolder.jpg
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/colorTheme.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/commandPalette.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/extensions.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/forwardPorts.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/github.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/languageExtensions.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/openFolder.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/openVSC.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/pullRequests.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/remoteTerminal.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/runProject.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/settings.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/settingsSync.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/terminal.png
 create mode 100644 src/vs/workbench/services/gettingStarted/common/media/tutorialVideo.png
 create mode 100644 src/vs/workbench/services/keybinding/browser/unboundCommands.ts
 rename src/vs/workbench/services/keybinding/test/{electron-browser => browser}/browserKeyboardMapper.test.ts (88%)
 create mode 100644 src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
 rename src/vs/workbench/services/keybinding/test/{electron-browser => browser}/keybindingIO.test.ts (95%)
 delete mode 100644 src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
 create mode 100644 src/vs/workbench/services/outline/browser/outline.ts
 create mode 100644 src/vs/workbench/services/outline/browser/outlineService.ts
 rename src/vs/workbench/services/preferences/{common => browser}/keybindingsEditorModel.ts (94%)
 rename src/vs/workbench/services/preferences/{common => browser}/preferencesEditorInput.ts (99%)
 rename src/vs/workbench/services/preferences/test/{common => browser}/keybindingsEditorModel.test.ts (99%)
 create mode 100644 src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
 rename src/vs/workbench/services/remote/electron-browser/{remoteAgentServiceImpl.ts => tunnelServiceImpl.ts} (60%)
 create mode 100644 src/vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl.ts
 delete mode 100644 src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts
 rename src/vs/workbench/services/telemetry/{electron-browser => electron-sandbox}/workbenchCommonProperties.ts (88%)
 create mode 100644 src/vs/workbench/services/themes/test/electron-browser/color-theme.json
 rename src/vs/workbench/services/userData/test/{electron-browser => browser}/fileUserDataProvider.test.ts (90%)
 create mode 100644 src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
 rename src/vs/workbench/test/browser/{parts/editor/rangeDecorations.test.ts => codeeditor.test.ts} (99%)
 create mode 100644 src/vs/workbench/test/node/api/extHostTunnelService.test.ts
 create mode 100644 test/.mocharc.json
 create mode 100644 test/integration/electron/testrunner.js
 delete mode 100644 test/mocha.opts
 create mode 100644 test/monaco/.gitignore
 create mode 100644 test/monaco/.mocharc.json
 create mode 100644 test/monaco/README.md
 create mode 100644 test/monaco/core.js
 create mode 100644 test/monaco/dist/core.html
 create mode 100644 test/monaco/monaco.test.ts
 create mode 100644 test/monaco/package.json
 create mode 100644 test/monaco/runner.js
 create mode 100644 test/monaco/tsconfig.json
 create mode 100644 test/monaco/webpack.config.js
 create mode 100644 test/monaco/yarn.lock
 create mode 100644 test/unit/fullJsonStreamReporter.js

diff --git a/.eslintignore b/.eslintignore
index b2c4a5b6e..5a8dd89ec 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -14,3 +14,4 @@
 **/extensions/**/build/**
 **/extensions/markdown-language-features/media/**
 **/extensions/typescript-basics/test/colorize-fixtures/**
+**/extensions/**/dist/**
diff --git a/.eslintrc.json b/.eslintrc.json
index fd72f0e58..24b5b101e 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,1010 +1,1030 @@
 {
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint",
-        "jsdoc",
-        "mocha"
-    ],
-    "rules": {
-        "constructor-super": "warn",
-        "curly": "warn",
-        "eqeqeq": "warn",
-        "no-buffer-constructor": "warn",
-        "no-caller": "warn",
-        "no-debugger": "warn",
-        "no-duplicate-case": "warn",
-        "no-duplicate-imports": "warn",
-        "no-eval": "warn",
-        "no-extra-semi": "warn",
-        "no-new-wrappers": "warn",
-        "no-redeclare": "off",
-        "no-sparse-arrays": "warn",
-        "no-throw-literal": "warn",
-        "no-unsafe-finally": "warn",
-        "no-unused-labels": "warn",
-        "no-restricted-globals": [
-            "warn",
-            "name",
-            "length",
-            "event",
-            "closed",
-            "external",
-            "status",
-            "origin",
-            "orientation",
-            "context"
-        ], // non-complete list of globals that are easy to access unintentionally
-        "no-var": "warn",
-        "jsdoc/no-types": "warn",
-        "semi": "off",
-        "mocha/no-exclusive-tests": "warn",
-        "@typescript-eslint/semi": "warn",
-        "@typescript-eslint/naming-convention": [
-            "warn",
-            {
-                "selector": "class",
-                "format": [
-                    "PascalCase"
-                ]
-            }
-        ],
-        "code-no-unused-expressions": [
-            "warn",
-            {
-                "allowTernary": true
-            }
-        ],
-        "code-translation-remind": "warn",
-        "code-no-nls-in-standalone-editor": "warn",
-        "code-no-standalone-editor": "warn",
-        "code-no-unexternalized-strings": "warn",
-        "code-layering": [
-            "warn",
-            {
-                "common": [],
-                "node": [
-                    "common"
-                ],
-                "browser": [
-                    "common"
-                ],
-                "electron-sandbox": [
-                    "common",
-                    "browser"
-                ],
-                "electron-browser": [
-                    "common",
-                    "browser",
-                    "node",
-                    "electron-sandbox"
-                ],
-                "electron-main": [
-                    "common",
-                    "node"
-                ]
-            }
-        ],
-        "code-import-patterns": [
-            "warn",
-            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            // !!! Do not relax these rules !!!
-            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            {
-                "target": "**/vs/base/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/test/common/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/test/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,electron-sandbox}/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                // vs/base/test/browser contains tests for vs/base/browser
-                "target": "**/vs/base/test/browser/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/test/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/parts/*/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/{common,node}/**",
-                    "**/vs/base/parts/*/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,electron-sandbox}/**",
-                    "**/vs/base/parts/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/base/parts/*/electron-main/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/{common,node,electron-main}/**",
-                    "**/vs/base/parts/*/{common,node,electron-main}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/parts/*/common/**",
-                    "**/vs/platform/*/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/test/common/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/parts/*/common/**",
-                    "**/vs/base/test/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/platform/*/test/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/{common,node}/**",
-                    "**/vs/base/parts/*/{common,node}/**",
-                    "**/vs/platform/*/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,electron-sandbox}/**",
-                    "**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
-                    "**/vs/platform/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/electron-main/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/{common,node,electron-main}/**",
-                    "**/vs/base/parts/*/{common,node,electron-main}/**",
-                    "**/vs/platform/*/{common,node,electron-main}/**",
-                    "**/vs/code/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/platform/*/test/browser/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/platform/*/test/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/worker/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/editor/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/test/common/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/platform/*/test/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/editor/test/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/test/browser/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/platform/*/test/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/test/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/standalone/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/editor/standalone/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/standalone/test/common/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/platform/*/test/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/editor/test/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/standalone/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/contrib/**",
-                    "**/vs/editor/standalone/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/standalone/test/browser/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/platform/*/test/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/standalone/{common,browser}/**",
-                    "**/vs/editor/test/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/contrib/*/test/**",
-                "restrictions": [
-                    "assert",
-                    "sinon",
-                    "vs/nls",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/test/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/platform/*/test/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/test/{common,browser}/**",
-                    "**/vs/editor/contrib/**"
-                ]
-            },
-            {
-                "target": "**/vs/editor/contrib/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**",
-                    "**/vs/platform/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/contrib/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/base/parts/*/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/editor/contrib/*/common/**",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/services/*/common/**",
-                    "assert"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser}/**",
-                    "**/vs/base/parts/*/{common,browser}/**",
-                    "**/vs/platform/*/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/vs/workbench/workbench.web.api",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/services/*/{common,browser}/**",
-                    "assert"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/api/common/**",
-                "restrictions": [
-                    "vscode",
-                    "vs/nls",
-                    "**/vs/base/common/**",
-                    "**/vs/platform/*/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/editor/contrib/*/common/**",
-                    "**/vs/workbench/api/common/**",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/services/*/common/**",
-                    "**/vs/workbench/contrib/*/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/api/worker/**",
-                "restrictions": [
-                    "vscode",
-                    "vs/nls",
-                    "**/vs/**/{common,worker}/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,electron-sandbox}/**",
-                    "**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
-                    "**/vs/platform/*/{common,browser,electron-sandbox}/**",
-                    "**/vs/editor/{common,browser,electron-sandbox}/**",
-                    "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/vs/workbench/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/services/*/{common,browser,electron-sandbox}/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/editor/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
-                    "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/test/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**",
-                    "**/vs/platform/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "vs/workbench/contrib/files/common/editors/fileEditorInput",
-                    "**/vs/workbench/services/**",
-                    "**/vs/workbench/test/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/common/**",
-                    "**/vs/platform/**/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/workbench/workbench.web.api",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/services/**/common/**",
-                    "**/vs/workbench/api/**/common/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "tas-client-umd",
-                    "jschardet"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/worker/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/common/**",
-                    "**/vs/platform/**/common/**",
-                    "**/vs/editor/common/**",
-                    "**/vs/workbench/**/common/**",
-                    "**/vs/workbench/**/worker/**",
-                    "**/vs/workbench/services/**/common/**",
-                    "vscode"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,worker}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/{common,browser}/**",
-                    "**/vs/workbench/workbench.web.api",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/api/{common,browser}/**",
-                    "**/vs/workbench/services/**/{common,browser}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,node}/**",
-                    "**/vs/platform/**/{common,node}/**",
-                    "**/vs/editor/{common,node}/**",
-                    "**/vs/workbench/{common,node}/**",
-                    "**/vs/workbench/api/{common,node}/**",
-                    "**/vs/workbench/services/**/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
-                    "**/vs/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/services/**/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/test/**",
-                "restrictions": [
-                    "assert",
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**",
-                    "**/vs/platform/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/services/**",
-                    "**/vs/workbench/contrib/**",
-                    "**/vs/workbench/test/**",
-                    "*"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/terminal/browser/**",
-                "restrictions": [
-                    // xterm and its addons are strictly browser-only components
-                    "xterm",
-                    "xterm-addon-*",
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser}/**",
-                    "**/vs/workbench/services/**/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/extensions/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser}/**",
-                    "**/vs/workbench/services/**/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/update/browser/update.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser}/**",
-                    "**/vs/workbench/services/**/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/notebook/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,worker}/**",
-                    "**/vs/platform/**/common/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/api/common/**",
-                    "**/vs/workbench/services/**/common/**",
-                    "**/vs/workbench/contrib/**/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/common/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/common/**",
-                    "**/vs/platform/**/common/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/common/**",
-                    "**/vs/workbench/api/common/**",
-                    "**/vs/workbench/services/**/common/**",
-                    "**/vs/workbench/contrib/**/common/**"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser}/**",
-                    "**/vs/workbench/api/{common,browser}/**",
-                    "**/vs/workbench/services/**/{common,browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,node}/**",
-                    "**/vs/platform/**/{common,node}/**",
-                    "**/vs/editor/**/common/**",
-                    "**/vs/workbench/{common,node}/**",
-                    "**/vs/workbench/api/{common,node}/**",
-                    "**/vs/workbench/services/**/{common,node}/**",
-                    "**/vs/workbench/contrib/**/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/electron-sandbox/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
-                    "**/vs/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/contrib/**/{common,browser,electron-sandbox}/**",
-                    "vscode-textmate",
-                    "vscode-oniguruma",
-                    "iconv-lite-umd",
-                    "jschardet"
-                ]
-            },
-            {
-                "target": "**/vs/workbench/contrib/**/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/code/browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/base/parts/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/code/**/{common,browser}/**",
-                    "**/vs/workbench/workbench.web.api"
-                ]
-            },
-            {
-                "target": "**/vs/code/node/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,node}/**",
-                    "**/vs/base/parts/**/{common,node}/**",
-                    "**/vs/platform/**/{common,node}/**",
-                    "**/vs/code/**/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/code/electron-browser/**",
-                "restrictions": [
-                    "vs/nls",
-                    "vs/css!./**/*",
-                    "**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/code/electron-main/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,node,electron-main}/**",
-                    "**/vs/base/parts/**/{common,node,electron-main}/**",
-                    "**/vs/platform/**/{common,node,electron-main}/**",
-                    "**/vs/code/**/{common,node,electron-main}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/vs/server/**",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,node}/**",
-                    "**/vs/base/parts/**/{common,node}/**",
-                    "**/vs/platform/**/{common,node}/**",
-                    "**/vs/workbench/**/{common,node}/**",
-                    "**/vs/server/**",
-                    "**/vs/code/**/{common,node}/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/src/vs/workbench/workbench.common.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/base/parts/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/**/{common,browser}/**"
-                ]
-            },
-            {
-                "target": "**/src/vs/workbench/workbench.web.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/base/parts/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/**/{common,browser}/**",
-                    "**/vs/workbench/workbench.common.main"
-                ]
-            },
-            {
-                "target": "**/src/vs/workbench/workbench.web.api.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,browser}/**",
-                    "**/vs/base/parts/**/{common,browser}/**",
-                    "**/vs/platform/**/{common,browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/**/{common,browser}/**",
-                    "**/vs/workbench/workbench.web.main"
-                ]
-            },
-            {
-                "target": "**/src/vs/workbench/workbench.sandbox.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/base/parts/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/platform/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/workbench.common.main"
-                ]
-            },
-            {
-                "target": "**/src/vs/workbench/workbench.desktop.main.ts",
-                "restrictions": [
-                    "vs/nls",
-                    "**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/editor/**",
-                    "**/vs/workbench/**/{common,browser,node,electron-sandbox,electron-browser}/**",
-                    "**/vs/workbench/workbench.common.main",
-                    "**/vs/workbench/workbench.sandbox.main"
-                ]
-            },
-            {
-                "target": "**/extensions/**",
-                "restrictions": "**/*"
-            },
-            {
-                "target": "**/test/smoke/**",
-                "restrictions": [
-                    "**/test/smoke/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/test/automation/**",
-                "restrictions": [
-                    "**/test/automation/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/test/integration/**",
-                "restrictions": [
-                    "**/test/integration/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/api/**.test.ts",
-                "restrictions": [
-                    "**/vs/**",
-                    "assert",
-                    "sinon",
-                    "crypto",
-                    "vscode"
-                ]
-            },
-            {
-                "target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
-                "restrictions": [
-                    "**/vs/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/{node,electron-browser,electron-main}/**/test/**",
-                "restrictions": [
-                    "**/vs/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/test/{node,electron-browser,electron-main}/**",
-                "restrictions": [
-                    "**/vs/**",
-                    "*" // node modules
-                ]
-            },
-            {
-                "target": "**/**.test.ts",
-                "restrictions": [
-                    "**/vs/**",
-                    "assert",
-                    "sinon",
-                    "crypto",
-                    "xterm*"
-                ]
-            },
-            {
-                "target": "**/test/**",
-                "restrictions": [
-                    "**/vs/**",
-                    "assert",
-                    "sinon",
-                    "crypto",
-                    "xterm*"
-                ]
-            }
-        ]
-    },
-    "overrides": [
-        {
-            "files": [
-                "*.js"
-            ],
-            "rules": {
-                "jsdoc/no-types": "off"
-            }
-        },
-        {
-            "files": [
-                "**/vscode.d.ts",
-                "**/vscode.proposed.d.ts"
-            ],
-            "rules": {
-                "vscode-dts-create-func": "warn",
-                "vscode-dts-literal-or-types": "warn",
-                "vscode-dts-interface-naming": "warn",
-                "vscode-dts-event-naming": [
-                    "warn",
-                    {
-                        "allowed": [
-                            "onCancellationRequested",
-                            "event"
-                        ],
-                        "verbs": [
-                            "accept",
-                            "change",
-                            "close",
-                            "collapse",
-                            "create",
-                            "delete",
-                            "discover",
-                            "dispose",
-                            "edit",
-                            "end",
-                            "expand",
-                            "hide",
-                            "open",
-                            "override",
-                            "receive",
-                            "register",
-                            "rename",
-                            "save",
-                            "send",
-                            "start",
-                            "terminate",
-                            "trigger",
-                            "unregister",
-                            "write"
-                        ]
-                    }
-                ]
-            }
-        }
-    ]
+	"root": true,
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": 6,
+		"sourceType": "module"
+	},
+	"plugins": [
+		"@typescript-eslint",
+		"jsdoc"
+	],
+	"rules": {
+		"constructor-super": "warn",
+		"curly": "warn",
+		"eqeqeq": "warn",
+		"no-buffer-constructor": "warn",
+		"no-caller": "warn",
+		"no-debugger": "warn",
+		"no-duplicate-case": "warn",
+		"no-duplicate-imports": "warn",
+		"no-eval": "warn",
+		"no-extra-semi": "warn",
+		"no-new-wrappers": "warn",
+		"no-redeclare": "off",
+		"no-sparse-arrays": "warn",
+		"no-throw-literal": "warn",
+		"no-unsafe-finally": "warn",
+		"no-unused-labels": "warn",
+		"no-restricted-globals": [
+			"warn",
+			"name",
+			"length",
+			"event",
+			"closed",
+			"external",
+			"status",
+			"origin",
+			"orientation",
+			"context"
+		], // non-complete list of globals that are easy to access unintentionally
+		"no-var": "warn",
+		"jsdoc/no-types": "warn",
+		"semi": "off",
+		"@typescript-eslint/semi": "warn",
+		"@typescript-eslint/naming-convention": [
+			"warn",
+			{
+				"selector": "class",
+				"format": [
+					"PascalCase"
+				]
+			}
+		],
+		"code-no-unused-expressions": [
+			"warn",
+			{
+				"allowTernary": true
+			}
+		],
+		"code-translation-remind": "warn",
+		"code-no-nls-in-standalone-editor": "warn",
+		"code-no-standalone-editor": "warn",
+		"code-no-unexternalized-strings": "warn",
+		"code-layering": [
+			"warn",
+			{
+				"common": [],
+				"node": [
+					"common"
+				],
+				"browser": [
+					"common"
+				],
+				"electron-sandbox": [
+					"common",
+					"browser"
+				],
+				"electron-browser": [
+					"common",
+					"browser",
+					"node",
+					"electron-sandbox"
+				],
+				"electron-main": [
+					"common",
+					"node"
+				]
+			}
+		],
+		"code-import-patterns": [
+			"warn",
+			// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+			// !!! Do not relax these rules !!!
+			// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+			{
+				"target": "**/vs/base/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**"
+				]
+			},
+			{
+				"target": "**/vs/base/test/common/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/test/common/**"
+				]
+			},
+			{
+				"target": "**/vs/base/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/base/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,electron-sandbox}/**"
+				]
+			},
+			{
+				"target": "**/vs/base/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				// vs/base/test/browser contains tests for vs/base/browser
+				"target": "**/vs/base/test/browser/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/test/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/parts/*/common/**"
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,node}/**",
+					"**/vs/base/parts/*/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,electron-sandbox}/**",
+					"**/vs/base/parts/*/{common,browser,electron-sandbox}/**"
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/base/parts/*/electron-main/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,node,electron-main}/**",
+					"**/vs/base/parts/*/{common,node,electron-main}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/parts/*/common/**",
+					"**/vs/platform/*/common/**"
+				]
+			},
+			{
+				"target": "**/vs/platform/*/test/common/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/parts/*/common/**",
+					"**/vs/base/test/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/platform/*/test/common/**"
+				]
+			},
+			{
+				"target": "**/vs/platform/*/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/platform/*/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,node}/**",
+					"**/vs/base/parts/*/{common,node}/**",
+					"**/vs/platform/*/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,electron-sandbox}/**",
+					"**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
+					"**/vs/platform/*/{common,browser,electron-sandbox}/**"
+				]
+			},
+			{
+				"target": "**/vs/platform/*/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/electron-main/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/{common,node,electron-main}/**",
+					"**/vs/base/parts/*/{common,node,electron-main}/**",
+					"**/vs/platform/*/{common,node,electron-main}/**",
+					"**/vs/code/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/platform/*/test/browser/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/platform/*/test/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/worker/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/editor/common/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/test/common/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/platform/*/test/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/test/common/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/test/browser/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/platform/*/test/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/test/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/standalone/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/standalone/common/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/standalone/test/common/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/platform/*/test/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/test/common/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/standalone/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/contrib/**",
+					"**/vs/editor/standalone/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/standalone/test/browser/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/platform/*/test/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/standalone/{common,browser}/**",
+					"**/vs/editor/test/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/contrib/*/test/**",
+				"restrictions": [
+					"assert",
+					"sinon",
+					"vs/nls",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/test/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/platform/*/test/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/test/{common,browser}/**",
+					"**/vs/editor/contrib/**"
+				]
+			},
+			{
+				"target": "**/vs/editor/contrib/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/contrib/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/parts/*/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/contrib/*/common/**",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/services/*/common/**",
+					"assert"
+				]
+			},
+			{
+				"target": "**/vs/workbench/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+					"**/vs/workbench/workbench.web.api",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/services/*/{common,browser}/**",
+					"assert"
+				]
+			},
+			{
+				"target": "**/vs/workbench/api/common/**",
+				"restrictions": [
+					"vscode",
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/contrib/*/common/**",
+					"**/vs/workbench/api/common/**",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/services/*/common/**",
+					"**/vs/workbench/contrib/*/common/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/api/worker/**",
+				"restrictions": [
+					"vscode",
+					"vs/nls",
+					"**/vs/**/{common,worker}/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,electron-sandbox}/**",
+					"**/vs/base/parts/*/{common,browser,electron-sandbox}/**",
+					"**/vs/platform/*/{common,browser,electron-sandbox}/**",
+					"**/vs/editor/{common,browser,electron-sandbox}/**",
+					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+					"**/vs/workbench/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/services/*/{common,browser,electron-sandbox}/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/editor/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/services/*/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/test/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"vs/workbench/contrib/files/common/editors/fileEditorInput",
+					"**/vs/workbench/services/**",
+					"**/vs/workbench/test/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/common/**",
+					"**/vs/platform/**/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/workbench/workbench.web.api",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/services/**/common/**",
+					"**/vs/workbench/api/**/common/**",
+					"vscode-textmate",
+					"vscode-oniguruma",
+					"iconv-lite-umd",
+					"tas-client-umd",
+					"jschardet"
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/worker/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/common/**",
+					"**/vs/platform/**/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/workbench/**/common/**",
+					"**/vs/workbench/**/worker/**",
+					"**/vs/workbench/services/**/common/**",
+					"vscode"
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,worker}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/workbench/workbench.web.api",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/api/{common,browser}/**",
+					"**/vs/workbench/services/**/{common,browser}/**",
+					"vscode-textmate",
+					"vscode-oniguruma",
+					"iconv-lite-umd",
+					"jschardet"
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,node}/**",
+					"**/vs/platform/**/{common,node}/**",
+					"**/vs/editor/{common,node}/**",
+					"**/vs/workbench/{common,node}/**",
+					"**/vs/workbench/api/{common,node}/**",
+					"**/vs/workbench/services/**/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
+					"**/vs/platform/**/{common,browser,electron-sandbox}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
+					"vscode-textmate",
+					"vscode-oniguruma",
+					"iconv-lite-umd",
+					"jschardet"
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/test/**",
+				"restrictions": [
+					"assert",
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/services/**",
+					"**/vs/workbench/contrib/**",
+					"**/vs/workbench/test/**",
+					"*"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/terminal/browser/**",
+				"restrictions": [
+					// xterm and its addons are strictly browser-only components
+					"xterm",
+					"xterm-addon-*",
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/contrib/**/{common,browser}/**",
+					"**/vs/workbench/services/**/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/extensions/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/contrib/**/{common,browser}/**",
+					"**/vs/workbench/services/**/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/update/browser/update.ts",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/contrib/**/{common,browser}/**",
+					"**/vs/workbench/services/**/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/notebook/common/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,worker}/**",
+					"**/vs/platform/**/common/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/api/common/**",
+					"**/vs/workbench/services/**/common/**",
+					"**/vs/workbench/contrib/**/common/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/common/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/common/**",
+					"**/vs/platform/**/common/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/api/common/**",
+					"**/vs/workbench/services/**/common/**",
+					"**/vs/workbench/contrib/**/common/**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/api/{common,browser}/**",
+					"**/vs/workbench/services/**/{common,browser}/**",
+					"**/vs/workbench/contrib/**/{common,browser}/**",
+					"vscode-textmate",
+					"vscode-oniguruma",
+					"iconv-lite-umd",
+					"jschardet"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/node/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,node}/**",
+					"**/vs/platform/**/{common,node}/**",
+					"**/vs/editor/**/common/**",
+					"**/vs/workbench/{common,node}/**",
+					"**/vs/workbench/api/{common,node}/**",
+					"**/vs/workbench/services/**/{common,node}/**",
+					"**/vs/workbench/contrib/**/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/electron-sandbox/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,worker,electron-sandbox}/**",
+					"**/vs/platform/**/{common,browser,electron-sandbox}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/api/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/contrib/**/{common,browser,electron-sandbox}/**",
+					"vscode-textmate",
+					"vscode-oniguruma",
+					"iconv-lite-umd",
+					"jschardet"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/**/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,worker,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/api/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/services/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/contrib/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/code/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/base/parts/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/code/**/{common,browser}/**",
+					"**/vs/workbench/workbench.web.api"
+				]
+			},
+			{
+				"target": "**/vs/code/node/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,node}/**",
+					"**/vs/base/parts/**/{common,node}/**",
+					"**/vs/platform/**/{common,node}/**",
+					"**/vs/code/**/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/code/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/code/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/code/electron-main/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,node,electron-main}/**",
+					"**/vs/base/parts/**/{common,node,electron-main}/**",
+					"**/vs/platform/**/{common,node,electron-main}/**",
+					"**/vs/code/**/{common,node,electron-main}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/server/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,node}/**",
+					"**/vs/base/parts/**/{common,node}/**",
+					"**/vs/platform/**/{common,node}/**",
+					"**/vs/workbench/**/{common,node}/**",
+					"**/vs/server/**",
+					"**/vs/code/**/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/src/vs/workbench/workbench.common.main.ts",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/base/parts/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/**/{common,browser}/**"
+				]
+			},
+			{
+				"target": "**/src/vs/workbench/workbench.web.main.ts",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/base/parts/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/**/{common,browser}/**",
+					"**/vs/workbench/workbench.common.main"
+				]
+			},
+			{
+				"target": "**/src/vs/workbench/workbench.web.api.ts",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,browser}/**",
+					"**/vs/base/parts/**/{common,browser}/**",
+					"**/vs/platform/**/{common,browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/**/{common,browser}/**",
+					"**/vs/workbench/workbench.web.main"
+				]
+			},
+			{
+				"target": "**/src/vs/workbench/workbench.sandbox.main.ts",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,browser,electron-sandbox}/**",
+					"**/vs/base/parts/**/{common,browser,electron-sandbox}/**",
+					"**/vs/platform/**/{common,browser,electron-sandbox}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/**/{common,browser,electron-sandbox}/**",
+					"**/vs/workbench/workbench.common.main"
+				]
+			},
+			{
+				"target": "**/src/vs/workbench/workbench.desktop.main.ts",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/base/parts/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/platform/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/**/{common,browser,node,electron-sandbox,electron-browser}/**",
+					"**/vs/workbench/workbench.common.main",
+					"**/vs/workbench/workbench.sandbox.main"
+				]
+			},
+			{
+				"target": "**/extensions/**",
+				"restrictions": "**/*"
+			},
+			{
+				"target": "**/test/smoke/**",
+				"restrictions": [
+					"**/test/smoke/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/test/automation/**",
+				"restrictions": [
+					"**/test/automation/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/test/integration/**",
+				"restrictions": [
+					"**/test/integration/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/test/monaco/**",
+				"restrictions": [
+					"**/test/monaco/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/api/**.test.ts",
+				"restrictions": [
+					"**/vs/**",
+					"assert",
+					"sinon",
+					"crypto",
+					"vscode"
+				]
+			},
+			{
+				"target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
+				"restrictions": [
+					"**/vs/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/{node,electron-browser,electron-main}/**/test/**",
+				"restrictions": [
+					"**/vs/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/test/{node,electron-browser,electron-main}/**",
+				"restrictions": [
+					"**/vs/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/**.test.ts",
+				"restrictions": [
+					"**/vs/**",
+					"assert",
+					"sinon",
+					"crypto",
+					"xterm*"
+				]
+			},
+			{
+				"target": "**/test/**",
+				"restrictions": [
+					"**/vs/**",
+					"assert",
+					"sinon",
+					"crypto",
+					"xterm*"
+				]
+			}
+		]
+	},
+	"overrides": [
+		{
+			"files": [
+				"*.js"
+			],
+			"rules": {
+				"jsdoc/no-types": "off"
+			}
+		},
+		{
+			"files": [
+				"**/vscode.d.ts",
+				"**/vscode.proposed.d.ts"
+			],
+			"rules": {
+				"vscode-dts-create-func": "warn",
+				"vscode-dts-literal-or-types": "warn",
+				"vscode-dts-interface-naming": "warn",
+				"vscode-dts-cancellation": "warn",
+				"vscode-dts-use-thenable": "warn",
+				"vscode-dts-region-comments": "warn",
+				"vscode-dts-provider-naming": [
+					"warn",
+					{
+						"allowed": [
+							"FileSystemProvider",
+							"TreeDataProvider",
+							"CustomEditorProvider",
+							"CustomReadonlyEditorProvider",
+							"TerminalLinkProvider"
+						]
+					}
+				],
+				"vscode-dts-event-naming": [
+					"warn",
+					{
+						"allowed": [
+							"onCancellationRequested",
+							"event"
+						],
+						"verbs": [
+							"accept",
+							"change",
+							"close",
+							"collapse",
+							"create",
+							"delete",
+							"discover",
+							"dispose",
+							"edit",
+							"end",
+							"expand",
+							"hide",
+							"open",
+							"override",
+							"receive",
+							"register",
+							"rename",
+							"save",
+							"send",
+							"start",
+							"terminate",
+							"trigger",
+							"unregister",
+							"write"
+						]
+					}
+				]
+			}
+		}
+	]
 }
diff --git a/.github/actions/build-chat/.gitignore b/.github/actions/build-chat/.gitignore
new file mode 100644
index 000000000..db4c6d9b6
--- /dev/null
+++ b/.github/actions/build-chat/.gitignore
@@ -0,0 +1,2 @@
+dist
+node_modules
\ No newline at end of file
diff --git a/.github/actions/build-chat/action.yml b/.github/actions/build-chat/action.yml
new file mode 100644
index 000000000..278475c9c
--- /dev/null
+++ b/.github/actions/build-chat/action.yml
@@ -0,0 +1,10 @@
+name: 'Build Chat'
+description: 'Notify in chat about build results.'
+author: 'Christof Marti'
+inputs:
+  workflow_run_url:
+    description: 'Workflow run URL of the completed build.'
+    required: true
+runs:
+  using: 'node12'
+  main: 'dist/main.js'
diff --git a/.github/actions/build-chat/package.json b/.github/actions/build-chat/package.json
new file mode 100644
index 000000000..156717a82
--- /dev/null
+++ b/.github/actions/build-chat/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "build-chat",
+  "version": "0.0.0",
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "description": "A GitHub action to create a Windows Package Manager manifest file.",
+  "main": "dist/main.js",
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "@actions/core": "^1.2.6",
+    "@octokit/rest": "^18.0.12",
+    "@slack/web-api": "^6.0.0",
+    "azure-storage": "^2.10.3",
+    "stream-buffers": "^3.0.2"
+  },
+  "devDependencies": {
+    "@types/node": "^14.14.22",
+    "@types/stream-buffers": "^3.0.3",
+    "typescript": "^4.1.3"
+  }
+}
diff --git a/.github/actions/build-chat/src/main.ts b/.github/actions/build-chat/src/main.ts
new file mode 100644
index 000000000..71e035850
--- /dev/null
+++ b/.github/actions/build-chat/src/main.ts
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as core from '@actions/core';
+import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
+import { WebClient } from '@slack/web-api';
+import * as storage from 'azure-storage';
+import { WritableStreamBuffer } from 'stream-buffers';
+
+(async () => {
+	const actionUrl = core.getInput('workflow_run_url');
+	const url = actionUrl || 'https://api.github.com/repos/microsoft/vscode/actions/runs/503514090';
+	console.log(url);
+	const parts = url.split('/');
+	const owner = parts[parts.length - 5];
+	const repo = parts[parts.length - 4];
+	const runId = parseInt(parts[parts.length - 1], 10);
+	if (actionUrl) {
+		await handleNotification(owner, repo, runId);
+	} else {
+		const results = await buildComplete(owner, repo, runId);
+		for (const message of [...results.logMessages, ...results.messages]) {
+			console.log(message);
+		}
+	}
+})()
+	.then(null, console.error);
+
+const testChannels = ['bot-log', 'bot-test-log'];
+
+async function handleNotification(owner: string, repo: string, runId: number) {
+
+	const results = await buildComplete(owner, repo, runId);
+	if (results.logMessages.length || results.messages.length) {
+
+		const web = new WebClient(process.env.SLACK_TOKEN);
+		const memberships = await listAllMemberships(web);
+		const memberTestChannels = memberships.filter(m => testChannels.indexOf(m.name) !== -1);
+
+		for (const message of results.logMessages) {
+			for (const testChannel of memberTestChannels) {
+				await web.chat.postMessage({
+					text: message,
+					link_names: true,
+					channel: testChannel.id,
+				});
+			}
+		}
+		for (const message of results.messages) {
+			for (const channel of memberships) {
+				await web.chat.postMessage({
+					text: message,
+					link_names: true,
+					channel: channel.id,
+				});
+			}
+		}
+	}
+}
+
+async function buildComplete(owner: string, repo: string, runId: number) {
+	console.log(`buildComplete: https://github.com/${owner}/${repo}/actions/runs/${runId}`);
+	const auth = `token ${process.env.GITHUB_TOKEN}`;
+	const octokit = new Octokit({ auth });
+	const buildResult = (await octokit.actions.getWorkflowRun({
+		owner,
+		repo,
+		run_id: runId,
+	})).data;
+	if (buildResult.head_branch !== 'master' && !buildResult.head_branch?.startsWith('release/')) {
+		console.error('Private branch. Terminating.')
+		return { logMessages: [], messages: [] };
+	}
+
+	// const buildQuery = `${buildsApiUrl}?$top=10&maxTime=${buildResult.finishTime}&definitions=${buildResult.definition.id}&branchName=${buildResult.sourceBranch}&resultFilter=${results.join(',')}&api-version=5.0-preview.4`;
+
+	const buildResults = (await octokit.actions.listWorkflowRuns({
+		owner,
+		repo,
+		workflow_id: buildResult.workflow_id,
+		branch: buildResult.head_branch || undefined,
+		per_page: 5, // More returns 502s.
+	})).data.workflow_runs
+		.filter(run => run.status === 'completed');
+
+	const currentBuildIndex = buildResults.findIndex(build => build.id === buildResult.id);
+	if (currentBuildIndex === -1) {
+		console.error('Build not on first page. Terminating.')
+		console.error(buildResults.map(({ id, status, conclusion }) => ({ id, status, conclusion })));
+		return { logMessages: [], messages: [] };
+	}
+	const slicedResults = buildResults.slice(currentBuildIndex, currentBuildIndex + 2);
+	const builds = slicedResults
+		.map<Build>((build, i, array) => ({
+			data: build,
+			previousSourceVersion: i < array.length - 1 ? array[i + 1].head_sha : undefined,
+			authors: [],
+			buildHtmlUrl: build.html_url,
+			changesHtmlUrl: '',
+		}));
+	const logMessages = builds.slice(0, 1)
+		.map(build => `Id: ${build.data.id} | Branch: ${build.data.head_branch} | Conclusion: ${build.data.conclusion} | Created: ${build.data.created_at} | Updated: ${build.data.updated_at}`);
+	const transitionedBuilds = builds.filter((build, i, array) => i < array.length - 1 && transitioned(build, array[i + 1]));
+	await Promise.all(transitionedBuilds
+		.map(async build => {
+			if (build.previousSourceVersion) {
+				const cmp = await compareCommits(octokit, owner, repo, build.previousSourceVersion, build.data.head_sha);
+				const commits = cmp.data.commits;
+				const authors = new Set<string>([
+					...commits.map((c: any) => c.author.login),
+					...commits.map((c: any) => c.committer.login),
+				]);
+				authors.delete('web-flow'); // GitHub Web UI committer
+				build.authors = [...authors];
+				build.changesHtmlUrl = `https://github.com/${owner}/${repo}/compare/${build.previousSourceVersion.substr(0, 7)}...${build.data.head_sha.substr(0, 7)}`; // Shorter than: cmp.data.html_url
+			}
+		}));
+	const vscode = repo === 'vscode';
+	const name = vscode ? `VS Code ${buildResult.name} Build` : buildResult.name;
+	// TBD: `Requester: ${vstsToSlackUser(build.requester, build.degraded)}${pingBenForSmokeTests && releaseBuild && build.result === 'partiallySucceeded' ? ' | Ping: @bpasero' : ''}`
+	const accounts = await readAccounts();
+	const githubAccountMap = githubToAccounts(accounts);
+	const messages = transitionedBuilds.map(build => `${name}
+Result: ${build.data.conclusion} | Branch: ${build.data.head_branch} | Authors: ${githubToSlackUsers(githubAccountMap, build.authors, build.degraded).sort().join(', ') || `None (rebuild)`}
+Build: ${build.buildHtmlUrl}
+Changes: ${build.changesHtmlUrl}`);
+	return { logMessages, messages };
+}
+
+const conclusions = ['success', 'failure']
+
+function transitioned(newer: Build, older: Build) {
+	const newerResult = newer.data.conclusion || 'success';
+	const olderResult = older.data.conclusion || 'success';
+	if (newerResult === olderResult) {
+		return false;
+	}
+	if (conclusions.indexOf(newerResult) > conclusions.indexOf(olderResult)) {
+		newer.degraded = true;
+	}
+	return true;
+}
+
+async function compareCommits(octokit: Octokit, owner: string, repo: string, base: string, head: string) {
+	return octokit.repos.compareCommits({ owner, repo, base, head });
+}
+
+function githubToSlackUsers(githubToAccounts: Record<string, Accounts>, githubUsers: string[], at?: boolean) {
+	return githubUsers.map(g => githubToAccounts[g] ? `${at ? '@' : ''}${githubToAccounts[g].slack}` : g);
+}
+
+interface Accounts {
+	github: string;
+	slack: string;
+	vsts: string;
+}
+
+function githubToAccounts(accounts: Accounts[]) {
+	return accounts.reduce((m, e) => {
+		m[e.github] = e;
+		return m;
+	}, <Record<string, Accounts>>{});
+}
+
+async function readAccounts() {
+	const connectionString = process.env.BUILD_CHAT_STORAGE_CONNECTION_STRING;
+	if (!connectionString) {
+		console.error('Connection string missing.');
+		return [];
+	}
+	const buf = await readFile(connectionString, 'config', '/', 'accounts.json');
+	return JSON.parse(buf.toString()) as Accounts[];
+}
+
+async function readFile(connectionString: string, share: string, directory: string, filename: string) {
+	return new Promise<Buffer>((resolve, reject) => {
+		const stream = new WritableStreamBuffer()
+		const fileService = storage.createFileService(connectionString);
+		fileService.getFileToStream(share, directory, filename, stream, err => {
+			if (err) {
+				reject(err);
+			} else {
+				const contents = stream.getContents();
+				if (contents) {
+					resolve(contents);
+				} else {
+					reject(new Error('No content'));
+				}
+			}
+		});
+	});
+}
+
+interface AllChannels {
+	channels: {
+		id: string;
+		name: string;
+		is_member: boolean;
+	}[];
+}
+
+async function listAllMemberships(web: WebClient) {
+	const groups = await web.conversations.list({ types: 'public_channel,private_channel' }) as unknown as AllChannels;
+	return groups.channels
+		.filter(c => c.is_member);
+}
+
+interface Build {
+	data: RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data'];
+	previousSourceVersion: string | undefined;
+	authors: string[];
+	buildHtmlUrl: string;
+	changesHtmlUrl: string;
+	degraded?: boolean;
+}
diff --git a/.github/actions/build-chat/tsconfig.json b/.github/actions/build-chat/tsconfig.json
new file mode 100644
index 000000000..f4889aab7
--- /dev/null
+++ b/.github/actions/build-chat/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es2017",
+        "strict": true,
+        "noUnusedLocals": true,
+        "resolveJsonModule": true,
+        "lib": [
+            "es2017"
+        ],
+        "sourceMap": true,
+        "outDir": "./dist",
+        "rootDir": "./src",
+    },
+    "exclude": [
+        "node_modules"
+    ]
+}
\ No newline at end of file
diff --git a/.github/actions/build-chat/yarn.lock b/.github/actions/build-chat/yarn.lock
new file mode 100644
index 000000000..bc2185232
--- /dev/null
+++ b/.github/actions/build-chat/yarn.lock
@@ -0,0 +1,728 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@actions/core@^1.2.6":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
+  integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
+
+"@octokit/auth-token@^2.4.4":
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56"
+  integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==
+  dependencies:
+    "@octokit/types" "^6.0.0"
+
+"@octokit/core@^3.2.3":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.4.tgz#5791256057a962eca972e31818f02454897fd106"
+  integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg==
+  dependencies:
+    "@octokit/auth-token" "^2.4.4"
+    "@octokit/graphql" "^4.5.8"
+    "@octokit/request" "^5.4.12"
+    "@octokit/types" "^6.0.3"
+    before-after-hook "^2.1.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^6.0.1":
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.10.tgz#741ce1fa2f4fb77ce8ebe0c6eaf5ce63f565f8e8"
+  integrity sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==
+  dependencies:
+    "@octokit/types" "^6.0.0"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^4.5.8":
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b"
+  integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA==
+  dependencies:
+    "@octokit/request" "^5.3.0"
+    "@octokit/types" "^6.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/openapi-types@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-3.0.0.tgz#f73d48af2d21bf4f97fbf38fae43b54699e0dbba"
+  integrity sha512-jOp1CVRw+OBJaZtG9QzZggvJXvyzgDXuW948SWsDiwmyDuCjeYCiF3TDD/qvhpF580RfP7iBIos4AVU6yhgMlA==
+
+"@octokit/plugin-paginate-rest@^2.6.2":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.8.0.tgz#2b41e12b494e895bf5fb5b12565d2c80a0ecc6ae"
+  integrity sha512-HtuEQ2AYE4YFEBQN0iHmMsIvVucd5RsnwJmRKIsfAg1/ZeoMaU+jXMnTAZqIUEmcVJA27LjHUm3f1hxf8Fpdxw==
+  dependencies:
+    "@octokit/types" "^6.4.0"
+
+"@octokit/plugin-request-log@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
+  integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
+
+"@octokit/plugin-rest-endpoint-methods@4.4.1":
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.4.1.tgz#105cf93255432155de078c9efc33bd4e14d1cd63"
+  integrity sha512-+v5PcvrUcDeFXf8hv1gnNvNLdm4C0+2EiuWt9EatjjUmfriM1pTMM+r4j1lLHxeBQ9bVDmbywb11e3KjuavieA==
+  dependencies:
+    "@octokit/types" "^6.1.0"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.0":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.4.tgz#07dd5c0521d2ee975201274c472a127917741262"
+  integrity sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==
+  dependencies:
+    "@octokit/types" "^6.0.0"
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
+"@octokit/request@^5.3.0", "@octokit/request@^5.4.12":
+  version "5.4.12"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc"
+  integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.0.0"
+    "@octokit/types" "^6.0.3"
+    deprecation "^2.0.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    once "^1.4.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/rest@^18.0.12":
+  version "18.0.12"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.12.tgz#278bd41358c56d87c201e787e8adc0cac132503a"
+  integrity sha512-hNRCZfKPpeaIjOVuNJzkEL6zacfZlBPV8vw8ReNeyUkVvbuCvvrrx8K8Gw2eyHHsmd4dPlAxIXIZ9oHhJfkJpw==
+  dependencies:
+    "@octokit/core" "^3.2.3"
+    "@octokit/plugin-paginate-rest" "^2.6.2"
+    "@octokit/plugin-request-log" "^1.0.2"
+    "@octokit/plugin-rest-endpoint-methods" "4.4.1"
+
+"@octokit/types@^6.0.0", "@octokit/types@^6.0.3", "@octokit/types@^6.1.0", "@octokit/types@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.4.0.tgz#f3f47be70bcdb3c26f2c2619f3dd0ced466a265c"
+  integrity sha512-1FEmuVppZE2zG0rBdQlviRz5cp0udyI63zyhBVPrm0FRNAsQkAXU7IYWQg1XvhChFut8YbFYN1usQpk54D6/4w==
+  dependencies:
+    "@octokit/openapi-types" "^3.0.0"
+    "@types/node" ">= 8"
+
+"@slack/logger@>=1.0.0 <3.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@slack/logger/-/logger-2.0.0.tgz#6a4e1c755849bc0f66dac08a8be54ce790ec0e6b"
+  integrity sha512-OkIJpiU2fz6HOJujhlhfIGrc8hB4ibqtf7nnbJQDerG0BqwZCfmgtK5sWzZ0TkXVRBKD5MpLrTmCYyMxoMCgPw==
+  dependencies:
+    "@types/node" ">=8.9.0"
+
+"@slack/types@^1.7.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@slack/types/-/types-1.10.0.tgz#cbf7d83e1027f4cbfd13d6b429f120c7fb09127a"
+  integrity sha512-tA7GG7Tj479vojfV3AoxbckalA48aK6giGjNtgH6ihpLwTyHE3fIgRrvt8TWfLwW8X8dyu7vgmAsGLRG7hWWOg==
+
+"@slack/web-api@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@slack/web-api/-/web-api-6.0.0.tgz#14c65ed73c66a187e5f20e12c3898dfd8d5cbf7c"
+  integrity sha512-YD1wqWuzrYPf4RQyD7OnYS5lImUmNWn+G5V6Qt0N97fPYxqhT72YJtRdSnsTc3VkH5R5imKOhYxb+wqI9hiHnA==
+  dependencies:
+    "@slack/logger" ">=1.0.0 <3.0.0"
+    "@slack/types" "^1.7.0"
+    "@types/is-stream" "^1.1.0"
+    "@types/node" ">=12.0.0"
+    axios "^0.21.1"
+    eventemitter3 "^3.1.0"
+    form-data "^2.5.0"
+    is-stream "^1.1.0"
+    p-queue "^6.6.1"
+    p-retry "^4.0.0"
+
+"@types/is-stream@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/is-stream/-/is-stream-1.1.0.tgz#b84d7bb207a210f2af9bed431dc0fbe9c4143be1"
+  integrity sha512-jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*", "@types/node@>= 8", "@types/node@>=12.0.0", "@types/node@>=8.9.0", "@types/node@^14.14.22":
+  version "14.14.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
+  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
+
+"@types/retry@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+
+"@types/stream-buffers@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stream-buffers/-/stream-buffers-3.0.3.tgz#34e565bf64e3e4bdeee23fd4aa58d4636014a02b"
+  integrity sha512-NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==
+  dependencies:
+    "@types/node" "*"
+
+ajv@^6.12.3:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  dependencies:
+    follow-redirects "^1.10.0"
+
+azure-storage@^2.10.3:
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz#c5966bf929d87587d78f6847040ea9a4b1d4a50a"
+  integrity sha512-IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ==
+  dependencies:
+    browserify-mime "~1.2.9"
+    extend "^3.0.2"
+    json-edm-parser "0.1.2"
+    md5.js "1.3.4"
+    readable-stream "~2.0.0"
+    request "^2.86.0"
+    underscore "~1.8.3"
+    uuid "^3.0.0"
+    validator "~9.4.1"
+    xml2js "0.2.8"
+    xmlbuilder "^9.0.7"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+before-after-hook@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
+  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
+
+browserify-mime@~1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
+  integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+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=
+
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+eventemitter3@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+
+eventemitter3@^4.0.4:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+extend@^3.0.2, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+follow-redirects@^1.10.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"
+  integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+json-edm-parser@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"
+  integrity sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ=
+  dependencies:
+    jsonparse "~1.2.0"
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsonparse@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
+  integrity sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70=
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+md5.js@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+mime-db@1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  dependencies:
+    mime-db "1.45.0"
+
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-queue@^6.6.1:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
+  dependencies:
+    eventemitter3 "^4.0.4"
+    p-timeout "^3.2.0"
+
+p-retry@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.2.0.tgz#ea9066c6b44f23cab4cd42f6147cdbbc6604da5d"
+  integrity sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==
+  dependencies:
+    "@types/retry" "^0.12.0"
+    retry "^0.12.0"
+
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+request@^2.86.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+stream-buffers@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521"
+  integrity sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+typescript@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+
+underscore@~1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
+
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+uuid@^3.0.0, uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+validator@~9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
+  integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+xml2js@0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2"
+  integrity sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I=
+  dependencies:
+    sax "0.5.x"
+
+xmlbuilder@^9.0.7:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
diff --git a/.github/classifier.json b/.github/classifier.json
index 0ff0712c3..96b587713 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -57,7 +57,7 @@
 		"editor-theming": {"assign": []},
 		"editor-wordnav": {"assign": ["alexdima"]},
 		"editor-wrapping": {"assign": ["alexdima"]},
-		"emmet": {"assign": []},
+		"emmet": {"assign": ["rzhao271"]},
 		"error-list": {"assign": ["sandy081"]},
 		"explorer-custom": {"assign": ["sandy081"]},
 		"extension-host": {"assign": []},
@@ -172,7 +172,7 @@
 		"workbench-tabs": {"assign": ["bpasero"]},
 		"workbench-touchbar": {"assign": ["bpasero"]},
 		"workbench-views": {"assign": ["sbatten"]},
-		"workbench-welcome": {"assign": ["chrmarti"]},
+		"workbench-welcome": {"assign": ["JacksonKearl"]},
 		"workbench-window": {"assign": ["bpasero"]},
 		"workbench-zen": {"assign": ["isidorn"]},
 		"workspace-edit": {"assign": ["jrieken"]},
diff --git a/.github/commands.json b/.github/commands.json
index 980b2906b..7563a3924 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -81,7 +81,7 @@
 		"type": "label",
 		"name": "*duplicate",
 		"action": "close",
-		"comment": "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for existing issues [here](https://aka.ms/vscodeissuesearch). See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
+		"comment": "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for existing issues [here](${duplicateQuery}). See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
 	},
 	{
 		"type": "comment",
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a2523237c..45f9ee8f3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 <!-- Thank you for submitting a Pull Request. Please:
 * Read our Pull Request guidelines:
-  https://github.com/microsoft/vscode/wiki/How-to-Contribute#pull-requests.
+  https://github.com/microsoft/vscode/wiki/How-to-Contribute#pull-requests
 * Associate an issue with the Pull Request.
 * Ensure that the code is up-to-date with the `master` branch.
 * Include a description of the proposed changes and how to test them.
diff --git a/.github/workflows/author-verified.yml b/.github/workflows/author-verified.yml
index 6924d9650..33b4b6076 100644
--- a/.github/workflows/author-verified.yml
+++ b/.github/workflows/author-verified.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'author-verification-requested')
diff --git a/.github/workflows/build-chat.yml b/.github/workflows/build-chat.yml
new file mode 100644
index 000000000..e8a6797b8
--- /dev/null
+++ b/.github/workflows/build-chat.yml
@@ -0,0 +1,36 @@
+name: "Build Chat"
+
+on:
+  workflow_run:
+    workflows:
+      - CI
+    types:
+      - completed
+    branches:
+      - master
+      - release/*
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup Node.js 12.x
+      uses: actions/setup-node@v1.4.4
+      with:
+          node-version: "12.x"
+
+    - name: Build
+      run: yarn install && yarn run build
+      working-directory: .github/actions/build-chat
+
+    - name: Build Chat
+      uses: ./.github/actions/build-chat
+      with:
+        workflow_run_url: ${{ github.event.workflow_run.url }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
+        BUILD_CHAT_STORAGE_CONNECTION_STRING: ${{ secrets.BUILD_CHAT_STORAGE_CONNECTION_STRING }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08775eab9..73acbb004 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,134 +11,269 @@ on:
       - release/*
 
 jobs:
-  # linux:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-  #   - run: |
-  #       sudo apt-get update
-  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-  #       sudo chmod +x /etc/init.d/xvfb
-  #       sudo update-rc.d xvfb defaults
-  #       sudo service xvfb start
-  #     name: Setup Build Environment
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   # TODO: cache node modules
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn electron x64
-  #     name: Download Electron
-  #   - run: yarn gulp hygiene
-  #     name: Run Hygiene Checks
-  #   - run: yarn monaco-compile-check
-  #     name: Run Monaco Editor Checks
-  #   - run: yarn valid-layers-check
-  #     name: Run Valid Layers Checks
-  #   - run: yarn compile
-  #     name: Compile Sources
-  #   - run: yarn download-builtin-extensions
-  #     name: Download Built-in Extensions
-  #   - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-  #     name: Run Unit Tests (Electron)
-  #   - run: DISPLAY=:10 yarn test-browser --browser chromium
-  #     name: Run Unit Tests (Browser)
-  #   - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-  #     name: Run Integration Tests (Electron)
-
-  # windows:
-  #   runs-on: windows-2016
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   - uses: actions/setup-python@v1
-  #     with:
-  #       python-version: '2.x'
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn electron
-  #     name: Download Electron
-  #   - run: yarn gulp hygiene
-  #     name: Run Hygiene Checks
-  #   - run: yarn monaco-compile-check
-  #     name: Run Monaco Editor Checks
-  #   - run: yarn valid-layers-check
-  #     name: Run Valid Layers Checks
-  #   - run: yarn compile
-  #     name: Compile Sources
-  #   - run: yarn download-builtin-extensions
-  #     name: Download Built-in Extensions
-  #   - run: .\scripts\test.bat --tfs "Unit Tests"
-  #     name: Run Unit Tests (Electron)
-  #   - run: yarn test-browser --browser chromium
-  #     name: Run Unit Tests (Browser)
-  #   - run: .\scripts\test-integration.bat --tfs "Integration Tests"
-  #     name: Run Integration Tests (Electron)
-
-  # darwin:
-  #   runs-on: macos-latest
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn electron x64
-  #     name: Download Electron
-  #   - run: yarn gulp hygiene
-  #     name: Run Hygiene Checks
-  #   - run: yarn monaco-compile-check
-  #     name: Run Monaco Editor Checks
-  #   - run: yarn valid-layers-check
-  #     name: Run Valid Layers Checks
-  #   - run: yarn compile
-  #     name: Compile Sources
-  #   - run: yarn download-builtin-extensions
-  #     name: Download Built-in Extensions
-  #   - run: ./scripts/test.sh --tfs "Unit Tests"
-  #     name: Run Unit Tests (Electron)
-  #   - run: yarn test-browser --browser chromium --browser webkit
-  #     name: Run Unit Tests (Browser)
-  #   - run: ./scripts/test-integration.sh --tfs "Integration Tests"
-  #     name: Run Integration Tests (Electron)
-
-  monaco:
-    runs-on: ubuntu-latest
+  windows:
+    name: Windows
+    runs-on: windows-latest
+    timeout-minutes: 30
     env:
       CHILD_CONCURRENCY: "1"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "2.x"
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      - name: Cache node_modules archive
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: ".build/node_modules_cache"
+          key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
+      - name: Extract node_modules archive
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit == 'true' }}
+        run: 7z.exe x .build/node_modules_cache/cache.7z -aos
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+      - name: Create node_modules archive
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: |
+          mkdir -Force .build
+          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          mkdir -Force .build/node_modules_cache
+          7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        run: .\scripts\test.bat
+
+      - name: Run Unit Tests (Browser)
+        run: yarn test-browser --browser chromium
+
+      - name: Run Integration Tests (Electron)
+        run: .\scripts\test-integration.bat
+
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
       # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-      - run: |
+      - name: Setup Build Environment
+        run: |
           sudo apt-get update
           sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
           sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
           sudo chmod +x /etc/init.d/xvfb
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
-        name: Setup Build Environment
-      - uses: actions/setup-node@v1
+
+      - uses: actions/setup-node@v2
         with:
-          node-version: 10
-      - run: yarn --frozen-lockfile
-        name: Install Dependencies
-      - run: yarn monaco-compile-check
-        name: Run Monaco Editor Checks
-      - run: yarn gulp editor-esm-bundle
-        name: Editor Distro & ESM Bundle
+          node-version: 12
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      - name: Cache node modules
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-cacheNodeModules11-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-cacheNodeModules11-
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        id: electron-unit-tests
+        run: DISPLAY=:10 ./scripts/test.sh
+
+      - name: Run Unit Tests (Browser)
+        id: browser-unit-tests
+        run: DISPLAY=:10 yarn test-browser --browser chromium
+
+      - name: Run Integration Tests (Electron)
+        id: electron-integration-tests
+        run: DISPLAY=:10 ./scripts/test-integration.sh
+
+  darwin:
+    name: macOS
+    runs-on: macos-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      - name: Cache node modules
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-cacheNodeModules11-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-cacheNodeModules11-
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        run: DISPLAY=:10 ./scripts/test.sh
+
+      - name: Run Unit Tests (Browser)
+        run: DISPLAY=:10 yarn test-browser --browser chromium
+
+      - name: Run Integration Tests (Electron)
+        run: DISPLAY=:10 ./scripts/test-integration.sh
+
+  hygiene:
+    name: Hygiene, Layering and Monaco Editor
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      - name: Cache node modules
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-cacheNodeModules11-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-cacheNodeModules11-
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Run Hygiene Checks
+        run: yarn gulp hygiene
+
+      - name: Run Valid Layers Checks
+        run: yarn valid-layers-check
+
+      - name: Run Monaco Editor Checks
+        run: yarn monaco-compile-check
+
+      - name: Editor Distro & ESM Bundle
+        run: yarn gulp editor-esm-bundle
+
+      - name: Typings validation prep
+        run: |
+          mkdir typings-test
+
+      - name: Typings validation
+        working-directory: ./typings-test
+        run: |
+          yarn init -yp
+          ../node_modules/.bin/tsc --init
+          echo "import '../out-monaco-editor-core';" > a.ts
+          ../node_modules/.bin/tsc --noEmit
+
+      - name: Webpack Editor
+        working-directory: ./test/monaco
+        run: yarn run bundle
+
+      - name: Compile Editor Tests
+        working-directory: ./test/monaco
+        run: yarn run compile
+
+      - name: Download Playwright
+        run: yarn playwright-install
+
+      - name: Run Editor Tests
+        timeout-minutes: 5
+        working-directory: ./test/monaco
+        run: yarn test
diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml
index c2b8f95e0..f189a10a2 100644
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -13,7 +13,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Commands
diff --git a/.github/workflows/deep-classifier-monitor.yml b/.github/workflows/deep-classifier-monitor.yml
index 2734f6b78..e8ad08aab 100644
--- a/.github/workflows/deep-classifier-monitor.yml
+++ b/.github/workflows/deep-classifier-monitor.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml
index 1aaf05a87..af42751b6 100644
--- a/.github/workflows/deep-classifier-runner.yml
+++ b/.github/workflows/deep-classifier-runner.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/deep-classifier-scraper.yml b/.github/workflows/deep-classifier-scraper.yml
index 42b5f1b63..837e56968 100644
--- a/.github/workflows/deep-classifier-scraper.yml
+++ b/.github/workflows/deep-classifier-scraper.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/english-please.yml b/.github/workflows/english-please.yml
index 5253fb73d..70ae98f40 100644
--- a/.github/workflows/english-please.yml
+++ b/.github/workflows/english-please.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         if: contains(github.event.issue.labels.*.name, '*english-please')
diff --git a/.github/workflows/feature-request.yml b/.github/workflows/feature-request.yml
index ec3bbb5e1..223077147 100644
--- a/.github/workflows/feature-request.yml
+++ b/.github/workflows/feature-request.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/latest-release-monitor.yml b/.github/workflows/latest-release-monitor.yml
index b27d79fda..bc4b6b557 100644
--- a/.github/workflows/latest-release-monitor.yml
+++ b/.github/workflows/latest-release-monitor.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Install Storage Module
diff --git a/.github/workflows/locker.yml b/.github/workflows/locker.yml
index dca0f5be6..3cdf09ba6 100644
--- a/.github/workflows/locker.yml
+++ b/.github/workflows/locker.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Locker
diff --git a/.github/workflows/needs-more-info-closer.yml b/.github/workflows/needs-more-info-closer.yml
index 75b7af423..d1f9a824d 100644
--- a/.github/workflows/needs-more-info-closer.yml
+++ b/.github/workflows/needs-more-info-closer.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run Needs More Info Closer
diff --git a/.github/workflows/on-label.yml b/.github/workflows/on-label.yml
index 67b8ec94c..86bbecb68 100644
--- a/.github/workflows/on-label.yml
+++ b/.github/workflows/on-label.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/on-open.yml b/.github/workflows/on-open.yml
index ebfa1cb34..c500a0e2b 100644
--- a/.github/workflows/on-open.yml
+++ b/.github/workflows/on-open.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Install Actions
         run: npm install --production --prefix ./actions
diff --git a/.github/workflows/release-pipeline-labeler.yml b/.github/workflows/release-pipeline-labeler.yml
index e5ea1a26b..edb01fa52 100644
--- a/.github/workflows/release-pipeline-labeler.yml
+++ b/.github/workflows/release-pipeline-labeler.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: "microsoft/vscode-github-triage-actions"
-          ref: v41
+          ref: v42
           path: ./actions
       - name: Checkout Repo
         if: github.event_name != 'issues'
diff --git a/.github/workflows/test-plan-item-validator.yml b/.github/workflows/test-plan-item-validator.yml
index 6c2752107..72c213463 100644
--- a/.github/workflows/test-plan-item-validator.yml
+++ b/.github/workflows/test-plan-item-validator.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions
-          ref: v41
+          ref: v42
       - name: Install Actions
         if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
         run: npm install --production --prefix ./actions
diff --git a/.gitignore b/.gitignore
index b7f5b58c8..11a7486bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,26 +5,8 @@ Thumbs.db
 node_modules/
 .build/
 extensions/**/dist/
-out/
-out-build/
-out-editor/
-out-editor-src/
-out-editor-build/
-out-editor-esm/
-out-editor-esm-bundle/
-out-editor-min/
-out-monaco-editor-core/
-out-vscode/
-out-vscode-min/
-out-vscode-reh/
-out-vscode-reh-min/
-out-vscode-reh-pkg/
-out-vscode-reh-web/
-out-vscode-reh-web-min/
-out-vscode-reh-web-pkg/
-out-vscode-web/
-out-vscode-web-min/
-out-vscode-web-pkg/
+/out*/
+/extensions/**/out/
 src/vs/server
 resources/server
 build/node_modules
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 2cd0a32b9..e8d77d395 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,6 @@
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
-		"EditorConfig.EditorConfig",
-		"msjsdiag.debugger-for-chrome"
+		"EditorConfig.EditorConfig"
 	]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index a83c164f3..11c578b99 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -203,7 +203,7 @@
 		{
 			"type": "pwa-chrome",
 			"request": "launch",
-			"name": "Launch VS Code",
+			"name": "Launch VS Code Internal",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
 			},
@@ -235,7 +235,9 @@
 				"${workspaceFolder}/out/**/*.js"
 			],
 			"browserLaunchLocation": "workspace",
-			"preLaunchTask": "Ensure Prelaunch Dependencies",
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "node",
@@ -472,7 +474,7 @@
 			"name": "VS Code",
 			"stopAll": true,
 			"configurations": [
-				"Launch VS Code",
+				"Launch VS Code Internal",
 				"Attach to Main Process",
 				"Attach to Extension Host",
 				"Attach to Shared Process",
@@ -486,7 +488,7 @@
 		{
 			"name": "Search and Renderer processes",
 			"configurations": [
-				"Launch VS Code",
+				"Launch VS Code Internal",
 				"Attach to Search Process"
 			],
 			"presentation": {
@@ -497,7 +499,7 @@
 		{
 			"name": "Renderer and Extension Host processes",
 			"configurations": [
-				"Launch VS Code",
+				"Launch VS Code Internal",
 				"Attach to Extension Host"
 			],
 			"presentation": {
@@ -526,6 +528,14 @@
 				"group": "1_vscode",
 				"order": 2
 			}
-		}
+		},
+		{
+			"name": "Launch VS Code",
+			"stopAll": true,
+			"configurations": [
+				"Launch VS Code Internal",
+			],
+			"preLaunchTask": "Ensure Prelaunch Dependencies"
+		},
 	]
 }
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index 8ff55e2c6..36ac402da 100644
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@@ -8,7 +8,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"November 2020\"",
+    "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"January 2021\"",
     "editable": true
   },
   {
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index e749a11c4..387b45793 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -8,8 +8,8 @@
   {
     "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:\"November 2020\"",
-    "editable": false
+    "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:\"January 2021\"",
+    "editable": true
   },
   {
     "kind": 1,
@@ -92,7 +92,7 @@
   {
     "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:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -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
   },
   {
@@ -104,7 +104,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE label:candidate",
+    "value": "$REPOS $MILESTONE is:open label:candidate",
     "editable": true
   }
 ]
\ No newline at end of file
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 54ec5328e..f22e29802 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -8,8 +8,8 @@
   {
     "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:\"November 2020\"\n\n$MINE=assignee:@me",
-    "editable": false
+    "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:\"January 2021\"\n\n$MINE=assignee:@me",
+    "editable": true
   },
   {
     "kind": 1,
@@ -176,7 +176,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me 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",
     "editable": true
   },
   {
@@ -188,7 +188,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:btholt -author:chrisdias -author:chrmarti -author:Chuxel -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:eamodio -author:egamma -author:fiveisprime -author:gregvanl -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:jrieken -author:kieferrm -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:Tyriar -author:weinand",
+    "value": "$REPOS $MILESTONE -$MINE 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 -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:btholt -author:chrisdias -author:chrmarti -author:Chuxel -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:eamodio -author:egamma -author:fiveisprime -author:gregvanl -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:jrieken -author:kieferrm -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rebornix -author:RMacfarlane -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:Tyriar -author:weinand -author:TylerLeonhardt -author:lramos15",
     "editable": true
   },
   {
@@ -200,7 +200,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found",
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me 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",
     "editable": true
   },
   {
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 55fc585e3..91f337b9f 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -8,7 +8,7 @@
   {
     "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:\"November 2020\"",
+    "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:\"January 2021\"",
     "editable": true
   },
   {
@@ -83,6 +83,24 @@
     "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"",
     "editable": false
   },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### Personal Inbox\n",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "\n#### Missing Type label",
+    "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
+  },
   {
     "kind": 1,
     "language": "markdown",
diff --git a/.vscode/notebooks/papercuts.github-issues b/.vscode/notebooks/papercuts.github-issues
new file mode 100644
index 000000000..7c20cd731
--- /dev/null
+++ b/.vscode/notebooks/papercuts.github-issues
@@ -0,0 +1,44 @@
+[
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Papercuts\n\nThis notebook serves as an ongoing collection of paper cut issues that we encounter while dogfooding. With that in mind only promote issues that really turn you off, e.g issues that make you wanna stop use VS Code or its extensions. To mark an issue (bug, feature-request, etc) as paper cut add the labels: `papercut :drop_of_blood:`",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## All Papercuts\n\nThese are all papercut issues that we encounter while dogfoodingf vscode or extensions that we author. ",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open -label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "## Native Notebook",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open label:notebook label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  },
+  {
+    "kind": 1,
+    "language": "markdown",
+    "value": "### My Papercuts",
+    "editable": true
+  },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "repo:microsoft/vscode is:open assignee:@me label:\"papercut :drop_of_blood:\"",
+    "editable": true
+  }
+]
\ No newline at end of file
diff --git a/.vscode/notebooks/verification.github-issues b/.vscode/notebooks/verification.github-issues
index 582859397..e223523d4 100644
--- a/.vscode/notebooks/verification.github-issues
+++ b/.vscode/notebooks/verification.github-issues
@@ -14,7 +14,7 @@
   {
     "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:\"November 2020\"",
+    "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:\"January 2021\"",
     "editable": true
   },
   {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4b2a90595..0222b24c2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -71,10 +71,12 @@
 		"files.insertFinalNewline": false,
 	},
 	"[typescript]": {
-		"editor.defaultFormatter": "vscode.typescript-language-features"
+		"editor.defaultFormatter": "vscode.typescript-language-features",
+		"editor.formatOnSave": true,
 	},
 	"[javascript]": {
-		"editor.defaultFormatter": "vscode.typescript-language-features"
+		"editor.defaultFormatter": "vscode.typescript-language-features",
+		"editor.formatOnSave": true,
 	},
 	"typescript.tsc.autoDetect": "off"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 943ae5bd5..007d2c3f1 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -62,7 +62,8 @@
 			"group": {
 				"kind": "build",
 				"isDefault": true
-			}
+			},
+			"problemMatcher": []
 		},
 		{
 			"type": "npm",
@@ -90,7 +91,8 @@
 				"Kill Build VS Code Core",
 				"Kill Build VS Code Extensions"
 			],
-			"group": "build"
+			"group": "build",
+			"problemMatcher": []
 		},
 		{
 			"type": "npm",
@@ -203,7 +205,7 @@
 					"base": "$tsc",
 					"applyTo": "allDocuments",
 					"owner": "tsec"
-				},
+				}
 			],
 			"group": "build",
 			"label": "npm: tsec-compile-check",
diff --git a/.yarnrc b/.yarnrc
index 264a5e3a3..83146ea60 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "9.3.5"
+target "11.2.1"
 runtime "electron"
diff --git a/README.md b/README.md
index ce1a7132e..ec206f094 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # Visual Studio Code - Open Source ("Code - OSS")
-[![Build Status](https://dev.azure.com/vscode/VSCode/_apis/build/status/VS%20Code?branchName=master)](https://aka.ms/vscode-builds)
 [![Feature Requests](https://img.shields.io/github/issues/microsoft/vscode/feature-request.svg)](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
 [![Bugs](https://img.shields.io/github/issues/microsoft/vscode/bug.svg)](https://github.com/microsoft/vscode/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3Abug)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-yellow.svg)](https://gitter.im/Microsoft/vscode)
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 0d0db3aca..5633bc5ab 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -28,23 +28,23 @@ This project incorporates components from the projects listed below. The origina
 21.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
 22.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
 23.	jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-24.	jeff-hykin/cpp-textmate-grammar version 1.15.3 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+24.	jeff-hykin/cpp-textmate-grammar version 1.15.5 (https://github.com/jeff-hykin/cpp-textmate-grammar)
 25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
 26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
 27.	language-docker (https://github.com/moby/moby)
 28.	language-less version 0.34.2 (https://github.com/atom/language-less)
-29.	language-php version 0.44.5 (https://github.com/atom/language-php)
+29.	language-php version 0.46.0 (https://github.com/atom/language-php)
 30.	MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
 31.	marked version 1.1.0 (https://github.com/markedjs/marked)
 32.	mdn-data version 1.1.12 (https://github.com/mdn/data)
 33.	microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
 34.	microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
-35.	microsoft/vscode-markdown-tm-grammar (https://github.com/microsoft/vscode-markdown-tm-grammar)
+35.	microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar)
 36.	microsoft/vscode-mssql version 1.9.0 (https://github.com/microsoft/vscode-mssql)
 37.	mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile)
 38.	octref/language-css version 0.42.11 (https://github.com/octref/language-css)
 39.	PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax)
-40.	rust-syntax version 0.2.13 (https://github.com/dustypomerleau/rust-syntax)
+40.	rust-syntax version 0.4.3 (https://github.com/dustypomerleau/rust-syntax)
 41.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
 42.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
 43.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
@@ -64,7 +64,7 @@ This project incorporates components from the projects listed below. The origina
 57.	TypeScript-TmLanguage version 1.0.0 (https://github.com/microsoft/TypeScript-TmLanguage)
 58.	Unicode version 12.0.0 (https://home.unicode.org/)
 59.	vscode-codicons version 0.0.1 (https://github.com/microsoft/vscode-codicons)
-60.	vscode-logfile-highlighter version 2.8.0 (https://github.com/emilast/vscode-logfile-highlighter)
+60.	vscode-logfile-highlighter version 2.9.0 (https://github.com/emilast/vscode-logfile-highlighter)
 61.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
 62.	Web Background Synchronization (https://github.com/WICG/background-sync)
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index cce8119d4..000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-jobs:
-- job: Windows
-  pool:
-    vmImage: VS2017-Win2016
-  steps:
-  - template: build/azure-pipelines/win32/continuous-build-win32.yml
-
-- job: Linux
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  steps:
-  - template: build/azure-pipelines/linux/continuous-build-linux.yml
-
-- job: macOS
-  pool:
-    vmImage: macOS-latest
-  steps:
-  - template: build/azure-pipelines/darwin/continuous-build-darwin.yml
-
-trigger:
-  branches:
-    exclude:
-    - electron-11.x.y
diff --git a/build/.cachesalt b/build/.cachesalt
index a7a4d5082..057dd5fd3 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2020-11-30T16:21:34.566Z
+2021-01-28T11:52:11.376Z
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index 01e8737ef..000000000
--- a/build/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-azure-pipelines/**/*.js
-darwin/**/*.js
-lib/**/*.js
diff --git a/build/azure-pipelines/common/.gitignore b/build/azure-pipelines/common/.gitignore
deleted file mode 100644
index e94ecda76..000000000
--- a/build/azure-pipelines/common/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-*.js
\ No newline at end of file
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.js b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
new file mode 100644
index 000000000..b471d5c84
--- /dev/null
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const crypto = require("crypto");
+const { dirs } = require('../../npm/dirs');
+const ROOT = path.join(__dirname, '../../../');
+const shasum = crypto.createHash('sha1');
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+// Add `yarn.lock` files
+for (let dir of dirs) {
+    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
+    shasum.update(fs.readFileSync(yarnLockPath));
+}
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+    shasum.update(process.argv[i]);
+}
+process.stdout.write(shasum.digest('hex'));
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
new file mode 100644
index 000000000..638f115a7
--- /dev/null
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
+const { dirs } = require('../../npm/dirs');
+
+const ROOT = path.join(__dirname, '../../../');
+
+const shasum = crypto.createHash('sha1');
+
+shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+
+// Add `yarn.lock` files
+for (let dir of dirs) {
+	const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
+	shasum.update(fs.readFileSync(yarnLockPath));
+}
+
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+	shasum.update(process.argv[i]);
+}
+
+process.stdout.write(shasum.digest('hex'));
diff --git a/build/azure-pipelines/common/createAsset.js b/build/azure-pipelines/common/createAsset.js
new file mode 100644
index 000000000..3038ff62b
--- /dev/null
+++ b/build/azure-pipelines/common/createAsset.js
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const crypto = require("crypto");
+const azure = require("azure-storage");
+const mime = require("mime");
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+if (process.argv.length !== 6) {
+    console.error('Usage: node createAsset.js PLATFORM TYPE NAME FILE');
+    process.exit(-1);
+}
+function hashStream(hashName, stream) {
+    return new Promise((c, e) => {
+        const shasum = crypto.createHash(hashName);
+        stream
+            .on('data', shasum.update.bind(shasum))
+            .on('error', e)
+            .on('close', () => c(shasum.digest('hex')));
+    });
+}
+async function doesAssetExist(blobService, quality, blobName) {
+    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r)));
+    return existsResult.exists;
+}
+async function uploadBlob(blobService, quality, blobName, filePath, fileName) {
+    const blobOptions = {
+        contentSettings: {
+            contentType: mime.lookup(filePath),
+            contentDisposition: `attachment; filename="${fileName}"`,
+            cacheControl: 'max-age=31536000, public'
+        }
+    };
+    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
+}
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+async function main() {
+    const [, , platform, type, fileName, filePath] = process.argv;
+    const quality = getEnv('VSCODE_QUALITY');
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    console.log('Creating asset...');
+    const stat = await new Promise((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat)));
+    const size = stat.size;
+    console.log('Size:', size);
+    const stream = fs.createReadStream(filePath);
+    const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
+    console.log('SHA1:', sha1hash);
+    console.log('SHA256:', sha256hash);
+    const blobName = commit + '/' + fileName;
+    const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    const blobExists = await doesAssetExist(blobService, quality, blobName);
+    if (blobExists) {
+        console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+        return;
+    }
+    console.log('Uploading blobs to Azure storage...');
+    await uploadBlob(blobService, quality, blobName, filePath, fileName);
+    console.log('Blobs successfully uploaded.');
+    const asset = {
+        platform,
+        type,
+        url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
+        hash: sha1hash,
+        sha256hash,
+        size
+    };
+    // Remove this if we ever need to rollback fast updates for windows
+    if (/win32/.test(platform)) {
+        asset.supportsFastUpdate = true;
+    }
+    console.log('Asset:', JSON.stringify(asset, null, '  '));
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true]));
+}
+main().then(() => {
+    console.log('Asset successfully created');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});
diff --git a/build/azure-pipelines/common/createBuild.js b/build/azure-pipelines/common/createBuild.js
new file mode 100644
index 000000000..afa150b91
--- /dev/null
+++ b/build/azure-pipelines/common/createBuild.js
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+if (process.argv.length !== 3) {
+    console.error('Usage: node createBuild.js VERSION');
+    process.exit(-1);
+}
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+async function main() {
+    const [, , _version] = process.argv;
+    const quality = getEnv('VSCODE_QUALITY');
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    const queuedBy = getEnv('BUILD_QUEUEDBY');
+    const sourceBranch = getEnv('BUILD_SOURCEBRANCH');
+    const version = _version + (quality === 'stable' ? '' : `-${quality}`);
+    console.log('Creating build...');
+    console.log('Quality:', quality);
+    console.log('Version:', version);
+    console.log('Commit:', commit);
+    const build = {
+        id: commit,
+        timestamp: (new Date()).getTime(),
+        version,
+        isReleased: false,
+        sourceBranch,
+        queuedBy,
+        assets: [],
+        updates: {}
+    };
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('createBuild').execute('', [Object.assign(Object.assign({}, build), { _partitionKey: '' })]));
+}
+main().then(() => {
+    console.log('Build successfully created');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});
diff --git a/build/azure-pipelines/common/extract-telemetry.sh b/build/azure-pipelines/common/extract-telemetry.sh
index 03d80c1bb..9cebe22bf 100755
--- a/build/azure-pipelines/common/extract-telemetry.sh
+++ b/build/azure-pipelines/common/extract-telemetry.sh
@@ -10,8 +10,8 @@ git clone --depth 1 https://github.com/microsoft/vscode-node-debug2.git
 git clone --depth 1 https://github.com/microsoft/vscode-node-debug.git
 git clone --depth 1 https://github.com/microsoft/vscode-html-languageservice.git
 git clone --depth 1 https://github.com/microsoft/vscode-json-languageservice.git
-node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
-node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
+node $BUILD_SOURCESDIRECTORY/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
+node $BUILD_SOURCESDIRECTORY/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
 mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
 mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
 mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
diff --git a/build/azure-pipelines/common/installPlaywright.js b/build/azure-pipelines/common/installPlaywright.js
new file mode 100644
index 000000000..8321e71aa
--- /dev/null
+++ b/build/azure-pipelines/common/installPlaywright.js
@@ -0,0 +1,14 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const retry_1 = require("./retry");
+const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');
+const playwrightPath = path.dirname(require.resolve('playwright'));
+async function install() {
+    await retry_1.retry(() => installBrowsersWithProgressBar(playwrightPath));
+}
+install();
diff --git a/build/azure-pipelines/common/installPlaywright.ts b/build/azure-pipelines/common/installPlaywright.ts
new file mode 100644
index 000000000..f0d821d44
--- /dev/null
+++ b/build/azure-pipelines/common/installPlaywright.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import { retry } from './retry';
+const { installBrowsersWithProgressBar } = require('playwright/lib/install/installer');
+const playwrightPath = path.dirname(require.resolve('playwright'));
+
+async function install() {
+	await retry(() => installBrowsersWithProgressBar(playwrightPath));
+}
+
+install();
diff --git a/build/azure-pipelines/common/listNodeModules.js b/build/azure-pipelines/common/listNodeModules.js
new file mode 100644
index 000000000..540569c79
--- /dev/null
+++ b/build/azure-pipelines/common/listNodeModules.js
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+if (process.argv.length !== 3) {
+    console.error('Usage: node listNodeModules.js OUTPUT_FILE');
+    process.exit(-1);
+}
+const ROOT = path.join(__dirname, '../../../');
+function findNodeModulesFiles(location, inNodeModules, result) {
+    const entries = fs.readdirSync(path.join(ROOT, location));
+    for (const entry of entries) {
+        const entryPath = `${location}/${entry}`;
+        if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
+            continue;
+        }
+        let stat;
+        try {
+            stat = fs.statSync(path.join(ROOT, entryPath));
+        }
+        catch (err) {
+            continue;
+        }
+        if (stat.isDirectory()) {
+            findNodeModulesFiles(entryPath, inNodeModules || (entry === 'node_modules'), result);
+        }
+        else {
+            if (inNodeModules) {
+                result.push(entryPath.substr(1));
+            }
+        }
+    }
+}
+const result = [];
+findNodeModulesFiles('', false, result);
+fs.writeFileSync(process.argv[2], result.join('\n') + '\n');
diff --git a/build/azure-pipelines/common/listNodeModules.ts b/build/azure-pipelines/common/listNodeModules.ts
new file mode 100644
index 000000000..2ed629447
--- /dev/null
+++ b/build/azure-pipelines/common/listNodeModules.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+if (process.argv.length !== 3) {
+	console.error('Usage: node listNodeModules.js OUTPUT_FILE');
+	process.exit(-1);
+}
+
+const ROOT = path.join(__dirname, '../../../');
+
+function findNodeModulesFiles(location: string, inNodeModules: boolean, result: string[]) {
+	const entries = fs.readdirSync(path.join(ROOT, location));
+	for (const entry of entries) {
+		const entryPath = `${location}/${entry}`;
+
+		if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
+			continue;
+		}
+
+		let stat: fs.Stats;
+		try {
+			stat = fs.statSync(path.join(ROOT, entryPath));
+		} catch (err) {
+			continue;
+		}
+
+		if (stat.isDirectory()) {
+			findNodeModulesFiles(entryPath, inNodeModules || (entry === 'node_modules'), result);
+		} else {
+			if (inNodeModules) {
+				result.push(entryPath.substr(1));
+			}
+		}
+	}
+}
+
+const result: string[] = [];
+findNodeModulesFiles('', false, result);
+fs.writeFileSync(process.argv[2], result.join('\n') + '\n');
diff --git a/build/azure-pipelines/common/publish-webview.js b/build/azure-pipelines/common/publish-webview.js
new file mode 100644
index 000000000..278046241
--- /dev/null
+++ b/build/azure-pipelines/common/publish-webview.js
@@ -0,0 +1,71 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const azure = require("azure-storage");
+const mime = require("mime");
+const minimist = require("minimist");
+const path_1 = require("path");
+const fileNames = [
+    'fake.html',
+    'host.js',
+    'index.html',
+    'main.js',
+    'service-worker.js'
+];
+async function assertContainer(blobService, container) {
+    await new Promise((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
+}
+async function doesBlobExist(blobService, container, blobName) {
+    const existsResult = await new Promise((c, e) => blobService.doesBlobExist(container, blobName, (err, r) => err ? e(err) : c(r)));
+    return existsResult.exists;
+}
+async function uploadBlob(blobService, container, blobName, file) {
+    const blobOptions = {
+        contentSettings: {
+            contentType: mime.lookup(file),
+            cacheControl: 'max-age=31536000, public'
+        }
+    };
+    await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
+}
+async function publish(commit, files) {
+    console.log('Publishing...');
+    console.log('Commit:', commit);
+    const storageAccount = process.env['AZURE_WEBVIEW_STORAGE_ACCOUNT'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_WEBVIEW_STORAGE_ACCESS_KEY'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    await assertContainer(blobService, commit);
+    for (const file of files) {
+        const blobName = path_1.basename(file);
+        const blobExists = await doesBlobExist(blobService, commit, blobName);
+        if (blobExists) {
+            console.log(`Blob ${commit}, ${blobName} already exists, not publishing again.`);
+            continue;
+        }
+        console.log('Uploading blob to Azure storage...');
+        await uploadBlob(blobService, commit, blobName, file);
+    }
+    console.log('Blobs successfully uploaded.');
+}
+function main() {
+    const commit = process.env['BUILD_SOURCEVERSION'];
+    if (!commit) {
+        console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
+        return;
+    }
+    const opts = minimist(process.argv.slice(2));
+    const [directory] = opts._;
+    const files = fileNames.map(fileName => path_1.join(directory, fileName));
+    publish(commit, files).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
+if (process.argv.length < 3) {
+    console.error('Usage: node publish.js <directory>');
+    process.exit(-1);
+}
+main();
diff --git a/build/azure-pipelines/common/releaseBuild.js b/build/azure-pipelines/common/releaseBuild.js
new file mode 100644
index 000000000..c2438ca9e
--- /dev/null
+++ b/build/azure-pipelines/common/releaseBuild.js
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+function getEnv(name) {
+    const result = process.env[name];
+    if (typeof result === 'undefined') {
+        throw new Error('Missing env: ' + name);
+    }
+    return result;
+}
+function createDefaultConfig(quality) {
+    return {
+        id: quality,
+        frozen: false
+    };
+}
+async function getConfig(client, quality) {
+    const query = `SELECT TOP 1 * FROM c WHERE c.id = "${quality}"`;
+    const res = await client.database('builds').container('config').items.query(query).fetchAll();
+    if (res.resources.length === 0) {
+        return createDefaultConfig(quality);
+    }
+    return res.resources[0];
+}
+async function main() {
+    const commit = getEnv('BUILD_SOURCEVERSION');
+    const quality = getEnv('VSCODE_QUALITY');
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const config = await getConfig(client, quality);
+    console.log('Quality config:', config);
+    if (config.frozen) {
+        console.log(`Skipping release because quality ${quality} is frozen.`);
+        return;
+    }
+    console.log(`Releasing build ${commit}...`);
+    const scripts = client.database('builds').container(quality).scripts;
+    await retry_1.retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+}
+main().then(() => {
+    console.log('Build successfully released');
+    process.exit(0);
+}, err => {
+    console.error(err);
+    process.exit(1);
+});
diff --git a/build/azure-pipelines/common/retry.js b/build/azure-pipelines/common/retry.js
new file mode 100644
index 000000000..41136b52b
--- /dev/null
+++ b/build/azure-pipelines/common/retry.js
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retry = void 0;
+async function retry(fn) {
+    for (let run = 1; run <= 10; run++) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            if (!/ECONNRESET/.test(err.message)) {
+                throw err;
+            }
+            const millis = (Math.random() * 200) + (50 * Math.pow(1.5, run));
+            console.log(`Failed with ECONNRESET, retrying in ${millis}ms...`);
+            // maximum delay is 10th retry: ~3 seconds
+            await new Promise(c => setTimeout(c, millis));
+        }
+    }
+    throw new Error('Retried too many times');
+}
+exports.retry = retry;
diff --git a/build/azure-pipelines/common/sync-mooncake.js b/build/azure-pipelines/common/sync-mooncake.js
new file mode 100644
index 000000000..1f3354226
--- /dev/null
+++ b/build/azure-pipelines/common/sync-mooncake.js
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const url = require("url");
+const azure = require("azure-storage");
+const mime = require("mime");
+const cosmos_1 = require("@azure/cosmos");
+const retry_1 = require("./retry");
+function log(...args) {
+    console.log(...[`[${new Date().toISOString()}]`, ...args]);
+}
+function error(...args) {
+    console.error(...[`[${new Date().toISOString()}]`, ...args]);
+}
+if (process.argv.length < 3) {
+    error('Usage: node sync-mooncake.js <quality>');
+    process.exit(-1);
+}
+async function sync(commit, quality) {
+    log(`Synchronizing Mooncake assets for ${quality}, ${commit}...`);
+    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], key: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const container = client.database('builds').container(quality);
+    const query = `SELECT TOP 1 * FROM c WHERE c.id = "${commit}"`;
+    const res = await container.items.query(query, {}).fetchAll();
+    if (res.resources.length !== 1) {
+        throw new Error(`No builds found for ${commit}`);
+    }
+    const build = res.resources[0];
+    log(`Found build for ${commit}, with ${build.assets.length} assets`);
+    const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+    const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
+        .withFilter(new azure.ExponentialRetryPolicyFilter(20));
+    // mooncake is fussy and far away, this is needed!
+    blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+    for (const asset of build.assets) {
+        try {
+            const blobPath = url.parse(asset.url).path;
+            if (!blobPath) {
+                throw new Error(`Failed to parse URL: ${asset.url}`);
+            }
+            const blobName = blobPath.replace(/^\/\w+\//, '');
+            log(`Found ${blobName}`);
+            if (asset.mooncakeUrl) {
+                log(`  Already in Mooncake ✔️`);
+                continue;
+            }
+            const readStream = blobService.createReadStream(quality, blobName, undefined);
+            const blobOptions = {
+                contentSettings: {
+                    contentType: mime.lookup(blobPath),
+                    cacheControl: 'max-age=31536000, public'
+                }
+            };
+            const writeStream = mooncakeBlobService.createWriteStreamToBlockBlob(quality, blobName, blobOptions, undefined);
+            log(`  Uploading to Mooncake...`);
+            await new Promise((c, e) => readStream.pipe(writeStream).on('finish', c).on('error', e));
+            log(`  Updating build in DB...`);
+            const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
+            await retry_1.retry(() => container.scripts.storedProcedure('setAssetMooncakeUrl')
+                .execute('', [commit, asset.platform, asset.type, mooncakeUrl]));
+            log(`  Done ✔️`);
+        }
+        catch (err) {
+            error(err);
+        }
+    }
+    log(`All done ✔️`);
+}
+function main() {
+    const commit = process.env['BUILD_SOURCEVERSION'];
+    if (!commit) {
+        error('Skipping publish due to missing BUILD_SOURCEVERSION');
+        return;
+    }
+    const quality = process.argv[2];
+    sync(commit, quality).catch(err => {
+        error(err);
+        process.exit(1);
+    });
+}
+main();
diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml
deleted file mode 100644
index 55efe5f32..000000000
--- a/build/azure-pipelines/darwin/continuous-build-darwin.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.14.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-
-  - script: |
-      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-    displayName: Install Dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - script: |
-      set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-  - script: |
-      yarn electron x64
-    displayName: Download Electron
-
-  - script: |
-      yarn monaco-compile-check
-    displayName: Run Monaco Editor Checks
-
-  - script: |
-      yarn valid-layers-check
-    displayName: Run Valid Layers Checks
-
-  - script: |
-      yarn compile
-    displayName: Compile Sources
-
-  - script: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-
-  - script: |
-      ./scripts/test.sh --tfs "Unit Tests"
-    displayName: Run Unit Tests (Electron)
-
-  - script: |
-      yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
-    displayName: Run Unit Tests (Browser)
-
-  - script: |
-      ./scripts/test-integration.sh --tfs "Integration Tests"
-    displayName: Run Integration Tests (Electron)
-
-  - task: PublishPipelineArtifact@0
-    inputs:
-      artifactName: crash-dump-macos
-      targetPath: .build/crashes
-    displayName: "Publish Crash Reports"
-    continueOnError: true
-    condition: failed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()
diff --git a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
deleted file mode 100644
index 7cd9df032..000000000
--- a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-</dict>
-</plist>
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 6f7dec16a..283cb4741 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -1,32 +1,7 @@
 steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - script: |
-      set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
+      versionSpec: "12.18.3"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
@@ -34,9 +9,21 @@ steps:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
 
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
+
   - script: |
       set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
+  - script: |
+      set -e
       cat << EOF > ~/.netrc
       machine github.com
       login vscode
@@ -55,40 +42,45 @@ steps:
 
   - script: |
       set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
   - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
-  - script: |
-      echo -n $(VSCODE_ARCH) > .build/arch
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
     displayName: Prepare yarn cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - task: Cache@2
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
 
   - script: |
       set -e
-      npm install -g node-gyp@7.1.0
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      set -e
+      npm install -g node-gyp@latest
       node-gyp --version
     displayName: Update node-gyp
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - script: |
       set -e
       export npm_config_arch=$(VSCODE_ARCH)
       export npm_config_node_gyp=$(which node-gyp)
       export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
-      export CHILD_CONCURRENCY="1"
 
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
@@ -98,25 +90,19 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      export npm_config_arch=$(VSCODE_ARCH)
-      export npm_config_node_gyp=$(which node-gyp)
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
-      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - script: |
       set -e
@@ -126,10 +112,21 @@ steps:
       export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
       ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
       yarn electron-rebuild
+      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
       cd ./node_modules/keytar
       node-gyp rebuild
     displayName: Rebuild native modules for ARM64
-    condition: eq(variables['VSCODE_ARCH'], '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'))
 
   - script: |
       set -e
@@ -141,6 +138,7 @@ steps:
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
         yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
     displayName: Build
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))
 
   - script: |
       set -e
@@ -148,14 +146,23 @@ steps:
         yarn gulp vscode-reh-darwin-min-ci
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
         yarn gulp vscode-reh-web-darwin-min-ci
-    displayName: Build reh
+    displayName: Build Server
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
   - script: |
       set -e
-      yarn electron $(VSCODE_ARCH)
-    displayName: Download Electron
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+      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)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+    displayName: Download Electron and Playwright
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
@@ -167,17 +174,26 @@ steps:
       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
     displayName: Set Hardened Entitlements
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
       ./scripts/test.sh --build --tfs "Unit Tests"
     displayName: Run unit tests (Electron)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
     displayName: Run unit tests (Browser)
+    timeoutInMinutes: 5
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - script: |
+      set -e
+      yarn --cwd test/integration/browser compile
+    displayName: Compile integration tests
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -191,13 +207,15 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
       ./scripts/test-integration.sh --build --tfs "Integration Tests"
     displayName: Run integration tests (Electron)
-    condition: and(succeeded(),  eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+    timeoutInMinutes: 5
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
       ./resources/server/test/test-web-integration.sh --browser webkit
     displayName: Run integration tests (Browser)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -208,22 +226,29 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
       ./resources/server/test/test-remote-integration.sh
     displayName: Run remote integration tests (Electron)
+    timeoutInMinutes: 5
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - script: |
+      set -e
+      yarn --cwd test/smoke compile
+    displayName: Compile smoke tests
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      yarn smoketest --build "$APP_ROOT/$APP_NAME"
-    continueOnError: true
+      yarn smoketest-no-compile --build "$APP_ROOT/$APP_NAME"
+    timeoutInMinutes: 5
     displayName: Run smoke tests (Electron)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
-      yarn smoketest --web --headless
-    continueOnError: true
+      yarn smoketest-no-compile --web --headless
+    timeoutInMinutes: 5
     displayName: Run smoke tests (Browser)
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
@@ -240,12 +265,13 @@ steps:
     inputs:
       testResultsFiles: "*-results.xml"
       searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
     displayName: Archive build
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     inputs:
@@ -270,10 +296,12 @@ steps:
         ]
       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 Archive
+    displayName: Clean
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
@@ -281,6 +309,7 @@ steps:
       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:
@@ -305,6 +334,7 @@ steps:
         ]
       SessionTimeout: 60
     displayName: Notarization
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
@@ -312,7 +342,7 @@ steps:
       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(), eq(variables['VSCODE_ARCH'], 'x64'))
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
@@ -323,13 +353,29 @@ steps:
       VSCODE_ARCH="$(VSCODE_ARCH)" \
       ./build/azure-pipelines/darwin/publish.sh
     displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    artifact: vscode-darwin-$(VSCODE_ARCH)
+    displayName: Publish archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)
+    displayName: Publish server archive
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-darwin-web.zip
+    artifact: vscode-server-darwin-$(VSCODE_ARCH)-web
+    displayName: Publish web server archive
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
       VSCODE_ARCH="$(VSCODE_ARCH)" \
       yarn gulp upload-vscode-configuration
     displayName: Upload configuration (for Bing settings search)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
     continueOnError: true
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/build/azure-pipelines/darwin/publish.sh b/build/azure-pipelines/darwin/publish.sh
index c9f5b4bab..df5b9770c 100755
--- a/build/azure-pipelines/darwin/publish.sh
+++ b/build/azure-pipelines/darwin/publish.sh
@@ -5,6 +5,7 @@ set -e
 case $VSCODE_ARCH in
 	x64) ASSET_ID="darwin" ;;
 	arm64) ASSET_ID="darwin-arm64" ;;
+	universal) ASSET_ID="darwin-universal" ;;
 esac
 
 # publish the build
diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml
index 99bad6b72..331fbf967 100644
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -8,7 +8,7 @@ pr:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/exploration-build.yml b/build/azure-pipelines/exploration-build.yml
index 4a7acf129..22e2602d0 100644
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -2,11 +2,12 @@ pool:
   vmImage: "Ubuntu-16.04"
 
 trigger: none
+pr: none
 
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
diff --git a/build/azure-pipelines/linux/alpine/publish.sh b/build/azure-pipelines/linux/alpine/publish.sh
index 4bf874c63..2f5647d1e 100755
--- a/build/azure-pipelines/linux/alpine/publish.sh
+++ b/build/azure-pipelines/linux/alpine/publish.sh
@@ -22,7 +22,7 @@ SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web"
 SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX-web.tar.gz"
 SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
 
-rm -rf $ROOT/vscode-server-*.tar.*
+rm -rf $ROOT/vscode-server-*-web.tar.*
 (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX-web" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml
deleted file mode 100644
index e777f821d..000000000
--- a/build/azure-pipelines/linux/continuous-build-linux.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-steps:
-  - script: |
-      set -e
-      sudo apt-get update
-      sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
-      sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-      sudo chmod +x /etc/init.d/xvfb
-      sudo update-rc.d xvfb defaults
-      sudo service xvfb start
-
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.14.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-
-  - script: |
-      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-    displayName: Install Dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - script: |
-      set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-  - script: |
-      yarn electron x64
-    displayName: Download Electron
-
-  - script: |
-      yarn gulp hygiene
-    displayName: Run Hygiene Checks
-
-  - script: |
-      yarn monaco-compile-check
-    displayName: Run Monaco Editor Checks
-
-  - script: |
-      yarn valid-layers-check
-    displayName: Run Valid Layers Checks
-
-  - script: |
-      yarn compile
-    displayName: Compile Sources
-
-  - script: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-
-  - script: |
-      DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-    displayName: Run Unit Tests (Electron)
-
-  - script: |
-      DISPLAY=:10 yarn test-browser --browser chromium --tfs "Browser Unit Tests"
-    displayName: Run Unit Tests (Browser)
-
-  - script: |
-      DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-    displayName: Run Integration Tests (Electron)
-
-  - task: PublishPipelineArtifact@0
-    inputs:
-      artifactName: crash-dump-linux
-      targetPath: .build/crashes
-    displayName: "Publish Crash Reports"
-    continueOnError: true
-    condition: failed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()
diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml
index 9a54bc2bc..a2bbb119b 100644
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -1,28 +1,7 @@
 steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - script: |
-      set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -34,6 +13,17 @@ steps:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
 
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+
   - task: Docker@1
     displayName: "Pull image"
     inputs:
@@ -45,7 +35,6 @@ steps:
 
   - script: |
       set -e
-
       cat << EOF > ~/.netrc
       machine github.com
       login vscode
@@ -58,30 +47,35 @@ steps:
 
   - script: |
       set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
   - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
-  - script: |
-      echo -n "alpine" > .build/arch
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js "alpine" $ENABLE_TERRAPIN > .build/yarnlockhash
     displayName: Prepare yarn cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - task: Cache@2
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - script: |
       set -e
-      export CHILD_CONCURRENCY="1"
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
         if [ $i -eq 3 ]; then
@@ -90,21 +84,19 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - script: |
       set -e
@@ -113,7 +105,7 @@ steps:
 
   - script: |
       set -e
-      docker run -e VSCODE_QUALITY -e CHILD_CONCURRENCY=1 -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
+      docker run -e VSCODE_QUALITY -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:alpine /root/vscode/build/azure-pipelines/linux/alpine/install-dependencies.sh
     displayName: Prebuild
 
   - script: |
@@ -129,6 +121,17 @@ steps:
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       ./build/azure-pipelines/linux/alpine/publish.sh
     displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine.tar.gz
+    artifact: vscode-server-linux-alpine
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-alpine-web.tar.gz
+    artifact: vscode-server-linux-alpine-web
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: "Component Detection"
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 1f7884a1c..b704d953d 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -1,28 +1,7 @@
 steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - script: |
-      set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -34,6 +13,17 @@ steps:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
 
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+
   - script: |
       set -e
       cat << EOF > ~/.netrc
@@ -48,31 +38,56 @@ steps:
 
   - script: |
       set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
   - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
-  - script: |
-      echo -n $(VSCODE_ARCH) > .build/arch
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
     displayName: Prepare yarn cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - task: Cache@2
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      set -e
+      npm install -g node-gyp@latest
+      node-gyp --version
+    displayName: Update node-gyp
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['VSCODE_ARCH'], 'x64'))
+
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - script: |
       set -e
       export npm_config_arch=$(NPM_ARCH)
-      export CHILD_CONCURRENCY="1"
+      export npm_config_build_from_source=true
+
+      if [ -z "$CC" ] || [ -z "$CXX" ]; then
+        export CC=$(which gcc-5)
+        export CXX=$(which g++-5)
+      fi
+
+      if [ "$VSCODE_ARCH" == "x64" ]; then
+        export VSCODE_REMOTE_CC=$(which gcc-4.8)
+        export VSCODE_REMOTE_CXX=$(which g++-4.8)
+        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
+      fi
+
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
         if [ $i -eq 3 ]; then
@@ -81,21 +96,23 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+      # 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
+    displayName: Install dependencies
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - script: |
       set -e
@@ -106,28 +123,41 @@ steps:
       set -e
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
         yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
     displayName: Build
 
   - script: |
       set -e
-      service xvfb start
-    displayName: Start xvfb
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
+    displayName: Build Server
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+    displayName: Download Electron and Playwright
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
     displayName: Run unit tests (Electron)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
       set -e
       DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
     displayName: Run unit tests (Browser)
+    timeoutInMinutes: 5
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - script: |
+      set -e
+      yarn --cwd test/integration/browser compile
+    displayName: Compile integration tests
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -142,6 +172,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
       DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
     displayName: Run integration tests (Electron)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -149,6 +180,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
       DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
     displayName: Run integration tests (Browser)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - script: |
@@ -160,6 +192,7 @@ steps:
       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
       DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
     displayName: Run remote integration tests (Electron)
+    timeoutInMinutes: 5
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
   - task: PublishPipelineArtifact@0
@@ -182,17 +215,20 @@ steps:
       yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
       yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
     displayName: Build deb, rpm packages
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
       yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
     displayName: Prepare snap package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   # needed for code signing
   - task: UseDotNet@2
     displayName: "Install .NET Core SDK 2.x"
     inputs:
       version: 2.x
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     inputs:
@@ -212,6 +248,7 @@ steps:
         ]
       SessionTimeout: 120
     displayName: Codesign rpm
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
@@ -221,12 +258,34 @@ steps:
       VSCODE_ARCH="$(VSCODE_ARCH)" \
       ./build/azure-pipelines/linux/publish.sh
     displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(DEB_PATH)
+    artifact: vscode-linux-deb-$(VSCODE_ARCH)
+    displayName: Publish deb package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(RPM_PATH)
+    artifact: vscode-linux-rpm-$(VSCODE_ARCH)
+    displayName: Publish rpm package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz
+    artifact: vscode-server-linux-$(VSCODE_ARCH)
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz
+    artifact: vscode-server-linux-$(VSCODE_ARCH)-web
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: PublishPipelineArtifact@0
     displayName: "Publish Pipeline Artifact"
     inputs:
       artifactName: "snap-$(VSCODE_ARCH)"
       targetPath: .build/linux/snap-tarball
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: "Component Detection"
diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
index e0f1ade30..6d748c6e3 100755
--- a/build/azure-pipelines/linux/publish.sh
+++ b/build/azure-pipelines/linux/publish.sh
@@ -26,6 +26,17 @@ rm -rf $ROOT/vscode-server-*.tar.*
 
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
+# Publish Remote Extension Host (Web)
+LEGACY_SERVER_BUILD_NAME="vscode-reh-web-$PLATFORM_LINUX"
+SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX-web"
+SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX-web.tar.gz"
+SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
+
+rm -rf $ROOT/vscode-server-*-web.tar.*
+(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
+
+node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX-web" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
+
 # Publish DEB
 case $VSCODE_ARCH in
 	x64) DEB_ARCH="amd64" ;;
@@ -58,3 +69,7 @@ mkdir -p $REPO/.build/linux/snap-tarball
 SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$VSCODE_ARCH.tar.gz"
 rm -rf $SNAP_TARBALL_PATH
 (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
+
+# Export DEB_PATH, RPM_PATH
+echo "##vso[task.setvariable variable=DEB_PATH]$DEB_PATH"
+echo "##vso[task.setvariable variable=RPM_PATH]$RPM_PATH"
diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml
index f08c7b3c3..09c5488f2 100644
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -54,3 +54,11 @@ steps:
       AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
       AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
       node build/azure-pipelines/common/createAsset.js "linux-snap-$(VSCODE_ARCH)" package "$SNAP_FILENAME" "$SNAP_PATH"
+
+      # Export SNAP_PATH
+      echo "##vso[task.setvariable variable=SNAP_PATH]$SNAP_PATH"
+
+  - publish: $(SNAP_PATH)
+    artifact: vscode-linux-snap-$(VSCODE_ARCH)
+    displayName: Publish snap package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
diff --git a/build/azure-pipelines/mixin.js b/build/azure-pipelines/mixin.js
new file mode 100644
index 000000000..62ad40ba0
--- /dev/null
+++ b/build/azure-pipelines/mixin.js
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const json = require("gulp-json-editor");
+const buffer = require('gulp-buffer');
+const filter = require("gulp-filter");
+const es = require("event-stream");
+const vfs = require("vinyl-fs");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const fs = require("fs");
+const path = require("path");
+function main() {
+    const quality = process.env['VSCODE_QUALITY'];
+    if (!quality) {
+        console.log('Missing VSCODE_QUALITY, skipping mixin');
+        return;
+    }
+    const productJsonFilter = filter(f => f.relative === 'product.json', { restore: true });
+    fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);
+    return vfs
+        .src(`quality/${quality}/**`, { base: `quality/${quality}` })
+        .pipe(filter(f => !f.isDirectory()))
+        .pipe(productJsonFilter)
+        .pipe(buffer())
+        .pipe(json((o) => {
+        const ossProduct = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'product.json'), 'utf8'));
+        let builtInExtensions = ossProduct.builtInExtensions;
+        if (Array.isArray(o.builtInExtensions)) {
+            fancyLog(ansiColors.blue('[mixin]'), 'Overwriting built-in extensions:', o.builtInExtensions.map(e => e.name));
+            builtInExtensions = o.builtInExtensions;
+        }
+        else if (o.builtInExtensions) {
+            const include = o.builtInExtensions['include'] || [];
+            const exclude = o.builtInExtensions['exclude'] || [];
+            fancyLog(ansiColors.blue('[mixin]'), 'OSS built-in extensions:', builtInExtensions.map(e => e.name));
+            fancyLog(ansiColors.blue('[mixin]'), 'Including built-in extensions:', include.map(e => e.name));
+            fancyLog(ansiColors.blue('[mixin]'), 'Excluding built-in extensions:', exclude);
+            builtInExtensions = builtInExtensions.filter(ext => !include.find(e => e.name === ext.name) && !exclude.find(name => name === ext.name));
+            builtInExtensions = [...builtInExtensions, ...include];
+            fancyLog(ansiColors.blue('[mixin]'), 'Final built-in extensions:', builtInExtensions.map(e => e.name));
+        }
+        else {
+            fancyLog(ansiColors.blue('[mixin]'), 'Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
+        }
+        return Object.assign(Object.assign({ webBuiltInExtensions: ossProduct.webBuiltInExtensions }, o), { builtInExtensions });
+    }))
+        .pipe(productJsonFilter.restore)
+        .pipe(es.mapSync(function (f) {
+        fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));
+        return f;
+    }))
+        .pipe(vfs.dest('.'));
+}
+main();
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index ebe2fe6ab..4d3762469 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -1,4 +1,3 @@
-trigger: none
 pr: none
 
 schedules:
@@ -8,11 +7,108 @@ schedules:
       include:
         - master
 
+parameters:
+  - name: VSCODE_QUALITY
+    displayName: Quality
+    type: string
+    default: insider
+    values:
+      - exploration
+      - insider
+      - stable
+  - name: ENABLE_TERRAPIN
+    displayName: "Enable Terrapin"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_WIN32
+    displayName: "🎯 Windows x64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_WIN32_32BIT
+    displayName: "🎯 Windows ia32"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_WIN32_ARM64
+    displayName: "🎯 Windows arm64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_LINUX
+    displayName: "🎯 Linux x64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_LINUX_ARM64
+    displayName: "🎯 Linux arm64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_LINUX_ARMHF
+    displayName: "🎯 Linux armhf"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_LINUX_ALPINE
+    displayName: "🎯 Alpine Linux"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_MACOS
+    displayName: "🎯 macOS x64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_MACOS_ARM64
+    displayName: "🎯 macOS arm64"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_MACOS_UNIVERSAL
+    displayName: "🎯 macOS universal"
+    type: boolean
+    default: true
+  - name: VSCODE_BUILD_WEB
+    displayName: "🎯 Web"
+    type: boolean
+    default: true
+  - name: VSCODE_PUBLISH
+    displayName: "Publish to builds.code.visualstudio.com"
+    type: boolean
+    default: true
+  - name: VSCODE_RELEASE
+    displayName: "Release build if successful"
+    type: boolean
+    default: false
+  - name: VSCODE_COMPILE_ONLY
+    displayName: "Run Compile stage exclusively"
+    type: boolean
+    default: false
+  - name: VSCODE_STEP_ON_IT
+    displayName: "Skip tests"
+    type: boolean
+    default: false
+
+variables:
+  - name: ENABLE_TERRAPIN
+    value: ${{ eq(parameters.ENABLE_TERRAPIN, true) }}
+  - name: VSCODE_QUALITY
+    value: ${{ parameters.VSCODE_QUALITY }}
+  - name: VSCODE_BUILD_STAGE_WINDOWS
+    value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
+  - name: VSCODE_BUILD_STAGE_LINUX
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
+  - name: VSCODE_BUILD_STAGE_MACOS
+    value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
+  - name: VSCODE_CIBUILD
+    value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
+  - name: VSCODE_PUBLISH
+    value: ${{ and(eq(parameters.VSCODE_PUBLISH, true), eq(variables.VSCODE_CIBUILD, false)) }}
+  - name: VSCODE_SCHEDULEDBUILD
+    value: ${{ eq(variables['Build.Reason'], 'Schedule') }}
+  - name: VSCODE_STEP_ON_IT
+    value: ${{ eq(parameters.VSCODE_STEP_ON_IT, true) }}
+  - name: VSCODE_BUILD_MACOS_UNIVERSAL
+    value: ${{ and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true), eq(parameters.VSCODE_BUILD_MACOS_UNIVERSAL, true)) }}
+
 resources:
   containers:
     - container: vscode-x64
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+      image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-x64
       endpoint: VSCodeHub
+      options: --user 0:0
     - container: vscode-arm64
       image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
       endpoint: VSCodeHub
@@ -26,177 +122,189 @@ stages:
   - stage: Compile
     jobs:
       - job: Compile
-        pool:
-          vmImage: "Ubuntu-16.04"
-        container: vscode-x64
+        pool: compile
         variables:
           VSCODE_ARCH: x64
         steps:
           - template: product-compile.yml
 
-  - stage: Windows
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: VS2017-Win2016
-    jobs:
-      - job: Windows
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: win32/product-build-win32.yml
+  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
+    - stage: Windows
+      dependsOn:
+        - Compile
+      pool:
+        vmImage: VS2017-Win2016
+      jobs:
 
-      - job: Windows32
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: ia32
-        steps:
-          - template: win32/product-build-win32.yml
+        - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
+          - job: Windows
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: x64
+            steps:
+              - template: win32/product-build-win32.yml
 
-      - job: WindowsARM64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_ARM64'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: win32/product-build-win32.yml
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true)) }}:
+          - job: Windows32
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: ia32
+            steps:
+              - template: win32/product-build-win32.yml
 
-  - stage: Linux
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: Linux
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
-        container: vscode-x64
-        variables:
-          VSCODE_ARCH: x64
-          NPM_ARCH: x64
-        steps:
-          - template: linux/product-build-linux.yml
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+          - job: WindowsARM64
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: arm64
+            steps:
+              - template: win32/product-build-win32.yml
 
-      - job: LinuxSnap
-        dependsOn:
+  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}:
+    - stage: Linux
+      dependsOn:
+        - Compile
+      pool:
+        vmImage: "Ubuntu-18.04"
+      jobs:
+
+        - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
+          - job: Linux
+            container: vscode-x64
+            variables:
+              VSCODE_ARCH: x64
+              NPM_ARCH: x64
+            steps:
+              - template: linux/product-build-linux.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
+          - job: LinuxSnap
+            dependsOn:
+              - Linux
+            container: snapcraft
+            variables:
+              VSCODE_ARCH: x64
+            steps:
+              - template: linux/snap-build-linux.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
+          - job: LinuxArmhf
+            container: vscode-armhf
+            variables:
+              VSCODE_ARCH: armhf
+              NPM_ARCH: armv7l
+            steps:
+              - template: linux/product-build-linux.yml
+
+        # TODO@joaomoreno: We don't ship ARM snaps for now
+        - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
+          - job: LinuxSnapArmhf
+            dependsOn:
+              - LinuxArmhf
+            container: snapcraft
+            variables:
+              VSCODE_ARCH: armhf
+            steps:
+              - template: linux/snap-build-linux.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
+          - job: LinuxArm64
+            container: vscode-arm64
+            variables:
+              VSCODE_ARCH: arm64
+              NPM_ARCH: arm64
+            steps:
+              - template: linux/product-build-linux.yml
+
+        # TODO@joaomoreno: We don't ship ARM snaps for now
+        - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
+          - job: LinuxSnapArm64
+            dependsOn:
+              - LinuxArm64
+            container: snapcraft
+            variables:
+              VSCODE_ARCH: arm64
+            steps:
+              - template: linux/snap-build-linux.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}:
+          - job: LinuxAlpine
+            steps:
+              - template: linux/product-build-alpine.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WEB, true)) }}:
+          - job: LinuxWeb
+            variables:
+              VSCODE_ARCH: x64
+            steps:
+              - template: web/product-build-web.yml
+
+  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}:
+    - stage: macOS
+      dependsOn:
+        - Compile
+      pool:
+        vmImage: macOS-latest
+      jobs:
+
+        - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
+          - job: macOS
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: x64
+            steps:
+              - template: darwin/product-build-darwin.yml
+
+        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
+          - job: macOSARM64
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: arm64
+            steps:
+              - template: darwin/product-build-darwin.yml
+
+        - ${{ if eq(variables['VSCODE_BUILD_MACOS_UNIVERSAL'], true) }}:
+          - job: macOSUniversal
+            dependsOn:
+              - macOS
+              - macOSARM64
+            timeoutInMinutes: 90
+            variables:
+              VSCODE_ARCH: universal
+            steps:
+              - template: darwin/product-build-darwin.yml
+
+  - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
+    - stage: Mooncake
+      dependsOn:
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true) }}:
+          - Windows
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_LINUX'], true) }}:
           - Linux
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: linux/snap-build-linux.yml
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_MACOS'], true) }}:
+          - macOS
+      condition: succeededOrFailed()
+      pool:
+        vmImage: "Ubuntu-18.04"
+      jobs:
+        - job: SyncMooncake
+          displayName: Sync Mooncake
+          steps:
+            - template: sync-mooncake.yml
 
-      - job: LinuxArmhf
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
-        container: vscode-armhf
-        variables:
-          VSCODE_ARCH: armhf
-          NPM_ARCH: armv7l
-        steps:
-          - template: linux/product-build-linux.yml
-
-      - job: LinuxSnapArmhf
-        dependsOn:
-          - LinuxArmhf
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: armhf
-        steps:
-          - template: linux/snap-build-linux.yml
-
-      - job: LinuxArm64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
-        container: vscode-arm64
-        variables:
-          VSCODE_ARCH: arm64
-          NPM_ARCH: arm64
-        steps:
-          - template: linux/product-build-linux.yml
-
-      - job: LinuxSnapArm64
-        dependsOn:
-          - LinuxArm64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'))
-        container: snapcraft
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: linux/snap-build-linux.yml
-
-      - job: LinuxAlpine
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'))
-        steps:
-          - template: linux/product-build-alpine.yml
-
-      - job: LinuxWeb
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: web/product-build-web.yml
-
-  - stage: macOS
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: macOS-latest
-    jobs:
-      - job: macOS
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: darwin/product-build-darwin.yml
-
-  - stage: macOSARM64
-    dependsOn:
-      - Compile
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: macOS-latest
-    jobs:
-      - job: macOSARM64
-        condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS_ARM64'], 'true'))
-        timeoutInMinutes: 90
-        variables:
-          VSCODE_ARCH: arm64
-        steps:
-          - template: darwin/product-build-darwin.yml
-
-  - stage: Mooncake
-    dependsOn:
-      - Windows
-      - Linux
-      - macOS
-      - macOSARM64
-    condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: SyncMooncake
-        displayName: Sync Mooncake
-        steps:
-          - template: sync-mooncake.yml
-
-  - stage: Publish
-    dependsOn:
-      - Windows
-      - Linux
-      - macOS
-      - macOSARM64
-    condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
-    pool:
-      vmImage: "Ubuntu-16.04"
-    jobs:
-      - job: BuildService
-        displayName: Build Service
-        steps:
-          - template: release.yml
+  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), or(eq(parameters.VSCODE_RELEASE, true), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true)))) }}:
+    - stage: Release
+      dependsOn:
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true) }}:
+          - Windows
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_LINUX'], true) }}:
+          - Linux
+        - ${{ if eq(variables['VSCODE_BUILD_STAGE_MACOS'], true) }}:
+          - macOS
+      pool:
+        vmImage: "Ubuntu-18.04"
+      jobs:
+        - job: ReleaseBuild
+          displayName: Release Build
+          steps:
+            - template: release.yml
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index eaf0a65e8..08e3f6945 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,36 +1,17 @@
 steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flag
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-      dryRun: true
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+      versionSpec: "12.x"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
       versionSpec: "1.x"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
     inputs:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
@@ -43,36 +24,46 @@ steps:
       git config user.email "vscode@microsoft.com"
       git config user.name "VSCode"
     displayName: Prepare tooling
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
+
+  # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
+  - task: Cache@2
+    inputs:
+      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
 
   - script: |
       npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
     timeoutInMinutes: 5
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
-  - script: |
-      echo -n $(VSCODE_ARCH) > .build/arch
-    displayName: Prepare yarn cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
+
+  - script: |
+      set -e
+      sudo apt update -y
+      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
+    displayName: Install build tools
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      export CHILD_CONCURRENCY="1"
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
         if [ $i -eq 3 ]; then
@@ -81,67 +72,50 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
-  # Mixin must run before optimize, because the CSS loader will
-  # inline small SVGs
+  # Mixin must run before optimize, because the CSS loader will inline small SVGs
   - script: |
       set -e
       node build/azure-pipelines/mixin
     displayName: Mix in quality
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
   - script: |
       set -e
-      yarn gulp hygiene
-      yarn monaco-compile-check
-      yarn valid-layers-check
-    displayName: Run hygiene, monaco compile & valid layers checks
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-  - script: |
-      set -
-      ./build/azure-pipelines/common/extract-telemetry.sh
-    displayName: Extract Telemetry
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-
-  - script: |
-      set -e
-      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
-      ./build/azure-pipelines/common/publish-webview.sh
-    displayName: Publish Webview
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
-
-  - script: |
-      set -e
-      yarn gulp compile-build
-      yarn gulp compile-extensions-build
-      yarn gulp minify-vscode
-      yarn gulp minify-vscode-reh
-      yarn gulp minify-vscode-reh-web
-    displayName: Compile
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+      yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
+    displayName: Compile & Hygiene
 
   - script: |
       set -e
       AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
         node build/azure-pipelines/upload-sourcemaps
     displayName: Upload sourcemaps
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -
+      ./build/azure-pipelines/common/extract-telemetry.sh
+    displayName: Extract Telemetry
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
+      ./build/azure-pipelines/common/publish-webview.sh
+    displayName: Publish Webview
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - script: |
       set -e
@@ -149,13 +123,16 @@ steps:
       AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
         node build/azure-pipelines/common/createBuild.js $VERSION
     displayName: Create build
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  # we gotta tarball everything in order to preserve file permissions
+  - script: |
+      set -e
+      tar -czf $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-*
+    displayName: Compress compilation artifact
+
+  - task: PublishPipelineArtifact@1
     inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-    condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
+      targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+      artifactName: Compilation
+    displayName: Publish compilation artifact
diff --git a/build/azure-pipelines/publish-types/.gitignore b/build/azure-pipelines/publish-types/.gitignore
deleted file mode 100644
index e94ecda76..000000000
--- a/build/azure-pipelines/publish-types/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-*.js
\ No newline at end of file
diff --git a/build/azure-pipelines/publish-types/check-version.js b/build/azure-pipelines/publish-types/check-version.js
new file mode 100644
index 000000000..b45ad3f4c
--- /dev/null
+++ b/build/azure-pipelines/publish-types/check-version.js
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const cp = require("child_process");
+let tag = '';
+try {
+    tag = cp
+        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
+        .toString()
+        .trim();
+    if (!isValidTag(tag)) {
+        throw Error(`Invalid tag ${tag}`);
+    }
+}
+catch (err) {
+    console.error(err);
+    console.error('Failed to update types');
+    process.exit(1);
+}
+function isValidTag(t) {
+    if (t.split('.').length !== 3) {
+        return false;
+    }
+    const [major, minor, bug] = t.split('.');
+    // Only release for tags like 1.34.0
+    if (bug !== '0') {
+        return false;
+    }
+    if (isNaN(parseInt(major, 10)) || isNaN(parseInt(minor, 10))) {
+        return false;
+    }
+    return true;
+}
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 5f1cf6c28..0e3f4e4da 100644
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -9,7 +9,7 @@ pr: none
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
diff --git a/build/azure-pipelines/publish-types/update-types.js b/build/azure-pipelines/publish-types/update-types.js
new file mode 100644
index 000000000..0957c5a89
--- /dev/null
+++ b/build/azure-pipelines/publish-types/update-types.js
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const cp = require("child_process");
+const path = require("path");
+let tag = '';
+try {
+    tag = cp
+        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
+        .toString()
+        .trim();
+    const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`;
+    const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
+    cp.execSync(`curl ${dtsUri} --output ${outPath}`);
+    updateDTSFile(outPath, tag);
+    console.log(`Done updating vscode.d.ts at ${outPath}`);
+}
+catch (err) {
+    console.error(err);
+    console.error('Failed to update types');
+    process.exit(1);
+}
+function updateDTSFile(outPath, tag) {
+    const oldContent = fs.readFileSync(outPath, 'utf-8');
+    const newContent = getNewFileContent(oldContent, tag);
+    fs.writeFileSync(outPath, newContent);
+}
+function repeat(str, times) {
+    const result = new Array(times);
+    for (let i = 0; i < times; i++) {
+        result[i] = str;
+    }
+    return result.join('');
+}
+function convertTabsToSpaces(str) {
+    return str.replace(/\t/gm, value => repeat('    ', value.length));
+}
+function getNewFileContent(content, tag) {
+    const oldheader = [
+        `/*---------------------------------------------------------------------------------------------`,
+        ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
+        ` *  Licensed under the MIT License. See License.txt in the project root for license information.`,
+        ` *--------------------------------------------------------------------------------------------*/`
+    ].join('\n');
+    return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
+}
+function getNewFileHeader(tag) {
+    const [major, minor] = tag.split('.');
+    const shorttag = `${major}.${minor}`;
+    const header = [
+        `// Type definitions for Visual Studio Code ${shorttag}`,
+        `// Project: https://github.com/microsoft/vscode`,
+        `// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/microsoft>`,
+        `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
+        ``,
+        `/*---------------------------------------------------------------------------------------------`,
+        ` *  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.`,
+        ` *--------------------------------------------------------------------------------------------*/`,
+        ``,
+        `/**`,
+        ` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
+        ` * See https://code.visualstudio.com/api for more information`,
+        ` */`
+    ].join('\n');
+    return header;
+}
diff --git a/build/azure-pipelines/sync-mooncake.yml b/build/azure-pipelines/sync-mooncake.yml
index 109709418..280c9e637 100644
--- a/build/azure-pipelines/sync-mooncake.yml
+++ b/build/azure-pipelines/sync-mooncake.yml
@@ -1,7 +1,7 @@
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
diff --git a/build/azure-pipelines/upload-cdn.js b/build/azure-pipelines/upload-cdn.js
new file mode 100644
index 000000000..16a072905
--- /dev/null
+++ b/build/azure-pipelines/upload-cdn.js
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const es = require("event-stream");
+const vfs = require("vinyl-fs");
+const util = require("../lib/util");
+const filter = require("gulp-filter");
+const gzip = require("gulp-gzip");
+const azure = require('gulp-azure-storage');
+const root = path.dirname(path.dirname(__dirname));
+const commit = util.getVersion(root);
+function main() {
+    return vfs.src('**', { cwd: '../vscode-web', base: '../vscode-web', dot: true })
+        .pipe(filter(f => !f.isDirectory()))
+        .pipe(gzip({ append: false }))
+        .pipe(es.through(function (data) {
+        console.log('Uploading CDN file:', data.relative); // debug
+        this.emit('data', data);
+    }))
+        .pipe(azure.upload({
+        account: process.env.AZURE_STORAGE_ACCOUNT,
+        key: process.env.AZURE_STORAGE_ACCESS_KEY,
+        container: process.env.VSCODE_QUALITY,
+        prefix: commit + '/',
+        contentSettings: {
+            contentEncoding: 'gzip',
+            cacheControl: 'max-age=31536000, public'
+        }
+    }));
+}
+main();
diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js
new file mode 100644
index 000000000..b2a886f6c
--- /dev/null
+++ b/build/azure-pipelines/upload-sourcemaps.js
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const es = require("event-stream");
+const vfs = require("vinyl-fs");
+const util = require("../lib/util");
+// @ts-ignore
+const deps = require("../lib/dependencies");
+const azure = require('gulp-azure-storage');
+const root = path.dirname(path.dirname(__dirname));
+const commit = util.getVersion(root);
+// optionally allow to pass in explicit base/maps to upload
+const [, , base, maps] = process.argv;
+function src(base, maps = `${base}/**/*.map`) {
+    return vfs.src(maps, { base })
+        .pipe(es.mapSync((f) => {
+        f.path = `${f.base}/core/${f.relative}`;
+        return f;
+    }));
+}
+function main() {
+    const sources = [];
+    // vscode client maps (default)
+    if (!base) {
+        const vs = src('out-vscode-min'); // client source-maps only
+        sources.push(vs);
+        const productionDependencies = deps.getProductionDependencies(root);
+        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+        const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
+            .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
+        sources.push(nodeModules);
+        const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+        sources.push(extensionsOut);
+    }
+    // specific client base/maps
+    else {
+        sources.push(src(base, maps));
+    }
+    return es.merge(...sources)
+        .pipe(es.through(function (data) {
+        console.log('Uploading Sourcemap', data.relative); // debug
+        this.emit('data', data);
+    }))
+        .pipe(azure.upload({
+        account: process.env.AZURE_STORAGE_ACCOUNT,
+        key: process.env.AZURE_STORAGE_ACCESS_KEY,
+        container: 'sourcemaps',
+        prefix: commit + '/'
+    }));
+}
+main();
diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts
index 6a13aaf17..769e224e6 100644
--- a/build/azure-pipelines/upload-sourcemaps.ts
+++ b/build/azure-pipelines/upload-sourcemaps.ts
@@ -11,7 +11,7 @@ import * as Vinyl from 'vinyl';
 import * as vfs from 'vinyl-fs';
 import * as util from '../lib/util';
 // @ts-ignore
-import * as deps from '../dependencies';
+import * as deps from '../lib/dependencies';
 const azure = require('gulp-azure-storage');
 
 const root = path.dirname(path.dirname(__dirname));
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index 33282adbe..05aa68fe1 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -1,28 +1,7 @@
 steps:
-  - script: |
-      mkdir -p .build
-      echo -n $BUILD_SOURCEVERSION > .build/commit
-      echo -n $VSCODE_QUALITY > .build/quality
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
-    displayName: Prepare compilation cache flag
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - script: |
-      set -e
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -34,6 +13,17 @@ steps:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
 
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+
+  - script: |
+      set -e
+      tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
+    displayName: Extract compilation output
+
   - script: |
       set -e
       cat << EOF > ~/.netrc
@@ -48,30 +38,35 @@ steps:
 
   - script: |
       set -e
-      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-      git fetch distro
-      git merge $(node -p "require('./package.json').distro")
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
     displayName: Merge distro
 
   - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js "web" $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags
 
-  - script: |
-      echo -n "web" > .build/arch
-    displayName: Prepare yarn cache flag
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - task: Cache@2
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'nodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - script: |
       set -e
-      export CHILD_CONCURRENCY="1"
       for i in {1..3}; do # try 3 times, for Terrapin
         yarn --frozen-lockfile && break
         if [ $i -eq 3 ]; then
@@ -80,21 +75,19 @@ steps:
         fi
         echo "Yarn failed $i, trying again..."
       done
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e
-      yarn postinstall
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - script: |
       set -e
@@ -130,3 +123,8 @@ steps:
       VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
       ./build/azure-pipelines/web/publish.sh
     displayName: Publish
+
+  - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz
+    artifact: vscode-web-standalone
+    displayName: Publish web archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
diff --git a/build/azure-pipelines/win32/ESRPClient/NuGet.config b/build/azure-pipelines/win32/ESRPClient/NuGet.config
index 6d6da347f..4ef337fa5 100644
--- a/build/azure-pipelines/win32/ESRPClient/NuGet.config
+++ b/build/azure-pipelines/win32/ESRPClient/NuGet.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <packageSources>
-        <add key="ESRP" value="https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json" />
-    </packageSources>
-</configuration>
\ No newline at end of file
+	<packageSources>
+		<clear />
+		<add key="ESRP" value="https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json" />
+	</packageSources>
+	<disabledPackageSources>
+		<clear />
+	</disabledPackageSources>
+</configuration>
diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml
deleted file mode 100644
index 87b820cb0..000000000
--- a/build/azure-pipelines/win32/continuous-build-win32.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.14.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: "2.x"
-      addToPath: true
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-
-  - powershell: |
-      yarn --frozen-lockfile
-    env:
-      CHILD_CONCURRENCY: "1"
-    displayName: Install Dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "vscode-build-cache"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { yarn postinstall }
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-  - powershell: |
-      yarn electron
-    displayName: Download Electron
-
-  - powershell: |
-      yarn monaco-compile-check
-    displayName: Run Monaco Editor Checks
-
-  - script: |
-      yarn valid-layers-check
-    displayName: Run Valid Layers Checks
-
-  - powershell: |
-      yarn compile
-    displayName: Compile Sources
-
-  - powershell: |
-      yarn download-builtin-extensions
-    displayName: Download Built-in Extensions
-
-  - powershell: |
-      .\scripts\test.bat --tfs "Unit Tests"
-    displayName: Run Unit Tests (Electron)
-
-  - powershell: |
-      yarn test-browser --browser chromium --browser firefox --tfs "Browser Unit Tests"
-    displayName: Run Unit Tests (Browser)
-
-  - powershell: |
-      .\scripts\test-integration.bat --tfs "Integration Tests"
-    displayName: Run Integration Tests (Electron)
-
-  - task: PublishPipelineArtifact@0
-    displayName: "Publish Crash Reports"
-    inputs:
-      artifactName: crash-dump-windows
-      targetPath: .build\crashes
-    continueOnError: true
-    condition: failed()
-
-  - task: PublishTestResults@2
-    displayName: Publish Tests Results
-    inputs:
-      testResultsFiles: "*-results.xml"
-      searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: succeededOrFailed()
diff --git a/build/azure-pipelines/win32/import-esrp-auth-cert.ps1 b/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
index f11f878c8..e9a1d5a8a 100644
--- a/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
+++ b/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 
 $CertBytes = [System.Convert]::FromBase64String($CertBase64)
 $CertCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection
-$CertCollection.Import($CertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable)
+$CertCollection.Import($CertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable -bxor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet)
 
 $CertStore = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","LocalMachine")
 $CertStore.Open("ReadWrite")
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 1992ac1af..035580035 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -1,28 +1,7 @@
 steps:
-  - powershell: |
-      mkdir .build -ea 0
-      "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
-      "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
-      "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
-    displayName: Prepare compilation cache flags
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-    inputs:
-      keyfile: "build/.cachesalt, .build/commit, .build/quality, .build/terrapin"
-      targetfolder: ".build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min"
-      vstsFeed: "npm-vscode"
-      platformIndependent: true
-      alias: "Compilation"
-
-  - powershell: |
-      $ErrorActionPreference = "Stop"
-      exit 1
-    displayName: Check RestoreCache
-    condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.14.1"
+      versionSpec: "12.18.3"
 
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
     inputs:
@@ -39,6 +18,18 @@ steps:
       azureSubscription: "vscode-builds-subscription"
       KeyVaultName: vscode
 
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: Compilation
+      path: $(Build.ArtifactStagingDirectory)
+    displayName: Download compilation output
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { tar --force-local -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz }
+    displayName: Extract compilation output
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
@@ -51,26 +42,34 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
-      exec { git fetch distro }
-      exec { git merge $(node -p "require('./package.json').distro") }
+      exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
     displayName: Merge distro
 
-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
   - powershell: |
       "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
+      "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js > .build/yarnlockhash
     displayName: Prepare yarn cache flags
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  - task: Cache@2
     inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'nodeModules | $(Agent.OS) | .build/arch, .build/terrapin, .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { 7z.exe x .build/node_modules_cache/cache.7z -aos }
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache
+
+  - script: |
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -79,22 +78,20 @@ steps:
       $env:npm_config_arch="$(VSCODE_ARCH)"
       $env:CHILD_CONCURRENCY="1"
       retry { exec { yarn --frozen-lockfile } }
+    env:
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
     displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { yarn postinstall }
-    displayName: Run postinstall scripts
-    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+      exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+      exec { mkdir -Force .build/node_modules_cache }
+      exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -107,11 +104,18 @@ steps:
       $ErrorActionPreference = "Stop"
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
       exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
-      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-code-helper" }
-      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
       echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
     displayName: Build
 
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-code-helper" }
+      exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+    displayName: Prepare Package
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
@@ -122,12 +126,21 @@ steps:
     displayName: Build Server
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+      exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" }
+    displayName: Download Electron and Playwright
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
       exec { yarn electron $(VSCODE_ARCH) }
       exec { .\scripts\test.bat --build --tfs "Unit Tests" }
     displayName: Run unit tests (Electron)
+    timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -135,6 +148,14 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { yarn test-browser --build --browser chromium --browser firefox --tfs "Browser Unit Tests" }
     displayName: Run unit tests (Browser)
+    timeoutInMinutes: 7
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { yarn --cwd test/integration/browser compile }
+    displayName: Compile integration tests
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -148,6 +169,7 @@ steps:
       $AppNameShort = $AppProductJson.nameShort
       exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
     displayName: Run integration tests (Electron)
+    timeoutInMinutes: 10
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -155,6 +177,7 @@ steps:
       $ErrorActionPreference = "Stop"
       exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox }
     displayName: Run integration tests (Browser)
+    timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - powershell: |
@@ -165,6 +188,7 @@ steps:
       $AppNameShort = $AppProductJson.nameShort
       exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-remote-integration.bat }
     displayName: Run remote integration tests (Electron)
+    timeoutInMinutes: 7
     condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - task: PublishPipelineArtifact@0
@@ -180,7 +204,7 @@ steps:
     inputs:
       testResultsFiles: "*-results.xml"
       searchFolder: "$(Build.ArtifactStagingDirectory)/test-results"
-    condition: and(succeededOrFailed(), ne(variables['VSCODE_ARCH'], 'arm64'))
+    condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     inputs:
@@ -236,6 +260,7 @@ steps:
           }
         ]
       SessionTimeout: 120
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: NuGetCommand@2
     displayName: Install ESRPClient.exe
@@ -245,11 +270,13 @@ steps:
       nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
       externalFeedCredentials: "ESRP Nuget"
       restoreDirectory: packages
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: ESRPImportCertTask@1
     displayName: Import ESRP Request Signing Certificate
     inputs:
       ESRP: "ESRP CodeSign"
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - task: PowerShell@2
     inputs:
@@ -257,6 +284,7 @@ steps:
       filePath: .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1
       arguments: "$(ESRP-SSL-AADAuth)"
     displayName: Import ESRP Auth Certificate
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
@@ -266,6 +294,32 @@ steps:
       $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
       .\build\azure-pipelines\win32\publish.ps1
     displayName: Publish
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip
+    artifact: vscode-win32-$(VSCODE_ARCH)
+    displayName: Publish archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe
+    artifact: vscode-win32-$(VSCODE_ARCH)-setup
+    displayName: Publish system setup
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe
+    artifact: vscode-win32-$(VSCODE_ARCH)-user-setup
+    displayName: Publish user setup
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip
+    artifact: vscode-server-win32-$(VSCODE_ARCH)
+    displayName: Publish server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip
+    artifact: vscode-server-win32-$(VSCODE_ARCH)-web
+    displayName: Publish web server archive
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: "Component Detection"
diff --git a/build/builtin/browser-main.js b/build/builtin/browser-main.js
index e59561795..d105181d6 100644
--- a/build/builtin/browser-main.js
+++ b/build/builtin/browser-main.js
@@ -6,8 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { remote } = require('electron');
-const dialog = remote.dialog;
+const { ipcRenderer } = require('electron');
 
 const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
@@ -84,17 +83,13 @@ function render(el, state) {
 		}
 
 		const localInput = renderOption(form, `local-${ext.name}`, 'Local', 'local', !!local);
-		localInput.onchange = function () {
-			const result = dialog.showOpenDialog(remote.getCurrentWindow(), {
-				title: 'Choose Folder',
-				properties: ['openDirectory']
-			});
+		localInput.onchange = async function () {
+			const result = await ipcRenderer.invoke('pickdir');
 
-			if (result && result.length >= 1) {
-				control[ext.name] = result[0];
+			if (result) {
+				control[ext.name] = result;
+				setState({ builtin, control });
 			}
-
-			setState({ builtin, control });
 		};
 
 		if (local) {
diff --git a/build/builtin/main.js b/build/builtin/main.js
index 7379de7a9..42865157c 100644
--- a/build/builtin/main.js
+++ b/build/builtin/main.js
@@ -3,12 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const { app, BrowserWindow } = require('electron');
+const { app, BrowserWindow, ipcMain, dialog } = require('electron');
 const url = require('url');
 const path = require('path');
 
 let window = null;
 
+ipcMain.handle('pickdir', async () => {
+	const result = await dialog.showOpenDialog(window, {
+		title: 'Choose Folder',
+		properties: ['openDirectory']
+	});
+
+	if (result.canceled || result.filePaths.length < 1) {
+		return undefined;
+	}
+
+	return result.filePaths[0];
+});
+
 app.once('ready', () => {
 	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
 	window.setMenuBarVisibility(false);
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
new file mode 100644
index 000000000..bcd51d370
--- /dev/null
+++ b/build/darwin/create-universal-app.js
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const vscode_universal_1 = require("vscode-universal");
+const fs = require("fs-extra");
+const path = require("path");
+const plist = require("plist");
+const product = require("../../product.json");
+async function main() {
+    const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+    const arch = process.env['VSCODE_ARCH'];
+    if (!buildDir) {
+        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 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);
+    const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
+    const infoPlistPath = path.resolve(outAppPath, 'Contents', 'Info.plist');
+    await vscode_universal_1.makeUniversalApp({
+        x64AppPath,
+        arm64AppPath,
+        x64AsarPath,
+        arm64AsarPath,
+        filesToSkip: [
+            'product.json',
+            'Credits.rtf',
+            'CodeResources',
+            'fsevents.node',
+            '.npmrc'
+        ],
+        outAppPath,
+        force: true
+    });
+    let productJson = await fs.readJson(productJsonPath);
+    Object.assign(productJson, {
+        darwinUniversalAssetId: 'darwin-universal'
+    });
+    await fs.writeJson(productJsonPath, productJson);
+    let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
+    let infoPlistJson = plist.parse(infoPlistString);
+    Object.assign(infoPlistJson, {
+        LSRequiresNativeExecution: true
+    });
+    await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
+}
+if (require.main === module) {
+    main().catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
new file mode 100644
index 000000000..c42d43c78
--- /dev/null
+++ b/build/darwin/create-universal-app.ts
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { makeUniversalApp } from 'vscode-universal';
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import * as plist from 'plist';
+import * as product from '../../product.json';
+
+async function main() {
+	const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+	const arch = process.env['VSCODE_ARCH'];
+
+	if (!buildDir) {
+		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 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);
+	const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
+	const infoPlistPath = path.resolve(outAppPath, 'Contents', 'Info.plist');
+
+	await makeUniversalApp({
+		x64AppPath,
+		arm64AppPath,
+		x64AsarPath,
+		arm64AsarPath,
+		filesToSkip: [
+			'product.json',
+			'Credits.rtf',
+			'CodeResources',
+			'fsevents.node',
+			'.npmrc'
+		],
+		outAppPath,
+		force: true
+	});
+
+	let productJson = await fs.readJson(productJsonPath);
+	Object.assign(productJson, {
+		darwinUniversalAssetId: 'darwin-universal'
+	});
+	await fs.writeJson(productJsonPath, productJson);
+
+	let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
+	let infoPlistJson = plist.parse(infoPlistString);
+	Object.assign(infoPlistJson, {
+		LSRequiresNativeExecution: true
+	});
+	await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
+}
+
+if (require.main === module) {
+	main().catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
+}
diff --git a/build/darwin/sign.js b/build/darwin/sign.js
new file mode 100644
index 000000000..e086b681a
--- /dev/null
+++ b/build/darwin/sign.js
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const codesign = require("electron-osx-sign");
+const path = require("path");
+const util = require("../lib/util");
+const product = require("../../product.json");
+async function main() {
+    const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+    const tempDir = process.env['AGENT_TEMPDIRECTORY'];
+    const arch = process.env['VSCODE_ARCH'];
+    if (!buildDir) {
+        throw new Error('$AGENT_BUILDDIRECTORY not set');
+    }
+    if (!tempDir) {
+        throw new Error('$AGENT_TEMPDIRECTORY not set');
+    }
+    const baseDir = path.dirname(__dirname);
+    const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
+    const appName = product.nameLong + '.app';
+    const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
+    const helperAppBaseName = product.nameShort;
+    const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
+    const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
+    const defaultOpts = {
+        app: path.join(appRoot, appName),
+        platform: 'darwin',
+        entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+        'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist'),
+        hardenedRuntime: true,
+        'pre-auto-entitlements': false,
+        'pre-embed-provisioning-profile': false,
+        keychain: path.join(tempDir, 'buildagent.keychain'),
+        version: util.getElectronVersion(),
+        identity: '99FM488X57',
+        'gatekeeper-assess': false
+    };
+    const appOpts = Object.assign(Object.assign({}, defaultOpts), { 
+        // TODO(deepak1556): Incorrectly declared type in electron-osx-sign
+        ignore: (filePath) => {
+            return filePath.includes(gpuHelperAppName) ||
+                filePath.includes(rendererHelperAppName);
+        } });
+    const gpuHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, gpuHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist') });
+    const rendererHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, rendererHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist') });
+    await codesign.signAsync(gpuHelperOpts);
+    await codesign.signAsync(rendererHelperOpts);
+    await codesign.signAsync(appOpts);
+}
+if (require.main === module) {
+    main().catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index 538dc97ad..f1908b147 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -29,7 +29,6 @@ async function main(): Promise<void> {
 	const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
 	const helperAppBaseName = product.nameShort;
 	const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
-	const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
 	const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
 
 	const defaultOpts: codesign.SignOptions = {
@@ -51,7 +50,6 @@ async function main(): Promise<void> {
 		// TODO(deepak1556): Incorrectly declared type in electron-osx-sign
 		ignore: (filePath: string) => {
 			return filePath.includes(gpuHelperAppName) ||
-				filePath.includes(pluginHelperAppName) ||
 				filePath.includes(rendererHelperAppName);
 		}
 	};
@@ -63,13 +61,6 @@ async function main(): Promise<void> {
 		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'),
 	};
 
-	const pluginHelperOpts: codesign.SignOptions = {
-		...defaultOpts,
-		app: path.join(appFrameworkPath, pluginHelperAppName),
-		entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
-		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
-	};
-
 	const rendererHelperOpts: codesign.SignOptions = {
 		...defaultOpts,
 		app: path.join(appFrameworkPath, rendererHelperAppName),
@@ -78,7 +69,6 @@ async function main(): Promise<void> {
 	};
 
 	await codesign.signAsync(gpuHelperOpts);
-	await codesign.signAsync(pluginHelperOpts);
 	await codesign.signAsync(rendererHelperOpts);
 	await codesign.signAsync(appOpts as any);
 }
diff --git a/build/eslint.js b/build/eslint.js
new file mode 100644
index 000000000..3e3fdf196
--- /dev/null
+++ b/build/eslint.js
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const es = require('event-stream');
+const vfs = require('vinyl-fs');
+const { jsHygieneFilter, tsHygieneFilter } = require('./filters');
+
+function eslint() {
+	const gulpeslint = require('gulp-eslint');
+	return vfs
+		.src([...jsHygieneFilter, ...tsHygieneFilter], { base: '.', follow: true, allowEmpty: true })
+		.pipe(
+			gulpeslint({
+				configFile: '.eslintrc.json',
+				rulePaths: ['./build/lib/eslint'],
+			})
+		)
+		.pipe(gulpeslint.formatEach('compact'))
+		.pipe(
+			gulpeslint.results((results) => {
+				if (results.warningCount > 0 || results.errorCount > 0) {
+					throw new Error('eslint failed with warnings and/or errors');
+				}
+			})
+		).pipe(es.through(function () { /* noop, important for the stream to end */ }));
+}
+
+if (require.main === module) {
+	eslint().on('error', (err) => {
+		console.error();
+		console.error(err);
+		process.exit(1);
+	});
+}
diff --git a/build/ext.js b/build/ext.js
new file mode 100644
index 000000000..11bd9f274
--- /dev/null
+++ b/build/ext.js
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const fs = require('fs').promises;
+const path = require('path');
+const cp = require('child_process');
+const os = require('os');
+const mkdirp = require('mkdirp');
+const product = require('../product.json');
+const root = path.resolve(path.join(__dirname, '..', '..'));
+const exists = (path) => fs.stat(path).then(() => true, () => false);
+
+const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
+
+async function readControlFile() {
+	try {
+		return JSON.parse(await fs.readFile(controlFilePath, 'utf8'));
+	} catch (err) {
+		return {};
+	}
+}
+
+async function writeControlFile(control) {
+	await mkdirp(path.dirname(controlFilePath));
+	await fs.writeFile(controlFilePath, JSON.stringify(control, null, '  '));
+}
+
+async function exec(cmd, args, opts = {}) {
+	return new Promise((c, e) => {
+		const child = cp.spawn(cmd, args, { stdio: 'inherit', env: process.env, ...opts });
+		child.on('close', code => code === 0 ? c() : e(`Returned ${code}`));
+	});
+}
+
+function getFolderPath(extDesc) {
+	const folder = extDesc.repo.replace(/.*\//, '');
+	return folderPath = path.join(root, folder);
+}
+
+async function getExtensionType(folderPath) {
+	const pkg = JSON.parse(await fs.readFile(path.join(folderPath, 'package.json'), 'utf8'));
+
+	if (pkg['contributes']['themes'] || pkg['contributes']['iconThemes']) {
+		return 'theme';
+	} else if (pkg['contributes']['grammars']) {
+		return 'grammar';
+	} else {
+		return 'misc';
+	}
+}
+
+async function initExtension(extDesc) {
+	const folderPath = getFolderPath(extDesc);
+
+	if (!await exists(folderPath)) {
+		console.log(`⏳ git clone: ${extDesc.name}`);
+		await exec('git', ['clone', `${extDesc.repo}.git`], { cwd: root });
+	}
+
+	const type = await getExtensionType(folderPath);
+	return { path: folderPath, type, ...extDesc };
+}
+
+async function createWorkspace(type, extensions) {
+	const workspaceName = `vscode-${type}-extensions.code-workspace`;
+	const workspacePath = path.join(root, workspaceName);
+	const workspace = { folders: extensions.map(ext => ({ path: path.basename(ext.path) })) };
+
+	if (!await exists(workspacePath)) {
+		console.log(`✅ create workspace: ${workspaceName}`);
+	}
+
+	await fs.writeFile(workspacePath, JSON.stringify(workspace, undefined, '  '));
+}
+
+async function init() {
+	const extensions = [];
+
+	for (const extDesc of product.builtInExtensions) {
+		extensions.push(await initExtension(extDesc));
+	}
+
+	await createWorkspace('all', extensions);
+
+	const byType = extensions
+		.reduce((m, e) => m.set(e.type, [...(m.get(e.type) || []), e]), new Map());
+
+	for (const [type, extensions] of byType) {
+		await createWorkspace(type, extensions);
+	}
+
+	return byType;
+}
+
+async function status() {
+	const byType = await init();
+	const control = await readControlFile();
+
+	for (const [type, extensions] of byType) {
+		console.log(`${type} (${extensions.length} extensions):`);
+
+		const maxWidth = Math.max(...extensions.map(e => e.name.length));
+		for (const ext of extensions) {
+			console.log(`  ${ext.name.padEnd(maxWidth, ' ')} ➡  ${control[ext.name]}`);
+		}
+	}
+
+	console.log(`total: ${product.builtInExtensions.length} extensions`);
+}
+
+async function each([cmd, ...args], opts) {
+	await init();
+
+	for (const extDesc of product.builtInExtensions) {
+		const folderPath = getFolderPath(extDesc);
+
+		if (opts.type) {
+			const type = await getExtensionType(folderPath);
+
+			if (type !== opts.type) {
+				continue;
+			}
+		}
+
+		console.log(`👉 ${extDesc.name}`);
+		await exec(cmd, args, { cwd: folderPath });
+	}
+}
+
+async function _link(extensions, opts, fn) {
+	await init();
+
+	const control = await readControlFile();
+
+	for (const extDesc of product.builtInExtensions) {
+		if (extensions.length > 0 && extensions.indexOf(extDesc.name) === -1) {
+			continue;
+		}
+
+		if (opts.type) {
+			const folderPath = getFolderPath(extDesc);
+			const type = await getExtensionType(folderPath);
+
+			if (type !== opts.type) {
+				continue;
+			}
+		}
+
+		await fn(control, extDesc);
+	}
+
+	await writeControlFile(control);
+}
+
+async function link(extensions, opts) {
+	await _link(extensions, opts, async (control, extDesc) => {
+		const ext = await initExtension(extDesc);
+		control[extDesc.name] = ext.path;
+		console.log(`👉 link: ${extDesc.name} ➡ ${ext.path}`);
+	});
+}
+
+async function unlink(extensions, opts) {
+	await _link(extensions, opts, async (control, extDesc) => {
+		control[extDesc.name] = 'marketplace';
+		console.log(`👉 unlink: ${extDesc.name}`);
+	});
+}
+
+if (require.main === module) {
+	const { program } = require('commander');
+
+	program.version('0.0.1');
+
+	program
+		.command('init')
+		.description('Initialize workspace with built-in extensions')
+		.action(init);
+
+	program
+		.command('status')
+		.description('Print extension status')
+		.action(status);
+
+	program
+		.command('each <command...>')
+		.option('-t, --type <type>', 'Specific type only')
+		.description('Run a command in each extension repository')
+		.allowUnknownOption()
+		.action(each);
+
+	program
+		.command('link [extensions...]')
+		.option('-t, --type <type>', 'Specific type only')
+		.description('Link with code-oss')
+		.action(link);
+
+	program
+		.command('unlink [extensions...]')
+		.option('-t, --type <type>', 'Specific type only')
+		.description('Unlink from code-oss')
+		.action(unlink);
+
+	program.parseAsync(process.argv);
+}
diff --git a/build/filters.js b/build/filters.js
new file mode 100644
index 000000000..968a30851
--- /dev/null
+++ b/build/filters.js
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Hygiene works by creating cascading subsets of all our files and
+ * passing them through a sequence of checks. Here are the current subsets,
+ * named according to the checks performed on them. Each subset contains
+ * the following one, as described in mathematical notation:
+ *
+ * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
+ */
+
+module.exports.all = [
+	'*',
+	'build/**/*',
+	'extensions/**/*',
+	'scripts/**/*',
+	'src/**/*',
+	'test/**/*',
+	'!out*/**',
+	'!test/**/out/**',
+	'!**/node_modules/**',
+];
+
+module.exports.indentationFilter = [
+	'**',
+
+	// except specific files
+	'!**/ThirdPartyNotices.txt',
+	'!**/LICENSE.{txt,rtf}',
+	'!LICENSES.chromium.html',
+	'!**/LICENSE',
+	'!src/vs/nls.js',
+	'!src/vs/nls.build.js',
+	'!src/vs/css.js',
+	'!src/vs/css.build.js',
+	'!src/vs/loader.js',
+	'!src/vs/base/common/insane/insane.js',
+	'!src/vs/base/common/marked/marked.js',
+	'!src/vs/base/common/semver/semver.js',
+	'!src/vs/base/node/terminateProcess.sh',
+	'!src/vs/base/node/cpuUsage.sh',
+	'!test/unit/assert.js',
+	'!resources/linux/snap/electron-launch',
+
+	// except specific folders
+	'!test/automation/out/**',
+	'!test/monaco/out/**',
+	'!test/smoke/out/**',
+	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!build/monaco/**',
+	'!build/win32/**',
+
+	// except multiple specific files
+	'!**/package.json',
+	'!**/yarn.lock',
+	'!**/yarn-error.log',
+
+	// except multiple specific folders
+	'!**/codicon/**',
+	'!**/fixtures/**',
+	'!**/lib/**',
+	'!extensions/**/dist/**',
+	'!extensions/**/out/**',
+	'!extensions/**/snippets/**',
+	'!extensions/**/syntaxes/**',
+	'!extensions/**/themes/**',
+	'!extensions/**/colorize-fixtures/**',
+
+	// except specific file types
+	'!src/vs/*/**/*.d.ts',
+	'!src/typings/**/*.d.ts',
+	'!extensions/**/*.d.ts',
+	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
+	'!build/{lib,download,darwin}/**/*.js',
+	'!build/**/*.sh',
+	'!build/azure-pipelines/**/*.js',
+	'!build/azure-pipelines/**/*.config',
+	'!**/Dockerfile',
+	'!**/Dockerfile.*',
+	'!**/*.Dockerfile',
+	'!**/*.dockerfile',
+	'!extensions/markdown-language-features/media/*.js',
+	'!extensions/simple-browser/media/*.js',
+];
+
+module.exports.copyrightFilter = [
+	'**',
+	'!**/*.desktop',
+	'!**/*.json',
+	'!**/*.html',
+	'!**/*.template',
+	'!**/*.md',
+	'!**/*.bat',
+	'!**/*.cmd',
+	'!**/*.ico',
+	'!**/*.icns',
+	'!**/*.xml',
+	'!**/*.sh',
+	'!**/*.txt',
+	'!**/*.xpm',
+	'!**/*.opts',
+	'!**/*.disabled',
+	'!**/*.code-workspace',
+	'!**/*.js.map',
+	'!build/**/*.init',
+	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/win32/bin/code.js',
+	'!resources/web/code-web.js',
+	'!resources/completions/**',
+	'!extensions/configuration-editing/build/inline-allOf.ts',
+	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/html-language-features/server/src/modes/typescript/*',
+	'!extensions/*/server/bin/*',
+	'!src/vs/editor/test/node/classification/typescript-test.ts',
+];
+
+module.exports.jsHygieneFilter = [
+	'src/**/*.js',
+	'build/gulpfile.*.js',
+	'!src/vs/loader.js',
+	'!src/vs/css.js',
+	'!src/vs/nls.js',
+	'!src/vs/css.build.js',
+	'!src/vs/nls.build.js',
+	'!src/**/insane.js',
+	'!src/**/marked.js',
+	'!src/**/semver.js',
+	'!**/test/**',
+];
+
+module.exports.tsHygieneFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
+	'!src/vs/*/**/*.d.ts',
+	'!src/typings/**/*.d.ts',
+	'!extensions/**/*.d.ts',
+	'!**/fixtures/**',
+	'!**/typings/**',
+	'!**/node_modules/**',
+	'!extensions/**/colorize-fixtures/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/**/*.test.ts',
+	'!extensions/html-language-features/server/lib/jquery.d.ts',
+];
diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
index 21aa78965..d10a87f9f 100644
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@@ -11,6 +11,11 @@ const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 
 // Full compile, including nls and inline sources in sourcemaps, for build
-const compileBuildTask = task.define('compile-build', task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true)));
+const compileBuildTask = task.define('compile-build',
+	task.series(
+		util.rimraf('out-build'),
+		compilation.compileTask('src', 'out-build', true)
+	)
+);
 gulp.task(compileBuildTask);
-exports.compileBuildTask = compileBuildTask;
\ No newline at end of file
+exports.compileBuildTask = compileBuildTask;
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 118fe6e81..7ef97f15b 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -16,8 +16,6 @@ const cp = require('child_process');
 const compilation = require('./lib/compilation');
 const monacoapi = require('./lib/monaco-api');
 const fs = require('fs');
-const webpack = require('webpack');
-const webpackGulp = require('webpack-stream');
 
 let root = path.dirname(__dirname);
 let sha1 = util.getVersion(root);
@@ -369,6 +367,9 @@ gulp.task('editor-distro',
 );
 
 const bundleEditorESMTask = task.define('editor-esm-bundle-webpack', () => {
+	const webpack = require('webpack');
+	const webpackGulp = require('webpack-stream');
+
 	const result = es.through();
 
 	const webpackConfigPath = path.join(root, 'build/monaco/monaco.webpack.config.js');
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
index c204e84fd..60d6a79c9 100644
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -9,17 +9,13 @@ require('events').EventEmitter.defaultMaxListeners = 100;
 const gulp = require('gulp');
 const path = require('path');
 const nodeUtil = require('util');
-const tsb = require('gulp-tsb');
 const es = require('event-stream');
 const filter = require('gulp-filter');
-const webpack = require('webpack');
 const util = require('./lib/util');
 const task = require('./lib/task');
 const watcher = require('./lib/watch');
 const createReporter = require('./lib/reporter').createReporter;
 const glob = require('glob');
-const sourcemaps = require('gulp-sourcemaps');
-const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
 const plumber = require('gulp-plumber');
@@ -29,10 +25,49 @@ const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
-const compilations = glob.sync('**/tsconfig.json', {
-	cwd: extensionsPath,
-	ignore: ['**/out/**', '**/node_modules/**']
-});
+// To save 250ms for each gulp startup, we are caching the result here
+// const compilations = glob.sync('**/tsconfig.json', {
+// 	cwd: extensionsPath,
+// 	ignore: ['**/out/**', '**/node_modules/**']
+// });
+const compilations = [
+	'configuration-editing/build/tsconfig.json',
+	'configuration-editing/tsconfig.json',
+	'css-language-features/client/tsconfig.json',
+	'css-language-features/server/tsconfig.json',
+	'debug-auto-launch/tsconfig.json',
+	'debug-server-ready/tsconfig.json',
+	'emmet/tsconfig.json',
+	'extension-editing/tsconfig.json',
+	'git-ui/tsconfig.json',
+	'git/tsconfig.json',
+	'github-authentication/tsconfig.json',
+	'github/tsconfig.json',
+	'grunt/tsconfig.json',
+	'gulp/tsconfig.json',
+	'html-language-features/client/tsconfig.json',
+	'html-language-features/server/tsconfig.json',
+	'image-preview/tsconfig.json',
+	'jake/tsconfig.json',
+	'json-language-features/client/tsconfig.json',
+	'json-language-features/server/tsconfig.json',
+	'markdown-language-features/preview-src/tsconfig.json',
+	'markdown-language-features/tsconfig.json',
+	'merge-conflict/tsconfig.json',
+	'microsoft-authentication/tsconfig.json',
+	'npm/tsconfig.json',
+	'php-language-features/tsconfig.json',
+	'search-result/tsconfig.json',
+	'simple-browser/tsconfig.json',
+	'testing-editor-contributions/tsconfig.json',
+	'typescript-language-features/test-workspace/tsconfig.json',
+	'typescript-language-features/tsconfig.json',
+	'vscode-api-tests/tsconfig.json',
+	'vscode-colorize-tests/tsconfig.json',
+	'vscode-custom-editor-tests/tsconfig.json',
+	'vscode-notebook-tests/tsconfig.json',
+	'vscode-test-resolver/tsconfig.json'
+];
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
@@ -64,6 +99,10 @@ const tasks = compilations.map(function (tsconfigFile) {
 	}
 
 	function createPipeline(build, emitError) {
+		const nlsDev = require('vscode-nls-dev');
+		const tsb = require('gulp-tsb');
+		const sourcemaps = require('gulp-sourcemaps');
+
 		const reporter = createReporter('extensions');
 
 		overrideOptions.inlineSources = Boolean(build);
@@ -170,6 +209,8 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));
 
 gulp.task(compileExtensionsBuildTask);
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask)));
+
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;
 
 const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
@@ -181,6 +222,7 @@ 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'),
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index 7f890e860..838fc661e 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -4,52 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 const gulp = require('gulp');
-const filter = require('gulp-filter');
 const es = require('event-stream');
-const gulpeslint = require('gulp-eslint');
-const vfs = require('vinyl-fs');
 const path = require('path');
 const task = require('./lib/task');
-const { all, jsHygieneFilter, tsHygieneFilter, hygiene } = require('./hygiene');
-
-gulp.task('eslint', () => {
-	return vfs
-		.src(all, { base: '.', follow: true, allowEmpty: true })
-		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
-		.pipe(
-			gulpeslint({
-				configFile: '.eslintrc.json',
-				rulePaths: ['./build/lib/eslint'],
-			})
-		)
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(
-			gulpeslint.results((results) => {
-				if (results.warningCount > 0 || results.errorCount > 0) {
-					throw new Error('eslint failed with warnings and/or errors');
-				}
-			})
-		);
-});
+const { hygiene } = require('./hygiene');
 
 function checkPackageJSON(actualPath) {
 	const actual = require(path.join(__dirname, '..', actualPath));
 	const rootPackageJSON = require('../package.json');
+	const checkIncluded = (set1, set2) => {
+		for (let depName in set1) {
+			const depVersion = set1[depName];
+			const rootDepVersion = set2[depName];
+			if (!rootDepVersion) {
+				// missing in root is allowed
+				continue;
+			}
+			if (depVersion !== rootDepVersion) {
+				this.emit(
+					'error',
+					`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
+				);
+			}
+		}
+	};
 
-	for (let depName in actual.dependencies) {
-		const depVersion = actual.dependencies[depName];
-		const rootDepVersion = rootPackageJSON.dependencies[depName];
-		if (!rootDepVersion) {
-			// missing in root is allowed
-			continue;
-		}
-		if (depVersion !== rootDepVersion) {
-			this.emit(
-				'error',
-				`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
-			);
-		}
-	}
+	checkIncluded(actual.dependencies, rootPackageJSON.dependencies);
+	checkIncluded(actual.devDependencies, rootPackageJSON.devDependencies);
 }
 
 const checkPackageJSONTask = task.define('check-package-json', () => {
@@ -57,12 +38,11 @@ const checkPackageJSONTask = task.define('check-package-json', () => {
 		es.through(function () {
 			checkPackageJSON.call(this, 'remote/package.json');
 			checkPackageJSON.call(this, 'remote/web/package.json');
+			checkPackageJSON.call(this, 'build/package.json');
 		})
 	);
 });
 gulp.task(checkPackageJSONTask);
 
-gulp.task(
-	'hygiene',
-	task.series(checkPackageJSONTask, () => hygiene())
-);
+const hygieneTask = task.define('hygiene', task.series(checkPackageJSONTask, () => hygiene(undefined, false)));
+gulp.task(hygieneTask);
diff --git a/build/gulpfile.js b/build/gulpfile.js
new file mode 100644
index 000000000..69b37c7c6
--- /dev/null
+++ b/build/gulpfile.js
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+// Increase max listeners for event emitters
+require('events').EventEmitter.defaultMaxListeners = 100;
+
+const gulp = require('gulp');
+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');
+
+// Fast compile for development time
+const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
+gulp.task(compileClientTask);
+
+const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), compilation.watchTask('out', false)));
+gulp.task(watchClientTask);
+
+// All
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
+gulp.task(compileTask);
+
+gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
+
+// Default
+gulp.task('default', compileTask);
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+	process.exit(1);
+});
+
+// Load all the gulpfiles only if running tasks other than the editor tasks
+require('glob').sync('gulpfile.*.js', { cwd: __dirname })
+	.forEach(f => require(`./${f}`));
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 5f367d1f0..387a54cbb 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -14,10 +14,8 @@ const task = require('./lib/task');
 const vfs = require('vinyl-fs');
 const flatmap = require('gulp-flatmap');
 const gunzip = require('gulp-gunzip');
-const untar = require('gulp-untar');
 const File = require('vinyl');
 const fs = require('fs');
-const remote = require('gulp-remote-retry-src');
 const rename = require('gulp-rename');
 const filter = require('gulp-filter');
 const cp = require('child_process');
@@ -70,13 +68,17 @@ BUILD_TARGETS.forEach(({ platform, arch }) => {
 	}));
 });
 
-const defaultNodeTask = gulp.task(`node-${process.platform}-${process.arch}`);
+const arch = process.platform === 'darwin' ? 'x64' : process.arch;
+const defaultNodeTask = gulp.task(`node-${process.platform}-${arch}`);
 
 if (defaultNodeTask) {
 	gulp.task(task.define('node', defaultNodeTask));
 }
 
 function nodejs(platform, arch) {
+	const remote = require('gulp-remote-retry-src');
+	const untar = require('gulp-untar');
+
 	if (arch === 'ia32') {
 		arch = 'x86';
 	}
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 42a9c2b27..6d3a36908 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -11,13 +11,10 @@ const os = require('os');
 const cp = require('child_process');
 const path = require('path');
 const es = require('event-stream');
-const azure = require('gulp-azure-storage');
-const electron = require('gulp-atom-electron');
 const vfs = require('vinyl-fs');
 const rename = require('gulp-rename');
 const replace = require('gulp-replace');
 const filter = require('gulp-filter');
-const json = require('gulp-json-editor');
 const _ = require('underscore');
 const util = require('./lib/util');
 const task = require('./lib/task');
@@ -29,15 +26,13 @@ const packageJson = require('../package.json');
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
-const deps = require('./dependencies');
+const { getProductionDependencies } = require('./lib/dependencies');
 const { config } = require('./lib/electron');
 const createAsar = require('./lib/asar').createAsar;
 const minimist = require('minimist');
 const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
-const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
-
 // Build
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
@@ -80,7 +75,6 @@ const vscodeResources = [
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-sandbox/issue/issueReporter.js',
 	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js',
-	'out-build/vs/code/electron-sandbox/proxy/auth.js',
 	'!**/test/**'
 ];
 
@@ -105,6 +99,16 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
 ));
 gulp.task(minifyVSCodeTask);
 
+const core = task.define('core-ci', task.series(
+	gulp.task('compile-build'),
+	task.parallel(
+		gulp.task('minify-vscode'),
+		gulp.task('minify-vscode-reh'),
+		gulp.task('minify-vscode-reh-web'),
+	)
+));
+gulp.task(core);
+
 /**
  * Compute checksums for some files.
  *
@@ -146,6 +150,9 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 	platform = platform || process.platform;
 
 	return () => {
+		const electron = require('gulp-atom-electron');
+		const json = require('gulp-json-editor');
+
 		const out = sourceFolderName;
 
 		const checksums = computeChecksums(out, [
@@ -161,7 +168,16 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
 			.pipe(util.setExecutableBit(['**/*.sh']));
 
-		const extensions = gulp.src('.build/extensions/**', { base: '.build', dot: true });
+		const platformSpecificBuiltInExtensionsExclusions = product.builtInExtensions.filter(ext => {
+			if (!ext.platforms) {
+				return false;
+			}
+
+			const set = new Set(ext.platforms);
+			return !set.has(platform);
+		}).map(ext => `!.build/extensions/${ext.name}/**`);
+
+		const extensions = gulp.src(['.build/extensions/**', ...platformSpecificBuiltInExtensionsExclusions], { base: '.build', dot: true });
 
 		const sources = es.merge(src, extensions)
 			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
@@ -203,10 +219,11 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 		const root = path.resolve(path.join(__dirname, '..'));
+		const productionDependencies = getProductionDependencies(root);
 		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
 
 		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
+			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-85/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
 			.pipe(jsFilter)
 			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
@@ -505,6 +522,8 @@ gulp.task(task.define(
 	task.series(
 		generateVSCodeConfigurationTask,
 		() => {
+			const azure = require('gulp-azure-storage');
+
 			if (!shouldSetupSettingsSearch()) {
 				const branch = process.env.BUILD_SOURCEBRANCH;
 				console.log(`Only runs on master and release branches, not ${branch}`);
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index b6732b7fa..3423e86e8 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -95,10 +95,6 @@ function prepareDebPackage(arch) {
 
 		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@ARCHITECTURE@@', debArch))
-			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
-			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
-			.pipe(replace('@@REPOSITORY_NAME@@', arch === 'x64' ? 'vscode' : 'code'))
 			.pipe(rename('DEBIAN/postinst'));
 
 		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, code);
diff --git a/build/hygiene.js b/build/hygiene.js
index ee6598912..9d6756dbc 100644
--- a/build/hygiene.js
+++ b/build/hygiene.js
@@ -5,156 +5,12 @@
 
 const filter = require('gulp-filter');
 const es = require('event-stream');
-const gulpeslint = require('gulp-eslint');
-const tsfmt = require('typescript-formatter');
 const VinylFile = require('vinyl');
 const vfs = require('vinyl-fs');
 const path = require('path');
 const fs = require('fs');
 const pall = require('p-all');
-
-/**
- * Hygiene works by creating cascading subsets of all our files and
- * passing them through a sequence of checks. Here are the current subsets,
- * named according to the checks performed on them. Each subset contains
- * the following one, as described in mathematical notation:
- *
- * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
- */
-
-const all = [
-	'*',
-	'build/**/*',
-	'extensions/**/*',
-	'scripts/**/*',
-	'src/**/*',
-	'test/**/*',
-	'!test/**/out/**',
-	'!**/node_modules/**',
-];
-module.exports.all = all;
-
-const indentationFilter = [
-	'**',
-
-	// except specific files
-	'!**/ThirdPartyNotices.txt',
-	'!**/LICENSE.{txt,rtf}',
-	'!LICENSES.chromium.html',
-	'!**/LICENSE',
-	'!src/vs/nls.js',
-	'!src/vs/nls.build.js',
-	'!src/vs/css.js',
-	'!src/vs/css.build.js',
-	'!src/vs/loader.js',
-	'!src/vs/base/common/insane/insane.js',
-	'!src/vs/base/common/marked/marked.js',
-	'!src/vs/base/common/semver/semver.js',
-	'!src/vs/base/node/terminateProcess.sh',
-	'!src/vs/base/node/cpuUsage.sh',
-	'!test/unit/assert.js',
-	'!resources/linux/snap/electron-launch',
-
-	// except specific folders
-	'!test/automation/out/**',
-	'!test/smoke/out/**',
-	'!extensions/typescript-language-features/test-workspace/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!build/monaco/**',
-	'!build/win32/**',
-
-	// except multiple specific files
-	'!**/package.json',
-	'!**/yarn.lock',
-	'!**/yarn-error.log',
-
-	// except multiple specific folders
-	'!**/codicon/**',
-	'!**/fixtures/**',
-	'!**/lib/**',
-	'!extensions/**/out/**',
-	'!extensions/**/snippets/**',
-	'!extensions/**/syntaxes/**',
-	'!extensions/**/themes/**',
-	'!extensions/**/colorize-fixtures/**',
-
-	// except specific file types
-	'!src/vs/*/**/*.d.ts',
-	'!src/typings/**/*.d.ts',
-	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
-	'!build/{lib,download,darwin}/**/*.js',
-	'!build/**/*.sh',
-	'!build/azure-pipelines/**/*.js',
-	'!build/azure-pipelines/**/*.config',
-	'!**/Dockerfile',
-	'!**/Dockerfile.*',
-	'!**/*.Dockerfile',
-	'!**/*.dockerfile',
-	'!extensions/markdown-language-features/media/*.js',
-];
-
-const copyrightFilter = [
-	'**',
-	'!**/*.desktop',
-	'!**/*.json',
-	'!**/*.html',
-	'!**/*.template',
-	'!**/*.md',
-	'!**/*.bat',
-	'!**/*.cmd',
-	'!**/*.ico',
-	'!**/*.icns',
-	'!**/*.xml',
-	'!**/*.sh',
-	'!**/*.txt',
-	'!**/*.xpm',
-	'!**/*.opts',
-	'!**/*.disabled',
-	'!**/*.code-workspace',
-	'!**/*.js.map',
-	'!build/**/*.init',
-	'!resources/linux/snap/snapcraft.yaml',
-	'!resources/win32/bin/code.js',
-	'!resources/web/code-web.js',
-	'!resources/completions/**',
-	'!extensions/configuration-editing/build/inline-allOf.ts',
-	'!extensions/markdown-language-features/media/highlight.css',
-	'!extensions/html-language-features/server/src/modes/typescript/*',
-	'!extensions/*/server/bin/*',
-	'!src/vs/editor/test/node/classification/typescript-test.ts',
-];
-
-const jsHygieneFilter = [
-	'src/**/*.js',
-	'build/gulpfile.*.js',
-	'!src/vs/loader.js',
-	'!src/vs/css.js',
-	'!src/vs/nls.js',
-	'!src/vs/css.build.js',
-	'!src/vs/nls.build.js',
-	'!src/**/insane.js',
-	'!src/**/marked.js',
-	'!src/**/semver.js',
-	'!**/test/**',
-];
-module.exports.jsHygieneFilter = jsHygieneFilter;
-
-const tsHygieneFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	'!**/fixtures/**',
-	'!**/typings/**',
-	'!**/node_modules/**',
-	'!extensions/typescript-basics/test/colorize-fixtures/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!extensions/**/*.test.ts',
-	'!extensions/html-language-features/server/lib/jquery.d.ts',
-];
-module.exports.tsHygieneFilter = tsHygieneFilter;
+const { all, copyrightFilter, indentationFilter, jsHygieneFilter, tsHygieneFilter } = require('./filters');
 
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
@@ -163,7 +19,10 @@ const copyrightHeaderLines = [
 	' *--------------------------------------------------------------------------------------------*/',
 ];
 
-function hygiene(some) {
+function hygiene(some, linting = true) {
+	const gulpeslint = require('gulp-eslint');
+	const tsfmt = require('typescript-formatter');
+
 	let errorCount = 0;
 
 	const productJson = es.through(function (file) {
@@ -273,26 +132,32 @@ function hygiene(some) {
 		.pipe(filter(copyrightFilter))
 		.pipe(copyrights);
 
-	const typescript = result.pipe(filter(tsHygieneFilter)).pipe(formatting);
+	const streams = [
+		result.pipe(filter(tsHygieneFilter)).pipe(formatting)
+	];
 
-	const javascript = result
-		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
-		.pipe(
-			gulpeslint({
-				configFile: '.eslintrc.json',
-				rulePaths: ['./build/lib/eslint'],
-			})
-		)
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(
-			gulpeslint.results((results) => {
-				errorCount += results.warningCount;
-				errorCount += results.errorCount;
-			})
+	if (linting) {
+		streams.push(
+			result
+				.pipe(filter([...jsHygieneFilter, ...tsHygieneFilter]))
+				.pipe(
+					gulpeslint({
+						configFile: '.eslintrc.json',
+						rulePaths: ['./build/lib/eslint'],
+					})
+				)
+				.pipe(gulpeslint.formatEach('compact'))
+				.pipe(
+					gulpeslint.results((results) => {
+						errorCount += results.warningCount;
+						errorCount += results.errorCount;
+					})
+				)
 		);
+	}
 
 	let count = 0;
-	return es.merge(typescript, javascript).pipe(
+	return es.merge(...streams).pipe(
 		es.through(
 			function (data) {
 				count++;
@@ -337,7 +202,7 @@ function createGitIndexVinyls(paths) {
 				}
 
 				cp.exec(
-					`git show :${relativePath}`,
+					process.platform === 'win32' ? `git show :${relativePath}` : `git show ':${relativePath}'`,
 					{ maxBuffer: 2000 * 1024, encoding: 'buffer' },
 					(err, out) => {
 						if (err) {
diff --git a/build/lib/asar.js b/build/lib/asar.js
new file mode 100644
index 000000000..708005791
--- /dev/null
+++ b/build/lib/asar.js
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAsar = void 0;
+const path = require("path");
+const es = require("event-stream");
+const pickle = require('chromium-pickle-js');
+const Filesystem = require('asar/lib/filesystem');
+const VinylFile = require("vinyl");
+const minimatch = require("minimatch");
+function createAsar(folderPath, unpackGlobs, destFilename) {
+    const shouldUnpackFile = (file) => {
+        for (let i = 0; i < unpackGlobs.length; i++) {
+            if (minimatch(file.relative, unpackGlobs[i])) {
+                return true;
+            }
+        }
+        return false;
+    };
+    const filesystem = new Filesystem(folderPath);
+    const out = [];
+    // Keep track of pending inserts
+    let pendingInserts = 0;
+    let onFileInserted = () => { pendingInserts--; };
+    // Do not insert twice the same directory
+    const seenDir = {};
+    const insertDirectoryRecursive = (dir) => {
+        if (seenDir[dir]) {
+            return;
+        }
+        let lastSlash = dir.lastIndexOf('/');
+        if (lastSlash === -1) {
+            lastSlash = dir.lastIndexOf('\\');
+        }
+        if (lastSlash !== -1) {
+            insertDirectoryRecursive(dir.substring(0, lastSlash));
+        }
+        seenDir[dir] = true;
+        filesystem.insertDirectory(dir);
+    };
+    const insertDirectoryForFile = (file) => {
+        let lastSlash = file.lastIndexOf('/');
+        if (lastSlash === -1) {
+            lastSlash = file.lastIndexOf('\\');
+        }
+        if (lastSlash !== -1) {
+            insertDirectoryRecursive(file.substring(0, lastSlash));
+        }
+    };
+    const insertFile = (relativePath, stat, shouldUnpack) => {
+        insertDirectoryForFile(relativePath);
+        pendingInserts++;
+        // Do not pass `onFileInserted` directly because it gets overwritten below.
+        // Create a closure capturing `onFileInserted`.
+        filesystem.insertFile(relativePath, shouldUnpack, { stat: stat }, {}).then(() => onFileInserted(), () => onFileInserted());
+    };
+    return es.through(function (file) {
+        if (file.stat.isDirectory()) {
+            return;
+        }
+        if (!file.stat.isFile()) {
+            throw new Error(`unknown item in stream!`);
+        }
+        const shouldUnpack = shouldUnpackFile(file);
+        insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
+        if (shouldUnpack) {
+            // The file goes outside of xx.asar, in a folder xx.asar.unpacked
+            const relative = path.relative(folderPath, file.path);
+            this.queue(new VinylFile({
+                base: '.',
+                path: path.join(destFilename + '.unpacked', relative),
+                stat: file.stat,
+                contents: file.contents
+            }));
+        }
+        else {
+            // The file goes inside of xx.asar
+            out.push(file.contents);
+        }
+    }, function () {
+        let finish = () => {
+            {
+                const headerPickle = pickle.createEmpty();
+                headerPickle.writeString(JSON.stringify(filesystem.header));
+                const headerBuf = headerPickle.toBuffer();
+                const sizePickle = pickle.createEmpty();
+                sizePickle.writeUInt32(headerBuf.length);
+                const sizeBuf = sizePickle.toBuffer();
+                out.unshift(headerBuf);
+                out.unshift(sizeBuf);
+            }
+            const contents = Buffer.concat(out);
+            out.length = 0;
+            this.queue(new VinylFile({
+                base: '.',
+                path: destFilename,
+                contents: contents
+            }));
+            this.queue(null);
+        };
+        // Call finish() only when all file inserts have finished...
+        if (pendingInserts === 0) {
+            finish();
+        }
+        else {
+            onFileInserted = () => {
+                pendingInserts--;
+                if (pendingInserts === 0) {
+                    finish();
+                }
+            };
+        }
+    });
+}
+exports.createAsar = createAsar;
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
new file mode 100644
index 000000000..9b8bcc9e0
--- /dev/null
+++ b/build/lib/builtInExtensions.js
@@ -0,0 +1,120 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBuiltInExtensions = void 0;
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const rimraf = require("rimraf");
+const es = require("event-stream");
+const rename = require("gulp-rename");
+const vfs = require("vinyl-fs");
+const ext = require("./extensions");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const mkdirp = require('mkdirp');
+const root = path.dirname(path.dirname(__dirname));
+const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productjson.builtInExtensions;
+const webBuiltInExtensions = productjson.webBuiltInExtensions;
+const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
+const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
+function log(...messages) {
+    if (ENABLE_LOGGING) {
+        fancyLog(...messages);
+    }
+}
+function getExtensionPath(extension) {
+    return path.join(root, '.build', 'builtInExtensions', extension.name);
+}
+function isUpToDate(extension) {
+    const packagePath = path.join(getExtensionPath(extension), 'package.json');
+    if (!fs.existsSync(packagePath)) {
+        return false;
+    }
+    const packageContents = fs.readFileSync(packagePath, { encoding: 'utf8' });
+    try {
+        const diskVersion = JSON.parse(packageContents).version;
+        return (diskVersion === extension.version);
+    }
+    catch (err) {
+        return false;
+    }
+}
+function syncMarketplaceExtension(extension) {
+    if (isUpToDate(extension)) {
+        log(ansiColors.blue('[marketplace]'), `${extension.name}@${extension.version}`, ansiColors.green('✔︎'));
+        return es.readArray([]);
+    }
+    rimraf.sync(getExtensionPath(extension));
+    return ext.fromMarketplace(extension.name, extension.version, extension.metadata)
+        .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`))
+        .pipe(vfs.dest('.build/builtInExtensions'))
+        .on('end', () => log(ansiColors.blue('[marketplace]'), extension.name, ansiColors.green('✔︎')));
+}
+function syncExtension(extension, controlState) {
+    if (extension.platforms) {
+        const platforms = new Set(extension.platforms);
+        if (!platforms.has(process.platform)) {
+            log(ansiColors.gray('[skip]'), `${extension.name}@${extension.version}: Platform '${process.platform}' not supported: [${extension.platforms}]`, ansiColors.green('✔︎'));
+            return es.readArray([]);
+        }
+    }
+    switch (controlState) {
+        case 'disabled':
+            log(ansiColors.blue('[disabled]'), ansiColors.gray(extension.name));
+            return es.readArray([]);
+        case 'marketplace':
+            return syncMarketplaceExtension(extension);
+        default:
+            if (!fs.existsSync(controlState)) {
+                log(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
+                return es.readArray([]);
+            }
+            else if (!fs.existsSync(path.join(controlState, 'package.json'))) {
+                log(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
+                return es.readArray([]);
+            }
+            log(ansiColors.blue('[local]'), `${extension.name}: ${ansiColors.cyan(controlState)}`, ansiColors.green('✔︎'));
+            return es.readArray([]);
+    }
+}
+function readControlFile() {
+    try {
+        return JSON.parse(fs.readFileSync(controlFilePath, 'utf8'));
+    }
+    catch (err) {
+        return {};
+    }
+}
+function writeControlFile(control) {
+    mkdirp.sync(path.dirname(controlFilePath));
+    fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
+}
+function getBuiltInExtensions() {
+    log('Syncronizing built-in extensions...');
+    log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
+    const control = readControlFile();
+    const streams = [];
+    for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
+        let controlState = control[extension.name] || 'marketplace';
+        control[extension.name] = controlState;
+        streams.push(syncExtension(extension, controlState));
+    }
+    writeControlFile(control);
+    return new Promise((resolve, reject) => {
+        es.merge(streams)
+            .on('error', reject)
+            .on('end', resolve);
+    });
+}
+exports.getBuiltInExtensions = getBuiltInExtensions;
+if (require.main === module) {
+    getBuiltInExtensions().then(() => process.exit(0)).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
index b20913f49..20f2ee0aa 100644
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -21,6 +21,7 @@ interface IExtensionDefinition {
 	name: string;
 	version: string;
 	repo: string;
+	platforms?: string[];
 	metadata: {
 		id: string;
 		publisherId: {
@@ -82,6 +83,15 @@ function syncMarketplaceExtension(extension: IExtensionDefinition): Stream {
 }
 
 function syncExtension(extension: IExtensionDefinition, controlState: 'disabled' | 'marketplace'): Stream {
+	if (extension.platforms) {
+		const platforms = new Set(extension.platforms);
+
+		if (!platforms.has(process.platform)) {
+			log(ansiColors.gray('[skip]'), `${extension.name}@${extension.version}: Platform '${process.platform}' not supported: [${extension.platforms}]`, ansiColors.green('✔︎'));
+			return es.readArray([]);
+		}
+	}
+
 	switch (controlState) {
 		case 'disabled':
 			log(ansiColors.blue('[disabled]'), ansiColors.gray(extension.name));
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
new file mode 100644
index 000000000..7d0c8d9b5
--- /dev/null
+++ b/build/lib/bundle.js
@@ -0,0 +1,464 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundle = void 0;
+const fs = require("fs");
+const path = require("path");
+const vm = require("vm");
+/**
+ * Bundle `entryPoints` given config `config`.
+ */
+function bundle(entryPoints, config, callback) {
+    const entryPointsMap = {};
+    entryPoints.forEach((module) => {
+        entryPointsMap[module.name] = module;
+    });
+    const allMentionedModulesMap = {};
+    entryPoints.forEach((module) => {
+        allMentionedModulesMap[module.name] = true;
+        (module.include || []).forEach(function (includedModule) {
+            allMentionedModulesMap[includedModule] = true;
+        });
+        (module.exclude || []).forEach(function (excludedModule) {
+            allMentionedModulesMap[excludedModule] = true;
+        });
+    });
+    const code = require('fs').readFileSync(path.join(__dirname, '../../src/vs/loader.js'));
+    const r = vm.runInThisContext('(function(require, module, exports) { ' + code + '\n});');
+    const loaderModule = { exports: {} };
+    r.call({}, require, loaderModule, loaderModule.exports);
+    const loader = loaderModule.exports;
+    config.isBuild = true;
+    config.paths = config.paths || {};
+    if (!config.paths['vs/nls']) {
+        config.paths['vs/nls'] = 'out-build/vs/nls.build';
+    }
+    if (!config.paths['vs/css']) {
+        config.paths['vs/css'] = 'out-build/vs/css.build';
+    }
+    loader.config(config);
+    loader(['require'], (localRequire) => {
+        const resolvePath = (path) => {
+            const r = localRequire.toUrl(path);
+            if (!/\.js/.test(r)) {
+                return r + '.js';
+            }
+            return r;
+        };
+        for (const moduleId in entryPointsMap) {
+            const entryPoint = entryPointsMap[moduleId];
+            if (entryPoint.append) {
+                entryPoint.append = entryPoint.append.map(resolvePath);
+            }
+            if (entryPoint.prepend) {
+                entryPoint.prepend = entryPoint.prepend.map(resolvePath);
+            }
+        }
+    });
+    loader(Object.keys(allMentionedModulesMap), () => {
+        const modules = loader.getBuildInfo();
+        const partialResult = emitEntryPoints(modules, entryPointsMap);
+        const cssInlinedResources = loader('vs/css').getInlinedResources();
+        callback(null, {
+            files: partialResult.files,
+            cssInlinedResources: cssInlinedResources,
+            bundleData: partialResult.bundleData
+        });
+    }, (err) => callback(err, null));
+}
+exports.bundle = bundle;
+function emitEntryPoints(modules, entryPoints) {
+    const modulesMap = {};
+    modules.forEach((m) => {
+        modulesMap[m.id] = m;
+    });
+    const modulesGraph = {};
+    modules.forEach((m) => {
+        modulesGraph[m.id] = m.dependencies;
+    });
+    const sortedModules = topologicalSort(modulesGraph);
+    let result = [];
+    const usedPlugins = {};
+    const bundleData = {
+        graph: modulesGraph,
+        bundles: {}
+    };
+    Object.keys(entryPoints).forEach((moduleToBundle) => {
+        const info = entryPoints[moduleToBundle];
+        const rootNodes = [moduleToBundle].concat(info.include || []);
+        const allDependencies = visit(rootNodes, modulesGraph);
+        const excludes = ['require', 'exports', 'module'].concat(info.exclude || []);
+        excludes.forEach((excludeRoot) => {
+            const allExcludes = visit([excludeRoot], modulesGraph);
+            Object.keys(allExcludes).forEach((exclude) => {
+                delete allDependencies[exclude];
+            });
+        });
+        const includedModules = sortedModules.filter((module) => {
+            return allDependencies[module];
+        });
+        bundleData.bundles[moduleToBundle] = includedModules;
+        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.append || [], info.dest);
+        result = result.concat(res.files);
+        for (const pluginName in res.usedPlugins) {
+            usedPlugins[pluginName] = usedPlugins[pluginName] || res.usedPlugins[pluginName];
+        }
+    });
+    Object.keys(usedPlugins).forEach((pluginName) => {
+        const plugin = usedPlugins[pluginName];
+        if (typeof plugin.finishBuild === 'function') {
+            const write = (filename, contents) => {
+                result.push({
+                    dest: filename,
+                    sources: [{
+                            path: null,
+                            contents: contents
+                        }]
+                });
+            };
+            plugin.finishBuild(write);
+        }
+    });
+    return {
+        // TODO@TS 2.1.2
+        files: extractStrings(removeDuplicateTSBoilerplate(result)),
+        bundleData: bundleData
+    };
+}
+function extractStrings(destFiles) {
+    const parseDefineCall = (moduleMatch, depsMatch) => {
+        const module = moduleMatch.replace(/^"|"$/g, '');
+        let deps = depsMatch.split(',');
+        deps = deps.map((dep) => {
+            dep = dep.trim();
+            dep = dep.replace(/^"|"$/g, '');
+            dep = dep.replace(/^'|'$/g, '');
+            let prefix = null;
+            let _path = null;
+            const pieces = dep.split('!');
+            if (pieces.length > 1) {
+                prefix = pieces[0] + '!';
+                _path = pieces[1];
+            }
+            else {
+                prefix = '';
+                _path = pieces[0];
+            }
+            if (/^\.\//.test(_path) || /^\.\.\//.test(_path)) {
+                const res = path.join(path.dirname(module), _path).replace(/\\/g, '/');
+                return prefix + res;
+            }
+            return prefix + _path;
+        });
+        return {
+            module: module,
+            deps: deps
+        };
+    };
+    destFiles.forEach((destFile) => {
+        if (!/\.js$/.test(destFile.dest)) {
+            return;
+        }
+        if (/\.nls\.js$/.test(destFile.dest)) {
+            return;
+        }
+        // Do one pass to record the usage counts for each module id
+        const useCounts = {};
+        destFile.sources.forEach((source) => {
+            const matches = source.contents.match(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/);
+            if (!matches) {
+                return;
+            }
+            const defineCall = parseDefineCall(matches[1], matches[2]);
+            useCounts[defineCall.module] = (useCounts[defineCall.module] || 0) + 1;
+            defineCall.deps.forEach((dep) => {
+                useCounts[dep] = (useCounts[dep] || 0) + 1;
+            });
+        });
+        const sortedByUseModules = Object.keys(useCounts);
+        sortedByUseModules.sort((a, b) => {
+            return useCounts[b] - useCounts[a];
+        });
+        const replacementMap = {};
+        sortedByUseModules.forEach((module, index) => {
+            replacementMap[module] = index;
+        });
+        destFile.sources.forEach((source) => {
+            source.contents = source.contents.replace(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/, (_, moduleMatch, depsMatch) => {
+                const defineCall = parseDefineCall(moduleMatch, depsMatch);
+                return `define(__m[${replacementMap[defineCall.module]}/*${defineCall.module}*/], __M([${defineCall.deps.map(dep => replacementMap[dep] + '/*' + dep + '*/').join(',')}])`;
+            });
+        });
+        destFile.sources.unshift({
+            path: null,
+            contents: [
+                '(function() {',
+                `var __m = ${JSON.stringify(sortedByUseModules)};`,
+                `var __M = function(deps) {`,
+                `  var result = [];`,
+                `  for (var i = 0, len = deps.length; i < len; i++) {`,
+                `    result[i] = __m[deps[i]];`,
+                `  }`,
+                `  return result;`,
+                `};`
+            ].join('\n')
+        });
+        destFile.sources.push({
+            path: null,
+            contents: '}).call(this);'
+        });
+    });
+    return destFiles;
+}
+function removeDuplicateTSBoilerplate(destFiles) {
+    // Taken from typescript compiler => emitFiles
+    const BOILERPLATE = [
+        { start: /^var __extends/, end: /^}\)\(\);$/ },
+        { start: /^var __assign/, end: /^};$/ },
+        { start: /^var __decorate/, end: /^};$/ },
+        { start: /^var __metadata/, end: /^};$/ },
+        { start: /^var __param/, end: /^};$/ },
+        { start: /^var __awaiter/, end: /^};$/ },
+        { start: /^var __generator/, end: /^};$/ },
+    ];
+    destFiles.forEach((destFile) => {
+        const SEEN_BOILERPLATE = [];
+        destFile.sources.forEach((source) => {
+            const lines = source.contents.split(/\r\n|\n|\r/);
+            const newLines = [];
+            let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (IS_REMOVING_BOILERPLATE) {
+                    newLines.push('');
+                    if (END_BOILERPLATE.test(line)) {
+                        IS_REMOVING_BOILERPLATE = false;
+                    }
+                }
+                else {
+                    for (let j = 0; j < BOILERPLATE.length; j++) {
+                        const boilerplate = BOILERPLATE[j];
+                        if (boilerplate.start.test(line)) {
+                            if (SEEN_BOILERPLATE[j]) {
+                                IS_REMOVING_BOILERPLATE = true;
+                                END_BOILERPLATE = boilerplate.end;
+                            }
+                            else {
+                                SEEN_BOILERPLATE[j] = true;
+                            }
+                        }
+                    }
+                    if (IS_REMOVING_BOILERPLATE) {
+                        newLines.push('');
+                    }
+                    else {
+                        newLines.push(line);
+                    }
+                }
+            }
+            source.contents = newLines.join('\n');
+        });
+    });
+    return destFiles;
+}
+function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, append, dest) {
+    if (!dest) {
+        dest = entryPoint + '.js';
+    }
+    const mainResult = {
+        sources: [],
+        dest: dest
+    }, results = [mainResult];
+    const usedPlugins = {};
+    const getLoaderPlugin = (pluginName) => {
+        if (!usedPlugins[pluginName]) {
+            usedPlugins[pluginName] = modulesMap[pluginName].exports;
+        }
+        return usedPlugins[pluginName];
+    };
+    includedModules.forEach((c) => {
+        const bangIndex = c.indexOf('!');
+        if (bangIndex >= 0) {
+            const pluginName = c.substr(0, bangIndex);
+            const plugin = getLoaderPlugin(pluginName);
+            mainResult.sources.push(emitPlugin(entryPoint, plugin, pluginName, c.substr(bangIndex + 1)));
+            return;
+        }
+        const module = modulesMap[c];
+        if (module.path === 'empty:') {
+            return;
+        }
+        const contents = readFileAndRemoveBOM(module.path);
+        if (module.shim) {
+            mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents));
+        }
+        else {
+            mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
+        }
+    });
+    Object.keys(usedPlugins).forEach((pluginName) => {
+        const plugin = usedPlugins[pluginName];
+        if (typeof plugin.writeFile === 'function') {
+            const req = (() => {
+                throw new Error('no-no!');
+            });
+            req.toUrl = something => something;
+            const write = (filename, contents) => {
+                results.push({
+                    dest: filename,
+                    sources: [{
+                            path: null,
+                            contents: contents
+                        }]
+                });
+            };
+            plugin.writeFile(pluginName, entryPoint, req, write, {});
+        }
+    });
+    const toIFile = (path) => {
+        const contents = readFileAndRemoveBOM(path);
+        return {
+            path: path,
+            contents: contents
+        };
+    };
+    const toPrepend = (prepend || []).map(toIFile);
+    const toAppend = (append || []).map(toIFile);
+    mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
+    return {
+        files: results,
+        usedPlugins: usedPlugins
+    };
+}
+function readFileAndRemoveBOM(path) {
+    const BOM_CHAR_CODE = 65279;
+    let contents = fs.readFileSync(path, 'utf8');
+    // Remove BOM
+    if (contents.charCodeAt(0) === BOM_CHAR_CODE) {
+        contents = contents.substring(1);
+    }
+    return contents;
+}
+function emitPlugin(entryPoint, plugin, pluginName, moduleName) {
+    let result = '';
+    if (typeof plugin.write === 'function') {
+        const write = ((what) => {
+            result += what;
+        });
+        write.getEntryPoint = () => {
+            return entryPoint;
+        };
+        write.asModule = (moduleId, code) => {
+            code = code.replace(/^define\(/, 'define("' + moduleId + '",');
+            result += code;
+        };
+        plugin.write(pluginName, moduleName, write);
+    }
+    return {
+        path: null,
+        contents: result
+    };
+}
+function emitNamedModule(moduleId, defineCallPosition, path, contents) {
+    // `defineCallPosition` is the position in code: |define()
+    const defineCallOffset = positionToOffset(contents, defineCallPosition.line, defineCallPosition.col);
+    // `parensOffset` is the position in code: define|()
+    const parensOffset = contents.indexOf('(', defineCallOffset);
+    const insertStr = '"' + moduleId + '", ';
+    return {
+        path: path,
+        contents: contents.substr(0, parensOffset + 1) + insertStr + contents.substr(parensOffset + 1)
+    };
+}
+function emitShimmedModule(moduleId, myDeps, factory, path, contents) {
+    const strDeps = (myDeps.length > 0 ? '"' + myDeps.join('", "') + '"' : '');
+    const strDefine = 'define("' + moduleId + '", [' + strDeps + '], ' + factory + ');';
+    return {
+        path: path,
+        contents: contents + '\n;\n' + strDefine
+    };
+}
+/**
+ * Convert a position (line:col) to (offset) in string `str`
+ */
+function positionToOffset(str, desiredLine, desiredCol) {
+    if (desiredLine === 1) {
+        return desiredCol - 1;
+    }
+    let line = 1;
+    let lastNewLineOffset = -1;
+    do {
+        if (desiredLine === line) {
+            return lastNewLineOffset + 1 + desiredCol - 1;
+        }
+        lastNewLineOffset = str.indexOf('\n', lastNewLineOffset + 1);
+        line++;
+    } while (lastNewLineOffset >= 0);
+    return -1;
+}
+/**
+ * Return a set of reachable nodes in `graph` starting from `rootNodes`
+ */
+function visit(rootNodes, graph) {
+    const result = {};
+    const queue = rootNodes;
+    rootNodes.forEach((node) => {
+        result[node] = true;
+    });
+    while (queue.length > 0) {
+        const el = queue.shift();
+        const myEdges = graph[el] || [];
+        myEdges.forEach((toNode) => {
+            if (!result[toNode]) {
+                result[toNode] = true;
+                queue.push(toNode);
+            }
+        });
+    }
+    return result;
+}
+/**
+ * Perform a topological sort on `graph`
+ */
+function topologicalSort(graph) {
+    const allNodes = {}, outgoingEdgeCount = {}, inverseEdges = {};
+    Object.keys(graph).forEach((fromNode) => {
+        allNodes[fromNode] = true;
+        outgoingEdgeCount[fromNode] = graph[fromNode].length;
+        graph[fromNode].forEach((toNode) => {
+            allNodes[toNode] = true;
+            outgoingEdgeCount[toNode] = outgoingEdgeCount[toNode] || 0;
+            inverseEdges[toNode] = inverseEdges[toNode] || [];
+            inverseEdges[toNode].push(fromNode);
+        });
+    });
+    // https://en.wikipedia.org/wiki/Topological_sorting
+    const S = [], L = [];
+    Object.keys(allNodes).forEach((node) => {
+        if (outgoingEdgeCount[node] === 0) {
+            delete outgoingEdgeCount[node];
+            S.push(node);
+        }
+    });
+    while (S.length > 0) {
+        // Ensure the exact same order all the time with the same inputs
+        S.sort();
+        const n = S.shift();
+        L.push(n);
+        const myInverseEdges = inverseEdges[n] || [];
+        myInverseEdges.forEach((m) => {
+            outgoingEdgeCount[m]--;
+            if (outgoingEdgeCount[m] === 0) {
+                delete outgoingEdgeCount[m];
+                S.push(m);
+            }
+        });
+    }
+    if (Object.keys(outgoingEdgeCount).length > 0) {
+        throw new Error('Cannot do topological sort on cyclic graph, remaining nodes: ' + Object.keys(outgoingEdgeCount));
+    }
+    return L;
+}
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
new file mode 100644
index 000000000..6fecf3f9a
--- /dev/null
+++ b/build/lib/compilation.js
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watchTask = exports.compileTask = void 0;
+const es = require("event-stream");
+const fs = require("fs");
+const gulp = require("gulp");
+const path = require("path");
+const monacodts = require("./monaco-api");
+const nls = require("./nls");
+const reporter_1 = require("./reporter");
+const util = require("./util");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const os = require("os");
+const watch = require('./watch');
+const reporter = reporter_1.createReporter();
+function getTypeScriptCompilerOptions(src) {
+    const rootDir = path.join(__dirname, `../../${src}`);
+    let options = {};
+    options.verbose = false;
+    options.sourceMap = true;
+    if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+        options.sourceMap = false;
+    }
+    options.rootDir = rootDir;
+    options.baseUrl = rootDir;
+    options.sourceRoot = util.toFileUri(rootDir);
+    options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 0 : 1;
+    return options;
+}
+function createCompile(src, build, emitError) {
+    const tsb = require('gulp-tsb');
+    const sourcemaps = require('gulp-sourcemaps');
+    const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
+    const overrideOptions = Object.assign(Object.assign({}, getTypeScriptCompilerOptions(src)), { inlineSources: Boolean(build) });
+    const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err));
+    function pipeline(token) {
+        const bom = require('gulp-bom');
+        const utf8Filter = util.filter(data => /(\/|\\)test(\/|\\).*utf8/.test(data.path));
+        const tsFilter = util.filter(data => /\.ts$/.test(data.path));
+        const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
+        const input = es.through();
+        const output = input
+            .pipe(utf8Filter)
+            .pipe(bom()) // this is required to preserve BOM in test files that loose it otherwise
+            .pipe(utf8Filter.restore)
+            .pipe(tsFilter)
+            .pipe(util.loadSourcemaps())
+            .pipe(compilation(token))
+            .pipe(noDeclarationsFilter)
+            .pipe(build ? nls.nls() : es.through())
+            .pipe(noDeclarationsFilter.restore)
+            .pipe(sourcemaps.write('.', {
+            addComment: false,
+            includeContent: !!build,
+            sourceRoot: overrideOptions.sourceRoot
+        }))
+            .pipe(tsFilter.restore)
+            .pipe(reporter.end(!!emitError));
+        return es.duplex(input, output);
+    }
+    pipeline.tsProjectSrc = () => {
+        return compilation.src({ base: src });
+    };
+    return pipeline;
+}
+function compileTask(src, out, build) {
+    return function () {
+        if (os.totalmem() < 4000000000) {
+            throw new Error('compilation requires 4GB of RAM');
+        }
+        const compile = createCompile(src, build, true);
+        const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
+        let generator = new MonacoGenerator(false);
+        if (src === 'src') {
+            generator.execute();
+        }
+        return srcPipe
+            .pipe(generator.stream)
+            .pipe(compile())
+            .pipe(gulp.dest(out));
+    };
+}
+exports.compileTask = compileTask;
+function watchTask(out, build) {
+    return function () {
+        const compile = createCompile('src', build);
+        const src = gulp.src('src/**', { base: 'src' });
+        const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
+        let generator = new MonacoGenerator(true);
+        generator.execute();
+        return watchSrc
+            .pipe(generator.stream)
+            .pipe(util.incremental(compile, src, true))
+            .pipe(gulp.dest(out));
+    };
+}
+exports.watchTask = watchTask;
+const REPO_SRC_FOLDER = path.join(__dirname, '../../src');
+class MonacoGenerator {
+    constructor(isWatch) {
+        this._executeSoonTimer = null;
+        this._isWatch = isWatch;
+        this.stream = es.through();
+        this._watchedFiles = {};
+        let onWillReadFile = (moduleId, filePath) => {
+            if (!this._isWatch) {
+                return;
+            }
+            if (this._watchedFiles[filePath]) {
+                return;
+            }
+            this._watchedFiles[filePath] = true;
+            fs.watchFile(filePath, () => {
+                this._declarationResolver.invalidateCache(moduleId);
+                this._executeSoon();
+            });
+        };
+        this._fsProvider = new class extends monacodts.FSProvider {
+            readFileSync(moduleId, filePath) {
+                onWillReadFile(moduleId, filePath);
+                return super.readFileSync(moduleId, filePath);
+            }
+        };
+        this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
+        if (this._isWatch) {
+            fs.watchFile(monacodts.RECIPE_PATH, () => {
+                this._executeSoon();
+            });
+        }
+    }
+    _executeSoon() {
+        if (this._executeSoonTimer !== null) {
+            clearTimeout(this._executeSoonTimer);
+            this._executeSoonTimer = null;
+        }
+        this._executeSoonTimer = setTimeout(() => {
+            this._executeSoonTimer = null;
+            this.execute();
+        }, 20);
+    }
+    _run() {
+        let r = monacodts.run3(this._declarationResolver);
+        if (!r && !this._isWatch) {
+            // The build must always be able to generate the monaco.d.ts
+            throw new Error(`monaco.d.ts generation error - Cannot continue`);
+        }
+        return r;
+    }
+    _log(message, ...rest) {
+        fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
+    }
+    execute() {
+        const startTime = Date.now();
+        const result = this._run();
+        if (!result) {
+            // nothing really changed
+            return;
+        }
+        if (result.isTheSame) {
+            return;
+        }
+        fs.writeFileSync(result.filePath, result.content);
+        fs.writeFileSync(path.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+        this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
+        if (!this._isWatch) {
+            this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
+        }
+    }
+}
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index 96e7d59ea..62fbea67b 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -8,9 +8,6 @@
 import * as es from 'event-stream';
 import * as fs from 'fs';
 import * as gulp from 'gulp';
-import * as bom from 'gulp-bom';
-import * as sourcemaps from 'gulp-sourcemaps';
-import * as tsb from 'gulp-tsb';
 import * as path from 'path';
 import * as monacodts from './monaco-api';
 import * as nls from './nls';
@@ -41,12 +38,17 @@ function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
 }
 
 function createCompile(src: string, build: boolean, emitError?: boolean) {
+	const tsb = require('gulp-tsb') as typeof import('gulp-tsb');
+	const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
+
+
 	const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
 	const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
 
 	const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err));
 
 	function pipeline(token?: util.ICancellationToken) {
+		const bom = require('gulp-bom') as typeof import('gulp-bom');
 
 		const utf8Filter = util.filter(data => /(\/|\\)test(\/|\\).*utf8/.test(data.path));
 		const tsFilter = util.filter(data => /\.ts$/.test(data.path));
@@ -61,7 +63,7 @@ function createCompile(src: string, build: boolean, emitError?: boolean) {
 			.pipe(util.loadSourcemaps())
 			.pipe(compilation(token))
 			.pipe(noDeclarationsFilter)
-			.pipe(build ? nls() : es.through())
+			.pipe(build ? nls.nls() : es.through())
 			.pipe(noDeclarationsFilter.restore)
 			.pipe(sourcemaps.write('.', {
 				addComment: false,
diff --git a/build/lib/dependencies.js b/build/lib/dependencies.js
new file mode 100644
index 000000000..b6a399267
--- /dev/null
+++ b/build/lib/dependencies.js
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProductionDependencies = void 0;
+const path = require("path");
+const cp = require("child_process");
+const _ = require("underscore");
+const parseSemver = require('parse-semver');
+function asYarnDependency(prefix, tree) {
+    let parseResult;
+    try {
+        parseResult = parseSemver(tree.name);
+    }
+    catch (err) {
+        err.message += `: ${tree.name}`;
+        console.warn(`Could not parse semver: ${tree.name}`);
+        return null;
+    }
+    // not an actual dependency in disk
+    if (parseResult.version !== parseResult.range) {
+        return null;
+    }
+    const name = parseResult.name;
+    const version = parseResult.version;
+    const dependencyPath = path.join(prefix, name);
+    const children = [];
+    for (const child of (tree.children || [])) {
+        const dep = asYarnDependency(path.join(prefix, name, 'node_modules'), child);
+        if (dep) {
+            children.push(dep);
+        }
+    }
+    return { name, version, path: dependencyPath, children };
+}
+function getYarnProductionDependencies(cwd) {
+    const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: Object.assign(Object.assign({}, process.env), { NODE_ENV: 'production' }), stdio: [null, null, 'inherit'] });
+    const match = /^{"type":"tree".*$/m.exec(raw);
+    if (!match || match.length !== 1) {
+        throw new Error('Could not parse result of `yarn list --json`');
+    }
+    const trees = JSON.parse(match[0]).data.trees;
+    return trees
+        .map(tree => asYarnDependency(path.join(cwd, 'node_modules'), tree))
+        .filter((dep) => !!dep);
+}
+function getProductionDependencies(cwd) {
+    const result = [];
+    const deps = getYarnProductionDependencies(cwd);
+    const flatten = (dep) => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
+    deps.forEach(flatten);
+    return _.uniq(result);
+}
+exports.getProductionDependencies = getProductionDependencies;
+if (require.main === module) {
+    const root = path.dirname(path.dirname(__dirname));
+    console.log(JSON.stringify(getProductionDependencies(root), null, '  '));
+}
diff --git a/build/dependencies.js b/build/lib/dependencies.ts
similarity index 64%
rename from build/dependencies.js
rename to build/lib/dependencies.ts
index 2adf7e29c..516da11be 100644
--- a/build/dependencies.js
+++ b/build/lib/dependencies.ts
@@ -5,12 +5,27 @@
 
 'use strict';
 
-const path = require('path');
+import * as path from 'path';
+import * as cp from 'child_process';
+import * as _ from 'underscore';
 const parseSemver = require('parse-semver');
-const cp = require('child_process');
-const _ = require('underscore');
 
-function asYarnDependency(prefix, tree) {
+interface Tree {
+	readonly name: string;
+	readonly children?: Tree[];
+}
+
+interface FlatDependency {
+	readonly name: string;
+	readonly version: string;
+	readonly path: string;
+}
+
+interface Dependency extends FlatDependency {
+	readonly children: Dependency[];
+}
+
+function asYarnDependency(prefix: string, tree: Tree): Dependency | null {
 	let parseResult;
 
 	try {
@@ -42,7 +57,7 @@ function asYarnDependency(prefix, tree) {
 	return { name, version, path: dependencyPath, children };
 }
 
-function getYarnProductionDependencies(cwd) {
+function getYarnProductionDependencies(cwd: string): Dependency[] {
 	const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
 	const match = /^{"type":"tree".*$/m.exec(raw);
 
@@ -50,25 +65,22 @@ function getYarnProductionDependencies(cwd) {
 		throw new Error('Could not parse result of `yarn list --json`');
 	}
 
-	const trees = JSON.parse(match[0]).data.trees;
+	const trees = JSON.parse(match[0]).data.trees as Tree[];
 
 	return trees
 		.map(tree => asYarnDependency(path.join(cwd, 'node_modules'), tree))
-		.filter(dep => !!dep);
+		.filter<Dependency>((dep): dep is Dependency => !!dep);
 }
 
-function getProductionDependencies(cwd) {
-	const result = [];
+export function getProductionDependencies(cwd: string): FlatDependency[] {
+	const result: FlatDependency[] = [];
 	const deps = getYarnProductionDependencies(cwd);
-	const flatten = dep => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
+	const flatten = (dep: Dependency) => { result.push({ name: dep.name, version: dep.version, path: dep.path }); dep.children.forEach(flatten); };
 	deps.forEach(flatten);
-
 	return _.uniq(result);
 }
 
-module.exports.getProductionDependencies = getProductionDependencies;
-
 if (require.main === module) {
-	const root = path.dirname(__dirname);
+	const root = path.dirname(path.dirname(__dirname));
 	console.log(JSON.stringify(getProductionDependencies(root), null, '  '));
 }
diff --git a/build/lib/electron.js b/build/lib/electron.js
new file mode 100644
index 000000000..42b7c2f81
--- /dev/null
+++ b/build/lib/electron.js
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const fs = require("fs");
+const path = require("path");
+const vfs = require("vinyl-fs");
+const filter = require("gulp-filter");
+const _ = require("underscore");
+const util = require("./util");
+const root = path.dirname(path.dirname(__dirname));
+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+const commit = util.getVersion(root);
+const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
+function darwinBundleDocumentType(extensions, icon) {
+    return {
+        name: product.nameLong + ' document',
+        role: 'Editor',
+        ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
+        extensions: extensions,
+        iconFile: icon
+    };
+}
+exports.config = {
+    version: util.getElectronVersion(),
+    productAppName: product.nameLong,
+    companyName: 'Microsoft Corporation',
+    copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+    darwinIcon: 'resources/darwin/code.icns',
+    darwinBundleIdentifier: product.darwinBundleIdentifier,
+    darwinApplicationCategoryType: 'public.app-category.developer-tools',
+    darwinHelpBookFolder: 'VS Code HelpBook',
+    darwinHelpBookName: 'VS Code HelpBook',
+    darwinBundleDocumentTypes: [
+        darwinBundleDocumentType(['bat', 'cmd'], 'resources/darwin/bat.icns'),
+        darwinBundleDocumentType(['bowerrc'], 'resources/darwin/bower.icns'),
+        darwinBundleDocumentType(['c', 'h'], 'resources/darwin/c.icns'),
+        darwinBundleDocumentType(['config', 'editorconfig', 'gitattributes', 'gitconfig', 'gitignore', 'ini'], 'resources/darwin/config.icns'),
+        darwinBundleDocumentType(['cc', 'cpp', 'cxx', 'c++', 'hh', 'hpp', 'hxx', 'h++'], 'resources/darwin/cpp.icns'),
+        darwinBundleDocumentType(['cs', 'csx'], 'resources/darwin/csharp.icns'),
+        darwinBundleDocumentType(['css'], 'resources/darwin/css.icns'),
+        darwinBundleDocumentType(['go'], 'resources/darwin/go.icns'),
+        darwinBundleDocumentType(['asp', 'aspx', 'cshtml', 'htm', 'html', 'jshtm', 'jsp', 'phtml', 'shtml'], 'resources/darwin/html.icns'),
+        darwinBundleDocumentType(['jade'], 'resources/darwin/jade.icns'),
+        darwinBundleDocumentType(['jav', 'java'], 'resources/darwin/java.icns'),
+        darwinBundleDocumentType(['js', 'jscsrc', 'jshintrc', 'mjs', 'cjs'], 'resources/darwin/javascript.icns'),
+        darwinBundleDocumentType(['json'], 'resources/darwin/json.icns'),
+        darwinBundleDocumentType(['less'], 'resources/darwin/less.icns'),
+        darwinBundleDocumentType(['markdown', 'md', 'mdoc', 'mdown', 'mdtext', 'mdtxt', 'mdwn', 'mkd', 'mkdn'], 'resources/darwin/markdown.icns'),
+        darwinBundleDocumentType(['php'], 'resources/darwin/php.icns'),
+        darwinBundleDocumentType(['ps1', 'psd1', 'psm1'], 'resources/darwin/powershell.icns'),
+        darwinBundleDocumentType(['py'], 'resources/darwin/python.icns'),
+        darwinBundleDocumentType(['gemspec', 'rb'], 'resources/darwin/ruby.icns'),
+        darwinBundleDocumentType(['scss'], 'resources/darwin/sass.icns'),
+        darwinBundleDocumentType(['bash', 'bash_login', 'bash_logout', 'bash_profile', 'bashrc', 'profile', 'rhistory', 'rprofile', 'sh', 'zlogin', 'zlogout', 'zprofile', 'zsh', 'zshenv', 'zshrc'], 'resources/darwin/shell.icns'),
+        darwinBundleDocumentType(['sql'], 'resources/darwin/sql.icns'),
+        darwinBundleDocumentType(['ts'], 'resources/darwin/typescript.icns'),
+        darwinBundleDocumentType(['tsx', 'jsx'], 'resources/darwin/react.icns'),
+        darwinBundleDocumentType(['vue'], 'resources/darwin/vue.icns'),
+        darwinBundleDocumentType(['ascx', 'csproj', 'dtd', 'wxi', 'wxl', 'wxs', 'xml', 'xaml'], 'resources/darwin/xml.icns'),
+        darwinBundleDocumentType(['eyaml', 'eyml', 'yaml', 'yml'], 'resources/darwin/yaml.icns'),
+        darwinBundleDocumentType(['clj', 'cljs', 'cljx', 'clojure', 'code-workspace', 'coffee', 'containerfile', 'ctp', 'dockerfile', 'dot', 'edn', 'fs', 'fsi', 'fsscript', 'fsx', 'handlebars', 'hbs', 'lua', 'm', 'makefile', 'ml', 'mli', 'pl', 'pl6', 'pm', 'pm6', 'pod', 'pp', 'properties', 'psgi', 'pug', 'r', 'rs', 'rt', 'svg', 'svgz', 't', 'txt', 'vb', 'xcodeproj', 'xcworkspace'], 'resources/darwin/default.icns')
+    ],
+    darwinBundleURLTypes: [{
+            role: 'Viewer',
+            name: product.nameLong,
+            urlSchemes: [product.urlProtocol]
+        }],
+    darwinForceDarkModeSupport: true,
+    darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
+    linuxExecutableName: product.applicationName,
+    winIcon: 'resources/win32/code.ico',
+    token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
+    repo: product.electronRepository || undefined
+};
+function getElectron(arch) {
+    return () => {
+        const electron = require('gulp-atom-electron');
+        const json = require('gulp-json-editor');
+        const electronOpts = _.extend({}, exports.config, {
+            platform: process.platform,
+            arch: arch === 'armhf' ? 'arm' : arch,
+            ffmpegChromium: true,
+            keepDefaultApp: true
+        });
+        return vfs.src('package.json')
+            .pipe(json({ name: product.nameShort }))
+            .pipe(electron(electronOpts))
+            .pipe(filter(['**', '!**/app/package.json']))
+            .pipe(vfs.dest('.build/electron'));
+    };
+}
+async function main(arch = process.arch) {
+    const version = util.getElectronVersion();
+    const electronPath = path.join(root, '.build', 'electron');
+    const versionFile = path.join(electronPath, 'version');
+    const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
+    if (!isUpToDate) {
+        await util.rimraf(electronPath)();
+        await util.streamToPromise(getElectron(arch)());
+    }
+}
+if (require.main === module) {
+    main(process.argv[2]).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index c76fcf3f5..beb1b571f 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -9,12 +9,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as vfs from 'vinyl-fs';
 import * as filter from 'gulp-filter';
-import * as json from 'gulp-json-editor';
 import * as _ from 'underscore';
 import * as util from './util';
 
-const electron = require('gulp-atom-electron');
-
 const root = path.dirname(path.dirname(__dirname));
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
 const commit = util.getVersion(root);
@@ -86,6 +83,9 @@ export const config = {
 
 function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	return () => {
+		const electron = require('gulp-atom-electron');
+		const json = require('gulp-json-editor') as typeof import('gulp-json-editor');
+
 		const electronOpts = _.extend({}, config, {
 			platform: process.platform,
 			arch: arch === 'armhf' ? 'arm' : arch,
diff --git a/build/lib/eslint/code-import-patterns.js b/build/lib/eslint/code-import-patterns.js
new file mode 100644
index 000000000..0d508d1d0
--- /dev/null
+++ b/build/lib/eslint/code-import-patterns.js
@@ -0,0 +1,59 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const minimatch = require("minimatch");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const configs = context.options;
+        for (const config of configs) {
+            if (minimatch(context.getFilename(), config.target)) {
+                return utils_1.createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
+            }
+        }
+        return {};
+    }
+    _checkImport(context, config, node, path) {
+        // resolve relative paths
+        if (path[0] === '.') {
+            path = path_1.join(context.getFilename(), path);
+        }
+        let restrictions;
+        if (typeof config.restrictions === 'string') {
+            restrictions = [config.restrictions];
+        }
+        else {
+            restrictions = config.restrictions;
+        }
+        let matched = false;
+        for (const pattern of restrictions) {
+            if (minimatch(path, pattern)) {
+                matched = true;
+                break;
+            }
+        }
+        if (!matched) {
+            // None of the restrictions matched
+            context.report({
+                loc: node.loc,
+                messageId: 'badImport',
+                data: {
+                    restrictions: restrictions.join(' or ')
+                }
+            });
+        }
+    }
+};
diff --git a/build/lib/eslint/code-layering.js b/build/lib/eslint/code-layering.js
new file mode 100644
index 000000000..db591f789
--- /dev/null
+++ b/build/lib/eslint/code-layering.js
@@ -0,0 +1,68 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const fileDirname = path_1.dirname(context.getFilename());
+        const parts = fileDirname.split(/\\|\//);
+        const ruleArgs = context.options[0];
+        let config;
+        for (let i = parts.length - 1; i >= 0; i--) {
+            if (ruleArgs[parts[i]]) {
+                config = {
+                    allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
+                    disallowed: new Set()
+                };
+                Object.keys(ruleArgs).forEach(key => {
+                    if (!config.allowed.has(key)) {
+                        config.disallowed.add(key);
+                    }
+                });
+                break;
+            }
+        }
+        if (!config) {
+            // nothing
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            if (path[0] === '.') {
+                path = path_1.join(path_1.dirname(context.getFilename()), path);
+            }
+            const parts = path_1.dirname(path).split(/\\|\//);
+            for (let i = parts.length - 1; i >= 0; i--) {
+                const part = parts[i];
+                if (config.allowed.has(part)) {
+                    // GOOD - same layer
+                    break;
+                }
+                if (config.disallowed.has(part)) {
+                    // BAD - wrong layer
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'layerbreaker',
+                        data: {
+                            from: part,
+                            allowed: [...config.allowed.keys()].join(', ')
+                        }
+                    });
+                    break;
+                }
+            }
+        });
+    }
+};
diff --git a/build/lib/eslint/code-no-nls-in-standalone-editor.js b/build/lib/eslint/code-no-nls-in-standalone-editor.js
new file mode 100644
index 000000000..d8955507b
--- /dev/null
+++ b/build/lib/eslint/code-no-nls-in-standalone-editor.js
@@ -0,0 +1,38 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
+            }
+        };
+    }
+    create(context) {
+        const fileName = context.getFilename();
+        if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)) {
+            return utils_1.createImportRuleListener((node, path) => {
+                // resolve relative paths
+                if (path[0] === '.') {
+                    path = path_1.join(context.getFilename(), path);
+                }
+                if (/vs(\/|\\)nls/.test(path)) {
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'noNls'
+                    });
+                }
+            });
+        }
+        return {};
+    }
+};
diff --git a/build/lib/eslint/code-no-standalone-editor.js b/build/lib/eslint/code-no-standalone-editor.js
new file mode 100644
index 000000000..d9d6bb55b
--- /dev/null
+++ b/build/lib/eslint/code-no-standalone-editor.js
@@ -0,0 +1,41 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Not allowed to import standalone editor modules.'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        if (/vs(\/|\\)editor/.test(context.getFilename())) {
+            // the vs/editor folder is allowed to use the standalone editor
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            // resolve relative paths
+            if (path[0] === '.') {
+                path = path_1.join(context.getFilename(), path);
+            }
+            if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'badImport'
+                });
+            }
+        });
+    }
+};
diff --git a/build/lib/eslint/code-no-unexternalized-strings.js b/build/lib/eslint/code-no-unexternalized-strings.js
new file mode 100644
index 000000000..b603f4d8e
--- /dev/null
+++ b/build/lib/eslint/code-no-unexternalized-strings.js
@@ -0,0 +1,111 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+function isStringLiteral(node) {
+    return !!node && node.type === experimental_utils_1.AST_NODE_TYPES.Literal && typeof node.value === 'string';
+}
+function isDoubleQuoted(node) {
+    return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"';
+}
+module.exports = new (_a = class NoUnexternalizedStrings {
+        constructor() {
+            this.meta = {
+                messages: {
+                    doubleQuoted: 'Only use double-quoted strings for externalized strings.',
+                    badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
+                    duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
+                    badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
+                }
+            };
+        }
+        create(context) {
+            const externalizedStringLiterals = new Map();
+            const doubleQuotedStringLiterals = new Set();
+            function collectDoubleQuotedStrings(node) {
+                if (isStringLiteral(node) && isDoubleQuoted(node)) {
+                    doubleQuotedStringLiterals.add(node);
+                }
+            }
+            function visitLocalizeCall(node) {
+                // localize(key, message)
+                const [keyNode, messageNode] = node.arguments;
+                // (1)
+                // extract key so that it can be checked later
+                let key;
+                if (isStringLiteral(keyNode)) {
+                    doubleQuotedStringLiterals.delete(keyNode);
+                    key = keyNode.value;
+                }
+                else if (keyNode.type === experimental_utils_1.AST_NODE_TYPES.ObjectExpression) {
+                    for (let property of keyNode.properties) {
+                        if (property.type === experimental_utils_1.AST_NODE_TYPES.Property && !property.computed) {
+                            if (property.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier && property.key.name === 'key') {
+                                if (isStringLiteral(property.value)) {
+                                    doubleQuotedStringLiterals.delete(property.value);
+                                    key = property.value.value;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (typeof key === 'string') {
+                    let array = externalizedStringLiterals.get(key);
+                    if (!array) {
+                        array = [];
+                        externalizedStringLiterals.set(key, array);
+                    }
+                    array.push({ call: node, message: messageNode });
+                }
+                // (2)
+                // remove message-argument from doubleQuoted list and make
+                // sure it is a string-literal
+                doubleQuotedStringLiterals.delete(messageNode);
+                if (!isStringLiteral(messageNode)) {
+                    context.report({
+                        loc: messageNode.loc,
+                        messageId: 'badMessage',
+                        data: { message: context.getSourceCode().getText(node) }
+                    });
+                }
+            }
+            function reportBadStringsAndBadKeys() {
+                // (1)
+                // report all strings that are in double quotes
+                for (const node of doubleQuotedStringLiterals) {
+                    context.report({ loc: node.loc, messageId: 'doubleQuoted' });
+                }
+                for (const [key, values] of externalizedStringLiterals) {
+                    // (2)
+                    // report all invalid NLS keys
+                    if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
+                        for (let value of values) {
+                            context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
+                        }
+                    }
+                    // (2)
+                    // report all invalid duplicates (same key, different message)
+                    if (values.length > 1) {
+                        for (let i = 1; i < values.length; i++) {
+                            if (context.getSourceCode().getText(values[i - 1].message) !== context.getSourceCode().getText(values[i].message)) {
+                                context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } });
+                            }
+                        }
+                    }
+                }
+            }
+            return {
+                ['Literal']: (node) => collectDoubleQuotedStrings(node),
+                ['ExpressionStatement[directive] Literal:exit']: (node) => doubleQuotedStringLiterals.delete(node),
+                ['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node) => visitLocalizeCall(node),
+                ['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node) => visitLocalizeCall(node),
+                ['Program:exit']: reportBadStringsAndBadKeys,
+            };
+        }
+    },
+    _a._rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/,
+    _a);
diff --git a/build/lib/eslint/code-no-unused-expressions.js b/build/lib/eslint/code-no-unused-expressions.js
new file mode 100644
index 000000000..d8ee6ca46
--- /dev/null
+++ b/build/lib/eslint/code-no-unused-expressions.js
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// FORKED FROM https://github.com/eslint/eslint/blob/b23ad0d789a909baf8d7c41a35bc53df932eaf30/lib/rules/no-unused-expressions.js
+// and added support for `OptionalCallExpression`, see https://github.com/facebook/create-react-app/issues/8107 and https://github.com/eslint/eslint/issues/12642
+/**
+ * @fileoverview Flag expressions in statement position that do not side effect
+ * @author Michael Ficarra
+ */
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+module.exports = {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'disallow unused expressions',
+            category: 'Best Practices',
+            recommended: false,
+            url: 'https://eslint.org/docs/rules/no-unused-expressions'
+        },
+        schema: [
+            {
+                type: 'object',
+                properties: {
+                    allowShortCircuit: {
+                        type: 'boolean',
+                        default: false
+                    },
+                    allowTernary: {
+                        type: 'boolean',
+                        default: false
+                    },
+                    allowTaggedTemplates: {
+                        type: 'boolean',
+                        default: false
+                    }
+                },
+                additionalProperties: false
+            }
+        ]
+    },
+    create(context) {
+        const config = context.options[0] || {}, allowShortCircuit = config.allowShortCircuit || false, allowTernary = config.allowTernary || false, allowTaggedTemplates = config.allowTaggedTemplates || false;
+        // eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param node any node
+         * @returns whether the given node structurally represents a directive
+         */
+        function looksLikeDirective(node) {
+            return node.type === 'ExpressionStatement' &&
+                node.expression.type === 'Literal' && typeof node.expression.value === 'string';
+        }
+        // eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param predicate ([a] -> Boolean) the function used to make the determination
+         * @param list the input list
+         * @returns the leading sequence of members in the given list that pass the given predicate
+         */
+        function takeWhile(predicate, list) {
+            for (let i = 0; i < list.length; ++i) {
+                if (!predicate(list[i])) {
+                    return list.slice(0, i);
+                }
+            }
+            return list.slice();
+        }
+        // eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param node a Program or BlockStatement node
+         * @returns the leading sequence of directive nodes in the given node's body
+         */
+        function directives(node) {
+            return takeWhile(looksLikeDirective, node.body);
+        }
+        // eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param node any node
+         * @param ancestors the given node's ancestors
+         * @returns whether the given node is considered a directive in its current position
+         */
+        function isDirective(node, ancestors) {
+            const parent = ancestors[ancestors.length - 1], grandparent = ancestors[ancestors.length - 2];
+            return (parent.type === 'Program' || parent.type === 'BlockStatement' &&
+                (/Function/u.test(grandparent.type))) &&
+                directives(parent).indexOf(node) >= 0;
+        }
+        /**
+         * Determines whether or not a given node is a valid expression. Recurses on short circuit eval and ternary nodes if enabled by flags.
+         * @param node any node
+         * @returns whether the given node is a valid expression
+         */
+        function isValidExpression(node) {
+            if (allowTernary) {
+                // Recursive check for ternary and logical expressions
+                if (node.type === 'ConditionalExpression') {
+                    return isValidExpression(node.consequent) && isValidExpression(node.alternate);
+                }
+            }
+            if (allowShortCircuit) {
+                if (node.type === 'LogicalExpression') {
+                    return isValidExpression(node.right);
+                }
+            }
+            if (allowTaggedTemplates && node.type === 'TaggedTemplateExpression') {
+                return true;
+            }
+            return /^(?:Assignment|OptionalCall|Call|New|Update|Yield|Await)Expression$/u.test(node.type) ||
+                (node.type === 'UnaryExpression' && ['delete', 'void'].indexOf(node.operator) >= 0);
+        }
+        return {
+            ExpressionStatement(node) {
+                if (!isValidExpression(node.expression) && !isDirective(node, context.getAncestors())) {
+                    context.report({ node: node, message: 'Expected an assignment or function call and instead saw an expression.' });
+                }
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/code-translation-remind.js b/build/lib/eslint/code-translation-remind.js
new file mode 100644
index 000000000..a276e7c00
--- /dev/null
+++ b/build/lib/eslint/code-translation-remind.js
@@ -0,0 +1,57 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const fs_1 = require("fs");
+const utils_1 = require("./utils");
+module.exports = new (_a = class TranslationRemind {
+        constructor() {
+            this.meta = {
+                messages: {
+                    missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.'
+                }
+            };
+        }
+        create(context) {
+            return utils_1.createImportRuleListener((node, path) => this._checkImport(context, node, path));
+        }
+        _checkImport(context, node, path) {
+            if (path !== TranslationRemind.NLS_MODULE) {
+                return;
+            }
+            const currentFile = context.getFilename();
+            const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
+            const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
+            if (!matchService && !matchPart) {
+                return;
+            }
+            const resource = matchService ? matchService[0] : matchPart[0];
+            let resourceDefined = false;
+            let json;
+            try {
+                json = fs_1.readFileSync('./build/lib/i18n.resources.json', 'utf8');
+            }
+            catch (e) {
+                console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
+                return;
+            }
+            const workbenchResources = JSON.parse(json).workbench;
+            workbenchResources.forEach((existingResource) => {
+                if (existingResource.name === resource) {
+                    resourceDefined = true;
+                    return;
+                }
+            });
+            if (!resourceDefined) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'missing',
+                    data: { resource }
+                });
+            }
+        }
+    },
+    _a.NLS_MODULE = 'vs/nls',
+    _a);
diff --git a/build/lib/eslint/utils.js b/build/lib/eslint/utils.js
new file mode 100644
index 000000000..c58e4e24b
--- /dev/null
+++ b/build/lib/eslint/utils.js
@@ -0,0 +1,37 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createImportRuleListener = void 0;
+function createImportRuleListener(validateImport) {
+    function _checkImport(node) {
+        if (node && node.type === 'Literal' && typeof node.value === 'string') {
+            validateImport(node, node.value);
+        }
+    }
+    return {
+        // import ??? from 'module'
+        ImportDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+        // import('module').then(...) OR await import('module')
+        ['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node) => {
+            _checkImport(node);
+        },
+        // import foo = ...
+        ['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node) => {
+            _checkImport(node);
+        },
+        // export ?? from 'module'
+        ExportAllDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+        // export {foo} from 'module'
+        ExportNamedDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+    };
+}
+exports.createImportRuleListener = createImportRuleListener;
diff --git a/build/lib/eslint/vscode-dts-cancellation.js b/build/lib/eslint/vscode-dts-cancellation.js
new file mode 100644
index 000000000..d016f0d2e
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-cancellation.js
@@ -0,0 +1,33 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new class ApiProviderNaming {
+    constructor() {
+        this.meta = {
+            messages: {
+                noToken: 'Function lacks a cancellation token, preferable as last argument',
+            }
+        };
+    }
+    create(context) {
+        return {
+            ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node) => {
+                let found = false;
+                for (let param of node.params) {
+                    if (param.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        found = found || param.name === 'token';
+                    }
+                }
+                if (!found) {
+                    context.report({
+                        node,
+                        messageId: 'noToken'
+                    });
+                }
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/vscode-dts-cancellation.ts b/build/lib/eslint/vscode-dts-cancellation.ts
new file mode 100644
index 000000000..66f184214
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-cancellation.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noToken: 'Function lacks a cancellation token, preferable as last argument',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node: any) => {
+
+				let found = false;
+				for (let param of (<TSESTree.TSMethodSignature>node).params) {
+					if (param.type === AST_NODE_TYPES.Identifier) {
+						found = found || param.name === 'token';
+					}
+				}
+
+				if (!found) {
+					context.report({
+						node,
+						messageId: 'noToken'
+					});
+				}
+			}
+		};
+	}
+};
diff --git a/build/lib/eslint/vscode-dts-create-func.js b/build/lib/eslint/vscode-dts-create-func.js
new file mode 100644
index 000000000..5a27bf51c
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-create-func.js
@@ -0,0 +1,35 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+            messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSDeclareFunction Identifier[name=/create.*/]']: (node) => {
+                var _a;
+                const decl = node.parent;
+                if (((_a = decl.returnType) === null || _a === void 0 ? void 0 : _a.typeAnnotation.type) !== experimental_utils_1.AST_NODE_TYPES.TSTypeReference) {
+                    return;
+                }
+                if (decl.returnType.typeAnnotation.typeName.type !== experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                    return;
+                }
+                const ident = decl.returnType.typeAnnotation.typeName.name;
+                if (ident === 'Promise' || ident === 'Thenable') {
+                    context.report({
+                        node,
+                        messageId: 'sync'
+                    });
+                }
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/vscode-dts-event-naming.js b/build/lib/eslint/vscode-dts-event-naming.js
new file mode 100644
index 000000000..388ccf2f8
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-event-naming.js
@@ -0,0 +1,87 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new (_a = class ApiEventNaming {
+        constructor() {
+            this.meta = {
+                docs: {
+                    url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+                },
+                messages: {
+                    naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+                    verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+                    subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+                    unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+                }
+            };
+        }
+        create(context) {
+            const config = context.options[0];
+            const allowed = new Set(config.allowed);
+            const verbs = new Set(config.verbs);
+            return {
+                ['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node) => {
+                    var _a, _b;
+                    const def = (_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent;
+                    const ident = this.getIdent(def);
+                    if (!ident) {
+                        // event on unknown structure...
+                        return context.report({
+                            node,
+                            message: 'unknown'
+                        });
+                    }
+                    if (allowed.has(ident.name)) {
+                        // configured exception
+                        return;
+                    }
+                    const match = ApiEventNaming._nameRegExp.exec(ident.name);
+                    if (!match) {
+                        context.report({
+                            node: ident,
+                            messageId: 'naming'
+                        });
+                        return;
+                    }
+                    // check that <verb> is spelled out (configured) as verb
+                    if (!verbs.has(match[2].toLowerCase())) {
+                        context.report({
+                            node: ident,
+                            messageId: 'verb',
+                            data: { verb: match[2] }
+                        });
+                    }
+                    // check that a subject (if present) has occurred
+                    if (match[3]) {
+                        const regex = new RegExp(match[3], 'ig');
+                        const parts = context.getSourceCode().getText().split(regex);
+                        if (parts.length < 3) {
+                            context.report({
+                                node: ident,
+                                messageId: 'subject',
+                                data: { subject: match[3] }
+                            });
+                        }
+                    }
+                }
+            };
+        }
+        getIdent(def) {
+            if (!def) {
+                return;
+            }
+            if (def.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                return def;
+            }
+            else if ((def.type === experimental_utils_1.AST_NODE_TYPES.TSPropertySignature || def.type === experimental_utils_1.AST_NODE_TYPES.ClassProperty) && def.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                return def.key;
+            }
+            return this.getIdent(def.parent);
+        }
+    },
+    _a._nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/,
+    _a);
diff --git a/build/lib/eslint/vscode-dts-interface-naming.js b/build/lib/eslint/vscode-dts-interface-naming.js
new file mode 100644
index 000000000..70ca81082
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-interface-naming.js
@@ -0,0 +1,30 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+module.exports = new (_a = class ApiInterfaceNaming {
+        constructor() {
+            this.meta = {
+                messages: {
+                    naming: 'Interfaces must not be prefixed with uppercase `I`',
+                }
+            };
+        }
+        create(context) {
+            return {
+                ['TSInterfaceDeclaration Identifier']: (node) => {
+                    const name = node.name;
+                    if (ApiInterfaceNaming._nameRegExp.test(name)) {
+                        context.report({
+                            node,
+                            messageId: 'naming'
+                        });
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /I[A-Z]/,
+    _a);
diff --git a/build/lib/eslint/vscode-dts-literal-or-types.js b/build/lib/eslint/vscode-dts-literal-or-types.js
new file mode 100644
index 000000000..e07dfc6de
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-literal-or-types.js
@@ -0,0 +1,27 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+            messages: { useEnum: 'Use enums, not literal-or-types', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                var _a;
+                if (((_a = node.literal) === null || _a === void 0 ? void 0 : _a.type) === 'TSNullKeyword') {
+                    return;
+                }
+                context.report({
+                    node: node,
+                    messageId: 'useEnum'
+                });
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/vscode-dts-provider-naming.js b/build/lib/eslint/vscode-dts-provider-naming.js
new file mode 100644
index 000000000..924c26ecb
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-provider-naming.js
@@ -0,0 +1,38 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+module.exports = new (_a = class ApiProviderNaming {
+        constructor() {
+            this.meta = {
+                messages: {
+                    naming: 'A provider should only have functions like provideXYZ or resolveXYZ',
+                }
+            };
+        }
+        create(context) {
+            const config = context.options[0];
+            const allowed = new Set(config.allowed);
+            return {
+                ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node) => {
+                    var _a;
+                    const interfaceName = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent).id.name;
+                    if (allowed.has(interfaceName)) {
+                        // allowed
+                        return;
+                    }
+                    const methodName = node.key.name;
+                    if (!ApiProviderNaming._providerFunctionNames.test(methodName)) {
+                        context.report({
+                            node,
+                            messageId: 'naming'
+                        });
+                    }
+                }
+            };
+        }
+    },
+    _a._providerFunctionNames = /^(provide|resolve|prepare).+/,
+    _a);
diff --git a/build/lib/eslint/vscode-dts-provider-naming.ts b/build/lib/eslint/vscode-dts-provider-naming.ts
new file mode 100644
index 000000000..284f12342
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-provider-naming.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			naming: 'A provider should only have functions like provideXYZ or resolveXYZ',
+		}
+	};
+
+	private static _providerFunctionNames = /^(provide|resolve|prepare).+/;
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const config = <{ allowed: string[] }>context.options[0];
+		const allowed = new Set(config.allowed);
+
+		return {
+			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node: any) => {
+
+
+				const interfaceName = (<TSESTree.TSInterfaceDeclaration>(<TSESTree.Identifier>node).parent?.parent).id.name;
+				if (allowed.has(interfaceName)) {
+					// allowed
+					return;
+				}
+
+				const methodName = (<any>(<TSESTree.TSMethodSignatureNonComputedName>node).key).name;
+
+				if (!ApiProviderNaming._providerFunctionNames.test(methodName)) {
+					context.report({
+						node,
+						messageId: 'naming'
+					});
+				}
+			}
+		};
+	}
+};
diff --git a/build/lib/eslint/vscode-dts-region-comments.js b/build/lib/eslint/vscode-dts-region-comments.js
new file mode 100644
index 000000000..7d37a20fb
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-region-comments.js
@@ -0,0 +1,35 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiEventNaming {
+    constructor() {
+        this.meta = {
+            messages: {
+                comment: 'region comments should start with the GH issue link, e.g #region https://github.com/microsoft/vscode/issues/<number>',
+            }
+        };
+    }
+    create(context) {
+        const sourceCode = context.getSourceCode();
+        return {
+            ['Program']: (_node) => {
+                for (let comment of sourceCode.getAllComments()) {
+                    if (comment.type !== 'Line') {
+                        continue;
+                    }
+                    if (!comment.value.match(/^\s*#region /)) {
+                        continue;
+                    }
+                    if (!comment.value.match(/https:\/\/github.com\/microsoft\/vscode\/issues\/\d+/i)) {
+                        context.report({
+                            node: comment,
+                            messageId: 'comment',
+                        });
+                    }
+                }
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/vscode-dts-region-comments.ts b/build/lib/eslint/vscode-dts-region-comments.ts
new file mode 100644
index 000000000..175fb9040
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-region-comments.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			comment: 'region comments should start with the GH issue link, e.g #region https://github.com/microsoft/vscode/issues/<number>',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const sourceCode = context.getSourceCode();
+
+
+		return {
+			['Program']: (_node: any) => {
+
+				for (let comment of sourceCode.getAllComments()) {
+					if (comment.type !== 'Line') {
+						continue;
+					}
+					if (!comment.value.match(/^\s*#region /)) {
+						continue;
+					}
+					if (!comment.value.match(/https:\/\/github.com\/microsoft\/vscode\/issues\/\d+/i)) {
+						context.report({
+							node: <any>comment,
+							messageId: 'comment',
+						});
+					}
+				}
+			}
+		};
+	}
+};
diff --git a/build/lib/eslint/vscode-dts-use-thenable.js b/build/lib/eslint/vscode-dts-use-thenable.js
new file mode 100644
index 000000000..7e23953cb
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-use-thenable.js
@@ -0,0 +1,24 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiEventNaming {
+    constructor() {
+        this.meta = {
+            messages: {
+                usage: 'Use the Thenable-type instead of the Promise type',
+            }
+        };
+    }
+    create(context) {
+        return {
+            ['TSTypeAnnotation TSTypeReference Identifier[name="Promise"]']: (node) => {
+                context.report({
+                    node,
+                    messageId: 'usage',
+                });
+            }
+        };
+    }
+};
diff --git a/build/lib/eslint/vscode-dts-use-thenable.ts b/build/lib/eslint/vscode-dts-use-thenable.ts
new file mode 100644
index 000000000..511124820
--- /dev/null
+++ b/build/lib/eslint/vscode-dts-use-thenable.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			usage: 'Use the Thenable-type instead of the Promise type',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+
+
+		return {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Promise"]']: (node: any) => {
+
+				context.report({
+					node,
+					messageId: 'usage',
+				});
+			}
+		};
+	}
+};
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
new file mode 100644
index 000000000..b25c3713e
--- /dev/null
+++ b/build/lib/extensions.js
@@ -0,0 +1,330 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.translatePackageJSON = exports.scanBuiltinExtensions = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
+const es = require("event-stream");
+const fs = require("fs");
+const glob = require("glob");
+const gulp = require("gulp");
+const path = require("path");
+const File = require("vinyl");
+const stats_1 = require("./stats");
+const util2 = require("./util");
+const vzip = require('gulp-vinyl-zip');
+const filter = require("gulp-filter");
+const rename = require("gulp-rename");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const buffer = require('gulp-buffer');
+const jsoncParser = require("jsonc-parser");
+const util = require('./util');
+const root = path.dirname(path.dirname(__dirname));
+const commit = util.getVersion(root);
+const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
+function minifyExtensionResources(input) {
+    const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true });
+    return input
+        .pipe(jsonFilter)
+        .pipe(buffer())
+        .pipe(es.mapSync((f) => {
+        const errors = [];
+        const value = jsoncParser.parse(f.contents.toString('utf8'), errors);
+        if (errors.length === 0) {
+            // file parsed OK => just stringify to drop whitespace and comments
+            f.contents = Buffer.from(JSON.stringify(value));
+        }
+        return f;
+    }))
+        .pipe(jsonFilter.restore);
+}
+function updateExtensionPackageJSON(input, update) {
+    const packageJsonFilter = filter('extensions/*/package.json', { restore: true });
+    return input
+        .pipe(packageJsonFilter)
+        .pipe(buffer())
+        .pipe(es.mapSync((f) => {
+        const data = JSON.parse(f.contents.toString('utf8'));
+        f.contents = Buffer.from(JSON.stringify(update(data)));
+        return f;
+    }))
+        .pipe(packageJsonFilter.restore);
+}
+function fromLocal(extensionPath, forWeb) {
+    const webpackConfigFileName = forWeb ? 'extension-browser.webpack.config.js' : 'extension.webpack.config.js';
+    const isWebPacked = fs.existsSync(path.join(extensionPath, webpackConfigFileName));
+    let input = isWebPacked
+        ? fromLocalWebpack(extensionPath, webpackConfigFileName)
+        : fromLocalNormal(extensionPath);
+    if (isWebPacked) {
+        input = updateExtensionPackageJSON(input, (data) => {
+            delete data.scripts;
+            delete data.dependencies;
+            delete data.devDependencies;
+            if (data.main) {
+                data.main = data.main.replace('/out/', /dist/);
+            }
+            return data;
+        });
+    }
+    return input;
+}
+function fromLocalWebpack(extensionPath, webpackConfigFileName) {
+    const result = es.through();
+    const packagedDependencies = [];
+    const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
+    if (packageJsonConfig.dependencies) {
+        const webpackRootConfig = require(path.join(extensionPath, webpackConfigFileName));
+        for (const key in webpackRootConfig.externals) {
+            if (key in packageJsonConfig.dependencies) {
+                packagedDependencies.push(key);
+            }
+        }
+    }
+    const vsce = require('vsce');
+    const webpack = require('webpack');
+    const webpackGulp = require('webpack-stream');
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+        const files = fileNames
+            .map(fileName => path.join(extensionPath, fileName))
+            .map(filePath => new File({
+            path: filePath,
+            stat: fs.statSync(filePath),
+            base: extensionPath,
+            contents: fs.createReadStream(filePath)
+        }));
+        // check for a webpack configuration files, then invoke webpack
+        // and merge its output with the files stream.
+        const webpackConfigLocations = glob.sync(path.join(extensionPath, '**', webpackConfigFileName), { ignore: ['**/node_modules'] });
+        const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
+            const webpackDone = (err, stats) => {
+                fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+                if (err) {
+                    result.emit('error', err);
+                }
+                const { compilation } = stats;
+                if (compilation.errors.length > 0) {
+                    result.emit('error', compilation.errors.join('\n'));
+                }
+                if (compilation.warnings.length > 0) {
+                    result.emit('error', compilation.warnings.join('\n'));
+                }
+            };
+            const webpackConfig = Object.assign(Object.assign({}, require(webpackConfigPath)), { mode: 'production' });
+            const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
+            return webpackGulp(webpackConfig, webpack, webpackDone)
+                .pipe(es.through(function (data) {
+                data.stat = data.stat || {};
+                data.base = extensionPath;
+                this.emit('data', data);
+            }))
+                .pipe(es.through(function (data) {
+                // source map handling:
+                // * rewrite sourceMappingURL
+                // * save to disk so that upload-task picks this up
+                const contents = data.contents.toString('utf8');
+                data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+                    return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+                }), 'utf8');
+                this.emit('data', data);
+            }));
+        });
+        es.merge(...webpackStreams, es.readArray(files))
+            // .pipe(es.through(function (data) {
+            // 	// debug
+            // 	console.log('out', data.path, data.contents.length);
+            // 	this.emit('data', data);
+            // }))
+            .pipe(result);
+    }).catch(err => {
+        console.error(extensionPath);
+        console.error(packagedDependencies);
+        result.emit('error', err);
+    });
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
+}
+function fromLocalNormal(extensionPath) {
+    const result = es.through();
+    const vsce = require('vsce');
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
+        .then(fileNames => {
+        const files = fileNames
+            .map(fileName => path.join(extensionPath, fileName))
+            .map(filePath => new File({
+            path: filePath,
+            stat: fs.statSync(filePath),
+            base: extensionPath,
+            contents: fs.createReadStream(filePath)
+        }));
+        es.readArray(files).pipe(result);
+    })
+        .catch(err => result.emit('error', err));
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
+}
+const baseHeaders = {
+    'X-Market-Client-Id': 'VSCode Build',
+    'User-Agent': 'VSCode Build',
+    'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
+};
+function fromMarketplace(extensionName, version, metadata) {
+    const remote = require('gulp-remote-retry-src');
+    const json = require('gulp-json-editor');
+    const [publisher, name] = extensionName.split('.');
+    const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
+    fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...');
+    const options = {
+        base: url,
+        requestOptions: {
+            gzip: true,
+            headers: baseHeaders
+        }
+    };
+    const packageJsonFilter = filter('package.json', { restore: true });
+    return remote('', options)
+        .pipe(vzip.src())
+        .pipe(filter('extension/**'))
+        .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
+        .pipe(packageJsonFilter)
+        .pipe(buffer())
+        .pipe(json({ __metadata: metadata }))
+        .pipe(packageJsonFilter.restore);
+}
+exports.fromMarketplace = fromMarketplace;
+const excludedExtensions = [
+    'vscode-api-tests',
+    'vscode-colorize-tests',
+    'vscode-test-resolver',
+    'ms-vscode.node-debug',
+    'ms-vscode.node-debug2',
+    'vscode-notebook-tests',
+    'vscode-custom-editor-tests',
+];
+const marketplaceWebExtensionsExclude = new Set([
+    'ms-vscode.node-debug',
+    'ms-vscode.node-debug2',
+    'ms-vscode.js-debug-companion',
+    'ms-vscode.js-debug',
+    'ms-vscode.vscode-js-profile-table'
+]);
+const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productJson.builtInExtensions || [];
+const webBuiltInExtensions = productJson.webBuiltInExtensions || [];
+/**
+ * Loosely based on `getExtensionKind` from `src/vs/workbench/services/extensions/common/extensionsUtil.ts`
+ */
+function isWebExtension(manifest) {
+    if (typeof manifest.extensionKind !== 'undefined') {
+        const extensionKind = Array.isArray(manifest.extensionKind) ? manifest.extensionKind : [manifest.extensionKind];
+        return (extensionKind.indexOf('web') >= 0);
+    }
+    return (!Boolean(manifest.main) || Boolean(manifest.browser));
+}
+function packageLocalExtensionsStream(forWeb) {
+    const localExtensionsDescriptions = (glob.sync('extensions/*/package.json')
+        .map(manifestPath => {
+        const absoluteManifestPath = path.join(root, manifestPath);
+        const extensionPath = path.dirname(path.join(root, manifestPath));
+        const extensionName = path.basename(extensionPath);
+        return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
+    })
+        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+        .filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true)));
+    const localExtensionsStream = minifyExtensionResources(es.merge(...localExtensionsDescriptions.map(extension => {
+        return fromLocal(extension.path, forWeb)
+            .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+    })));
+    let result;
+    if (forWeb) {
+        result = localExtensionsStream;
+    }
+    else {
+        // also include shared node modules
+        result = es.merge(localExtensionsStream, gulp.src('extensions/node_modules/**', { base: '.' }));
+    }
+    return (result
+        .pipe(util2.setExecutableBit(['**/*.sh'])));
+}
+exports.packageLocalExtensionsStream = packageLocalExtensionsStream;
+function packageMarketplaceExtensionsStream(forWeb) {
+    const marketplaceExtensionsDescriptions = [
+        ...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),
+        ...(forWeb ? webBuiltInExtensions : [])
+    ];
+    const marketplaceExtensionsStream = minifyExtensionResources(es.merge(...marketplaceExtensionsDescriptions
+        .map(extension => {
+        const input = fromMarketplace(extension.name, extension.version, extension.metadata)
+            .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+        return updateExtensionPackageJSON(input, (data) => {
+            delete data.scripts;
+            delete data.dependencies;
+            delete data.devDependencies;
+            return data;
+        });
+    })));
+    return (marketplaceExtensionsStream
+        .pipe(util2.setExecutableBit(['**/*.sh'])));
+}
+exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
+function scanBuiltinExtensions(extensionsRoot, exclude = []) {
+    const scannedExtensions = [];
+    try {
+        const extensionsFolders = fs.readdirSync(extensionsRoot);
+        for (const extensionFolder of extensionsFolders) {
+            if (exclude.indexOf(extensionFolder) >= 0) {
+                continue;
+            }
+            const packageJSONPath = path.join(extensionsRoot, extensionFolder, 'package.json');
+            if (!fs.existsSync(packageJSONPath)) {
+                continue;
+            }
+            let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+            if (!isWebExtension(packageJSON)) {
+                continue;
+            }
+            const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
+            const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
+            const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;
+            const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
+            const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
+            scannedExtensions.push({
+                extensionPath: extensionFolder,
+                packageJSON,
+                packageNLS,
+                readmePath: readme ? path.join(extensionFolder, readme) : undefined,
+                changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
+            });
+        }
+        return scannedExtensions;
+    }
+    catch (ex) {
+        return scannedExtensions;
+    }
+}
+exports.scanBuiltinExtensions = scanBuiltinExtensions;
+function translatePackageJSON(packageJSON, packageNLSPath) {
+    const CharCode_PC = '%'.charCodeAt(0);
+    const packageNls = JSON.parse(fs.readFileSync(packageNLSPath).toString());
+    const translate = (obj) => {
+        for (let key in obj) {
+            const val = obj[key];
+            if (Array.isArray(val)) {
+                val.forEach(translate);
+            }
+            else if (val && typeof val === 'object') {
+                translate(val);
+            }
+            else if (typeof val === 'string' && val.charCodeAt(0) === CharCode_PC && val.charCodeAt(val.length - 1) === CharCode_PC) {
+                const translated = packageNls[val.substr(1, val.length - 2)];
+                if (translated) {
+                    obj[key] = translated;
+                }
+            }
+        }
+    };
+    translate(packageJSON);
+    return packageJSON;
+}
+exports.translatePackageJSON = translatePackageJSON;
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index dac71c814..6a3c78ca7 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -10,20 +10,15 @@ import * as gulp from 'gulp';
 import * as path from 'path';
 import { Stream } from 'stream';
 import * as File from 'vinyl';
-import * as vsce from 'vsce';
 import { createStatsStream } from './stats';
 import * as util2 from './util';
-import remote = require('gulp-remote-retry-src');
 const vzip = require('gulp-vinyl-zip');
 import filter = require('gulp-filter');
 import rename = require('gulp-rename');
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 const buffer = require('gulp-buffer');
-import json = require('gulp-json-editor');
 import * as jsoncParser from 'jsonc-parser';
-const webpack = require('webpack');
-const webpackGulp = require('webpack-stream');
 const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
@@ -97,6 +92,10 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string):
 		}
 	}
 
+	const vsce = require('vsce') as typeof import('vsce');
+	const webpack = require('webpack');
+	const webpackGulp = require('webpack-stream');
+
 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
 		const files = fileNames
 			.map(fileName => path.join(extensionPath, fileName))
@@ -175,6 +174,8 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string):
 function fromLocalNormal(extensionPath: string): Stream {
 	const result = es.through();
 
+	const vsce = require('vsce') as typeof import('vsce');
+
 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
 		.then(fileNames => {
 			const files = fileNames
@@ -200,6 +201,9 @@ const baseHeaders = {
 };
 
 export function fromMarketplace(extensionName: string, version: string, metadata: any): Stream {
+	const remote = require('gulp-remote-retry-src');
+	const json = require('gulp-json-editor') as typeof import('gulp-json-editor');
+
 	const [publisher, name] = extensionName.split('.');
 	const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
 
@@ -234,9 +238,13 @@ const excludedExtensions = [
 	'vscode-custom-editor-tests',
 ];
 
-const marketplaceWebExtensions = [
-	'ms-vscode.references-view'
-];
+const marketplaceWebExtensionsExclude = new Set([
+	'ms-vscode.node-debug',
+	'ms-vscode.node-debug2',
+	'ms-vscode.js-debug-companion',
+	'ms-vscode.js-debug',
+	'ms-vscode.vscode-js-profile-table'
+]);
 
 interface IBuiltInExtension {
 	name: string;
@@ -304,7 +312,7 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream {
 
 export function packageMarketplaceExtensionsStream(forWeb: boolean): Stream {
 	const marketplaceExtensionsDescriptions = [
-		...builtInExtensions.filter(({ name }) => (forWeb ? marketplaceWebExtensions.indexOf(name) >= 0 : true)),
+		...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),
 		...(forWeb ? webBuiltInExtensions : [])
 	];
 	const marketplaceExtensionsStream = minifyExtensionResources(
diff --git a/build/lib/git.js b/build/lib/git.js
new file mode 100644
index 000000000..1726f76fc
--- /dev/null
+++ b/build/lib/git.js
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersion = void 0;
+const path = require("path");
+const fs = require("fs");
+/**
+ * Returns the sha1 commit version of a repository or undefined in case of failure.
+ */
+function getVersion(repo) {
+    const git = path.join(repo, '.git');
+    const headPath = path.join(git, 'HEAD');
+    let head;
+    try {
+        head = fs.readFileSync(headPath, 'utf8').trim();
+    }
+    catch (e) {
+        return undefined;
+    }
+    if (/^[0-9a-f]{40}$/i.test(head)) {
+        return head;
+    }
+    const refMatch = /^ref: (.*)$/.exec(head);
+    if (!refMatch) {
+        return undefined;
+    }
+    const ref = refMatch[1];
+    const refPath = path.join(git, ref);
+    try {
+        return fs.readFileSync(refPath, 'utf8').trim();
+    }
+    catch (e) {
+        // noop
+    }
+    const packedRefsPath = path.join(git, 'packed-refs');
+    let refsRaw;
+    try {
+        refsRaw = fs.readFileSync(packedRefsPath, 'utf8').trim();
+    }
+    catch (e) {
+        return undefined;
+    }
+    const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
+    let refsMatch;
+    let refs = {};
+    while (refsMatch = refsRegex.exec(refsRaw)) {
+        refs[refsMatch[2]] = refsMatch[1];
+    }
+    return refs[ref];
+}
+exports.getVersion = getVersion;
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
new file mode 100644
index 000000000..7a529824a
--- /dev/null
+++ b/build/lib/i18n.js
@@ -0,0 +1,1204 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.pullI18nPackFiles = exports.prepareI18nFiles = exports.pullSetupXlfFiles = exports.pullCoreAndExtensionsXlfFiles = exports.findObsoleteResources = exports.pushXlfFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.Limiter = exports.XLF = exports.Line = exports.externalExtensionsWithTranslations = exports.extraLanguages = exports.defaultLanguages = void 0;
+const path = require("path");
+const fs = require("fs");
+const event_stream_1 = require("event-stream");
+const File = require("vinyl");
+const Is = require("is");
+const xml2js = require("xml2js");
+const glob = require("glob");
+const https = require("https");
+const gulp = require("gulp");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const iconv = require("iconv-lite-umd");
+const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
+function log(message, ...rest) {
+    fancyLog(ansiColors.green('[i18n]'), message, ...rest);
+}
+exports.defaultLanguages = [
+    { id: 'zh-tw', folderName: 'cht', translationId: 'zh-hant' },
+    { id: 'zh-cn', folderName: 'chs', translationId: 'zh-hans' },
+    { id: 'ja', folderName: 'jpn' },
+    { id: 'ko', folderName: 'kor' },
+    { id: 'de', folderName: 'deu' },
+    { id: 'fr', folderName: 'fra' },
+    { id: 'es', folderName: 'esn' },
+    { id: 'ru', folderName: 'rus' },
+    { id: 'it', folderName: 'ita' }
+];
+// languages requested by the community to non-stable builds
+exports.extraLanguages = [
+    { id: 'pt-br', folderName: 'ptb' },
+    { id: 'hu', folderName: 'hun' },
+    { id: 'tr', folderName: 'trk' }
+];
+// non built-in extensions also that are transifex and need to be part of the language packs
+exports.externalExtensionsWithTranslations = {
+    'vscode-chrome-debug': 'msjsdiag.debugger-for-chrome',
+    'vscode-node-debug': 'ms-vscode.node-debug',
+    'vscode-node-debug2': 'ms-vscode.node-debug2'
+};
+var LocalizeInfo;
+(function (LocalizeInfo) {
+    function is(value) {
+        let candidate = value;
+        return Is.defined(candidate) && Is.string(candidate.key) && (Is.undef(candidate.comment) || (Is.array(candidate.comment) && candidate.comment.every(element => Is.string(element))));
+    }
+    LocalizeInfo.is = is;
+})(LocalizeInfo || (LocalizeInfo = {}));
+var BundledFormat;
+(function (BundledFormat) {
+    function is(value) {
+        if (Is.undef(value)) {
+            return false;
+        }
+        let candidate = value;
+        let length = Object.keys(value).length;
+        return length === 3 && Is.defined(candidate.keys) && Is.defined(candidate.messages) && Is.defined(candidate.bundles);
+    }
+    BundledFormat.is = is;
+})(BundledFormat || (BundledFormat = {}));
+var PackageJsonFormat;
+(function (PackageJsonFormat) {
+    function is(value) {
+        if (Is.undef(value) || !Is.object(value)) {
+            return false;
+        }
+        return Object.keys(value).every(key => {
+            let element = value[key];
+            return Is.string(element) || (Is.object(element) && Is.defined(element.message) && Is.defined(element.comment));
+        });
+    }
+    PackageJsonFormat.is = is;
+})(PackageJsonFormat || (PackageJsonFormat = {}));
+class Line {
+    constructor(indent = 0) {
+        this.buffer = [];
+        if (indent > 0) {
+            this.buffer.push(new Array(indent + 1).join(' '));
+        }
+    }
+    append(value) {
+        this.buffer.push(value);
+        return this;
+    }
+    toString() {
+        return this.buffer.join('');
+    }
+}
+exports.Line = Line;
+class TextModel {
+    constructor(contents) {
+        this._lines = contents.split(/\r\n|\r|\n/);
+    }
+    get lines() {
+        return this._lines;
+    }
+}
+class XLF {
+    constructor(project) {
+        this.project = project;
+        this.buffer = [];
+        this.files = Object.create(null);
+        this.numberOfMessages = 0;
+    }
+    toString() {
+        this.appendHeader();
+        for (let file in this.files) {
+            this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
+            for (let item of this.files[file]) {
+                this.addStringItem(file, item);
+            }
+            this.appendNewLine('</body></file>', 2);
+        }
+        this.appendFooter();
+        return this.buffer.join('\r\n');
+    }
+    addFile(original, keys, messages) {
+        if (keys.length === 0) {
+            console.log('No keys in ' + original);
+            return;
+        }
+        if (keys.length !== messages.length) {
+            throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
+        }
+        this.numberOfMessages += keys.length;
+        this.files[original] = [];
+        let existingKeys = new Set();
+        for (let i = 0; i < keys.length; i++) {
+            let key = keys[i];
+            let realKey;
+            let comment;
+            if (Is.string(key)) {
+                realKey = key;
+                comment = undefined;
+            }
+            else if (LocalizeInfo.is(key)) {
+                realKey = key.key;
+                if (key.comment && key.comment.length > 0) {
+                    comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
+                }
+            }
+            if (!realKey || existingKeys.has(realKey)) {
+                continue;
+            }
+            existingKeys.add(realKey);
+            let message = encodeEntities(messages[i]);
+            this.files[original].push({ id: realKey, message: message, comment: comment });
+        }
+    }
+    addStringItem(file, item) {
+        if (!item.id || item.message === undefined || item.message === null) {
+            throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
+        }
+        if (item.message.length === 0) {
+            log(`Item with id ${item.id} in file ${file} has an empty message.`);
+        }
+        this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
+        this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
+        if (item.comment) {
+            this.appendNewLine(`<note>${item.comment}</note>`, 6);
+        }
+        this.appendNewLine('</trans-unit>', 4);
+    }
+    appendHeader() {
+        this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
+        this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
+    }
+    appendFooter() {
+        this.appendNewLine('</xliff>', 0);
+    }
+    appendNewLine(content, indent) {
+        let line = new Line(indent);
+        line.append(content);
+        this.buffer.push(line.toString());
+    }
+}
+exports.XLF = XLF;
+XLF.parsePseudo = function (xlfString) {
+    return new Promise((resolve) => {
+        let parser = new xml2js.Parser();
+        let files = [];
+        parser.parseString(xlfString, function (_err, result) {
+            const fileNodes = result['xliff']['file'];
+            fileNodes.forEach(file => {
+                const originalFilePath = file.$.original;
+                const messages = {};
+                const transUnits = file.body[0]['trans-unit'];
+                if (transUnits) {
+                    transUnits.forEach((unit) => {
+                        const key = unit.$.id;
+                        const val = pseudify(unit.source[0]['_'].toString());
+                        if (key && val) {
+                            messages[key] = decodeEntities(val);
+                        }
+                    });
+                    files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' });
+                }
+            });
+            resolve(files);
+        });
+    });
+};
+XLF.parse = function (xlfString) {
+    return new Promise((resolve, reject) => {
+        let parser = new xml2js.Parser();
+        let files = [];
+        parser.parseString(xlfString, function (err, result) {
+            if (err) {
+                reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
+            }
+            const fileNodes = result['xliff']['file'];
+            if (!fileNodes) {
+                reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
+            }
+            fileNodes.forEach((file) => {
+                const originalFilePath = file.$.original;
+                if (!originalFilePath) {
+                    reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
+                }
+                let language = file.$['target-language'];
+                if (!language) {
+                    reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
+                }
+                const messages = {};
+                const transUnits = file.body[0]['trans-unit'];
+                if (transUnits) {
+                    transUnits.forEach((unit) => {
+                        const key = unit.$.id;
+                        if (!unit.target) {
+                            return; // No translation available
+                        }
+                        let val = unit.target[0];
+                        if (typeof val !== 'string') {
+                            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.`));
+                        }
+                    });
+                    files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
+                }
+            });
+            resolve(files);
+        });
+    });
+};
+class Limiter {
+    constructor(maxDegreeOfParalellism) {
+        this.maxDegreeOfParalellism = maxDegreeOfParalellism;
+        this.outstandingPromises = [];
+        this.runningPromises = 0;
+    }
+    queue(factory) {
+        return new Promise((c, e) => {
+            this.outstandingPromises.push({ factory, c, e });
+            this.consume();
+        });
+    }
+    consume() {
+        while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
+            const iLimitedTask = this.outstandingPromises.shift();
+            this.runningPromises++;
+            const promise = iLimitedTask.factory();
+            promise.then(iLimitedTask.c).catch(iLimitedTask.e);
+            promise.then(() => this.consumed()).catch(() => this.consumed());
+        }
+    }
+    consumed() {
+        this.runningPromises--;
+        this.consume();
+    }
+}
+exports.Limiter = Limiter;
+function sortLanguages(languages) {
+    return languages.sort((a, b) => {
+        return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0);
+    });
+}
+function stripComments(content) {
+    /**
+    * First capturing group matches double quoted string
+    * Second matches single quotes string
+    * Third matches block comments
+    * Fourth matches line comments
+    */
+    const regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
+    let result = content.replace(regexp, (match, _m1, _m2, m3, m4) => {
+        // Only one of m1, m2, m3, m4 matches
+        if (m3) {
+            // A block comment. Replace with nothing
+            return '';
+        }
+        else if (m4) {
+            // A line comment. If it ends in \r?\n then keep it.
+            let length = m4.length;
+            if (length > 2 && m4[length - 1] === '\n') {
+                return m4[length - 2] === '\r' ? '\r\n' : '\n';
+            }
+            else {
+                return '';
+            }
+        }
+        else {
+            // We match a string
+            return match;
+        }
+    });
+    return result;
+}
+function escapeCharacters(value) {
+    const result = [];
+    for (let i = 0; i < value.length; i++) {
+        const ch = value.charAt(i);
+        switch (ch) {
+            case '\'':
+                result.push('\\\'');
+                break;
+            case '"':
+                result.push('\\"');
+                break;
+            case '\\':
+                result.push('\\\\');
+                break;
+            case '\n':
+                result.push('\\n');
+                break;
+            case '\r':
+                result.push('\\r');
+                break;
+            case '\t':
+                result.push('\\t');
+                break;
+            case '\b':
+                result.push('\\b');
+                break;
+            case '\f':
+                result.push('\\f');
+                break;
+            default:
+                result.push(ch);
+        }
+    }
+    return result.join('');
+}
+function processCoreBundleFormat(fileHeader, languages, json, emitter) {
+    let keysSection = json.keys;
+    let messageSection = json.messages;
+    let bundleSection = json.bundles;
+    let statistics = Object.create(null);
+    let defaultMessages = Object.create(null);
+    let modules = Object.keys(keysSection);
+    modules.forEach((module) => {
+        let keys = keysSection[module];
+        let messages = messageSection[module];
+        if (!messages || keys.length !== messages.length) {
+            emitter.emit('error', `Message for module ${module} corrupted. Mismatch in number of keys and messages.`);
+            return;
+        }
+        let messageMap = Object.create(null);
+        defaultMessages[module] = messageMap;
+        keys.map((key, i) => {
+            if (typeof key === 'string') {
+                messageMap[key] = messages[i];
+            }
+            else {
+                messageMap[key.key] = messages[i];
+            }
+        });
+    });
+    let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+    if (!fs.existsSync(languageDirectory)) {
+        log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
+        log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
+    }
+    let sortedLanguages = sortLanguages(languages);
+    sortedLanguages.forEach((language) => {
+        if (process.env['VSCODE_BUILD_VERBOSE']) {
+            log(`Generating nls bundles for: ${language.id}`);
+        }
+        statistics[language.id] = 0;
+        let localizedModules = Object.create(null);
+        let languageFolderName = language.translationId || language.id;
+        let i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
+        let allMessages;
+        if (fs.existsSync(i18nFile)) {
+            let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
+            allMessages = JSON.parse(content);
+        }
+        modules.forEach((module) => {
+            let order = keysSection[module];
+            let moduleMessage;
+            if (allMessages) {
+                moduleMessage = allMessages.contents[module];
+            }
+            if (!moduleMessage) {
+                if (process.env['VSCODE_BUILD_VERBOSE']) {
+                    log(`No localized messages found for module ${module}. Using default messages.`);
+                }
+                moduleMessage = defaultMessages[module];
+                statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length;
+            }
+            let localizedMessages = [];
+            order.forEach((keyInfo) => {
+                let key = null;
+                if (typeof keyInfo === 'string') {
+                    key = keyInfo;
+                }
+                else {
+                    key = keyInfo.key;
+                }
+                let message = moduleMessage[key];
+                if (!message) {
+                    if (process.env['VSCODE_BUILD_VERBOSE']) {
+                        log(`No localized message found for key ${key} in module ${module}. Using default message.`);
+                    }
+                    message = defaultMessages[module][key];
+                    statistics[language.id] = statistics[language.id] + 1;
+                }
+                localizedMessages.push(message);
+            });
+            localizedModules[module] = localizedMessages;
+        });
+        Object.keys(bundleSection).forEach((bundle) => {
+            let modules = bundleSection[bundle];
+            let contents = [
+                fileHeader,
+                `define("${bundle}.nls.${language.id}", {`
+            ];
+            modules.forEach((module, index) => {
+                contents.push(`\t"${module}": [`);
+                let messages = localizedModules[module];
+                if (!messages) {
+                    emitter.emit('error', `Didn't find messages for module ${module}.`);
+                    return;
+                }
+                messages.forEach((message, index) => {
+                    contents.push(`\t\t"${escapeCharacters(message)}${index < messages.length ? '",' : '"'}`);
+                });
+                contents.push(index < modules.length - 1 ? '\t],' : '\t]');
+            });
+            contents.push('});');
+            emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: Buffer.from(contents.join('\n'), 'utf-8') }));
+        });
+    });
+    Object.keys(statistics).forEach(key => {
+        let value = statistics[key];
+        log(`${key} has ${value} untranslated strings.`);
+    });
+    sortedLanguages.forEach(language => {
+        let stats = statistics[language.id];
+        if (Is.undef(stats)) {
+            log(`\tNo translations found for language ${language.id}. Using default language instead.`);
+        }
+    });
+}
+function processNlsFiles(opts) {
+    return event_stream_1.through(function (file) {
+        let fileName = path.basename(file.path);
+        if (fileName === 'nls.metadata.json') {
+            let json = null;
+            if (file.isBuffer()) {
+                json = JSON.parse(file.contents.toString('utf8'));
+            }
+            else {
+                this.emit('error', `Failed to read component file: ${file.relative}`);
+                return;
+            }
+            if (BundledFormat.is(json)) {
+                processCoreBundleFormat(opts.fileHeader, opts.languages, json, this);
+            }
+        }
+        this.queue(file);
+    });
+}
+exports.processNlsFiles = processNlsFiles;
+const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup';
+function getResource(sourceFile) {
+    let resource;
+    if (/^vs\/platform/.test(sourceFile)) {
+        return { name: 'vs/platform', project: editorProject };
+    }
+    else if (/^vs\/editor\/contrib/.test(sourceFile)) {
+        return { name: 'vs/editor/contrib', project: editorProject };
+    }
+    else if (/^vs\/editor/.test(sourceFile)) {
+        return { name: 'vs/editor', project: editorProject };
+    }
+    else if (/^vs\/base/.test(sourceFile)) {
+        return { name: 'vs/base', project: editorProject };
+    }
+    else if (/^vs\/code/.test(sourceFile)) {
+        return { name: 'vs/code', project: workbenchProject };
+    }
+    else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
+        resource = sourceFile.split('/', 4).join('/');
+        return { name: resource, project: workbenchProject };
+    }
+    else if (/^vs\/workbench\/services/.test(sourceFile)) {
+        resource = sourceFile.split('/', 4).join('/');
+        return { name: resource, project: workbenchProject };
+    }
+    else if (/^vs\/workbench/.test(sourceFile)) {
+        return { name: 'vs/workbench', project: workbenchProject };
+    }
+    throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
+}
+exports.getResource = getResource;
+function createXlfFilesForCoreBundle() {
+    return event_stream_1.through(function (file) {
+        const basename = path.basename(file.path);
+        if (basename === 'nls.metadata.json') {
+            if (file.isBuffer()) {
+                const xlfs = Object.create(null);
+                const json = JSON.parse(file.contents.toString('utf8'));
+                for (let coreModule in json.keys) {
+                    const projectResource = getResource(coreModule);
+                    const resource = projectResource.name;
+                    const project = projectResource.project;
+                    const keys = json.keys[coreModule];
+                    const messages = json.messages[coreModule];
+                    if (keys.length !== messages.length) {
+                        this.emit('error', `There is a mismatch between keys and messages in ${file.relative} for module ${coreModule}`);
+                        return;
+                    }
+                    else {
+                        let xlf = xlfs[resource];
+                        if (!xlf) {
+                            xlf = new XLF(project);
+                            xlfs[resource] = xlf;
+                        }
+                        xlf.addFile(`src/${coreModule}`, keys, messages);
+                    }
+                }
+                for (let resource in xlfs) {
+                    const xlf = xlfs[resource];
+                    const filePath = `${xlf.project}/${resource.replace(/\//g, '_')}.xlf`;
+                    const xlfFile = new File({
+                        path: filePath,
+                        contents: Buffer.from(xlf.toString(), 'utf8')
+                    });
+                    this.queue(xlfFile);
+                }
+            }
+            else {
+                this.emit('error', new Error(`File ${file.relative} is not using a buffer content`));
+                return;
+            }
+        }
+        else {
+            this.emit('error', new Error(`File ${file.relative} is not a core meta data file.`));
+            return;
+        }
+    });
+}
+exports.createXlfFilesForCoreBundle = createXlfFilesForCoreBundle;
+function createXlfFilesForExtensions() {
+    let counter = 0;
+    let folderStreamEnded = false;
+    let folderStreamEndEmitted = false;
+    return event_stream_1.through(function (extensionFolder) {
+        const folderStream = this;
+        const stat = fs.statSync(extensionFolder.path);
+        if (!stat.isDirectory()) {
+            return;
+        }
+        let extensionName = path.basename(extensionFolder.path);
+        if (extensionName === 'node_modules') {
+            return;
+        }
+        counter++;
+        let _xlf;
+        function getXlf() {
+            if (!_xlf) {
+                _xlf = new XLF(extensionsProject);
+            }
+            return _xlf;
+        }
+        gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(event_stream_1.through(function (file) {
+            if (file.isBuffer()) {
+                const buffer = file.contents;
+                const basename = path.basename(file.path);
+                if (basename === 'package.nls.json') {
+                    const json = JSON.parse(buffer.toString('utf8'));
+                    const keys = Object.keys(json);
+                    const messages = keys.map((key) => {
+                        const value = json[key];
+                        if (Is.string(value)) {
+                            return value;
+                        }
+                        else if (value) {
+                            return value.message;
+                        }
+                        else {
+                            return `Unknown message for key: ${key}`;
+                        }
+                    });
+                    getXlf().addFile(`extensions/${extensionName}/package`, keys, messages);
+                }
+                else if (basename === 'nls.metadata.json') {
+                    const json = JSON.parse(buffer.toString('utf8'));
+                    const relPath = path.relative(`.build/extensions/${extensionName}`, path.dirname(file.path));
+                    for (let file in json) {
+                        const fileContent = json[file];
+                        getXlf().addFile(`extensions/${extensionName}/${relPath}/${file}`, fileContent.keys, fileContent.messages);
+                    }
+                }
+                else {
+                    this.emit('error', new Error(`${file.path} is not a valid extension nls file`));
+                    return;
+                }
+            }
+        }, function () {
+            if (_xlf) {
+                let xlfFile = new File({
+                    path: path.join(extensionsProject, extensionName + '.xlf'),
+                    contents: Buffer.from(_xlf.toString(), 'utf8')
+                });
+                folderStream.queue(xlfFile);
+            }
+            this.queue(null);
+            counter--;
+            if (counter === 0 && folderStreamEnded && !folderStreamEndEmitted) {
+                folderStreamEndEmitted = true;
+                folderStream.queue(null);
+            }
+        }));
+    }, function () {
+        folderStreamEnded = true;
+        if (counter === 0) {
+            folderStreamEndEmitted = true;
+            this.queue(null);
+        }
+    });
+}
+exports.createXlfFilesForExtensions = createXlfFilesForExtensions;
+function createXlfFilesForIsl() {
+    return event_stream_1.through(function (file) {
+        let projectName, resourceFile;
+        if (path.basename(file.path) === 'Default.isl') {
+            projectName = setupProject;
+            resourceFile = 'setup_default.xlf';
+        }
+        else {
+            projectName = workbenchProject;
+            resourceFile = 'setup_messages.xlf';
+        }
+        let xlf = new XLF(projectName), keys = [], messages = [];
+        let model = new TextModel(file.contents.toString());
+        let inMessageSection = false;
+        model.lines.forEach(line => {
+            if (line.length === 0) {
+                return;
+            }
+            let firstChar = line.charAt(0);
+            switch (firstChar) {
+                case ';':
+                    // Comment line;
+                    return;
+                case '[':
+                    inMessageSection = '[Messages]' === line || '[CustomMessages]' === line;
+                    return;
+            }
+            if (!inMessageSection) {
+                return;
+            }
+            let sections = line.split('=');
+            if (sections.length !== 2) {
+                throw new Error(`Badly formatted message found: ${line}`);
+            }
+            else {
+                let key = sections[0];
+                let value = sections[1];
+                if (key.length > 0 && value.length > 0) {
+                    keys.push(key);
+                    messages.push(value);
+                }
+            }
+        });
+        const originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/');
+        xlf.addFile(originalPath, keys, messages);
+        // Emit only upon all ISL files combined into single XLF instance
+        const newFilePath = path.join(projectName, resourceFile);
+        const xlfFile = new File({ path: newFilePath, contents: Buffer.from(xlf.toString(), 'utf-8') });
+        this.queue(xlfFile);
+    });
+}
+exports.createXlfFilesForIsl = createXlfFilesForIsl;
+function pushXlfFiles(apiHostname, username, password) {
+    let tryGetPromises = [];
+    let updateCreatePromises = [];
+    return event_stream_1.through(function (file) {
+        const project = path.dirname(file.relative);
+        const fileName = path.basename(file.path);
+        const slug = fileName.substr(0, fileName.length - '.xlf'.length);
+        const credentials = `${username}:${password}`;
+        // Check if resource already exists, if not, then create it.
+        let promise = tryGetResource(project, slug, apiHostname, credentials);
+        tryGetPromises.push(promise);
+        promise.then(exists => {
+            if (exists) {
+                promise = updateResource(project, slug, file, apiHostname, credentials);
+            }
+            else {
+                promise = createResource(project, slug, file, apiHostname, credentials);
+            }
+            updateCreatePromises.push(promise);
+        });
+    }, function () {
+        // End the pipe only after all the communication with Transifex API happened
+        Promise.all(tryGetPromises).then(() => {
+            Promise.all(updateCreatePromises).then(() => {
+                this.queue(null);
+            }).catch((reason) => { throw new Error(reason); });
+        }).catch((reason) => { throw new Error(reason); });
+    });
+}
+exports.pushXlfFiles = pushXlfFiles;
+function getAllResources(project, apiHostname, username, password) {
+    return new Promise((resolve, reject) => {
+        const credentials = `${username}:${password}`;
+        const options = {
+            hostname: apiHostname,
+            path: `/api/2/project/${project}/resources`,
+            auth: credentials,
+            method: 'GET'
+        };
+        const request = https.request(options, (res) => {
+            let buffer = [];
+            res.on('data', (chunk) => buffer.push(chunk));
+            res.on('end', () => {
+                if (res.statusCode === 200) {
+                    let json = JSON.parse(Buffer.concat(buffer).toString());
+                    if (Array.isArray(json)) {
+                        resolve(json.map(o => o.slug));
+                        return;
+                    }
+                    reject(`Unexpected data format. Response code: ${res.statusCode}.`);
+                }
+                else {
+                    reject(`No resources in ${project} returned no data. Response code: ${res.statusCode}.`);
+                }
+            });
+        });
+        request.on('error', (err) => {
+            reject(`Failed to query resources in ${project} with the following error: ${err}. ${options.path}`);
+        });
+        request.end();
+    });
+}
+function findObsoleteResources(apiHostname, username, password) {
+    let resourcesByProject = Object.create(null);
+    resourcesByProject[extensionsProject] = [].concat(exports.externalExtensionsWithTranslations); // clone
+    return event_stream_1.through(function (file) {
+        const project = path.dirname(file.relative);
+        const fileName = path.basename(file.path);
+        const slug = fileName.substr(0, fileName.length - '.xlf'.length);
+        let slugs = resourcesByProject[project];
+        if (!slugs) {
+            resourcesByProject[project] = slugs = [];
+        }
+        slugs.push(slug);
+        this.push(file);
+    }, function () {
+        const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'));
+        let i18Resources = [...json.editor, ...json.workbench].map((r) => r.project + '/' + r.name.replace(/\//g, '_'));
+        let extractedResources = [];
+        for (let project of [workbenchProject, editorProject]) {
+            for (let resource of resourcesByProject[project]) {
+                if (resource !== 'setup_messages') {
+                    extractedResources.push(project + '/' + resource);
+                }
+            }
+        }
+        if (i18Resources.length !== extractedResources.length) {
+            console.log(`[i18n] Obsolete resources in file 'build/lib/i18n.resources.json': JSON.stringify(${i18Resources.filter(p => extractedResources.indexOf(p) === -1)})`);
+            console.log(`[i18n] Missing resources in file 'build/lib/i18n.resources.json': JSON.stringify(${extractedResources.filter(p => i18Resources.indexOf(p) === -1)})`);
+        }
+        let promises = [];
+        for (let project in resourcesByProject) {
+            promises.push(getAllResources(project, apiHostname, username, password).then(resources => {
+                let expectedResources = resourcesByProject[project];
+                let unusedResources = resources.filter(resource => resource && expectedResources.indexOf(resource) === -1);
+                if (unusedResources.length) {
+                    console.log(`[transifex] Obsolete resources in project '${project}': ${unusedResources.join(', ')}`);
+                }
+            }));
+        }
+        return Promise.all(promises).then(_ => {
+            this.push(null);
+        }).catch((reason) => { throw new Error(reason); });
+    });
+}
+exports.findObsoleteResources = findObsoleteResources;
+function tryGetResource(project, slug, apiHostname, credentials) {
+    return new Promise((resolve, reject) => {
+        const options = {
+            hostname: apiHostname,
+            path: `/api/2/project/${project}/resource/${slug}/?details`,
+            auth: credentials,
+            method: 'GET'
+        };
+        const request = https.request(options, (response) => {
+            if (response.statusCode === 404) {
+                resolve(false);
+            }
+            else if (response.statusCode === 200) {
+                resolve(true);
+            }
+            else {
+                reject(`Failed to query resource ${project}/${slug}. Response: ${response.statusCode} ${response.statusMessage}`);
+            }
+        });
+        request.on('error', (err) => {
+            reject(`Failed to get ${project}/${slug} on Transifex: ${err}`);
+        });
+        request.end();
+    });
+}
+function createResource(project, slug, xlfFile, apiHostname, credentials) {
+    return new Promise((_resolve, reject) => {
+        const data = JSON.stringify({
+            'content': xlfFile.contents.toString(),
+            'name': slug,
+            'slug': slug,
+            'i18n_type': 'XLIFF'
+        });
+        const options = {
+            hostname: apiHostname,
+            path: `/api/2/project/${project}/resources`,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(data)
+            },
+            auth: credentials,
+            method: 'POST'
+        };
+        let request = https.request(options, (res) => {
+            if (res.statusCode === 201) {
+                log(`Resource ${project}/${slug} successfully created on Transifex.`);
+            }
+            else {
+                reject(`Something went wrong in the request creating ${slug} in ${project}. ${res.statusCode}`);
+            }
+        });
+        request.on('error', (err) => {
+            reject(`Failed to create ${project}/${slug} on Transifex: ${err}`);
+        });
+        request.write(data);
+        request.end();
+    });
+}
+/**
+ * The following link provides information about how Transifex handles updates of a resource file:
+ * https://dev.befoolish.co/tx-docs/public/projects/updating-content#what-happens-when-you-update-files
+ */
+function updateResource(project, slug, xlfFile, apiHostname, credentials) {
+    return new Promise((resolve, reject) => {
+        const data = JSON.stringify({ content: xlfFile.contents.toString() });
+        const options = {
+            hostname: apiHostname,
+            path: `/api/2/project/${project}/resource/${slug}/content`,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(data)
+            },
+            auth: credentials,
+            method: 'PUT'
+        };
+        let request = https.request(options, (res) => {
+            if (res.statusCode === 200) {
+                res.setEncoding('utf8');
+                let responseBuffer = '';
+                res.on('data', function (chunk) {
+                    responseBuffer += chunk;
+                });
+                res.on('end', () => {
+                    const response = JSON.parse(responseBuffer);
+                    log(`Resource ${project}/${slug} successfully updated on Transifex. Strings added: ${response.strings_added}, updated: ${response.strings_added}, deleted: ${response.strings_added}`);
+                    resolve();
+                });
+            }
+            else {
+                reject(`Something went wrong in the request updating ${slug} in ${project}. ${res.statusCode}`);
+            }
+        });
+        request.on('error', (err) => {
+            reject(`Failed to update ${project}/${slug} on Transifex: ${err}`);
+        });
+        request.write(data);
+        request.end();
+    });
+}
+// cache resources
+let _coreAndExtensionResources;
+function pullCoreAndExtensionsXlfFiles(apiHostname, username, password, language, externalExtensions) {
+    if (!_coreAndExtensionResources) {
+        _coreAndExtensionResources = [];
+        // editor and workbench
+        const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'));
+        _coreAndExtensionResources.push(...json.editor);
+        _coreAndExtensionResources.push(...json.workbench);
+        // extensions
+        let extensionsToLocalize = Object.create(null);
+        glob.sync('.build/extensions/**/*.nls.json').forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);
+        glob.sync('.build/extensions/*/node_modules/vscode-nls').forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);
+        Object.keys(extensionsToLocalize).forEach(extension => {
+            _coreAndExtensionResources.push({ name: extension, project: extensionsProject });
+        });
+        if (externalExtensions) {
+            for (let resourceName in externalExtensions) {
+                _coreAndExtensionResources.push({ name: resourceName, project: extensionsProject });
+            }
+        }
+    }
+    return pullXlfFiles(apiHostname, username, password, language, _coreAndExtensionResources);
+}
+exports.pullCoreAndExtensionsXlfFiles = pullCoreAndExtensionsXlfFiles;
+function pullSetupXlfFiles(apiHostname, username, password, language, includeDefault) {
+    let setupResources = [{ name: 'setup_messages', project: workbenchProject }];
+    if (includeDefault) {
+        setupResources.push({ name: 'setup_default', project: setupProject });
+    }
+    return pullXlfFiles(apiHostname, username, password, language, setupResources);
+}
+exports.pullSetupXlfFiles = pullSetupXlfFiles;
+function pullXlfFiles(apiHostname, username, password, language, resources) {
+    const credentials = `${username}:${password}`;
+    let expectedTranslationsCount = resources.length;
+    let translationsRetrieved = 0, called = false;
+    return event_stream_1.readable(function (_count, callback) {
+        // Mark end of stream when all resources were retrieved
+        if (translationsRetrieved === expectedTranslationsCount) {
+            return this.emit('end');
+        }
+        if (!called) {
+            called = true;
+            const stream = this;
+            resources.map(function (resource) {
+                retrieveResource(language, resource, apiHostname, credentials).then((file) => {
+                    if (file) {
+                        stream.emit('data', file);
+                    }
+                    translationsRetrieved++;
+                }).catch(error => { throw new Error(error); });
+            });
+        }
+        callback();
+    });
+}
+const limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS);
+function retrieveResource(language, resource, apiHostname, credentials) {
+    return limiter.queue(() => new Promise((resolve, reject) => {
+        const slug = resource.name.replace(/\//g, '_');
+        const project = resource.project;
+        let transifexLanguageId = language.id === 'ps' ? 'en' : language.translationId || language.id;
+        const options = {
+            hostname: apiHostname,
+            path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`,
+            auth: credentials,
+            port: 443,
+            method: 'GET'
+        };
+        console.log('[transifex] Fetching ' + options.path);
+        let request = https.request(options, (res) => {
+            let xlfBuffer = [];
+            res.on('data', (chunk) => xlfBuffer.push(chunk));
+            res.on('end', () => {
+                if (res.statusCode === 200) {
+                    resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` }));
+                }
+                else if (res.statusCode === 404) {
+                    console.log(`[transifex] ${slug} in ${project} returned no data.`);
+                    resolve(null);
+                }
+                else {
+                    reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`);
+                }
+            });
+        });
+        request.on('error', (err) => {
+            reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`);
+        });
+        request.end();
+    }));
+}
+function prepareI18nFiles() {
+    let parsePromises = [];
+    return event_stream_1.through(function (xlf) {
+        let stream = this;
+        let parsePromise = XLF.parse(xlf.contents.toString());
+        parsePromises.push(parsePromise);
+        parsePromise.then(resolvedFiles => {
+            resolvedFiles.forEach(file => {
+                let translatedFile = createI18nFile(file.originalFilePath, file.messages);
+                stream.queue(translatedFile);
+            });
+        });
+    }, function () {
+        Promise.all(parsePromises)
+            .then(() => { this.queue(null); })
+            .catch(reason => { throw new Error(reason); });
+    });
+}
+exports.prepareI18nFiles = prepareI18nFiles;
+function createI18nFile(originalFilePath, messages) {
+    let result = Object.create(null);
+    result[''] = [
+        '--------------------------------------------------------------------------------------------',
+        'Copyright (c) Microsoft Corporation. All rights reserved.',
+        'Licensed under the MIT License. See License.txt in the project root for license information.',
+        '--------------------------------------------------------------------------------------------',
+        'Do not edit this file. It is machine generated.'
+    ];
+    for (let key of Object.keys(messages)) {
+        result[key] = messages[key];
+    }
+    let content = JSON.stringify(result, null, '\t');
+    if (process.platform === 'win32') {
+        content = content.replace(/\n/g, '\r\n');
+    }
+    return new File({
+        path: path.join(originalFilePath + '.i18n.json'),
+        contents: Buffer.from(content, 'utf8')
+    });
+}
+const i18nPackVersion = '1.0.0';
+function pullI18nPackFiles(apiHostname, username, password, language, resultingTranslationPaths) {
+    return pullCoreAndExtensionsXlfFiles(apiHostname, username, password, language, exports.externalExtensionsWithTranslations)
+        .pipe(prepareI18nPackFiles(exports.externalExtensionsWithTranslations, resultingTranslationPaths, language.id === 'ps'));
+}
+exports.pullI18nPackFiles = pullI18nPackFiles;
+function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pseudo = false) {
+    let parsePromises = [];
+    let mainPack = { version: i18nPackVersion, contents: {} };
+    let extensionsPacks = {};
+    let errors = [];
+    return event_stream_1.through(function (xlf) {
+        let project = path.basename(path.dirname(xlf.relative));
+        let resource = path.basename(xlf.relative, '.xlf');
+        let contents = xlf.contents.toString();
+        let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents);
+        parsePromises.push(parsePromise);
+        parsePromise.then(resolvedFiles => {
+            resolvedFiles.forEach(file => {
+                const path = file.originalFilePath;
+                const firstSlash = path.indexOf('/');
+                if (project === extensionsProject) {
+                    let extPack = extensionsPacks[resource];
+                    if (!extPack) {
+                        extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} };
+                    }
+                    const externalId = externalExtensions[resource];
+                    if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent
+                        const secondSlash = path.indexOf('/', firstSlash + 1);
+                        extPack.contents[path.substr(secondSlash + 1)] = file.messages;
+                    }
+                    else {
+                        extPack.contents[path] = file.messages;
+                    }
+                }
+                else {
+                    mainPack.contents[path.substr(firstSlash + 1)] = file.messages;
+                }
+            });
+        }).catch(reason => {
+            errors.push(reason);
+        });
+    }, function () {
+        Promise.all(parsePromises)
+            .then(() => {
+            if (errors.length > 0) {
+                throw errors;
+            }
+            const translatedMainFile = createI18nFile('./main', mainPack);
+            resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' });
+            this.queue(translatedMainFile);
+            for (let extension in extensionsPacks) {
+                const translatedExtFile = createI18nFile(`extensions/${extension}`, extensionsPacks[extension]);
+                this.queue(translatedExtFile);
+                const externalExtensionId = externalExtensions[extension];
+                if (externalExtensionId) {
+                    resultingTranslationPaths.push({ id: externalExtensionId, resourceName: `extensions/${extension}.i18n.json` });
+                }
+                else {
+                    resultingTranslationPaths.push({ id: `vscode.${extension}`, resourceName: `extensions/${extension}.i18n.json` });
+                }
+            }
+            this.queue(null);
+        })
+            .catch((reason) => {
+            this.emit('error', reason);
+        });
+    });
+}
+exports.prepareI18nPackFiles = prepareI18nPackFiles;
+function prepareIslFiles(language, innoSetupConfig) {
+    let parsePromises = [];
+    return event_stream_1.through(function (xlf) {
+        let stream = this;
+        let parsePromise = XLF.parse(xlf.contents.toString());
+        parsePromises.push(parsePromise);
+        parsePromise.then(resolvedFiles => {
+            resolvedFiles.forEach(file => {
+                if (path.basename(file.originalFilePath) === 'Default' && !innoSetupConfig.defaultInfo) {
+                    return;
+                }
+                let translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig);
+                stream.queue(translatedFile);
+            });
+        }).catch(reason => {
+            this.emit('error', reason);
+        });
+    }, function () {
+        Promise.all(parsePromises)
+            .then(() => { this.queue(null); })
+            .catch(reason => {
+            this.emit('error', reason);
+        });
+    });
+}
+exports.prepareIslFiles = prepareIslFiles;
+function createIslFile(originalFilePath, messages, language, innoSetup) {
+    let content = [];
+    let originalContent;
+    if (path.basename(originalFilePath) === 'Default') {
+        originalContent = new TextModel(fs.readFileSync(originalFilePath + '.isl', 'utf8'));
+    }
+    else {
+        originalContent = new TextModel(fs.readFileSync(originalFilePath + '.en.isl', 'utf8'));
+    }
+    originalContent.lines.forEach(line => {
+        if (line.length > 0) {
+            let firstChar = line.charAt(0);
+            if (firstChar === '[' || firstChar === ';') {
+                content.push(line);
+            }
+            else {
+                let sections = line.split('=');
+                let key = sections[0];
+                let translated = line;
+                if (key) {
+                    if (key === 'LanguageName') {
+                        translated = `${key}=${innoSetup.defaultInfo.name}`;
+                    }
+                    else if (key === 'LanguageID') {
+                        translated = `${key}=${innoSetup.defaultInfo.id}`;
+                    }
+                    else if (key === 'LanguageCodePage') {
+                        translated = `${key}=${innoSetup.codePage.substr(2)}`;
+                    }
+                    else {
+                        let translatedMessage = messages[key];
+                        if (translatedMessage) {
+                            translated = `${key}=${translatedMessage}`;
+                        }
+                    }
+                }
+                content.push(translated);
+            }
+        }
+    });
+    const basename = path.basename(originalFilePath);
+    const filePath = `${basename}.${language.id}.isl`;
+    const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
+    return new File({
+        path: filePath,
+        contents: Buffer.from(encoded),
+    });
+}
+function encodeEntities(value) {
+    let result = [];
+    for (let i = 0; i < value.length; i++) {
+        let ch = value[i];
+        switch (ch) {
+            case '<':
+                result.push('&lt;');
+                break;
+            case '>':
+                result.push('&gt;');
+                break;
+            case '&':
+                result.push('&amp;');
+                break;
+            default:
+                result.push(ch);
+        }
+    }
+    return result.join('');
+}
+function decodeEntities(value) {
+    return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
+}
+function pseudify(message) {
+    return '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D';
+}
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 9ec898986..bb2ed8a7e 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -182,6 +182,10 @@
 			"name": "vs/workbench/contrib/tasks",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/testing",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/terminal",
 			"project": "vscode-workbench"
@@ -222,6 +226,10 @@
 			"name": "vs/workbench/contrib/customEditor",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/externalUriOpener",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/welcome",
 			"project": "vscode-workbench"
@@ -250,6 +258,10 @@
 			"name": "vs/workbench/services/bulkEdit",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/clipboard",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/commands",
 			"project": "vscode-workbench"
diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
new file mode 100644
index 000000000..9ef9dc591
--- /dev/null
+++ b/build/lib/layersChecker.js
@@ -0,0 +1,283 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = require("typescript");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const minimatch_1 = require("minimatch");
+//
+// #############################################################################################
+//
+// A custom typescript checker for the specific task of detecting the use of certain types in a
+// layer that does not allow such use. For example:
+// - using DOM globals in common/node/electron-main layer (e.g. HTMLElement)
+// - using node.js globals in common/browser layer (e.g. process)
+//
+// Make changes to below RULES to lift certain files from these checks only if absolutely needed
+//
+// #############################################################################################
+//
+// Types we assume are present in all implementations of JS VMs (node.js, browsers)
+// Feel free to add more core types as you see needed if present in node.js and browsers
+const CORE_TYPES = [
+    'require',
+    'setTimeout',
+    'clearTimeout',
+    'setInterval',
+    'clearInterval',
+    'console',
+    'log',
+    'info',
+    'warn',
+    'error',
+    'group',
+    'groupEnd',
+    'table',
+    'assert',
+    'Error',
+    'String',
+    'throws',
+    'stack',
+    'captureStackTrace',
+    'stackTraceLimit',
+    'TextDecoder',
+    'TextEncoder',
+    'encode',
+    'decode',
+    'self',
+    'trimLeft',
+    'trimRight'
+];
+// Types that are defined in a common layer but are known to be only
+// available in native environments should not be allowed in browser
+const NATIVE_TYPES = [
+    'NativeParsedArgs',
+    'INativeEnvironmentService',
+    'INativeWindowConfiguration',
+    'ICommonNativeHostService'
+];
+const RULES = [
+    // Tests: skip
+    {
+        target: '**/vs/**/test/**',
+        skip: true // -> skip all test files
+    },
+    // Common: vs/base/common/platform.ts
+    {
+        target: '**/vs/base/common/platform.ts',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // Safe access to postMessage() and friends
+            'MessageEvent',
+            'data'
+        ],
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Common: vs/platform/environment/common/argv.ts
+    {
+        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',
+        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/windows/common/windows.ts
+    {
+        target: '**/vs/platform/windows/common/windows.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/native/common/native.ts
+    {
+        target: '**/vs/platform/native/common/native.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/workbench/api/common/extHostExtensionService.ts
+    {
+        target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // Safe access to global
+            'global'
+        ],
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Common
+    {
+        target: '**/vs/**/common/**',
+        allowedTypes: CORE_TYPES,
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Browser
+    {
+        target: '**/vs/**/browser/**',
+        allowedTypes: CORE_TYPES,
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
+    // Browser (editor contrib)
+    {
+        target: '**/src/vs/editor/contrib/**',
+        allowedTypes: CORE_TYPES,
+        disallowedTypes: NATIVE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
+    // node.js
+    {
+        target: '**/vs/**/node/**',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // --> types from node.d.ts that duplicate from lib.dom.d.ts
+            'URL',
+            'protocol',
+            'hostname',
+            'port',
+            'pathname',
+            'search',
+            'username',
+            'password'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts' // no DOM
+        ]
+    },
+    // Electron (sandbox)
+    {
+        target: '**/vs/**/electron-sandbox/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
+    // Electron (renderer): skip
+    {
+        target: '**/vs/**/electron-browser/**',
+        skip: true // -> supports all types
+    },
+    // Electron (main)
+    {
+        target: '**/vs/**/electron-main/**',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // --> types from electron.d.ts that duplicate from lib.dom.d.ts
+            'Event',
+            'Request'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts' // no DOM
+        ]
+    }
+];
+const TS_CONFIG_PATH = path_1.join(__dirname, '../../', 'src', 'tsconfig.json');
+let hasErrors = false;
+function checkFile(program, sourceFile, rule) {
+    checkNode(sourceFile);
+    function checkNode(node) {
+        var _a, _b;
+        if (node.kind !== ts.SyntaxKind.Identifier) {
+            return ts.forEachChild(node, checkNode); // recurse down
+        }
+        const text = node.getText(sourceFile);
+        if ((_a = rule.allowedTypes) === null || _a === void 0 ? void 0 : _a.some(allowed => allowed === text)) {
+            return; // override
+        }
+        if ((_b = rule.disallowedTypes) === null || _b === void 0 ? void 0 : _b.some(disallowed => disallowed === text)) {
+            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+            console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+            hasErrors = true;
+            return;
+        }
+        const checker = program.getTypeChecker();
+        const symbol = checker.getSymbolAtLocation(node);
+        if (symbol) {
+            const declarations = symbol.declarations;
+            if (Array.isArray(declarations)) {
+                for (const declaration of declarations) {
+                    if (declaration) {
+                        const parent = declaration.parent;
+                        if (parent) {
+                            const parentSourceFile = parent.getSourceFile();
+                            if (parentSourceFile) {
+                                const definitionFileName = parentSourceFile.fileName;
+                                if (rule.disallowedDefinitions) {
+                                    for (const disallowedDefinition of rule.disallowedDefinitions) {
+                                        if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
+                                            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+                                            console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+                                            hasErrors = true;
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+function createProgram(tsconfigPath) {
+    const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => fs_1.readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
+    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, path_1.resolve(path_1.dirname(tsconfigPath)), { noEmit: true });
+    const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
+    return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
+}
+//
+// Create program and start checking
+//
+const program = createProgram(TS_CONFIG_PATH);
+for (const sourceFile of program.getSourceFiles()) {
+    for (const rule of RULES) {
+        if (minimatch_1.match([sourceFile.fileName], rule.target).length > 0) {
+            if (!rule.skip) {
+                checkFile(program, sourceFile, rule);
+            }
+            break;
+        }
+    }
+}
+if (hasErrors) {
+    process.exit(1);
+}
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index 1c7579206..c0d67db60 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -25,8 +25,6 @@ import { match } from 'minimatch';
 // Feel free to add more core types as you see needed if present in node.js and browsers
 const CORE_TYPES = [
 	'require', // from our AMD loader
-	// 'atob',
-	// 'btoa',
 	'setTimeout',
 	'clearTimeout',
 	'setInterval',
diff --git a/build/lib/monaco-api.js b/build/lib/monaco-api.js
new file mode 100644
index 000000000..2c6677d43
--- /dev/null
+++ b/build/lib/monaco-api.js
@@ -0,0 +1,628 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.execute = exports.run3 = exports.DeclarationResolver = exports.FSProvider = exports.RECIPE_PATH = void 0;
+const fs = require("fs");
+const path = require("path");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const dtsv = '3';
+const tsfmt = require('../../tsfmt.json');
+const SRC = path.join(__dirname, '../../src');
+exports.RECIPE_PATH = path.join(__dirname, '../monaco/monaco.d.ts.recipe');
+const DECLARATION_PATH = path.join(__dirname, '../../src/vs/monaco.d.ts');
+function logErr(message, ...rest) {
+    fancyLog(ansiColors.yellow(`[monaco.d.ts]`), message, ...rest);
+}
+function isDeclaration(ts, a) {
+    return (a.kind === ts.SyntaxKind.InterfaceDeclaration
+        || a.kind === ts.SyntaxKind.EnumDeclaration
+        || a.kind === ts.SyntaxKind.ClassDeclaration
+        || a.kind === ts.SyntaxKind.TypeAliasDeclaration
+        || a.kind === ts.SyntaxKind.FunctionDeclaration
+        || a.kind === ts.SyntaxKind.ModuleDeclaration);
+}
+function visitTopLevelDeclarations(ts, sourceFile, visitor) {
+    let stop = false;
+    let visit = (node) => {
+        if (stop) {
+            return;
+        }
+        switch (node.kind) {
+            case ts.SyntaxKind.InterfaceDeclaration:
+            case ts.SyntaxKind.EnumDeclaration:
+            case ts.SyntaxKind.ClassDeclaration:
+            case ts.SyntaxKind.VariableStatement:
+            case ts.SyntaxKind.TypeAliasDeclaration:
+            case ts.SyntaxKind.FunctionDeclaration:
+            case ts.SyntaxKind.ModuleDeclaration:
+                stop = visitor(node);
+        }
+        if (stop) {
+            return;
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+}
+function getAllTopLevelDeclarations(ts, sourceFile) {
+    let all = [];
+    visitTopLevelDeclarations(ts, sourceFile, (node) => {
+        if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) {
+            let interfaceDeclaration = node;
+            let triviaStart = interfaceDeclaration.pos;
+            let triviaEnd = interfaceDeclaration.name.pos;
+            let triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd });
+            if (triviaText.indexOf('@internal') === -1) {
+                all.push(node);
+            }
+        }
+        else {
+            let nodeText = getNodeText(sourceFile, node);
+            if (nodeText.indexOf('@internal') === -1) {
+                all.push(node);
+            }
+        }
+        return false /*continue*/;
+    });
+    return all;
+}
+function getTopLevelDeclaration(ts, sourceFile, typeName) {
+    let result = null;
+    visitTopLevelDeclarations(ts, sourceFile, (node) => {
+        if (isDeclaration(ts, node) && node.name) {
+            if (node.name.text === typeName) {
+                result = node;
+                return true /*stop*/;
+            }
+            return false /*continue*/;
+        }
+        // node is ts.VariableStatement
+        if (getNodeText(sourceFile, node).indexOf(typeName) >= 0) {
+            result = node;
+            return true /*stop*/;
+        }
+        return false /*continue*/;
+    });
+    return result;
+}
+function getNodeText(sourceFile, node) {
+    return sourceFile.getFullText().substring(node.pos, node.end);
+}
+function hasModifier(modifiers, kind) {
+    if (modifiers) {
+        for (let i = 0; i < modifiers.length; i++) {
+            let mod = modifiers[i];
+            if (mod.kind === kind) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function isStatic(ts, member) {
+    return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+}
+function isDefaultExport(ts, declaration) {
+    return (hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
+        && hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword));
+}
+function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums) {
+    let result = getNodeText(sourceFile, declaration);
+    if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
+        let interfaceDeclaration = declaration;
+        const staticTypeName = (isDefaultExport(ts, interfaceDeclaration)
+            ? `${importName}.default`
+            : `${importName}.${declaration.name.text}`);
+        let instanceTypeName = staticTypeName;
+        const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
+        if (typeParametersCnt > 0) {
+            let arr = [];
+            for (let i = 0; i < typeParametersCnt; i++) {
+                arr.push('any');
+            }
+            instanceTypeName = `${instanceTypeName}<${arr.join(',')}>`;
+        }
+        const members = interfaceDeclaration.members;
+        members.forEach((member) => {
+            try {
+                let memberText = getNodeText(sourceFile, member);
+                if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) {
+                    result = result.replace(memberText, '');
+                }
+                else {
+                    const memberName = member.name.text;
+                    const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
+                    if (isStatic(ts, member)) {
+                        usage.push(`a = ${staticTypeName}${memberAccess};`);
+                    }
+                    else {
+                        usage.push(`a = (<${instanceTypeName}>b)${memberAccess};`);
+                    }
+                }
+            }
+            catch (err) {
+                // life..
+            }
+        });
+    }
+    else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+        const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+        if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+            const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+            let directives = [];
+            for (const jsDocLine of jsDocLines) {
+                const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+                if (m) {
+                    directives.push([new RegExp(m[1], 'g'), m[2]]);
+                }
+            }
+            // remove the jsdoc
+            result = result.substr(jsDoc.length);
+            if (directives.length > 0) {
+                // apply replace directives
+                const replacer = createReplacerFromDirectives(directives);
+                result = replacer(result);
+            }
+        }
+    }
+    result = result.replace(/export default /g, 'export ');
+    result = result.replace(/export declare /g, 'export ');
+    result = result.replace(/declare /g, '');
+    let lines = result.split(/\r\n|\r|\n/);
+    for (let i = 0; i < lines.length; i++) {
+        if (/\s*\*/.test(lines[i])) {
+            // very likely a comment
+            continue;
+        }
+        lines[i] = lines[i].replace(/"/g, '\'');
+    }
+    result = lines.join('\n');
+    if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
+        result = result.replace(/const enum/, 'enum');
+        enums.push({
+            enumName: declaration.name.getText(sourceFile),
+            text: result
+        });
+    }
+    return result;
+}
+function format(ts, text, endl) {
+    const REALLY_FORMAT = false;
+    text = preformat(text, endl);
+    if (!REALLY_FORMAT) {
+        return text;
+    }
+    // Parse the source text
+    let sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true);
+    // Get the formatting edits on the input sources
+    let edits = ts.formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt);
+    // Apply the edits on the input code
+    return applyEdits(text, edits);
+    function countParensCurly(text) {
+        let cnt = 0;
+        for (let i = 0; i < text.length; i++) {
+            if (text.charAt(i) === '(' || text.charAt(i) === '{') {
+                cnt++;
+            }
+            if (text.charAt(i) === ')' || text.charAt(i) === '}') {
+                cnt--;
+            }
+        }
+        return cnt;
+    }
+    function repeatStr(s, cnt) {
+        let r = '';
+        for (let i = 0; i < cnt; i++) {
+            r += s;
+        }
+        return r;
+    }
+    function preformat(text, endl) {
+        let lines = text.split(endl);
+        let inComment = false;
+        let inCommentDeltaIndent = 0;
+        let indent = 0;
+        for (let i = 0; i < lines.length; i++) {
+            let line = lines[i].replace(/\s$/, '');
+            let repeat = false;
+            let lineIndent = 0;
+            do {
+                repeat = false;
+                if (line.substring(0, 4) === '    ') {
+                    line = line.substring(4);
+                    lineIndent++;
+                    repeat = true;
+                }
+                if (line.charAt(0) === '\t') {
+                    line = line.substring(1);
+                    lineIndent++;
+                    repeat = true;
+                }
+            } while (repeat);
+            if (line.length === 0) {
+                continue;
+            }
+            if (inComment) {
+                if (/\*\//.test(line)) {
+                    inComment = false;
+                }
+                lines[i] = repeatStr('\t', lineIndent + inCommentDeltaIndent) + line;
+                continue;
+            }
+            if (/\/\*/.test(line)) {
+                inComment = true;
+                inCommentDeltaIndent = indent - lineIndent;
+                lines[i] = repeatStr('\t', indent) + line;
+                continue;
+            }
+            const cnt = countParensCurly(line);
+            let shouldUnindentAfter = false;
+            let shouldUnindentBefore = false;
+            if (cnt < 0) {
+                if (/[({]/.test(line)) {
+                    shouldUnindentAfter = true;
+                }
+                else {
+                    shouldUnindentBefore = true;
+                }
+            }
+            else if (cnt === 0) {
+                shouldUnindentBefore = /^\}/.test(line);
+            }
+            let shouldIndentAfter = false;
+            if (cnt > 0) {
+                shouldIndentAfter = true;
+            }
+            else if (cnt === 0) {
+                shouldIndentAfter = /{$/.test(line);
+            }
+            if (shouldUnindentBefore) {
+                indent--;
+            }
+            lines[i] = repeatStr('\t', indent) + line;
+            if (shouldUnindentAfter) {
+                indent--;
+            }
+            if (shouldIndentAfter) {
+                indent++;
+            }
+        }
+        return lines.join(endl);
+    }
+    function getRuleProvider(options) {
+        // Share this between multiple formatters using the same options.
+        // This represents the bulk of the space the formatter uses.
+        return ts.formatting.getFormatContext(options);
+    }
+    function applyEdits(text, edits) {
+        // Apply edits in reverse on the existing text
+        let result = text;
+        for (let i = edits.length - 1; i >= 0; i--) {
+            let change = edits[i];
+            let head = result.slice(0, change.span.start);
+            let tail = result.slice(change.span.start + change.span.length);
+            result = head + change.newText + tail;
+        }
+        return result;
+    }
+}
+function createReplacerFromDirectives(directives) {
+    return (str) => {
+        for (let i = 0; i < directives.length; i++) {
+            str = str.replace(directives[i][0], directives[i][1]);
+        }
+        return str;
+    };
+}
+function createReplacer(data) {
+    data = data || '';
+    let rawDirectives = data.split(';');
+    let directives = [];
+    rawDirectives.forEach((rawDirective) => {
+        if (rawDirective.length === 0) {
+            return;
+        }
+        let pieces = rawDirective.split('=>');
+        let findStr = pieces[0];
+        let replaceStr = pieces[1];
+        findStr = findStr.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&');
+        findStr = '\\b' + findStr + '\\b';
+        directives.push([new RegExp(findStr, 'g'), replaceStr]);
+    });
+    return createReplacerFromDirectives(directives);
+}
+function generateDeclarationFile(ts, recipe, sourceFileGetter) {
+    const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
+    let lines = recipe.split(endl);
+    let result = [];
+    let usageCounter = 0;
+    let usageImports = [];
+    let usage = [];
+    let failed = false;
+    usage.push(`var a: any;`);
+    usage.push(`var b: any;`);
+    const generateUsageImport = (moduleId) => {
+        let importName = 'm' + (++usageCounter);
+        usageImports.push(`import * as ${importName} from './${moduleId.replace(/\.d\.ts$/, '')}';`);
+        return importName;
+    };
+    let enums = [];
+    let version = null;
+    lines.forEach(line => {
+        if (failed) {
+            return;
+        }
+        let m0 = line.match(/^\/\/dtsv=(\d+)$/);
+        if (m0) {
+            version = m0[1];
+        }
+        let m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
+        if (m1) {
+            let moduleId = m1[1];
+            const sourceFile = sourceFileGetter(moduleId);
+            if (!sourceFile) {
+                logErr(`While handling ${line}`);
+                logErr(`Cannot find ${moduleId}`);
+                failed = true;
+                return;
+            }
+            const importName = generateUsageImport(moduleId);
+            let replacer = createReplacer(m1[2]);
+            let typeNames = m1[3].split(/,/);
+            typeNames.forEach((typeName) => {
+                typeName = typeName.trim();
+                if (typeName.length === 0) {
+                    return;
+                }
+                let declaration = getTopLevelDeclaration(ts, sourceFile, typeName);
+                if (!declaration) {
+                    logErr(`While handling ${line}`);
+                    logErr(`Cannot find ${typeName}`);
+                    failed = true;
+                    return;
+                }
+                result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
+            });
+            return;
+        }
+        let m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
+        if (m2) {
+            let moduleId = m2[1];
+            const sourceFile = sourceFileGetter(moduleId);
+            if (!sourceFile) {
+                logErr(`While handling ${line}`);
+                logErr(`Cannot find ${moduleId}`);
+                failed = true;
+                return;
+            }
+            const importName = generateUsageImport(moduleId);
+            let replacer = createReplacer(m2[2]);
+            let typeNames = m2[3].split(/,/);
+            let typesToExcludeMap = {};
+            let typesToExcludeArr = [];
+            typeNames.forEach((typeName) => {
+                typeName = typeName.trim();
+                if (typeName.length === 0) {
+                    return;
+                }
+                typesToExcludeMap[typeName] = true;
+                typesToExcludeArr.push(typeName);
+            });
+            getAllTopLevelDeclarations(ts, sourceFile).forEach((declaration) => {
+                if (isDeclaration(ts, declaration) && declaration.name) {
+                    if (typesToExcludeMap[declaration.name.text]) {
+                        return;
+                    }
+                }
+                else {
+                    // node is ts.VariableStatement
+                    let nodeText = getNodeText(sourceFile, declaration);
+                    for (let i = 0; i < typesToExcludeArr.length; i++) {
+                        if (nodeText.indexOf(typesToExcludeArr[i]) >= 0) {
+                            return;
+                        }
+                    }
+                }
+                result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
+            });
+            return;
+        }
+        result.push(line);
+    });
+    if (failed) {
+        return null;
+    }
+    if (version !== dtsv) {
+        if (!version) {
+            logErr(`gulp watch restart required. 'monaco.d.ts.recipe' is written before versioning was introduced.`);
+        }
+        else {
+            logErr(`gulp watch restart required. 'monaco.d.ts.recipe' v${version} does not match runtime v${dtsv}.`);
+        }
+        return null;
+    }
+    let resultTxt = result.join(endl);
+    resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
+    resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
+    resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
+    resultTxt = format(ts, resultTxt, endl);
+    resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
+    enums.sort((e1, e2) => {
+        if (e1.enumName < e2.enumName) {
+            return -1;
+        }
+        if (e1.enumName > e2.enumName) {
+            return 1;
+        }
+        return 0;
+    });
+    let resultEnums = [
+        '/*---------------------------------------------------------------------------------------------',
+        ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
+        ' *  Licensed under the MIT License. See License.txt in the project root for license information.',
+        ' *--------------------------------------------------------------------------------------------*/',
+        '',
+        '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
+        ''
+    ].concat(enums.map(e => e.text)).join(endl);
+    resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
+    resultEnums = format(ts, resultEnums, endl);
+    resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
+    return {
+        result: resultTxt,
+        usageContent: `${usageImports.join('\n')}\n\n${usage.join('\n')}`,
+        enums: resultEnums
+    };
+}
+function _run(ts, sourceFileGetter) {
+    const recipe = fs.readFileSync(exports.RECIPE_PATH).toString();
+    const t = generateDeclarationFile(ts, recipe, sourceFileGetter);
+    if (!t) {
+        return null;
+    }
+    const result = t.result;
+    const usageContent = t.usageContent;
+    const enums = t.enums;
+    const currentContent = fs.readFileSync(DECLARATION_PATH).toString();
+    const one = currentContent.replace(/\r\n/gm, '\n');
+    const other = result.replace(/\r\n/gm, '\n');
+    const isTheSame = (one === other);
+    return {
+        content: result,
+        usageContent: usageContent,
+        enums: enums,
+        filePath: DECLARATION_PATH,
+        isTheSame
+    };
+}
+class FSProvider {
+    existsSync(filePath) {
+        return fs.existsSync(filePath);
+    }
+    statSync(filePath) {
+        return fs.statSync(filePath);
+    }
+    readFileSync(_moduleId, filePath) {
+        return fs.readFileSync(filePath);
+    }
+}
+exports.FSProvider = FSProvider;
+class CacheEntry {
+    constructor(sourceFile, mtime) {
+        this.sourceFile = sourceFile;
+        this.mtime = mtime;
+    }
+}
+class DeclarationResolver {
+    constructor(_fsProvider) {
+        this._fsProvider = _fsProvider;
+        this.ts = require('typescript');
+        this._sourceFileCache = Object.create(null);
+    }
+    invalidateCache(moduleId) {
+        this._sourceFileCache[moduleId] = null;
+    }
+    getDeclarationSourceFile(moduleId) {
+        if (this._sourceFileCache[moduleId]) {
+            // Since we cannot trust file watching to invalidate the cache, check also the mtime
+            const fileName = this._getFileName(moduleId);
+            const mtime = this._fsProvider.statSync(fileName).mtime.getTime();
+            if (this._sourceFileCache[moduleId].mtime !== mtime) {
+                this._sourceFileCache[moduleId] = null;
+            }
+        }
+        if (!this._sourceFileCache[moduleId]) {
+            this._sourceFileCache[moduleId] = this._getDeclarationSourceFile(moduleId);
+        }
+        return this._sourceFileCache[moduleId] ? this._sourceFileCache[moduleId].sourceFile : null;
+    }
+    _getFileName(moduleId) {
+        if (/\.d\.ts$/.test(moduleId)) {
+            return path.join(SRC, moduleId);
+        }
+        return path.join(SRC, `${moduleId}.ts`);
+    }
+    _getDeclarationSourceFile(moduleId) {
+        const fileName = this._getFileName(moduleId);
+        if (!this._fsProvider.existsSync(fileName)) {
+            return null;
+        }
+        const mtime = this._fsProvider.statSync(fileName).mtime.getTime();
+        if (/\.d\.ts$/.test(moduleId)) {
+            // const mtime = this._fsProvider.statFileSync()
+            const fileContents = this._fsProvider.readFileSync(moduleId, fileName).toString();
+            return new CacheEntry(this.ts.createSourceFile(fileName, fileContents, this.ts.ScriptTarget.ES5), mtime);
+        }
+        const fileContents = this._fsProvider.readFileSync(moduleId, fileName).toString();
+        const fileMap = {
+            'file.ts': fileContents
+        };
+        const service = this.ts.createLanguageService(new TypeScriptLanguageServiceHost(this.ts, {}, fileMap, {}));
+        const text = service.getEmitOutput('file.ts', true, true).outputFiles[0].text;
+        return new CacheEntry(this.ts.createSourceFile(fileName, text, this.ts.ScriptTarget.ES5), mtime);
+    }
+}
+exports.DeclarationResolver = DeclarationResolver;
+function run3(resolver) {
+    const sourceFileGetter = (moduleId) => resolver.getDeclarationSourceFile(moduleId);
+    return _run(resolver.ts, sourceFileGetter);
+}
+exports.run3 = run3;
+class TypeScriptLanguageServiceHost {
+    constructor(ts, libs, files, compilerOptions) {
+        this._ts = ts;
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    getCompilationSettings() {
+        return this._compilerOptions;
+    }
+    getScriptFileNames() {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    }
+    getScriptVersion(_fileName) {
+        return '1';
+    }
+    getProjectVersion() {
+        return '1';
+    }
+    getScriptSnapshot(fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return this._ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return this._ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return this._ts.ScriptSnapshot.fromString('');
+        }
+    }
+    getScriptKind(_fileName) {
+        return this._ts.ScriptKind.TS;
+    }
+    getCurrentDirectory() {
+        return '';
+    }
+    getDefaultLibFileName(_options) {
+        return 'defaultLib:es5';
+    }
+    isDefaultLibFileName(fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    }
+}
+function execute() {
+    let r = run3(new DeclarationResolver(new FSProvider()));
+    if (!r) {
+        throw new Error(`monaco.d.ts generation error - Cannot continue`);
+    }
+    return r;
+}
+exports.execute = execute;
diff --git a/build/lib/monaco-api.ts b/build/lib/monaco-api.ts
index 6604b14d9..e45422b53 100644
--- a/build/lib/monaco-api.ts
+++ b/build/lib/monaco-api.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import * as path from 'path';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
@@ -26,7 +26,7 @@ type SourceFileGetter = (moduleId: string) => ts.SourceFile | null;
 type TSTopLevelDeclaration = ts.InterfaceDeclaration | ts.EnumDeclaration | ts.ClassDeclaration | ts.TypeAliasDeclaration | ts.FunctionDeclaration | ts.ModuleDeclaration;
 type TSTopLevelDeclare = TSTopLevelDeclaration | ts.VariableStatement;
 
-function isDeclaration(a: TSTopLevelDeclare): a is TSTopLevelDeclaration {
+function isDeclaration(ts: typeof import('typescript'), a: TSTopLevelDeclare): a is TSTopLevelDeclaration {
 	return (
 		a.kind === ts.SyntaxKind.InterfaceDeclaration
 		|| a.kind === ts.SyntaxKind.EnumDeclaration
@@ -37,7 +37,7 @@ function isDeclaration(a: TSTopLevelDeclare): a is TSTopLevelDeclaration {
 	);
 }
 
-function visitTopLevelDeclarations(sourceFile: ts.SourceFile, visitor: (node: TSTopLevelDeclare) => boolean): void {
+function visitTopLevelDeclarations(ts: typeof import('typescript'), sourceFile: ts.SourceFile, visitor: (node: TSTopLevelDeclare) => boolean): void {
 	let stop = false;
 
 	let visit = (node: ts.Node): void => {
@@ -66,9 +66,9 @@ function visitTopLevelDeclarations(sourceFile: ts.SourceFile, visitor: (node: TS
 }
 
 
-function getAllTopLevelDeclarations(sourceFile: ts.SourceFile): TSTopLevelDeclare[] {
+function getAllTopLevelDeclarations(ts: typeof import('typescript'), sourceFile: ts.SourceFile): TSTopLevelDeclare[] {
 	let all: TSTopLevelDeclare[] = [];
-	visitTopLevelDeclarations(sourceFile, (node) => {
+	visitTopLevelDeclarations(ts, sourceFile, (node) => {
 		if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) {
 			let interfaceDeclaration = <ts.InterfaceDeclaration>node;
 			let triviaStart = interfaceDeclaration.pos;
@@ -90,10 +90,10 @@ function getAllTopLevelDeclarations(sourceFile: ts.SourceFile): TSTopLevelDeclar
 }
 
 
-function getTopLevelDeclaration(sourceFile: ts.SourceFile, typeName: string): TSTopLevelDeclare | null {
+function getTopLevelDeclaration(ts: typeof import('typescript'), sourceFile: ts.SourceFile, typeName: string): TSTopLevelDeclare | null {
 	let result: TSTopLevelDeclare | null = null;
-	visitTopLevelDeclarations(sourceFile, (node) => {
-		if (isDeclaration(node) && node.name) {
+	visitTopLevelDeclarations(ts, sourceFile, (node) => {
+		if (isDeclaration(ts, node) && node.name) {
 			if (node.name.text === typeName) {
 				result = node;
 				return true /*stop*/;
@@ -127,24 +127,24 @@ function hasModifier(modifiers: ts.NodeArray<ts.Modifier> | undefined, kind: ts.
 	return false;
 }
 
-function isStatic(member: ts.ClassElement | ts.TypeElement): boolean {
+function isStatic(ts: typeof import('typescript'), member: ts.ClassElement | ts.TypeElement): boolean {
 	return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
 }
 
-function isDefaultExport(declaration: ts.InterfaceDeclaration | ts.ClassDeclaration): boolean {
+function isDefaultExport(ts: typeof import('typescript'), declaration: ts.InterfaceDeclaration | ts.ClassDeclaration): boolean {
 	return (
 		hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
 		&& hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword)
 	);
 }
 
-function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string {
+function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
 		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
 
 		const staticTypeName = (
-			isDefaultExport(interfaceDeclaration)
+			isDefaultExport(ts, interfaceDeclaration)
 				? `${importName}.default`
 				: `${importName}.${declaration.name!.text}`
 		);
@@ -168,7 +168,7 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 				} else {
 					const memberName = (<ts.Identifier | ts.StringLiteral>member.name).text;
 					const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
-					if (isStatic(member)) {
+					if (isStatic(ts, member)) {
 						usage.push(`a = ${staticTypeName}${memberAccess};`);
 					} else {
 						usage.push(`a = (<${instanceTypeName}>b)${memberAccess};`);
@@ -222,7 +222,7 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 	return result;
 }
 
-function format(text: string, endl: string): string {
+function format(ts: typeof import('typescript'), text: string, endl: string): string {
 	const REALLY_FORMAT = false;
 
 	text = preformat(text, endl);
@@ -396,7 +396,7 @@ interface IEnumEntry {
 	text: string;
 }
 
-function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGetter): ITempResult | null {
+function generateDeclarationFile(ts: typeof import('typescript'), recipe: string, sourceFileGetter: SourceFileGetter): ITempResult | null {
 	const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
 
 	let lines = recipe.split(endl);
@@ -452,14 +452,14 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 				if (typeName.length === 0) {
 					return;
 				}
-				let declaration = getTopLevelDeclaration(sourceFile, typeName);
+				let declaration = getTopLevelDeclaration(ts, sourceFile, typeName);
 				if (!declaration) {
 					logErr(`While handling ${line}`);
 					logErr(`Cannot find ${typeName}`);
 					failed = true;
 					return;
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage, enums)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
 			});
 			return;
 		}
@@ -491,8 +491,8 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 				typesToExcludeArr.push(typeName);
 			});
 
-			getAllTopLevelDeclarations(sourceFile).forEach((declaration) => {
-				if (isDeclaration(declaration) && declaration.name) {
+			getAllTopLevelDeclarations(ts, sourceFile).forEach((declaration) => {
+				if (isDeclaration(ts, declaration) && declaration.name) {
 					if (typesToExcludeMap[declaration.name.text]) {
 						return;
 					}
@@ -505,7 +505,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 						}
 					}
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage, enums)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
 			});
 			return;
 		}
@@ -530,7 +530,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 	resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
 	resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
 	resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
-	resultTxt = format(resultTxt, endl);
+	resultTxt = format(ts, resultTxt, endl);
 	resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
 
 	enums.sort((e1, e2) => {
@@ -553,7 +553,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 		''
 	].concat(enums.map(e => e.text)).join(endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
-	resultEnums = format(resultEnums, endl);
+	resultEnums = format(ts, resultEnums, endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
 
 	return {
@@ -571,9 +571,9 @@ export interface IMonacoDeclarationResult {
 	isTheSame: boolean;
 }
 
-function _run(sourceFileGetter: SourceFileGetter): IMonacoDeclarationResult | null {
+function _run(ts: typeof import('typescript'), sourceFileGetter: SourceFileGetter): IMonacoDeclarationResult | null {
 	const recipe = fs.readFileSync(RECIPE_PATH).toString();
-	const t = generateDeclarationFile(recipe, sourceFileGetter);
+	const t = generateDeclarationFile(ts, recipe, sourceFileGetter);
 	if (!t) {
 		return null;
 	}
@@ -617,9 +617,11 @@ class CacheEntry {
 
 export class DeclarationResolver {
 
+	public readonly ts: typeof import('typescript');
 	private _sourceFileCache: { [moduleId: string]: CacheEntry | null; };
 
 	constructor(private readonly _fsProvider: FSProvider) {
+		this.ts = require('typescript') as typeof import('typescript');
 		this._sourceFileCache = Object.create(null);
 	}
 
@@ -659,7 +661,7 @@ export class DeclarationResolver {
 			// const mtime = this._fsProvider.statFileSync()
 			const fileContents = this._fsProvider.readFileSync(moduleId, fileName).toString();
 			return new CacheEntry(
-				ts.createSourceFile(fileName, fileContents, ts.ScriptTarget.ES5),
+				this.ts.createSourceFile(fileName, fileContents, this.ts.ScriptTarget.ES5),
 				mtime
 			);
 		}
@@ -667,10 +669,10 @@ export class DeclarationResolver {
 		const fileMap: IFileMap = {
 			'file.ts': fileContents
 		};
-		const service = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, fileMap, {}));
+		const service = this.ts.createLanguageService(new TypeScriptLanguageServiceHost(this.ts, {}, fileMap, {}));
 		const text = service.getEmitOutput('file.ts', true, true).outputFiles[0].text;
 		return new CacheEntry(
-			ts.createSourceFile(fileName, text, ts.ScriptTarget.ES5),
+			this.ts.createSourceFile(fileName, text, this.ts.ScriptTarget.ES5),
 			mtime
 		);
 	}
@@ -678,7 +680,7 @@ export class DeclarationResolver {
 
 export function run3(resolver: DeclarationResolver): IMonacoDeclarationResult | null {
 	const sourceFileGetter = (moduleId: string) => resolver.getDeclarationSourceFile(moduleId);
-	return _run(sourceFileGetter);
+	return _run(resolver.ts, sourceFileGetter);
 }
 
 
@@ -689,11 +691,13 @@ interface IFileMap { [fileName: string]: string; }
 
 class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 
+	private readonly _ts: typeof import('typescript');
 	private readonly _libs: ILibMap;
 	private readonly _files: IFileMap;
 	private readonly _compilerOptions: ts.CompilerOptions;
 
-	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+	constructor(ts: typeof import('typescript'), libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._ts = ts;
 		this._libs = libs;
 		this._files = files;
 		this._compilerOptions = compilerOptions;
@@ -719,15 +723,15 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 	}
 	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
 		if (this._files.hasOwnProperty(fileName)) {
-			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+			return this._ts.ScriptSnapshot.fromString(this._files[fileName]);
 		} else if (this._libs.hasOwnProperty(fileName)) {
-			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+			return this._ts.ScriptSnapshot.fromString(this._libs[fileName]);
 		} else {
-			return ts.ScriptSnapshot.fromString('');
+			return this._ts.ScriptSnapshot.fromString('');
 		}
 	}
 	getScriptKind(_fileName: string): ts.ScriptKind {
-		return ts.ScriptKind.TS;
+		return this._ts.ScriptKind.TS;
 	}
 	getCurrentDirectory(): string {
 		return '';
diff --git a/build/lib/nls.js b/build/lib/nls.js
new file mode 100644
index 000000000..671a0afed
--- /dev/null
+++ b/build/lib/nls.js
@@ -0,0 +1,348 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nls = void 0;
+const lazy = require("lazy.js");
+const event_stream_1 = require("event-stream");
+const File = require("vinyl");
+const sm = require("source-map");
+const path = require("path");
+var CollectStepResult;
+(function (CollectStepResult) {
+    CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes";
+    CollectStepResult[CollectStepResult["YesAndRecurse"] = 1] = "YesAndRecurse";
+    CollectStepResult[CollectStepResult["No"] = 2] = "No";
+    CollectStepResult[CollectStepResult["NoAndRecurse"] = 3] = "NoAndRecurse";
+})(CollectStepResult || (CollectStepResult = {}));
+function collect(ts, node, fn) {
+    const result = [];
+    function loop(node) {
+        const stepResult = fn(node);
+        if (stepResult === CollectStepResult.Yes || stepResult === CollectStepResult.YesAndRecurse) {
+            result.push(node);
+        }
+        if (stepResult === CollectStepResult.YesAndRecurse || stepResult === CollectStepResult.NoAndRecurse) {
+            ts.forEachChild(node, loop);
+        }
+    }
+    loop(node);
+    return result;
+}
+function clone(object) {
+    const result = {};
+    for (const id in object) {
+        result[id] = object[id];
+    }
+    return result;
+}
+function template(lines) {
+    let indent = '', wrap = '';
+    if (lines.length > 1) {
+        indent = '\t';
+        wrap = '\n';
+    }
+    return `/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+define([], [${wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
+}
+/**
+ * Returns a stream containing the patched JavaScript and source maps.
+ */
+function nls() {
+    const input = event_stream_1.through();
+    const output = input.pipe(event_stream_1.through(function (f) {
+        if (!f.sourceMap) {
+            return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
+        }
+        let source = f.sourceMap.sources[0];
+        if (!source) {
+            return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
+        }
+        const root = f.sourceMap.sourceRoot;
+        if (root) {
+            source = path.join(root, source);
+        }
+        const typescript = f.sourceMap.sourcesContent[0];
+        if (!typescript) {
+            return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
+        }
+        _nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
+    }));
+    return event_stream_1.duplex(input, output);
+}
+exports.nls = nls;
+function isImportNode(ts, node) {
+    return node.kind === ts.SyntaxKind.ImportDeclaration || node.kind === ts.SyntaxKind.ImportEqualsDeclaration;
+}
+var _nls;
+(function (_nls) {
+    function fileFrom(file, contents, path = file.path) {
+        return new File({
+            contents: Buffer.from(contents),
+            base: file.base,
+            cwd: file.cwd,
+            path: path
+        });
+    }
+    function mappedPositionFrom(source, lc) {
+        return { source, line: lc.line + 1, column: lc.character };
+    }
+    function lcFrom(position) {
+        return { line: position.line - 1, character: position.column };
+    }
+    class SingleFileServiceHost {
+        constructor(ts, options, filename, contents) {
+            this.options = options;
+            this.filename = filename;
+            this.getCompilationSettings = () => this.options;
+            this.getScriptFileNames = () => [this.filename];
+            this.getScriptVersion = () => '1';
+            this.getScriptSnapshot = (name) => name === this.filename ? this.file : this.lib;
+            this.getCurrentDirectory = () => '';
+            this.getDefaultLibFileName = () => 'lib.d.ts';
+            this.file = ts.ScriptSnapshot.fromString(contents);
+            this.lib = ts.ScriptSnapshot.fromString('');
+        }
+    }
+    function isCallExpressionWithinTextSpanCollectStep(ts, textSpan, node) {
+        if (!ts.textSpanContainsTextSpan({ start: node.pos, length: node.end - node.pos }, textSpan)) {
+            return CollectStepResult.No;
+        }
+        return node.kind === ts.SyntaxKind.CallExpression ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse;
+    }
+    function analyze(ts, contents, options = {}) {
+        const filename = 'file.ts';
+        const serviceHost = new SingleFileServiceHost(ts, Object.assign(clone(options), { noResolve: true }), filename, contents);
+        const service = ts.createLanguageService(serviceHost);
+        const sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);
+        // all imports
+        const imports = lazy(collect(ts, sourceFile, n => isImportNode(ts, n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse));
+        // import nls = require('vs/nls');
+        const importEqualsDeclarations = imports
+            .filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
+            .map(n => n)
+            .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
+            .filter(d => d.moduleReference.expression.getText() === '\'vs/nls\'');
+        // import ... from 'vs/nls';
+        const importDeclarations = imports
+            .filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
+            .map(n => n)
+            .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
+            .filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+            .filter(d => !!d.importClause && !!d.importClause.namedBindings);
+        const nlsExpressions = importEqualsDeclarations
+            .map(d => d.moduleReference.expression)
+            .concat(importDeclarations.map(d => d.moduleSpecifier))
+            .map(d => ({
+            start: ts.getLineAndCharacterOfPosition(sourceFile, d.getStart()),
+            end: ts.getLineAndCharacterOfPosition(sourceFile, d.getEnd())
+        }));
+        // `nls.localize(...)` calls
+        const nlsLocalizeCallExpressions = importDeclarations
+            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
+            .map(d => d.importClause.namedBindings.name)
+            .concat(importEqualsDeclarations.map(d => d.name))
+            // find read-only references to `nls`
+            .map(n => service.getReferencesAtPosition(filename, n.pos + 1))
+            .flatten()
+            .filter(r => !r.isWriteAccess)
+            // find the deepest call expressions AST nodes that contain those references
+            .map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
+            .map(a => lazy(a).last())
+            .filter(n => !!n)
+            .map(n => n)
+            // only `localize` calls
+            .filter(n => n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === 'localize');
+        // `localize` named imports
+        const allLocalizeImportDeclarations = importDeclarations
+            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports))
+            .map(d => [].concat(d.importClause.namedBindings.elements))
+            .flatten();
+        // `localize` read-only references
+        const localizeReferences = allLocalizeImportDeclarations
+            .filter(d => d.name.getText() === 'localize')
+            .map(n => service.getReferencesAtPosition(filename, n.pos + 1))
+            .flatten()
+            .filter(r => !r.isWriteAccess);
+        // custom named `localize` read-only references
+        const namedLocalizeReferences = allLocalizeImportDeclarations
+            .filter(d => d.propertyName && d.propertyName.getText() === 'localize')
+            .map(n => service.getReferencesAtPosition(filename, n.name.pos + 1))
+            .flatten()
+            .filter(r => !r.isWriteAccess);
+        // find the deepest call expressions AST nodes that contain those references
+        const localizeCallExpressions = localizeReferences
+            .concat(namedLocalizeReferences)
+            .map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
+            .map(a => lazy(a).last())
+            .filter(n => !!n)
+            .map(n => n);
+        // collect everything
+        const localizeCalls = nlsLocalizeCallExpressions
+            .concat(localizeCallExpressions)
+            .map(e => e.arguments)
+            .filter(a => a.length > 1)
+            .sort((a, b) => a[0].getStart() - b[0].getStart())
+            .map(a => ({
+            keySpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getEnd()) },
+            key: a[0].getText(),
+            valueSpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getEnd()) },
+            value: a[1].getText()
+        }));
+        return {
+            localizeCalls: localizeCalls.toArray(),
+            nlsExpressions: nlsExpressions.toArray()
+        };
+    }
+    class TextModel {
+        constructor(contents) {
+            const regex = /\r\n|\r|\n/g;
+            let index = 0;
+            let match;
+            this.lines = [];
+            this.lineEndings = [];
+            while (match = regex.exec(contents)) {
+                this.lines.push(contents.substring(index, match.index));
+                this.lineEndings.push(match[0]);
+                index = regex.lastIndex;
+            }
+            if (contents.length > 0) {
+                this.lines.push(contents.substring(index, contents.length));
+                this.lineEndings.push('');
+            }
+        }
+        get(index) {
+            return this.lines[index];
+        }
+        set(index, line) {
+            this.lines[index] = line;
+        }
+        get lineCount() {
+            return this.lines.length;
+        }
+        /**
+         * Applies patch(es) to the model.
+         * Multiple patches must be ordered.
+         * Does not support patches spanning multiple lines.
+         */
+        apply(patch) {
+            const startLineNumber = patch.span.start.line;
+            const endLineNumber = patch.span.end.line;
+            const startLine = this.lines[startLineNumber] || '';
+            const endLine = this.lines[endLineNumber] || '';
+            this.lines[startLineNumber] = [
+                startLine.substring(0, patch.span.start.character),
+                patch.content,
+                endLine.substring(patch.span.end.character)
+            ].join('');
+            for (let i = startLineNumber + 1; i <= endLineNumber; i++) {
+                this.lines[i] = '';
+            }
+        }
+        toString() {
+            return lazy(this.lines).zip(this.lineEndings)
+                .flatten().toArray().join('');
+        }
+    }
+    function patchJavascript(patches, contents, moduleId) {
+        const model = new TextModel(contents);
+        // patch the localize calls
+        lazy(patches).reverse().each(p => model.apply(p));
+        // patch the 'vs/nls' imports
+        const firstLine = model.get(0);
+        const patchedFirstLine = firstLine.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
+        model.set(0, patchedFirstLine);
+        return model.toString();
+    }
+    function patchSourcemap(patches, rsm, smc) {
+        const smg = new sm.SourceMapGenerator({
+            file: rsm.file,
+            sourceRoot: rsm.sourceRoot
+        });
+        patches = patches.reverse();
+        let currentLine = -1;
+        let currentLineDiff = 0;
+        let source = null;
+        smc.eachMapping(m => {
+            const patch = patches[patches.length - 1];
+            const original = { line: m.originalLine, column: m.originalColumn };
+            const generated = { line: m.generatedLine, column: m.generatedColumn };
+            if (currentLine !== generated.line) {
+                currentLineDiff = 0;
+            }
+            currentLine = generated.line;
+            generated.column += currentLineDiff;
+            if (patch && m.generatedLine - 1 === patch.span.end.line && m.generatedColumn === patch.span.end.character) {
+                const originalLength = patch.span.end.character - patch.span.start.character;
+                const modifiedLength = patch.content.length;
+                const lengthDiff = modifiedLength - originalLength;
+                currentLineDiff += lengthDiff;
+                generated.column += lengthDiff;
+                patches.pop();
+            }
+            source = rsm.sourceRoot ? path.relative(rsm.sourceRoot, m.source) : m.source;
+            source = source.replace(/\\/g, '/');
+            smg.addMapping({ source, name: m.name, original, generated });
+        }, null, sm.SourceMapConsumer.GENERATED_ORDER);
+        if (source) {
+            smg.setSourceContent(source, smc.sourceContentFor(source));
+        }
+        return JSON.parse(smg.toString());
+    }
+    function patch(ts, moduleId, typescript, javascript, sourcemap) {
+        const { localizeCalls, nlsExpressions } = analyze(ts, typescript);
+        if (localizeCalls.length === 0) {
+            return { javascript, sourcemap };
+        }
+        const nlsKeys = template(localizeCalls.map(lc => lc.key));
+        const nls = template(localizeCalls.map(lc => lc.value));
+        const smc = new sm.SourceMapConsumer(sourcemap);
+        const positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
+        let i = 0;
+        // build patches
+        const patches = lazy(localizeCalls)
+            .map(lc => ([
+            { range: lc.keySpan, content: '' + (i++) },
+            { range: lc.valueSpan, content: 'null' }
+        ]))
+            .flatten()
+            .map(c => {
+            const start = lcFrom(smc.generatedPositionFor(positionFrom(c.range.start)));
+            const end = lcFrom(smc.generatedPositionFor(positionFrom(c.range.end)));
+            return { span: { start, end }, content: c.content };
+        })
+            .toArray();
+        javascript = patchJavascript(patches, javascript, moduleId);
+        // since imports are not within the sourcemap information,
+        // we must do this MacGyver style
+        if (nlsExpressions.length) {
+            javascript = javascript.replace(/^define\(.*$/m, line => {
+                return line.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
+            });
+        }
+        sourcemap = patchSourcemap(patches, sourcemap, smc);
+        return { javascript, sourcemap, nlsKeys, nls };
+    }
+    function patchFiles(javascriptFile, typescript) {
+        const ts = require('typescript');
+        // hack?
+        const moduleId = javascriptFile.relative
+            .replace(/\.js$/, '')
+            .replace(/\\/g, '/');
+        const { javascript, sourcemap, nlsKeys, nls } = patch(ts, moduleId, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap);
+        const result = [fileFrom(javascriptFile, javascript)];
+        result[0].sourceMap = sourcemap;
+        if (nlsKeys) {
+            result.push(fileFrom(javascriptFile, nlsKeys, javascriptFile.path.replace(/\.js$/, '.nls.keys.js')));
+        }
+        if (nls) {
+            result.push(fileFrom(javascriptFile, nls, javascriptFile.path.replace(/\.js$/, '.nls.js')));
+        }
+        return result;
+    }
+    _nls.patchFiles = patchFiles;
+})(_nls || (_nls = {}));
diff --git a/build/lib/nls.ts b/build/lib/nls.ts
index bc667459b..cd184ad98 100644
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import * as lazy from 'lazy.js';
 import { duplex, through } from 'event-stream';
 import * as File from 'vinyl';
@@ -21,7 +21,7 @@ enum CollectStepResult {
 	NoAndRecurse
 }
 
-function collect(node: ts.Node, fn: (node: ts.Node) => CollectStepResult): ts.Node[] {
+function collect(ts: typeof import('typescript'), node: ts.Node, fn: (node: ts.Node) => CollectStepResult): ts.Node[] {
 	const result: ts.Node[] = [];
 
 	function loop(node: ts.Node) {
@@ -65,7 +65,7 @@ define([], [${ wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
 /**
  * Returns a stream containing the patched JavaScript and source maps.
  */
-function nls(): NodeJS.ReadWriteStream {
+export function nls(): NodeJS.ReadWriteStream {
 	const input = through();
 	const output = input.pipe(through(function (f: FileSourceMap) {
 		if (!f.sourceMap) {
@@ -87,48 +87,48 @@ function nls(): NodeJS.ReadWriteStream {
 			return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
 		}
 
-		nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
+		_nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
 	}));
 
 	return duplex(input, output);
 }
 
-function isImportNode(node: ts.Node): boolean {
+function isImportNode(ts: typeof import('typescript'), node: ts.Node): boolean {
 	return node.kind === ts.SyntaxKind.ImportDeclaration || node.kind === ts.SyntaxKind.ImportEqualsDeclaration;
 }
 
-module nls {
+module _nls {
 
-	export interface INlsStringResult {
+	interface INlsStringResult {
 		javascript: string;
 		sourcemap: sm.RawSourceMap;
 		nls?: string;
 		nlsKeys?: string;
 	}
 
-	export interface ISpan {
+	interface ISpan {
 		start: ts.LineAndCharacter;
 		end: ts.LineAndCharacter;
 	}
 
-	export interface ILocalizeCall {
+	interface ILocalizeCall {
 		keySpan: ISpan;
 		key: string;
 		valueSpan: ISpan;
 		value: string;
 	}
 
-	export interface ILocalizeAnalysisResult {
+	interface ILocalizeAnalysisResult {
 		localizeCalls: ILocalizeCall[];
 		nlsExpressions: ISpan[];
 	}
 
-	export interface IPatch {
+	interface IPatch {
 		span: ISpan;
 		content: string;
 	}
 
-	export function fileFrom(file: File, contents: string, path: string = file.path) {
+	function fileFrom(file: File, contents: string, path: string = file.path) {
 		return new File({
 			contents: Buffer.from(contents),
 			base: file.base,
@@ -137,20 +137,20 @@ module nls {
 		});
 	}
 
-	export function mappedPositionFrom(source: string, lc: ts.LineAndCharacter): sm.MappedPosition {
+	function mappedPositionFrom(source: string, lc: ts.LineAndCharacter): sm.MappedPosition {
 		return { source, line: lc.line + 1, column: lc.character };
 	}
 
-	export function lcFrom(position: sm.Position): ts.LineAndCharacter {
+	function lcFrom(position: sm.Position): ts.LineAndCharacter {
 		return { line: position.line - 1, character: position.column };
 	}
 
-	export class SingleFileServiceHost implements ts.LanguageServiceHost {
+	class SingleFileServiceHost implements ts.LanguageServiceHost {
 
 		private file: ts.IScriptSnapshot;
 		private lib: ts.IScriptSnapshot;
 
-		constructor(private options: ts.CompilerOptions, private filename: string, contents: string) {
+		constructor(ts: typeof import('typescript'), private options: ts.CompilerOptions, private filename: string, contents: string) {
 			this.file = ts.ScriptSnapshot.fromString(contents);
 			this.lib = ts.ScriptSnapshot.fromString('');
 		}
@@ -163,7 +163,7 @@ module nls {
 		getDefaultLibFileName = () => 'lib.d.ts';
 	}
 
-	function isCallExpressionWithinTextSpanCollectStep(textSpan: ts.TextSpan, node: ts.Node): CollectStepResult {
+	function isCallExpressionWithinTextSpanCollectStep(ts: typeof import('typescript'), textSpan: ts.TextSpan, node: ts.Node): CollectStepResult {
 		if (!ts.textSpanContainsTextSpan({ start: node.pos, length: node.end - node.pos }, textSpan)) {
 			return CollectStepResult.No;
 		}
@@ -171,14 +171,14 @@ module nls {
 		return node.kind === ts.SyntaxKind.CallExpression ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse;
 	}
 
-	export function analyze(contents: string, options: ts.CompilerOptions = {}): ILocalizeAnalysisResult {
+	function analyze(ts: typeof import('typescript'), contents: string, options: ts.CompilerOptions = {}): ILocalizeAnalysisResult {
 		const filename = 'file.ts';
-		const serviceHost = new SingleFileServiceHost(Object.assign(clone(options), { noResolve: true }), filename, contents);
+		const serviceHost = new SingleFileServiceHost(ts, Object.assign(clone(options), { noResolve: true }), filename, contents);
 		const service = ts.createLanguageService(serviceHost);
 		const sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);
 
 		// all imports
-		const imports = lazy(collect(sourceFile, n => isImportNode(n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse));
+		const imports = lazy(collect(ts, sourceFile, n => isImportNode(ts, n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse));
 
 		// import nls = require('vs/nls');
 		const importEqualsDeclarations = imports
@@ -215,7 +215,7 @@ module nls {
 			.filter(r => !r.isWriteAccess)
 
 			// find the deepest call expressions AST nodes that contain those references
-			.map(r => collect(sourceFile, n => isCallExpressionWithinTextSpanCollectStep(r.textSpan, n)))
+			.map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
 			.map(a => lazy(a).last())
 			.filter(n => !!n)
 			.map(n => <ts.CallExpression>n)
@@ -246,7 +246,7 @@ module nls {
 		// find the deepest call expressions AST nodes that contain those references
 		const localizeCallExpressions = localizeReferences
 			.concat(namedLocalizeReferences)
-			.map(r => collect(sourceFile, n => isCallExpressionWithinTextSpanCollectStep(r.textSpan, n)))
+			.map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
 			.map(a => lazy(a).last())
 			.filter(n => !!n)
 			.map(n => <ts.CallExpression>n);
@@ -270,7 +270,7 @@ module nls {
 		};
 	}
 
-	export class TextModel {
+	class TextModel {
 
 		private lines: string[];
 		private lineEndings: string[];
@@ -336,8 +336,8 @@ module nls {
 		}
 	}
 
-	export function patchJavascript(patches: IPatch[], contents: string, moduleId: string): string {
-		const model = new nls.TextModel(contents);
+	function patchJavascript(patches: IPatch[], contents: string, moduleId: string): string {
+		const model = new TextModel(contents);
 
 		// patch the localize calls
 		lazy(patches).reverse().each(p => model.apply(p));
@@ -350,7 +350,7 @@ module nls {
 		return model.toString();
 	}
 
-	export function patchSourcemap(patches: IPatch[], rsm: sm.RawSourceMap, smc: sm.SourceMapConsumer): sm.RawSourceMap {
+	function patchSourcemap(patches: IPatch[], rsm: sm.RawSourceMap, smc: sm.SourceMapConsumer): sm.RawSourceMap {
 		const smg = new sm.SourceMapGenerator({
 			file: rsm.file,
 			sourceRoot: rsm.sourceRoot
@@ -395,8 +395,8 @@ module nls {
 		return JSON.parse(smg.toString());
 	}
 
-	export function patch(moduleId: string, typescript: string, javascript: string, sourcemap: sm.RawSourceMap): INlsStringResult {
-		const { localizeCalls, nlsExpressions } = analyze(typescript);
+	function patch(ts: typeof import('typescript'), moduleId: string, typescript: string, javascript: string, sourcemap: sm.RawSourceMap): INlsStringResult {
+		const { localizeCalls, nlsExpressions } = analyze(ts, typescript);
 
 		if (localizeCalls.length === 0) {
 			return { javascript, sourcemap };
@@ -438,12 +438,14 @@ module nls {
 	}
 
 	export function patchFiles(javascriptFile: File, typescript: string): File[] {
+		const ts = require('typescript') as typeof import('typescript');
 		// hack?
 		const moduleId = javascriptFile.relative
 			.replace(/\.js$/, '')
 			.replace(/\\/g, '/');
 
 		const { javascript, sourcemap, nlsKeys, nls } = patch(
+			ts,
 			moduleId,
 			typescript,
 			javascriptFile.contents.toString(),
@@ -464,5 +466,3 @@ module nls {
 		return result;
 	}
 }
-
-export = nls;
diff --git a/build/lib/node.js b/build/lib/node.js
new file mode 100644
index 000000000..e727aff83
--- /dev/null
+++ b/build/lib/node.js
@@ -0,0 +1,17 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const fs = require("fs");
+const root = path.dirname(path.dirname(__dirname));
+const yarnrcPath = path.join(root, 'remote', '.yarnrc');
+const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
+const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
+const platform = process.platform;
+const arch = platform === 'darwin' ? 'x64' : process.arch;
+const node = platform === 'win32' ? 'node.exe' : 'node';
+const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
+console.log(nodePath);
diff --git a/build/lib/node.ts b/build/lib/node.ts
index 643970344..6ac45ebb1 100644
--- a/build/lib/node.ts
+++ b/build/lib/node.ts
@@ -10,7 +10,11 @@ const root = path.dirname(path.dirname(__dirname));
 const yarnrcPath = path.join(root, 'remote', '.yarnrc');
 const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
 const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
-const node = process.platform === 'win32' ? 'node.exe' : 'node';
-const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
 
-console.log(nodePath);
\ No newline at end of file
+const platform = process.platform;
+const arch = platform === 'darwin' ? 'x64' : process.arch;
+
+const node = platform === 'win32' ? 'node.exe' : 'node';
+const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
+
+console.log(nodePath);
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
new file mode 100644
index 000000000..1cfca357f
--- /dev/null
+++ b/build/lib/optimize.js
@@ -0,0 +1,202 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.minifyTask = exports.optimizeTask = exports.loaderConfig = void 0;
+const es = require("event-stream");
+const gulp = require("gulp");
+const concat = require("gulp-concat");
+const filter = require("gulp-filter");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const path = require("path");
+const pump = require("pump");
+const VinylFile = require("vinyl");
+const bundle = require("./bundle");
+const i18n_1 = require("./i18n");
+const stats_1 = require("./stats");
+const util = require("./util");
+const REPO_ROOT_PATH = path.join(__dirname, '../..');
+function log(prefix, message) {
+    fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
+}
+function loaderConfig() {
+    const result = {
+        paths: {
+            'vs': 'out-build/vs',
+            'vscode': 'empty:'
+        },
+        amdModulesPattern: /^vs\//
+    };
+    result['vs/css'] = { inlineResources: true };
+    return result;
+}
+exports.loaderConfig = loaderConfig;
+const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
+function loader(src, bundledFileHeader, bundleLoader) {
+    let sources = [
+        `${src}/vs/loader.js`
+    ];
+    if (bundleLoader) {
+        sources = sources.concat([
+            `${src}/vs/css.js`,
+            `${src}/vs/nls.js`
+        ]);
+    }
+    let isFirst = true;
+    return (gulp
+        .src(sources, { base: `${src}` })
+        .pipe(es.through(function (data) {
+        if (isFirst) {
+            isFirst = false;
+            this.emit('data', new VinylFile({
+                path: 'fake',
+                base: '.',
+                contents: Buffer.from(bundledFileHeader)
+            }));
+            this.emit('data', data);
+        }
+        else {
+            this.emit('data', data);
+        }
+    }))
+        .pipe(concat('vs/loader.js')));
+}
+function toConcatStream(src, bundledFileHeader, sources, dest, fileContentMapper) {
+    const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
+    // If a bundle ends up including in any of the sources our copyright, then
+    // insert a fake source at the beginning of each bundle with our copyright
+    let containsOurCopyright = false;
+    for (let i = 0, len = sources.length; i < len; i++) {
+        const fileContents = sources[i].contents;
+        if (IS_OUR_COPYRIGHT_REGEXP.test(fileContents)) {
+            containsOurCopyright = true;
+            break;
+        }
+    }
+    if (containsOurCopyright) {
+        sources.unshift({
+            path: null,
+            contents: bundledFileHeader
+        });
+    }
+    const treatedSources = sources.map(function (source) {
+        const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
+        const base = source.path ? root + `/${src}` : '.';
+        const path = source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake';
+        const contents = source.path ? fileContentMapper(source.contents, path) : source.contents;
+        return new VinylFile({
+            path: path,
+            base: base,
+            contents: Buffer.from(contents)
+        });
+    });
+    return es.readArray(treatedSources)
+        .pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
+        .pipe(concat(dest))
+        .pipe(stats_1.createStatsStream(dest));
+}
+function toBundleStream(src, bundledFileHeader, bundles, fileContentMapper) {
+    return es.merge(bundles.map(function (bundle) {
+        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest, fileContentMapper);
+    }));
+}
+const DEFAULT_FILE_HEADER = [
+    '/*!--------------------------------------------------------',
+    ' * Copyright (C) Microsoft Corporation. All rights reserved.',
+    ' *--------------------------------------------------------*/'
+].join('\n');
+function optimizeTask(opts) {
+    const src = opts.src;
+    const entryPoints = opts.entryPoints;
+    const resources = opts.resources;
+    const loaderConfig = opts.loaderConfig;
+    const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
+    const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
+    const out = opts.out;
+    const fileContentMapper = opts.fileContentMapper || ((contents, _path) => contents);
+    return function () {
+        const sourcemaps = require('gulp-sourcemaps');
+        const bundlesStream = es.through(); // this stream will contain the bundled files
+        const resourcesStream = es.through(); // this stream will contain the resources
+        const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
+        bundle.bundle(entryPoints, loaderConfig, function (err, result) {
+            if (err || !result) {
+                return bundlesStream.emit('error', JSON.stringify(err));
+            }
+            toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream);
+            // Remove css inlined resources
+            const filteredResources = resources.slice();
+            result.cssInlinedResources.forEach(function (resource) {
+                if (process.env['VSCODE_BUILD_VERBOSE']) {
+                    log('optimizer', 'excluding inlined: ' + resource);
+                }
+                filteredResources.push('!' + resource);
+            });
+            gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream);
+            const bundleInfoArray = [];
+            if (opts.bundleInfo) {
+                bundleInfoArray.push(new VinylFile({
+                    path: 'bundleInfo.json',
+                    base: '.',
+                    contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t'))
+                }));
+            }
+            es.readArray(bundleInfoArray).pipe(bundleInfoStream);
+        });
+        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, resourcesStream, bundleInfoStream);
+        return result
+            .pipe(sourcemaps.write('./', {
+            sourceRoot: undefined,
+            addComment: true,
+            includeContent: true
+        }))
+            .pipe(opts.languages && opts.languages.length ? i18n_1.processNlsFiles({
+            fileHeader: bundledFileHeader,
+            languages: opts.languages
+        }) : es.through())
+            .pipe(gulp.dest(out));
+    };
+}
+exports.optimizeTask = optimizeTask;
+function minifyTask(src, sourceMapBaseUrl) {
+    const esbuild = require('esbuild');
+    const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
+    return cb => {
+        const cssnano = require('cssnano');
+        const postcss = require('gulp-postcss');
+        const sourcemaps = require('gulp-sourcemaps');
+        const jsFilter = filter('**/*.js', { restore: true });
+        const cssFilter = filter('**/*.css', { restore: true });
+        pump(gulp.src([src + '/**', '!' + src + '/**/*.map']), jsFilter, sourcemaps.init({ loadMaps: true }), es.map((f, cb) => {
+            esbuild.build({
+                entryPoints: [f.path],
+                minify: true,
+                sourcemap: 'external',
+                outdir: '.',
+                platform: 'node',
+                target: ['node12.18'],
+                write: false
+            }).then(res => {
+                const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path));
+                const sourceMapFile = res.outputFiles.find(f => /\.js\.map$/.test(f.path));
+                f.contents = Buffer.from(jsFile.contents);
+                f.sourceMap = JSON.parse(sourceMapFile.text);
+                cb(undefined, f);
+            }, cb);
+        }), jsFilter.restore, cssFilter, postcss([cssnano({ preset: 'default' })]), cssFilter.restore, sourcemaps.mapSources((sourcePath) => {
+            if (sourcePath === 'bootstrap-fork.js') {
+                return 'bootstrap-fork.orig.js';
+            }
+            return sourcePath;
+        }), sourcemaps.write('./', {
+            sourceMappingURL,
+            sourceRoot: undefined,
+            includeContent: true,
+            addComment: true
+        }), gulp.dest(src + '-min'), (err) => cb(err));
+    };
+}
+exports.minifyTask = minifyTask;
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 86400889d..c3c29e4a7 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -8,17 +8,11 @@
 import * as es from 'event-stream';
 import * as gulp from 'gulp';
 import * as concat from 'gulp-concat';
-import * as minifyCSS from 'gulp-cssnano';
 import * as filter from 'gulp-filter';
-import * as flatmap from 'gulp-flatmap';
-import * as sourcemaps from 'gulp-sourcemaps';
-import * as uglify from 'gulp-uglify';
-import * as composer from 'gulp-uglify/composer';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import * as path from 'path';
 import * as pump from 'pump';
-import * as terser from 'terser';
 import * as VinylFile from 'vinyl';
 import * as bundle from './bundle';
 import { Language, processNlsFiles } from './i18n';
@@ -184,6 +178,8 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 	const fileContentMapper = opts.fileContentMapper || ((contents: string, _path: string) => contents);
 
 	return function () {
+		const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
+
 		const bundlesStream = es.through(); // this stream will contain the bundled files
 		const resourcesStream = es.through(); // this stream will contain the resources
 		const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
@@ -235,62 +231,15 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 	};
 }
 
-declare class FileWithCopyright extends VinylFile {
-	public __hasOurCopyright: boolean;
-}
-/**
- * Wrap around uglify and allow the preserveComments function
- * to have a file "context" to include our copyright only once per file.
- */
-function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
-	const preserveComments = (f: FileWithCopyright) => {
-		return (_node: any, comment: { value: string; type: string; }) => {
-			const text = comment.value;
-			const type = comment.type;
-
-			if (/@minifier_do_not_preserve/.test(text)) {
-				return false;
-			}
-
-			const isOurCopyright = IS_OUR_COPYRIGHT_REGEXP.test(text);
-
-			if (isOurCopyright) {
-				if (f.__hasOurCopyright) {
-					return false;
-				}
-				f.__hasOurCopyright = true;
-				return true;
-			}
-
-			if ('comment2' === type) {
-				// check for /*!. Note that text doesn't contain leading /*
-				return (text.length > 0 && text[0] === '!') || /@preserve|license|@cc_on|copyright/i.test(text);
-			} else if ('comment1' === type) {
-				return /license|copyright/i.test(text);
-			}
-			return false;
-		};
-	};
-
-	const minify = (composer as any)(terser);
-	const input = es.through();
-	const output = input
-		.pipe(flatmap((stream, f) => {
-			return stream.pipe(minify({
-				output: {
-					comments: preserveComments(<FileWithCopyright>f),
-					max_line_len: 1024
-				}
-			}));
-		}));
-
-	return es.duplex(input, output);
-}
-
 export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
+	const esbuild = require('esbuild') as typeof import('esbuild');
 	const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
 
 	return cb => {
+		const cssnano = require('cssnano') as typeof import('cssnano');
+		const postcss = require('gulp-postcss') as typeof import('gulp-postcss');
+		const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
+
 		const jsFilter = filter('**/*.js', { restore: true });
 		const cssFilter = filter('**/*.css', { restore: true });
 
@@ -298,10 +247,28 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 			gulp.src([src + '/**', '!' + src + '/**/*.map']),
 			jsFilter,
 			sourcemaps.init({ loadMaps: true }),
-			uglifyWithCopyrights(),
+			es.map((f: any, cb) => {
+				esbuild.build({
+					entryPoints: [f.path],
+					minify: true,
+					sourcemap: 'external',
+					outdir: '.',
+					platform: 'node',
+					target: ['node12.18'],
+					write: false
+				}).then(res => {
+					const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path))!;
+					const sourceMapFile = res.outputFiles.find(f => /\.js\.map$/.test(f.path))!;
+
+					f.contents = Buffer.from(jsFile.contents);
+					f.sourceMap = JSON.parse(sourceMapFile.text);
+
+					cb(undefined, f);
+				}, cb);
+			}),
 			jsFilter.restore,
 			cssFilter,
-			minifyCSS({ reduceIdents: false }),
+			postcss([cssnano({ preset: 'default' })]),
 			cssFilter.restore,
 			(<any>sourcemaps).mapSources((sourcePath: string) => {
 				if (sourcePath === 'bootstrap-fork.js') {
@@ -316,13 +283,7 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 				includeContent: true,
 				addComment: true
 			} as any),
-			gulp.dest(src + '-min')
-			, (err: any) => {
-				if (err instanceof (uglify as any).GulpUglifyError) {
-					console.error(`Uglify error in '${err.cause && err.cause.filename}'`);
-				}
-
-				cb(err);
-			});
+			gulp.dest(src + '-min'),
+			(err: any) => cb(err));
 	};
 }
diff --git a/build/lib/preLaunch.js b/build/lib/preLaunch.js
new file mode 100644
index 000000000..1aecbe190
--- /dev/null
+++ b/build/lib/preLaunch.js
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-check
+const path = require("path");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
+const rootDir = path.resolve(__dirname, '..', '..');
+function runProcess(command, args = []) {
+    return new Promise((resolve, reject) => {
+        const child = child_process_1.spawn(command, args, { cwd: rootDir, stdio: 'inherit', env: process.env });
+        child.on('exit', err => !err ? resolve() : process.exit(err !== null && err !== void 0 ? err : 1));
+        child.on('error', reject);
+    });
+}
+async function exists(subdir) {
+    try {
+        await fs_1.promises.stat(path.join(rootDir, subdir));
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+async function ensureNodeModules() {
+    if (!(await exists('node_modules'))) {
+        await runProcess(yarn);
+    }
+}
+async function getElectron() {
+    await runProcess(yarn, ['electron']);
+}
+async function ensureCompiled() {
+    if (!(await exists('out'))) {
+        await runProcess(yarn, ['compile']);
+    }
+}
+async function main() {
+    await ensureNodeModules();
+    await getElectron();
+    await ensureCompiled();
+    // Can't require this until after dependencies are installed
+    const { getBuiltInExtensions } = require('./builtInExtensions');
+    await getBuiltInExtensions();
+}
+if (require.main === module) {
+    main().catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
+}
diff --git a/build/lib/reporter.js b/build/lib/reporter.js
new file mode 100644
index 000000000..def8f24a0
--- /dev/null
+++ b/build/lib/reporter.js
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createReporter = void 0;
+const es = require("event-stream");
+const _ = require("underscore");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+const fs = require("fs");
+const path = require("path");
+class ErrorLog {
+    constructor(id) {
+        this.id = id;
+        this.allErrors = [];
+        this.startTime = null;
+        this.count = 0;
+    }
+    onStart() {
+        if (this.count++ > 0) {
+            return;
+        }
+        this.startTime = new Date().getTime();
+        fancyLog(`Starting ${ansiColors.green('compilation')}${this.id ? ansiColors.blue(` ${this.id}`) : ''}...`);
+    }
+    onEnd() {
+        if (--this.count > 0) {
+            return;
+        }
+        this.log();
+    }
+    log() {
+        const errors = _.flatten(this.allErrors);
+        const seen = new Set();
+        errors.map(err => {
+            if (!seen.has(err)) {
+                seen.add(err);
+                fancyLog(`${ansiColors.red('Error')}: ${err}`);
+            }
+        });
+        fancyLog(`Finished ${ansiColors.green('compilation')}${this.id ? ansiColors.blue(` ${this.id}`) : ''} with ${errors.length} errors after ${ansiColors.magenta((new Date().getTime() - this.startTime) + ' ms')}`);
+        const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/s;
+        const messages = errors
+            .map(err => regex.exec(err))
+            .filter(match => !!match)
+            .map(x => x)
+            .map(([, path, line, column, message]) => ({ path, line: parseInt(line), column: parseInt(column), message }));
+        try {
+            const logFileName = 'log' + (this.id ? `_${this.id}` : '');
+            fs.writeFileSync(path.join(buildLogFolder, logFileName), JSON.stringify(messages));
+        }
+        catch (err) {
+            //noop
+        }
+    }
+}
+const errorLogsById = new Map();
+function getErrorLog(id = '') {
+    let errorLog = errorLogsById.get(id);
+    if (!errorLog) {
+        errorLog = new ErrorLog(id);
+        errorLogsById.set(id, errorLog);
+    }
+    return errorLog;
+}
+const buildLogFolder = path.join(path.dirname(path.dirname(__dirname)), '.build');
+try {
+    fs.mkdirSync(buildLogFolder);
+}
+catch (err) {
+    // ignore
+}
+function createReporter(id) {
+    const errorLog = getErrorLog(id);
+    const errors = [];
+    errorLog.allErrors.push(errors);
+    const result = (err) => errors.push(err);
+    result.hasErrors = () => errors.length > 0;
+    result.end = (emitError) => {
+        errors.length = 0;
+        errorLog.onStart();
+        return es.through(undefined, function () {
+            errorLog.onEnd();
+            if (emitError && errors.length > 0) {
+                if (!errors.__logged__) {
+                    errorLog.log();
+                }
+                errors.__logged__ = true;
+                const err = new Error(`Found ${errors.length} errors`);
+                err.__reporter__ = true;
+                this.emit('error', err);
+            }
+            else {
+                this.emit('end');
+            }
+        });
+    };
+    return result;
+}
+exports.createReporter = createReporter;
diff --git a/build/lib/snapshotLoader.js b/build/lib/snapshotLoader.js
new file mode 100644
index 000000000..ee626a0f7
--- /dev/null
+++ b/build/lib/snapshotLoader.js
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+var snaps;
+(function (snaps) {
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+    const cp = require('child_process');
+    const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
+    const product = require('../../product.json');
+    const arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
+    //
+    let loaderFilepath;
+    let startupBlobFilepath;
+    switch (process.platform) {
+        case 'darwin':
+            loaderFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Resources/app/out/vs/loader.js`;
+            startupBlobFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`;
+            break;
+        case 'win32':
+        case 'linux':
+            loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
+            startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
+            break;
+        default:
+            throw new Error('Unknown platform');
+    }
+    loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
+    startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
+    snapshotLoader(loaderFilepath, startupBlobFilepath);
+    function snapshotLoader(loaderFilepath, startupBlobFilepath) {
+        const inputFile = fs.readFileSync(loaderFilepath);
+        const wrappedInputFile = `
+		var Monaco_Loader_Init;
+		(function() {
+			var doNotInitLoader = true;
+			${inputFile.toString()};
+			Monaco_Loader_Init = function() {
+				AMDLoader.init();
+				CSSLoaderPlugin.init();
+				NLSLoaderPlugin.init();
+
+				return { define, require };
+			}
+		})();
+		`;
+        const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
+        console.log(wrappedInputFilepath);
+        fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
+        cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
+    }
+})(snaps || (snaps = {}));
diff --git a/build/lib/standalone.js b/build/lib/standalone.js
new file mode 100644
index 000000000..91a693ce2
--- /dev/null
+++ b/build/lib/standalone.js
@@ -0,0 +1,322 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createESMSourcesAndResources2 = exports.extractEditor = void 0;
+const fs = require("fs");
+const path = require("path");
+const tss = require("./treeshaking");
+const REPO_ROOT = path.join(__dirname, '../../');
+const SRC_DIR = path.join(REPO_ROOT, 'src');
+let dirCache = {};
+function writeFile(filePath, contents) {
+    function ensureDirs(dirPath) {
+        if (dirCache[dirPath]) {
+            return;
+        }
+        dirCache[dirPath] = true;
+        ensureDirs(path.dirname(dirPath));
+        if (fs.existsSync(dirPath)) {
+            return;
+        }
+        fs.mkdirSync(dirPath);
+    }
+    ensureDirs(path.dirname(filePath));
+    fs.writeFileSync(filePath, contents);
+}
+function extractEditor(options) {
+    var _a;
+    const ts = require('typescript');
+    const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.monaco.json')).toString());
+    let compilerOptions;
+    if (tsConfig.extends) {
+        compilerOptions = Object.assign({}, require(path.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
+        delete tsConfig.extends;
+    }
+    else {
+        compilerOptions = tsConfig.compilerOptions;
+    }
+    tsConfig.compilerOptions = compilerOptions;
+    compilerOptions.noEmit = false;
+    compilerOptions.noUnusedLocals = false;
+    compilerOptions.preserveConstEnums = false;
+    compilerOptions.declaration = false;
+    compilerOptions.moduleResolution = ts.ModuleResolutionKind.Classic;
+    options.compilerOptions = compilerOptions;
+    console.log(`Running tree shaker with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`);
+    // Take the extra included .d.ts files from `tsconfig.monaco.json`
+    options.typings = tsConfig.include.filter(includedFile => /\.d\.ts$/.test(includedFile));
+    // Add extra .d.ts files from `node_modules/@types/`
+    if (Array.isArray((_a = options.compilerOptions) === null || _a === void 0 ? void 0 : _a.types)) {
+        options.compilerOptions.types.forEach((type) => {
+            options.typings.push(`../node_modules/@types/${type}/index.d.ts`);
+        });
+    }
+    let result = tss.shake(options);
+    for (let fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            writeFile(path.join(options.destRoot, fileName), result[fileName]);
+        }
+    }
+    let copied = {};
+    const copyFile = (fileName) => {
+        if (copied[fileName]) {
+            return;
+        }
+        copied[fileName] = true;
+        const srcPath = path.join(options.sourcesRoot, fileName);
+        const dstPath = path.join(options.destRoot, fileName);
+        writeFile(dstPath, fs.readFileSync(srcPath));
+    };
+    const writeOutputFile = (fileName, contents) => {
+        writeFile(path.join(options.destRoot, fileName), contents);
+    };
+    for (let fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            const fileContents = result[fileName];
+            const info = ts.preProcessFile(fileContents);
+            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+                const importedFileName = info.importedFiles[i].fileName;
+                let importedFilePath;
+                if (/^vs\/css!/.test(importedFileName)) {
+                    importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
+                }
+                else {
+                    importedFilePath = importedFileName;
+                }
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
+                    importedFilePath = path.join(path.dirname(fileName), importedFilePath);
+                }
+                if (/\.css$/.test(importedFilePath)) {
+                    transportCSS(importedFilePath, copyFile, writeOutputFile);
+                }
+                else {
+                    if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
+                        copyFile(importedFilePath + '.js');
+                    }
+                }
+            }
+        }
+    }
+    delete tsConfig.compilerOptions.moduleResolution;
+    writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
+    [
+        'vs/css.build.js',
+        'vs/css.d.ts',
+        'vs/css.js',
+        'vs/loader.js',
+        'vs/nls.build.js',
+        'vs/nls.d.ts',
+        'vs/nls.js',
+        'vs/nls.mock.ts',
+    ].forEach(copyFile);
+}
+exports.extractEditor = extractEditor;
+function createESMSourcesAndResources2(options) {
+    const ts = require('typescript');
+    const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
+    const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
+    const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
+    const getDestAbsoluteFilePath = (file) => {
+        let dest = options.renames[file.replace(/\\/g, '/')] || file;
+        if (dest === 'tsconfig.json') {
+            return path.join(OUT_FOLDER, `tsconfig.json`);
+        }
+        if (/\.ts$/.test(dest)) {
+            return path.join(OUT_FOLDER, dest);
+        }
+        return path.join(OUT_RESOURCES_FOLDER, dest);
+    };
+    const allFiles = walkDirRecursive(SRC_FOLDER);
+    for (const file of allFiles) {
+        if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
+            continue;
+        }
+        if (file === 'tsconfig.json') {
+            const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
+            tsConfig.compilerOptions.module = 'es6';
+            tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
+            write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
+            continue;
+        }
+        if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file) || /\.ttf$/.test(file)) {
+            // Transport the files directly
+            write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
+            continue;
+        }
+        if (/\.ts$/.test(file)) {
+            // Transform the .ts file
+            let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
+            const info = ts.preProcessFile(fileContents);
+            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+                const importedFilename = info.importedFiles[i].fileName;
+                const pos = info.importedFiles[i].pos;
+                const end = info.importedFiles[i].end;
+                let importedFilepath;
+                if (/^vs\/css!/.test(importedFilename)) {
+                    importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+                }
+                else {
+                    importedFilepath = importedFilename;
+                }
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+                    importedFilepath = path.join(path.dirname(file), importedFilepath);
+                }
+                let relativePath;
+                if (importedFilepath === path.dirname(file).replace(/\\/g, '/')) {
+                    relativePath = '../' + path.basename(path.dirname(file));
+                }
+                else if (importedFilepath === path.dirname(path.dirname(file)).replace(/\\/g, '/')) {
+                    relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
+                }
+                else {
+                    relativePath = path.relative(path.dirname(file), importedFilepath);
+                }
+                relativePath = relativePath.replace(/\\/g, '/');
+                if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+                    relativePath = './' + relativePath;
+                }
+                fileContents = (fileContents.substring(0, pos + 1)
+                    + relativePath
+                    + fileContents.substring(end + 1));
+            }
+            fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+                return `import * as ${m1} from ${m2};`;
+            });
+            write(getDestAbsoluteFilePath(file), fileContents);
+            continue;
+        }
+        console.log(`UNKNOWN FILE: ${file}`);
+    }
+    function walkDirRecursive(dir) {
+        if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') {
+            dir += '/';
+        }
+        let result = [];
+        _walkDirRecursive(dir, result, dir.length);
+        return result;
+    }
+    function _walkDirRecursive(dir, result, trimPos) {
+        const files = fs.readdirSync(dir);
+        for (let i = 0; i < files.length; i++) {
+            const file = path.join(dir, files[i]);
+            if (fs.statSync(file).isDirectory()) {
+                _walkDirRecursive(file, result, trimPos);
+            }
+            else {
+                result.push(file.substr(trimPos));
+            }
+        }
+    }
+    function write(absoluteFilePath, contents) {
+        if (/(\.ts$)|(\.js$)/.test(absoluteFilePath)) {
+            contents = toggleComments(contents.toString());
+        }
+        writeFile(absoluteFilePath, contents);
+        function toggleComments(fileContents) {
+            let lines = fileContents.split(/\r\n|\r|\n/);
+            let mode = 0;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
+                if (mode === 0) {
+                    if (/\/\/ ESM-comment-begin/.test(line)) {
+                        mode = 1;
+                        continue;
+                    }
+                    if (/\/\/ ESM-uncomment-begin/.test(line)) {
+                        mode = 2;
+                        continue;
+                    }
+                    continue;
+                }
+                if (mode === 1) {
+                    if (/\/\/ ESM-comment-end/.test(line)) {
+                        mode = 0;
+                        continue;
+                    }
+                    lines[i] = '// ' + line;
+                    continue;
+                }
+                if (mode === 2) {
+                    if (/\/\/ ESM-uncomment-end/.test(line)) {
+                        mode = 0;
+                        continue;
+                    }
+                    lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+                        return indent;
+                    });
+                }
+            }
+            return lines.join('\n');
+        }
+    }
+}
+exports.createESMSourcesAndResources2 = createESMSourcesAndResources2;
+function transportCSS(module, enqueue, write) {
+    if (!/\.css/.test(module)) {
+        return false;
+    }
+    const filename = path.join(SRC_DIR, module);
+    const fileContents = fs.readFileSync(filename).toString();
+    const inlineResources = 'base64'; // see https://github.com/microsoft/monaco-editor/issues/148
+    const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64');
+    write(module, newContents);
+    return true;
+    function _rewriteOrInlineUrls(contents, forceBase64) {
+        return _replaceURL(contents, (url) => {
+            const fontMatch = url.match(/^(.*).ttf\?(.*)$/);
+            if (fontMatch) {
+                const relativeFontPath = `${fontMatch[1]}.ttf`; // trim the query parameter
+                const fontPath = path.join(path.dirname(module), relativeFontPath);
+                enqueue(fontPath);
+                return relativeFontPath;
+            }
+            const imagePath = path.join(path.dirname(module), url);
+            const fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
+            const MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
+            let DATA = ';base64,' + fileContents.toString('base64');
+            if (!forceBase64 && /\.svg$/.test(url)) {
+                // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
+                let newText = fileContents.toString()
+                    .replace(/"/g, '\'')
+                    .replace(/</g, '%3C')
+                    .replace(/>/g, '%3E')
+                    .replace(/&/g, '%26')
+                    .replace(/#/g, '%23')
+                    .replace(/\s+/g, ' ');
+                let encodedData = ',' + newText;
+                if (encodedData.length < DATA.length) {
+                    DATA = encodedData;
+                }
+            }
+            return '"data:' + MIME + DATA + '"';
+        });
+    }
+    function _replaceURL(contents, replacer) {
+        // Use ")" as the terminator as quotes are oftentimes not used at all
+        return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_, ...matches) => {
+            let url = matches[0];
+            // Eliminate starting quotes (the initial whitespace is not captured)
+            if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
+                url = url.substring(1);
+            }
+            // The ending whitespace is captured
+            while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
+                url = url.substring(0, url.length - 1);
+            }
+            // Eliminate ending quotes
+            if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
+                url = url.substring(0, url.length - 1);
+            }
+            if (!_startsWith(url, 'data:') && !_startsWith(url, 'http://') && !_startsWith(url, 'https://')) {
+                url = replacer(url);
+            }
+            return 'url(' + url + ')';
+        });
+    }
+    function _startsWith(haystack, needle) {
+        return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
+    }
+}
diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts
index 51868c22f..8b87b9fa4 100644
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as ts from 'typescript';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as tss from './treeshaking';
@@ -31,6 +30,8 @@ function writeFile(filePath: string, contents: Buffer | string): void {
 }
 
 export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: string }): void {
+	const ts = require('typescript') as typeof import('typescript');
+
 	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.monaco.json')).toString());
 	let compilerOptions: { [key: string]: any };
 	if (tsConfig.extends) {
@@ -134,6 +135,8 @@ export interface IOptions2 {
 }
 
 export function createESMSourcesAndResources2(options: IOptions2): void {
+	const ts = require('typescript') as typeof import('typescript');
+
 	const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
 	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
 	const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
diff --git a/build/lib/stats.js b/build/lib/stats.js
new file mode 100644
index 000000000..9a239e886
--- /dev/null
+++ b/build/lib/stats.js
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.submitAllStats = exports.createStatsStream = void 0;
+const es = require("event-stream");
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+class Entry {
+    constructor(name, totalCount, totalSize) {
+        this.name = name;
+        this.totalCount = totalCount;
+        this.totalSize = totalSize;
+    }
+    toString(pretty) {
+        if (!pretty) {
+            if (this.totalCount === 1) {
+                return `${this.name}: ${this.totalSize} bytes`;
+            }
+            else {
+                return `${this.name}: ${this.totalCount} files with ${this.totalSize} bytes`;
+            }
+        }
+        else {
+            if (this.totalCount === 1) {
+                return `Stats for '${ansiColors.grey(this.name)}': ${Math.round(this.totalSize / 1204)}KB`;
+            }
+            else {
+                const count = this.totalCount < 100
+                    ? ansiColors.green(this.totalCount.toString())
+                    : ansiColors.red(this.totalCount.toString());
+                return `Stats for '${ansiColors.grey(this.name)}': ${count} files, ${Math.round(this.totalSize / 1204)}KB`;
+            }
+        }
+    }
+}
+const _entries = new Map();
+function createStatsStream(group, log) {
+    const entry = new Entry(group, 0, 0);
+    _entries.set(entry.name, entry);
+    return es.through(function (data) {
+        const file = data;
+        if (typeof file.path === 'string') {
+            entry.totalCount += 1;
+            if (Buffer.isBuffer(file.contents)) {
+                entry.totalSize += file.contents.length;
+            }
+            else if (file.stat && typeof file.stat.size === 'number') {
+                entry.totalSize += file.stat.size;
+            }
+            else {
+                // funky file...
+            }
+        }
+        this.emit('data', data);
+    }, function () {
+        if (log) {
+            if (entry.totalCount === 1) {
+                fancyLog(`Stats for '${ansiColors.grey(entry.name)}': ${Math.round(entry.totalSize / 1204)}KB`);
+            }
+            else {
+                const count = entry.totalCount < 100
+                    ? ansiColors.green(entry.totalCount.toString())
+                    : ansiColors.red(entry.totalCount.toString());
+                fancyLog(`Stats for '${ansiColors.grey(entry.name)}': ${count} files, ${Math.round(entry.totalSize / 1204)}KB`);
+            }
+        }
+        this.emit('end');
+    });
+}
+exports.createStatsStream = createStatsStream;
+function submitAllStats(productJson, commit) {
+    const appInsights = require('applicationinsights');
+    const sorted = [];
+    // move entries for single files to the front
+    _entries.forEach(value => {
+        if (value.totalCount === 1) {
+            sorted.unshift(value);
+        }
+        else {
+            sorted.push(value);
+        }
+    });
+    // print to console
+    for (const entry of sorted) {
+        console.log(entry.toString(true));
+    }
+    // send data as telementry event when the
+    // product is configured to send telemetry
+    if (!productJson || !productJson.aiConfig || typeof productJson.aiConfig.asimovKey !== 'string') {
+        return Promise.resolve(false);
+    }
+    return new Promise(resolve => {
+        try {
+            const sizes = {};
+            const counts = {};
+            for (const entry of sorted) {
+                sizes[entry.name] = entry.totalSize;
+                counts[entry.name] = entry.totalCount;
+            }
+            appInsights.setup(productJson.aiConfig.asimovKey)
+                .setAutoCollectConsole(false)
+                .setAutoCollectExceptions(false)
+                .setAutoCollectPerformance(false)
+                .setAutoCollectRequests(false)
+                .setAutoCollectDependencies(false)
+                .setAutoDependencyCorrelation(false)
+                .start();
+            appInsights.defaultClient.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
+            /* __GDPR__
+                "monacoworkbench/packagemetrics" : {
+                    "commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+                    "size" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+                    "count" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+                }
+            */
+            appInsights.defaultClient.trackEvent({
+                name: 'monacoworkbench/packagemetrics',
+                properties: { commit, size: JSON.stringify(sizes), count: JSON.stringify(counts) }
+            });
+            appInsights.defaultClient.flush({
+                callback: () => {
+                    appInsights.dispose();
+                    resolve(true);
+                }
+            });
+        }
+        catch (err) {
+            console.error('ERROR sending build stats as telemetry event!');
+            console.error(err);
+            resolve(false);
+        }
+    });
+}
+exports.submitAllStats = submitAllStats;
diff --git a/build/lib/stats.ts b/build/lib/stats.ts
index a94b1c9ae..ce141a2f7 100644
--- a/build/lib/stats.ts
+++ b/build/lib/stats.ts
@@ -9,7 +9,6 @@ import * as es from 'event-stream';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import * as File from 'vinyl';
-import * as appInsights from 'applicationinsights';
 
 class Entry {
 	constructor(readonly name: string, public totalCount: number, public totalSize: number) { }
@@ -75,6 +74,7 @@ export function createStatsStream(group: string, log?: boolean): es.ThroughStrea
 }
 
 export function submitAllStats(productJson: any, commit: string): Promise<boolean> {
+	const appInsights = require('applicationinsights') as typeof import('applicationinsights');
 
 	const sorted: Entry[] = [];
 	// move entries for single files to the front
diff --git a/build/lib/task.js b/build/lib/task.js
new file mode 100644
index 000000000..d08ab8acd
--- /dev/null
+++ b/build/lib/task.js
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.define = exports.parallel = exports.series = void 0;
+const fancyLog = require("fancy-log");
+const ansiColors = require("ansi-colors");
+function _isPromise(p) {
+    if (typeof p.then === 'function') {
+        return true;
+    }
+    return false;
+}
+function _renderTime(time) {
+    return `${Math.round(time)} ms`;
+}
+async function _execute(task) {
+    const name = task.taskName || task.displayName || `<anonymous>`;
+    if (!task._tasks) {
+        fancyLog('Starting', ansiColors.cyan(name), '...');
+    }
+    const startTime = process.hrtime();
+    await _doExecute(task);
+    const elapsedArr = process.hrtime(startTime);
+    const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
+    if (!task._tasks) {
+        fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.magenta(_renderTime(elapsedNanoseconds / 1e6)));
+    }
+}
+async function _doExecute(task) {
+    // Always invoke as if it were a callback task
+    return new Promise((resolve, reject) => {
+        if (task.length === 1) {
+            // this is a callback task
+            task((err) => {
+                if (err) {
+                    return reject(err);
+                }
+                resolve();
+            });
+            return;
+        }
+        const taskResult = task();
+        if (typeof taskResult === 'undefined') {
+            // this is a sync task
+            resolve();
+            return;
+        }
+        if (_isPromise(taskResult)) {
+            // this is a promise returning task
+            taskResult.then(resolve, reject);
+            return;
+        }
+        // this is a stream returning task
+        taskResult.on('end', _ => resolve());
+        taskResult.on('error', err => reject(err));
+    });
+}
+function series(...tasks) {
+    const result = async () => {
+        for (let i = 0; i < tasks.length; i++) {
+            await _execute(tasks[i]);
+        }
+    };
+    result._tasks = tasks;
+    return result;
+}
+exports.series = series;
+function parallel(...tasks) {
+    const result = async () => {
+        await Promise.all(tasks.map(t => _execute(t)));
+    };
+    result._tasks = tasks;
+    return result;
+}
+exports.parallel = parallel;
+function define(name, task) {
+    if (task._tasks) {
+        // This is a composite task
+        const lastTask = task._tasks[task._tasks.length - 1];
+        if (lastTask._tasks || lastTask.taskName) {
+            // This is a composite task without a real task function
+            // => generate a fake task function
+            return define(name, series(task, () => Promise.resolve()));
+        }
+        lastTask.taskName = name;
+        task.displayName = name;
+        return task;
+    }
+    // This is a simple task
+    task.taskName = name;
+    task.displayName = name;
+    return task;
+}
+exports.define = define;
diff --git a/build/lib/test/i18n.test.js b/build/lib/test/i18n.test.js
new file mode 100644
index 000000000..3dd104259
--- /dev/null
+++ b/build/lib/test/i18n.test.js
@@ -0,0 +1,40 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = require("assert");
+const i18n = require("../i18n");
+suite('XLF Parser Tests', () => {
+    const sampleXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source></trans-unit></body></file></xliff>';
+    const sampleTranslatedXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" target-language="ru" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source><target>Кнопка #1</target></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source><target>Кнопка #2 &amp;</target></trans-unit></body></file></xliff>';
+    const originalFilePath = 'vs/base/common/keybinding';
+    const keys = ['key1', 'key2'];
+    const messages = ['Key #1', 'Key #2 &'];
+    const translatedMessages = { key1: 'Кнопка #1', key2: 'Кнопка #2 &' };
+    test('Keys & messages to XLF conversion', () => {
+        const xlf = new i18n.XLF('vscode-workbench');
+        xlf.addFile(originalFilePath, keys, messages);
+        const xlfString = xlf.toString();
+        assert.strictEqual(xlfString.replace(/\s{2,}/g, ''), sampleXlf);
+    });
+    test('XLF to keys & messages conversion', () => {
+        i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) {
+            assert.deepEqual(resolvedFiles[0].messages, translatedMessages);
+            assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath);
+        });
+    });
+    test('JSON file source path to Transifex resource match', () => {
+        const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench';
+        const platform = { name: 'vs/platform', project: editorProject }, editorContrib = { name: 'vs/editor/contrib', project: editorProject }, editor = { name: 'vs/editor', project: editorProject }, base = { name: 'vs/base', project: editorProject }, code = { name: 'vs/code', project: workbenchProject }, workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject }, workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject }, workbench = { name: 'vs/workbench', project: workbenchProject };
+        assert.deepEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
+        assert.deepEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
+        assert.deepEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
+        assert.deepEqual(i18n.getResource('vs/base/common/errorMessage'), base);
+        assert.deepEqual(i18n.getResource('vs/code/electron-main/window'), code);
+        assert.deepEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
+        assert.deepEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
+        assert.deepEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
+    });
+});
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
new file mode 100644
index 000000000..19c45a104
--- /dev/null
+++ b/build/lib/treeshaking.js
@@ -0,0 +1,780 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shake = exports.toStringShakeLevel = exports.ShakeLevel = void 0;
+const fs = require("fs");
+const path = require("path");
+const TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+var ShakeLevel;
+(function (ShakeLevel) {
+    ShakeLevel[ShakeLevel["Files"] = 0] = "Files";
+    ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile";
+    ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers";
+})(ShakeLevel = exports.ShakeLevel || (exports.ShakeLevel = {}));
+function toStringShakeLevel(shakeLevel) {
+    switch (shakeLevel) {
+        case 0 /* Files */:
+            return 'Files (0)';
+        case 1 /* InnerFile */:
+            return 'InnerFile (1)';
+        case 2 /* ClassMembers */:
+            return 'ClassMembers (2)';
+    }
+}
+exports.toStringShakeLevel = toStringShakeLevel;
+function printDiagnostics(options, diagnostics) {
+    for (const diag of diagnostics) {
+        let result = '';
+        if (diag.file) {
+            result += `${path.join(options.sourcesRoot, diag.file.fileName)}`;
+        }
+        if (diag.file && diag.start) {
+            let location = diag.file.getLineAndCharacterOfPosition(diag.start);
+            result += `:${location.line + 1}:${location.character}`;
+        }
+        result += ` - ` + JSON.stringify(diag.messageText);
+        console.log(result);
+    }
+}
+function shake(options) {
+    const ts = require('typescript');
+    const languageService = createTypeScriptLanguageService(ts, options);
+    const program = languageService.getProgram();
+    const globalDiagnostics = program.getGlobalDiagnostics();
+    if (globalDiagnostics.length > 0) {
+        printDiagnostics(options, globalDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
+    const syntacticDiagnostics = program.getSyntacticDiagnostics();
+    if (syntacticDiagnostics.length > 0) {
+        printDiagnostics(options, syntacticDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
+    const semanticDiagnostics = program.getSemanticDiagnostics();
+    if (semanticDiagnostics.length > 0) {
+        printDiagnostics(options, semanticDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
+    markNodes(ts, languageService, options);
+    return generateResult(ts, languageService, options.shakeLevel);
+}
+exports.shake = shake;
+//#region Discovery, LanguageService & Setup
+function createTypeScriptLanguageService(ts, options) {
+    // Discover referenced files
+    const FILES = discoverAndReadFiles(ts, options);
+    // Add fake usage files
+    options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
+        FILES[`inlineEntryPoint.${index}.ts`] = inlineEntryPoint;
+    });
+    // Add additional typings
+    options.typings.forEach((typing) => {
+        const filePath = path.join(options.sourcesRoot, typing);
+        FILES[typing] = fs.readFileSync(filePath).toString();
+    });
+    // Resolve libs
+    const RESOLVED_LIBS = processLibFiles(ts, options);
+    const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
+    const host = new TypeScriptLanguageServiceHost(ts, RESOLVED_LIBS, FILES, compilerOptions);
+    return ts.createLanguageService(host);
+}
+/**
+ * Read imports and follow them until all files have been handled
+ */
+function discoverAndReadFiles(ts, options) {
+    const FILES = {};
+    const in_queue = Object.create(null);
+    const queue = [];
+    const enqueue = (moduleId) => {
+        if (in_queue[moduleId]) {
+            return;
+        }
+        in_queue[moduleId] = true;
+        queue.push(moduleId);
+    };
+    options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
+    while (queue.length > 0) {
+        const moduleId = queue.shift();
+        const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        if (fs.existsSync(dts_filename)) {
+            const dts_filecontents = fs.readFileSync(dts_filename).toString();
+            FILES[`${moduleId}.d.ts`] = dts_filecontents;
+            continue;
+        }
+        const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+        if (fs.existsSync(js_filename)) {
+            // This is an import for a .js file, so ignore it...
+            continue;
+        }
+        let ts_filename;
+        if (options.redirects[moduleId]) {
+            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
+        }
+        else {
+            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
+        }
+        const ts_filecontents = fs.readFileSync(ts_filename).toString();
+        const info = ts.preProcessFile(ts_filecontents);
+        for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+            const importedFileName = info.importedFiles[i].fileName;
+            if (options.importIgnorePattern.test(importedFileName)) {
+                // Ignore vs/css! imports
+                continue;
+            }
+            let importedModuleId = importedFileName;
+            if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
+                importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+            }
+            enqueue(importedModuleId);
+        }
+        FILES[`${moduleId}.ts`] = ts_filecontents;
+    }
+    return FILES;
+}
+/**
+ * Read lib files and follow lib references
+ */
+function processLibFiles(ts, options) {
+    const stack = [...options.compilerOptions.lib];
+    const result = {};
+    while (stack.length > 0) {
+        const filename = `lib.${stack.shift().toLowerCase()}.d.ts`;
+        const key = `defaultLib:${filename}`;
+        if (!result[key]) {
+            // add this file
+            const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+            const sourceText = fs.readFileSync(filepath).toString();
+            result[key] = sourceText;
+            // precess dependencies and "recurse"
+            const info = ts.preProcessFile(sourceText);
+            for (let ref of info.libReferenceDirectives) {
+                stack.push(ref.fileName);
+            }
+        }
+    }
+    return result;
+}
+/**
+ * A TypeScript language service host
+ */
+class TypeScriptLanguageServiceHost {
+    constructor(ts, libs, files, compilerOptions) {
+        this._ts = ts;
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    getCompilationSettings() {
+        return this._compilerOptions;
+    }
+    getScriptFileNames() {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    }
+    getScriptVersion(_fileName) {
+        return '1';
+    }
+    getProjectVersion() {
+        return '1';
+    }
+    getScriptSnapshot(fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return this._ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return this._ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return this._ts.ScriptSnapshot.fromString('');
+        }
+    }
+    getScriptKind(_fileName) {
+        return this._ts.ScriptKind.TS;
+    }
+    getCurrentDirectory() {
+        return '';
+    }
+    getDefaultLibFileName(_options) {
+        return 'defaultLib:lib.d.ts';
+    }
+    isDefaultLibFileName(fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    }
+}
+//#endregion
+//#region Tree Shaking
+var NodeColor;
+(function (NodeColor) {
+    NodeColor[NodeColor["White"] = 0] = "White";
+    NodeColor[NodeColor["Gray"] = 1] = "Gray";
+    NodeColor[NodeColor["Black"] = 2] = "Black";
+})(NodeColor || (NodeColor = {}));
+function getColor(node) {
+    return node.$$$color || 0 /* White */;
+}
+function setColor(node, color) {
+    node.$$$color = color;
+}
+function nodeOrParentIsBlack(node) {
+    while (node) {
+        const color = getColor(node);
+        if (color === 2 /* Black */) {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
+function nodeOrChildIsBlack(node) {
+    if (getColor(node) === 2 /* Black */) {
+        return true;
+    }
+    for (const child of node.getChildren()) {
+        if (nodeOrChildIsBlack(child)) {
+            return true;
+        }
+    }
+    return false;
+}
+function markNodes(ts, languageService, options) {
+    const program = languageService.getProgram();
+    if (!program) {
+        throw new Error('Could not get program from language service');
+    }
+    if (options.shakeLevel === 0 /* Files */) {
+        // Mark all source files Black
+        program.getSourceFiles().forEach((sourceFile) => {
+            setColor(sourceFile, 2 /* Black */);
+        });
+        return;
+    }
+    const black_queue = [];
+    const gray_queue = [];
+    const export_import_queue = [];
+    const sourceFilesLoaded = {};
+    function enqueueTopLevelModuleStatements(sourceFile) {
+        sourceFile.forEachChild((node) => {
+            if (ts.isImportDeclaration(node)) {
+                if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                return;
+            }
+            if (ts.isExportDeclaration(node)) {
+                if (!node.exportClause && node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier)) {
+                    // export * from "foo";
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                if (node.exportClause && ts.isNamedExports(node.exportClause)) {
+                    for (const exportSpecifier of node.exportClause.elements) {
+                        export_import_queue.push(exportSpecifier);
+                    }
+                }
+                return;
+            }
+            if (ts.isExpressionStatement(node)
+                || ts.isIfStatement(node)
+                || ts.isIterationStatement(node, true)
+                || ts.isExportAssignment(node)) {
+                enqueue_black(node);
+            }
+            if (ts.isImportEqualsDeclaration(node)) {
+                if (/export/.test(node.getFullText(sourceFile))) {
+                    // e.g. "export import Severity = BaseSeverity;"
+                    enqueue_black(node);
+                }
+            }
+        });
+    }
+    function enqueue_gray(node) {
+        if (nodeOrParentIsBlack(node) || getColor(node) === 1 /* Gray */) {
+            return;
+        }
+        setColor(node, 1 /* Gray */);
+        gray_queue.push(node);
+    }
+    function enqueue_black(node) {
+        const previousColor = getColor(node);
+        if (previousColor === 2 /* Black */) {
+            return;
+        }
+        if (previousColor === 1 /* Gray */) {
+            // remove from gray queue
+            gray_queue.splice(gray_queue.indexOf(node), 1);
+            setColor(node, 0 /* White */);
+            // add to black queue
+            enqueue_black(node);
+            // // move from one queue to the other
+            // black_queue.push(node);
+            // setColor(node, NodeColor.Black);
+            return;
+        }
+        if (nodeOrParentIsBlack(node)) {
+            return;
+        }
+        const fileName = node.getSourceFile().fileName;
+        if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
+            setColor(node, 2 /* Black */);
+            return;
+        }
+        const sourceFile = node.getSourceFile();
+        if (!sourceFilesLoaded[sourceFile.fileName]) {
+            sourceFilesLoaded[sourceFile.fileName] = true;
+            enqueueTopLevelModuleStatements(sourceFile);
+        }
+        if (ts.isSourceFile(node)) {
+            return;
+        }
+        setColor(node, 2 /* Black */);
+        black_queue.push(node);
+        if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isPropertyDeclaration(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
+            const references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+            if (references) {
+                for (let i = 0, len = references.length; i < len; i++) {
+                    const reference = references[i];
+                    const referenceSourceFile = program.getSourceFile(reference.fileName);
+                    if (!referenceSourceFile) {
+                        continue;
+                    }
+                    const referenceNode = getTokenAtPosition(ts, referenceSourceFile, reference.textSpan.start, false, false);
+                    if (ts.isMethodDeclaration(referenceNode.parent)
+                        || ts.isPropertyDeclaration(referenceNode.parent)
+                        || ts.isGetAccessor(referenceNode.parent)
+                        || ts.isSetAccessor(referenceNode.parent)) {
+                        enqueue_gray(referenceNode.parent);
+                    }
+                }
+            }
+        }
+    }
+    function enqueueFile(filename) {
+        const sourceFile = program.getSourceFile(filename);
+        if (!sourceFile) {
+            console.warn(`Cannot find source file ${filename}`);
+            return;
+        }
+        enqueue_black(sourceFile);
+    }
+    function enqueueImport(node, importText) {
+        if (options.importIgnorePattern.test(importText)) {
+            // this import should be ignored
+            return;
+        }
+        const nodeSourceFile = node.getSourceFile();
+        let fullPath;
+        if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+            fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
+        }
+        else {
+            fullPath = importText + '.ts';
+        }
+        enqueueFile(fullPath);
+    }
+    options.entryPoints.forEach(moduleId => enqueueFile(moduleId + '.ts'));
+    // Add fake usage files
+    options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint.${index}.ts`));
+    let step = 0;
+    const checker = program.getTypeChecker();
+    while (black_queue.length > 0 || gray_queue.length > 0) {
+        ++step;
+        let node;
+        if (step % 100 === 0) {
+            console.log(`Treeshaking - ${Math.floor(100 * step / (step + black_queue.length + gray_queue.length))}% - ${step}/${step + black_queue.length + gray_queue.length} (${black_queue.length}, ${gray_queue.length})`);
+        }
+        if (black_queue.length === 0) {
+            for (let i = 0; i < gray_queue.length; i++) {
+                const node = gray_queue[i];
+                const nodeParent = node.parent;
+                if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
+                    gray_queue.splice(i, 1);
+                    black_queue.push(node);
+                    setColor(node, 2 /* Black */);
+                    i--;
+                }
+            }
+        }
+        if (black_queue.length > 0) {
+            node = black_queue.shift();
+        }
+        else {
+            // only gray nodes remaining...
+            break;
+        }
+        const nodeSourceFile = node.getSourceFile();
+        const loop = (node) => {
+            const [symbol, symbolImportNode] = getRealNodeSymbol(ts, checker, node);
+            if (symbolImportNode) {
+                setColor(symbolImportNode, 2 /* Black */);
+            }
+            if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
+                for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+                    const declaration = symbol.declarations[i];
+                    if (ts.isSourceFile(declaration)) {
+                        // Do not enqueue full source files
+                        // (they can be the declaration of a module import)
+                        continue;
+                    }
+                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) {
+                        enqueue_black(declaration.name);
+                        for (let j = 0; j < declaration.members.length; j++) {
+                            const member = declaration.members[j];
+                            const memberName = member.name ? member.name.getText() : null;
+                            if (ts.isConstructorDeclaration(member)
+                                || ts.isConstructSignatureDeclaration(member)
+                                || ts.isIndexSignatureDeclaration(member)
+                                || ts.isCallSignatureDeclaration(member)
+                                || memberName === '[Symbol.iterator]'
+                                || memberName === '[Symbol.toStringTag]'
+                                || memberName === 'toJSON'
+                                || memberName === 'toString'
+                                || memberName === 'dispose' // TODO: keeping all `dispose` methods
+                                || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`...
+                            ) {
+                                enqueue_black(member);
+                            }
+                        }
+                        // queue the heritage clauses
+                        if (declaration.heritageClauses) {
+                            for (let heritageClause of declaration.heritageClauses) {
+                                enqueue_black(heritageClause);
+                            }
+                        }
+                    }
+                    else {
+                        enqueue_black(declaration);
+                    }
+                }
+            }
+            node.forEachChild(loop);
+        };
+        node.forEachChild(loop);
+    }
+    while (export_import_queue.length > 0) {
+        const node = export_import_queue.shift();
+        if (nodeOrParentIsBlack(node)) {
+            continue;
+        }
+        const symbol = node.symbol;
+        if (!symbol) {
+            continue;
+        }
+        const aliased = checker.getAliasedSymbol(symbol);
+        if (aliased.declarations && aliased.declarations.length > 0) {
+            if (nodeOrParentIsBlack(aliased.declarations[0]) || nodeOrChildIsBlack(aliased.declarations[0])) {
+                setColor(node, 2 /* Black */);
+            }
+        }
+    }
+}
+function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
+    for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+        const declaration = symbol.declarations[i];
+        const declarationSourceFile = declaration.getSourceFile();
+        if (nodeSourceFile === declarationSourceFile) {
+            if (declaration.pos <= node.pos && node.end <= declaration.end) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function generateResult(ts, languageService, shakeLevel) {
+    const program = languageService.getProgram();
+    if (!program) {
+        throw new Error('Could not get program from language service');
+    }
+    let result = {};
+    const writeFile = (filePath, contents) => {
+        result[filePath] = contents;
+    };
+    program.getSourceFiles().forEach((sourceFile) => {
+        const fileName = sourceFile.fileName;
+        if (/^defaultLib:/.test(fileName)) {
+            return;
+        }
+        const destination = fileName;
+        if (/\.d\.ts$/.test(fileName)) {
+            if (nodeOrChildIsBlack(sourceFile)) {
+                writeFile(destination, sourceFile.text);
+            }
+            return;
+        }
+        let text = sourceFile.text;
+        let result = '';
+        function keep(node) {
+            result += text.substring(node.pos, node.end);
+        }
+        function write(data) {
+            result += data;
+        }
+        function writeMarkedNodes(node) {
+            if (getColor(node) === 2 /* Black */) {
+                return keep(node);
+            }
+            // Always keep certain top-level statements
+            if (ts.isSourceFile(node.parent)) {
+                if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
+                    return keep(node);
+                }
+                if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
+                    return keep(node);
+                }
+            }
+            // Keep the entire import in import * as X cases
+            if (ts.isImportDeclaration(node)) {
+                if (node.importClause && node.importClause.namedBindings) {
+                    if (ts.isNamespaceImport(node.importClause.namedBindings)) {
+                        if (getColor(node.importClause.namedBindings) === 2 /* Black */) {
+                            return keep(node);
+                        }
+                    }
+                    else {
+                        let survivingImports = [];
+                        for (const importNode of node.importClause.namedBindings.elements) {
+                            if (getColor(importNode) === 2 /* Black */) {
+                                survivingImports.push(importNode.getFullText(sourceFile));
+                            }
+                        }
+                        const leadingTriviaWidth = node.getLeadingTriviaWidth();
+                        const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+                        if (survivingImports.length > 0) {
+                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* Black */) {
+                                return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+                            }
+                            return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+                        }
+                        else {
+                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* Black */) {
+                                return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                        return keep(node);
+                    }
+                }
+            }
+            if (ts.isExportDeclaration(node)) {
+                if (node.exportClause && node.moduleSpecifier && ts.isNamedExports(node.exportClause)) {
+                    let survivingExports = [];
+                    for (const exportSpecifier of node.exportClause.elements) {
+                        if (getColor(exportSpecifier) === 2 /* Black */) {
+                            survivingExports.push(exportSpecifier.getFullText(sourceFile));
+                        }
+                    }
+                    const leadingTriviaWidth = node.getLeadingTriviaWidth();
+                    const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+                    if (survivingExports.length > 0) {
+                        return write(`${leadingTrivia}export {${survivingExports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+                    }
+                }
+            }
+            if (shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
+                let toWrite = node.getFullText();
+                for (let i = node.members.length - 1; i >= 0; i--) {
+                    const member = node.members[i];
+                    if (getColor(member) === 2 /* Black */ || !member.name) {
+                        // keep method
+                        continue;
+                    }
+                    let pos = member.pos - node.pos;
+                    let end = member.end - node.pos;
+                    toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
+                }
+                return write(toWrite);
+            }
+            if (ts.isFunctionDeclaration(node)) {
+                // Do not go inside functions if they haven't been marked
+                return;
+            }
+            node.forEachChild(writeMarkedNodes);
+        }
+        if (getColor(sourceFile) !== 2 /* Black */) {
+            if (!nodeOrChildIsBlack(sourceFile)) {
+                // none of the elements are reachable => don't write this file at all!
+                return;
+            }
+            sourceFile.forEachChild(writeMarkedNodes);
+            result += sourceFile.endOfFileToken.getFullText(sourceFile);
+        }
+        else {
+            result = text;
+        }
+        writeFile(destination, result);
+    });
+    return result;
+}
+//#endregion
+//#region Utils
+function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration) {
+    if (!program.isSourceFileDefaultLibrary(declaration.getSourceFile()) && declaration.heritageClauses) {
+        for (const heritageClause of declaration.heritageClauses) {
+            for (const type of heritageClause.types) {
+                const symbol = findSymbolFromHeritageType(ts, checker, type);
+                if (symbol) {
+                    const decl = symbol.valueDeclaration || (symbol.declarations && symbol.declarations[0]);
+                    if (decl && program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+function findSymbolFromHeritageType(ts, checker, type) {
+    if (ts.isExpressionWithTypeArguments(type)) {
+        return findSymbolFromHeritageType(ts, checker, type.expression);
+    }
+    if (ts.isIdentifier(type)) {
+        return getRealNodeSymbol(ts, checker, type)[0];
+    }
+    if (ts.isPropertyAccessExpression(type)) {
+        return findSymbolFromHeritageType(ts, checker, type.name);
+    }
+    return null;
+}
+/**
+ * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
+ */
+function getRealNodeSymbol(ts, checker, node) {
+    const getPropertySymbolsFromContextualType = ts.getPropertySymbolsFromContextualType;
+    const getContainingObjectLiteralElement = ts.getContainingObjectLiteralElement;
+    const getNameFromPropertyName = ts.getNameFromPropertyName;
+    // Go to the original declaration for cases:
+    //
+    //   (1) when the aliased symbol was declared in the location(parent).
+    //   (2) when the aliased symbol is originating from an import.
+    //
+    function shouldSkipAlias(node, declaration) {
+        if (!ts.isShorthandPropertyAssignment(node) && node.kind !== ts.SyntaxKind.Identifier) {
+            return false;
+        }
+        if (node.parent === declaration) {
+            return true;
+        }
+        switch (declaration.kind) {
+            case ts.SyntaxKind.ImportClause:
+            case ts.SyntaxKind.ImportEqualsDeclaration:
+                return true;
+            case ts.SyntaxKind.ImportSpecifier:
+                return declaration.parent.kind === ts.SyntaxKind.NamedImports;
+            default:
+                return false;
+        }
+    }
+    if (!ts.isShorthandPropertyAssignment(node)) {
+        if (node.getChildCount() !== 0) {
+            return [null, null];
+        }
+    }
+    const { parent } = node;
+    let symbol = (ts.isShorthandPropertyAssignment(node)
+        ? checker.getShorthandAssignmentValueSymbol(node)
+        : checker.getSymbolAtLocation(node));
+    let importNode = null;
+    // If this is an alias, and the request came at the declaration location
+    // get the aliased symbol instead. This allows for goto def on an import e.g.
+    //   import {A, B} from "mod";
+    // to jump to the implementation directly.
+    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+        const aliased = checker.getAliasedSymbol(symbol);
+        if (aliased.declarations) {
+            // We should mark the import as visited
+            importNode = symbol.declarations[0];
+            symbol = aliased;
+        }
+    }
+    if (symbol) {
+        // Because name in short-hand property assignment has two different meanings: property name and property value,
+        // using go-to-definition at such position should go to the variable declaration of the property value rather than
+        // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+        // is performed at the location of property access, we would like to go to definition of the property in the short-hand
+        // assignment. This case and others are handled by the following code.
+        if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+            symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+        }
+        // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+        // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+        // and return the property declaration for the referenced property.
+        // For example:
+        //      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+        //
+        //      function bar<T>(onfulfilled: (value: T) => void) { //....}
+        //      interface Test {
+        //          pr/*destination*/op1: number
+        //      }
+        //      bar<Test>(({pr/*goto*/op1})=>{});
+        if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
+            (node === (parent.propertyName || parent.name))) {
+            const name = getNameFromPropertyName(node);
+            const type = checker.getTypeAtLocation(parent.parent);
+            if (name && type) {
+                if (type.isUnion()) {
+                    const prop = type.types[0].getProperty(name);
+                    if (prop) {
+                        symbol = prop;
+                    }
+                }
+                else {
+                    const prop = type.getProperty(name);
+                    if (prop) {
+                        symbol = prop;
+                    }
+                }
+            }
+        }
+        // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+        // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+        // For example
+        //      interface Props{
+        //          /*first*/prop1: number
+        //          prop2: boolean
+        //      }
+        //      function Foo(arg: Props) {}
+        //      Foo( { pr/*1*/op1: 10, prop2: false })
+        const element = getContainingObjectLiteralElement(node);
+        if (element) {
+            const contextualType = element && checker.getContextualType(element.parent);
+            if (contextualType) {
+                const propertySymbols = getPropertySymbolsFromContextualType(element, checker, contextualType, /*unionSymbolOk*/ false);
+                if (propertySymbols) {
+                    symbol = propertySymbols[0];
+                }
+            }
+        }
+    }
+    if (symbol && symbol.declarations) {
+        return [symbol, importNode];
+    }
+    return [null, null];
+}
+/** Get the token whose text contains the position */
+function getTokenAtPosition(ts, sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) {
+    let current = sourceFile;
+    outer: while (true) {
+        // find the child that contains 'position'
+        for (const child of current.getChildren()) {
+            const start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+            if (start > position) {
+                // If this child begins after position, then all subsequent children will as well.
+                break;
+            }
+            const end = child.getEnd();
+            if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
+                current = child;
+                continue outer;
+            }
+        }
+        return current;
+    }
+}
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
index 405336bfc..cb0426792 100644
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -7,7 +7,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 
 const TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
 
@@ -82,7 +82,8 @@ function printDiagnostics(options: ITreeShakingOptions, diagnostics: ReadonlyArr
 }
 
 export function shake(options: ITreeShakingOptions): ITreeShakingResult {
-	const languageService = createTypeScriptLanguageService(options);
+	const ts = require('typescript') as typeof import('typescript');
+	const languageService = createTypeScriptLanguageService(ts, options);
 	const program = languageService.getProgram()!;
 
 	const globalDiagnostics = program.getGlobalDiagnostics();
@@ -103,15 +104,15 @@ export function shake(options: ITreeShakingOptions): ITreeShakingResult {
 		throw new Error(`Compilation Errors encountered.`);
 	}
 
-	markNodes(languageService, options);
+	markNodes(ts, languageService, options);
 
-	return generateResult(languageService, options.shakeLevel);
+	return generateResult(ts, languageService, options.shakeLevel);
 }
 
 //#region Discovery, LanguageService & Setup
-function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.LanguageService {
+function createTypeScriptLanguageService(ts: typeof import('typescript'), options: ITreeShakingOptions): ts.LanguageService {
 	// Discover referenced files
-	const FILES = discoverAndReadFiles(options);
+	const FILES = discoverAndReadFiles(ts, options);
 
 	// Add fake usage files
 	options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
@@ -125,18 +126,18 @@ function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.Langu
 	});
 
 	// Resolve libs
-	const RESOLVED_LIBS = processLibFiles(options);
+	const RESOLVED_LIBS = processLibFiles(ts, options);
 
 	const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
 
-	const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, compilerOptions);
+	const host = new TypeScriptLanguageServiceHost(ts, RESOLVED_LIBS, FILES, compilerOptions);
 	return ts.createLanguageService(host);
 }
 
 /**
  * Read imports and follow them until all files have been handled
  */
-function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
+function discoverAndReadFiles(ts: typeof import('typescript'), options: ITreeShakingOptions): IFileMap {
 	const FILES: IFileMap = {};
 
 	const in_queue: { [module: string]: boolean; } = Object.create(null);
@@ -199,7 +200,7 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
 /**
  * Read lib files and follow lib references
  */
-function processLibFiles(options: ITreeShakingOptions): ILibMap {
+function processLibFiles(ts: typeof import('typescript'), options: ITreeShakingOptions): ILibMap {
 
 	const stack: string[] = [...options.compilerOptions.lib];
 	const result: ILibMap = {};
@@ -232,11 +233,13 @@ interface IFileMap { [fileName: string]: string; }
  */
 class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 
+	private readonly _ts: typeof import('typescript');
 	private readonly _libs: ILibMap;
 	private readonly _files: IFileMap;
 	private readonly _compilerOptions: ts.CompilerOptions;
 
-	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+	constructor(ts: typeof import('typescript'), libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._ts = ts;
 		this._libs = libs;
 		this._files = files;
 		this._compilerOptions = compilerOptions;
@@ -262,15 +265,15 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 	}
 	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
 		if (this._files.hasOwnProperty(fileName)) {
-			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+			return this._ts.ScriptSnapshot.fromString(this._files[fileName]);
 		} else if (this._libs.hasOwnProperty(fileName)) {
-			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+			return this._ts.ScriptSnapshot.fromString(this._libs[fileName]);
 		} else {
-			return ts.ScriptSnapshot.fromString('');
+			return this._ts.ScriptSnapshot.fromString('');
 		}
 	}
 	getScriptKind(_fileName: string): ts.ScriptKind {
-		return ts.ScriptKind.TS;
+		return this._ts.ScriptKind.TS;
 	}
 	getCurrentDirectory(): string {
 		return '';
@@ -320,7 +323,7 @@ function nodeOrChildIsBlack(node: ts.Node): boolean {
 	return false;
 }
 
-function markNodes(languageService: ts.LanguageService, options: ITreeShakingOptions) {
+function markNodes(ts: typeof import('typescript'), languageService: ts.LanguageService, options: ITreeShakingOptions) {
 	const program = languageService.getProgram();
 	if (!program) {
 		throw new Error('Could not get program from language service');
@@ -446,7 +449,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 						continue;
 					}
 
-					const referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+					const referenceNode = getTokenAtPosition(ts, referenceSourceFile, reference.textSpan.start, false, false);
 					if (
 						ts.isMethodDeclaration(referenceNode.parent)
 						|| ts.isPropertyDeclaration(referenceNode.parent)
@@ -522,7 +525,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 		const nodeSourceFile = node.getSourceFile();
 
 		const loop = (node: ts.Node) => {
-			const [symbol, symbolImportNode] = getRealNodeSymbol(checker, node);
+			const [symbol, symbolImportNode] = getRealNodeSymbol(ts, checker, node);
 			if (symbolImportNode) {
 				setColor(symbolImportNode, NodeColor.Black);
 			}
@@ -536,7 +539,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 						continue;
 					}
 
-					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program, checker, declaration)) {
+					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) {
 						enqueue_black(declaration.name!);
 
 						for (let j = 0; j < declaration.members.length; j++) {
@@ -607,7 +610,7 @@ function nodeIsInItsOwnDeclaration(nodeSourceFile: ts.SourceFile, node: ts.Node,
 	return false;
 }
 
-function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLevel): ITreeShakingResult {
+function generateResult(ts: typeof import('typescript'), languageService: ts.LanguageService, shakeLevel: ShakeLevel): ITreeShakingResult {
 	const program = languageService.getProgram();
 	if (!program) {
 		throw new Error('Could not get program from language service');
@@ -752,11 +755,11 @@ function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLe
 
 //#region Utils
 
-function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program: ts.Program, checker: ts.TypeChecker, declaration: ts.ClassDeclaration | ts.InterfaceDeclaration): boolean {
+function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts: typeof import('typescript'), program: ts.Program, checker: ts.TypeChecker, declaration: ts.ClassDeclaration | ts.InterfaceDeclaration): boolean {
 	if (!program.isSourceFileDefaultLibrary(declaration.getSourceFile()) && declaration.heritageClauses) {
 		for (const heritageClause of declaration.heritageClauses) {
 			for (const type of heritageClause.types) {
-				const symbol = findSymbolFromHeritageType(checker, type);
+				const symbol = findSymbolFromHeritageType(ts, checker, type);
 				if (symbol) {
 					const decl = symbol.valueDeclaration || (symbol.declarations && symbol.declarations[0]);
 					if (decl && program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
@@ -769,15 +772,15 @@ function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(program: ts.Progra
 	return false;
 }
 
-function findSymbolFromHeritageType(checker: ts.TypeChecker, type: ts.ExpressionWithTypeArguments | ts.Expression | ts.PrivateIdentifier): ts.Symbol | null {
+function findSymbolFromHeritageType(ts: typeof import('typescript'), checker: ts.TypeChecker, type: ts.ExpressionWithTypeArguments | ts.Expression | ts.PrivateIdentifier): ts.Symbol | null {
 	if (ts.isExpressionWithTypeArguments(type)) {
-		return findSymbolFromHeritageType(checker, type.expression);
+		return findSymbolFromHeritageType(ts, checker, type.expression);
 	}
 	if (ts.isIdentifier(type)) {
-		return getRealNodeSymbol(checker, type)[0];
+		return getRealNodeSymbol(ts, checker, type)[0];
 	}
 	if (ts.isPropertyAccessExpression(type)) {
-		return findSymbolFromHeritageType(checker, type.name);
+		return findSymbolFromHeritageType(ts, checker, type.name);
 	}
 	return null;
 }
@@ -785,7 +788,7 @@ function findSymbolFromHeritageType(checker: ts.TypeChecker, type: ts.Expression
 /**
  * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
  */
-function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol | null, ts.Declaration | null] {
+function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChecker, node: ts.Node): [ts.Symbol | null, ts.Declaration | null] {
 
 	// Use some TypeScript internals to avoid code duplication
 	type ObjectLiteralElementWithName = ts.ObjectLiteralElement & { name: ts.PropertyName; parent: ts.ObjectLiteralExpression | ts.JsxAttributes };
@@ -913,7 +916,7 @@ function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol |
 }
 
 /** Get the token whose text contains the position */
-function getTokenAtPosition(sourceFile: ts.SourceFile, position: number, allowPositionInLeadingTrivia: boolean, includeEndPosition: boolean): ts.Node {
+function getTokenAtPosition(ts: typeof import('typescript'), sourceFile: ts.SourceFile, position: number, allowPositionInLeadingTrivia: boolean, includeEndPosition: boolean): ts.Node {
 	let current: ts.Node = sourceFile;
 	outer: while (true) {
 		// find the child that contains 'position'
diff --git a/build/lib/typings/gulp-cssnano.d.ts b/build/lib/typings/gulp-cssnano.d.ts
deleted file mode 100644
index 97d382764..000000000
--- a/build/lib/typings/gulp-cssnano.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-
-declare module "gulp-cssnano" {
-	function f(opts:{reduceIdents:boolean;}): NodeJS.ReadWriteStream;
-
-	/**
-	 * This is required as per:
-	 * https://github.com/microsoft/TypeScript/issues/5073
-	 */
-	namespace f {}
-
-	export = f;
-}
diff --git a/build/lib/util.js b/build/lib/util.js
new file mode 100644
index 000000000..8d0294e4c
--- /dev/null
+++ b/build/lib/util.js
@@ -0,0 +1,276 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.rewriteSourceMappingURL = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.incremental = void 0;
+const es = require("event-stream");
+const debounce = require("debounce");
+const _filter = require("gulp-filter");
+const rename = require("gulp-rename");
+const path = require("path");
+const fs = require("fs");
+const _rimraf = require("rimraf");
+const git = require("./git");
+const VinylFile = require("vinyl");
+const root = path.dirname(path.dirname(__dirname));
+const NoCancellationToken = { isCancellationRequested: () => false };
+function incremental(streamProvider, initial, supportsCancellation) {
+    const input = es.through();
+    const output = es.through();
+    let state = 'idle';
+    let buffer = Object.create(null);
+    const token = !supportsCancellation ? undefined : { isCancellationRequested: () => Object.keys(buffer).length > 0 };
+    const run = (input, isCancellable) => {
+        state = 'running';
+        const stream = !supportsCancellation ? streamProvider() : streamProvider(isCancellable ? token : NoCancellationToken);
+        input
+            .pipe(stream)
+            .pipe(es.through(undefined, () => {
+            state = 'idle';
+            eventuallyRun();
+        }))
+            .pipe(output);
+    };
+    if (initial) {
+        run(initial, false);
+    }
+    const eventuallyRun = debounce(() => {
+        const paths = Object.keys(buffer);
+        if (paths.length === 0) {
+            return;
+        }
+        const data = paths.map(path => buffer[path]);
+        buffer = Object.create(null);
+        run(es.readArray(data), true);
+    }, 500);
+    input.on('data', (f) => {
+        buffer[f.path] = f;
+        if (state === 'idle') {
+            eventuallyRun();
+        }
+    });
+    return es.duplex(input, output);
+}
+exports.incremental = incremental;
+function fixWin32DirectoryPermissions() {
+    if (!/win32/.test(process.platform)) {
+        return es.through();
+    }
+    return es.mapSync(f => {
+        if (f.stat && f.stat.isDirectory && f.stat.isDirectory()) {
+            f.stat.mode = 16877;
+        }
+        return f;
+    });
+}
+exports.fixWin32DirectoryPermissions = fixWin32DirectoryPermissions;
+function setExecutableBit(pattern) {
+    const setBit = es.mapSync(f => {
+        if (!f.stat) {
+            f.stat = { isFile() { return true; } };
+        }
+        f.stat.mode = /* 100755 */ 33261;
+        return f;
+    });
+    if (!pattern) {
+        return setBit;
+    }
+    const input = es.through();
+    const filter = _filter(pattern, { restore: true });
+    const output = input
+        .pipe(filter)
+        .pipe(setBit)
+        .pipe(filter.restore);
+    return es.duplex(input, output);
+}
+exports.setExecutableBit = setExecutableBit;
+function toFileUri(filePath) {
+    const match = filePath.match(/^([a-z])\:(.*)$/i);
+    if (match) {
+        filePath = '/' + match[1].toUpperCase() + ':' + match[2];
+    }
+    return 'file://' + filePath.replace(/\\/g, '/');
+}
+exports.toFileUri = toFileUri;
+function skipDirectories() {
+    return es.mapSync(f => {
+        if (!f.isDirectory()) {
+            return f;
+        }
+    });
+}
+exports.skipDirectories = skipDirectories;
+function cleanNodeModules(rulePath) {
+    const rules = fs.readFileSync(rulePath, 'utf8')
+        .split(/\r?\n/g)
+        .map(line => line.trim())
+        .filter(line => line && !/^#/.test(line));
+    const excludes = rules.filter(line => !/^!/.test(line)).map(line => `!**/node_modules/${line}`);
+    const includes = rules.filter(line => /^!/.test(line)).map(line => `**/node_modules/${line.substr(1)}`);
+    const input = es.through();
+    const output = es.merge(input.pipe(_filter(['**', ...excludes])), input.pipe(_filter(includes)));
+    return es.duplex(input, output);
+}
+exports.cleanNodeModules = cleanNodeModules;
+function loadSourcemaps() {
+    const input = es.through();
+    const output = input
+        .pipe(es.map((f, cb) => {
+        if (f.sourceMap) {
+            cb(undefined, f);
+            return;
+        }
+        if (!f.contents) {
+            cb(undefined, f);
+            return;
+        }
+        const contents = f.contents.toString('utf8');
+        const reg = /\/\/# sourceMappingURL=(.*)$/g;
+        let lastMatch = null;
+        let match = null;
+        while (match = reg.exec(contents)) {
+            lastMatch = match;
+        }
+        if (!lastMatch) {
+            f.sourceMap = {
+                version: '3',
+                names: [],
+                mappings: '',
+                sources: [f.relative],
+                sourcesContent: [contents]
+            };
+            cb(undefined, f);
+            return;
+        }
+        f.contents = Buffer.from(contents.replace(/\/\/# sourceMappingURL=(.*)$/g, ''), 'utf8');
+        fs.readFile(path.join(path.dirname(f.path), lastMatch[1]), 'utf8', (err, contents) => {
+            if (err) {
+                return cb(err);
+            }
+            f.sourceMap = JSON.parse(contents);
+            cb(undefined, f);
+        });
+    }));
+    return es.duplex(input, output);
+}
+exports.loadSourcemaps = loadSourcemaps;
+function stripSourceMappingURL() {
+    const input = es.through();
+    const output = input
+        .pipe(es.mapSync(f => {
+        const contents = f.contents.toString('utf8');
+        f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, ''), 'utf8');
+        return f;
+    }));
+    return es.duplex(input, output);
+}
+exports.stripSourceMappingURL = stripSourceMappingURL;
+function rewriteSourceMappingURL(sourceMappingURLBase) {
+    const input = es.through();
+    const output = input
+        .pipe(es.mapSync(f => {
+        const contents = f.contents.toString('utf8');
+        const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path.dirname(f.relative).replace(/\\/g, '/')}/$1`;
+        f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
+        return f;
+    }));
+    return es.duplex(input, output);
+}
+exports.rewriteSourceMappingURL = rewriteSourceMappingURL;
+function rimraf(dir) {
+    const result = () => new Promise((c, e) => {
+        let retries = 0;
+        const retry = () => {
+            _rimraf(dir, { maxBusyTries: 1 }, (err) => {
+                if (!err) {
+                    return c();
+                }
+                if (err.code === 'ENOTEMPTY' && ++retries < 5) {
+                    return setTimeout(() => retry(), 10);
+                }
+                return e(err);
+            });
+        };
+        retry();
+    });
+    result.taskName = `clean-${path.basename(dir).toLowerCase()}`;
+    return result;
+}
+exports.rimraf = rimraf;
+function _rreaddir(dirPath, prepend, result) {
+    const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            _rreaddir(path.join(dirPath, entry.name), `${prepend}/${entry.name}`, result);
+        }
+        else {
+            result.push(`${prepend}/${entry.name}`);
+        }
+    }
+}
+function rreddir(dirPath) {
+    let result = [];
+    _rreaddir(dirPath, '', result);
+    return result;
+}
+exports.rreddir = rreddir;
+function ensureDir(dirPath) {
+    if (fs.existsSync(dirPath)) {
+        return;
+    }
+    ensureDir(path.dirname(dirPath));
+    fs.mkdirSync(dirPath);
+}
+exports.ensureDir = ensureDir;
+function getVersion(root) {
+    let version = process.env['BUILD_SOURCEVERSION'];
+    if (!version || !/^[0-9a-f]{40}$/i.test(version)) {
+        version = git.getVersion(root);
+    }
+    return version;
+}
+exports.getVersion = getVersion;
+function rebase(count) {
+    return rename(f => {
+        const parts = f.dirname ? f.dirname.split(/[\/\\]/) : [];
+        f.dirname = parts.slice(count).join(path.sep);
+    });
+}
+exports.rebase = rebase;
+function filter(fn) {
+    const result = es.through(function (data) {
+        if (fn(data)) {
+            this.emit('data', data);
+        }
+        else {
+            result.restore.push(data);
+        }
+    });
+    result.restore = es.through();
+    return result;
+}
+exports.filter = filter;
+function versionStringToNumber(versionStr) {
+    const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
+    const match = versionStr.match(semverRegex);
+    if (!match) {
+        throw new Error('Version string is not properly formatted: ' + versionStr);
+    }
+    return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
+}
+exports.versionStringToNumber = versionStringToNumber;
+function streamToPromise(stream) {
+    return new Promise((c, e) => {
+        stream.on('error', err => e(err));
+        stream.on('end', () => c());
+    });
+}
+exports.streamToPromise = streamToPromise;
+function getElectronVersion() {
+    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+    return target;
+}
+exports.getElectronVersion = getElectronVersion;
diff --git a/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css b/build/lib/watch/index.js
similarity index 64%
rename from src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
rename to build/lib/watch/index.js
index a7ba268d1..949cb91cf 100644
--- a/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
+++ b/build/lib/watch/index.js
@@ -1,9 +1,9 @@
+"use strict";
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-.monaco-icon-label.deprecated {
-	text-decoration: line-through;
-	opacity: 0.66;
-}
+const watch = process.platform === 'win32' ? require('./watch-win32') : require('vscode-gulp-watch');
+module.exports = function () {
+    return watch.apply(null, arguments);
+};
diff --git a/build/lib/watch/package.json b/build/lib/watch/package.json
index d509f873e..e2e4f5520 100644
--- a/build/lib/watch/package.json
+++ b/build/lib/watch/package.json
@@ -7,6 +7,6 @@
   "license": "MIT",
   "devDependencies": {},
   "dependencies": {
-    "vscode-gulp-watch": "^5.0.2"
+    "vscode-gulp-watch": "^5.0.3"
   }
 }
diff --git a/build/lib/watch/watch-win32.js b/build/lib/watch/watch-win32.js
new file mode 100644
index 000000000..71681c9c9
--- /dev/null
+++ b/build/lib/watch/watch-win32.js
@@ -0,0 +1,100 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const cp = require("child_process");
+const fs = require("fs");
+const File = require("vinyl");
+const es = require("event-stream");
+const filter = require("gulp-filter");
+const watcherPath = path.join(__dirname, 'watcher.exe');
+function toChangeType(type) {
+    switch (type) {
+        case '0': return 'change';
+        case '1': return 'add';
+        default: return 'unlink';
+    }
+}
+function watch(root) {
+    const result = es.through();
+    let child = cp.spawn(watcherPath, [root]);
+    child.stdout.on('data', function (data) {
+        const lines = data.toString('utf8').split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i].trim();
+            if (line.length === 0) {
+                continue;
+            }
+            const changeType = line[0];
+            const changePath = line.substr(2);
+            // filter as early as possible
+            if (/^\.git/.test(changePath) || /(^|\\)out($|\\)/.test(changePath)) {
+                continue;
+            }
+            const changePathFull = path.join(root, changePath);
+            const file = new File({
+                path: changePathFull,
+                base: root
+            });
+            file.event = toChangeType(changeType);
+            result.emit('data', file);
+        }
+    });
+    child.stderr.on('data', function (data) {
+        result.emit('error', data);
+    });
+    child.on('exit', function (code) {
+        result.emit('error', 'Watcher died with code ' + code);
+        child = null;
+    });
+    process.once('SIGTERM', function () { process.exit(0); });
+    process.once('SIGTERM', function () { process.exit(0); });
+    process.once('exit', function () { if (child) {
+        child.kill();
+    } });
+    return result;
+}
+const cache = Object.create(null);
+module.exports = function (pattern, options) {
+    options = options || {};
+    const cwd = path.normalize(options.cwd || process.cwd());
+    let watcher = cache[cwd];
+    if (!watcher) {
+        watcher = cache[cwd] = watch(cwd);
+    }
+    const rebase = !options.base ? es.through() : es.mapSync(function (f) {
+        f.base = options.base;
+        return f;
+    });
+    return watcher
+        .pipe(filter(['**', '!.git{,/**}'])) // ignore all things git
+        .pipe(filter(pattern))
+        .pipe(es.map(function (file, cb) {
+        fs.stat(file.path, function (err, stat) {
+            if (err && err.code === 'ENOENT') {
+                return cb(undefined, file);
+            }
+            if (err) {
+                return cb();
+            }
+            if (!stat.isFile()) {
+                return cb();
+            }
+            fs.readFile(file.path, function (err, contents) {
+                if (err && err.code === 'ENOENT') {
+                    return cb(undefined, file);
+                }
+                if (err) {
+                    return cb();
+                }
+                file.contents = contents;
+                file.stat = stat;
+                cb(undefined, file);
+            });
+        });
+    }))
+        .pipe(rebase);
+};
diff --git a/build/lib/watch/watch-win32.ts b/build/lib/watch/watch-win32.ts
index 4ed372771..833c8d9c6 100644
--- a/build/lib/watch/watch-win32.ts
+++ b/build/lib/watch/watch-win32.ts
@@ -25,7 +25,7 @@ function watch(root: string): Stream {
 	const result = es.through();
 	let child: cp.ChildProcess | null = cp.spawn(watcherPath, [root]);
 
-	child.stdout.on('data', function (data) {
+	child.stdout!.on('data', function (data) {
 		const lines: string[] = data.toString('utf8').split('\n');
 		for (let i = 0; i < lines.length; i++) {
 			const line = lines[i].trim();
@@ -52,7 +52,7 @@ function watch(root: string): Stream {
 		}
 	});
 
-	child.stderr.on('data', function (data) {
+	child.stderr!.on('data', function (data) {
 		result.emit('error', data);
 	});
 
diff --git a/build/lib/watch/yarn.lock b/build/lib/watch/yarn.lock
index edbfe1f31..b0d7dd4a9 100644
--- a/build/lib/watch/yarn.lock
+++ b/build/lib/watch/yarn.lock
@@ -2,7 +2,12 @@
 # yarn lockfile v1
 
 
-ansi-colors@1.1.0, ansi-colors@^1.0.1:
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
   integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
@@ -21,15 +26,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
-anymatch@~3.1.1:
+anymatch@^3.1.1, anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
   integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
@@ -37,33 +34,16 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -74,15 +54,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
   integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -90,10 +61,10 @@ braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+chokidar@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -101,30 +72,20 @@ chokidar@3.3.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.2.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.1"
+    fsevents "~2.3.1"
 
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
   integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
 clone-stats@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
   integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
 clone@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@@ -149,20 +110,6 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
@@ -171,38 +118,16 @@ extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-fancy-log@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
+fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
     color-support "^1.1.3"
+    parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -217,47 +142,12 @@ first-chunk-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@~5.1.0:
+glob-parent@^5.1.1, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -269,7 +159,7 @@ graceful-fs@^4.1.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-inherits@^2.0.1, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -281,28 +171,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
@@ -310,30 +178,11 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -341,18 +190,6 @@ is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -365,120 +202,37 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-utf8@^0.2.0:
+is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-normalize-path@^2.0.0, normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-object-assign@^4.1.0:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-is-absolute@^1.0.1:
+parse-node-version@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-picomatch@^2.0.4:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -488,18 +242,6 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 plugin-error@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
@@ -510,26 +252,12 @@ plugin-error@1.0.1:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.5:
+readable-stream@^2.0.2, readable-stream@^2.3.5:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -542,40 +270,27 @@ readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.5:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
-    picomatch "^2.0.4"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
   dependencies:
-    is-equal-shallow "^0.1.3"
+    picomatch "^2.2.1"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
 replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
@@ -586,6 +301,18 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -593,6 +320,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+strip-bom-buf@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  integrity sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=
+  dependencies:
+    is-utf8 "^0.2.1"
+
 strip-bom-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
@@ -620,36 +354,26 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-vinyl-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
-  integrity sha1-p+v1/779obfRjRQPyweyI++2dRo=
+vinyl-file@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365"
+  integrity sha1-sQTZ5ECf+jJfqt1SBkLQo7SIs2U=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.3.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
+    strip-bom-buf "^1.0.0"
     strip-bom-stream "^2.0.0"
-    vinyl "^1.1.0"
+    vinyl "^2.0.1"
 
-vinyl@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+vinyl@^2.0.1, vinyl@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
     clone-buffer "^1.0.0"
@@ -658,20 +382,19 @@ vinyl@^2.1.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-gulp-watch@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-gulp-watch/-/vscode-gulp-watch-5.0.2.tgz#0060ba8d091284a6fbd7e608aa318a9c1d73b840"
-  integrity sha512-l2v+W3iQvxpX2ny2C7eJTd+83rQXiZ85KGY0mub/QRqUxgDc+KH/EYiw4mttzIhPzVBmxrUO4RcLNbPdccg0mQ==
+vscode-gulp-watch@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-gulp-watch/-/vscode-gulp-watch-5.0.3.tgz#1ca1c03581d43692ecb1fe0b9afd4256faeb701b"
+  integrity sha512-MTUp2yLE9CshhkNSNV58EQNxQSeF8lIj3mkXZX9a1vAk+EQNM2PAYdPUDSd/P/08W3PMHGznEiZyfK7JAjLosg==
   dependencies:
-    ansi-colors "1.1.0"
-    anymatch "^1.3.0"
-    chokidar "3.3.0"
-    fancy-log "1.3.2"
-    glob-parent "^3.0.1"
+    ansi-colors "4.1.1"
+    anymatch "^3.1.1"
+    chokidar "3.5.1"
+    fancy-log "^1.3.3"
+    glob-parent "^5.1.1"
     normalize-path "^3.0.0"
-    object-assign "^4.1.0"
-    path-is-absolute "^1.0.1"
+    object-assign "^4.1.1"
     plugin-error "1.0.1"
-    readable-stream "^2.2.2"
-    vinyl "^2.1.0"
-    vinyl-file "^2.0.0"
+    readable-stream "^3.6.0"
+    vinyl "^2.2.0"
+    vinyl-file "^3.0.0"
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index 7288af94c..0449ec6b8 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -10,6 +10,7 @@ declare namespace monaco {
 	export type Thenable<T> = PromiseLike<T>;
 
 	export interface Environment {
+		globalAPI?: boolean;
 		baseUrl?: string;
 		getWorker?(workerId: string, label: string): Worker;
 		getWorkerUrl?(workerId: string, label: string): string;
diff --git a/build/monaco/package.json b/build/monaco/package.json
index b42c6aa73..e26efaa54 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.21.1",
+  "version": "0.22.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
diff --git a/build/npm/dirs.js b/build/npm/dirs.js
new file mode 100644
index 000000000..17e97a0c6
--- /dev/null
+++ b/build/npm/dirs.js
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Complete list of directories where yarn should be executed to install node modules
+exports.dirs = [
+	'',
+	'build',
+	'build/lib/watch',
+	'extensions',
+	'extensions/configuration-editing',
+	'extensions/css-language-features',
+	'extensions/css-language-features/server',
+	'extensions/debug-auto-launch',
+	'extensions/debug-server-ready',
+	'extensions/emmet',
+	'extensions/extension-editing',
+	'extensions/git',
+	'extensions/git-ui',
+	'extensions/github',
+	'extensions/github-authentication',
+	'extensions/grunt',
+	'extensions/gulp',
+	'extensions/html-language-features',
+	'extensions/html-language-features/server',
+	'extensions/image-preview',
+	'extensions/jake',
+	'extensions/json-language-features',
+	'extensions/json-language-features/server',
+	'extensions/markdown-language-features',
+	'extensions/merge-conflict',
+	'extensions/microsoft-authentication',
+	'extensions/npm',
+	'extensions/php-language-features',
+	'extensions/search-result',
+	'extensions/simple-browser',
+	'extensions/testing-editor-contributions',
+	'extensions/typescript-language-features',
+	'extensions/vscode-api-tests',
+	'extensions/vscode-colorize-tests',
+	'extensions/vscode-custom-editor-tests',
+	'extensions/vscode-notebook-tests',
+	'extensions/vscode-test-resolver',
+	'remote',
+	'remote/web',
+	'test/automation',
+	'test/integration/browser',
+	'test/monaco',
+	'test/smoke',
+];
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 8f8b0019a..18ccef884 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -6,6 +6,7 @@
 const cp = require('child_process');
 const path = require('path');
 const fs = require('fs');
+const { dirs } = require('./dirs');
 const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
 
 /**
@@ -21,6 +22,10 @@ function yarnInstall(location, opts) {
 	const argv = JSON.parse(raw);
 	const original = argv.original || [];
 	const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
+	if (opts.ignoreEngines) {
+		args.push('--ignore-engines');
+		delete opts.ignoreEngines;
+	}
 
 	console.log(`Installing dependencies in ${location}...`);
 	console.log(`$ yarn ${args.join(' ')}`);
@@ -31,24 +36,39 @@ function yarnInstall(location, opts) {
 	}
 }
 
-yarnInstall('extensions'); // node modules shared by all extensions
+for (let dir of dirs) {
 
-if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
-	yarnInstall('remote'); // node modules used by vscode server
-	yarnInstall('remote/web'); // node modules used by vscode web
-}
-
-const allExtensionFolders = fs.readdirSync('extensions');
-const extensions = allExtensionFolders.filter(e => {
-	try {
-		let packageJSON = JSON.parse(fs.readFileSync(path.join('extensions', e, 'package.json')).toString());
-		return packageJSON && (packageJSON.dependencies || packageJSON.devDependencies);
-	} catch (e) {
-		return false;
+	if (dir === '') {
+		// `yarn` already executed in root
+		continue;
 	}
-});
 
-extensions.forEach(extension => yarnInstall(`extensions/${extension}`));
+	if (/^remote/.test(dir) && process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
+		// windows arm: do not execute `yarn` on remote folder
+		continue;
+	}
+
+	if (dir === 'build/lib/watch') {
+		// node modules for watching, specific to host node version, not electron
+		yarnInstallBuildDependencies();
+		continue;
+	}
+
+	let opts;
+
+	if (dir === 'remote') {
+		// node modules used by vscode server
+		const env = { ...process.env };
+		if (process.env['VSCODE_REMOTE_CC']) { env['CC'] = process.env['VSCODE_REMOTE_CC']; }
+		if (process.env['VSCODE_REMOTE_CXX']) { env['CXX'] = process.env['VSCODE_REMOTE_CXX']; }
+		if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
+		opts = { env };
+	} else if (/^extensions\//.test(dir)) {
+		opts = { ignoreEngines: true };
+	}
+
+	yarnInstall(dir, opts);
+}
 
 function yarnInstallBuildDependencies() {
 	// make sure we install the deps of build/lib/watch for the system installed
@@ -68,10 +88,4 @@ runtime "${runtime}"`;
 	yarnInstall(watchPath);
 }
 
-yarnInstall(`build`); // node modules required for build
-yarnInstall('test/automation'); // node modules required for smoketest
-yarnInstall('test/smoke'); // node modules required for smoketest
-yarnInstall('test/integration/browser'); // node modules required for integration
-yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
-
 cp.execSync('git config pull.rebase true');
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
index 94dbb3b9e..8d51e7a78 100644
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -28,7 +28,41 @@ if (!/yarn[\w-.]*\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
 	err = true;
 }
 
+if (process.platform === 'win32') {
+	if (!hasSupportedVisualStudioVersion()) {
+		console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute.\033[0;0m');
+		err = true;
+	}
+}
+
 if (err) {
 	console.error('');
 	process.exit(1);
 }
+
+function hasSupportedVisualStudioVersion() {
+	const fs = require('fs');
+	const path = require('path');
+	// Translated over from
+	// https://source.chromium.org/chromium/chromium/src/+/master:build/vs_toolchain.py;l=140-175
+	const supportedVersions = ['2019', '2017'];
+
+	const availableVersions = [];
+	for (const version of supportedVersions) {
+		let vsPath = process.env[`vs${version}_install`];
+		if (vsPath && fs.existsSync(vsPath)) {
+			availableVersions.push(version);
+			break;
+		}
+		const programFiles86Path = process.env['ProgramFiles(x86)'];
+		if (programFiles86Path) {
+			vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
+			const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
+			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
+				availableVersions.push(version);
+				break;
+			}
+		}
+	}
+	return availableVersions.length;
+}
diff --git a/build/npm/update-theme.js b/build/npm/update-theme.js
deleted file mode 100644
index 7e5649a1c..000000000
--- a/build/npm/update-theme.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-var path = require('path');
-var fs = require('fs');
-var plist = require('fast-plist');
-
-var mappings = {
-	"background": ["editor.background"],
-	"foreground": ["editor.foreground"],
-	"hoverHighlight": ["editor.hoverHighlightBackground"],
-	"linkForeground": ["editorLink.foreground"],
-	"selection": ["editor.selectionBackground"],
-	"inactiveSelection": ["editor.inactiveSelectionBackground"],
-	"selectionHighlightColor": ["editor.selectionHighlightBackground"],
-	"wordHighlight": ["editor.wordHighlightBackground"],
-	"wordHighlightStrong": ["editor.wordHighlightStrongBackground"],
-	"findMatchHighlight": ["editor.findMatchHighlightBackground", "peekViewResult.matchHighlightBackground"],
-	"currentFindMatchHighlight": ["editor.findMatchBackground"],
-	"findRangeHighlight": ["editor.findRangeHighlightBackground"],
-	"referenceHighlight": ["peekViewEditor.matchHighlightBackground"],
-	"lineHighlight": ["editor.lineHighlightBackground"],
-	"rangeHighlight": ["editor.rangeHighlightBackground"],
-	"caret": ["editorCursor.foreground"],
-	"invisibles": ["editorWhitespace.foreground"],
-	"guide": ["editorIndentGuide.background"],
-	"ansiBlack": ["terminal.ansiBlack"], "ansiRed": ["terminal.ansiRed"], "ansiGreen": ["terminal.ansiGreen"], "ansiYellow": ["terminal.ansiYellow"],
-	"ansiBlue": ["terminal.ansiBlue"], "ansiMagenta": ["terminal.ansiMagenta"], "ansiCyan": ["terminal.ansiCyan"], "ansiWhite": ["terminal.ansiWhite"],
-	"ansiBrightBlack": ["terminal.ansiBrightBlack"], "ansiBrightRed": ["terminal.ansiBrightRed"], "ansiBrightGreen": ["terminal.ansiBrightGreen"],
-	"ansiBrightYellow": ["terminal.ansiBrightYellow"], "ansiBrightBlue": ["terminal.ansiBrightBlue"], "ansiBrightMagenta": ["terminal.ansiBrightMagenta"],
-	"ansiBrightCyan": ["terminal.ansiBrightCyan"], "ansiBrightWhite": ["terminal.ansiBrightWhite"]
-};
-
-exports.update = function (srcName, destName) {
-	try {
-		console.log('reading ', srcName);
-		let result = {};
-		let plistContent = fs.readFileSync(srcName).toString();
-		let theme = plist.parse(plistContent);
-		let settings = theme.settings;
-		if (Array.isArray(settings)) {
-			let colorMap = {};
-			for (let entry of settings) {
-				let scope = entry.scope;
-				if (scope) {
-					let parts = scope.split(',').map(p => p.trim());
-					if (parts.length > 1) {
-						entry.scope = parts;
-					}
-				} else {
-					var entrySettings = entry.settings;
-					for (let entry in entrySettings) {
-						let mapping = mappings[entry];
-						if (mapping) {
-							for (let newKey of mapping) {
-								colorMap[newKey] = entrySettings[entry];
-							}
-							if (entry !== 'foreground' && entry !== 'background') {
-								delete entrySettings[entry];
-							}
-						}
-					}
-
-				}
-			}
-			result.name = theme.name;
-			result.tokenColors = settings;
-			result.colors = colorMap;
-		}
-		fs.writeFileSync(destName, JSON.stringify(result, null, '\t'));
-	} catch (e) {
-		console.log(e);
-	}
-};
-
-if (path.basename(process.argv[1]) === 'update-theme.js') {
-	exports.update(process.argv[2], process.argv[3]);
-}
diff --git a/build/package.json b/build/package.json
index 20fc702f9..d1d0b42e9 100644
--- a/build/package.json
+++ b/build/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
+    "@azure/cosmos": "^3.9.3",
     "@types/ansi-colors": "^3.2.0",
     "@types/azure": "0.9.19",
     "@types/debounce": "^1.0.0",
@@ -16,50 +17,41 @@
     "@types/gulp-json-editor": "^2.2.31",
     "@types/gulp-rename": "^0.0.33",
     "@types/gulp-sourcemaps": "^0.0.32",
-    "@types/gulp-uglify": "^3.0.5",
     "@types/mime": "0.0.29",
     "@types/minimatch": "^3.0.3",
-    "@types/minimist": "^1.2.0",
-    "@types/mocha": "2.2.39",
-    "@types/node": "^10.14.8",
+    "@types/minimist": "^1.2.1",
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9",
+    "@types/plist": "^3.0.2",
     "@types/pump": "^1.0.1",
     "@types/request": "^2.47.0",
-    "@types/rimraf": "^2.0.2",
-    "@types/terser": "^3.12.0",
+    "@types/rimraf": "^2.0.4",
     "@types/through": "^0.0.29",
     "@types/through2": "^2.0.34",
     "@types/underscore": "^1.8.9",
     "@types/xml2js": "0.0.33",
     "@typescript-eslint/experimental-utils": "~2.13.0",
-    "@typescript-eslint/parser": "^2.12.0",
+    "@typescript-eslint/parser": "^3.3.0",
     "applicationinsights": "1.0.8",
     "azure-storage": "^2.1.0",
+    "commander": "^7.0.0",
     "electron-osx-sign": "^0.4.16",
-    "github-releases": "^0.4.1",
-    "gulp-azure-storage": "^0.11.1",
-    "gulp-bom": "^1.0.0",
-    "gulp-gzip": "^1.4.2",
-    "gulp-sourcemaps": "^1.11.0",
-    "gulp-uglify": "^3.0.0",
+    "esbuild": "^0.8.30",
+    "fs-extra": "^9.1.0",
     "iconv-lite-umd": "0.6.8",
     "jsonc-parser": "^2.3.0",
-    "mime": "^1.3.4",
-    "minimatch": "3.0.4",
-    "minimist": "^1.2.3",
-    "request": "^2.85.0",
-    "terser": "4.3.8",
-    "typescript": "^4.2.0-dev.20201119",
+    "mime": "^1.4.1",
+    "mkdirp": "^1.0.4",
+    "plist": "^3.0.1",
+    "source-map": "0.6.1",
+    "typescript": "4.2.0-dev.20201207",
     "vsce": "1.48.0",
-    "vscode-telemetry-extractor": "^1.6.0",
-    "xml2js": "^0.4.17"
+    "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
   },
   "scripts": {
     "compile": "tsc -p tsconfig.build.json",
     "watch": "tsc -p tsconfig.build.json --watch",
-    "postinstall": "npm run compile",
     "npmCheckJs": "tsc --noEmit"
   },
-  "dependencies": {
-    "@azure/cosmos": "^3.9.3"
-  }
+  "dependencies": {}
 }
diff --git a/build/yarn.lock b/build/yarn.lock
index 17c5c201d..d958ed216 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -19,42 +19,12 @@
     universal-user-agent "^6.0.0"
     uuid "^8.3.0"
 
-"@dsherret/to-absolute-glob@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
-  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
+"@malept/cross-spawn-promise@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
   dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
-"@gulp-sourcemaps/map-sources@1.X":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
-  integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o=
-  dependencies:
-    normalize-path "^2.0.1"
-    through2 "^2.0.3"
-
-"@nodelib/fs.scandir@2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz#7fa8fed654939e1a39753d286b48b4836d00e0eb"
-  integrity sha512-NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.1"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.1", "@nodelib/fs.stat@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz#814f71b1167390cfcb6a6b3d9cdeb0951a192c14"
-  integrity sha512-+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==
-
-"@nodelib/fs.walk@^1.2.1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz#6a6450c5e17012abd81450eb74949a4d970d2807"
-  integrity sha512-J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.1"
-    fastq "^1.6.0"
+    cross-spawn "^7.0.1"
 
 "@types/ansi-colors@^3.2.0":
   version "3.2.0"
@@ -86,7 +56,7 @@
   resolved "https://registry.yarnpkg.com/@types/debounce/-/debounce-1.0.0.tgz#417560200331e1bb84d72da85391102c2fcd61b7"
   integrity sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc=
 
-"@types/debug@^4.1.4":
+"@types/debug@^4.1.4", "@types/debug@^4.1.5":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
@@ -126,6 +96,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/fs-extra@^9.0.6":
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab"
+  integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig==
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob-stream@*":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-6.1.0.tgz#7ede8a33e59140534f8d8adfb8ac9edfb31897bc"
@@ -188,14 +165,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/gulp-uglify@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/gulp-uglify/-/gulp-uglify-3.0.5.tgz#ddcbbb6bd15a84b8a6c5e2218c2efba98102d135"
-  integrity sha512-LD2b6gCPugrKI1W188nIp0gm+cAnGGwaTFpPdeZYVXwPHdoCQloy3du0JR62MeMjAwUwlcOb+SKYT6Qgw7yBiA==
-  dependencies:
-    "@types/node" "*"
-    "@types/uglify-js" "^2"
-
 "@types/gulp@^4.0.5":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.5.tgz#f5f498d5bf9538364792de22490a12c0e6bc5eb4"
@@ -225,25 +194,38 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/minimist@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+"@types/minimist@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
-"@types/mocha@2.2.39":
-  version "2.2.39"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829"
-  integrity sha1-9o1j24tpw46VWLQHNSXPlsT3qCk=
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
 "@types/node@*":
   version "8.0.51"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
   integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
 
-"@types/node@^10.14.8":
-  version "10.14.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.13.tgz#ac786d623860adf39a3f51d629480aacd6a6eec7"
-  integrity sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
+
+"@types/node@^14.14.21":
+  version "14.14.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
+  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
+
+"@types/plist@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
+  integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==
+  dependencies:
+    "@types/node" "*"
+    xmlbuilder ">=11.0.1"
 
 "@types/pump@^1.0.1":
   version "1.0.1"
@@ -262,21 +244,14 @@
     "@types/node" "*"
     "@types/tough-cookie" "*"
 
-"@types/rimraf@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
-  integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==
+"@types/rimraf@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/terser@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@types/terser/-/terser-3.12.0.tgz#25e020fe9a7a6ae92ce46261f00ced67de6c12ac"
-  integrity sha512-J0Wy8A7ULEqVJftkWhrXZbH0iBk4tYuTj0gBiiveKaY9deNi6cCsxl0ApJ27ojqwYv51bvEw85lOb8Wt4ng9zA==
-  dependencies:
-    terser "*"
-
 "@types/through2@^2.0.34":
   version "2.0.34"
   resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.34.tgz#9c2a259a238dace2a05a2f8e94b786961bc27ac4"
@@ -296,13 +271,6 @@
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.2.tgz#e0d481d8bb282ad8a8c9e100ceb72c995fb5e709"
   integrity sha512-vOVmaruQG5EatOU/jM6yU2uCp3Lz6mK1P5Ztu4iJjfM4SVHU9XYktPUQtKlIXuahqXHdEyUarMrBEwg5Cwu+bA==
 
-"@types/uglify-js@^2":
-  version "2.6.31"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-2.6.31.tgz#c694755eeb6a1bb9f8f321f3ec37cc22ca4c4f6b"
-  integrity sha512-LjcyGt6CHsgZ0AoofnMwhyxo9hUqz2mgl6IcF+S8B1zdSTxHAvTO/1RPvBAHG3C1ZeAc+AoWA5mb3lDJKtM9Zg==
-  dependencies:
-    source-map "^0.6.1"
-
 "@types/underscore@^1.8.9":
   version "1.8.9"
   resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.9.tgz#fef41f800cd23db1b4f262ddefe49cd952d82323"
@@ -343,14 +311,16 @@
   resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.0.33.tgz#20c5dd6460245284d64a55690015b95e409fb7de"
   integrity sha1-IMXdZGAkUoTWSlVpABW5XkCft94=
 
-"@typescript-eslint/experimental-utils@2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.14.0.tgz#e9179fa3c44e00b3106b85d7b69342901fb43e3b"
-  integrity sha512-KcyKS7G6IWnIgl3ZpyxyBCxhkBPV+0a5Jjy2g5HxlrbG2ZLQNFeneIBVXdaBCYOVjvGmGGFKom1kgiAY75SDeQ==
+"@typescript-eslint/experimental-utils@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz#e179ffc81a80ebcae2ea04e0332f8b251345a686"
+  integrity sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.14.0"
+    "@typescript-eslint/types" "3.10.1"
+    "@typescript-eslint/typescript-estree" "3.10.1"
     eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
 
 "@typescript-eslint/experimental-utils@~2.13.0":
   version "2.13.0"
@@ -361,16 +331,22 @@
     "@typescript-eslint/typescript-estree" "2.13.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/parser@^2.12.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.14.0.tgz#30fa0523d86d74172a5e32274558404ba4262cd6"
-  integrity sha512-haS+8D35fUydIs+zdSf4BxpOartb/DjrZ2IxQ5sR8zyGfd77uT9ZJZYF8+I0WPhzqHmfafUBx8MYpcp8pfaoSA==
+"@typescript-eslint/parser@^3.3.0":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.10.1.tgz#1883858e83e8b442627e1ac6f408925211155467"
+  integrity sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.14.0"
-    "@typescript-eslint/typescript-estree" "2.14.0"
+    "@typescript-eslint/experimental-utils" "3.10.1"
+    "@typescript-eslint/types" "3.10.1"
+    "@typescript-eslint/typescript-estree" "3.10.1"
     eslint-visitor-keys "^1.1.0"
 
+"@typescript-eslint/types@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
+  integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
+
 "@typescript-eslint/typescript-estree@2.13.0":
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.13.0.tgz#a2e746867da772c857c13853219fced10d2566bc"
@@ -384,46 +360,26 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.14.0.tgz#c67698acdc14547f095eeefe908958d93e1a648d"
-  integrity sha512-pnLpUcMNG7GfFFfNQbEX6f1aPa5fMnH2G9By+A1yovYI4VIOK2DzkaRuUlIkbagpAcrxQHLqovI1YWqEcXyRnA==
+"@typescript-eslint/typescript-estree@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853"
+  integrity sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==
   dependencies:
+    "@typescript-eslint/types" "3.10.1"
+    "@typescript-eslint/visitor-keys" "3.10.1"
     debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
     glob "^7.1.6"
     is-glob "^4.0.1"
-    lodash.unescape "4.0.1"
-    semver "^6.3.0"
+    lodash "^4.17.15"
+    semver "^7.3.2"
     tsutils "^3.17.1"
 
-acorn@4.X:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
-  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
-
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
+"@typescript-eslint/visitor-keys@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931"
+  integrity sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==
   dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    eslint-visitor-keys "^1.1.0"
 
 ajv@^6.12.3:
   version "6.12.6"
@@ -435,59 +391,6 @@ ajv@^6.12.3:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-any-promise@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -504,124 +407,51 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-back@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
-  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-differ@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
-  integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
-
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+asar@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
+  integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
 
 asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
-aws4@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
-  integrity sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==
-
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 azure-storage@^2.1.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.6.0.tgz#84747ee54a4bd194bb960f89f3eff89d67acf1cf"
-  integrity sha1-hHR+5UpL0ZS7lg+J8+/4nWes8c8=
-  dependencies:
-    browserify-mime "~1.2.9"
-    extend "~1.2.1"
-    json-edm-parser "0.1.2"
-    md5.js "1.3.4"
-    readable-stream "~2.0.0"
-    request "~2.81.0"
-    underscore "~1.8.3"
-    uuid "^3.0.0"
-    validator "~3.35.0"
-    xml2js "0.2.7"
-    xmlbuilder "0.4.3"
-
-azure-storage@^2.10.2:
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz#c5966bf929d87587d78f6847040ea9a4b1d4a50a"
   integrity sha512-IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ==
@@ -649,17 +479,12 @@ base64-js@^1.2.3:
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  integrity sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
 bluebird@^3.5.0:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -670,27 +495,6 @@ boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -699,13 +503,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 browserify-mime@~1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
@@ -729,7 +526,7 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-equal@^1.0.0:
+buffer-equal@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
   integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
@@ -739,37 +536,11 @@ buffer-fill@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-bytes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -782,94 +553,15 @@ cheerio@^1.0.0-rc.1:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+chromium-pickle-js@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
+  integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-clone@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-code-block-writer@9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-9.4.1.tgz#1448fca79dfc7a3649000f4c85be6bc770604c4c"
-  integrity sha512-LHAB+DL4YZDcwK8y/kAxZ0Lf/ncwLh/Ux4cTVWbPwIdrf1gPxXiPcwpz8r8/KqXu1aD+Raz46EOxDjFlbyO6bA==
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-colors@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
-  integrity sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==
-
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
-  dependencies:
-    delayed-stream "~1.0.0"
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
@@ -878,26 +570,28 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-command-line-args@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a"
-  integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==
+commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
   dependencies:
-    array-back "^3.0.1"
-    find-replace "^3.0.0"
-    lodash.camelcase "^4.3.0"
-    typical "^4.0.0"
-
-commander@^2.20.0, commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+    graceful-readlink ">= 1.0.0"
 
 commander@^2.8.1:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+commander@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
+  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
+
 compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
@@ -908,38 +602,19 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-convert-source-map@1.X:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^1.5.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
+cross-spawn@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
 css-select@~1.2.0:
   version "1.2.0"
@@ -956,16 +631,6 @@ css-what@2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
   integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
 
-css@2.X:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -973,63 +638,20 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug-fabulous@0.0.X:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.0.4.tgz#fa071c5d87484685424807421ca4b16b0b1a0763"
-  integrity sha1-+gccXYdIRoVCSAdCHKSxawsaB2M=
-  dependencies:
-    debug "2.X"
-    lazy-debug-legacy "0.0.X"
-    object-assign "4.1.0"
-
-debug@2.X, debug@^2.6.8:
+debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.1:
+debug@^4.1.1, debug@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-delayed-stream@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.6.tgz#a2646cb7ec3d5d7774614670a7a65de0c173edbc"
-  integrity sha1-omRst+w9XXd0YUZwp6Zd4MFz7bw=
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1040,11 +662,6 @@ denodeify@^1.2.1:
   resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
   integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
 
-detect-newline@2.X:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
-
 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"
@@ -1057,12 +674,15 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+dir-compare@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
+  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
   dependencies:
-    path-type "^4.0.0"
+    buffer-equal "1.0.0"
+    colors "1.0.3"
+    commander "2.9.0"
+    minimatch "3.0.4"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
@@ -1110,34 +730,13 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
 ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
 
 electron-osx-sign@^0.4.16:
   version "0.4.16"
@@ -1151,54 +750,15 @@ electron-osx-sign@^0.4.16:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+esbuild@^0.8.30:
+  version "0.8.30"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.30.tgz#3d057ff9ffe6d5d30bccb0afe8cc92a2e69622d3"
+  integrity sha512-gCJQYUMO9QNrfpNOIiCnFoX41nWiPFCvURBQF+qWckyJ7gmw2xCShdKCXvS+RZcQ5krcxEOLIkzujqclePKhfw==
 
 eslint-scope@^5.0.0:
   version "5.0.0"
@@ -1208,6 +768,13 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-utils@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -1225,100 +792,31 @@ estraverse@^4.1.0, estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-event-stream@3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extend@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-1.2.1.tgz#a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"
-  integrity sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=
-
-extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
-fancy-log@^1.1.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
-fancy-log@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602"
-  integrity sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.1"
-    "@nodelib/fs.walk" "^1.2.1"
-    glob-parent "^5.0.0"
-    is-glob "^4.0.1"
-    merge2 "^1.2.3"
-    micromatch "^4.0.2"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fastq@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"
-  integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==
-  dependencies:
-    reusify "^1.0.0"
-
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -1326,59 +824,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-replace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
-  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
-  dependencies:
-    array-back "^3.0.1"
-
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-flush-write-stream@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -1388,43 +838,21 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+fs-extra@^9.0.1, fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
+    at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -1432,47 +860,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-github-releases@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/github-releases/-/github-releases-0.4.1.tgz#4a13bdf85c4161344271db3d81db08e7379102ff"
-  integrity sha1-ShO9+FxBYTRCcds9gdsI5zeRAv8=
-  dependencies:
-    minimatch "3.0.4"
-    optimist "0.6.1"
-    prettyjson "1.2.1"
-    request "2.81.0"
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
-  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
-  dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
-
 glob@^7.0.6:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -1485,7 +872,7 @@ glob@^7.0.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.6:
+glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -1497,180 +884,21 @@ glob@^7.1.1, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globby@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
-  integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
-
-glogg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
-  integrity sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@4.X:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-gulp-azure-storage@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/gulp-azure-storage/-/gulp-azure-storage-0.11.1.tgz#0e5f5d0f789da11206f1e5a9311a6cf7107877d7"
-  integrity sha512-csOwItwZV1P9GLsORVQy+CFwjYDdHNrBol89JlHdlhGx0fTgJBc1COTRZbjGRyRjgdUuVguo3YLl4ToJ10/SIQ==
-  dependencies:
-    azure-storage "^2.10.2"
-    delayed-stream "0.0.6"
-    event-stream "3.3.4"
-    mime "^1.3.4"
-    progress "^1.1.8"
-    queue "^3.0.10"
-    streamifier "^0.1.1"
-    vinyl "^2.2.0"
-    vinyl-fs "^3.0.3"
-    yargs "^15.3.0"
-
-gulp-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-bom/-/gulp-bom-1.0.0.tgz#38a183a07187bd57a7922d37977441f379df2abf"
-  integrity sha1-OKGDoHGHvVenki03l3RB83nfKr8=
-  dependencies:
-    gulp-util "^3.0.0"
-    through2 "^2.0.0"
-
-gulp-gzip@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/gulp-gzip/-/gulp-gzip-1.4.2.tgz#0422a94014248655b5b1a9eea1c2abee1d4f4337"
-  integrity sha512-ZIxfkUwk2XmZPTT9pPHrHUQlZMyp9nPhg2sfoeN27mBGpi7OaHnOD+WCN41NXjfJQ69lV1nQ9LLm1hYxx4h3UQ==
-  dependencies:
-    ansi-colors "^1.0.1"
-    bytes "^3.0.0"
-    fancy-log "^1.3.2"
-    plugin-error "^1.0.0"
-    stream-to-array "^2.3.0"
-    through2 "^2.0.3"
-
-gulp-sourcemaps@^1.11.0:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.12.1.tgz#b437d1f3d980cf26e81184823718ce15ae6597b6"
-  integrity sha1-tDfR89mAzyboEYSCNxjOFa5ll7Y=
-  dependencies:
-    "@gulp-sourcemaps/map-sources" "1.X"
-    acorn "4.X"
-    convert-source-map "1.X"
-    css "2.X"
-    debug-fabulous "0.0.X"
-    detect-newline "2.X"
-    graceful-fs "4.X"
-    source-map "~0.6.0"
-    strip-bom "2.X"
-    through2 "2.X"
-    vinyl "1.X"
-
-gulp-uglify@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.2.tgz#5f5b2e8337f879ca9dec971feb1b82a5a87850b0"
-  integrity sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==
-  dependencies:
-    array-each "^1.0.1"
-    extend-shallow "^3.0.2"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    isobject "^3.0.1"
-    make-error-cause "^1.1.1"
-    safe-buffer "^5.1.2"
-    through2 "^2.0.0"
-    uglify-js "^3.0.5"
-    vinyl-sourcemaps-apply "^0.2.0"
-
-gulp-util@^3.0.0:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
@@ -1679,69 +907,14 @@ har-validator@~5.1.3:
     ajv "^6.12.3"
     har-schema "^2.0.0"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 htmlparser2@^3.9.1:
   version "3.10.0"
@@ -1755,15 +928,6 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.0.6"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -1773,24 +937,11 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
-  dependencies:
-    agent-base "5"
-    debug "4"
-
 iconv-lite-umd@0.6.8:
   version "0.6.8"
   resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
   integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A==
 
-ignore@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558"
-  integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1799,63 +950,21 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.0:
+inherits@2, inherits@^2.0.1, inherits@^2.0.4, inherits@~2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -1863,81 +972,11 @@ is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
-is-windows@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -1950,10 +989,10 @@ isbinaryfile@^3.0.2:
   dependencies:
     buffer-alloc "^1.2.0"
 
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isstream@~0.1.2:
   version "0.1.2"
@@ -1977,11 +1016,6 @@ json-edm-parser@0.1.2:
   dependencies:
     jsonparse "~1.2.0"
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -1992,18 +1026,6 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -2014,18 +1036,15 @@ jsonc-parser@^2.3.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.0.tgz#7c7fc988ee1486d35734faaaa866fadb00fa91ee"
   integrity sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
 jsonparse@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
@@ -2041,25 +1060,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-lazy-debug-legacy@0.0.X:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/lazy-debug-legacy/-/lazy-debug-legacy-0.0.1.tgz#537716c0776e4cf79e3ed1b621f7658c2911b1b1"
-  integrity sha1-U3cWwHduTPeePtG2IfdljCkRsbE=
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
-
 linkify-it@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
@@ -2067,117 +1067,6 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -2188,22 +1077,17 @@ lodash@^4.15.0, lodash@^4.17.10:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
-make-error-cause@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
-  integrity sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=
+lodash@^4.17.15:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    make-error "^1.2.0"
-
-make-error@^1.2.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
+    yallist "^4.0.0"
 
 markdown-it@^8.3.1:
   version "8.4.2"
@@ -2229,60 +1113,28 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+mime-db@1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-  integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-mime-types@~2.1.17:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==
-  dependencies:
-    mime-db "~1.33.0"
-
-mime-types@~2.1.19:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
-  dependencies:
-    mime-db "1.44.0"
+    mime-db "1.45.0"
 
 mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -2290,44 +1142,26 @@ minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3:
+minimist@^1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
   integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-multimatch@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
-  integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
-  dependencies:
-    "@types/minimatch" "^3.0.3"
-    array-differ "^3.0.0"
-    array-union "^2.1.0"
-    arrify "^2.0.1"
-    minimatch "^3.0.4"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
 mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -2343,20 +1177,6 @@ node-fetch@^2.6.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -2364,68 +1184,18 @@ nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-  integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.0.4, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
-optimist@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
-
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -2444,30 +1214,6 @@ osenv@^0.1.3:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
 parse-semver@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/parse-semver/-/parse-semver-1.1.1.tgz#9a4afd6df063dc4826f93fba4a99cf223f666cb8"
@@ -2482,53 +1228,26 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "*"
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.5:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
-
 plist@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
@@ -2538,81 +1257,21 @@ plist@^3.0.1:
     xmlbuilder "^9.0.7"
     xmldom "0.1.x"
 
-plugin-error@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
-  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
-  dependencies:
-    ansi-colors "^1.0.1"
-    arr-diff "^4.0.0"
-    arr-union "^3.1.0"
-    extend-shallow "^3.0.2"
-
-prettyjson@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
-  integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok=
-  dependencies:
-    colors "^1.1.2"
-    minimist "^1.2.0"
-
 priorityqueuejs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz#2ee4f23c2560913e08c07ce5ccdd6de3df2c5af8"
   integrity sha1-LuTyPCVgkT4IwHzlzN1t498sWvg=
 
-process-nextick-args@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
   integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
 psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.5:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -2623,28 +1282,11 @@ q@^1.0.1:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-queue@^3.0.10:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
 read@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -2652,32 +1294,6 @@ read@^1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.1.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
@@ -2687,15 +1303,14 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
 readable-stream@~2.0.0:
   version "2.0.6"
@@ -2709,94 +1324,6 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-request@2.81.0, request@~2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@^2.85.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 request@^2.86.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -2823,73 +1350,26 @@ request@^2.86.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
-  dependencies:
-    value-or-function "^3.0.0"
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-reusify@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-safe-buffer@^5.1.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-sax@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.2.tgz#735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"
-  integrity sha1-c1/6o5oc/4/7lZjwIjq9sDqfsuo=
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
   integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
-sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
 semaphore@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
@@ -2905,146 +1385,51 @@ semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-set-blocking@^2.0.0:
+semver@^7.3.2:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
 
-slash@^3.0.0:
+shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
-source-map-resolve@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
-  dependencies:
-    atob "^2.1.1"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@~0.5.12:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@^0.5.1:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  integrity sha1-US322mKHFEMW3EwY/hzx2UBzm+M=
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-stream-to-array@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353"
-  integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M=
-  dependencies:
-    any-promise "^1.1.0"
-
-streamifier@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string.prototype.trimend@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46"
-  integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7"
-  integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
-string_decoder@^1.1.1, string_decoder@~1.1.1:
+string_decoder@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
@@ -3056,89 +1441,6 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-bom@2.X:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-terser@*:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz#1052cfe17576c66e7bc70fcc7119f22b155bdac1"
-  integrity sha512-cGbc5utAcX4a9+2GGVX4DsenG6v0x3glnDi5hx8816X1McEAwPlPgRtXPJzSBsbpILxZ8MQMT0KvArLuE0HP5A==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@4.3.8:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
-  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@2.X, through2@^2.0.0, through2@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through2@~2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through@2, through@~2.3, through@~2.3.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
 tmp@0.0.29:
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
@@ -3146,42 +1448,6 @@ tmp@0.0.29:
   dependencies:
     os-tmpdir "~1.0.1"
 
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
-
-tough-cookie@~2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -3190,20 +1456,6 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-ts-morph@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-3.1.3.tgz#bbfa1d14481ee23bdd1c030340ccf4a243cfc844"
-  integrity sha512-CwjgyJTtd3f8vBi7Vr0IOgdOY6Wi/Tq0MhieXOE2B5ns5WWRD7BwMNHtv+ZufKI/S2U/lMrh+Q3bOauE4tsv2g==
-  dependencies:
-    "@dsherret/to-absolute-glob" "^2.0.2"
-    code-block-writer "9.4.1"
-    fs-extra "^8.1.0"
-    glob-parent "^5.0.0"
-    globby "^10.0.1"
-    is-negated-glob "^1.0.0"
-    multimatch "^4.0.0"
-    typescript "^3.0.1"
-
 tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -3246,39 +1498,21 @@ typed-rest-client@^0.9.0:
     tunnel "0.0.4"
     underscore "1.8.3"
 
-typescript@^3.0.1:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+typescript@4.2.0-dev.20201207:
+  version "4.2.0-dev.20201207"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201207.tgz#19a34bc7d2d42a7467c512c63f135587ac848807"
+  integrity sha512-fPHBDi/fgdX4WiRC7cFVv/aL069PgUaDWuLYUSHatWZujz/Lkc9bkf/zL3rKdNSCxlNKAMs3fhJv/yompOphZA==
 
-typescript@^4.2.0-dev.20201119:
-  version "4.2.0-dev.20201119"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201119.tgz#d4a43511cd9931adac05e1a47b6425f6b0e76cc3"
-  integrity sha512-HIgv+D/0VpVYRTbcVVf9oac/0GtLKMqaufTcPgohNaFWlCOh4lq8syefANgENXTG5Q4VEC6xwDGzHW6EJAVr3A==
-
-typical@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
-  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
+typescript@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
   integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
 
-uglify-js@^3.0.5:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
-  dependencies:
-    commander "~2.20.0"
-    source-map "~0.6.1"
-
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
 underscore@1.8.3, underscore@~1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
@@ -3289,36 +1523,23 @@ underscore@^1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
 universal-user-agent@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
   integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
 url-join@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
@@ -3329,17 +1550,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-  integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
-
-uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-  integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==
-
-uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -3349,21 +1560,11 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
   integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
 
-validator@~3.35.0:
-  version "3.35.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-3.35.0.tgz#3f07249402c1fc8fc093c32c6e43d72a79cca1dc"
-  integrity sha1-PwcklALB/I/Ak8MsbkPXKnnModw=
-
 validator@~9.4.1:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
   integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==
 
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -3373,79 +1574,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vinyl-fs@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
-
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
-  dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl-sourcemaps-apply@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
-  integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
-  dependencies:
-    source-map "^0.5.1"
-
-vinyl@1.X:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.0.0, vinyl@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
-  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
 vsce@1.48.0:
   version "1.48.0"
   resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.48.0.tgz#31c1a4c6909c3b8bdc48b3d32cc8c8e94c7113a2"
@@ -3469,22 +1597,19 @@ vsce@1.48.0:
     yauzl "^2.3.1"
     yazl "^2.2.2"
 
-vscode-ripgrep@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.6.2.tgz#fb912c7465699f10ce0218a6676cc632c77369b4"
-  integrity sha512-jkZEWnQFcE+QuQFfxQXWcWtDafTmgkp3DjMKawDkajZwgnDlGKpFp15ybKrZNVTi1SLEF/12BzxYSZVVZ2XrkA==
+vscode-universal@deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58:
+  version "0.0.2"
+  resolved "https://codeload.github.com/deepak1556/universal/tar.gz/61454d96223b774c53cda10f72c2098c0ce02d58"
   dependencies:
-    https-proxy-agent "^4.0.0"
-    proxy-from-env "^1.1.0"
-
-vscode-telemetry-extractor@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.6.0.tgz#e9d9c1d24863cce8d3d715f0287de3b31eb90c56"
-  integrity sha512-zSxvkbyAMa1lTRGIHfGg7gW2e9Sey+2zGYD19uNWCsVEfoXAr2NB6uzb0sNHtbZ2SSqxSePmFXzBAavsudT5fw==
-  dependencies:
-    command-line-args "^5.1.1"
-    ts-morph "^3.1.3"
-    vscode-ripgrep "^1.6.2"
+    "@malept/cross-spawn-promise" "^1.1.0"
+    "@types/debug" "^4.1.5"
+    "@types/fs-extra" "^9.0.6"
+    "@types/node" "^14.14.21"
+    asar "^3.0.3"
+    debug "^4.3.1"
+    dir-compare "^2.4.0"
+    fs-extra "^9.0.1"
+    typescript "^4.1.3"
 
 vso-node-api@6.1.2-preview:
   version "6.1.2-preview"
@@ -3496,37 +1621,18 @@ vso-node-api@6.1.2-preview:
     typed-rest-client "^0.9.0"
     underscore "^1.8.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    isexe "^2.0.0"
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xml2js@0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.7.tgz#1838518bb01741cae0878bab4915e494c32306af"
-  integrity sha1-GDhRi7AXQcrgh4urSRXklMMjBq8=
-  dependencies:
-    sax "0.5.2"
-
 xml2js@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2"
@@ -3534,73 +1640,25 @@ xml2js@0.2.8:
   dependencies:
     sax "0.5.x"
 
-xml2js@^0.4.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
-
-xmlbuilder@0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-0.4.3.tgz#c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"
-  integrity sha1-xGFLp04K0ZbmCcknLNnh3bKKilg=
+xmlbuilder@>=11.0.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
+  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
 
 xmlbuilder@^9.0.7:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmlbuilder@~9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
-  integrity sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=
-
 xmldom@0.1.x:
   version "0.1.31"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
   integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
 
-xtend@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-y18n@^4.0.0:
+yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@^15.3.0:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yauzl@^2.3.1:
   version "2.10.0"
diff --git a/cgmanifest.json b/cgmanifest.json
index 656e3f821..a47ba0d62 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "894fb9eb56c6cbda65e3c3ae9ada6d4cb5850cc9"
+					"commitHash": "c0dfcf99c0bbc9c4763c70e5034eb1a970a9ff3b"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "83.0.4103.122"
+			"version": "87.0.4280.141"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "9622fed3fb2cffcea9efff6c8cb4cc2def99d75d"
+					"commitHash": "e3e0927bb93ed92bcdfe81e7ad9af3d78ccc74fb"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.14.1"
+			"version": "12.18.3"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "415c1f9e9b35d9599b1a8ad1200476afa47a3323"
+					"commitHash": "8805b996e0d8cfb6e3921f9b586366bafb125b59"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "9.3.5"
+			"version": "11.2.1"
 		},
 		{
 			"component": {
@@ -132,11 +132,11 @@
 				"git": {
 					"name": "vscode-codicons",
 					"repositoryUrl": "https://github.com/microsoft/vscode-codicons",
-					"commitHash": "f0caa623812a8ed5059516277675b4158d4c4867"
+					"commitHash": "ccdcf91d57d3a5a1d6b620d95d518bab4d75984d"
 				}
 			},
 			"license": "MIT and Creative Commons Attribution 4.0",
-			"version": "0.0.1"
+			"version": "0.0.14"
 		},
 		{
 			"component": {
diff --git a/extensions/clojure/language-configuration.json b/extensions/clojure/language-configuration.json
index a62cb968e..f6ab4a268 100644
--- a/extensions/clojure/language-configuration.json
+++ b/extensions/clojure/language-configuration.json
@@ -1,6 +1,6 @@
 {
 	"comments": {
-		"lineComment": ";"
+		"lineComment": ";;"
 	},
 	"brackets": [
 		["{", "}"],
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 423400413..263485762 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -128,6 +128,6 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts
index 966073e23..a3ef34f3d 100644
--- a/extensions/configuration-editing/src/configurationEditingMain.ts
+++ b/extensions/configuration-editing/src/configurationEditingMain.ts
@@ -81,7 +81,7 @@ function registerExtensionsCompletionsInExtensionsDocument(): vscode.Disposable
 			const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 			if (location.path[0] === 'recommendations') {
 				const extensionsContent = <IExtensionsContent>parse(document.getText());
-				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], range, false);
+				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], '', range, false);
 			}
 			return [];
 		}
@@ -95,7 +95,7 @@ function registerExtensionsCompletionsInWorkspaceConfigurationDocument(): vscode
 			const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 			if (location.path[0] === 'extensions' && location.path[1] === 'recommendations') {
 				const extensionsContent = <IExtensionsContent>parse(document.getText())['extensions'];
-				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], range, false);
+				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], '', range, false);
 			}
 			return [];
 		}
diff --git a/extensions/configuration-editing/src/extensionsProposals.ts b/extensions/configuration-editing/src/extensionsProposals.ts
index 60533ae29..7fef9836b 100644
--- a/extensions/configuration-editing/src/extensionsProposals.ts
+++ b/extensions/configuration-editing/src/extensionsProposals.ts
@@ -8,14 +8,14 @@ import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
 
-export function provideInstalledExtensionProposals(existing: string[], range: vscode.Range, includeBuiltinExtensions: boolean): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
+export function provideInstalledExtensionProposals(existing: string[], additionalText: string, range: vscode.Range, includeBuiltinExtensions: boolean): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
 	if (Array.isArray(existing)) {
 		const extensions = includeBuiltinExtensions ? vscode.extensions.all : vscode.extensions.all.filter(e => !(e.id.startsWith('vscode.') || e.id === 'Microsoft.vscode-markdown'));
 		const knownExtensionProposals = extensions.filter(e => existing.indexOf(e.id) === -1);
 		if (knownExtensionProposals.length) {
 			return knownExtensionProposals.map(e => {
 				const item = new vscode.CompletionItem(e.id);
-				const insertText = `"${e.id}"`;
+				const insertText = `"${e.id}"${additionalText}`;
 				item.kind = vscode.CompletionItemKind.Value;
 				item.insertText = insertText;
 				item.range = range;
diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
index 5e466c2eb..f3461f0c3 100644
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -48,7 +48,16 @@ export class SettingsDocument {
 			try {
 				ignoredExtensions = parse(this.document.getText())['settingsSync.ignoredExtensions'];
 			} catch (e) {/* ignore error */ }
-			return provideInstalledExtensionProposals(ignoredExtensions, range, true);
+			return provideInstalledExtensionProposals(ignoredExtensions, '', range, true);
+		}
+
+		// remote.extensionKind
+		if (location.path[0] === 'remote.extensionKind' && location.path.length === 2 && location.isAtPropertyKey) {
+			let alreadyConfigured: string[] = [];
+			try {
+				alreadyConfigured = Object.keys(parse(this.document.getText())['remote.extensionKind']);
+			} catch (e) {/* ignore error */ }
+			return provideInstalledExtensionProposals(alreadyConfigured, `: [\n\t"ui"\n]`, range, true);
 		}
 
 		return this.provideLanguageOverridesCompletionItems(location, position);
diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock
index 36aab5fd2..ebfaa046d 100644
--- a/extensions/configuration-editing/yarn.lock
+++ b/extensions/configuration-editing/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 jsonc-parser@^2.2.1:
   version "2.2.1"
diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
index 05938de60..a483664d1 100644
--- a/extensions/cpp/cgmanifest.json
+++ b/extensions/cpp/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "ad9f1541fd376740c30a7257614c9cb5ed25005d"
+					"commitHash": "f074a48ae0b7ba313af3faf3d8bfda8537864bd1"
 				}
 			},
 			"license": "MIT",
-			"version": "1.15.3",
+			"version": "1.15.5",
 			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		},
 		{
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json
index 952730f5a..7ce64b81d 100644
--- a/extensions/cpp/syntaxes/c.tmLanguage.json
+++ b/extensions/cpp/syntaxes/c.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/jeff-hykin/cpp-textmate-grammar/commit/afa42b3f5529833714ae354fbc638ece8f253074",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/f074a48ae0b7ba313af3faf3d8bfda8537864bd1",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -2939,9 +2939,6 @@
 								}
 							}
 						},
-						{
-							"include": "#comments_context"
-						},
 						{
 							"include": "#comments"
 						},
@@ -3104,9 +3101,6 @@
 									"match": ":",
 									"name": "punctuation.separator.delimiter.colon.assembly.c"
 								},
-								{
-									"include": "#comments_context"
-								},
 								{
 									"include": "#comments"
 								}
diff --git a/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json b/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
index 151cad6fe..23f35fd56 100644
--- a/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.embedded.macro.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/jeff-hykin/cpp-textmate-grammar/commit/ad9f1541fd376740c30a7257614c9cb5ed25005d",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/f074a48ae0b7ba313af3faf3d8bfda8537864bd1",
 	"name": "C++",
 	"scopeName": "source.cpp.embedded.macro",
 	"patterns": [
@@ -298,9 +298,6 @@
 						}
 					}
 				},
-				{
-					"include": "#comments_context"
-				},
 				{
 					"include": "#comments"
 				},
@@ -463,9 +460,6 @@
 							"match": ":",
 							"name": "punctuation.separator.delimiter.colon.assembly.cpp"
 						},
-						{
-							"include": "#comments_context"
-						},
 						{
 							"include": "#comments"
 						}
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index 43ce95262..ecd7d3db2 100644
--- a/extensions/cpp/syntaxes/cpp.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.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/jeff-hykin/cpp-textmate-grammar/commit/dc9c3ed759c84e0b168cc2140e6869ca97abbd14",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/f074a48ae0b7ba313af3faf3d8bfda8537864bd1",
 	"name": "C++",
 	"scopeName": "source.cpp",
 	"patterns": [
@@ -344,9 +344,6 @@
 						}
 					}
 				},
-				{
-					"include": "#comments_context"
-				},
 				{
 					"include": "#comments"
 				},
@@ -509,9 +506,6 @@
 							"match": ":",
 							"name": "punctuation.separator.delimiter.colon.assembly.cpp"
 						},
-						{
-							"include": "#comments_context"
-						},
 						{
 							"include": "#comments"
 						}
diff --git a/extensions/css-language-features/client/src/customData.ts b/extensions/css-language-features/client/src/customData.ts
index 24b56f12b..bab5cc407 100644
--- a/extensions/css-language-features/client/src/customData.ts
+++ b/extensions/css-language-features/client/src/customData.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { workspace, extensions, Uri, EventEmitter, Disposable } from 'vscode';
-import { resolvePath, joinPath } from './requests';
+import { Utils } from 'vscode-uri';
 
 export function getCustomDataSource(toDispose: Disposable[]) {
 	let pathsInWorkspace = getCustomDataPathsInAllWorkspaces();
@@ -50,7 +50,7 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
 		if (Array.isArray(paths)) {
 			for (const path of paths) {
 				if (typeof path === 'string') {
-					dataPaths.push(resolvePath(rootFolder, path).toString());
+					dataPaths.push(Utils.resolvePath(rootFolder, path).toString());
 				}
 			}
 		}
@@ -80,7 +80,7 @@ function getCustomDataPathsFromAllExtensions(): string[] {
 		const customData = extension.packageJSON?.contributes?.css?.customData;
 		if (Array.isArray(customData)) {
 			for (const rp of customData) {
-				dataPaths.push(joinPath(extension.extensionUri, rp).toString());
+				dataPaths.push(Utils.joinPath(extension.extensionUri, rp).toString());
 			}
 		}
 	}
diff --git a/extensions/css-language-features/client/src/node/nodeFs.ts b/extensions/css-language-features/client/src/node/nodeFs.ts
index c13ef2e1c..0b5720188 100644
--- a/extensions/css-language-features/client/src/node/nodeFs.ts
+++ b/extensions/css-language-features/client/src/node/nodeFs.ts
@@ -5,11 +5,11 @@
 
 import * as fs from 'fs';
 import { Uri } from 'vscode';
-import { getScheme, RequestService, FileType } from '../requests';
+import { RequestService, FileType } from '../requests';
 
 export function getNodeFSRequestService(): RequestService {
 	function ensureFileUri(location: string) {
-		if (getScheme(location) !== 'file') {
+		if (!location.startsWith('file://')) {
 			throw new Error('fileRequestService can only handle file URLs');
 		}
 	}
diff --git a/extensions/css-language-features/client/src/requests.ts b/extensions/css-language-features/client/src/requests.ts
index 1b1e70b2d..f06ce978c 100644
--- a/extensions/css-language-features/client/src/requests.ts
+++ b/extensions/css-language-features/client/src/requests.ts
@@ -8,14 +8,14 @@ import { RequestType, CommonLanguageClient } from 'vscode-languageclient';
 import { Runtime } from './cssClient';
 
 export namespace FsContentRequest {
-	export const type: RequestType<{ uri: string; encoding?: string; }, string, any, any> = new RequestType('fs/content');
+	export const type: RequestType<{ uri: string; encoding?: string; }, string, any> = new RequestType('fs/content');
 }
 export namespace FsStatRequest {
-	export const type: RequestType<string, FileStat, any, any> = new RequestType('fs/stat');
+	export const type: RequestType<string, FileStat, any> = new RequestType('fs/stat');
 }
 
 export namespace FsReadDirRequest {
-	export const type: RequestType<string, [string, FileType][], any, any> = new RequestType('fs/readDir');
+	export const type: RequestType<string, [string, FileType][], any> = new RequestType('fs/readDir');
 }
 
 export function serveFileSystemRequests(client: CommonLanguageClient, runtime: Runtime) {
@@ -88,61 +88,3 @@ export interface RequestService {
 	stat(uri: string): Promise<FileStat>;
 	readDirectory(uri: string): Promise<[string, FileType][]>;
 }
-
-export function getScheme(uri: string) {
-	return uri.substr(0, uri.indexOf(':'));
-}
-
-export function dirname(uri: string) {
-	const lastIndexOfSlash = uri.lastIndexOf('/');
-	return lastIndexOfSlash !== -1 ? uri.substr(0, lastIndexOfSlash) : '';
-}
-
-export function basename(uri: string) {
-	const lastIndexOfSlash = uri.lastIndexOf('/');
-	return uri.substr(lastIndexOfSlash + 1);
-}
-
-const Slash = '/'.charCodeAt(0);
-const Dot = '.'.charCodeAt(0);
-
-export function isAbsolutePath(path: string) {
-	return path.charCodeAt(0) === Slash;
-}
-
-export function resolvePath(uri: Uri, path: string): Uri {
-	if (isAbsolutePath(path)) {
-		return uri.with({ path: normalizePath(path.split('/')) });
-	}
-	return joinPath(uri, path);
-}
-
-export function normalizePath(parts: string[]): string {
-	const newParts: string[] = [];
-	for (const part of parts) {
-		if (part.length === 0 || part.length === 1 && part.charCodeAt(0) === Dot) {
-			// ignore
-		} else if (part.length === 2 && part.charCodeAt(0) === Dot && part.charCodeAt(1) === Dot) {
-			newParts.pop();
-		} else {
-			newParts.push(part);
-		}
-	}
-	if (parts.length > 1 && parts[parts.length - 1].length === 0) {
-		newParts.push('');
-	}
-	let res = newParts.join('/');
-	if (parts[0].length === 0) {
-		res = '/' + res;
-	}
-	return res;
-}
-
-
-export function joinPath(uri: Uri, ...paths: string[]): Uri {
-	const parts = uri.path.split('/');
-	for (let path of paths) {
-		parts.push(...path.split('/'));
-	}
-	return uri.with({ path: normalizePath(parts) });
-}
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 29f056e41..7450976d7 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -21,8 +21,7 @@
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
     "watch": "gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
-    "test": "mocha",
-    "postinstall": "cd server && yarn install",
+    "test": "node ../../node_modules/mocha/bin/mocha",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
   "categories": [
@@ -807,11 +806,11 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "7.0.0-next.5.1",
-    "vscode-nls": "^4.1.2"
+    "vscode-languageclient": "^7.0.0",
+    "vscode-nls": "^5.0.0",
+    "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7",
-    "mocha": "^7.0.1"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 5a2cd56cf..e271bfd7f 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -10,25 +10,21 @@
   "main": "./out/node/cssServerMain",
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^4.4.0",
-    "vscode-languageserver": "7.0.0-next.3",
-    "vscode-uri": "^2.1.2"
+    "vscode-css-languageservice": "^5.0.3",
+    "vscode-languageserver": "^7.0.0",
+    "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "7.0.2",
-    "@types/node": "^12.11.7",
-    "glob": "^7.1.6",
-    "mocha": "^7.1.2",
-    "mocha-junit-reporter": "^1.23.3",
-    "mocha-multi-reporters": "^1.1.7"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9"
   },
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-server",
     "watch": "gulp watch-extension:css-language-features-server",
     "install-service-next": "yarn add vscode-css-languageservice@next",
-    "install-service-local": "npm install ../../../../vscode-css-languageservice -f",
+    "install-service-local": "yarn link vscode-css-languageservice",
     "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f",
+    "install-server-local": "yarn link vscode-languageserver",
     "test": "node ./test/index.js"
   }
 }
diff --git a/extensions/css-language-features/server/src/node/nodeFs.ts b/extensions/css-language-features/server/src/node/nodeFs.ts
index c7b130129..c72617e3a 100644
--- a/extensions/css-language-features/server/src/node/nodeFs.ts
+++ b/extensions/css-language-features/server/src/node/nodeFs.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RequestService, getScheme } from '../requests';
+import { RequestService } from '../requests';
 import { URI as Uri } from 'vscode-uri';
 
 import * as fs from 'fs';
@@ -11,7 +11,7 @@ import { FileType } from 'vscode-css-languageservice';
 
 export function getNodeFSRequestService(): RequestService {
 	function ensureFileUri(location: string) {
-		if (getScheme(location) !== 'file') {
+		if (!location.startsWith('file://')) {
 			throw new Error('fileRequestService can only handle file URLs');
 		}
 	}
diff --git a/extensions/css-language-features/server/src/requests.ts b/extensions/css-language-features/server/src/requests.ts
index 79f166c2d..8ace0b0c8 100644
--- a/extensions/css-language-features/server/src/requests.ts
+++ b/extensions/css-language-features/server/src/requests.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vscode-uri';
 import { RequestType, Connection } from 'vscode-languageserver';
 import { RuntimeEnvironment } from './cssServer';
 
 export namespace FsContentRequest {
-	export const type: RequestType<{ uri: string; encoding?: string; }, string, any, any> = new RequestType('fs/content');
+	export const type: RequestType<{ uri: string; encoding?: string; }, string, any> = new RequestType('fs/content');
 }
 export namespace FsStatRequest {
-	export const type: RequestType<string, FileStat, any, any> = new RequestType('fs/stat');
+	export const type: RequestType<string, FileStat, any> = new RequestType('fs/stat');
 }
 
 export namespace FsReadDirRequest {
-	export const type: RequestType<string, [string, FileType][], any, any> = new RequestType('fs/readDir');
+	export const type: RequestType<string, [string, FileType][], any> = new RequestType('fs/readDir');
 }
 
 export enum FileType {
@@ -99,79 +98,6 @@ export function getRequestService(handledSchemas: string[], connection: Connecti
 	};
 }
 
-export function getScheme(uri: string) {
+function getScheme(uri: string) {
 	return uri.substr(0, uri.indexOf(':'));
 }
-
-export function dirname(uri: string) {
-	const lastIndexOfSlash = uri.lastIndexOf('/');
-	return lastIndexOfSlash !== -1 ? uri.substr(0, lastIndexOfSlash) : '';
-}
-
-export function basename(uri: string) {
-	const lastIndexOfSlash = uri.lastIndexOf('/');
-	return uri.substr(lastIndexOfSlash + 1);
-}
-
-
-const Slash = '/'.charCodeAt(0);
-const Dot = '.'.charCodeAt(0);
-
-export function extname(uri: string) {
-	for (let i = uri.length - 1; i >= 0; i--) {
-		const ch = uri.charCodeAt(i);
-		if (ch === Dot) {
-			if (i > 0 && uri.charCodeAt(i - 1) !== Slash) {
-				return uri.substr(i);
-			} else {
-				break;
-			}
-		} else if (ch === Slash) {
-			break;
-		}
-	}
-	return '';
-}
-
-export function isAbsolutePath(path: string) {
-	return path.charCodeAt(0) === Slash;
-}
-
-export function resolvePath(uriString: string, path: string): string {
-	if (isAbsolutePath(path)) {
-		const uri = URI.parse(uriString);
-		const parts = path.split('/');
-		return uri.with({ path: normalizePath(parts) }).toString();
-	}
-	return joinPath(uriString, path);
-}
-
-export function normalizePath(parts: string[]): string {
-	const newParts: string[] = [];
-	for (const part of parts) {
-		if (part.length === 0 || part.length === 1 && part.charCodeAt(0) === Dot) {
-			// ignore
-		} else if (part.length === 2 && part.charCodeAt(0) === Dot && part.charCodeAt(1) === Dot) {
-			newParts.pop();
-		} else {
-			newParts.push(part);
-		}
-	}
-	if (parts.length > 1 && parts[parts.length - 1].length === 0) {
-		newParts.push('');
-	}
-	let res = newParts.join('/');
-	if (parts[0].length === 0) {
-		res = '/' + res;
-	}
-	return res;
-}
-
-export function joinPath(uriString: string, ...paths: string[]): string {
-	const uri = URI.parse(uriString);
-	const parts = uri.path.split('/');
-	for (let path of paths) {
-		parts.push(...path.split('/'));
-	}
-	return uri.with({ path: normalizePath(parts) }).toString();
-}
diff --git a/extensions/css-language-features/server/src/test/requests.test.ts b/extensions/css-language-features/server/src/test/requests.test.ts
deleted file mode 100644
index 3f287fefe..000000000
--- a/extensions/css-language-features/server/src/test/requests.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import 'mocha';
-import * as assert from 'assert';
-import { joinPath, normalizePath, resolvePath, extname } from '../requests';
-
-suite('requests', () => {
-	test('join', async function () {
-		assert.equal(joinPath('foo://a/foo/bar', 'x'), 'foo://a/foo/bar/x');
-		assert.equal(joinPath('foo://a/foo/bar/', 'x'), 'foo://a/foo/bar/x');
-		assert.equal(joinPath('foo://a/foo/bar/', '/x'), 'foo://a/foo/bar/x');
-		assert.equal(joinPath('foo://a/foo/bar/', 'x/'), 'foo://a/foo/bar/x/');
-		assert.equal(joinPath('foo://a/foo/bar/', 'x', 'y'), 'foo://a/foo/bar/x/y');
-		assert.equal(joinPath('foo://a/foo/bar/', 'x/', '/y'), 'foo://a/foo/bar/x/y');
-		assert.equal(joinPath('foo://a/foo/bar/', '.', '/y'), 'foo://a/foo/bar/y');
-		assert.equal(joinPath('foo://a/foo/bar/', 'x/y/z', '..'), 'foo://a/foo/bar/x/y');
-	});
-
-	test('resolve', async function () {
-		assert.equal(resolvePath('foo://a/foo/bar', 'x'), 'foo://a/foo/bar/x');
-		assert.equal(resolvePath('foo://a/foo/bar/', 'x'), 'foo://a/foo/bar/x');
-		assert.equal(resolvePath('foo://a/foo/bar/', '/x'), 'foo://a/x');
-		assert.equal(resolvePath('foo://a/foo/bar/', 'x/'), 'foo://a/foo/bar/x/');
-	});
-
-	test('normalize', async function () {
-		function assertNormalize(path: string, expected: string) {
-			assert.equal(normalizePath(path.split('/')), expected, path);
-		}
-		assertNormalize('a', 'a');
-		assertNormalize('/a', '/a');
-		assertNormalize('a/', 'a/');
-		assertNormalize('a/b', 'a/b');
-		assertNormalize('/a/foo/bar/x', '/a/foo/bar/x');
-		assertNormalize('/a/foo/bar//x', '/a/foo/bar/x');
-		assertNormalize('/a/foo/bar///x', '/a/foo/bar/x');
-		assertNormalize('/a/foo/bar/x/', '/a/foo/bar/x/');
-		assertNormalize('a/foo/bar/x/', 'a/foo/bar/x/');
-		assertNormalize('a/foo/bar/x//', 'a/foo/bar/x/');
-		assertNormalize('//a/foo/bar/x//', '/a/foo/bar/x/');
-		assertNormalize('a/.', 'a');
-		assertNormalize('a/./b', 'a/b');
-		assertNormalize('a/././b', 'a/b');
-		assertNormalize('a/n/../b', 'a/b');
-		assertNormalize('a/n/../', 'a/');
-		assertNormalize('a/n/../', 'a/');
-		assertNormalize('/a/n/../..', '/');
-		assertNormalize('..', '');
-		assertNormalize('/..', '/');
-	});
-
-	test('extname', async function () {
-		function assertExtName(input: string, expected: string) {
-			assert.equal(extname(input), expected, input);
-		}
-		assertExtName('foo://a/foo/bar', '');
-		assertExtName('foo://a/foo/bar.foo', '.foo');
-		assertExtName('foo://a/foo/.foo', '');
-	});
-});
diff --git a/extensions/css-language-features/server/src/utils/documentContext.ts b/extensions/css-language-features/server/src/utils/documentContext.ts
index f8bc67f8b..a7beffd03 100644
--- a/extensions/css-language-features/server/src/utils/documentContext.ts
+++ b/extensions/css-language-features/server/src/utils/documentContext.ts
@@ -6,7 +6,7 @@
 import { DocumentContext } from 'vscode-css-languageservice';
 import { endsWith, startsWith } from '../utils/strings';
 import { WorkspaceFolder } from 'vscode-languageserver';
-import { resolvePath } from '../requests';
+import { Utils, URI } from 'vscode-uri';
 
 export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext {
 	function getRootFolder(): string | undefined {
@@ -31,7 +31,7 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp
 				}
 			}
 			base = base.substr(0, base.lastIndexOf('/') + 1);
-			return resolvePath(base, ref);
+			return Utils.resolvePath(URI.parse(base), ref).toString();
 		},
 	};
 }
diff --git a/extensions/css-language-features/server/src/utils/runner.ts b/extensions/css-language-features/server/src/utils/runner.ts
index ad1d779e2..9b82baf54 100644
--- a/extensions/css-language-features/server/src/utils/runner.ts
+++ b/extensions/css-language-features/server/src/utils/runner.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResponseError, ErrorCodes, CancellationToken } from 'vscode-languageserver';
+import { ResponseError, CancellationToken, LSPErrorCodes } from 'vscode-languageserver';
 
 export function formatError(message: string, err: any): string {
 	if (err instanceof Error) {
@@ -39,5 +39,5 @@ export function runSafeAsync<T>(func: () => Thenable<T>, errorVal: T, errorMessa
 }
 
 function cancelValue<E>() {
-	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+	return new ResponseError<E>(LSPErrorCodes.RequestCancelled, 'Request cancelled');
 }
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index af0eddbb9..62acbd46b 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -2,838 +2,62 @@
 # yarn lockfile v1
 
 
-"@types/mocha@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
-  integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
-
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
-  optionalDependencies:
-    fsevents "~2.1.1"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-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=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-debug@3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-define-properties@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has@^1.0.1, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-buffer@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
-
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
-  dependencies:
-    has-symbols "^1.0.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash@^4.16.4, lodash@^4.17.15:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-log-symbols@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
-  dependencies:
-    chalk "^2.4.2"
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"
-  integrity sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "3.0.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.5"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-node-environment-flags@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-p-limit@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
-  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-picomatch@^2.0.4:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
-
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
-  dependencies:
-    picomatch "^2.0.4"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-semver@^5.7.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-json-comments@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-vscode-css-languageservice@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz#a7c5edf3057e707601ca18fa3728784a298513b4"
-  integrity sha512-jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw==
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
+
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
+
+vscode-css-languageservice@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.0.3.tgz#2d400a47e73d0bfc5bc0d3fdf5be487cfdca341b"
+  integrity sha512-KJt4jhCxqrgGrC02UsQsKw90dPkFknMHsH5HTInT7gkDRRfGFwEd+e2O1/E75br3TdFhvRmzjljYz5thZ58L3A==
   dependencies:
     vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-languageserver-types "^3.16.0"
     vscode-nls "^5.0.0"
-    vscode-uri "^2.1.2"
+    vscode-uri "^3.0.2"
 
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
+vscode-jsonrpc@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
 
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
 vscode-languageserver-textdocument@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
   integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
+vscode-languageserver-types@3.16.0, vscode-languageserver-types@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
-vscode-languageserver@7.0.0-next.3:
-  version "7.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz#3833bd09259a4a085baeba90783f1e4d06d81095"
-  integrity sha512-qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg==
+vscode-languageserver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
+  integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
   dependencies:
-    vscode-languageserver-protocol "3.16.0-next.4"
+    vscode-languageserver-protocol "3.16.0"
 
 vscode-nls@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
-vscode-uri@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
-  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
-yargs@13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+vscode-uri@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
+  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index 241dd5e94..eec3195c3 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -2,58 +2,16 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -62,677 +20,70 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-chalk@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.2.0"
-  optionalDependencies:
-    fsevents "~2.1.1"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
 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=
 
-debug@3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    ms "^2.1.1"
+    yallist "^4.0.0"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-es-abstract@^1.5.1:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497"
-  integrity sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.0"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.6.0"
-    object-keys "^1.1.1"
-    string.prototype.trimleft "^2.0.0"
-    string.prototype.trimright "^2.0.0"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has@^1.0.1, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
-
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
-  dependencies:
-    has-symbols "^1.0.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash@^4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-log-symbols@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-minimatch@3.0.4, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
   dependencies:
-    minimist "0.0.8"
+    lru-cache "^6.0.0"
 
-mocha@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
-  integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "2.2.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.0"
-    yargs-parser "13.1.1"
-    yargs-unparser "1.6.0"
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-node-environment-flags@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-object-inspect@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-picomatch@^2.0.4:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
-
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
-  dependencies:
-    picomatch "^2.0.4"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-semver@^5.7.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.trimleft@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
-  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string.prototype.trimright@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
-  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-json-comments@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-supports-color@6.0.0:
+vscode-jsonrpc@6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
+
+vscode-languageclient@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz#b505c22c21ffcf96e167799757fca07a6bad0fb2"
+  integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==
   dependencies:
-    has-flag "^3.0.0"
+    minimatch "^3.0.4"
+    semver "^7.3.4"
+    vscode-languageserver-protocol "3.16.0"
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    has-flag "^3.0.0"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
+vscode-languageserver-types@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
+vscode-nls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
+  integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
-vscode-languageclient@7.0.0-next.5.1:
-  version "7.0.0-next.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0-next.5.1.tgz#ed93f14e4c2cdccedf15002c7bf8ef9cb638f36c"
-  integrity sha512-OONvbk3IFpubwF8/Y5uPQaq5J5CEskpeET3SfK4iGlv5OUK+44JawH/SEW5wXuEPpfdMLEMZLuGLU5v5d7N7PQ==
-  dependencies:
-    semver "^6.3.0"
-    vscode-languageserver-protocol "3.16.0-next.4"
+vscode-uri@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
+  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
 
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
-  dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
-
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
-
-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==
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-y18n@^4.0.0:
+yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@13.1.1, yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
-yargs@13.3.0, yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/debug-auto-launch/package.json b/extensions/debug-auto-launch/package.json
index f0dc77826..0f349851c 100644
--- a/extensions/debug-auto-launch/package.json
+++ b/extensions/debug-auto-launch/package.json
@@ -29,7 +29,7 @@
 		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "^12.11.7"
+		"@types/node": "^12.19.9"
 	},
 	"prettier": {
 		"printWidth": 100,
diff --git a/extensions/debug-auto-launch/yarn.lock b/extensions/debug-auto-launch/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/debug-auto-launch/yarn.lock
+++ b/extensions/debug-auto-launch/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/debug-server-ready/package.json b/extensions/debug-server-ready/package.json
index 111699064..ac199f059 100644
--- a/extensions/debug-server-ready/package.json
+++ b/extensions/debug-server-ready/package.json
@@ -4,6 +4,7 @@
 	"description": "%description%",
 	"version": "1.0.0",
 	"publisher": "vscode",
+	"license": "MIT",
 	"engines": {
 		"vscode": "^1.32.0"
 	},
@@ -137,6 +138,6 @@
 		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "^12.11.7"
+		"@types/node": "^12.19.9"
 	}
 }
diff --git a/extensions/debug-server-ready/yarn.lock b/extensions/debug-server-ready/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/debug-server-ready/yarn.lock
+++ b/extensions/debug-server-ready/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 12178fa8b..f39527519 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -17,7 +17,7 @@
         "url": "https://github.com/microsoft/vscode-emmet"
     },
     "activationEvents": [
-        "*",
+        "onStartupFinished",
         "onCommand:emmet.expandAbbreviation",
         "onLanguage:html",
         "onLanguage:css",
@@ -430,17 +430,16 @@
         "deps": "yarn add vscode-emmet-helper"
     },
     "devDependencies": {
-        "@types/node": "^12.11.7",
-        "mocha-junit-reporter": "^1.17.0",
-        "mocha-multi-reporters": "^1.1.7",
-        "vscode": "1.0.1"
+        "@types/node": "^12.19.9",
+        "emmet": "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
     },
     "dependencies": {
+        "@emmetio/abbreviation": "^2.2.0",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/math-expression": "^1.0.4",
         "image-size": "^0.5.2",
-        "vscode-emmet-helper": "~2.0.0",
-        "vscode-html-languageservice": "^3.0.3"
+        "vscode-emmet-helper": "2.2.4",
+        "vscode-languageserver-textdocument": "^1.0.1"
     }
 }
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index a37741b8e..494bf8d29 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -4,16 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
-import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet, isStyleAttribute, getEmbeddedCssNodeIfAny, allowedMimeTypesInScriptTag, toLSTextDocument } from './util';
+import * as nls from 'vscode-nls';
+import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetFlatNode';
+import { getEmmetHelper, getFlatNode, getMappingForIncludedLanguages, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet, isStyleAttribute, getEmbeddedCssNodeIfAny, allowedMimeTypesInScriptTag, toLSTextDocument } from './util';
+import { getRootNode as parseDocument } from './parseDocument';
+import { MarkupAbbreviation } from 'emmet';
+// import { AbbreviationNode } from '@emmetio/abbreviation';
 
+const localize = nls.loadMessageBundle();
 const trimRegex = /[\u00a0]*[\d#\-\*\u2022]+\.?/;
 const hexColorRegex = /^#[\da-fA-F]{0,6}$/;
-const inlineElements = ['a', 'abbr', 'acronym', 'applet', 'b', 'basefont', 'bdo',
-	'big', 'br', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i',
-	'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'map', 'object', 'q',
-	's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup',
-	'textarea', 'tt', 'u', 'var'];
+// const inlineElements = ['a', 'abbr', 'acronym', 'applet', 'b', 'basefont', 'bdo',
+// 	'big', 'br', 'button', 'cite', 'code', 'del', 'dfn', 'em', 'font', 'i',
+// 	'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'map', 'object', 'q',
+// 	's', 'samp', 'select', 'small', 'span', 'strike', 'strong', 'sub', 'sup',
+// 	'textarea', 'tt', 'u', 'var'];
 
 interface ExpandAbbreviationInput {
 	syntax: string;
@@ -31,35 +36,28 @@ interface PreviewRangesWithContent {
 }
 
 export function wrapWithAbbreviation(args: any) {
-	return doWrapping(false, args);
+	return doWrapping(true, args);
 }
 
 export function wrapIndividualLinesWithAbbreviation(args: any) {
 	return doWrapping(true, args);
 }
 
-function doWrapping(individualLines: boolean, args: any) {
+function doWrapping(_: boolean, args: any) {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
 		return;
 	}
 
 	const editor = vscode.window.activeTextEditor;
-	if (individualLines) {
-		if (editor.selections.length === 1 && editor.selection.isEmpty) {
-			vscode.window.showInformationMessage('Select more than 1 line and try again.');
-			return;
-		}
-		if (editor.selections.find(x => x.isEmpty)) {
-			vscode.window.showInformationMessage('Select more than 1 line in each selection and try again.');
-			return;
-		}
-	}
+	const document = editor.document;
+
 	args = args || {};
 	if (!args['language']) {
-		args['language'] = editor.document.languageId;
+		args['language'] = document.languageId;
 	}
+	// we know it's not stylesheet due to the validate(false) call above
 	const syntax = getSyntaxFromArgs(args) || 'html';
-	const rootNode = parseDocument(editor.document, false);
+	const rootNode = parseDocument(document, true);
 
 	let inPreview = false;
 	let currentValue = '';
@@ -69,34 +67,49 @@ function doWrapping(individualLines: boolean, args: any) {
 	const rangesToReplace: PreviewRangesWithContent[] = editor.selections.sort((a: vscode.Selection, b: vscode.Selection) => { return a.start.compareTo(b.start); }).map(selection => {
 		let rangeToReplace: vscode.Range = selection.isReversed ? new vscode.Range(selection.active, selection.anchor) : selection;
 		if (!rangeToReplace.isSingleLine && rangeToReplace.end.character === 0) {
+			// in case of multi-line, exclude last empty line from rangeToReplace
 			const previousLine = rangeToReplace.end.line - 1;
-			const lastChar = editor.document.lineAt(previousLine).text.length;
+			const lastChar = document.lineAt(previousLine).text.length;
 			rangeToReplace = new vscode.Range(rangeToReplace.start, new vscode.Position(previousLine, lastChar));
 		} else if (rangeToReplace.isEmpty) {
 			const { active } = selection;
-			const currentNode = getNode(rootNode, active, true);
-			if (currentNode && (currentNode.start.line === active.line || currentNode.end.line === active.line)) {
-				rangeToReplace = new vscode.Range(currentNode.start, currentNode.end);
+			const activeOffset = document.offsetAt(active);
+			const currentNode = getFlatNode(rootNode, activeOffset, true);
+			if (currentNode) {
+				const currentNodeStart = document.positionAt(currentNode.start);
+				const currentNodeEnd = document.positionAt(currentNode.end);
+				if (currentNodeStart.line === active.line || currentNodeEnd.line === active.line) {
+					// wrap around entire node
+					rangeToReplace = new vscode.Range(currentNodeStart, currentNodeEnd);
+				}
+				else {
+					// wrap line that cursor is on
+					rangeToReplace = new vscode.Range(rangeToReplace.start.line, 0, rangeToReplace.start.line, document.lineAt(rangeToReplace.start.line).text.length);
+				}
 			} else {
-				rangeToReplace = new vscode.Range(rangeToReplace.start.line, 0, rangeToReplace.start.line, editor.document.lineAt(rangeToReplace.start.line).text.length);
+				// wrap line that cursor is on
+				rangeToReplace = new vscode.Range(rangeToReplace.start.line, 0, rangeToReplace.start.line, document.lineAt(rangeToReplace.start.line).text.length);
 			}
 		}
 
-		const firstLineOfSelection = editor.document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character);
+		const firstLineOfSelection = document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character);
 		const matches = firstLineOfSelection.match(/^(\s*)/);
 		const extraWhitespaceSelected = matches ? matches[1].length : 0;
 		rangeToReplace = new vscode.Range(rangeToReplace.start.line, rangeToReplace.start.character + extraWhitespaceSelected, rangeToReplace.end.line, rangeToReplace.end.character);
 
 		let textToWrapInPreview: string[];
-		const textToReplace = editor.document.getText(rangeToReplace);
-		if (individualLines) {
-			textToWrapInPreview = textToReplace.split('\n').map(x => x.trim());
-		} else {
-			const wholeFirstLine = editor.document.lineAt(rangeToReplace.start).text;
-			const otherMatches = wholeFirstLine.match(/^(\s*)/);
-			const precedingWhitespace = otherMatches ? otherMatches[1] : '';
-			textToWrapInPreview = rangeToReplace.isSingleLine ? [textToReplace] : ['\n\t' + textToReplace.split('\n' + precedingWhitespace).join('\n\t') + '\n'];
-		}
+		const textToReplace = document.getText(rangeToReplace);
+
+		// the following assumes all the lines are indented the same way as the first
+		// this assumption helps with applyPreview later
+		const wholeFirstLine = document.lineAt(rangeToReplace.start).text;
+		const otherMatches = wholeFirstLine.match(/^(\s*)/);
+		const precedingWhitespace = otherMatches ? otherMatches[1] : '';
+		textToWrapInPreview = rangeToReplace.isSingleLine ?
+			[textToReplace] :
+			textToReplace.split('\n' + precedingWhitespace).map(x => x.trimEnd());
+
+		// escape $ characters, fixes #52640
 		textToWrapInPreview = textToWrapInPreview.map(e => e.replace(/(\$\d)/g, '\\$1'));
 
 		return {
@@ -107,7 +120,29 @@ function doWrapping(individualLines: boolean, args: any) {
 		};
 	});
 
-	function revertPreview(): Thenable<any> {
+	// if a selection falls on a node, it could interfere with linked editing,
+	// so back up the selections, and change selections to wrap around the node
+	const oldSelections = editor.selections;
+	const newSelections: vscode.Selection[] = [];
+	editor.selections.forEach(selection => {
+		let { start, end } = selection;
+		const startOffset = document.offsetAt(start);
+		const startNode = <HtmlNode>getFlatNode(rootNode, startOffset, true);
+		const endOffset = document.offsetAt(end);
+		const endNode = <HtmlNode>getFlatNode(rootNode, endOffset, true);
+		if (startNode) {
+			start = document.positionAt(startNode.start);
+		}
+		if (endNode) {
+			end = document.positionAt(endNode.end);
+		}
+		// don't need to preserve active/anchor order since the selection changes
+		// after wrapping anyway
+		newSelections.push(new vscode.Selection(start, end));
+	});
+	editor.selections = newSelections;
+
+	function revertPreview(): Thenable<boolean> {
 		return editor.edit(builder => {
 			for (const rangeToReplace of rangesToReplace) {
 				builder.replace(rangeToReplace.previewRange, rangeToReplace.originalContent);
@@ -119,9 +154,10 @@ function doWrapping(individualLines: boolean, args: any) {
 	function applyPreview(expandAbbrList: ExpandAbbreviationInput[]): Thenable<boolean> {
 		let lastOldPreviewRange = new vscode.Range(0, 0, 0, 0);
 		let lastNewPreviewRange = new vscode.Range(0, 0, 0, 0);
-		let totalLinesInserted = 0;
+		let totalNewLinesInserted = 0;
 
 		return editor.edit(builder => {
+			// the edits are applied in order top-down
 			for (let i = 0; i < rangesToReplace.length; i++) {
 				const expandedText = expandAbbr(expandAbbrList[i]) || '';
 				if (!expandedText) {
@@ -129,11 +165,14 @@ function doWrapping(individualLines: boolean, args: any) {
 					break;
 				}
 
+				// get the current preview range, format the new wrapped text, and then replace
+				// the text in the preview range with that new text
 				const oldPreviewRange = rangesToReplace[i].previewRange;
 				const preceedingText = editor.document.getText(new vscode.Range(oldPreviewRange.start.line, 0, oldPreviewRange.start.line, oldPreviewRange.start.character));
 				const indentPrefix = (preceedingText.match(/^(\s*)/) || ['', ''])[1];
 
-				let newText = expandedText.replace(/\n/g, '\n' + indentPrefix); // Adding indentation on each line of expanded text
+				let newText = expandedText;
+				newText = newText.replace(/\n/g, '\n' + indentPrefix); // Adding indentation on each line of expanded text
 				newText = newText.replace(/\$\{[\d]*\}/g, '|'); // Removing Tabstops
 				newText = newText.replace(/\$\{[\d]*(:[^}]*)?\}/g, (match) => {		// Replacing Placeholders
 					return match.replace(/^\$\{[\d]*:/, '').replace('}', '');
@@ -141,13 +180,17 @@ function doWrapping(individualLines: boolean, args: any) {
 				newText = newText.replace(/\\\$/g, '$'); // Remove backslashes before $
 				builder.replace(oldPreviewRange, newText);
 
+				// calculate the new preview range to use for future previews
+				// we also have to take into account that the previous expansions could:
+				// - cause new lines to appear
+				// - be on the same line as other expansions
 				const expandedTextLines = newText.split('\n');
 				const oldPreviewLines = oldPreviewRange.end.line - oldPreviewRange.start.line + 1;
 				const newLinesInserted = expandedTextLines.length - oldPreviewLines;
 
-				const newPreviewLineStart = oldPreviewRange.start.line + totalLinesInserted;
+				const newPreviewLineStart = oldPreviewRange.start.line + totalNewLinesInserted;
 				let newPreviewStart = oldPreviewRange.start.character;
-				const newPreviewLineEnd = oldPreviewRange.end.line + totalLinesInserted + newLinesInserted;
+				const newPreviewLineEnd = oldPreviewRange.end.line + totalNewLinesInserted + newLinesInserted;
 				let newPreviewEnd = expandedTextLines[expandedTextLines.length - 1].length;
 				if (i > 0 && newPreviewLineEnd === lastNewPreviewRange.end.line) {
 					// If newPreviewLineEnd is equal to the previous expandedText lineEnd,
@@ -166,9 +209,9 @@ function doWrapping(individualLines: boolean, args: any) {
 				}
 
 				lastOldPreviewRange = rangesToReplace[i].previewRange;
-				rangesToReplace[i].previewRange = lastNewPreviewRange = new vscode.Range(newPreviewLineStart, newPreviewStart, newPreviewLineEnd, newPreviewEnd);
-
-				totalLinesInserted += newLinesInserted;
+				lastNewPreviewRange = new vscode.Range(newPreviewLineStart, newPreviewStart, newPreviewLineEnd, newPreviewEnd);
+				rangesToReplace[i].previewRange = lastNewPreviewRange;
+				totalNewLinesInserted += newLinesInserted;
 			}
 		}, { undoStopBefore: false, undoStopAfter: false });
 	}
@@ -187,19 +230,21 @@ function doWrapping(individualLines: boolean, args: any) {
 
 		const { abbreviation, filter } = extractedResults;
 		if (definitive) {
-			const revertPromise = inPreview ? revertPreview() : Promise.resolve();
+			const revertPromise = inPreview ? revertPreview() : Promise.resolve(true);
 			return revertPromise.then(() => {
 				const expandAbbrList: ExpandAbbreviationInput[] = rangesToReplace.map(rangesAndContent => {
 					const rangeToReplace = rangesAndContent.originalRange;
 					let textToWrap: string[];
-					if (individualLines) {
-						textToWrap = rangesAndContent.textToWrapInPreview;
-					} else {
-						textToWrap = rangeToReplace.isSingleLine ? ['$TM_SELECTED_TEXT'] : ['\n\t$TM_SELECTED_TEXT\n'];
-					}
+					// if (individualLines) {
+					textToWrap = rangesAndContent.textToWrapInPreview;
+					// } else {
+					// 	// use the p tag as a dummy element to get Emmet to wrap the expression properly
+					// 	textToWrap = rangeToReplace.isSingleLine ?
+					// 		['$TM_SELECTED_TEXT'] : ['<p>$TM_SELECTED_TEXT</p>'];
+					// }
 					return { syntax: syntax || '', abbreviation, rangeToReplace, textToWrap, filter };
 				});
-				return expandAbbreviationInRange(editor, expandAbbrList, !individualLines).then(() => { return true; });
+				return expandAbbreviationInRange(editor, expandAbbrList, false).then(() => { return true; });
 			});
 		}
 
@@ -214,16 +259,22 @@ function doWrapping(individualLines: boolean, args: any) {
 		if (value !== currentValue) {
 			currentValue = value;
 			makeChanges(value, false).then((out) => {
-				if (typeof out === 'boolean') {
-					inPreview = out;
-				}
+				inPreview = out;
 			});
 		}
 		return '';
 	}
-	const abbreviationPromise: Thenable<string | undefined> = (args && args['abbreviation']) ? Promise.resolve(args['abbreviation']) : vscode.window.showInputBox({ prompt: 'Enter Abbreviation', validateInput: inputChanged });
-	return abbreviationPromise.then(inputAbbreviation => {
-		return makeChanges(inputAbbreviation, true);
+
+	const prompt = localize('wrapWithAbbreviationPrompt', "Enter Abbreviation");
+	const abbreviationPromise: Thenable<string | undefined> = (args && args['abbreviation']) ?
+		Promise.resolve(args['abbreviation']) :
+		vscode.window.showInputBox({ prompt, validateInput: inputChanged });
+	return abbreviationPromise.then(async (inputAbbreviation) => {
+		const changesWereMade = await makeChanges(inputAbbreviation, true);
+		if (!changesWereMade) {
+			editor.selections = oldSelections;
+		}
+		return changesWereMade;
 	});
 }
 
@@ -327,7 +378,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 		if (editor.selections.length === 1 && isStyleSheet(editor.document.languageId) && usePartialParsing && editor.document.lineCount > 1000) {
 			rootNode = parsePartialStylesheet(editor.document, editor.selection.isReversed ? editor.selection.anchor : editor.selection.active);
 		} else {
-			rootNode = parseDocument(editor.document, false);
+			rootNode = parseDocument(editor.document, true);
 		}
 
 		return rootNode;
@@ -342,24 +393,25 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 		if (!helper.isAbbreviationValid(syntax, abbreviation)) {
 			return;
 		}
-		let currentNode = getNode(getRootNode(), position, true);
+		const offset = editor.document.offsetAt(position);
+		let currentNode = getFlatNode(getRootNode(), offset, true);
 		let validateLocation = true;
 		let syntaxToUse = syntax;
 
 		if (editor.document.languageId === 'html') {
-			if (isStyleAttribute(currentNode, position)) {
+			if (isStyleAttribute(currentNode, offset)) {
 				syntaxToUse = 'css';
 				validateLocation = false;
 			} else {
 				const embeddedCssNode = getEmbeddedCssNodeIfAny(editor.document, currentNode, position);
 				if (embeddedCssNode) {
-					currentNode = getNode(embeddedCssNode, position, true);
+					currentNode = getFlatNode(embeddedCssNode, offset, true);
 					syntaxToUse = 'css';
 				}
 			}
 		}
 
-		if (validateLocation && !isValidLocationForEmmetAbbreviation(editor.document, getRootNode(), currentNode, syntaxToUse, position, rangeToReplace)) {
+		if (validateLocation && !isValidLocationForEmmetAbbreviation(editor.document, getRootNode(), currentNode, syntaxToUse, offset, rangeToReplace)) {
 			return;
 		}
 
@@ -393,10 +445,10 @@ function fallbackTab(): Thenable<boolean | undefined> {
  * @param position position to validate
  * @param abbreviationRange The range of the abbreviation for which given position is being validated
  */
-export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, rootNode: Node | undefined, currentNode: Node | null, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
+export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, rootNode: Node | undefined, currentNode: Node | undefined, syntax: string, offset: number, abbreviationRange: vscode.Range): boolean {
 	if (isStyleSheet(syntax)) {
 		const stylesheet = <Stylesheet>rootNode;
-		if (stylesheet && (stylesheet.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
+		if (stylesheet && (stylesheet.comments || []).some(x => offset >= x.start && offset <= x.end)) {
 			return false;
 		}
 		// Continue validation only if the file was parse-able and the currentNode has been found
@@ -419,14 +471,14 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			const propertyNode = <Property>currentNode;
 			if (propertyNode.terminatorToken
 				&& propertyNode.separator
-				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
-				&& position.isBeforeOrEqual(propertyNode.terminatorToken.start)
+				&& offset >= propertyNode.separatorToken.end
+				&& offset <= propertyNode.terminatorToken.start
 				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
 			if (!propertyNode.terminatorToken
 				&& propertyNode.separator
-				&& position.isAfterOrEqual(propertyNode.separatorToken.end)
+				&& offset >= propertyNode.separatorToken.end
 				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
@@ -444,7 +496,7 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 		const currentCssNode = <Rule>currentNode;
 
 		// Position is valid if it occurs after the `{` that marks beginning of rule contents
-		if (position.isAfter(currentCssNode.contentStartToken.end)) {
+		if (offset > currentCssNode.contentStartToken.end) {
 			return true;
 		}
 
@@ -453,12 +505,16 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 		// But we should assume it is a valid location for css properties under the parent rule
 		if (currentCssNode.parent
 			&& (currentCssNode.parent.type === 'rule' || currentCssNode.parent.type === 'at-rule')
-			&& currentCssNode.selectorToken
-			&& position.line !== currentCssNode.selectorToken.end.line
-			&& currentCssNode.selectorToken.start.character === abbreviationRange.start.character
-			&& currentCssNode.selectorToken.start.line === abbreviationRange.start.line
-		) {
-			return true;
+			&& currentCssNode.selectorToken) {
+			const position = document.positionAt(offset);
+			const tokenStartPos = document.positionAt(currentCssNode.selectorToken.start);
+			const tokenEndPos = document.positionAt(currentCssNode.selectorToken.end);
+			if (position.line !== tokenEndPos.line
+				&& tokenStartPos.character === abbreviationRange.start.character
+				&& tokenStartPos.line === abbreviationRange.start.line
+			) {
+				return true;
+			}
 		}
 
 		return false;
@@ -469,7 +525,7 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 	const escape = '\\';
 	const question = '?';
 	const currentHtmlNode = <HtmlNode>currentNode;
-	let start = new vscode.Position(0, 0);
+	let start = 0;
 
 	if (currentHtmlNode) {
 		if (currentHtmlNode.name === 'script') {
@@ -487,27 +543,27 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			return false;
 		}
 
-		const innerRange = getInnerRange(currentHtmlNode);
-
 		// Fix for https://github.com/microsoft/vscode/issues/28829
-		if (!innerRange || !innerRange.contains(position)) {
+		if (!currentHtmlNode.open || !currentHtmlNode.close ||
+			!(currentHtmlNode.open.end <= offset && offset <= currentHtmlNode.close.start)) {
 			return false;
 		}
 
 		// Fix for https://github.com/microsoft/vscode/issues/35128
 		// Find the position up till where we will backtrack looking for unescaped < or >
 		// to decide if current position is valid for emmet expansion
-		start = innerRange.start;
+		start = currentHtmlNode.open.end;
 		let lastChildBeforePosition = currentHtmlNode.firstChild;
 		while (lastChildBeforePosition) {
-			if (lastChildBeforePosition.end.isAfter(position)) {
+			if (lastChildBeforePosition.end > offset) {
 				break;
 			}
 			start = lastChildBeforePosition.end;
 			lastChildBeforePosition = lastChildBeforePosition.nextSibling;
 		}
 	}
-	let textToBackTrack = document.getText(new vscode.Range(start.line, start.character, abbreviationRange.start.line, abbreviationRange.start.character));
+	const startPos = document.positionAt(start);
+	let textToBackTrack = document.getText(new vscode.Range(startPos.line, startPos.character, abbreviationRange.start.line, abbreviationRange.start.character));
 
 	// Worse case scenario is when cursor is inside a big chunk of text which needs to backtracked
 	// Backtrack only 500 offsets to ensure we dont waste time doing this
@@ -582,7 +638,7 @@ function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: Ex
 	const insertPromises: Thenable<boolean>[] = [];
 	if (!insertSameSnippet) {
 		expandAbbrList.sort((a: ExpandAbbreviationInput, b: ExpandAbbreviationInput) => { return b.rangeToReplace.start.compareTo(a.rangeToReplace.start); }).forEach((expandAbbrInput: ExpandAbbreviationInput) => {
-			let expandedText = expandAbbr(expandAbbrInput);
+			const expandedText = expandAbbr(expandAbbrInput);
 			if (expandedText) {
 				insertPromises.push(editor.insertSnippet(new vscode.SnippetString(expandedText), expandAbbrInput.rangeToReplace, { undoStopBefore: false, undoStopAfter: false }));
 			}
@@ -607,24 +663,26 @@ function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: Ex
 	return Promise.resolve(false);
 }
 
-/*
-* Walks the tree rooted at root and apply function fn on each node.
-* if fn return false at any node, the further processing of tree is stopped.
-*/
-function walk(root: any, fn: ((node: any) => boolean)): boolean {
-	let ctx = root;
-	while (ctx) {
+// /*
+// * Walks the tree rooted at root and apply function fn on each node.
+// * if fn return false at any node, the further processing of tree is stopped.
+// */
+// function walk(root: AbbreviationNode, fn: ((node: AbbreviationNode) => boolean)): boolean {
+// 	if (fn(root) === false || walkChildren(root.children, fn) === false) {
+// 		return false;
+// 	}
+// 	return true;
+// }
 
-		const next = ctx.next;
-		if (fn(ctx) === false || walk(ctx.firstChild, fn) === false) {
-			return false;
-		}
-
-		ctx = next;
-	}
-
-	return true;
-}
+// function walkChildren(children: AbbreviationNode[], fn: ((node: AbbreviationNode) => boolean)): boolean {
+// 	for (let i = 0; i < children.length; i++) {
+// 		const child = children[i];
+// 		if (walk(child, fn) === false) {
+// 			return false;
+// 		}
+// 	}
+// 	return true;
+// }
 
 /**
  * Expands abbreviation as detailed in given input.
@@ -634,7 +692,7 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
 	const expandOptions = helper.getExpandOptions(input.syntax, getEmmetConfiguration(input.syntax), input.filter);
 
 	if (input.textToWrap) {
-		if (input.filter && input.filter.indexOf('t') > -1) {
+		if (input.filter && input.filter.includes('t')) {
 			input.textToWrap = input.textToWrap.map(line => {
 				return line.replace(trimRegex, '').trim();
 			});
@@ -644,46 +702,47 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
 		// Below fixes https://github.com/microsoft/vscode/issues/29898
 		// With this, Emmet formats inline elements as block elements
 		// ensuring the wrapped multi line text does not get merged to a single line
-		if (!input.rangeToReplace.isSingleLine) {
-			expandOptions.profile['inlineBreak'] = 1;
+		if (!input.rangeToReplace.isSingleLine && expandOptions.options) {
+			expandOptions.options['output.inlineBreak'] = 1;
 		}
 	}
 
 	let expandedText;
 	try {
 		// Expand the abbreviation
+		if (input.textToWrap && !isStyleSheet(input.syntax)) {
+			const parsedAbbr = <MarkupAbbreviation>helper.parseAbbreviation(input.abbreviation, expandOptions);
+			// if (input.rangeToReplace.isSingleLine && input.textToWrap.length === 1) {
+			// 	// Fetch rightmost element in the parsed abbreviation (i.e the element that will contain the wrapped text).
+			// 	const wrappingNodeChildren = parsedAbbr.children;
+			// 	let wrappingNode = wrappingNodeChildren[wrappingNodeChildren.length - 1];
+			// 	while (wrappingNode && wrappingNode.children && wrappingNode.children.length > 0) {
+			// 		wrappingNode = wrappingNode.children[wrappingNode.children.length - 1];
+			// 	}
 
-		if (input.textToWrap) {
-			const parsedAbbr = helper.parseAbbreviation(input.abbreviation, expandOptions);
-			if (input.rangeToReplace.isSingleLine && input.textToWrap.length === 1) {
-
-				// Fetch rightmost element in the parsed abbreviation (i.e the element that will contain the wrapped text).
-				let wrappingNode = parsedAbbr;
-				while (wrappingNode && wrappingNode.children && wrappingNode.children.length > 0) {
-					wrappingNode = wrappingNode.children[wrappingNode.children.length - 1];
-				}
-
-				// If wrapping with a block element, insert newline in the text to wrap.
-				if (wrappingNode && inlineElements.indexOf(wrappingNode.name) === -1 && (expandOptions['profile'].hasOwnProperty('format') ? expandOptions['profile'].format : true)) {
-					wrappingNode.value = '\n\t' + wrappingNode.value + '\n';
-				}
-			}
+			// 	// If wrapping with a block element, insert newline in the text to wrap.
+			// 	// const format = expandOptions.options ? (expandOptions.options['output.format'] ?? true) : true;
+			// 	// if (wrappingNode && wrappingNode.name && wrappingNode.value
+			// 	// 	&& inlineElements.indexOf(wrappingNode.name) === -1
+			// 	// 	&& format) {
+			// 	// 	wrappingNode.value[0] = '\n\t' + wrappingNode.value[0] + '\n';
+			// 	// }
+			// }
 
 			// Below fixes https://github.com/microsoft/vscode/issues/78219
 			// walk the tree and remove tags for empty values
-			walk(parsedAbbr, node => {
-				if (node.name !== null && node.value === '' && !node.isSelfClosing && node.children.length === 0) {
-					node.name = '';
-					node.value = '\n';
-				}
-
-				return true;
-			});
+			// walkChildren(parsedAbbr.children, node => {
+			// 	if (node.name !== null && node.value && node.value[0] === '' && !node.selfClosing && node.children.length === 0) {
+			// 		node.name = '';
+			// 		node.value[0] = '\n';
+			// 	}
+			// 	return true;
+			// });
 
 			expandedText = helper.expandAbbreviation(parsedAbbr, expandOptions);
 			// All $anyword would have been escaped by the emmet helper.
 			// Remove the escaping backslash from $TM_SELECTED_TEXT so that VS Code Snippet controller can treat it as a variable
-			expandedText = expandedText.replace('\\$TM_SELECTED_TEXT', '$TM_SELECTED_TEXT');
+			expandedText = expandedText.replace('<p>\\$TM_SELECTED_TEXT</p>', '$TM_SELECTED_TEXT');
 		} else {
 			expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
 		}
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
index 21ac3027d..9cce9593b 100644
--- a/extensions/emmet/src/balance.ts
+++ b/extensions/emmet/src/balance.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { HtmlNode } from 'EmmetNode';
-import { getHtmlNode, parseDocument, validate } from './util';
+import { getHtmlFlatNode, offsetRangeToSelection, validate } from './util';
+import { getRootNode } from './parseDocument';
+import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
 
 let balanceOutStack: Array<vscode.Selection[]> = [];
-let lastOut = false;
 let lastBalancedSelections: vscode.Selection[] = [];
 
 export function balanceOut() {
@@ -24,53 +24,51 @@ function balance(out: boolean) {
 		return;
 	}
 	const editor = vscode.window.activeTextEditor;
-	let rootNode = <HtmlNode>parseDocument(editor.document);
+	const document = editor.document;
+	const rootNode = <HtmlFlatNode>getRootNode(document, true);
 	if (!rootNode) {
 		return;
 	}
 
-	let getRangeFunction = out ? getRangeToBalanceOut : getRangeToBalanceIn;
+	const rangeFn = out ? getRangeToBalanceOut : getRangeToBalanceIn;
 	let newSelections: vscode.Selection[] = [];
 	editor.selections.forEach(selection => {
-		let range = getRangeFunction(editor.document, selection, rootNode);
+		const range = rangeFn(document, rootNode, selection);
 		newSelections.push(range);
 	});
 
-	if (areSameSelections(newSelections, editor.selections)) {
-		return;
-	}
-
+	// check whether we are starting a balance elsewhere
 	if (areSameSelections(lastBalancedSelections, editor.selections)) {
+		// we are not starting elsewhere, so use the stack as-is
 		if (out) {
-			if (!balanceOutStack.length) {
+			// make sure we are able to expand outwards
+			if (!areSameSelections(editor.selections, newSelections)) {
 				balanceOutStack.push(editor.selections);
 			}
-			balanceOutStack.push(newSelections);
-		} else {
-			if (lastOut) {
-				balanceOutStack.pop();
-			}
-			newSelections = balanceOutStack.pop() || newSelections;
+		} else if (balanceOutStack.length) {
+			newSelections = balanceOutStack.pop()!;
 		}
 	} else {
-		balanceOutStack = out ? [editor.selections, newSelections] : [];
+		// we are starting elsewhere, so reset the stack
+		balanceOutStack = out ? [editor.selections] : [];
 	}
 
-	lastOut = out;
-	lastBalancedSelections = editor.selections = newSelections;
+	editor.selections = newSelections;
+	lastBalancedSelections = editor.selections;
 }
 
-function getRangeToBalanceOut(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlNode): vscode.Selection {
-	let nodeToBalance = getHtmlNode(document, rootNode, selection.start, false);
+function getRangeToBalanceOut(document: vscode.TextDocument, rootNode: HtmlFlatNode, selection: vscode.Selection): vscode.Selection {
+	const offset = document.offsetAt(selection.start);
+	const nodeToBalance = getHtmlFlatNode(document.getText(), rootNode, offset, false);
 	if (!nodeToBalance) {
 		return selection;
 	}
-	if (!nodeToBalance.close) {
-		return new vscode.Selection(nodeToBalance.start, nodeToBalance.end);
+	if (!nodeToBalance.open || !nodeToBalance.close) {
+		return offsetRangeToSelection(document, nodeToBalance.start, nodeToBalance.end);
 	}
 
-	let innerSelection = new vscode.Selection(nodeToBalance.open.end, nodeToBalance.close.start);
-	let outerSelection = new vscode.Selection(nodeToBalance.start, nodeToBalance.end);
+	const innerSelection = offsetRangeToSelection(document, nodeToBalance.open.end, nodeToBalance.close.start);
+	const outerSelection = offsetRangeToSelection(document, nodeToBalance.open.start, nodeToBalance.close.end);
 
 	if (innerSelection.contains(selection) && !innerSelection.isEqual(selection)) {
 		return innerSelection;
@@ -81,19 +79,22 @@ function getRangeToBalanceOut(document: vscode.TextDocument, selection: vscode.S
 	return selection;
 }
 
-function getRangeToBalanceIn(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlNode): vscode.Selection {
-	let nodeToBalance = getHtmlNode(document, rootNode, selection.start, true);
+function getRangeToBalanceIn(document: vscode.TextDocument, rootNode: HtmlFlatNode, selection: vscode.Selection): vscode.Selection {
+	const offset = document.offsetAt(selection.start);
+	const nodeToBalance = getHtmlFlatNode(document.getText(), rootNode, offset, true);
 	if (!nodeToBalance) {
 		return selection;
 	}
 
-	if (nodeToBalance.close) {
-		const entireNodeSelected = selection.start.isEqual(nodeToBalance.start) && selection.end.isEqual(nodeToBalance.end);
-		const startInOpenTag = selection.start.isAfter(nodeToBalance.open.start) && selection.start.isBefore(nodeToBalance.open.end);
-		const startInCloseTag = selection.start.isAfter(nodeToBalance.close.start) && selection.start.isBefore(nodeToBalance.close.end);
+	const selectionStart = document.offsetAt(selection.start);
+	const selectionEnd = document.offsetAt(selection.end);
+	if (nodeToBalance.open && nodeToBalance.close) {
+		const entireNodeSelected = selectionStart === nodeToBalance.start && selectionEnd === nodeToBalance.end;
+		const startInOpenTag = selectionStart > nodeToBalance.open.start && selectionStart < nodeToBalance.open.end;
+		const startInCloseTag = selectionStart > nodeToBalance.close.start && selectionStart < nodeToBalance.close.end;
 
 		if (entireNodeSelected || startInOpenTag || startInCloseTag) {
-			return new vscode.Selection(nodeToBalance.open.end, nodeToBalance.close.start);
+			return offsetRangeToSelection(document, nodeToBalance.open.end, nodeToBalance.close.start);
 		}
 	}
 
@@ -101,14 +102,15 @@ function getRangeToBalanceIn(document: vscode.TextDocument, selection: vscode.Se
 		return selection;
 	}
 
-	if (selection.start.isEqual(nodeToBalance.firstChild.start)
-		&& selection.end.isEqual(nodeToBalance.firstChild.end)
-		&& nodeToBalance.firstChild.close) {
-		return new vscode.Selection(nodeToBalance.firstChild.open.end, nodeToBalance.firstChild.close.start);
+	const firstChild = nodeToBalance.firstChild;
+	if (selectionStart === firstChild.start
+		&& selectionEnd === firstChild.end
+		&& firstChild.open
+		&& firstChild.close) {
+		return offsetRangeToSelection(document, firstChild.open.end, firstChild.close.start);
 	}
 
-	return new vscode.Selection(nodeToBalance.firstChild.start, nodeToBalance.firstChild.end);
-
+	return offsetRangeToSelection(document, firstChild.start, firstChild.end);
 }
 
 function areSameSelections(a: vscode.Selection[], b: vscode.Selection[]): boolean {
@@ -121,4 +123,4 @@ function areSameSelections(a: vscode.Selection[], b: vscode.Selection[]): boolea
 		}
 	}
 	return true;
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/bufferStream.ts b/extensions/emmet/src/bufferStream.ts
index 81702969f..60376c1e2 100644
--- a/extensions/emmet/src/bufferStream.ts
+++ b/extensions/emmet/src/bufferStream.ts
@@ -5,7 +5,7 @@
 
 /* Based on @sergeche's work in his emmet plugin */
 
-import { TextDocument, Position, Range, EndOfLine } from 'vscode';
+import { TextDocument } from 'vscode';
 
 /**
  * A stream reader for VSCode's `TextDocument`
@@ -13,40 +13,37 @@ import { TextDocument, Position, Range, EndOfLine } from 'vscode';
  */
 export class DocumentStreamReader {
 	private document: TextDocument;
-	private start: Position;
-	private _eof: Position;
-	private _sof: Position;
-	public pos: Position;
-	private _eol: string;
-
-	constructor(document: TextDocument, pos?: Position, limit?: Range) {
+	private start: number;
+	private _eof: number;
+	private _sof: number;
+	public pos: number;
 
+	constructor(document: TextDocument, pos?: number, limit?: [number, number]) {
 		this.document = document;
-		this.start = this.pos = pos ? pos : new Position(0, 0);
-		this._sof = limit ? limit.start : new Position(0, 0);
-		this._eof = limit ? limit.end : new Position(this.document.lineCount - 1, this._lineLength(this.document.lineCount - 1));
-		this._eol = this.document.eol === EndOfLine.LF ? '\n' : '\r\n';
+		this.start = this.pos = pos ? pos : 0;
+		this._sof = limit ? limit[0] : 0;
+		this._eof = limit ? limit[1] : document.getText().length;
 	}
 
 	/**
 	 * Returns true only if the stream is at the start of the file.
 	 */
 	sof(): boolean {
-		return this.pos.isBeforeOrEqual(this._sof);
+		return this.pos <= this._sof;
 	}
 
 	/**
 	 * Returns true only if the stream is at the end of the file.
 	 */
 	eof(): boolean {
-		return this.pos.isAfterOrEqual(this._eof);
+		return this.pos >= this._eof;
 	}
 
 	/**
 	 * Creates a new stream instance which is limited to given range for given document
 	 */
-	limit(start: Position, end: Position): DocumentStreamReader {
-		return new DocumentStreamReader(this.document, start, new Range(start, end));
+	limit(start: number, end: number): DocumentStreamReader {
+		return new DocumentStreamReader(this.document, start, [start, end]);
 	}
 
 	/**
@@ -57,8 +54,7 @@ export class DocumentStreamReader {
 		if (this.eof()) {
 			return NaN;
 		}
-		const line = this.document.lineAt(this.pos.line).text;
-		return this.pos.character < line.length ? line.charCodeAt(this.pos.character) : this._eol.charCodeAt(this.pos.character - line.length);
+		return this.document.getText().charCodeAt(this.pos);
 	}
 
 	/**
@@ -70,19 +66,12 @@ export class DocumentStreamReader {
 			return NaN;
 		}
 
-		const line = this.document.lineAt(this.pos.line).text;
-		let code: number;
-		if (this.pos.character < line.length) {
-			code = line.charCodeAt(this.pos.character);
-			this.pos = this.pos.translate(0, 1);
-		} else {
-			code = this._eol.charCodeAt(this.pos.character - line.length);
-			this.pos = new Position(this.pos.line + 1, 0);
-		}
+		const code = this.document.getText().charCodeAt(this.pos);
+		this.pos++;
 
 		if (this.eof()) {
 			// restrict pos to eof, if in case it got moved beyond eof
-			this.pos = new Position(this._eof.line, this._eof.character);
+			this.pos = this._eof;
 		}
 
 		return code;
@@ -92,20 +81,11 @@ export class DocumentStreamReader {
 	 * Backs up the stream n characters. Backing it up further than the
 	 * start of the current token will cause things to break, so be careful.
 	 */
-	backUp(n: number) {
-		let row = this.pos.line;
-		let column = this.pos.character;
-		column -= (n || 1);
-
-		while (row >= 0 && column < 0) {
-			row--;
-			column += this._lineLength(row);
+	backUp(n: number): number {
+		this.pos -= n;
+		if (this.pos < 0) {
+			this.pos = 0;
 		}
-
-		this.pos = row < 0 || column < 0
-			? new Position(0, 0)
-			: new Position(row, column);
-
 		return this.peek();
 	}
 
@@ -120,29 +100,18 @@ export class DocumentStreamReader {
 	/**
 	 * Returns contents for given range
 	 */
-	substring(from: Position, to: Position): string {
-		return this.document.getText(new Range(from, to));
+	substring(from: number, to: number): string {
+		return this.document.getText().substring(from, to);
 	}
 
 	/**
 	 * Creates error object with current stream state
 	 */
 	error(message: string): Error {
-		const err = new Error(`${message} at row ${this.pos.line}, column ${this.pos.character}`);
-
+		const err = new Error(`${message} at offset ${this.pos}`);
 		return err;
 	}
 
-	/**
-	 * Returns line length of given row, including line ending
-	 */
-	_lineLength(row: number): number {
-		if (row === this.document.lineCount - 1) {
-			return this.document.lineAt(row).text.length;
-		}
-		return this.document.lineAt(row).text.length + this._eol.length;
-	}
-
 	/**
 	 * `match` can be a character code or a function that takes a character code
 	 * and returns a boolean. If the next character in the stream 'matches'
@@ -167,6 +136,6 @@ export class DocumentStreamReader {
 	eatWhile(match: number | Function): boolean {
 		const start = this.pos;
 		while (!this.eof() && this.eat(match)) { }
-		return !this.pos.isEqual(start);
+		return this.pos !== start;
 	}
 }
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 9ac469af6..bb9226c59 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node, Stylesheet } from 'EmmetNode';
+import { Node, Stylesheet } from 'EmmetFlatNode';
 import { isValidLocationForEmmetAbbreviation, getSyntaxFromArgs } from './abbreviationActions';
-import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument, getNode, allowedMimeTypesInScriptTag, trimQuotes, toLSTextDocument } from './util';
-import { getLanguageService, TokenType, Range as LSRange } from 'vscode-html-languageservice';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, getFlatNode, allowedMimeTypesInScriptTag, toLSTextDocument, getHtmlFlatNode } from './util';
+import { Range as LSRange } from 'vscode-languageserver-textdocument';
+import { getRootNode } from './parseDocument';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
 	private lastCompletionType: string | undefined;
 
-	private htmlLS = getLanguageService();
-
 	public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, _: vscode.CancellationToken, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
 		const completionResult = this.provideCompletionItemsInternal(document, position, context);
 		if (!completionResult) {
@@ -62,8 +61,8 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 
 		const helper = getEmmetHelper();
 		let validateLocation = syntax === 'html' || syntax === 'jsx' || syntax === 'xml';
-		let rootNode: Node | undefined = undefined;
-		let currentNode: Node | null = null;
+		let rootNode: Node | undefined;
+		let currentNode: Node | undefined;
 
 		const lsDoc = toLSTextDocument(document);
 		position = document.validatePosition(position);
@@ -81,19 +80,16 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 					default:
 						break;
 				}
-
 			}
 			if (validateLocation) {
-
-				const parsedLsDoc = this.htmlLS.parseHTMLDocument(lsDoc);
 				const positionOffset = document.offsetAt(position);
-				const node = parsedLsDoc.findNodeAt(positionOffset);
-
-				if (node.tag === 'script') {
-					if (node.attributes && 'type' in node.attributes) {
-						const rawTypeAttrValue = node.attributes['type'];
-						if (rawTypeAttrValue) {
-							const typeAttrValue = trimQuotes(rawTypeAttrValue);
+				const emmetRootNode = getRootNode(document, true);
+				const foundNode = getHtmlFlatNode(document.getText(), emmetRootNode, positionOffset, false);
+				if (foundNode) {
+					if (foundNode.name === 'script') {
+						const typeNode = foundNode.attributes.find(attr => attr.name.toString() === 'type');
+						if (typeNode) {
+							const typeAttrValue = typeNode.value.toString();
 							if (typeAttrValue === 'application/javascript' || typeAttrValue === 'text/javascript') {
 								if (!getSyntaxFromArgs({ language: 'javascript' })) {
 									return;
@@ -101,34 +97,19 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 									validateLocation = false;
 								}
 							}
-
-							else if (allowedMimeTypesInScriptTag.indexOf(trimQuotes(rawTypeAttrValue)) > -1) {
+							else if (allowedMimeTypesInScriptTag.includes(typeAttrValue)) {
 								validateLocation = false;
 							}
+						} else {
+							return;
 						}
-					} else {
-						return;
 					}
-				}
-				else if (node.tag === 'style') {
-					syntax = 'css';
-					validateLocation = false;
-				} else {
-					if (node.attributes && node.attributes['style']) {
-						const scanner = this.htmlLS.createScanner(document.getText(), node.start);
-						let tokenType = scanner.scan();
-						let prevAttr = undefined;
-						let styleAttrValueRange: [number, number] | undefined = undefined;
-						while (tokenType !== TokenType.EOS && (scanner.getTokenEnd() <= positionOffset)) {
-							tokenType = scanner.scan();
-							if (tokenType === TokenType.AttributeName) {
-								prevAttr = scanner.getTokenText();
-							}
-							else if (tokenType === TokenType.AttributeValue && prevAttr === 'style') {
-								styleAttrValueRange = [scanner.getTokenOffset(), scanner.getTokenEnd()];
-							}
-						}
-						if (prevAttr === 'style' && styleAttrValueRange && positionOffset > styleAttrValueRange[0] && positionOffset < styleAttrValueRange[1]) {
+					else if (foundNode.name === 'style') {
+						syntax = 'css';
+						validateLocation = false;
+					} else {
+						const styleNode = foundNode.attributes.find(attr => attr.name.toString() === 'style');
+						if (styleNode && styleNode.value.start <= positionOffset && positionOffset <= styleNode.value.end) {
 							syntax = 'css';
 							validateLocation = false;
 						}
@@ -145,19 +126,18 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			return;
 		}
 
+		const offset = document.offsetAt(position);
 		if (isStyleSheet(document.languageId) && context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
 			validateLocation = true;
 			let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true;
-			rootNode = usePartialParsing && document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
+			rootNode = usePartialParsing && document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>getRootNode(document, true);
 			if (!rootNode) {
 				return;
 			}
-			currentNode = getNode(rootNode, position, true);
+			currentNode = getFlatNode(rootNode, offset, true);
 		}
 
-
-
-		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, currentNode, syntax, position, toRange(extractAbbreviationResults.abbreviationRange))) {
+		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, currentNode, syntax, offset, toRange(extractAbbreviationResults.abbreviationRange))) {
 			return;
 		}
 
diff --git a/extensions/emmet/src/editPoint.ts b/extensions/emmet/src/editPoint.ts
index d91511857..239df1f4c 100644
--- a/extensions/emmet/src/editPoint.ts
+++ b/extensions/emmet/src/editPoint.ts
@@ -46,7 +46,7 @@ function findEditPoint(lineNum: number, editor: vscode.TextEditor, position: vsc
 	let line = editor.document.lineAt(lineNum);
 	let lineContent = line.text;
 
-	if (lineNum !== position.line && line.isEmptyOrWhitespace) {
+	if (lineNum !== position.line && line.isEmptyOrWhitespace && lineContent.length) {
 		return new vscode.Selection(lineNum, lineContent.length, lineNum, lineContent.length);
 	}
 
diff --git a/extensions/emmet/src/emmetCommon.ts b/extensions/emmet/src/emmetCommon.ts
index e768b03af..d04742862 100644
--- a/extensions/emmet/src/emmetCommon.ts
+++ b/extensions/emmet/src/emmetCommon.ts
@@ -17,8 +17,9 @@ import { fetchEditPoint } from './editPoint';
 import { fetchSelectItem } from './selectItem';
 import { evaluateMathExpression } from './evaluateMathExpression';
 import { incrementDecrement } from './incrementDecrement';
-import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, getPathBaseName } from './util';
+import { LANGUAGE_MODES, getMappingForIncludedLanguages, updateEmmetExtensionsPath, getPathBaseName, getSyntaxes, getEmmetMode } from './util';
 import { reflectCssValue } from './reflectCssValue';
+import { addFileToParseCache, removeFileFromParseCache } from './parseDocument';
 
 export function activateEmmetExtension(context: vscode.ExtensionContext) {
 	registerCompletionProviders(context);
@@ -145,6 +146,22 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) {
 			updateEmmetExtensionsPath(true);
 		}
 	}));
+
+	context.subscriptions.push(vscode.workspace.onDidOpenTextDocument((e) => {
+		const emmetMode = getEmmetMode(e.languageId, []) ?? '';
+		const syntaxes = getSyntaxes();
+		if (syntaxes.markup.includes(emmetMode) || syntaxes.stylesheet.includes(emmetMode)) {
+			addFileToParseCache(e);
+		}
+	}));
+
+	context.subscriptions.push(vscode.workspace.onDidCloseTextDocument((e) => {
+		const emmetMode = getEmmetMode(e.languageId, []) ?? '';
+		const syntaxes = getSyntaxes();
+		if (syntaxes.markup.includes(emmetMode) || syntaxes.stylesheet.includes(emmetMode)) {
+			removeFileFromParseCache(e);
+		}
+	}));
 }
 
 /**
diff --git a/extensions/emmet/src/evaluateMathExpression.ts b/extensions/emmet/src/evaluateMathExpression.ts
index 588d4dce9..cdbcfda1d 100644
--- a/extensions/emmet/src/evaluateMathExpression.ts
+++ b/extensions/emmet/src/evaluateMathExpression.ts
@@ -7,7 +7,6 @@
 
 import * as vscode from 'vscode';
 import evaluate, { extract } from '@emmetio/math-expression';
-import { DocumentStreamReader } from './bufferStream';
 
 export function evaluateMathExpression(): Thenable<boolean> {
 	if (!vscode.window.activeTextEditor) {
@@ -15,13 +14,12 @@ export function evaluateMathExpression(): Thenable<boolean> {
 		return Promise.resolve(false);
 	}
 	const editor = vscode.window.activeTextEditor;
-	const stream = new DocumentStreamReader(editor.document);
 	return editor.edit(editBuilder => {
 		editor.selections.forEach(selection => {
 			// startpos always comes before endpos
 			const startpos = selection.isReversed ? selection.active : selection.anchor;
 			const endpos = selection.isReversed ? selection.anchor : selection.active;
-			const selectionText = stream.substring(startpos, endpos);
+			const selectionText = editor.document.getText(new vscode.Range(startpos, endpos));
 
 			try {
 				if (selectionText) {
@@ -30,7 +28,7 @@ export function evaluateMathExpression(): Thenable<boolean> {
 					editBuilder.replace(new vscode.Range(startpos, endpos), result);
 				} else {
 					// no selection made, extract expression from line
-					const lineToSelectionEnd = stream.substring(new vscode.Position(selection.end.line, 0), endpos);
+					const lineToSelectionEnd = editor.document.getText(new vscode.Range(new vscode.Position(selection.end.line, 0), endpos));
 					const extractedIndices = extract(lineToSelectionEnd);
 					if (!extractedIndices) {
 						throw new Error('Invalid extracted indices');
diff --git a/extensions/emmet/src/imageSizeHelper.ts b/extensions/emmet/src/imageSizeHelper.ts
index 13ae22391..c761b095b 100644
--- a/extensions/emmet/src/imageSizeHelper.ts
+++ b/extensions/emmet/src/imageSizeHelper.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 // Based on @sergeche's work on the emmet plugin for atom
-// TODO: Move to https://github.com/emmetio/image-size
 
 import * as path from 'path';
 import * as http from 'http';
diff --git a/extensions/emmet/src/matchTag.ts b/extensions/emmet/src/matchTag.ts
index 1e5ead3fb..d7331a465 100644
--- a/extensions/emmet/src/matchTag.ts
+++ b/extensions/emmet/src/matchTag.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { HtmlNode } from 'EmmetNode';
-import { getHtmlNode, parseDocument, validate } from './util';
-
+import { validate, getHtmlFlatNode, offsetRangeToSelection } from './util';
+import { getRootNode } from './parseDocument';
+import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
 
 export function matchTag() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
@@ -14,32 +14,40 @@ export function matchTag() {
 	}
 
 	const editor = vscode.window.activeTextEditor;
-	let rootNode: HtmlNode = <HtmlNode>parseDocument(editor.document);
-	if (!rootNode) { return; }
+	const document = editor.document;
+	const rootNode = <HtmlFlatNode>getRootNode(document, true);
+	if (!rootNode) {
+		return;
+	}
 
 	let updatedSelections: vscode.Selection[] = [];
 	editor.selections.forEach(selection => {
-		let updatedSelection = getUpdatedSelections(editor, selection.start, rootNode);
+		const updatedSelection = getUpdatedSelections(document, rootNode, selection.start);
 		if (updatedSelection) {
 			updatedSelections.push(updatedSelection);
 		}
 	});
-	if (updatedSelections.length > 0) {
+	if (updatedSelections.length) {
 		editor.selections = updatedSelections;
 		editor.revealRange(editor.selections[updatedSelections.length - 1]);
 	}
 }
 
-function getUpdatedSelections(editor: vscode.TextEditor, position: vscode.Position, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, position, true);
-	if (!currentNode) { return; }
+function getUpdatedSelections(document: vscode.TextDocument, rootNode: HtmlFlatNode, position: vscode.Position): vscode.Selection | undefined {
+	const offset = document.offsetAt(position);
+	const currentNode = getHtmlFlatNode(document.getText(), rootNode, offset, true);
+	if (!currentNode) {
+		return;
+	}
 
-	// If no closing tag or cursor is between open and close tag, then no-op
-	if (!currentNode.close || (position.isAfter(currentNode.open.end) && position.isBefore(currentNode.close.start))) {
+	// If no opening/closing tag or cursor is between open and close tag, then no-op
+	if (!currentNode.open
+		|| !currentNode.close
+		|| (offset > currentNode.open.end && offset < currentNode.close.start)) {
 		return;
 	}
 
 	// Place cursor inside the close tag if cursor is inside the open tag, else place it inside the open tag
-	let finalPosition = position.isBeforeOrEqual(currentNode.open.end) ? currentNode.close.start.translate(0, 2) : currentNode.open.start.translate(0, 1);
-	return new vscode.Selection(finalPosition, finalPosition);
-}
\ No newline at end of file
+	const finalOffset = (offset <= currentNode.open.end) ? currentNode.close.start + 2 : currentNode.start + 1;
+	return offsetRangeToSelection(document, finalOffset, finalOffset);
+}
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
index cebcea301..ef2f37f7d 100644
--- a/extensions/emmet/src/mergeLines.ts
+++ b/extensions/emmet/src/mergeLines.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node } from 'EmmetNode';
-import { getNode, parseDocument, validate } from './util';
+import { Node } from 'EmmetFlatNode';
+import { getFlatNode, offsetRangeToVsRange, validate } from './util';
+import { getRootNode } from './parseDocument';
 
 export function mergeLines() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
@@ -14,14 +15,14 @@ export function mergeLines() {
 
 	const editor = vscode.window.activeTextEditor;
 
-	let rootNode = parseDocument(editor.document);
+	const rootNode = getRootNode(editor.document, true);
 	if (!rootNode) {
 		return;
 	}
 
 	return editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
-			let textEdit = getRangesToReplace(editor.document, selection, rootNode!);
+			const textEdit = getRangesToReplace(editor.document, selection, rootNode);
 			if (textEdit) {
 				editBuilder.replace(textEdit.range, textEdit.newText);
 			}
@@ -30,25 +31,36 @@ export function mergeLines() {
 }
 
 function getRangesToReplace(document: vscode.TextDocument, selection: vscode.Selection, rootNode: Node): vscode.TextEdit | undefined {
-	let startNodeToUpdate: Node | null;
-	let endNodeToUpdate: Node | null;
+	let startNodeToUpdate: Node | undefined;
+	let endNodeToUpdate: Node | undefined;
 
+	const selectionStart = document.offsetAt(selection.start);
+	const selectionEnd = document.offsetAt(selection.end);
 	if (selection.isEmpty) {
-		startNodeToUpdate = endNodeToUpdate = getNode(rootNode, selection.start, true);
+		startNodeToUpdate = endNodeToUpdate = getFlatNode(rootNode, selectionStart, true);
 	} else {
-		startNodeToUpdate = getNode(rootNode, selection.start, true);
-		endNodeToUpdate = getNode(rootNode, selection.end, true);
+		startNodeToUpdate = getFlatNode(rootNode, selectionStart, true);
+		endNodeToUpdate = getFlatNode(rootNode, selectionEnd, true);
 	}
 
-	if (!startNodeToUpdate || !endNodeToUpdate || startNodeToUpdate.start.line === endNodeToUpdate.end.line) {
+	if (!startNodeToUpdate || !endNodeToUpdate) {
 		return;
 	}
 
-	let rangeToReplace = new vscode.Range(startNodeToUpdate.start, endNodeToUpdate.end);
-	let textToReplaceWith = document.lineAt(startNodeToUpdate.start.line).text.substr(startNodeToUpdate.start.character);
-	for (let i = startNodeToUpdate.start.line + 1; i <= endNodeToUpdate.end.line; i++) {
+	const startPos = document.positionAt(startNodeToUpdate.start);
+	const startLine = startPos.line;
+	const startChar = startPos.character;
+	const endPos = document.positionAt(endNodeToUpdate.end);
+	const endLine = endPos.line;
+	if (startLine === endLine) {
+		return;
+	}
+
+	const rangeToReplace = offsetRangeToVsRange(document, startNodeToUpdate.start, endNodeToUpdate.end);
+	let textToReplaceWith = document.lineAt(startLine).text.substr(startChar);
+	for (let i = startLine + 1; i <= endLine; i++) {
 		textToReplaceWith += document.lineAt(i).text.trim();
 	}
 
 	return new vscode.TextEdit(rangeToReplace, textToReplaceWith);
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/parseDocument.ts b/extensions/emmet/src/parseDocument.ts
new file mode 100644
index 000000000..c062e9d89
--- /dev/null
+++ b/extensions/emmet/src/parseDocument.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TextDocument } from 'vscode';
+import { Node as FlatNode } from 'EmmetFlatNode';
+import parse from '@emmetio/html-matcher';
+import parseStylesheet from '@emmetio/css-parser';
+import { isStyleSheet } from './util';
+
+type Pair<K, V> = {
+	key: K;
+	value: V;
+};
+
+// Map(filename, Pair(fileVersion, rootNodeOfParsedContent))
+const _parseCache = new Map<string, Pair<number, FlatNode> | undefined>();
+
+export function getRootNode(document: TextDocument, useCache: boolean): FlatNode {
+	const key = document.uri.toString();
+	const result = _parseCache.get(key);
+	const documentVersion = document.version;
+	if (useCache && result) {
+		if (documentVersion === result.key) {
+			return result.value;
+		}
+	}
+
+	const parseContent = isStyleSheet(document.languageId) ? parseStylesheet : parse;
+	const rootNode = parseContent(document.getText());
+	if (useCache) {
+		_parseCache.set(key, { key: documentVersion, value: rootNode });
+	}
+	return rootNode;
+}
+
+export function addFileToParseCache(document: TextDocument) {
+	const filename = document.uri.toString();
+	_parseCache.set(filename, undefined);
+}
+
+export function removeFileFromParseCache(document: TextDocument) {
+	const filename = document.uri.toString();
+	_parseCache.delete(filename);
+}
diff --git a/extensions/emmet/src/reflectCssValue.ts b/extensions/emmet/src/reflectCssValue.ts
index da20b3839..6992e6297 100644
--- a/extensions/emmet/src/reflectCssValue.ts
+++ b/extensions/emmet/src/reflectCssValue.ts
@@ -3,20 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range, window, TextEditor } from 'vscode';
-import { getCssPropertyFromRule, getCssPropertyFromDocument } from './util';
-import { Property, Rule } from 'EmmetNode';
+import { window, TextEditor } from 'vscode';
+import { getCssPropertyFromRule, getCssPropertyFromDocument, offsetRangeToVsRange } from './util';
+import { Property, Rule } from 'EmmetFlatNode';
 
 const vendorPrefixes = ['-webkit-', '-moz-', '-ms-', '-o-', ''];
 
 export function reflectCssValue(): Thenable<boolean> | undefined {
-	let editor = window.activeTextEditor;
+	const editor = window.activeTextEditor;
 	if (!editor) {
 		window.showInformationMessage('No editor is active.');
 		return;
 	}
 
-	let node = getCssPropertyFromDocument(editor, editor.selection.active);
+	const node = getCssPropertyFromDocument(editor, editor.selection.active);
 	if (!node) {
 		return;
 	}
@@ -45,10 +45,11 @@ function updateCSSNode(editor: TextEditor, property: Property): Thenable<boolean
 			if (prefix === currentPrefix) {
 				return;
 			}
-			let vendorProperty = getCssPropertyFromRule(rule, prefix + propertyName);
+			const vendorProperty = getCssPropertyFromRule(rule, prefix + propertyName);
 			if (vendorProperty) {
-				builder.replace(new Range(vendorProperty.valueToken.start, vendorProperty.valueToken.end), propertyValue);
+				const rangeToReplace = offsetRangeToVsRange(editor.document, vendorProperty.valueToken.start, vendorProperty.valueToken.end);
+				builder.replace(rangeToReplace, propertyValue);
 			}
 		});
 	});
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/removeTag.ts b/extensions/emmet/src/removeTag.ts
index 9209a6d75..89f91e6b0 100644
--- a/extensions/emmet/src/removeTag.ts
+++ b/extensions/emmet/src/removeTag.ts
@@ -4,63 +4,91 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { parseDocument, validate, getHtmlNode } from './util';
-import { HtmlNode } from 'EmmetNode';
+import { getRootNode } from './parseDocument';
+import { validate, getHtmlFlatNode, offsetRangeToVsRange } from './util';
+import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
 
 export function removeTag() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
 		return;
 	}
 	const editor = vscode.window.activeTextEditor;
-
-	let rootNode = <HtmlNode>parseDocument(editor.document);
+	const document = editor.document;
+	const rootNode = <HtmlFlatNode>getRootNode(document, true);
 	if (!rootNode) {
 		return;
 	}
 
-	let indentInSpaces = '';
-	const tabSize: number = editor.options.tabSize ? +editor.options.tabSize : 0;
-	for (let i = 0; i < tabSize || 0; i++) {
-		indentInSpaces += ' ';
-	}
-
-	let rangesToRemove: vscode.Range[] = [];
-	editor.selections.reverse().forEach(selection => {
-		rangesToRemove = rangesToRemove.concat(getRangeToRemove(editor, rootNode, selection, indentInSpaces));
-	});
+	let finalRangesToRemove = editor.selections.reverse()
+		.reduce<vscode.Range[]>((prev, selection) =>
+			prev.concat(getRangesToRemove(editor.document, rootNode, selection)), []);
 
 	return editor.edit(editBuilder => {
-		rangesToRemove.forEach(range => {
+		finalRangesToRemove.forEach(range => {
 			editBuilder.replace(range, '');
 		});
 	});
 }
 
-function getRangeToRemove(editor: vscode.TextEditor, rootNode: HtmlNode, selection: vscode.Selection, indentInSpaces: string): vscode.Range[] {
-
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
+/**
+ * Calculates the ranges to remove, along with what to replace those ranges with.
+ * It finds the node to remove based on the selection's start position
+ * and then removes that node, reindenting the content in between.
+ */
+function getRangesToRemove(document: vscode.TextDocument, rootNode: HtmlFlatNode, selection: vscode.Selection): vscode.Range[] {
+	const offset = document.offsetAt(selection.start);
+	const nodeToUpdate = getHtmlFlatNode(document.getText(), rootNode, offset, true);
 	if (!nodeToUpdate) {
 		return [];
 	}
 
-	let openRange = new vscode.Range(nodeToUpdate.open.start, nodeToUpdate.open.end);
-	let closeRange: vscode.Range | null = null;
+	let openTagRange: vscode.Range | undefined;
+	if (nodeToUpdate.open) {
+		openTagRange = offsetRangeToVsRange(document, nodeToUpdate.open.start, nodeToUpdate.open.end);
+	}
+	let closeTagRange: vscode.Range | undefined;
 	if (nodeToUpdate.close) {
-		closeRange = new vscode.Range(nodeToUpdate.close.start, nodeToUpdate.close.end);
+		closeTagRange = offsetRangeToVsRange(document, nodeToUpdate.close.start, nodeToUpdate.close.end);
 	}
 
-	let ranges = [openRange];
-	if (closeRange) {
-		for (let i = openRange.start.line + 1; i <= closeRange.start.line; i++) {
-			let lineContent = editor.document.lineAt(i).text;
-			if (lineContent.startsWith('\t')) {
-				ranges.push(new vscode.Range(i, 0, i, 1));
-			} else if (lineContent.startsWith(indentInSpaces)) {
-				ranges.push(new vscode.Range(i, 0, i, indentInSpaces.length));
+	let rangesToRemove = [];
+	if (openTagRange) {
+		rangesToRemove.push(openTagRange);
+		if (closeTagRange) {
+			const indentAmountToRemove = calculateIndentAmountToRemove(document, openTagRange, closeTagRange);
+			for (let i = openTagRange.start.line + 1; i < closeTagRange.start.line; i++) {
+				rangesToRemove.push(new vscode.Range(i, 0, i, indentAmountToRemove));
 			}
+			rangesToRemove.push(closeTagRange);
 		}
-		ranges.push(closeRange);
 	}
-	return ranges;
+	return rangesToRemove;
 }
 
+/**
+ * Calculates the amount of indent to remove for getRangesToRemove.
+ */
+function calculateIndentAmountToRemove(document: vscode.TextDocument, openRange: vscode.Range, closeRange: vscode.Range): number {
+	const startLine = openRange.start.line;
+	const endLine = closeRange.start.line;
+
+	const startLineIndent = document.lineAt(startLine).firstNonWhitespaceCharacterIndex;
+	const endLineIndent = document.lineAt(endLine).firstNonWhitespaceCharacterIndex;
+
+	let contentIndent: number | undefined;
+	for (let i = startLine + 1; i < endLine; i++) {
+		const lineIndent = document.lineAt(i).firstNonWhitespaceCharacterIndex;
+		contentIndent = !contentIndent ? lineIndent : Math.min(contentIndent, lineIndent);
+	}
+
+	let indentAmount = 0;
+	if (contentIndent) {
+		if (contentIndent < startLineIndent || contentIndent < endLineIndent) {
+			indentAmount = 0;
+		}
+		else {
+			indentAmount = Math.min(contentIndent - startLineIndent, contentIndent - endLineIndent);
+		}
+	}
+	return indentAmount;
+}
diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts
index 9fa8a5a46..52e672edd 100644
--- a/extensions/emmet/src/selectItem.ts
+++ b/extensions/emmet/src/selectItem.ts
@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { validate, parseDocument, isStyleSheet } from './util';
+import { validate, isStyleSheet } from './util';
 import { nextItemHTML, prevItemHTML } from './selectItemHTML';
 import { nextItemStylesheet, prevItemStylesheet } from './selectItemStylesheet';
-import { HtmlNode, CssNode } from 'EmmetNode';
+import { HtmlNode, CssNode } from 'EmmetFlatNode';
+import { getRootNode } from './parseDocument';
 
 export function fetchSelectItem(direction: string): void {
 	if (!validate() || !vscode.window.activeTextEditor) {
 		return;
 	}
 	const editor = vscode.window.activeTextEditor;
-	let rootNode = parseDocument(editor.document);
+	const document = editor.document;
+	const rootNode = getRootNode(document, true);
 	if (!rootNode) {
 		return;
 	}
@@ -26,12 +28,16 @@ export function fetchSelectItem(direction: string): void {
 
 		let updatedSelection;
 		if (isStyleSheet(editor.document.languageId)) {
-			updatedSelection = direction === 'next' ? nextItemStylesheet(selectionStart, selectionEnd, <CssNode>rootNode!) : prevItemStylesheet(selectionStart, selectionEnd, <CssNode>rootNode!);
+			updatedSelection = direction === 'next' ?
+				nextItemStylesheet(document, selectionStart, selectionEnd, <CssNode>rootNode) :
+				prevItemStylesheet(document, selectionStart, selectionEnd, <CssNode>rootNode);
 		} else {
-			updatedSelection = direction === 'next' ? nextItemHTML(selectionStart, selectionEnd, editor, <HtmlNode>rootNode!) : prevItemHTML(selectionStart, selectionEnd, editor, <HtmlNode>rootNode!);
+			updatedSelection = direction === 'next' ?
+				nextItemHTML(document, selectionStart, selectionEnd, <HtmlNode>rootNode) :
+				prevItemHTML(document, selectionStart, selectionEnd, <HtmlNode>rootNode);
 		}
 		newSelections.push(updatedSelection ? updatedSelection : selection);
 	});
 	editor.selections = newSelections;
 	editor.revealRange(editor.selections[editor.selections.length - 1]);
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
index 4af29cd71..f818f5783 100644
--- a/extensions/emmet/src/selectItemHTML.ts
+++ b/extensions/emmet/src/selectItemHTML.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { getDeepestNode, findNextWord, findPrevWord, getHtmlNode, isNumber } from './util';
-import { HtmlNode } from 'EmmetNode';
+import { getDeepestFlatNode, findNextWord, findPrevWord, getHtmlFlatNode, offsetRangeToSelection } from './util';
+import { HtmlNode } from 'EmmetFlatNode';
 
-export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionEnd, false);
+export function nextItemHTML(document: vscode.TextDocument, selectionStart: vscode.Position, selectionEnd: vscode.Position, rootNode: HtmlNode): vscode.Selection | undefined {
+	const selectionEndOffset = document.offsetAt(selectionEnd);
+	let currentNode = getHtmlFlatNode(document.getText(), rootNode, selectionEndOffset, false);
 	let nextNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
@@ -17,13 +18,16 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 	if (currentNode.type !== 'comment') {
 		// If cursor is in the tag name, select tag
-		if (selectionEnd.isBefore(currentNode.open.start.translate(0, currentNode.name.length))) {
-			return getSelectionFromNode(currentNode);
+		if (currentNode.open &&
+			selectionEndOffset < currentNode.open.start + currentNode.name.length) {
+			return getSelectionFromNode(document, currentNode);
 		}
 
 		// If cursor is in the open tag, look for attributes
-		if (selectionEnd.isBefore(currentNode.open.end)) {
-			let attrSelection = getNextAttribute(selectionStart, selectionEnd, currentNode);
+		if (currentNode.open &&
+			selectionEndOffset < currentNode.open.end) {
+			const selectionStartOffset = document.offsetAt(selectionStart);
+			const attrSelection = getNextAttribute(document, selectionStartOffset, selectionEndOffset, currentNode);
 			if (attrSelection) {
 				return attrSelection;
 			}
@@ -31,12 +35,11 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 		// Get the first child of current node which is right after the cursor and is not a comment
 		nextNode = currentNode.firstChild;
-		while (nextNode && (selectionEnd.isAfterOrEqual(nextNode.end) || nextNode.type === 'comment')) {
+		while (nextNode && (selectionEndOffset >= nextNode.end || nextNode.type === 'comment')) {
 			nextNode = nextNode.nextSibling;
 		}
 	}
 
-
 	// Get next sibling of current node which is not a comment. If none is found try the same on the parent
 	while (!nextNode && currentNode) {
 		if (currentNode.nextSibling) {
@@ -50,33 +53,36 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 		}
 	}
 
-	return nextNode && getSelectionFromNode(nextNode);
+	return nextNode && getSelectionFromNode(document, nextNode);
 }
 
-export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: HtmlNode): vscode.Selection | undefined {
-	let currentNode = getHtmlNode(editor.document, rootNode, selectionStart, false);
+export function prevItemHTML(document: vscode.TextDocument, selectionStart: vscode.Position, selectionEnd: vscode.Position, rootNode: HtmlNode): vscode.Selection | undefined {
+	const selectionStartOffset = document.offsetAt(selectionStart);
+	let currentNode = getHtmlFlatNode(document.getText(), rootNode, selectionStartOffset, false);
 	let prevNode: HtmlNode | undefined = undefined;
 
 	if (!currentNode) {
 		return;
 	}
 
-	if (currentNode.type !== 'comment' && selectionStart.translate(0, -1).isAfter(currentNode.open.start)) {
-
-		if (selectionStart.isBefore(currentNode.open.end) || !currentNode.firstChild || selectionEnd.isBeforeOrEqual(currentNode.firstChild.start)) {
+	const selectionEndOffset = document.offsetAt(selectionEnd);
+	if (currentNode.open &&
+		currentNode.type !== 'comment' &&
+		selectionStartOffset - 1 > currentNode.open.start) {
+		if (selectionStartOffset < currentNode.open.end || !currentNode.firstChild || selectionEndOffset <= currentNode.firstChild.start) {
 			prevNode = currentNode;
 		} else {
 			// Select the child that appears just before the cursor and is not a comment
 			prevNode = currentNode.firstChild;
 			let oldOption: HtmlNode | undefined = undefined;
-			while (prevNode.nextSibling && selectionStart.isAfterOrEqual(prevNode.nextSibling.end)) {
+			while (prevNode.nextSibling && selectionStartOffset >= prevNode.nextSibling.end) {
 				if (prevNode && prevNode.type !== 'comment') {
 					oldOption = prevNode;
 				}
 				prevNode = prevNode.nextSibling;
 			}
 
-			prevNode = <HtmlNode>getDeepestNode((prevNode && prevNode.type !== 'comment') ? prevNode : oldOption);
+			prevNode = <HtmlNode>getDeepestFlatNode((prevNode && prevNode.type !== 'comment') ? prevNode : oldOption);
 		}
 	}
 
@@ -84,7 +90,7 @@ export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 	while (!prevNode && currentNode) {
 		if (currentNode.previousSibling) {
 			if (currentNode.previousSibling.type !== 'comment') {
-				prevNode = <HtmlNode>getDeepestNode(currentNode.previousSibling);
+				prevNode = <HtmlNode>getDeepestFlatNode(currentNode.previousSibling);
 			} else {
 				currentNode = currentNode.previousSibling;
 			}
@@ -98,66 +104,66 @@ export function prevItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 		return undefined;
 	}
 
-	let attrSelection = getPrevAttribute(selectionStart, selectionEnd, prevNode);
-	return attrSelection ? attrSelection : getSelectionFromNode(prevNode);
+	const attrSelection = getPrevAttribute(document, selectionStartOffset, selectionEndOffset, prevNode);
+	return attrSelection ? attrSelection : getSelectionFromNode(document, prevNode);
 }
 
-function getSelectionFromNode(node: HtmlNode): vscode.Selection | undefined {
+function getSelectionFromNode(document: vscode.TextDocument, node: HtmlNode): vscode.Selection | undefined {
 	if (node && node.open) {
-		let selectionStart = (<vscode.Position>node.open.start).translate(0, 1);
-		let selectionEnd = selectionStart.translate(0, node.name.length);
-
-		return new vscode.Selection(selectionStart, selectionEnd);
+		const selectionStart = node.open.start + 1;
+		const selectionEnd = selectionStart + node.name.length;
+		return offsetRangeToSelection(document, selectionStart, selectionEnd);
 	}
 	return undefined;
 }
 
-function getNextAttribute(selectionStart: vscode.Position, selectionEnd: vscode.Position, node: HtmlNode): vscode.Selection | undefined {
-
+function getNextAttribute(document: vscode.TextDocument, selectionStart: number, selectionEnd: number, node: HtmlNode): vscode.Selection | undefined {
 	if (!node.attributes || node.attributes.length === 0 || node.type === 'comment') {
 		return;
 	}
 
 	for (const attr of node.attributes) {
-		if (selectionEnd.isBefore(attr.start)) {
+		if (selectionEnd < attr.start) {
 			// select full attr
-			return new vscode.Selection(attr.start, attr.end);
+			return offsetRangeToSelection(document, attr.start, attr.end);
 		}
 
-		if (!attr.value || (<vscode.Position>attr.value.start).isEqual(attr.value.end)) {
+		if (!attr.value || attr.value.start === attr.value.end) {
 			// No attr value to select
 			continue;
 		}
 
-		if ((selectionStart.isEqual(attr.start) && selectionEnd.isEqual(attr.end)) || selectionEnd.isBefore(attr.value.start)) {
+		if ((selectionStart === attr.start && selectionEnd === attr.end) ||
+			selectionEnd < attr.value.start) {
 			// cursor is in attr name,  so select full attr value
-			return new vscode.Selection(attr.value.start, attr.value.end);
+			return offsetRangeToSelection(document, attr.value.start, attr.value.end);
 		}
 
 		// Fetch the next word in the attr value
-
 		if (attr.value.toString().indexOf(' ') === -1) {
 			// attr value does not have space, so no next word to find
 			continue;
 		}
 
 		let pos: number | undefined = undefined;
-		if (selectionStart.isEqual(attr.value.start) && selectionEnd.isEqual(attr.value.end)) {
+		if (selectionStart === attr.value.start && selectionEnd === attr.value.end) {
 			pos = -1;
 		}
-		if (pos === undefined && selectionEnd.isBefore(attr.end)) {
-			pos = selectionEnd.character - attr.value.start.character - 1;
+		if (pos === undefined && selectionEnd < attr.end) {
+			const selectionEndCharacter = document.positionAt(selectionEnd).character;
+			const attrValueStartCharacter = document.positionAt(attr.value.start).character;
+			pos = selectionEndCharacter - attrValueStartCharacter - 1;
 		}
 
 		if (pos !== undefined) {
-			let [newSelectionStartOffset, newSelectionEndOffset] = findNextWord(attr.value.toString(), pos);
-			if (!isNumber(newSelectionStartOffset) || !isNumber(newSelectionEndOffset)) {
+			const [newSelectionStartOffset, newSelectionEndOffset] = findNextWord(attr.value.toString(), pos);
+			if (newSelectionStartOffset === undefined || newSelectionEndOffset === undefined) {
 				return;
 			}
 			if (newSelectionStartOffset >= 0 && newSelectionEndOffset >= 0) {
-				const newSelectionStart = (<vscode.Position>attr.value.start).translate(0, newSelectionStartOffset);
-				const newSelectionEnd = (<vscode.Position>attr.value.start).translate(0, newSelectionEndOffset);
-				return new vscode.Selection(newSelectionStart, newSelectionEnd);
+				const newSelectionStart = attr.value.start + newSelectionStartOffset;
+				const newSelectionEnd = attr.value.start + newSelectionEndOffset;
+				return offsetRangeToSelection(document, newSelectionStart, newSelectionEnd);
 			}
 		}
 
@@ -166,44 +172,44 @@ function getNextAttribute(selectionStart: vscode.Position, selectionEnd: vscode.
 	return;
 }
 
-function getPrevAttribute(selectionStart: vscode.Position, selectionEnd: vscode.Position, node: HtmlNode): vscode.Selection | undefined {
-
+function getPrevAttribute(document: vscode.TextDocument, selectionStart: number, selectionEnd: number, node: HtmlNode): vscode.Selection | undefined {
 	if (!node.attributes || node.attributes.length === 0 || node.type === 'comment') {
 		return;
 	}
 
 	for (let i = node.attributes.length - 1; i >= 0; i--) {
-		let attr = node.attributes[i];
-
-		if (selectionStart.isBeforeOrEqual(attr.start)) {
+		const attr = node.attributes[i];
+		if (selectionStart <= attr.start) {
 			continue;
 		}
 
-		if (!attr.value || (<vscode.Position>attr.value.start).isEqual(attr.value.end) || selectionStart.isBefore(attr.value.start)) {
+		if (!attr.value || attr.value.start === attr.value.end || selectionStart < attr.value.start) {
 			// select full attr
-			return new vscode.Selection(attr.start, attr.end);
+			return offsetRangeToSelection(document, attr.start, attr.end);
 		}
 
-		if (selectionStart.isEqual(attr.value.start)) {
-			if (selectionEnd.isAfterOrEqual(attr.value.end)) {
+		if (selectionStart === attr.value.start) {
+			if (selectionEnd >= attr.value.end) {
 				// select full attr
-				return new vscode.Selection(attr.start, attr.end);
+				return offsetRangeToSelection(document, attr.start, attr.end);
 			}
 			// select attr value
-			return new vscode.Selection(attr.value.start, attr.value.end);
+			return offsetRangeToSelection(document, attr.value.start, attr.value.end);
 		}
 
 		// Fetch the prev word in the attr value
-
-		let pos = selectionStart.isAfter(attr.value.end) ? attr.value.toString().length : selectionStart.character - attr.value.start.character;
-		let [newSelectionStartOffset, newSelectionEndOffset] = findPrevWord(attr.value.toString(), pos);
-		if (!isNumber(newSelectionStartOffset) || !isNumber(newSelectionEndOffset)) {
+		const selectionStartCharacter = document.positionAt(selectionStart).character;
+		const attrValueStartCharacter = document.positionAt(attr.value.start).character;
+		const pos = selectionStart > attr.value.end ? attr.value.toString().length :
+			selectionStartCharacter - attrValueStartCharacter;
+		const [newSelectionStartOffset, newSelectionEndOffset] = findPrevWord(attr.value.toString(), pos);
+		if (newSelectionStartOffset === undefined || newSelectionEndOffset === undefined) {
 			return;
 		}
 		if (newSelectionStartOffset >= 0 && newSelectionEndOffset >= 0) {
-			const newSelectionStart = (<vscode.Position>attr.value.start).translate(0, newSelectionStartOffset);
-			const newSelectionEnd = (<vscode.Position>attr.value.start).translate(0, newSelectionEndOffset);
-			return new vscode.Selection(newSelectionStart, newSelectionEnd);
+			const newSelectionStart = attr.value.start + newSelectionStartOffset;
+			const newSelectionEnd = attr.value.start + newSelectionEndOffset;
+			return offsetRangeToSelection(document, newSelectionStart, newSelectionEnd);
 		}
 	}
 
diff --git a/extensions/emmet/src/selectItemStylesheet.ts b/extensions/emmet/src/selectItemStylesheet.ts
index 420b4c152..557d97136 100644
--- a/extensions/emmet/src/selectItemStylesheet.ts
+++ b/extensions/emmet/src/selectItemStylesheet.ts
@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { getDeepestNode, findNextWord, findPrevWord, getNode } from './util';
-import { Node, CssNode, Rule, Property } from 'EmmetNode';
+import { getDeepestFlatNode, findNextWord, findPrevWord, getFlatNode, offsetRangeToSelection } from './util';
+import { Node, CssNode, Rule, Property } from 'EmmetFlatNode';
 
-export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, rootNode: Node): vscode.Selection | undefined {
-	let currentNode = <CssNode>getNode(rootNode, endOffset, true);
+export function nextItemStylesheet(document: vscode.TextDocument, startPosition: vscode.Position, endPosition: vscode.Position, rootNode: Node): vscode.Selection | undefined {
+	const startOffset = document.offsetAt(startPosition);
+	const endOffset = document.offsetAt(endPosition);
+	let currentNode: CssNode | undefined = <CssNode>getFlatNode(rootNode, endOffset, true);
 	if (!currentNode) {
 		currentNode = <CssNode>rootNode;
 	}
@@ -16,27 +18,31 @@ export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vsco
 		return;
 	}
 	// Full property is selected, so select full property value next
-	if (currentNode.type === 'property' && startOffset.isEqual(currentNode.start) && endOffset.isEqual(currentNode.end)) {
-		return getSelectionFromProperty(currentNode, startOffset, endOffset, true, 'next');
+	if (currentNode.type === 'property' &&
+		startOffset === currentNode.start &&
+		endOffset === currentNode.end) {
+		return getSelectionFromProperty(document, currentNode, startOffset, endOffset, true, 'next');
 	}
 
 	// Part or whole of propertyValue is selected, so select the next word in the propertyValue
-	if (currentNode.type === 'property' && startOffset.isAfterOrEqual((<Property>currentNode).valueToken.start) && endOffset.isBeforeOrEqual((<Property>currentNode).valueToken.end)) {
-		let singlePropertyValue = getSelectionFromProperty(currentNode, startOffset, endOffset, false, 'next');
+	if (currentNode.type === 'property' &&
+		startOffset >= (<Property>currentNode).valueToken.start &&
+		endOffset <= (<Property>currentNode).valueToken.end) {
+		let singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'next');
 		if (singlePropertyValue) {
 			return singlePropertyValue;
 		}
 	}
 
 	// Cursor is in the selector or in a property
-	if ((currentNode.type === 'rule' && endOffset.isBefore((<Rule>currentNode).selectorToken.end))
-		|| (currentNode.type === 'property' && endOffset.isBefore((<Property>currentNode).valueToken.end))) {
-		return getSelectionFromNode(currentNode);
+	if ((currentNode.type === 'rule' && endOffset < (<Rule>currentNode).selectorToken.end)
+		|| (currentNode.type === 'property' && endOffset < (<Property>currentNode).valueToken.end)) {
+		return getSelectionFromNode(document, currentNode);
 	}
 
 	// Get the first child of current node which is right after the cursor
 	let nextNode = currentNode.firstChild;
-	while (nextNode && endOffset.isAfterOrEqual(nextNode.end)) {
+	while (nextNode && endOffset >= nextNode.end) {
 		nextNode = nextNode.nextSibling;
 	}
 
@@ -46,12 +52,13 @@ export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vsco
 		currentNode = currentNode.parent;
 	}
 
-	return getSelectionFromNode(nextNode);
-
+	return nextNode ? getSelectionFromNode(document, nextNode) : undefined;
 }
 
-export function prevItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, rootNode: CssNode): vscode.Selection | undefined {
-	let currentNode = <CssNode>getNode(rootNode, startOffset, false);
+export function prevItemStylesheet(document: vscode.TextDocument, startPosition: vscode.Position, endPosition: vscode.Position, rootNode: CssNode): vscode.Selection | undefined {
+	const startOffset = document.offsetAt(startPosition);
+	const endOffset = document.offsetAt(endPosition);
+	let currentNode = <CssNode>getFlatNode(rootNode, startOffset, false);
 	if (!currentNode) {
 		currentNode = rootNode;
 	}
@@ -60,70 +67,80 @@ export function prevItemStylesheet(startOffset: vscode.Position, endOffset: vsco
 	}
 
 	// Full property value is selected, so select the whole property next
-	if (currentNode.type === 'property' && startOffset.isEqual((<Property>currentNode).valueToken.start) && endOffset.isEqual((<Property>currentNode).valueToken.end)) {
-		return getSelectionFromNode(currentNode);
+	if (currentNode.type === 'property' &&
+		startOffset === (<Property>currentNode).valueToken.start &&
+		endOffset === (<Property>currentNode).valueToken.end) {
+		return getSelectionFromNode(document, currentNode);
 	}
 
 	// Part of propertyValue is selected, so select the prev word in the propertyValue
-	if (currentNode.type === 'property' && startOffset.isAfterOrEqual((<Property>currentNode).valueToken.start) && endOffset.isBeforeOrEqual((<Property>currentNode).valueToken.end)) {
-		let singlePropertyValue = getSelectionFromProperty(currentNode, startOffset, endOffset, false, 'prev');
+	if (currentNode.type === 'property' &&
+		startOffset >= (<Property>currentNode).valueToken.start &&
+		endOffset <= (<Property>currentNode).valueToken.end) {
+		let singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'prev');
 		if (singlePropertyValue) {
 			return singlePropertyValue;
 		}
 	}
 
-	if (currentNode.type === 'property' || !currentNode.firstChild || (currentNode.type === 'rule' && startOffset.isBeforeOrEqual(currentNode.firstChild.start))) {
-		return getSelectionFromNode(currentNode);
+	if (currentNode.type === 'property' || !currentNode.firstChild ||
+		(currentNode.type === 'rule' && startOffset <= currentNode.firstChild.start)) {
+		return getSelectionFromNode(document, currentNode);
 	}
 
 	// Select the child that appears just before the cursor
-	let prevNode = currentNode.firstChild;
-	while (prevNode.nextSibling && startOffset.isAfterOrEqual(prevNode.nextSibling.end)) {
+	let prevNode: CssNode | undefined = currentNode.firstChild;
+	while (prevNode.nextSibling && startOffset >= prevNode.nextSibling.end) {
 		prevNode = prevNode.nextSibling;
 	}
-	prevNode = <CssNode>getDeepestNode(prevNode);
-
-	return getSelectionFromProperty(prevNode, startOffset, endOffset, false, 'prev');
+	prevNode = <CssNode | undefined>getDeepestFlatNode(prevNode);
 
+	return getSelectionFromProperty(document, prevNode, startOffset, endOffset, false, 'prev');
 }
 
 
-function getSelectionFromNode(node: Node): vscode.Selection | undefined {
+function getSelectionFromNode(document: vscode.TextDocument, node: Node | undefined): vscode.Selection | undefined {
 	if (!node) {
 		return;
 	}
 
-	let nodeToSelect = node.type === 'rule' ? (<Rule>node).selectorToken : node;
-	return new vscode.Selection(nodeToSelect.start, nodeToSelect.end);
+	const nodeToSelect = node.type === 'rule' ? (<Rule>node).selectorToken : node;
+	return offsetRangeToSelection(document, nodeToSelect.start, nodeToSelect.end);
 }
 
 
-function getSelectionFromProperty(node: Node, selectionStart: vscode.Position, selectionEnd: vscode.Position, selectFullValue: boolean, direction: string): vscode.Selection | undefined {
+function getSelectionFromProperty(document: vscode.TextDocument, node: Node | undefined, selectionStart: number, selectionEnd: number, selectFullValue: boolean, direction: string): vscode.Selection | undefined {
 	if (!node || node.type !== 'property') {
 		return;
 	}
 	const propertyNode = <Property>node;
 
 	let propertyValue = propertyNode.valueToken.stream.substring(propertyNode.valueToken.start, propertyNode.valueToken.end);
-	selectFullValue = selectFullValue || (direction === 'prev' && selectionStart.isEqual(propertyNode.valueToken.start) && selectionEnd.isBefore(propertyNode.valueToken.end));
+	selectFullValue = selectFullValue ||
+		(direction === 'prev' && selectionStart === propertyNode.valueToken.start && selectionEnd < propertyNode.valueToken.end);
 
 	if (selectFullValue) {
-		return new vscode.Selection(propertyNode.valueToken.start, propertyNode.valueToken.end);
+		return offsetRangeToSelection(document, propertyNode.valueToken.start, propertyNode.valueToken.end);
 	}
 
 	let pos: number = -1;
 	if (direction === 'prev') {
-		if (selectionStart.isEqual(propertyNode.valueToken.start)) {
+		if (selectionStart === propertyNode.valueToken.start) {
 			return;
 		}
-		pos = selectionStart.isAfter(propertyNode.valueToken.end) ? propertyValue.length : selectionStart.character - propertyNode.valueToken.start.character;
-	}
-
-	if (direction === 'next') {
-		if (selectionEnd.isEqual(propertyNode.valueToken.end) && (selectionStart.isAfter(propertyNode.valueToken.start) || propertyValue.indexOf(' ') === -1)) {
+		const selectionStartChar = document.positionAt(selectionStart).character;
+		const tokenStartChar = document.positionAt(propertyNode.valueToken.start).character;
+		pos = selectionStart > propertyNode.valueToken.end ? propertyValue.length :
+			selectionStartChar - tokenStartChar;
+	} else if (direction === 'next') {
+		if (selectionEnd === propertyNode.valueToken.end &&
+			(selectionStart > propertyNode.valueToken.start || !propertyValue.includes(' '))) {
 			return;
 		}
-		pos = selectionEnd.isEqual(propertyNode.valueToken.end) ? -1 : selectionEnd.character - propertyNode.valueToken.start.character - 1;
+		const selectionEndChar = document.positionAt(selectionEnd).character;
+		const tokenStartChar = document.positionAt(propertyNode.valueToken.start).character;
+		pos = selectionEnd === propertyNode.valueToken.end ? -1 :
+			selectionEndChar - tokenStartChar - 1;
 	}
 
 
@@ -132,8 +149,9 @@ function getSelectionFromProperty(node: Node, selectionStart: vscode.Position, s
 		return;
 	}
 
-	const newSelectionStart = (<vscode.Position>propertyNode.valueToken.start).translate(0, newSelectionStartOffset);
-	const newSelectionEnd = (<vscode.Position>propertyNode.valueToken.start).translate(0, newSelectionEndOffset);
+	const tokenStart = document.positionAt(propertyNode.valueToken.start);
+	const newSelectionStart = tokenStart.translate(0, newSelectionStartOffset);
+	const newSelectionEnd = tokenStart.translate(0, newSelectionEndOffset);
 
 	return new vscode.Selection(newSelectionStart, newSelectionEnd);
 }
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index a5f1d255c..3d1df0219 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { HtmlNode } from 'EmmetNode';
-import { getHtmlNode, parseDocument, validate, getEmmetMode, getEmmetConfiguration } from './util';
+import { validate, getEmmetMode, getEmmetConfiguration, getHtmlFlatNode, offsetRangeToVsRange } from './util';
+import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
+import { getRootNode } from './parseDocument';
 
 export function splitJoinTag() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
@@ -13,40 +14,43 @@ export function splitJoinTag() {
 	}
 
 	const editor = vscode.window.activeTextEditor;
-	let rootNode = <HtmlNode>parseDocument(editor.document);
+	const document = editor.document;
+	const rootNode = <HtmlFlatNode>getRootNode(editor.document, true);
 	if (!rootNode) {
 		return;
 	}
 
 	return editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
-			let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
+			const documentText = document.getText();
+			const offset = document.offsetAt(selection.start);
+			const nodeToUpdate = getHtmlFlatNode(documentText, rootNode, offset, true);
 			if (nodeToUpdate) {
-				let textEdit = getRangesToReplace(editor.document, nodeToUpdate);
+				const textEdit = getRangesToReplace(document, nodeToUpdate);
 				editBuilder.replace(textEdit.range, textEdit.newText);
 			}
 		});
 	});
 }
 
-function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlNode): vscode.TextEdit {
+function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlFlatNode): vscode.TextEdit {
 	let rangeToReplace: vscode.Range;
 	let textToReplaceWith: string;
 
-	if (!nodeToUpdate.close) {
+	if (!nodeToUpdate.open || !nodeToUpdate.close) {
 		// Split Tag
-		let nodeText = document.getText(new vscode.Range(nodeToUpdate.start, nodeToUpdate.end));
-		let m = nodeText.match(/(\s*\/)?>$/);
-		let end = <vscode.Position>nodeToUpdate.end;
-		let start = m ? end.translate(0, -m[0].length) : end;
+		const nodeText = document.getText().substring(nodeToUpdate.start, nodeToUpdate.end);
+		const m = nodeText.match(/(\s*\/)?>$/);
+		const end = nodeToUpdate.end;
+		const start = m ? end - m[0].length : end;
 
-		rangeToReplace = new vscode.Range(start, end);
+		rangeToReplace = offsetRangeToVsRange(document, start, end);
 		textToReplaceWith = `></${nodeToUpdate.name}>`;
 	} else {
 		// Join Tag
-		let start = (<vscode.Position>nodeToUpdate.open.end).translate(0, -1);
-		let end = <vscode.Position>nodeToUpdate.end;
-		rangeToReplace = new vscode.Range(start, end);
+		const start = nodeToUpdate.open.end - 1;
+		const end = nodeToUpdate.end;
+		rangeToReplace = offsetRangeToVsRange(document, start, end);
 		textToReplaceWith = '/>';
 
 		const emmetMode = getEmmetMode(document.languageId, []) || '';
@@ -55,8 +59,7 @@ function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlNod
 			(emmetConfig.syntaxProfiles[emmetMode]['selfClosingStyle'] === 'xhtml' || emmetConfig.syntaxProfiles[emmetMode]['self_closing_tag'] === 'xhtml')) {
 			textToReplaceWith = ' ' + textToReplaceWith;
 		}
-
 	}
 
 	return new vscode.TextEdit(rangeToReplace, textToReplaceWith);
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
index e5960d5fe..e429fe7e9 100644
--- a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
+++ b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts
@@ -62,13 +62,13 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		return withRandomFileEditor(htmlContents, '.html', (editor, _) => {
 			editor.selections = [new Selection(1, 5, 1, 5)];
 
-			let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [20, 0]];
+			let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [10, 2]];
 			expectedNextEditPoints.forEach(([line, col]) => {
 				fetchEditPoint('next');
 				testSelection(editor.selection, col, line);
 			});
 
-			let expectedPrevEditPoints = [[10, 2], [6, 8], [4, 16], [0, 0]];
+			let expectedPrevEditPoints = [[6, 8], [4, 16], [4, 16]];
 			expectedPrevEditPoints.forEach(([line, col]) => {
 				fetchEditPoint('prev');
 				testSelection(editor.selection, col, line);
@@ -113,7 +113,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => {
 		});
 	});
 
-	test('Emmet Select Next/Prev item at boundary', function(): any {
+	test('Emmet Select Next/Prev item at boundary', function (): any {
 		return withRandomFileEditor(htmlContents, '.html', (editor, _) => {
 			editor.selections = [new Selection(4, 1, 4, 1)];
 
@@ -365,4 +365,4 @@ function testSelection(selection: Selection, startChar: number, startline: numbe
 	} else {
 		assert.equal(selection.active.character, endChar);
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/emmet/src/test/index.ts b/extensions/emmet/src/test/index.ts
index 3aeda9dfa..7d5667439 100644
--- a/extensions/emmet/src/test/index.ts
+++ b/extensions/emmet/src/test/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
@@ -38,3 +38,34 @@ 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);
+// 		}
+// 	});
+// }
diff --git a/extensions/emmet/src/test/partialParsingStylesheet.test.ts b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
index 0c19d06b6..b0928e1a3 100644
--- a/extensions/emmet/src/test/partialParsingStylesheet.test.ts
+++ b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
@@ -7,15 +7,16 @@ import 'mocha';
 import * as assert from 'assert';
 import { withRandomFileEditor } from './testUtils';
 import * as vscode from 'vscode';
-import { parsePartialStylesheet, getNode } from '../util';
+import { parsePartialStylesheet, getFlatNode } from '../util';
 import { isValidLocationForEmmetAbbreviation } from '../abbreviationActions';
 
 suite('Tests for partial parse of Stylesheets', () => {
 
 	function isValid(doc: vscode.TextDocument, range: vscode.Range, syntax: string): boolean {
 		const rootNode = parsePartialStylesheet(doc, range.end);
-		const currentNode = getNode(rootNode, range.end, true);
-		return isValidLocationForEmmetAbbreviation(doc, rootNode, currentNode, syntax, range.end, range);
+		const endOffset = doc.offsetAt(range.end);
+		const currentNode = getFlatNode(rootNode, endOffset, true);
+		return isValidLocationForEmmetAbbreviation(doc, rootNode, currentNode, syntax, endOffset, range);
 	}
 
 	test('Ignore block comment inside rule', function (): any {
@@ -257,4 +258,4 @@ ment */{
 	});
 
 
-});
\ No newline at end of file
+});
diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts
index 80f2d30ff..8c217bf3c 100644
--- a/extensions/emmet/src/test/tagActions.test.ts
+++ b/extensions/emmet/src/test/tagActions.test.ts
@@ -175,7 +175,7 @@ suite('Tests for Emmet actions on html tags', () => {
 		<li><span>Hello</span></li>
 		<li><span>There</span></li>
 		<div><li><span>Bye</span></li></div>
-\t
+\t\t
 		<span/>
 	</script>
 	`;
diff --git a/extensions/emmet/src/test/toggleComment.test.ts b/extensions/emmet/src/test/toggleComment.test.ts
index 4793c3ed8..42a867f9c 100644
--- a/extensions/emmet/src/test/toggleComment.test.ts
+++ b/extensions/emmet/src/test/toggleComment.test.ts
@@ -26,7 +26,7 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 			<div><li><span>Bye</span></li></div>
 		</ul>
 		<ul>
-			<!--<li>Previously Commented Node</li>-->
+			<!-- <li>Previously Commented Node</li> -->
 			<li>Another Node</li>
 		</ul>
 		<span/>
@@ -47,24 +47,24 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const expectedContents = `
 	<div class="hello">
 		<ul>
-			<li><!--<span>Hello</span>--></li>
-			<!--<li><span>There</span></li>-->
-			<!--<div><li><span>Bye</span></li></div>-->
+			<li><!-- <span>Hello</span> --></li>
+			<!-- <li><span>There</span></li> -->
+			<!-- <div><li><span>Bye</span></li></div> -->
 		</ul>
-		<!--<ul>
+		<!-- <ul>
 			<li>Previously Commented Node</li>
 			<li>Another Node</li>
-		</ul>-->
+		</ul> -->
 		<span/>
 		<style>
 			.boo {
-				/*margin: 10px;*/
+				/* margin: 10px; */
 				padding: 20px;
 			}
-			/*.hoo {
+			/* .hoo {
 				margin: 10px;
 				padding: 20px;
-			}*/
+			} */
 		</style>
 	</div>
 	`;
@@ -89,24 +89,24 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const expectedContents = `
 	<div class="hello">
 		<ul>
-			<li><!--<span>Hello</span>--></li>
-			<!--<li><span>There</span></li>-->
+			<li><!-- <span>Hello</span> --></li>
+			<!-- <li><span>There</span></li> -->
 			<div><li><span>Bye</span></li></div>
 		</ul>
-		<!--<ul>
+		<!-- <ul>
 			<li>Previously Commented Node</li>
 			<li>Another Node</li>
-		</ul>-->
+		</ul> -->
 		<span/>
 		<style>
 			.boo {
-				/*margin: 10px;*/
+				/* margin: 10px; */
 				padding: 20px;
 			}
-			/*.hoo {
+			/* .hoo {
 				margin: 10px;
 				padding: 20px;
-			}*/
+			} */
 		</style>
 	</div>
 	`;
@@ -130,19 +130,19 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const expectedContents = `
 	<div class="hello">
 		<ul>
-			<!--<li><span>Hello</span></li>
-			<li><span>There</span></li>-->
+			<!-- <li><span>Hello</span></li>
+			<li><span>There</span></li> -->
 			<div><li><span>Bye</span></li></div>
 		</ul>
 		<ul>
-			<!--<li>Previously Commented Node</li>-->
+			<!-- <li>Previously Commented Node</li> -->
 			<li>Another Node</li>
 		</ul>
 		<span/>
 		<style>
 			.boo {
-				/*margin: 10px;
-				padding: 20px;*/
+				/* margin: 10px;
+				padding: 20px; */
 			}
 			.hoo {
 				margin: 10px;
@@ -168,14 +168,14 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const expectedContents = `
 	<div class="hello">
 		<ul>
-			<!--<li><span>Hello</span></li>
-			<li><span>There</span></li>-->
+			<!-- <li><span>Hello</span></li>
+			<li><span>There</span></li> -->
 			<div><li><span>Bye</span></li></div>
 		</ul>
-		<!--<ul>
+		<!-- <ul>
 			<li>Previously Commented Node</li>
 			<li>Another Node</li>
-		</ul>-->
+		</ul> -->
 		<span/>
 		<style>
 			.boo {
@@ -206,16 +206,16 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const expectedContents = `
 	<div class="hello">
 		<ul>
-			<li><!--<span>Hello</span>--></li>
-			<!--<li><span>There</span></li>-->
+			<li><!-- <span>Hello</span> --></li>
+			<!-- <li><span>There</span></li> -->
 			<div><li><span>Bye</span></li></div>
 		</ul>
-		<!--<ul>
+		<!-- <ul>
 			<li>Previously Commented Node</li>
 			<li>Another Node</li>
-		</ul>-->
+		</ul> -->
 		<span/>
-		<!--<style>
+		<!-- <style>
 			.boo {
 				margin: 10px;
 				padding: 20px;
@@ -224,7 +224,7 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 				margin: 10px;
 				padding: 20px;
 			}
-		</style>-->
+		</style> -->
 	</div>
 	`;
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
@@ -252,16 +252,16 @@ suite('Tests for Toggle Comment action from Emmet (HTML)', () => {
 		const templateContents = `
 	<script type="text/template">
 		<li><span>Hello</span></li>
-		<li><!--<span>There</span>--></li>
+		<li><!-- <span>There</span> --></li>
 		<div><li><span>Bye</span></li></div>
 		<span/>
 	</script>
 	`;
 		const expectedContents = `
 	<script type="text/template">
-		<!--<li><span>Hello</span></li>-->
+		<!-- <li><span>Hello</span></li> -->
 		<li><span>There</span></li>
-		<div><li><!--<span>Bye</span>--></li></div>
+		<div><li><!-- <span>Bye</span> --></li></div>
 		<span/>
 	</script>
 	`;
@@ -298,13 +298,13 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 	test('toggle comment with multiple cursors, but no selection (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*margin: 10px;*/
+		/* margin: 10px; */
 		padding: 10px;
 	}
-	/*.two {
+	/* .two {
 		height: 42px;
 		display: none;
-	}*/
+	} */
 	.three {
 		width: 42px;
 	}`;
@@ -327,13 +327,13 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 	test('toggle comment with multiple cursors and whole node selected (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*margin: 10px;*/
-		/*padding: 10px;*/
+		/* margin: 10px; */
+		/* padding: 10px; */
 	}
-	/*.two {
+	/* .two {
 		height: 42px;
 		display: none;
-	}*/
+	} */
 	.three {
 		width: 42px;
 	}`;
@@ -359,16 +359,16 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 	test('toggle comment when multiple nodes of same parent are completely under single selection (CSS)', () => {
 		const expectedContents = `
 	.one {
-/*		margin: 10px;
-		padding: 10px;*/
+/* 		margin: 10px;
+		padding: 10px; */
 	}
-	/*.two {
+	/* .two {
 		height: 42px;
 		display: none;
 	}
 	.three {
 		width: 42px;
-	}*/`;
+	} */`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
 			editor.selections = [
 				new Selection(2, 0, 3, 16), // 2 properties completely under a single selection along with whitespace
@@ -389,10 +389,10 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 		const expectedContents = `
 	.one {
 		margin: 10px;
-		/*padding: 10px;
+		/* padding: 10px;
 	}
 	.two {
-		height: 42px;*/
+		height: 42px; */
 		display: none;
 	}
 	.three {
@@ -417,10 +417,10 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 		const expectedContents = `
 	.one {
 		margin: 10px;
-		/*padding: 10px;
+		/* padding: 10px;
 	}
 	.two {
-		height: 42px;*/
+		height: 42px; */
 		display: none;
 	}
 	.three {
@@ -445,10 +445,10 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 		const expectedContents = `
 	.one {
 		margin: 10px;
-		/*padding: 10px;
+		/* padding: 10px;
 	}
 	.two {
-		height: 42px;*/
+		height: 42px; */
 		display: none;
 	}
 	.three {
@@ -473,10 +473,10 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 		const expectedContents = `
 	.one {
 		margin: 10px;
-		/*padding: 10px;
+		/* padding: 10px;
 	}
 	.two {
-		height: 42px;*/
+		height: 42px; */
 		display: none;
 	}
 	.three {
@@ -500,16 +500,16 @@ suite('Tests for Toggle Comment action from Emmet (CSS)', () => {
 	test('toggle comment when multiple nodes of same parent are partially under single selection (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*margin: 10px;
-		padding: 10px;*/
+		/* margin: 10px;
+		padding: 10px; */
 	}
-	/*.two {
+	/* .two {
 		height: 42px;
 		display: none;
 	}
 	.three {
 		width: 42px;
-*/	}`;
+ */	}`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
 			editor.selections = [
 				new Selection(2, 7, 3, 10), // 2 properties partially under a single selection
@@ -549,14 +549,14 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	test('toggle comment with multiple cursors selecting nested nodes (SCSS)', () => {
 		const expectedContents = `
 	.one {
-		/*height: 42px;*/
+		/* height: 42px; */
 
-		/*.two {
+		/* .two {
 			width: 42px;
-		}*/
+		} */
 
 		.three {
-			/*padding: 10px;*/
+			/* padding: 10px; */
 		}
 	}`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
@@ -578,7 +578,7 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	});
 	test('toggle comment with multiple cursors selecting several nested nodes (SCSS)', () => {
 		const expectedContents = `
-	/*.one {
+	/* .one {
 		height: 42px;
 
 		.two {
@@ -588,7 +588,7 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 		.three {
 			padding: 10px;
 		}
-	}*/`;
+	} */`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
 			editor.selections = [
 				new Selection(1, 3, 1, 3), // cursor in the outside rule. And several cursors inside:
@@ -611,14 +611,14 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	test('toggle comment with multiple cursors, but no selection (SCSS)', () => {
 		const expectedContents = `
 	.one {
-		/*height: 42px;*/
+		/* height: 42px; */
 
-		/*.two {
+		/* .two {
 			width: 42px;
-		}*/
+		} */
 
 		.three {
-			/*padding: 10px;*/
+			/* padding: 10px; */
 		}
 	}`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
@@ -641,14 +641,14 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	test('toggle comment with multiple cursors and whole node selected (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*height: 42px;*/
+		/* height: 42px; */
 
-		/*.two {
+		/* .two {
 			width: 42px;
-		}*/
+		} */
 
 		.three {
-			/*padding: 10px;*/
+			/* padding: 10px; */
 		}
 	}`;
 		return withRandomFileEditor(contents, 'css', (editor, doc) => {
@@ -673,11 +673,11 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	test('toggle comment when multiple nodes are completely under single selection (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*height: 42px;
+		/* height: 42px;
 
 		.two {
 			width: 42px;
-		}*/
+		} */
 
 		.three {
 			padding: 10px;
@@ -701,11 +701,11 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 	test('toggle comment when multiple nodes are partially under single selection (CSS)', () => {
 		const expectedContents = `
 	.one {
-		/*height: 42px;
+		/* height: 42px;
 
 		.two {
 			width: 42px;
-	*/	}
+	 */	}
 
 		.three {
 			padding: 10px;
@@ -726,4 +726,29 @@ suite('Tests for Toggle Comment action from Emmet in nested css (SCSS)', () => {
 		});
 	});
 
-});
\ No newline at end of file
+	test('toggle comment doesn\'t fail when start and end nodes differ HTML', () => {
+		const contents = `
+	<div>
+		<p>Hello</p>
+	</div>
+	`;
+		const expectedContents = `
+	<!-- <div>
+		<p>Hello</p>
+	</div> -->
+	`;
+		return withRandomFileEditor(contents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(1, 2, 2, 9), // <div> to <p> inclusive
+			];
+
+			return toggleComment().then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return toggleComment().then(() => {
+					assert.equal(doc.getText(), contents);
+					return Promise.resolve();
+				});
+			});
+		});
+	});
+});
diff --git a/extensions/emmet/src/test/updateImageSize.test.ts b/extensions/emmet/src/test/updateImageSize.test.ts
index 63452786a..b43b3e6ed 100644
--- a/extensions/emmet/src/test/updateImageSize.test.ts
+++ b/extensions/emmet/src/test/updateImageSize.test.ts
@@ -3,148 +3,147 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// import 'mocha';
-// import * as assert from 'assert';
-// import { Selection } from 'vscode';
-// import { withRandomFileEditor, closeAllEditors } from './testUtils';
-// import { updateImageSize } from '../updateImageSize';
+import 'mocha';
+import * as assert from 'assert';
+import { Selection } from 'vscode';
+import { withRandomFileEditor, closeAllEditors } from './testUtils';
+import { updateImageSize } from '../updateImageSize';
 
-// suite('Tests for Emmet actions on html tags', () => {
-// 	teardown(closeAllEditors);
+suite('Tests for Emmet actions on html tags', () => {
+	teardown(closeAllEditors);
 
-	// test('update image css with multiple cursors in css file', () => {
-	// 	const cssContents = `
-	// 	.one {
-	// 		margin: 10px;
-	// 		padding: 10px;
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 	}
-	// 	.two {
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 		height: 42px;
-	// 	}
-	// 	.three {
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 		width: 42px;
-	// 	}
-	// `;
-	// 	const expectedContents = `
-	// 	.one {
-	// 		margin: 10px;
-	// 		padding: 10px;
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 		width: 32px;
-	// 		height: 32px;
-	// 	}
-	// 	.two {
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 		width: 32px;
-	// 		height: 32px;
-	// 	}
-	// 	.three {
-	// 		background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 		height: 32px;
-	// 		width: 32px;
-	// 	}
-	// `;
-	// 	return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
-	// 		editor.selections = [
-	// 			new Selection(4, 50, 4, 50),
-	// 			new Selection(7, 50, 7, 50),
-	// 			new Selection(11, 50, 11, 50)
-	// 		];
+	test('update image css with multiple cursors in css file', () => {
+		const cssContents = `
+		.one {
+			margin: 10px;
+			padding: 10px;
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+		}
+		.two {
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+			height: 42px;
+		}
+		.three {
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+			width: 42px;
+		}
+	`;
+		const expectedContents = `
+		.one {
+			margin: 10px;
+			padding: 10px;
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+			width: 1024px;
+			height: 1024px;
+		}
+		.two {
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+			width: 1024px;
+			height: 1024px;
+		}
+		.three {
+			background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+			height: 1024px;
+			width: 1024px;
+		}
+	`;
+		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
+			editor.selections = [
+				new Selection(4, 50, 4, 50),
+				new Selection(7, 50, 7, 50),
+				new Selection(11, 50, 11, 50)
+			];
 
-	// 		return updateImageSize()!.then(() => {
-	// 			assert.equal(doc.getText(), expectedContents);
-	// 			return Promise.resolve();
-	// 		});
-	// 	});
-	// });
+			return updateImageSize()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
 
-	// test('update image size in css in html file with multiple cursors', () => {
-	// 	const htmlWithCssContents = `
-	// 	<html>
-	// 		<style>
-	// 			.one {
-	// 				margin: 10px;
-	// 				padding: 10px;
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 			}
-	// 			.two {
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 				height: 42px;
-	// 			}
-	// 			.three {
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 				width: 42px;
-	// 			}
-	// 		</style>
-	// 	</html>
-	// `;
-	// 	const expectedContents = `
-	// 	<html>
-	// 		<style>
-	// 			.one {
-	// 				margin: 10px;
-	// 				padding: 10px;
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 				width: 32px;
-	// 				height: 32px;
-	// 			}
-	// 			.two {
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 				width: 32px;
-	// 				height: 32px;
-	// 			}
-	// 			.three {
-	// 				background-image: url(https://github.com/microsoft/vscode/blob/master/resources/linux/code.png);
-	// 				height: 32px;
-	// 				width: 32px;
-	// 			}
-	// 		</style>
-	// 	</html>
-	// `;
-	// 	return withRandomFileEditor(htmlWithCssContents, 'html', (editor, doc) => {
-	// 		editor.selections = [
-	// 			new Selection(6, 50, 6, 50),
-	// 			new Selection(9, 50, 9, 50),
-	// 			new Selection(13, 50, 13, 50)
-	// 		];
+	test('update image size in css in html file with multiple cursors', () => {
+		const htmlWithCssContents = `
+		<html>
+			<style>
+				.one {
+					margin: 10px;
+					padding: 10px;
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+				}
+				.two {
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+					height: 42px;
+				}
+				.three {
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+					width: 42px;
+				}
+			</style>
+		</html>
+	`;
+		const expectedContents = `
+		<html>
+			<style>
+				.one {
+					margin: 10px;
+					padding: 10px;
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+					width: 1024px;
+					height: 1024px;
+				}
+				.two {
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+					width: 1024px;
+					height: 1024px;
+				}
+				.three {
+					background-image: url(https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png);
+					height: 1024px;
+					width: 1024px;
+				}
+			</style>
+		</html>
+	`;
+		return withRandomFileEditor(htmlWithCssContents, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(6, 50, 6, 50),
+				new Selection(9, 50, 9, 50),
+				new Selection(13, 50, 13, 50)
+			];
 
-	// 		return updateImageSize()!.then(() => {
-	// 			assert.equal(doc.getText(), expectedContents);
-	// 			return Promise.resolve();
-	// 		});
-	// 	});
-	// });
+			return updateImageSize()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
 
-	// test('update image size in img tag in html file with multiple cursors', () => {
-	// 	const htmlwithimgtag = `
-	// 	<html>
-	// 		<img id="one" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" />
-	// 		<img id="two" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" width="56" />
-	// 		<img id="three" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" height="56" />
-	// 	</html>
-	// `;
-	// 	const expectedContents = `
-	// 	<html>
-	// 		<img id="one" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" width="32" height="32" />
-	// 		<img id="two" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" width="32" height="32" />
-	// 		<img id="three" src="https://github.com/microsoft/vscode/blob/master/resources/linux/code.png" height="32" width="32" />
-	// 	</html>
-	// `;
-	// 	return withRandomFileEditor(htmlwithimgtag, 'html', (editor, doc) => {
-	// 		editor.selections = [
-	// 			new Selection(2, 50, 2, 50),
-	// 			new Selection(3, 50, 3, 50),
-	// 			new Selection(4, 50, 4, 50)
-	// 		];
+	test('update image size in img tag in html file with multiple cursors', () => {
+		const htmlwithimgtag = `
+		<html>
+			<img id="one" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" />
+			<img id="two" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" width="56" />
+			<img id="three" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" height="56" />
+		</html>
+	`;
+		const expectedContents = `
+		<html>
+			<img id="one" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" width="1024" height="1024" />
+			<img id="two" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" width="1024" height="1024" />
+			<img id="three" src="https://raw.githubusercontent.com/microsoft/vscode/master/resources/linux/code.png" height="1024" width="1024" />
+		</html>
+	`;
+		return withRandomFileEditor(htmlwithimgtag, 'html', (editor, doc) => {
+			editor.selections = [
+				new Selection(2, 50, 2, 50),
+				new Selection(3, 50, 3, 50),
+				new Selection(4, 50, 4, 50)
+			];
 
-	// 		return updateImageSize()!.then(() => {
-	// 			assert.equal(doc.getText(), expectedContents);
-	// 			return Promise.resolve();
-	// 		});
-	// 	});
-	// });
-
-// });
+			return updateImageSize()!.then(() => {
+				assert.equal(doc.getText(), expectedContents);
+				return Promise.resolve();
+			});
+		});
+	});
+});
diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index d5a4a2bce..c89e6942d 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -9,13 +9,20 @@ import { Selection, workspace, ConfigurationTarget } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { wrapWithAbbreviation, wrapIndividualLinesWithAbbreviation } from '../abbreviationActions';
 
-const htmlContentsForWrapTests = `
+const htmlContentsForBlockWrapTests = `
 	<ul class="nav main">
 		<li class="item1">img</li>
 		<li class="item2">$hithere</li>
 	</ul>
 `;
 
+const htmlContentsForInlineWrapTests = `
+	<ul class="nav main">
+		<em class="item1">img</em>
+		<em class="item2">$hithere</em>
+	</ul>
+`;
+
 const wrapBlockElementExpected = `
 	<ul class="nav main">
 		<div>
@@ -29,15 +36,19 @@ const wrapBlockElementExpected = `
 
 const wrapInlineElementExpected = `
 	<ul class="nav main">
-		<span><li class="item1">img</li></span>
-		<span><li class="item2">$hithere</li></span>
+		<span><em class="item1">img</em></span>
+		<span><em class="item2">$hithere</em></span>
 	</ul>
 `;
 
 const wrapSnippetExpected = `
 	<ul class="nav main">
-		<a href=""><li class="item1">img</li></a>
-		<a href=""><li class="item2">$hithere</li></a>
+		<a href="">
+			<li class="item1">img</li>
+		</a>
+		<a href="">
+			<li class="item2">$hithere</li>
+		</a>
 	</ul>
 `;
 
@@ -56,10 +67,16 @@ const wrapMultiLineAbbrExpected = `
 	</ul>
 `;
 
+// technically a bug, but also a feature (requested behaviour)
+// https://github.com/microsoft/vscode/issues/78015
 const wrapInlineElementExpectedFormatFalse = `
 	<ul class="nav main">
-		<h1><li class="item1">img</li></h1>
-		<h1><li class="item2">$hithere</li></h1>
+		<h1>
+			<li class="item1">img</li>
+		</h1>
+		<h1>
+			<li class="item2">$hithere</li>
+		</h1>
 	</ul>
 `;
 
@@ -73,51 +90,51 @@ suite('Tests for Wrap with Abbreviations', () => {
 	const oldValueForSyntaxProfiles = workspace.getConfiguration('emmet').inspect('syntaxProfile');
 
 	test('Wrap with block element using multi cursor', () => {
-		return testWrapWithAbbreviation(multiCursors, 'div', wrapBlockElementExpected);
+		return testWrapWithAbbreviation(multiCursors, 'div', wrapBlockElementExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with inline element using multi cursor', () => {
-		return testWrapWithAbbreviation(multiCursors, 'span', wrapInlineElementExpected);
+		return testWrapWithAbbreviation(multiCursors, 'span', wrapInlineElementExpected, htmlContentsForInlineWrapTests);
 	});
 
 	test('Wrap with snippet using multi cursor', () => {
-		return testWrapWithAbbreviation(multiCursors, 'a', wrapSnippetExpected);
+		return testWrapWithAbbreviation(multiCursors, 'a', wrapSnippetExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with multi line abbreviation using multi cursor', () => {
-		return testWrapWithAbbreviation(multiCursors, 'ul>li', wrapMultiLineAbbrExpected);
+		return testWrapWithAbbreviation(multiCursors, 'ul>li', wrapMultiLineAbbrExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with block element using multi cursor selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithSelection, 'div', wrapBlockElementExpected);
+		return testWrapWithAbbreviation(multiCursorsWithSelection, 'div', wrapBlockElementExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with inline element using multi cursor selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithSelection, 'span', wrapInlineElementExpected);
+		return testWrapWithAbbreviation(multiCursorsWithSelection, 'span', wrapInlineElementExpected, htmlContentsForInlineWrapTests);
 	});
 
 	test('Wrap with snippet using multi cursor selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithSelection, 'a', wrapSnippetExpected);
+		return testWrapWithAbbreviation(multiCursorsWithSelection, 'a', wrapSnippetExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with multi line abbreviation using multi cursor selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithSelection, 'ul>li', wrapMultiLineAbbrExpected);
+		return testWrapWithAbbreviation(multiCursorsWithSelection, 'ul>li', wrapMultiLineAbbrExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with block element using multi cursor full line selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'div', wrapBlockElementExpected);
+		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'div', wrapBlockElementExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with inline element using multi cursor full line selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'span', wrapInlineElementExpected);
+		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'span', wrapInlineElementExpected, htmlContentsForInlineWrapTests);
 	});
 
 	test('Wrap with snippet using multi cursor full line selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'a', wrapSnippetExpected);
+		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'a', wrapSnippetExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with multi line abbreviation using multi cursor full line selection', () => {
-		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'ul>li', wrapMultiLineAbbrExpected);
+		return testWrapWithAbbreviation(multiCursorsWithFullLineSelection, 'ul>li', wrapMultiLineAbbrExpected, htmlContentsForBlockWrapTests);
 	});
 
 	test('Wrap with abbreviation and comment filter', () => {
@@ -128,15 +145,31 @@ suite('Tests for Wrap with Abbreviations', () => {
 	`;
 		const expectedContents = `
 	<ul class="nav main">
-		<li class="hello">
-			line
-		</li>
+		<li class="hello">line</li>
 		<!-- /.hello -->
 	</ul>
 	`;
 		return testWrapWithAbbreviation([new Selection(2, 0, 2, 0)], 'li.hello|c', expectedContents, contents);
 	});
 
+	test('Wrap with abbreviation link', () => {
+		const contents = `
+	<ul class="nav main">
+		line
+	</ul>
+	`;
+		const expectedContents = `
+	<a href="https://example.com">
+		<div>
+			<ul class="nav main">
+				line
+			</ul>
+		</div>
+	</a>
+	`;
+		return testWrapWithAbbreviation([new Selection(1, 1, 1, 1)], 'a[href="https://example.com"]>div', expectedContents, contents);
+	});
+
 	test('Wrap with abbreviation entire node when cursor is on opening tag', () => {
 		const contents = `
 	<div class="nav main">
@@ -192,8 +225,12 @@ suite('Tests for Wrap with Abbreviations', () => {
 		const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
-			<li class="hello2"><li class="item2">hi.there</li></li>
+			<li class="hello1">
+				<li class="item1">This $10 is not a tabstop</li>
+			</li>
+			<li class="hello2">
+				<li class="item2">hi.there</li>
+			</li>
 		</ul>
 	</ul>
 `;
@@ -210,8 +247,12 @@ suite('Tests for Wrap with Abbreviations', () => {
 		const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello1"><li class="item1">img</li></li>
-			<li class="hello2"><li class="item2">hi.there</li></li>
+			<li class="hello1">
+				<li class="item1">img</li>
+			</li>
+			<li class="hello2">
+				<li class="item2">hi.there</li>
+			</li>
 		</ul>
 	</ul>
 `;
@@ -228,9 +269,13 @@ suite('Tests for Wrap with Abbreviations', () => {
 		const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello"><li class="item1">img</li></li>
+			<li class="hello">
+				<li class="item1">img</li>
+			</li>
 			<!-- /.hello -->
-			<li class="hello"><li class="item2">hi.there</li></li>
+			<li class="hello">
+				<li class="item2">hi.there</li>
+			</li>
 			<!-- /.hello -->
 		</ul>
 	</ul>
@@ -257,9 +302,9 @@ suite('Tests for Wrap with Abbreviations', () => {
 	});
 
 	test('Wrap with abbreviation and format set to false', () => {
-		return workspace.getConfiguration('emmet').update('syntaxProfiles',{ 'html' : { 'format': false } } , ConfigurationTarget.Global).then(() => {
-			return testWrapWithAbbreviation(multiCursors,'h1',wrapInlineElementExpectedFormatFalse).then(() => {
-				return workspace.getConfiguration('emmet').update('syntaxProfiles',oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
+		return workspace.getConfiguration('emmet').update('syntaxProfiles', { 'html' : { 'format': false } }, ConfigurationTarget.Global).then(() => {
+			return testWrapWithAbbreviation(multiCursors, 'h1', wrapInlineElementExpectedFormatFalse, htmlContentsForBlockWrapTests).then(() => {
+				return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
 			});
 		});
 	});
@@ -302,28 +347,32 @@ suite('Tests for Wrap with Abbreviations', () => {
 	</ul>
 `;
 
-		return testWrapWithAbbreviation([new Selection(2,2,3,33)], '.hello', wrapMultiLineJsxExpected, htmlContentsForWrapTests, 'jsx');
+		return testWrapWithAbbreviation([new Selection(2,2,3,33)], '.hello', wrapMultiLineJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
 	});
 
 	test('Wrap individual line with abbreviation uses className for jsx files', () => {
 		const wrapIndividualLinesJsxExpected = `
 	<ul class="nav main">
-		<div className="hello1"><li class="item1">img</li></div>
-		<div className="hello2"><li class="item2">$hithere</li></div>
+		<div className="hello1">
+			<li class="item1">img</li>
+		</div>
+		<div className="hello2">
+			<li class="item2">$hithere</li>
+		</div>
 	</ul>
 `;
 
-		return testWrapIndividualLinesWithAbbreviation([new Selection(2,2,3,33)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForWrapTests, 'jsx');
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2,2,3,33)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
 	});
 });
 
 
-function testWrapWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string = htmlContentsForWrapTests, fileExtension: string = 'html'): Thenable<any> {
+function testWrapWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string, fileExtension: string = 'html'): Thenable<any> {
 	return withRandomFileEditor(input, fileExtension, (editor, _) => {
 		editor.selections = selections;
 		const promise = wrapWithAbbreviation({ abbreviation });
 		if (!promise) {
-			assert.equal(1, 2, 'Wrap  with Abbreviation returned undefined.');
+			assert.equal(1, 2, 'Wrap with Abbreviation returned undefined.');
 			return Promise.resolve();
 		}
 
@@ -334,7 +383,7 @@ function testWrapWithAbbreviation(selections: Selection[], abbreviation: string,
 	});
 }
 
-function testWrapIndividualLinesWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string = htmlContentsForWrapTests, fileExtension: string = 'html'): Thenable<any> {
+function testWrapIndividualLinesWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string, fileExtension: string = 'html'): Thenable<any> {
 	return withRandomFileEditor(input, fileExtension, (editor, _) => {
 		editor.selections = selections;
 		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation });
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
index 952126fca..1afb8fe22 100644
--- a/extensions/emmet/src/toggleComment.ts
+++ b/extensions/emmet/src/toggleComment.ts
@@ -4,22 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { getNodesInBetween, getNode, getHtmlNode, parseDocument, sameNodes, isStyleSheet, validate } from './util';
-import { Node, Stylesheet, Rule } from 'EmmetNode';
+import { getNodesInBetween, getFlatNode, getHtmlFlatNode, sameNodes, isStyleSheet, validate, offsetRangeToVsRange, offsetRangeToSelection } from './util';
+import { Node, Stylesheet, Rule } from 'EmmetFlatNode';
 import parseStylesheet from '@emmetio/css-parser';
-import { DocumentStreamReader } from './bufferStream';
+import { getRootNode } from './parseDocument';
 
-const startCommentStylesheet = '/*';
-const endCommentStylesheet = '*/';
-const startCommentHTML = '<!--';
-const endCommentHTML = '-->';
+let startCommentStylesheet: string;
+let endCommentStylesheet: string;
+let startCommentHTML: string;
+let endCommentHTML: string;
 
 export function toggleComment(): Thenable<boolean> | undefined {
 	if (!validate() || !vscode.window.activeTextEditor) {
 		return;
 	}
+	setupCommentSpacing();
+
 	const editor = vscode.window.activeTextEditor;
-	let rootNode = parseDocument(editor.document);
+	const rootNode = getRootNode(editor.document, true);
 	if (!rootNode) {
 		return;
 	}
@@ -27,7 +29,7 @@ export function toggleComment(): Thenable<boolean> | undefined {
 	return editor.edit(editBuilder => {
 		let allEdits: vscode.TextEdit[][] = [];
 		editor.selections.reverse().forEach(selection => {
-			let edits = isStyleSheet(editor.document.languageId) ? toggleCommentStylesheet(selection, <Stylesheet>rootNode) : toggleCommentHTML(editor.document, selection, rootNode!);
+			const edits = isStyleSheet(editor.document.languageId) ? toggleCommentStylesheet(editor.document, selection, <Stylesheet>rootNode) : toggleCommentHTML(editor.document, selection, rootNode!);
 			if (edits.length > 0) {
 				allEdits.push(edits);
 			}
@@ -53,21 +55,25 @@ export function toggleComment(): Thenable<boolean> | undefined {
 function toggleCommentHTML(document: vscode.TextDocument, selection: vscode.Selection, rootNode: Node): vscode.TextEdit[] {
 	const selectionStart = selection.isReversed ? selection.active : selection.anchor;
 	const selectionEnd = selection.isReversed ? selection.anchor : selection.active;
+	const selectionStartOffset = document.offsetAt(selectionStart);
+	const selectionEndOffset = document.offsetAt(selectionEnd);
+	const documentText = document.getText();
 
-	let startNode = getHtmlNode(document, rootNode, selectionStart, true);
-	let endNode = getHtmlNode(document, rootNode, selectionEnd, true);
+	const startNode = getHtmlFlatNode(documentText, rootNode, selectionStartOffset, true);
+	const endNode = getHtmlFlatNode(documentText, rootNode, selectionEndOffset, true);
 
 	if (!startNode || !endNode) {
 		return [];
 	}
 
 	if (sameNodes(startNode, endNode) && startNode.name === 'style'
-		&& startNode.open.end.isBefore(selectionStart)
-		&& startNode.close.start.isAfter(selectionEnd)) {
-		let buffer = new DocumentStreamReader(document, startNode.open.end, new vscode.Range(startNode.open.end, startNode.close.start));
-		let cssRootNode = parseStylesheet(buffer);
-
-		return toggleCommentStylesheet(selection, cssRootNode);
+		&& startNode.open && startNode.close
+		&& startNode.open.end < selectionStartOffset
+		&& startNode.close.start > selectionEndOffset) {
+		const buffer = ' '.repeat(startNode.open.end) +
+			documentText.substring(startNode.open.end, startNode.close.start);
+		const cssRootNode = parseStylesheet(buffer);
+		return toggleCommentStylesheet(document, selection, cssRootNode);
 	}
 
 	let allNodes: Node[] = getNodesInBetween(startNode, endNode);
@@ -82,8 +88,8 @@ function toggleCommentHTML(document: vscode.TextDocument, selection: vscode.Sele
 	}
 
 
-	edits.push(new vscode.TextEdit(new vscode.Range(allNodes[0].start, allNodes[0].start), startCommentHTML));
-	edits.push(new vscode.TextEdit(new vscode.Range(allNodes[allNodes.length - 1].end, allNodes[allNodes.length - 1].end), endCommentHTML));
+	edits.push(new vscode.TextEdit(offsetRangeToVsRange(document, allNodes[0].start, allNodes[0].start), startCommentHTML));
+	edits.push(new vscode.TextEdit(offsetRangeToVsRange(document, allNodes[allNodes.length - 1].end, allNodes[allNodes.length - 1].end), endCommentHTML));
 
 	return edits;
 }
@@ -93,10 +99,8 @@ function getRangesToUnCommentHTML(node: Node, document: vscode.TextDocument): vs
 
 	// If current node is commented, then uncomment and return
 	if (node.type === 'comment') {
-
-		unCommentTextEdits.push(new vscode.TextEdit(new vscode.Range(node.start, node.start.translate(0, startCommentHTML.length)), ''));
-		unCommentTextEdits.push(new vscode.TextEdit(new vscode.Range(node.end.translate(0, -endCommentHTML.length), node.end), ''));
-
+		unCommentTextEdits.push(new vscode.TextEdit(offsetRangeToVsRange(document, node.start, node.start + startCommentHTML.length), ''));
+		unCommentTextEdits.push(new vscode.TextEdit(offsetRangeToVsRange(document, node.end - endCommentHTML.length, node.end), ''));
 		return unCommentTextEdits;
 	}
 
@@ -108,32 +112,34 @@ function getRangesToUnCommentHTML(node: Node, document: vscode.TextDocument): vs
 	return unCommentTextEdits;
 }
 
-function toggleCommentStylesheet(selection: vscode.Selection, rootNode: Stylesheet): vscode.TextEdit[] {
-	let selectionStart = selection.isReversed ? selection.active : selection.anchor;
-	let selectionEnd = selection.isReversed ? selection.anchor : selection.active;
+function toggleCommentStylesheet(document: vscode.TextDocument, selection: vscode.Selection, rootNode: Stylesheet): vscode.TextEdit[] {
+	const selectionStart = selection.isReversed ? selection.active : selection.anchor;
+	const selectionEnd = selection.isReversed ? selection.anchor : selection.active;
+	let selectionStartOffset = document.offsetAt(selectionStart);
+	let selectionEndOffset = document.offsetAt(selectionEnd);
 
-	let startNode = getNode(rootNode, selectionStart, true);
-	let endNode = getNode(rootNode, selectionEnd, true);
+	const startNode = getFlatNode(rootNode, selectionStartOffset, true);
+	const endNode = getFlatNode(rootNode, selectionEndOffset, true);
 
 	if (!selection.isEmpty) {
-		selectionStart = adjustStartNodeCss(startNode, selectionStart, rootNode);
-		selectionEnd = adjustEndNodeCss(endNode, selectionEnd, rootNode);
-		selection = new vscode.Selection(selectionStart, selectionEnd);
+		selectionStartOffset = adjustStartNodeCss(startNode, selectionStartOffset, rootNode);
+		selectionEndOffset = adjustEndNodeCss(endNode, selectionEndOffset, rootNode);
+		selection = offsetRangeToSelection(document, selectionStartOffset, selectionEndOffset);
 	} else if (startNode) {
-		selectionStart = startNode.start;
-		selectionEnd = startNode.end;
-		selection = new vscode.Selection(selectionStart, selectionEnd);
+		selectionStartOffset = startNode.start;
+		selectionEndOffset = startNode.end;
+		selection = offsetRangeToSelection(document, selectionStartOffset, selectionEndOffset);
 	}
 
 	// Uncomment the comments that intersect with the selection.
 	let rangesToUnComment: vscode.Range[] = [];
 	let edits: vscode.TextEdit[] = [];
 	rootNode.comments.forEach(comment => {
-		let commentRange = new vscode.Range(comment.start, comment.end);
+		const commentRange = offsetRangeToVsRange(document, comment.start, comment.end);
 		if (selection.intersection(commentRange)) {
 			rangesToUnComment.push(commentRange);
-			edits.push(new vscode.TextEdit(new vscode.Range(comment.start, comment.start.translate(0, startCommentStylesheet.length)), ''));
-			edits.push(new vscode.TextEdit(new vscode.Range(comment.end.translate(0, -endCommentStylesheet.length), comment.end), ''));
+			edits.push(new vscode.TextEdit(offsetRangeToVsRange(document, comment.start, comment.start + startCommentStylesheet.length), ''));
+			edits.push(new vscode.TextEdit(offsetRangeToVsRange(document, comment.end - endCommentStylesheet.length, comment.end), ''));
 		}
 	});
 
@@ -145,20 +151,32 @@ function toggleCommentStylesheet(selection: vscode.Selection, rootNode: Styleshe
 		new vscode.TextEdit(new vscode.Range(selection.start, selection.start), startCommentStylesheet),
 		new vscode.TextEdit(new vscode.Range(selection.end, selection.end), endCommentStylesheet)
 	];
-
-
 }
 
-function adjustStartNodeCss(node: Node | null, pos: vscode.Position, rootNode: Stylesheet): vscode.Position {
+function setupCommentSpacing() {
+	const config: boolean | undefined = vscode.workspace.getConfiguration('editor.comments').get('insertSpace');
+	if (config) {
+		startCommentStylesheet = '/* ';
+		endCommentStylesheet = ' */';
+		startCommentHTML = '<!-- ';
+		endCommentHTML = ' -->';
+	} else {
+		startCommentStylesheet = '/*';
+		endCommentStylesheet = '*/';
+		startCommentHTML = '<!--';
+		endCommentHTML = '-->';
+	}
+}
+
+function adjustStartNodeCss(node: Node | undefined, offset: number, rootNode: Stylesheet): number {
 	for (const comment of rootNode.comments) {
-		let commentRange = new vscode.Range(comment.start, comment.end);
-		if (commentRange.contains(pos)) {
-			return pos;
+		if (comment.start <= offset && offset <= comment.end) {
+			return offset;
 		}
 	}
 
 	if (!node) {
-		return pos;
+		return offset;
 	}
 
 	if (node.type === 'property') {
@@ -166,32 +184,31 @@ function adjustStartNodeCss(node: Node | null, pos: vscode.Position, rootNode: S
 	}
 
 	const rule = <Rule>node;
-	if (pos.isBefore(rule.contentStartToken.end) || !rule.firstChild) {
+	if (offset < rule.contentStartToken.end || !rule.firstChild) {
 		return rule.start;
 	}
 
-	if (pos.isBefore(rule.firstChild.start)) {
-		return pos;
+	if (offset < rule.firstChild.start) {
+		return offset;
 	}
 
 	let newStartNode = rule.firstChild;
-	while (newStartNode.nextSibling && pos.isAfter(newStartNode.end)) {
+	while (newStartNode.nextSibling && offset > newStartNode.end) {
 		newStartNode = newStartNode.nextSibling;
 	}
 
 	return newStartNode.start;
 }
 
-function adjustEndNodeCss(node: Node | null, pos: vscode.Position, rootNode: Stylesheet): vscode.Position {
+function adjustEndNodeCss(node: Node | undefined, offset: number, rootNode: Stylesheet): number {
 	for (const comment of rootNode.comments) {
-		let commentRange = new vscode.Range(comment.start, comment.end);
-		if (commentRange.contains(pos)) {
-			return pos;
+		if (comment.start <= offset && offset <= comment.end) {
+			return offset;
 		}
 	}
 
 	if (!node) {
-		return pos;
+		return offset;
 	}
 
 	if (node.type === 'property') {
@@ -199,16 +216,16 @@ function adjustEndNodeCss(node: Node | null, pos: vscode.Position, rootNode: Sty
 	}
 
 	const rule = <Rule>node;
-	if (pos.isEqual(rule.contentEndToken.end) || !rule.firstChild) {
+	if (offset === rule.contentEndToken.end || !rule.firstChild) {
 		return rule.end;
 	}
 
-	if (pos.isAfter(rule.children[rule.children.length - 1].end)) {
-		return pos;
+	if (offset > rule.children[rule.children.length - 1].end) {
+		return offset;
 	}
 
 	let newEndNode = rule.children[rule.children.length - 1];
-	while (newEndNode.previousSibling && pos.isBefore(newEndNode.start)) {
+	while (newEndNode.previousSibling && offset < newEndNode.start) {
 		newEndNode = newEndNode.previousSibling;
 	}
 
diff --git a/extensions/emmet/src/typings/EmmetFlatNode.d.ts b/extensions/emmet/src/typings/EmmetFlatNode.d.ts
new file mode 100644
index 000000000..05f5a5b3c
--- /dev/null
+++ b/extensions/emmet/src/typings/EmmetFlatNode.d.ts
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+declare module 'EmmetFlatNode' {
+    export interface Node {
+        start: number
+        end: number
+        type: string
+        parent: Node | undefined
+        firstChild: Node | undefined
+        nextSibling: Node | undefined
+        previousSibling: Node | undefined
+        children: Node[]
+    }
+
+    export interface Token {
+        start: number
+        end: number
+        stream: BufferStream
+        toString(): string
+    }
+
+    export interface CssToken extends Token {
+        size: number
+        item(number: number): any
+        type: string
+    }
+
+    export interface HtmlToken extends Token {
+        value: string
+    }
+
+    export interface Attribute extends Token {
+        name: Token
+        value: Token
+    }
+
+    export interface HtmlNode extends Node {
+        name: string
+        open: Token | undefined
+        close: Token | undefined
+        parent: HtmlNode | undefined
+        firstChild: HtmlNode | undefined
+        nextSibling: HtmlNode | undefined
+        previousSibling: HtmlNode | undefined
+        children: HtmlNode[]
+        attributes: Attribute[]
+    }
+
+    export interface CssNode extends Node {
+        name: string
+        parent: CssNode | undefined
+        firstChild: CssNode | undefined
+        nextSibling: CssNode | undefined
+        previousSibling: CssNode | undefined
+        children: CssNode[]
+    }
+
+    export interface Rule extends CssNode {
+        selectorToken: Token
+        contentStartToken: Token
+        contentEndToken: Token
+    }
+
+    export interface Property extends CssNode {
+        valueToken: Token
+        separator: string
+        parent: Rule
+        terminatorToken: Token
+        separatorToken: Token
+        value: string
+    }
+
+    export interface Stylesheet extends Node {
+        comments: Token[]
+    }
+
+    export interface BufferStream {
+        peek(): number
+        next(): number
+        backUp(n: number): number
+        current(): string
+        substring(from: number, to: number): string
+        eat(match: any): boolean
+        eatWhile(match: any): boolean
+    }
+}
diff --git a/extensions/emmet/src/typings/emmetio__css-parser.d.ts b/extensions/emmet/src/typings/emmetio__css-parser.d.ts
index 65e7ac6ec..e02b94709 100644
--- a/extensions/emmet/src/typings/emmetio__css-parser.d.ts
+++ b/extensions/emmet/src/typings/emmetio__css-parser.d.ts
@@ -5,8 +5,10 @@
 
 declare module '@emmetio/css-parser' {
 	import { BufferStream, Stylesheet } from 'EmmetNode';
+	import { Stylesheet as FlatStylesheet } from 'EmmetFlatNode';
 
 	function parseStylesheet(stream: BufferStream): Stylesheet;
+	function parseStylesheet(stream: string): FlatStylesheet;
 
 	export default parseStylesheet;
 }
diff --git a/extensions/emmet/src/typings/emmetio__html-matcher.d.ts b/extensions/emmet/src/typings/emmetio__html-matcher.d.ts
index 2b425c88e..1c525f2d0 100644
--- a/extensions/emmet/src/typings/emmetio__html-matcher.d.ts
+++ b/extensions/emmet/src/typings/emmetio__html-matcher.d.ts
@@ -5,8 +5,10 @@
 
 declare module '@emmetio/html-matcher' {
 	import { BufferStream, HtmlNode } from 'EmmetNode';
+	import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
 
 	function parse(stream: BufferStream): HtmlNode;
+	function parse(stream: string): HtmlFlatNode;
 
 	export default parse;
 }
diff --git a/extensions/emmet/src/updateImageSize.ts b/extensions/emmet/src/updateImageSize.ts
index 3ac3f15a1..b590fabb2 100644
--- a/extensions/emmet/src/updateImageSize.ts
+++ b/extensions/emmet/src/updateImageSize.ts
@@ -5,26 +5,26 @@
 
 // Based on @sergeche's work on the emmet plugin for atom
 
-import { TextEditor, Range, Position, window, TextEdit } from 'vscode';
+import { TextEditor, Position, window, TextEdit } from 'vscode';
 import * as path from 'path';
 import { getImageSize } from './imageSizeHelper';
-import { parseDocument, getNode, iterateCSSToken, getCssPropertyFromRule, isStyleSheet, validate } from './util';
-import { HtmlNode, CssToken, HtmlToken, Attribute, Property } from 'EmmetNode';
+import { getFlatNode, iterateCSSToken, getCssPropertyFromRule, isStyleSheet, validate, offsetRangeToVsRange } from './util';
+import { HtmlNode, CssToken, HtmlToken, Attribute, Property } from 'EmmetFlatNode';
 import { locateFile } from './locateFile';
 import parseStylesheet from '@emmetio/css-parser';
-import { DocumentStreamReader } from './bufferStream';
+import { getRootNode } from './parseDocument';
 
 /**
  * Updates size of context image in given editor
  */
-export function updateImageSize() {
+export function updateImageSize(): Promise<boolean> | undefined {
 	if (!validate() || !window.activeTextEditor) {
 		return;
 	}
 	const editor = window.activeTextEditor;
 
-	let allUpdatesPromise = editor.selections.reverse().map(selection => {
-		let position = selection.isReversed ? selection.active : selection.anchor;
+	const allUpdatesPromise = editor.selections.reverse().map(selection => {
+		const position = selection.isReversed ? selection.active : selection.anchor;
 		if (!isStyleSheet(editor.document.languageId)) {
 			return updateImageSizeHTML(editor, position);
 		} else {
@@ -71,15 +71,19 @@ function updateImageSizeHTML(editor: TextEditor, position: Position): Promise<Te
 
 function updateImageSizeStyleTag(editor: TextEditor, position: Position): Promise<TextEdit[]> {
 	const getPropertyInsiderStyleTag = (editor: TextEditor): Property | null => {
-		const rootNode = parseDocument(editor.document);
-		const currentNode = <HtmlNode>getNode(rootNode, position, true);
+		const document = editor.document;
+		const rootNode = getRootNode(document, true);
+		const offset = document.offsetAt(position);
+		const currentNode = <HtmlNode>getFlatNode(rootNode, offset, true);
 		if (currentNode && currentNode.name === 'style'
-			&& currentNode.open.end.isBefore(position)
-			&& currentNode.close.start.isAfter(position)) {
-			let buffer = new DocumentStreamReader(editor.document, currentNode.open.end, new Range(currentNode.open.end, currentNode.close.start));
-			let rootNode = parseStylesheet(buffer);
-			const node = getNode(rootNode, position, true);
-			return (node && node.type === 'property') ? <Property>node : null;
+			&& currentNode.open && currentNode.close
+			&& currentNode.open.end < offset
+			&& currentNode.close.start > offset) {
+			const buffer = ' '.repeat(currentNode.open.end) +
+				document.getText().substring(currentNode.open.end, currentNode.close.start);
+			const innerRootNode = parseStylesheet(buffer);
+			const innerNode = getFlatNode(innerRootNode, offset, true);
+			return (innerNode && innerNode.type === 'property') ? <Property>innerNode : null;
 		}
 		return null;
 	};
@@ -96,7 +100,7 @@ function updateImageSizeCSSFile(editor: TextEditor, position: Position): Promise
  */
 function updateImageSizeCSS(editor: TextEditor, position: Position, fetchNode: (editor: TextEditor, position: Position) => Property | null): Promise<TextEdit[]> {
 	const node = fetchNode(editor, position);
-	const src = node && getImageSrcCSS(node, position);
+	const src = node && getImageSrcCSS(editor, node, position);
 
 	if (!src) {
 		return Promise.reject(new Error('No valid image source'));
@@ -108,7 +112,7 @@ function updateImageSizeCSS(editor: TextEditor, position: Position, fetchNode: (
 			// since this action is asynchronous, we have to ensure that editor wasn’t
 			// changed and user didn’t moved caret outside <img> node
 			const prop = fetchNode(editor, position);
-			if (prop && getImageSrcCSS(prop, position) === src) {
+			if (prop && getImageSrcCSS(editor, prop, position) === src) {
 				return updateCSSNode(editor, prop, size.width, size.height);
 			}
 			return [];
@@ -121,8 +125,10 @@ function updateImageSizeCSS(editor: TextEditor, position: Position, fetchNode: (
  * be found
  */
 function getImageHTMLNode(editor: TextEditor, position: Position): HtmlNode | null {
-	const rootNode = parseDocument(editor.document);
-	const node = <HtmlNode>getNode(rootNode, position, true);
+	const document = editor.document;
+	const rootNode = getRootNode(document, true);
+	const offset = document.offsetAt(position);
+	const node = <HtmlNode>getFlatNode(rootNode, offset, true);
 
 	return node && node.name.toLowerCase() === 'img' ? node : null;
 }
@@ -132,8 +138,10 @@ function getImageHTMLNode(editor: TextEditor, position: Position): HtmlNode | nu
  * be found
  */
 function getImageCSSNode(editor: TextEditor, position: Position): Property | null {
-	const rootNode = parseDocument(editor.document);
-	const node = getNode(rootNode, position, true);
+	const document = editor.document;
+	const rootNode = getRootNode(document, true);
+	const offset = document.offsetAt(position);
+	const node = getFlatNode(rootNode, offset, true);
 	return node && node.type === 'property' ? <Property>node : null;
 }
 
@@ -152,11 +160,11 @@ function getImageSrcHTML(node: HtmlNode): string | undefined {
 /**
  * Returns image source from given `url()` token
  */
-function getImageSrcCSS(node: Property | undefined, position: Position): string | undefined {
+function getImageSrcCSS(editor: TextEditor, node: Property | undefined, position: Position): string | undefined {
 	if (!node) {
 		return;
 	}
-	const urlToken = findUrlToken(node, position);
+	const urlToken = findUrlToken(editor, node, position);
 	if (!urlToken) {
 		return;
 	}
@@ -174,7 +182,12 @@ function getImageSrcCSS(node: Property | undefined, position: Position): string
  * Updates size of given HTML node
  */
 function updateHTMLTag(editor: TextEditor, node: HtmlNode, width: number, height: number): TextEdit[] {
+	const document = editor.document;
 	const srcAttr = getAttribute(node, 'src');
+	if (!srcAttr) {
+		return [];
+	}
+
 	const widthAttr = getAttribute(node, 'width');
 	const heightAttr = getAttribute(node, 'height');
 	const quote = getAttributeQuote(editor, srcAttr);
@@ -186,15 +199,15 @@ function updateHTMLTag(editor: TextEditor, node: HtmlNode, width: number, height
 	if (!widthAttr) {
 		textToAdd += ` width=${quote}${width}${quote}`;
 	} else {
-		edits.push(new TextEdit(new Range(widthAttr.value.start, widthAttr.value.end), String(width)));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, widthAttr.value.start, widthAttr.value.end), String(width)));
 	}
 	if (!heightAttr) {
 		textToAdd += ` height=${quote}${height}${quote}`;
 	} else {
-		edits.push(new TextEdit(new Range(heightAttr.value.start, heightAttr.value.end), String(height)));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, heightAttr.value.start, heightAttr.value.end), String(height)));
 	}
 	if (textToAdd) {
-		edits.push(new TextEdit(new Range(endOfAttributes, endOfAttributes), textToAdd));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, endOfAttributes, endOfAttributes), textToAdd));
 	}
 
 	return edits;
@@ -204,6 +217,7 @@ function updateHTMLTag(editor: TextEditor, node: HtmlNode, width: number, height
  * Updates size of given CSS rule
  */
 function updateCSSNode(editor: TextEditor, srcProp: Property, width: number, height: number): TextEdit[] {
+	const document = editor.document;
 	const rule = srcProp.parent;
 	const widthProp = getCssPropertyFromRule(rule, 'width');
 	const heightProp = getCssPropertyFromRule(rule, 'height');
@@ -214,22 +228,22 @@ function updateCSSNode(editor: TextEditor, srcProp: Property, width: number, hei
 
 	let edits: TextEdit[] = [];
 	if (!srcProp.terminatorToken) {
-		edits.push(new TextEdit(new Range(srcProp.end, srcProp.end), ';'));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, srcProp.end, srcProp.end), ';'));
 	}
 
 	let textToAdd = '';
 	if (!widthProp) {
 		textToAdd += `${before}width${separator}${width}px;`;
 	} else {
-		edits.push(new TextEdit(new Range(widthProp.valueToken.start, widthProp.valueToken.end), `${width}px`));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, widthProp.valueToken.start, widthProp.valueToken.end), `${width}px`));
 	}
 	if (!heightProp) {
 		textToAdd += `${before}height${separator}${height}px;`;
 	} else {
-		edits.push(new TextEdit(new Range(heightProp.valueToken.start, heightProp.valueToken.end), `${height}px`));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, heightProp.valueToken.start, heightProp.valueToken.end), `${height}px`));
 	}
 	if (textToAdd) {
-		edits.push(new TextEdit(new Range(srcProp.end, srcProp.end), textToAdd));
+		edits.push(new TextEdit(offsetRangeToVsRange(document, srcProp.end, srcProp.end), textToAdd));
 	}
 
 	return edits;
@@ -238,9 +252,9 @@ function updateCSSNode(editor: TextEditor, srcProp: Property, width: number, hei
 /**
  * Returns attribute object with `attrName` name from given HTML node
  */
-function getAttribute(node: HtmlNode, attrName: string): Attribute {
+function getAttribute(node: HtmlNode, attrName: string): Attribute | undefined {
 	attrName = attrName.toLowerCase();
-	return node && (node.open as any).attributes.find((attr: any) => attr.name.value.toLowerCase() === attrName);
+	return node && node.attributes.find(attr => attr.name.toString().toLowerCase() === attrName);
 }
 
 /**
@@ -248,18 +262,20 @@ function getAttribute(node: HtmlNode, attrName: string): Attribute {
  * string if attribute wasn’t quoted
 
  */
-function getAttributeQuote(editor: TextEditor, attr: any): string {
-	const range = new Range(attr.value ? attr.value.end : attr.end, attr.end);
-	return range.isEmpty ? '' : editor.document.getText(range);
+function getAttributeQuote(editor: TextEditor, attr: Attribute): string {
+	const begin = attr.value ? attr.value.end : attr.end;
+	const end = attr.end;
+	return begin === end ? '' : editor.document.getText().substring(begin, end);
 }
 
 /**
  * Finds 'url' token for given `pos` point in given CSS property `node`
  */
-function findUrlToken(node: Property, pos: Position): CssToken | undefined {
+function findUrlToken(editor: TextEditor, node: Property, pos: Position): CssToken | undefined {
+	const offset = editor.document.offsetAt(pos);
 	for (let i = 0, il = (node as any).parsedValue.length, url; i < il; i++) {
 		iterateCSSToken((node as any).parsedValue[i], (token: CssToken) => {
-			if (token.type === 'url' && token.start.isBeforeOrEqual(pos) && token.end.isAfterOrEqual(pos)) {
+			if (token.type === 'url' && token.start <= offset && token.end >= offset) {
 				url = token;
 				return false;
 			}
@@ -279,9 +295,9 @@ function findUrlToken(node: Property, pos: Position): CssToken | undefined {
 function getPropertyDelimitor(editor: TextEditor, node: Property): string {
 	let anchor;
 	if (anchor = (node.previousSibling || node.parent.contentStartToken)) {
-		return editor.document.getText(new Range(anchor.end, node.start));
+		return editor.document.getText().substring(anchor.end, node.start);
 	} else if (anchor = (node.nextSibling || node.parent.contentEndToken)) {
-		return editor.document.getText(new Range(node.end, anchor.start));
+		return editor.document.getText().substring(node.end, anchor.start);
 	}
 
 	return '';
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
index b8f568e9e..5dcbe2ffb 100644
--- a/extensions/emmet/src/updateTag.ts
+++ b/extensions/emmet/src/updateTag.ts
@@ -4,23 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { HtmlNode } from 'EmmetNode';
-import { getHtmlNode, parseDocument, validate } from './util';
+import { getHtmlFlatNode, validate } from './util';
+import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';
+import { getRootNode } from './parseDocument';
 
 export function updateTag(tagName: string): Thenable<boolean> | undefined {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
 		return;
 	}
-	let editor = vscode.window.activeTextEditor;
-	let rootNode = <HtmlNode>parseDocument(editor.document);
+
+	const editor = vscode.window.activeTextEditor;
+	const document = editor.document;
+	const rootNode = <HtmlFlatNode>getRootNode(document, true);
 	if (!rootNode) {
 		return;
 	}
 
-	let rangesToUpdate: vscode.Range[] = [];
-	editor.selections.reverse().forEach(selection => {
-		rangesToUpdate = rangesToUpdate.concat(getRangesToUpdate(editor, selection, rootNode));
-	});
+	const rangesToUpdate = editor.selections.reverse()
+		.reduce<vscode.Range[]>((prev, selection) =>
+			prev.concat(getRangesToUpdate(document, selection, rootNode)), []);
 
 	return editor.edit(editBuilder => {
 		rangesToUpdate.forEach(range => {
@@ -29,22 +31,27 @@ export function updateTag(tagName: string): Thenable<boolean> | undefined {
 	});
 }
 
-function getRangesToUpdate(editor: vscode.TextEditor, selection: vscode.Selection, rootNode: HtmlNode): vscode.Range[] {
-	let nodeToUpdate = getHtmlNode(editor.document, rootNode, selection.start, true);
-	if (!nodeToUpdate) {
-		return [];
+function getRangesFromNode(node: HtmlFlatNode, document: vscode.TextDocument): vscode.Range[] {
+	let ranges: vscode.Range[] = [];
+	if (node.open) {
+		const start = document.positionAt(node.open.start);
+		ranges.push(new vscode.Range(start.translate(0, 1),
+			start.translate(0, 1).translate(0, node.name.length)));
 	}
-
-	let openStart = nodeToUpdate.open.start.translate(0, 1);
-	let openEnd = openStart.translate(0, nodeToUpdate.name.length);
-
-	let ranges = [new vscode.Range(openStart, openEnd)];
-	if (nodeToUpdate.close) {
-		let closeStart = nodeToUpdate.close.start.translate(0, 2);
-		let closeEnd = nodeToUpdate.close.end.translate(0, -1);
-		ranges.push(new vscode.Range(closeStart, closeEnd));
+	if (node.close) {
+		const endTagStart = document.positionAt(node.close.start);
+		const end = document.positionAt(node.close.end);
+		ranges.push(new vscode.Range(endTagStart.translate(0, 2), end.translate(0, -1)));
 	}
 	return ranges;
 }
 
-
+function getRangesToUpdate(document: vscode.TextDocument, selection: vscode.Selection, rootNode: HtmlFlatNode): vscode.Range[] {
+	const documentText = document.getText();
+	const offset = document.offsetAt(selection.start);
+	const nodeToUpdate = getHtmlFlatNode(documentText, rootNode, offset, true);
+	if (!nodeToUpdate) {
+		return [];
+	}
+	return getRangesFromNode(nodeToUpdate, document);
+}
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index f2b72548a..17ad4fbef 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -6,10 +6,11 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
-import { Node, HtmlNode, CssToken, Property, Rule, Stylesheet } from 'EmmetNode';
+import { Node as FlatNode, HtmlNode as HtmlFlatNode, Property as FlatProperty, Rule as FlatRule, CssToken as FlatCssToken, Stylesheet as FlatStylesheet } from 'EmmetFlatNode';
 import { DocumentStreamReader } from './bufferStream';
 import * as EmmetHelper from 'vscode-emmet-helper';
-import { TextDocument as LSTextDocument } from 'vscode-html-languageservice';
+import { TextDocument as LSTextDocument } from 'vscode-languageserver-textdocument';
+import { getRootNode } from './parseDocument';
 
 let _emmetHelper: typeof EmmetHelper;
 let _currentExtensionsPath: string | undefined = undefined;
@@ -21,7 +22,6 @@ export function setHomeDir(homeDir: vscode.Uri) {
 	_homeDir = homeDir;
 }
 
-
 export function getEmmetHelper() {
 	// Lazy load vscode-emmet-helper instead of importing it
 	// directly to reduce the start-up time of the extension
@@ -130,28 +130,13 @@ export function getEmmetMode(language: string, excludedLanguages: string[]): str
 	if (language === 'jade') {
 		return 'pug';
 	}
-	const emmetModes = ['html', 'pug', 'slim', 'haml', 'xml', 'xsl', 'jsx', 'css', 'scss', 'sass', 'less', 'stylus'];
-	if (emmetModes.indexOf(language) > -1) {
+	const syntaxes = getSyntaxes();
+	if (syntaxes.markup.includes(language) || syntaxes.stylesheet.includes(language)) {
 		return language;
 	}
 	return;
 }
 
-/**
- * Parses the given document using emmet parsing modules
- */
-export function parseDocument(document: vscode.TextDocument, showError: boolean = true): Node | undefined {
-	let parseContent = isStyleSheet(document.languageId) ? parseStylesheet : parse;
-	try {
-		return parseContent(new DocumentStreamReader(document));
-	} catch (e) {
-		if (showError) {
-			vscode.window.showErrorMessage('Emmet: Failed to parse the file');
-		}
-	}
-	return undefined;
-}
-
 const closeBrace = 125;
 const openBrace = 123;
 const slash = 47;
@@ -163,39 +148,41 @@ const star = 42;
  * @param document vscode.TextDocument
  * @param position vscode.Position
  */
-export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Stylesheet | undefined {
+export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): FlatStylesheet | undefined {
 	const isCSS = document.languageId === 'css';
-	let startPosition = new vscode.Position(0, 0);
-	let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);
-	const limitCharacter = document.offsetAt(position) - 5000;
-	const limitPosition = limitCharacter > 0 ? document.positionAt(limitCharacter) : startPosition;
-	const stream = new DocumentStreamReader(document, position);
+	const positionOffset = document.offsetAt(position);
+	let startOffset = 0;
+	let endOffset = document.getText().length;
+	const limitCharacter = positionOffset - 5000;
+	const limitOffset = limitCharacter > 0 ? limitCharacter : startOffset;
+	const stream = new DocumentStreamReader(document, positionOffset);
 
-	function findOpeningCommentBeforePosition(pos: vscode.Position): vscode.Position | undefined {
-		let text = document.getText(new vscode.Range(0, 0, pos.line, pos.character));
+	function findOpeningCommentBeforePosition(pos: number): number | undefined {
+		const text = document.getText().substring(0, pos);
 		let offset = text.lastIndexOf('/*');
 		if (offset === -1) {
 			return;
 		}
-		return document.positionAt(offset);
+		return offset;
 	}
 
-	function findClosingCommentAfterPosition(pos: vscode.Position): vscode.Position | undefined {
-		let text = document.getText(new vscode.Range(pos.line, pos.character, document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length));
+	function findClosingCommentAfterPosition(pos: number): number | undefined {
+		const text = document.getText().substring(pos);
 		let offset = text.indexOf('*/');
 		if (offset === -1) {
 			return;
 		}
-		offset += 2 + document.offsetAt(pos);
-		return document.positionAt(offset);
+		offset += 2 + pos;
+		return offset;
 	}
 
 	function consumeLineCommentBackwards() {
-		if (!isCSS && currentLine !== stream.pos.line) {
-			currentLine = stream.pos.line;
-			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
+		const posLineNumber = document.positionAt(stream.pos).line;
+		if (!isCSS && currentLine !== posLineNumber) {
+			currentLine = posLineNumber;
+			const startLineComment = document.lineAt(currentLine).text.indexOf('//');
 			if (startLineComment > -1) {
-				stream.pos = new vscode.Position(currentLine, startLineComment);
+				stream.pos = document.offsetAt(new vscode.Position(currentLine, startLineComment));
 			}
 		}
 	}
@@ -203,7 +190,7 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 	function consumeBlockCommentBackwards() {
 		if (stream.peek() === slash) {
 			if (stream.backUp(1) === star) {
-				stream.pos = findOpeningCommentBeforePosition(stream.pos) || startPosition;
+				stream.pos = findOpeningCommentBeforePosition(stream.pos) ?? startOffset;
 			} else {
 				stream.next();
 			}
@@ -213,9 +200,10 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 	function consumeCommentForwards() {
 		if (stream.eat(slash)) {
 			if (stream.eat(slash) && !isCSS) {
-				stream.pos = new vscode.Position(stream.pos.line + 1, 0);
+				const posLineNumber = document.positionAt(stream.pos).line;
+				stream.pos = document.offsetAt(new vscode.Position(posLineNumber + 1, 0));
 			} else if (stream.eat(star)) {
-				stream.pos = findClosingCommentAfterPosition(stream.pos) || endPosition;
+				stream.pos = findClosingCommentAfterPosition(stream.pos) ?? endOffset;
 			}
 		}
 	}
@@ -230,10 +218,10 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 	}
 
 	if (!stream.eof()) {
-		endPosition = stream.pos;
+		endOffset = stream.pos;
 	}
 
-	stream.pos = position;
+	stream.pos = positionOffset;
 	let openBracesToFind = 1;
 	let currentLine = position.line;
 	let exit = false;
@@ -249,7 +237,7 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 			case closeBrace:
 				if (isCSS) {
 					stream.next();
-					startPosition = stream.pos;
+					startOffset = stream.pos;
 					exit = true;
 				} else {
 					openBracesToFind++;
@@ -262,17 +250,17 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 				break;
 		}
 
-		if (position.line - stream.pos.line > 100 || stream.pos.isBeforeOrEqual(limitPosition)) {
+		if (position.line - document.positionAt(stream.pos).line > 100
+			|| stream.pos <= limitOffset) {
 			exit = true;
 		}
 	}
 
 	// We are at an opening brace. We need to include its selector.
-	currentLine = stream.pos.line;
+	currentLine = document.positionAt(stream.pos).line;
 	openBracesToFind = 0;
 	let foundSelector = false;
 	while (!exit && !stream.sof() && !foundSelector && openBracesToFind >= 0) {
-
 		consumeLineCommentBackwards();
 
 		const ch = stream.backUp(1);
@@ -298,12 +286,13 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 		}
 
 		if (!stream.sof() && foundSelector) {
-			startPosition = stream.pos;
+			startOffset = stream.pos;
 		}
 	}
 
 	try {
-		return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
+		const buffer = ' '.repeat(startOffset) + document.getText().substring(startOffset, endOffset);
+		return parseStylesheet(buffer);
 	} catch (e) {
 		return;
 	}
@@ -312,80 +301,101 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 /**
  * Returns node corresponding to given position in the given root node
  */
-export function getNode(root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean) {
+export function getFlatNode(root: FlatNode | undefined, offset: number, includeNodeBoundary: boolean): FlatNode | undefined {
 	if (!root) {
-		return null;
+		return;
 	}
 
-	let currentNode = root.firstChild;
-	let foundNode: Node | null = null;
-
-	while (currentNode) {
-		const nodeStart: vscode.Position = currentNode.start;
-		const nodeEnd: vscode.Position = currentNode.end;
-		if ((nodeStart.isBefore(position) && nodeEnd.isAfter(position))
-			|| (includeNodeBoundary && (nodeStart.isBeforeOrEqual(position) && nodeEnd.isAfterOrEqual(position)))) {
-
-			foundNode = currentNode;
-			// Dig deeper
-			currentNode = currentNode.firstChild;
-		} else {
-			currentNode = currentNode.nextSibling;
+	function getFlatNodeChild(child: FlatNode | undefined): FlatNode | undefined {
+		if (!child) {
+			return;
 		}
+		const nodeStart = child.start;
+		const nodeEnd = child.end;
+		if ((nodeStart < offset && nodeEnd > offset)
+			|| (includeNodeBoundary && nodeStart <= offset && nodeEnd >= offset)) {
+			return getFlatNodeChildren(child.children) ?? child;
+		}
+		else if ('close' in <any>child) {
+			// We have an HTML node in this case.
+			// In case this node is an invalid unpaired HTML node,
+			// we still want to search its children
+			const htmlChild = <HtmlFlatNode>child;
+			if (htmlChild.open && !htmlChild.close) {
+				return getFlatNodeChildren(htmlChild.children);
+			}
+		}
+		return;
 	}
 
-	return foundNode;
+	function getFlatNodeChildren(children: FlatNode[]): FlatNode | undefined {
+		for (let i = 0; i < children.length; i++) {
+			const foundChild = getFlatNodeChild(children[i]);
+			if (foundChild) {
+				return foundChild;
+			}
+		}
+		return;
+	}
+
+	return getFlatNodeChildren(root.children);
 }
 
 export const allowedMimeTypesInScriptTag = ['text/html', 'text/plain', 'text/x-template', 'text/template', 'text/ng-template'];
 
 /**
- * Returns HTML node corresponding to given position in the given root node
+ * Finds the HTML node within an HTML document at a given position
  * If position is inside a script tag of type template, then it will be parsed to find the inner HTML node as well
  */
-export function getHtmlNode(document: vscode.TextDocument, root: Node | undefined, position: vscode.Position, includeNodeBoundary: boolean): HtmlNode | undefined {
-	let currentNode = <HtmlNode>getNode(root, position, includeNodeBoundary);
+export function getHtmlFlatNode(documentText: string, root: FlatNode | undefined, offset: number, includeNodeBoundary: boolean): HtmlFlatNode | undefined {
+	const currentNode: HtmlFlatNode | undefined = <HtmlFlatNode | undefined>getFlatNode(root, offset, includeNodeBoundary);
 	if (!currentNode) { return; }
 
 	const isTemplateScript = currentNode.name === 'script' &&
 		(currentNode.attributes &&
 			currentNode.attributes.some(x => x.name.toString() === 'type'
-				&& allowedMimeTypesInScriptTag.indexOf(x.value.toString()) > -1));
-
-	if (isTemplateScript && currentNode.close &&
-		(position.isAfter(currentNode.open.end) && position.isBefore(currentNode.close.start))) {
-
-		let buffer = new DocumentStreamReader(document, currentNode.open.end, new vscode.Range(currentNode.open.end, currentNode.close.start));
-
-		try {
-			let scriptInnerNodes = parse(buffer);
-			currentNode = <HtmlNode>getNode(scriptInnerNodes, position, includeNodeBoundary) || currentNode;
-		} catch (e) { }
+				&& allowedMimeTypesInScriptTag.includes(x.value.toString())));
+	if (isTemplateScript
+		&& currentNode.open
+		&& offset > currentNode.open.end
+		&& (!currentNode.close || offset < currentNode.close.start)) {
+		// blank out the rest of the document and search for the node within
+		const beforePadding = ' '.repeat(currentNode.open.end);
+		const endToUse = currentNode.close ? currentNode.close.start : currentNode.end;
+		const scriptBodyText = beforePadding + documentText.substring(currentNode.open.end, endToUse);
+		const innerRoot: HtmlFlatNode = parse(scriptBodyText);
+		const scriptBodyNode = getHtmlFlatNode(scriptBodyText, innerRoot, offset, includeNodeBoundary);
+		if (scriptBodyNode) {
+			scriptBodyNode.parent = currentNode;
+			currentNode.children.push(scriptBodyNode);
+			return scriptBodyNode;
+		}
 	}
-
 	return currentNode;
 }
 
-/**
- * Returns inner range of an html node.
- */
-export function getInnerRange(currentNode: HtmlNode): vscode.Range | undefined {
-	if (!currentNode.close) {
-		return undefined;
-	}
-	return new vscode.Range(currentNode.open.end, currentNode.close.start);
+export function offsetRangeToSelection(document: vscode.TextDocument, start: number, end: number): vscode.Selection {
+	const startPos = document.positionAt(start);
+	const endPos = document.positionAt(end);
+	return new vscode.Selection(startPos, endPos);
+}
+
+export function offsetRangeToVsRange(document: vscode.TextDocument, start: number, end: number): vscode.Range {
+	const startPos = document.positionAt(start);
+	const endPos = document.positionAt(end);
+	return new vscode.Range(startPos, endPos);
 }
 
 /**
  * Returns the deepest non comment node under given node
  */
-export function getDeepestNode(node: Node | undefined): Node | undefined {
+export function getDeepestFlatNode(node: FlatNode | undefined): FlatNode | undefined {
 	if (!node || !node.children || node.children.length === 0 || !node.children.find(x => x.type !== 'comment')) {
 		return node;
 	}
 	for (let i = node.children.length - 1; i >= 0; i--) {
 		if (node.children[i].type !== 'comment') {
-			return getDeepestNode(node.children[i]);
+			return getDeepestFlatNode(node.children[i]);
 		}
 	}
 	return undefined;
@@ -467,7 +477,7 @@ export function findPrevWord(propertyValue: string, pos: number): [number | unde
 	return [newSelectionStart, newSelectionEnd];
 }
 
-export function getNodesInBetween(node1: Node, node2: Node): Node[] {
+export function getNodesInBetween(node1: FlatNode, node2: FlatNode): FlatNode[] {
 	// Same node
 	if (sameNodes(node1, node2)) {
 		return [node1];
@@ -476,41 +486,46 @@ export function getNodesInBetween(node1: Node, node2: Node): Node[] {
 	// Not siblings
 	if (!sameNodes(node1.parent, node2.parent)) {
 		// node2 is ancestor of node1
-		if (node2.start.isBefore(node1.start)) {
+		if (node2.start < node1.start) {
 			return [node2];
 		}
 
 		// node1 is ancestor of node2
-		if (node2.start.isBefore(node1.end)) {
+		if (node2.start < node1.end) {
 			return [node1];
 		}
 
 		// Get the highest ancestor of node1 that should be commented
-		while (node1.parent && node1.parent.end.isBefore(node2.start)) {
+		while (node1.parent && node1.parent.end < node2.start) {
 			node1 = node1.parent;
 		}
 
 		// Get the highest ancestor of node2 that should be commented
-		while (node2.parent && node2.parent.start.isAfter(node1.start)) {
+		while (node2.parent && node2.parent.start > node1.start) {
 			node2 = node2.parent;
 		}
 	}
 
-	const siblings: Node[] = [];
-	let currentNode = node1;
+	const siblings: FlatNode[] = [];
+	let currentNode: FlatNode | undefined = node1;
 	const position = node2.end;
-	while (currentNode && position.isAfter(currentNode.start)) {
+	while (currentNode && position > currentNode.start) {
 		siblings.push(currentNode);
 		currentNode = currentNode.nextSibling;
 	}
 	return siblings;
 }
 
-export function sameNodes(node1: Node, node2: Node): boolean {
+export function sameNodes(node1: FlatNode | undefined, node2: FlatNode | undefined): boolean {
+	// return true if they're both undefined
+	if (!node1 && !node2) {
+		return true;
+	}
+	// return false if only one of them is undefined
 	if (!node1 || !node2) {
 		return false;
 	}
-	return (<vscode.Position>node1.start).isEqual(node2.start) && (<vscode.Position>node1.end).isEqual(node2.end);
+	return node1.start === node2.start && node1.end === node2.end;
 }
 
 export function getEmmetConfiguration(syntax: string) {
@@ -546,7 +561,7 @@ export function getEmmetConfiguration(syntax: string) {
  * Itereates by each child, as well as nested child's children, in their order
  * and invokes `fn` for each. If `fn` function returns `false`, iteration stops
  */
-export function iterateCSSToken(token: CssToken, fn: (x: any) => any): boolean {
+export function iterateCSSToken(token: FlatCssToken, fn: (x: any) => any): boolean {
 	for (let i = 0, il = token.size; i < il; i++) {
 		if (fn(token.item(i)) === false || iterateCSSToken(token.item(i), fn) === false) {
 			return false;
@@ -558,51 +573,53 @@ export function iterateCSSToken(token: CssToken, fn: (x: any) => any): boolean {
 /**
  * Returns `name` CSS property from given `rule`
  */
-export function getCssPropertyFromRule(rule: Rule, name: string): Property | undefined {
-	return rule.children.find(node => node.type === 'property' && node.name === name) as Property;
+export function getCssPropertyFromRule(rule: FlatRule, name: string): FlatProperty | undefined {
+	return rule.children.find(node => node.type === 'property' && node.name === name) as FlatProperty;
 }
 
 /**
  * Returns css property under caret in given editor or `null` if such node cannot
  * be found
  */
-export function getCssPropertyFromDocument(editor: vscode.TextEditor, position: vscode.Position): Property | null {
-	const rootNode = parseDocument(editor.document);
-	const node = getNode(rootNode, position, true);
+export function getCssPropertyFromDocument(editor: vscode.TextEditor, position: vscode.Position): FlatProperty | null {
+	const document = editor.document;
+	const rootNode = getRootNode(document, true);
+	const offset = document.offsetAt(position);
+	const node = getFlatNode(rootNode, offset, true);
 
 	if (isStyleSheet(editor.document.languageId)) {
-		return node && node.type === 'property' ? <Property>node : null;
+		return node && node.type === 'property' ? <FlatProperty>node : null;
 	}
 
-	let htmlNode = <HtmlNode>node;
+	const htmlNode = <HtmlFlatNode>node;
 	if (htmlNode
 		&& htmlNode.name === 'style'
-		&& htmlNode.open.end.isBefore(position)
-		&& htmlNode.close.start.isAfter(position)) {
-		let buffer = new DocumentStreamReader(editor.document, htmlNode.start, new vscode.Range(htmlNode.start, htmlNode.end));
-		let rootNode = parseStylesheet(buffer);
-		const node = getNode(rootNode, position, true);
-		return (node && node.type === 'property') ? <Property>node : null;
+		&& htmlNode.open && htmlNode.close
+		&& htmlNode.open.end < offset
+		&& htmlNode.close.start > offset) {
+		const buffer = ' '.repeat(htmlNode.start) +
+			document.getText().substring(htmlNode.start, htmlNode.end);
+		const innerRootNode = parseStylesheet(buffer);
+		const innerNode = getFlatNode(innerRootNode, offset, true);
+		return (innerNode && innerNode.type === 'property') ? <FlatProperty>innerNode : null;
 	}
 
 	return null;
 }
 
 
-export function getEmbeddedCssNodeIfAny(document: vscode.TextDocument, currentNode: Node | null, position: vscode.Position): Node | undefined {
+export function getEmbeddedCssNodeIfAny(document: vscode.TextDocument, currentNode: FlatNode | undefined, position: vscode.Position): FlatNode | undefined {
 	if (!currentNode) {
 		return;
 	}
-	const currentHtmlNode = <HtmlNode>currentNode;
-	if (currentHtmlNode && currentHtmlNode.close) {
-		const innerRange = getInnerRange(currentHtmlNode);
-		if (innerRange && innerRange.contains(position)) {
+	const currentHtmlNode = <HtmlFlatNode>currentNode;
+	if (currentHtmlNode && currentHtmlNode.open && currentHtmlNode.close) {
+		const offset = document.offsetAt(position);
+		if (currentHtmlNode.open.end <= offset && offset <= currentHtmlNode.close.start) {
 			if (currentHtmlNode.name === 'style'
-				&& currentHtmlNode.open.end.isBefore(position)
-				&& currentHtmlNode.close.start.isAfter(position)
-
-			) {
-				let buffer = new DocumentStreamReader(document, currentHtmlNode.open.end, new vscode.Range(currentHtmlNode.open.end, currentHtmlNode.close.start));
+				&& currentHtmlNode.open.end < offset
+				&& currentHtmlNode.close.start > offset) {
+				const buffer = ' '.repeat(currentHtmlNode.open.end) + document.getText().substring(currentHtmlNode.open.end, currentHtmlNode.close.start);
 				return parseStylesheet(buffer);
 			}
 		}
@@ -610,34 +627,17 @@ export function getEmbeddedCssNodeIfAny(document: vscode.TextDocument, currentNo
 	return;
 }
 
-export function isStyleAttribute(currentNode: Node | null, position: vscode.Position): boolean {
+export function isStyleAttribute(currentNode: FlatNode | undefined, offset: number): boolean {
 	if (!currentNode) {
 		return false;
 	}
-	const currentHtmlNode = <HtmlNode>currentNode;
+	const currentHtmlNode = <HtmlFlatNode>currentNode;
 	const index = (currentHtmlNode.attributes || []).findIndex(x => x.name.toString() === 'style');
 	if (index === -1) {
 		return false;
 	}
 	const styleAttribute = currentHtmlNode.attributes[index];
-	return position.isAfterOrEqual(styleAttribute.value.start) && position.isBeforeOrEqual(styleAttribute.value.end);
-}
-
-
-export function trimQuotes(s: string) {
-	if (s.length <= 1) {
-		return s.replace(/['"]/, '');
-	}
-
-	if (s[0] === `'` || s[0] === `"`) {
-		s = s.slice(1);
-	}
-
-	if (s[s.length - 1] === `'` || s[s.length - 1] === `"`) {
-		s = s.slice(0, -1);
-	}
-
-	return s;
+	return offset >= styleAttribute.value.start && offset <= styleAttribute.value.end;
 }
 
 export function isNumber(obj: any): obj is number {
@@ -653,3 +653,13 @@ export function getPathBaseName(path: string): string {
 	const pathAfterBackslashSplit = pathAfterSlashSplit ? pathAfterSlashSplit.split('\\').pop() : '';
 	return pathAfterBackslashSplit ?? '';
 }
+
+export function getSyntaxes() {
+	/**
+	 * List of all known syntaxes, from emmetio/emmet
+	 */
+	return {
+		markup: ['html', 'xml', 'xsl', 'jsx', 'js', 'pug', 'slim', 'haml'],
+		stylesheet: ['css', 'sass', 'scss', 'less', 'sss', 'stylus']
+	};
+}
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index d956865f4..742443d36 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@emmetio/abbreviation@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.0.2.tgz#e26d55d78c00cdeb2ef983e902c7ad55ed0b648d"
-  integrity sha512-kpWg6jyR1YEj/yWceruvDj/fe1BhXqA0tGH3Z2ZiPFo8SDMH4JHg6FChqon5x0CCfLf4zVswrQa0gcZ4XtdRBQ==
+"@emmetio/abbreviation@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.2.0.tgz#9f8dedbdb00e3136d6d37c6415375c82c0bb477f"
+  integrity sha512-NPGVUmnr7cLj4i6MKS4c8NjuoIIJROrruJl/8nXsp2MdbDRHvtfq25foySvv/NbfqTQm+P9JzVLDD9JxGIpvkQ==
   dependencies:
     "@emmetio/scanner" "^1.0.0"
 
@@ -53,2400 +53,49 @@
   resolved "https://registry.yarnpkg.com/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz#46cffea119a0a003312a21c2d9b5628cb5fcd442"
   integrity sha1-Rs/+oRmgoAMxKiHC2bVijLX81EI=
 
-"@types/node@^12.11.7":
-  version "12.19.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz#cdfbb62e26c7435ed9aab9c941393cc3598e9b46"
-  integrity sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w==
+"@types/node@^12.19.9":
+  version "12.19.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.12.tgz#04793c2afa4ce833a9972e4c476432e30f9df47b"
+  integrity sha512-UwfL2uIU9arX/+/PRcIkT08/iBadGN2z6ExOROA2Dh5mAuWTBj6iJbQX4nekiV5H8cTrEG569LeX+HRco9Cbxw==
 
-ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^0.2.0, ansi-regex@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
-  integrity sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-styles@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
-  integrity sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
-  integrity sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=
-  dependencies:
-    ansi-styles "^1.1.0"
-    escape-string-regexp "^1.0.0"
-    has-ansi "^0.1.0"
-    strip-ansi "^0.3.0"
-    supports-color "^0.2.0"
-
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1, clone-stats@~0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
-
-commander@2.3.0:
+"emmet@https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a":
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
-
-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=
-
-convert-source-map@^1.1.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  resolved "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
   dependencies:
-    safe-buffer "~5.1.1"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-dateformat@^1.0.7-1.2.3:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
-  integrity sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.3.0"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
-  dependencies:
-    ms "0.7.1"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
-  dependencies:
-    ms "2.1.2"
-
-decamelize@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-deep-assign@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
-  integrity sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=
-  dependencies:
-    is-obj "^1.0.0"
-
-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=
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@^0.1.1, duplexer@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.2.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-emmet@^2.1.5:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.1.6.tgz#425e0bcef6bf6e5eb758610f3e8d49f86a6fe877"
-  integrity sha512-kfJMlze+k8jpX5CUx7xPYS83DxRNXuh8rQ98rQKnnf+wfo/KD+BG6pmpnEp5a7a1DWM9xmllKuOPfC7MeRmepQ==
-  dependencies:
-    "@emmetio/abbreviation" "^2.0.2"
+    "@emmetio/abbreviation" "^2.2.0"
     "@emmetio/css-abbreviation" "^2.1.2"
 
-end-of-stream@^1.0.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-error-ex@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
-
-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-event-stream@3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-event-stream@^3.3.1:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.5.tgz#e5dd8989543630d94c6cf4d657120341fa31636b"
-  integrity sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==
-  dependencies:
-    duplexer "^0.1.1"
-    from "^0.1.7"
-    map-stream "0.0.7"
-    pause-stream "^0.0.11"
-    split "^1.0.1"
-    stream-combiner "^0.2.2"
-    through "^2.3.8"
-
-event-stream@~3.1.5:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.1.7.tgz#b4c540012d0fe1498420f3d8946008db6393c37a"
-  integrity sha1-tMVAAS0P4UmEIPPYlGAI22OTw3o=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.2"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fancy-log@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-from@^0.1.7, from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fstream@~0.1.28:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988"
-  integrity sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=
-  dependencies:
-    graceful-fs "~3.0.2"
-    inherits "~2.0.0"
-    mkdirp "0.5"
-    rimraf "2"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
-glob@^5.0.15, glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.2:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-graceful-fs@~3.0.2:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef"
-  integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==
-  dependencies:
-    natives "^1.1.3"
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-gulp-chmod@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-1.3.0.tgz#8bb6e8c11895dcbf9b42520c874347a5022bcb0d"
-  integrity sha1-i7bowRiV3L+bQlIMh0NHpQIryw0=
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
-gulp-filter@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-4.0.0.tgz#395f58a256c559cdb9e0d157f1caaf5248a38dcb"
-  integrity sha1-OV9YolbFWc254NFX8cqvUkijjcs=
-  dependencies:
-    gulp-util "^3.0.6"
-    multimatch "^2.0.0"
-    streamfilter "^1.0.5"
-
-gulp-gunzip@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
-  integrity sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
-gulp-remote-src@^0.4.0:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.4.tgz#4a4d18fac0ffedde94a7855953de90db00a1d1b1"
-  integrity sha512-mo7lGgZmNXyTbcUzfjSnUVkx1pnqqiwv/pPaIrYdTO77hq0WNTxXLAzQdoYOnyJ0mfVLNmNl9AGqWLiAzTPMMA==
-  dependencies:
-    event-stream "3.3.4"
-    node.extend "~1.1.2"
-    request "^2.88.0"
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-symdest@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.1.tgz#b0a6df3d43a0537165946ab8e38c1b7080a66fac"
-  integrity sha512-UHd3MokfIN7SrFdsbV5uZTwzBpL0ZSTu7iq98fuDqBGZ0dlHxgbQBJwfd6qjCW83snkQ3Hz9IY4sMRMz2iTq7w==
-  dependencies:
-    event-stream "3.3.4"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^2.4.3"
-
-gulp-untar@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.4.tgz#635cc7d67d3d48aec0dbc69822623fc7c33f7d37"
-  integrity sha1-Y1zH1n09SK7A28aYImI/x8M/fTc=
-  dependencies:
-    event-stream "~3.1.5"
-    gulp-util "~2.2.14"
-    streamifier "~0.1.0"
-    tar "~0.1.19"
-    through2 "~0.4.1"
-
-gulp-util@^3.0.6:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-util@~2.2.14:
-  version "2.2.20"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
-  integrity sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=
-  dependencies:
-    chalk "^0.5.0"
-    dateformat "^1.0.7-1.2.3"
-    lodash._reinterpolate "^2.4.1"
-    lodash.template "^2.4.1"
-    minimist "^0.2.0"
-    multipipe "^0.1.0"
-    through2 "^0.5.0"
-    vinyl "^0.2.1"
-
-gulp-vinyl-zip@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
-  integrity sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^3.0.10"
-    through2 "^0.6.3"
-    vinyl "^0.4.6"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
-  integrity sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=
-  dependencies:
-    ansi-regex "^0.2.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 image-size@^0.5.2:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-buffer@^1.1.5, is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-core-module@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
-  dependencies:
-    has "^1.0.3"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79"
-  integrity sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
 jsonc-parser@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
   integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+vscode-emmet-helper@2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.2.4.tgz#8ab86d2b7fe9e6270b4c77c9fd8d1eb8f3f4c401"
+  integrity sha512-1N6bMzP1ZzkDGzamvsKxQ/lOmBc4+OQdj0dA2C9A5PSeYV9gh5xbJ061sm+VyFHOGZE+VyUQq5m/WFmFsLbKnA==
   dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._escapehtmlchar@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
-  integrity sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=
-  dependencies:
-    lodash._htmlescapes "~2.4.1"
-
-lodash._escapestringchar@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
-  integrity sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._htmlescapes@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
-  integrity sha1-MtFL8IRLbeb4tioFG09nwii2JMs=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._isnative@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
-  integrity sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=
-
-lodash._objecttypes@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
-  integrity sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
-  integrity sha1-TxInqlqHEfxjL1sHofRgequLMiI=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._reunescapedhtml@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
-  integrity sha1-dHxPxAED6zu4oJduVx96JlnpO6c=
-  dependencies:
-    lodash._htmlescapes "~2.4.1"
-    lodash.keys "~2.4.1"
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash._shimkeys@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
-  integrity sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=
-  dependencies:
-    lodash._objecttypes "~2.4.1"
-
-lodash.defaults@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
-  integrity sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=
-  dependencies:
-    lodash._objecttypes "~2.4.1"
-    lodash.keys "~2.4.1"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.escape@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
-  integrity sha1-LOEsXghNsKV92l5dHu659dF1o7Q=
-  dependencies:
-    lodash._escapehtmlchar "~2.4.1"
-    lodash._reunescapedhtml "~2.4.1"
-    lodash.keys "~2.4.1"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.isobject@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
-  integrity sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=
-  dependencies:
-    lodash._objecttypes "~2.4.1"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.keys@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
-  integrity sha1-SN6kbfj/djKxDXBrissmWR4rNyc=
-  dependencies:
-    lodash._isnative "~2.4.1"
-    lodash._shimkeys "~2.4.1"
-    lodash.isobject "~2.4.1"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
-  integrity sha1-nmEQB+32KRKal0qzxIuBez4c8g0=
-  dependencies:
-    lodash._escapestringchar "~2.4.1"
-    lodash._reinterpolate "~2.4.1"
-    lodash.defaults "~2.4.1"
-    lodash.escape "~2.4.1"
-    lodash.keys "~2.4.1"
-    lodash.templatesettings "~2.4.1"
-    lodash.values "~2.4.1"
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash.templatesettings@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
-  integrity sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=
-  dependencies:
-    lodash._reinterpolate "~2.4.1"
-    lodash.escape "~2.4.1"
-
-lodash.values@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
-  integrity sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=
-  dependencies:
-    lodash.keys "~2.4.1"
-
-lodash@^4.17.15:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-md5@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
-meow@^3.3.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
-  dependencies:
-    mime-db "1.44.0"
-
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
-  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
-
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
-mkdirp@0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz#c73486bed5519e1d59c9ce39ac7a9792600e5676"
-  integrity sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==
-  dependencies:
-    debug "^4.1.1"
-    lodash "^4.17.15"
-
-mocha@^2.3.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
-  dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.0, multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-natives@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
-  integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==
-
-node.extend@~1.1.2:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.8.tgz#0aab3e63789f4e6d68b42bc00073ad1881243cf0"
-  integrity sha512-L/dvEBwyg3UowwqOUTyDsGBU6kjBQOpOhshio9V3i3BMPv5YUb9+mWNN8MK0IbWqT0AqaTSONZf0aTuMMahWgA==
-  dependencies:
-    has "^1.0.3"
-    is "^3.2.1"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0, object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pause-stream@0.0.11, pause-stream@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-queue@^3.0.10, queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-request@^2.67.0, request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-resolve@^1.10.0:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
-  dependencies:
-    is-core-module "^2.0.0"
-    path-parse "^1.0.6"
-
-rimraf@2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-"semver@2 || 3 || 4 || 5", semver@^5.1.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
-signal-exit@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-source-map-support@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
-  integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
-  dependencies:
-    source-map "0.1.32"
-
-source-map@0.1.32:
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
-  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
-  dependencies:
-    amdefine ">=0.0.4"
-
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
-
-split@0.2:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.2.10.tgz#67097c601d697ce1368f418f06cd201cf0521a57"
-  integrity sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=
-  dependencies:
-    through "2"
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-split@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
-  dependencies:
-    through "2"
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
-stream-combiner@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-streamfilter@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
-  integrity sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
-  integrity sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=
-  dependencies:
-    ansi-regex "^0.2.1"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
-
-supports-color@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
-  integrity sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-tar@~0.1.19:
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-0.1.20.tgz#42940bae5b5f22c74483699126f9f3f27449cb13"
-  integrity sha1-QpQLrltfIsdEg2mRJvnz8nRJyxM=
-  dependencies:
-    block-stream "*"
-    fstream "~0.1.28"
-    inherits "2"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
-  integrity sha1-390BLrnHAOIyP9M084rGIqs3Lac=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~3.0.0"
-
-through2@^0.6.0, through2@^0.6.3, through2@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through2@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
-
-through@2, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
-  dependencies:
-    punycode "^2.1.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vinyl-fs@^2.0.0, vinyl-fs@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl-source-stream@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz#62b53a135610a896e98ca96bee3a87f008a8e780"
-  integrity sha1-YrU6E1YQqJbpjKlr7jqH8Aio54A=
-  dependencies:
-    through2 "^2.0.3"
-    vinyl "^0.4.3"
-
-vinyl@^0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
-  integrity sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=
-  dependencies:
-    clone-stats "~0.0.1"
-
-vinyl@^0.4.3, vinyl@^0.4.6, vinyl@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode-emmet-helper@~2.0.0:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.0.9.tgz#16244c087cba4e379116f268384bb644649db6ad"
-  integrity sha512-S6RjnR9gUicl8LsYnQAMNqqOxolud9gcj+NpPyEnxfxp1YIBuC9oetj6l6N9VMZBWu6tL77wmf+/EJsRx1PDPA==
-  dependencies:
-    emmet "^2.1.5"
+    emmet "https://github.com/rzhao271/emmet.git#1b2df677d8925ef5ea6da9df8845968403979a0a"
     jsonc-parser "^2.3.0"
     vscode-languageserver-textdocument "^1.0.1"
     vscode-languageserver-types "^3.15.1"
     vscode-nls "^5.0.0"
     vscode-uri "^2.1.2"
 
-vscode-html-languageservice@^3.0.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.4.tgz#0316dff77ee38dc176f40560cbf55e4f64f4f433"
-  integrity sha512-3M+bm+hNvwQcScVe5/ok9BXvctOiGJ4nlOkkFf+WKSDrYNkarZ/RByKOa1/iylbvZxJUPzbeziembWPe/dMvhw==
-  dependencies:
-    vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "3.16.0-next.2"
-    vscode-nls "^5.0.0"
-    vscode-uri "^2.1.2"
-
 vscode-languageserver-textdocument@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
   integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
-
 vscode-languageserver-types@^3.15.1:
-  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
-  integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
 vscode-nls@^5.0.0:
   version "5.0.0"
@@ -2457,64 +106,3 @@ vscode-uri@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
   integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
-
-vscode@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.0.1.tgz#3d161200615fe2af1d92ddc650751159411a513b"
-  integrity sha1-PRYSAGFf4q8dkt3GUHURWUEaUTs=
-  dependencies:
-    glob "^5.0.15"
-    gulp-chmod "^1.3.0"
-    gulp-filter "^4.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.0"
-    gulp-symdest "^1.0.0"
-    gulp-untar "0.0.4"
-    gulp-vinyl-zip "^1.1.2"
-    mocha "^2.3.3"
-    request "^2.67.0"
-    semver "^5.1.0"
-    source-map-support "^0.3.2"
-    vinyl-source-stream "^1.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
-  dependencies:
-    object-keys "~0.4.0"
-
-xtend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
-  integrity sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=
-
-yauzl@^2.2.1:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yazl@^2.2.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
-  dependencies:
-    buffer-crc32 "~0.2.3"
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index bdd02d870..14c98dc5c 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -59,6 +59,6 @@
 	},
 	"devDependencies": {
 		"@types/markdown-it": "0.0.2",
-		"@types/node": "^12.11.7"
+		"@types/node": "^12.19.9"
 	}
 }
diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock
index 50adf31c0..0cc523547 100644
--- a/extensions/extension-editing/yarn.lock
+++ b/extensions/extension-editing/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
   integrity sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/node@^6.0.46":
   version "6.0.78"
diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json
index d1f7e2324..b898a3866 100644
--- a/extensions/fsharp/cgmanifest.json
+++ b/extensions/fsharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "ionide/ionide-fsgrammar",
 					"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
-					"commitHash": "af037b23ca4c61b02799957a61cbd05b44355caf"
+					"commitHash": "fc4cac6d9bc1787f54ce48bbc77bcbb1de8160ff"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/fsharp/package.json b/extensions/fsharp/package.json
index 4341fdc30..fb67e704c 100644
--- a/extensions/fsharp/package.json
+++ b/extensions/fsharp/package.json
@@ -7,7 +7,7 @@
 	"license": "MIT",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammars/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index 419feb7f7..ca06a19c2 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/ionide/ionide-fsgrammar/blob/master/grammar/fsharp.json",
+		"This file has been converted from https://github.com/ionide/ionide-fsgrammar/blob/master/grammars/fsharp.json",
 		"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/ionide/ionide-fsgrammar/commit/af037b23ca4c61b02799957a61cbd05b44355caf",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/fc4cac6d9bc1787f54ce48bbc77bcbb1de8160ff",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@@ -560,6 +560,11 @@
 						}
 					},
 					"patterns": [
+						{
+							"comments": "Capture // when inside of (* *) like that the rule which capture comments starting by // is not trigger. See https://github.com/ionide/ionide-fsgrammar/issues/155",
+							"name": "fast-capture.comment.line.double-slash.fsharp",
+							"match": "//"
+						},
 						{
 							"include": "#comments"
 						}
diff --git a/extensions/git-ui/package.json b/extensions/git-ui/package.json
index b08942888..1b20849b1 100644
--- a/extensions/git-ui/package.json
+++ b/extensions/git-ui/package.json
@@ -3,6 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
+  "license": "MIT",
   "version": "1.0.0",
   "engines": {
     "vscode": "^1.5.0"
@@ -25,6 +26,6 @@
     "watch": "gulp watch-extension:git-ui"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/git-ui/yarn.lock b/extensions/git-ui/yarn.lock
index 40784952b..e03bdd573 100644
--- a/extensions/git-ui/yarn.lock
+++ b/extensions/git-ui/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
diff --git a/extensions/git/package.json b/extensions/git/package.json
index bea5f96a6..0aa7b2cd4 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -24,7 +24,7 @@
     "watch": "gulp watch-extension:git",
     "update-emoji": "node ./build/update-emoji.js",
     "update-grammar": "node ./build/update-grammars.js",
-    "test": "mocha"
+    "test": "node ../../node_modules/mocha/bin/mocha"
   },
   "contributes": {
     "commands": [
@@ -71,6 +71,11 @@
         "category": "Git",
         "icon": "$(compare-changes)"
       },
+      {
+        "command": "git.openAllChanges",
+        "title": "%command.openAllChanges%",
+        "category": "Git"
+      },
       {
         "command": "git.openFile",
         "title": "%command.openFile%",
@@ -1287,6 +1292,11 @@
           "group": "navigation",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
         },
+        {
+          "command": "git.openFile",
+          "group": "navigation",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInNotebookTextDiffEditor && resourceScheme =~ /^git$|^file$/"
+        },
         {
           "command": "git.openChange",
           "group": "navigation",
@@ -1644,7 +1654,17 @@
           "default": true
         },
         "git.autofetch": {
-          "type": "boolean",
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "string",
+              "enum": [
+                "all"
+              ]
+            }
+          ],
           "scope": "resource",
           "description": "%config.autofetch%",
           "default": false,
@@ -1732,6 +1752,11 @@
           "description": "%config.ignoreLimitWarning%",
           "default": false
         },
+        "git.ignoreRebaseWarning": {
+          "type": "boolean",
+          "description": "%config.ignoreRebaseWarning%",
+          "default": false
+        },
         "git.defaultCloneDirectory": {
           "type": [
             "string",
@@ -2040,6 +2065,11 @@
           "description": "%config.untrackedChanges%",
           "scope": "resource"
         },
+        "git.requireGitUserConfig": {
+          "type": "boolean",
+          "description": "%config.requireGitUserConfig%",
+          "default": true
+        },
         "git.showCommitInput": {
           "type": "boolean",
           "scope": "resource",
@@ -2309,12 +2339,8 @@
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
-    "@types/mocha": "2.2.43",
-    "@types/node": "^12.12.31",
-    "@types/which": "^1.0.28",
-    "mocha": "^3.2.0",
-    "mocha-junit-reporter": "^1.23.3",
-    "mocha-multi-reporters": "^1.1.7",
-    "vscode": "^1.1.36"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9",
+    "@types/which": "^1.0.28"
   }
 }
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 6158a7e0c..f76c42dbb 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -9,6 +9,7 @@
 	"command.close": "Close Repository",
 	"command.refresh": "Refresh",
 	"command.openChange": "Open Changes",
+	"command.openAllChanges": "Open All Changes",
 	"command.openFile": "Open File",
 	"command.openHEADFile": "Open File (HEAD)",
 	"command.stage": "Stage Changes",
@@ -97,7 +98,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 enabled, commits will automatically be fetched from the default remote of the current Git repository.",
+	"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.",
@@ -114,6 +115,7 @@
 	"config.ignoreMissingGitWarning": "Ignores the warning when Git is missing.",
 	"config.ignoreWindowsGit27Warning": "Ignores the warning when Git 2.25 - 2.26 is installed on Windows.",
 	"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository.",
+	"config.ignoreRebaseWarning": "Ignores the warning when it looks like the branch might have been rebased when pulling.",
 	"config.defaultCloneDirectory": "The default location to clone a git repository.",
 	"config.enableSmartCommit": "Commit all changes when there are no staged changes.",
 	"config.smartCommitChanges": "Control which changes are automatically staged by Smart Commit.",
@@ -173,6 +175,7 @@
 	"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.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",
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index 0a309c6f9..c5f7cd924 100644
--- a/extensions/git/src/api/api1.ts
+++ b/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, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, RemoteSourceProvider, CredentialsProvider, BranchQuery, PushErrorHandler } 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 } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands } from 'vscode';
 import { mapEvent } from '../util';
 import { toGitUri } from '../uri';
@@ -201,8 +201,8 @@ export class ApiRepository implements Repository {
 		return this._repository.pull(undefined, unshallow);
 	}
 
-	push(remoteName?: string, branchName?: string, setUpstream: boolean = false): Promise<void> {
-		return this._repository.pushTo(remoteName, branchName, setUpstream);
+	push(remoteName?: string, branchName?: string, setUpstream: boolean = false, force?: ForcePushMode): Promise<void> {
+		return this._repository.pushTo(remoteName, branchName, setUpstream, force);
 	}
 
 	blame(path: string): Promise<string> {
@@ -237,6 +237,10 @@ export class ApiImpl implements API {
 		return this._model.onDidChangeState;
 	}
 
+	get onDidPublish(): Event<PublishEvent> {
+		return this._model.onDidPublish;
+	}
+
 	get onDidOpenRepository(): Event<Repository> {
 		return mapEvent(this._model.onDidOpenRepository, r => new ApiRepository(r));
 	}
@@ -265,6 +269,11 @@ export class ApiImpl implements API {
 		return this.getRepository(root) || null;
 	}
 
+	async openRepository(root: Uri): Promise<Repository | null> {
+		await this._model.openRepository(root.fsPath);
+		return this.getRepository(root) || null;
+	}
+
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable {
 		return this._model.registerRemoteSourceProvider(provider);
 	}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index b9a09632b..43832f186 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -14,6 +14,11 @@ export interface InputBox {
 	value: string;
 }
 
+export const enum ForcePushMode {
+	Force,
+	ForceWithLease
+}
+
 export const enum RefType {
 	Head,
 	RemoteHead,
@@ -131,6 +136,7 @@ export interface CommitOptions {
 	signCommit?: boolean;
 	empty?: boolean;
 	noVerify?: boolean;
+	requireUserConfig?: boolean;
 }
 
 export interface BranchQuery {
@@ -193,7 +199,7 @@ export interface Repository {
 
 	fetch(remote?: string, ref?: string, depth?: number): Promise<void>;
 	pull(unshallow?: boolean): Promise<void>;
-	push(remoteName?: string, branchName?: string, setUpstream?: boolean): Promise<void>;
+	push(remoteName?: string, branchName?: string, setUpstream?: boolean, force?: ForcePushMode): Promise<void>;
 
 	blame(path: string): Promise<string>;
 	log(options?: LogOptions): Promise<Commit[]>;
@@ -231,9 +237,15 @@ export interface PushErrorHandler {
 
 export type APIState = 'uninitialized' | 'initialized';
 
+export interface PublishEvent {
+	repository: Repository;
+	branch?: string;
+}
+
 export interface API {
 	readonly state: APIState;
 	readonly onDidChangeState: Event<APIState>;
+	readonly onDidPublish: Event<PublishEvent>;
 	readonly git: Git;
 	readonly repositories: Repository[];
 	readonly onDidOpenRepository: Event<Repository>;
@@ -242,6 +254,7 @@ export interface API {
 	toGitUri(uri: Uri, ref: string): Uri;
 	getRepository(uri: Uri): Repository | null;
 	init(root: Uri): Promise<Repository | null>;
+	openRepository(root: Uri): Promise<Repository | null>
 
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable;
 	registerCredentialsProvider(provider: CredentialsProvider): Disposable;
diff --git a/extensions/git/src/askpass-main.ts b/extensions/git/src/askpass-main.ts
index 685fc08ef..c15dd583f 100644
--- a/extensions/git/src/askpass-main.ts
+++ b/extensions/git/src/askpass-main.ts
@@ -30,7 +30,7 @@ function main(argv: string[]): void {
 
 	const output = process.env['VSCODE_GIT_ASKPASS_PIPE'] as string;
 	const request = argv[2];
-	const host = argv[4].substring(1, argv[4].length - 2);
+	const host = argv[4].replace(/^["']+|["']+$/g, '');
 	const ipcClient = new IPCClient('askpass');
 
 	ipcClient.call({ request, host }).then(res => {
diff --git a/extensions/git/src/autofetch.ts b/extensions/git/src/autofetch.ts
index d9e436b9f..5a45a522d 100644
--- a/extensions/git/src/autofetch.ts
+++ b/extensions/git/src/autofetch.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget, Uri } from 'vscode';
+import { workspace, Disposable, EventEmitter, Memento, window, MessageItem, ConfigurationTarget, Uri, ConfigurationChangeEvent } from 'vscode';
 import { Repository, Operation } from './repository';
 import { eventToPromise, filterEvent, onceEvent } from './util';
 import * as nls from 'vscode-nls';
@@ -23,6 +23,7 @@ export class AutoFetcher {
 	private onDidChange = this._onDidChange.event;
 
 	private _enabled: boolean = false;
+	private _fetchAll: boolean = false;
 	get enabled(): boolean { return this._enabled; }
 	set enabled(enabled: boolean) { this._enabled = enabled; this._onDidChange.fire(enabled); }
 
@@ -67,13 +68,26 @@ export class AutoFetcher {
 		this.globalState.update(AutoFetcher.DidInformUser, true);
 	}
 
-	private onConfiguration(): void {
-		const gitConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
+	private onConfiguration(e?: ConfigurationChangeEvent): void {
+		if (e !== undefined && !e.affectsConfiguration('git.autofetch')) {
+			return;
+		}
 
-		if (gitConfig.get<boolean>('autofetch') === false) {
-			this.disable();
-		} else {
-			this.enable();
+		const gitConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
+		switch (gitConfig.get<boolean | 'all'>('autofetch')) {
+			case true:
+				this._fetchAll = false;
+				this.enable();
+				break;
+			case 'all':
+				this._fetchAll = true;
+				this.enable();
+				break;
+			case false:
+			default:
+				this._fetchAll = false;
+				this.disable();
+				break;
 		}
 	}
 
@@ -99,7 +113,11 @@ export class AutoFetcher {
 			}
 
 			try {
-				await this.repository.fetchDefault({ silent: true });
+				if (this._fetchAll) {
+					await this.repository.fetchAll();
+				} else {
+					await this.repository.fetchDefault({ silent: true });
+				}
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) {
 					this.disable();
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 2c24d9095..ac9249871 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -8,8 +8,8 @@ import * as path from 'path';
 import { commands, Disposable, LineChange, MessageOptions, OutputChannel, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider } from 'vscode';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import * as nls from 'vscode-nls';
-import { Branch, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider } from './api/git';
-import { ForcePushMode, Git, Stash } from './git';
+import { Branch, ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourceProvider } from './api/git';
+import { Git, Stash } from './git';
 import { Model } from './model';
 import { Repository, Resource, ResourceGroupType } from './repository';
 import { applyLineChanges, getModifiedRange, intersectDiffWithRange, invertLineChange, toLineRanges } from './staging';
@@ -277,6 +277,12 @@ interface PushOptions {
 	pushType: PushType;
 	forcePush?: boolean;
 	silent?: boolean;
+
+	pushTo?: {
+		remote?: string;
+		refspec?: string;
+		setUpstream?: boolean;
+	}
 }
 
 class CommandErrorOutputTextDocumentContentProvider implements TextDocumentContentProvider {
@@ -366,6 +372,20 @@ export class CommandCenter {
 		await resource.open();
 	}
 
+	@command('git.openAllChanges', { repository: true })
+	async openChanges(repository: Repository): Promise<void> {
+		[
+			...repository.workingTreeGroup.resourceStates,
+			...repository.untrackedGroup.resourceStates,
+		].forEach(resource => {
+			commands.executeCommand(
+				'vscode.open',
+				resource.resourceUri,
+				{ preview: false, }
+			);
+		});
+	}
+
 	async cloneRepository(url?: string, parentPath?: string, options: { recursive?: boolean } = {}): Promise<void> {
 		if (!url || typeof url !== 'string') {
 			url = await pickRemoteSource(this.model, {
@@ -500,12 +520,12 @@ export class CommandCenter {
 
 	@command('git.clone')
 	async clone(url?: string, parentPath?: string): Promise<void> {
-		this.cloneRepository(url, parentPath);
+		await this.cloneRepository(url, parentPath);
 	}
 
 	@command('git.cloneRecursive')
 	async cloneRecursive(url?: string, parentPath?: string): Promise<void> {
-		this.cloneRepository(url, parentPath, { recursive: true });
+		await this.cloneRepository(url, parentPath, { recursive: true });
 	}
 
 	@command('git.init')
@@ -1323,8 +1343,8 @@ export class CommandCenter {
 
 		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
 		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
-		const noStagedChanges = repository.indexGroup.resourceStates.length === 0;
-		const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
+		let noStagedChanges = repository.indexGroup.resourceStates.length === 0;
+		let noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
 
 		if (promptToSaveFilesBeforeCommit !== 'never') {
 			let documents = workspace.textDocuments
@@ -1346,6 +1366,9 @@ export class CommandCenter {
 				if (pick === saveAndCommit) {
 					await Promise.all(documents.map(d => d.save()));
 					await repository.add(documents.map(d => d.uri));
+
+					noStagedChanges = repository.indexGroup.resourceStates.length === 0;
+					noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
 				} else if (pick !== commit) {
 					return false; // do not commit on cancel
 				}
@@ -2112,23 +2135,27 @@ export class CommandCenter {
 			}
 		} else {
 			const branchName = repository.HEAD.name;
-			const addRemote = new AddRemoteItem(this);
-			const picks = [...remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
-			const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
-			const choice = await window.showQuickPick(picks, { placeHolder });
+			if (!pushOptions.pushTo?.remote) {
+				const addRemote = new AddRemoteItem(this);
+				const picks = [...remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl })), addRemote];
+				const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
+				const choice = await window.showQuickPick(picks, { placeHolder });
 
-			if (!choice) {
-				return;
-			}
+				if (!choice) {
+					return;
+				}
 
-			if (choice === addRemote) {
-				const newRemote = await this.addRemote(repository);
+				if (choice === addRemote) {
+					const newRemote = await this.addRemote(repository);
 
-				if (newRemote) {
-					await repository.pushTo(newRemote, branchName, undefined, forcePushMode);
+					if (newRemote) {
+						await repository.pushTo(newRemote, branchName, undefined, forcePushMode);
+					}
+				} else {
+					await repository.pushTo(choice.label, branchName, undefined, forcePushMode);
 				}
 			} else {
-				await repository.pushTo(choice.label, branchName, undefined, forcePushMode);
+				await repository.pushTo(pushOptions.pushTo.remote, pushOptions.pushTo.refspec || branchName, pushOptions.pushTo.setUpstream, forcePushMode);
 			}
 		}
 	}
@@ -2169,13 +2196,13 @@ export class CommandCenter {
 	}
 
 	@command('git.pushTo', { repository: true })
-	async pushTo(repository: Repository): Promise<void> {
-		await this._push(repository, { pushType: PushType.PushTo });
+	async pushTo(repository: Repository, remote?: string, refspec?: string, setUpstream?: boolean): Promise<void> {
+		await this._push(repository, { pushType: PushType.PushTo, pushTo: { remote: remote, refspec: refspec, setUpstream: setUpstream } });
 	}
 
 	@command('git.pushToForce', { repository: true })
-	async pushToForce(repository: Repository): Promise<void> {
-		await this._push(repository, { pushType: PushType.PushTo, forcePush: true });
+	async pushToForce(repository: Repository, remote?: string, refspec?: string, setUpstream?: boolean): Promise<void> {
+		await this._push(repository, { pushType: PushType.PushTo, pushTo: { remote: remote, refspec: refspec, setUpstream: setUpstream }, forcePush: true });
 	}
 
 	@command('git.pushTags', { repository: true })
@@ -2355,11 +2382,16 @@ export class CommandCenter {
 			}
 
 			await provider.publishRepository!(new ApiRepository(repository));
+			this.model.firePublishEvent(repository, branchName);
+
 			return;
 		}
 
 		if (remotes.length === 1) {
-			return await repository.pushTo(remotes[0].name, branchName, true);
+			await repository.pushTo(remotes[0].name, branchName, true);
+			this.model.firePublishEvent(repository, branchName);
+
+			return;
 		}
 
 		const addRemote = new AddRemoteItem(this);
@@ -2376,9 +2408,13 @@ export class CommandCenter {
 
 			if (newRemote) {
 				await repository.pushTo(newRemote, branchName, true);
+
+				this.model.firePublishEvent(repository, branchName);
 			}
 		} else {
 			await repository.pushTo(choice.label, branchName, true);
+
+			this.model.firePublishEvent(repository, branchName);
 		}
 	}
 
@@ -2648,7 +2684,7 @@ export class CommandCenter {
 						return Promise.resolve();
 					}
 
-					return Promise.resolve(method.apply(this, [repository, ...args]));
+					return Promise.resolve(method.apply(this, [repository, ...args.slice(1)]));
 				});
 			}
 
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index af536fe6c..a3f54427a 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -14,7 +14,7 @@ import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter } from './util';
 import { CancellationToken, Progress, Uri } from 'vscode';
 import { detectEncoding } from './encoding';
-import { Ref, RefType, Branch, Remote, GitErrorCodes, LogOptions, Change, Status, CommitOptions, BranchQuery } from './api/git';
+import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, BranchQuery } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
 
@@ -311,6 +311,7 @@ export class GitError {
 
 export interface IGitOptions {
 	gitPath: string;
+	userAgent: string;
 	version: string;
 	env?: any;
 }
@@ -362,6 +363,8 @@ export interface ICloneOptions {
 export class Git {
 
 	readonly path: string;
+	readonly userAgent: string;
+	readonly version: string;
 	private env: any;
 
 	private _onOutput = new EventEmitter();
@@ -369,6 +372,8 @@ export class Git {
 
 	constructor(options: IGitOptions) {
 		this.path = options.gitPath;
+		this.version = options.version;
+		this.userAgent = options.userAgent;
 		this.env = options.env || {};
 	}
 
@@ -427,7 +432,11 @@ export class Git {
 			if (options.recursive) {
 				command.push('--recursive');
 			}
-			await this.exec(options.parentPath, command, { cancellationToken, onSpawn });
+			await this.exec(options.parentPath, command, {
+				cancellationToken,
+				env: { 'GIT_HTTP_USER_AGENT': this.userAgent },
+				onSpawn,
+			});
 		} catch (err) {
 			if (err.stderr) {
 				err.stderr = err.stderr.replace(/^Cloning.+$/m, '').trim();
@@ -458,7 +467,7 @@ export class Git {
 
 					try {
 						const networkPath = await new Promise<string | undefined>(resolve =>
-							realpath.native(`${letter}:`, { encoding: 'utf8' }, (err, resolvedPath) =>
+							realpath.native(`${letter}:\\`, { encoding: 'utf8' }, (err, resolvedPath) =>
 								resolve(err !== null ? undefined : resolvedPath),
 							),
 						);
@@ -798,11 +807,6 @@ export interface PullOptions {
 	readonly cancellationToken?: CancellationToken;
 }
 
-export enum ForcePushMode {
-	Force,
-	ForceWithLease
-}
-
 export class Repository {
 
 	constructor(
@@ -1365,8 +1369,10 @@ export class Repository {
 			args.push('--no-verify');
 		}
 
-		// Stops git from guessing at user/email
-		args.splice(0, 0, '-c', 'user.useConfigOnly=true');
+		if (opts.requireUserConfig ?? true) {
+			// Stops git from guessing at user/email
+			args.splice(0, 0, '-c', 'user.useConfigOnly=true');
+		}
 
 		try {
 			await this.run(args, !opts.amend || message ? { input: message || '' } : {});
@@ -1563,6 +1569,7 @@ export class Repository {
 		const args = ['fetch'];
 		const spawnOptions: SpawnOptions = {
 			cancellationToken: options.cancellationToken,
+			env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent }
 		};
 
 		if (options.remote) {
@@ -1584,7 +1591,7 @@ export class Repository {
 		}
 
 		if (options.silent) {
-			spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
+			spawnOptions.env!['VSCODE_GIT_FETCH_SILENT'] = 'true';
 		}
 
 		try {
@@ -1621,7 +1628,10 @@ export class Repository {
 		}
 
 		try {
-			await this.run(args, options);
+			await this.run(args, {
+				cancellationToken: options.cancellationToken,
+				env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent }
+			});
 		} catch (err) {
 			if (/^CONFLICT \([^)]+\): \b/m.test(err.stdout || '')) {
 				err.gitErrorCode = GitErrorCodes.Conflict;
@@ -1690,7 +1700,7 @@ export class Repository {
 		}
 
 		try {
-			await this.run(args);
+			await this.run(args, { env: { 'GIT_HTTP_USER_AGENT': this.git.userAgent } });
 		} catch (err) {
 			if (/^error: failed to push some refs to\b/m.test(err.stderr || '')) {
 				err.gitErrorCode = GitErrorCodes.PushRejected;
@@ -1913,7 +1923,7 @@ export class Repository {
 			return null;
 		};
 
-		return result.stdout.trim().split('\n')
+		return result.stdout.split('\n')
 			.filter(line => !!line)
 			.map(fn)
 			.filter(ref => !!ref) as Ref[];
@@ -1968,50 +1978,59 @@ export class Repository {
 			return this.getHEAD();
 		}
 
-		let result = await this.run(['rev-parse', name]);
-
-		if (!result.stdout && /^@/.test(name)) {
-			const symbolicFullNameResult = await this.run(['rev-parse', '--symbolic-full-name', name]);
-			name = symbolicFullNameResult.stdout.trim();
-
-			result = await this.run(['rev-parse', name]);
+		const args = ['for-each-ref', '--format=%(refname)%00%(upstream:short)%00%(upstream:track)%00%(objectname)'];
+		if (/^refs\/(head|remotes)\//i.test(name)) {
+			args.push(name);
+		} else {
+			args.push(`refs/heads/${name}`, `refs/remotes/${name}`);
 		}
 
-		if (!result.stdout) {
-			return Promise.reject<Branch>(new Error('No such branch'));
-		}
+		const result = await this.run(args);
+		const branches: Branch[] = result.stdout.trim().split('\n').map<Branch | undefined>(line => {
+			let [branchName, upstream, status, ref] = line.trim().split('\0');
 
-		const commit = result.stdout.trim();
+			if (branchName.startsWith('refs/heads/')) {
+				branchName = branchName.substring(11);
+				const index = upstream.indexOf('/');
 
-		try {
-			const res2 = await this.run(['rev-parse', '--symbolic-full-name', name + '@{u}']);
-			const fullUpstream = res2.stdout.trim();
-			const match = /^refs\/remotes\/([^/]+)\/(.+)$/.exec(fullUpstream);
-
-			if (!match) {
-				throw new Error(`Could not parse upstream branch: ${fullUpstream}`);
-			}
-
-			const upstream = { remote: match[1], name: match[2] };
-			const res3 = await this.run(['rev-list', '--left-right', name + '...' + fullUpstream]);
-
-			let ahead = 0, behind = 0;
-			let i = 0;
-
-			while (i < res3.stdout.length) {
-				switch (res3.stdout.charAt(i)) {
-					case '<': ahead++; break;
-					case '>': behind++; break;
-					default: i++; break;
+				let ahead;
+				let behind;
+				const match = /\[(?:ahead ([0-9]+))?[,\s]*(?:behind ([0-9]+))?]|\[gone]/.exec(status);
+				if (match) {
+					[, ahead, behind] = match;
 				}
 
-				while (res3.stdout.charAt(i++) !== '\n') { /* no-op */ }
-			}
+				return {
+					type: RefType.Head,
+					name: branchName,
+					upstream: upstream ? {
+						name: upstream.substring(index + 1),
+						remote: upstream.substring(0, index)
+					} : undefined,
+					commit: ref || undefined,
+					ahead: Number(ahead) || 0,
+					behind: Number(behind) || 0,
+				};
+			} else if (branchName.startsWith('refs/remotes/')) {
+				branchName = branchName.substring(13);
+				const index = branchName.indexOf('/');
 
-			return { name, type: RefType.Head, commit, upstream, ahead, behind };
-		} catch (err) {
-			return { name, type: RefType.Head, commit };
+				return {
+					type: RefType.RemoteHead,
+					name: branchName.substring(index + 1),
+					remote: branchName.substring(0, index),
+					commit: ref,
+				};
+			} else {
+				return undefined;
+			}
+		}).filter((b?: Branch): b is Branch => !!b);
+
+		if (branches.length) {
+			return branches[0];
 		}
+
+		return Promise.reject<Branch>(new Error('No such branch'));
 	}
 
 	async getBranches(query: BranchQuery): Promise<Ref[]> {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index b9b525203..d5c81c889 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { ExtensionContext, workspace, window, Disposable, commands, Uri, OutputChannel, WorkspaceFolder } from 'vscode';
+import { env, ExtensionContext, workspace, window, Disposable, commands, Uri, OutputChannel, version as vscodeVersion, WorkspaceFolder } from 'vscode';
 import { findGit, Git, IGit } from './git';
 import { Model } from './model';
 import { CommandCenter } from './commands';
@@ -20,6 +20,7 @@ import { GitProtocolHandler } from './protocolHandler';
 import { GitExtensionImpl } from './api/extension';
 import * as path from 'path';
 import * as fs from 'fs';
+import * as os from 'os';
 import { GitTimelineProvider } from './timelineProvider';
 import { registerAPICommands } from './api/api1';
 import { TerminalEnvironmentManager } from './terminal';
@@ -39,11 +40,17 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 	const askpass = await Askpass.create(outputChannel, context.storagePath);
 	disposables.push(askpass);
 
-	const env = askpass.getEnv();
-	const terminalEnvironmentManager = new TerminalEnvironmentManager(context, env);
+	const environment = askpass.getEnv();
+	const terminalEnvironmentManager = new TerminalEnvironmentManager(context, environment);
 	disposables.push(terminalEnvironmentManager);
 
-	const git = new Git({ gitPath: info.path, version: info.version, env });
+
+	const git = new Git({
+		gitPath: info.path,
+		userAgent: `git/${info.version} (${(os as any).version?.() ?? os.type()} ${os.release()}; ${os.platform()} ${os.arch()}) vscode/${vscodeVersion} (${env.appName})`,
+		version: info.version,
+		env: environment,
+	});
 	const model = new Model(git, askpass, context.globalState, outputChannel);
 	disposables.push(model);
 
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 5b4b10c91..47043bbb3 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -12,10 +12,11 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 import { fromGitUri } from './uri';
-import { APIState as State, RemoteSourceProvider, CredentialsProvider, PushErrorHandler } from './api/git';
+import { APIState as State, RemoteSourceProvider, CredentialsProvider, PushErrorHandler, PublishEvent } from './api/git';
 import { Askpass } from './askpass';
 import { IRemoteSourceProviderRegistry } from './remoteProvider';
 import { IPushErrorHandlerRegistry } from './pushError';
+import { ApiRepository } from './api/api1';
 
 const localize = nls.loadMessageBundle();
 
@@ -69,6 +70,13 @@ export class Model implements IRemoteSourceProviderRegistry, IPushErrorHandlerRe
 	private _onDidChangeState = new EventEmitter<State>();
 	readonly onDidChangeState = this._onDidChangeState.event;
 
+	private _onDidPublish = new EventEmitter<PublishEvent>();
+	readonly onDidPublish = this._onDidPublish.event;
+
+	firePublishEvent(repository: Repository, branch?: string) {
+		this._onDidPublish.fire({ repository: new ApiRepository(repository), branch: branch });
+	}
+
 	private _state: State = 'uninitialized';
 	get state(): State { return this._state; }
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 87f24395d..e85a4f169 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -7,10 +7,10 @@ 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, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery } from './api/git';
+import { Branch, Change, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status, CommitOptions, BranchQuery } from './api/git';
 import { AutoFetcher } from './autofetch';
 import { debounce, memoize, throttle } from './decorators';
-import { Commit, ForcePushMode, GitError, Repository as BaseRepository, Stash, Submodule, LogFileOptions } from './git';
+import { Commit, GitError, Repository as BaseRepository, Stash, Submodule, LogFileOptions } from './git';
 import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
 import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, IDisposable, isDescendant, onceEvent } from './util';
@@ -79,7 +79,7 @@ export class Resource implements SourceControlResourceState {
 		return this.resources[0];
 	}
 
-	get rightUri(): Uri {
+	get rightUri(): Uri | undefined {
 		return this.resources[1];
 	}
 
@@ -88,7 +88,7 @@ export class Resource implements SourceControlResourceState {
 	}
 
 	@memoize
-	private get resources(): [Uri | undefined, Uri] {
+	private get resources(): [Uri | undefined, Uri | undefined] {
 		return this._commandResolver.getResources(this);
 	}
 
@@ -613,7 +613,7 @@ class ResourceCommandResolver {
 		}
 	}
 
-	getResources(resource: Resource): [Uri | undefined, Uri] {
+	getResources(resource: Resource): [Uri | undefined, Uri | undefined] {
 		for (const submodule of this.repository.submodules) {
 			if (path.join(this.repository.root, submodule.path) === resource.resourceUri.fsPath) {
 				return [undefined, toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: this.repository.root })];
@@ -641,7 +641,7 @@ class ResourceCommandResolver {
 		return undefined;
 	}
 
-	private getRightResource(resource: Resource): Uri {
+	private getRightResource(resource: Resource): Uri | undefined {
 		switch (resource.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.INDEX_ADDED:
@@ -677,7 +677,7 @@ class ResourceCommandResolver {
 				return resource.resourceUri;
 		}
 
-		throw new Error('Should never happen');
+		return undefined;
 	}
 
 	private getTitle(resource: Resource): string {
@@ -1129,7 +1129,7 @@ export class Repository implements Disposable {
 		return this.run(Operation.HashObject, () => this.repository.hashObject(data));
 	}
 
-	async add(resources: Uri[], opts?: { update?: boolean }): Promise<void> {
+	async add(resources: Uri[], opts?: { update?: boolean; }): Promise<void> {
 		await this.run(Operation.Add, () => this.repository.add(resources.map(r => r.fsPath), opts));
 	}
 
@@ -1165,6 +1165,12 @@ export class Repository implements Disposable {
 				}
 
 				delete opts.all;
+
+				if (opts.requireUserConfig === undefined || opts.requireUserConfig === null) {
+					const config = workspace.getConfiguration('git', Uri.file(this.root));
+					opts.requireUserConfig = config.get<boolean>('requireGitUserConfig');
+				}
+
 				await this.repository.commit(message, opts);
 			});
 		}
@@ -1260,11 +1266,11 @@ export class Repository implements Disposable {
 		await this.run(Operation.DeleteTag, () => this.repository.deleteTag(name));
 	}
 
-	async checkout(treeish: string, opts?: { detached?: boolean }): Promise<void> {
+	async checkout(treeish: string, opts?: { detached?: boolean; }): Promise<void> {
 		await this.run(Operation.Checkout, () => this.repository.checkout(treeish, [], opts));
 	}
 
-	async checkoutTracking(treeish: string, opts: { detached?: boolean } = {}): Promise<void> {
+	async checkoutTracking(treeish: string, opts: { detached?: boolean; } = {}): Promise<void> {
 		await this.run(Operation.CheckoutTracking, () => this.repository.checkout(treeish, [], { ...opts, track: true }));
 	}
 
@@ -1297,7 +1303,7 @@ export class Repository implements Disposable {
 	}
 
 	@throttle
-	async fetchDefault(options: { silent?: boolean } = {}): Promise<void> {
+	async fetchDefault(options: { silent?: boolean; } = {}): Promise<void> {
 		await this._fetch({ silent: options.silent });
 	}
 
@@ -1315,7 +1321,7 @@ export class Repository implements Disposable {
 		await this._fetch({ remote, ref, depth });
 	}
 
-	private async _fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean } = {}): Promise<void> {
+	private async _fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean; } = {}): Promise<void> {
 		if (!options.prune) {
 			const config = workspace.getConfiguration('git', Uri.file(this.root));
 			const prune = config.get<boolean>('pruneOnFetch');
@@ -1363,7 +1369,9 @@ export class Repository implements Disposable {
 					await this.repository.fetch({ all: true });
 				}
 
-				await this.repository.pull(rebase, remote, branch, { unshallow, tags });
+				if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
+					await this.repository.pull(rebase, remote, branch, { unshallow, tags });
+				}
 			});
 		});
 	}
@@ -1432,10 +1440,11 @@ export class Repository implements Disposable {
 						await this.repository.fetch({ all: true, cancellationToken });
 					}
 
-					await this.repository.pull(rebase, remoteName, pullBranch, { tags, cancellationToken });
+					if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
+						await this.repository.pull(rebase, remoteName, pullBranch, { tags, cancellationToken });
+					}
 				};
 
-
 				if (supportCancellation) {
 					const opts: ProgressOptions = {
 						location: ProgressLocation.Notification,
@@ -1463,6 +1472,54 @@ export class Repository implements Disposable {
 		});
 	}
 
+	private async checkIfMaybeRebased(currentBranch?: string) {
+		const config = workspace.getConfiguration('git');
+		const shouldIgnore = config.get<boolean>('ignoreRebaseWarning') === true;
+
+		if (shouldIgnore) {
+			return true;
+		}
+
+		const maybeRebased = await this.run(Operation.Log, async () => {
+			try {
+				const result = await this.repository.run(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
+				if (result.exitCode) {
+					return false;
+				}
+
+				return /^=/.test(result.stdout);
+			} catch {
+				return false;
+			}
+		});
+
+		if (!maybeRebased) {
+			return true;
+		}
+
+		const always = { title: localize('always pull', "Always Pull") };
+		const pull = { title: localize('pull', "Pull") };
+		const cancel = { title: localize('dont pull', "Don't Pull") };
+		const result = await window.showWarningMessage(
+			currentBranch
+				? localize('pull branch maybe rebased', "It looks like the current branch \'{0}\' might have been rebased. Are you sure you still want to pull into it?", currentBranch)
+				: localize('pull maybe rebased', "It looks like the current branch might have been rebased. Are you sure you still want to pull into it?"),
+			always, pull, cancel
+		);
+
+		if (result === pull) {
+			return true;
+		}
+
+		if (result === always) {
+			await config.update('ignoreRebaseWarning', true, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
 	async show(ref: string, filePath: string): Promise<string> {
 		return await this.run(Operation.Show, async () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
@@ -1490,11 +1547,11 @@ export class Repository implements Disposable {
 		});
 	}
 
-	getObjectDetails(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number }> {
+	getObjectDetails(ref: string, filePath: string): Promise<{ mode: string, object: string, size: number; }> {
 		return this.run(Operation.GetObjectDetails, () => this.repository.getObjectDetails(ref, filePath));
 	}
 
-	detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string }> {
+	detectObjectType(object: string): Promise<{ mimetype: string, encoding?: string; }> {
 		return this.run(Operation.Show, () => this.repository.detectObjectType(object));
 	}
 
diff --git a/extensions/git/src/test/index.ts b/extensions/git/src/test/index.ts
index 8773f772e..819850af7 100644
--- a/extensions/git/src/test/index.ts
+++ b/extensions/git/src/test/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
index 9e0933776..c8c761bc7 100644
--- a/extensions/git/src/test/smoke.test.ts
+++ b/extensions/git/src/test/smoke.test.ts
@@ -124,4 +124,31 @@ suite('git smoke test', function () {
 		assert.equal(repository.state.workingTreeChanges.length, 0);
 		assert.equal(repository.state.indexChanges.length, 0);
 	});
+		
+	test('rename/delete conflict', async function () {
+		cp.execSync('git branch test', { cwd });
+		cp.execSync('git checkout test', { cwd });
+
+		fs.unlinkSync(file('app.js'));
+		cp.execSync('git add .', { cwd });
+
+		await repository.commit('commit on test');
+		cp.execSync('git checkout master', { cwd });
+
+		fs.renameSync(file('app.js'), file('rename.js'));
+		cp.execSync('git add .', { cwd });
+		await repository.commit('commit on master');
+
+		try {
+			cp.execSync('git merge test', { cwd });
+		} catch (e) { }
+		
+		setTimeout(() => {
+			commands.executeCommand('workbench.scm.focus');
+		}, 2e3);
+
+		await new Promise(resolve => {
+			setTimeout(resolve, 5e3);
+		});
+	});
 });
diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts
index 6e2408366..f00302f61 100644
--- a/extensions/git/src/timelineProvider.ts
+++ b/extensions/git/src/timelineProvider.ts
@@ -58,8 +58,8 @@ export class GitTimelineItem extends TimelineItem {
 }
 
 export class GitTimelineProvider implements TimelineProvider {
-	private _onDidChange = new EventEmitter<TimelineChangeEvent>();
-	get onDidChange(): Event<TimelineChangeEvent> {
+	private _onDidChange = new EventEmitter<TimelineChangeEvent | undefined>();
+	get onDidChange(): Event<TimelineChangeEvent | undefined> {
 		return this._onDidChange.event;
 	}
 
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index b56e76c37..971cc6e09 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -16,48 +16,26 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mocha@2.2.43":
-  version "2.2.43"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.43.tgz#03c54589c43ad048cbcbfd63999b55d0424eec27"
-  integrity sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
 "@types/node@*":
   version "8.0.51"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
   integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
 
-"@types/node@^12.12.31":
-  version "12.12.31"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.31.tgz#d6b4f9645fee17f11319b508fb1001797425da51"
-  integrity sha512-T+wnJno8uh27G9c+1T+a1/WYCHzLeDqtsGJkoEdSp2X8RTh3oOCZQcUnjAx90CS8cmmADX51O0FI/tu9s0yssg==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/which@^1.0.28":
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
   integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=
 
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-ajv@^6.5.5:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
-  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -67,157 +45,11 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-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=
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
-  dependencies:
-    ms "2.0.0"
-
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.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"
@@ -230,635 +62,31 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escape-string-regexp@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
 file-type@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-7.2.0.tgz#113cfed52e1d6959ab80248906e2f25a8cdccb74"
   integrity sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q=
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.2:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
-  dependencies:
-    ajv "^6.5.5"
-    har-schema "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
 iconv-lite-umd@0.6.8:
   version "0.6.8"
   resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
   integrity sha512-zvXJ5gSwMC9JD3wDzH8CoZGc1pbiJn12Tqjk8BXYCnYz3hYL5GRjHW8LEykjXhV9WgNGI4rgpgHcbIiBfrRq6A==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
 jschardet@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.2.1.tgz#03b0264669a90c7a5c436a68c5a7d4e4cb0c9823"
   integrity sha512-Ks2JNuUJoc7PGaZ7bVFtSEvOcr0rBq6Q1J5/7+zKWLT+g+4zziL63O0jg7y2jxhzIa1LVsHUbPXrbaWmz9iwDw==
 
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash@^4.16.4:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.26"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
-  dependencies:
-    mime-db "1.43.0"
-
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-mkdirp@0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-mocha@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-psl@^1.1.28:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
-  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
-
-request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 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==
 
-semver@^5.4.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-source-map-support@^0.5.0:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-url-parse@^1.4.4:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.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"
@@ -871,32 +99,11 @@ vscode-nls@^4.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
-vscode-test@^0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8"
-  integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==
-  dependencies:
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-
 vscode-uri@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.0.tgz#2df704222f72b8a71ff266ba0830ed6c51ac1542"
   integrity sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw==
 
-vscode@^1.1.36:
-  version "1.1.36"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.36.tgz#5e1a0d1bf4977d0c7bc5159a9a13d5b104d4b1b6"
-  integrity sha512-cGFh9jmGLcTapCpPCKvn8aG/j9zVQ+0x5hzYJq5h5YyUXVGa1iamOaB2M2PZXoumQPES4qeAP1FwkI0b6tL4bQ==
-  dependencies:
-    glob "^7.1.2"
-    mocha "^5.2.0"
-    request "^2.88.0"
-    semver "^5.4.1"
-    source-map-support "^0.5.0"
-    url-parse "^1.4.4"
-    vscode-test "^0.4.1"
-
 which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
@@ -904,16 +111,6 @@ which@^1.3.0:
   dependencies:
     isexe "^2.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index b74a91843..70adf8856 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -3,6 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
+  "license": "MIT",
   "version": "0.0.1",
   "engines": {
     "vscode": "^1.41.0"
@@ -58,10 +59,8 @@
     "vscode-nls": "^4.1.2"
   },
   "devDependencies": {
-    "@types/keytar": "^4.4.2",
-    "@types/node": "^10.12.21",
-    "@types/node-fetch": "2.5.7",
-    "@types/uuid": "8.0.0",
-    "typescript": "^3.7.5"
+    "@types/node": "^12.19.9",
+    "@types/node-fetch": "^2.5.7",
+    "@types/uuid": "8.0.0"
   }
 }
diff --git a/extensions/github-authentication/src/common/keychain.ts b/extensions/github-authentication/src/common/keychain.ts
index 96afff43b..d1dc0a32a 100644
--- a/extensions/github-authentication/src/common/keychain.ts
+++ b/extensions/github-authentication/src/common/keychain.ts
@@ -31,9 +31,10 @@ export type Keytar = {
 const SERVICE_ID = `github.auth`;
 
 export class Keychain {
+	constructor(private context: vscode.ExtensionContext) { }
 	async setToken(token: string): Promise<void> {
 		try {
-			return await vscode.authentication.setPassword(SERVICE_ID, token);
+			return await this.context.secrets.store(SERVICE_ID, token);
 		} catch (e) {
 			// Ignore
 			Logger.error(`Setting token failed: ${e}`);
@@ -47,7 +48,7 @@ export class Keychain {
 
 	async getToken(): Promise<string | null | undefined> {
 		try {
-			return await vscode.authentication.getPassword(SERVICE_ID);
+			return await this.context.secrets.get(SERVICE_ID);
 		} catch (e) {
 			// Ignore
 			Logger.error(`Getting token failed: ${e}`);
@@ -57,7 +58,7 @@ export class Keychain {
 
 	async deleteToken(): Promise<void> {
 		try {
-			return await vscode.authentication.deletePassword(SERVICE_ID);
+			return await this.context.secrets.delete(SERVICE_ID);
 		} catch (e) {
 			// Ignore
 			Logger.error(`Deleting token failed: ${e}`);
@@ -85,5 +86,3 @@ export class Keychain {
 		}
 	}
 }
-
-export const keychain = new Keychain();
diff --git a/extensions/github-authentication/src/extension.ts b/extensions/github-authentication/src/extension.ts
index b49942b52..59994b742 100644
--- a/extensions/github-authentication/src/extension.ts
+++ b/extensions/github-authentication/src/extension.ts
@@ -14,7 +14,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	const telemetryReporter = new TelemetryReporter(name, version, aiKey);
 
 	context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
-	const loginService = new GitHubAuthenticationProvider();
+	const loginService = new GitHubAuthenticationProvider(context);
 
 	await loginService.initialize(context);
 
@@ -22,10 +22,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		return loginService.manuallyProvideToken();
 	}));
 
-	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider({
-		id: 'github',
-		label: 'GitHub',
-		supportsMultipleAccounts: false,
+	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('github', 'GitHub', {
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
 		login: async (scopeList: string[]) => {
@@ -79,7 +76,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				throw e;
 			}
 		}
-	}));
+	}, { supportsMultipleAccounts: false }));
 
 	return;
 }
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index d1cf45b7d..852127b9d 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { v4 as uuid } from 'uuid';
-import { keychain } from './common/keychain';
+import { Keychain } from './common/keychain';
 import { GitHubServer, NETWORK_ERROR } from './githubServer';
 import Logger from './common/logger';
 
@@ -26,6 +26,12 @@ export class GitHubAuthenticationProvider {
 	private _sessions: vscode.AuthenticationSession[] = [];
 	private _githubServer = new GitHubServer();
 
+	private _keychain: Keychain;
+
+	constructor(context: vscode.ExtensionContext) {
+		this._keychain = new Keychain(context);
+	}
+
 	public async initialize(context: vscode.ExtensionContext): Promise<void> {
 		try {
 			this._sessions = await this.readSessions();
@@ -34,7 +40,7 @@ export class GitHubAuthenticationProvider {
 			// Ignore, network request failed
 		}
 
-		context.subscriptions.push(vscode.authentication.onDidChangePassword(() => this.checkForUpdates()));
+		context.subscriptions.push(context.secrets.onDidChange(() => this.checkForUpdates()));
 	}
 
 	private async verifySessions(): Promise<void> {
@@ -101,7 +107,7 @@ export class GitHubAuthenticationProvider {
 	}
 
 	private async readSessions(): Promise<vscode.AuthenticationSession[]> {
-		const storedSessions = await keychain.getToken() || await keychain.tryMigrate();
+		const storedSessions = await this._keychain.getToken() || await this._keychain.tryMigrate();
 		if (storedSessions) {
 			try {
 				const sessionData: SessionData[] = JSON.parse(storedSessions);
@@ -132,7 +138,7 @@ export class GitHubAuthenticationProvider {
 				}
 
 				Logger.error(`Error reading sessions: ${e}`);
-				await keychain.deleteToken();
+				await this._keychain.deleteToken();
 			}
 		}
 
@@ -140,7 +146,7 @@ export class GitHubAuthenticationProvider {
 	}
 
 	private async storeSessions(): Promise<void> {
-		await keychain.setToken(JSON.stringify(this._sessions));
+		await this._keychain.setToken(JSON.stringify(this._sessions));
 	}
 
 	get sessions(): vscode.AuthenticationSession[] {
diff --git a/extensions/github-authentication/yarn.lock b/extensions/github-authentication/yarn.lock
index 08604b972..1da6beed5 100644
--- a/extensions/github-authentication/yarn.lock
+++ b/extensions/github-authentication/yarn.lock
@@ -2,14 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/keytar@^4.4.2":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.4.2.tgz#49ef917d6cbb4f19241c0ab50cd35097b5729b32"
-  integrity sha512-xtQcDj9ruGnMwvSu1E2BH4SFa5Dv2PvSPd0CKEBLN5hEj/v5YpXJY+B6hAfuKIbvEomD7vJTc/P1s1xPNh2kRw==
-  dependencies:
-    keytar "*"
-
-"@types/node-fetch@2.5.7":
+"@types/node-fetch@^2.5.7":
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
   integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
@@ -22,26 +15,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
   integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
 
-"@types/node@^10.12.21":
-  version "10.17.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.24.tgz#c57511e3a19c4b5e9692bb2995c40a3a52167944"
-  integrity sha512-5SCfvCxV74kzR3uWgTYiGxrd69TbT1I6+cMx1A5kEly/IVveJBimtAMlXiEyVFn5DvUFewQWxOOiJhlxeQwxgA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/uuid@8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -51,56 +34,11 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
-
-bl@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
-  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-buffer@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -108,43 +46,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-decompress-response@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
-  integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
-  dependencies:
-    mimic-response "^2.0.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 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=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 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"
@@ -157,18 +63,6 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -178,75 +72,6 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
-
-inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-keytar@*:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-6.0.1.tgz#996961abdebf300b2d34bb2eab6e42a8096b1ed8"
-  integrity sha512-1Ihpf2tdM3sLwGMkYHXYhVC/hx5BDR7CWFL4IrBA3IDZo0xHhS2nM+tU9Y+u/U7okNfbVkwmKsieLkcWRMh93g==
-  dependencies:
-    node-addon-api "^3.0.0"
-    prebuild-install "5.3.4"
-
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -259,275 +84,16 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "1.44.0"
 
-mimic-response@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
-  integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
-
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp-classic@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
-mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
-node-abi@^2.7.0:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.1.tgz#6aa32561d0a5e2fdb6810d8c25641b657a8cea85"
-  integrity sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==
-  dependencies:
-    semver "^5.4.1"
-
-node-addon-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.0.tgz#812446a1001a54f71663bed188314bba07e09247"
-  integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==
-
 node-fetch@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
-
-npmlog@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-prebuild-install@5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.4.tgz#6982d10084269d364c1856550b7d090ea31fa293"
-  integrity sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==
-  dependencies:
-    detect-libc "^1.0.3"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp "^0.5.1"
-    napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
-    noop-logger "^0.1.1"
-    npmlog "^4.0.1"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^3.0.3"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-    which-pm-runs "^1.0.0"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^2.0.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-safe-buffer@^5.0.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-semver@^5.3.0, semver@^5.4.1:
+semver@^5.3.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-signal-exit@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
-  dependencies:
-    decompress-response "^4.2.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-tar-fs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"
-  integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.0.0"
-
-tar-stream@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
-  integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-typescript@^3.7.5:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
-  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
 uuid@8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
@@ -545,23 +111,6 @@ vscode-nls@^4.1.2:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
   integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
 
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 464453d39..828ca9659 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -3,6 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
+  "license": "MIT",
   "version": "0.0.1",
   "engines": {
     "vscode": "^1.41.0"
@@ -62,6 +63,6 @@
     "vscode-nls": "^4.1.2"
   },
   "devDependencies": {
-    "@types/node": "^10.12.21"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/github/yarn.lock b/extensions/github/yarn.lock
index a9e0ba38b..5e790ac29 100644
--- a/extensions/github/yarn.lock
+++ b/extensions/github/yarn.lock
@@ -104,10 +104,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
   integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
 
-"@types/node@^10.12.21":
-  version "10.17.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.14.tgz#b6c60ebf2fb5e4229fdd751ff9ddfae0f5f31541"
-  integrity sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 before-after-hook@^2.1.0:
   version "2.1.0"
diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json
index 40344a179..ccf9440b3 100644
--- a/extensions/grunt/package.json
+++ b/extensions/grunt/package.json
@@ -20,7 +20,7 @@
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   },
   "main": "./out/main",
   "activationEvents": [
diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/grunt/yarn.lock
+++ b/extensions/grunt/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json
index 3577dd8e3..b0b25f31a 100644
--- a/extensions/gulp/package.json
+++ b/extensions/gulp/package.json
@@ -20,7 +20,7 @@
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   },
   "main": "./out/main",
   "activationEvents": [
diff --git a/extensions/gulp/src/main.ts b/extensions/gulp/src/main.ts
index 0d70cdd48..a144531d9 100644
--- a/extensions/gulp/src/main.ts
+++ b/extensions/gulp/src/main.ts
@@ -13,12 +13,31 @@ const localize = nls.loadMessageBundle();
 
 type AutoDetect = 'on' | 'off';
 
-function exists(file: string): Promise<boolean> {
-	return new Promise<boolean>((resolve, _reject) => {
-		fs.exists(file, (value) => {
-			resolve(value);
-		});
-	});
+/**
+ * Check if the given filename is a file.
+ *
+ * If returns false in case the file does not exist or
+ * the file stats cannot be accessed/queried or it
+ * is no file at all.
+ *
+ * @param filename
+ *   the filename to the checked
+ * @returns
+ *   true in case the file exists, in any other case false.
+ */
+async function exists(filename: string): Promise<boolean> {
+	try {
+
+		if ((await fs.promises.stat(filename)).isFile()) {
+			return true;
+		}
+	} catch (ex) {
+		// In case requesting the file statistics fail.
+		// we assume it does not exist.
+		return false;
+	}
+
+	return false;
 }
 
 function exec(command: string, options: cp.ExecOptions): Promise<{ stdout: string; stderr: string }> {
@@ -70,21 +89,23 @@ function showError() {
 }
 
 async function findGulpCommand(rootPath: string): Promise<string> {
-	let gulpCommand: string;
 	let platform = process.platform;
+
 	if (platform === 'win32' && await exists(path.join(rootPath, 'node_modules', '.bin', 'gulp.cmd'))) {
 		const globalGulp = path.join(process.env.APPDATA ? process.env.APPDATA : '', 'npm', 'gulp.cmd');
 		if (await exists(globalGulp)) {
-			gulpCommand = '"' + globalGulp + '"';
-		} else {
-			gulpCommand = path.join('.', 'node_modules', '.bin', 'gulp.cmd');
+			return `"${globalGulp}"`;
 		}
-	} else if ((platform === 'linux' || platform === 'darwin') && await exists(path.join(rootPath, 'node_modules', '.bin', 'gulp'))) {
-		gulpCommand = path.join('.', 'node_modules', '.bin', 'gulp');
-	} else {
-		gulpCommand = 'gulp';
+
+		return path.join('.', 'node_modules', '.bin', 'gulp.cmd');
+
 	}
-	return gulpCommand;
+
+	if ((platform === 'linux' || platform === 'darwin') && await exists(path.join(rootPath, 'node_modules', '.bin', 'gulp'))) {
+		return path.join('.', 'node_modules', '.bin', 'gulp');
+	}
+
+	return 'gulp';
 }
 
 interface GulpTaskDefinition extends vscode.TaskDefinition {
@@ -111,7 +132,7 @@ class FolderDetector {
 	}
 
 	public start(): void {
-		let pattern = path.join(this._workspaceFolder.uri.fsPath, '{node_modules,gulpfile{.babel.js,.js,.ts}}');
+		let pattern = path.join(this._workspaceFolder.uri.fsPath, '{node_modules,gulpfile{.babel.js,.esm.js,.js,.mjs,.cjs,.ts}}');
 		this.fileWatcher = vscode.workspace.createFileSystemWatcher(pattern);
 		this.fileWatcher.onDidChange(() => this.promise = undefined);
 		this.fileWatcher.onDidCreate(() => this.promise = undefined);
@@ -119,14 +140,15 @@ class FolderDetector {
 	}
 
 	public async getTasks(): Promise<vscode.Task[]> {
-		if (this.isEnabled()) {
-			if (!this.promise) {
-				this.promise = this.computeTasks();
-			}
-			return this.promise;
-		} else {
+		if (!this.isEnabled()) {
 			return [];
 		}
+
+		if (!this.promise) {
+			this.promise = this.computeTasks();
+		}
+
+		return this.promise;
 	}
 
 	public async getTask(_task: vscode.Task): Promise<vscode.Task | undefined> {
@@ -140,21 +162,55 @@ class FolderDetector {
 		return undefined;
 	}
 
+	/**
+	 * Searches for a gulp entry point inside the given folder.
+	 *
+	 * Typically the entry point is a file named "gulpfile.js"
+	 *
+	 * It can also be a transposed gulp entry points, like gulp.babel.js or gulp.esm.js
+	 *
+	 * Additionally recent node version prefer the .mjs or .cjs extension over the .js.
+	 *
+	 * @param root
+	 *   the folder which should be checked.
+	 */
+	private async hasGulpfile(root: string): Promise<boolean | undefined> {
+
+		for (const filename of await fs.promises.readdir(root)) {
+
+			const ext = path.extname(filename);
+			if (ext !== '.js' && ext !== '.mjs' && ext !== '.cjs') {
+				continue;
+			}
+
+			if (!exists(filename)) {
+				continue;
+			}
+
+			let basename = path.basename(filename, ext).toLowerCase();
+			if (basename === 'gulpfile') {
+				return true;
+			}
+			if (basename === 'gulpfile.esm') {
+				return true;
+			}
+			if (basename === 'gulpfile.babel') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	private async computeTasks(): Promise<vscode.Task[]> {
 		let rootPath = this._workspaceFolder.uri.scheme === 'file' ? this._workspaceFolder.uri.fsPath : undefined;
 		let emptyTasks: vscode.Task[] = [];
 		if (!rootPath) {
 			return emptyTasks;
 		}
-		let gulpfile = path.join(rootPath, 'gulpfile.js');
-		if (!await exists(gulpfile)) {
-			gulpfile = path.join(rootPath, 'Gulpfile.js');
-			if (!await exists(gulpfile)) {
-				gulpfile = path.join(rootPath, 'gulpfile.babel.js');
-				if (!await exists(gulpfile)) {
-					return emptyTasks;
-				}
-			}
+
+		if (!await this.hasGulpfile(rootPath)) {
+			return emptyTasks;
 		}
 
 		let commandLine = `${await this._gulpCommand} --tasks-simple --no-color`;
diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/gulp/yarn.lock
+++ b/extensions/gulp/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts
index 494b935a7..064cab91c 100644
--- a/extensions/html-language-features/client/src/htmlClient.ts
+++ b/extensions/html-language-features/client/src/htmlClient.ts
@@ -25,26 +25,22 @@ namespace CustomDataChangedNotification {
 }
 
 namespace TagCloseRequest {
-	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
+	export const type: RequestType<TextDocumentPositionParams, string, any> = new RequestType('html/tag');
 }
-namespace LinkedEditingRequest {
-	export const type: RequestType<TextDocumentPositionParams, LspRange[] | null, any, any> = new RequestType('html/linkedEditing');
-}
-
 // experimental: semantic tokens
 interface SemanticTokenParams {
 	textDocument: TextDocumentIdentifier;
 	ranges?: LspRange[];
 }
 namespace SemanticTokenRequest {
-	export const type: RequestType<SemanticTokenParams, number[] | null, any, any> = new RequestType('html/semanticTokens');
+	export const type: RequestType<SemanticTokenParams, number[] | null, any> = new RequestType('html/semanticTokens');
 }
 namespace SemanticTokenLegendRequest {
-	export const type: RequestType0<{ types: string[]; modifiers: string[] } | null, any, any> = new RequestType0('html/semanticTokenLegend');
+	export const type: RequestType0<{ types: string[]; modifiers: string[] } | null, any> = new RequestType0('html/semanticTokenLegend');
 }
 
 namespace SettingIds {
-	export const linkedRename = 'editor.linkedRename';
+	export const linkedEditing = 'editor.linkedEditing';
 	export const formatEnable = 'html.format.enable';
 
 }
@@ -168,22 +164,6 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 				toDispose.push(languages.registerDocumentSemanticTokensProvider(documentSelector, provider, new SemanticTokensLegend(legend.types, legend.modifiers)));
 			}
 		});
-
-		disposable = languages.registerLinkedEditingRangeProvider(documentSelector, {
-			async provideLinkedEditingRanges(document, position) {
-				const param = client.code2ProtocolConverter.asTextDocumentPositionParams(document, position);
-				return client.sendRequest(LinkedEditingRequest.type, param).then(response => {
-					if (response) {
-						return {
-							ranges: response.map(r => client.protocol2CodeConverter.asRange(r))
-						};
-					}
-					return undefined;
-				});
-			}
-		});
-		toDispose.push(disposable);
-
 	});
 
 	function updateFormatterRegistration() {
@@ -194,10 +174,16 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 		} else if (formatEnabled && !rangeFormatting) {
 			rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
 				provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]> {
+					const filesConfig = workspace.getConfiguration('files', document);
+					const fileFormattingOptions = {
+						trimTrailingWhitespace: filesConfig.get<boolean>('trimTrailingWhitespace'),
+						trimFinalNewlines: filesConfig.get<boolean>('trimFinalNewlines'),
+						insertFinalNewline: filesConfig.get<boolean>('insertFinalNewline'),
+					};
 					let params: DocumentRangeFormattingParams = {
 						textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
 						range: client.code2ProtocolConverter.asRange(range),
-						options: client.code2ProtocolConverter.asFormattingOptions(options)
+						options: client.code2ProtocolConverter.asFormattingOptions(options, fileFormattingOptions)
 					};
 					return client.sendRequest(DocumentRangeFormattingRequest.type, params, token).then(
 						client.protocol2CodeConverter.asTextEdits,
@@ -298,25 +284,25 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 		}
 	});
 
-	const promptForTypeOnRenameKey = 'html.promptForTypeOnRename';
-	const promptForTypeOnRename = extensions.getExtension('formulahendry.auto-rename-tag') !== undefined &&
-		(context.globalState.get(promptForTypeOnRenameKey) !== false) &&
-		!workspace.getConfiguration('editor', { languageId: 'html' }).get('linkedRename');
-
-	if (promptForTypeOnRename) {
-		const activeEditorListener = window.onDidChangeActiveTextEditor(async e => {
-			if (e && documentSelector.indexOf(e.document.languageId) !== -1) {
-				context.globalState.update(promptForTypeOnRenameKey, false);
-				activeEditorListener.dispose();
-				const configure = localize('configureButton', 'Configure');
-				const res = await window.showInformationMessage(localize('linkedRenameQuestion', 'VS Code now has built-in support for auto-renaming tags. Do you want to enable it?'), configure);
-				if (res === configure) {
-					commands.executeCommand('workbench.action.openSettings', SettingIds.linkedRename);
+	const promptForLinkedEditingKey = 'html.promptForLinkedEditing';
+	if (extensions.getExtension('formulahendry.auto-rename-tag') !== undefined && (context.globalState.get(promptForLinkedEditingKey) !== false)) {
+		const config = workspace.getConfiguration('editor', { languageId: 'html' });
+		if (!config.get('linkedEditing') && !config.get('renameOnType')) {
+			const activeEditorListener = window.onDidChangeActiveTextEditor(async e => {
+				if (e && documentSelector.indexOf(e.document.languageId) !== -1) {
+					context.globalState.update(promptForLinkedEditingKey, false);
+					activeEditorListener.dispose();
+					const configure = localize('configureButton', 'Configure');
+					const res = await window.showInformationMessage(localize('linkedEditingQuestion', 'VS Code now has built-in support for auto-renaming tags. Do you want to enable it?'), configure);
+					if (res === configure) {
+						commands.executeCommand('workbench.action.openSettings', SettingIds.linkedEditing);
+					}
 				}
-			}
-		});
-		toDispose.push(activeEditorListener);
+			});
+			toDispose.push(activeEditorListener);
+		}
 	}
 
+
 	toDispose.push();
 }
diff --git a/extensions/html-language-features/client/src/requests.ts b/extensions/html-language-features/client/src/requests.ts
index ac9666363..f127c8856 100644
--- a/extensions/html-language-features/client/src/requests.ts
+++ b/extensions/html-language-features/client/src/requests.ts
@@ -8,14 +8,14 @@ import { RequestType, CommonLanguageClient } from 'vscode-languageclient';
 import { Runtime } from './htmlClient';
 
 export namespace FsContentRequest {
-	export const type: RequestType<{ uri: string; encoding?: string; }, string, any, any> = new RequestType('fs/content');
+	export const type: RequestType<{ uri: string; encoding?: string; }, string, any> = new RequestType('fs/content');
 }
 export namespace FsStatRequest {
-	export const type: RequestType<string, FileStat, any, any> = new RequestType('fs/stat');
+	export const type: RequestType<string, FileStat, any> = new RequestType('fs/stat');
 }
 
 export namespace FsReadDirRequest {
-	export const type: RequestType<string, [string, FileType][], any, any> = new RequestType('fs/readDir');
+	export const type: RequestType<string, [string, FileType][], any> = new RequestType('fs/readDir');
 }
 
 export function serveFileSystemRequests(client: CommonLanguageClient, runtime: Runtime) {
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index c2c211ccb..4caf26f2b 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -20,7 +20,6 @@
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-client compile-extension:html-language-features-server",
     "watch": "npx gulp watch-extension:html-language-features-client watch-extension:html-language-features-server",
-    "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
   "categories": [
@@ -148,17 +147,13 @@
           "description": "%html.format.wrapAttributesIndentSize.desc%"
         },
         "html.format.templating": {
-          "type": [
-            "boolean"
-          ],
+          "type": "boolean",
           "scope": "resource",
           "default": false,
           "description": "%html.format.templating.desc%"
         },
         "html.format.unformattedContentDelimiter": {
-          "type": [
-            "string"
-          ],
+          "type": "string",
           "scope": "resource",
           "default": "",
           "markdownDescription": "%html.format.unformattedContentDelimiter.desc%"
@@ -240,10 +235,10 @@
   },
   "dependencies": {
     "vscode-extension-telemetry": "0.1.1",
-    "vscode-languageclient": "7.0.0-next.5.1",
+    "vscode-languageclient": "^7.0.0",
     "vscode-nls": "^5.0.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 65ce7cc7e..3fd01ff5b 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -9,27 +9,23 @@
   },
   "main": "./out/node/htmlServerMain",
   "dependencies": {
-    "vscode-css-languageservice": "^4.4.0",
-    "vscode-html-languageservice": "^3.2.0",
-    "vscode-languageserver": "7.0.0-next.3",
+    "vscode-css-languageservice": "^5.0.3",
+    "vscode-html-languageservice": "^4.0.1",
+    "vscode-languageserver": "^7.0.0",
     "vscode-nls": "^5.0.0",
-    "vscode-uri": "^2.1.2"
+    "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "^8.0.3",
-    "@types/node": "^12.11.7",
-    "glob": "^7.1.6",
-    "mocha": "^8.1.3",
-    "mocha-junit-reporter": "^2.0.0",
-    "mocha-multi-reporters": "^1.1.7"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9"
   },
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-server",
     "watch": "npx gulp watch-extension:html-language-features-server",
     "install-service-next": "yarn add vscode-css-languageservice@next && yarn add vscode-html-languageservice@next",
-    "install-service-local": "npm install ../../../../vscode-css-languageservice -f && npm install ../../../../vscode-html-languageservice -f",
+    "install-service-local": "yarn link vscode-css-languageservice && yarn link vscode-html-languageservice",
     "install-server-next": "yarn add vscode-languageserver@next",
-    "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f",
+    "install-server-local": "yarn link vscode-languageserver",
     "test": "npm run compile && node ./test/index.js"
   }
 }
diff --git a/extensions/html-language-features/server/src/htmlServer.ts b/extensions/html-language-features/server/src/htmlServer.ts
index 7b76a8577..7bc6a444b 100644
--- a/extensions/html-language-features/server/src/htmlServer.ts
+++ b/extensions/html-language-features/server/src/htmlServer.ts
@@ -7,7 +7,7 @@ import {
 	Connection, TextDocuments, InitializeParams, InitializeResult, RequestType,
 	DocumentRangeFormattingRequest, Disposable, DocumentSelector, TextDocumentPositionParams, ServerCapabilities,
 	ConfigurationRequest, ConfigurationParams, DidChangeWorkspaceFoldersNotification,
-	DocumentColorRequest, ColorPresentationRequest, TextDocumentSyncKind, NotificationType
+	DocumentColorRequest, ColorPresentationRequest, TextDocumentSyncKind, NotificationType, RequestType0
 } from 'vscode-languageserver';
 import {
 	getLanguageModes, LanguageModes, Settings, TextDocument, Position, Diagnostic, WorkspaceFolder, ColorInformation,
@@ -31,10 +31,7 @@ namespace CustomDataChangedNotification {
 }
 
 namespace TagCloseRequest {
-	export const type: RequestType<TextDocumentPositionParams, string | null, any, any> = new RequestType('html/tag');
-}
-namespace LinkedEditingRequest {
-	export const type: RequestType<TextDocumentPositionParams, Range[] | null, any, any> = new RequestType('html/linkedEditing');
+	export const type: RequestType<TextDocumentPositionParams, string | null, any> = new RequestType('html/tag');
 }
 
 // experimental: semantic tokens
@@ -43,10 +40,10 @@ interface SemanticTokenParams {
 	ranges?: Range[];
 }
 namespace SemanticTokenRequest {
-	export const type: RequestType<SemanticTokenParams, number[] | null, any, any> = new RequestType('html/semanticTokens');
+	export const type: RequestType<SemanticTokenParams, number[] | null, any> = new RequestType('html/semanticTokens');
 }
 namespace SemanticTokenLegendRequest {
-	export const type: RequestType<void, { types: string[]; modifiers: string[] } | null, any, any> = new RequestType('html/semanticTokenLegend');
+	export const type: RequestType0<{ types: string[]; modifiers: string[] } | null, any> = new RequestType0('html/semanticTokenLegend');
 }
 
 export interface RuntimeEnvironment {
@@ -164,7 +161,8 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			colorProvider: {},
 			foldingRangeProvider: true,
 			selectionRangeProvider: true,
-			renameProvider: true
+			renameProvider: true,
+			linkedEditingRangeProvider: true
 		};
 		return { capabilities };
 	});
@@ -501,24 +499,28 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			const position: Position = params.position;
 
 			if (document) {
-				const htmlMode = languageModes.getMode('html');
-				if (htmlMode && htmlMode.doRename) {
-					return htmlMode.doRename(document, position, params.newName);
+				const mode = languageModes.getModeAtPosition(document, params.position);
+
+				if (mode && mode.doRename) {
+					return mode.doRename(document, position, params.newName);
 				}
 			}
 			return null;
 		}, null, `Error while computing rename for ${params.textDocument.uri}`, token);
 	});
 
-	connection.onRequest(LinkedEditingRequest.type, (params, token) => {
-		return runSafe(async () => {
+	connection.languages.onLinkedEditingRange((params, token) => {
+		return <any> /* todo remove when microsoft/vscode-languageserver-node#700 fixed */ runSafe(async () => {
 			const document = documents.get(params.textDocument.uri);
 			if (document) {
 				const pos = params.position;
 				if (pos.character > 0) {
 					const mode = languageModes.getModeAtPosition(document, Position.create(pos.line, pos.character - 1));
 					if (mode && mode.doLinkedEditing) {
-						return mode.doLinkedEditing(document, pos);
+						const ranges = await mode.doLinkedEditing(document, pos);
+						if (ranges) {
+							return { ranges };
+						}
 					}
 				}
 			}
@@ -544,7 +546,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 		}, null, `Error while computing semantic tokens for ${params.textDocument.uri}`, token);
 	});
 
-	connection.onRequest(SemanticTokenLegendRequest.type, (_params, token) => {
+	connection.onRequest(SemanticTokenLegendRequest.type, token => {
 		return runSafe(async () => {
 			return getSemanticTokenProvider().legend;
 		}, null, `Error while computing semantic tokens legend`, token);
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 1fc33faed..bb6305948 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -188,6 +188,28 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 			}
 			return null;
 		},
+		async doRename(document: TextDocument, position: Position, newName: string) {
+			const jsDocument = jsDocuments.get(document);
+			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsDocumentPosition = jsDocument.offsetAt(position);
+			const { canRename } = jsLanguageService.getRenameInfo(jsDocument.uri, jsDocumentPosition);
+			if (!canRename) {
+				return null;
+			}
+			const renameInfos = jsLanguageService.findRenameLocations(jsDocument.uri, jsDocumentPosition, false, false);
+
+			const edits: TextEdit[] = [];
+			renameInfos?.map(renameInfo => {
+				edits.push({
+					range: convertRange(jsDocument, renameInfo.textSpan),
+					newText: newName,
+				});
+			});
+
+			return {
+				changes: { [document.uri]: edits },
+			};
+		},
 		async findDocumentHighlight(document: TextDocument, position: Position): Promise<DocumentHighlight[]> {
 			const jsDocument = jsDocuments.get(document);
 			const jsLanguageService = await host.getLanguageService(jsDocument);
diff --git a/extensions/html-language-features/server/src/modes/semanticTokens.ts b/extensions/html-language-features/server/src/modes/semanticTokens.ts
index 33f17a70b..f386a0dab 100644
--- a/extensions/html-language-features/server/src/modes/semanticTokens.ts
+++ b/extensions/html-language-features/server/src/modes/semanticTokens.ts
@@ -45,7 +45,7 @@ export function newSemanticTokenProvider(languageModes: LanguageModes): Semantic
 					}
 				}
 			}
-			return encodeTokens(allTokens, ranges);
+			return encodeTokens(allTokens, ranges, document);
 		}
 	};
 }
@@ -94,15 +94,13 @@ function applyModifiersMapping(tokens: SemanticTokenData[], modifiersMapping: nu
 	}
 }
 
-const fullRange = [Range.create(Position.create(0, 0), Position.create(Number.MAX_VALUE, 0))];
-
-function encodeTokens(tokens: SemanticTokenData[], ranges?: Range[]): number[] {
+function encodeTokens(tokens: SemanticTokenData[], ranges: Range[] | undefined, document: TextDocument): number[] {
 
 	const resultTokens = tokens.sort((d1, d2) => d1.start.line - d2.start.line || d1.start.character - d2.start.character);
 	if (ranges) {
 		ranges = ranges.sort((d1, d2) => d1.start.line - d2.start.line || d1.start.character - d2.start.character);
 	} else {
-		ranges = fullRange;
+		ranges = [Range.create(Position.create(0, 0), Position.create(document.lineCount, 0))];
 	}
 
 	let rangeIndex = 0;
diff --git a/extensions/html-language-features/server/src/requests.ts b/extensions/html-language-features/server/src/requests.ts
index 45b2ef204..8d741faeb 100644
--- a/extensions/html-language-features/server/src/requests.ts
+++ b/extensions/html-language-features/server/src/requests.ts
@@ -8,14 +8,14 @@ import { RequestType, Connection } from 'vscode-languageserver';
 import { RuntimeEnvironment } from './htmlServer';
 
 export namespace FsContentRequest {
-	export const type: RequestType<{ uri: string; encoding?: string; }, string, any, any> = new RequestType('fs/content');
+	export const type: RequestType<{ uri: string; encoding?: string; }, string, any> = new RequestType('fs/content');
 }
 export namespace FsStatRequest {
-	export const type: RequestType<string, FileStat, any, any> = new RequestType('fs/stat');
+	export const type: RequestType<string, FileStat, any> = new RequestType('fs/stat');
 }
 
 export namespace FsReadDirRequest {
-	export const type: RequestType<string, [string, FileType][], any, any> = new RequestType('fs/readDir');
+	export const type: RequestType<string, [string, FileType][], any> = new RequestType('fs/readDir');
 }
 
 export enum FileType {
diff --git a/extensions/html-language-features/server/src/test/rename.test.ts b/extensions/html-language-features/server/src/test/rename.test.ts
new file mode 100644
index 000000000..2705b56fd
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/rename.test.ts
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { WorkspaceEdit, TextDocument, getLanguageModes, ClientCapabilities } from '../modes/languageModes';
+import { getNodeFSRequestService } from '../node/nodeFs';
+
+
+async function testRename(value: string, newName: string, expectedDocContent: string): Promise<void> {
+	const offset = value.indexOf('|');
+	value = value.substr(0, offset) + value.substr(offset + 1);
+
+	const document = TextDocument.create('test://test/test.html', 'html', 0, value);
+	const workspace = {
+		settings: {},
+		folders: [{ name: 'foo', uri: 'test://foo' }]
+	};
+	const languageModes = getLanguageModes({ css: true, javascript: true }, workspace, ClientCapabilities.LATEST, getNodeFSRequestService());
+	const javascriptMode = languageModes.getMode('javascript')
+	const position = document.positionAt(offset);
+
+	if (javascriptMode) {
+		const workspaceEdit: WorkspaceEdit | null = await javascriptMode.doRename!(document, position, newName);
+
+		if (!workspaceEdit || !workspaceEdit.changes) {
+			assert.fail('No workspace edits');
+		}
+
+		const edits = workspaceEdit.changes[document.uri.toString()];
+		if (!edits) {
+			assert.fail(`No edits for file at ${document.uri.toString()}`);
+		}
+
+		const newDocContent = TextDocument.applyEdits(document, edits);
+		assert.equal(newDocContent, expectedDocContent, `Expected: ${expectedDocContent}\nActual: ${newDocContent}`);
+	} else {
+		assert.fail('should have javascriptMode but no')
+	}
+}
+
+async function testNoRename(value: string, newName: string): Promise<void> {
+	const offset = value.indexOf('|');
+	value = value.substr(0, offset) + value.substr(offset + 1);
+
+	const document = TextDocument.create('test://test/test.html', 'html', 0, value);
+	const workspace = {
+		settings: {},
+		folders: [{ name: 'foo', uri: 'test://foo' }]
+	};
+	const languageModes = getLanguageModes({ css: true, javascript: true }, workspace, ClientCapabilities.LATEST, getNodeFSRequestService());
+	const javascriptMode = languageModes.getMode('javascript')
+	const position = document.positionAt(offset);
+
+	if (javascriptMode) {
+		const workspaceEdit: WorkspaceEdit | null = await javascriptMode.doRename!(document, position, newName);
+
+		assert.ok(workspaceEdit?.changes === undefined, 'Should not rename but rename happened')
+	} else {
+		assert.fail('should have javascriptMode but no')
+	}
+}
+
+suite('HTML Javascript Rename', () => {
+	test('Rename Variable', async () => {
+		const input = [
+			'<html>',
+			'<head>',
+			'<script>',
+			'const |a = 2;',
+			'const b = a + 2',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		const output = [
+			'<html>',
+			'<head>',
+			'<script>',
+			'const h = 2;',
+			'const b = h + 2',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		await testRename(input.join('\n'), 'h', output.join('\n'))
+	})
+
+	test('Rename Function', async () => {
+		const input = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const name = 'cjg';`,
+			'function |sayHello(name) {',
+			`console.log('hello', name)`,
+			'}',
+			'sayHello(name)',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		const output = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const name = 'cjg';`,
+			'function sayName(name) {',
+			`console.log('hello', name)`,
+			'}',
+			'sayName(name)',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		await testRename(input.join('\n'), 'sayName', output.join('\n'))
+	})
+
+	test('Rename Function Params', async () => {
+		const input = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const name = 'cjg';`,
+			'function sayHello(|name) {',
+			`console.log('hello', name)`,
+			'}',
+			'sayHello(name)',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		const output = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const name = 'cjg';`,
+			'function sayHello(newName) {',
+			`console.log('hello', newName)`,
+			'}',
+			'sayHello(name)',
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		await testRename(input.join('\n'), 'newName', output.join('\n'))
+	})
+
+	test('Rename Class', async () => {
+		const input = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`class |Foo {}`,
+			`const foo = new Foo()`,
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		const output = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`class Bar {}`,
+			`const foo = new Bar()`,
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		await testRename(input.join('\n'), 'Bar', output.join('\n'))
+	})
+
+	test('Cannot Rename literal', async () => {
+		const stringLiteralInput = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const name = |'cjg';`,
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+		const numberLiteralInput = [
+			'<html>',
+			'<head>',
+			'<script>',
+			`const num = |2;`,
+			'</script>',
+			'</head>',
+			'</html>'
+		]
+
+		await testNoRename(stringLiteralInput.join('\n'), 'something')
+		await testNoRename(numberLiteralInput.join('\n'), 'hhhh')
+	})
+});
diff --git a/extensions/html-language-features/server/src/utils/runner.ts b/extensions/html-language-features/server/src/utils/runner.ts
index 6bf8a88d0..7889b6a42 100644
--- a/extensions/html-language-features/server/src/utils/runner.ts
+++ b/extensions/html-language-features/server/src/utils/runner.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResponseError, ErrorCodes, CancellationToken } from 'vscode-languageserver';
+import { ResponseError, CancellationToken, LSPErrorCodes } from 'vscode-languageserver';
 
 export function formatError(message: string, err: any): string {
 	if (err instanceof Error) {
@@ -41,5 +41,5 @@ export function runSafe<T>(func: () => Thenable<T>, errorVal: T, errorMessage: s
 
 
 function cancelValue<E>() {
-	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+	return new ResponseError<E>(LSPErrorCodes.RequestCancelled, 'Request cancelled');
 }
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 6d17972d5..3db233624 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -2,1048 +2,72 @@
 # yarn lockfile v1
 
 
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
-"@types/mocha@^8.0.3":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.0.3.tgz#51b21b6acb6d1b923bbdc7725c38f9f455166402"
-  integrity sha512-vyxR57nv8NfcU0GZu8EUXZLTbCMupIUwy95LJ6lllN+JRPG25CwMHoB1q5xKh8YKhQnHYRAn4yW2yuHbf/5xgg==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+vscode-css-languageservice@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.0.3.tgz#2d400a47e73d0bfc5bc0d3fdf5be487cfdca341b"
+  integrity sha512-KJt4jhCxqrgGrC02UsQsKw90dPkFknMHsH5HTInT7gkDRRfGFwEd+e2O1/E75br3TdFhvRmzjljYz5thZ58L3A==
   dependencies:
-    color-convert "^1.9.0"
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-languageserver-types "^3.16.0"
+    vscode-nls "^5.0.0"
+    vscode-uri "^3.0.2"
 
-ansi-styles@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
-  dependencies:
-    "@types/color-name" "^1.1.1"
-    color-convert "^2.0.1"
-
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-array.prototype.map@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec"
-  integrity sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.4"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-chalk@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-chokidar@3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
-  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.4.0"
-  optionalDependencies:
-    fsevents "~2.1.2"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-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=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-debug@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-diff@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.0:
-  version "1.18.0-next.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz#b302834927e624d8e5837ed48224291f2c66e6fc"
-  integrity sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
-es-get-iterator@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
-  integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
-  dependencies:
-    es-abstract "^1.17.4"
-    has-symbols "^1.0.1"
-    is-arguments "^1.0.4"
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-string-regexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-esprima@^4.0.0:
+vscode-html-languageservice@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.1.tgz#6fb50fcf782937dffe0de55e12a8c43c817ec0f1"
+  integrity sha512-CZtnuQoDwZdmPLKLMC6RqFlRTw0jvZK71l53u5ZIM3hSoVKAqW33gahBVNFpC3TPFxZSx0jqEhBTLf37RUMkWg==
   dependencies:
-    to-regex-range "^5.0.1"
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-languageserver-types "^3.16.0"
+    vscode-nls "^5.0.0"
+    vscode-uri "^3.0.2"
 
-find-up@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.1.6, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-buffer@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-callable@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz#4d1e21a4f437509d25ce55f8184350771421c96d"
-  integrity sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
-  integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
-
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-regex@^1.1.0, is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-set@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
-  integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
-
-is-string@^1.0.4, is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
-  dependencies:
-    has-symbols "^1.0.0"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-iterate-iterator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6"
-  integrity sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==
-
-iterate-value@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57"
-  integrity sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==
-  dependencies:
-    es-get-iterator "^1.0.2"
-    iterate-iterator "^1.0.1"
-
-js-yaml@3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^6.0.0:
+vscode-jsonrpc@6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
+
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    p-locate "^5.0.0"
-
-lodash@^4.16.4:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-log-symbols@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
-  dependencies:
-    chalk "^4.0.0"
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-2.0.0.tgz#3bf990fce7a42c0d2b718f188553a25d9f24b9a2"
-  integrity sha512-20HoWh2HEfhqmigfXOKUhZQyX23JImskc37ZOhIjBKoBEsb+4cAFRJpAVhFpnvsztLklW/gFVzsrobjLwmX4lA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.3.tgz#5e93f873e35dfdd69617ea75f9c68c2ca61c2ac5"
-  integrity sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==
-  dependencies:
-    ansi-colors "4.1.1"
-    browser-stdout "1.3.1"
-    chokidar "3.4.2"
-    debug "4.1.1"
-    diff "4.0.2"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
-    glob "7.1.6"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.14.0"
-    log-symbols "4.0.0"
-    minimatch "3.0.4"
-    ms "2.1.2"
-    object.assign "4.1.0"
-    promise.allsettled "1.0.2"
-    serialize-javascript "4.0.0"
-    strip-json-comments "3.0.1"
-    supports-color "7.1.0"
-    which "2.0.2"
-    wide-align "1.1.3"
-    workerpool "6.0.0"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.1"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-object-inspect@^1.7.0, object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-picomatch@^2.0.4:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
-
-picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-promise.allsettled@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9"
-  integrity sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==
-  dependencies:
-    array.prototype.map "^1.0.1"
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    iterate-value "^1.0.0"
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-readdirp@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
-  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-safe-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-serialize-javascript@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-json-comments@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
-
-supports-color@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-vscode-css-languageservice@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz#a7c5edf3057e707601ca18fa3728784a298513b4"
-  integrity sha512-jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw==
-  dependencies:
-    vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "3.16.0-next.2"
-    vscode-nls "^5.0.0"
-    vscode-uri "^2.1.2"
-
-vscode-html-languageservice@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz#e92269a04097d87bd23431e3a4e491a27b5447b9"
-  integrity sha512-aLWIoWkvb5HYTVE0kI9/u3P0ZAJGrYOSAAE6L0wqB9radKRtbJNrF9+BjSUFyCgBdNBE/GFExo35LoknQDJrfw==
-  dependencies:
-    vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "3.16.0-next.2"
-    vscode-nls "^5.0.0"
-    vscode-uri "^2.1.2"
-
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
-
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
-  dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
 vscode-languageserver-textdocument@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
   integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
+vscode-languageserver-types@3.16.0, vscode-languageserver-types@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
-vscode-languageserver@7.0.0-next.3:
-  version "7.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz#3833bd09259a4a085baeba90783f1e4d06d81095"
-  integrity sha512-qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg==
+vscode-languageserver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
+  integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
   dependencies:
-    vscode-languageserver-protocol "3.16.0-next.4"
+    vscode-languageserver-protocol "3.16.0"
 
 vscode-nls@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
-vscode-uri@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
-  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-workerpool@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58"
-  integrity sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
-  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-unparser@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.1.tgz#bd4b0ee05b4c94d058929c32cb09e3fce71d3c5f"
-  integrity sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==
-  dependencies:
-    camelcase "^5.3.1"
-    decamelize "^1.2.0"
-    flat "^4.1.0"
-    is-plain-obj "^1.1.0"
-    yargs "^14.2.3"
-
-yargs@13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yargs@^14.2.3:
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
-  integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==
-  dependencies:
-    cliui "^5.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^15.0.1"
+vscode-uri@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
+  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index 7d639c7b4..dea3c0177 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  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"
@@ -16,6 +16,24 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.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"
@@ -28,15 +46,31 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 semver@^5.3.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 vscode-extension-telemetry@0.1.1:
   version "0.1.1"
@@ -45,37 +79,43 @@ vscode-extension-telemetry@0.1.1:
   dependencies:
     applicationinsights "1.0.8"
 
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
+vscode-jsonrpc@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
 
-vscode-languageclient@7.0.0-next.5.1:
-  version "7.0.0-next.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0-next.5.1.tgz#ed93f14e4c2cdccedf15002c7bf8ef9cb638f36c"
-  integrity sha512-OONvbk3IFpubwF8/Y5uPQaq5J5CEskpeET3SfK4iGlv5OUK+44JawH/SEW5wXuEPpfdMLEMZLuGLU5v5d7N7PQ==
+vscode-languageclient@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz#b505c22c21ffcf96e167799757fca07a6bad0fb2"
+  integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==
   dependencies:
-    semver "^6.3.0"
-    vscode-languageserver-protocol "3.16.0-next.4"
+    minimatch "^3.0.4"
+    semver "^7.3.4"
+    vscode-languageserver-protocol "3.16.0"
 
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
+vscode-languageserver-types@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
 vscode-nls@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
+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"
diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json
index 064ada948..69fd11e56 100644
--- a/extensions/image-preview/package.json
+++ b/extensions/image-preview/package.json
@@ -34,7 +34,7 @@
         "priority": "builtin",
         "selector": [
           {
-            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,webp}"
+            "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,webp,avif}"
           }
         ]
       }
diff --git a/extensions/jake/package.json b/extensions/jake/package.json
index e919813a2..03e60fe32 100644
--- a/extensions/jake/package.json
+++ b/extensions/jake/package.json
@@ -20,7 +20,7 @@
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   },
   "main": "./out/main",
   "activationEvents": [
diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/jake/yarn.lock
+++ b/extensions/jake/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index c729c8ff9..a6cf72881 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.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/microsoft/TypeScript-TmLanguage/commit/59b62cbc624e3a01368e5432d85af0c99a27d49d",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/398985941eb36cd270054a6e668d03fb9ef92e77",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -439,7 +439,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js entity.name.function.js"
@@ -497,7 +497,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js"
@@ -881,7 +881,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1121,7 +1121,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.js entity.name.function.js"
@@ -1304,7 +1304,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1334,7 +1334,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -1366,7 +1366,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.js",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.js"
@@ -1387,7 +1387,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -1447,7 +1447,7 @@
 				},
 				{
 					"name": "meta.arrow.js",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -1557,6 +1557,14 @@
 				}
 			},
 			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.js"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				}
@@ -1994,6 +2002,23 @@
 				{
 					"include": "#type-parameters"
 				},
+				{
+					"begin": "(=)\\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js"
+						},
+						"2": {
+							"name": "keyword.control.intrinsic.js"
+						}
+					},
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
 				{
 					"begin": "(=)\\s*",
 					"beginCaptures": {
@@ -2452,7 +2477,7 @@
 		"if-statement": {
 			"patterns": [
 				{
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))\\s*(?!\\{))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
 					"end": "(?=;|$|\\})",
 					"patterns": [
 						{
@@ -2641,7 +2666,7 @@
 				},
 				{
 					"name": "meta.object.member.js",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js"
@@ -2732,7 +2757,7 @@
 					"end": "(?=,|\\})",
 					"patterns": [
 						{
-							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.js"
@@ -2765,7 +2790,7 @@
 							]
 						},
 						{
-							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.js"
@@ -2801,7 +2826,7 @@
 							]
 						},
 						{
-							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "meta.brace.round.js"
@@ -2854,13 +2879,13 @@
 		"function-call": {
 			"patterns": [
 				{
-					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 					"patterns": [
 						{
 							"name": "meta.function-call.js",
 							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 							"patterns": [
 								{
 									"include": "#function-call-target"
@@ -2962,13 +2987,7 @@
 			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
-					"include": "#paren-expression"
-				},
-				{
-					"include": "#class-declaration"
-				},
-				{
-					"include": "#type"
+					"include": "#expression"
 				}
 			]
 		},
@@ -2989,7 +3008,7 @@
 		"paren-expression-possibly-arrow": {
 			"patterns": [
 				{
-					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -3003,7 +3022,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -3073,7 +3092,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -3328,8 +3347,18 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.expression.typeof.js",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.expression.typeof.js"
+				}
+			},
+			"end": "(?=[,);}\\]=>]|$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
 		},
 		"literal": {
 			"patterns": [
@@ -3597,7 +3626,7 @@
 					}
 				},
 				{
-					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
+					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -3641,7 +3670,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -3964,7 +3993,7 @@
 					"include": "#comment"
 				},
 				{
-					"include": "#string"
+					"include": "#type-string"
 				},
 				{
 					"include": "#numeric-literal"
@@ -4172,7 +4201,7 @@
 			},
 			"patterns": [
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -4577,42 +4606,7 @@
 		"template": {
 			"patterns": [
 				{
-					"name": "string.template.js",
-					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-							"patterns": [
-								{
-									"include": "#support-function-call-identifiers"
-								},
-								{
-									"name": "entity.name.function.tagged-template.js",
-									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
-								}
-							]
-						},
-						{
-							"include": "#type-arguments"
-						}
-					]
-				},
-				{
-					"name": "string.template.js",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.tagged-template.js"
-						}
-					},
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"include": "#type-arguments"
-						}
-					]
+					"include": "#template-call"
 				},
 				{
 					"name": "string.template.js",
@@ -4642,6 +4636,48 @@
 				}
 			]
 		},
+		"template-call": {
+			"patterns": [
+				{
+					"name": "string.template.js",
+					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+							"patterns": [
+								{
+									"include": "#support-function-call-identifiers"
+								},
+								{
+									"name": "entity.name.function.tagged-template.js",
+									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+								}
+							]
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				},
+				{
+					"name": "string.template.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js"
+						}
+					},
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
 		"template-substitution-element": {
 			"name": "meta.template.expression.js",
 			"begin": "\\$\\{",
@@ -4663,6 +4699,73 @@
 			],
 			"contentName": "meta.embedded.line.js"
 		},
+		"type-string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template-type"
+				}
+			]
+		},
+		"template-type": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"name": "string.template.js",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js"
+						},
+						"2": {
+							"name": "punctuation.definition.string.template.begin.js"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.template.end.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-type-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-type-substitution-element": {
+			"name": "meta.template.expression.js",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.js"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.js"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			],
+			"contentName": "meta.embedded.line.js"
+		},
 		"regex": {
 			"patterns": [
 				{
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 6cf2346d9..c5e957929 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.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/microsoft/TypeScript-TmLanguage/commit/59b62cbc624e3a01368e5432d85af0c99a27d49d",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/398985941eb36cd270054a6e668d03fb9ef92e77",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -439,7 +439,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
@@ -497,7 +497,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx variable.other.constant.js.jsx entity.name.function.js.jsx"
@@ -881,7 +881,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1121,7 +1121,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
@@ -1304,7 +1304,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js.jsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1334,7 +1334,7 @@
 				},
 				{
 					"name": "meta.method.declaration.js.jsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -1366,7 +1366,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.js.jsx",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.js.jsx"
@@ -1387,7 +1387,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -1447,7 +1447,7 @@
 				},
 				{
 					"name": "meta.arrow.js.jsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -1557,6 +1557,14 @@
 				}
 			},
 			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.js.jsx"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				}
@@ -1994,6 +2002,23 @@
 				{
 					"include": "#type-parameters"
 				},
+				{
+					"begin": "(=)\\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.js.jsx"
+						},
+						"2": {
+							"name": "keyword.control.intrinsic.js.jsx"
+						}
+					},
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
 				{
 					"begin": "(=)\\s*",
 					"beginCaptures": {
@@ -2452,7 +2477,7 @@
 		"if-statement": {
 			"patterns": [
 				{
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))\\s*(?!\\{))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
 					"end": "(?=;|$|\\})",
 					"patterns": [
 						{
@@ -2641,7 +2666,7 @@
 				},
 				{
 					"name": "meta.object.member.js.jsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js.jsx"
@@ -2732,7 +2757,7 @@
 					"end": "(?=,|\\})",
 					"patterns": [
 						{
-							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.js.jsx"
@@ -2765,7 +2790,7 @@
 							]
 						},
 						{
-							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.js.jsx"
@@ -2801,7 +2826,7 @@
 							]
 						},
 						{
-							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "meta.brace.round.js.jsx"
@@ -2854,13 +2879,13 @@
 		"function-call": {
 			"patterns": [
 				{
-					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 					"patterns": [
 						{
 							"name": "meta.function-call.js.jsx",
 							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 							"patterns": [
 								{
 									"include": "#function-call-target"
@@ -2962,13 +2987,7 @@
 			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
-					"include": "#paren-expression"
-				},
-				{
-					"include": "#class-declaration"
-				},
-				{
-					"include": "#type"
+					"include": "#expression"
 				}
 			]
 		},
@@ -2989,7 +3008,7 @@
 		"paren-expression-possibly-arrow": {
 			"patterns": [
 				{
-					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -3003,7 +3022,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -3073,7 +3092,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -3328,8 +3347,18 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.expression.typeof.js.jsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.expression.typeof.js.jsx"
+				}
+			},
+			"end": "(?=[,);}\\]=>]|$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
 		},
 		"literal": {
 			"patterns": [
@@ -3597,7 +3626,7 @@
 					}
 				},
 				{
-					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
+					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js.jsx"
@@ -3641,7 +3670,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js.jsx"
@@ -3964,7 +3993,7 @@
 					"include": "#comment"
 				},
 				{
-					"include": "#string"
+					"include": "#type-string"
 				},
 				{
 					"include": "#numeric-literal"
@@ -4172,7 +4201,7 @@
 			},
 			"patterns": [
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -4577,42 +4606,7 @@
 		"template": {
 			"patterns": [
 				{
-					"name": "string.template.js.jsx",
-					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-							"patterns": [
-								{
-									"include": "#support-function-call-identifiers"
-								},
-								{
-									"name": "entity.name.function.tagged-template.js.jsx",
-									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
-								}
-							]
-						},
-						{
-							"include": "#type-arguments"
-						}
-					]
-				},
-				{
-					"name": "string.template.js.jsx",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.tagged-template.js.jsx"
-						}
-					},
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"include": "#type-arguments"
-						}
-					]
+					"include": "#template-call"
 				},
 				{
 					"name": "string.template.js.jsx",
@@ -4642,6 +4636,48 @@
 				}
 			]
 		},
+		"template-call": {
+			"patterns": [
+				{
+					"name": "string.template.js.jsx",
+					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+							"patterns": [
+								{
+									"include": "#support-function-call-identifiers"
+								},
+								{
+									"name": "entity.name.function.tagged-template.js.jsx",
+									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+								}
+							]
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				},
+				{
+					"name": "string.template.js.jsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js.jsx"
+						}
+					},
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
 		"template-substitution-element": {
 			"name": "meta.template.expression.js.jsx",
 			"begin": "\\$\\{",
@@ -4663,6 +4699,73 @@
 			],
 			"contentName": "meta.embedded.line.js.jsx"
 		},
+		"type-string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template-type"
+				}
+			]
+		},
+		"template-type": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"name": "string.template.js.jsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.js.jsx"
+						},
+						"2": {
+							"name": "punctuation.definition.string.template.begin.js.jsx"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.template.end.js.jsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-type-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-type-substitution-element": {
+			"name": "meta.template.expression.js.jsx",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.js.jsx"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.js.jsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			],
+			"contentName": "meta.embedded.line.js.jsx"
+		},
 		"regex": {
 			"patterns": [
 				{
diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 068fe11cb..c925a9181 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -21,15 +21,15 @@ import { hash } from './utils/hash';
 import { RequestService, joinPath } from './requests';
 
 namespace VSCodeContentRequest {
-	export const type: RequestType<string, string, any, any> = new RequestType('vscode/content');
+	export const type: RequestType<string, string, any> = new RequestType('vscode/content');
 }
 
 namespace SchemaContentChangeNotification {
-	export const type: NotificationType<string, any> = new NotificationType('json/schemaContent');
+	export const type: NotificationType<string> = new NotificationType('json/schemaContent');
 }
 
 namespace ForceValidateRequest {
-	export const type: RequestType<string, Diagnostic[], any, any> = new RequestType('json/validate');
+	export const type: RequestType<string, Diagnostic[], any> = new RequestType('json/validate');
 }
 
 export interface ISchemaAssociations {
@@ -42,11 +42,11 @@ export interface ISchemaAssociation {
 }
 
 namespace SchemaAssociationNotification {
-	export const type: NotificationType<ISchemaAssociations | ISchemaAssociation[], any> = new NotificationType('json/schemaAssociations');
+	export const type: NotificationType<ISchemaAssociations | ISchemaAssociation[]> = new NotificationType('json/schemaAssociations');
 }
 
 namespace ResultLimitReachedNotification {
-	export const type: NotificationType<string, any> = new NotificationType('json/resultLimitReached');
+	export const type: NotificationType<string> = new NotificationType('json/resultLimitReached');
 }
 
 interface Settings {
@@ -325,12 +325,17 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 			} else if (formatEnabled && !rangeFormatting) {
 				rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
 					provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]> {
+						const filesConfig = workspace.getConfiguration('files', document);
+						const fileFormattingOptions = {
+							trimTrailingWhitespace: filesConfig.get<boolean>('trimTrailingWhitespace'),
+							trimFinalNewlines: filesConfig.get<boolean>('trimFinalNewlines'),
+							insertFinalNewline: filesConfig.get<boolean>('insertFinalNewline'),
+						};
 						const params: DocumentRangeFormattingParams = {
 							textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
 							range: client.code2ProtocolConverter.asRange(range),
-							options: client.code2ProtocolConverter.asFormattingOptions(options)
+							options: client.code2ProtocolConverter.asFormattingOptions(options, fileFormattingOptions)
 						};
-						params.options.insertFinalNewline = workspace.getConfiguration('files', document).get('insertFinalNewline');
 
 						return client.sendRequest(DocumentRangeFormattingRequest.type, params, token).then(
 							client.protocol2CodeConverter.asTextEdits,
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index a8e3231a9..c36b2e6a3 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -20,7 +20,6 @@
     "scripts": {
         "compile": "gulp compile-extension:json-language-features-client compile-extension:json-language-features-server",
         "watch": "gulp watch-extension:json-language-features-client watch-extension:json-language-features-server",
-        "postinstall": "cd server && yarn install",
         "install-client-next": "yarn add vscode-languageclient@next"
     },
     "categories": [
@@ -98,11 +97,13 @@
                     "description": "%json.maxItemsComputed.desc%"
                 },
                 "json.schemaDownload.enable": {
-                  "type": "boolean",
-                  "default": true,
-                  "description": "%json.enableSchemaDownload.desc%",
-                  "tags": ["usesOnlineServices"]
-              }
+                    "type": "boolean",
+                    "default": true,
+                    "description": "%json.enableSchemaDownload.desc%",
+                    "tags": [
+                        "usesOnlineServices"
+                    ]
+                }
             }
         },
         "configurationDefaults": {
@@ -129,10 +130,10 @@
     "dependencies": {
         "request-light": "^0.4.0",
         "vscode-extension-telemetry": "0.1.1",
-        "vscode-languageclient": "7.0.0-next.5.1",
+        "vscode-languageclient": "^7.0.0",
         "vscode-nls": "^5.0.0"
     },
     "devDependencies": {
-        "@types/node": "^12.11.7"
+        "@types/node": "^12.19.9"
     }
 }
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 86df32285..6d1e3143b 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -14,13 +14,13 @@
   "dependencies": {
     "jsonc-parser": "^3.0.0",
     "request-light": "^0.4.0",
-    "vscode-json-languageservice": "^3.11.0",
-    "vscode-languageserver": "7.0.0-next.3",
-    "vscode-uri": "^2.1.2"
+    "vscode-json-languageservice": "^4.0.2",
+    "vscode-languageserver": "^7.0.0",
+    "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "2.2.33",
-    "@types/node": "^12.11.7"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile",
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index e7d2526f1..0266d536c 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -17,23 +17,23 @@ import { RequestService, basename, resolvePath } from './requests';
 type ISchemaAssociations = Record<string, string[]>;
 
 namespace SchemaAssociationNotification {
-	export const type: NotificationType<ISchemaAssociations | SchemaConfiguration[], any> = new NotificationType('json/schemaAssociations');
+	export const type: NotificationType<ISchemaAssociations | SchemaConfiguration[]> = new NotificationType('json/schemaAssociations');
 }
 
 namespace VSCodeContentRequest {
-	export const type: RequestType<string, string, any, any> = new RequestType('vscode/content');
+	export const type: RequestType<string, string, any> = new RequestType('vscode/content');
 }
 
 namespace SchemaContentChangeNotification {
-	export const type: NotificationType<string, any> = new NotificationType('json/schemaContent');
+	export const type: NotificationType<string> = new NotificationType('json/schemaContent');
 }
 
 namespace ResultLimitReachedNotification {
-	export const type: NotificationType<string, any> = new NotificationType('json/resultLimitReached');
+	export const type: NotificationType<string> = new NotificationType('json/resultLimitReached');
 }
 
 namespace ForceValidateRequest {
-	export const type: RequestType<string, Diagnostic[], any, any> = new RequestType('json/validate');
+	export const type: RequestType<string, Diagnostic[], any> = new RequestType('json/validate');
 }
 
 
diff --git a/extensions/json-language-features/server/src/utils/runner.ts b/extensions/json-language-features/server/src/utils/runner.ts
index 3efbc6bbe..968df7987 100644
--- a/extensions/json-language-features/server/src/utils/runner.ts
+++ b/extensions/json-language-features/server/src/utils/runner.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, ResponseError, ErrorCodes } from 'vscode-languageserver';
+import { CancellationToken, ResponseError, LSPErrorCodes } from 'vscode-languageserver';
 
 export function formatError(message: string, err: any): string {
 	if (err instanceof Error) {
@@ -64,5 +64,5 @@ export function runSafe<T, E>(func: () => T, errorVal: T, errorMessage: string,
 
 function cancelValue<E>() {
 	console.log('cancelled');
-	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+	return new ResponseError<E>(LSPErrorCodes.RequestCancelled, 'Request cancelled');
 }
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index ec82f87b5..a49955024 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@types/mocha@2.2.33":
-  version "2.2.33"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
-  integrity sha1-15oAYewnA3n02eIl9AlvtDZmne8=
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 agent-base@4:
   version "4.1.2"
@@ -80,46 +80,46 @@ request-light@^0.4.0:
     https-proxy-agent "^2.2.4"
     vscode-nls "^4.1.2"
 
-vscode-json-languageservice@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz#ad574b36c4346bd7830f1d34b5a5213d3af8d232"
-  integrity sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==
+vscode-json-languageservice@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-4.0.2.tgz#8f91dc3a33dac180063067f8277f4facdc0795b6"
+  integrity sha512-d8Ahw990Cq/G60CzN26rehXcbhbMgMGMmXeN6C/V/RYZUhfs16EELRK+EL7b/3Y8ZGshtKqboePSeDVa94qqFg==
   dependencies:
     jsonc-parser "^3.0.0"
     vscode-languageserver-textdocument "^1.0.1"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-languageserver-types "^3.16.0"
     vscode-nls "^5.0.0"
-    vscode-uri "^2.1.2"
+    vscode-uri "^3.0.2"
 
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
+vscode-jsonrpc@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
 
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
 vscode-languageserver-textdocument@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
   integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
+vscode-languageserver-types@3.16.0, vscode-languageserver-types@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
-vscode-languageserver@7.0.0-next.3:
-  version "7.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz#3833bd09259a4a085baeba90783f1e4d06d81095"
-  integrity sha512-qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg==
+vscode-languageserver@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
+  integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
   dependencies:
-    vscode-languageserver-protocol "3.16.0-next.4"
+    vscode-languageserver-protocol "3.16.0"
 
 vscode-nls@^4.1.2:
   version "4.1.2"
@@ -131,7 +131,7 @@ vscode-nls@^5.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
-vscode-uri@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
-  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
+vscode-uri@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
+  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index a1e87bdbc..8946235df 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 agent-base@4:
   version "4.2.1"
@@ -30,6 +30,24 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.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=
+
 debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -84,6 +102,20 @@ https-proxy-agent@^2.2.4:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -108,10 +140,12 @@ semver@^5.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 vscode-extension-telemetry@0.1.1:
   version "0.1.1"
@@ -120,31 +154,32 @@ vscode-extension-telemetry@0.1.1:
   dependencies:
     applicationinsights "1.0.8"
 
-vscode-jsonrpc@6.0.0-next.2:
-  version "6.0.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz#3d73f86d812304cb91b9fb1efee40ec60b09ed7f"
-  integrity sha512-dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw==
+vscode-jsonrpc@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
+  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
 
-vscode-languageclient@7.0.0-next.5.1:
-  version "7.0.0-next.5.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0-next.5.1.tgz#ed93f14e4c2cdccedf15002c7bf8ef9cb638f36c"
-  integrity sha512-OONvbk3IFpubwF8/Y5uPQaq5J5CEskpeET3SfK4iGlv5OUK+44JawH/SEW5wXuEPpfdMLEMZLuGLU5v5d7N7PQ==
+vscode-languageclient@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz#b505c22c21ffcf96e167799757fca07a6bad0fb2"
+  integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==
   dependencies:
-    semver "^6.3.0"
-    vscode-languageserver-protocol "3.16.0-next.4"
+    minimatch "^3.0.4"
+    semver "^7.3.4"
+    vscode-languageserver-protocol "3.16.0"
 
-vscode-languageserver-protocol@3.16.0-next.4:
-  version "3.16.0-next.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz#8f8b1b831d4dfd9b26aa1ba3d2a32c427a91c99f"
-  integrity sha512-6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ==
+vscode-languageserver-protocol@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
+  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
   dependencies:
-    vscode-jsonrpc "6.0.0-next.2"
-    vscode-languageserver-types "3.16.0-next.2"
+    vscode-jsonrpc "6.0.0"
+    vscode-languageserver-types "3.16.0"
 
-vscode-languageserver-types@3.16.0-next.2:
-  version "3.16.0-next.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
-  integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==
+vscode-languageserver-types@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
 
 vscode-nls@^4.1.2:
   version "4.1.2"
@@ -156,6 +191,11 @@ vscode-nls@^5.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
   integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
+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"
diff --git a/extensions/log/cgmanifest.json b/extensions/log/cgmanifest.json
index 0fe21e5c2..be1411f81 100644
--- a/extensions/log/cgmanifest.json
+++ b/extensions/log/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "vscode-logfile-highlighter",
 					"repositoryUrl": "https://github.com/emilast/vscode-logfile-highlighter",
-					"commitHash": "5dcab1c304110b605041824cde3810c6ef305477"
+					"commitHash": "6f6eecc097509c6ee8f4141a7bd6a1f243461d68"
 				}
 			},
 			"license": "MIT",
-			"version": "2.8.0"
+			"version": "2.9.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json
index 4882a761e..130656383 100644
--- a/extensions/log/syntaxes/log.tmLanguage.json
+++ b/extensions/log/syntaxes/log.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/emilast/vscode-logfile-highlighter/commit/5dcab1c304110b605041824cde3810c6ef305477",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/6f6eecc097509c6ee8f4141a7bd6a1f243461d68",
 	"name": "Log file",
 	"scopeName": "text.log",
 	"patterns": [
@@ -73,7 +73,7 @@
 			"name": "comment log.date"
 		},
 		{
-			"match": "\\b\\d{2}[^\\w\\s]\\d{2}[^\\w\\s]\\d{4}\\b",
+			"match": "(?<=(^|\\s))\\d{2}[^\\w\\s]\\d{2}[^\\w\\s]\\d{4}\\b",
 			"name": "comment log.date"
 		},
 		{
@@ -114,7 +114,7 @@
 			"name": "string.key, emphasis log.exception"
 		},
 		{
-			"match": "\\b(http|https|ftp|file)://\\S+\\b/?",
+			"match": "\\b[a-z]+://\\S+\\b/?",
 			"name": "constant.language log.constant"
 		},
 		{
diff --git a/extensions/markdown-basics/cgmanifest.json b/extensions/markdown-basics/cgmanifest.json
index 5606dcc7c..92288d403 100644
--- a/extensions/markdown-basics/cgmanifest.json
+++ b/extensions/markdown-basics/cgmanifest.json
@@ -33,12 +33,12 @@
 				"git": {
 					"name": "microsoft/vscode-markdown-tm-grammar",
 					"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
-					"commitHash": "11cf764606cb2cde54badb5d0e5a0758a8871c4b"
+					"commitHash": "7019b191c3ee38b6c345f3a2a843f223eb92ca1e"
 				}
 			},
 			"license": "MIT",
-			"version": "0.0.0"
+			"version": "1.0.0"
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index 13ee6f360..a61af0d0c 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.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/microsoft/vscode-markdown-tm-grammar/commit/f051a36bd9713dd722cbe1bdde9c8240d12f00b4",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/7019b191c3ee38b6c345f3a2a843f223eb92ca1e",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -2574,7 +2574,7 @@
 					"name": "punctuation.definition.link.markdown"
 				}
 			},
-			"match": "(<)((?:mailto:)?[-.\\w]+@[-a-z0-9]+(\\.[-a-z0-9]+)*\\.[a-z]+)(>)",
+			"match": "(<)((?:mailto:)?[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*)(>)",
 			"name": "meta.link.email.lt-gt.markdown"
 		},
 		"link-inet": {
diff --git a/extensions/markdown-language-features/media/index.js b/extensions/markdown-language-features/media/index.js
index 0433f33c8..3215cd6a0 100644
--- a/extensions/markdown-language-features/media/index.js
+++ b/extensions/markdown-language-features/media/index.js
@@ -1 +1 @@
-!function(e){var t={};function n(o){if(t[o])return t[o].exports;var i=t[o]={i:o,l:!1,exports:{}};return e[o].call(i.exports,i,i.exports,n),i.l=!0,i.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 i in e)n.d(o,i,function(t){return e[t]}.bind(null,i));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=3)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});let o=void 0;function i(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=i,t.getSettings=function(){if(o)return o;if(o=i("data-settings"))return o;throw new Error("Could not load settings")}},function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const o=n(0),i="code-line";function r(e){return t=0,n=o.getSettings().lineCount-1,i=e,Math.min(n,Math.max(t,i));var t,n,i}const c=(()=>{let e;return()=>{if(!e){e=[{element:document.body,line:0}];for(const t of document.getElementsByClassName(i)){const n=+t.getAttribute("data-line");isNaN(n)||("CODE"===t.tagName&&t.parentElement&&"PRE"===t.parentElement.tagName?e.push({element:t.parentElement,line:n}):e.push({element:t,line:n}))}}return e}})();function s(e){const t=Math.floor(e),n=c();let o=n[0]||null;for(const e of n){if(e.line===t)return{previous:e,next:void 0};if(e.line>t)return{previous:o,next:e};o=e}return{previous:o}}function a(e){const t=c(),n=e-window.scrollY;let o=-1,i=t.length-1;for(;o+1<i;){const e=Math.floor((o+i)/2),r=u(t[e]);r.top+r.height>=n?i=e:o=e}const r=t[i],s=u(r);if(i>=1&&s.top>n){return{previous:t[o],next:r}}return i>1&&i<t.length&&s.top+s.height>n?{previous:r,next:t[i+1]}:{previous:r}}function u({element:e}){const t=e.getBoundingClientRect(),n=e.querySelector(`.${i}`);if(n){const e=n.getBoundingClientRect(),o=Math.max(1,e.top-t.top);return{top:t.top,height:o}}return t}t.getElementsForSourceLine=s,t.getLineElementsAtPageOffset=a,t.scrollToRevealSourceLine=function(e){if(!o.getSettings().scrollPreviewWithEditor)return;if(e<=0)return void window.scroll(window.scrollX,0);const{previous:t,next:n}=s(e);if(!t)return;let i=0;const r=u(t),c=r.top;if(n&&n.line!==t.line){i=c+(e-t.line)/(n.line-t.line)*(n.element.getBoundingClientRect().top-c)}else{const t=e-Math.floor(e);i=c+r.height*t}window.scroll(window.scrollX,Math.max(1,window.scrollY+i))},t.getEditorLineNumberForPageOffset=function(e){const{previous:t,next:n}=a(e);if(t){const o=u(t),i=e-window.scrollY-o.top;if(n){const e=i/(u(n).top-o.top);return r(t.line+e*(n.line-t.line))}{const e=i/o.height;return r(t.line+e)}}return null},t.getLineElementForFragment=function(e){return c().find(t=>t.element.id===e)}},function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0});const o=n(7),i=n(8),r=n(9),c=n(2),s=n(0),a=n(10);let u=!0;const l=new o.ActiveLineMarker,f=s.getSettings(),d=acquireVsCodeApi(),m=d.getState(),p={..."object"==typeof m?m:{},...s.getData("data-state")};d.setState(p);const g=r.createPosterForVsCode(d);window.cspAlerter.setPoster(g),window.styleLoadingMonitor.setPoster(g),window.onload=()=>{v()},i.onceDocumentLoaded(()=>{const t=p.scrollProgress;"number"!=typeof t||f.fragment?f.scrollPreviewWithEditor&&e(()=>{if(f.fragment){p.fragment=void 0,d.setState(p);const e=c.getLineElementForFragment(f.fragment);e&&(u=!0,c.scrollToRevealSourceLine(e.line))}else isNaN(f.line)||(u=!0,c.scrollToRevealSourceLine(f.line))}):e(()=>{u=!0,window.scrollTo(0,t*document.body.clientHeight)})});const h=(()=>{const e=a(e=>{u=!0,c.scrollToRevealSourceLine(e)},50);return t=>{isNaN(t)||(p.line=t,e(t))}})();let v=a(()=>{const e=[];let t=document.getElementsByTagName("img");if(t){let n;for(n=0;n<t.length;n++){const o=t[n];o.classList.contains("loading")&&o.classList.remove("loading"),e.push({id:o.id,height:o.height,width:o.width})}g.postMessage("cacheImageSizes",e)}},50);window.addEventListener("resize",()=>{u=!0,w(),v()},!0),window.addEventListener("message",e=>{if(e.data.source===f.source)switch(e.data.type){case"onDidChangeTextEditorSelection":l.onDidChangeTextEditorSelection(e.data.line);break;case"updateView":h(e.data.line)}},!1),document.addEventListener("dblclick",e=>{if(!f.doubleClickToSwitchToEditor)return;for(let t=e.target;t;t=t.parentNode)if("A"===t.tagName)return;const t=e.pageY,n=c.getEditorLineNumberForPageOffset(t);"number"!=typeof n||isNaN(n)||g.postMessage("didClick",{line:Math.floor(n)})});const y=["http:","https:","mailto:","vscode:","vscode-insiders:"];function w(){p.scrollProgress=window.scrollY/document.body.clientHeight,d.setState(p)}document.addEventListener("click",e=>{if(!e)return;let t=e.target;for(;t;){if(t.tagName&&"A"===t.tagName&&t.href){if(t.getAttribute("href").startsWith("#"))return;let n=t.getAttribute("data-href");if(!n){if(y.some(e=>t.href.startsWith(e)))return;n=t.getAttribute("href")}return/^[a-z\-]+:/i.test(n)?void 0:(g.postMessage("openLink",{href:n}),e.preventDefault(),void e.stopPropagation())}t=t.parentNode}},!0),window.addEventListener("scroll",a(()=>{if(w(),u)u=!1;else{const e=c.getEditorLineNumberForPageOffset(window.scrollY);"number"!=typeof e||isNaN(e)||g.postMessage("revealLine",{line:e})}},50))}).call(this,n(4).setImmediate)},function(e,t,n){(function(e){var o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout((function(){e._onTimeout&&e._onTimeout()}),t))},n(5),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(1))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var o,i,r,c,s,a=1,u={},l=!1,f=e.document,d=Object.getPrototypeOf&&Object.getPrototypeOf(e);d=d&&d.setTimeout?d:e,"[object process]"==={}.toString.call(e.process)?o=function(e){t.nextTick((function(){p(e)}))}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((r=new MessageChannel).port1.onmessage=function(e){p(e.data)},o=function(e){r.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(i=f.documentElement,o=function(e){var t=f.createElement("script");t.onreadystatechange=function(){p(e),t.onreadystatechange=null,i.removeChild(t),t=null},i.appendChild(t)}):o=function(e){setTimeout(p,0,e)}:(c="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(c)&&p(+t.data.slice(c.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),o=function(t){e.postMessage(c+t,"*")}),d.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var i={callback:e,args:t};return u[a]=i,o(a),a++},d.clearImmediate=m}function m(e){delete u[e]}function p(e){if(l)setTimeout(p,0,e);else{var t=u[e];if(t){l=!0;try{!function(e){var t=e.callback,o=e.args;switch(o.length){case 0:t();break;case 1:t(o[0]);break;case 2:t(o[0],o[1]);break;case 3:t(o[0],o[1],o[2]);break;default:t.apply(n,o)}}(t)}finally{m(e),l=!1}}}}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,n(1),n(6))},function(e,t){var n,o,i=e.exports={};function r(){throw new Error("setTimeout has not been defined")}function c(){throw new Error("clearTimeout has not been defined")}function s(e){if(n===setTimeout)return setTimeout(e,0);if((n===r||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:r}catch(e){n=r}try{o="function"==typeof clearTimeout?clearTimeout:c}catch(e){o=c}}();var a,u=[],l=!1,f=-1;function d(){l&&a&&(l=!1,a.length?u=a.concat(u):f=-1,u.length&&m())}function m(){if(!l){var e=s(d);l=!0;for(var t=u.length;t;){for(a=u,u=[];++f<t;)a&&a[f].run();f=-1,t=u.length}a=null,l=!1,function(e){if(o===clearTimeout)return clearTimeout(e);if((o===c||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(e);try{o(e)}catch(t){try{return o.call(null,e)}catch(t){return o.call(this,e)}}}(e)}}function p(e,t){this.fun=e,this.array=t}function g(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];u.push(new p(e,t)),1!==u.length||l||s(m)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=g,i.addListener=g,i.once=g,i.off=g,i.removeListener=g,i.removeAllListeners=g,i.emit=g,i.prependListener=g,i.prependOnceListener=g,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const o=n(2);t.ActiveLineMarker=class{onDidChangeTextEditorSelection(e){const{previous:t}=o.getElementsForSourceLine(e);this._update(t&&t.element)}_update(e){this._unmarkActiveElement(this._current),this._markActiveElement(e),this._current=e}_unmarkActiveElement(e){e&&(e.className=e.className.replace(/\bcode-active-line\b/g,""))}_markActiveElement(e){e&&(e.className+=" code-active-line")}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.onceDocumentLoaded=function(e){"loading"===document.readyState||"uninitialized"===document.readyState?document.addEventListener("DOMContentLoaded",e):e()}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const o=n(0);t.createPosterForVsCode=e=>new class{postMessage(t,n){e.postMessage({type:t,source:o.getSettings().source,body:n})}}},function(e,t,n){(function(t){var n="Expected a function",o=NaN,i="[object Symbol]",r=/^\s+|\s+$/g,c=/^[-+]0x[0-9a-f]+$/i,s=/^0b[01]+$/i,a=/^0o[0-7]+$/i,u=parseInt,l="object"==typeof t&&t&&t.Object===Object&&t,f="object"==typeof self&&self&&self.Object===Object&&self,d=l||f||Function("return this")(),m=Object.prototype.toString,p=Math.max,g=Math.min,h=function(){return d.Date.now()};function v(e,t,o){var i,r,c,s,a,u,l=0,f=!1,d=!1,m=!0;if("function"!=typeof e)throw new TypeError(n);function v(t){var n=i,o=r;return i=r=void 0,l=t,s=e.apply(o,n)}function b(e){var n=e-u;return void 0===u||n>=t||n<0||d&&e-l>=c}function T(){var e=h();if(b(e))return E(e);a=setTimeout(T,function(e){var n=t-(e-u);return d?g(n,c-(e-l)):n}(e))}function E(e){return a=void 0,m&&i?v(e):(i=r=void 0,s)}function _(){var e=h(),n=b(e);if(i=arguments,r=this,u=e,n){if(void 0===a)return function(e){return l=e,a=setTimeout(T,t),f?v(e):s}(u);if(d)return a=setTimeout(T,t),v(u)}return void 0===a&&(a=setTimeout(T,t)),s}return t=w(t)||0,y(o)&&(f=!!o.leading,c=(d="maxWait"in o)?p(w(o.maxWait)||0,t):c,m="trailing"in o?!!o.trailing:m),_.cancel=function(){void 0!==a&&clearTimeout(a),l=0,i=u=r=a=void 0},_.flush=function(){return void 0===a?s:E(h())},_}function y(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function w(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&m.call(e)==i}(e))return o;if(y(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=y(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(r,"");var n=s.test(e);return n||a.test(e)?u(e.slice(2),n?2:8):c.test(e)?o:+e}e.exports=function(e,t,o){var i=!0,r=!0;if("function"!=typeof e)throw new TypeError(n);return y(o)&&(i="leading"in o?!!o.leading:i,r="trailing"in o?!!o.trailing:r),v(e,t,{leading:i,maxWait:t,trailing:r})}}).call(this,n(1))}]);
\ No newline at end of file
+!function(e){var t={};function n(o){if(t[o])return t[o].exports;var i=t[o]={i:o,l:!1,exports:{}};return e[o].call(i.exports,i,i.exports,n),i.l=!0,i.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 i in e)n.d(o,i,function(t){return e[t]}.bind(null,i));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=3)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getSettings=t.getData=void 0;let o=void 0;function i(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=i,t.getSettings=function(){if(o)return o;if(o=i("data-settings"),o)return o;throw new Error("Could not load settings")}},function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getLineElementForFragment=t.getEditorLineNumberForPageOffset=t.scrollToRevealSourceLine=t.getLineElementsAtPageOffset=t.getElementsForSourceLine=void 0;const o=n(0);function i(e){return t=0,n=o.getSettings().lineCount-1,i=e,Math.min(n,Math.max(t,i));var t,n,i}const r=(()=>{let e;return()=>{if(!e){e=[{element:document.body,line:0}];for(const t of document.getElementsByClassName("code-line")){const n=+t.getAttribute("data-line");isNaN(n)||("CODE"===t.tagName&&t.parentElement&&"PRE"===t.parentElement.tagName?e.push({element:t.parentElement,line:n}):e.push({element:t,line:n}))}}return e}})();function s(e){const t=Math.floor(e),n=r();let o=n[0]||null;for(const e of n){if(e.line===t)return{previous:e,next:void 0};if(e.line>t)return{previous:o,next:e};o=e}return{previous:o}}function a(e){const t=r(),n=e-window.scrollY;let o=-1,i=t.length-1;for(;o+1<i;){const e=Math.floor((o+i)/2),r=c(t[e]);r.top+r.height>=n?i=e:o=e}const s=t[i],a=c(s);if(i>=1&&a.top>n){return{previous:t[o],next:s}}return i>1&&i<t.length&&a.top+a.height>n?{previous:s,next:t[i+1]}:{previous:s}}function c({element:e}){const t=e.getBoundingClientRect(),n=e.querySelector(".code-line");if(n){const e=n.getBoundingClientRect(),o=Math.max(1,e.top-t.top);return{top:t.top,height:o}}return t}t.getElementsForSourceLine=s,t.getLineElementsAtPageOffset=a,t.scrollToRevealSourceLine=function(e){if(!o.getSettings().scrollPreviewWithEditor)return;if(e<=0)return void window.scroll(window.scrollX,0);const{previous:t,next:n}=s(e);if(!t)return;let i=0;const r=c(t),a=r.top;if(n&&n.line!==t.line){i=a+(e-t.line)/(n.line-t.line)*(n.element.getBoundingClientRect().top-a)}else{const t=e-Math.floor(e);i=a+r.height*t}i=Math.abs(i)<1?Math.sign(i):i,window.scroll(window.scrollX,Math.max(1,window.scrollY+i))},t.getEditorLineNumberForPageOffset=function(e){const{previous:t,next:n}=a(e);if(t){const o=c(t),r=e-window.scrollY-o.top;if(n){const e=r/(c(n).top-o.top);return i(t.line+e*(n.line-t.line))}{const e=r/o.height;return i(t.line+e)}}return null},t.getLineElementForFragment=function(e){return r().find(t=>t.element.id===e)}},function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0});const o=n(7),i=n(8),r=n(9),s=n(2),a=n(0),c=n(10);let u=0;const l=new o.ActiveLineMarker,f=a.getSettings(),d=acquireVsCodeApi(),m=d.getState(),g={..."object"==typeof m?m:{},...a.getData("data-state")};d.setState(g);const p=r.createPosterForVsCode(d);function h(t){const n=document.getElementsByTagName("img");if(n.length>0){const o=Array.from(n).map(e=>e.complete?Promise.resolve():new Promise(t=>{e.addEventListener("load",()=>t()),e.addEventListener("error",()=>t())}));Promise.all(o).then(()=>e(t))}else e(t)}window.cspAlerter.setPoster(p),window.styleLoadingMonitor.setPoster(p),window.onload=()=>{y()},i.onceDocumentLoaded(()=>{const e=g.scrollProgress;"number"!=typeof e||f.fragment?f.scrollPreviewWithEditor&&h(()=>{if(f.fragment){g.fragment=void 0,d.setState(g);const e=s.getLineElementForFragment(f.fragment);e&&(u+=1,s.scrollToRevealSourceLine(e.line))}else isNaN(f.line)||(u+=1,s.scrollToRevealSourceLine(f.line))}):h(()=>{u+=1,window.scrollTo(0,e*document.body.clientHeight)})});const v=(()=>{const e=c(e=>{u+=1,h(()=>s.scrollToRevealSourceLine(e))},50);return t=>{isNaN(t)||(g.line=t,e(t))}})();let y=c(()=>{const e=[];let t=document.getElementsByTagName("img");if(t){let n;for(n=0;n<t.length;n++){const o=t[n];o.classList.contains("loading")&&o.classList.remove("loading"),e.push({id:o.id,height:o.height,width:o.width})}p.postMessage("cacheImageSizes",e)}},50);window.addEventListener("resize",()=>{u+=1,b(),y()},!0),window.addEventListener("message",e=>{if(e.data.source===f.source)switch(e.data.type){case"onDidChangeTextEditorSelection":l.onDidChangeTextEditorSelection(e.data.line);break;case"updateView":v(e.data.line)}},!1),document.addEventListener("dblclick",e=>{if(!f.doubleClickToSwitchToEditor)return;for(let t=e.target;t;t=t.parentNode)if("A"===t.tagName)return;const t=e.pageY,n=s.getEditorLineNumberForPageOffset(t);"number"!=typeof n||isNaN(n)||p.postMessage("didClick",{line:Math.floor(n)})});const w=["http:","https:","mailto:","vscode:","vscode-insiders:"];function b(){g.scrollProgress=window.scrollY/document.body.clientHeight,d.setState(g)}document.addEventListener("click",e=>{if(!e)return;let t=e.target;for(;t;){if(t.tagName&&"A"===t.tagName&&t.href){if(t.getAttribute("href").startsWith("#"))return;let n=t.getAttribute("data-href");if(!n){if(w.some(e=>t.href.startsWith(e)))return;n=t.getAttribute("href")}return/^[a-z\-]+:/i.test(n)?void 0:(p.postMessage("openLink",{href:n}),e.preventDefault(),void e.stopPropagation())}t=t.parentNode}},!0),window.addEventListener("scroll",c(()=>{if(b(),u>0)u-=1;else{const e=s.getEditorLineNumberForPageOffset(window.scrollY);"number"!=typeof e||isNaN(e)||p.postMessage("revealLine",{line:e})}},50))}).call(this,n(4).setImmediate)},function(e,t,n){(function(e){var o=void 0!==e&&e||"undefined"!=typeof self&&self||window,i=Function.prototype.apply;function r(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new r(i.call(setTimeout,o,arguments),clearTimeout)},t.setInterval=function(){return new r(i.call(setInterval,o,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},r.prototype.unref=r.prototype.ref=function(){},r.prototype.close=function(){this._clearFn.call(o,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout((function(){e._onTimeout&&e._onTimeout()}),t))},n(5),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(1))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var o,i,r,s,a,c=1,u={},l=!1,f=e.document,d=Object.getPrototypeOf&&Object.getPrototypeOf(e);d=d&&d.setTimeout?d:e,"[object process]"==={}.toString.call(e.process)?o=function(e){t.nextTick((function(){g(e)}))}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((r=new MessageChannel).port1.onmessage=function(e){g(e.data)},o=function(e){r.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(i=f.documentElement,o=function(e){var t=f.createElement("script");t.onreadystatechange=function(){g(e),t.onreadystatechange=null,i.removeChild(t),t=null},i.appendChild(t)}):o=function(e){setTimeout(g,0,e)}:(s="setImmediate$"+Math.random()+"$",a=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(s)&&g(+t.data.slice(s.length))},e.addEventListener?e.addEventListener("message",a,!1):e.attachEvent("onmessage",a),o=function(t){e.postMessage(s+t,"*")}),d.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var i={callback:e,args:t};return u[c]=i,o(c),c++},d.clearImmediate=m}function m(e){delete u[e]}function g(e){if(l)setTimeout(g,0,e);else{var t=u[e];if(t){l=!0;try{!function(e){var t=e.callback,n=e.args;switch(n.length){case 0:t();break;case 1:t(n[0]);break;case 2:t(n[0],n[1]);break;case 3:t(n[0],n[1],n[2]);break;default:t.apply(void 0,n)}}(t)}finally{m(e),l=!1}}}}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,n(1),n(6))},function(e,t){var n,o,i=e.exports={};function r(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(e){if(n===setTimeout)return setTimeout(e,0);if((n===r||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:r}catch(e){n=r}try{o="function"==typeof clearTimeout?clearTimeout:s}catch(e){o=s}}();var c,u=[],l=!1,f=-1;function d(){l&&c&&(l=!1,c.length?u=c.concat(u):f=-1,u.length&&m())}function m(){if(!l){var e=a(d);l=!0;for(var t=u.length;t;){for(c=u,u=[];++f<t;)c&&c[f].run();f=-1,t=u.length}c=null,l=!1,function(e){if(o===clearTimeout)return clearTimeout(e);if((o===s||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(e);try{o(e)}catch(t){try{return o.call(null,e)}catch(t){return o.call(this,e)}}}(e)}}function g(e,t){this.fun=e,this.array=t}function p(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];u.push(new g(e,t)),1!==u.length||l||a(m)},g.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=p,i.addListener=p,i.once=p,i.off=p,i.removeListener=p,i.removeAllListeners=p,i.emit=p,i.prependListener=p,i.prependOnceListener=p,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.ActiveLineMarker=void 0;const o=n(2);t.ActiveLineMarker=class{onDidChangeTextEditorSelection(e){const{previous:t}=o.getElementsForSourceLine(e);this._update(t&&t.element)}_update(e){this._unmarkActiveElement(this._current),this._markActiveElement(e),this._current=e}_unmarkActiveElement(e){e&&(e.className=e.className.replace(/\bcode-active-line\b/g,""))}_markActiveElement(e){e&&(e.className+=" code-active-line")}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.onceDocumentLoaded=void 0,t.onceDocumentLoaded=function(e){"loading"===document.readyState||"uninitialized"===document.readyState?document.addEventListener("DOMContentLoaded",e):e()}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createPosterForVsCode=void 0;const o=n(0);t.createPosterForVsCode=e=>new class{postMessage(t,n){e.postMessage({type:t,source:o.getSettings().source,body:n})}}},function(e,t,n){(function(t){var n=/^\s+|\s+$/g,o=/^[-+]0x[0-9a-f]+$/i,i=/^0b[01]+$/i,r=/^0o[0-7]+$/i,s=parseInt,a="object"==typeof t&&t&&t.Object===Object&&t,c="object"==typeof self&&self&&self.Object===Object&&self,u=a||c||Function("return this")(),l=Object.prototype.toString,f=Math.max,d=Math.min,m=function(){return u.Date.now()};function g(e,t,n){var o,i,r,s,a,c,u=0,l=!1,g=!1,v=!0;if("function"!=typeof e)throw new TypeError("Expected a function");function y(t){var n=o,r=i;return o=i=void 0,u=t,s=e.apply(r,n)}function w(e){return u=e,a=setTimeout(T,t),l?y(e):s}function b(e){var n=e-c;return void 0===c||n>=t||n<0||g&&e-u>=r}function T(){var e=m();if(b(e))return E(e);a=setTimeout(T,function(e){var n=t-(e-c);return g?d(n,r-(e-u)):n}(e))}function E(e){return a=void 0,v&&o?y(e):(o=i=void 0,s)}function L(){var e=m(),n=b(e);if(o=arguments,i=this,c=e,n){if(void 0===a)return w(c);if(g)return a=setTimeout(T,t),y(c)}return void 0===a&&(a=setTimeout(T,t)),s}return t=h(t)||0,p(n)&&(l=!!n.leading,r=(g="maxWait"in n)?f(h(n.maxWait)||0,t):r,v="trailing"in n?!!n.trailing:v),L.cancel=function(){void 0!==a&&clearTimeout(a),u=0,o=c=i=a=void 0},L.flush=function(){return void 0===a?s:E(m())},L}function p(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}function h(e){if("number"==typeof e)return e;if(function(e){return"symbol"==typeof e||function(e){return!!e&&"object"==typeof e}(e)&&"[object Symbol]"==l.call(e)}(e))return NaN;if(p(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=p(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(n,"");var a=i.test(e);return a||r.test(e)?s(e.slice(2),a?2:8):o.test(e)?NaN:+e}e.exports=function(e,t,n){var o=!0,i=!0;if("function"!=typeof e)throw new TypeError("Expected a function");return p(n)&&(o="leading"in n?!!n.leading:o,i="trailing"in n?!!n.trailing:i),g(e,t,{leading:o,maxWait:t,trailing:i})}}).call(this,n(1))}]);
\ No newline at end of file
diff --git a/extensions/markdown-language-features/media/pre.js b/extensions/markdown-language-features/media/pre.js
index 8268f1e2d..5a2fa4262 100644
--- a/extensions/markdown-language-features/media/pre.js
+++ b/extensions/markdown-language-features/media/pre.js
@@ -1 +1 @@
-!function(e){var t={};function n(s){if(t[s])return t[s].exports;var o=t[s]={i:s,l:!1,exports:{}};return e[s].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,s){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:s})},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 s=Object.create(null);if(n.r(s),Object.defineProperty(s,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(s,o,function(t){return e[t]}.bind(null,o));return s},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});let s=void 0;function o(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=o,t.getSettings=function(){if(s)return s;if(s=o("data-settings"))return s;throw new Error("Could not load settings")}},,,,,,,,,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const s=n(12),o=n(14);window.cspAlerter=new s.CspAlerter,window.styleLoadingMonitor=new o.StyleLoadingMonitor},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});const s=n(0),o=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=o.getStrings(),t=s.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=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=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})}}}]);
\ No newline at end of file
+!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})}}}]);
\ No newline at end of file
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 72b952e82..d72f4cd94 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -324,24 +324,17 @@
 		"watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
 	},
 	"dependencies": {
-		"highlight.js": "10.1.2",
-		"markdown-it": "^10.0.0",
+		"highlight.js": "^10.4.1",
+		"markdown-it": "^12.0.3",
 		"markdown-it-front-matter": "^0.2.1",
 		"vscode-extension-telemetry": "0.1.1",
 		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
-		"@types/highlight.js": "9.12.3",
+		"@types/highlight.js": "10.1.0",
 		"@types/lodash.throttle": "^4.1.3",
 		"@types/markdown-it": "0.0.2",
-		"@types/node": "^12.11.7",
-		"lodash.throttle": "^4.1.1",
-		"mocha-junit-reporter": "^1.17.0",
-		"mocha-multi-reporters": "^1.1.7",
-		"ts-loader": "^6.2.1",
-		"typescript": "^3.7.3",
-		"vscode": "^1.1.10",
-		"webpack": "^4.41.2",
-		"webpack-cli": "^3.3.0"
+		"@types/node": "^12.19.9",
+		"lodash.throttle": "^4.1.1"
 	}
 }
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 064c30ac9..90e96b6b3 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -12,7 +12,7 @@ import throttle = require('lodash.throttle');
 
 declare let acquireVsCodeApi: any;
 
-let scrollDisabled = true;
+let scrollDisabledCount = 0;
 const marker = new ActiveLineMarker();
 const settings = getSettings();
 
@@ -37,19 +37,39 @@ window.onload = () => {
 	updateImageSizes();
 };
 
+
+function doAfterImagesLoaded(cb: () => void) {
+	const imgElements = document.getElementsByTagName('img');
+	if (imgElements.length > 0) {
+		const ps = Array.from(imgElements).map(e => {
+			if (e.complete) {
+				return Promise.resolve();
+			} else {
+				return new Promise<void>((resolve) => {
+					e.addEventListener('load', () => resolve());
+					e.addEventListener('error', () => resolve());
+				});
+			}
+		});
+		Promise.all(ps).then(() => setImmediate(cb));
+	} else {
+		setImmediate(cb);
+	}
+}
+
 onceDocumentLoaded(() => {
 	const scrollProgress = state.scrollProgress;
 
 	if (typeof scrollProgress === 'number' && !settings.fragment) {
-		setImmediate(() => {
-			scrollDisabled = true;
+		doAfterImagesLoaded(() => {
+			scrollDisabledCount += 1;
 			window.scrollTo(0, scrollProgress * document.body.clientHeight);
 		});
 		return;
 	}
 
 	if (settings.scrollPreviewWithEditor) {
-		setImmediate(() => {
+		doAfterImagesLoaded(() => {
 			// Try to scroll to fragment if available
 			if (settings.fragment) {
 				state.fragment = undefined;
@@ -57,12 +77,12 @@ onceDocumentLoaded(() => {
 
 				const element = getLineElementForFragment(settings.fragment);
 				if (element) {
-					scrollDisabled = true;
+					scrollDisabledCount += 1;
 					scrollToRevealSourceLine(element.line);
 				}
 			} else {
 				if (!isNaN(settings.line!)) {
-					scrollDisabled = true;
+					scrollDisabledCount += 1;
 					scrollToRevealSourceLine(settings.line!);
 				}
 			}
@@ -72,8 +92,8 @@ onceDocumentLoaded(() => {
 
 const onUpdateView = (() => {
 	const doScroll = throttle((line: number) => {
-		scrollDisabled = true;
-		scrollToRevealSourceLine(line);
+		scrollDisabledCount += 1;
+		doAfterImagesLoaded(() => scrollToRevealSourceLine(line));
 	}, 50);
 
 	return (line: number) => {
@@ -109,7 +129,7 @@ let updateImageSizes = throttle(() => {
 }, 50);
 
 window.addEventListener('resize', () => {
-	scrollDisabled = true;
+	scrollDisabledCount += 1;
 	updateScrollProgress();
 	updateImageSizes();
 }, true);
@@ -189,8 +209,8 @@ document.addEventListener('click', event => {
 window.addEventListener('scroll', throttle(() => {
 	updateScrollProgress();
 
-	if (scrollDisabled) {
-		scrollDisabled = false;
+	if (scrollDisabledCount > 0) {
+		scrollDisabledCount -= 1;
 	} else {
 		const line = getEditorLineNumberForPageOffset(window.scrollY);
 		if (typeof line === 'number' && !isNaN(line)) {
diff --git a/extensions/markdown-language-features/preview-src/scroll-sync.ts b/extensions/markdown-language-features/preview-src/scroll-sync.ts
index e83386206..4d1adcfb3 100644
--- a/extensions/markdown-language-features/preview-src/scroll-sync.ts
+++ b/extensions/markdown-language-features/preview-src/scroll-sync.ts
@@ -143,6 +143,7 @@ export function scrollToRevealSourceLine(line: number) {
 		const progressInElement = line - Math.floor(line);
 		scrollTo = previousTop + (rect.height * progressInElement);
 	}
+	scrollTo = Math.abs(scrollTo) < 1 ? Math.sign(scrollTo) : scrollTo;
 	window.scroll(window.scrollX, Math.max(1, window.scrollY + scrollTo));
 }
 
diff --git a/extensions/markdown-language-features/src/commands/renderDocument.ts b/extensions/markdown-language-features/src/commands/renderDocument.ts
index f9ec89fce..d46e10d52 100644
--- a/extensions/markdown-language-features/src/commands/renderDocument.ts
+++ b/extensions/markdown-language-features/src/commands/renderDocument.ts
@@ -15,6 +15,6 @@ export class RenderDocument implements Command {
 	) { }
 
 	public async execute(document: SkinnyTextDocument | string): Promise<string> {
-		return this.engine.render(document);
+		return (await (this.engine.render(document))).html;
 	}
 }
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 9244546c5..9363431f8 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -14,8 +14,9 @@ import { isMarkdownFile } from '../util/file';
 import { normalizeResource, WebviewResourceProvider } from '../util/resources';
 import { getVisibleLine, TopmostLineMonitor } from '../util/topmostLineMonitor';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
-import { MarkdownContentProvider } from './previewContentProvider';
+import { MarkdownContentProvider, MarkdownContentProviderOutput } from './previewContentProvider';
 import { MarkdownEngine } from '../markdownEngine';
+import { urlToUri } from '../util/url';
 
 const localize = nls.loadMessageBundle();
 
@@ -90,7 +91,7 @@ class StartingScrollLine {
 	) { }
 }
 
-class StartingScrollFragment {
+export class StartingScrollFragment {
 	public readonly type = 'fragment';
 
 	constructor(
@@ -118,6 +119,8 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	private _disposed: boolean = false;
 	private imageInfo: { readonly id: string, readonly width: number, readonly height: number; }[] = [];
 
+	private readonly _fileWatchersBySrc = new Map</* src: */ string, vscode.FileSystemWatcher>();
+
 	constructor(
 		webview: vscode.WebviewPanel,
 		resource: vscode.Uri,
@@ -156,6 +159,16 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}));
 
+		const watcher = this._register(vscode.workspace.createFileSystemWatcher(resource.fsPath));
+		this._register(watcher.onDidChange(uri => {
+			if (this.isPreviewOf(uri)) {
+				// Only use the file system event when VS Code does not already know about the file
+				if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() !== uri.toString())) {
+					this.refresh();
+				}
+			}
+		}));
+
 		this._register(this._webviewPanel.webview.onDidReceiveMessage((e: CacheImageSizesMessage | RevealLineMessage | DidClickMessage | ClickLinkMessage | ShowPreviewSecuritySelectorMessage | PreviewStyleLoadErrorMessage) => {
 			if (e.source !== this._resource.toString()) {
 				return;
@@ -198,6 +211,9 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		super.dispose();
 		this._disposed = true;
 		clearTimeout(this.throttleTimer);
+		for (const entry of this._fileWatchersBySrc.values()) {
+			entry.dispose();
+		}
 	}
 
 	public get resource(): vscode.Uri {
@@ -214,6 +230,10 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		};
 	}
 
+	/**
+	 * The first call immediately refreshes the preview,
+	 * calls happening shortly thereafter are debounced.
+	*/
 	public refresh() {
 		// Schedule update if none is pending
 		if (!this.throttleTimer) {
@@ -350,7 +370,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		this._webviewPanel.webview.html = this._contentProvider.provideFileNotFoundContent(this._resource);
 	}
 
-	private setContent(html: string): void {
+	private setContent(content: MarkdownContentProviderOutput): void {
 		if (this._disposed) {
 			return;
 		}
@@ -361,7 +381,30 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		this._webviewPanel.iconPath = this.iconPath;
 		this._webviewPanel.webview.options = this.getWebviewOptions();
 
-		this._webviewPanel.webview.html = html;
+		this._webviewPanel.webview.html = content.html;
+
+		const srcs = new Set(content.containingImages.map(img => img.src));
+
+		// Delete stale file watchers.
+		for (const [src, watcher] of [...this._fileWatchersBySrc]) {
+			if (!srcs.has(src)) {
+				watcher.dispose();
+				this._fileWatchersBySrc.delete(src);
+			}
+		}
+
+		// Create new file watchers.
+		const root = vscode.Uri.joinPath(this._resource, '../');
+		for (const src of srcs) {
+			const uri = urlToUri(src, root);
+			if (uri && uri.scheme === 'file' && !this._fileWatchersBySrc.has(src)) {
+				const watcher = vscode.workspace.createFileSystemWatcher(uri.fsPath);
+				watcher.onDidChange(() => {
+					this.refresh();
+				});
+				this._fileWatchersBySrc.set(src, watcher);
+			}
+		}
 	}
 
 	private getWebviewOptions(): vscode.WebviewOptions {
diff --git a/extensions/markdown-language-features/src/features/previewContentProvider.ts b/extensions/markdown-language-features/src/features/previewContentProvider.ts
index a8a64e527..beeeb569d 100644
--- a/extensions/markdown-language-features/src/features/previewContentProvider.ts
+++ b/extensions/markdown-language-features/src/features/previewContentProvider.ts
@@ -39,6 +39,12 @@ function escapeAttribute(value: string | vscode.Uri): string {
 	return value.toString().replace(/"/g, '&quot;');
 }
 
+export interface MarkdownContentProviderOutput {
+	html: string;
+	containingImages: { src: string }[];
+}
+
+
 export class MarkdownContentProvider {
 	constructor(
 		private readonly engine: MarkdownEngine,
@@ -54,11 +60,12 @@ export class MarkdownContentProvider {
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		initialLine: number | undefined = undefined,
 		state?: any
-	): Promise<string> {
+	): Promise<MarkdownContentProviderOutput> {
 		const sourceUri = markdownDocument.uri;
 		const config = previewConfigurations.loadAndCacheConfiguration(sourceUri);
 		const initialData = {
 			source: sourceUri.toString(),
+			fragment: state?.fragment || markdownDocument.uri.fragment || undefined,
 			line: initialLine,
 			lineCount: markdownDocument.lineCount,
 			scrollPreviewWithEditor: config.scrollPreviewWithEditor,
@@ -75,7 +82,7 @@ export class MarkdownContentProvider {
 		const csp = this.getCsp(resourceProvider, sourceUri, nonce);
 
 		const body = await this.engine.render(markdownDocument);
-		return `<!DOCTYPE html>
+		const html = `<!DOCTYPE html>
 			<html style="${escapeAttribute(this.getSettingsOverrideStyles(config))}">
 			<head>
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
@@ -89,11 +96,15 @@ export class MarkdownContentProvider {
 				<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">
 			</head>
 			<body class="vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
-				${body}
+				${body.html}
 				<div class="code-line" data-line="${markdownDocument.lineCount}"></div>
 				${this.getScripts(resourceProvider, nonce)}
 			</body>
 			</html>`;
+		return {
+			html,
+			containingImages: body.containingImages,
+		};
 	}
 
 	public provideFileNotFoundContent(
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index 3c8ddd774..1b0dc660b 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -9,7 +9,7 @@ import { MarkdownEngine } from '../markdownEngine';
 import { MarkdownContributionProvider } from '../markdownExtensions';
 import { Disposable, disposeAll } from '../util/dispose';
 import { TopmostLineMonitor } from '../util/topmostLineMonitor';
-import { DynamicMarkdownPreview, ManagedMarkdownPreview, StaticMarkdownPreview } from './preview';
+import { DynamicMarkdownPreview, ManagedMarkdownPreview, StartingScrollFragment, StaticMarkdownPreview } from './preview';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
 import { MarkdownContentProvider } from './previewContentProvider';
 
@@ -106,7 +106,10 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			preview = this.createNewDynamicPreview(resource, settings);
 		}
 
-		preview.update(resource);
+		preview.update(
+			resource,
+			resource.fragment ? new StartingScrollFragment(resource.fragment) : undefined
+		);
 	}
 
 	public get activePreviewResource() {
diff --git a/extensions/markdown-language-features/src/features/smartSelect.ts b/extensions/markdown-language-features/src/features/smartSelect.ts
index 12b2bdd78..53c0bb8d8 100644
--- a/extensions/markdown-language-features/src/features/smartSelect.ts
+++ b/extensions/markdown-language-features/src/features/smartSelect.ts
@@ -162,9 +162,9 @@ function createFencedRange(token: Token, cursorLine: number, document: vscode.Te
 }
 
 function createBoldRange(lineText: string, cursorChar: number, cursorLine: number, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const regex = /(?:^|(?<=\s))(?:\*\*\s*([^*]+)(?:\*\s*([^*]+)\s*?\*)*([^*]+)\s*?\*\*)/g;
+	const regex = /(?:\*\*([^*]+)(?:\*([^*]+)([^*]+)\*)*([^*]+)\*\*)/g;
 	const matches = [...lineText.matchAll(regex)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-	if (matches.length > 0) {
+	if (matches.length) {
 		// should only be one match, so select first and index 0 contains the entire match
 		const bold = matches[0][0];
 		const startIndex = lineText.indexOf(bold);
@@ -177,11 +177,20 @@ function createBoldRange(lineText: string, cursorChar: number, cursorLine: numbe
 }
 
 function createOtherInlineRange(lineText: string, cursorChar: number, cursorLine: number, isItalic: boolean, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const regex = isItalic ? /(?:^|(?<=\s))(?:\*\s*([^*]+)(?:\*\*\s*([^*]+)\s*?\*\*)*([^*]+)\s*?\*)/g : /\`[^\`]*\`/g;
-	const matches = [...lineText.matchAll(regex)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-	if (matches.length > 0) {
-		// should only be one match, so select first and index 0 contains the entire match
-		const match = matches[0][0];
+	const italicRegexes = [/(?:[^*]+)(\*([^*]+)(?:\*\*[^*]*\*\*)*([^*]+)\*)(?:[^*]+)/g, /^(?:[^*]*)(\*([^*]+)(?:\*\*[^*]*\*\*)*([^*]+)\*)(?:[^*]*)$/g];
+	let matches = [];
+	if (isItalic) {
+		matches = [...lineText.matchAll(italicRegexes[0])].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
+		if (!matches.length) {
+			matches = [...lineText.matchAll(italicRegexes[1])].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
+		}
+	} else {
+		matches = [...lineText.matchAll(/\`[^\`]*\`/g)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
+	}
+	if (matches.length) {
+		// should only be one match, so select first and select group 1 for italics because that contains just the italic section
+		// doesn't include the leading and trailing characters which are guaranteed to not be * so as not to be confused with bold
+		const match = isItalic ? matches[0][1] : matches[0][0];
 		const startIndex = lineText.indexOf(match);
 		const cursorOnType = cursorChar === startIndex || cursorChar === startIndex + match.length;
 		const contentAndType = new vscode.SelectionRange(new vscode.Range(cursorLine, startIndex, cursorLine, startIndex + match.length), parent);
@@ -195,7 +204,7 @@ function createLinkRange(lineText: string, cursorChar: number, cursorLine: numbe
 	const regex = /(\[[^\(\)]*\])(\([^\[\]]*\))/g;
 	const matches = [...lineText.matchAll(regex)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length > cursorChar);
 
-	if (matches.length > 0) {
+	if (matches.length) {
 		// should only be one match, so select first and index 0 contains the entire match, so match = [text](url)
 		const link = matches[0][0];
 		const linkRange = new vscode.SelectionRange(new vscode.Range(cursorLine, lineText.indexOf(link), cursorLine, lineText.indexOf(link) + link.length), parent);
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 8bb509d45..80761e0ea 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -54,6 +54,15 @@ class TokenCache {
 	}
 }
 
+export interface RenderOutput {
+	html: string;
+	containingImages: { src: string }[];
+}
+
+interface RenderEnv {
+	containingImages: { src: string }[];
+}
+
 export class MarkdownEngine {
 	private md?: Promise<MarkdownIt>;
 
@@ -141,7 +150,7 @@ export class MarkdownEngine {
 		return engine.parse(text.replace(UNICODE_NEWLINE_REGEX, ''), {});
 	}
 
-	public async render(input: SkinnyTextDocument | string): Promise<string> {
+	public async render(input: SkinnyTextDocument | string): Promise<RenderOutput> {
 		const config = this.getConfig(typeof input === 'string' ? undefined : input.uri);
 		const engine = await this.getEngine(config);
 
@@ -149,10 +158,19 @@ export class MarkdownEngine {
 			? this.tokenizeString(input, engine)
 			: this.tokenizeDocument(input, config, engine);
 
-		return engine.renderer.render(tokens, {
+		const env: RenderEnv = {
+			containingImages: []
+		};
+
+		const html = engine.renderer.render(tokens, {
 			...(engine as any).options,
 			...config
-		}, {});
+		}, env);
+
+		return {
+			html,
+			containingImages: env.containingImages
+		};
 	}
 
 	public async parse(document: SkinnyTextDocument): Promise<Token[]> {
@@ -192,12 +210,13 @@ export class MarkdownEngine {
 
 	private addImageStabilizer(md: any): void {
 		const original = md.renderer.rules.image;
-		md.renderer.rules.image = (tokens: any, idx: number, options: any, env: any, self: any) => {
+		md.renderer.rules.image = (tokens: any, idx: number, options: any, env: RenderEnv, self: any) => {
 			const token = tokens[idx];
 			token.attrJoin('class', 'loading');
 
 			const src = token.attrGet('src');
 			if (src) {
+				env.containingImages.push({ src });
 				const imgHash = hash(src);
 				token.attrSet('id', `image-hash-${imgHash}`);
 			}
@@ -231,6 +250,13 @@ export class MarkdownEngine {
 					return normalizeLink(vscode.Uri.parse(link).with({ scheme: vscode.env.uriScheme }).toString());
 				}
 
+				// Support file:// links
+				if (isOfScheme(Schemes.file, link)) {
+					// Ensure link is relative by prepending `/` so that it uses the <base> element URI
+					// when resolving the absolute URL
+					return normalizeLink('/' + link.replace(/^file:/, 'file'));
+				}
+
 				// If original link doesn't look like a url with a scheme, assume it must be a link to a file in workspace
 				if (!/^[a-z\-]+:/i.test(link)) {
 					// Use a fake scheme for parsing
@@ -241,12 +267,14 @@ export class MarkdownEngine {
 					if (uri.path[0] === '/') {
 						const root = vscode.workspace.getWorkspaceFolder(this.currentDocument!);
 						if (root) {
-							const fileUri = vscode.Uri.joinPath(root.uri, uri.fsPath);
-							uri = fileUri.with({
-								scheme: uri.scheme,
+							const fileUri = vscode.Uri.joinPath(root.uri, uri.fsPath).with({
 								fragment: uri.fragment,
 								query: uri.query,
 							});
+
+							// Ensure fileUri is relative by prepending `/` so that it uses the <base> element URI
+							// when resolving the absolute URL
+							uri = vscode.Uri.parse('markdown-link:' + '/' + fileUri.toString(true).replace(/^\S+?:/, fileUri.scheme));
 						}
 					}
 
@@ -269,9 +297,7 @@ export class MarkdownEngine {
 	private addLinkValidator(md: any): void {
 		const validateLink = md.validateLink;
 		md.validateLink = (link: string) => {
-			// support file:// links
 			return validateLink(link)
-				|| isOfScheme(Schemes.file, link)
 				|| isOfScheme(Schemes.vscode, link)
 				|| isOfScheme(Schemes['vscode-insiders'], link)
 				|| /^data:image\/.*?;/.test(link);
diff --git a/extensions/markdown-language-features/src/test/documentLink.test.ts b/extensions/markdown-language-features/src/test/documentLink.test.ts
index 9b26d995f..052610515 100644
--- a/extensions/markdown-language-features/src/test/documentLink.test.ts
+++ b/extensions/markdown-language-features/src/test/documentLink.test.ts
@@ -20,6 +20,11 @@ async function getLinksForFile(file: vscode.Uri): Promise<vscode.DocumentLink[]>
 
 suite('Markdown Document links', () => {
 
+	setup(async () => {
+		// the tests make the assumption that link providers are already registered
+		await vscode.extensions.getExtension('vscode.markdown-language-features')!.activate();
+	});
+
 	teardown(async () => {
 		await vscode.commands.executeCommand('workbench.action.closeAllEditors');
 	});
diff --git a/extensions/markdown-language-features/src/test/engine.test.ts b/extensions/markdown-language-features/src/test/engine.test.ts
index 3cd4f8669..c3eb7c850 100644
--- a/extensions/markdown-language-features/src/test/engine.test.ts
+++ b/extensions/markdown-language-features/src/test/engine.test.ts
@@ -21,12 +21,31 @@ suite('markdown.engine', () => {
 		test('Renders a document', async () => {
 			const doc = new InMemoryDocument(testFileName, input);
 			const engine = createNewMarkdownEngine();
-			assert.strictEqual(await engine.render(doc), output);
+			assert.strictEqual((await engine.render(doc)).html, output);
 		});
 
 		test('Renders a string', async () => {
 			const engine = createNewMarkdownEngine();
-			assert.strictEqual(await engine.render(input), output);
+			assert.strictEqual((await engine.render(input)).html, output);
+		});
+	});
+
+	suite('image-caching', () => {
+		const input = '![](img.png) [](no-img.png) ![](http://example.org/img.png) ![](img.png) ![](./img2.png)';
+
+		test('Extracts all images', async () => {
+			const engine = createNewMarkdownEngine();
+			assert.deepStrictEqual((await engine.render(input)), {
+				html: '<p data-line="0" class="code-line">'
+					+ '<img src="img.png" alt="" class="loading" id="image-hash--754511435"> '
+					+ '<a href="no-img.png" data-href="no-img.png"></a> '
+					+ '<img src="http://example.org/img.png" alt="" class="loading" id="image-hash--1903814170"> '
+					+ '<img src="img.png" alt="" class="loading" id="image-hash--754511435"> '
+					+ '<img src="./img2.png" alt="" class="loading" id="image-hash-265238964">'
+					+ '</p>\n'
+				,
+				containingImages: [{ src: 'img.png' }, { src: 'http://example.org/img.png' }, { src: 'img.png' }, { src: './img2.png' }],
+			});
 		});
 	});
 });
diff --git a/extensions/markdown-language-features/src/test/index.ts b/extensions/markdown-language-features/src/test/index.ts
index 0eb9bc924..56ba0dde4 100644
--- a/extensions/markdown-language-features/src/test/index.ts
+++ b/extensions/markdown-language-features/src/test/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/markdown-language-features/src/test/urlToUri.test.ts b/extensions/markdown-language-features/src/test/urlToUri.test.ts
new file mode 100644
index 000000000..6578d207e
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/urlToUri.test.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { deepStrictEqual } from 'assert';
+import 'mocha';
+import { Uri } from 'vscode';
+import { urlToUri } from '../util/url';
+
+suite('urlToUri', () => {
+	test('Absolute File', () => {
+		deepStrictEqual(
+			urlToUri('file:///root/test.txt', Uri.parse('file:///usr/home/')),
+			Uri.parse('file:///root/test.txt')
+		);
+	});
+
+	test('Relative File', () => {
+		deepStrictEqual(
+			urlToUri('./file.ext', Uri.parse('file:///usr/home/')),
+			Uri.parse('file:///usr/home/file.ext')
+		);
+	});
+
+	test('Http Basic', () => {
+		deepStrictEqual(
+			urlToUri('http://example.org?q=10&f', Uri.parse('file:///usr/home/')),
+			Uri.parse('http://example.org?q=10&f')
+		);
+	});
+
+	test('Http Encoded Chars', () => {
+		deepStrictEqual(
+			urlToUri('http://example.org/%C3%A4', Uri.parse('file:///usr/home/')),
+			Uri.parse('http://example.org/%C3%A4')
+		);
+	});
+});
diff --git a/extensions/markdown-language-features/src/util/url.ts b/extensions/markdown-language-features/src/util/url.ts
new file mode 100644
index 000000000..d91cb4ab0
--- /dev/null
+++ b/extensions/markdown-language-features/src/util/url.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+declare const URL: typeof import('url').URL;
+
+/**
+ * Tries to convert an url into a vscode uri and returns undefined if this is not possible.
+ * `url` can be absolute or relative.
+*/
+export function urlToUri(url: string, base: vscode.Uri): vscode.Uri | undefined {
+	try {
+		// `vscode.Uri.joinPath` cannot be used, since it understands
+		// `src` as path, not as relative url. This is problematic for query args.
+		const parsedUrl = new URL(url, base.toString());
+		const uri = vscode.Uri.parse(parsedUrl.toString());
+		return uri;
+	} catch (e) {
+		// Don't crash if `URL` cannot parse `src`.
+		return undefined;
+	}
+}
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index 065943fa4..b2068e2d4 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -2,10 +2,12 @@
 # yarn lockfile v1
 
 
-"@types/highlight.js@9.12.3":
-  version "9.12.3"
-  resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
-  integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
+"@types/highlight.js@10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-10.1.0.tgz#89bb0c202997d7a90a07bd2ec1f7d00c56bb90b4"
+  integrity sha512-77hF2dGBsOgnvZll1vymYiNUtqJ8cJfXPD6GG/2M0aLRc29PkvB7Au6sIDjIEFcSICBhCh2+Pyq6WSRS7LUm6A==
+  dependencies:
+    highlight.js "*"
 
 "@types/lodash.throttle@^4.1.3":
   version "4.1.3"
@@ -24,289 +26,10 @@
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
   integrity sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-acorn@^6.2.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
-  integrity sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=
-
-ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671"
-  integrity sha1-KKarxJOiq+D7TIUHrK7bQ/pVBnE=
-  dependencies:
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
+"@types/node@^12.19.9":
+  version "12.19.9"
+  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"
@@ -317,882 +40,10 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
-  dependencies:
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
-  integrity sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-base64-js@^1.0.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
-  integrity sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  integrity sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-bluebird@^3.5.5:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
-  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-braces@^2.3.0, braces@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
-  integrity sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    kind-of "^6.0.2"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
-  integrity sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
-  integrity sha1-mYgkSHS/XtTijalWZtzWasj8Njo=
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
-  integrity sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-cacache@^12.0.2:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
-  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^1.0.0, chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-  integrity sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-chokidar@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
-  integrity sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chownr@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
-  integrity sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=
-
-clone@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
-  integrity sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=
-
-cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
-  integrity sha1-pikNQT8hemEjL5XkWP84QYz7ARc=
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
-  integrity sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==
-  dependencies:
-    color-name "^1.1.1"
-
-color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-  integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^2.9.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-  integrity sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-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=
-
-concat-stream@^1.5.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
-  integrity sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-convert-source-map@^1.1.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-  integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
-  integrity sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
-  integrity sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
-  integrity sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@6.0.5, cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@3.1.0, debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-assign@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
-  integrity sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=
-  dependencies:
-    is-obj "^1.0.0"
-
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-  integrity sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.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=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+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"
@@ -1206,3338 +57,54 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-diff@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
-  integrity sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==
-
-diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
-  integrity sha1-tYNXOScM/ias9jIJn97SoH8gnl4=
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
-  integrity sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-duplexify@^3.4.2, duplexify@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
-  integrity sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
-  dependencies:
-    jsbn "~0.1.0"
-
-elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emojis-list@^2.0.0:
+entities@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
+highlight.js@*, highlight.js@^10.4.1:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
+  integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
-  integrity sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
-entities@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
-
-errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
-  dependencies:
-    prr "~1.0.1"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-event-stream@^3.3.1, event-stream@~3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
-  dependencies:
-    kind-of "^1.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+linkify-it@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fancy-log@^1.1.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
-figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  integrity sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-findup-sync@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-flush-write-stream@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
-  integrity sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  integrity sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  integrity sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-  integrity sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0, glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@7.1.2, glob@^7.0.5, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3, glob@^7.1.4:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
-  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-modules@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
-  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
-  dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
-
-glogg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
-  integrity sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.15:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
-growl@1.10.3:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
-  integrity sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==
-
-gulp-chmod@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
-  integrity sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
-gulp-filter@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
-  integrity sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM=
-  dependencies:
-    multimatch "^2.0.0"
-    plugin-error "^0.1.2"
-    streamfilter "^1.0.5"
-
-gulp-gunzip@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz#15b741145e83a9c6f50886241b57cc5871f151a9"
-  integrity sha1-FbdBFF6Dqcb1CIYkG1fMWHHxUak=
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
-gulp-remote-src@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1"
-  integrity sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=
-  dependencies:
-    event-stream "~3.3.4"
-    node.extend "~1.1.2"
-    request "~2.79.0"
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-symdest@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.0.tgz#c165320732d192ce56fd94271ffa123234bf2ae0"
-  integrity sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=
-  dependencies:
-    event-stream "^3.3.1"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^2.4.3"
-
-gulp-untar@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000"
-  integrity sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=
-  dependencies:
-    event-stream "~3.3.4"
-    gulp-util "~3.0.8"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-
-gulp-util@~3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-vinyl-zip@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz#24e40685dc05b7149995245099e0590263be8dad"
-  integrity sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^4.2.1"
-    through2 "^2.0.3"
-    vinyl "^2.0.2"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
-  integrity sha1-ZuodhW206KVHDK32/OI65SRO8uE=
-  dependencies:
-    inherits "^2.0.1"
-
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-highlight.js@10.1.2:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
-  integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
-
-hmac-drbg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
-homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
-  dependencies:
-    parse-passwd "^1.0.0"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-import-local@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-infer-owner@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-interpret@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-my-json-valid@^2.12.4:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
-  integrity sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-odd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-  integrity sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==
-  dependencies:
-    is-number "^4.0.0"
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is-windows@^1.0.1, is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-is@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
-  integrity sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-lazy-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-  integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=
-  dependencies:
-    set-getter "^0.1.0"
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-linkify-it@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-  integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
   dependencies:
     uc.micro "^1.0.1"
 
-loader-runner@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@1.2.3, loader-utils@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@^4.16.4:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-make-dir@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
 markdown-it-front-matter@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/markdown-it-front-matter/-/markdown-it-front-matter-0.2.1.tgz#dca49a827bb3cebb0528452c1d87dff276eb28dc"
   integrity sha512-ydUIqlKfDscRpRUTRcA3maeeUKn3Cl5EaKZSA+I/f0KOGCBurW7e+bbz59sxqkC3FA9Q2S2+t4mpkH9T0BCM6A==
 
-markdown-it@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
-  integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
+markdown-it@^12.0.3:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.3.tgz#8d1e47daf1d716d63610495eb93f6665573e4abe"
+  integrity sha512-M57RsMv+QQmJHz1yCu0gTJRMx/LlxRPtrrw+2kb/CpDVK/graCmWO0qfNnz/SE1FCNdyq3pkMMZ+itTnyT/YGA==
   dependencies:
-    argparse "^1.0.7"
-    entities "~2.0.0"
-    linkify-it "^2.0.0"
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-micromatch@^3.0.4, micromatch@^3.1.10:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^3.1.4:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
-  integrity sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-micromatch@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-mimic-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.0, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
-  integrity sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.11.0"
-    debug "3.1.0"
-    diff "3.3.1"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.3"
-    he "1.1.1"
-    mkdirp "0.5.1"
-    supports-color "4.4.0"
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-nan@^2.3.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
-  integrity sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==
-
-nanomatch@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-  integrity sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-odd "^2.0.0"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-neo-async@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
-  integrity sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==
-
-neo-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
-
-nice-try@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
-  integrity sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==
-
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
-  integrity sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==
-  dependencies:
-    detect-libc "^1.0.2"
-    hawk "3.1.3"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-node.extend@~1.1.2:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96"
-  integrity sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=
-  dependencies:
-    is "^3.1.0"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-path@^2.0.1, normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
-p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
-
-parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
-  dependencies:
-    cyclist "~0.2.2"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
-  integrity sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
-  integrity sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picomatch@^2.0.5:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.0.tgz#0fd042f568d08b1ad9ff2d3ec0f0bfb3cb80e177"
-  integrity sha512-uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
-  integrity sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
-  integrity sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==
-  dependencies:
-    duplexify "^3.5.3"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-  integrity sha1-51vV9uJoEioqDgvaYwslUMFmUCw=
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
-  integrity sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=
-
-queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-queue@^4.2.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-4.4.2.tgz#5a9733d9a8b8bd1b36e934bc9c55ab89b28e29c7"
-  integrity sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==
-  dependencies:
-    inherits "~2.0.0"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  integrity sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-rc@^1.1.7:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
-  integrity sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-"readable-stream@1 || 2", readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
-  integrity sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
-
-repeat-string@^1.5.2, repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@^2.83.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  integrity sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-rimraf@2, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
-  integrity sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=
-  dependencies:
-    hash-base "^2.0.0"
-    inherits "^2.0.1"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-semver@^5.3.0, semver@^5.4.1, semver@^5.5.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==
 
-semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-serialize-javascript@^1.7.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
-  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-getter@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
-  integrity sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=
-  dependencies:
-    to-object-path "^0.3.0"
-
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
-  integrity sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
-  integrity sha1-4StUh/re0+PeoKyR6UAL91tAE3A=
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^2.0.0"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
-source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
-
-source-map-resolve@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
-  integrity sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==
-  dependencies:
-    atob "^2.0.0"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76"
-  integrity sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==
-  dependencies:
-    source-map "^0.6.0"
-
-source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-  integrity sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  integrity sha1-US322mKHFEMW3EwY/hzx2UBzm+M=
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-each@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
-  integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
-  integrity sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.3"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-streamfilter@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
-  integrity sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string_decoder@^1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-supports-color@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-  integrity sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
-  integrity sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==
-  dependencies:
-    has-flag "^3.0.0"
-
-tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-  integrity sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==
-
-tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  integrity sha512-PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-terser-webpack-plugin@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
-  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
-  dependencies:
-    cacache "^12.0.2"
-    find-cache-dir "^2.1.0"
-    is-wsl "^1.1.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.7.0"
-    source-map "^0.6.1"
-    terser "^4.1.2"
-    webpack-sources "^1.4.0"
-    worker-farm "^1.7.0"
-
-terser@^4.1.2:
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
-  integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through@2, through@~2.3, through@~2.3.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-timers-browserify@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
-  integrity sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==
-  dependencies:
-    setimmediate "^1.0.4"
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
-ts-loader@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.1.tgz#67939d5772e8a8c6bdaf6277ca023a4812da02ef"
-  integrity sha512-Dd9FekWuABGgjE1g0TlQJ+4dFUfYGbYcs52/HQObE0ZmUNjQlmLAS7xXsSzy23AMaMwipsx5sNHvoEpT2CZq1g==
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^4.0.0"
-    semver "^6.0.0"
-
-tslib@^1.9.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typescript@^3.7.3:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
-  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
-
 uc.micro@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
@@ -4548,223 +115,6 @@ uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
   integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
-
-union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^0.4.3"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-  integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  integrity sha1-WqADz76Uxf+GbE59ZouxxNuts2k=
-  dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
-  integrity sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==
-  dependencies:
-    querystringify "~1.0.0"
-    requires-port "~1.0.0"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
-  integrity sha1-riig1y+TvyJCKhii43mZMRLeyOg=
-  dependencies:
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-  integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==
-
-v8-compile-cache@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vinyl-fs@^2.0.0, vinyl-fs@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl-source-stream@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz#62b53a135610a896e98ca96bee3a87f008a8e780"
-  integrity sha1-YrU6E1YQqJbpjKlr7jqH8Aio54A=
-  dependencies:
-    through2 "^2.0.3"
-    vinyl "^0.4.3"
-
-vinyl@^0.4.3, vinyl@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
-  integrity sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vm-browserify@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
-  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
-
 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"
@@ -4777,196 +127,6 @@ vscode-nls@^4.0.0:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
   integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
 
-vscode@^1.1.10:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.10.tgz#d1cba378ab24f1d3ddf9cd470d242ee1472dd35b"
-  integrity sha512-MvFXXSGuhw0Q6GC6dQrnRc0ES+63wpttGIoYGBMQnoS9JFCCNC/rWfX0lBCHJyuKL2Q8CYg0ROsMEHbHVwEtVw==
-  dependencies:
-    glob "^7.1.2"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.1"
-    gulp-gunzip "1.0.0"
-    gulp-remote-src "^0.4.3"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^2.1.0"
-    mocha "^4.0.1"
-    request "^2.83.0"
-    semver "^5.4.1"
-    source-map-support "^0.5.0"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
-watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
-  dependencies:
-    chokidar "^2.0.2"
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-
-webpack-cli@^3.3.0:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
-  integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==
-  dependencies:
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    enhanced-resolve "4.1.0"
-    findup-sync "3.0.0"
-    global-modules "2.0.0"
-    import-local "2.0.0"
-    interpret "1.2.0"
-    loader-utils "1.2.3"
-    supports-color "6.1.0"
-    v8-compile-cache "2.0.3"
-    yargs "13.2.4"
-
-webpack-sources@^1.4.0, webpack-sources@^1.4.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack@^4.41.2:
-  version "4.41.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
-  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.1"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
-    watchpack "^1.6.0"
-    webpack-sources "^1.4.1"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@^1.2.14, which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
-  integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==
-  dependencies:
-    string-width "^1.0.2"
-
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
-  dependencies:
-    errno "~0.1.7"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yargs-parser@^13.1.0:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
-yauzl@^2.2.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
-  integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
-yazl@^2.2.1:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
-  integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index d438b96ca..ab645a38f 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -14,7 +14,7 @@
     "Other"
   ],
   "activationEvents": [
-    "*"
+    "onStartupFinished"
   ],
   "main": "./out/mergeConflictMain",
   "browser": "./dist/browser/mergeConflictMain",
@@ -139,6 +139,6 @@
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 64becb504..0d1f221cf 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "microsoft-authentication",
 	"publisher": "vscode",
+	"license": "MIT",
 	"displayName": "%displayName%",
 	"description": "%description%",
 	"version": "0.0.1",
@@ -38,13 +39,11 @@
 		"watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
 	},
 	"devDependencies": {
-		"@types/keytar": "^4.0.1",
-		"@types/node": "^10.12.21",
+		"@types/node": "^12.19.9",
 		"@types/node-fetch": "^2.5.7",
 		"@types/randombytes": "^2.0.0",
 		"@types/sha.js": "^2.4.0",
-		"@types/uuid": "^8.0.0",
-		"typescript": "^3.7.4"
+		"@types/uuid": "8.0.0"
 	},
 	"dependencies": {
 		"buffer": "^5.6.0",
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
index 60455f02a..6222d09d0 100644
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -10,12 +10,13 @@ import * as vscode from 'vscode';
 import { createServer, startServer } from './authServer';
 
 import { v4 as uuid } from 'uuid';
-import { keychain } from './keychain';
+import { Keychain } from './keychain';
 import Logger from './logger';
 import { toBase64UrlEncoding } from './utils';
 import fetch, { Response } from 'node-fetch';
 import { sha256 } from './env/node/sha256';
 import * as nls from 'vscode-nls';
+import { MicrosoftAuthenticationSession } from './microsoft-authentication';
 
 const localize = nls.loadMessageBundle();
 
@@ -26,6 +27,7 @@ const tenant = 'organizations';
 
 interface IToken {
 	accessToken?: string; // When unable to refresh due to network problems, the access token becomes undefined
+	idToken?: string; // depending on the scopes can be either supplied or empty
 
 	expiresIn?: number; // How long access token is valid, in seconds
 	expiresAt?: number; // UNIX epoch time at which token will expire
@@ -71,6 +73,11 @@ export interface ITokenResponse {
 	id_token?: string;
 }
 
+export interface IMicrosoftTokens {
+	accessToken: string;
+	idToken?: string;
+}
+
 function parseQuery(uri: vscode.Uri) {
 	return uri.query.split('&').reduce((prev: any, current) => {
 		const queryString = current.split('=');
@@ -100,13 +107,16 @@ export class AzureActiveDirectoryService {
 	private _codeExchangePromises = new Map<string, Promise<vscode.AuthenticationSession>>();
 	private _codeVerfifiers = new Map<string, string>();
 
-	constructor() {
+	private _keychain: Keychain;
+
+	constructor(private _context: vscode.ExtensionContext) {
+		this._keychain = new Keychain(_context);
 		this._uriHandler = new UriEventHandler();
 		this._disposables.push(vscode.window.registerUriHandler(this._uriHandler));
 	}
 
 	public async initialize(): Promise<void> {
-		const storedData = await keychain.getToken() || await keychain.tryMigrate();
+		const storedData = await this._keychain.getToken() || await this._keychain.tryMigrate();
 		if (storedData) {
 			try {
 				const sessions = this.parseStoredData(storedData);
@@ -146,7 +156,7 @@ export class AzureActiveDirectoryService {
 			}
 		}
 
-		this._disposables.push(vscode.authentication.onDidChangePassword(() => this.checkForUpdates));
+		this._disposables.push(this._context.secrets.onDidChange(() => this.checkForUpdates));
 	}
 
 	private parseStoredData(data: string): IStoredSession[] {
@@ -163,13 +173,13 @@ export class AzureActiveDirectoryService {
 			};
 		});
 
-		await keychain.setToken(JSON.stringify(serializedData));
+		await this._keychain.setToken(JSON.stringify(serializedData));
 	}
 
 	private async checkForUpdates(): Promise<void> {
 		const addedIds: string[] = [];
 		let removedIds: string[] = [];
-		const storedData = await keychain.getToken();
+		const storedData = await this._keychain.getToken();
 		if (storedData) {
 			try {
 				const sessions = this.parseStoredData(storedData);
@@ -225,29 +235,36 @@ export class AzureActiveDirectoryService {
 		}
 	}
 
-	private async convertToSession(token: IToken): Promise<vscode.AuthenticationSession> {
-		const resolvedToken = await this.resolveAccessToken(token);
+	private async convertToSession(token: IToken): Promise<MicrosoftAuthenticationSession> {
+		const resolvedTokens = await this.resolveAccessAndIdTokens(token);
 		return {
 			id: token.sessionId,
-			accessToken: resolvedToken,
+			accessToken: resolvedTokens.accessToken,
+			idToken: resolvedTokens.idToken,
 			account: token.account,
 			scopes: token.scope.split(' ')
 		};
 	}
 
-	private async resolveAccessToken(token: IToken): Promise<string> {
+	private async resolveAccessAndIdTokens(token: IToken): Promise<IMicrosoftTokens> {
 		if (token.accessToken && (!token.expiresAt || token.expiresAt > Date.now())) {
 			token.expiresAt
 				? Logger.info(`Token available from cache, expires in ${token.expiresAt - Date.now()} milliseconds`)
 				: Logger.info('Token available from cache');
-			return Promise.resolve(token.accessToken);
+			return Promise.resolve({
+				accessToken: token.accessToken,
+				idToken: token.idToken
+			});
 		}
 
 		try {
 			Logger.info('Token expired or unavailable, trying refresh');
 			const refreshedToken = await this.refreshToken(token.refreshToken, token.scope, token.sessionId);
 			if (refreshedToken.accessToken) {
-				return refreshedToken.accessToken;
+				return {
+					accessToken: refreshedToken.accessToken,
+					idToken: refreshedToken.idToken
+				};
 			} else {
 				throw new Error();
 			}
@@ -498,6 +515,7 @@ export class AzureActiveDirectoryService {
 			expiresIn: json.expires_in,
 			expiresAt: json.expires_in ? Date.now() + json.expires_in * 1000 : undefined,
 			accessToken: json.access_token,
+			idToken: json.id_token,
 			refreshToken: json.refresh_token,
 			scope,
 			sessionId: existingId || `${claims.tid}/${(claims.oid || (claims.altsecid || '' + claims.ipd || ''))}/${uuid()}`,
@@ -651,7 +669,7 @@ export class AzureActiveDirectoryService {
 		this.removeInMemorySessionData(sessionId);
 
 		if (this._tokens.length === 0) {
-			await keychain.deleteToken();
+			await this._keychain.deleteToken();
 		} else {
 			this.storeTokenData();
 		}
@@ -660,7 +678,7 @@ export class AzureActiveDirectoryService {
 	public async clearSessions() {
 		Logger.info('Logging out of all sessions');
 		this._tokens = [];
-		await keychain.deleteToken();
+		await this._keychain.deleteToken();
 
 		this._refreshTimeouts.forEach(timeout => {
 			clearTimeout(timeout);
diff --git a/extensions/microsoft-authentication/src/extension.ts b/extensions/microsoft-authentication/src/extension.ts
index f31d72d84..23c18d8b9 100644
--- a/extensions/microsoft-authentication/src/extension.ts
+++ b/extensions/microsoft-authentication/src/extension.ts
@@ -13,15 +13,12 @@ export async function activate(context: vscode.ExtensionContext) {
 	const { name, version, aiKey } = require('../package.json') as { name: string, version: string, aiKey: string };
 	const telemetryReporter = new TelemetryReporter(name, version, aiKey);
 
-	const loginService = new AzureActiveDirectoryService();
+	const loginService = new AzureActiveDirectoryService(context);
 	context.subscriptions.push(loginService);
 
 	await loginService.initialize();
 
-	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider({
-		id: 'microsoft',
-		label: 'Microsoft',
-		supportsMultipleAccounts: true,
+	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', {
 		onDidChangeSessions: onDidChangeSessions.event,
 		getSessions: () => Promise.resolve(loginService.sessions),
 		login: async (scopes: string[]) => {
@@ -59,7 +56,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				telemetryReporter.sendTelemetryEvent('logoutFailed');
 			}
 		}
-	}));
+	}, { supportsMultipleAccounts: true }));
 
 	return;
 }
diff --git a/extensions/microsoft-authentication/src/keychain.ts b/extensions/microsoft-authentication/src/keychain.ts
index f0e487760..1a0001c11 100644
--- a/extensions/microsoft-authentication/src/keychain.ts
+++ b/extensions/microsoft-authentication/src/keychain.ts
@@ -35,7 +35,7 @@ const ACCOUNT_ID = 'account';
 export class Keychain {
 	private keytar: Keytar;
 
-	constructor() {
+	constructor(private context: vscode.ExtensionContext) {
 		const keytar = getKeytar();
 		if (!keytar) {
 			throw new Error('System keychain unavailable');
@@ -46,8 +46,9 @@ export class Keychain {
 
 
 	async setToken(token: string): Promise<void> {
+
 		try {
-			return await vscode.authentication.setPassword(SERVICE_ID, token);
+			return await this.context.secrets.store(SERVICE_ID, token);
 		} catch (e) {
 			Logger.error(`Setting token failed: ${e}`);
 
@@ -69,7 +70,7 @@ export class Keychain {
 
 	async getToken(): Promise<string | null | undefined> {
 		try {
-			return await vscode.authentication.getPassword(SERVICE_ID);
+			return await this.context.secrets.get(SERVICE_ID);
 		} catch (e) {
 			// Ignore
 			Logger.error(`Getting token failed: ${e}`);
@@ -79,7 +80,7 @@ export class Keychain {
 
 	async deleteToken(): Promise<void> {
 		try {
-			return await vscode.authentication.deletePassword(SERVICE_ID);
+			return await this.context.secrets.delete(SERVICE_ID);
 		} catch (e) {
 			// Ignore
 			Logger.error(`Deleting token failed: ${e}`);
@@ -102,5 +103,3 @@ export class Keychain {
 		}
 	}
 }
-
-export const keychain = new Keychain();
diff --git a/extensions/microsoft-authentication/src/microsoft-authentication.d.ts b/extensions/microsoft-authentication/src/microsoft-authentication.d.ts
new file mode 100644
index 000000000..c04107ff5
--- /dev/null
+++ b/extensions/microsoft-authentication/src/microsoft-authentication.d.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AuthenticationSession } from 'vscode';
+
+/**
+ * Represents a session of a currently logged in Microsoft user.
+ */
+export interface MicrosoftAuthenticationSession extends AuthenticationSession {
+	/**
+	 * The id token.
+	 */
+	idToken?: string;
+}
\ No newline at end of file
diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock
index df970ce40..58e34ee84 100644
--- a/extensions/microsoft-authentication/yarn.lock
+++ b/extensions/microsoft-authentication/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@types/keytar@^4.0.1":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.4.2.tgz#49ef917d6cbb4f19241c0ab50cd35097b5729b32"
-  integrity sha512-xtQcDj9ruGnMwvSu1E2BH4SFa5Dv2PvSPd0CKEBLN5hEj/v5YpXJY+B6hAfuKIbvEomD7vJTc/P1s1xPNh2kRw==
-  dependencies:
-    keytar "*"
-
 "@types/node-fetch@^2.5.7":
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
@@ -22,10 +15,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
   integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
 
-"@types/node@^10.12.21":
-  version "10.17.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
-  integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/randombytes@^2.0.0":
   version "2.0.0"
@@ -41,21 +34,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/uuid@^8.0.0":
+"@types/uuid@8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
   integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -65,19 +48,6 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -88,13 +58,6 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-bl@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
-  integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
-  dependencies:
-    readable-stream "^3.0.1"
-
 buffer@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
@@ -103,16 +66,6 @@ buffer@^5.6.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-chownr@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -120,43 +73,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-decompress-response@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
-  integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
-  dependencies:
-    mimic-response "^2.0.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 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=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 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"
@@ -174,18 +95,6 @@ emitter-component@^1.1.1:
   resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
   integrity sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY=
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -195,75 +104,16 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-keytar@*:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.0.0.tgz#c89b6b7a4608fd7af633d9f8474b1a7eb97cbe6f"
-  integrity sha512-a5UheK59YOlJf9i+2Osaj/kkH6mK0RCHVMtJ84u6ZfbfRIbOJ/H4b5VlOF/LgNHF6s78dRSBzZnvIuPiBKv6wg==
-  dependencies:
-    nan "2.14.0"
-    prebuild-install "5.3.3"
-
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -276,155 +126,18 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "1.44.0"
 
-mimic-response@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.0.0.tgz#996a51c60adf12cb8a87d7fb8ef24c2f3d5ebb46"
-  integrity sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-nan@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
-napi-build-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
-  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
-
-node-abi@^2.7.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.13.0.tgz#e2f2ec444d0aca3ea1b3874b6de41d1665828f63"
-  integrity sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==
-  dependencies:
-    semver "^5.4.1"
-
 node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
-
-npmlog@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-prebuild-install@5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e"
-  integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==
-  dependencies:
-    detect-libc "^1.0.3"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
-    noop-logger "^0.1.1"
-    npmlog "^4.0.1"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^3.0.3"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-    which-pm-runs "^1.0.0"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 "randombytes@github:rmacfarlane/randombytes#b28d4ecee46262801ea09f15fa1f1513a05c5971":
   version "2.1.0"
   resolved "https://codeload.github.com/rmacfarlane/randombytes/tar.gz/b28d4ecee46262801ea09f15fa1f1513a05c5971"
   dependencies:
     safe-buffer "^5.1.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^2.0.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.1, readable-stream@^3.1.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -434,21 +147,11 @@ 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==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-semver@^5.3.0, semver@^5.4.1:
+semver@^5.3.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 sha.js@2.4.11:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -457,25 +160,6 @@ sha.js@2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-simple-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
-  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
-
-simple-get@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
-  dependencies:
-    decompress-response "^4.2.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
 stream@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
@@ -483,94 +167,6 @@ stream@0.0.2:
   dependencies:
     emitter-component "^1.1.1"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-tar-fs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
-  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp "^0.5.1"
-    pump "^3.0.0"
-    tar-stream "^2.0.0"
-
-tar-stream@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
-  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
-  dependencies:
-    bl "^3.0.0"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-typescript@^3.7.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19"
-  integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
 uuid@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
@@ -588,23 +184,6 @@ vscode-nls@^4.1.1:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
   integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
 
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 5210c5296..873107fd7 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@types/minimatch": "^3.0.3",
-    "@types/node": "^12.11.7"
+    "@types/node": "^12.19.9"
   },
   "resolutions": {
     "which-pm/load-yaml-file/**/argparse": "1.0.9"
diff --git a/extensions/npm/src/commands.ts b/extensions/npm/src/commands.ts
index 4f9131a44..8fda10777 100644
--- a/extensions/npm/src/commands.ts
+++ b/extensions/npm/src/commands.ts
@@ -34,7 +34,12 @@ export function runSelectedScript(context: vscode.ExtensionContext) {
 	}
 }
 
-export async function selectAndRunScriptFromFolder(context: vscode.ExtensionContext, selectedFolder: vscode.Uri) {
+export async function selectAndRunScriptFromFolder(context: vscode.ExtensionContext, selectedFolders: vscode.Uri[]) {
+	if (selectedFolders.length === 0) {
+		return;
+	}
+	const selectedFolder = selectedFolders[0];
+
 	let taskList: FolderTaskItem[] = await detectNpmScriptsForFolder(context, selectedFolder);
 
 	if (taskList && taskList.length > 0) {
diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts
index 8617b7f7f..d5497f82f 100644
--- a/extensions/npm/src/npmView.ts
+++ b/extensions/npm/src/npmView.ts
@@ -9,12 +9,12 @@ import {
 	commands, Event, EventEmitter, ExtensionContext,
 	Range,
 	Selection, Task,
-	TaskGroup, tasks, TextDocument, TextDocumentShowOptions, ThemeIcon, TreeDataProvider, TreeItem, TreeItemCollapsibleState, Uri,
+	TaskGroup, tasks, TextDocument, TextDocumentShowOptions, ThemeIcon, TreeDataProvider, TreeItem, TreeItemLabel, TreeItemCollapsibleState, Uri,
 	window, workspace, WorkspaceFolder
 } from 'vscode';
 import * as nls from 'vscode-nls';
 import {
-	createTask, getTaskName, isAutoDetectionEnabled, isWorkspaceFolder, NpmTaskDefinition,
+	createTask, getPackageManager, getTaskName, isAutoDetectionEnabled, isWorkspaceFolder, NpmTaskDefinition,
 	NpmTaskProvider,
 	startDebugging,
 	TaskLocation,
@@ -126,13 +126,15 @@ class NoScripts extends TreeItem {
 	}
 }
 
+type TaskTree = Folder[] | PackageJSON[] | NoScripts[];
+
 export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
-	private taskTree: Folder[] | PackageJSON[] | NoScripts[] | null = null;
+	private taskTree: TaskTree | null = null;
 	private extensionContext: ExtensionContext;
 	private _onDidChangeTreeData: EventEmitter<TreeItem | null> = new EventEmitter<TreeItem | null>();
 	readonly onDidChangeTreeData: Event<TreeItem | null> = this._onDidChangeTreeData.event;
 
-	constructor(context: ExtensionContext, public taskProvider: NpmTaskProvider) {
+	constructor(private context: ExtensionContext, public taskProvider: NpmTaskProvider) {
 		const subscriptions = context.subscriptions;
 		this.extensionContext = context;
 		subscriptions.push(commands.registerCommand('npm.runScript', this.runScript, this));
@@ -142,6 +144,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 	}
 
 	private async runScript(script: NpmScript) {
+		// Call getPackageManager to trigger the multiple lock files warning.
+		await getPackageManager(this.context, script.getFolder().uri);
 		tasks.executeTask(script.task);
 	}
 
@@ -190,7 +194,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 		if (!uri) {
 			return;
 		}
-		let task = await createTask(this.extensionContext, 'install', 'install', selection.folder.workspaceFolder, uri, undefined, []);
+		let task = await createTask(this.extensionContext, 'install', ['install'], selection.folder.workspaceFolder, uri, true, undefined, []);
 		tasks.executeTask(task);
 	}
 
@@ -239,7 +243,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 		if (!this.taskTree) {
 			const taskItems = await this.taskProvider.tasksWithLocation;
 			if (taskItems) {
-				this.taskTree = this.buildTaskTree(taskItems);
+				const taskTree = this.buildTaskTree(taskItems);
+				this.taskTree = this.sortTaskTree(taskTree);
 				if (this.taskTree.length === 0) {
 					let message = localize('noScripts', 'No scripts found.');
 					if (!isAutoDetectionEnabled()) {
@@ -274,7 +279,27 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
 		return fullName === task.name;
 	}
 
-	private buildTaskTree(tasks: TaskWithLocation[]): Folder[] | PackageJSON[] | NoScripts[] {
+	private getTaskTreeItemLabel(taskTreeLabel: string | TreeItemLabel | undefined): string {
+		if (taskTreeLabel === undefined) {
+			return '';
+		}
+
+		if (typeof taskTreeLabel === 'string') {
+			return taskTreeLabel;
+		}
+
+		return taskTreeLabel.label;
+	}
+
+	private sortTaskTree(taskTree: TaskTree) {
+		return taskTree.sort((first: TreeItem, second: TreeItem) => {
+			const firstLabel = this.getTaskTreeItemLabel(first.label);
+			const secondLabel = this.getTaskTreeItemLabel(second.label);
+			return firstLabel.localeCompare(secondLabel);
+		});
+	}
+
+	private buildTaskTree(tasks: TaskWithLocation[]): TaskTree {
 		let folders: Map<String, Folder> = new Map();
 		let packages: Map<String, PackageJSON> = new Map();
 
diff --git a/extensions/npm/src/scriptHover.ts b/extensions/npm/src/scriptHover.ts
index 48482660f..b216fb064 100644
--- a/extensions/npm/src/scriptHover.ts
+++ b/extensions/npm/src/scriptHover.ts
@@ -103,7 +103,7 @@ export class NpmScriptHoverProvider implements HoverProvider {
 		let documentUri = args.documentUri;
 		let folder = workspace.getWorkspaceFolder(documentUri);
 		if (folder) {
-			let task = await createTask(this.context, script, `run ${script}`, folder, documentUri);
+			let task = await createTask(this.context, script, ['run', script], folder, documentUri);
 			await tasks.executeTask(task);
 		}
 	}
diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts
index fac16a396..7d860ae3e 100644
--- a/extensions/npm/src/tasks.ts
+++ b/extensions/npm/src/tasks.ts
@@ -5,7 +5,8 @@
 
 import {
 	TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace,
-	DebugConfiguration, debug, TaskProvider, TextDocument, tasks, TaskScope, QuickPickItem, window, Position, ExtensionContext, env
+	DebugConfiguration, debug, TaskProvider, TextDocument, tasks, TaskScope, QuickPickItem, window, Position, ExtensionContext, env,
+	ShellQuotedString, ShellQuoting
 } from 'vscode';
 import * as path from 'path';
 import * as fs from 'fs';
@@ -48,11 +49,11 @@ export class NpmTaskProvider implements TaskProvider {
 	}
 
 	get tasksWithLocation(): Promise<TaskWithLocation[]> {
-		return provideNpmScripts(this.context);
+		return provideNpmScripts(this.context, false);
 	}
 
 	public async provideTasks() {
-		const tasks = await provideNpmScripts(this.context);
+		const tasks = await provideNpmScripts(this.context, true);
 		return tasks.map(task => task.task);
 	}
 
@@ -70,7 +71,11 @@ export class NpmTaskProvider implements TaskProvider {
 			} else {
 				packageJsonUri = _task.scope.uri.with({ path: _task.scope.uri.path + '/package.json' });
 			}
-			return createTask(this.context, kind, `${kind.script === INSTALL_SCRIPT ? '' : 'run '}${kind.script}`, _task.scope, packageJsonUri);
+			const cmd = [kind.script];
+			if (kind.script !== INSTALL_SCRIPT) {
+				cmd.unshift('run');
+			}
+			return createTask(this.context, kind, cmd, _task.scope, packageJsonUri);
 		}
 		return undefined;
 	}
@@ -123,14 +128,14 @@ export function isWorkspaceFolder(value: any): value is WorkspaceFolder {
 	return value && typeof value !== 'number';
 }
 
-export async function getPackageManager(extensionContext: ExtensionContext, folder: Uri): Promise<string> {
+export async function getPackageManager(extensionContext: ExtensionContext, folder: Uri, showWarning: boolean = true): Promise<string> {
 	let packageManagerName = workspace.getConfiguration('npm', folder).get<string>('packageManager', 'npm');
 
 	if (packageManagerName === 'auto') {
 		const { name, multiplePMDetected } = await findPreferredPM(folder.fsPath);
 		packageManagerName = name;
 		const neverShowWarning = 'npm.multiplePMWarning.neverShow';
-		if (multiplePMDetected && !extensionContext.globalState.get<boolean>(neverShowWarning)) {
+		if (showWarning && multiplePMDetected && !extensionContext.globalState.get<boolean>(neverShowWarning)) {
 			const multiplePMWarning = localize('npm.multiplePMWarning', 'Using {0} as the preferred package manager. Found multiple lockfiles for {1}.', packageManagerName, folder.fsPath);
 			const neverShowAgain = localize('npm.multiplePMWarning.doNotShow', "Do not show again");
 			const learnMore = localize('npm.multiplePMWarning.learnMore', "Learn more");
@@ -167,7 +172,7 @@ export async function hasNpmScripts(): Promise<boolean> {
 	}
 }
 
-async function detectNpmScripts(context: ExtensionContext): Promise<TaskWithLocation[]> {
+async function detectNpmScripts(context: ExtensionContext, showWarning: boolean): Promise<TaskWithLocation[]> {
 
 	let emptyTasks: TaskWithLocation[] = [];
 	let allTasks: TaskWithLocation[] = [];
@@ -184,7 +189,7 @@ async function detectNpmScripts(context: ExtensionContext): Promise<TaskWithLoca
 				let paths = await workspace.findFiles(relativePattern, '**/{node_modules,.vscode-test}/**');
 				for (const path of paths) {
 					if (!isExcluded(folder, path) && !visitedPackageJsonFiles.has(path.fsPath)) {
-						let tasks = await provideNpmScriptsForFolder(context, path);
+						let tasks = await provideNpmScriptsForFolder(context, path, showWarning);
 						visitedPackageJsonFiles.add(path.fsPath);
 						allTasks.push(...tasks);
 					}
@@ -209,7 +214,7 @@ export async function detectNpmScriptsForFolder(context: ExtensionContext, folde
 		let visitedPackageJsonFiles: Set<string> = new Set();
 		for (const path of paths) {
 			if (!visitedPackageJsonFiles.has(path.fsPath)) {
-				let tasks = await provideNpmScriptsForFolder(context, path);
+				let tasks = await provideNpmScriptsForFolder(context, path, true);
 				visitedPackageJsonFiles.add(path.fsPath);
 				folderTasks.push(...tasks.map(t => ({ label: t.task.name, task: t.task })));
 			}
@@ -220,9 +225,9 @@ export async function detectNpmScriptsForFolder(context: ExtensionContext, folde
 	}
 }
 
-export async function provideNpmScripts(context: ExtensionContext): Promise<TaskWithLocation[]> {
+export async function provideNpmScripts(context: ExtensionContext, showWarning: boolean): Promise<TaskWithLocation[]> {
 	if (!cachedTasks) {
-		cachedTasks = await detectNpmScripts(context);
+		cachedTasks = await detectNpmScripts(context, showWarning);
 	}
 	return cachedTasks;
 }
@@ -258,7 +263,7 @@ function isDebugScript(script: string): boolean {
 	return match !== null;
 }
 
-async function provideNpmScriptsForFolder(context: ExtensionContext, packageJsonUri: Uri): Promise<TaskWithLocation[]> {
+async function provideNpmScriptsForFolder(context: ExtensionContext, packageJsonUri: Uri, showWarning: boolean): Promise<TaskWithLocation[]> {
 	let emptyTasks: TaskWithLocation[] = [];
 
 	let folder = workspace.getWorkspaceFolder(packageJsonUri);
@@ -276,7 +281,7 @@ async function provideNpmScriptsForFolder(context: ExtensionContext, packageJson
 
 	for (const each of scripts.keys()) {
 		const scriptValue = scripts.get(each)!;
-		const task = await createTask(context, each, `run ${each}`, folder!, packageJsonUri, scriptValue.script);
+		const task = await createTask(context, each, ['run', each], folder!, packageJsonUri, showWarning, scriptValue.script);
 		const lowerCaseTaskName = each.toLowerCase();
 		if (isBuildTask(lowerCaseTaskName)) {
 			task.group = TaskGroup.Build;
@@ -295,7 +300,7 @@ async function provideNpmScriptsForFolder(context: ExtensionContext, packageJson
 	}
 
 	// always add npm install (without a problem matcher)
-	result.push({ task: await createTask(context, INSTALL_SCRIPT, INSTALL_SCRIPT, folder, packageJsonUri, 'install dependencies from package', []) });
+	result.push({ task: await createTask(context, INSTALL_SCRIPT, [INSTALL_SCRIPT], folder, packageJsonUri, showWarning, 'install dependencies from package', []) });
 	return result;
 }
 
@@ -306,7 +311,7 @@ export function getTaskName(script: string, relativePath: string | undefined) {
 	return script;
 }
 
-export async function createTask(context: ExtensionContext, script: NpmTaskDefinition | string, cmd: string, folder: WorkspaceFolder, packageJsonUri: Uri, detail?: string, matcher?: any): Promise<Task> {
+export async function createTask(context: ExtensionContext, script: NpmTaskDefinition | string, cmd: string[], folder: WorkspaceFolder, packageJsonUri: Uri, showWarning: boolean = true, detail?: string, matcher?: any): Promise<Task> {
 	let kind: NpmTaskDefinition;
 	if (typeof script === 'string') {
 		kind = { type: 'npm', script: script };
@@ -314,12 +319,20 @@ export async function createTask(context: ExtensionContext, script: NpmTaskDefin
 		kind = script;
 	}
 
-	const packageManager = await getPackageManager(context, folder.uri);
-	async function getCommandLine(cmd: string): Promise<string> {
-		if (workspace.getConfiguration('npm', folder.uri).get<boolean>('runSilent')) {
-			return `${packageManager} --silent ${cmd}`;
+	const packageManager = await getPackageManager(context, folder.uri, showWarning);
+	function getCommandLine(cmd: string[]): (string | ShellQuotedString)[] {
+		const result: (string | ShellQuotedString)[] = new Array(cmd.length);
+		for (let i = 0; i < cmd.length; i++) {
+			if (/\s/.test(cmd[i])) {
+				result[i] = { value: cmd[i], quoting: cmd[i].includes('--') ? ShellQuoting.Weak : ShellQuoting.Strong };
+			} else {
+				result[i] = cmd[i];
+			}
 		}
-		return `${packageManager} ${cmd}`;
+		if (workspace.getConfiguration('npm', folder.uri).get<boolean>('runSilent')) {
+			result.unshift('--silent');
+		}
+		return result;
 	}
 
 	function getRelativePath(packageJsonUri: Uri): string {
@@ -334,7 +347,7 @@ export async function createTask(context: ExtensionContext, script: NpmTaskDefin
 	}
 	let taskName = getTaskName(kind.script, relativePackageJson);
 	let cwd = path.dirname(packageJsonUri.fsPath);
-	const task = new Task(kind, folder, taskName, 'npm', new ShellExecution(await getCommandLine(cmd), { cwd: cwd }), matcher);
+	const task = new Task(kind, folder, taskName, 'npm', new ShellExecution(packageManager, getCommandLine(cmd), { cwd: cwd }), matcher);
 	task.detail = detail;
 	return task;
 }
@@ -379,7 +392,7 @@ export async function runScript(context: ExtensionContext, script: string, docum
 	let uri = document.uri;
 	let folder = workspace.getWorkspaceFolder(uri);
 	if (folder) {
-		let task = await createTask(context, script, `run ${script}`, folder, uri);
+		let task = await createTask(context, script, ['run', script], folder, uri);
 		tasks.executeTask(task);
 	}
 }
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
index 0fa2f344a..c8ca31e33 100644
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 agent-base@4:
   version "4.2.0"
diff --git a/extensions/package.json b/extensions/package.json
index 7abc2e1e6..b8863465f 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -1,9 +1,10 @@
 {
   "name": "vscode-extensions",
   "version": "0.0.1",
+  "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "4.1.2"
+    "typescript": "4.1.5"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index 2856782f5..63801b228 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -82,6 +82,6 @@
 		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "^12.11.7"
+		"@types/node": "^12.19.9"
 	}
 }
diff --git a/extensions/php-language-features/src/features/phpGlobalFunctions.ts b/extensions/php-language-features/src/features/phpGlobalFunctions.ts
index ce2acbc42..caf9eb11b 100644
--- a/extensions/php-language-features/src/features/phpGlobalFunctions.ts
+++ b/extensions/php-language-features/src/features/phpGlobalFunctions.ts
@@ -1416,7 +1416,7 @@ export const globalfunctions: IEntries = {
 	},
 	date_format: {
 		description: 'Returns date formatted according to given format',
-		signature: '( string $format , DateTimeInterface $object ): string'
+		signature: '( DateTimeInterface $object , string $format ): string'
 	},
 	date_offset_get: {
 		description: 'Returns the timezone offset',
diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock
index 7af62a72c..687f15f48 100644
--- a/extensions/php-language-features/yarn.lock
+++ b/extensions/php-language-features/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 vscode-nls@^4.0.0:
   version "4.0.0"
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index 3c5b9b9ff..15b73aeaf 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/atom/language-php",
-					"commitHash": "6c0da475f86b45ea990638525f68be7658986546"
+					"commitHash": "72739e6341b1b4bf4aa185e928932983baca449e"
 				}
 			},
 			"license": "MIT",
-			"version": "0.44.5"
+			"version": "0.46.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index 54fbd4b78..d6341cce2 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.tmLanguage.json
@@ -4,9 +4,12 @@
 		"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/atom/language-php/commit/6c0da475f86b45ea990638525f68be7658986546",
+	"version": "https://github.com/atom/language-php/commit/72739e6341b1b4bf4aa185e928932983baca449e",
 	"scopeName": "source.php",
 	"patterns": [
+		{
+			"include": "#attribute"
+		},
 		{
 			"include": "#comments"
 		},
@@ -230,7 +233,7 @@
 			]
 		},
 		{
-			"begin": "(?ix)\n(?:\n  (?:^|(?<=}))\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\n  |\\b(new)\\s+(class)\\b # anonymous class\n)",
+			"begin": "(?ix)\n(?:\n  \\b(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\n  |\\b(new)\\b\\s*(\\#\\[.*\\])?\\s*\\b(class)\\b # anonymous class\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.${1:/downcase}.php"
@@ -245,6 +248,13 @@
 					"name": "keyword.other.new.php"
 				},
 				"5": {
+					"patterns": [
+						{
+							"include": "#attribute"
+						}
+					]
+				},
+				"6": {
 					"name": "storage.type.class.php"
 				}
 			},
@@ -357,6 +367,9 @@
 				}
 			]
 		},
+		{
+			"include": "#match_statement"
+		},
 		{
 			"include": "#switch_statement"
 		},
@@ -410,30 +423,34 @@
 			"name": "meta.catch.php",
 			"patterns": [
 				{
-					"include": "#namespace"
-				},
-				{
-					"match": "(?xi)\n([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)                 # Exception class\n((?:\\s*\\|\\s*[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)*) # Optional additional exception classes\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)           # Variable",
+					"match": "(?xi)\n([a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)*) # union or single exception class\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?           # Variable",
 					"captures": {
 						"1": {
-							"name": "support.class.exception.php"
-						},
-						"2": {
 							"patterns": [
-								{
-									"match": "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
-									"name": "support.class.exception.php"
-								},
 								{
 									"match": "\\|",
 									"name": "punctuation.separator.delimiter.php"
+								},
+								{
+									"begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
+									"end": "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+									"endCaptures": {
+										"1": {
+											"name": "support.class.exception.php"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#namespace"
+										}
+									]
 								}
 							]
 						},
-						"3": {
+						"2": {
 							"name": "variable.other.php"
 						},
-						"4": {
+						"3": {
 							"name": "punctuation.definition.variable.php"
 						}
 					}
@@ -496,7 +513,12 @@
 							"name": "punctuation.definition.parameters.end.bracket.round.php"
 						}
 					},
+					"name": "meta.function.closure.use.php",
 					"patterns": [
+						{
+							"match": ",",
+							"name": "punctuation.separator.delimiter.php"
+						},
 						{
 							"captures": {
 								"1": {
@@ -509,22 +531,22 @@
 									"name": "punctuation.definition.variable.php"
 								}
 							},
-							"match": "(?i)((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(?=,|\\))",
-							"name": "meta.function.closure.use.php"
+							"match": "(?i)((?:(&)\\s*)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(?=,|\\))"
 						}
 					]
 				},
 				{
-					"match": "(:)\\s*(\\?)?\\s*((?:\\\\?[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+)",
+					"match": "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:{|/[/*]|\\#|$))",
 					"captures": {
 						"1": {
 							"name": "keyword.operator.return-value.php"
 						},
 						"2": {
-							"name": "keyword.operator.nullable-type.php"
-						},
-						"3": {
-							"name": "storage.type.php"
+							"patterns": [
+								{
+									"include": "#php-types"
+								}
+							]
 						}
 					}
 				}
@@ -546,7 +568,7 @@
 			"name": "meta.function.closure.php",
 			"patterns": [
 				{
-					"begin": "(&)?\\s*(\\()",
+					"begin": "(?:(&)\\s*)?(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.reference.php"
@@ -569,21 +591,109 @@
 					]
 				},
 				{
-					"match": "(:)\\s*(\\?)?\\s*((?:\\\\?[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+)\\s*",
+					"match": "(?xi)\n(:)\\s*\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n(?=\\s*(?:=>|/[/*]|\\#|$))",
 					"captures": {
 						"1": {
 							"name": "keyword.operator.return-value.php"
 						},
 						"2": {
-							"name": "keyword.operator.nullable-type.php"
-						},
-						"3": {
-							"name": "storage.type.php"
+							"patterns": [
+								{
+									"include": "#php-types"
+								}
+							]
 						}
 					}
 				}
 			]
 		},
+		{
+			"begin": "(?x)\n((?:(?:final|abstract|public|private|protected)\\s+)*)\n(function)\\s+(__construct)\n\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"match": "final|abstract|public|private|protected",
+							"name": "storage.modifier.php"
+						}
+					]
+				},
+				"2": {
+					"name": "storage.type.function.php"
+				},
+				"3": {
+					"name": "support.function.constructor.php"
+				},
+				"4": {
+					"name": "punctuation.definition.parameters.begin.bracket.round.php"
+				}
+			},
+			"contentName": "meta.function.parameters.php",
+			"end": "(?xi)\n(\\)) \\s* ( : \\s*\n  (?:\\?\\s*)? (?!\\s) [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\\\s\\|]+ (?<!\\s)\n)?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.parameters.end.bracket.round.php"
+				},
+				"2": {
+					"name": "invalid.illegal.return-type.php"
+				}
+			},
+			"name": "meta.function.php",
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.php"
+				},
+				{
+					"begin": "(?xi)\n(public|private|protected) \\s+\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.php"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#php-types"
+								}
+							]
+						},
+						"3": {
+							"name": "variable.other.php"
+						},
+						"4": {
+							"name": "storage.modifier.reference.php"
+						},
+						"5": {
+							"name": "punctuation.definition.variable.php"
+						}
+					},
+					"end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+					"name": "meta.function.parameter.promoted-property.php",
+					"patterns": [
+						{
+							"begin": "=",
+							"beginCaptures": {
+								"0": {
+									"name": "keyword.operator.assignment.php"
+								}
+							},
+							"end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
+							"patterns": [
+								{
+									"include": "#parameter-default-types"
+								}
+							]
+						}
+					]
+				},
+				{
+					"include": "#function-parameters"
+				}
+			]
+		},
 		{
 			"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))\n  |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
 			"beginCaptures": {
@@ -612,7 +722,7 @@
 				}
 			},
 			"contentName": "meta.function.parameters.php",
-			"end": "(\\))(?:\\s*(:)\\s*(\\?)?\\s*((?:\\\\?[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+))?",
+			"end": "(?xi)\n(\\)) (?: \\s* (:) \\s* (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) )?\n(?=\\s*(?:{|/[/*]|\\#|$|;))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.definition.parameters.end.bracket.round.php"
@@ -621,10 +731,15 @@
 					"name": "keyword.operator.return-value.php"
 				},
 				"3": {
-					"name": "keyword.operator.nullable-type.php"
-				},
-				"4": {
-					"name": "storage.type.php"
+					"patterns": [
+						{
+							"match": "\\b(static)\\b",
+							"name": "storage.type.php"
+						},
+						{
+							"include": "#php-types"
+						}
+					]
 				}
 			},
 			"name": "meta.function.php",
@@ -635,7 +750,7 @@
 			]
 		},
 		{
-			"match": "(?xi)\n((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))+)                     # At least one modifier\n(?:(\\?)?\\s*                                                                  # Optional nullable\n  (\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*)   # Optional namespace\n  ([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))?               # Typehinted class name\n\\s+((\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)          # Variable name",
+			"match": "(?xi)\n((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))+)                     # At least one modifier\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)          # Variable name",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -646,28 +761,16 @@
 					]
 				},
 				"2": {
-					"name": "keyword.operator.nullable-type.php"
-				},
-				"3": {
-					"name": "support.other.namespace.php",
 					"patterns": [
 						{
-							"match": "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
-							"name": "storage.type.php"
-						},
-						{
-							"match": "\\\\",
-							"name": "punctuation.separator.inheritance.php"
+							"include": "#php-types"
 						}
 					]
 				},
-				"4": {
-					"name": "storage.type.php"
-				},
-				"5": {
+				"3": {
 					"name": "variable.other.php"
 				},
-				"6": {
+				"4": {
 					"name": "punctuation.definition.variable.php"
 				}
 			}
@@ -737,7 +840,7 @@
 			}
 		},
 		{
-			"match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|var|function|interface|trait|parent|self|object)\\b",
+			"match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|var|function|interface|trait|parent|self|object|mixed)\\b",
 			"name": "storage.type.php"
 		},
 		{
@@ -943,10 +1046,94 @@
 		}
 	],
 	"repository": {
+		"attribute-name": {
+			"patterns": [
+				{
+					"begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
+					"end": "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+					"endCaptures": {
+						"1": {
+							"name": "support.attribute.php"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#namespace"
+						}
+					]
+				},
+				{
+					"match": "(?xi)\n(\\\\)?\\b(Attribute)\\b",
+					"name": "support.attribute.builtin.php",
+					"captures": {
+						"1": {
+							"name": "punctuation.separator.inheritance.php"
+						}
+					}
+				},
+				{
+					"begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
+					"end": "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
+					"endCaptures": {
+						"1": {
+							"name": "support.attribute.php"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#namespace"
+						}
+					]
+				}
+			]
+		},
+		"attribute": {
+			"begin": "\\#\\[",
+			"end": "\\]",
+			"name": "meta.attribute.php",
+			"patterns": [
+				{
+					"match": ",",
+					"name": "punctuation.separator.delimiter.php"
+				},
+				{
+					"begin": "([a-zA-Z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"patterns": [
+								{
+									"include": "#attribute-name"
+								}
+							]
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.begin.bracket.round.php"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.arguments.end.bracket.round.php"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#named-arguments"
+						},
+						{
+							"include": "$self"
+						}
+					]
+				},
+				{
+					"include": "#attribute-name"
+				}
+			]
+		},
 		"class-builtin": {
 			"patterns": [
 				{
-					"match": "(?xi)\n(\\\\)?\\b\n((APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
+					"match": "(?xi)\n(\\\\)?\\b\n(Attribute|(APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
 					"name": "support.class.builtin.php",
 					"captures": {
 						"1": {
@@ -959,8 +1146,8 @@
 		"class-name": {
 			"patterns": [
 				{
-					"begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
-					"end": "(?i)([a-z_][a-z_0-9]*)?(?![a-z0-9_\\\\])",
+					"begin": "(?i)(?=\\\\?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)",
+					"end": "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
 					"endCaptures": {
 						"1": {
 							"name": "support.class.php"
@@ -976,8 +1163,8 @@
 					"include": "#class-builtin"
 				},
 				{
-					"begin": "(?=[\\\\a-zA-Z_])",
-					"end": "(?i)([a-z_][a-z_0-9]*)?(?![a-z0-9_\\\\])",
+					"begin": "(?i)(?=[\\\\a-z_\\x{7f}-\\x{7fffffff}])",
+					"end": "(?xi)\n( [a-z_\\x{7f}-\\x{7fffffff}] [a-z0-9_\\x{7f}-\\x{7fffffff}]* )?\n(?![a-z0-9_\\x{7f}-\\x{7fffffff}\\\\])",
 					"endCaptures": {
 						"1": {
 							"name": "support.class.php"
@@ -1045,7 +1232,7 @@
 					]
 				},
 				{
-					"begin": "(^\\s+)?(?=#)",
+					"begin": "(^\\s+)?(?=#)(?!#\\[)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.whitespace.comment.leading.php"
@@ -1125,132 +1312,51 @@
 					"name": "punctuation.separator.delimiter.php"
 				},
 				{
-					"begin": "(?xi)\n(?:(\\?)\\s*)?(array)                                              # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n\\s*(=)\\s*(array)\\s*(\\()                                        # Default value",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.nullable-type.php"
-						},
-						"2": {
-							"name": "storage.type.php"
-						},
-						"3": {
-							"name": "variable.other.php"
-						},
-						"4": {
-							"name": "storage.modifier.reference.php"
-						},
-						"5": {
-							"name": "punctuation.definition.variable.php"
-						},
-						"6": {
-							"name": "keyword.operator.assignment.php"
-						},
-						"7": {
-							"name": "support.function.construct.php"
-						},
-						"8": {
-							"name": "punctuation.definition.array.begin.bracket.round.php"
-						}
-					},
-					"contentName": "meta.array.php",
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.array.end.bracket.round.php"
-						}
-					},
-					"name": "meta.function.parameter.array.php",
-					"patterns": [
-						{
-							"include": "#comments"
-						},
-						{
-							"include": "#strings"
-						},
-						{
-							"include": "#numbers"
-						}
-					]
-				},
-				{
-					"match": "(?xi)\n(?:(\\?)\\s*)?(array|callable)                                     # Typehint\n\\s+((&)?\\s*(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?:                                                                # Optional default value\n  \\s*(=)\\s*\n  (?:\n    (null)\n    |\n    (\\[)((?>[^\\[\\]]+|\\[\\g<8>\\])*)(\\])\n    |((?:\\S*?\\(\\))|(?:\\S*?))\n  )\n)?\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment",
-					"name": "meta.function.parameter.array.php",
+					"match": "(?xi)\n(?: (\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n) \\s+ )?\n((?:(&)\\s*)?(\\.\\.\\.)(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
 					"captures": {
 						"1": {
-							"name": "keyword.operator.nullable-type.php"
-						},
-						"2": {
-							"name": "storage.type.php"
-						},
-						"3": {
-							"name": "variable.other.php"
-						},
-						"4": {
-							"name": "storage.modifier.reference.php"
-						},
-						"5": {
-							"name": "punctuation.definition.variable.php"
-						},
-						"6": {
-							"name": "keyword.operator.assignment.php"
-						},
-						"7": {
-							"name": "constant.language.php"
-						},
-						"8": {
-							"name": "punctuation.section.array.begin.php"
-						},
-						"9": {
 							"patterns": [
 								{
-									"include": "#parameter-default-types"
+									"include": "#php-types"
 								}
 							]
 						},
-						"10": {
-							"name": "punctuation.section.array.end.php"
-						},
-						"11": {
-							"name": "invalid.illegal.non-null-typehinted.php"
-						}
-					}
-				},
-				{
-					"begin": "(?xi)\n(?:(\\?)\\s*)?\n(\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*)                 # Optional namespace\n([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)                               # Typehinted class name\n\\s+((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.operator.nullable-type.php"
-						},
 						"2": {
-							"name": "support.other.namespace.php",
-							"patterns": [
-								{
-									"match": "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
-									"name": "storage.type.php"
-								},
-								{
-									"match": "\\\\",
-									"name": "punctuation.separator.inheritance.php"
-								}
-							]
-						},
-						"3": {
-							"name": "storage.type.php"
-						},
-						"4": {
 							"name": "variable.other.php"
 						},
-						"5": {
+						"3": {
 							"name": "storage.modifier.reference.php"
 						},
-						"6": {
+						"4": {
 							"name": "keyword.operator.variadic.php"
 						},
-						"7": {
+						"5": {
 							"name": "punctuation.definition.variable.php"
 						}
 					},
-					"end": "(?=,|\\)|/[/*]|\\#)",
+					"name": "meta.function.parameter.variadic.php"
+				},
+				{
+					"begin": "(?xi)\n(\n  (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ |                                        # nullable type\n  [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+ (?: \\s*\\|\\s* [a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+)+ # union type\n)\n\\s+ ((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference",
+					"beginCaptures": {
+						"1": {
+							"patterns": [
+								{
+									"include": "#php-types"
+								}
+							]
+						},
+						"2": {
+							"name": "variable.other.php"
+						},
+						"3": {
+							"name": "storage.modifier.reference.php"
+						},
+						"4": {
+							"name": "punctuation.definition.variable.php"
+						}
+					},
+					"end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
 					"name": "meta.function.parameter.typehinted.php",
 					"patterns": [
 						{
@@ -1260,16 +1366,17 @@
 									"name": "keyword.operator.assignment.php"
 								}
 							},
-							"end": "(?=,|\\)|/[/*]|\\#)",
+							"end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
 							"patterns": [
 								{
-									"include": "$self"
+									"include": "#parameter-default-types"
 								}
 							]
 						}
 					]
 				},
 				{
+					"match": "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n(?=\\s*(?:,|\\)|/[/*]|\\#|$)) # A closing parentheses (end of argument list) or a comma or a comment",
 					"captures": {
 						"1": {
 							"name": "variable.other.php"
@@ -1278,17 +1385,13 @@
 							"name": "storage.modifier.reference.php"
 						},
 						"3": {
-							"name": "keyword.operator.variadic.php"
-						},
-						"4": {
 							"name": "punctuation.definition.variable.php"
 						}
 					},
-					"match": "(?xi)\n((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment",
 					"name": "meta.function.parameter.no-default.php"
 				},
 				{
-					"begin": "(?xi)\n((&)?\\s*(\\.\\.\\.)?(\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n\\s*(=)\\s*\n(?:(\\[)((?>[^\\[\\]]+|\\[\\g<6>\\])*)(\\]))?                              # Optional default type",
+					"begin": "(?xi)\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*) # Variable name with possible reference\n\\s*(=)\\s*",
 					"beginCaptures": {
 						"1": {
 							"name": "variable.other.php"
@@ -1297,29 +1400,13 @@
 							"name": "storage.modifier.reference.php"
 						},
 						"3": {
-							"name": "keyword.operator.variadic.php"
-						},
-						"4": {
 							"name": "punctuation.definition.variable.php"
 						},
-						"5": {
+						"4": {
 							"name": "keyword.operator.assignment.php"
-						},
-						"6": {
-							"name": "punctuation.section.array.begin.php"
-						},
-						"7": {
-							"patterns": [
-								{
-									"include": "#parameter-default-types"
-								}
-							]
-						},
-						"8": {
-							"name": "punctuation.section.array.end.php"
 						}
 					},
-					"end": "(?=,|\\)|/[/*]|\\#)",
+					"end": "(?=\\s*(?:,|\\)|/[/*]|\\#))",
 					"name": "meta.function.parameter.default.php",
 					"patterns": [
 						{
@@ -2154,13 +2241,13 @@
 		"invoke-call": {
 			"captures": {
 				"1": {
-					"name": "punctuation.definition.variable.php"
+					"name": "variable.other.php"
 				},
 				"2": {
-					"name": "variable.other.php"
+					"name": "punctuation.definition.variable.php"
 				}
 			},
-			"match": "(?i)(\\$+)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)(?=\\s*\\()",
+			"match": "(?i)((\\$+)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)(?=\\s*\\()",
 			"name": "meta.function-call.invoke.php"
 		},
 		"namespace": {
@@ -2217,7 +2304,7 @@
 		"object": {
 			"patterns": [
 				{
-					"begin": "(->)(\\$?{)",
+					"begin": "(\\??->)\\s*(\\$?{)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.class.php"
@@ -2239,7 +2326,7 @@
 					]
 				},
 				{
-					"begin": "(?i)(->)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(\\()",
+					"begin": "(?i)(\\??->)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.class.php"
@@ -2279,7 +2366,30 @@
 							"name": "punctuation.definition.variable.php"
 						}
 					},
-					"match": "(?i)(->)((\\$+)?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?"
+					"match": "(?i)(\\??->)\\s*((\\$+)?[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?"
+				}
+			]
+		},
+		"php-types": {
+			"patterns": [
+				{
+					"match": "\\?",
+					"name": "keyword.operator.nullable-type.php"
+				},
+				{
+					"match": "\\|",
+					"name": "punctuation.separator.delimiter.php"
+				},
+				{
+					"match": "(?i)\\b(null|int|float|bool|string|array|object|callable|iterable|false|mixed)\\b",
+					"name": "storage.type.php"
+				},
+				{
+					"match": "(?i)\\b(parent|self)\\b",
+					"name": "storage.type.php"
+				},
+				{
+					"include": "#class-name"
 				}
 			]
 		},
@@ -2332,12 +2442,31 @@
 						}
 					]
 				},
+				{
+					"begin": "\\[",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.array.begin.php"
+						}
+					},
+					"end": "\\]|(?=\\?>)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.array.end.php"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$self"
+						}
+					]
+				},
 				{
 					"include": "#instantiation"
 				},
 				{
-					"begin": "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+(::)\n  ([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?\n)",
-					"end": "(?i)(::)([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?",
+					"begin": "(?xi)\n(?=[a-z0-9_\\x{7f}-\\x{7fffffff}\\\\]+\n  (::)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?\n)",
+					"end": "(?i)(::)\\s*([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)?",
 					"endCaptures": {
 						"1": {
 							"name": "keyword.operator.class.php"
@@ -2430,7 +2559,7 @@
 				"0": {
 					"patterns": [
 						{
-							"match": "(?x)\\b\n(string|integer|int|boolean|bool|float|double|object|mixed\n|array|resource|void|null|callback|false|true|self)\\b",
+							"match": "(?x)\\b\n(string|integer|int|boolean|bool|float|double|object|mixed\n|array|resource|void|null|callback|false|true|self|static)\\b",
 							"name": "keyword.other.type.php"
 						},
 						{
@@ -3290,6 +3419,67 @@
 				}
 			]
 		},
+		"match_statement": {
+			"patterns": [
+				{
+					"match": "\\s+(?=match\\b)"
+				},
+				{
+					"begin": "\\bmatch\\b",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.control.match.php"
+						}
+					},
+					"end": "}|(?=\\?>)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.section.match-block.end.bracket.curly.php"
+						}
+					},
+					"name": "meta.match-statement.php",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.match-expression.begin.bracket.round.php"
+								}
+							},
+							"end": "\\)|(?=\\?>)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.match-expression.end.bracket.round.php"
+								}
+							},
+							"patterns": [
+								{
+									"include": "$self"
+								}
+							]
+						},
+						{
+							"begin": "{",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.section.match-block.begin.bracket.curly.php"
+								}
+							},
+							"end": "(?=}|\\?>)",
+							"patterns": [
+								{
+									"match": "=>",
+									"name": "keyword.definition.arrow.php"
+								},
+								{
+									"include": "$self"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
 		"use-inner": {
 			"patterns": [
 				{
@@ -3399,7 +3589,7 @@
 							"name": "punctuation.section.array.end.php"
 						}
 					},
-					"match": "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))\n(?:\n  (->)(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))(\\])\n)?"
+					"match": "(?xi)\n((\\$)(?<name>[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))\\s*\n(?:\n  (\\??->)\\s*(\\g<name>)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g<name>)|([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))(\\])\n)?"
 				},
 				{
 					"captures": {
diff --git a/extensions/python/.vscodeignore b/extensions/python/.vscodeignore
index b5c95d0fb..fd575df17 100644
--- a/extensions/python/.vscodeignore
+++ b/extensions/python/.vscodeignore
@@ -1,8 +1,3 @@
 test/**
-src/**
-out/**
-tsconfig.json
-extension.webpack.config.js
-extension-browser.webpack.config.js
 cgmanifest.json
 .vscode
diff --git a/extensions/python/language-configuration.json b/extensions/python/language-configuration.json
index 4717d0975..8e3f54141 100644
--- a/extensions/python/language-configuration.json
+++ b/extensions/python/language-configuration.json
@@ -46,5 +46,11 @@
 			"start": "^\\s*#\\s*region\\b",
 			"end": "^\\s*#\\s*endregion\\b"
 		}
-	}
+	},
+	"onEnterRules": [
+		{
+			"beforeText": "^\\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async).*?:\\s*$",
+			"action": { "indent": "indent" }
+		}
+	]
 }
diff --git a/extensions/python/package.json b/extensions/python/package.json
index f39c3d62b..678b88718 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -6,9 +6,6 @@
 	"publisher": "vscode",
 	"license": "MIT",
 	"engines": { "vscode": "*" },
-	"activationEvents": ["onLanguage:python"],
-	"main": "./out/pythonMain",
-	"browser": "./dist/browser/pythonMain",
 	"extensionKind": [ "ui", "workspace", "web" ],
 	"contributes": {
 		"languages": [{
@@ -29,8 +26,6 @@
 		}]
 	},
 	"scripts": {
-		"compile": "gulp compile-extension:python",
-		"watch": "gulp watch-extension:python",
 		"update-grammar": "node ../../build/npm/update-grammar.js MagicStack/MagicPython grammars/MagicPython.tmLanguage ./syntaxes/MagicPython.tmLanguage.json grammars/MagicRegExp.tmLanguage ./syntaxes/MagicRegExp.tmLanguage.json"
 	}
 }
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
index 4572f2526..020b1d6da 100644
--- a/extensions/ruby/package.json
+++ b/extensions/ruby/package.json
@@ -13,7 +13,7 @@
 		"languages": [{
 			"id": "ruby",
 			"extensions": [ ".rb", ".rbx", ".rjs", ".gemspec", ".rake", ".ru", ".erb", ".podspec", ".rbi" ],
-			"filenames": [ "rakefile", "gemfile", "guardfile", "podfile", "capfile" ],
+			"filenames": [ "rakefile", "gemfile", "guardfile", "podfile", "capfile", "cheffile", "hobofile", "vagrantfile", "appraisals", "rantfile", "berksfile", "berksfile.lock", "thorfile", "puppetfile", "dangerfile", "brewfile", "fastfile", "appfile", "deliverfile", "matchfile", "scanfile", "snapfile", "gymfile" ],
 			"aliases": [ "Ruby", "rb" ],
 			"firstLine": "^#!\\s*/.*\\bruby\\b",
 			"configuration": "./language-configuration.json"
diff --git a/extensions/rust/cgmanifest.json b/extensions/rust/cgmanifest.json
index 932a3926f..bfd206149 100644
--- a/extensions/rust/cgmanifest.json
+++ b/extensions/rust/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "rust-syntax",
 					"repositoryUrl": "https://github.com/dustypomerleau/rust-syntax",
-					"commitHash": "19f9aa86c0850b98db175754f019a2e79413353e"
+					"commitHash": "7b924664814131ae4509a537bb07960fe65dcaac"
 				}
 			},
 			"license": "MIT",
 			"description": "A TextMate-style grammar for Rust.",
-			"version": "0.2.13"
+			"version": "0.4.3"
 		}
 	],
 	"version": 1
diff --git a/extensions/rust/syntaxes/rust.tmLanguage.json b/extensions/rust/syntaxes/rust.tmLanguage.json
index fdced0797..0bf857378 100644
--- a/extensions/rust/syntaxes/rust.tmLanguage.json
+++ b/extensions/rust/syntaxes/rust.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/dustypomerleau/rust-syntax/commit/19f9aa86c0850b98db175754f019a2e79413353e",
+	"version": "https://github.com/dustypomerleau/rust-syntax/commit/7b924664814131ae4509a537bb07960fe65dcaac",
 	"name": "Rust",
 	"scopeName": "source.rust",
 	"patterns": [
@@ -52,7 +52,7 @@
 		{
 			"comment": "macro type metavariables",
 			"name": "meta.macro.metavariable.type.rust",
-			"match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|pat|path|stmt|tt|ty|vis))?",
+			"match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
 			"captures": {
 				"1": {
 					"name": "keyword.operator.macro.dollar.rust"
@@ -79,7 +79,7 @@
 		{
 			"comment": "macro metavariables",
 			"name": "meta.macro.metavariable.rust",
-			"match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|pat|path|stmt|tt|ty|vis))?",
+			"match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
 			"captures": {
 				"1": {
 					"name": "keyword.operator.macro.dollar.rust"
@@ -150,6 +150,9 @@
 				{
 					"include": "#keywords"
 				},
+				{
+					"include": "#lifetimes"
+				},
 				{
 					"include": "#punctuation"
 				},
@@ -169,7 +172,7 @@
 			"match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)",
 			"captures": {
 				"1": {
-					"name": "keyword.control.rust"
+					"name": "storage.type.rust"
 				},
 				"2": {
 					"name": "entity.name.module.rust"
@@ -182,7 +185,7 @@
 			"begin": "\\b(extern)\\s+(crate)",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.rust"
+					"name": "storage.type.rust"
 				},
 				"2": {
 					"name": "keyword.other.crate.rust"
@@ -215,7 +218,7 @@
 			"begin": "\\b(use)\\s",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.rust"
+					"name": "keyword.other.rust"
 				}
 			},
 			"end": ";",
@@ -309,9 +312,14 @@
 		"block-comments": {
 			"patterns": [
 				{
-					"comment": "block comments",
+					"comment": "empty block comments",
 					"name": "comment.block.rust",
-					"begin": "/\\*(?!\\*)",
+					"match": "/\\*\\*/"
+				},
+				{
+					"comment": "block documentation comments",
+					"name": "comment.block.documentation.rust",
+					"begin": "/\\*\\*",
 					"end": "\\*/",
 					"patterns": [
 						{
@@ -320,9 +328,9 @@
 					]
 				},
 				{
-					"comment": "block documentation comments",
-					"name": "comment.block.documentation.rust",
-					"begin": "/\\*\\*",
+					"comment": "block comments",
+					"name": "comment.block.rust",
+					"begin": "/\\*(?!\\*)",
 					"end": "\\*/",
 					"patterns": [
 						{
@@ -344,7 +352,7 @@
 					"match": "\\b(const)\\s+([A-Z][A-Za-z0-9_]*)\\b",
 					"captures": {
 						"1": {
-							"name": "keyword.control.rust"
+							"name": "storage.type.rust"
 						},
 						"2": {
 							"name": "constant.other.caps.rust"
@@ -406,7 +414,7 @@
 				{
 					"comment": "booleans",
 					"name": "constant.language.bool.rust",
-					"match": "\\btrue|false\\b"
+					"match": "\\b(true|false)\\b"
 				}
 			]
 		},
@@ -452,7 +460,7 @@
 					"begin": "\\b(fn)\\s+((?:r#(?!crate|[Ss]elf|super))?[A-Za-z0-9_]+)((\\()|(<))",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.control.fn.rust"
+							"name": "keyword.other.fn.rust"
 						},
 						"2": {
 							"name": "entity.name.function.rust"
@@ -645,7 +653,7 @@
 				{
 					"comment": "control flow keywords",
 					"name": "keyword.control.rust",
-					"match": "\\b(async|await|break|continue|do|else|for|if|loop|match|move|return|try|where|while|yield)\\b"
+					"match": "\\b(await|break|continue|do|else|for|if|loop|match|return|try|while|yield)\\b"
 				},
 				{
 					"comment": "storage keywords",
@@ -660,7 +668,7 @@
 				{
 					"comment": "other keywords",
 					"name": "keyword.other.rust",
-					"match": "\\b(as|become|box|dyn|final|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual)\\b"
+					"match": "\\b(as|async|become|box|dyn|move|final|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual|where)\\b"
 				},
 				{
 					"comment": "fn",
@@ -677,11 +685,6 @@
 					"name": "storage.modifier.mut.rust",
 					"match": "\\bmut\\b"
 				},
-				{
-					"comment": "math operators",
-					"name": "keyword.operator.math.rust",
-					"match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))"
-				},
 				{
 					"comment": "logical operators",
 					"name": "keyword.operator.logical.rust",
@@ -695,7 +698,7 @@
 				{
 					"comment": "assignment operators",
 					"name": "keyword.operator.assignment.rust",
-					"match": "(-=|\\*=|/=|%=|\\^=|&=|\\|=|<<=|>>=)"
+					"match": "(\\+=|-=|\\*=|/=|%=|\\^=|&=|\\|=|<<=|>>=)"
 				},
 				{
 					"comment": "single equal",
@@ -707,6 +710,11 @@
 					"name": "keyword.operator.comparison.rust",
 					"match": "(=(=)?(?!>)|!=|<=|(?<!=)>=)"
 				},
+				{
+					"comment": "math operators",
+					"name": "keyword.operator.math.rust",
+					"match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))"
+				},
 				{
 					"comment": "less than, greater than (special case)",
 					"match": "(?:\\b|(?:(\\))|(\\])|(\\})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))",
@@ -1129,7 +1137,7 @@
 				{
 					"comment": "variables",
 					"name": "variable.other.rust",
-					"match": "\\b(?<!\\.)(?:r#(?!(crate|[Ss]elf|super)))?[a-z0-9_]+\\b"
+					"match": "\\b(?<!(?<!\\.)\\.)(?:r#(?!(crate|[Ss]elf|super)))?[a-z0-9_]+\\b"
 				}
 			]
 		}
diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json
index 9635a6c51..d80c207ac 100644
--- a/extensions/search-result/package.json
+++ b/extensions/search-result/package.json
@@ -15,7 +15,7 @@
   "main": "./out/extension.js",
   "browser": "./dist/extension.js",
   "activationEvents": [
-    "*"
+    "onLanguage:search-result"
   ],
   "scripts": {
     "generate-grammar": "node ./syntaxes/generateTMLanguage.js",
diff --git a/extensions/search-result/src/extension.ts b/extensions/search-result/src/extension.ts
index 6bc5a573c..0f0528af8 100644
--- a/extensions/search-result/src/extension.ts
+++ b/extensions/search-result/src/extension.ts
@@ -128,16 +128,19 @@ export function activate(context: vscode.ExtensionContext) {
 
 
 function relativePathToUri(path: string, resultsUri: vscode.Uri): vscode.Uri | undefined {
+
+	const userDataPrefix = 'vscode-userdata:';
+	if (path.startsWith(userDataPrefix)) {
+		return vscode.Uri.file(path.slice(userDataPrefix.length)).with({ scheme: 'vscode-userdata' });
+	}
+
 	if (pathUtils.isAbsolute(path)) {
-		return vscode.Uri
-			.file(path)
-			.with({ scheme: process.env.HOME ? 'file' : 'vscode-userdata' });
+		return vscode.Uri.file(path);
 	}
 
 	if (path.indexOf('~/') === 0) {
-		return vscode.Uri
-			.file(pathUtils.join(process.env.HOME ?? '', path.slice(2)))
-			.with({ scheme: process.env.HOME ? 'file' : 'vscode-userdata' });
+		const homePath = process.env.HOME || process.env.HOMEPATH || '';
+		return vscode.Uri.file(pathUtils.join(homePath, path.slice(2)));
 	}
 
 	const uriFromFolderWithPath = (folder: vscode.WorkspaceFolder, path: string): vscode.Uri =>
@@ -220,9 +223,18 @@ function parseSearchResults(document: vscode.TextDocument, token?: vscode.Cancel
 			const metadataOffset = (indentation + _lineNumber + seperator).length;
 			const targetRange = new vscode.Range(Math.max(lineNumber - 3, 0), 0, lineNumber + 3, line.length);
 
+			let locations: Required<vscode.LocationLink>[] = [];
+
+			// Allow line number, indentation, etc to take you to definition as well.
+			locations.push({
+				targetRange,
+				targetSelectionRange: new vscode.Range(lineNumber, 0, lineNumber, 1),
+				targetUri: currentTarget,
+				originSelectionRange: new vscode.Range(i, 0, i, resultStart),
+			});
+
 			let lastEnd = resultStart;
 			let offset = 0;
-			let locations: Required<vscode.LocationLink>[] = [];
 			ELISION_REGEX.lastIndex = resultStart;
 			for (let match: RegExpExecArray | null; (match = ELISION_REGEX.exec(line));) {
 				locations.push({
diff --git a/extensions/shared.tsconfig.json b/extensions/shared.tsconfig.json
index a84d7a1cc..5559704e3 100644
--- a/extensions/shared.tsconfig.json
+++ b/extensions/shared.tsconfig.json
@@ -10,6 +10,7 @@
 		"noImplicitAny": true,
 		"noImplicitReturns": true,
 		"noUnusedLocals": true,
-		"noUnusedParameters": true
+		"noUnusedParameters": true,
+		"forceConsistentCasingInFileNames": true
 	}
 }
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
index ab6a40c6b..b5f908d0c 100644
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -69,10 +69,11 @@ function withNodeDefaults(/**@type WebpackConfig*/extConfig) {
 		// yes, really source maps
 		devtool: 'source-map',
 		plugins: [
-			// @ts-expect-error
-			new CopyWebpackPlugin([
-				{ from: 'src', to: '.', ignore: ['**/test/**', '*.ts'] }
-			]),
+			new CopyWebpackPlugin({
+				patterns: [
+					{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
+				]
+			}),
 			new NLSBundlePlugin(id)
 		],
 	};
@@ -126,10 +127,11 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig) {
 		// yes, really source maps
 		devtool: 'source-map',
 		plugins: [
-			// @ts-expect-error
-			new CopyWebpackPlugin([
-				{ from: 'src', to: '.', ignore: ['**/test/**', '*.ts'] }
-			]),
+			new CopyWebpackPlugin({
+				patterns: [
+					{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
+				]
+			}),
 			new DefinePlugin({ WEBWORKER: JSON.stringify(true) })
 		]
 	};
diff --git a/extensions/simple-browser/.vscodeignore b/extensions/simple-browser/.vscodeignore
new file mode 100644
index 000000000..9f1e06207
--- /dev/null
+++ b/extensions/simple-browser/.vscodeignore
@@ -0,0 +1,12 @@
+test/**
+test-workspace/**
+src/**
+tsconfig.json
+out/test/**
+out/**
+extension.webpack.config.js
+extension-browser.webpack.config.js
+cgmanifest.json
+yarn.lock
+preview-src/**
+webpack.config.js
diff --git a/extensions/simple-browser/README.md b/extensions/simple-browser/README.md
new file mode 100644
index 000000000..5cc65e7b1
--- /dev/null
+++ b/extensions/simple-browser/README.md
@@ -0,0 +1,3 @@
+# Simple Browser files
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
diff --git a/extensions/python/extension-browser.webpack.config.js b/extensions/simple-browser/extension-browser.webpack.config.js
similarity index 87%
rename from extensions/python/extension-browser.webpack.config.js
rename to extensions/simple-browser/extension-browser.webpack.config.js
index 9ffa8d167..7fcc53a72 100644
--- a/extensions/python/extension-browser.webpack.config.js
+++ b/extensions/simple-browser/extension-browser.webpack.config.js
@@ -12,9 +12,6 @@ const withBrowserDefaults = require('../shared.webpack.config').browser;
 module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
-		extension: './src/pythonMain.ts'
-	},
-	output: {
-		filename: 'pythonMain.js'
+		extension: './src/extension.ts'
 	}
 });
diff --git a/extensions/python/extension.webpack.config.js b/extensions/simple-browser/extension.webpack.config.js
similarity index 85%
rename from extensions/python/extension.webpack.config.js
rename to extensions/simple-browser/extension.webpack.config.js
index 1467031c5..de88398ec 100644
--- a/extensions/python/extension.webpack.config.js
+++ b/extensions/simple-browser/extension.webpack.config.js
@@ -11,7 +11,10 @@ const withDefaults = require('../shared.webpack.config');
 
 module.exports = withDefaults({
 	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
 	entry: {
-		pythonMain: './src/pythonMain.ts'
+		extension: './src/extension.ts',
 	}
 });
diff --git a/extensions/simple-browser/media/index.js b/extensions/simple-browser/media/index.js
new file mode 100644
index 000000000..5a7763a93
--- /dev/null
+++ b/extensions/simple-browser/media/index.js
@@ -0,0 +1,210 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = "./preview-src/index.ts");
+/******/ })
+/************************************************************************/
+/******/ ({
+
+/***/ "./preview-src/events.ts":
+/*!*******************************!*\
+  !*** ./preview-src/events.ts ***!
+  \*******************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onceDocumentLoaded = void 0;
+function onceDocumentLoaded(f) {
+    if (document.readyState === 'loading' || document.readyState === 'uninitialized') {
+        document.addEventListener('DOMContentLoaded', f);
+    }
+    else {
+        f();
+    }
+}
+exports.onceDocumentLoaded = onceDocumentLoaded;
+
+
+/***/ }),
+
+/***/ "./preview-src/index.ts":
+/*!******************************!*\
+  !*** ./preview-src/index.ts ***!
+  \******************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__(/*! ./events */ "./preview-src/events.ts");
+const vscode = acquireVsCodeApi();
+function getSettings() {
+    const element = document.getElementById('simple-browser-settings');
+    if (element) {
+        const data = element.getAttribute('data-settings');
+        if (data) {
+            return JSON.parse(data);
+        }
+    }
+    throw new Error(`Could not load settings`);
+}
+const settings = getSettings();
+const iframe = document.querySelector('iframe');
+const header = document.querySelector('.header');
+const input = header.querySelector('.url-input');
+const forwardButton = header.querySelector('.forward-button');
+const backButton = header.querySelector('.back-button');
+const reloadButton = header.querySelector('.reload-button');
+const openExternalButton = header.querySelector('.open-external-button');
+window.addEventListener('message', e => {
+    switch (e.data.type) {
+        case 'focus':
+            {
+                iframe.focus();
+                break;
+            }
+        case 'didChangeFocusLockIndicatorEnabled':
+            {
+                toggleFocusLockIndicatorEnabled(e.data.enabled);
+                break;
+            }
+    }
+});
+events_1.onceDocumentLoaded(() => {
+    setInterval(() => {
+        var _a;
+        const iframeFocused = ((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName) === 'IFRAME';
+        document.body.classList.toggle('iframe-focused', iframeFocused);
+    }, 50);
+    iframe.addEventListener('load', () => {
+        // Noop
+    });
+    input.addEventListener('change', e => {
+        const url = e.target.value;
+        navigateTo(url);
+    });
+    forwardButton.addEventListener('click', () => {
+        history.forward();
+    });
+    backButton.addEventListener('click', () => {
+        history.back();
+    });
+    openExternalButton.addEventListener('click', () => {
+        vscode.postMessage({
+            type: 'openExternal',
+            url: input.value
+        });
+    });
+    reloadButton.addEventListener('click', () => {
+        // This does not seem to trigger what we want
+        // history.go(0);
+        // This incorrectly adds entries to the history but does reload
+        iframe.src = input.value;
+    });
+    navigateTo(settings.url);
+    toggleFocusLockIndicatorEnabled(settings.focusLockIndicatorEnabled);
+    function navigateTo(url) {
+        iframe.src = url;
+    }
+});
+function toggleFocusLockIndicatorEnabled(enabled) {
+    document.body.classList.toggle('enable-focus-lock-indicator', enabled);
+}
+
+
+/***/ })
+
+/******/ });
+//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/extensions/simple-browser/media/index.js.map b/extensions/simple-browser/media/index.js.map
new file mode 100644
index 000000000..d6128aae7
--- /dev/null
+++ b/extensions/simple-browser/media/index.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./preview-src/events.ts","webpack:///./preview-src/index.ts"],"names":[],"mappings":";QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;;AClFa;AACb;AACA;AACA;AACA;AACA,8CAA8C,cAAc;AAC5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;;;;;;;;;ACfa;AACb;AACA;AACA;AACA;AACA,8CAA8C,cAAc;AAC5D,iBAAiB,mBAAO,CAAC,yCAAU;AACnC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA,SAAS;AACT,KAAK;AACL;AACA;AACA;AACA;AACA;AACA,KAAK;AACL;AACA;AACA;AACA;AACA;AACA,CAAC;AACD;AACA;AACA","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","\"use strict\";\n/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.onceDocumentLoaded = void 0;\nfunction onceDocumentLoaded(f) {\n    if (document.readyState === 'loading' || document.readyState === 'uninitialized') {\n        document.addEventListener('DOMContentLoaded', f);\n    }\n    else {\n        f();\n    }\n}\nexports.onceDocumentLoaded = onceDocumentLoaded;\n","\"use strict\";\n/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nObject.defineProperty(exports, \"__esModule\", { value: true });\nconst events_1 = require(\"./events\");\nconst vscode = acquireVsCodeApi();\nfunction getSettings() {\n    const element = document.getElementById('simple-browser-settings');\n    if (element) {\n        const data = element.getAttribute('data-settings');\n        if (data) {\n            return JSON.parse(data);\n        }\n    }\n    throw new Error(`Could not load settings`);\n}\nconst settings = getSettings();\nconst iframe = document.querySelector('iframe');\nconst header = document.querySelector('.header');\nconst input = header.querySelector('.url-input');\nconst forwardButton = header.querySelector('.forward-button');\nconst backButton = header.querySelector('.back-button');\nconst reloadButton = header.querySelector('.reload-button');\nconst openExternalButton = header.querySelector('.open-external-button');\nwindow.addEventListener('message', e => {\n    switch (e.data.type) {\n        case 'focus':\n            {\n                iframe.focus();\n                break;\n            }\n        case 'didChangeFocusLockIndicatorEnabled':\n            {\n                toggleFocusLockIndicatorEnabled(e.data.enabled);\n                break;\n            }\n    }\n});\nevents_1.onceDocumentLoaded(() => {\n    setInterval(() => {\n        var _a;\n        const iframeFocused = ((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.tagName) === 'IFRAME';\n        document.body.classList.toggle('iframe-focused', iframeFocused);\n    }, 50);\n    iframe.addEventListener('load', () => {\n        // Noop\n    });\n    input.addEventListener('change', e => {\n        const url = e.target.value;\n        navigateTo(url);\n    });\n    forwardButton.addEventListener('click', () => {\n        history.forward();\n    });\n    backButton.addEventListener('click', () => {\n        history.back();\n    });\n    openExternalButton.addEventListener('click', () => {\n        vscode.postMessage({\n            type: 'openExternal',\n            url: input.value\n        });\n    });\n    reloadButton.addEventListener('click', () => {\n        // This does not seem to trigger what we want\n        // history.go(0);\n        // This incorrectly adds entries to the history but does reload\n        iframe.src = input.value;\n    });\n    navigateTo(settings.url);\n    toggleFocusLockIndicatorEnabled(settings.focusLockIndicatorEnabled);\n    function navigateTo(url) {\n        iframe.src = url;\n    }\n});\nfunction toggleFocusLockIndicatorEnabled(enabled) {\n    document.body.classList.toggle('enable-focus-lock-indicator', enabled);\n}\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/extensions/simple-browser/media/main.css b/extensions/simple-browser/media/main.css
new file mode 100644
index 000000000..9192d4b6b
--- /dev/null
+++ b/extensions/simple-browser/media/main.css
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+:root {
+	--container-paddding: 20px;
+	--input-padding-vertical: 2px;
+	--input-padding-horizontal: 4px;
+	--input-margin-vertical: 4px;
+	--input-margin-horizontal: 0;
+}
+
+html, body {
+	height: 100%;
+	min-height: 100%;
+	padding: 0;
+	margin: 0;
+}
+
+body {
+	display: grid;
+	grid-template-rows: auto 1fr;
+}
+
+input:not([type='checkbox']),
+textarea {
+	display: block;
+	width: 100%;
+	border: none;
+	font-family: var(--vscode-font-family);
+	padding: var(--input-padding-vertical) var(--input-padding-horizontal);
+	color: var(--vscode-input-foreground);
+	outline-color: var(--vscode-input-border);
+	background-color: var(--vscode-input-background);
+}
+
+input::placeholder,
+textarea::placeholder {
+	color: var(--vscode-input-placeholderForeground);
+}
+
+button {
+	border: none;
+	padding: var(--input-padding-vertical) var(--input-padding-horizontal);
+	text-align: center;
+	outline: 1px solid transparent;
+	outline-offset: 2px !important;
+	color: var(--vscode-icon-foreground);
+	background: none;
+}
+
+button:hover:not(:disabled) {
+	cursor: pointer;
+	background: var(--vscode-button-hoverBackground);
+}
+
+button:disabled {
+	opacity: 0.5;
+	background: var(--vscode-button-background);
+}
+
+button:focus {
+	outline-color: var(--vscode-focusBorder);
+}
+
+.header {
+	display: flex;
+	margin: 0.4em 1em;
+}
+
+.url-input {
+	flex: 1;
+}
+
+.controls {
+	display: flex;
+}
+
+.controls button {
+	display: flex;
+	margin-right: 0.3em;
+}
+
+.content {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	justify-content: center;
+}
+
+iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.iframe-focused-alert {
+	display: none;
+	position: absolute;
+	bottom: 1em;
+	background: var(--vscode-editorWidget-background);
+	color: var(--vscode-editorWidget-foreground);
+	padding: 0.2em 0.2em;
+	border-radius: 4px;
+
+	font-size: 8px;
+	font-family: monospace;
+	user-select: none;
+	pointer-events: none;
+}
+
+.iframe-focused.enable-focus-lock-indicator .iframe-focused-alert {
+	display: block;
+}
diff --git a/extensions/simple-browser/media/preview-dark.svg b/extensions/simple-browser/media/preview-dark.svg
new file mode 100644
index 000000000..ec71ea811
--- /dev/null
+++ b/extensions/simple-browser/media/preview-dark.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 2L1 3V13L2 14H14L15 13V3L14 2H2ZM2 13V3H14V13H2ZM12 5H4V6H12V5ZM3 4V7H13V4H3ZM7 9H3V8H7V9ZM3 12H7V11H3V12ZM12 9H10V11H12V9ZM9 8V12H13V8H9Z" fill="#C5C5C5"/>
+</svg>
diff --git a/extensions/simple-browser/media/preview-light.svg b/extensions/simple-browser/media/preview-light.svg
new file mode 100644
index 000000000..4a6b85b58
--- /dev/null
+++ b/extensions/simple-browser/media/preview-light.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 2L1 3V13L2 14H14L15 13V3L14 2H2ZM2 13V3H14V13H2ZM12 5H4V6H12V5ZM3 4V7H13V4H3ZM7 9H3V8H7V9ZM3 12H7V11H3V12ZM12 9H10V11H12V9ZM9 8V12H13V8H9Z" fill="#424242"/>
+</svg>
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
new file mode 100644
index 000000000..d93645f13
--- /dev/null
+++ b/extensions/simple-browser/package.json
@@ -0,0 +1,69 @@
+{
+  "name": "simple-browser",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "enableProposedApi": true,
+  "version": "1.0.0",
+  "icon": "icon.png",
+  "publisher": "vscode",
+  "license": "MIT",
+  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "engines": {
+    "vscode": "^1.53.0"
+  },
+  "main": "./out/extension",
+  "browser": "./dist/browser/extension",
+  "categories": [
+    "Other"
+  ],
+  "activationEvents": [
+    "onCommand:simpleBrowser.show",
+    "onCommand:simpleBrowser.api.open",
+    "onUriOpen:http",
+    "onUriOpen:https"
+  ],
+  "contributes": {
+    "commands": [
+      {
+        "command": "simpleBrowser.show",
+        "title": "Show",
+        "category": "Simple Browser"
+      }
+    ],
+    "configuration": [
+      {
+        "title": "Simple Browser",
+        "properties": {
+          "simpleBrowser.focusLockIndicator.enabled": {
+            "type": "boolean",
+            "default": true,
+            "title": "Focus Lock Indicator Enabled",
+            "description": "%configuration.focusLockIndicator.enabled.description%"
+          }
+        }
+      }
+    ]
+  },
+  "scripts": {
+    "compile": "gulp compile-extension:markdown-language-features && npm run build-preview",
+    "watch": "npm run build-preview && gulp watch-extension:markdown-language-features",
+    "vscode:prepublish": "npm run build-ext && npm run build-preview",
+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:markdown-language-features ./tsconfig.json",
+    "build-preview": "webpack --mode development",
+    "build-preview-production": "webpack --mode production",
+    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
+    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
+  },
+  "dependencies": {
+    "vscode-codicons": "^0.0.12",
+    "vscode-extension-telemetry": "0.1.1",
+    "vscode-nls": "^4.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.7",
+    "ts-loader": "^6.2.1",
+    "typescript": "^3.7.3",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.0"
+  }
+}
diff --git a/extensions/simple-browser/package.nls.json b/extensions/simple-browser/package.nls.json
new file mode 100644
index 000000000..496dc28df
--- /dev/null
+++ b/extensions/simple-browser/package.nls.json
@@ -0,0 +1,5 @@
+{
+	"displayName": "Simple Browser",
+	"description": "A very basic built-in webview for displaying web content.",
+	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser."
+}
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon-animations.css b/extensions/simple-browser/preview-src/events.ts
similarity index 62%
rename from src/vs/base/browser/ui/codicons/codicon/codicon-animations.css
rename to extensions/simple-browser/preview-src/events.ts
index 667002f5b..81ce5c616 100644
--- a/src/vs/base/browser/ui/codicons/codicon/codicon-animations.css
+++ b/extensions/simple-browser/preview-src/events.ts
@@ -3,13 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-@keyframes codicon-spin {
-	100% {
-		transform:rotate(360deg);
+export function onceDocumentLoaded(f: () => void) {
+	if (document.readyState === 'loading' || document.readyState as string === 'uninitialized') {
+		document.addEventListener('DOMContentLoaded', f);
+	} else {
+		f();
 	}
-}
-
-.codicon-animation-spin {
-	/* Use steps to throttle FPS to reduce CPU usage */
-	animation: codicon-spin 1.5s steps(30) infinite;
-}
+}
\ No newline at end of file
diff --git a/extensions/simple-browser/preview-src/index.ts b/extensions/simple-browser/preview-src/index.ts
new file mode 100644
index 000000000..564224fd3
--- /dev/null
+++ b/extensions/simple-browser/preview-src/index.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { onceDocumentLoaded } from './events';
+
+declare let acquireVsCodeApi: any;
+const vscode = acquireVsCodeApi();
+
+function getSettings() {
+	const element = document.getElementById('simple-browser-settings');
+	if (element) {
+		const data = element.getAttribute('data-settings');
+		if (data) {
+			return JSON.parse(data);
+		}
+	}
+
+	throw new Error(`Could not load settings`);
+}
+
+const settings = getSettings();
+
+const iframe = document.querySelector('iframe')!;
+const header = document.querySelector('.header')!;
+const input = header.querySelector<HTMLInputElement>('.url-input')!;
+const forwardButton = header.querySelector<HTMLButtonElement>('.forward-button')!;
+const backButton = header.querySelector<HTMLButtonElement>('.back-button')!;
+const reloadButton = header.querySelector<HTMLButtonElement>('.reload-button')!;
+const openExternalButton = header.querySelector<HTMLButtonElement>('.open-external-button')!;
+
+window.addEventListener('message', e => {
+	switch (e.data.type) {
+		case 'focus':
+			{
+				iframe.focus();
+				break;
+			}
+		case 'didChangeFocusLockIndicatorEnabled':
+			{
+				toggleFocusLockIndicatorEnabled(e.data.enabled);
+				break;
+			}
+	}
+});
+
+onceDocumentLoaded(() => {
+	setInterval(() => {
+		const iframeFocused = document.activeElement?.tagName === 'IFRAME';
+		document.body.classList.toggle('iframe-focused', iframeFocused);
+	}, 50);
+
+	iframe.addEventListener('load', () => {
+		// Noop
+	});
+
+	input.addEventListener('change', e => {
+		const url = (e.target as HTMLInputElement).value;
+		navigateTo(url);
+	});
+
+	forwardButton.addEventListener('click', () => {
+		history.forward();
+	});
+
+	backButton.addEventListener('click', () => {
+		history.back();
+	});
+
+	openExternalButton.addEventListener('click', () => {
+		vscode.postMessage({
+			type: 'openExternal',
+			url: input.value
+		});
+	});
+
+	reloadButton.addEventListener('click', () => {
+		// This does not seem to trigger what we want
+		// history.go(0);
+
+		// This incorrectly adds entries to the history but does reload
+		iframe.src = input.value;
+	});
+
+	navigateTo(settings.url);
+	toggleFocusLockIndicatorEnabled(settings.focusLockIndicatorEnabled);
+
+	function navigateTo(url: string): void {
+		iframe.src = url;
+	}
+});
+
+function toggleFocusLockIndicatorEnabled(enabled: boolean) {
+	document.body.classList.toggle('enable-focus-lock-indicator', enabled);
+}
+
diff --git a/extensions/simple-browser/preview-src/tsconfig.json b/extensions/simple-browser/preview-src/tsconfig.json
new file mode 100644
index 000000000..e19cd4a67
--- /dev/null
+++ b/extensions/simple-browser/preview-src/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": "../../shared.tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./dist/",
+		"jsx": "react",
+		"lib": [
+			"es2018",
+			"DOM",
+			"DOM.Iterable"
+		]
+	}
+}
diff --git a/extensions/simple-browser/src/dispose.ts b/extensions/simple-browser/src/dispose.ts
new file mode 100644
index 000000000..03c494c7c
--- /dev/null
+++ b/extensions/simple-browser/src/dispose.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+export function disposeAll(disposables: vscode.Disposable[]) {
+	while (disposables.length) {
+		const item = disposables.pop();
+		if (item) {
+			item.dispose();
+		}
+	}
+}
+
+export abstract class Disposable {
+	private _isDisposed = false;
+
+	protected _disposables: vscode.Disposable[] = [];
+
+	public dispose(): any {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+		disposeAll(this._disposables);
+	}
+
+	protected _register<T extends vscode.Disposable>(value: T): T {
+		if (this._isDisposed) {
+			value.dispose();
+		} else {
+			this._disposables.push(value);
+		}
+		return value;
+	}
+
+	protected get isDisposed() {
+		return this._isDisposed;
+	}
+}
diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts
new file mode 100644
index 000000000..cf2b7863c
--- /dev/null
+++ b/extensions/simple-browser/src/extension.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { SimpleBrowserManager } from './simpleBrowserManager';
+
+declare const URL: typeof import('url').URL;
+
+const localize = nls.loadMessageBundle();
+
+const openApiCommand = 'simpleBrowser.api.open';
+const showCommand = 'simpleBrowser.show';
+
+const enabledHosts = new Set<string>([
+	'localhost',
+	'127.0.0.1'
+]);
+
+const openerId = 'simpleBrowser.open';
+
+export function activate(context: vscode.ExtensionContext) {
+
+	const manager = new SimpleBrowserManager(context.extensionUri);
+	context.subscriptions.push(manager);
+
+	context.subscriptions.push(vscode.commands.registerCommand(showCommand, async (url?: string) => {
+		if (!url) {
+			url = await vscode.window.showInputBox({
+				placeHolder: localize('simpleBrowser.show.placeholder', "https://example.com"),
+				prompt: localize('simpleBrowser.show.prompt', "Enter url to visit")
+			});
+		}
+
+		if (url) {
+			manager.show(url);
+		}
+	}));
+
+	context.subscriptions.push(vscode.commands.registerCommand(openApiCommand, (url: vscode.Uri, showOptions?: {
+		preserveFocus?: boolean,
+		viewColumn: vscode.ViewColumn,
+	}) => {
+		manager.show(url.toString(), showOptions);
+	}));
+
+	context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, {
+		canOpenExternalUri(uri: vscode.Uri) {
+			const originalUri = new URL(uri.toString());
+			if (enabledHosts.has(originalUri.hostname)) {
+				return isWeb()
+					? vscode.ExternalUriOpenerPriority.Default
+					: vscode.ExternalUriOpenerPriority.Option;
+			}
+
+			return vscode.ExternalUriOpenerPriority.None;
+		},
+		openExternalUri(resolveUri: vscode.Uri) {
+			return manager.show(resolveUri.toString(), {
+				viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
+			});
+		}
+	}, {
+		schemes: ['http', 'https'],
+		label: localize('openTitle', "Open in simple browser"),
+	}));
+}
+
+function isWeb(): boolean {
+	// @ts-expect-error
+	return typeof navigator !== 'undefined' && vscode.env.uiKind === vscode.UIKind.Web;
+}
diff --git a/extensions/simple-browser/src/simpleBrowserManager.ts b/extensions/simple-browser/src/simpleBrowserManager.ts
new file mode 100644
index 000000000..e699377fa
--- /dev/null
+++ b/extensions/simple-browser/src/simpleBrowserManager.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { ShowOptions, SimpleBrowserView } from './simpleBrowserView';
+
+export class SimpleBrowserManager {
+
+	private _activeView?: SimpleBrowserView;
+
+	constructor(
+		private readonly extensionUri: vscode.Uri,
+	) { }
+
+	dispose() {
+		this._activeView?.dispose();
+		this._activeView = undefined;
+	}
+
+	public show(url: string, options?: ShowOptions): void {
+		if (this._activeView) {
+			this._activeView.show(url, options);
+		} else {
+			const view = new SimpleBrowserView(this.extensionUri, url, options);
+			view.onDispose(() => {
+				if (this._activeView === view) {
+					this._activeView = undefined;
+				}
+			});
+
+			this._activeView = view;
+		}
+	}
+}
+
+
diff --git a/extensions/simple-browser/src/simpleBrowserView.ts b/extensions/simple-browser/src/simpleBrowserView.ts
new file mode 100644
index 000000000..104acfe95
--- /dev/null
+++ b/extensions/simple-browser/src/simpleBrowserView.ts
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { Disposable } from './dispose';
+
+const localize = nls.loadMessageBundle();
+
+export interface ShowOptions {
+	readonly preserveFocus?: boolean;
+	readonly viewColumn?: vscode.ViewColumn;
+}
+
+export class SimpleBrowserView extends Disposable {
+
+	public static readonly viewType = 'simpleBrowser.view';
+	private static readonly title = localize('view.title', "Simple Browser");
+
+	private readonly _webviewPanel: vscode.WebviewPanel;
+
+	private readonly _onDidDispose = this._register(new vscode.EventEmitter<void>());
+	public readonly onDispose = this._onDidDispose.event;
+
+	constructor(
+		private readonly extensionUri: vscode.Uri,
+		url: string,
+		showOptions?: ShowOptions
+	) {
+		super();
+
+		this._webviewPanel = this._register(vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, {
+			viewColumn: showOptions?.viewColumn ?? vscode.ViewColumn.Active,
+			preserveFocus: showOptions?.preserveFocus
+		}, {
+			enableScripts: true,
+			retainContextWhenHidden: true,
+		}));
+
+		this._register(this._webviewPanel.webview.onDidReceiveMessage(e => {
+			switch (e.type) {
+				case 'openExternal':
+					try {
+						const url = vscode.Uri.parse(e.url);
+						vscode.env.openExternal(url);
+					} catch {
+						// Noop
+					}
+					break;
+			}
+		}));
+
+		this._register(this._webviewPanel.onDidDispose(() => {
+			this.dispose();
+		}));
+
+		this._register(vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('simpleBrowser.focusLockIndicator.enabled')) {
+				const configuration = vscode.workspace.getConfiguration('simpleBrowser');
+				this._webviewPanel.webview.postMessage({
+					type: 'didChangeFocusLockIndicatorEnabled',
+					focusLockEnabled: configuration.get<boolean>('focusLockIndicator.enabled', true)
+				});
+			}
+		}));
+
+		this.show(url);
+	}
+
+	public dispose() {
+		this._onDidDispose.fire();
+		super.dispose();
+	}
+
+	public show(url: string, options?: ShowOptions) {
+		this._webviewPanel.webview.html = this.getHtml(url);
+		this._webviewPanel.reveal(options?.viewColumn, options?.preserveFocus);
+	}
+
+	private getHtml(url: string) {
+		const configuration = vscode.workspace.getConfiguration('simpleBrowser');
+
+		const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
+
+		const mainJs = this.extensionResourceUrl('media', 'index.js');
+		const mainCss = this.extensionResourceUrl('media', 'main.css');
+		const codiconsUri = this.extensionResourceUrl('node_modules', 'vscode-codicons', 'dist', 'codicon.css');
+		const codiconsFontUri = this.extensionResourceUrl('node_modules', 'vscode-codicons', 'dist', 'codicon.ttf');
+
+		return /* html */ `<!DOCTYPE html>
+			<html>
+			<head>
+				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+
+				<meta http-equiv="Content-Security-Policy" content="
+					default-src 'none';
+					font-src ${codiconsFontUri};
+					style-src ${this._webviewPanel.webview.cspSource};
+					script-src 'nonce-${nonce}';
+					frame-src *;
+					">
+
+				<meta id="simple-browser-settings" data-settings="${escapeAttribute(JSON.stringify({
+			url: url,
+			focusLockEnabled: configuration.get<boolean>('focusLockIndicator.enabled', true)
+		}))}">
+
+				<link rel="stylesheet" type="text/css" href="${mainCss}">
+				<link rel="stylesheet" type="text/css" href="${codiconsUri}">
+			</head>
+			<body>
+				<header class="header">
+					<nav class="controls">
+						<button
+							title="${localize('control.back.title', "Back")}"
+							class="back-button icon"><i class="codicon codicon-arrow-left"></i></button>
+
+						<button
+							title="${localize('control.forward.title', "Forward")}"
+							class="forward-button icon"><i class="codicon codicon-arrow-right"></i></button>
+
+						<button
+							title="${localize('control.reload.title', "Reload")}"
+							class="reload-button icon"><i class="codicon codicon-refresh"></i></button>
+					</nav>
+
+					<input class="url-input" type="text" value=${url}>
+
+					<nav class="controls">
+						<button
+							title="${localize('control.openExternal.title', "Open in browser")}"
+							class="open-external-button icon"><i class="codicon codicon-link-external"></i></button>
+					</nav>
+				</header>
+				<div class="content">
+					<div class="iframe-focused-alert">${localize('view.iframe-focused', "Focus Lock")}</div>
+					<iframe sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
+				</div>
+
+				<script src="${mainJs}" nonce="${nonce}"></script>
+			</body>
+			</html>`;
+	}
+
+	private extensionResourceUrl(...parts: string[]): vscode.Uri {
+		return this._webviewPanel.webview.asWebviewUri(vscode.Uri.joinPath(this.extensionUri, ...parts));
+	}
+}
+
+function escapeAttribute(value: string | vscode.Uri): string {
+	return value.toString().replace(/"/g, '&quot;');
+}
diff --git a/extensions/python/src/typings/ref.d.ts b/extensions/simple-browser/src/typings/ref.d.ts
similarity index 74%
rename from extensions/python/src/typings/ref.d.ts
rename to extensions/simple-browser/src/typings/ref.d.ts
index 531d3c037..c9849d48e 100644
--- a/extensions/python/src/typings/ref.d.ts
+++ b/extensions/simple-browser/src/typings/ref.d.ts
@@ -3,4 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../../src/vs/vscode.d.ts'/>
\ No newline at end of file
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
diff --git a/extensions/simple-browser/tsconfig.json b/extensions/simple-browser/tsconfig.json
new file mode 100644
index 000000000..d0797affb
--- /dev/null
+++ b/extensions/simple-browser/tsconfig.json
@@ -0,0 +1,10 @@
+{
+	"extends": "../shared.tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./out",
+		"experimentalDecorators": true
+	},
+	"include": [
+		"src/**/*"
+	]
+}
diff --git a/extensions/python/src/pythonMain.ts b/extensions/simple-browser/webpack.config.js
similarity index 50%
rename from extensions/python/src/pythonMain.ts
rename to extensions/simple-browser/webpack.config.js
index b16021f56..4a9990ac0 100644
--- a/extensions/python/src/pythonMain.ts
+++ b/extensions/simple-browser/webpack.config.js
@@ -2,16 +2,27 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+const path = require('path');
 
-import { ExtensionContext, languages, IndentAction } from 'vscode';
-
-export function activate(_context: ExtensionContext): any {
-	languages.setLanguageConfiguration('python', {
-		onEnterRules: [
+module.exports = {
+	entry: {
+		index: './preview-src/index.ts',
+	},
+	devtool: 'source-map',
+	module: {
+		rules: [
 			{
-				beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally|except|async).*?:\s*$/,
-				action: { indentAction: IndentAction.Indent }
+				test: /\.tsx?$/,
+				use: 'ts-loader',
+				exclude: /node_modules/
 			}
 		]
-	});
-}
\ No newline at end of file
+	},
+	resolve: {
+		extensions: ['.tsx', '.ts', '.js']
+	},
+	output: {
+		filename: '[name].js',
+		path: path.resolve(__dirname, 'media')
+	}
+};
diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock
new file mode 100644
index 000000000..1daa22f57
--- /dev/null
+++ b/extensions/simple-browser/yarn.lock
@@ -0,0 +1,2732 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@^12.11.7":
+  version "12.12.69"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.69.tgz#7cb6a3aa0d16664bf2dcd1450ccb8477464fbd79"
+  integrity sha512-2F2VQRSFmzqgUEXw75L51MgnnZqc6bKWVSUPfrDPzp6mzGGibeVwyQcpvZvBr5RnsoMRHmC8EcBQiobSeqeJxg==
+
+"@webassemblyjs/ast@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
+  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+
+"@webassemblyjs/floating-point-hex-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
+  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+
+"@webassemblyjs/helper-api-error@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
+  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+
+"@webassemblyjs/helper-buffer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
+  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+
+"@webassemblyjs/helper-code-frame@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
+  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/helper-fsm@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
+  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+
+"@webassemblyjs/helper-module-context@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
+  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+
+"@webassemblyjs/helper-wasm-bytecode@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
+  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+
+"@webassemblyjs/helper-wasm-section@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
+  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+
+"@webassemblyjs/ieee754@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
+  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
+  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
+  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+
+"@webassemblyjs/wasm-edit@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
+  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/helper-wasm-section" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-opt" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.0"
+
+"@webassemblyjs/wasm-gen@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
+  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wasm-opt@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
+  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-buffer" "1.9.0"
+    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+
+"@webassemblyjs/wasm-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
+  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
+    "@webassemblyjs/ieee754" "1.9.0"
+    "@webassemblyjs/leb128" "1.9.0"
+    "@webassemblyjs/utf8" "1.9.0"
+
+"@webassemblyjs/wast-parser@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
+  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
+    "@webassemblyjs/helper-api-error" "1.9.0"
+    "@webassemblyjs/helper-code-frame" "1.9.0"
+    "@webassemblyjs/helper-fsm" "1.9.0"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
+  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/wast-parser" "1.9.0"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.1.0, ajv@^6.10.2:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+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==
+  dependencies:
+    diagnostic-channel "0.2.0"
+    diagnostic-channel-publishers "0.2.1"
+    zone.js "0.7.6"
+
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-js@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+
+bn.js@^5.1.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+chalk@^2.3.0, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chokidar@^3.4.1:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
+  integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-trace-event@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+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=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+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@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
+  integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc=
+  dependencies:
+    semver "^5.3.0"
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+elliptic@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+esrecurse@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+events@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+findup-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+fsevents@~2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@~5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1.3, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+interpret@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^1.0.2, loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@^0.5.1, mkdirp@^0.5.3:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+nan@^2.12.1:
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+neo-async@^2.5.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+p-limit@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
+  dependencies:
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+pbkdf2@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+rimraf@^2.5.4, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+safer-buffer@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+tapable@^1.0.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+terser-webpack-plugin@^1.4.3:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@^4.1.2:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+timers-browserify@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+ts-loader@^6.2.1:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
+  integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^4.0.0"
+    loader-utils "^1.0.2"
+    micromatch "^4.0.0"
+    semver "^6.0.0"
+
+tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript@^3.7.3:
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
+  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+uri-js@^4.2.2:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+vscode-codicons@^0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-codicons/-/vscode-codicons-0.0.12.tgz#94b867156f3e3a6a4cf7661e9bf2bd0060042390"
+  integrity sha512-CyGFDf3OmQhtBql/BFheUAlvEZ1MKAgvyCrGktGXEsqYvK5m9456kckDTNvnEAGG8gYjE2ds5O1cle82sMgmAg==
+
+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==
+  dependencies:
+    applicationinsights "1.0.8"
+
+vscode-nls@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
+  integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
+
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.0"
+
+webpack-cli@^3.3.0:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
+  integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
+  dependencies:
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.1"
+    findup-sync "^3.0.0"
+    global-modules "^2.0.0"
+    import-local "^2.0.0"
+    interpret "^1.4.0"
+    loader-utils "^1.4.0"
+    supports-color "^6.1.0"
+    v8-compile-cache "^2.1.1"
+    yargs "^13.3.2"
+
+webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^4.41.2:
+  version "4.44.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.3.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.3"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.7.4"
+    webpack-sources "^1.4.1"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@^1.2.14, which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+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=
diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json
index 91a374d47..632b31603 100644
--- a/extensions/swift/syntaxes/swift.tmLanguage.json
+++ b/extensions/swift/syntaxes/swift.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/textmate/swift.tmbundle/commit/97d29d2073853c328e42239c5d38c96e2e2ade9c",
+	"version": "https://github.com/textmate/swift.tmbundle/commit/d31bae2e0d6a4d977187dc7f06f538d6ba56b89b",
 	"name": "Swift",
 	"scopeName": "source.swift",
 	"comment": "See swift.tmbundle/grammar-test.swift for test cases.",
@@ -754,6 +754,9 @@
 				{
 					"include": "#function-initializer"
 				},
+				{
+					"include": "#typed-variable-declaration"
+				},
 				{
 					"include": "#import"
 				},
@@ -792,6 +795,10 @@
 							"match": "\\b(?:throws|rethrows)\\b",
 							"name": "keyword.control.exception.swift"
 						},
+						{
+							"match": "\\bsome\\b",
+							"name": "keyword.operator.type.opaque.swift"
+						},
 						{
 							"match": "\\binout\\b",
 							"name": "storage.modifier.swift"
@@ -2228,6 +2235,20 @@
 						}
 					]
 				},
+				"typed-variable-declaration": {
+					"begin": "(?x)\n\t\t\t\t\t\t\\b(let|var)\\b\\s+\n\t\t\t\t\t\t(?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)\\s*\n\t\t\t\t\t\t:\n\t\t\t\t\t",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.other.declaration-specifier.swift"
+						}
+					},
+					"end": "(?=$|[={])",
+					"patterns": [
+						{
+							"include": "#available-types"
+						}
+					]
+				},
 				"types-precedencegroup": {
 					"patterns": [
 						{
diff --git a/extensions/testing-editor-contributions/.vscodeignore b/extensions/testing-editor-contributions/.vscodeignore
new file mode 100644
index 000000000..da3d27636
--- /dev/null
+++ b/extensions/testing-editor-contributions/.vscodeignore
@@ -0,0 +1,6 @@
+src/**
+out/**
+tsconfig.json
+extension.webpack.config.js
+extension-browser.webpack.config.js
+yarn.lock
diff --git a/extensions/testing-editor-contributions/README.md b/extensions/testing-editor-contributions/README.md
new file mode 100644
index 000000000..721f6c7c3
--- /dev/null
+++ b/extensions/testing-editor-contributions/README.md
@@ -0,0 +1,5 @@
+# Testing Editor Contributions
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+Provides the in-editor experience for tests and test results
diff --git a/extensions/testing-editor-contributions/extension-browser.webpack.config.js b/extensions/testing-editor-contributions/extension-browser.webpack.config.js
new file mode 100644
index 000000000..10c0a19e3
--- /dev/null
+++ b/extensions/testing-editor-contributions/extension-browser.webpack.config.js
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+const path = require('path');
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts'
+	},
+	output: {
+		filename: 'extension.js',
+		path: path.join(__dirname, 'dist')
+	}
+});
diff --git a/extensions/testing-editor-contributions/extension.webpack.config.js b/extensions/testing-editor-contributions/extension.webpack.config.js
new file mode 100644
index 000000000..de88398ec
--- /dev/null
+++ b/extensions/testing-editor-contributions/extension.webpack.config.js
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	}
+});
diff --git a/extensions/testing-editor-contributions/package.json b/extensions/testing-editor-contributions/package.json
new file mode 100644
index 000000000..1576d3c0f
--- /dev/null
+++ b/extensions/testing-editor-contributions/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "testing-editor-contributions",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "enableProposedApi": true,
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "^1.39.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "main": "./out/extension.js",
+  "browser": "./dist/extension.js",
+  "activationEvents": [
+    "onStartupFinished"
+  ],
+	"dependencies": {
+		"vscode-nls": "^5.0.0"
+	},
+  "contributes": {
+    "configuration": {
+      "title": "Testing",
+      "properties": {
+        "testing.enableCodeLens": {
+          "description": "%config.enableCodeLens%",
+          "type": "boolean",
+          "default": true
+        },
+        "testing.enableProblemDiagnostics": {
+          "description": "%config.enableProblemDiagnostics%",
+          "type": "boolean",
+          "default": false
+        }
+      }
+    }
+  },
+  "scripts": {
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:testing-editor-contributions ./tsconfig.json"
+  },
+  "prettier": {
+    "printWidth": 100,
+    "singleQuote": true,
+    "trailingComma": "all"
+  }
+}
diff --git a/extensions/testing-editor-contributions/package.nls.json b/extensions/testing-editor-contributions/package.nls.json
new file mode 100644
index 000000000..753f6ec7b
--- /dev/null
+++ b/extensions/testing-editor-contributions/package.nls.json
@@ -0,0 +1,19 @@
+{
+	"displayName": "Testing Editor Contributions",
+	"description": "Provides the in-editor experience for tests and test results.",
+
+	"action.run": "Run Tests",
+	"action.debug": "Debug",
+
+	"tooltip.run": "Run {0}",
+	"tooltip.debug": "Debug {0}",
+	"tooltip.runState": "{0}/{0} Tests Passed",
+	"tooltip.runStateWithDuration": "{0}/{1} Tests Passed in {2}",
+
+	"state.failed": "Failed",
+	"state.passed": "Passed",
+	"state.passedWithDuration": "Passed in {0}",
+
+	"config.enableCodeLens": "Whether code lens on test cases and suites should be visible",
+	"config.enableProblemDiagnostics": "Whether test failures should be reported in the 'problems' view and show as errors in the editor."
+}
diff --git a/extensions/testing-editor-contributions/src/extension.ts b/extensions/testing-editor-contributions/src/extension.ts
new file mode 100644
index 000000000..fc6ab30b1
--- /dev/null
+++ b/extensions/testing-editor-contributions/src/extension.ts
@@ -0,0 +1,412 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+interface IDisposable {
+	dispose(): void;
+}
+
+const enum Constants {
+	ConfigSection = 'testing',
+	EnableCodeLensConfig = 'enableCodeLens',
+	EnableDiagnosticsConfig = 'enableProblemDiagnostics',
+}
+
+export function activate(context: vscode.ExtensionContext) {
+	const diagnostics = vscode.languages.createDiagnosticCollection();
+	const services = new TestingEditorServices(diagnostics);
+	context.subscriptions.push(
+		services,
+		diagnostics,
+		vscode.languages.registerCodeLensProvider({ scheme: 'file' }, services),
+	);
+}
+
+class TestingConfig implements IDisposable {
+	private section = vscode.workspace.getConfiguration(Constants.ConfigSection);
+	private readonly changeEmitter = new vscode.EventEmitter<void>();
+	private readonly listener = vscode.workspace.onDidChangeConfiguration(evt => {
+		if (evt.affectsConfiguration(Constants.ConfigSection)) {
+			this.section = vscode.workspace.getConfiguration(Constants.ConfigSection);
+			this.changeEmitter.fire();
+		}
+	});
+
+	public readonly onChange = this.changeEmitter.event;
+
+	public get codeLens() {
+		return this.section.get(Constants.EnableCodeLensConfig, true);
+	}
+
+	public get diagnostics() {
+		return this.section.get(Constants.EnableDiagnosticsConfig, false);
+	}
+
+	public get isEnabled() {
+		return this.codeLens || this.diagnostics;
+	}
+
+	public dispose() {
+		this.listener.dispose();
+	}
+}
+
+export class TestingEditorServices implements IDisposable, vscode.CodeLensProvider {
+	private readonly codeLensChangeEmitter = new vscode.EventEmitter<void>();
+	private readonly documents = new Map<string, DocumentTestObserver>();
+	private readonly config = new TestingConfig();
+	private disposables: IDisposable[];
+	private wasEnabled = this.config.isEnabled;
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onDidChangeCodeLenses = this.codeLensChangeEmitter.event;
+
+	constructor(private readonly diagnostics: vscode.DiagnosticCollection) {
+		this.disposables = [
+			new vscode.Disposable(() => this.expireAll()),
+
+			this.config,
+
+			vscode.window.onDidChangeVisibleTextEditors((editors) => {
+				if (!this.config.isEnabled) {
+					return;
+				}
+
+				const expiredEditors = new Set(this.documents.keys());
+				for (const editor of editors) {
+					const key = editor.document.uri.toString();
+					this.ensure(key, editor.document);
+					expiredEditors.delete(key);
+				}
+
+				for (const expired of expiredEditors) {
+					this.expire(expired);
+				}
+			}),
+
+			vscode.workspace.onDidCloseTextDocument((document) => {
+				this.expire(document.uri.toString());
+			}),
+
+			this.config.onChange(() => {
+				if (!this.wasEnabled || this.config.isEnabled) {
+					this.attachToAllVisible();
+				} else if (this.wasEnabled || !this.config.isEnabled) {
+					this.expireAll();
+				}
+
+				this.wasEnabled = this.config.isEnabled;
+				this.codeLensChangeEmitter.fire();
+			}),
+		];
+
+		if (this.config.isEnabled) {
+			this.attachToAllVisible();
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public provideCodeLenses(document: vscode.TextDocument) {
+		if (!this.config.codeLens) {
+			return [];
+		}
+
+		return this.documents.get(document.uri.toString())?.provideCodeLenses() ?? [];
+	}
+
+	/**
+	 * Attach to all currently visible editors.
+	 */
+	private attachToAllVisible() {
+		for (const editor of vscode.window.visibleTextEditors) {
+			this.ensure(editor.document.uri.toString(), editor.document);
+		}
+	}
+
+	/**
+	 * Unattaches to all tests.
+	 */
+	private expireAll() {
+		for (const observer of this.documents.values()) {
+			observer.dispose();
+		}
+
+		this.documents.clear();
+	}
+
+	/**
+	 * Subscribes to tests for the document URI.
+	 */
+	private ensure(key: string, document: vscode.TextDocument) {
+		const state = this.documents.get(key);
+		if (!state) {
+			const observer = new DocumentTestObserver(document, this.diagnostics, this.config);
+			this.documents.set(key, observer);
+			observer.onDidChangeCodeLenses(() => this.config.codeLens && this.codeLensChangeEmitter.fire());
+		}
+	}
+
+	/**
+	 * Expires and removes the watcher for the document.
+	 */
+	private expire(key: string) {
+		const observer = this.documents.get(key);
+		if (!observer) {
+			return;
+		}
+
+		observer.dispose();
+		this.documents.delete(key);
+	}
+
+	/**
+	 * @override
+	 */
+	public dispose() {
+		this.disposables.forEach((d) => d.dispose());
+	}
+}
+
+class DocumentTestObserver implements IDisposable {
+	private readonly codeLensChangeEmitter = new vscode.EventEmitter<void>();
+	private readonly observer = vscode.test.createDocumentTestObserver(this.document);
+	private readonly disposables: IDisposable[];
+	public readonly onDidChangeCodeLenses = this.codeLensChangeEmitter.event;
+	private didHaveDiagnostics = this.config.diagnostics;
+
+	constructor(
+		private readonly document: vscode.TextDocument,
+		private readonly diagnostics: vscode.DiagnosticCollection,
+		private readonly config: TestingConfig,
+	) {
+		this.disposables = [
+			this.observer,
+			this.codeLensChangeEmitter,
+
+			config.onChange(() => {
+				if (this.didHaveDiagnostics && !config.diagnostics) {
+					this.diagnostics.set(document.uri, []);
+				} else if (!this.didHaveDiagnostics && config.diagnostics) {
+					this.updateDiagnostics();
+				}
+
+				this.didHaveDiagnostics = config.diagnostics;
+			}),
+
+			this.observer.onDidChangeTest(() => {
+				this.updateDiagnostics();
+				this.codeLensChangeEmitter.fire();
+			}),
+		];
+
+	}
+
+	private updateDiagnostics() {
+		if (!this.config.diagnostics) {
+			return;
+		}
+
+		const uriString = this.document.uri.toString();
+		const diagnostics: vscode.Diagnostic[] = [];
+		for (const test of iterateOverTests(this.observer.tests)) {
+			for (const message of test.state.messages) {
+				if (message.location?.uri.toString() === uriString) {
+					diagnostics.push({
+						range: message.location.range,
+						message: message.message.toString(),
+						severity: testToDiagnosticSeverity(message.severity),
+					});
+				}
+			}
+		}
+
+		this.diagnostics.set(this.document.uri, diagnostics);
+	}
+
+	public provideCodeLenses(): vscode.CodeLens[] {
+		const lenses: vscode.CodeLens[] = [];
+
+		for (const test of iterateOverTests(this.observer.tests)) {
+			const { debuggable = false, runnable = true } = test;
+			if (!test.location || !(debuggable || runnable)) {
+				continue;
+			}
+
+			const summary = summarize(test);
+
+			lenses.push({
+				isResolved: true,
+				range: test.location.range,
+				command: {
+					title: `$(${testStateToIcon[summary.computedState]}) ${getLabelFor(test, summary)}`,
+					command: 'vscode.runTests',
+					arguments: [[test]],
+					tooltip: localize('tooltip.debug', 'Debug {0}', test.label),
+				},
+			});
+
+			if (debuggable) {
+				lenses.push({
+					isResolved: true,
+					range: test.location.range,
+					command: {
+						title: localize('action.debug', 'Debug'),
+						command: 'vscode.debugTests',
+						arguments: [[test]],
+						tooltip: localize('tooltip.debug', 'Debug {0}', test.label),
+					},
+				});
+			}
+		}
+
+		return lenses;
+	}
+
+	/**
+	 * @override
+	 */
+	public dispose() {
+		this.diagnostics.set(this.document.uri, []);
+		this.disposables.forEach(d => d.dispose());
+	}
+}
+
+function getLabelFor(test: vscode.TestItem, summary: ITestSummary) {
+	if (summary.duration !== undefined) {
+		return localize(
+			'tooltip.runStateWithDuration',
+			'{0}/{1} Tests Passed in {2}',
+			summary.passed,
+			summary.passed + summary.failed,
+			formatDuration(summary.duration),
+		);
+	}
+
+	if (summary.passed > 0 || summary.failed > 0) {
+		return localize('tooltip.runState', '{0}/{1} Tests Passed', summary.passed, summary.failed);
+	}
+
+	if (test.state.runState === vscode.TestRunState.Passed) {
+		return test.state.duration !== undefined
+			? localize('state.passedWithDuration', 'Passed in {0}', formatDuration(test.state.duration))
+			: localize('state.passed', 'Passed');
+	}
+
+	if (isFailedState(test.state.runState)) {
+		return localize('state.failed', 'Failed');
+	}
+
+	return localize('action.run', 'Run Tests');
+}
+
+function formatDuration(duration: number) {
+	if (duration < 1_000) {
+		return `${Math.round(duration)}ms`;
+	}
+
+	if (duration < 100_000) {
+		return `${(duration / 1000).toPrecision(3)}s`;
+	}
+
+	return `${(duration / 1000 / 60).toPrecision(3)}m`;
+}
+
+const statePriority: { [K in vscode.TestRunState]: number } = {
+	[vscode.TestRunState.Running]: 6,
+	[vscode.TestRunState.Queued]: 5,
+	[vscode.TestRunState.Errored]: 4,
+	[vscode.TestRunState.Failed]: 3,
+	[vscode.TestRunState.Passed]: 2,
+	[vscode.TestRunState.Skipped]: 1,
+	[vscode.TestRunState.Unset]: 0,
+};
+
+const maxPriority = (a: vscode.TestRunState, b: vscode.TestRunState) =>
+	statePriority[a] > statePriority[b] ? a : b;
+
+const isFailedState = (s: vscode.TestRunState) =>
+	s === vscode.TestRunState.Failed || s === vscode.TestRunState.Errored;
+
+interface ITestSummary {
+	passed: number;
+	failed: number;
+	duration: number | undefined;
+	computedState: vscode.TestRunState;
+}
+
+function summarize(test: vscode.TestItem) {
+	let passed = 0;
+	let failed = 0;
+	let duration: number | undefined;
+	let computedState = test.state.runState;
+
+	const queue = test.children ? [test.children] : [];
+	while (queue.length) {
+		for (const test of queue.pop()!) {
+			computedState = maxPriority(computedState, test.state.runState);
+			if (test.state.runState === vscode.TestRunState.Passed) {
+				passed++;
+				if (test.state.duration !== undefined) {
+					duration = test.state.duration + (duration ?? 0);
+				}
+			} else if (isFailedState(test.state.runState)) {
+				failed++;
+				if (test.state.duration !== undefined) {
+					duration = test.state.duration + (duration ?? 0);
+				}
+			}
+
+			if (test.children) {
+				queue.push(test.children);
+			}
+		}
+	}
+
+	return { passed, failed, duration, computedState };
+}
+
+function* iterateOverTests(tests: ReadonlyArray<vscode.TestItem>) {
+	const queue = [tests];
+	while (queue.length) {
+		for (const test of queue.pop()!) {
+			yield test;
+			if (test.children) {
+				queue.push(test.children);
+			}
+		}
+	}
+}
+
+const testStateToIcon: { [K in vscode.TestRunState]: string } = {
+	[vscode.TestRunState.Errored]: 'testing-error-icon',
+	[vscode.TestRunState.Failed]: 'testing-failed-icon',
+	[vscode.TestRunState.Passed]: 'testing-passed-icon',
+	[vscode.TestRunState.Queued]: 'testing-queued-icon',
+	[vscode.TestRunState.Skipped]: 'testing-skipped-icon',
+	[vscode.TestRunState.Unset]: 'beaker',
+	[vscode.TestRunState.Running]: 'loading~spin',
+};
+
+const testToDiagnosticSeverity = (severity: vscode.TestMessageSeverity | undefined) => {
+	switch (severity) {
+		case vscode.TestMessageSeverity.Hint:
+			return vscode.DiagnosticSeverity.Hint;
+		case vscode.TestMessageSeverity.Information:
+			return vscode.DiagnosticSeverity.Information;
+		case vscode.TestMessageSeverity.Warning:
+			return vscode.DiagnosticSeverity.Warning;
+		case vscode.TestMessageSeverity.Error:
+		default:
+			return vscode.DiagnosticSeverity.Error;
+	}
+};
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css b/extensions/testing-editor-contributions/src/typings/refs.d.ts
similarity index 74%
rename from src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css
rename to extensions/testing-editor-contributions/src/typings/refs.d.ts
index 950493dd6..c9849d48e 100644
--- a/src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css
+++ b/extensions/testing-editor-contributions/src/typings/refs.d.ts
@@ -3,6 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.codicon-wrench-subaction {
-	opacity: 0.5;
-}
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
diff --git a/extensions/python/tsconfig.json b/extensions/testing-editor-contributions/tsconfig.json
similarity index 80%
rename from extensions/python/tsconfig.json
rename to extensions/testing-editor-contributions/tsconfig.json
index 296ddb38f..16ed233f6 100644
--- a/extensions/python/tsconfig.json
+++ b/extensions/testing-editor-contributions/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"extends": "../shared.tsconfig.json",
 	"compilerOptions": {
-		"outDir": "./out"
+		"outDir": "./out",
 	},
 	"include": [
 		"src/**/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/testing-editor-contributions/yarn.lock b/extensions/testing-editor-contributions/yarn.lock
new file mode 100644
index 000000000..9250709d1
--- /dev/null
+++ b/extensions/testing-editor-contributions/yarn.lock
@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+vscode-nls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
+  integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index 545003e97..c21bc3b75 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -1666,6 +1666,9 @@
 		"gruntfile.coffee": "_grunt",
 		"gulpfile": "_gulp",
 		"gulpfile.js": "_gulp",
+		"gulpfile.mjs": "_gulp",
+		"gulpfile.cjs": "_gulp",
+		"gulpfile.esm.js": "_gulp",
 		"ionic.config.json": "_ionic",
 		"ionic.project": "_ionic",
 		"platformio.ini": "_platformio",
@@ -2099,4 +2102,4 @@
 		}
 	},
 	"version": "https://github.com/jesseweed/seti-ui/commit/4bbf2132df28c71302e305077ce20a811bf7d64b"
-}
\ No newline at end of file
+}
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index 0a81ee864..11992b0e4 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "TypeScript-TmLanguage",
 					"repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage",
-					"commitHash": "59b62cbc624e3a01368e5432d85af0c99a27d49d"
+					"commitHash": "398985941eb36cd270054a6e668d03fb9ef92e77"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 4f7b3c715..54748a293 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.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/microsoft/TypeScript-TmLanguage/commit/59b62cbc624e3a01368e5432d85af0c99a27d49d",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/398985941eb36cd270054a6e668d03fb9ef92e77",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -436,7 +436,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts entity.name.function.ts"
@@ -494,7 +494,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts variable.other.constant.ts entity.name.function.ts"
@@ -878,7 +878,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1118,7 +1118,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.ts entity.name.function.ts"
@@ -1301,7 +1301,7 @@
 				},
 				{
 					"name": "meta.method.declaration.ts",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1331,7 +1331,7 @@
 				},
 				{
 					"name": "meta.method.declaration.ts",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -1363,7 +1363,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.ts",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.ts"
@@ -1384,7 +1384,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -1444,7 +1444,7 @@
 				},
 				{
 					"name": "meta.arrow.ts",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -1554,6 +1554,14 @@
 				}
 			},
 			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.ts"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				}
@@ -1991,6 +1999,23 @@
 				{
 					"include": "#type-parameters"
 				},
+				{
+					"begin": "(=)\\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.ts"
+						},
+						"2": {
+							"name": "keyword.control.intrinsic.ts"
+						}
+					},
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
 				{
 					"begin": "(=)\\s*",
 					"beginCaptures": {
@@ -2449,7 +2474,7 @@
 		"if-statement": {
 			"patterns": [
 				{
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))\\s*(?!\\{))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
 					"end": "(?=;|$|\\})",
 					"patterns": [
 						{
@@ -2638,7 +2663,7 @@
 				},
 				{
 					"name": "meta.object.member.ts",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.ts"
@@ -2729,7 +2754,7 @@
 					"end": "(?=,|\\})",
 					"patterns": [
 						{
-							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.ts"
@@ -2762,7 +2787,7 @@
 							]
 						},
 						{
-							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.ts"
@@ -2798,7 +2823,7 @@
 							]
 						},
 						{
-							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "meta.brace.round.ts"
@@ -2851,13 +2876,13 @@
 		"function-call": {
 			"patterns": [
 				{
-					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 					"patterns": [
 						{
 							"name": "meta.function-call.ts",
 							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 							"patterns": [
 								{
 									"include": "#function-call-target"
@@ -2959,13 +2984,7 @@
 			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
-					"include": "#paren-expression"
-				},
-				{
-					"include": "#class-declaration"
-				},
-				{
-					"include": "#type"
+					"include": "#expression"
 				}
 			]
 		},
@@ -2986,7 +3005,7 @@
 		"paren-expression-possibly-arrow": {
 			"patterns": [
 				{
-					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -3000,7 +3019,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -3070,7 +3089,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -3377,8 +3396,18 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.expression.typeof.ts",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.expression.typeof.ts"
+				}
+			},
+			"end": "(?=[,);}\\]=>]|$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
 		},
 		"literal": {
 			"patterns": [
@@ -3646,7 +3675,7 @@
 					}
 				},
 				{
-					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
+					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -3690,7 +3719,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -4013,7 +4042,7 @@
 					"include": "#comment"
 				},
 				{
-					"include": "#string"
+					"include": "#type-string"
 				},
 				{
 					"include": "#numeric-literal"
@@ -4221,7 +4250,7 @@
 			},
 			"patterns": [
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -4626,42 +4655,7 @@
 		"template": {
 			"patterns": [
 				{
-					"name": "string.template.ts",
-					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-							"patterns": [
-								{
-									"include": "#support-function-call-identifiers"
-								},
-								{
-									"name": "entity.name.function.tagged-template.ts",
-									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
-								}
-							]
-						},
-						{
-							"include": "#type-arguments"
-						}
-					]
-				},
-				{
-					"name": "string.template.ts",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.tagged-template.ts"
-						}
-					},
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"include": "#type-arguments"
-						}
-					]
+					"include": "#template-call"
 				},
 				{
 					"name": "string.template.ts",
@@ -4691,6 +4685,48 @@
 				}
 			]
 		},
+		"template-call": {
+			"patterns": [
+				{
+					"name": "string.template.ts",
+					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+							"patterns": [
+								{
+									"include": "#support-function-call-identifiers"
+								},
+								{
+									"name": "entity.name.function.tagged-template.ts",
+									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+								}
+							]
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				},
+				{
+					"name": "string.template.ts",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.ts"
+						}
+					},
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
 		"template-substitution-element": {
 			"name": "meta.template.expression.ts",
 			"begin": "\\$\\{",
@@ -4712,6 +4748,73 @@
 			],
 			"contentName": "meta.embedded.line.ts"
 		},
+		"type-string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template-type"
+				}
+			]
+		},
+		"template-type": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"name": "string.template.ts",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.ts"
+						},
+						"2": {
+							"name": "punctuation.definition.string.template.begin.ts"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.template.end.ts"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-type-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-type-substitution-element": {
+			"name": "meta.template.expression.ts",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.ts"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.ts"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			],
+			"contentName": "meta.embedded.line.ts"
+		},
 		"regex": {
 			"patterns": [
 				{
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index e655d8ab0..5f673691d 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.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/microsoft/TypeScript-TmLanguage/commit/59b62cbc624e3a01368e5432d85af0c99a27d49d",
+	"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/398985941eb36cd270054a6e668d03fb9ef92e77",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -439,7 +439,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\!)?(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx entity.name.function.tsx"
@@ -497,7 +497,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx"
@@ -881,7 +881,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1121,7 +1121,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(\\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\\?)|(\\!))?(?=\\s*\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "meta.definition.property.tsx entity.name.function.tsx"
@@ -1304,7 +1304,7 @@
 				},
 				{
 					"name": "meta.method.declaration.tsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:(?:\\s*\\b(new)\\b(?!:)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(?:(\\*)\\s*)?)(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1334,7 +1334,7 @@
 				},
 				{
 					"name": "meta.method.declaration.tsx",
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -1366,7 +1366,7 @@
 		},
 		"object-literal-method-declaration": {
 			"name": "meta.method.declaration.tsx",
-			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+			"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.async.tsx"
@@ -1387,7 +1387,7 @@
 					"include": "#function-body"
 				},
 				{
-					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
+					"begin": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=\\s*(((\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)| # 1.1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # 1.E+3\n  (?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|             # .1E+3\n  (?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|                 # 1E+3\n  (?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|                      # 1.1\n  (?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|                                  # 1.\n  (?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|                                  # .1\n  (?:\\b[0-9][0-9_]*(n)?\\b(?!\\.))                                 # 1\n)(?!\\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?[\\(])",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -1447,7 +1447,7 @@
 				},
 				{
 					"name": "meta.arrow.tsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -1557,6 +1557,14 @@
 				}
 			},
 			"patterns": [
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+					"captures": {
+						"1": {
+							"name": "keyword.control.as.tsx"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				}
@@ -1994,6 +2002,23 @@
 				{
 					"include": "#type-parameters"
 				},
+				{
+					"begin": "(=)\\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.assignment.tsx"
+						},
+						"2": {
+							"name": "keyword.control.intrinsic.tsx"
+						}
+					},
+					"end": "(?=\\}|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
 				{
 					"begin": "(=)\\s*",
 					"beginCaptures": {
@@ -2452,7 +2477,7 @@
 		"if-statement": {
 			"patterns": [
 				{
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))\\s*(?!\\{))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\s*(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))\\s*(?!\\{))",
 					"end": "(?=;|$|\\})",
 					"patterns": [
 						{
@@ -2641,7 +2666,7 @@
 				},
 				{
 					"name": "meta.object.member.tsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.tsx"
@@ -2732,7 +2757,7 @@
 					"end": "(?=,|\\})",
 					"patterns": [
 						{
-							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.tsx"
@@ -2765,7 +2790,7 @@
 							]
 						},
 						{
-							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "storage.modifier.async.tsx"
@@ -2801,7 +2826,7 @@
 							]
 						},
 						{
-							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+							"begin": "(?<=\\>)\\s*(\\()(?=\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 							"beginCaptures": {
 								"1": {
 									"name": "meta.brace.round.tsx"
@@ -2854,13 +2879,13 @@
 		"function-call": {
 			"patterns": [
 				{
-					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
-					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"begin": "(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+					"end": "(?<=\\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\\)]))\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 					"patterns": [
 						{
 							"name": "meta.function-call.tsx",
 							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)(\\s*\\??\\.\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\\??\\.\\s*\\#?[_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
+							"end": "(?=\\s*(?:(\\?\\.\\s*)|(\\!))?((<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?\\())",
 							"patterns": [
 								{
 									"include": "#function-call-target"
@@ -2962,13 +2987,7 @@
 			"end": "(?<=\\))|(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
-					"include": "#paren-expression"
-				},
-				{
-					"include": "#class-declaration"
-				},
-				{
-					"include": "#type"
+					"include": "#expression"
 				}
 			]
 		},
@@ -2989,7 +3008,7 @@
 		"paren-expression-possibly-arrow": {
 			"patterns": [
 				{
-					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
+					"begin": "(?<=[(=,])\\s*(async)?(?=\\s*((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\(\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -3003,7 +3022,7 @@
 					]
 				},
 				{
-					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
+					"begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -3073,7 +3092,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -3328,8 +3347,18 @@
 			]
 		},
 		"typeof-operator": {
-			"name": "keyword.operator.expression.typeof.tsx",
-			"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))"
+			"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))typeof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
+			"beginCaptures": {
+				"0": {
+					"name": "keyword.operator.expression.typeof.tsx"
+				}
+			},
+			"end": "(?=[,);}\\]=>]|$|;|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))",
+			"patterns": [
+				{
+					"include": "#expression"
+				}
+			]
 		},
 		"literal": {
 			"patterns": [
@@ -3597,7 +3626,7 @@
 					}
 				},
 				{
-					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
+					"match": "(?x) (?:(\\.)|(\\?\\.(?!\\s*[[:digit:]]))) \\s* (?:\n  (?:(constructor|length|prototype|__proto__)\\b(?!\\$|\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\())\n  |\n  (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\\b(?!\\$)))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -3641,7 +3670,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))))) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\n  [(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -3964,7 +3993,7 @@
 					"include": "#comment"
 				},
 				{
-					"include": "#string"
+					"include": "#type-string"
 				},
 				{
 					"include": "#numeric-literal"
@@ -4172,7 +4201,7 @@
 			},
 			"patterns": [
 				{
-					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
+					"match": "(?x)(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private|protected|readonly)\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\\s*(\\??)(?=\\s*(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))Function(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))) |\n(:\\s*((<\\s*$)|([\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -4577,42 +4606,7 @@
 		"template": {
 			"patterns": [
 				{
-					"name": "string.template.tsx",
-					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
-							"patterns": [
-								{
-									"include": "#support-function-call-identifiers"
-								},
-								{
-									"name": "entity.name.function.tagged-template.tsx",
-									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
-								}
-							]
-						},
-						{
-							"include": "#type-arguments"
-						}
-					]
-				},
-				{
-					"name": "string.template.tsx",
-					"begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.tagged-template.tsx"
-						}
-					},
-					"end": "(?=`)",
-					"patterns": [
-						{
-							"include": "#type-arguments"
-						}
-					]
+					"include": "#template-call"
 				},
 				{
 					"name": "string.template.tsx",
@@ -4642,6 +4636,48 @@
 				}
 			]
 		},
+		"template-call": {
+			"patterns": [
+				{
+					"name": "string.template.tsx",
+					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
+							"end": "(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)",
+							"patterns": [
+								{
+									"include": "#support-function-call-identifiers"
+								},
+								{
+									"name": "entity.name.function.tagged-template.tsx",
+									"match": "([_$[:alpha:]][_$[:alnum:]]*)"
+								}
+							]
+						},
+						{
+							"include": "#type-arguments"
+						}
+					]
+				},
+				{
+					"name": "string.template.tsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|awaited|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.tsx"
+						}
+					},
+					"end": "(?=`)",
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			]
+		},
 		"template-substitution-element": {
 			"name": "meta.template.expression.tsx",
 			"begin": "\\$\\{",
@@ -4663,6 +4699,73 @@
 			],
 			"contentName": "meta.embedded.line.tsx"
 		},
+		"type-string": {
+			"patterns": [
+				{
+					"include": "#qstring-single"
+				},
+				{
+					"include": "#qstring-double"
+				},
+				{
+					"include": "#template-type"
+				}
+			]
+		},
+		"template-type": {
+			"patterns": [
+				{
+					"include": "#template-call"
+				},
+				{
+					"name": "string.template.tsx",
+					"begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.tagged-template.tsx"
+						},
+						"2": {
+							"name": "punctuation.definition.string.template.begin.tsx"
+						}
+					},
+					"end": "`",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.template.end.tsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#template-type-substitution-element"
+						},
+						{
+							"include": "#string-character-escape"
+						}
+					]
+				}
+			]
+		},
+		"template-type-substitution-element": {
+			"name": "meta.template.expression.tsx",
+			"begin": "\\$\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.begin.tsx"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.template-expression.end.tsx"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#type"
+				}
+			],
+			"contentName": "meta.embedded.line.tsx"
+		},
 		"regex": {
 			"patterns": [
 				{
diff --git a/extensions/typescript-language-features/.eslintrc.json b/extensions/typescript-language-features/.eslintrc.json
new file mode 100644
index 000000000..ae8cc48c0
--- /dev/null
+++ b/extensions/typescript-language-features/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+	"rules": {
+		"prefer-const": "error"
+	}
+}
diff --git a/extensions/typescript-language-features/extension-browser.webpack.config.js b/extensions/typescript-language-features/extension-browser.webpack.config.js
index fd8e5877c..ab1fc1aea 100644
--- a/extensions/typescript-language-features/extension-browser.webpack.config.js
+++ b/extensions/typescript-language-features/extension-browser.webpack.config.js
@@ -12,6 +12,22 @@ const Terser = require('terser');
 
 const withBrowserDefaults = require('../shared.webpack.config').browser;
 
+const languages = [
+	'zh-tw',
+	'cs',
+	'de',
+	'es',
+	'fr',
+	'it',
+	'ja',
+	'ko',
+	'pl',
+	'pt-br',
+	'ru',
+	'tr',
+	'zh-cn',
+];
+
 module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
@@ -22,17 +38,28 @@ module.exports = withBrowserDefaults({
 		new CopyPlugin({
 			patterns: [
 				{
-					from: 'node_modules/typescript-web-server/*.d.ts',
+					from: 'node_modules/typescript-web/lib/*.d.ts',
 					to: 'typescript-web/',
 					flatten: true
 				},
+				{
+					from: 'node_modules/typescript-web/lib/typesMap.json',
+					to: 'typescript-web/'
+				},
+				...languages.map(lang => ({
+					from: `node_modules/typescript-web/lib/${lang}/**/*`,
+					to: 'typescript-web/',
+					transformPath: (targetPath) => {
+						return targetPath.replace(/node_modules[\/\\]typescript-web[\/\\]lib/, '');
+					}
+				}))
 			],
 		}),
 		// @ts-ignore
 		new CopyPlugin({
 			patterns: [
 				{
-					from: 'node_modules/typescript-web-server/tsserver.js',
+					from: 'node_modules/typescript-web/lib/tsserver.js',
 					to: 'typescript-web/tsserver.web.js',
 					transform: (content) => {
 						return Terser.minify(content.toString()).code;
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 2ea05450a..d22f57d50 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -24,13 +24,10 @@
     "vscode-nls": "^4.1.1"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7",
-    "@types/rimraf": "2.0.2",
+    "@types/node": "^12.19.9",
+    "@types/rimraf": "^2.0.4",
     "@types/semver": "^5.5.0",
-    "copy-webpack-plugin": "^6.0.3",
-    "terser": "^4.8.0",
-    "typescript-web-server": "git://github.com/mjbvz/ts-server-web-build",
-    "vscode": "^1.1.36"
+    "typescript-web": "npm:typescript@^4.2.0-dev.20201209"
   },
   "scripts": {
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript-language-features",
@@ -52,6 +49,7 @@
     "onCommand:workbench.action.tasks.runTask",
     "onCommand:_typescript.configurePlugin",
     "onCommand:_typescript.learnMoreAboutRefactorings",
+    "onCommand:typescript.fileReferences",
     "onLanguage:jsonc"
   ],
   "main": "./out/extension",
@@ -964,6 +962,11 @@
         "command": "typescript.restartTsServer",
         "title": "%typescript.restartTsServer%",
         "category": "TypeScript"
+      },
+      {
+        "command": "typescript.findAllFileReferences",
+        "title": "%typescript.findAllFileReferences%",
+        "category": "TypeScript"
       }
     ],
     "menus": {
@@ -1011,6 +1014,46 @@
         {
           "command": "typescript.restartTsServer",
           "when": "typescript.isManagedFile"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && typescript.isManagedFile"
+        }
+      ],
+      "explorer/context": [
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == javascript"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == javascriptreact"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == typescript"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == typescriptreact"
+        }
+      ],
+      "editor/title/context": [
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == javascript"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == javascriptreact"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == typescript"
+        },
+        {
+          "command": "typescript.findAllFileReferences",
+          "when": "tsSupportsFileReferences && resourceLangId == typescriptreact"
         }
       ]
     },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 4283596c2..b6407a50b 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -63,9 +63,9 @@
 	"configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) Enables project wide error reporting.",
 	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Default of `null` uses VS Code's locale.",
 	"configuration.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
-	"configuration.javascript.checkJs.checkJs.deprecation": "This setting has been deprecated in favor of `#js/ts.implicitProjectConfig.checkJs#`.",
+	"configuration.javascript.checkJs.checkJs.deprecation": "This setting has been deprecated in favor of `js/ts.implicitProjectConfig.checkJs`.",
 	"configuration.implicitProjectConfig.experimentalDecorators": "Enable/disable `experimentalDecorators` in JavaScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
-	"configuration.javascript.checkJs.experimentalDecorators.deprecation": "This setting has been deprecated in favor of `#js/ts.implicitProjectConfig.experimentalDecorators#`.",
+	"configuration.javascript.checkJs.experimentalDecorators.deprecation": "This setting has been deprecated in favor of `js/ts.implicitProjectConfig.experimentalDecorators`.",
 	"configuration.implicitProjectConfig.strictNullChecks": "Enable/disable [strict null checks](https://www.typescriptlang.org/tsconfig#strictNullChecks) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
 	"configuration.implicitProjectConfig.strictFunctionTypes": "Enable/disable [strict function types](https://www.typescriptlang.org/tsconfig#strictFunctionTypes) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
 	"configuration.suggest.autoImports": "Enable/disable auto import suggestions.",
@@ -135,5 +135,6 @@
 	"codeActions.refactor.rewrite.parameters.toDestructured.title": "Convert parameters to destructured object",
 	"codeActions.refactor.rewrite.property.generateAccessors.title": "Generate accessors",
 	"codeActions.refactor.rewrite.property.generateAccessors.description": "Generate 'get' and 'set' accessors",
-	"codeActions.source.organizeImports.title": "Organize imports"
+	"codeActions.source.organizeImports.title": "Organize imports",
+	"typescript.findAllFileReferences": "Find File References"
 }
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
index b6d15a34b..f4818ab8d 100644
--- a/extensions/typescript-language-features/src/extension.browser.ts
+++ b/extensions/typescript-language-features/src/extension.browser.ts
@@ -53,7 +53,7 @@ export function activate(
 		new TypeScriptVersion(
 			TypeScriptVersionSource.Bundled,
 			vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript-web/tsserver.web.js').toString(),
-			API.fromSimpleString('4.0.3')));
+			API.fromSimpleString('4.2.0')));
 
 	const lazyClientHost = createLazyClientHost(context, false, {
 		pluginManager,
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index e316dd6ff..13c90d1aa 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -533,7 +533,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 
 		let includesPackageJsonImport = false;
 		const items: MyCompletionItem[] = [];
-		for (let entry of entries) {
+		for (const entry of entries) {
 			if (!shouldExcludeCompletionEntry(entry, completionConfiguration)) {
 				items.push(new MyCompletionItem(position, document, entry, completionContext, metadata));
 				includesPackageJsonImport = !!entry.isPackageJsonImport;
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
new file mode 100644
index 000000000..010f4038c
--- /dev/null
+++ b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { Command, CommandManager } from '../commands/commandManager';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import API from '../utils/api';
+import { isSupportedLanguageMode } from '../utils/languageModeIds';
+import * as typeConverters from '../utils/typeConverters';
+
+const localize = nls.loadMessageBundle();
+
+class FileReferencesCommand implements Command {
+
+	public static readonly context = 'tsSupportsFileReferences';
+	public static readonly minVersion = API.v420;
+
+	public readonly id = 'typescript.findAllFileReferences';
+
+	public constructor(
+		private readonly client: ITypeScriptServiceClient
+	) { }
+
+	public async execute(resource?: vscode.Uri) {
+		if (this.client.apiVersion.lt(FileReferencesCommand.minVersion)) {
+			vscode.window.showErrorMessage(localize('error.unsupportedVersion', "Find file references failed. Requires TypeScript 4.2+."));
+			return;
+		}
+
+		if (!resource) {
+			resource = vscode.window.activeTextEditor?.document.uri;
+		}
+
+		if (!resource) {
+			vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided."));
+			return;
+		}
+
+		const document = await vscode.workspace.openTextDocument(resource);
+		if (!isSupportedLanguageMode(document)) {
+			vscode.window.showErrorMessage(localize('error.unsupportedLanguage', "Find file references failed. Unsupported file type."));
+			return;
+		}
+
+		const openedFiledPath = this.client.toOpenedFilePath(document);
+		if (!openedFiledPath) {
+			vscode.window.showErrorMessage(localize('error.unknownFile', "Find file references failed. Unknown file type."));
+			return;
+		}
+
+		await vscode.window.withProgress({
+			location: vscode.ProgressLocation.Window,
+			title: localize('progress.title', "Finding file references")
+		}, async (_progress, token) => {
+
+			const response = await this.client.execute('fileReferences', {
+				file: openedFiledPath
+			}, token);
+			if (response.type !== 'response' || !response.body) {
+				return;
+			}
+
+			const locations: vscode.Location[] = response.body.refs.map(reference =>
+				typeConverters.Location.fromTextSpan(this.client.toResource(reference.file), reference));
+
+			const config = vscode.workspace.getConfiguration('references');
+			const existingSetting = config.inspect<string>('preferredLocation');
+
+			await config.update('preferredLocation', 'view');
+			try {
+				await vscode.commands.executeCommand('editor.action.showReferences', resource, new vscode.Position(0, 0), locations);
+			} finally {
+				await config.update('preferredLocation', existingSetting?.workspaceFolderValue ?? existingSetting?.workspaceValue);
+			}
+		});
+	}
+}
+
+
+export function register(
+	client: ITypeScriptServiceClient,
+	commandManager: CommandManager
+) {
+	function updateContext() {
+		vscode.commands.executeCommand('setContext', FileReferencesCommand.context, client.apiVersion.gte(FileReferencesCommand.minVersion));
+	}
+	updateContext();
+
+	commandManager.register(new FileReferencesCommand(client));
+	return client.onTsServerStarted(() => updateContext());
+}
diff --git a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
index 6e091af16..6efe472e4 100644
--- a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
@@ -95,9 +95,9 @@ export function templateToSnippet(template: string): vscode.SnippetString {
 	// TODO: use append placeholder
 	let snippetIndex = 1;
 	template = template.replace(/\$/g, '\\$');
-	template = template.replace(/^\s*(?=(\/|[ ]\*))/gm, '');
+	template = template.replace(/^[ \t]*(?=(\/|[ ]\*))/gm, '');
 	template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, (x) => x + `\$0`);
-	template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)\s*$/gm, (_param, type, post) => {
+	template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)[ \t]*$/gm, (_param, type, post) => {
 		let out = '* @param ';
 		if (type === ' {any}' || type === ' {*}') {
 			out += `{\$\{${snippetIndex++}:*\}} `;
diff --git a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
index fc81cb57f..ccd59d517 100644
--- a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
@@ -31,7 +31,7 @@ const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 		}, {
 			// e.g.  * ...|
 			beforeText: /^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/,
-			oneLineAboveText: /(?=^(\s*(\/\*\*|\*)).*)(?=(?!(\s*\*\/)))/,
+			previousLineText: /(?=^(\s*(\/\*\*|\*)).*)(?=(?!(\s*\*\/)))/,
 			action: { indentAction: vscode.IndentAction.None, appendText: '* ' },
 		}, {
 			// e.g.  */|
diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
index cc8c0a5d3..b8a4bcfda 100644
--- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
@@ -298,9 +298,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			}
 			this.formattingOptionsManager.ensureConfigurationForDocument(document, token);
 
-			const args: Proto.GetApplicableRefactorsRequestArgs = {
+			const args: Proto.GetApplicableRefactorsRequestArgs & { kind?: string } = {
 				...typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection),
 				triggerReason: this.toTsTriggerReason(context),
+				kind: context.only?.value
 			};
 			return this.client.execute('getApplicableRefactors', args, token);
 		});
@@ -384,6 +385,9 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 	}
 
 	private static getKind(refactor: Proto.RefactorActionInfo) {
+		if ((refactor as Proto.RefactorActionInfo & { kind?: string }).kind) {
+			return vscode.CodeActionKind.Empty.append((refactor as Proto.RefactorActionInfo & { kind?: string }).kind!);
+		}
 		const match = allKnownCodeActionKinds.find(kind => kind.matches(refactor));
 		return match ? match.kind : vscode.CodeActionKind.Refactor;
 	}
diff --git a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
index 16f78dbe4..c19af5b6f 100644
--- a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
@@ -73,7 +73,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro
 			return null;
 		}
 
-		let versionBeforeRequest = document.version;
+		const versionBeforeRequest = document.version;
 
 		const response = await (this.client as ExperimentalProtocol.IExtendedTypeScriptServiceClient).execute('encodedSemanticClassifications-full', requestArg, token, {
 			cancelOnResourceChange: document.uri
@@ -95,7 +95,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro
 			// as the new request will come in right after our response, we first wait for the document activity to stop
 			await waitForDocumentChangesToEnd(document);
 
-			throw new Error('busy');
+			throw new vscode.CancellationError();
 		}
 
 		const tokenSpan = response.body.spans;
@@ -137,7 +137,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro
 function waitForDocumentChangesToEnd(document: vscode.TextDocument) {
 	let version = document.version;
 	return new Promise<void>((s) => {
-		let iv = setInterval(_ => {
+		const iv = setInterval(_ => {
 			if (document.version === version) {
 				clearInterval(iv);
 				s();
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 92ab84be3..5634edb44 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -58,30 +58,31 @@ export default class LanguageProvider extends Disposable {
 		const cachedResponse = new CachedResponse();
 
 		await Promise.all([
+			import('./languageFeatures/callHierarchy').then(provider => this._register(provider.register(selector, this.client))),
+			import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description.id, this.client, cachedResponse))),
+			import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description.id, this.client, cachedResponse))),
 			import('./languageFeatures/completions').then(provider => this._register(provider.register(selector, this.description.id, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager, this.telemetryReporter, this.onCompletionAccepted))),
 			import('./languageFeatures/definitions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/directiveCommentCompletions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/documentHighlight').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/documentSymbol').then(provider => this._register(provider.register(selector, this.client, cachedResponse))),
+			import('./languageFeatures/fileReferences').then(provider => this._register(provider.register(this.client, this.commandManager))),
+			import('./languageFeatures/fixAll').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.client.diagnosticsManager))),
 			import('./languageFeatures/folding').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/formatting').then(provider => this._register(provider.register(selector, this.description.id, this.client, this.fileConfigurationManager))),
 			import('./languageFeatures/hover').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/implementations').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description.id, this.client, cachedResponse))),
 			import('./languageFeatures/jsDocCompletions').then(provider => this._register(provider.register(selector, this.description.id, this.client))),
 			import('./languageFeatures/organizeImports').then(provider => this._register(provider.register(selector, this.client, this.commandManager, this.fileConfigurationManager, this.telemetryReporter))),
 			import('./languageFeatures/quickFix').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.client.diagnosticsManager, this.telemetryReporter))),
-			import('./languageFeatures/fixAll').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.client.diagnosticsManager))),
 			import('./languageFeatures/refactor').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter))),
 			import('./languageFeatures/references').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description.id, this.client, cachedResponse))),
 			import('./languageFeatures/rename').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager))),
-			import('./languageFeatures/smartSelect').then(provider => this._register(provider.register(selector, this.client))),
+			import('./languageFeatures/semanticTokens').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/signatureHelp').then(provider => this._register(provider.register(selector, this.client))),
+			import('./languageFeatures/smartSelect').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/tagClosing').then(provider => this._register(provider.register(selector, this.description.id, this.client))),
 			import('./languageFeatures/typeDefinitions').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/semanticTokens').then(provider => this._register(provider.register(selector, this.client))),
-			import('./languageFeatures/callHierarchy').then(provider => this._register(provider.register(selector, this.client))),
 		]);
 	}
 
diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts
index 73dee25e6..d7108e96e 100644
--- a/extensions/typescript-language-features/src/lazyClientHost.ts
+++ b/extensions/typescript-language-features/src/lazyClientHost.ts
@@ -33,7 +33,7 @@ export function createLazyClientHost(
 	return lazy(() => {
 		const clientHost = new TypeScriptServiceClientHost(
 			standardLanguageDescriptions,
-			context.workspaceState,
+			context,
 			onCaseInsenitiveFileSystem,
 			services,
 			onCompletionAccepted);
diff --git a/extensions/typescript-language-features/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts
index e81fe81f2..e202c0097 100644
--- a/extensions/typescript-language-features/src/protocol.d.ts
+++ b/extensions/typescript-language-features/src/protocol.d.ts
@@ -6,7 +6,25 @@ declare enum ServerType {
 	Semantic = 'semantic',
 }
 declare module 'typescript/lib/protocol' {
+
 	interface Response {
 		readonly _serverType?: ServerType;
 	}
+
+	interface FileReferencesRequest extends FileRequest {
+	}
+	interface FileReferencesResponseBody {
+		/**
+		 * The file locations referencing the symbol.
+		 */
+		refs: readonly ReferencesResponseItem[];
+		/**
+		 * The name of the symbol.
+		 */
+		symbolName: string;
+	}
+	interface FileReferencesResponse extends Response {
+		body?: FileReferencesResponseBody;
+	}
 }
+
diff --git a/extensions/typescript-language-features/src/test-all.ts b/extensions/typescript-language-features/src/test-all.ts
new file mode 100644
index 000000000..0057b8aa4
--- /dev/null
+++ b/extensions/typescript-language-features/src/test-all.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//
+// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
+//
+// This file is providing the test runner to use when running extension tests.
+// By default the test runner in use is Mocha based.
+//
+// You can provide your own test runner if you want to override it by exporting
+// a function run(testRoot: string, clb: (error:Error) => void) that the extension
+// host can call to run the tests. The test runner is expected to use console.log
+// to report the results back to the caller. When the tests are finished, return
+// a possible error to the callback or null if none.
+
+const testRunner = require('../../../test/integration/electron/testrunner');
+
+// You can directly control Mocha options by uncommenting the following lines
+// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
+testRunner.configure({
+	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
+	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	timeout: 60000,
+});
+
+export = testRunner;
diff --git a/extensions/typescript-language-features/src/test/index.ts b/extensions/typescript-language-features/src/test/index.ts
index 1a5f74190..6ddff532d 100644
--- a/extensions/typescript-language-features/src/test/index.ts
+++ b/extensions/typescript-language-features/src/test/index.ts
@@ -15,7 +15,7 @@
 // to report the results back to the caller. When the tests are finished, return
 // a possible error to the callback or null if none.
 
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 // You can directly control Mocha options by uncommenting the following lines
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
diff --git a/extensions/typescript-language-features/src/test/completions.test.ts b/extensions/typescript-language-features/src/test/smoke/completions.test.ts
similarity index 97%
rename from extensions/typescript-language-features/src/test/completions.test.ts
rename to extensions/typescript-language-features/src/test/smoke/completions.test.ts
index 92a7da63f..b89226c50 100644
--- a/extensions/typescript-language-features/src/test/completions.test.ts
+++ b/extensions/typescript-language-features/src/test/smoke/completions.test.ts
@@ -5,15 +5,15 @@
 
 import 'mocha';
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
-import { acceptFirstSuggestion, typeCommitCharacter } from './suggestTestHelpers';
-import { assertEditorContents, Config, createTestEditor, joinLines, updateConfig, VsCodeConfiguration, wait, enumerateConfig } from './testUtils';
+import { disposeAll } from '../../utils/dispose';
+import { acceptFirstSuggestion, typeCommitCharacter } from '../../test/suggestTestHelpers';
+import { assertEditorContents, Config, createTestEditor, enumerateConfig, joinLines, updateConfig, VsCodeConfiguration } from '../../test/testUtils';
 
 const testDocumentUri = vscode.Uri.parse('untitled:test.ts');
 
 const insertModes = Object.freeze(['insert', 'replace']);
 
-suite('TypeScript Completions', () => {
+suite.skip('TypeScript Completions', () => {
 	const configDefaults: VsCodeConfiguration = Object.freeze({
 		[Config.autoClosingBrackets]: 'always',
 		[Config.typescriptCompleteFunctionCalls]: false,
@@ -28,7 +28,8 @@ suite('TypeScript Completions', () => {
 	let oldConfig: { [key: string]: any } = {};
 
 	setup(async () => {
-		await wait(500);
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
 
 		// Save off config and apply defaults
 		oldConfig = await updateConfig(testDocumentUri, configDefaults);
diff --git a/extensions/typescript-language-features/src/test/fixAll.test.ts b/extensions/typescript-language-features/src/test/smoke/fixAll.test.ts
similarity index 91%
rename from extensions/typescript-language-features/src/test/fixAll.test.ts
rename to extensions/typescript-language-features/src/test/smoke/fixAll.test.ts
index 37fae0bcf..303693f35 100644
--- a/extensions/typescript-language-features/src/test/fixAll.test.ts
+++ b/extensions/typescript-language-features/src/test/smoke/fixAll.test.ts
@@ -6,17 +6,22 @@
 import 'mocha';
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
-import { createTestEditor, wait, joinLines } from './testUtils';
+import { disposeAll } from '../../utils/dispose';
+import { createTestEditor, wait, joinLines } from '../../test/testUtils';
 
 const testDocumentUri = vscode.Uri.parse('untitled:test.ts');
 
 const emptyRange = new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 0));
 
-suite('TypeScript Fix All', () => {
+suite.skip('TypeScript Fix All', () => {
 
 	const _disposables: vscode.Disposable[] = [];
 
+	setup(async () => {
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
+	});
+
 	teardown(async () => {
 		disposeAll(_disposables);
 
diff --git a/extensions/typescript-language-features/src/test/smoke/index.ts b/extensions/typescript-language-features/src/test/smoke/index.ts
new file mode 100644
index 000000000..7c6b17618
--- /dev/null
+++ b/extensions/typescript-language-features/src/test/smoke/index.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//
+// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
+//
+// This file is providing the test runner to use when running extension tests.
+// By default the test runner in use is Mocha based.
+//
+// You can provide your own test runner if you want to override it by exporting
+// a function run(testRoot: string, clb: (error:Error) => void) that the extension
+// host can call to run the tests. The test runner is expected to use console.log
+// to report the results back to the caller. When the tests are finished, return
+// a possible error to the callback or null if none.
+
+const testRunner = require('../../../../../test/integration/electron/testrunner');
+
+// You can directly control Mocha options by uncommenting the following lines
+// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
+testRunner.configure({
+	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
+	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	timeout: 60000,
+});
+
+export = testRunner;
diff --git a/extensions/typescript-language-features/src/test/jsDocCompletions.test.ts b/extensions/typescript-language-features/src/test/smoke/jsDocCompletions.test.ts
similarity index 84%
rename from extensions/typescript-language-features/src/test/jsDocCompletions.test.ts
rename to extensions/typescript-language-features/src/test/smoke/jsDocCompletions.test.ts
index 63d3f144f..a347c5b67 100644
--- a/extensions/typescript-language-features/src/test/jsDocCompletions.test.ts
+++ b/extensions/typescript-language-features/src/test/smoke/jsDocCompletions.test.ts
@@ -5,9 +5,9 @@
 
 import 'mocha';
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
-import { acceptFirstSuggestion } from './suggestTestHelpers';
-import { assertEditorContents, Config, createTestEditor, CURSOR, enumerateConfig, insertModesValues, joinLines, updateConfig, VsCodeConfiguration, wait } from './testUtils';
+import { disposeAll } from '../../utils/dispose';
+import { acceptFirstSuggestion } from '../suggestTestHelpers';
+import { assertEditorContents, Config, createTestEditor, CURSOR, enumerateConfig, insertModesValues, joinLines, updateConfig, VsCodeConfiguration } from '../testUtils';
 
 const testDocumentUri = vscode.Uri.parse('untitled:test.ts');
 
@@ -21,7 +21,8 @@ suite('JSDoc Completions', () => {
 	let oldConfig: { [key: string]: any } = {};
 
 	setup(async () => {
-		await wait(100);
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
 
 		// Save off config and apply defaults
 		oldConfig = await updateConfig(testDocumentUri, configDefaults);
diff --git a/extensions/typescript-language-features/src/test/quickFix.test.ts b/extensions/typescript-language-features/src/test/smoke/quickFix.test.ts
similarity index 94%
rename from extensions/typescript-language-features/src/test/quickFix.test.ts
rename to extensions/typescript-language-features/src/test/smoke/quickFix.test.ts
index 13200dbcf..a22118201 100644
--- a/extensions/typescript-language-features/src/test/quickFix.test.ts
+++ b/extensions/typescript-language-features/src/test/smoke/quickFix.test.ts
@@ -6,13 +6,18 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
-import { createTestEditor, joinLines, retryUntilDocumentChanges, wait } from './testUtils';
+import { disposeAll } from '../../utils/dispose';
+import { createTestEditor, joinLines, retryUntilDocumentChanges, wait } from '../../test/testUtils';
 
-suite('TypeScript Quick Fix', () => {
+suite.skip('TypeScript Quick Fix', () => {
 
 	const _disposables: vscode.Disposable[] = [];
 
+	setup(async () => {
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
+	});
+
 	teardown(async () => {
 		disposeAll(_disposables);
 
diff --git a/extensions/typescript-language-features/src/test/referencesCodeLens.test.ts b/extensions/typescript-language-features/src/test/smoke/referencesCodeLens.test.ts
similarity index 92%
rename from extensions/typescript-language-features/src/test/referencesCodeLens.test.ts
rename to extensions/typescript-language-features/src/test/smoke/referencesCodeLens.test.ts
index f848d0f4d..4a7fbd1ff 100644
--- a/extensions/typescript-language-features/src/test/referencesCodeLens.test.ts
+++ b/extensions/typescript-language-features/src/test/smoke/referencesCodeLens.test.ts
@@ -6,8 +6,8 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import { disposeAll } from '../utils/dispose';
-import { createTestEditor, wait } from './testUtils';
+import { disposeAll } from '../../utils/dispose';
+import { createTestEditor, wait } from '../../test/testUtils';
 
 
 type VsCodeConfiguration = { [key: string]: any };
@@ -37,7 +37,8 @@ suite('TypeScript References', () => {
 	let oldConfig: { [key: string]: any } = {};
 
 	setup(async () => {
-		await wait(100);
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
 
 		// Save off config and apply defaults
 		oldConfig = await updateConfig(configDefaults);
diff --git a/extensions/typescript-language-features/src/test/cachedResponse.test.ts b/extensions/typescript-language-features/src/test/unit/cachedResponse.test.ts
similarity index 96%
rename from extensions/typescript-language-features/src/test/cachedResponse.test.ts
rename to extensions/typescript-language-features/src/test/unit/cachedResponse.test.ts
index ae05f5d44..1b0dd4411 100644
--- a/extensions/typescript-language-features/src/test/cachedResponse.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/cachedResponse.test.ts
@@ -6,9 +6,9 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import type * as Proto from '../protocol';
-import { CachedResponse } from '../tsServer/cachedResponse';
-import { ServerResponse } from '../typescriptService';
+import type * as Proto from '../../protocol';
+import { CachedResponse } from '../../tsServer/cachedResponse';
+import { ServerResponse } from '../../typescriptService';
 
 suite('CachedResponse', () => {
 	test('should cache simple response for same document', async () => {
diff --git a/extensions/typescript-language-features/src/test/functionCallSnippet.test.ts b/extensions/typescript-language-features/src/test/unit/functionCallSnippet.test.ts
similarity index 99%
rename from extensions/typescript-language-features/src/test/functionCallSnippet.test.ts
rename to extensions/typescript-language-features/src/test/unit/functionCallSnippet.test.ts
index 5c8cf18c7..c5f8e8539 100644
--- a/extensions/typescript-language-features/src/test/functionCallSnippet.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/functionCallSnippet.test.ts
@@ -9,7 +9,7 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import { snippetForFunctionCall } from '../utils/snippetForFunctionCall';
+import { snippetForFunctionCall } from '../../utils/snippetForFunctionCall';
 
 suite('typescript function call snippets', () => {
 	test('Should use label as function name', async () => {
diff --git a/extensions/typescript-language-features/src/test/unit/index.ts b/extensions/typescript-language-features/src/test/unit/index.ts
new file mode 100644
index 000000000..7c6b17618
--- /dev/null
+++ b/extensions/typescript-language-features/src/test/unit/index.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//
+// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
+//
+// This file is providing the test runner to use when running extension tests.
+// By default the test runner in use is Mocha based.
+//
+// You can provide your own test runner if you want to override it by exporting
+// a function run(testRoot: string, clb: (error:Error) => void) that the extension
+// host can call to run the tests. The test runner is expected to use console.log
+// to report the results back to the caller. When the tests are finished, return
+// a possible error to the callback or null if none.
+
+const testRunner = require('../../../../../test/integration/electron/testrunner');
+
+// You can directly control Mocha options by uncommenting the following lines
+// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
+testRunner.configure({
+	ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
+	useColors: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'), // colored output from test results (only windows cannot handle)
+	timeout: 60000,
+});
+
+export = testRunner;
diff --git a/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts b/extensions/typescript-language-features/src/test/unit/jsdocSnippet.test.ts
similarity index 83%
rename from extensions/typescript-language-features/src/test/jsdocSnippet.test.ts
rename to extensions/typescript-language-features/src/test/unit/jsdocSnippet.test.ts
index d9e17a756..ebf1552df 100644
--- a/extensions/typescript-language-features/src/test/jsdocSnippet.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/jsdocSnippet.test.ts
@@ -5,11 +5,17 @@
 
 import * as assert from 'assert';
 import 'mocha';
-import { templateToSnippet } from '../languageFeatures/jsDocCompletions';
-
-const joinLines = (...args: string[]) => args.join('\n');
+import * as vscode from 'vscode';
+import { templateToSnippet } from '../../languageFeatures/jsDocCompletions';
+import { joinLines } from '../testUtils';
 
 suite('typescript.jsDocSnippet', () => {
+
+	setup(async () => {
+		// the tests assume that typescript features are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
+	});
+
 	test('Should do nothing for single line input', async () => {
 		const input = `/** */`;
 		assert.strictEqual(templateToSnippet(input).value, input);
diff --git a/extensions/typescript-language-features/src/test/onEnter.test.ts b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
similarity index 74%
rename from extensions/typescript-language-features/src/test/onEnter.test.ts
rename to extensions/typescript-language-features/src/test/unit/onEnter.test.ts
index 72e59b448..0aeb8425b 100644
--- a/extensions/typescript-language-features/src/test/onEnter.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import { CURSOR, withRandomFileEditor, wait, joinLines } from './testUtils';
+import { CURSOR, withRandomFileEditor, wait, joinLines } from '../testUtils';
 
 const onDocumentChange = (doc: vscode.TextDocument): Promise<vscode.TextDocument> => {
 	return new Promise<vscode.TextDocument>(resolve => {
@@ -27,7 +27,12 @@ const type = async (document: vscode.TextDocument, text: string): Promise<vscode
 	return document;
 };
 
-suite('OnEnter', () => {
+suite.skip('OnEnter', () => {
+	setup(async () => {
+		// the tests make the assumption that language rules are registered
+		await vscode.extensions.getExtension('vscode.typescript-language-features')!.activate();
+	});
+
 	test('should indent after if block with braces', () => {
 		return withRandomFileEditor(`if (true) {${CURSOR}`, 'js', async (_editor, document) => {
 			await type(document, '\nx');
@@ -51,4 +56,15 @@ suite('OnEnter', () => {
 					`})`));
 		});
 	});
+
+	test('should indent after simple jsx tag with attributes', () => {
+		return withRandomFileEditor(`const a = <div onclick={bla}>${CURSOR}`, 'jsx', async (_editor, document) => {
+			await type(document, '\nx');
+			assert.strictEqual(
+				document.getText(),
+				joinLines(
+					`const a = <div onclick={bla}>`,
+					`    x`));
+		});
+	});
 });
diff --git a/extensions/typescript-language-features/src/test/previewer.test.ts b/extensions/typescript-language-features/src/test/unit/previewer.test.ts
similarity index 96%
rename from extensions/typescript-language-features/src/test/previewer.test.ts
rename to extensions/typescript-language-features/src/test/unit/previewer.test.ts
index b92c00196..38bfc14ec 100644
--- a/extensions/typescript-language-features/src/test/previewer.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/previewer.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import 'mocha';
-import { tagsMarkdownPreview, markdownDocumentation } from '../utils/previewer';
+import { tagsMarkdownPreview, markdownDocumentation } from '../../utils/previewer';
 
 suite('typescript.previewer', () => {
 	test('Should ignore hyphens after a param tag', async () => {
diff --git a/extensions/typescript-language-features/src/test/requestQueue.test.ts b/extensions/typescript-language-features/src/test/unit/requestQueue.test.ts
similarity index 98%
rename from extensions/typescript-language-features/src/test/requestQueue.test.ts
rename to extensions/typescript-language-features/src/test/unit/requestQueue.test.ts
index 910379268..1568a95e4 100644
--- a/extensions/typescript-language-features/src/test/requestQueue.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/requestQueue.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import 'mocha';
-import { RequestQueue, RequestQueueingType } from '../tsServer/requestQueue';
+import { RequestQueue, RequestQueueingType } from '../../tsServer/requestQueue';
 
 suite('RequestQueue', () => {
 	test('should be empty on creation', async () => {
diff --git a/extensions/typescript-language-features/src/test/server.test.ts b/extensions/typescript-language-features/src/test/unit/server.test.ts
similarity index 83%
rename from extensions/typescript-language-features/src/test/server.test.ts
rename to extensions/typescript-language-features/src/test/unit/server.test.ts
index 5caad737a..09ea48e00 100644
--- a/extensions/typescript-language-features/src/test/server.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/server.test.ts
@@ -6,14 +6,14 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as stream from 'stream';
-import type * as Proto from '../protocol';
-import { NodeRequestCanceller } from '../tsServer/cancellation.electron';
-import { ProcessBasedTsServer, TsServerProcess } from '../tsServer/server';
-import { ServerType } from '../typescriptService';
-import { nulToken } from '../utils/cancellation';
-import { Logger } from '../utils/logger';
-import { TelemetryReporter } from '../utils/telemetry';
-import Tracer from '../utils/tracer';
+import type * as Proto from '../../protocol';
+import { NodeRequestCanceller } from '../../tsServer/cancellation.electron';
+import { ProcessBasedTsServer, TsServerProcess } from '../../tsServer/server';
+import { ServerType } from '../../typescriptService';
+import { nulToken } from '../../utils/cancellation';
+import { Logger } from '../../utils/logger';
+import { TelemetryReporter } from '../../utils/telemetry';
+import Tracer from '../../utils/tracer';
 
 
 const NoopTelemetryReporter = new class implements TelemetryReporter {
@@ -60,7 +60,7 @@ class FakeServerProcess implements TsServerProcess {
 	}
 }
 
-suite('Server', () => {
+suite.skip('Server', () => {
 	const tracer = new Tracer(new Logger());
 
 	test('should send requests with increasing sequence numbers', async () => {
diff --git a/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts b/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
index 96b0c6b41..c47a75b5e 100644
--- a/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
+++ b/extensions/typescript-language-features/src/tsServer/serverProcess.electron.ts
@@ -39,7 +39,7 @@ class ProtocolBuffer {
 		if (this.buffer.length - this.index >= toAppend.length) {
 			toAppend.copy(this.buffer, this.index, 0, toAppend.length);
 		} else {
-			let newSize = (Math.ceil((this.index + toAppend.length) / defaultSize) + 1) * defaultSize;
+			const newSize = (Math.ceil((this.index + toAppend.length) / defaultSize) + 1) * defaultSize;
 			if (this.index === 0) {
 				this.buffer = Buffer.allocUnsafe(newSize);
 				toAppend.copy(this.buffer, 0, 0, toAppend.length);
@@ -61,14 +61,14 @@ class ProtocolBuffer {
 			return result;
 		}
 		current += contentLengthSize;
-		let start = current;
+		const start = current;
 		while (current < this.index && this.buffer[current] !== backslashR) {
 			current++;
 		}
 		if (current + 3 >= this.index || this.buffer[current + 1] !== backslashN || this.buffer[current + 2] !== backslashR || this.buffer[current + 3] !== backslashN) {
 			return result;
 		}
-		let data = this.buffer.toString('utf8', start, current);
+		const data = this.buffer.toString('utf8', start, current);
 		result = parseInt(data);
 		this.buffer = this.buffer.slice(current + 4);
 		this.index = this.index - (current + 4);
@@ -79,7 +79,7 @@ class ProtocolBuffer {
 		if (this.index < length) {
 			return null;
 		}
-		let result = this.buffer.toString('utf8', 0, length);
+		const result = this.buffer.toString('utf8', 0, length);
 		let sourceStart = length;
 		while (sourceStart < this.index && (this.buffer[sourceStart] === backslashR || this.buffer[sourceStart] === backslashN)) {
 			sourceStart++;
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index 76471a204..af08509e4 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -57,7 +57,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
 
 	constructor(
 		descriptions: LanguageDescription[],
-		workspaceState: vscode.Memento,
+		context: vscode.ExtensionContext,
 		onCaseInsenitiveFileSystem: boolean,
 		services: {
 			pluginManager: PluginManager,
@@ -75,7 +75,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
 
 		const allModeIds = this.getAllModeIds(descriptions, services.pluginManager);
 		this.client = this._register(new TypeScriptServiceClient(
-			workspaceState,
+			context,
 			onCaseInsenitiveFileSystem,
 			services,
 			allModeIds));
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index 588925ec6..8bcfb24f5 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -68,6 +68,7 @@ interface StandardTsServerRequests {
 	'prepareCallHierarchy': [Proto.FileLocationRequestArgs, Proto.PrepareCallHierarchyResponse];
 	'provideCallHierarchyIncomingCalls': [Proto.FileLocationRequestArgs, Proto.ProvideCallHierarchyIncomingCallsResponse];
 	'provideCallHierarchyOutgoingCalls': [Proto.FileLocationRequestArgs, Proto.ProvideCallHierarchyOutgoingCallsResponse];
+	'fileReferences': [Proto.FileRequestArgs, Proto.FileReferencesResponse];
 }
 
 interface NoResponseTsServerRequests {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index e4c8c840e..c27928ad1 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -97,6 +97,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	private readonly pathSeparator: string;
 	private readonly inMemoryResourcePrefix = '^';
 
+	private readonly workspaceState: vscode.Memento;
+
 	private _onReady?: { promise: Promise<void>; resolve: () => void; reject: () => void; };
 	private _configuration: TypeScriptServiceConfiguration;
 	private pluginPathsProvider: TypeScriptPluginPathsProvider;
@@ -125,7 +127,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	private readonly processFactory: TsServerProcessFactory;
 
 	constructor(
-		private readonly workspaceState: vscode.Memento,
+		private readonly context: vscode.ExtensionContext,
 		onCaseInsenitiveFileSystem: boolean,
 		services: {
 			pluginManager: PluginManager,
@@ -138,6 +140,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	) {
 		super();
 
+		this.workspaceState = context.workspaceState;
+
 		this.pluginManager = services.pluginManager;
 		this.logDirectoryProvider = services.logDirectoryProvider;
 		this.cancellerFactory = services.cancellerFactory;
@@ -374,7 +378,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this.info(`Using tsserver from: ${version.path}`);
 
 		const apiVersion = version.apiVersion || API.defaultVersion;
-		let mytoken = ++this.token;
+		const mytoken = ++this.token;
 		const handle = this.typescriptServerSpawner.spawn(version, this.capabilities, this.configuration, this.pluginManager, this.cancellerFactory, {
 			onFatalError: (command, err) => this.fatalError(command, err),
 		});
@@ -686,6 +690,13 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	}
 
 	public toResource(filepath: string): vscode.Uri {
+		if (isWeb()) {
+			// On web, treat absolute paths as pointing to standard lib files
+			if (filepath.startsWith('/')) {
+				return vscode.Uri.joinPath(this.context.extensionUri, 'node_modules', 'typescript-web', 'lib', filepath.slice(1));
+			}
+		}
+
 		if (filepath.startsWith(this.inMemoryResourcePrefix)) {
 			const resource = vscode.Uri.parse(filepath.slice(1));
 			return this.bufferSyncSupport.toVsCodeResource(resource);
diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts
index 52bcf441c..2282791a9 100644
--- a/extensions/typescript-language-features/src/utils/api.ts
+++ b/extensions/typescript-language-features/src/utils/api.ts
@@ -21,12 +21,10 @@ export default class API {
 	public static readonly v280 = API.fromSimpleString('2.8.0');
 	public static readonly v290 = API.fromSimpleString('2.9.0');
 	public static readonly v291 = API.fromSimpleString('2.9.1');
-	public static readonly v292 = API.fromSimpleString('2.9.2');
 	public static readonly v300 = API.fromSimpleString('3.0.0');
 	public static readonly v310 = API.fromSimpleString('3.1.0');
 	public static readonly v314 = API.fromSimpleString('3.1.4');
 	public static readonly v320 = API.fromSimpleString('3.2.0');
-	public static readonly v330 = API.fromSimpleString('3.3.0');
 	public static readonly v333 = API.fromSimpleString('3.3.3');
 	public static readonly v340 = API.fromSimpleString('3.4.0');
 	public static readonly v345 = API.fromSimpleString('3.4.5');
@@ -36,6 +34,7 @@ export default class API {
 	public static readonly v390 = API.fromSimpleString('3.9.0');
 	public static readonly v400 = API.fromSimpleString('4.0.0');
 	public static readonly v401 = API.fromSimpleString('4.0.1');
+	public static readonly v420 = API.fromSimpleString('4.2.0');
 
 	public static fromVersionString(versionString: string): API {
 		let version = semver.valid(versionString);
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 7a2eafbfa..0efbb2328 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -3,11 +3,9 @@
 	"compilerOptions": {
 		"outDir": "./out",
 		"experimentalDecorators": true,
-		// https://github.com/microsoft/TypeScript/issues/31869#issuecomment-515167432
-		"baseUrl": "src/\u0000",
 		"paths": {
 			"vscode": [
-				"../../../../src/vs/vscode.d.ts"
+				"../../src/vs/vscode.d.ts"
 			]
 		}
 	},
diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock
index 4ef8f0327..3e39f67c4 100644
--- a/extensions/typescript-language-features/yarn.lock
+++ b/extensions/typescript-language-features/yarn.lock
@@ -2,39 +2,6 @@
 # yarn lockfile v1
 
 
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.3"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
-    fastq "^1.6.0"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
-  integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==
-  dependencies:
-    mkdirp "^1.0.4"
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
 "@types/glob@*":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
@@ -43,11 +10,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/json-schema@^7.0.5":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -58,15 +20,15 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
   integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
 
-"@types/node@^12.11.7":
-  version "12.12.62"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b"
-  integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-"@types/rimraf@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
-  integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==
+"@types/rimraf@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
@@ -76,43 +38,6 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
   integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
-  dependencies:
-    debug "4"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv@^6.12.4:
-  version "6.12.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
-  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 applicationinsights@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.8.tgz#db6e3d983cf9f9405fe1ee5ba30ac6e1914537b5"
@@ -122,21 +47,11 @@ applicationinsights@1.0.8:
     diagnostic-channel-publishers "0.2.1"
     zone.js "0.7.6"
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -145,114 +60,11 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-cacache@^15.0.5:
-  version "15.0.5"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
-  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
-  dependencies:
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.0"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
 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=
 
-copy-webpack-plugin@^6.0.3:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.1.1.tgz#737a3ba21c16cc6ddca972f5cf8de25568ca0616"
-  integrity sha512-4TlkHFYkrZ3WppLA5XkPmBLI5lnEpFsXvpeqxCf5PzkratZiVklNXsvoQkLhUU43q7ZL3AOXtaHAd9jLNJoU0w==
-  dependencies:
-    cacache "^15.0.5"
-    fast-glob "^3.2.4"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^3.0.2"
-    schema-utils "^2.7.1"
-    serialize-javascript "^5.0.1"
-    webpack-sources "^1.4.3"
-
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@4:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
-  dependencies:
-    ms "2.1.2"
-
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  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"
@@ -265,125 +77,12 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escape-string-regexp@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.1.1, fast-glob@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
-  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
-  dependencies:
-    reusify "^1.0.4"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-glob-parent@^5.1.0, glob-parent@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -395,86 +94,6 @@ glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -488,180 +107,18 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-glob@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonc-parser@^2.2.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
   integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
 
-loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-minimatch@3.0.4, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
-  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
-  dependencies:
-    yallist "^4.0.0"
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mocha@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -669,88 +126,11 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
-  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-pkg-dir@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
 rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -758,148 +138,25 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
-
-safe-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-schema-utils@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
 semver@5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@^5.3.0, semver@^5.4.1:
+semver@^5.3.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
-  dependencies:
-    randombytes "^2.1.0"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-map-support@^0.5.0, source-map-support@~0.5.12:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-ssri@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
-  integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==
-  dependencies:
-    minipass "^3.1.1"
-
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
-tar@^6.0.2:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
-  integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-terser@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 typescript-vscode-sh-plugin@^0.6.14:
   version "0.6.14"
   resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.14.tgz#a81031b502f6346a26ea49ce082438c3e353bb38"
   integrity sha512-AkNlRBbI6K7gk29O92qthNSvc6jjmNQ6isVXoYxkFwPa8D04tIv2SOPd+sd+mNpso4tNdL2gy7nVtrd5yFqvlA==
 
-"typescript-web-server@git://github.com/mjbvz/ts-server-web-build":
-  version "0.0.0"
-  resolved "git://github.com/mjbvz/ts-server-web-build#2a70d88432760118a6aab21da7b819a57e7d4e5e"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
-  dependencies:
-    punycode "^2.1.0"
+"typescript-web@npm:typescript@^4.2.0-dev.20201209":
+  version "4.2.0-dev.20201209"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201209.tgz#fab33fdb1aa7beb857271e0626bca6b200c61351"
+  integrity sha512-rXJtE/naraN9n3bPBDA5Sa/2nrx1di5se/kVkmAjhUSpBzGmx3zeNHZF59U8XhYQdQ1QsMiDDnjmtjFUGC9LEQ==
 
 vscode-extension-telemetry@0.1.1:
   version "0.1.1"
@@ -913,45 +170,11 @@ vscode-nls@^4.1.1:
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
   integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
 
-vscode-test@^0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8"
-  integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==
-  dependencies:
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-
-vscode@^1.1.36:
-  version "1.1.37"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.37.tgz#c2a770bee4bb3fff765e2b72c7bcc813b8a6bb0a"
-  integrity sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==
-  dependencies:
-    glob "^7.1.2"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    mocha "^5.2.0"
-    semver "^5.4.1"
-    source-map-support "^0.5.0"
-    vscode-test "^0.4.1"
-
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-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"
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index e72c27967..f7facc24b 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -113,11 +113,7 @@
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-api-tests ./tsconfig.json"
   },
   "devDependencies": {
-    "@types/mocha": "2.2.43",
-    "@types/node": "^12.11.7",
-    "mocha-junit-reporter": "^1.17.0",
-    "mocha-multi-reporters": "^1.1.7",
-    "typescript": "^1.6.2",
-    "vscode": "1.1.5"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9"
   }
 }
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
index ea50f38b1..8e0c944f8 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts
index fd97ea917..83357278c 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts
@@ -33,7 +33,7 @@ suite.skip('vscode API - webview', () => {
 
 	test('webviews should be able to send and receive messages', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true }));
-		const firstResponse = getMesssage(webview);
+		const firstResponse = getMessage(webview);
 		webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 			<script>
 				const vscode = acquireVsCodeApi();
@@ -49,7 +49,7 @@ suite.skip('vscode API - webview', () => {
 	test('webviews should not have scripts enabled by default', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, {}));
 		const response = Promise.race<any>([
-			getMesssage(webview),
+			getMessage(webview),
 			new Promise<{}>(resolve => setTimeout(() => resolve({ value: '🎉' }), 1000))
 		]);
 		webview.webview.html = createHtmlDocumentWithBody(/*html*/`
@@ -65,7 +65,7 @@ suite.skip('vscode API - webview', () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true }));
 
 		{
-			const response = getMesssage(webview);
+			const response = getMessage(webview);
 			webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 				<script>
 					const vscode = acquireVsCodeApi();
@@ -75,7 +75,7 @@ suite.skip('vscode API - webview', () => {
 			assert.strictEqual((await response).value, 'first');
 		}
 		{
-			const response = getMesssage(webview);
+			const response = getMessage(webview);
 			webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 				<script>
 					const vscode = acquireVsCodeApi();
@@ -88,7 +88,7 @@ suite.skip('vscode API - webview', () => {
 
 	test.skip('webviews should preserve vscode API state when they are hidden', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true }));
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 		webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 			<script>
 				const vscode = acquireVsCodeApi();
@@ -120,7 +120,7 @@ suite.skip('vscode API - webview', () => {
 		await vscode.window.showTextDocument(doc);
 
 		// And then back
-		const ready2 = getMesssage(webview);
+		const ready2 = getMessage(webview);
 		webview.reveal(vscode.ViewColumn.One);
 		await ready2;
 
@@ -135,7 +135,7 @@ suite.skip('vscode API - webview', () => {
 
 		// Open webview in same column
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true }));
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 		webview.webview.html = statefulWebviewHtml;
 		await ready;
 
@@ -152,7 +152,7 @@ suite.skip('vscode API - webview', () => {
 
 	test('webviews with retainContextWhenHidden should preserve their context when they are hidden', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true }));
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 
 		webview.webview.html = statefulWebviewHtml;
 		await ready;
@@ -174,7 +174,7 @@ suite.skip('vscode API - webview', () => {
 
 	test('webviews with retainContextWhenHidden should preserve their page position when hidden', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true }));
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 		webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 			${'<h1>Header</h1>'.repeat(200)}
 			<script>
@@ -196,7 +196,7 @@ suite.skip('vscode API - webview', () => {
 			</script>`);
 		await ready;
 
-		const firstResponse = getMesssage(webview);
+		const firstResponse = getMessage(webview);
 
 		assert.strictEqual(Math.round((await firstResponse).value), 100);
 
@@ -214,7 +214,7 @@ suite.skip('vscode API - webview', () => {
 
 	test('webviews with retainContextWhenHidden should be able to recive messages while hidden', async () => {
 		const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true }));
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 
 		webview.webview.html = statefulWebviewHtml;
 		await ready;
@@ -264,7 +264,7 @@ suite.skip('vscode API - webview', () => {
 				vscode.postMessage({ type: 'ready' });
 			</script>`);
 
-		const ready = getMesssage(webview);
+		const ready = getMessage(webview);
 		await ready;
 
 		{
@@ -341,7 +341,7 @@ suite.skip('vscode API - webview', () => {
 				img.addEventListener('error', () => { vscode.postMessage({ value: false }); });
 			</script>`);
 
-		const firstResponse = getMesssage(webview);
+		const firstResponse = getMessage(webview);
 
 		assert.strictEqual((await firstResponse).value, true);
 	});
@@ -365,7 +365,7 @@ suite.skip('vscode API - webview', () => {
 
 		assert.strictEqual((await viewStateChanged).webviewPanel.viewColumn, vscode.ViewColumn.One);
 
-		const firstResponse = getMesssage(webview);
+		const firstResponse = getMessage(webview);
 		webview.webview.html = createHtmlDocumentWithBody(/*html*/`
 			<script>
 				const vscode = acquireVsCodeApi();
@@ -382,7 +382,7 @@ suite.skip('vscode API - webview', () => {
 			const expectedText = `webview text from: ${Date.now()}!`;
 
 			const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true }));
-			const ready = getMesssage(webview);
+			const ready = getMessage(webview);
 
 
 			webview.webview.html = createHtmlDocumentWithBody(/*html*/`
@@ -437,7 +437,7 @@ const statefulWebviewHtml = createHtmlDocumentWithBody(/*html*/ `
 	</script>`);
 
 
-function getMesssage<R = any>(webview: vscode.WebviewPanel): Promise<R> {
+function getMessage<R = any>(webview: vscode.WebviewPanel): Promise<R> {
 	return new Promise<R>(resolve => {
 		const sub = webview.webview.onDidReceiveMessage(message => {
 			sub.dispose();
@@ -447,7 +447,7 @@ function getMesssage<R = any>(webview: vscode.WebviewPanel): Promise<R> {
 }
 
 function sendRecieveMessage<T = {}, R = any>(webview: vscode.WebviewPanel, message: T): Promise<R> {
-	const p = getMesssage<R>(webview);
+	const p = getMessage<R>(webview);
 	webview.webview.postMessage(message);
 	return p;
 }
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index 82681ca03..b3241e6d3 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -132,7 +132,10 @@ suite('vscode API - workspace', () => {
 			let d0 = vscode.workspace.onDidCloseTextDocument(e => closed = e);
 
 			return vscode.window.showTextDocument(doc).then(() => {
-				return doc.save().then(() => {
+				return doc.save().then((didSave: boolean) => {
+
+					assert.equal(didSave, true, `FAILED to save${doc.uri.toString()}`);
+
 					assert.ok(closed === doc);
 					assert.ok(!doc.isDirty);
 					assert.ok(fs.existsSync(path));
@@ -975,6 +978,81 @@ suite('vscode API - workspace', () => {
 		assert.equal(document.getText(), expected);
 	});
 
+	test('Should send a single FileWillRenameEvent instead of separate events when moving multiple files at once#111867', async function () {
+
+		const file1 = await createRandomFile();
+		const file2 = await createRandomFile();
+
+		const file1New = await createRandomFile();
+		const file2New = await createRandomFile();
+
+		const event = new Promise<vscode.FileWillRenameEvent>(resolve => {
+			let sub = vscode.workspace.onWillRenameFiles(e => {
+				sub.dispose();
+				resolve(e);
+			});
+		});
+
+		const we = new vscode.WorkspaceEdit();
+		we.renameFile(file1, file1New, { overwrite: true });
+		we.renameFile(file2, file2New, { overwrite: true });
+		await vscode.workspace.applyEdit(we);
+
+		const e = await event;
+
+		assert.strictEqual(e.files.length, 2);
+		assert.strictEqual(e.files[0].oldUri.toString(), file1.toString());
+		assert.strictEqual(e.files[1].oldUri.toString(), file2.toString());
+	});
+
+	test('Should send a single FileWillRenameEvent instead of separate events when moving multiple files at once#111867', async function () {
+
+		const event = new Promise<vscode.FileWillCreateEvent>(resolve => {
+			let sub = vscode.workspace.onWillCreateFiles(e => {
+				sub.dispose();
+				resolve(e);
+			});
+		});
+
+		const file1 = vscode.Uri.parse(`fake-fs:/${rndName()}`);
+		const file2 = vscode.Uri.parse(`fake-fs:/${rndName()}`);
+
+		const we = new vscode.WorkspaceEdit();
+		we.createFile(file1, { overwrite: true });
+		we.createFile(file2, { overwrite: true });
+		await vscode.workspace.applyEdit(we);
+
+		const e = await event;
+
+		assert.strictEqual(e.files.length, 2);
+		assert.strictEqual(e.files[0].toString(), file1.toString());
+		assert.strictEqual(e.files[1].toString(), file2.toString());
+	});
+
+	test('Should send a single FileWillRenameEvent instead of separate events when moving multiple files at once#111867', async function () {
+
+		const file1 = await createRandomFile();
+		const file2 = await createRandomFile();
+
+		const event = new Promise<vscode.FileWillDeleteEvent>(resolve => {
+			let sub = vscode.workspace.onWillDeleteFiles(e => {
+				sub.dispose();
+				resolve(e);
+			});
+		});
+
+		const we = new vscode.WorkspaceEdit();
+		we.deleteFile(file1);
+		we.deleteFile(file2);
+		await vscode.workspace.applyEdit(we);
+
+		const e = await event;
+
+		assert.strictEqual(e.files.length, 2);
+		assert.strictEqual(e.files[0].toString(), file1.toString());
+		assert.strictEqual(e.files[1].toString(), file2.toString());
+	});
+
 	test('issue #107739 - Redo of rename Java Class name has no effect', async () => {
 		const file = await createRandomFile('hello');
 		const fileName = basename(file.fsPath);
diff --git a/extensions/vscode-api-tests/src/workspace-tests/index.ts b/extensions/vscode-api-tests/src/workspace-tests/index.ts
index 9486d8ed3..f636d2fd7 100644
--- a/extensions/vscode-api-tests/src/workspace-tests/index.ts
+++ b/extensions/vscode-api-tests/src/workspace-tests/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/vscode-api-tests/yarn.lock b/extensions/vscode-api-tests/yarn.lock
index 2d8b725ff..0e3ca71c6 100644
--- a/extensions/vscode-api-tests/yarn.lock
+++ b/extensions/vscode-api-tests/yarn.lock
@@ -2,2020 +2,12 @@
 # yarn lockfile v1
 
 
-"@types/mocha@2.2.43":
-  version "2.2.43"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.43.tgz#03c54589c43ad048cbcbfd63999b55d0424eec27"
-  integrity sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==
-
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  integrity sha1-RBT/dKUIecII7l/cgm4ywwNUnto=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  integrity sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.0.0, chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
-  integrity sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=
-
-cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
-  integrity sha1-pikNQT8hemEjL5XkWP84QYz7ARc=
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-  integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
-
-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=
-
-convert-source-map@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-  integrity sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
-  dependencies:
-    ms "2.0.0"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-deep-assign@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
-  integrity sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=
-  dependencies:
-    is-obj "^1.0.0"
-
-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=
-
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.2.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
-  integrity sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
-  dependencies:
-    jsbn "~0.1.0"
-
-end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  integrity sha1-epDYM+/abPpurA9JSduw+tOmMgY=
-  dependencies:
-    once "^1.4.0"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-event-stream@^3.3.1, event-stream@~3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0, extsprintf@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
-  integrity sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=
-  dependencies:
-    chalk "^1.1.1"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  integrity sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-  integrity sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.5, glob@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
-  integrity sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-gulp-chmod@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
-  integrity sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
-gulp-filter@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.0.1.tgz#5d87f662e317e5839ef7650e620e6c9008ff92d0"
-  integrity sha512-5olRzAhFdXB2klCu1lnazP65aO9YdA/5WfC9VdInIc8PrUeDIoZfaA3Edb0yUBGhVdHv4eHKL9Fg5tUoEJ9z5A==
-  dependencies:
-    gulp-util "^3.0.6"
-    multimatch "^2.0.0"
-    streamfilter "^1.0.5"
-
-gulp-gunzip@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
-  integrity sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
-gulp-remote-src@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1"
-  integrity sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=
-  dependencies:
-    event-stream "~3.3.4"
-    node.extend "~1.1.2"
-    request "~2.79.0"
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-symdest@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.0.tgz#c165320732d192ce56fd94271ffa123234bf2ae0"
-  integrity sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=
-  dependencies:
-    event-stream "^3.3.1"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^2.4.3"
-
-gulp-untar@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000"
-  integrity sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=
-  dependencies:
-    event-stream "~3.3.4"
-    gulp-util "~3.0.8"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-
-gulp-util@^3.0.6, gulp-util@~3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-vinyl-zip@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
-  integrity sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^3.0.10"
-    through2 "^0.6.3"
-    vinyl "^0.4.6"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
-  integrity sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
-  integrity sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash@^4.16.4:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-node.extend@~1.1.2:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96"
-  integrity sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=
-  dependencies:
-    is "^3.1.0"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-  integrity sha1-51vV9uJoEioqDgvaYwslUMFmUCw=
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
-querystringify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
-  integrity sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=
-
-queue@^3.0.10, queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  integrity sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
-request@^2.79.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  integrity sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-requires-port@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-rimraf@2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
-source-map-support@^0.4.11:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-  integrity sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  integrity sha1-US322mKHFEMW3EwY/hzx2UBzm+M=
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-streamfilter@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.5.tgz#87507111beb8e298451717b511cfed8f002abf53"
-  integrity sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.1, through2@~2.0.0, through2@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through@2, through@~2.3, through@~2.3.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-typescript@^1.6.2:
-  version "1.8.10"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"
-  integrity sha1-tHXW4N/wv1DyluXKbvn7tccyDx4=
-
-unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  integrity sha1-WqADz76Uxf+GbE59ZouxxNuts2k=
-  dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
-
-url-parse@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
-  integrity sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==
-  dependencies:
-    querystringify "~1.0.0"
-    requires-port "~1.0.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-  integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vinyl-fs@^2.0.0, vinyl-fs@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl-source-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz#44cbe5108205279deb0c5653c094a2887938b1ab"
-  integrity sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=
-  dependencies:
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
-
-vinyl@^0.4.3, vinyl@^0.4.6, vinyl@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.5.tgz#10eb104001840c3dd0813815fd4a05f8fc882d14"
-  integrity sha1-EOsQQAGEDD3QgTgV/UoF+PyILRQ=
-  dependencies:
-    glob "^7.1.1"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.2"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^1.4.0"
-    mocha "^3.2.0"
-    request "^2.79.0"
-    semver "^5.3.0"
-    source-map-support "^0.4.11"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-yauzl@^2.2.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
-  integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
-yazl@^2.2.1:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
-  integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
-  dependencies:
-    buffer-crc32 "~0.2.3"
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
+
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index c976dbc8d..30c728cfb 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -20,10 +20,7 @@
     "jsonc-parser": "2.2.1"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7",
-    "mocha-junit-reporter": "^1.17.0",
-    "mocha-multi-reporters": "^1.1.7",
-    "vscode": "1.1.5"
+    "@types/node": "^12.19.9"
   },
   "contributes": {
     "semanticTokenTypes": [
diff --git a/extensions/vscode-colorize-tests/producticons/test-product-icon-theme.json b/extensions/vscode-colorize-tests/producticons/test-product-icon-theme.json
index dc076aef5..916582d4d 100644
--- a/extensions/vscode-colorize-tests/producticons/test-product-icon-theme.json
+++ b/extensions/vscode-colorize-tests/producticons/test-product-icon-theme.json
@@ -35,7 +35,7 @@
 		"extensions": {
 			"fontCharacter": "\\e015"
 		},
-		"debug-alt-2": {
+		"run-view-icon": {
 			"fontCharacter": "\\e072"
 		}
 
diff --git a/extensions/vscode-colorize-tests/src/colorizer.test.ts b/extensions/vscode-colorize-tests/src/colorizer.test.ts
index 28a992573..9d809409b 100644
--- a/extensions/vscode-colorize-tests/src/colorizer.test.ts
+++ b/extensions/vscode-colorize-tests/src/colorizer.test.ts
@@ -6,27 +6,26 @@
 import 'mocha';
 import * as assert from 'assert';
 import { commands, Uri } from 'vscode';
-import { join, basename, normalize, dirname } from 'path';
+import { join, normalize } from 'path';
 import * as fs from 'fs';
 
-function assertUnchangedTokens(testFixurePath: string, done: any) {
-	let fileName = basename(testFixurePath);
+function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixture: string, done: any) {
+	const testFixurePath = join(fixturesPath, fixture);
 
 	return commands.executeCommand('_workbench.captureSyntaxTokens', Uri.file(testFixurePath)).then(data => {
 		try {
-			let resultsFolderPath = join(dirname(dirname(testFixurePath)), 'colorize-results');
-			if (!fs.existsSync(resultsFolderPath)) {
-				fs.mkdirSync(resultsFolderPath);
+			if (!fs.existsSync(resultsPath)) {
+				fs.mkdirSync(resultsPath);
 			}
-			let resultPath = join(resultsFolderPath, fileName.replace('.', '_') + '.json');
+			let resultPath = join(resultsPath, fixture.replace('.', '_') + '.json');
 			if (fs.existsSync(resultPath)) {
 				let previousData = JSON.parse(fs.readFileSync(resultPath).toString());
 				try {
-					assert.deepEqual(data, previousData);
+					assert.deepStrictEqual(data, previousData);
 				} catch (e) {
 					fs.writeFileSync(resultPath, JSON.stringify(data, null, '\t'), { flag: 'w' });
 					if (Array.isArray(data) && Array.isArray(previousData) && data.length === previousData.length) {
-						for (let i= 0; i < data.length; i++) {
+						for (let i = 0; i < data.length; i++) {
 							let d = data[i];
 							let p = previousData[i];
 							if (d.c !== p.c || hasThemeChange(d.r, p.r)) {
@@ -48,7 +47,7 @@ function assertUnchangedTokens(testFixurePath: string, done: any) {
 	}, done);
 }
 
-function hasThemeChange(d: any, p: any) : boolean {
+function hasThemeChange(d: any, p: any): boolean {
 	let keys = Object.keys(d);
 	for (let key of keys) {
 		if (d[key] !== p[key]) {
@@ -59,18 +58,13 @@ function hasThemeChange(d: any, p: any) : boolean {
 }
 
 suite('colorization', () => {
-	let extensionsFolder = normalize(join(__dirname, '../../'));
-	let extensions = fs.readdirSync(extensionsFolder);
-	extensions.forEach(extension => {
-		let extensionColorizeFixturePath = join(extensionsFolder, extension, 'test', 'colorize-fixtures');
-		if (fs.existsSync(extensionColorizeFixturePath)) {
-			let fixturesFiles = fs.readdirSync(extensionColorizeFixturePath);
-			fixturesFiles.forEach(fixturesFile => {
-				// define a test for each fixture
-				test(extension + '-' + fixturesFile, function (done) {
-					assertUnchangedTokens(join(extensionColorizeFixturePath, fixturesFile), done);
-				});
-			});
-		}
-	});
+	const testPath = normalize(join(__dirname, '../test'));
+	const fixturesPath = join(testPath, 'colorize-fixtures');
+	const resultsPath = join(testPath, 'colorize-results');
+
+	for (const fixture of fs.readdirSync(fixturesPath)) {
+		test(`colorize: ${fixture}`, function (done) {
+			assertUnchangedTokens(fixturesPath, resultsPath, fixture, done);
+		});
+	}
 });
diff --git a/extensions/vscode-colorize-tests/src/index.ts b/extensions/vscode-colorize-tests/src/index.ts
index 691ba5c6f..a6e6e6818 100644
--- a/extensions/vscode-colorize-tests/src/index.ts
+++ b/extensions/vscode-colorize-tests/src/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../test/integration/electron/testrunner');
 
 const suite = 'Integration Colorize Tests';
 
diff --git a/extensions/html/test/colorize-fixtures/12750.html b/extensions/vscode-colorize-tests/test/colorize-fixtures/12750.html
similarity index 100%
rename from extensions/html/test/colorize-fixtures/12750.html
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/12750.html
diff --git a/extensions/html/test/colorize-fixtures/13448.html b/extensions/vscode-colorize-tests/test/colorize-fixtures/13448.html
similarity index 100%
rename from extensions/html/test/colorize-fixtures/13448.html
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/13448.html
diff --git a/extensions/less/test/colorize-fixtures/14119.less b/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less
similarity index 100%
rename from extensions/less/test/colorize-fixtures/14119.less
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less
diff --git a/extensions/html/test/colorize-fixtures/25920.html b/extensions/vscode-colorize-tests/test/colorize-fixtures/25920.html
similarity index 100%
rename from extensions/html/test/colorize-fixtures/25920.html
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/25920.html
diff --git a/extensions/docker/test/colorize-fixtures/Dockerfile b/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
similarity index 100%
rename from extensions/docker/test/colorize-fixtures/Dockerfile
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
diff --git a/extensions/java/test/colorize-fixtures/basic.java b/extensions/vscode-colorize-tests/test/colorize-fixtures/basic.java
similarity index 100%
rename from extensions/java/test/colorize-fixtures/basic.java
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/basic.java
diff --git a/extensions/yaml/test/colorize-fixtures/issue-1550.yaml b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-1550.yaml
similarity index 100%
rename from extensions/yaml/test/colorize-fixtures/issue-1550.yaml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/issue-1550.yaml
diff --git a/extensions/php/test/colorize-fixtures/issue-28354.php b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-28354.php
similarity index 100%
rename from extensions/php/test/colorize-fixtures/issue-28354.php
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/issue-28354.php
diff --git a/extensions/yaml/test/colorize-fixtures/issue-4008.yaml b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-4008.yaml
similarity index 100%
rename from extensions/yaml/test/colorize-fixtures/issue-4008.yaml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/issue-4008.yaml
diff --git a/extensions/yaml/test/colorize-fixtures/issue-6303.yaml b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-6303.yaml
similarity index 100%
rename from extensions/yaml/test/colorize-fixtures/issue-6303.yaml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/issue-6303.yaml
diff --git a/extensions/php/test/colorize-fixtures/issue-76997.php b/extensions/vscode-colorize-tests/test/colorize-fixtures/issue-76997.php
similarity index 100%
rename from extensions/php/test/colorize-fixtures/issue-76997.php
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/issue-76997.php
diff --git a/extensions/make/test/colorize-fixtures/makefile b/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile
similarity index 100%
rename from extensions/make/test/colorize-fixtures/makefile
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/makefile
diff --git a/extensions/go/test/colorize-fixtures/test-13777.go b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-13777.go
similarity index 100%
rename from extensions/go/test/colorize-fixtures/test-13777.go
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-13777.go
diff --git a/extensions/cpp/test/colorize-fixtures/test-23630.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-23630.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test-23630.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-23630.cpp
diff --git a/extensions/cpp/test/colorize-fixtures/test-23850.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-23850.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test-23850.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-23850.cpp
diff --git a/extensions/markdown-basics/test/colorize-fixtures/test-33886.md b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-33886.md
similarity index 100%
rename from extensions/markdown-basics/test/colorize-fixtures/test-33886.md
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-33886.md
diff --git a/extensions/pug/test/colorize-fixtures/test-4287.pug b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-4287.pug
similarity index 100%
rename from extensions/pug/test/colorize-fixtures/test-4287.pug
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-4287.pug
diff --git a/extensions/rust/test/colorize-fixtures/test-6611.rs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-6611.rs
similarity index 100%
rename from extensions/rust/test/colorize-fixtures/test-6611.rs
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-6611.rs
diff --git a/extensions/xml/test/colorize-fixtures/test-7115.xml b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-7115.xml
similarity index 100%
rename from extensions/xml/test/colorize-fixtures/test-7115.xml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-7115.xml
diff --git a/extensions/cpp/test/colorize-fixtures/test-78769.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-78769.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test-78769.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-78769.cpp
diff --git a/extensions/cpp/test/colorize-fixtures/test-80644.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-80644.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test-80644.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-80644.cpp
diff --git a/extensions/cpp/test/colorize-fixtures/test-92369.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-92369.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test-92369.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-92369.cpp
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-brackets.tsx b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-brackets.tsx
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-brackets.tsx
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-brackets.tsx
diff --git a/extensions/less/test/colorize-fixtures/test-cssvariables.less b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-cssvariables.less
similarity index 100%
rename from extensions/less/test/colorize-fixtures/test-cssvariables.less
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-cssvariables.less
diff --git a/extensions/scss/test/colorize-fixtures/test-cssvariables.scss b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-cssvariables.scss
similarity index 100%
rename from extensions/scss/test/colorize-fixtures/test-cssvariables.scss
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-cssvariables.scss
diff --git a/extensions/html/test/colorize-fixtures/test-embedding.html b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-embedding.html
similarity index 100%
rename from extensions/html/test/colorize-fixtures/test-embedding.html
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-embedding.html
diff --git a/extensions/powershell/test/colorize-fixtures/test-freeze-56476.ps1 b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-freeze-56476.ps1
similarity index 100%
rename from extensions/powershell/test/colorize-fixtures/test-freeze-56476.ps1
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-freeze-56476.ps1
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-function-inv.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-function-inv.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-function-inv.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-function-inv.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-issue11.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue11.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-issue11.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue11.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-issue5431.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5431.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-issue5431.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5431.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-issue5465.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5465.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-issue5465.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5465.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-issue5566.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5566.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-issue5566.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue5566.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-jsdoc-multiline-type.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-jsdoc-multiline-type.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-jsdoc-multiline-type.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-jsdoc-multiline-type.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-keywords.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-keywords.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-keywords.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-keywords.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-members.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-members.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-members.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-members.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-object-literals.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-object-literals.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-object-literals.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-object-literals.ts
diff --git a/extensions/coffeescript/test/colorize-fixtures/test-regex.coffee b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-regex.coffee
similarity index 100%
rename from extensions/coffeescript/test/colorize-fixtures/test-regex.coffee
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-regex.coffee
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-strings.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-strings.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-strings.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-strings.ts
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test-this.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-this.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test-this.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-this.ts
diff --git a/extensions/css/test/colorize-fixtures/test-variables.css b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-variables.css
similarity index 100%
rename from extensions/css/test/colorize-fixtures/test-variables.css
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test-variables.css
diff --git a/extensions/bat/test/colorize-fixtures/test.bat b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat
similarity index 100%
rename from extensions/bat/test/colorize-fixtures/test.bat
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.bat
diff --git a/extensions/cpp/test/colorize-fixtures/test.c b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.c
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test.c
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.c
diff --git a/extensions/cpp/test/colorize-fixtures/test.cc b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cc
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test.cc
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.cc
diff --git a/extensions/clojure/test/colorize-fixtures/test.clj b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.clj
similarity index 100%
rename from extensions/clojure/test/colorize-fixtures/test.clj
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.clj
diff --git a/extensions/coffeescript/test/colorize-fixtures/test.coffee b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.coffee
similarity index 100%
rename from extensions/coffeescript/test/colorize-fixtures/test.coffee
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.coffee
diff --git a/extensions/cpp/test/colorize-fixtures/test.cpp b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cpp
similarity index 100%
rename from extensions/cpp/test/colorize-fixtures/test.cpp
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.cpp
diff --git a/extensions/csharp/test/colorize-fixtures/test.cs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs
similarity index 100%
rename from extensions/csharp/test/colorize-fixtures/test.cs
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.cs
diff --git a/extensions/razor/test/colorize-fixtures/test.cshtml b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.cshtml
similarity index 100%
rename from extensions/razor/test/colorize-fixtures/test.cshtml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.cshtml
diff --git a/extensions/css/test/colorize-fixtures/test.css b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.css
similarity index 100%
rename from extensions/css/test/colorize-fixtures/test.css
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.css
diff --git a/extensions/fsharp/test/colorize-fixtures/test.fs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.fs
similarity index 100%
rename from extensions/fsharp/test/colorize-fixtures/test.fs
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.fs
diff --git a/extensions/go/test/colorize-fixtures/test.go b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.go
similarity index 100%
rename from extensions/go/test/colorize-fixtures/test.go
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.go
diff --git a/extensions/groovy/test/colorize-fixtures/test.groovy b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.groovy
similarity index 100%
rename from extensions/groovy/test/colorize-fixtures/test.groovy
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.groovy
diff --git a/extensions/handlebars/test/colorize-fixtures/test.handlebars b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.handlebars
similarity index 100%
rename from extensions/handlebars/test/colorize-fixtures/test.handlebars
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.handlebars
diff --git a/extensions/handlebars/test/colorize-fixtures/test.hbs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.hbs
similarity index 100%
rename from extensions/handlebars/test/colorize-fixtures/test.hbs
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.hbs
diff --git a/extensions/hlsl/test/colorize-fixtures/test.hlsl b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.hlsl
similarity index 100%
rename from extensions/hlsl/test/colorize-fixtures/test.hlsl
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.hlsl
diff --git a/extensions/html/test/colorize-fixtures/test.html b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.html
similarity index 100%
rename from extensions/html/test/colorize-fixtures/test.html
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.html
diff --git a/extensions/ini/test/colorize-fixtures/test.ini b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.ini
similarity index 100%
rename from extensions/ini/test/colorize-fixtures/test.ini
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.ini
diff --git a/extensions/javascript/test/colorize-fixtures/test.js b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.js
similarity index 100%
rename from extensions/javascript/test/colorize-fixtures/test.js
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.js
diff --git a/extensions/json/test/colorize-fixtures/test.json b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.json
similarity index 100%
rename from extensions/json/test/colorize-fixtures/test.json
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.json
diff --git a/extensions/javascript/test/colorize-fixtures/test.jsx b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.jsx
similarity index 100%
rename from extensions/javascript/test/colorize-fixtures/test.jsx
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.jsx
diff --git a/extensions/less/test/colorize-fixtures/test.less b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.less
similarity index 100%
rename from extensions/less/test/colorize-fixtures/test.less
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.less
diff --git a/extensions/log/test/colorize-fixtures/test.log b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.log
similarity index 100%
rename from extensions/log/test/colorize-fixtures/test.log
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.log
diff --git a/extensions/lua/test/colorize-fixtures/test.lua b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.lua
similarity index 100%
rename from extensions/lua/test/colorize-fixtures/test.lua
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.lua
diff --git a/extensions/objective-c/test/colorize-fixtures/test.m b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.m
similarity index 100%
rename from extensions/objective-c/test/colorize-fixtures/test.m
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.m
diff --git a/extensions/markdown-basics/test/colorize-fixtures/test.md b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.md
similarity index 100%
rename from extensions/markdown-basics/test/colorize-fixtures/test.md
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.md
diff --git a/extensions/objective-c/test/colorize-fixtures/test.mm b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.mm
similarity index 100%
rename from extensions/objective-c/test/colorize-fixtures/test.mm
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.mm
diff --git a/extensions/php/test/colorize-fixtures/test.php b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.php
similarity index 100%
rename from extensions/php/test/colorize-fixtures/test.php
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.php
diff --git a/extensions/perl/test/colorize-fixtures/test.pl b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.pl
similarity index 100%
rename from extensions/perl/test/colorize-fixtures/test.pl
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.pl
diff --git a/extensions/powershell/test/colorize-fixtures/test.ps1 b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.ps1
similarity index 100%
rename from extensions/powershell/test/colorize-fixtures/test.ps1
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.ps1
diff --git a/extensions/pug/test/colorize-fixtures/test.pug b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.pug
similarity index 100%
rename from extensions/pug/test/colorize-fixtures/test.pug
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.pug
diff --git a/extensions/r/test/colorize-fixtures/test.r b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.r
similarity index 100%
rename from extensions/r/test/colorize-fixtures/test.r
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.r
diff --git a/extensions/ruby/test/colorize-fixtures/test.rb b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.rb
similarity index 100%
rename from extensions/ruby/test/colorize-fixtures/test.rb
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.rb
diff --git a/extensions/rust/test/colorize-fixtures/test.rs b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.rs
similarity index 100%
rename from extensions/rust/test/colorize-fixtures/test.rs
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.rs
diff --git a/extensions/scss/test/colorize-fixtures/test.scss b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.scss
similarity index 100%
rename from extensions/scss/test/colorize-fixtures/test.scss
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.scss
diff --git a/extensions/shellscript/test/colorize-fixtures/test.sh b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh
similarity index 100%
rename from extensions/shellscript/test/colorize-fixtures/test.sh
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.sh
diff --git a/extensions/shaderlab/test/colorize-fixtures/test.shader b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.shader
similarity index 100%
rename from extensions/shaderlab/test/colorize-fixtures/test.shader
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.shader
diff --git a/extensions/sql/test/colorize-fixtures/test.sql b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.sql
similarity index 100%
rename from extensions/sql/test/colorize-fixtures/test.sql
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.sql
diff --git a/extensions/swift/test/colorize-fixtures/test.swift b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.swift
similarity index 100%
rename from extensions/swift/test/colorize-fixtures/test.swift
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.swift
diff --git a/extensions/typescript-basics/test/colorize-fixtures/test.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.ts
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/test.ts
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.ts
diff --git a/extensions/vb/test/colorize-fixtures/test.vb b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.vb
similarity index 100%
rename from extensions/vb/test/colorize-fixtures/test.vb
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.vb
diff --git a/extensions/xml/test/colorize-fixtures/test.xml b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.xml
similarity index 100%
rename from extensions/xml/test/colorize-fixtures/test.xml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.xml
diff --git a/extensions/yaml/test/colorize-fixtures/test.yaml b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.yaml
similarity index 100%
rename from extensions/yaml/test/colorize-fixtures/test.yaml
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test.yaml
diff --git a/extensions/perl/test/colorize-fixtures/test2.pl b/extensions/vscode-colorize-tests/test/colorize-fixtures/test2.pl
similarity index 100%
rename from extensions/perl/test/colorize-fixtures/test2.pl
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test2.pl
diff --git a/extensions/javascript/test/colorize-fixtures/test6916.js b/extensions/vscode-colorize-tests/test/colorize-fixtures/test6916.js
similarity index 100%
rename from extensions/javascript/test/colorize-fixtures/test6916.js
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/test6916.js
diff --git a/extensions/typescript-basics/test/colorize-fixtures/tsconfig_off.json b/extensions/vscode-colorize-tests/test/colorize-fixtures/tsconfig_off.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-fixtures/tsconfig_off.json
rename to extensions/vscode-colorize-tests/test/colorize-fixtures/tsconfig_off.json
diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
similarity index 100%
rename from extensions/html/test/colorize-results/12750_html.json
rename to extensions/vscode-colorize-tests/test/colorize-results/12750_html.json
diff --git a/extensions/html/test/colorize-results/13448_html.json b/extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
similarity index 100%
rename from extensions/html/test/colorize-results/13448_html.json
rename to extensions/vscode-colorize-tests/test/colorize-results/13448_html.json
diff --git a/extensions/less/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
similarity index 100%
rename from extensions/less/test/colorize-results/14119_less.json
rename to extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
diff --git a/extensions/html/test/colorize-results/25920_html.json b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
similarity index 100%
rename from extensions/html/test/colorize-results/25920_html.json
rename to extensions/vscode-colorize-tests/test/colorize-results/25920_html.json
diff --git a/extensions/docker/test/colorize-results/Dockerfile.json b/extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
similarity index 100%
rename from extensions/docker/test/colorize-results/Dockerfile.json
rename to extensions/vscode-colorize-tests/test/colorize-results/Dockerfile.json
diff --git a/extensions/java/test/colorize-results/basic_java.json b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
similarity index 100%
rename from extensions/java/test/colorize-results/basic_java.json
rename to extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
diff --git a/extensions/yaml/test/colorize-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
similarity index 100%
rename from extensions/yaml/test/colorize-results/issue-1550_yaml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
diff --git a/extensions/php/test/colorize-results/issue-28354_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
similarity index 100%
rename from extensions/php/test/colorize-results/issue-28354_php.json
rename to extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
diff --git a/extensions/yaml/test/colorize-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
similarity index 100%
rename from extensions/yaml/test/colorize-results/issue-4008_yaml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
diff --git a/extensions/yaml/test/colorize-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
similarity index 100%
rename from extensions/yaml/test/colorize-results/issue-6303_yaml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
diff --git a/extensions/php/test/colorize-results/issue-76997_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json
similarity index 100%
rename from extensions/php/test/colorize-results/issue-76997_php.json
rename to extensions/vscode-colorize-tests/test/colorize-results/issue-76997_php.json
diff --git a/extensions/make/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
similarity index 100%
rename from extensions/make/test/colorize-results/makefile.json
rename to extensions/vscode-colorize-tests/test/colorize-results/makefile.json
diff --git a/extensions/go/test/colorize-results/test-13777_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json
similarity index 100%
rename from extensions/go/test/colorize-results/test-13777_go.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-13777_go.json
diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test-23630_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
diff --git a/extensions/cpp/test/colorize-results/test-23850_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test-23850_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
diff --git a/extensions/markdown-basics/test/colorize-results/test-33886_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json
similarity index 100%
rename from extensions/markdown-basics/test/colorize-results/test-33886_md.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-33886_md.json
diff --git a/extensions/pug/test/colorize-results/test-4287_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
similarity index 100%
rename from extensions/pug/test/colorize-results/test-4287_pug.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json
diff --git a/extensions/rust/test/colorize-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
similarity index 94%
rename from extensions/rust/test/colorize-results/test-6611_rs.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
index bc87118fc..598893df2 100644
--- a/extensions/rust/test/colorize-results/test-6611_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
@@ -100,13 +100,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust keyword.control.rust",
+		"t": "source.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -342,13 +342,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust keyword.control.rust",
+		"t": "source.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -595,13 +595,13 @@
 	},
 	{
 		"c": "fn",
-		"t": "source.rust meta.function.definition.rust keyword.control.fn.rust",
+		"t": "source.rust meta.function.definition.rust keyword.other.fn.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -738,13 +738,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust meta.function.definition.rust keyword.control.rust",
+		"t": "source.rust meta.function.definition.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -859,13 +859,13 @@
 	},
 	{
 		"c": "fn",
-		"t": "source.rust meta.function.definition.rust keyword.control.fn.rust",
+		"t": "source.rust meta.function.definition.rust keyword.other.fn.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1002,13 +1002,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust meta.function.definition.rust keyword.control.rust",
+		"t": "source.rust meta.function.definition.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1200,13 +1200,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust keyword.control.rust",
+		"t": "source.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -1442,13 +1442,13 @@
 	},
 	{
 		"c": "where",
-		"t": "source.rust keyword.control.rust",
+		"t": "source.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
diff --git a/extensions/xml/test/colorize-results/test-7115_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
similarity index 100%
rename from extensions/xml/test/colorize-results/test-7115_xml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json
diff --git a/extensions/cpp/test/colorize-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test-78769_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
diff --git a/extensions/cpp/test/colorize-results/test-80644_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test-80644_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-80644_cpp.json
diff --git a/extensions/cpp/test/colorize-results/test-92369_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-92369_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test-92369_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-92369_cpp.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-brackets_tsx.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-brackets_tsx.json
diff --git a/extensions/less/test/colorize-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
similarity index 100%
rename from extensions/less/test/colorize-results/test-cssvariables_less.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json
diff --git a/extensions/scss/test/colorize-results/test-cssvariables_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
similarity index 100%
rename from extensions/scss/test/colorize-results/test-cssvariables_scss.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
diff --git a/extensions/html/test/colorize-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
similarity index 100%
rename from extensions/html/test/colorize-results/test-embedding_html.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json
diff --git a/extensions/powershell/test/colorize-results/test-freeze-56476_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json
similarity index 100%
rename from extensions/powershell/test/colorize-results/test-freeze-56476_ps1.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56476_ps1.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
similarity index 95%
rename from extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
index a6f0571c6..0029c9885 100644
--- a/extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-function-inv_ts.json
@@ -89,13 +89,13 @@
 	},
 	{
 		"c": "Cell",
-		"t": "source.ts new.expr.ts entity.name.type.ts",
+		"t": "source.ts new.expr.ts meta.function-call.ts entity.name.function.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-issue11_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-issue5431_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-issue5465_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-issue5566_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-issue5566_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-jsdoc-multiline-type_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-jsdoc-multiline-type_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
similarity index 96%
rename from extensions/typescript-basics/test/colorize-results/test-keywords_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
index 016639c50..2ef1c3c62 100644
--- a/extensions/typescript-basics/test/colorize-results/test-keywords_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
@@ -166,13 +166,13 @@
 	},
 	{
 		"c": "RegExp",
-		"t": "source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts",
+		"t": "source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "support.class: #4EC9B0",
+			"light_plus": "support.class: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "support.class: #4EC9B0"
 		}
 	},
 	{
diff --git a/extensions/typescript-basics/test/colorize-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-members_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-members_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-object-literals_ts.json
diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
similarity index 100%
rename from extensions/coffeescript/test/colorize-results/test-regex_coffee.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-strings_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-strings_ts.json
diff --git a/extensions/typescript-basics/test/colorize-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/test-this_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-this_ts.json
diff --git a/extensions/css/test/colorize-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
similarity index 100%
rename from extensions/css/test/colorize-results/test-variables_css.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
diff --git a/extensions/perl/test/colorize-results/test2_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
similarity index 100%
rename from extensions/perl/test/colorize-results/test2_pl.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
diff --git a/extensions/javascript/test/colorize-results/test6916_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
similarity index 100%
rename from extensions/javascript/test/colorize-results/test6916_js.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
diff --git a/extensions/bat/test/colorize-results/test_bat.json b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
similarity index 100%
rename from extensions/bat/test/colorize-results/test_bat.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
diff --git a/extensions/cpp/test/colorize-results/test_c.json b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test_c.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_c.json
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test_cc.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
diff --git a/extensions/clojure/test/colorize-results/test_clj.json b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
similarity index 100%
rename from extensions/clojure/test/colorize-results/test_clj.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
similarity index 100%
rename from extensions/coffeescript/test/colorize-results/test_coffee.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
similarity index 100%
rename from extensions/cpp/test/colorize-results/test_cpp.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
diff --git a/extensions/csharp/test/colorize-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
similarity index 100%
rename from extensions/csharp/test/colorize-results/test_cs.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
diff --git a/extensions/razor/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
similarity index 100%
rename from extensions/razor/test/colorize-results/test_cshtml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
diff --git a/extensions/css/test/colorize-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
similarity index 100%
rename from extensions/css/test/colorize-results/test_css.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_css.json
diff --git a/extensions/fsharp/test/colorize-results/test_fs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
similarity index 100%
rename from extensions/fsharp/test/colorize-results/test_fs.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_fs.json
diff --git a/extensions/go/test/colorize-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
similarity index 100%
rename from extensions/go/test/colorize-results/test_go.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_go.json
diff --git a/extensions/groovy/test/colorize-results/test_groovy.json b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
similarity index 100%
rename from extensions/groovy/test/colorize-results/test_groovy.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
diff --git a/extensions/handlebars/test/colorize-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
similarity index 100%
rename from extensions/handlebars/test/colorize-results/test_handlebars.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
diff --git a/extensions/handlebars/test/colorize-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
similarity index 100%
rename from extensions/handlebars/test/colorize-results/test_hbs.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
diff --git a/extensions/hlsl/test/colorize-results/test_hlsl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
similarity index 100%
rename from extensions/hlsl/test/colorize-results/test_hlsl.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
diff --git a/extensions/html/test/colorize-results/test_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json
similarity index 100%
rename from extensions/html/test/colorize-results/test_html.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_html.json
diff --git a/extensions/ini/test/colorize-results/test_ini.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
similarity index 100%
rename from extensions/ini/test/colorize-results/test_ini.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_ini.json
diff --git a/extensions/javascript/test/colorize-results/test_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
similarity index 100%
rename from extensions/javascript/test/colorize-results/test_js.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_js.json
diff --git a/extensions/json/test/colorize-results/test_json.json b/extensions/vscode-colorize-tests/test/colorize-results/test_json.json
similarity index 100%
rename from extensions/json/test/colorize-results/test_json.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_json.json
diff --git a/extensions/javascript/test/colorize-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
similarity index 100%
rename from extensions/javascript/test/colorize-results/test_jsx.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
diff --git a/extensions/less/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
similarity index 100%
rename from extensions/less/test/colorize-results/test_less.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_less.json
diff --git a/extensions/log/test/colorize-results/test_log.json b/extensions/vscode-colorize-tests/test/colorize-results/test_log.json
similarity index 100%
rename from extensions/log/test/colorize-results/test_log.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_log.json
diff --git a/extensions/lua/test/colorize-results/test_lua.json b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
similarity index 100%
rename from extensions/lua/test/colorize-results/test_lua.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
diff --git a/extensions/objective-c/test/colorize-results/test_m.json b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
similarity index 100%
rename from extensions/objective-c/test/colorize-results/test_m.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_m.json
diff --git a/extensions/markdown-basics/test/colorize-results/test_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json
similarity index 100%
rename from extensions/markdown-basics/test/colorize-results/test_md.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_md.json
diff --git a/extensions/objective-c/test/colorize-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
similarity index 100%
rename from extensions/objective-c/test/colorize-results/test_mm.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
diff --git a/extensions/php/test/colorize-results/test_php.json b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
similarity index 100%
rename from extensions/php/test/colorize-results/test_php.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_php.json
diff --git a/extensions/perl/test/colorize-results/test_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
similarity index 100%
rename from extensions/perl/test/colorize-results/test_pl.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
diff --git a/extensions/powershell/test/colorize-results/test_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
similarity index 100%
rename from extensions/powershell/test/colorize-results/test_ps1.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
diff --git a/extensions/pug/test/colorize-results/test_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
similarity index 100%
rename from extensions/pug/test/colorize-results/test_pug.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_pug.json
diff --git a/extensions/r/test/colorize-results/test_r.json b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
similarity index 100%
rename from extensions/r/test/colorize-results/test_r.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_r.json
diff --git a/extensions/ruby/test/colorize-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
similarity index 100%
rename from extensions/ruby/test/colorize-results/test_rb.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
diff --git a/extensions/rust/test/colorize-results/test_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
similarity index 97%
rename from extensions/rust/test/colorize-results/test_rs.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
index 82615d435..72f3f3324 100644
--- a/extensions/rust/test/colorize-results/test_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rs.json
@@ -1,13 +1,13 @@
 [
 	{
 		"c": "use",
-		"t": "source.rust meta.use.rust keyword.control.rust",
+		"t": "source.rust meta.use.rust keyword.other.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
@@ -67,13 +67,13 @@
 	},
 	{
 		"c": "fn",
-		"t": "source.rust meta.function.definition.rust keyword.control.fn.rust",
+		"t": "source.rust meta.function.definition.rust keyword.other.fn.rust",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
 		}
 	},
 	{
diff --git a/extensions/scss/test/colorize-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
similarity index 100%
rename from extensions/scss/test/colorize-results/test_scss.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
diff --git a/extensions/shellscript/test/colorize-results/test_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
similarity index 100%
rename from extensions/shellscript/test/colorize-results/test_sh.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
diff --git a/extensions/shaderlab/test/colorize-results/test_shader.json b/extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
similarity index 100%
rename from extensions/shaderlab/test/colorize-results/test_shader.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_shader.json
diff --git a/extensions/sql/test/colorize-results/test_sql.json b/extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
similarity index 100%
rename from extensions/sql/test/colorize-results/test_sql.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_sql.json
diff --git a/extensions/swift/test/colorize-results/test_swift.json b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
similarity index 100%
rename from extensions/swift/test/colorize-results/test_swift.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
diff --git a/extensions/typescript-basics/test/colorize-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
similarity index 99%
rename from extensions/typescript-basics/test/colorize-results/test_ts.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
index 053f9a777..2aa299d82 100644
--- a/extensions/typescript-basics/test/colorize-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
@@ -5149,13 +5149,13 @@
 	},
 	{
 		"c": "Cell",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts new.expr.ts entity.name.type.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts new.expr.ts meta.function-call.ts entity.name.function.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
@@ -9219,13 +9219,13 @@
 	},
 	{
 		"c": "Cell",
-		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts",
+		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts new.expr.ts meta.function-call.ts entity.name.function.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
@@ -11364,18 +11364,18 @@
 	},
 	{
 		"c": "Conway",
-		"t": "source.ts meta.var.expr.ts new.expr.ts entity.name.type.module.ts",
+		"t": "source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts variable.other.object.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": ".",
-		"t": "source.ts meta.var.expr.ts new.expr.ts punctuation.accessor.ts",
+		"t": "source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts punctuation.accessor.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -11386,13 +11386,13 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts",
+		"t": "source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts entity.name.function.ts",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0"
+			"hc_black": "entity.name.function: #DCDCAA"
 		}
 	},
 	{
@@ -11417,4 +11417,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/vb/test/colorize-results/test_vb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
similarity index 100%
rename from extensions/vb/test/colorize-results/test_vb.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
diff --git a/extensions/xml/test/colorize-results/test_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
similarity index 100%
rename from extensions/xml/test/colorize-results/test_xml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_xml.json
diff --git a/extensions/yaml/test/colorize-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
similarity index 100%
rename from extensions/yaml/test/colorize-results/test_yaml.json
rename to extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
diff --git a/extensions/typescript-basics/test/colorize-results/tsconfig_off_json.json b/extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json
similarity index 100%
rename from extensions/typescript-basics/test/colorize-results/tsconfig_off_json.json
rename to extensions/vscode-colorize-tests/test/colorize-results/tsconfig_off_json.json
diff --git a/extensions/vscode-colorize-tests/yarn.lock b/extensions/vscode-colorize-tests/yarn.lock
index b8a66d65e..a02d17759 100644
--- a/extensions/vscode-colorize-tests/yarn.lock
+++ b/extensions/vscode-colorize-tests/yarn.lock
@@ -2,2015 +2,12 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  integrity sha1-RBT/dKUIecII7l/cgm4ywwNUnto=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  integrity sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
-brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.0.0, chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
-  integrity sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=
-
-cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
-  integrity sha1-pikNQT8hemEjL5XkWP84QYz7ARc=
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-  integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
-
-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=
-
-convert-source-map@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-  integrity sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
-  dependencies:
-    ms "2.0.0"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-deep-assign@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
-  integrity sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=
-  dependencies:
-    is-obj "^1.0.0"
-
-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=
-
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.2.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
-  integrity sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
-  dependencies:
-    jsbn "~0.1.0"
-
-end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  integrity sha1-epDYM+/abPpurA9JSduw+tOmMgY=
-  dependencies:
-    once "^1.4.0"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-event-stream@^3.3.1, event-stream@~3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0, extsprintf@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
-  integrity sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=
-  dependencies:
-    chalk "^1.1.1"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
-  dependencies:
-    pend "~1.2.0"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  integrity sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-  integrity sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.5, glob@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
-  integrity sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-gulp-chmod@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
-  integrity sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
-gulp-filter@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.0.1.tgz#5d87f662e317e5839ef7650e620e6c9008ff92d0"
-  integrity sha512-5olRzAhFdXB2klCu1lnazP65aO9YdA/5WfC9VdInIc8PrUeDIoZfaA3Edb0yUBGhVdHv4eHKL9Fg5tUoEJ9z5A==
-  dependencies:
-    gulp-util "^3.0.6"
-    multimatch "^2.0.0"
-    streamfilter "^1.0.5"
-
-gulp-gunzip@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
-  integrity sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
-gulp-remote-src@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1"
-  integrity sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=
-  dependencies:
-    event-stream "~3.3.4"
-    node.extend "~1.1.2"
-    request "~2.79.0"
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-symdest@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.0.tgz#c165320732d192ce56fd94271ffa123234bf2ae0"
-  integrity sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=
-  dependencies:
-    event-stream "^3.3.1"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^2.4.3"
-
-gulp-untar@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000"
-  integrity sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=
-  dependencies:
-    event-stream "~3.3.4"
-    gulp-util "~3.0.8"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-
-gulp-util@^3.0.6, gulp-util@~3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-vinyl-zip@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
-  integrity sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^3.0.10"
-    through2 "^0.6.3"
-    vinyl "^0.4.6"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
-  integrity sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
-  integrity sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 jsonc-parser@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc"
   integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash@^4.16.4:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
-  dependencies:
-    mime-db "~1.30.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-node.extend@~1.1.2:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96"
-  integrity sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=
-  dependencies:
-    is "^3.1.0"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-  integrity sha1-51vV9uJoEioqDgvaYwslUMFmUCw=
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
-querystringify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
-  integrity sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=
-
-queue@^3.0.10, queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  integrity sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
-request@^2.79.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  integrity sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-requires-port@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-rimraf@2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
-source-map-support@^0.4.11:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-  integrity sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  integrity sha1-US322mKHFEMW3EwY/hzx2UBzm+M=
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-streamfilter@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.5.tgz#87507111beb8e298451717b511cfed8f002abf53"
-  integrity sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.1, through2@~2.0.0, through2@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through@2, through@~2.3, through@~2.3.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  integrity sha1-WqADz76Uxf+GbE59ZouxxNuts2k=
-  dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
-
-url-parse@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
-  integrity sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==
-  dependencies:
-    querystringify "~1.0.0"
-    requires-port "~1.0.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-  integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vinyl-fs@^2.0.0, vinyl-fs@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl-source-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz#44cbe5108205279deb0c5653c094a2887938b1ab"
-  integrity sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=
-  dependencies:
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
-
-vinyl@^0.4.3, vinyl@^0.4.6, vinyl@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.5.tgz#10eb104001840c3dd0813815fd4a05f8fc882d14"
-  integrity sha1-EOsQQAGEDD3QgTgV/UoF+PyILRQ=
-  dependencies:
-    glob "^7.1.1"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.2"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^1.4.0"
-    mocha "^3.2.0"
-    request "^2.79.0"
-    semver "^5.3.0"
-    source-map-support "^0.4.11"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-yauzl@^2.2.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
-  integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
-
-yazl@^2.2.1:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
-  integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
-  dependencies:
-    buffer-crc32 "~0.2.3"
diff --git a/extensions/vscode-custom-editor-tests/package.json b/extensions/vscode-custom-editor-tests/package.json
index 08b6702b8..481b8db61 100644
--- a/extensions/vscode-custom-editor-tests/package.json
+++ b/extensions/vscode-custom-editor-tests/package.json
@@ -21,12 +21,8 @@
     "p-limit": "^3.0.2"
   },
   "devDependencies": {
-    "@types/node": "^12.11.7",
-    "@types/p-limit": "^2.2.0",
-    "mocha": "^2.3.3",
-    "mocha-junit-reporter": "^1.17.0",
-    "mocha-multi-reporters": "^1.1.7",
-    "vscode": "^1.1.36"
+    "@types/node": "^12.19.9",
+    "@types/p-limit": "^2.2.0"
   },
   "contributes": {
     "customEditors": [
diff --git a/extensions/vscode-custom-editor-tests/src/test/index.ts b/extensions/vscode-custom-editor-tests/src/test/index.ts
index a60622b2f..c5a810981 100644
--- a/extensions/vscode-custom-editor-tests/src/test/index.ts
+++ b/extensions/vscode-custom-editor-tests/src/test/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../../test/integration/electron/testrunner');
 
 const suite = 'Custom Editor Tests';
 
diff --git a/extensions/vscode-custom-editor-tests/yarn.lock b/extensions/vscode-custom-editor-tests/yarn.lock
index 0d39ebbaa..29a81a09a 100644
--- a/extensions/vscode-custom-editor-tests/yarn.lock
+++ b/extensions/vscode-custom-editor-tests/yarn.lock
@@ -2,15 +2,10 @@
 # yarn lockfile v1
 
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@types/node@^12.11.7":
-  version "12.12.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.53.tgz#be0d375933c3d15ef2380dafb3b0350ea7021129"
-  integrity sha512-51MYTDTyCziHb70wtGNFRwB4l+5JNvdqzFSkbDvpbftEgVUBEE+T5f7pROhWMp/fxp07oNIEQZd5bbfAH22ohQ==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/p-limit@^2.2.0":
   version "2.2.0"
@@ -19,398 +14,6 @@
   dependencies:
     p-limit "*"
 
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
-  dependencies:
-    debug "4"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
-
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
-
-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=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
-  dependencies:
-    ms "0.7.1"
-
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@4:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
-
-escape-string-regexp@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.2:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
-lodash@^4.16.4:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@~0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^2.3.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
-  dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
-
-mocha@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
 p-limit@*, p-limit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
@@ -422,86 +25,3 @@ p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-semver@^5.4.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
-source-map-support@^0.5.0:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
-
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
-
-vscode-test@^0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8"
-  integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==
-  dependencies:
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-
-vscode@^1.1.36:
-  version "1.1.37"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.37.tgz#c2a770bee4bb3fff765e2b72c7bcc813b8a6bb0a"
-  integrity sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==
-  dependencies:
-    glob "^7.1.2"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    mocha "^5.2.0"
-    semver "^5.4.1"
-    source-map-support "^0.5.0"
-    vscode-test "^0.4.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
diff --git a/extensions/vscode-notebook-tests/package.json b/extensions/vscode-notebook-tests/package.json
index 4454b25fb..85f01c009 100644
--- a/extensions/vscode-notebook-tests/package.json
+++ b/extensions/vscode-notebook-tests/package.json
@@ -19,12 +19,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "typescript": "^3.8.3",
-    "@types/node": "^12.11.7",
-    "mocha-junit-reporter": "^1.17.0",
-    "mocha-multi-reporters": "^1.1.7",
-    "vscode": "~1.1.36",
-    "mocha": "^2.3.3"
+    "@types/node": "^12.19.9"
   },
   "contributes": {
     "commands": [
diff --git a/extensions/vscode-notebook-tests/src/index.ts b/extensions/vscode-notebook-tests/src/index.ts
index 293c02db7..27c81a57f 100644
--- a/extensions/vscode-notebook-tests/src/index.ts
+++ b/extensions/vscode-notebook-tests/src/index.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-const testRunner = require('vscode/lib/testrunner');
+const testRunner = require('../../../test/integration/electron/testrunner');
 
 const options: any = {
 	ui: 'tdd',
diff --git a/extensions/vscode-notebook-tests/src/notebook.test.ts b/extensions/vscode-notebook-tests/src/notebook.test.ts
index d1368d1d5..bd36c5969 100644
--- a/extensions/vscode-notebook-tests/src/notebook.test.ts
+++ b/extensions/vscode-notebook-tests/src/notebook.test.ts
@@ -935,6 +935,108 @@ suite('notebook workflow', () => {
 		await vscode.commands.executeCommand('workbench.action.files.save');
 		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
 	});
+
+	test('cell execute command takes arguments', async () => {
+		assertInitalState();
+		const resource = await createRandomFile('', undefined, 'first', '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+		assert.equal(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first');
+		const editor = vscode.window.activeNotebookEditor!;
+		const cell = editor.document.cells[0];
+
+		await vscode.commands.executeCommand('notebook.execute');
+		assert.equal(cell.outputs.length, 0, 'should not execute'); // not runnable, didn't work
+
+		const metadataChangeEvent = getEventOncePromise<vscode.NotebookDocumentMetadataChangeEvent>(vscode.notebook.onDidChangeNotebookDocumentMetadata);
+		editor.document.metadata.runnable = true;
+		await metadataChangeEvent;
+
+		await vscode.commands.executeCommand('notebook.execute');
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+
+		const clearChangeEvent = getEventOncePromise<vscode.NotebookDocumentMetadataChangeEvent>(vscode.notebook.onDidChangeCellOutputs);
+		await vscode.commands.executeCommand('notebook.cell.clearOutputs');
+		await clearChangeEvent;
+		assert.equal(cell.outputs.length, 0, 'should clear');
+
+		const secondResource = await createRandomFile('', undefined, 'second', '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest');
+		await vscode.commands.executeCommand('notebook.cell.execute', { start: 0, end: 1 }, resource);
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+		assert.equal(vscode.window.activeNotebookEditor?.document.uri.fsPath, secondResource.fsPath);
+
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+	});
+
+	test('document execute command takes arguments', async () => {
+		assertInitalState();
+		const resource = await createRandomFile('', undefined, 'first', '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+		assert.equal(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first');
+		const editor = vscode.window.activeNotebookEditor!;
+		const cell = editor.document.cells[0];
+
+		await vscode.commands.executeCommand('notebook.execute');
+		assert.equal(cell.outputs.length, 0, 'should not execute'); // not runnable, didn't work
+
+		const metadataChangeEvent = getEventOncePromise<vscode.NotebookDocumentMetadataChangeEvent>(vscode.notebook.onDidChangeNotebookDocumentMetadata);
+		editor.document.metadata.runnable = true;
+		await metadataChangeEvent;
+
+		await vscode.commands.executeCommand('notebook.execute');
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+
+		const clearChangeEvent = getEventOncePromise<vscode.NotebookDocumentMetadataChangeEvent>(vscode.notebook.onDidChangeCellOutputs);
+		await vscode.commands.executeCommand('notebook.cell.clearOutputs');
+		await clearChangeEvent;
+		assert.equal(cell.outputs.length, 0, 'should clear');
+
+		const secondResource = await createRandomFile('', undefined, 'second', '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest');
+		await vscode.commands.executeCommand('notebook.execute', resource);
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+		assert.equal(vscode.window.activeNotebookEditor?.document.uri.fsPath, secondResource.fsPath);
+
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+	});
+
+	test('cell execute and select kernel', async () => {
+		assertInitalState();
+		const resource = await createRandomFile('', undefined, 'first', '.vsctestnb');
+		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
+		assert.equal(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first');
+		const editor = vscode.window.activeNotebookEditor!;
+		const cell = editor.document.cells[0];
+
+		const metadataChangeEvent = getEventOncePromise<vscode.NotebookDocumentMetadataChangeEvent>(vscode.notebook.onDidChangeNotebookDocumentMetadata);
+		editor.document.metadata.runnable = true;
+		await metadataChangeEvent;
+
+		await vscode.commands.executeCommand('notebook.cell.execute');
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+		assert.deepEqual((cell.outputs[0] as vscode.CellDisplayOutput).data, {
+			'text/plain': [
+				'my output'
+			]
+		});
+
+		await vscode.commands.executeCommand('notebook.selectKernel', { extension: 'vscode.vscode-notebook-tests', id: 'secondaryKernel' })
+		await vscode.commands.executeCommand('notebook.cell.execute');
+		assert.equal(cell.outputs.length, 1, 'should execute'); // runnable, it worked
+		assert.deepEqual((cell.outputs[0] as vscode.CellDisplayOutput).data, {
+			'text/plain': [
+				'my second output'
+			]
+		});
+		await vscode.commands.executeCommand('workbench.action.files.save');
+		await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
+	});
 });
 
 suite('notebook dirty state', () => {
@@ -1269,11 +1371,10 @@ suite('regression', () => {
 		await vscode.commands.executeCommand('vscode.open', cell.uri, vscode.ViewColumn.Active);
 
 		assert.strictEqual(!!vscode.window.activeNotebookEditor, true);
-		assert.strictEqual(vscode.window.activeNotebookEditor?.document.uri.toString(), resource.toString());
+		assert.strictEqual(vscode.window.activeNotebookEditor!.document.uri.toString(), resource.toString());
 	});
 
-	test('Cannot open notebook from cell-uri with vscode.open-command', async function () {
-		this.skip();
+	test.skip('Cannot open notebook from cell-uri with vscode.open-command', async function () {
 		assertInitalState();
 		const resource = await createRandomFile('', undefined, 'first', '.vsctestnb');
 		await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest');
@@ -1288,7 +1389,7 @@ suite('regression', () => {
 		// removes the fragment if it matches something numeric. For notebooks that's not wanted...
 		await vscode.commands.executeCommand('vscode.open', cell.uri);
 
-		assert.strictEqual(vscode.window.activeNotebookEditor?.document.uri.toString(), resource.toString());
+		assert.strictEqual(vscode.window.activeNotebookEditor!.document.uri.toString(), resource.toString());
 	});
 
 	test('#97830, #97764. Support switch to other editor types', async function () {
diff --git a/extensions/vscode-notebook-tests/src/notebookTestMain.ts b/extensions/vscode-notebook-tests/src/notebookTestMain.ts
index 03c8c7435..c02749acd 100644
--- a/extensions/vscode-notebook-tests/src/notebookTestMain.ts
+++ b/extensions/vscode-notebook-tests/src/notebookTestMain.ts
@@ -60,6 +60,7 @@ export function activate(context: vscode.ExtensionContext): any {
 	}));
 
 	const kernel: vscode.NotebookKernel = {
+		id: 'mainKernel',
 		label: 'Notebook Test Kernel',
 		isPreferred: true,
 		executeAllCells: async (_document: vscode.NotebookDocument) => {
@@ -118,9 +119,69 @@ export function activate(context: vscode.ExtensionContext): any {
 		cancelCellExecution: async (_document: vscode.NotebookDocument, _cell: vscode.NotebookCell) => { }
 	};
 
+	const kernel2: vscode.NotebookKernel = {
+		id: 'secondaryKernel',
+		label: 'Notebook Secondary Test Kernel',
+		isPreferred: false,
+		executeAllCells: async (_document: vscode.NotebookDocument) => {
+			const cell = _document.cells[0];
+
+			cell.outputs = [{
+				outputKind: vscode.CellOutputKind.Rich,
+				data: {
+					'text/plain': ['my second output']
+				}
+			}];
+			return;
+		},
+		cancelAllCellsExecution: async (_document: vscode.NotebookDocument) => { },
+		executeCell: async (document: vscode.NotebookDocument, cell: vscode.NotebookCell | undefined) => {
+			if (!cell) {
+				cell = document.cells[0];
+			}
+
+			if (document.uri.path.endsWith('customRenderer.vsctestnb')) {
+				cell.outputs = [{
+					outputKind: vscode.CellOutputKind.Rich,
+					data: {
+						'text/custom': 'test 2'
+					}
+				}];
+
+				return;
+			}
+
+			const previousOutputs = cell.outputs;
+			const newOutputs: vscode.CellOutput[] = [{
+				outputKind: vscode.CellOutputKind.Rich,
+				data: {
+					'text/plain': ['my second output']
+				}
+			}];
+
+			cell.outputs = newOutputs;
+
+			_onDidChangeNotebook.fire({
+				document: document,
+				undo: () => {
+					if (cell) {
+						cell.outputs = previousOutputs;
+					}
+				},
+				redo: () => {
+					if (cell) {
+						cell.outputs = newOutputs;
+					}
+				}
+			});
+			return;
+		},
+		cancelCellExecution: async (_document: vscode.NotebookDocument, _cell: vscode.NotebookCell) => { }
+	};
+
 	context.subscriptions.push(vscode.notebook.registerNotebookKernelProvider({ filenamePattern: '*.vsctestnb' }, {
 		provideKernels: async () => {
-			return [kernel];
+			return [kernel, kernel2];
 		}
 	}));
 }
diff --git a/extensions/vscode-notebook-tests/yarn.lock b/extensions/vscode-notebook-tests/yarn.lock
index 465cb67d0..e03bdd573 100644
--- a/extensions/vscode-notebook-tests/yarn.lock
+++ b/extensions/vscode-notebook-tests/yarn.lock
@@ -2,792 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.12.37"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.37.tgz#cb4782d847f801fa58316da5b4801ca3a59ae790"
-  integrity sha512-4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg==
-
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-ajv@^6.5.5:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
-
-commander@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
-
-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=
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
-  dependencies:
-    ms "0.7.1"
-
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.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=
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
-
-escape-string-regexp@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.2:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
-  dependencies:
-    ajv "^6.5.5"
-    har-schema "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-lodash@^4.16.4:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.26"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
-  dependencies:
-    mime-db "1.43.0"
-
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-minimatch@3.0.4, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
-mkdirp@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@~0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mocha-junit-reporter@^1.17.0:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^2.3.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
-  dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
-
-mocha@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
-  dependencies:
-    browser-stdout "1.3.1"
-    commander "2.15.1"
-    debug "3.1.0"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.2"
-    growl "1.10.5"
-    he "1.1.1"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    supports-color "5.4.0"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
-
-request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^5.4.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
-source-map-support@^0.5.0:
-  version "0.5.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.18.tgz#f5f33489e270bd7f7d7e7b8debf283f3a4066960"
-  integrity sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
-
-supports-color@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-typescript@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-url-parse@^1.4.4:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vscode-test@^0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8"
-  integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==
-  dependencies:
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-
-vscode@~1.1.36:
-  version "1.1.36"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.36.tgz#5e1a0d1bf4977d0c7bc5159a9a13d5b104d4b1b6"
-  integrity sha512-cGFh9jmGLcTapCpPCKvn8aG/j9zVQ+0x5hzYJq5h5YyUXVGa1iamOaB2M2PZXoumQPES4qeAP1FwkI0b6tL4bQ==
-  dependencies:
-    glob "^7.1.2"
-    mocha "^5.2.0"
-    request "^2.88.0"
-    semver "^5.4.1"
-    source-map-support "^0.5.0"
-    url-parse "^1.4.4"
-    vscode-test "^0.4.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index fd7a9c2f8..12571d0dc 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -3,12 +3,15 @@
 	"description": "Test resolver for VS Code",
 	"version": "0.0.1",
 	"publisher": "vscode",
+	"license": "MIT",
 	"enableProposedApi": true,
 	"private": true,
 	"engines": {
 		"vscode": "^1.25.0"
 	},
-	"extensionKind": [ "ui" ],
+	"extensionKind": [
+		"ui"
+	],
 	"scripts": {
 		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-test-resolver"
@@ -17,12 +20,13 @@
 		"onResolveRemoteAuthority:test",
 		"onCommand:vscode-testresolver.newWindow",
 		"onCommand:vscode-testresolver.newWindowWithError",
-		"onCommand:vscode-testresolver.showLog"
+		"onCommand:vscode-testresolver.showLog",
+		"onCommand:vscode-testresolver.openTunnel",
+		"onCommand:vscode-testresolver.startRemoteServer"
 	],
 	"main": "./out/extension",
 	"devDependencies": {
-		"@types/node": "^12.11.7",
-		"vscode": "1.1.5"
+		"@types/node": "^12.19.9"
 	},
 	"contributes": {
 		"resourceLabelFormatters": [
@@ -47,9 +51,34 @@
 				"title": "Show Log",
 				"category": "Remote-TestResolver",
 				"command": "vscode-testresolver.showLog"
+			},
+			{
+				"title": "Kill Server and Trigger Handled Error",
+				"category": "Remote-TestResolver",
+				"command": "vscode-testresolver.killServerAndTriggerHandledError"
+			},
+			{
+				"title": "Open Tunnel...",
+				"category": "Remote-TestResolver",
+				"command": "vscode-testresolver.openTunnel"
+			},
+			{
+				"title": "Open Remote Server...",
+				"category": "Remote-TestResolver",
+				"command": "vscode-testresolver.startRemoteServer"
 			}
 		],
 		"menus": {
+			"commandPalette": [
+				{
+					"command": "vscode-testresolver.openTunnel",
+					"when": "remoteName == test"
+				},
+				{
+					"command": "vscode-testresolver.startRemoteServer",
+					"when": "remoteName == test"
+				}
+			],
 			"statusBar/windowIndicator": [
 				{
 					"command": "vscode-testresolver.newWindow",
@@ -65,6 +94,16 @@
 					"command": "vscode-testresolver.newWindow",
 					"when": "remoteName == test",
 					"group": "1_remote_testresolver_open@1"
+				},
+				{
+					"command": "vscode-testresolver.openTunnel",
+					"when": "remoteName == test",
+					"group": "1_remote_testresolver_open@4"
+				},
+				{
+					"command": "vscode-testresolver.startRemoteServer",
+					"when": "remoteName == test",
+					"group": "1_remote_testresolver_open@5"
 				}
 			]
 		},
@@ -84,10 +123,13 @@
 					"description": "If set, connection is paused",
 					"type": "boolean",
 					"default": false
+				},
+				"testresolver.supportPublicPorts": {
+					"description": "If set, the test resolver tunnel factory will support mock public ports. Forwarded ports will not actually be public. Requires reload.",
+					"type": "boolean",
+					"default": false
 				}
 			}
 		}
 	}
-
-
 }
diff --git a/extensions/vscode-test-resolver/src/download.ts b/extensions/vscode-test-resolver/src/download.ts
index d94ea2122..805c49482 100644
--- a/extensions/vscode-test-resolver/src/download.ts
+++ b/extensions/vscode-test-resolver/src/download.ts
@@ -23,14 +23,14 @@ function getDownloadUrl(updateUrl: string, commit: string, platform: string, qua
 	return `${updateUrl}/commit:${commit}/server-${platform}/${quality}`;
 }
 
-async function downloadVSCodeServerArchive(updateUrl: string, commit: string, quality: string, destDir: string): Promise<string> {
+async function downloadVSCodeServerArchive(updateUrl: string, commit: string, quality: string, destDir: string, log: (messsage: string) => void): Promise<string> {
 	ensureFolderExists(destDir);
 
 	const platform = process.platform === 'win32' ? 'win32-x64' : process.platform === 'darwin' ? 'darwin' : 'linux-x64';
 	const downloadUrl = getDownloadUrl(updateUrl, commit, platform, quality);
 
 	return new Promise((resolve, reject) => {
-		console.log(`Downloading VS Code Server from: ${downloadUrl}`);
+		log(`Downloading VS Code Server from: ${downloadUrl}`);
 		const requestOptions: https.RequestOptions = parseUrl(downloadUrl);
 
 		https.get(requestOptions, res => {
@@ -70,9 +70,10 @@ async function downloadVSCodeServerArchive(updateUrl: string, commit: string, qu
 /**
  * Unzip a .zip or .tar.gz VS Code archive
  */
-function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string) {
+function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string, destDir: string, log: (messsage: string) => void) {
+	log(`Extracting ${vscodeArchivePath}`);
 	if (vscodeArchivePath.endsWith('.zip')) {
-		const tempDir = fs.mkdtempSync('vscode-server');
+		const tempDir = fs.mkdtempSync(path.join(destDir, 'vscode-server-extract'));
 		if (process.platform === 'win32') {
 			cp.spawnSync('powershell.exe', [
 				'-NoProfile',
@@ -95,17 +96,17 @@ function unzipVSCodeServer(vscodeArchivePath: string, extractDir: string) {
 	}
 }
 
-export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: string, quality: string = 'stable', destDir: string): Promise<string> {
+export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: string, quality: string = 'stable', destDir: string, log: (messsage: string) => void): Promise<string> {
 
 	const extractDir = path.join(destDir, commit);
 	if (fs.existsSync(extractDir)) {
-		console.log(`Found ${extractDir}. Skipping download.`);
+		log(`Found ${extractDir}. Skipping download.`);
 	} else {
-		console.log(`Downloading VS Code Server ${quality} - ${commit} into ${extractDir}.`);
+		log(`Downloading VS Code Server ${quality} - ${commit} into ${extractDir}.`);
 		try {
-			const vscodeArchivePath = await downloadVSCodeServerArchive(updateUrl, commit, quality, destDir);
+			const vscodeArchivePath = await downloadVSCodeServerArchive(updateUrl, commit, quality, destDir, log);
 			if (fs.existsSync(vscodeArchivePath)) {
-				unzipVSCodeServer(vscodeArchivePath, extractDir);
+				unzipVSCodeServer(vscodeArchivePath, extractDir, destDir, log);
 				// Remove archive
 				fs.unlinkSync(vscodeArchivePath);
 			}
@@ -114,4 +115,4 @@ export async function downloadAndUnzipVSCodeServer(updateUrl: string, commit: st
 		}
 	}
 	return Promise.resolve(extractDir);
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts
index 61c900c4b..ccac6c52c 100644
--- a/extensions/vscode-test-resolver/src/extension.ts
+++ b/extensions/vscode-test-resolver/src/extension.ts
@@ -9,6 +9,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as net from 'net';
+import * as http from 'http';
 import { downloadAndUnzipVSCodeServer } from './download';
 import { terminateProcess } from './util/processes';
 
@@ -81,6 +82,13 @@ export function activate(context: vscode.ExtensionContext) {
 			const commandArgs = ['--port=0', '--disable-telemetry'];
 			const env = getNewEnv();
 			const remoteDataDir = process.env['TESTRESOLVER_DATA_FOLDER'] || path.join(os.homedir(), serverDataFolderName || `${dataFolderName}-testresolver`);
+
+			const remoteExtension = process.env['TESTRESOLVER_REMOTE_EXTENSION'];
+			if (remoteExtension) {
+				commandArgs.push('--install-extension', remoteExtension);
+				commandArgs.push('--start-server');
+			}
+
 			env['VSCODE_AGENT_FOLDER'] = remoteDataDir;
 			outputChannel.appendLine(`Using data folder at ${remoteDataDir}`);
 
@@ -95,10 +103,11 @@ export function activate(context: vscode.ExtensionContext) {
 				if (!serverLocation) {
 					const serverBin = path.join(remoteDataDir, 'bin');
 					progress.report({ message: 'Installing VSCode Server' });
-					serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin);
+					serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m));
 				}
 
 				outputChannel.appendLine(`Using server build at ${serverLocation}`);
+				outputChannel.appendLine(`Server arguments ${commandArgs.join(' ')}`);
 
 				extHostProcess = cp.spawn(path.join(serverLocation, serverCommand), commandArgs, { env, cwd: serverLocation });
 			}
@@ -206,27 +215,76 @@ export function activate(context: vscode.ExtensionContext) {
 		});
 	}
 
-	vscode.workspace.registerRemoteAuthorityResolver('test', {
+	const authorityResolverDisposable = vscode.workspace.registerRemoteAuthorityResolver('test', {
 		resolve(_authority: string): Thenable<vscode.ResolvedAuthority> {
 			return vscode.window.withProgress({
 				location: vscode.ProgressLocation.Notification,
 				title: 'Open TestResolver Remote ([details](command:vscode-testresolver.showLog))',
 				cancellable: false
 			}, (progress) => doResolve(_authority, progress));
-		}
+		},
+		tunnelFactory,
+		tunnelFeatures: { elevation: true, public: !!vscode.workspace.getConfiguration('testresolver').get('supportPublicPorts') },
+		showCandidatePort
 	});
+	context.subscriptions.push(authorityResolverDisposable);
 
-	vscode.commands.registerCommand('vscode-testresolver.newWindow', () => {
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.newWindow', () => {
 		return vscode.commands.executeCommand('vscode.newWindow', { remoteAuthority: 'test+test' });
-	});
-	vscode.commands.registerCommand('vscode-testresolver.newWindowWithError', () => {
+	}));
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.newWindowWithError', () => {
 		return vscode.commands.executeCommand('vscode.newWindow', { remoteAuthority: 'test+error' });
-	});
-	vscode.commands.registerCommand('vscode-testresolver.showLog', () => {
+	}));
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.killServerAndTriggerHandledError', () => {
+		authorityResolverDisposable.dispose();
+		if (extHostProcess) {
+			terminateProcess(extHostProcess, context.extensionPath);
+		}
+		vscode.workspace.registerRemoteAuthorityResolver('test', {
+			async resolve(_authority: string): Promise<vscode.ResolvedAuthority> {
+				setTimeout(async () => {
+					await vscode.window.showErrorMessage('Just a custom message.', { modal: true, useCustom: true }, 'OK', 'Great');
+				}, 2000);
+				throw vscode.RemoteAuthorityResolverError.NotAvailable('Intentional Error', true);
+			}
+		});
+	}));
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.showLog', () => {
 		if (outputChannel) {
 			outputChannel.show();
 		}
-	});
+	}));
+
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.openTunnel', async () => {
+		const result = await vscode.window.showInputBox({
+			prompt: 'Enter the remote port for the tunnel',
+			value: '5000',
+			validateInput: input => /^[\d]+$/.test(input) ? undefined : 'Not a valid number'
+		});
+		if (result) {
+			const port = Number.parseInt(result);
+			vscode.workspace.openTunnel({
+				remoteAddress: {
+					host: 'localhost',
+					port: port
+				},
+				localAddressPort: port + 1
+			});
+		}
+
+	}));
+	context.subscriptions.push(vscode.commands.registerCommand('vscode-testresolver.startRemoteServer', async () => {
+		const result = await vscode.window.showInputBox({
+			prompt: 'Enter the port for the remote server',
+			value: '5000',
+			validateInput: input => /^[\d]+$/.test(input) ? undefined : 'Not a valid number'
+		});
+		if (result) {
+			runHTTPTestServer(Number.parseInt(result));
+		}
+
+	}));
+	vscode.commands.executeCommand('setContext', 'forwardedPortsViewEnabled', true);
 }
 
 type ActionItem = (vscode.MessageItem & { execute: () => void; });
@@ -287,3 +345,92 @@ function sleep(ms: number): Promise<void> {
 function getConfiguration<T>(id: string): T | undefined {
 	return vscode.workspace.getConfiguration('testresolver').get<T>(id);
 }
+
+const remoteServers: number[] = [];
+
+async function showCandidatePort(_host: string, port: number, _detail: string): Promise<boolean> {
+	return remoteServers.includes(port) || port === 100;
+}
+
+async function tunnelFactory(tunnelOptions: vscode.TunnelOptions, tunnelCreationOptions: vscode.TunnelCreationOptions): Promise<vscode.Tunnel> {
+	outputChannel.appendLine(`Tunnel factory request: Remote ${tunnelOptions.remoteAddress.port} -> local ${tunnelOptions.localAddressPort}`);
+	if (tunnelCreationOptions.elevationRequired) {
+		await vscode.window.showInformationMessage('This is a fake elevation message. A real resolver would show a native elevation prompt.', { modal: true }, 'Ok');
+	}
+
+	return createTunnelService();
+
+	function newTunnel(localAddress: { host: string, port: number }) {
+		const onDidDispose: vscode.EventEmitter<void> = new vscode.EventEmitter();
+		let isDisposed = false;
+		return {
+			localAddress,
+			remoteAddress: tunnelOptions.remoteAddress,
+			public: !!vscode.workspace.getConfiguration('testresolver').get('supportPublicPorts') && tunnelOptions.public,
+			onDidDispose: onDidDispose.event,
+			dispose: () => {
+				if (!isDisposed) {
+					isDisposed = true;
+					onDidDispose.fire();
+				}
+			}
+		};
+	}
+
+	function createTunnelService(): Promise<vscode.Tunnel> {
+		return new Promise<vscode.Tunnel>((res, _rej) => {
+			const proxyServer = net.createServer(proxySocket => {
+				const remoteSocket = net.createConnection({ host: tunnelOptions.remoteAddress.host, port: tunnelOptions.remoteAddress.port });
+				remoteSocket.pipe(proxySocket);
+				proxySocket.pipe(remoteSocket);
+			});
+			let localPort = 0;
+
+			if (tunnelOptions.localAddressPort) {
+				// When the tunnelOptions include a localAddressPort, we should use that.
+				// However, the test resolver all runs on one machine, so if the localAddressPort is the same as the remote port,
+				// then we must use a different port number.
+				localPort = tunnelOptions.localAddressPort;
+			} else {
+				localPort = tunnelOptions.remoteAddress.port;
+			}
+
+			if (localPort === tunnelOptions.remoteAddress.port) {
+				localPort += 1;
+			}
+
+			// The test resolver can't actually handle privileged ports, it only pretends to.
+			if (localPort < 1024 && process.platform !== 'win32') {
+				localPort = 0;
+			}
+			proxyServer.listen(localPort, () => {
+				const localPort = (<net.AddressInfo>proxyServer.address()).port;
+				outputChannel.appendLine(`New test resolver tunnel service: Remote ${tunnelOptions.remoteAddress.port} -> local ${localPort}`);
+				const tunnel = newTunnel({ host: 'localhost', port: localPort });
+				tunnel.onDidDispose(() => proxyServer.close());
+				res(tunnel);
+			});
+		});
+	}
+}
+
+function runHTTPTestServer(port: number): vscode.Disposable {
+	const server = http.createServer((_req, res) => {
+		res.writeHead(200);
+		res.end(`Hello, World from test server running on port ${port}!`);
+	});
+	remoteServers.push(port);
+	server.listen(port);
+	const message = `Opened HTTP server on http://localhost:${port}`;
+	console.log(message);
+	outputChannel.appendLine(message);
+	return {
+		dispose: () => {
+			server.close();
+			const index = remoteServers.indexOf(port);
+			if (index !== -1) {
+				remoteServers.splice(index, 1);
+			}
+		}
+	};
+}
diff --git a/extensions/vscode-test-resolver/src/util/processes.ts b/extensions/vscode-test-resolver/src/util/processes.ts
index d5af12566..3bc127255 100644
--- a/extensions/vscode-test-resolver/src/util/processes.ts
+++ b/extensions/vscode-test-resolver/src/util/processes.ts
@@ -23,7 +23,7 @@ export function terminateProcess(p: cp.ChildProcess, extensionPath: string): Ter
 	} else if (process.platform === 'darwin' || process.platform === 'linux') {
 		try {
 			const cmd = path.join(extensionPath, 'scripts', 'terminateProcess.sh');
-			const result = cp.spawnSync(cmd, [process.pid.toString()]);
+			const result = cp.spawnSync(cmd, [p.pid.toString()]);
 			if (result.error) {
 				return { success: false, error: result.error };
 			}
@@ -34,4 +34,4 @@ export function terminateProcess(p: cp.ChildProcess, extensionPath: string): Ter
 		p.kill('SIGKILL');
 	}
 	return { success: true };
-}
\ No newline at end of file
+}
diff --git a/extensions/vscode-test-resolver/yarn.lock b/extensions/vscode-test-resolver/yarn.lock
index 4bc145109..e03bdd573 100644
--- a/extensions/vscode-test-resolver/yarn.lock
+++ b/extensions/vscode-test-resolver/yarn.lock
@@ -2,1878 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/node@^12.11.7":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
-
-ajv@^6.5.5:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-cloneable-readable@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.2.tgz#d591dee4a8f8bc15da43ce97dceeba13d43e2a65"
-  integrity sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-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=
-
-convert-source-map@^1.1.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
-  dependencies:
-    ms "2.0.0"
-
-deep-assign@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-1.0.0.tgz#b092743be8427dc621ea0067cdec7e70dd19f37b"
-  integrity sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=
-  dependencies:
-    is-obj "^1.0.0"
-
-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=
-
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@^0.1.1, duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.2.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-end-of-stream@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-event-stream@3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-event-stream@^3.3.1, event-stream@~3.3.4:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.5.tgz#e5dd8989543630d94c6cf4d657120341fa31636b"
-  integrity sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==
-  dependencies:
-    duplexer "^0.1.1"
-    from "^0.1.7"
-    map-stream "0.0.7"
-    pause-stream "^0.0.11"
-    split "^1.0.1"
-    stream-combiner "^0.2.2"
-    through "^2.3.8"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
-  dependencies:
-    kind-of "^1.1.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fancy-log@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-from@^0.1.7, from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
-  dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
-
-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.1, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.2:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
-
-gulp-chmod@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
-  integrity sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
-gulp-filter@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
-  integrity sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM=
-  dependencies:
-    multimatch "^2.0.0"
-    plugin-error "^0.1.2"
-    streamfilter "^1.0.5"
-
-gulp-gunzip@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
-  integrity sha1-e24HsPWP09QlFcSOrVpj3wVy9i8=
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
-gulp-remote-src@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.4.tgz#4a4d18fac0ffedde94a7855953de90db00a1d1b1"
-  integrity sha512-mo7lGgZmNXyTbcUzfjSnUVkx1pnqqiwv/pPaIrYdTO77hq0WNTxXLAzQdoYOnyJ0mfVLNmNl9AGqWLiAzTPMMA==
-  dependencies:
-    event-stream "3.3.4"
-    node.extend "~1.1.2"
-    request "^2.88.0"
-    through2 "~2.0.3"
-    vinyl "~2.0.1"
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-symdest@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.1.tgz#b0a6df3d43a0537165946ab8e38c1b7080a66fac"
-  integrity sha512-UHd3MokfIN7SrFdsbV5uZTwzBpL0ZSTu7iq98fuDqBGZ0dlHxgbQBJwfd6qjCW83snkQ3Hz9IY4sMRMz2iTq7w==
-  dependencies:
-    event-stream "3.3.4"
-    mkdirp "^0.5.1"
-    queue "^3.1.0"
-    vinyl-fs "^2.4.3"
-
-gulp-untar@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000"
-  integrity sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=
-  dependencies:
-    event-stream "~3.3.4"
-    gulp-util "~3.0.8"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-
-gulp-util@~3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-vinyl-zip@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
-  integrity sha1-VjgvLMtXIxuwR4x4c3zNVylzvuE=
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^3.0.10"
-    through2 "^0.6.3"
-    vinyl "^0.4.6"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
-  dependencies:
-    ajv "^6.5.5"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-stream@^1.0.1, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79"
-  integrity sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
-  dependencies:
-    mime-db "~1.38.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-node.extend@~1.1.2:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.8.tgz#0aab3e63789f4e6d68b42bc00073ad1881243cf0"
-  integrity sha512-L/dvEBwyg3UowwqOUTyDsGBU6kjBQOpOhshio9V3i3BMPv5YUb9+mWNN8MK0IbWqT0AqaTSONZf0aTuMMahWgA==
-  dependencies:
-    has "^1.0.3"
-    is "^3.2.1"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-pause-stream@0.0.11, pause-stream@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
-  dependencies:
-    through "~2.3"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
-process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-psl@^1.1.24:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
-
-queue@^3.0.10, queue@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
-  integrity sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=
-  dependencies:
-    inherits "~2.0.0"
-
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
-request@^2.79.0, request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-rimraf@2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-semver@^5.3.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-source-map-support@^0.4.11:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
-  dependencies:
-    through "2"
-
-split@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
-  dependencies:
-    through "2"
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
-
-stream-combiner@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
-  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
-  dependencies:
-    duplexer "~0.1.1"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-streamfilter@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
-  integrity sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==
-  dependencies:
-    readable-stream "^2.0.2"
-
-streamifier@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
-  integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.3, through2@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through@2, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-url-parse@^1.1.9:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vinyl-fs@^2.0.0, vinyl-fs@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl-source-stream@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz#62b53a135610a896e98ca96bee3a87f008a8e780"
-  integrity sha1-YrU6E1YQqJbpjKlr7jqH8Aio54A=
-  dependencies:
-    through2 "^2.0.3"
-    vinyl "^0.4.3"
-
-vinyl@^0.4.3, vinyl@^0.4.6, vinyl@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@~2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
-  integrity sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vscode@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.5.tgz#10eb104001840c3dd0813815fd4a05f8fc882d14"
-  integrity sha1-EOsQQAGEDD3QgTgV/UoF+PyILRQ=
-  dependencies:
-    glob "^7.1.1"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.2"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^1.4.0"
-    mocha "^3.2.0"
-    request "^2.79.0"
-    semver "^5.3.0"
-    source-map-support "^0.4.11"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-yauzl@^2.2.1:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yazl@^2.2.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
-  dependencies:
-    buffer-crc32 "~0.2.3"
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 9e9d4faf7..206d04ad1 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-typescript@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
-  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
+typescript@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
+  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
diff --git a/gulpfile.js b/gulpfile.js
index 1d13cff60..9691ba806 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,41 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-// Increase max listeners for event emitters
-require('events').EventEmitter.defaultMaxListeners = 100;
-
-const gulp = require('gulp');
-const util = require('./build/lib/util');
-const task = require('./build/lib/task');
-const path = require('path');
-const compilation = require('./build/lib/compilation');
-const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./build/gulpfile.editor');
-const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions');
-
-// Fast compile for development time
-const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
-gulp.task(compileClientTask);
-
-const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), compilation.watchTask('out', false)));
-gulp.task(watchClientTask);
-
-// All
-const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
-gulp.task(compileTask);
-
-gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
-
-// Default
-gulp.task('default', compileTask);
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-	process.exit(1);
-});
-
-// Load all the gulpfiles only if running tasks other than the editor tasks
-const build = path.join(__dirname, 'build');
-require('glob').sync('gulpfile.*.js', { cwd: build })
-	.forEach(f => require(`./build/${f}`));
+require('./build/gulpfile');
diff --git a/package.json b/package.json
index c856e311d..0540794fe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.52.1",
-  "distro": "11fd6f1230738827638f000f641d01b2b178db20",
+  "version": "1.53.2",
+  "distro": "cdd6e6dc2642505c6c9d9ca940672ff0171a34f9",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -13,43 +13,56 @@
     "test-browser": "node test/unit/browser/index.js",
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
-    "compile": "gulp compile --max_old_space_size=4095",
-    "watch": "concurrently \"npm:watch-client\" \"npm:watch-extensions\"",
+    "compile": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile",
+    "watch": "npm-run-all -lp watch-client watch-extensions",
     "watchd": "deemon yarn watch",
     "watch-webd": "deemon yarn watch-web",
     "kill-watchd": "deemon --kill yarn watch",
     "kill-watch-webd": "deemon --kill yarn watch-web",
     "restart-watchd": "deemon --restart yarn watch",
     "restart-watch-webd": "deemon --restart yarn watch-web",
-    "watch-client": "gulp watch-client --max_old_space_size=4095",
+    "watch-client": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-client",
     "watch-clientd": "deemon yarn watch-client",
     "kill-watch-clientd": "deemon --kill yarn watch-client",
-    "watch-extensions": "gulp watch-extensions --max_old_space_size=4095",
+    "watch-extensions": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-extensions",
     "watch-extensionsd": "deemon yarn watch-extensions",
     "kill-watch-extensionsd": "deemon --kill yarn watch-extensions",
     "mocha": "mocha test/unit/node/all.js --delay",
     "precommit": "node build/hygiene.js",
-    "gulp": "gulp --max_old_space_size=8192",
+    "gulp": "node --max_old_space_size=8192 ./node_modules/gulp/bin/gulp.js",
     "electron": "node build/lib/electron",
     "7z": "7z",
     "update-grammars": "node build/npm/update-all-grammars.js",
     "update-localization-extension": "node build/npm/update-localization-extension.js",
-    "smoketest": "cd test/smoke && node test/index.js",
+    "smoketest": "cd test/smoke && yarn compile && node test/index.js",
+    "smoketest-no-compile": "cd test/smoke && node test/index.js",
     "download-builtin-extensions": "node build/lib/builtInExtensions.js",
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
-    "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit",
+    "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json",
     "valid-layers-check": "node build/lib/layersChecker.js",
     "strict-function-types-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictFunctionTypes",
     "update-distro": "node build/npm/update-distro.js",
     "web": "node resources/web/code-web.js",
-    "compile-web": "gulp compile-web --max_old_space_size=4095",
-    "watch-web": "gulp watch-web --max_old_space_size=4095",
-    "eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions",
-    "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.0.2"
+    "compile-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-web",
+    "watch-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-web",
+    "eslint": "node build/eslint",
+    "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.2.1",
+    "playwright-install": "node build/azure-pipelines/common/installPlaywright.js",
+    "compile-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-build",
+    "compile-extensions-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-extensions-build",
+    "minify-vscode": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode",
+    "minify-vscode-reh": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh",
+    "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",
+    "hygiene": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js hygiene",
+    "core-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js core-ci",
+    "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci",
+    "ext": "node build/ext.js",
+    "update-all-grammars": "node build/ext.js each -t grammar npm run update-grammar",
+    "link-grammars": "node build/ext.js link -t grammar"
   },
   "dependencies": {
     "applicationinsights": "1.0.8",
-    "chokidar": "3.4.3",
+    "chokidar": "3.5.0",
     "graceful-fs": "4.2.3",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",
@@ -60,7 +73,7 @@
     "native-is-elevated": "0.4.1",
     "native-keymap": "2.2.1",
     "native-watchdog": "1.3.0",
-    "node-pty": "0.10.0-beta17",
+    "node-pty": "0.10.0-beta19",
     "spdlog": "^0.11.1",
     "sudo-prompt": "9.1.1",
     "tas-client-umd": "0.1.2",
@@ -72,7 +85,7 @@
     "vscode-ripgrep": "^1.11.1",
     "vscode-sqlite3": "4.0.10",
     "vscode-textmate": "5.2.0",
-    "xterm": "4.10.0-beta.4",
+    "xterm": "4.10.0-beta.39",
     "xterm-addon-search": "0.8.0-beta.3",
     "xterm-addon-unicode11": "0.3.0-beta.3",
     "xterm-addon-webgl": "0.10.0-beta.1",
@@ -84,17 +97,20 @@
     "@types/applicationinsights": "0.20.0",
     "@types/chokidar": "2.1.3",
     "@types/cookie": "^0.3.3",
-    "@types/debug": "^4.1.5",
+    "@types/copy-webpack-plugin": "^6.0.3",
+    "@types/cssnano": "^4.0.0",
+    "@types/debug": "4.1.5",
     "@types/graceful-fs": "4.1.2",
+    "@types/gulp-postcss": "^8.0.0",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/keytar": "^4.4.0",
-    "@types/minimist": "^1.2.0",
-    "@types/mocha": "2.2.39",
-    "@types/node": "^12.11.7",
+    "@types/minimist": "^1.2.1",
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^12.19.9",
     "@types/sinon": "^1.16.36",
     "@types/trusted-types": "^1.0.6",
     "@types/vscode-windows-registry": "^1.0.0",
-    "@types/webpack": "^4.4.10",
+    "@types/webpack": "^4.41.25",
     "@types/windows-foreground-love": "^0.3.0",
     "@types/windows-mutex": "^0.4.0",
     "@types/windows-process-tree": "^0.2.0",
@@ -106,38 +122,40 @@
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
-    "concurrently": "^5.2.0",
-    "copy-webpack-plugin": "^4.5.2",
+    "copy-webpack-plugin": "^6.0.3",
     "cson-parser": "^1.3.3",
     "css-loader": "^3.2.0",
+    "cssnano": "^4.1.10",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "9.3.5",
+    "electron": "11.2.1",
     "electron-rebuild": "2.0.3",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
-    "eslint-plugin-mocha": "8.0.0",
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
     "fast-plist": "0.1.2",
     "file-loader": "^4.2.0",
     "glob": "^5.0.13",
     "gulp": "^4.0.0",
-    "gulp-atom-electron": "^1.22.0",
-    "gulp-azure-storage": "^0.10.0",
+    "gulp-atom-electron": "1.22.0",
+    "gulp-azure-storage": "^0.11.1",
+    "gulp-bom": "^3.0.0",
     "gulp-buffer": "0.0.2",
     "gulp-concat": "^2.6.1",
-    "gulp-cssnano": "^2.1.3",
     "gulp-eslint": "^5.0.0",
     "gulp-filter": "^5.1.0",
     "gulp-flatmap": "^1.0.2",
     "gulp-gunzip": "^1.0.0",
+    "gulp-gzip": "^1.4.2",
     "gulp-json-editor": "^2.5.0",
     "gulp-plumber": "^1.2.0",
+    "gulp-postcss": "^9.0.0",
     "gulp-remote-retry-src": "^0.6.0",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.6.5",
+    "gulp-sourcemaps": "^3.0.0",
     "gulp-tsb": "4.0.5",
     "gulp-untar": "^0.0.7",
     "gulp-vinyl-zip": "^2.1.2",
@@ -154,33 +172,39 @@
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
-    "mkdirp": "^0.5.0",
-    "mocha": "^2.2.5",
-    "mocha-junit-reporter": "^1.17.0",
+    "minimist": "^1.2.5",
+    "mkdirp": "^1.0.4",
+    "mocha": "^8.2.1",
+    "mocha-junit-reporter": "^2.0.0",
+    "mocha-multi-reporters": "^1.5.1",
+    "npm-run-all": "^4.1.5",
     "opn": "^6.0.0",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
-    "playwright": "1.6.2",
+    "playwright": "1.7.1",
     "pump": "^1.0.1",
     "queue": "3.0.6",
     "rcedit": "^1.1.0",
+    "request": "^2.85.0",
     "rimraf": "^2.2.8",
     "sinon": "^1.17.2",
-    "source-map": "^0.4.4",
+    "source-map": "0.6.1",
+    "source-map-support": "^0.3.2",
     "style-loader": "^1.0.0",
-    "ts-loader": "^4.4.2",
-    "tsec": "googleinterns/tsec",
-    "typescript": "^4.2.0-dev.20201119",
+    "ts-loader": "^6.2.1",
+    "tsec": "0.1.1",
+    "typescript": "4.2.0-dev.20201207",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
     "vinyl-fs": "^3.0.0",
-    "vsce": "1.48.0",
-    "vscode-debugprotocol": "1.43.0",
+    "vscode-debugprotocol": "1.44.0",
     "vscode-nls-dev": "^3.3.1",
+    "vscode-telemetry-extractor": "^1.6.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12",
     "webpack-stream": "^5.2.1",
+    "xml2js": "^0.4.17",
     "yaserver": "^0.2.0"
   },
   "repository": {
@@ -191,10 +215,14 @@
     "url": "https://github.com/microsoft/vscode/issues"
   },
   "optionalDependencies": {
-    "vscode-windows-ca-certs": "0.2.0",
+    "vscode-windows-ca-certs": "^0.3.0",
     "vscode-windows-registry": "1.0.3",
     "windows-foreground-love": "0.2.0",
     "windows-mutex": "0.3.0",
     "windows-process-tree": "0.2.4"
+  },
+  "resolutions": {
+    "elliptic": "^6.5.3",
+    "nwmatcher": "^1.4.4"
   }
 }
diff --git a/product.json b/product.json
index 207bcf8f5..9cddae242 100644
--- a/product.json
+++ b/product.json
@@ -31,7 +31,7 @@
 	"builtInExtensions": [
 		{
 			"name": "ms-vscode.node-debug",
-			"version": "1.44.15",
+			"version": "1.44.16",
 			"repo": "https://github.com/microsoft/vscode-node-debug",
 			"metadata": {
 				"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
@@ -61,7 +61,7 @@
 		},
 		{
 			"name": "ms-vscode.references-view",
-			"version": "0.0.74",
+			"version": "0.0.77",
 			"repo": "https://github.com/microsoft/vscode-reference-view",
 			"metadata": {
 				"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
@@ -91,7 +91,7 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.52.2",
+			"version": "1.53.0",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
diff --git a/remote/.yarnrc b/remote/.yarnrc
index c1a32ce53..cd436416b 100644
--- a/remote/.yarnrc
+++ b/remote/.yarnrc
@@ -1,3 +1,3 @@
 disturl "http://nodejs.org/dist"
-target "12.14.1"
+target "12.18.3"
 runtime "node"
diff --git a/remote/package.json b/remote/package.json
index f68deac64..83df0a777 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -1,9 +1,10 @@
 {
   "name": "vscode-reh",
   "version": "0.0.0",
+  "private": true,
   "dependencies": {
     "applicationinsights": "1.0.8",
-    "chokidar": "3.4.3",
+    "chokidar": "3.5.0",
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.3",
     "http-proxy-agent": "^2.1.0",
@@ -12,16 +13,16 @@
     "jschardet": "2.2.1",
     "minimist": "^1.2.5",
     "native-watchdog": "1.3.0",
-    "node-pty": "0.10.0-beta17",
+    "node-pty": "0.10.0-beta19",
     "spdlog": "^0.11.1",
     "tas-client-umd": "0.1.2",
     "vscode-nsfw": "1.2.9",
     "vscode-oniguruma": "1.3.1",
     "vscode-proxy-agent": "^0.5.2",
+    "vscode-regexpp": "^3.1.0",
     "vscode-ripgrep": "^1.11.1",
     "vscode-textmate": "5.2.0",
-    "vscode-regexpp": "^3.1.0",
-    "xterm": "4.10.0-beta.4",
+    "xterm": "4.10.0-beta.39",
     "xterm-addon-search": "0.8.0-beta.3",
     "xterm-addon-unicode11": "0.3.0-beta.3",
     "xterm-addon-webgl": "0.10.0-beta.1",
@@ -29,7 +30,7 @@
     "yazl": "^2.4.3"
   },
   "optionalDependencies": {
-    "vscode-windows-ca-certs": "0.2.0",
+    "vscode-windows-ca-certs": "0.3.0",
     "vscode-windows-registry": "1.0.2"
   }
 }
diff --git a/remote/web/package.json b/remote/web/package.json
index 09ecb81a3..e57dc1eee 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -1,13 +1,14 @@
 {
 	"name": "vscode-web",
 	"version": "0.0.0",
+	"private": true,
 	"dependencies": {
 		"iconv-lite-umd": "0.6.8",
 		"jschardet": "2.2.1",
 		"tas-client-umd": "0.1.2",
 		"vscode-oniguruma": "1.3.1",
 		"vscode-textmate": "5.2.0",
-		"xterm": "4.10.0-beta.4",
+		"xterm": "4.10.0-beta.39",
 		"xterm-addon-search": "0.8.0-beta.3",
 		"xterm-addon-unicode11": "0.3.0-beta.3",
 		"xterm-addon-webgl": "0.10.0-beta.1"
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index e1a49f7e9..7510e9363 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -42,7 +42,7 @@ xterm-addon-webgl@0.10.0-beta.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e"
   integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q==
 
-xterm@4.10.0-beta.4:
-  version "4.10.0-beta.4"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e"
-  integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA==
+xterm@4.10.0-beta.39:
+  version "4.10.0-beta.39"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.39.tgz#29c5ce3ed814d04e0bf2781cf9bd09e354b6e422"
+  integrity sha512-0qtknUlct48WyVj8tnoVvwn4Bz2+lmVBLIGKjifTvawRccw2QVXjTa5hUgNIbecgZv8PWZhseBREtccRbbqbuA==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 22d8ebe3f..68fd8d4bb 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -69,10 +69,10 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-chokidar@3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
-  integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
+chokidar@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65"
+  integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -82,7 +82,7 @@ chokidar@3.4.3:
     normalize-path "~3.0.0"
     readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
 cookie@^0.4.0:
   version "0.4.0"
@@ -155,10 +155,10 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
 glob-parent@~5.1.0:
   version "5.1.0"
@@ -299,15 +299,15 @@ native-watchdog@1.3.0:
   resolved "https://registry.yarnpkg.com/native-watchdog/-/native-watchdog-1.3.0.tgz#88cee94c9dc766b85c8506eda14c8bd8c9618e27"
   integrity sha512-WOjGRNGkYZ5MXsntcvCYrKtSYMaewlbCFplbcUVo9bE80LPVt8TAVFHYWB8+a6fWCGYheq21+Wtt6CJrUaCJhw==
 
-node-addon-api@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.2.tgz#d8aad9781a5cfc4132cc2fecdbdd982534265217"
-  integrity sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==
+node-addon-api@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
+  integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
 
-node-pty@0.10.0-beta17:
-  version "0.10.0-beta17"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta17.tgz#962d4a3f4dc6772385e0cad529c209cef3bc79e6"
-  integrity sha512-tn7EANQacnAvnOQCImvgag1DL0tVmUoY/1yIZbh3u/BBpvCcGHLZJNn7TXheodRLr6hmGSUS2VbfcUr9p0gOug==
+node-pty@0.10.0-beta19:
+  version "0.10.0-beta19"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta19.tgz#b7cbfba53f7b2a816efe8c9302dd083cc5874458"
+  integrity sha512-4UIOGMvpofUbe+ZniBUtY8zc/psMURSzbMonQgIhK7JlMQsUwcbkDIrKzStVLJX0FkeZpUNlsVtK7qqzHvrUZA==
   dependencies:
     nan "^2.14.0"
 
@@ -438,12 +438,12 @@ vscode-textmate@5.2.0:
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
   integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
 
-vscode-windows-ca-certs@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.2.0.tgz#086f0f4de57e2760a35ac6920831bff246237115"
-  integrity sha512-YBrJRT0zos+Yb1Qdn73GD8QZr7pa2IE96b5Y1hmmp6XeR8aYB7Iiq5gDAF/+/AxL+caSR9KPZQ6jiYWh5biD7w==
+vscode-windows-ca-certs@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.3.0.tgz#324e1f8ba842bbf048a39e7c0ee8fe655e9adfcc"
+  integrity sha512-CYrpCEKmAFQJoZNReOrelNL+VKyebOVRCqL9evrBlVcpWQDliliJgU5RggGS8FPGtQ3jAKLQt9frF0qlxYYPKA==
   dependencies:
-    node-addon-api "1.6.2"
+    node-addon-api "^3.0.2"
 
 vscode-windows-registry@1.0.2:
   version "1.0.2"
@@ -465,10 +465,10 @@ xterm-addon-webgl@0.10.0-beta.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e"
   integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q==
 
-xterm@4.10.0-beta.4:
-  version "4.10.0-beta.4"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e"
-  integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA==
+xterm@4.10.0-beta.39:
+  version "4.10.0-beta.39"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.39.tgz#29c5ce3ed814d04e0bf2781cf9bd09e354b6e422"
+  integrity sha512-0qtknUlct48WyVj8tnoVvwn4Bz2+lmVBLIGKjifTvawRccw2QVXjTa5hUgNIbecgZv8PWZhseBREtccRbbqbuA==
 
 yauzl@^2.9.2:
   version "2.10.0"
diff --git a/resources/completions/zsh/_code b/resources/completions/zsh/_code
index c7abee1bc..087ea61f5 100644
--- a/resources/completions/zsh/_code
+++ b/resources/completions/zsh/_code
@@ -17,8 +17,8 @@ arguments=(
 	'--telemetry[show all telemetry events which VS code collects]'
 	'--extensions-dir[set the root path for extensions]:root path:_directories'
 	'--list-extensions[list the installed extensions]'
-	'--category[filters installed extension list by category, when using --list-extension]'
-	'--show-versions[show versions of installed extensions, when using --list-extension]'
+	'--category[filters installed extension list by category, when using --list-extensions]'
+	'--show-versions[show versions of installed extensions, when using --list-extensions]'
 	'--install-extension[install an extension]:id or path:_files -g "*.vsix(-.)"'
 	'--uninstall-extension[uninstall an extension]:id or path:_files -g "*.vsix(-.)"'
 	'--enable-proposed-api[enables proposed API features for extensions]::extension id: '
diff --git a/resources/linux/debian/postinst.template b/resources/linux/debian/postinst.template
index c72fe5f9f..c440312f3 100755
--- a/resources/linux/debian/postinst.template
+++ b/resources/linux/debian/postinst.template
@@ -66,13 +66,16 @@ NdCFTW7wY0Fb1fWJ+/KTsC4=
 	if [ ! -f $CODE_SOURCE_PART ]; then
 		# Write source list if it does not exist
 		WRITE_SOURCE=1
-	elif grep -q "# disabled on upgrade to" /etc/apt/sources.list.d/vscode.list; then
+	elif grep -Eq "http:\/\/packages\.microsoft\.com\/repos\/vscode" $CODE_SOURCE_PART; then
+		# Migrate from old repository
+		WRITE_SOURCE=1
+	elif grep -q "# disabled on upgrade to" $CODE_SOURCE_PART; then
 		# Write source list if it was disabled by OS upgrade
 		WRITE_SOURCE=1
 	fi
 	if [ "$WRITE_SOURCE" -eq "1" ]; then
 		echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
 # You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/@@REPOSITORY_NAME@@ stable main" > $CODE_SOURCE_PART
+deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main" > $CODE_SOURCE_PART
 	fi
 fi
diff --git a/resources/web/code-web.js b/resources/web/code-web.js
index 9be3bc2d8..f4e97df0c 100644
--- a/resources/web/code-web.js
+++ b/resources/web/code-web.js
@@ -21,6 +21,7 @@ const vfs = require('vinyl-fs');
 const uuid = require('uuid');
 
 const extensions = require('../../build/lib/extensions');
+const { getBuiltInExtensions } = require('../../build/lib/builtInExtensions');
 
 const APP_ROOT = path.join(__dirname, '..', '..');
 const BUILTIN_EXTENSIONS_ROOT = path.join(APP_ROOT, 'extensions');
@@ -28,6 +29,14 @@ const BUILTIN_MARKETPLACE_EXTENSIONS_ROOT = path.join(APP_ROOT, '.build', 'built
 const WEB_DEV_EXTENSIONS_ROOT = path.join(APP_ROOT, '.build', 'builtInWebDevExtensions');
 const WEB_MAIN = path.join(APP_ROOT, 'src', 'vs', 'code', 'browser', 'workbench', 'workbench-dev.html');
 
+// This is useful to simulate real world CORS
+const ALLOWED_CORS_ORIGINS = [
+	'http://localhost:8081',
+	'http://127.0.0.1:8081',
+	'http://localhost:8080',
+	'http://127.0.0.1:8080',
+];
+
 const WEB_PLAYGROUND_VERSION = '0.0.10';
 
 const args = minimist(process.argv, {
@@ -37,7 +46,6 @@ const args = minimist(process.argv, {
 		'verbose',
 		'wrap-iframe',
 		'enable-sync',
-		'trusted-types'
 	],
 	string: [
 		'scheme',
@@ -54,7 +62,6 @@ if (args.help) {
 		'yarn web [options]\n' +
 		' --no-launch      Do not open VSCode web in the browser\n' +
 		' --wrap-iframe    Wrap the Web Worker Extension Host in an iframe\n' +
-		' --trusted-types  Enable trusted types (report only)\n' +
 		' --enable-sync    Enable sync by default\n' +
 		' --scheme         Protocol (https or http)\n' +
 		' --host           Remote host\n' +
@@ -82,6 +89,8 @@ const exists = (path) => util.promisify(fs.exists)(path);
 const readFile = (path) => util.promisify(fs.readFile)(path);
 
 async function getBuiltInExtensionInfos() {
+	await getBuiltInExtensions();
+
 	const allExtensions = [];
 	/** @type {Object.<string, string>} */
 	const locations = {};
@@ -281,6 +290,17 @@ secondaryServer.on('error', err => {
 	console.error(err);
 });
 
+/**
+ * @param {import('http').IncomingMessage} req
+ */
+function addCORSReplyHeader(req) {
+	if (typeof req.headers['origin'] !== 'string') {
+		// not a CORS request
+		return false;
+	}
+	return (ALLOWED_CORS_ORIGINS.indexOf(req.headers['origin']) >= 0);
+}
+
 /**
  * @param {import('http').IncomingMessage} req
  * @param {import('http').ServerResponse} res
@@ -291,9 +311,10 @@ async function handleStatic(req, res, parsedUrl) {
 	if (/^\/static\/extensions\//.test(parsedUrl.pathname)) {
 		const relativePath = decodeURIComponent(parsedUrl.pathname.substr('/static/extensions/'.length));
 		const filePath = getExtensionFilePath(relativePath, (await builtInExtensionsPromise).locations);
-		const responseHeaders = {
-			'Access-Control-Allow-Origin': '*'
-		};
+		const responseHeaders = {};
+		if (addCORSReplyHeader(req)) {
+			responseHeaders['Access-Control-Allow-Origin'] = '*';
+		}
 		if (!filePath) {
 			return serveError(req, res, 400, `Bad request.`, responseHeaders);
 		}
@@ -315,9 +336,10 @@ async function handleExtension(req, res, parsedUrl) {
 	// Strip `/extension/` from the path
 	const relativePath = decodeURIComponent(parsedUrl.pathname.substr('/extension/'.length));
 	const filePath = getExtensionFilePath(relativePath, (await commandlineProvidedExtensionsPromise).locations);
-	const responseHeaders = {
-		'Access-Control-Allow-Origin': '*'
-	};
+	const responseHeaders = {};
+	if (addCORSReplyHeader(req)) {
+		responseHeaders['Access-Control-Allow-Origin'] = '*';
+	}
 	if (!filePath) {
 		return serveError(req, res, 400, `Bad request.`, responseHeaders);
 	}
@@ -377,11 +399,18 @@ async function handleRoot(req, res) {
 		fancyLog(`${ansiColors.magenta('Additional extensions')}: ${staticExtensions.map(e => path.basename(e.extensionLocation.path)).join(', ') || 'None'}`);
 	}
 
+	const secondaryHost = (
+		req.headers['host']
+			? req.headers['host'].replace(':' + PORT, ':' + SECONDARY_PORT)
+			: `${HOST}:${SECONDARY_PORT}`
+	);
 	const webConfigJSON = {
 		folderUri: folderUri,
 		staticExtensions,
-		enableSyncByDefault: args['enable-sync'],
-		webWorkerExtensionHostIframeSrc: `${SCHEME}://${HOST}:${SECONDARY_PORT}/static/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
+		settingsSyncOptions: {
+			enabled: args['enable-sync']
+		},
+		webWorkerExtensionHostIframeSrc: `${SCHEME}://${secondaryHost}/static/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
 	};
 	if (args['wrap-iframe']) {
 		webConfigJSON._wrapWebWorkerExtHostInIframe = true;
@@ -404,12 +433,10 @@ async function handleRoot(req, res) {
 		.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '')
 		.replace('{{WEBVIEW_ENDPOINT}}', '');
 
-
-	const headers = { 'Content-Type': 'text/html' };
-	if (args['trusted-types']) {
-		headers['Content-Security-Policy-Report-Only'] = 'require-trusted-types-for \'script\';';
-	}
-
+	const headers = {
+		'Content-Type': 'text/html',
+		'Content-Security-Policy': 'require-trusted-types-for \'script\';'
+	};
 	res.writeHead(200, headers);
 	return res.end(data);
 }
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 5a493b0b1..3013dc04b 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -40,8 +40,8 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 )
 
 :: Integration & performance tests in AMD
-::call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
-::if %errorlevel% neq 0 exit /b %errorlevel%
+@REM ::call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
+@REM ::if %errorlevel% neq 0 exit /b %errorlevel%
 
 :: Tests in the extension host
 
@@ -54,8 +54,8 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-colorize-tests\test --extensionDevelopmentPath=%~dp0\..\extensions\vscode-colorize-tests --extensionTestsPath=%~dp0\..\extensions\vscode-colorize-tests\out --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-REM call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
-REM if %errorlevel% neq 0 exit /b %errorlevel%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\markdown-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\markdown-language-features --extensionTestsPath=%~dp0\..\extensions\markdown-language-features\out\test --disable-telemetry --crash-reporter-directory=%VSCODECRASHDIR% --no-cached-data --disable-updates --disable-extensions --user-data-dir=%VSCODEUSERDATADIR%
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index b82dbec11..b1d5e9588 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -6,7 +6,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	ROOT=$(dirname $(dirname $(realpath "$0")))
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
-	LINUX_NO_SANDBOX="--no-sandbox" # Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
+	# Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
+	LINUX_EXTRA_ARGS="--no-sandbox"
 fi
 
 VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
@@ -42,6 +43,13 @@ else
 	export ELECTRON_ENABLE_STACK_DUMPING=1
 	export ELECTRON_ENABLE_LOGGING=1
 
+	# Production builds are run on docker containers where size of /dev/shm partition < 64MB which causes OOM failure
+	# for chromium compositor that uses the partition for shared memory
+	if [ "$LINUX_EXTRA_ARGS" ]
+	then
+		LINUX_EXTRA_ARGS="$LINUX_EXTRA_ARGS  --disable-dev-shm-usage --use-gl=swiftshader"
+	fi
+
 	echo "Storing crash reports into '$VSCODECRASHDIR'."
 	echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build."
 fi
@@ -57,28 +65,30 @@ fi
 after_suite
 
 # Tests in the extension host
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+# TODO(deepak1556): Disable workspace test temporarily
+# https://github.com/microsoft/vscode/issues/111288
+#"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+#after_suite
+
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/markdown-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/markdown-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-#"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
-# after_suite
-
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/emmet/out/test/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions  --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/out/test/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions  --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-notebook-tests/test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-notebook-tests --extensionTestsPath=$ROOT/extensions/vscode-notebook-tests/out/ --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-notebook-tests/test --enable-proposed-api=vscode.vscode-notebook-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-notebook-tests --extensionTestsPath=$ROOT/extensions/vscode-notebook-tests/out/ --disable-telemetry --crash-reporter-directory=$VSCODECRASHDIR --no-cached-data --disable-updates --disable-extensions --user-data-dir=$VSCODEUSERDATADIR
 after_suite
 
 # Tests in commonJS (CSS, HTML)
diff --git a/scripts/test.sh b/scripts/test.sh
index 0744c096e..7594af3d9 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -6,6 +6,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	ROOT=$(dirname $(dirname $(realpath "$0")))
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
+	# Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
+	LINUX_EXTRA_ARGS="--no-sandbox --disable-dev-shm-usage --use-gl=swiftshader"
 fi
 
 cd $ROOT
@@ -34,5 +36,5 @@ else
 	cd $ROOT ; \
 		ELECTRON_ENABLE_LOGGING=1 \
 		"$CODE" \
-		test/unit/electron/index.js --no-sandbox "$@" # Electron 6 introduces a chrome-sandbox that requires root to run. This can fail. Disable sandbox via --no-sandbox.
+		test/unit/electron/index.js $LINUX_EXTRA_ARGS "$@"
 fi
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 58355aebd..1d8a27120 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -8,6 +8,7 @@
 
 const loader = require('./vs/loader');
 const bootstrap = require('./bootstrap');
+const performance = require('./vs/base/common/performance');
 
 // Bootstrap: NLS
 const nlsConfig = bootstrap.setupNLS();
@@ -55,5 +56,6 @@ exports.load = function (entrypoint, onLoad, onError) {
 	onLoad = onLoad || function () { };
 	onError = onError || function (err) { console.error(err); };
 
+	performance.mark(`code/fork/willLoadCode`);
 	loader([entrypoint], onLoad, onError);
 };
diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
index 68e2219ba..c211ba137 100644
--- a/src/bootstrap-fork.js
+++ b/src/bootstrap-fork.js
@@ -6,6 +6,9 @@
 //@ts-check
 'use strict';
 
+const performance = require('./vs/base/common/performance');
+performance.mark('code/fork/start');
+
 const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
 
@@ -20,7 +23,7 @@ if (process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']) {
 }
 
 // Configure: pipe logging to parent process
-if (!!process.send && process.env.PIPE_LOGGING === 'true') {
+if (!!process.send && process.env['VSCODE_PIPE_LOGGING'] === 'true') {
 	pipeLoggingToParent();
 }
 
@@ -38,7 +41,7 @@ if (process.env['VSCODE_PARENT_PID']) {
 configureCrashReporter();
 
 // Load AMD entry point
-require('./bootstrap-amd').load(process.env['AMD_ENTRYPOINT']);
+require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
 
 
 //#region Helpers
@@ -79,7 +82,7 @@ function pipeLoggingToParent() {
 
 		// Add the stack trace as payload if we are told so. We remove the message and the 2 top frames
 		// to start the stacktrace where the console message was being written
-		if (process.env.VSCODE_LOG_STACK === 'true') {
+		if (process.env['VSCODE_LOG_STACK'] === 'true') {
 			const stack = new Error().stack;
 			if (stack) {
 				argsArray.push({ __$stack: stack.split('\n').slice(3).join('\n') });
@@ -135,18 +138,47 @@ function pipeLoggingToParent() {
 			&& !(obj instanceof Date);
 	}
 
+	/**
+	 *
+	 * @param {'log' | 'warn' | 'error'} severity
+	 * @param {string} args
+	 */
+	function safeSendConsoleMessage(severity, args) {
+		safeSend({ type: '__$console', severity, arguments: args });
+	}
+
+	/**
+	 * @param {'log' | 'info' | 'warn' | 'error'} method
+	 * @param {'log' | 'warn' | 'error'} severity
+	 */
+	function wrapConsoleMethod(method, severity) {
+		if (process.env['VSCODE_LOG_NATIVE'] === 'true') {
+			const original = console[method];
+			console[method] = function () {
+				safeSendConsoleMessage(severity, safeToArray(arguments));
+
+				const stream = method === 'error' || method === 'warn' ? process.stderr : process.stdout;
+				stream.write('\nSTART_NATIVE_LOG\n');
+				original.apply(console, arguments);
+				stream.write('\nEND_NATIVE_LOG\n');
+			};
+		} else {
+			console[method] = function () { safeSendConsoleMessage(severity, safeToArray(arguments)); };
+		}
+	}
+
 	// Pass console logging to the outside so that we have it in the main side if told so
-	if (process.env.VERBOSE_LOGGING === 'true') {
-		console.log = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
-		console.info = function () { safeSend({ type: '__$console', severity: 'log', arguments: safeToArray(arguments) }); };
-		console.warn = function () { safeSend({ type: '__$console', severity: 'warn', arguments: safeToArray(arguments) }); };
-	} else {
+	if (process.env['VSCODE_VERBOSE_LOGGING'] === 'true') {
+		wrapConsoleMethod('info', 'log');
+		wrapConsoleMethod('log', 'log');
+		wrapConsoleMethod('warn', 'warn');
+		wrapConsoleMethod('error', 'error');
+	} else if (process.env['VSCODE_LOG_NATIVE'] !== 'true') {
 		console.log = function () { /* ignore */ };
 		console.warn = function () { /* ignore */ };
 		console.info = function () { /* ignore */ };
+		wrapConsoleMethod('error', 'error');
 	}
-
-	console.error = function () { safeSend({ type: '__$console', severity: 'error', arguments: safeToArray(arguments) }); };
 }
 
 function handleExceptions() {
@@ -177,11 +209,11 @@ function terminateWhenParentTerminates() {
 }
 
 function configureCrashReporter() {
-	const crashReporterOptionsRaw = process.env['CRASH_REPORTER_START_OPTIONS'];
+	const crashReporterOptionsRaw = process.env['VSCODE_CRASH_REPORTER_START_OPTIONS'];
 	if (typeof crashReporterOptionsRaw === 'string') {
 		try {
 			const crashReporterOptions = JSON.parse(crashReporterOptionsRaw);
-			if (crashReporterOptions) {
+			if (crashReporterOptions && process['crashReporter'] /* Electron only */) {
 				process['crashReporter'].start(crashReporterOptions);
 			}
 		} catch (error) {
diff --git a/src/bootstrap-node.js b/src/bootstrap-node.js
index 161d68d59..eaaf1dc61 100644
--- a/src/bootstrap-node.js
+++ b/src/bootstrap-node.js
@@ -62,7 +62,7 @@ exports.removeGlobalNodeModuleLookupPaths = function () {
 /**
  * Helper to enable portable mode.
  *
- * @param {{ portable?: string; applicationName: string; }} product
+ * @param {Partial<import('./vs/platform/product/common/productService').IProductConfiguration>} product
  * @returns {{ portableDataPath: string; isPortable: boolean; }}
  */
 exports.configurePortable = function (product) {
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
index d7cc72d3b..cf3d3bfba 100644
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -27,6 +27,7 @@
 	const webFrame = preloadGlobals.webFrame;
 	const safeProcess = preloadGlobals.process;
 	const configuration = parseWindowConfiguration();
+	const useCustomProtocol = sandbox || typeof safeProcess.env['ENABLE_VSCODE_BROWSER_CODE_LOADING'] === 'string';
 
 	// Start to resolve process.env before anything gets load
 	// so that we can run loading and resolving in parallel
@@ -34,7 +35,7 @@
 
 	/**
 	 * @param {string[]} modulePaths
-	 * @param {(result, configuration: object) => any} resultCallback
+	 * @param {(result: unknown, configuration: object) => Promise<unknown> | undefined} resultCallback
 	 * @param {{ forceEnableDeveloperKeybindings?: boolean, disallowReloadKeybinding?: boolean, removeDeveloperKeybindingsAfterLoad?: boolean, canModifyDOM?: (config: object) => void, beforeLoaderConfig?: (config: object, loaderConfig: object) => void, beforeRequire?: () => void }=} options
 	 */
 	function load(modulePaths, resultCallback, options) {
@@ -77,27 +78,39 @@
 		window.document.documentElement.setAttribute('lang', locale);
 
 		// do not advertise AMD to avoid confusing UMD modules loaded with nodejs
-		if (!sandbox) {
+		if (!useCustomProtocol) {
 			window['define'] = undefined;
 		}
 
 		// replace the patched electron fs with the original node fs for all AMD code (TODO@sandbox non-sandboxed only)
 		if (!sandbox) {
-			require.define('fs', ['original-fs'], function (originalFS) { return originalFS; });
+			require.define('fs', [], function () { return require.__$__nodeRequire('original-fs'); });
 		}
 
 		window['MonacoEnvironment'] = {};
 
-		const baseUrl = sandbox ?
+		const baseUrl = useCustomProtocol ?
 			`${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out` :
 			`${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32' })}/out`;
 
 		const loaderConfig = {
 			baseUrl,
 			'vs/nls': nlsConfig,
-			preferScriptTags: sandbox
+			preferScriptTags: useCustomProtocol
 		};
 
+		// use a trusted types policy when loading via script tags
+		if (loaderConfig.preferScriptTags) {
+			loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
+				createScriptURL(value) {
+					if (value.startsWith(window.location.origin)) {
+						return value;
+					}
+					throw new Error(`Invalid script url: ${value}`);
+				}
+			});
+		}
+
 		// Enable loading of node modules:
 		// - sandbox: we list paths of webpacked modules to help the loader
 		// - non-sandbox: we signal that any module that does not begin with
@@ -145,10 +158,9 @@
 			try {
 
 				// Wait for process environment being fully resolved
-				const perf = perfLib();
-				perf.mark('willWaitForShellEnv');
+				performance.mark('code/willWaitForShellEnv');
 				await whenEnvResolved;
-				perf.mark('didWaitForShellEnv');
+				performance.mark('code/didWaitForShellEnv');
 
 				// Callback only after process environment is resolved
 				const callbackResult = resultCallback(result, configuration);
@@ -166,7 +178,7 @@
 	}
 
 	/**
-	 * Parses the contents of the `INativeWindowConfiguration` that
+	 * Parses the contents of the window condiguration that
 	 * is passed into the URL from the `electron-main` side.
 	 *
 	 * @returns {{
@@ -195,22 +207,26 @@
 	function registerDeveloperKeybindings(disallowReloadKeybinding) {
 		const ipcRenderer = preloadGlobals.ipcRenderer;
 
-		const extractKey = function (e) {
-			return [
-				e.ctrlKey ? 'ctrl-' : '',
-				e.metaKey ? 'meta-' : '',
-				e.altKey ? 'alt-' : '',
-				e.shiftKey ? 'shift-' : '',
-				e.keyCode
-			].join('');
-		};
+		const extractKey =
+			/**
+			 * @param {KeyboardEvent} e
+			 */
+			function (e) {
+				return [
+					e.ctrlKey ? 'ctrl-' : '',
+					e.metaKey ? 'meta-' : '',
+					e.altKey ? 'alt-' : '',
+					e.shiftKey ? 'shift-' : '',
+					e.keyCode
+				].join('');
+			};
 
 		// Devtools & reload support
 		const TOGGLE_DEV_TOOLS_KB = (safeProcess.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
 		const TOGGLE_DEV_TOOLS_KB_ALT = '123'; // F12
 		const RELOAD_KB = (safeProcess.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
 
-		/** @type {((e: any) => void) | undefined} */
+		/** @type {((e: KeyboardEvent) => void) | undefined} */
 		let listener = function (e) {
 			const key = extractKey(e);
 			if (key === TOGGLE_DEV_TOOLS_KB || key === TOGGLE_DEV_TOOLS_KB_ALT) {
@@ -263,26 +279,8 @@
 		return window.vscode;
 	}
 
-	/**
-	 * @return {{ mark: (name: string) => void }}
-	 */
-	function perfLib() {
-		globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || [];
-
-		return {
-			/**
-			 * @param {string} name
-			 */
-			mark(name) {
-				globalThis.MonacoPerformanceMarks.push(name, Date.now());
-				performance.mark(name);
-			}
-		};
-	}
-
 	return {
 		load,
-		globals,
-		perfLib
+		globals
 	};
 }));
diff --git a/src/main.js b/src/main.js
index 0bc566099..618c45bbf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,17 +7,16 @@
 'use strict';
 
 const perf = require('./vs/base/common/performance');
+perf.mark('code/didStartMain');
+
 const lp = require('./vs/base/node/languagePacks');
-
-perf.mark('main:started');
-
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
 const paths = require('./paths');
-/** @type {any} */
+/** @type {Partial<import('./vs/platform/product/common/productService').IProductConfiguration> & { applicationName: string}} */
 const product = require('../product.json');
 const { app, protocol, crashReporter } = require('electron');
 
@@ -194,14 +193,14 @@ function startup(cachedDataDir, nlsConfig) {
 	process.env['VSCODE_NODE_CACHED_DATA_DIR'] = cachedDataDir || '';
 
 	// Load main in AMD
-	perf.mark('willLoadMainBundle');
+	perf.mark('code/willLoadMainBundle');
 	require('./bootstrap-amd').load('vs/code/electron-main/main', () => {
-		perf.mark('didLoadMainBundle');
+		perf.mark('code/didLoadMainBundle');
 	});
 }
 
 async function onReady() {
-	perf.mark('main:appReady');
+	perf.mark('code/mainAppReady');
 
 	try {
 		const [cachedDataDir, nlsConfig] = await Promise.all([nodeCachedDataDir.ensureExists(), resolveNlsConfiguration()]);
@@ -213,9 +212,7 @@ async function onReady() {
 }
 
 /**
- * @typedef	 {{ [arg: string]: any; '--'?: string[]; _: string[]; }} NativeParsedArgs
- *
- * @param {NativeParsedArgs} cliArgs
+ * @param {import('./vs/platform/environment/common/argv').NativeParsedArgs} cliArgs
  */
 function configureCommandlineSwitchesSync(cliArgs) {
 	const SUPPORTED_ELECTRON_SWITCHES = [
@@ -239,7 +236,11 @@ function configureCommandlineSwitchesSync(cliArgs) {
 	const SUPPORTED_MAIN_PROCESS_SWITCHES = [
 
 		// Persistently enable proposed api via argv.json: https://github.com/microsoft/vscode/issues/99775
-		'enable-proposed-api'
+		'enable-proposed-api',
+
+		// TODO@bpasero remove me once testing is done on `vscode-file` protocol
+		// (all traces of `enable-browser-code-loading` and `ENABLE_VSCODE_BROWSER_CODE_LOADING`)
+		'enable-browser-code-loading'
 	];
 
 	// Read argv config
@@ -270,12 +271,20 @@ function configureCommandlineSwitchesSync(cliArgs) {
 
 		// Append main process flags to process.argv
 		else if (SUPPORTED_MAIN_PROCESS_SWITCHES.indexOf(argvKey) !== -1) {
-			if (argvKey === 'enable-proposed-api') {
-				if (Array.isArray(argvValue)) {
-					argvValue.forEach(id => id && typeof id === 'string' && process.argv.push('--enable-proposed-api', id));
-				} else {
-					console.error(`Unexpected value for \`enable-proposed-api\` in argv.json. Expected array of extension ids.`);
-				}
+			switch (argvKey) {
+				case 'enable-proposed-api':
+					if (Array.isArray(argvValue)) {
+						argvValue.forEach(id => id && typeof id === 'string' && process.argv.push('--enable-proposed-api', id));
+					} else {
+						console.error(`Unexpected value for \`enable-proposed-api\` in argv.json. Expected array of extension ids.`);
+					}
+					break;
+
+				case 'enable-browser-code-loading':
+					if (typeof argvValue === 'string') {
+						process.env['ENABLE_VSCODE_BROWSER_CODE_LOADING'] = argvValue;
+					}
+					break;
 			}
 		}
 	});
@@ -286,6 +295,11 @@ function configureCommandlineSwitchesSync(cliArgs) {
 		app.commandLine.appendSwitch('js-flags', jsFlags);
 	}
 
+	// Support __sandbox flag
+	if (cliArgs.__sandbox) {
+		process.env['ENABLE_VSCODE_BROWSER_CODE_LOADING'] = 'bypassHeatCheck';
+	}
+
 	return argvConfig;
 }
 
@@ -368,7 +382,7 @@ function getArgvConfigPath() {
 }
 
 /**
- * @param {NativeParsedArgs} cliArgs
+ * @param {import('./vs/platform/environment/common/argv').NativeParsedArgs} cliArgs
  * @returns {string | null}
  */
 function getJSFlags(cliArgs) {
@@ -388,7 +402,7 @@ function getJSFlags(cliArgs) {
 }
 
 /**
- * @param {NativeParsedArgs} cliArgs
+ * @param {import('./vs/platform/environment/common/argv').NativeParsedArgs} cliArgs
  *
  * @returns {string}
  */
@@ -401,7 +415,7 @@ function getUserDataPath(cliArgs) {
 }
 
 /**
- * @returns {NativeParsedArgs}
+ * @returns {import('./vs/platform/environment/common/argv').NativeParsedArgs}
  */
 function parseCLIArgs() {
 	const minimist = require('minimist');
@@ -450,11 +464,16 @@ function registerListeners() {
 	 * @type {string[]}
 	 */
 	const openUrls = [];
-	const onOpenUrl = function (event, url) {
-		event.preventDefault();
+	const onOpenUrl =
+		/**
+		 * @param {{ preventDefault: () => void; }} event
+		 * @param {string} url
+		 */
+		function (event, url) {
+			event.preventDefault();
 
-		openUrls.push(url);
-	};
+			openUrls.push(url);
+		};
 
 	app.on('will-finish-launching', function () {
 		app.on('open-url', onOpenUrl);
diff --git a/src/tsconfig.tsec.json b/src/tsconfig.tsec.json
new file mode 100644
index 000000000..d2524df22
--- /dev/null
+++ b/src/tsconfig.tsec.json
@@ -0,0 +1,16 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"noEmit": true,
+		"plugins": [
+			{
+				"name": "tsec",
+				"exemptionConfig": "./tsec.exemptions.json"
+			}
+		]
+	},
+	"exclude": [
+		"*/test/*",
+		"**/*.test.ts"
+	]
+}
diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json
new file mode 100644
index 000000000..dc1e80586
--- /dev/null
+++ b/src/tsec.exemptions.json
@@ -0,0 +1,5 @@
+{
+	"ban-trustedtypes-createpolicy": [
+		"**/*.ts"
+	]
+}
diff --git a/src/typings/require.d.ts b/src/typings/require.d.ts
index dc6c6bd10..5b0fcf921 100644
--- a/src/typings/require.d.ts
+++ b/src/typings/require.d.ts
@@ -50,6 +50,7 @@ interface NodeRequire {
 	onError: Function;
 	__$__nodeRequire<T>(moduleName: string): T;
 	getStats(): ReadonlyArray<LoaderEvent>;
+	hasDependencyCycle(): boolean;
 	define(amdModuleId: string, dependencies: string[], callback: (...args: any[]) => any): any;
 }
 
diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 6b369dd3d..3eb11e78c 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -110,13 +110,13 @@ export const onDidChangeFullscreen = WindowManager.INSTANCE.onDidChangeFullscree
 
 const userAgent = navigator.userAgent;
 
-export const isEdge = (userAgent.indexOf('Edge/') >= 0);
-export const isOpera = (userAgent.indexOf('Opera') >= 0);
+export const isEdgeLegacy = (userAgent.indexOf('Edge/') >= 0);
 export const isFirefox = (userAgent.indexOf('Firefox') >= 0);
 export const isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
 export const isChrome = (userAgent.indexOf('Chrome') >= 0);
 export const isSafari = (!isChrome && (userAgent.indexOf('Safari') >= 0));
 export const isWebkitWebView = (!isChrome && !isSafari && isWebKit);
 export const isIPad = (userAgent.indexOf('iPad') >= 0 || (isSafari && navigator.maxTouchPoints > 0));
-export const isEdgeWebView = isEdge && (userAgent.indexOf('WebView/') >= 0);
+export const isEdgeLegacyWebView = isEdgeLegacy && (userAgent.indexOf('WebView/') >= 0);
+export const isElectron = (userAgent.indexOf('Electron/') >= 0);
 export const isStandalone = (window.matchMedia && window.matchMedia('(display-mode: standalone)').matches);
diff --git a/src/vs/base/browser/canIUse.ts b/src/vs/base/browser/canIUse.ts
index 3f5391410..ca5ab5e01 100644
--- a/src/vs/base/browser/canIUse.ts
+++ b/src/vs/base/browser/canIUse.ts
@@ -27,7 +27,7 @@ export const BrowserFeatures = {
 			|| !!(navigator && navigator.clipboard && navigator.clipboard.readText)
 		),
 		richText: (() => {
-			if (browser.isEdge) {
+			if (browser.isEdgeLegacy) {
 				let index = navigator.userAgent.indexOf('Edge/');
 				let version = parseInt(navigator.userAgent.substring(index + 5, navigator.userAgent.indexOf('.', index)), 10);
 
diff --git a/src/vs/base/browser/contextmenu.ts b/src/vs/base/browser/contextmenu.ts
index fc2ee0320..2a28dace3 100644
--- a/src/vs/base/browser/contextmenu.ts
+++ b/src/vs/base/browser/contextmenu.ts
@@ -16,7 +16,7 @@ export interface IContextMenuEvent {
 
 export interface IContextMenuDelegate {
 	getAnchor(): HTMLElement | { x: number; y: number; width?: number; height?: number; };
-	getActions(): IAction[];
+	getActions(): readonly IAction[];
 	getCheckedActionsRepresentation?(action: IAction): 'radio' | 'checkbox';
 	getActionViewItem?(action: IAction): IActionViewItem | undefined;
 	getActionsContext?(event?: IContextMenuEvent): any;
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index b4740dade..f2f2fa1aa 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -20,18 +20,15 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 
 export function clearNode(node: HTMLElement): void {
 	while (node.firstChild) {
-		node.removeChild(node.firstChild);
+		node.firstChild.remove();
 	}
 }
 
+/**
+ * @deprecated Use node.isConnected directly
+ */
 export function isInDOM(node: Node | null): boolean {
-	while (node) {
-		if (node === document.body) {
-			return true;
-		}
-		node = node.parentNode || (node as ShadowRoot).host;
-	}
-	return false;
+	return node?.isConnected ?? false;
 }
 
 class DomListener implements IDisposable {
@@ -451,6 +448,8 @@ export interface IDimension {
 
 export class Dimension implements IDimension {
 
+	static readonly None = new Dimension(0, 0);
+
 	constructor(
 		public readonly width: number,
 		public readonly height: number,
@@ -842,7 +841,7 @@ export const EventType = {
 	MOUSE_OUT: 'mouseout',
 	MOUSE_ENTER: 'mouseenter',
 	MOUSE_LEAVE: 'mouseleave',
-	MOUSE_WHEEL: browser.isEdge ? 'mousewheel' : 'wheel',
+	MOUSE_WHEEL: browser.isEdgeLegacy ? 'mousewheel' : 'wheel',
 	POINTER_UP: 'pointerup',
 	POINTER_DOWN: 'pointerdown',
 	POINTER_MOVE: 'pointermove',
@@ -1002,9 +1001,13 @@ export function after<T extends Node>(sibling: HTMLElement, child: T): T {
 	return child;
 }
 
-export function append<T extends Node>(parent: HTMLElement, ...children: T[]): T {
-	children.forEach(child => parent.appendChild(child));
-	return children[children.length - 1];
+export function append<T extends Node>(parent: HTMLElement, child: T): T;
+export function append<T extends Node>(parent: HTMLElement, ...children: (T | string)[]): void;
+export function append<T extends Node>(parent: HTMLElement, ...children: (T | string)[]): T | void {
+	parent.append(...children);
+	if (children.length === 1 && typeof children[0] !== 'string') {
+		return <T>children[0];
+	}
 }
 
 export function prepend<T extends Node>(parent: HTMLElement, child: T): T {
@@ -1012,26 +1015,12 @@ export function prepend<T extends Node>(parent: HTMLElement, child: T): T {
 	return child;
 }
 
-
 /**
  * Removes all children from `parent` and appends `children`
  */
 export function reset(parent: HTMLElement, ...children: Array<Node | string>): void {
 	parent.innerText = '';
-	appendChildren(parent, ...children);
-}
-
-/**
- * Appends `children` to `parent`
- */
-export function appendChildren(parent: HTMLElement, ...children: Array<Node | string>): void {
-	for (const child of children) {
-		if (child instanceof Node) {
-			parent.appendChild(child);
-		} else if (typeof child === 'string') {
-			parent.appendChild(document.createTextNode(child));
-		}
-	}
+	append(parent, ...children);
 }
 
 const SELECTOR_REGEX = /([\w\-]+)?(#([\w\-]+))?((\.([\w\-]+))*)/;
@@ -1085,13 +1074,7 @@ function _$<T extends Element>(namespace: Namespace, description: string, attrs?
 		}
 	});
 
-	for (const child of children) {
-		if (child instanceof Node) {
-			result.appendChild(child);
-		} else if (typeof child === 'string') {
-			result.appendChild(document.createTextNode(child));
-		}
-	}
+	result.append(...children);
 
 	return result as T;
 }
@@ -1211,9 +1194,10 @@ export function computeScreenAwareSize(cssPx: number): number {
  * See https://mathiasbynens.github.io/rel-noopener/
  */
 export function windowOpenNoOpener(url: string): void {
-	if (platform.isNative || browser.isEdgeWebView) {
+	if (browser.isElectron || browser.isEdgeLegacyWebView) {
 		// In VSCode, window.open() always returns null...
 		// The same is true for a WebView (see https://github.com/microsoft/monaco-editor/issues/628)
+		// Also call directly window.open in sandboxed Electron (see https://github.com/microsoft/monaco-editor/issues/2220)
 		window.open(url);
 	} else {
 		let newTab = window.open();
@@ -1249,7 +1233,7 @@ export function asCSSUrl(uri: URI): string {
 export function triggerDownload(dataOrUri: Uint8Array | URI, name: string): void {
 
 	// If the data is provided as Buffer, we create a
-	// blog URL out of it to produce a valid link
+	// blob URL out of it to produce a valid link
 	let url: string;
 	if (URI.isUri(dataOrUri)) {
 		url = dataOrUri.toString(true);
@@ -1298,7 +1282,7 @@ export interface IDetectedFullscreen {
 	mode: DetectedFullscreenMode;
 
 	/**
-	 * Wether we know for sure that we are in fullscreen mode or
+	 * Whether we know for sure that we are in fullscreen mode or
 	 * it is a guess.
 	 */
 	guess: boolean;
@@ -1385,7 +1369,7 @@ export function safeInnerHtml(node: HTMLElement, value: string): void {
 	}, ['class', 'id', 'role', 'tabindex']);
 
 	const html = _ttpSafeInnerHtml?.createHTML(value, options) ?? insane(value, options);
-	node.innerHTML = html as unknown as string;
+	node.innerHTML = html as string;
 }
 
 /**
@@ -1398,7 +1382,12 @@ function toBinary(str: string): string {
 	for (let i = 0; i < codeUnits.length; i++) {
 		codeUnits[i] = str.charCodeAt(i);
 	}
-	return String.fromCharCode(...new Uint8Array(codeUnits.buffer));
+	let binary = '';
+	const uint8array = new Uint8Array(codeUnits.buffer);
+	for (let i = 0; i < uint8array.length; i++) {
+		binary += String.fromCharCode(uint8array[i]);
+	}
+	return binary;
 }
 
 /**
@@ -1445,7 +1434,7 @@ export namespace WebFileSystemAccess {
 	}
 
 	export function supported(obj: any & Window): obj is FileSystemAccess {
-		const candidate = obj as FileSystemAccess;
+		const candidate = obj as FileSystemAccess | undefined;
 		if (typeof candidate?.showDirectoryPicker === 'function') {
 			return true;
 		}
@@ -1483,7 +1472,13 @@ export class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
 		};
 
 		this._subscriptions.add(domEvent(document.body, 'keydown', true)(e => {
+
 			const event = new StandardKeyboardEvent(e);
+			// If Alt-key keydown event is repeated, ignore it #112347
+			// Only known to be necessary for Alt-Key at the moment #115810
+			if (event.keyCode === KeyCode.Alt && e.repeat) {
+				return;
+			}
 
 			if (e.altKey && !this._keyStatus.altKey) {
 				this._keyStatus.lastKeyPressed = 'alt';
@@ -1595,3 +1590,9 @@ export class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
 		this._subscriptions.dispose();
 	}
 }
+
+export function getCookieValue(name: string): string | undefined {
+	const match = document.cookie.match('(^|[^;]+)\\s*' + name + '\\s*=\\s*([^;]+)'); // See https://stackoverflow.com/a/25490531
+
+	return match ? match.pop() : undefined;
+}
diff --git a/src/vs/base/browser/hash.ts b/src/vs/base/browser/hash.ts
index bf48b614b..a9a5b6690 100644
--- a/src/vs/base/browser/hash.ts
+++ b/src/vs/base/browser/hash.ts
@@ -10,7 +10,14 @@ export async function sha1Hex(str: string): Promise<string> {
 
 	// Prefer to use browser's crypto module
 	if (globalThis?.crypto?.subtle) {
-		const hash = await globalThis.crypto.subtle.digest({ name: 'sha-1' }, VSBuffer.fromString(str).buffer);
+
+		// Careful to use `dontUseNodeBuffer` when passing the
+		// buffer to the browser `crypto` API. Users reported
+		// native crashes in certain cases that we could trace
+		// back to passing node.js `Buffer` around
+		// (https://github.com/microsoft/vscode/issues/114227)
+		const buffer = VSBuffer.fromString(str, { dontUseNodeBuffer: true }).buffer;
+		const hash = await globalThis.crypto.subtle.digest({ name: 'sha-1' }, buffer);
 
 		return toHexString(hash);
 	}
diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index a5cd4c5ec..81457733d 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -15,10 +15,10 @@ import { cloneAndChange } from 'vs/base/common/objects';
 import { escape } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { FileAccess, Schemas } from 'vs/base/common/network';
-import { markdownEscapeEscapedCodicons } from 'vs/base/common/codicons';
+import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels';
 import { resolvePath } from 'vs/base/common/resources';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { Event } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 
@@ -156,7 +156,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	};
 	renderer.paragraph = (text): string => {
 		if (markdown.supportThemeIcons) {
-			const elements = renderCodicons(text);
+			const elements = renderLabelWithIcons(text);
 			text = elements.map(e => typeof e === 'string' ? e : e.outerHTML).join('');
 		}
 		return `<p>${text}</p>`;
@@ -218,7 +218,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	// We always pass the output through insane after this so that we don't rely on
 	// marked for sanitization.
 	markedOptions.sanitizer = (html: string): string => {
-		const match = markdown.isTrusted ? html.match(/^(<span[^<]+>)|(<\/\s*span>)$/) : undefined;
+		const match = markdown.isTrusted ? html.match(/^(<span[^>]+>)|(<\/\s*span>)$/) : undefined;
 		return match ? html : '';
 	};
 	markedOptions.sanitize = true;
@@ -233,13 +233,13 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	}
 	// escape theme icons
 	if (markdown.supportThemeIcons) {
-		value = markdownEscapeEscapedCodicons(value);
+		value = markdownEscapeEscapedIcons(value);
 	}
 
 	const renderedMarkdown = marked.parse(value, markedOptions);
 
 	// sanitize with insane
-	element.innerHTML = sanitizeRenderedMarkdown(markdown, renderedMarkdown);
+	element.innerHTML = sanitizeRenderedMarkdown(markdown, renderedMarkdown) as string;
 
 	// signal that async code blocks can be now be inserted
 	signalInnerHTML!();
@@ -261,13 +261,9 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 function sanitizeRenderedMarkdown(
 	options: { isTrusted?: boolean },
 	renderedMarkdown: string,
-): string {
+): string | TrustedHTML {
 	const insaneOptions = getInsaneOptions(options);
-	if (_ttpInsane) {
-		return _ttpInsane.createHTML(renderedMarkdown, insaneOptions) as unknown as string;
-	} else {
-		return insane(renderedMarkdown, insaneOptions);
-	}
+	return _ttpInsane?.createHTML(renderedMarkdown, insaneOptions) ?? insane(renderedMarkdown, insaneOptions);
 }
 
 function getInsaneOptions(options: { readonly isTrusted?: boolean }): InsaneOptions {
@@ -302,12 +298,12 @@ function getInsaneOptions(options: { readonly isTrusted?: boolean }): InsaneOpti
 			'td': ['align']
 		},
 		filter(token: { tag: string; attrs: { readonly [key: string]: string; }; }): boolean {
-			if (token.tag === 'span' && options.isTrusted && (Object.keys(token.attrs).length === 1)) {
-				if (token.attrs['style']) {
+			if (token.tag === 'span' && options.isTrusted) {
+				if (token.attrs['style'] && (Object.keys(token.attrs).length === 1)) {
 					return !!token.attrs['style'].match(/^(color\:#[0-9a-fA-F]+;)?(background-color\:#[0-9a-fA-F]+;)?$/);
 				} else if (token.attrs['class']) {
 					// The class should match codicon rendering in src\vs\base\common\codicons.ts
-					return !!token.attrs['class'].match(/^codicon codicon-[a-z\-]+( codicon-animation-[a-z\-]+)?$/);
+					return !!token.attrs['class'].match(/^codicon codicon-[a-z\-]+( codicon-modifier-[a-z\-]+)?$/);
 				}
 				return false;
 			}
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index a88787fd0..75dbbb12c 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -104,7 +104,3 @@
 .monaco-action-bar .action-item.action-dropdown-item > .action-label {
 	margin-right: 1px;
 }
-
-.monaco-action-bar .action-item.action-dropdown-item > .monaco-dropdown {
-	margin-right: 4px;
-}
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
index 37b6b03fe..6f55172c1 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -20,27 +20,6 @@ export abstract class BreadcrumbsItem {
 	abstract render(container: HTMLElement): void;
 }
 
-export class SimpleBreadcrumbsItem extends BreadcrumbsItem {
-
-	constructor(
-		readonly text: string,
-		readonly title: string = text
-	) {
-		super();
-	}
-
-	equals(other: this) {
-		return other === this || other instanceof SimpleBreadcrumbsItem && other.text === this.text && other.title === this.title;
-	}
-
-	render(container: HTMLElement): void {
-		let node = document.createElement('div');
-		node.title = this.title;
-		node.innerText = this.text;
-		container.appendChild(node);
-	}
-}
-
 export interface IBreadcrumbsWidgetStyles {
 	breadcrumbsBackground?: Color;
 	breadcrumbsForeground?: Color;
@@ -333,7 +312,12 @@ export class BreadcrumbsWidget {
 	private _renderItem(item: BreadcrumbsItem, container: HTMLDivElement): void {
 		dom.clearNode(container);
 		container.className = '';
-		item.render(container);
+		try {
+			item.render(container);
+		} catch (err) {
+			container.innerText = '<<RENDER ERROR>>';
+			console.error(err);
+		}
 		container.tabIndex = -1;
 		container.setAttribute('role', 'listitem');
 		container.classList.add('monaco-breadcrumb-item');
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index b3697f9bf..ebfe8d59f 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -11,15 +11,15 @@ import { mixin } from 'vs/base/common/objects';
 import { Event as BaseEvent, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { Gesture, EventType as TouchEventType } from 'vs/base/browser/touch';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { addDisposableListener, IFocusTracker, EventType, EventHelper, trackFocus, reset, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
 import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
-import { IAction, IActionRunner } from 'vs/base/common/actions';
+import { Action, IAction, IActionRunner } from 'vs/base/common/actions';
 import { CSSIcon, Codicon } from 'vs/base/common/codicons';
 
 export interface IButtonOptions extends IButtonStyles {
 	readonly title?: boolean | string;
-	readonly supportCodicons?: boolean;
+	readonly supportIcons?: boolean;
 	readonly secondary?: boolean;
 }
 
@@ -41,7 +41,7 @@ const defaultOptions: IButtonStyles = {
 
 export interface IButton extends IDisposable {
 	readonly element: HTMLElement;
-	readonly onDidClick: BaseEvent<Event>;
+	readonly onDidClick: BaseEvent<Event | undefined>;
 	label: string;
 	icon: CSSIcon;
 	enabled: boolean;
@@ -190,8 +190,8 @@ export class Button extends Disposable implements IButton {
 
 	set label(value: string) {
 		this._element.classList.add('monaco-text-button');
-		if (this.options.supportCodicons) {
-			reset(this._element, ...renderCodicons(value));
+		if (this.options.supportIcons) {
+			reset(this._element, ...renderLabelWithIcons(value));
 		} else {
 			this._element.textContent = value;
 		}
@@ -203,7 +203,7 @@ export class Button extends Disposable implements IButton {
 	}
 
 	set icon(icon: CSSIcon) {
-		this._element.classList.add(...icon.classNames.split(' '));
+		this._element.classList.add(...CSSIcon.asClassNameArray(icon));
 	}
 
 	set enabled(value: boolean) {
@@ -240,10 +240,12 @@ export interface IButtonWithDropdownOptions extends IButtonOptions {
 export class ButtonWithDropdown extends Disposable implements IButton {
 
 	private readonly button: Button;
+	private readonly action: Action;
 	private readonly dropdownButton: Button;
 
 	readonly element: HTMLElement;
-	readonly onDidClick: BaseEvent<Event>;
+	private readonly _onDidClick = this._register(new Emitter<Event | undefined>());
+	readonly onDidClick = this._onDidClick.event;
 
 	constructor(container: HTMLElement, options: IButtonWithDropdownOptions) {
 		super();
@@ -253,15 +255,16 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		container.appendChild(this.element);
 
 		this.button = this._register(new Button(this.element, options));
-		this.onDidClick = this.button.onDidClick;
+		this._register(this.button.onDidClick(e => this._onDidClick.fire(e)));
+		this.action = this._register(new Action('primaryAction', this.button.label, undefined, true, async () => this._onDidClick.fire(undefined)));
 
-		this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportCodicons: true }));
+		this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportIcons: true }));
 		this.dropdownButton.element.classList.add('monaco-dropdown-button');
 		this.dropdownButton.icon = Codicon.dropDownButton;
-		this._register(this.dropdownButton.onDidClick(() => {
+		this._register(this.dropdownButton.onDidClick(e => {
 			options.contextMenuProvider.showContextMenu({
 				getAnchor: () => this.dropdownButton.element,
-				getActions: () => options.actions,
+				getActions: () => [this.action, ...options.actions],
 				actionRunner: options.actionRunner,
 				onHide: () => this.dropdownButton.element.setAttribute('aria-expanded', 'false')
 			});
@@ -271,6 +274,7 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 
 	set label(value: string) {
 		this.button.label = value;
+		this.action.label = value;
 	}
 
 	set icon(icon: CSSIcon) {
diff --git a/src/vs/base/browser/ui/checkbox/checkbox.ts b/src/vs/base/browser/ui/checkbox/checkbox.ts
index 932a28602..f09bfc0d9 100644
--- a/src/vs/base/browser/ui/checkbox/checkbox.ts
+++ b/src/vs/base/browser/ui/checkbox/checkbox.ts
@@ -101,12 +101,10 @@ export class Checkbox extends Widget {
 
 		const classes = ['monaco-custom-checkbox'];
 		if (this._opts.icon) {
-			classes.push(this._opts.icon.classNames);
-		} else {
-			classes.push('codicon'); // todo@aeschli: remove once codicon fully adopted
+			classes.push(...CSSIcon.asClassNameArray(this._opts.icon));
 		}
 		if (this._opts.actionClassName) {
-			classes.push(this._opts.actionClassName);
+			classes.push(...this._opts.actionClassName.split(' '));
 		}
 		if (this._checked) {
 			classes.push('checked');
@@ -114,7 +112,7 @@ export class Checkbox extends Widget {
 
 		this.domNode = document.createElement('div');
 		this.domNode.title = this._opts.title;
-		this.domNode.className = classes.join(' ');
+		this.domNode.classList.add(...classes);
 		this.domNode.tabIndex = 0;
 		this.domNode.setAttribute('role', 'checkbox');
 		this.domNode.setAttribute('aria-checked', String(this._checked));
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css b/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
new file mode 100644
index 000000000..fc65710a8
--- /dev/null
+++ b/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.codicon-wrench-subaction {
+	opacity: 0.5;
+}
+
+@keyframes codicon-spin {
+	100% {
+		transform:rotate(360deg);
+	}
+}
+
+.codicon-sync.codicon-modifier-spin, .codicon-loading.codicon-modifier-spin{
+	/* Use steps to throttle FPS to reduce CPU usage */
+	animation: codicon-spin 1.5s steps(30) infinite;
+}
+
+.codicon-modifier-disabled {
+	opacity: 0.4;
+}
+
+/* custom speed & easing for loading icon */
+.codicon-loading,
+.codicon-tree-item-loading::before {
+	animation-duration: 1s !important;
+	animation-timing-function: cubic-bezier(0.53, 0.21, 0.29, 0.67) !important;
+}
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index 7fdf6ed7b9db8580b4a762998936d06b55c37b51..01abb46b868b7211758d3e2b92189072fc12ff08 100644
GIT binary patch
delta 7229
zcmZvg34B!bwa0(wPLc`9WU|j>zgZw5A$u~J5XcNW$YK&8As~b-BrFLKLQt>_g9=J5
z1vGBY;!?F1=|+iCOY&Ok^HJJ|idHRct)<ply#GQiO|4BKzVpwq_Px)0lYH;F|2uc?
zJ@@}V>m9Ld2S2tQ$qC*A&_MuA9h=*F|Iur-0ru%Yf^U7#uCDt2#2)||g}}KB8#>$8
zr5?T%!slLMsy6Te`_Dsbcz>9gxM6eu&dPA!1HBJ~Hur4pXuEdTk1hbIy8+|do7;Bw
z8ryJ|zfa<mGPksC?#y~FW#%2g2iN(8h~BN+`+KkVodZ7P%fyA;H=N^d0_h6^^XBe(
zYi;!Ozar9hS>NNGnXf$lFZt=H?TYO~9*4uwNBP6Qp{9Wh`YsI*UZDEW`;D}LOnZEK
z?)Vj9%Y<!wuaIQ~5R!`!V`QM-o=C$3UG}ohWB4<!;$B>$5?r82{D7h{m2M_bIN7lk
zdH4l7aTL#^l!~wlPFjLpSPzAt;y>^*RpVjYi9=LQDcDF;D4wz@lM*P03TP5#;0PsC
z-oSOc894(pF$=RX5Az3d!@a?3)L<H>qZSLX2#awumZ1?%Sb=7&#4T8jHE6+Fw4x2|
z=)gL3VFNZ{GqzwG`mi1S*nwMd8+PJ$d;z-=z#as#7kA(;?8AOO=Wg7C1NagS;xO*R
z03N_Ycm)53NAZ;)9>e2!0#D+rcnVMB8GH?2$8$K2Z{Y;Ki<20{DSQtv;`=y_f5#7T
z20y|}_)lKibNC6);}yJ)x9~Q8j*Ivueua1NYrKo!;CFZ*zsCpo11{r3SokBZ;7|An
z*YFpN;IH@?f5RsTj^ZD<jvE-mr(~lL3Z*cbKoR7iC~{H^#Zn@<$W2L<N@<i%CS}n?
z%B9IvN@Y|*mE@r+^3qhQp=mUoYH23Tra3g1=F<YYi5Agfs-t>ppry2omQy3Xfp6m5
z_zvb^F6uX-0ZXxf@==H7SOPzik%A#~qZbd-EH;{G+=OTGU-&x};%E3W8AN!E;_xPZ
z3m+{+1v^9!?#B!GG2TNO-oUGvjC^>hnC8(8@{u23Wb+Igm>KcOKz&4H(4j3hM!N-n
zs0pxI1vXAtZ32$5Y!}!#VRZ;>rm)rtY_PC81?{F*m%v60YrOz=No#|^h7D_DP;dCo
z?CaJhfvp`@w}7cEdjz_f<z_*<rnN;Nc3Eqy!2SWNS71+pwM}53fz>Cl_rTgNAX#hN
zFR)9&+9BZifqI8KSj3~90y`S4T>_jeZx`74V0}SgH-yC@N5c*YD<H6I!rCLSlfu%E
z&9J+|+AH8?mUjs3!m#cHf_lT=4C^j|{TkLj0f$)b7pR=&-2!_(ta}9T+*$_&n!-{q
z5<~GUza&sLOOC@D%4B(1pak}Q>j)1R%3*n*Km{!C7ibd80f9pctOo?>-#sW$GRubq
z4m>YL{jhchkG?K&2!f^Ui{W4d>p6kL60G9_2PjzI5HNr6d1oDQtb+9ufuk0z^8&{&
zSg!~i$zZ)Ia7=^sn!wQw)&+s%9IV#`j(D)%5IFY1`kBD<0P9VG;~}iK^wRK#LnExW
z1rCz1elBphgmqEizzORY0*6pozZ5u_!uplKVHMUp0tZ-FzZN*u!g^OgE6d*q9Daka
zF7bfjNDS+@0>@-n?+F~8Vf{|vI1TH4fg?7o-wPbOVSONQ6o>T(f#W%>%K}GsSRV=;
zzhPM#ZN1xhM+qGGVf|6y6aedrz{vpCRe{q2tUn2yAYgqYaH@dyXMvLjtZM?N4_JQ@
zIFY~_5jdr=_xzPN3{M2Cj|J>y`8R<x4y;cE&ONaHE^rotH7amEg7pt!{K>BKKEpW*
z)(wHP6|6CV^A@a6g&?Oe?bhRPGJ_(4(;Ac^aDs!f37qPnLIh5FP@w{+Kd3N)6Cspc
z;FJgzE^u;$njqjSEF<`_c>_+EP>}+sPAG@KNfatdz>_SU0w-3eXn|8KRE)sM7AjWY
zv<np{Z~}&k7dRC|B?x$qr(GoqoS&gw0%vL{x4=0YDoNn%4V5f#9*0U1IHN<Q3Y^=a
z(ge=(Q0W5ad#DV7Ge4Bc1bM?n092;H<p5Ncz=Z)+wtzD%a|A9Hpe71jHb6}hxPXAl
z6?B!T@&qm_pe74kUO?pwTxcMu3V6V9%>gw<;OYaaP~bWQsz~691gcoz+61aZ;3@^G
zRN#6As!ZU@1*%-&8V0ID;A#e{avYxjcX`JnaESv|C2+9=<rTQ>fvOg`0D_t-a47^;
zBXCg!HBI312x_{(g%VV)z$FuuPvGJS%Fp*#et!BZEN2K@Q9;cVxVD0tC2*AmHCy0%
z3u=zQl^4`pfom|Rc>-5sQ1b<@%b*qrT%keTB<NZVYN5bY8`L6!>o=&y0#|ZSO9Zaz
zpl%lMDa(3+Y%CiD3Sqfapiq{}1PWuhT%ZXo8}<70h9Y>-B#?vU3W1_nHVdR(Z>2yn
zELRB>%kmb15?QVm$i;GvKyH>Tf^J>ZT7gov|F`mhp){6l0;RKT7szDUA&~ZrbplOf
z*(p#i%PxT?vs^EbHp&eGX`|dIkT%3knjqg;TVl6B9+o`<X+zvBkT%3E0%_yhDv&n5
zUV*gnZ4*cvU!OqQ__hnA?W$iOZA-x&ykSTi)2#w&W4cWsZ9qE(TEKFbK-z$A7f9R8
z7X;Eavs<7#mH~mZo$L`v+X+9oCP>;)_6np8<qm<gq1-8Ofe&?;z@<LaK7osVsQm($
z|4?@e+z3G3BXCOqbwJ?e0P2eZv_kiCCBYkT!vOUqfm;Wtg97vue_7ym0_u>!jRn+U
zfm;lyBLX)YQ1=P&4=hg3DI4O^g90}oP!9>*ia<RqK!5*;K(hv(OwI}F**z+7qXPAq
zz%2{Z;{yK9@(F?47^o)&ZfKysDnRT0lt2c{rv+|zpq>%%8q2Q<+yX)I{epVK-4N8*
z1@4QWjtTIwd`{qA3F^4OT@#dE9Y()UP<nM3?xdi;C2&s#rB{mK?g~n;6vKTM)Cqw*
zu7Mw=xPou+a8Tg(3+j1+8!;&TQ-)hIs8a&8i+oR@VwNuoG>_%?1)9O~v_SeX^y)C&
z&OvFF8Qs|F&;6+l!NQ1D5zj<sM>a>EjJ)P>IQkqHqbj3TMIDMd>zwS|;5_1d$$25V
zCHj0!am)iT=VPwLI$|?oOJjYpO|f0E2jddrisPP%I~^Y$KO=rs{E_(M@vp|emyn&X
zIALeP>4Xc3U5Q5%&$)743tWA!M_gxJm)%bHJooMHr`&HO8A+wVq$iULlGi2gO+K4a
zkg_x7a_WNAyHhWvtx7wdHkLjw{bc&Z3`a(B#&E_ZGsMg_cblioKW27iC1h>LI+^Xu
zemiH~#F&Z8CpjiPo7<B+mNzG_Iqz8BwaF=yTPOcC-;wXjKbU{5U~<9Uf_J8rPT4c%
zWMM?%`68pJzv#W<+~Nbp!Slr*m#iz<Tk>RSeQ8hW1EuH7s>@cFy;yd&d~x~C^2f{1
zm0z#ut+==1gGyKB>dL1o-}hvAmV5Sj&Q>|Ad{ukA4)40^4b{i0-=DgC>fKX6s##w1
z&1nVG_D;Jz?fUfc>AR;7Prq0jURzjuqISf0z<1T(>_6)tov~%cw`aUPvub8@aAw!6
znpvl2y*s;W_USp5bDo-WeQxvIgLBW#E1dVxys`P!^V{d|oB#5HxCPS}^e;GhQ`$|f
zH$A(sdf~A}xr_Q1eX_V_@$SW!msBo!e#ylpqjiqDg>_wZ_t%ZoC)M9v|475l4Lci7
zFEy4HENxkO_tKY_-Mj4Eva#h08y$_+jpv%en)WoUJ>GPAMbC=kD@K}Yn(u6Wb!Fzt
zg)1Lj`O?afRWYmjR=sh{fm?oh%R9GRU5(Xot9P$HvnFIs{hCMCeAF_r<@UA4+Lu}r
zS{Jq+YQ5T4({`}!WZT>AuJ(oP=i9G#oL!f)ZUZoQG<|uzF>UI=wbI$a-0WxyvxnKs
zoRr{pxigINDsNepx5`gdl_iv$SC%W=JU+`w*~K9~@>Y3$RPN3ow<{scSW((lN+ku2
z<;f{gsq?azx2|8S2mI0{iX6$w*_54MP(rS09c8_@_O{p8n3Rz|t-ZYW)~UTun=vy?
zTMM5Ul~mq1W$pTs)_K|GDXBc*pOmgI;p^t}1(K5;H%_-tOE=A$`u5)2ww879evJ8a
zZ}rZtgCCW7?7;}_I=0KU<FF$V@o>XL4yK@lqXXxmczdF|!t2Sidnyv6>0kSHZ-qP2
zo|ETItniRMmd}aJv*&m!Vwp)fi4}IY{!xo*4rOK@4IKSU4(Z{L=?fU~ra5eyW?)Vr
z5EwiB(o6orZQBZM$N5V>Wtb1@uZPW{K;SX`3-f3oK&LXtzG#|s8-G7`F5vU|C-oNg
zPGR*2Cr)k6j~RcAZy*b0`~qni)($+-K0Pxu$5WX*h1~W$kJoLlD0jJCiMAXMYsn8(
zk(e`ZquuZFd-Jx}74F|(Sl3@t7w0hiLqq&Ou)bra>#>$RZ++qZ!u>^cm4)f%jjhAJ
z;bGt4-uCBG=W|Tvdp^rk7tax?*vNL0J%<gzTUE~X;Bwo#qBlM9{1cm^{n7r~)ob5g
zySmmNZB#TLZfH2%ys4?Nw5+VOv1!xb!QkKQLA?Tz{N~C8vRF6PFej1cF}{SdczUxu
zIk8!+uRiWJu8M-yZ^n<U;R#6@rRq`t=nLbj8BxEqXWoc2{l<4jeSsm4m9}v;_4VWU
z`W%cY>z^0Rip}y9UpLmiIxCv8JX!o=?|;sY?cT9wk8AA5e3Ry}vy|+rqI>-_#x}V;
zV<Y77xalFEsAB8(L}cD*Fnx5}gsK1~w@j!S@=Un?=D122TzKGcY;ZHb)yrnPs@55v
z66_UK#WtsrVe@*zipghWP-uBoWo~v@g3HaG<Yt%2&GTlE*Hu+nO#0~ff+dbGo^jRi
z+l$uRd1zl}Wk~I&d*-irwBFT!{F#oiO(_#6R!*Aqa8`}0&|JD|nOW$neOw=#GilN(
ze;~mBMtpS4{ChUlhE#U$J9OuoBD+6g*;l@GSHAB^wf<@4#K%(Hg<07XvkH?^A0r-X
zh6BDpz&Cj8(fo>F<oJws+q%bnCVJd!Qpf!!Z`^ZuhV`0xW9?d7#?33qt2xc^<kV6{
zBJrVEwm-Xe9-ejEVqP%QxN7?JeCdxCV-CGXBRA@e6Si*iMm?W$g8d-i4u~@B5>wfG
ze$0CD?hF3G*IsF{2SYwn?l>}dx^q#$lbvJJKAfX{**3n_qg48Amsl0868lPpZE?@*
zvrTi<G-qAt8TZ<dGiO4zE3!I#E8~Q|D^;7LnVF;J*g0`nGRJ;9zDExShla)$vXTM(
zzlvxTBI$E&;y>3Wo{xoorU;EI!T})k%$bmJ_wTtdYh0<>ulJZY;#h-WIu!_v$BVH`
zlqq3_?R3-(GBnj3;)xnt#MAde0HL4HNDjXbmC%MsIe9z>p3gN&WKHa!X`^GCj(WUQ
zId%=7CzI3LZMK-1nE}(xY%#lgIe?knm%4d7wus}=@bHj7-*0U5`$xO4@WFsSGhklP
zCz!q6<L4Vke51poe!m}sQ{L*b1;fUb)85(0FSNGsd!yU+dmhTIa=T1&mFslE|K7aZ
zJdQASkC!8hNnW4fEq5g*<YcqMa1PS>hbqc-?D4ue-5BgU{HGI;JuI5^IMhd#xp@^C
zln`dm$tosKrMJRKLH4VETC0u2frtP2HGOhaXsF#bAvQc=!USiS5o-$#ak^X)tKuR;
zL+o*pX=a=wJ|!YH&J`XLoo0j>_E39ROk_w%WN3IqQfi_zEYubf5@v)t!XpwRQrsyC
zv?nDkJ*7B3J=H88%g9KpDN0F8O*KvguQ!>d?YQZ?{-CW}LrKmUyDcQl7VSuhicX3Q
zo9T>-hz&O!v5Co1j<nP`Gtr20rc6k1xRSO<MutrYjf%0`!yJ*$<oKxYNJn%`meb*m
zj>?F3N5{ry*EQ8;XEro1$u=9NteTVE&{&^koXEWXCf~I1`d^F+!xtDla&cEAH4R3*
z|G42a8jPjJGGn>XXfzos29JHP(XiV)wr+0UxMeWr!}bujd;P}#qTU@nJw<(;+jewr
z?=R};>ul>E+;-)=VPT>DZS6gs1KA@Fc;ota^>!9**x1?E*4MFNSJCzz?Fs+qP;Y0S
f^M4;4I5kok?Yy<EZ==3a(fYovJ9-DKkpuq?SSf-o

delta 5988
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

diff --git a/src/vs/base/browser/ui/codicons/codiconStyles.ts b/src/vs/base/browser/ui/codicons/codiconStyles.ts
index 442811967..f2f58befb 100644
--- a/src/vs/base/browser/ui/codicons/codiconStyles.ts
+++ b/src/vs/base/browser/ui/codicons/codiconStyles.ts
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./codicon/codicon';
-import 'vs/css!./codicon/codicon-modifications';
-import 'vs/css!./codicon/codicon-animations';
+import 'vs/css!./codicon/codicon-modifiers';
 
 import { Codicon } from 'vs/base/common/codicons';
 
diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 4d8a075df..a1646c4cc 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -182,7 +182,9 @@ export class Dialog extends Disposable {
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 
 				this._register(button.onDidClick(e => {
-					EventHelper.stop(e);
+					if (e) {
+						EventHelper.stop(e);
+					}
 
 					resolve({
 						button: buttonMap[index].index,
@@ -307,7 +309,9 @@ export class Dialog extends Disposable {
 				}
 			}));
 
-			this.iconElement.classList.remove(...dialogErrorIcon.classNamesArray, ...dialogWarningIcon.classNamesArray, ...dialogInfoIcon.classNamesArray, ...Codicon.loading.classNamesArray);
+			const spinModifierClassName = 'codicon-modifier-spin';
+
+			this.iconElement.classList.remove(...dialogErrorIcon.classNamesArray, ...dialogWarningIcon.classNamesArray, ...dialogInfoIcon.classNamesArray, ...Codicon.loading.classNamesArray, spinModifierClassName);
 
 			switch (this.options.type) {
 				case 'error':
@@ -317,7 +321,7 @@ export class Dialog extends Disposable {
 					this.iconElement.classList.add(...dialogWarningIcon.classNamesArray);
 					break;
 				case 'pending':
-					this.iconElement.classList.add(...Codicon.loading.classNamesArray, 'codicon-animation-spin');
+					this.iconElement.classList.add(...Codicon.loading.classNamesArray, spinModifierClassName);
 					break;
 				case 'none':
 				case 'info':
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index 9abc9274c..ea6611aba 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -201,7 +201,7 @@ export class Dropdown extends BaseDropdown {
 }
 
 export interface IActionProvider {
-	getActions(): IAction[];
+	getActions(): readonly IAction[];
 }
 
 export interface IDropdownMenuOptions extends IBaseDropdownOptions {
@@ -215,7 +215,7 @@ export interface IDropdownMenuOptions extends IBaseDropdownOptions {
 export class DropdownMenu extends BaseDropdown {
 	private _contextMenuProvider: IContextMenuProvider;
 	private _menuOptions: IMenuOptions | undefined;
-	private _actions: IAction[] = [];
+	private _actions: readonly IAction[] = [];
 	private actionProvider?: IActionProvider;
 	private menuClassName: string;
 	private menuAsChild?: boolean;
@@ -238,7 +238,7 @@ export class DropdownMenu extends BaseDropdown {
 		return this._menuOptions;
 	}
 
-	private get actions(): IAction[] {
+	private get actions(): readonly IAction[] {
 		if (this.actionProvider) {
 			return this.actionProvider.getActions();
 		}
@@ -246,7 +246,7 @@ export class DropdownMenu extends BaseDropdown {
 		return this._actions;
 	}
 
-	private set actions(actions: IAction[]) {
+	private set actions(actions: readonly IAction[]) {
 		this._actions = actions;
 	}
 
diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
index ea32bdc07..2a712e089 100644
--- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
@@ -170,7 +170,13 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem {
 		super.render(container);
 		if (this.element) {
 			this.element.classList.add('action-dropdown-item');
-			this.dropdownMenuActionViewItem = new DropdownMenuActionViewItem(new Action('dropdownAction', undefined), (<IActionWithDropdownActionViewItemOptions>this.options).menuActionsOrProvider, this.contextMenuProvider, { classNames: ['dropdown', ...Codicon.dropDownButton.classNamesArray, ...(<IActionWithDropdownActionViewItemOptions>this.options).menuActionClassNames || []] });
+			const menuActionsProvider = {
+				getActions: () => {
+					const actionsProvider = (<IActionWithDropdownActionViewItemOptions>this.options).menuActionsOrProvider;
+					return [this._action, ...(Array.isArray(actionsProvider) ? actionsProvider : actionsProvider.getActions())];
+				}
+			};
+			this.dropdownMenuActionViewItem = new DropdownMenuActionViewItem(this._register(new Action('dropdownAction', undefined)), menuActionsProvider, this.contextMenuProvider, { classNames: ['dropdown', ...Codicon.dropDownButton.classNamesArray, ...(<IActionWithDropdownActionViewItemOptions>this.options).menuActionClassNames || []] });
 			this.dropdownMenuActionViewItem.render(this.element);
 		}
 	}
diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts
index cf7db18c2..e0e21cad1 100644
--- a/src/vs/base/browser/ui/findinput/findInput.ts
+++ b/src/vs/base/browser/ui/findinput/findInput.ts
@@ -258,6 +258,10 @@ export class FindInput extends Widget {
 		this.onmousedown(this.inputBox.inputElement, (e) => this._onMouseDown.fire(e));
 	}
 
+	public get onDidChange(): Event<string> {
+		return this.inputBox.onDidChange;
+	}
+
 	public enable(): void {
 		this.domNode.classList.remove('disabled');
 		this.inputBox.enable();
diff --git a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
index c6b985085..552f1e57d 100644
--- a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
+++ b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
@@ -5,7 +5,7 @@
 
 import * as objects from 'vs/base/common/objects';
 import * as dom from 'vs/base/browser/dom';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
 export interface IHighlight {
 	start: number;
@@ -21,7 +21,7 @@ export class HighlightedLabel {
 	private highlights: IHighlight[] = [];
 	private didEverRender: boolean = false;
 
-	constructor(container: HTMLElement, private supportCodicons: boolean) {
+	constructor(container: HTMLElement, private supportIcons: boolean) {
 		this.domNode = document.createElement('span');
 		this.domNode.className = 'monaco-highlighted-label';
 
@@ -61,12 +61,12 @@ export class HighlightedLabel {
 			}
 			if (pos < highlight.start) {
 				const substring = this.text.substring(pos, highlight.start);
-				children.push(dom.$('span', undefined, ...this.supportCodicons ? renderCodicons(substring) : [substring]));
+				children.push(dom.$('span', undefined, ...this.supportIcons ? renderLabelWithIcons(substring) : [substring]));
 				pos = highlight.end;
 			}
 
 			const substring = this.text.substring(highlight.start, highlight.end);
-			const element = dom.$('span.highlight', undefined, ...this.supportCodicons ? renderCodicons(substring) : [substring]);
+			const element = dom.$('span.highlight', undefined, ...this.supportIcons ? renderLabelWithIcons(substring) : [substring]);
 			if (highlight.extraClasses) {
 				element.classList.add(highlight.extraClasses);
 			}
@@ -76,7 +76,7 @@ export class HighlightedLabel {
 
 		if (pos < this.text.length) {
 			const substring = this.text.substring(pos,);
-			children.push(dom.$('span', undefined, ...this.supportCodicons ? renderCodicons(substring) : [substring]));
+			children.push(dom.$('span', undefined, ...this.supportIcons ? renderLabelWithIcons(substring) : [substring]));
 		}
 
 		dom.reset(this.domNode, ...children);
diff --git a/src/vs/base/browser/ui/hover/hover.css b/src/vs/base/browser/ui/hover/hover.css
index c2e11fa89..5b8bf0afb 100644
--- a/src/vs/base/browser/ui/hover/hover.css
+++ b/src/vs/base/browser/ui/hover/hover.css
@@ -45,10 +45,13 @@
 }
 
 .monaco-hover hr {
+	box-sizing: border-box;
+	border-left: 0px;
+	border-right: 0px;
 	margin-top: 4px;
 	margin-bottom: -4px;
-	margin-left: -10px;
-	margin-right: -10px;
+	margin-left: -8px;
+	margin-right: -8px;
 	height: 1px;
 }
 
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.ts b/src/vs/base/browser/ui/hover/hoverWidget.ts
index 616256948..28b240f06 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.ts
+++ b/src/vs/base/browser/ui/hover/hoverWidget.ts
@@ -27,7 +27,9 @@ export class HoverWidget extends Disposable {
 		this.contentsDomNode = document.createElement('div');
 		this.contentsDomNode.className = 'monaco-hover-content';
 
-		this._scrollbar = this._register(new DomScrollableElement(this.contentsDomNode, {}));
+		this._scrollbar = this._register(new DomScrollableElement(this.contentsDomNode, {
+			consumeMouseWheelIfScrollbarIsNeeded: true
+		}));
 		this.containerDomNode.appendChild(this._scrollbar.getDomNode());
 	}
 
diff --git a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts
index 0e853d988..2aafbf827 100644
--- a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts
@@ -20,4 +20,5 @@ export interface IHoverDelegateOptions {
 
 export interface IHoverDelegate {
 	showHover(options: IHoverDelegateOptions): IDisposable | undefined;
+	hideHover(): void;
 }
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index 44c56834f..98e87e06a 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -16,16 +16,18 @@ import { AnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { isFunction, isString } from 'vs/base/common/types';
 import { domEvent } from 'vs/base/browser/event';
+import { localize } from 'vs/nls';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
 	supportDescriptionHighlights?: boolean;
-	supportCodicons?: boolean;
+	supportIcons?: boolean;
 	hoverDelegate?: IHoverDelegate;
 }
 
 export interface IIconLabelMarkdownString {
-	markdown: IMarkdownString | string | undefined | (() => Promise<IMarkdownString | string | undefined>);
+	markdown: IMarkdownString | string | undefined | ((token: CancellationToken) => Promise<IMarkdownString | string | undefined>);
 	markdownNotSupportedFallback: string | undefined;
 }
 
@@ -114,13 +116,13 @@ export class IconLabel extends Disposable {
 		this.descriptionContainer = this._register(new FastLabelNode(dom.append(this.labelContainer, dom.$('span.monaco-icon-description-container'))));
 
 		if (options?.supportHighlights) {
-			this.nameNode = new LabelWithHighlights(nameContainer, !!options.supportCodicons);
+			this.nameNode = new LabelWithHighlights(nameContainer, !!options.supportIcons);
 		} else {
 			this.nameNode = new Label(nameContainer);
 		}
 
 		if (options?.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.descriptionContainer.element, dom.$('span.label-description')), !!options.supportCodicons);
+			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.descriptionContainer.element, dom.$('span.label-description')), !!options.supportIcons);
 		} else {
 			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.descriptionContainer.element, dom.$('span.label-description'))));
 		}
@@ -190,29 +192,47 @@ export class IconLabel extends Disposable {
 		}
 	}
 
-	private setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, markdownTooltip: string | IIconLabelMarkdownString): void {
-		htmlElement.removeAttribute('title');
-		let tooltip: () => Promise<string | IMarkdownString | undefined>;
+	private static adjustXAndShowCustomHover(hoverOptions: IHoverDelegateOptions | undefined, mouseX: number | undefined, hoverDelegate: IHoverDelegate, isHovering: boolean) {
+		if (hoverOptions && isHovering) {
+			if (mouseX !== undefined) {
+				(<IHoverDelegateTarget>hoverOptions.target).x = mouseX + 10;
+			}
+			hoverDelegate.showHover(hoverOptions);
+		}
+	}
+
+	private getTooltipForCustom(markdownTooltip: string | IIconLabelMarkdownString): (token: CancellationToken) => Promise<string | IMarkdownString | undefined> {
 		if (isString(markdownTooltip)) {
-			tooltip = async () => markdownTooltip;
+			return async () => markdownTooltip;
 		} else if (isFunction(markdownTooltip.markdown)) {
-			tooltip = markdownTooltip.markdown;
+			return markdownTooltip.markdown;
 		} else {
 			const markdown = markdownTooltip.markdown;
-			tooltip = async () => markdown;
+			return async () => markdown;
 		}
+	}
+
+	private setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, markdownTooltip: string | IIconLabelMarkdownString): void {
+		htmlElement.setAttribute('title', '');
+		htmlElement.removeAttribute('title');
+		let tooltip = this.getTooltipForCustom(markdownTooltip);
+
 		// Testing has indicated that on Windows and Linux 500 ms matches the native hovers most closely.
 		// On Mac, the delay is 1500.
 		const hoverDelay = isMacintosh ? 1500 : 500;
 		let hoverOptions: IHoverDelegateOptions | undefined;
 		let mouseX: number | undefined;
 		let isHovering = false;
+		let tokenSource: CancellationTokenSource;
 		function mouseOver(this: HTMLElement, e: MouseEvent): any {
 			if (isHovering) {
 				return;
 			}
+			tokenSource = new CancellationTokenSource();
 			function mouseLeaveOrDown(this: HTMLElement, e: MouseEvent): any {
 				isHovering = false;
+				hoverOptions = undefined;
+				tokenSource.dispose(true);
 				mouseLeaveDisposable.dispose();
 				mouseDownDisposable.dispose();
 			}
@@ -232,22 +252,26 @@ export class IconLabel extends Disposable {
 							targetElements: [this],
 							dispose: () => { }
 						};
-						const resolvedTooltip = await tooltip();
+						hoverOptions = {
+							text: localize('iconLabel.loading', "Loading..."),
+							target,
+							anchorPosition: AnchorPosition.BELOW
+						};
+						IconLabel.adjustXAndShowCustomHover(hoverOptions, mouseX, hoverDelegate, isHovering);
+
+						const resolvedTooltip = (await tooltip(tokenSource.token)) ?? (!isString(markdownTooltip) ? markdownTooltip.markdownNotSupportedFallback : undefined);
 						if (resolvedTooltip) {
 							hoverOptions = {
 								text: resolvedTooltip,
 								target,
 								anchorPosition: AnchorPosition.BELOW
 							};
+							// awaiting the tooltip could take a while. Make sure we're still hovering.
+							IconLabel.adjustXAndShowCustomHover(hoverOptions, mouseX, hoverDelegate, isHovering);
+						} else {
+							hoverDelegate.hideHover();
 						}
 					}
-					// awaiting the tooltip could take a while. Make sure we're still hovering.
-					if (hoverOptions && isHovering) {
-						if (mouseX !== undefined) {
-							(<IHoverDelegateTarget>hoverOptions.target).x = mouseX + 10;
-						}
-						hoverDelegate.showHover(hoverOptions);
-					}
 				}
 				mouseMoveDisposable.dispose();
 			}, hoverDelay);
@@ -336,7 +360,7 @@ class LabelWithHighlights {
 	private singleLabel: HighlightedLabel | undefined = undefined;
 	private options: IIconLabelValueOptions | undefined;
 
-	constructor(private container: HTMLElement, private supportCodicons: boolean) { }
+	constructor(private container: HTMLElement, private supportIcons: boolean) { }
 
 	setLabel(label: string | string[], options?: IIconLabelValueOptions): void {
 		if (this.label === label && equals(this.options, options)) {
@@ -350,7 +374,7 @@ class LabelWithHighlights {
 			if (!this.singleLabel) {
 				this.container.innerText = '';
 				this.container.classList.remove('multiple');
-				this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportCodicons);
+				this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportIcons);
 			}
 
 			this.singleLabel.set(label, options?.matches, undefined, options?.labelEscapeNewLines);
@@ -368,7 +392,7 @@ class LabelWithHighlights {
 				const id = options?.domId && `${options?.domId}_${i}`;
 
 				const name = dom.$('a.label-name', { id, 'data-icon-label-count': label.length, 'data-icon-label-index': i, 'role': 'treeitem' });
-				const highlightedLabel = new HighlightedLabel(dom.append(this.container, name), this.supportCodicons);
+				const highlightedLabel = new HighlightedLabel(dom.append(this.container, name), this.supportIcons);
 				highlightedLabel.set(l, m, undefined, options?.labelEscapeNewLines);
 
 				if (i < label.length - 1) {
diff --git a/src/vs/base/browser/codicons.ts b/src/vs/base/browser/ui/iconLabel/iconLabels.ts
similarity index 58%
rename from src/vs/base/browser/codicons.ts
rename to src/vs/base/browser/ui/iconLabel/iconLabels.ts
index cf55c1a9b..1460c8e15 100644
--- a/src/vs/base/browser/codicons.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabels.ts
@@ -4,21 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import { CSSIcon } from 'vs/base/common/codicons';
 
-const renderCodiconsRegex = /(\\)?\$\((([a-z0-9\-]+?)(?:~([a-z0-9\-]*?))?)\)/gi;
+const labelWithIconsRegex = /(\\)?\$\(([a-z\-]+(?:~[a-z\-]+)?)\)/gi;
 
-export function renderCodicons(text: string): Array<HTMLSpanElement | string> {
+export function renderLabelWithIcons(text: string): Array<HTMLSpanElement | string> {
 	const elements = new Array<HTMLSpanElement | string>();
 	let match: RegExpMatchArray | null;
 
 	let textStart = 0, textStop = 0;
-	while ((match = renderCodiconsRegex.exec(text)) !== null) {
+	while ((match = labelWithIconsRegex.exec(text)) !== null) {
 		textStop = match.index || 0;
 		elements.push(text.substring(textStart, textStop));
 		textStart = (match.index || 0) + match[0].length;
 
-		const [, escaped, codicon, name, animation] = match;
-		elements.push(escaped ? `$(${codicon})` : renderCodicon(name, animation));
+		const [, escaped, codicon] = match;
+		elements.push(escaped ? `$(${codicon})` : renderIcon({ id: codicon }));
 	}
 
 	if (textStart < text.length) {
@@ -27,6 +28,8 @@ export function renderCodicons(text: string): Array<HTMLSpanElement | string> {
 	return elements;
 }
 
-export function renderCodicon(name: string, animation: string): HTMLSpanElement {
-	return dom.$(`span.codicon.codicon-${name}${animation ? `.codicon-animation-${animation}` : ''}`);
+export function renderIcon(icon: CSSIcon): HTMLSpanElement {
+	const node = dom.$(`span`);
+	node.classList.add(...CSSIcon.asClassNameArray(icon));
+	return node;
 }
diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css
index 06224874c..196d23f60 100644
--- a/src/vs/base/browser/ui/iconLabel/iconlabel.css
+++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css
@@ -55,6 +55,10 @@
 	white-space: pre; /* enable to show labels that include multiple whitespaces */
 }
 
+.monaco-icon-label.nowrap > .monaco-icon-label-container > .monaco-icon-description-container > .label-description{
+	white-space: nowrap
+}
+
 .vs .monaco-icon-label > .monaco-icon-label-container > .monaco-icon-description-container > .label-description {
 	opacity: .95;
 }
@@ -64,6 +68,16 @@
 	font-style: italic;
 }
 
+.monaco-icon-label.deprecated {
+	text-decoration: line-through;
+	opacity: 0.66;
+}
+
+/* make sure apply italic font style to decorations as well */
+.monaco-icon-label.italic::after {
+	font-style: italic;
+}
+
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-name-container > .label-name,
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-description-container > .label-description {
 	text-decoration: line-through;
diff --git a/src/vs/base/browser/ui/codicons/codiconLabel.ts b/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
similarity index 76%
rename from src/vs/base/browser/ui/codicons/codiconLabel.ts
rename to src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
index e21eb2381..659572d4f 100644
--- a/src/vs/base/browser/ui/codicons/codiconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/simpleIconLabel.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { reset } from 'vs/base/browser/dom';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
-export class CodiconLabel {
+export class SimpleIconLabel {
 
 	constructor(
 		private readonly _container: HTMLElement
 	) { }
 
 	set text(text: string) {
-		reset(this._container, ...renderCodicons(text ?? ''));
+		reset(this._container, ...renderLabelWithIcons(text ?? ''));
 	}
 
 	set title(title: string) {
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index 6c1811a2f..f6640a7f8 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -17,20 +17,20 @@
 	border: 1px solid transparent;
 }
 
-.monaco-inputbox > .wrapper > .input,
-.monaco-inputbox > .wrapper > .mirror {
+.monaco-inputbox > .ibwrapper > .input,
+.monaco-inputbox > .ibwrapper > .mirror {
 
 	/* Customizable */
 	padding: 4px;
 }
 
-.monaco-inputbox > .wrapper {
+.monaco-inputbox > .ibwrapper {
 	position: relative;
 	width: 100%;
 	height: 100%;
 }
 
-.monaco-inputbox > .wrapper > .input {
+.monaco-inputbox > .ibwrapper > .input {
 	display: inline-block;
 	box-sizing:	border-box;
 	width: 100%;
@@ -43,26 +43,26 @@
 	color: inherit;
 }
 
-.monaco-inputbox > .wrapper > input {
+.monaco-inputbox > .ibwrapper > input {
 	text-overflow: ellipsis;
 }
 
-.monaco-inputbox > .wrapper > textarea.input {
+.monaco-inputbox > .ibwrapper > textarea.input {
 	display: block;
 	-ms-overflow-style: none; /* IE 10+: hide scrollbars */
 	scrollbar-width: none; /* Firefox: hide scrollbars */
 	outline: none;
 }
 
-.monaco-inputbox > .wrapper > textarea.input::-webkit-scrollbar {
+.monaco-inputbox > .ibwrapper > textarea.input::-webkit-scrollbar {
 	display: none; /* Chrome + Safari: hide scrollbar */
 }
 
-.monaco-inputbox > .wrapper > textarea.input.empty {
+.monaco-inputbox > .ibwrapper > textarea.input.empty {
 	white-space: nowrap;
 }
 
-.monaco-inputbox > .wrapper > .mirror {
+.monaco-inputbox > .ibwrapper > .mirror {
 	position: absolute;
 	display: inline-block;
 	width: 100%;
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index 2410c5234..c726b9b76 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -157,7 +157,7 @@ export class InputBox extends Widget {
 
 		let tagName = this.options.flexibleHeight ? 'textarea' : 'input';
 
-		let wrapper = dom.append(this.element, $('.wrapper'));
+		let wrapper = dom.append(this.element, $('.ibwrapper'));
 		this.input = dom.append(wrapper, $(tagName + '.input.empty'));
 		this.input.setAttribute('autocorrect', 'off');
 		this.input.setAttribute('autocapitalize', 'off');
@@ -398,7 +398,7 @@ export class InputBox extends Widget {
 		return !!this.validation && !this.validation(this.value);
 	}
 
-	public validate(): boolean {
+	public validate(): MessageType | undefined {
 		let errorMsg: IMessage | null = null;
 
 		if (this.validation) {
@@ -414,7 +414,7 @@ export class InputBox extends Widget {
 			}
 		}
 
-		return !errorMsg;
+		return errorMsg?.type;
 	}
 
 	public stylesForType(type: MessageType | undefined): { border: Color | undefined; background: Color | undefined; foreground: Color | undefined } {
diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css
index 53857f4da..396bf18fe 100644
--- a/src/vs/base/browser/ui/list/list.css
+++ b/src/vs/base/browser/ui/list/list.css
@@ -33,7 +33,7 @@
 
 .monaco-list-row {
 	position: absolute;
-	box-sizing:	border-box;
+	box-sizing: border-box;
 	overflow: hidden;
 	width: 100%;
 }
@@ -49,7 +49,9 @@
 }
 
 /* Focus */
-.monaco-list.element-focused, .monaco-list.selection-single, .monaco-list.selection-multiple {
+.monaco-list.element-focused,
+.monaco-list.selection-single,
+.monaco-list.selection-multiple {
 	outline: 0 !important;
 }
 
@@ -64,6 +66,7 @@
 	border-radius: 10px;
 	font-size: 12px;
 	position: absolute;
+	z-index: 1000;
 }
 
 /* Type filter */
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 26b198431..9bc49fdce 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -432,8 +432,24 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 		const deleteRange = { start, end: start + deleteCount };
 		const removeRange = Range.intersect(previousRenderRange, deleteRange);
 
+		// try to reuse rows, avoid removing them from DOM
+		const rowsToDispose = new Map<string, [IRow, T, number, number][]>();
 		for (let i = removeRange.start; i < removeRange.end; i++) {
-			this.removeItemFromDOM(i);
+			const item = this.items[i];
+			item.dragStartDisposable.dispose();
+
+			if (item.row) {
+				let rows = rowsToDispose.get(item.templateId);
+
+				if (!rows) {
+					rows = [];
+					rowsToDispose.set(item.templateId, rows);
+				}
+
+				rows.push([item.row, item.element, i, item.size]);
+			}
+
+			item.row = null;
 		}
 
 		const previousRestRange: IRange = { start: start + deleteCount, end: this.items.length };
@@ -491,7 +507,34 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		for (const range of insertRanges) {
 			for (let i = range.start; i < range.end; i++) {
-				this.insertItemInDOM(i, beforeElement);
+				const item = this.items[i];
+				const rows = rowsToDispose.get(item.templateId);
+				const rowData = rows?.pop();
+
+				if (!rowData) {
+					this.insertItemInDOM(i, beforeElement);
+				} else {
+					const [row, element, index, size] = rowData;
+					const renderer = this.renderers.get(item.templateId);
+
+					if (renderer && renderer.disposeElement) {
+						renderer.disposeElement(element, index, row.templateData, size);
+					}
+
+					this.insertItemInDOM(i, beforeElement, row);
+				}
+			}
+		}
+
+		for (const [templateId, rows] of rowsToDispose) {
+			for (const [row, element, index, size] of rows) {
+				const renderer = this.renderers.get(templateId);
+
+				if (renderer && renderer.disposeElement) {
+					renderer.disposeElement(element, index, row.templateData, size);
+				}
+
+				this.cache.release(row);
 			}
 		}
 
@@ -699,24 +742,26 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 	// DOM operations
 
-	private insertItemInDOM(index: number, beforeElement: HTMLElement | null): void {
+	private insertItemInDOM(index: number, beforeElement: HTMLElement | null, row?: IRow): void {
 		const item = this.items[index];
 
 		if (!item.row) {
-			item.row = this.cache.alloc(item.templateId);
-			const role = this.accessibilityProvider.getRole(item.element) || 'listitem';
-			item.row!.domNode!.setAttribute('role', role);
-			const checked = this.accessibilityProvider.isChecked(item.element);
-			if (typeof checked !== 'undefined') {
-				item.row!.domNode!.setAttribute('aria-checked', String(!!checked));
-			}
+			item.row = row ?? this.cache.alloc(item.templateId);
 		}
 
-		if (!item.row.domNode!.parentElement) {
+		const role = this.accessibilityProvider.getRole(item.element) || 'listitem';
+		item.row.domNode.setAttribute('role', role);
+
+		const checked = this.accessibilityProvider.isChecked(item.element);
+		if (typeof checked !== 'undefined') {
+			item.row.domNode.setAttribute('aria-checked', String(!!checked));
+		}
+
+		if (!item.row.domNode.parentElement) {
 			if (beforeElement) {
-				this.rowsContainer.insertBefore(item.row.domNode!, beforeElement);
+				this.rowsContainer.insertBefore(item.row.domNode, beforeElement);
 			} else {
-				this.rowsContainer.appendChild(item.row.domNode!);
+				this.rowsContainer.appendChild(item.row.domNode);
 			}
 		}
 
@@ -734,10 +779,10 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		const uri = this.dnd.getDragURI(item.element);
 		item.dragStartDisposable.dispose();
-		item.row.domNode!.draggable = !!uri;
+		item.row.domNode.draggable = !!uri;
 
 		if (uri) {
-			const onDragStart = domEvent(item.row.domNode!, 'dragstart');
+			const onDragStart = domEvent(item.row.domNode, 'dragstart');
 			item.dragStartDisposable = onDragStart(event => this.onDragStart(item.element, uri, event));
 		}
 
@@ -768,36 +813,39 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 	}
 
 	private updateItemInDOM(item: IItem<T>, index: number): void {
-		item.row!.domNode!.style.top = `${this.elementTop(index)}px`;
+		item.row!.domNode.style.top = `${this.elementTop(index)}px`;
 
 		if (this.setRowHeight) {
-			item.row!.domNode!.style.height = `${item.size}px`;
+			item.row!.domNode.style.height = `${item.size}px`;
 		}
 
 		if (this.setRowLineHeight) {
-			item.row!.domNode!.style.lineHeight = `${item.size}px`;
+			item.row!.domNode.style.lineHeight = `${item.size}px`;
 		}
 
-		item.row!.domNode!.setAttribute('data-index', `${index}`);
-		item.row!.domNode!.setAttribute('data-last-element', index === this.length - 1 ? 'true' : 'false');
-		item.row!.domNode!.setAttribute('aria-setsize', String(this.accessibilityProvider.getSetSize(item.element, index, this.length)));
-		item.row!.domNode!.setAttribute('aria-posinset', String(this.accessibilityProvider.getPosInSet(item.element, index)));
-		item.row!.domNode!.setAttribute('id', this.getElementDomId(index));
+		item.row!.domNode.setAttribute('data-index', `${index}`);
+		item.row!.domNode.setAttribute('data-last-element', index === this.length - 1 ? 'true' : 'false');
+		item.row!.domNode.setAttribute('aria-setsize', String(this.accessibilityProvider.getSetSize(item.element, index, this.length)));
+		item.row!.domNode.setAttribute('aria-posinset', String(this.accessibilityProvider.getPosInSet(item.element, index)));
+		item.row!.domNode.setAttribute('id', this.getElementDomId(index));
 
-		item.row!.domNode!.classList.toggle('drop-target', item.dropTarget);
+		item.row!.domNode.classList.toggle('drop-target', item.dropTarget);
 	}
 
 	private removeItemFromDOM(index: number): void {
 		const item = this.items[index];
 		item.dragStartDisposable.dispose();
 
-		const renderer = this.renderers.get(item.templateId);
-		if (item.row && renderer && renderer.disposeElement) {
-			renderer.disposeElement(item.element, index, item.row.templateData, item.size);
-		}
+		if (item.row) {
+			const renderer = this.renderers.get(item.templateId);
 
-		this.cache.release(item.row!);
-		item.row = null;
+			if (renderer && renderer.disposeElement) {
+				renderer.disposeElement(item.element, index, item.row.templateData, item.size);
+			}
+
+			this.cache.release(item.row);
+			item.row = null;
+		}
 
 		if (this.horizontalScrolling) {
 			this.eventuallyUpdateScrollWidth();
@@ -809,14 +857,14 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 		return scrollPosition.scrollTop;
 	}
 
-	setScrollTop(scrollTop: number): void {
+	setScrollTop(scrollTop: number, reuseAnimation?: boolean): void {
 		if (this.scrollableElementUpdateDisposable) {
 			this.scrollableElementUpdateDisposable.dispose();
 			this.scrollableElementUpdateDisposable = null;
 			this.scrollableElement.setScrollDimensions({ scrollHeight: this.scrollHeight });
 		}
 
-		this.scrollableElement.setScrollPosition({ scrollTop });
+		this.scrollableElement.setScrollPosition({ scrollTop, reuseAnimation });
 	}
 
 	getScrollLeft(): number {
@@ -895,9 +943,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 			this.render(previousRenderRange, e.scrollTop, e.height, e.scrollLeft, e.scrollWidth);
 
 			if (this.supportDynamicHeights) {
-				// Don't update scrollTop from within an scroll event
-				// so we don't break smooth scrolling. #104144
-				this._rerender(e.scrollTop, e.height, false);
+				this._rerender(e.scrollTop, e.height, e.inSmoothScrolling);
 			}
 		} catch (err) {
 			console.error('Got bad scroll event:', e);
@@ -1027,7 +1073,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 				const item = this.items[index]!;
 				item.dropTarget = true;
 
-				if (item.row && item.row.domNode) {
+				if (item.row) {
 					item.row.domNode.classList.add('drop-target');
 				}
 			}
@@ -1037,7 +1083,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 					const item = this.items[index]!;
 					item.dropTarget = false;
 
-					if (item.row && item.row.domNode) {
+					if (item.row) {
 						item.row.domNode.classList.remove('drop-target');
 					}
 				}
@@ -1167,7 +1213,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 	 * Given a stable rendered state, checks every rendered element whether it needs
 	 * to be probed for dynamic height. Adjusts scroll height and top if necessary.
 	 */
-	private _rerender(renderTop: number, renderHeight: number, updateScrollTop: boolean = true): void {
+	private _rerender(renderTop: number, renderHeight: number, inSmoothScrolling?: boolean): void {
 		const previousRenderRange = this.getRenderRange(renderTop, renderHeight);
 
 		// Let's remember the second element's position, this helps in scrolling up
@@ -1233,8 +1279,15 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 					}
 				}
 
-				if (updateScrollTop && typeof anchorElementIndex === 'number') {
-					this.scrollTop = this.elementTop(anchorElementIndex) - anchorElementTopDelta!;
+				if (typeof anchorElementIndex === 'number') {
+					// To compute a destination scroll top, we need to take into account the current smooth scrolling
+					// animation, and then reuse it with a new target (to avoid prolonging the scroll)
+					// See https://github.com/microsoft/vscode/issues/104144
+					// See https://github.com/microsoft/vscode/pull/104284
+					// See https://github.com/microsoft/vscode/issues/107704
+					const deltaScrollTop = this.scrollable.getFutureScrollPosition().scrollTop - renderTop;
+					const newScrollTop = this.elementTop(anchorElementIndex) - anchorElementTopDelta! + deltaScrollTop;
+					this.setScrollTop(newScrollTop, inSmoothScrolling);
 				}
 
 				this._onDidChangeContentHeight.fire(this.contentHeight);
@@ -1256,7 +1309,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		const size = item.size;
 
-		if (!this.setRowHeight && item.row && item.row.domNode) {
+		if (!this.setRowHeight && item.row) {
 			let newSize = item.row.domNode.offsetHeight;
 			item.size = newSize;
 			item.lastDynamicHeightWidth = this.renderWidth;
@@ -1265,8 +1318,8 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		const row = this.cache.alloc(item.templateId);
 
-		row.domNode!.style.height = '';
-		this.rowsContainer.appendChild(row.domNode!);
+		row.domNode.style.height = '';
+		this.rowsContainer.appendChild(row.domNode);
 
 		const renderer = this.renderers.get(item.templateId);
 		if (renderer) {
@@ -1277,14 +1330,14 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 			}
 		}
 
-		item.size = row.domNode!.offsetHeight;
+		item.size = row.domNode.offsetHeight;
 
 		if (this.virtualDelegate.setDynamicHeight) {
 			this.virtualDelegate.setDynamicHeight(item.element, item.size);
 		}
 
 		item.lastDynamicHeightWidth = this.renderWidth;
-		this.rowsContainer.removeChild(row.domNode!);
+		this.rowsContainer.removeChild(row.domNode);
 		this.cache.release(row);
 
 		return item.size - size;
diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts
index 953a11d13..2c49f3a41 100644
--- a/src/vs/base/browser/ui/list/rowCache.ts
+++ b/src/vs/base/browser/ui/list/rowCache.ts
@@ -8,7 +8,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { $ } from 'vs/base/browser/dom';
 
 export interface IRow {
-	domNode: HTMLElement | null;
+	domNode: HTMLElement;
 	templateId: string;
 	templateData: any;
 }
@@ -84,7 +84,6 @@ export class RowCache<T> implements IDisposable {
 			for (const cachedRow of cachedRows) {
 				const renderer = this.getRenderer(templateId);
 				renderer.disposeTemplate(cachedRow.templateData);
-				cachedRow.domNode = null;
 				cachedRow.templateData = null;
 			}
 		});
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index fc129fef5..947ba2708 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -18,11 +18,12 @@ import { ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
 import { Event } from 'vs/base/common/event';
 import { AnchorAlignment, layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { Codicon, registerCodicon, stripCodicons } from 'vs/base/common/codicons';
+import { Codicon, registerCodicon } from 'vs/base/common/codicons';
 import { BaseActionViewItem, ActionViewItem, IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { formatRule } from 'vs/base/browser/ui/codicons/codiconStyles';
 import { isFirefox } from 'vs/base/browser/browser';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { stripIcons } from 'vs/base/common/iconLabels';
 
 export const MENU_MNEMONIC_REGEX = /\(&([^\s&])\)|(^|[^&])&([^\s&])/;
 export const MENU_ESCAPED_MNEMONIC_REGEX = /(&amp;)?(&amp;)([^\s&])/g;
@@ -532,7 +533,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
 		if (this.options.label) {
 			clearNode(this.label);
 
-			let label = stripCodicons(this.getAction().label);
+			let label = stripIcons(this.getAction().label);
 			if (label) {
 				const cleanLabel = cleanMnemonic(label);
 				if (!this.options.enableMnemonics) {
diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts
index 55858a589..6a304f9ff 100644
--- a/src/vs/base/browser/ui/menu/menubar.ts
+++ b/src/vs/base/browser/ui/menu/menubar.ts
@@ -126,9 +126,11 @@ export class MenuBar extends Disposable {
 			let eventHandled = true;
 			const key = !!e.key ? e.key.toLocaleLowerCase() : '';
 
-			if (event.equals(KeyCode.LeftArrow) || (isMacintosh && event.equals(KeyCode.Tab | KeyMod.Shift))) {
+			const tabNav = isMacintosh && this.options.compactMode === undefined;
+
+			if (event.equals(KeyCode.LeftArrow) || (tabNav && event.equals(KeyCode.Tab | KeyMod.Shift))) {
 				this.focusPrevious();
-			} else if (event.equals(KeyCode.RightArrow) || (isMacintosh && event.equals(KeyCode.Tab))) {
+			} else if (event.equals(KeyCode.RightArrow) || (tabNav && event.equals(KeyCode.Tab))) {
 				this.focusNext();
 			} else if (event.equals(KeyCode.Escape) && this.isFocused && !this.isOpen) {
 				this.setUnfocusedState();
diff --git a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
index 133ec9350..f6e5e7d31 100644
--- a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts
@@ -83,7 +83,7 @@ export abstract class AbstractScrollbar extends Widget {
 	 * Creates the dom node for an arrow & adds it to the container
 	 */
 	protected _createArrow(opts: ScrollbarArrowOptions): void {
-		let arrow = this._register(new ScrollbarArrow(opts));
+		const arrow = this._register(new ScrollbarArrow(opts));
 		this.domNode.domNode.appendChild(arrow.bgDomNode);
 		this.domNode.domNode.appendChild(arrow.domNode);
 	}
@@ -186,10 +186,10 @@ export abstract class AbstractScrollbar extends Widget {
 	}
 
 	public delegateMouseDown(e: IMouseEvent): void {
-		let domTop = this.domNode.domNode.getClientRects()[0].top;
-		let sliderStart = domTop + this._scrollbarState.getSliderPosition();
-		let sliderStop = domTop + this._scrollbarState.getSliderPosition() + this._scrollbarState.getSliderSize();
-		let mousePos = this._sliderMousePosition(e);
+		const domTop = this.domNode.domNode.getClientRects()[0].top;
+		const sliderStart = domTop + this._scrollbarState.getSliderPosition();
+		const sliderStop = domTop + this._scrollbarState.getSliderPosition() + this._scrollbarState.getSliderSize();
+		const mousePos = this._sliderMousePosition(e);
 		if (sliderStart <= mousePos && mousePos <= sliderStop) {
 			// Act as if it was a mouse down on the slider
 			if (e.leftButton) {
@@ -263,7 +263,7 @@ export abstract class AbstractScrollbar extends Widget {
 
 	private _setDesiredScrollPositionNow(_desiredScrollPosition: number): void {
 
-		let desiredScrollPosition: INewScrollPosition = {};
+		const desiredScrollPosition: INewScrollPosition = {};
 		this.writeScrollPosition(desiredScrollPosition, _desiredScrollPosition);
 
 		this._scrollable.setScrollPositionNow(desiredScrollPosition);
@@ -278,6 +278,10 @@ export abstract class AbstractScrollbar extends Widget {
 		}
 	}
 
+	public isNeeded(): boolean {
+		return this._scrollbarState.isNeeded();
+	}
+
 	// ----------------- Overwrite these
 
 	protected abstract _renderDomNode(largeSize: number, smallSize: number): void;
diff --git a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
index 9d9a22683..7246630ee 100644
--- a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts
@@ -38,8 +38,8 @@ export class HorizontalScrollbar extends AbstractScrollbar {
 		});
 
 		if (options.horizontalHasArrows) {
-			let arrowDelta = (options.arrowSize - ARROW_IMG_SIZE) / 2;
-			let scrollbarDelta = (options.horizontalScrollbarSize - ARROW_IMG_SIZE) / 2;
+			const arrowDelta = (options.arrowSize - ARROW_IMG_SIZE) / 2;
+			const scrollbarDelta = (options.horizontalScrollbarSize - ARROW_IMG_SIZE) / 2;
 
 			this._createArrow({
 				className: 'scra',
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index 115864f3d..fe7b7edc9 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -187,7 +187,7 @@ export abstract class AbstractScrollableElement extends Widget {
 			this._onScroll.fire(e);
 		}));
 
-		let scrollbarHost: ScrollbarHost = {
+		const scrollbarHost: ScrollbarHost = {
 			onMouseWheel: (mouseWheelEvent: StandardWheelEvent) => this._onMouseWheel(mouseWheelEvent),
 			onDragStart: () => this._onDragStart(),
 			onDragEnd: () => this._onDragEnd(),
@@ -325,7 +325,7 @@ export abstract class AbstractScrollableElement extends Widget {
 	// -------------------- mouse wheel scrolling --------------------
 
 	private _setListeningToMouseWheel(shouldListen: boolean): void {
-		let isListening = (this._mouseWheelToDispose.length > 0);
+		const isListening = (this._mouseWheelToDispose.length > 0);
 
 		if (isListening === shouldListen) {
 			// No change
@@ -337,7 +337,7 @@ export abstract class AbstractScrollableElement extends Widget {
 
 		// Start listening (if necessary)
 		if (shouldListen) {
-			let onMouseWheel = (browserEvent: IMouseWheelEvent) => {
+			const onMouseWheel = (browserEvent: IMouseWheelEvent) => {
 				this._onMouseWheel(new StandardWheelEvent(browserEvent));
 			};
 
@@ -426,7 +426,15 @@ export abstract class AbstractScrollableElement extends Widget {
 			}
 		}
 
-		if (this._options.alwaysConsumeMouseWheel || didScroll) {
+		let consumeMouseWheel = didScroll;
+		if (!consumeMouseWheel && this._options.alwaysConsumeMouseWheel) {
+			consumeMouseWheel = true;
+		}
+		if (!consumeMouseWheel && this._options.consumeMouseWheelIfScrollbarIsNeeded && (this._verticalScrollbar.isNeeded() || this._horizontalScrollbar.isNeeded())) {
+			consumeMouseWheel = true;
+		}
+
+		if (consumeMouseWheel) {
 			e.preventDefault();
 			e.stopPropagation();
 		}
@@ -473,8 +481,8 @@ export abstract class AbstractScrollableElement extends Widget {
 
 		if (this._options.useShadows) {
 			const scrollState = this._scrollable.getCurrentScrollPosition();
-			let enableTop = scrollState.scrollTop > 0;
-			let enableLeft = scrollState.scrollLeft > 0;
+			const enableTop = scrollState.scrollTop > 0;
+			const enableLeft = scrollState.scrollLeft > 0;
 
 			this._leftShadowDomNode!.setClassName('shadow' + (enableLeft ? ' left' : ''));
 			this._topShadowDomNode!.setClassName('shadow' + (enableTop ? ' top' : ''));
@@ -549,8 +557,12 @@ export class SmoothScrollableElement extends AbstractScrollableElement {
 		super(element, options, scrollable);
 	}
 
-	public setScrollPosition(update: INewScrollPosition): void {
-		this._scrollable.setScrollPositionNow(update);
+	public setScrollPosition(update: INewScrollPosition & { reuseAnimation?: boolean }): void {
+		if (update.reuseAnimation) {
+			this._scrollable.setScrollPositionSmooth(update, update.reuseAnimation);
+		} else {
+			this._scrollable.setScrollPositionNow(update);
+		}
 	}
 
 	public getScrollPosition(): IScrollPosition {
@@ -593,12 +605,13 @@ export class DomScrollableElement extends ScrollableElement {
 }
 
 function resolveOptions(opts: ScrollableElementCreationOptions): ScrollableElementResolvedOptions {
-	let result: ScrollableElementResolvedOptions = {
+	const result: ScrollableElementResolvedOptions = {
 		lazyRender: (typeof opts.lazyRender !== 'undefined' ? opts.lazyRender : false),
 		className: (typeof opts.className !== 'undefined' ? opts.className : ''),
 		useShadows: (typeof opts.useShadows !== 'undefined' ? opts.useShadows : true),
 		handleMouseWheel: (typeof opts.handleMouseWheel !== 'undefined' ? opts.handleMouseWheel : true),
 		flipAxes: (typeof opts.flipAxes !== 'undefined' ? opts.flipAxes : false),
+		consumeMouseWheelIfScrollbarIsNeeded: (typeof opts.consumeMouseWheelIfScrollbarIsNeeded !== 'undefined' ? opts.consumeMouseWheelIfScrollbarIsNeeded : false),
 		alwaysConsumeMouseWheel: (typeof opts.alwaysConsumeMouseWheel !== 'undefined' ? opts.alwaysConsumeMouseWheel : false),
 		scrollYToX: (typeof opts.scrollYToX !== 'undefined' ? opts.scrollYToX : false),
 		mouseWheelScrollSensitivity: (typeof opts.mouseWheelScrollSensitivity !== 'undefined' ? opts.mouseWheelScrollSensitivity : 1),
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts b/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
index 556d20839..22387bdad 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts
@@ -40,6 +40,11 @@ export interface ScrollableElementCreationOptions {
 	 * Defaults to false.
 	 */
 	scrollYToX?: boolean;
+	/**
+	 * Consume all mouse wheel events if a scrollbar is needed (i.e. scrollSize > size).
+	 * Defaults to false.
+	 */
+	consumeMouseWheelIfScrollbarIsNeeded?: boolean;
 	/**
 	 * Always consume mouse wheel events, even when scrolling is no longer possible.
 	 * Defaults to false.
@@ -136,6 +141,7 @@ export interface ScrollableElementResolvedOptions {
 	handleMouseWheel: boolean;
 	flipAxes: boolean;
 	scrollYToX: boolean;
+	consumeMouseWheelIfScrollbarIsNeeded: boolean;
 	alwaysConsumeMouseWheel: boolean;
 	mouseWheelScrollSensitivity: number;
 	fastScrollSensitivity: number;
diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
index 64b8e8c98..03601e9e3 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts
@@ -88,7 +88,7 @@ export class ScrollbarArrow extends Widget {
 	}
 
 	private _arrowMouseDown(e: IMouseEvent): void {
-		let scheduleRepeater = () => {
+		const scheduleRepeater = () => {
 			this._mousedownRepeatTimer.cancelAndSet(() => this._onActivate(), 1000 / 24);
 		};
 
diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarState.ts b/src/vs/base/browser/ui/scrollbar/scrollbarState.ts
index d0d98b9a8..515902868 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollbarState.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollbarState.ts
@@ -85,7 +85,7 @@ export class ScrollbarState {
 	}
 
 	public setVisibleSize(visibleSize: number): boolean {
-		let iVisibleSize = Math.round(visibleSize);
+		const iVisibleSize = Math.round(visibleSize);
 		if (this._visibleSize !== iVisibleSize) {
 			this._visibleSize = iVisibleSize;
 			this._refreshComputedValues();
@@ -95,7 +95,7 @@ export class ScrollbarState {
 	}
 
 	public setScrollSize(scrollSize: number): boolean {
-		let iScrollSize = Math.round(scrollSize);
+		const iScrollSize = Math.round(scrollSize);
 		if (this._scrollSize !== iScrollSize) {
 			this._scrollSize = iScrollSize;
 			this._refreshComputedValues();
@@ -105,7 +105,7 @@ export class ScrollbarState {
 	}
 
 	public setScrollPosition(scrollPosition: number): boolean {
-		let iScrollPosition = Math.round(scrollPosition);
+		const iScrollPosition = Math.round(scrollPosition);
 		if (this._scrollPosition !== iScrollPosition) {
 			this._scrollPosition = iScrollPosition;
 			this._refreshComputedValues();
@@ -198,7 +198,7 @@ export class ScrollbarState {
 			return 0;
 		}
 
-		let desiredSliderPosition = offset - this._arrowSize - this._computedSliderSize / 2;
+		const desiredSliderPosition = offset - this._arrowSize - this._computedSliderSize / 2;
 		return Math.round(desiredSliderPosition / this._computedSliderRatio);
 	}
 
@@ -214,7 +214,7 @@ export class ScrollbarState {
 			return 0;
 		}
 
-		let correctedOffset = offset - this._arrowSize;  // compensate if has arrows
+		const correctedOffset = offset - this._arrowSize;  // compensate if has arrows
 		let desiredScrollPosition = this._scrollPosition;
 		if (correctedOffset < this._computedSliderPosition) {
 			desiredScrollPosition -= this._visibleSize;  // page up/left
@@ -233,7 +233,7 @@ export class ScrollbarState {
 			return 0;
 		}
 
-		let desiredSliderPosition = this._computedSliderPosition + delta;
+		const desiredSliderPosition = this._computedSliderPosition + delta;
 		return Math.round(desiredSliderPosition / this._computedSliderRatio);
 	}
 }
diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
index a77792ee2..35d82adbd 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts
@@ -43,7 +43,7 @@ export class ScrollbarVisibilityController extends Disposable {
 	}
 
 	public setShouldBeVisible(rawShouldBeVisible: boolean): void {
-		let shouldBeVisible = this.applyVisibilitySetting(rawShouldBeVisible);
+		const shouldBeVisible = this.applyVisibilitySetting(rawShouldBeVisible);
 
 		if (this._shouldBeVisible !== shouldBeVisible) {
 			this._shouldBeVisible = shouldBeVisible;
@@ -105,4 +105,4 @@ export class ScrollbarVisibilityController extends Disposable {
 			this._domNode.setClassName(this._invisibleClassName + (withFadeAway ? ' fade' : ''));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
index 12d2887b6..6088d2169 100644
--- a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
+++ b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts
@@ -38,8 +38,8 @@ export class VerticalScrollbar extends AbstractScrollbar {
 		});
 
 		if (options.verticalHasArrows) {
-			let arrowDelta = (options.arrowSize - ARROW_IMG_SIZE) / 2;
-			let scrollbarDelta = (options.verticalScrollbarSize - ARROW_IMG_SIZE) / 2;
+			const arrowDelta = (options.arrowSize - ARROW_IMG_SIZE) / 2;
+			const scrollbarDelta = (options.verticalScrollbarSize - ARROW_IMG_SIZE) / 2;
 
 			this._createArrow({
 				className: 'scra',
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index d782e1bcb..c1348a93d 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -73,7 +73,7 @@ export class ToolBar extends Disposable {
 							actionViewItemProvider: this.options.actionViewItemProvider,
 							actionRunner: this.actionRunner,
 							keybindingProvider: this.options.getKeyBinding,
-							classNames: (options.moreIcon ?? toolBarMoreIcon).classNames,
+							classNames: CSSIcon.asClassNameArray(options.moreIcon ?? toolBarMoreIcon),
 							anchorAlignmentProvider: this.options.anchorAlignmentProvider,
 							menuAsChild: !!this.options.renderDropdownAsChildElement
 						}
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index e4a93aef0..bdc5399f2 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ComposedTreeDelegate, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree';
-import { ObjectTree, IObjectTreeOptions, CompressibleObjectTree, ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions } from 'vs/base/browser/ui/tree/objectTree';
+import { ObjectTree, IObjectTreeOptions, CompressibleObjectTree, ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions, IObjectTreeSetChildrenOptions } from 'vs/base/browser/ui/tree/objectTree';
 import { IListVirtualDelegate, IIdentityProvider, IListDragAndDrop, IListDragOverReaction } from 'vs/base/browser/ui/list/list';
 import { ITreeElement, ITreeNode, ITreeRenderer, ITreeEvent, ITreeMouseEvent, ITreeContextMenuEvent, ITreeSorter, ICollapseStateChangeEvent, IAsyncDataSource, ITreeDragAndDrop, TreeError, WeakMapper, ITreeFilter, TreeVisibility, TreeFilterResult } from 'vs/base/browser/ui/tree/tree';
 import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
@@ -279,6 +279,7 @@ function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOpt
 }
 
 export interface IAsyncDataTreeOptionsUpdate extends IAbstractTreeOptionsUpdate { }
+export interface IAsyncDataTreeUpdateChildrenOptions<T> extends IObjectTreeSetChildrenOptions<T> { }
 
 export interface IAsyncDataTreeOptions<T, TFilterData = void> extends IAsyncDataTreeOptionsUpdate, Pick<IAbstractTreeOptions<T, TFilterData>, Exclude<keyof IAbstractTreeOptions<T, TFilterData>, 'collapseByDefault'>> {
 	readonly collapseByDefault?: { (e: T): boolean; };
@@ -499,11 +500,11 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		}
 	}
 
-	async updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false): Promise<void> {
-		await this._updateChildren(element, recursive, rerender);
+	async updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false, options?: IAsyncDataTreeUpdateChildrenOptions<T>): Promise<void> {
+		await this._updateChildren(element, recursive, rerender, undefined, options);
 	}
 
-	private async _updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): Promise<void> {
+	private async _updateChildren(element: TInput | T = this.root.element, recursive = true, rerender = false, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>, options?: IAsyncDataTreeUpdateChildrenOptions<T>): Promise<void> {
 		if (typeof this.root.element === 'undefined') {
 			throw new TreeError(this.user, 'Tree input not set');
 		}
@@ -514,7 +515,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		}
 
 		const node = this.getDataNode(element);
-		await this.refreshAndRenderNode(node, recursive, viewStateContext);
+		await this.refreshAndRenderNode(node, recursive, viewStateContext, options);
 
 		if (rerender) {
 			try {
@@ -704,9 +705,9 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		return node;
 	}
 
-	private async refreshAndRenderNode(node: IAsyncDataTreeNode<TInput, T>, recursive: boolean, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): Promise<void> {
+	private async refreshAndRenderNode(node: IAsyncDataTreeNode<TInput, T>, recursive: boolean, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>, options?: IAsyncDataTreeUpdateChildrenOptions<T>): Promise<void> {
 		await this.refreshNode(node, recursive, viewStateContext);
-		this.render(node, viewStateContext);
+		this.render(node, viewStateContext, options);
 	}
 
 	private async refreshNode(node: IAsyncDataTreeNode<TInput, T>, recursive: boolean, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): Promise<void> {
@@ -768,8 +769,8 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			const children = await childrenPromise;
 			return this.setChildren(node, children, recursive, viewStateContext);
 		} catch (err) {
-			if (node !== this.root) {
-				this.tree.collapse(node === this.root ? null : node);
+			if (node !== this.root && this.tree.hasElement(node)) {
+				this.tree.collapse(node);
 			}
 
 			if (isPromiseCanceledError(err)) {
@@ -921,9 +922,18 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		return childrenToRefresh;
 	}
 
-	protected render(node: IAsyncDataTreeNode<TInput, T>, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>): void {
+	protected render(node: IAsyncDataTreeNode<TInput, T>, viewStateContext?: IAsyncDataTreeViewStateContext<TInput, T>, options?: IAsyncDataTreeUpdateChildrenOptions<T>): void {
 		const children = node.children.map(node => this.asTreeElement(node, viewStateContext));
-		this.tree.setChildren(node === this.root ? null : node, children);
+		const objectTreeOptions: IObjectTreeSetChildrenOptions<IAsyncDataTreeNode<TInput, T>> | undefined = options && {
+			...options,
+			diffIdentityProvider: options!.diffIdentityProvider && {
+				getId(node: IAsyncDataTreeNode<TInput, T>): { toString(): string; } {
+					return options!.diffIdentityProvider!.getId(node.element as T);
+				}
+			}
+		};
+
+		this.tree.setChildren(node === this.root ? null : node, children, objectTreeOptions);
 
 		if (node !== this.root) {
 			this.tree.setCollapsible(node, node.hasChildren);
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
index 3dc8ab961..dd99d4d6e 100644
--- a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
@@ -6,8 +6,9 @@
 import { Iterable } from 'vs/base/common/iterator';
 import { Event } from 'vs/base/common/event';
 import { ITreeModel, ITreeNode, ITreeElement, ICollapseStateChangeEvent, ITreeModelSpliceEvent, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree';
-import { IObjectTreeModelOptions, ObjectTreeModel, IObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { IObjectTreeModelOptions, ObjectTreeModel, IObjectTreeModel, IObjectTreeModelSetChildrenOptions } from 'vs/base/browser/ui/tree/objectTreeModel';
+import { IIndexTreeModelSpliceOptions, IList } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
 
 // Exported only for test reasons, do not use directly
 export interface ICompressedTreeElement<T> extends ITreeElement<T> {
@@ -108,6 +109,12 @@ interface ICompressedObjectTreeModelOptions<T, TFilterData> extends IObjectTreeM
 	readonly compressionEnabled?: boolean;
 }
 
+const wrapIdentityProvider = <T>(base: IIdentityProvider<T>): IIdentityProvider<ICompressedTreeNode<T>> => ({
+	getId(node) {
+		return node.elements.map(e => base.getId(e).toString()).join('\0');
+	}
+});
+
 // Exported only for test reasons, do not use directly
 export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements ITreeModel<ICompressedTreeNode<T> | null, TFilterData, T | null> {
 
@@ -120,6 +127,7 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 	private model: ObjectTreeModel<ICompressedTreeNode<T>, TFilterData>;
 	private nodes = new Map<T | null, ICompressedTreeNode<T>>();
 	private enabled: boolean;
+	private readonly identityProvider?: IIdentityProvider<ICompressedTreeNode<T>>;
 
 	get size(): number { return this.nodes.size; }
 
@@ -130,15 +138,21 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 	) {
 		this.model = new ObjectTreeModel(user, list, options);
 		this.enabled = typeof options.compressionEnabled === 'undefined' ? true : options.compressionEnabled;
+		this.identityProvider = options.identityProvider;
 	}
 
 	setChildren(
 		element: T | null,
-		children: Iterable<ICompressedTreeElement<T>> = Iterable.empty()
+		children: Iterable<ICompressedTreeElement<T>> = Iterable.empty(),
+		options: IObjectTreeModelSetChildrenOptions<T, TFilterData>,
 	): void {
+		// Diffs must be deem, since the compression can affect nested elements.
+		// @see https://github.com/microsoft/vscode/pull/114237#issuecomment-759425034
+
+		const diffIdentityProvider = options.diffIdentityProvider && wrapIdentityProvider(options.diffIdentityProvider);
 		if (element === null) {
 			const compressedChildren = Iterable.map(children, this.enabled ? compress : noCompress);
-			this._setChildren(null, compressedChildren);
+			this._setChildren(null, compressedChildren, { diffIdentityProvider, diffDepth: Infinity });
 			return;
 		}
 
@@ -159,7 +173,10 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 		const parentChildren = parent.children
 			.map(child => child === node ? recompressedElement : child);
 
-		this._setChildren(parent.element, parentChildren);
+		this._setChildren(parent.element, parentChildren, {
+			diffIdentityProvider,
+			diffDepth: node.depth - parent.depth,
+		});
 	}
 
 	isCompressionEnabled(): boolean {
@@ -177,22 +194,29 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 		const rootChildren = root.children as ITreeNode<ICompressedTreeNode<T>>[];
 		const decompressedRootChildren = Iterable.map(rootChildren, decompress);
 		const recompressedRootChildren = Iterable.map(decompressedRootChildren, enabled ? compress : noCompress);
-		this._setChildren(null, recompressedRootChildren);
+
+		// it should be safe to always use deep diff mode here if an identity
+		// provider is available, since we know the raw nodes are unchanged.
+		this._setChildren(null, recompressedRootChildren, {
+			diffIdentityProvider: this.identityProvider,
+			diffDepth: Infinity,
+		});
 	}
 
 	private _setChildren(
 		node: ICompressedTreeNode<T> | null,
-		children: Iterable<ITreeElement<ICompressedTreeNode<T>>>
+		children: Iterable<ITreeElement<ICompressedTreeNode<T>>>,
+		options: IIndexTreeModelSpliceOptions<ICompressedTreeNode<T>, TFilterData>,
 	): void {
 		const insertedElements = new Set<T | null>();
-		const _onDidCreateNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
+		const onDidCreateNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
 			for (const element of node.element.elements) {
 				insertedElements.add(element);
 				this.nodes.set(element, node.element);
 			}
 		};
 
-		const _onDidDeleteNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
+		const onDidDeleteNode = (node: ITreeNode<ICompressedTreeNode<T>, TFilterData>) => {
 			for (const element of node.element.elements) {
 				if (!insertedElements.has(element)) {
 					this.nodes.delete(element);
@@ -200,7 +224,7 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 			}
 		};
 
-		this.model.setChildren(node, children, _onDidCreateNode, _onDidDeleteNode);
+		this.model.setChildren(node, children, { ...options, onDidCreateNode, onDidDeleteNode });
 	}
 
 	has(element: T | null): boolean {
@@ -363,16 +387,16 @@ function mapList<T, TFilterData>(nodeMapper: CompressedNodeWeakMapper<T, TFilter
 function mapOptions<T, TFilterData>(compressedNodeUnwrapper: CompressedNodeUnwrapper<T>, options: ICompressibleObjectTreeModelOptions<T, TFilterData>): ICompressedObjectTreeModelOptions<T, TFilterData> {
 	return {
 		...options,
-		sorter: options.sorter && {
-			compare(node: ICompressedTreeNode<T>, otherNode: ICompressedTreeNode<T>): number {
-				return options.sorter!.compare(node.elements[0], otherNode.elements[0]);
-			}
-		},
 		identityProvider: options.identityProvider && {
 			getId(node: ICompressedTreeNode<T>): { toString(): string; } {
 				return options.identityProvider!.getId(compressedNodeUnwrapper(node));
 			}
 		},
+		sorter: options.sorter && {
+			compare(node: ICompressedTreeNode<T>, otherNode: ICompressedTreeNode<T>): number {
+				return options.sorter!.compare(node.elements[0], otherNode.elements[0]);
+			}
+		},
 		filter: options.filter && {
 			filter(node: ICompressedTreeNode<T>, parentVisibility: TreeVisibility): TreeFilterResult<TFilterData> {
 				return options.filter!.filter(compressedNodeUnwrapper(node), parentVisibility);
@@ -424,8 +448,12 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 		this.model = new CompressedObjectTreeModel(user, mapList(this.nodeMapper, list), mapOptions(compressedNodeUnwrapper, options));
 	}
 
-	setChildren(element: T | null, children: Iterable<ICompressedTreeElement<T>> = Iterable.empty()): void {
-		this.model.setChildren(element, children);
+	setChildren(
+		element: T | null,
+		children: Iterable<ICompressedTreeElement<T>> = Iterable.empty(),
+		options: IObjectTreeModelSetChildrenOptions<T, TFilterData> = {},
+	): void {
+		this.model.setChildren(element, children, options);
 	}
 
 	isCompressionEnabled(): boolean {
diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts
index 4e97f4ed9..b548e2e3d 100644
--- a/src/vs/base/browser/ui/tree/dataTree.ts
+++ b/src/vs/base/browser/ui/tree/dataTree.ts
@@ -47,13 +47,19 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
 		return this.input;
 	}
 
-	setInput(input: TInput, viewState?: IDataTreeViewState): void {
+	setInput(input: TInput | undefined, viewState?: IDataTreeViewState): void {
 		if (viewState && !this.identityProvider) {
 			throw new TreeError(this.user, 'Can\'t restore tree view state without an identity provider');
 		}
 
 		this.input = input;
 
+		if (!input) {
+			this.nodesByIdentity.clear();
+			this.model.setChildren(null, Iterable.empty());
+			return;
+		}
+
 		if (!viewState) {
 			this._refresh(input);
 			return;
@@ -155,7 +161,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
 			};
 		}
 
-		this.model.setChildren((element === this.input ? null : element) as T, this.iterate(element, isCollapsed).elements, onDidCreateNode, onDidDeleteNode);
+		this.model.setChildren((element === this.input ? null : element) as T, this.iterate(element, isCollapsed).elements, { onDidCreateNode, onDidDeleteNode });
 	}
 
 	private iterate(element: TInput | T, isCollapsed?: (el: T) => boolean | undefined): { elements: Iterable<ITreeElement<T>>, size: number } {
diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts
index 362ef7e1a..f72d4956c 100644
--- a/src/vs/base/browser/ui/tree/indexTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/indexTreeModel.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
 import { ICollapseStateChangeEvent, ITreeElement, ITreeFilter, ITreeFilterDataResult, ITreeModel, ITreeNode, TreeVisibility, ITreeModelSpliceEvent, TreeError } from 'vs/base/browser/ui/tree/tree';
 import { tail2 } from 'vs/base/common/arrays';
+import { LcsDiff } from 'vs/base/common/diff/diff';
 import { Emitter, Event, EventBufferer } from 'vs/base/common/event';
 import { Iterable } from 'vs/base/common/iterator';
 import { ISpliceable } from 'vs/base/common/sequence';
@@ -41,6 +43,34 @@ export interface IIndexTreeModelOptions<T, TFilterData> {
 	readonly autoExpandSingleChildren?: boolean;
 }
 
+export interface IIndexTreeModelSpliceOptions<T, TFilterData> {
+	/**
+	 * If set, child updates will recurse the given number of levels even if
+	 * items in the splice operation are unchanged. `Infinity` is a valid value.
+	 */
+	readonly diffDepth?: number;
+
+	/**
+	 * Identity provider used to optimize splice() calls in the IndexTree. If
+	 * this is not present, optimized splicing is not enabled.
+	 *
+	 * Warning: if this is present, calls to `setChildren()` will not replace
+	 * or update nodes if their identity is the same, even if the elements are
+	 * different. For this, you should call `rerender()`.
+	 */
+	readonly diffIdentityProvider?: IIdentityProvider<T>;
+
+	/**
+	 * Callback for when a node is created.
+	 */
+	onDidCreateNode?: (node: ITreeNode<T, TFilterData>) => void;
+
+	/**
+	 * Callback for when a node is deleted.
+	 */
+	onDidDeleteNode?: (node: ITreeNode<T, TFilterData>) => void
+}
+
 interface CollapsibleStateUpdate {
 	readonly collapsible: boolean;
 }
@@ -110,18 +140,95 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		location: number[],
 		deleteCount: number,
 		toInsert: Iterable<ITreeElement<T>> = Iterable.empty(),
-		onDidCreateNode?: (node: ITreeNode<T, TFilterData>) => void,
-		onDidDeleteNode?: (node: ITreeNode<T, TFilterData>) => void
+		options: IIndexTreeModelSpliceOptions<T, TFilterData> = {},
 	): void {
 		if (location.length === 0) {
 			throw new TreeError(this.user, 'Invalid tree location');
 		}
 
+		if (options.diffIdentityProvider) {
+			this.spliceSmart(options.diffIdentityProvider, location, deleteCount, toInsert, options);
+		} else {
+			this.spliceSimple(location, deleteCount, toInsert, options);
+		}
+	}
+
+	private spliceSmart(
+		identity: IIdentityProvider<T>,
+		location: number[],
+		deleteCount: number,
+		toInsertIterable: Iterable<ITreeElement<T>> = Iterable.empty(),
+		options: IIndexTreeModelSpliceOptions<T, TFilterData>,
+		recurseLevels = options.diffDepth ?? 0,
+	) {
+		const { parentNode } = this.getParentNodeWithListIndex(location);
+		const toInsert = [...toInsertIterable];
+		const index = location[location.length - 1];
+		const diff = new LcsDiff(
+			{ getElements: () => parentNode.children.map(e => identity.getId(e.element).toString()) },
+			{
+				getElements: () => [
+					...parentNode.children.slice(0, index),
+					...toInsert,
+					...parentNode.children.slice(index + deleteCount),
+				].map(e => identity.getId(e.element).toString())
+			},
+		).ComputeDiff(false);
+
+		// if we were given a 'best effort' diff, use default behavior
+		if (diff.quitEarly) {
+			return this.spliceSimple(location, deleteCount, toInsert, options);
+		}
+
+		const locationPrefix = location.slice(0, -1);
+		const recurseSplice = (fromOriginal: number, fromModified: number, count: number) => {
+			if (recurseLevels > 0) {
+				for (let i = 0; i < count; i++) {
+					fromOriginal--;
+					fromModified--;
+					this.spliceSmart(
+						identity,
+						[...locationPrefix, fromOriginal, 0],
+						Number.MAX_SAFE_INTEGER,
+						toInsert[fromModified].children,
+						options,
+						recurseLevels - 1,
+					);
+				}
+			}
+		};
+
+		let lastStartO = Math.min(parentNode.children.length, index + deleteCount);
+		let lastStartM = toInsert.length;
+		for (const change of diff.changes.sort((a, b) => b.originalStart - a.originalStart)) {
+			recurseSplice(lastStartO, lastStartM, lastStartO - (change.originalStart + change.originalLength));
+			lastStartO = change.originalStart;
+			lastStartM = change.modifiedStart - index;
+
+			this.spliceSimple(
+				[...locationPrefix, lastStartO],
+				change.originalLength,
+				Iterable.slice(toInsert, lastStartM, lastStartM + change.modifiedLength),
+				options,
+			);
+		}
+
+		// at this point, startO === startM === count since any remaining prefix should match
+		recurseSplice(lastStartO, lastStartM, lastStartO);
+	}
+
+	private spliceSimple(
+		location: number[],
+		deleteCount: number,
+		toInsert: Iterable<ITreeElement<T>> = Iterable.empty(),
+		{ onDidCreateNode, onDidDeleteNode }: IIndexTreeModelSpliceOptions<T, TFilterData>,
+	) {
 		const { parentNode, listIndex, revealed, visible } = this.getParentNodeWithListIndex(location);
 		const treeListElementsToInsert: ITreeNode<T, TFilterData>[] = [];
 		const nodesToInsertIterator = Iterable.map(toInsert, el => this.createTreeNode(el, parentNode, parentNode.visible ? TreeVisibility.Visible : TreeVisibility.Hidden, revealed, treeListElementsToInsert, onDidCreateNode));
 
 		const lastIndex = location[location.length - 1];
+		const lastHadChildren = parentNode.children.length > 0;
 
 		// figure out what's the visible child start index right before the
 		// splice point
@@ -190,6 +297,11 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 			deletedNodes.forEach(visit);
 		}
 
+		const currentlyHasChildren = parentNode.children.length > 0;
+		if (lastHadChildren !== currentlyHasChildren) {
+			this.setCollapsible(location.slice(0, -1), currentlyHasChildren);
+		}
+
 		this._onDidSplice.fire({ insertedNodes: nodesToInsert, deletedNodes });
 
 		let node: IIndexTreeNode<T, TFilterData> | undefined = parentNode;
diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts
index db1c98a06..633d8ca7e 100644
--- a/src/vs/base/browser/ui/tree/objectTree.ts
+++ b/src/vs/base/browser/ui/tree/objectTree.ts
@@ -7,7 +7,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { AbstractTree, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree';
 import { ITreeNode, ITreeModel, ITreeElement, ITreeRenderer, ITreeSorter, ICollapseStateChangeEvent } from 'vs/base/browser/ui/tree/tree';
 import { ObjectTreeModel, IObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
-import { IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
+import { IListVirtualDelegate, IKeyboardNavigationLabelProvider, IIdentityProvider } from 'vs/base/browser/ui/list/list';
 import { Event } from 'vs/base/common/event';
 import { CompressibleObjectTreeModel, ElementMapper, ICompressedTreeNode, ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import { memoize } from 'vs/base/common/decorators';
@@ -17,6 +17,25 @@ export interface IObjectTreeOptions<T, TFilterData = void> extends IAbstractTree
 	readonly sorter?: ITreeSorter<T>;
 }
 
+export interface IObjectTreeSetChildrenOptions<T> {
+
+	/**
+	 * If set, child updates will recurse the given number of levels even if
+	 * items in the splice operation are unchanged. `Infinity` is a valid value.
+	 */
+	readonly diffDepth?: number;
+
+	/**
+	 * Identity provider used to optimize splice() calls in the IndexTree. If
+	 * this is not present, optimized splicing is not enabled.
+	 *
+	 * Warning: if this is present, calls to `setChildren()` will not replace
+	 * or update nodes if their identity is the same, even if the elements are
+	 * different. For this, you should call `rerender()`.
+	 */
+	readonly diffIdentityProvider?: IIdentityProvider<T>;
+}
+
 export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
 
 	protected model!: IObjectTreeModel<T, TFilterData>;
@@ -33,8 +52,8 @@ export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends
 		super(user, container, delegate, renderers, options as IObjectTreeOptions<T | null, TFilterData>);
 	}
 
-	setChildren(element: T | null, children: Iterable<ITreeElement<T>> = Iterable.empty()): void {
-		this.model.setChildren(element, children);
+	setChildren(element: T | null, children: Iterable<ITreeElement<T>> = Iterable.empty(), options?: IObjectTreeSetChildrenOptions<T>): void {
+		this.model.setChildren(element, children, options);
 	}
 
 	rerender(element?: T): void {
@@ -189,8 +208,8 @@ export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = vo
 		super(user, container, delegate, compressibleRenderers, asObjectTreeOptions<T, TFilterData>(compressedTreeNodeProvider, options));
 	}
 
-	setChildren(element: T | null, children: Iterable<ICompressedTreeElement<T>> = Iterable.empty()): void {
-		this.model.setChildren(element, children);
+	setChildren(element: T | null, children: Iterable<ICompressedTreeElement<T>> = Iterable.empty(), options?: IObjectTreeSetChildrenOptions<T>): void {
+		this.model.setChildren(element, children, options);
 	}
 
 	protected createModel(user: string, view: IList<ITreeNode<T, TFilterData>>, options: ICompressibleObjectTreeOptions<T, TFilterData>): ITreeModel<T | null, TFilterData, T | null> {
diff --git a/src/vs/base/browser/ui/tree/objectTreeModel.ts b/src/vs/base/browser/ui/tree/objectTreeModel.ts
index 59afa8d4b..e618e3be3 100644
--- a/src/vs/base/browser/ui/tree/objectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/objectTreeModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Iterable } from 'vs/base/common/iterator';
-import { IndexTreeModel, IIndexTreeModelOptions, IList } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { IndexTreeModel, IIndexTreeModelOptions, IList, IIndexTreeModelSpliceOptions } from 'vs/base/browser/ui/tree/indexTreeModel';
 import { Event } from 'vs/base/common/event';
 import { ITreeModel, ITreeNode, ITreeElement, ITreeSorter, ICollapseStateChangeEvent, ITreeModelSpliceEvent, TreeError } from 'vs/base/browser/ui/tree/tree';
 import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
@@ -13,11 +13,14 @@ import { mergeSort } from 'vs/base/common/arrays';
 export type ITreeNodeCallback<T, TFilterData> = (node: ITreeNode<T, TFilterData>) => void;
 
 export interface IObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> extends ITreeModel<T | null, TFilterData, T | null> {
-	setChildren(element: T | null, children: Iterable<ITreeElement<T>> | undefined): void;
+	setChildren(element: T | null, children: Iterable<ITreeElement<T>> | undefined, options?: IObjectTreeModelSetChildrenOptions<T, TFilterData>): void;
 	resort(element?: T | null, recursive?: boolean): void;
 	updateElementHeight(element: T, height: number): void;
 }
 
+export interface IObjectTreeModelSetChildrenOptions<T, TFilterData> extends IIndexTreeModelSpliceOptions<T, TFilterData> {
+}
+
 export interface IObjectTreeModelOptions<T, TFilterData> extends IIndexTreeModelOptions<T, TFilterData> {
 	readonly sorter?: ITreeSorter<T>;
 	readonly identityProvider?: IIdentityProvider<T>;
@@ -63,23 +66,21 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 	setChildren(
 		element: T | null,
 		children: Iterable<ITreeElement<T>> = Iterable.empty(),
-		onDidCreateNode?: ITreeNodeCallback<T, TFilterData>,
-		onDidDeleteNode?: ITreeNodeCallback<T, TFilterData>
+		options: IObjectTreeModelSetChildrenOptions<T, TFilterData> = {},
 	): void {
 		const location = this.getElementLocation(element);
-		this._setChildren(location, this.preserveCollapseState(children), onDidCreateNode, onDidDeleteNode);
+		this._setChildren(location, this.preserveCollapseState(children), options);
 	}
 
 	private _setChildren(
 		location: number[],
 		children: Iterable<ITreeElement<T>> = Iterable.empty(),
-		onDidCreateNode?: ITreeNodeCallback<T, TFilterData>,
-		onDidDeleteNode?: ITreeNodeCallback<T, TFilterData>
+		options: IObjectTreeModelSetChildrenOptions<T, TFilterData>,
 	): void {
 		const insertedElements = new Set<T | null>();
 		const insertedElementIds = new Set<string>();
 
-		const _onDidCreateNode = (node: ITreeNode<T | null, TFilterData>) => {
+		const onDidCreateNode = (node: ITreeNode<T | null, TFilterData>) => {
 			if (node.element === null) {
 				return;
 			}
@@ -95,12 +96,10 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 				this.nodesByIdentity.set(id, tnode);
 			}
 
-			if (onDidCreateNode) {
-				onDidCreateNode(tnode);
-			}
+			options.onDidCreateNode?.(tnode);
 		};
 
-		const _onDidDeleteNode = (node: ITreeNode<T | null, TFilterData>) => {
+		const onDidDeleteNode = (node: ITreeNode<T | null, TFilterData>) => {
 			if (node.element === null) {
 				return;
 			}
@@ -118,17 +117,14 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 				}
 			}
 
-			if (onDidDeleteNode) {
-				onDidDeleteNode(tnode);
-			}
+			options.onDidDeleteNode?.(tnode);
 		};
 
 		this.model.splice(
 			[...location, 0],
 			Number.MAX_VALUE,
 			children,
-			_onDidCreateNode,
-			_onDidDeleteNode
+			{ ...options, onDidCreateNode, onDidDeleteNode }
 		);
 	}
 
@@ -182,7 +178,7 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		const location = this.getElementLocation(element);
 		const node = this.model.getNode(location);
 
-		this._setChildren(location, this.resortChildren(node, recursive));
+		this._setChildren(location, this.resortChildren(node, recursive), {});
 	}
 
 	private resortChildren(node: ITreeNode<T | null, TFilterData>, recursive: boolean, first = true): Iterable<ITreeElement<T>> {
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index 8be6f19af..41b0fd824 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -14,8 +14,8 @@ export interface ITelemetryData {
 }
 
 export type WorkbenchActionExecutedClassification = {
-	id: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-	from: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	id: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
+	from: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
 };
 
 export type WorkbenchActionExecutedEvent = {
@@ -63,7 +63,7 @@ export interface IActionChangeEvent {
 export class Action extends Disposable implements IAction {
 
 	protected _onDidChange = this._register(new Emitter<IActionChangeEvent>());
-	readonly onDidChange: Event<IActionChangeEvent> = this._onDidChange.event;
+	readonly onDidChange = this._onDidChange.event;
 
 	protected readonly _id: string;
 	protected _label: string;
@@ -179,10 +179,10 @@ export interface IRunEvent {
 export class ActionRunner extends Disposable implements IActionRunner {
 
 	private _onBeforeRun = this._register(new Emitter<IRunEvent>());
-	readonly onBeforeRun: Event<IRunEvent> = this._onBeforeRun.event;
+	readonly onBeforeRun = this._onBeforeRun.event;
 
 	private _onDidRun = this._register(new Emitter<IRunEvent>());
-	readonly onDidRun: Event<IRunEvent> = this._onDidRun.event;
+	readonly onDidRun = this._onDidRun.event;
 
 	async run(action: IAction, context?: any): Promise<any> {
 		if (!action.enabled) {
@@ -246,15 +246,35 @@ export class ActionWithMenuAction extends Action {
 	}
 }
 
-export class SubmenuAction extends Action {
+export class SubmenuAction implements IAction {
 
-	get actions(): IAction[] {
+	readonly id: string;
+	readonly label: string;
+	readonly class: string | undefined;
+	readonly tooltip: string = '';
+	readonly enabled: boolean = true;
+	readonly checked: boolean = false;
+
+	private readonly _actions: readonly IAction[];
+
+	constructor(id: string, label: string, actions: readonly IAction[], cssClass?: string) {
+		this.id = id;
+		this.label = label;
+		this.class = cssClass;
+		this._actions = actions;
+	}
+
+	dispose(): void {
+		// there is NOTHING to dispose and the SubmenuAction should
+		// never have anything to dispose as it is a convenience type
+		// to bridge into the rendering world.
+	}
+
+	get actions(): readonly IAction[] {
 		return this._actions;
 	}
 
-	constructor(id: string, label: string, private _actions: IAction[], cssClass?: string) {
-		super(id, label, cssClass, !!_actions?.length);
-	}
+	async run(): Promise<any> { }
 }
 
 export class EmptySubmenuAction extends Action {
@@ -263,3 +283,16 @@ export class EmptySubmenuAction extends Action {
 		super(EmptySubmenuAction.ID, nls.localize('submenu.empty', '(empty)'), undefined, false);
 	}
 }
+
+export function toAction(props: { id: string, label: string, enabled?: boolean, checked?: boolean, run: Function; }): IAction {
+	return {
+		id: props.id,
+		label: props.label,
+		class: undefined,
+		enabled: props.enabled ?? true,
+		checked: props.checked ?? false,
+		run: async () => props.run(),
+		tooltip: props.label,
+		dispose: () => { }
+	};
+}
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 167a47d15..b0da12183 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -152,13 +152,13 @@ export class Throttler {
 					return result;
 				};
 
-				this.queuedPromise = new Promise(c => {
-					this.activePromise!.then(onComplete, onComplete).then(c);
+				this.queuedPromise = new Promise(resolve => {
+					this.activePromise!.then(onComplete, onComplete).then(resolve);
 				});
 			}
 
-			return new Promise((c, e) => {
-				this.queuedPromise!.then(c, e);
+			return new Promise((resolve, reject) => {
+				this.queuedPromise!.then(resolve, reject);
 			});
 		}
 
@@ -181,7 +181,7 @@ export class Sequencer {
 	private current: Promise<any> = Promise.resolve(null);
 
 	queue<T>(promiseTask: ITask<Promise<T>>): Promise<T> {
-		return this.current = this.current.then(() => promiseTask());
+		return this.current = this.current.then(() => promiseTask(), () => promiseTask());
 	}
 }
 
@@ -205,7 +205,7 @@ export class SequencerByKey<TKey> {
 }
 
 /**
- * A helper to delay execution of a task that is being requested often.
+ * A helper to delay (debounce) execution of a task that is being requested often.
  *
  * Following the throttler, now imagine the mail man wants to optimize the number of
  * trips proactively. The trip itself can be long, so he decides not to make the trip
@@ -248,9 +248,9 @@ export class Delayer<T> implements IDisposable {
 		this.cancelTimeout();
 
 		if (!this.completionPromise) {
-			this.completionPromise = new Promise((c, e) => {
-				this.doResolve = c;
-				this.doReject = e;
+			this.completionPromise = new Promise((resolve, reject) => {
+				this.doResolve = resolve;
+				this.doReject = reject;
 			}).then(() => {
 				this.completionPromise = null;
 				this.doResolve = null;
@@ -1013,3 +1013,61 @@ export class IntervalCounter {
 }
 
 //#endregion
+
+export type ValueCallback<T = any> = (value: T | Promise<T>) => void;
+
+/**
+ * Creates a promise whose resolution or rejection can be controlled imperatively.
+ */
+export class DeferredPromise<T> {
+
+	private completeCallback!: ValueCallback<T>;
+	private errorCallback!: (err: any) => void;
+	private rejected = false;
+	private resolved = false;
+
+	public get isRejected() {
+		return this.rejected;
+	}
+
+	public get isResolved() {
+		return this.resolved;
+	}
+
+	public get isSettled() {
+		return this.rejected || this.resolved;
+	}
+
+	public p: Promise<T>;
+
+	constructor() {
+		this.p = new Promise<T>((c, e) => {
+			this.completeCallback = c;
+			this.errorCallback = e;
+		});
+	}
+
+	public complete(value: T) {
+		return new Promise<void>(resolve => {
+			this.completeCallback(value);
+			this.resolved = true;
+			resolve();
+		});
+	}
+
+	public error(err: any) {
+		return new Promise<void>(resolve => {
+			this.errorCallback(err);
+			this.rejected = true;
+			resolve();
+		});
+	}
+
+	public cancel() {
+		new Promise<void>(resolve => {
+			this.errorCallback(errors.canceled());
+			this.rejected = true;
+			resolve();
+		});
+	}
+}
diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts
index 6c6285e0c..9df28d9b4 100644
--- a/src/vs/base/common/buffer.ts
+++ b/src/vs/base/common/buffer.ts
@@ -34,8 +34,9 @@ export class VSBuffer {
 		return new VSBuffer(actual);
 	}
 
-	static fromString(source: string): VSBuffer {
-		if (hasBuffer) {
+	static fromString(source: string, options?: { dontUseNodeBuffer?: boolean; }): VSBuffer {
+		const dontUseNodeBuffer = options?.dontUseNodeBuffer || false;
+		if (!dontUseNodeBuffer && hasBuffer) {
 			return new VSBuffer(Buffer.from(source));
 		} else if (hasTextEncoder) {
 			if (!textEncoder) {
diff --git a/src/vs/base/common/codicon.ts b/src/vs/base/common/codicon.ts
deleted file mode 100644
index 5b3541125..000000000
--- a/src/vs/base/common/codicon.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { matchesFuzzy, IMatch } from 'vs/base/common/filters';
-import { ltrim } from 'vs/base/common/strings';
-
-export const codiconStartMarker = '$(';
-
-export interface IParsedCodicons {
-	readonly text: string;
-	readonly codiconOffsets?: readonly number[];
-}
-
-export function parseCodicons(text: string): IParsedCodicons {
-	const firstCodiconIndex = text.indexOf(codiconStartMarker);
-	if (firstCodiconIndex === -1) {
-		return { text }; // return early if the word does not include an codicon
-	}
-
-	return doParseCodicons(text, firstCodiconIndex);
-}
-
-function doParseCodicons(text: string, firstCodiconIndex: number): IParsedCodicons {
-	const codiconOffsets: number[] = [];
-	let textWithoutCodicons: string = '';
-
-	function appendChars(chars: string) {
-		if (chars) {
-			textWithoutCodicons += chars;
-
-			for (const _ of chars) {
-				codiconOffsets.push(codiconsOffset); // make sure to fill in codicon offsets
-			}
-		}
-	}
-
-	let currentCodiconStart = -1;
-	let currentCodiconValue: string = '';
-	let codiconsOffset = 0;
-
-	let char: string;
-	let nextChar: string;
-
-	let offset = firstCodiconIndex;
-	const length = text.length;
-
-	// Append all characters until the first codicon
-	appendChars(text.substr(0, firstCodiconIndex));
-
-	// example: $(file-symlink-file) my cool $(other-codicon) entry
-	while (offset < length) {
-		char = text[offset];
-		nextChar = text[offset + 1];
-
-		// beginning of codicon: some value $( <--
-		if (char === codiconStartMarker[0] && nextChar === codiconStartMarker[1]) {
-			currentCodiconStart = offset;
-
-			// if we had a previous potential codicon value without
-			// the closing ')', it was actually not an codicon and
-			// so we have to add it to the actual value
-			appendChars(currentCodiconValue);
-
-			currentCodiconValue = codiconStartMarker;
-
-			offset++; // jump over '('
-		}
-
-		// end of codicon: some value $(some-codicon) <--
-		else if (char === ')' && currentCodiconStart !== -1) {
-			const currentCodiconLength = offset - currentCodiconStart + 1; // +1 to include the closing ')'
-			codiconsOffset += currentCodiconLength;
-			currentCodiconStart = -1;
-			currentCodiconValue = '';
-		}
-
-		// within codicon
-		else if (currentCodiconStart !== -1) {
-			// Make sure this is a real codicon name
-			if (/^[a-z0-9\-]$/i.test(char)) {
-				currentCodiconValue += char;
-			} else {
-				// This is not a real codicon, treat it as text
-				appendChars(currentCodiconValue);
-
-				currentCodiconStart = -1;
-				currentCodiconValue = '';
-			}
-		}
-
-		// any value outside of codicons
-		else {
-			appendChars(char);
-		}
-
-		offset++;
-	}
-
-	// if we had a previous potential codicon value without
-	// the closing ')', it was actually not an codicon and
-	// so we have to add it to the actual value
-	appendChars(currentCodiconValue);
-
-	return { text: textWithoutCodicons, codiconOffsets };
-}
-
-export function matchesFuzzyCodiconAware(query: string, target: IParsedCodicons, enableSeparateSubstringMatching = false): IMatch[] | null {
-	const { text, codiconOffsets } = target;
-
-	// Return early if there are no codicon markers in the word to match against
-	if (!codiconOffsets || codiconOffsets.length === 0) {
-		return matchesFuzzy(query, text, enableSeparateSubstringMatching);
-	}
-
-	// Trim the word to match against because it could have leading
-	// whitespace now if the word started with an codicon
-	const wordToMatchAgainstWithoutCodiconsTrimmed = ltrim(text, ' ');
-	const leadingWhitespaceOffset = text.length - wordToMatchAgainstWithoutCodiconsTrimmed.length;
-
-	// match on value without codicons
-	const matches = matchesFuzzy(query, wordToMatchAgainstWithoutCodiconsTrimmed, enableSeparateSubstringMatching);
-
-	// Map matches back to offsets with codicons and trimming
-	if (matches) {
-		for (const match of matches) {
-			const codiconOffset = codiconOffsets[match.start + leadingWhitespaceOffset] /* codicon offsets at index */ + leadingWhitespaceOffset /* overall leading whitespace offset */;
-			match.start += codiconOffset;
-			match.end += codiconOffset;
-		}
-	}
-
-	return matches;
-}
diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts
index 8681df323..094951fa8 100644
--- a/src/vs/base/common/codicons.ts
+++ b/src/vs/base/common/codicons.ts
@@ -3,9 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { codiconStartMarker } from 'vs/base/common/codicon';
 import { Emitter, Event } from 'vs/base/common/event';
-import { localize } from 'vs/nls';
 
 export interface IIconRegistry {
 	readonly all: IterableIterator<Codicon>;
@@ -47,8 +45,8 @@ const _registry = new Registry();
 
 export const iconRegistry: IIconRegistry = _registry;
 
-export function registerCodicon(id: string, def: Codicon, description?: string): Codicon {
-	return new Codicon(id, def, description);
+export function registerCodicon(id: string, def: Codicon): Codicon {
+	return new Codicon(id, def);
 }
 
 export class Codicon implements CSSIcon {
@@ -61,8 +59,44 @@ export class Codicon implements CSSIcon {
 	public get cssSelector() { return '.codicon.codicon-' + this.id; }
 }
 
+export function getClassNamesArray(id: string, modifier?: string) {
+	const classNames = ['codicon', 'codicon-' + id];
+	if (modifier) {
+		classNames.push('codicon-modifier-' + modifier);
+	}
+	return classNames;
+}
+
 export interface CSSIcon {
-	readonly classNames: string;
+	readonly id: string;
+}
+
+export namespace CSSIcon {
+	export const iconIdRegex = /^(codicon\/)?([a-z\-]+)(?:~([a-z\-]+))?$/i;
+
+	export function asClassNameArray(icon: CSSIcon): string[] {
+		if (icon instanceof Codicon) {
+			return ['codicon', 'codicon-' + icon.id];
+		}
+		const match = iconIdRegex.exec(icon.id);
+		if (!match) {
+			return asClassNameArray(Codicon.error);
+		}
+		let [, , id, modifier] = match;
+		const classNames = ['codicon', 'codicon-' + id];
+		if (modifier) {
+			classNames.push('codicon-modifier-' + modifier);
+		}
+		return classNames;
+	}
+
+	export function asClassName(icon: CSSIcon): string {
+		return asClassNameArray(icon).join(' ');
+	}
+
+	export function asCSSSelector(icon: CSSIcon): string {
+		return '.' + asClassNameArray(icon).join('.');
+	}
 }
 
 
@@ -497,36 +531,15 @@ export namespace Codicon {
 	export const passFilled = new Codicon('pass-filled', { character: '\\ebb3' });
 	export const circleLargeFilled = new Codicon('circle-large-filled', { character: '\\ebb4' });
 	export const circleLargeOutline = new Codicon('circle-large-outline', { character: '\\ebb5' });
+	export const combine = new Codicon('combine', { character: '\\ebb6' });
+	export const gather = new Codicon('gather', { character: '\\ebb6' });
+	export const table = new Codicon('table', { character: '\\ebb7' });
+	export const variableGroup = new Codicon('variable-group', { character: '\\ebb8' });
+	export const typeHierarchy = new Codicon('type-hierarchy', { character: '\\ebb9' });
+	export const typeHierarchySub = new Codicon('type-hierarchy-sub', { character: '\\ebba' });
+	export const typeHierarchySuper = new Codicon('type-hierarchy-super', { character: '\\ebbb' });
+	export const gitPullRequestCreate = new Codicon('git-pull-request-create', { character: '\\ebbc' });
 
-	export const dropDownButton = new Codicon('drop-down-button', Codicon.chevronDown.definition, localize('dropDownButton', 'Icon for drop down buttons.'));
+	export const dropDownButton = new Codicon('drop-down-button', Codicon.chevronDown.definition);
 }
 
-// common icons
-
-
-
-
-const escapeCodiconsRegex = /(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi;
-export function escapeCodicons(text: string): string {
-	return text.replace(escapeCodiconsRegex, (match, escaped) => escaped ? match : `\\${match}`);
-}
-
-const markdownEscapedCodiconsRegex = /\\\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi;
-export function markdownEscapeEscapedCodicons(text: string): string {
-	// Need to add an extra \ for escaping in markdown
-	return text.replace(markdownEscapedCodiconsRegex, match => `\\${match}`);
-}
-
-const markdownUnescapeCodiconsRegex = /(\\)?\$\\\(([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?)\\\)/gi;
-export function markdownUnescapeCodicons(text: string): string {
-	return text.replace(markdownUnescapeCodiconsRegex, (match, escaped, codicon) => escaped ? match : `$(${codicon})`);
-}
-
-const stripCodiconsRegex = /(\s)?(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)(\s)?/gi;
-export function stripCodicons(text: string): string {
-	if (text.indexOf(codiconStartMarker) === -1) {
-		return text;
-	}
-
-	return text.replace(stripCodiconsRegex, (match, preWhitespace, escaped, postWhitespace) => escaped ? match : preWhitespace || postWhitespace || '');
-}
diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index f6d4f5cf8..8c8e874e8 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -142,6 +142,15 @@ export function isPromiseCanceledError(error: any): boolean {
 	return error instanceof Error && error.name === canceledName && error.message === canceledName;
 }
 
+// !!!IMPORTANT!!!
+// Do NOT change this class because it is also used as an API-type.
+export class CancellationError extends Error {
+	constructor() {
+		super(canceledName);
+		this.name = this.message;
+	}
+}
+
 /**
  * Returns an error that signals cancellation.
  */
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 6a69c0e6a..b433d1a32 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -8,6 +8,7 @@ import { once as onceFn } from 'vs/base/common/functional';
 import { Disposable, IDisposable, toDisposable, combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { StopWatch } from 'vs/base/common/stopwatch';
 
 /**
  * To an event a function with one or zero parameters
@@ -374,7 +375,7 @@ export namespace Event {
 	}
 
 	export function toPromise<T>(event: Event<T>): Promise<T> {
-		return new Promise(c => once(event)(c));
+		return new Promise(resolve => once(event)(resolve));
 	}
 }
 
@@ -386,6 +387,41 @@ export interface EmitterOptions {
 	onListenerDidAdd?: Function;
 	onLastListenerRemove?: Function;
 	leakWarningThreshold?: number;
+
+	/** ONLY enable this during development */
+	_profName?: string
+}
+
+
+class EventProfiling {
+
+	private static _idPool = 0;
+
+	private _name: string;
+	private _stopWatch?: StopWatch;
+	private _listenerCount: number = 0;
+	private _invocationCount = 0;
+	private _elapsedOverall = 0;
+
+	constructor(name: string) {
+		this._name = `${name}_${EventProfiling._idPool++}`;
+	}
+
+	start(listenerCount: number): void {
+		this._stopWatch = new StopWatch(true);
+		this._listenerCount = listenerCount;
+	}
+
+	stop(): void {
+		if (this._stopWatch) {
+			const elapsed = this._stopWatch.elapsed();
+			this._elapsedOverall += elapsed;
+			this._invocationCount += 1;
+
+			console.info(`did FIRE ${this._name}: elapsed_ms: ${elapsed.toFixed(5)}, listener: ${this._listenerCount} (elapsed_overall: ${this._elapsedOverall.toFixed(2)}, invocations: ${this._invocationCount})`);
+			this._stopWatch = undefined;
+		}
+	}
 }
 
 let _globalLeakWarningThreshold = -1;
@@ -487,6 +523,7 @@ export class Emitter<T> {
 
 	private readonly _options?: EmitterOptions;
 	private readonly _leakageMon?: LeakageMonitor;
+	private readonly _perfMon?: EventProfiling;
 	private _disposed: boolean = false;
 	private _event?: Event<T>;
 	private _deliveryQueue?: LinkedList<[Listener<T>, T]>;
@@ -494,9 +531,8 @@ export class Emitter<T> {
 
 	constructor(options?: EmitterOptions) {
 		this._options = options;
-		this._leakageMon = _globalLeakWarningThreshold > 0
-			? new LeakageMonitor(this._options && this._options.leakWarningThreshold)
-			: undefined;
+		this._leakageMon = _globalLeakWarningThreshold > 0 ? new LeakageMonitor(this._options && this._options.leakWarningThreshold) : undefined;
+		this._perfMon = this._options?._profName ? new EventProfiling(this._options._profName) : undefined;
 	}
 
 	/**
@@ -527,10 +563,7 @@ export class Emitter<T> {
 				}
 
 				// check and record this emitter for potential leakage
-				let removeMonitor: (() => void) | undefined;
-				if (this._leakageMon) {
-					removeMonitor = this._leakageMon.check(this._listeners.size);
-				}
+				const removeMonitor = this._leakageMon?.check(this._listeners.size);
 
 				let result: IDisposable;
 				result = {
@@ -580,6 +613,9 @@ export class Emitter<T> {
 				this._deliveryQueue.push([listener, event]);
 			}
 
+			// start/stop performance insight collection
+			this._perfMon?.start(this._deliveryQueue.size);
+
 			while (this._deliveryQueue.size > 0) {
 				const [listener, event] = this._deliveryQueue.shift()!;
 				try {
@@ -592,19 +628,15 @@ export class Emitter<T> {
 					onUnexpectedError(e);
 				}
 			}
+
+			this._perfMon?.stop();
 		}
 	}
 
 	dispose() {
-		if (this._listeners) {
-			this._listeners.clear();
-		}
-		if (this._deliveryQueue) {
-			this._deliveryQueue.clear();
-		}
-		if (this._leakageMon) {
-			this._leakageMon.dispose();
-		}
+		this._listeners?.clear();
+		this._deliveryQueue?.clear();
+		this._leakageMon?.dispose();
 		this._disposed = true;
 	}
 }
@@ -617,7 +649,7 @@ export class PauseableEmitter<T> extends Emitter<T> {
 
 	constructor(options?: EmitterOptions & { merge?: (input: T[]) => T }) {
 		super(options);
-		this._mergeFn = options && options.merge;
+		this._mergeFn = options?.merge;
 	}
 
 	pause(): void {
diff --git a/src/vs/base/common/extpath.ts b/src/vs/base/common/extpath.ts
index ad10163e7..40fd732e9 100644
--- a/src/vs/base/common/extpath.ts
+++ b/src/vs/base/common/extpath.ts
@@ -277,14 +277,25 @@ export function isRootOrDriveLetter(path: string): boolean {
 			return false;
 		}
 
-		return isWindowsDriveLetter(pathNormalized.charCodeAt(0))
-			&& pathNormalized.charCodeAt(1) === CharCode.Colon
-			&& (path.length === 2 || pathNormalized.charCodeAt(2) === CharCode.Backslash);
+		return hasDriveLetter(pathNormalized) &&
+			(path.length === 2 || pathNormalized.charCodeAt(2) === CharCode.Backslash);
 	}
 
 	return pathNormalized === posix.sep;
 }
 
+export function hasDriveLetter(path: string): boolean {
+	if (isWindows) {
+		return isWindowsDriveLetter(path.charCodeAt(0)) && path.charCodeAt(1) === CharCode.Colon;
+	}
+
+	return false;
+}
+
+export function getDriveLetter(path: string): string | undefined {
+	return hasDriveLetter(path) ? path[0] : undefined;
+}
+
 export function indexOfPath(path: string, candidate: string, ignoreCase?: boolean): number {
 	if (candidate.length > path.length) {
 		return -1;
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index adff05173..653587dc5 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -370,24 +370,23 @@ export function anyScore(pattern: string, lowPattern: string, _patternPos: numbe
 	if (result) {
 		return result;
 	}
-	let matches = 0;
+	let matches: number[] = [];
 	let score = 0;
 	let idx = _wordPos;
 	for (let patternPos = 0; patternPos < lowPattern.length && patternPos < _maxLen; ++patternPos) {
 		const wordPos = lowWord.indexOf(lowPattern.charAt(patternPos), idx);
 		if (wordPos >= 0) {
 			score += 1;
-			matches += 2 ** wordPos;
+			matches.unshift(wordPos);
 			idx = wordPos + 1;
-
-		} else if (matches !== 0) {
+		} else if (matches.length > 0) {
 			// once we have started matching things
 			// we need to match the remaining pattern
 			// characters
 			break;
 		}
 	}
-	return [score, matches, _wordPos];
+	return [score, _wordPos, ...matches];
 }
 
 //#region --- fuzzyScore ---
@@ -396,19 +395,15 @@ export function createMatches(score: undefined | FuzzyScore): IMatch[] {
 	if (typeof score === 'undefined') {
 		return [];
 	}
-
-	const matches = score[1].toString(2);
-	const wordStart = score[2];
 	const res: IMatch[] = [];
-
-	for (let pos = wordStart; pos < _maxLen; pos++) {
-		if (matches[matches.length - (pos + 1)] === '1') {
-			const last = res[res.length - 1];
-			if (last && last.end === pos) {
-				last.end = pos + 1;
-			} else {
-				res.push({ start: pos, end: pos + 1 });
-			}
+	const wordPos = score[1];
+	for (let i = score.length - 1; i > 1; i--) {
+		const pos = score[i] + wordPos;
+		const last = res[res.length - 1];
+		if (last && last.end === pos) {
+			last.end = pos + 1;
+		} else {
+			res.push({ start: pos, end: pos + 1 });
 		}
 	}
 	return res;
@@ -418,20 +413,28 @@ const _maxLen = 128;
 
 function initTable() {
 	const table: number[][] = [];
-	const row: number[] = [0];
-	for (let i = 1; i <= _maxLen; i++) {
-		row.push(-i);
+	const row: number[] = [];
+	for (let i = 0; i <= _maxLen; i++) {
+		row[i] = 0;
 	}
 	for (let i = 0; i <= _maxLen; i++) {
-		const thisRow = row.slice(0);
-		thisRow[0] = -i;
-		table.push(thisRow);
+		table.push(row.slice(0));
 	}
 	return table;
 }
 
+function initArr(maxLen: number) {
+	const row: number[] = [];
+	for (let i = 0; i <= maxLen; i++) {
+		row[i] = 0;
+	}
+	return row;
+}
+
+const _minWordMatchPos = initArr(2 * _maxLen); // min word position for a certain pattern position
+const _maxWordMatchPos = initArr(2 * _maxLen); // max word position for a certain pattern position
+const _diag = initTable(); // the length of a contiguous diagonal match
 const _table = initTable();
-const _scores = initTable();
 const _arrows = <Arrow[][]>initTable();
 const _debug = false;
 
@@ -460,14 +463,14 @@ function printTables(pattern: string, patternStart: number, word: string, wordSt
 	word = word.substr(wordStart);
 	console.log(printTable(_table, pattern, pattern.length, word, word.length));
 	console.log(printTable(_arrows, pattern, pattern.length, word, word.length));
-	console.log(printTable(_scores, pattern, pattern.length, word, word.length));
+	console.log(printTable(_diag, pattern, pattern.length, word, word.length));
 }
 
 function isSeparatorAtPos(value: string, index: number): boolean {
 	if (index < 0 || index >= value.length) {
 		return false;
 	}
-	const code = value.charCodeAt(index);
+	const code = value.codePointAt(index);
 	switch (code) {
 		case CharCode.Underline:
 		case CharCode.Dash:
@@ -479,8 +482,16 @@ function isSeparatorAtPos(value: string, index: number): boolean {
 		case CharCode.DoubleQuote:
 		case CharCode.Colon:
 		case CharCode.DollarSign:
+		case CharCode.LessThan:
+		case CharCode.OpenParen:
+		case CharCode.OpenSquareBracket:
 			return true;
+		case undefined:
+			return false;
 		default:
+			if (strings.isEmojiImprecise(code)) {
+				return true;
+			}
 			return false;
 	}
 }
@@ -503,9 +514,13 @@ function isUpperCaseAtPos(pos: number, word: string, wordLow: string): boolean {
 	return word[pos] !== wordLow[pos];
 }
 
-export function isPatternInWord(patternLow: string, patternPos: number, patternLen: number, wordLow: string, wordPos: number, wordLen: number): boolean {
+export function isPatternInWord(patternLow: string, patternPos: number, patternLen: number, wordLow: string, wordPos: number, wordLen: number, fillMinWordPosArr = false): boolean {
 	while (patternPos < patternLen && wordPos < wordLen) {
 		if (patternLow[patternPos] === wordLow[wordPos]) {
+			if (fillMinWordPosArr) {
+				// Remember the min word position for each pattern position
+				_minWordMatchPos[patternPos] = wordPos;
+			}
 			patternPos += 1;
 		}
 		wordPos += 1;
@@ -513,21 +528,24 @@ export function isPatternInWord(patternLow: string, patternPos: number, patternL
 	return patternPos === patternLen; // pattern must be exhausted
 }
 
-const enum Arrow { Top = 0b1, Diag = 0b10, Left = 0b100 }
+const enum Arrow { Diag = 1, Left = 2, LeftLeft = 3 }
 
 /**
- * A tuple of three values.
+ * An array representating a fuzzy match.
+ *
  * 0. the score
- * 1. the matches encoded as bitmask (2^53)
- * 2. the offset at which matching started
+ * 1. the offset at which matching started
+ * 2. `<match_pos_N>`
+ * 3. `<match_pos_1>`
+ * 4. `<match_pos_0>` etc
  */
-export type FuzzyScore = [number, number, number];
+export type FuzzyScore = [score: number, wordStart: number, ...matches: number[]];// [number, number, number];
 
 export namespace FuzzyScore {
 	/**
 	 * No matches and value `-100`
 	 */
-	export const Default: [-100, 0, 0] = <[-100, 0, 0]>Object.freeze([-100, 0, 0]);
+	export const Default: FuzzyScore = ([-100, 0]);
 
 	export function isDefault(score?: FuzzyScore): score is [-100, 0, 0] {
 		return !score || (score[0] === -100 && score[1] === 0 && score[2] === 0);
@@ -550,58 +568,71 @@ export function fuzzyScore(pattern: string, patternLow: string, patternStart: nu
 	// Run a simple check if the characters of pattern occur
 	// (in order) at all in word. If that isn't the case we
 	// stop because no match will be possible
-	if (!isPatternInWord(patternLow, patternStart, patternLen, wordLow, wordStart, wordLen)) {
+	if (!isPatternInWord(patternLow, patternStart, patternLen, wordLow, wordStart, wordLen, true)) {
 		return undefined;
 	}
 
+	// Find the max matching word position for each pattern position
+	// NOTE: the min matching word position was filled in above, in the `isPatternInWord` call
+	_fillInMaxWordMatchPos(patternLen, wordLen, patternStart, wordStart, patternLow, wordLow);
+
 	let row: number = 1;
 	let column: number = 1;
 	let patternPos = patternStart;
 	let wordPos = wordStart;
 
-	let hasStrongFirstMatch = false;
+	const hasStrongFirstMatch = [false];
 
 	// There will be a match, fill in tables
 	for (row = 1, patternPos = patternStart; patternPos < patternLen; row++, patternPos++) {
 
-		for (column = 1, wordPos = wordStart; wordPos < wordLen; column++, wordPos++) {
+		// Reduce search space to possible matching word positions and to possible access from next row
+		const minWordMatchPos = _minWordMatchPos[patternPos];
+		const maxWordMatchPos = _maxWordMatchPos[patternPos];
+		const nextMaxWordMatchPos = (patternPos + 1 < patternLen ? _maxWordMatchPos[patternPos + 1] : wordLen);
 
-			const score = _doScore(pattern, patternLow, patternPos, patternStart, word, wordLow, wordPos);
+		for (column = minWordMatchPos - wordStart + 1, wordPos = minWordMatchPos; wordPos < nextMaxWordMatchPos; column++, wordPos++) {
 
-			if (patternPos === patternStart && score > 1) {
-				hasStrongFirstMatch = true;
+			let score = Number.MIN_SAFE_INTEGER;
+			let canComeDiag = false;
+
+			if (wordPos <= maxWordMatchPos) {
+				score = _doScore(
+					pattern, patternLow, patternPos, patternStart,
+					word, wordLow, wordPos, wordLen, wordStart,
+					_diag[row - 1][column - 1] === 0,
+					hasStrongFirstMatch
+				);
 			}
 
-			_scores[row][column] = score;
+			let diagScore = 0;
+			if (score !== Number.MAX_SAFE_INTEGER) {
+				canComeDiag = true;
+				diagScore = score + _table[row - 1][column - 1];
+			}
 
-			const diag = _table[row - 1][column - 1] + (score > 1 ? 1 : score);
-			const top = _table[row - 1][column] + -1;
-			const left = _table[row][column - 1] + -1;
+			const canComeLeft = wordPos > minWordMatchPos;
+			const leftScore = canComeLeft ? _table[row][column - 1] + (_diag[row][column - 1] > 0 ? -5 : 0) : 0; // penalty for a gap start
 
-			if (left >= top) {
-				// left or diag
-				if (left > diag) {
-					_table[row][column] = left;
-					_arrows[row][column] = Arrow.Left;
-				} else if (left === diag) {
-					_table[row][column] = left;
-					_arrows[row][column] = Arrow.Left | Arrow.Diag;
-				} else {
-					_table[row][column] = diag;
-					_arrows[row][column] = Arrow.Diag;
-				}
+			const canComeLeftLeft = wordPos > minWordMatchPos + 1 && _diag[row][column - 1] > 0;
+			const leftLeftScore = canComeLeftLeft ? _table[row][column - 2] + (_diag[row][column - 2] > 0 ? -5 : 0) : 0; // penalty for a gap start
+
+			if (canComeLeftLeft && (!canComeLeft || leftLeftScore >= leftScore) && (!canComeDiag || leftLeftScore >= diagScore)) {
+				// always prefer choosing left left to jump over a diagonal because that means a match is earlier in the word
+				_table[row][column] = leftLeftScore;
+				_arrows[row][column] = Arrow.LeftLeft;
+				_diag[row][column] = 0;
+			} else if (canComeLeft && (!canComeDiag || leftScore >= diagScore)) {
+				// always prefer choosing left since that means a match is earlier in the word
+				_table[row][column] = leftScore;
+				_arrows[row][column] = Arrow.Left;
+				_diag[row][column] = 0;
+			} else if (canComeDiag) {
+				_table[row][column] = diagScore;
+				_arrows[row][column] = Arrow.Diag;
+				_diag[row][column] = _diag[row - 1][column - 1] + 1;
 			} else {
-				// top or diag
-				if (top > diag) {
-					_table[row][column] = top;
-					_arrows[row][column] = Arrow.Top;
-				} else if (top === diag) {
-					_table[row][column] = top;
-					_arrows[row][column] = Arrow.Top | Arrow.Diag;
-				} else {
-					_table[row][column] = diag;
-					_arrows[row][column] = Arrow.Diag;
-				}
+				throw new Error(`not possible`);
 			}
 		}
 	}
@@ -610,144 +641,152 @@ export function fuzzyScore(pattern: string, patternLow: string, patternStart: nu
 		printTables(pattern, patternStart, word, wordStart);
 	}
 
-	if (!hasStrongFirstMatch && !firstMatchCanBeWeak) {
+	if (!hasStrongFirstMatch[0] && !firstMatchCanBeWeak) {
 		return undefined;
 	}
 
-	_matchesCount = 0;
-	_topScore = -100;
-	_wordStart = wordStart;
-	_firstMatchCanBeWeak = firstMatchCanBeWeak;
+	row--;
+	column--;
 
-	_findAllMatches2(row - 1, column - 1, patternLen === wordLen ? 1 : 0, 0, false);
-	if (_matchesCount === 0) {
-		return undefined;
+	const result: FuzzyScore = [_table[row][column], wordStart];
+
+	let backwardsDiagLength = 0;
+	let maxMatchColumn = 0;
+
+	while (row >= 1) {
+		// Find the column where we go diagonally up
+		let diagColumn = column;
+		do {
+			const arrow = _arrows[row][diagColumn];
+			if (arrow === Arrow.LeftLeft) {
+				diagColumn = diagColumn - 2;
+			} else if (arrow === Arrow.Left) {
+				diagColumn = diagColumn - 1;
+			} else {
+				// found the diagonal
+				break;
+			}
+		} while (diagColumn >= 1);
+
+		// Overturn the "forwards" decision if keeping the "backwards" diagonal would give a better match
+		if (
+			backwardsDiagLength > 1 // only if we would have a contiguous match of 3 characters
+			&& patternLow[patternStart + row - 1] === wordLow[wordStart + column - 1] // only if we can do a contiguous match diagonally
+			&& !isUpperCaseAtPos(diagColumn + wordStart - 1, word, wordLow) // only if the forwards chose diagonal is not an uppercase
+			&& backwardsDiagLength + 1 > _diag[row][diagColumn] // only if our contiguous match would be longer than the "forwards" contiguous match
+		) {
+			diagColumn = column;
+		}
+
+		if (diagColumn === column) {
+			// this is a contiguous match
+			backwardsDiagLength++;
+		} else {
+			backwardsDiagLength = 1;
+		}
+
+		if (!maxMatchColumn) {
+			// remember the last matched column
+			maxMatchColumn = diagColumn;
+		}
+
+		row--;
+		column = diagColumn - 1;
+		result.push(column);
 	}
 
-	return [_topScore, _topMatch2, wordStart];
+	if (wordLen === patternLen) {
+		// the word matches the pattern with all characters!
+		// giving the score a total match boost (to come up ahead other words)
+		result[0] += 2;
+	}
+
+	// Add 1 penalty for each skipped character in the word
+	const skippedCharsCount = maxMatchColumn - patternLen;
+	result[0] -= skippedCharsCount;
+
+	return result;
 }
 
-function _doScore(pattern: string, patternLow: string, patternPos: number, patternStart: number, word: string, wordLow: string, wordPos: number) {
-	if (patternLow[patternPos] !== wordLow[wordPos]) {
-		return -1;
+function _fillInMaxWordMatchPos(patternLen: number, wordLen: number, patternStart: number, wordStart: number, patternLow: string, wordLow: string) {
+	let patternPos = patternLen - 1;
+	let wordPos = wordLen - 1;
+	while (patternPos >= patternStart && wordPos >= wordStart) {
+		if (patternLow[patternPos] === wordLow[wordPos]) {
+			_maxWordMatchPos[patternPos] = wordPos;
+			patternPos--;
+		}
+		wordPos--;
 	}
+}
+
+function _doScore(
+	pattern: string, patternLow: string, patternPos: number, patternStart: number,
+	word: string, wordLow: string, wordPos: number, wordLen: number, wordStart: number,
+	newMatchStart: boolean,
+	outFirstMatchStrong: boolean[],
+): number {
+	if (patternLow[patternPos] !== wordLow[wordPos]) {
+		return Number.MIN_SAFE_INTEGER;
+	}
+
+	let score = 1;
+	let isGapLocation = false;
 	if (wordPos === (patternPos - patternStart)) {
 		// common prefix: `foobar <-> foobaz`
 		//                            ^^^^^
-		if (pattern[patternPos] === word[wordPos]) {
-			return 7;
-		} else {
-			return 5;
-		}
+		score = pattern[patternPos] === word[wordPos] ? 7 : 5;
+
 	} else if (isUpperCaseAtPos(wordPos, word, wordLow) && (wordPos === 0 || !isUpperCaseAtPos(wordPos - 1, word, wordLow))) {
 		// hitting upper-case: `foo <-> forOthers`
 		//                              ^^ ^
-		if (pattern[patternPos] === word[wordPos]) {
-			return 7;
-		} else {
-			return 5;
-		}
+		score = pattern[patternPos] === word[wordPos] ? 7 : 5;
+		isGapLocation = true;
+
 	} else if (isSeparatorAtPos(wordLow, wordPos) && (wordPos === 0 || !isSeparatorAtPos(wordLow, wordPos - 1))) {
 		// hitting a separator: `. <-> foo.bar`
 		//                                ^
-		return 5;
+		score = 5;
 
 	} else if (isSeparatorAtPos(wordLow, wordPos - 1) || isWhitespaceAtPos(wordLow, wordPos - 1)) {
 		// post separator: `foo <-> bar_foo`
 		//                              ^^^
-		return 5;
+		score = 5;
+		isGapLocation = true;
+	}
 
+	if (score > 1 && patternPos === patternStart) {
+		outFirstMatchStrong[0] = true;
+	}
+
+	if (!isGapLocation) {
+		isGapLocation = isUpperCaseAtPos(wordPos, word, wordLow) || isSeparatorAtPos(wordLow, wordPos - 1) || isWhitespaceAtPos(wordLow, wordPos - 1);
+	}
+
+	//
+	if (patternPos === patternStart) { // first character in pattern
+		if (wordPos > wordStart) {
+			// the first pattern character would match a word character that is not at the word start
+			// so introduce a penalty to account for the gap preceding this match
+			score -= isGapLocation ? 3 : 5;
+		}
 	} else {
-		return 1;
-	}
-}
-
-let _matchesCount: number = 0;
-let _topMatch2: number = 0;
-let _topScore: number = 0;
-let _wordStart: number = 0;
-let _firstMatchCanBeWeak: boolean = false;
-
-function _findAllMatches2(row: number, column: number, total: number, matches: number, lastMatched: boolean): void {
-
-	if (_matchesCount >= 10 || total < -25) {
-		// stop when having already 10 results, or
-		// when a potential alignment as already 5 gaps
-		return;
-	}
-
-	let simpleMatchCount = 0;
-
-	while (row > 0 && column > 0) {
-
-		const score = _scores[row][column];
-		const arrow = _arrows[row][column];
-
-		if (arrow === Arrow.Left) {
-			// left -> no match, skip a word character
-			column -= 1;
-			if (lastMatched) {
-				total -= 5; // new gap penalty
-			} else if (matches !== 0) {
-				total -= 1; // gap penalty after first match
-			}
-			lastMatched = false;
-			simpleMatchCount = 0;
-
-		} else if (arrow & Arrow.Diag) {
-
-			if (arrow & Arrow.Left) {
-				// left
-				_findAllMatches2(
-					row,
-					column - 1,
-					matches !== 0 ? total - 1 : total, // gap penalty after first match
-					matches,
-					lastMatched
-				);
-			}
-
-			// diag
-			total += score;
-			row -= 1;
-			column -= 1;
-			lastMatched = true;
-
-			// match -> set a 1 at the word pos
-			matches += 2 ** (column + _wordStart);
-
-			// count simple matches and boost a row of
-			// simple matches when they yield in a
-			// strong match.
-			if (score === 1) {
-				simpleMatchCount += 1;
-
-				if (row === 0 && !_firstMatchCanBeWeak) {
-					// when the first match is a weak
-					// match we discard it
-					return undefined;
-				}
-
-			} else {
-				// boost
-				total += 1 + (simpleMatchCount * (score - 1));
-				simpleMatchCount = 0;
-			}
-
+		if (newMatchStart) {
+			// this would be the beginning of a new match (i.e. there would be a gap before this location)
+			score += isGapLocation ? 2 : 0;
 		} else {
-			return undefined;
+			// this is part of a contiguous match, so give it a slight bonus, but do so only if it would not be a prefered gap location
+			score += isGapLocation ? 0 : 1;
 		}
 	}
 
-	total -= column >= 3 ? 9 : column * 3; // late start penalty
-
-	// dynamically keep track of the current top score
-	// and insert the current best score at head, the rest at tail
-	_matchesCount += 1;
-	if (total > _topScore) {
-		_topScore = total;
-		_topMatch2 = matches;
+	if (wordPos + 1 === wordLen) {
+		// we always penalize gaps, but this gives unfair advantages to a match that would match the last character in the word
+		// so pretend there is a gap after the last character in the word to normalize things
+		score -= isGapLocation ? 3 : 5;
 	}
+
+	return score;
 }
 
 //#endregion
diff --git a/src/vs/base/common/fuzzyScorer.ts b/src/vs/base/common/fuzzyScorer.ts
index 11fc4bc0e..71414ea93 100644
--- a/src/vs/base/common/fuzzyScorer.ts
+++ b/src/vs/base/common/fuzzyScorer.ts
@@ -389,7 +389,7 @@ export function scoreItemFuzzy<T>(item: T, query: IPreparedQuery, fuzzy: boolean
 	// - description (if provided)
 	// - query (normalized)
 	// - number of query pieces (i.e. 'hello world' and 'helloworld' are different)
-	// - wether fuzzy matching is enabled or not
+	// - whether fuzzy matching is enabled or not
 	let cacheHash: string;
 	if (description) {
 		cacheHash = `${label}${description}${query.normalized}${Array.isArray(query.values) ? query.values.length : ''}${fuzzy}`;
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index b8aaab0a0..a3c6c4ac4 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -393,15 +393,24 @@ function trivia3(pattern: string, options: IGlobOptions): ParsedStringPattern {
 }
 
 // common patterns: **/something/else just need endsWith check, something/else just needs and equals check
-function trivia4and5(path: string, pattern: string, matchPathEnds: boolean): ParsedStringPattern {
-	const nativePath = paths.sep !== paths.posix.sep ? path.replace(ALL_FORWARD_SLASHES, paths.sep) : path;
+function trivia4and5(targetPath: string, pattern: string, matchPathEnds: boolean): ParsedStringPattern {
+	const usingPosixSep = paths.sep === paths.posix.sep;
+	const nativePath = usingPosixSep ? targetPath : targetPath.replace(ALL_FORWARD_SLASHES, paths.sep);
 	const nativePathEnd = paths.sep + nativePath;
-	const parsedPattern: ParsedStringPattern = matchPathEnds ? function (path, basename) {
-		return typeof path === 'string' && (path === nativePath || path.endsWith(nativePathEnd)) ? pattern : null;
-	} : function (path, basename) {
-		return typeof path === 'string' && path === nativePath ? pattern : null;
+	const targetPathEnd = paths.posix.sep + targetPath;
+
+	const parsedPattern: ParsedStringPattern = matchPathEnds ? function (testPath, basename) {
+		return typeof testPath === 'string' &&
+			((testPath === nativePath || testPath.endsWith(nativePathEnd))
+				|| !usingPosixSep && (testPath === targetPath || testPath.endsWith(targetPathEnd)))
+			? pattern : null;
+	} : function (testPath, basename) {
+		return typeof testPath === 'string' &&
+			(testPath === nativePath
+				|| (!usingPosixSep && testPath === targetPath))
+			? pattern : null;
 	};
-	parsedPattern.allPaths = [(matchPathEnds ? '*/' : './') + path];
+	parsedPattern.allPaths = [(matchPathEnds ? '*/' : './') + targetPath];
 	return parsedPattern;
 }
 
diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index 829a34800..321fff44c 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -5,7 +5,7 @@
 
 import { equals } from 'vs/base/common/arrays';
 import { UriComponents } from 'vs/base/common/uri';
-import { escapeCodicons } from 'vs/base/common/codicons';
+import { escapeIcons } from 'vs/base/common/iconLabels';
 import { illegalArgument } from 'vs/base/common/errors';
 
 export interface IMarkdownString {
@@ -46,9 +46,7 @@ export class MarkdownString implements IMarkdownString {
 	}
 
 	appendText(value: string, newlineStyle: MarkdownStringTextNewlineStyle = MarkdownStringTextNewlineStyle.Paragraph): MarkdownString {
-		// escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
-		this.value += (this.supportThemeIcons ? escapeCodicons(value) : value)
-			.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&')
+		this.value += escapeMarkdownSyntaxTokens(this.supportThemeIcons ? escapeIcons(value) : value)
 			.replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length))
 			.replace(/^>/gm, '\\>')
 			.replace(/\n/g, newlineStyle === MarkdownStringTextNewlineStyle.Break ? '\\\n' : '\n\n');
@@ -116,6 +114,11 @@ function markdownStringEqual(a: IMarkdownString, b: IMarkdownString): boolean {
 	}
 }
 
+export function escapeMarkdownSyntaxTokens(text: string): string {
+	// escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
+	return text.replace(/[\\`*_{}[\]()#+\-.!]/g, '\\$&');
+}
+
 export function removeMarkdownEscapes(text: string): string {
 	if (!text) {
 		return text;
diff --git a/src/vs/base/common/iconLabels.ts b/src/vs/base/common/iconLabels.ts
new file mode 100644
index 000000000..8ad65bee7
--- /dev/null
+++ b/src/vs/base/common/iconLabels.ts
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { matchesFuzzy, IMatch } from 'vs/base/common/filters';
+import { ltrim } from 'vs/base/common/strings';
+
+export const iconStartMarker = '$(';
+
+const escapeIconsRegex = /(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi;
+export function escapeIcons(text: string): string {
+	return text.replace(escapeIconsRegex, (match, escaped) => escaped ? match : `\\${match}`);
+}
+
+const markdownEscapedIconsRegex = /\\\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)/gi;
+export function markdownEscapeEscapedIcons(text: string): string {
+	// Need to add an extra \ for escaping in markdown
+	return text.replace(markdownEscapedIconsRegex, match => `\\${match}`);
+}
+
+const markdownUnescapeIconsRegex = /(\\)?\$\\\(([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?)\\\)/gi;
+export function markdownUnescapeIcons(text: string): string {
+	return text.replace(markdownUnescapeIconsRegex, (match, escaped, iconId) => escaped ? match : `$(${iconId})`);
+}
+
+const stripIconsRegex = /(\s)?(\\)?\$\([a-z0-9\-]+?(?:~[a-z0-9\-]*?)?\)(\s)?/gi;
+export function stripIcons(text: string): string {
+	if (text.indexOf(iconStartMarker) === -1) {
+		return text;
+	}
+
+	return text.replace(stripIconsRegex, (match, preWhitespace, escaped, postWhitespace) => escaped ? match : preWhitespace || postWhitespace || '');
+}
+
+
+export interface IParsedLabelWithIcons {
+	readonly text: string;
+	readonly iconOffsets?: readonly number[];
+}
+
+export function parseLabelWithIcons(text: string): IParsedLabelWithIcons {
+	const firstIconIndex = text.indexOf(iconStartMarker);
+	if (firstIconIndex === -1) {
+		return { text }; // return early if the word does not include an icon
+	}
+
+	return doParseLabelWithIcons(text, firstIconIndex);
+}
+
+function doParseLabelWithIcons(text: string, firstIconIndex: number): IParsedLabelWithIcons {
+	const iconOffsets: number[] = [];
+	let textWithoutIcons: string = '';
+
+	function appendChars(chars: string) {
+		if (chars) {
+			textWithoutIcons += chars;
+
+			for (const _ of chars) {
+				iconOffsets.push(iconsOffset); // make sure to fill in icon offsets
+			}
+		}
+	}
+
+	let currentIconStart = -1;
+	let currentIconValue: string = '';
+	let iconsOffset = 0;
+
+	let char: string;
+	let nextChar: string;
+
+	let offset = firstIconIndex;
+	const length = text.length;
+
+	// Append all characters until the first icon
+	appendChars(text.substr(0, firstIconIndex));
+
+	// example: $(file-symlink-file) my cool $(other-icon) entry
+	while (offset < length) {
+		char = text[offset];
+		nextChar = text[offset + 1];
+
+		// beginning of icon: some value $( <--
+		if (char === iconStartMarker[0] && nextChar === iconStartMarker[1]) {
+			currentIconStart = offset;
+
+			// if we had a previous potential icon value without
+			// the closing ')', it was actually not an icon and
+			// so we have to add it to the actual value
+			appendChars(currentIconValue);
+
+			currentIconValue = iconStartMarker;
+
+			offset++; // jump over '('
+		}
+
+		// end of icon: some value $(some-icon) <--
+		else if (char === ')' && currentIconStart !== -1) {
+			const currentIconLength = offset - currentIconStart + 1; // +1 to include the closing ')'
+			iconsOffset += currentIconLength;
+			currentIconStart = -1;
+			currentIconValue = '';
+		}
+
+		// within icon
+		else if (currentIconStart !== -1) {
+			// Make sure this is a real icon name
+			if (/^[a-z0-9\-]$/i.test(char)) {
+				currentIconValue += char;
+			} else {
+				// This is not a real icon, treat it as text
+				appendChars(currentIconValue);
+
+				currentIconStart = -1;
+				currentIconValue = '';
+			}
+		}
+
+		// any value outside of icon
+		else {
+			appendChars(char);
+		}
+
+		offset++;
+	}
+
+	// if we had a previous potential icon value without
+	// the closing ')', it was actually not an icon and
+	// so we have to add it to the actual value
+	appendChars(currentIconValue);
+
+	return { text: textWithoutIcons, iconOffsets };
+}
+
+export function matchesFuzzyIconAware(query: string, target: IParsedLabelWithIcons, enableSeparateSubstringMatching = false): IMatch[] | null {
+	const { text, iconOffsets } = target;
+
+	// Return early if there are no icon markers in the word to match against
+	if (!iconOffsets || iconOffsets.length === 0) {
+		return matchesFuzzy(query, text, enableSeparateSubstringMatching);
+	}
+
+	// Trim the word to match against because it could have leading
+	// whitespace now if the word started with an icon
+	const wordToMatchAgainstWithoutIconsTrimmed = ltrim(text, ' ');
+	const leadingWhitespaceOffset = text.length - wordToMatchAgainstWithoutIconsTrimmed.length;
+
+	// match on value without icon
+	const matches = matchesFuzzy(query, wordToMatchAgainstWithoutIconsTrimmed, enableSeparateSubstringMatching);
+
+	// Map matches back to offsets with icon and trimming
+	if (matches) {
+		for (const match of matches) {
+			const iconOffset = iconOffsets[match.start + leadingWhitespaceOffset] /* icon offsets at index */ + leadingWhitespaceOffset /* overall leading whitespace offset */;
+			match.start += iconOffset;
+			match.end += iconOffset;
+		}
+	}
+
+	return matches;
+}
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index d66882ac0..4b66374e5 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -22,6 +22,10 @@ export namespace Iterable {
 		return iterable || _empty;
 	}
 
+	export function isEmpty<T>(iterable: Iterable<T> | undefined | null): boolean {
+		return !iterable || iterable[Symbol.iterator]().next().done === true;
+	}
+
 	export function first<T>(iterable: Iterable<T>): T | undefined {
 		return iterable[Symbol.iterator]().next().value;
 	}
@@ -35,6 +39,8 @@ export namespace Iterable {
 		return false;
 	}
 
+	export function filter<T, R extends T>(iterable: Iterable<T>, predicate: (t: T) => t is R): Iterable<R>;
+	export function filter<T>(iterable: Iterable<T>, predicate: (t: T) => boolean): Iterable<T>;
 	export function* filter<T>(iterable: Iterable<T>, predicate: (t: T) => boolean): Iterable<T> {
 		for (const element of iterable) {
 			if (predicate(element)) {
@@ -57,6 +63,33 @@ export namespace Iterable {
 		}
 	}
 
+	export function* concatNested<T>(iterables: Iterable<Iterable<T>>): Iterable<T> {
+		for (const iterable of iterables) {
+			for (const element of iterable) {
+				yield element;
+			}
+		}
+	}
+
+	/**
+	 * Returns an iterable slice of the array, with the same semantics as `array.slice()`.
+	 */
+	export function* slice<T>(iterable: ReadonlyArray<T>, from: number, to = iterable.length): Iterable<T> {
+		if (from < 0) {
+			from += iterable.length;
+		}
+
+		if (to < 0) {
+			to += iterable.length;
+		} else if (to > iterable.length) {
+			to = iterable.length;
+		}
+
+		for (; from < to; from++) {
+			yield iterable[from];
+		}
+	}
+
 	/**
 	 * Consumes `atMost` elements from iterable and returns the consumed elements,
 	 * and an iterable for the rest of the elements.
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
index 5c1aac3bc..a7645ba7e 100644
--- a/src/vs/base/common/labels.ts
+++ b/src/vs/base/common/labels.ts
@@ -9,11 +9,12 @@ import { startsWithIgnoreCase, rtrim } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux, isWindows, isMacintosh } from 'vs/base/common/platform';
 import { isEqual, basename, relativePath } from 'vs/base/common/resources';
+import { hasDriveLetter, isRootOrDriveLetter } from 'vs/base/common/extpath';
 
 export interface IWorkspaceFolderProvider {
-	getWorkspaceFolder(resource: URI): { uri: URI, name?: string } | null;
+	getWorkspaceFolder(resource: URI): { uri: URI, name?: string; } | null;
 	getWorkspace(): {
-		folders: { uri: URI, name?: string }[];
+		folders: { uri: URI, name?: string; }[];
 	};
 }
 
@@ -84,21 +85,13 @@ export function getBaseLabel(resource: URI | string | undefined): string | undef
 	const base = basename(resource) || (resource.scheme === Schemas.file ? resource.fsPath : resource.path) /* can be empty string if '/' is passed in */;
 
 	// convert c: => C:
-	if (hasDriveLetter(base)) {
+	if (isWindows && isRootOrDriveLetter(base)) {
 		return normalizeDriveLetter(base);
 	}
 
 	return base;
 }
 
-function hasDriveLetter(path: string): boolean {
-	return !!(isWindows && path && path[1] === ':');
-}
-
-export function extractDriveLetter(path: string): string | undefined {
-	return hasDriveLetter(path) ? path[0] : undefined;
-}
-
 export function normalizeDriveLetter(path: string): string {
 	if (hasDriveLetter(path)) {
 		return path.charAt(0).toUpperCase() + path.slice(1);
@@ -107,7 +100,7 @@ export function normalizeDriveLetter(path: string): string {
 	return path;
 }
 
-let normalizedUserHomeCached: { original: string; normalized: string } = Object.create(null);
+let normalizedUserHomeCached: { original: string; normalized: string; } = Object.create(null);
 export function tildify(path: string, userHome: string): string {
 	if (isWindows || !path || !userHome) {
 		return path; // unsupported
@@ -286,7 +279,7 @@ interface ISegment {
  * @param value string to which templating is applied
  * @param values the values of the templates to use
  */
-export function template(template: string, values: { [key: string]: string | ISeparator | undefined | null } = Object.create(null)): string {
+export function template(template: string, values: { [key: string]: string | ISeparator | undefined | null; } = Object.create(null)): string {
 	const segments: ISegment[] = [];
 
 	let inVariable = false;
@@ -390,7 +383,7 @@ export function unmnemonicLabel(label: string): string {
 /**
  * Splits a path in name and parent path, supporting both '/' and '\'
  */
-export function splitName(fullPath: string): { name: string, parentPath: string } {
+export function splitName(fullPath: string): { name: string, parentPath: string; } {
 	const p = fullPath.indexOf('/') !== -1 ? posix : win32;
 	const name = p.basename(fullPath);
 	const parentPath = p.dirname(fullPath);
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 79bbb910a..fd4a71fc8 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -14,34 +14,53 @@ import { Iterable } from 'vs/base/common/iterator';
  * extend Disposable or use a DisposableStore. This means there are a lot of false positives.
  */
 const TRACK_DISPOSABLES = false;
+let disposableTracker: IDisposableTracker | null = null;
 
-const __is_disposable_tracked__ = '__is_disposable_tracked__';
-
-function markTracked<T extends IDisposable>(x: T): void {
-	if (!TRACK_DISPOSABLES) {
-		return;
-	}
-
-	if (x && x !== Disposable.None) {
-		try {
-			(x as any)[__is_disposable_tracked__] = true;
-		} catch {
-			// noop
-		}
-	}
+export interface IDisposableTracker {
+	trackDisposable(x: IDisposable): void;
+	markTracked(x: IDisposable): void;
 }
 
-function trackDisposable<T extends IDisposable>(x: T): T {
-	if (!TRACK_DISPOSABLES) {
+export function setDisposableTracker(tracker: IDisposableTracker | null): void {
+	disposableTracker = tracker;
+}
+
+if (TRACK_DISPOSABLES) {
+	const __is_disposable_tracked__ = '__is_disposable_tracked__';
+	disposableTracker = new class implements IDisposableTracker {
+		trackDisposable(x: IDisposable): void {
+			const stack = new Error('Potentially leaked disposable').stack!;
+			setTimeout(() => {
+				if (!(x as any)[__is_disposable_tracked__]) {
+					console.log(stack);
+				}
+			}, 3000);
+		}
+
+		markTracked(x: IDisposable): void {
+			if (x && x !== Disposable.None) {
+				try {
+					(x as any)[__is_disposable_tracked__] = true;
+				} catch {
+					// noop
+				}
+			}
+		}
+	};
+}
+
+function markTracked<T extends IDisposable>(x: T): void {
+	if (!disposableTracker) {
+		return;
+	}
+	disposableTracker.markTracked(x);
+}
+
+export function trackDisposable<T extends IDisposable>(x: T): T {
+	if (!disposableTracker) {
 		return x;
 	}
-
-	const stack = new Error('Potentially leaked disposable').stack!;
-	setTimeout(() => {
-		if (!(x as any)[__is_disposable_tracked__]) {
-			console.log(stack);
-		}
-	}, 3000);
+	disposableTracker.trackDisposable(x);
 	return x;
 }
 
@@ -98,7 +117,7 @@ export function dispose<T extends IDisposable>(arg: T | IterableIterator<T> | un
 
 export function combinedDisposable(...disposables: IDisposable[]): IDisposable {
 	disposables.forEach(markTracked);
-	return trackDisposable({ dispose: () => dispose(disposables) });
+	return toDisposable(() => dispose(disposables));
 }
 
 export function toDisposable(fn: () => void): IDisposable {
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 4e12b577e..a409e7722 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -60,6 +60,8 @@ export namespace Schemas {
 
 	export const vscodeNotebookCell = 'vscode-notebook-cell';
 
+	export const vscodeNotebookCellMetadata = 'vscode-notebook-cell-metadata';
+
 	export const vscodeSettings = 'vscode-settings';
 
 	export const webviewPanel = 'webview-panel';
@@ -147,8 +149,8 @@ class FileAccessImpl {
 	 * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context.
 	 */
 	asBrowserUri(uri: URI): URI;
-	asBrowserUri(moduleId: string, moduleIdToUrl: { toUrl(moduleId: string): string }): URI;
-	asBrowserUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }): URI {
+	asBrowserUri(moduleId: string, moduleIdToUrl: { toUrl(moduleId: string): string }, __forceCodeFileUri?: boolean): URI;
+	asBrowserUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }, __forceCodeFileUri?: boolean): URI {
 		const uri = this.toUri(uriOrModule, moduleIdToUrl);
 
 		// Handle remote URIs via `RemoteAuthorities`
@@ -157,37 +159,23 @@ class FileAccessImpl {
 		}
 
 		// Only convert the URI if we are in a native context and it has `file:` scheme
-		if (platform.isElectronSandboxed && platform.isNative && uri.scheme === Schemas.file) {
-			return this.toCodeFileUri(uri);
+		// and we have explicitly enabled the conversion (sandbox, or ENABLE_VSCODE_BROWSER_CODE_LOADING)
+		if (platform.isNative && (__forceCodeFileUri || platform.isPreferringBrowserCodeLoad) && uri.scheme === Schemas.file) {
+			return uri.with({
+				scheme: Schemas.vscodeFileResource,
+				// We need to provide an authority here so that it can serve
+				// as origin for network and loading matters in chromium.
+				// If the URI is not coming with an authority already, we
+				// add our own
+				authority: uri.authority || this.FALLBACK_AUTHORITY,
+				query: null,
+				fragment: null
+			});
 		}
 
 		return uri;
 	}
 
-	/**
-	 * TODO@bpasero remove me eventually when vscode-file is adopted everywhere
-	 */
-	_asCodeFileUri(uri: URI): URI;
-	_asCodeFileUri(moduleId: string, moduleIdToUrl: { toUrl(moduleId: string): string }): URI;
-	_asCodeFileUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }): URI {
-		const uri = this.toUri(uriOrModule, moduleIdToUrl);
-
-		return this.toCodeFileUri(uri);
-	}
-
-	private toCodeFileUri(uri: URI): URI {
-		return uri.with({
-			scheme: Schemas.vscodeFileResource,
-			// We need to provide an authority here so that it can serve
-			// as origin for network and loading matters in chromium.
-			// If the URI is not coming with an authority already, we
-			// add our own
-			authority: uri.authority || this.FALLBACK_AUTHORITY,
-			query: null,
-			fragment: null
-		});
-	}
-
 	/**
 	 * Returns the `file` URI to use in contexts where node.js
 	 * is responsible for loading.
diff --git a/src/vs/base/common/path.ts b/src/vs/base/common/path.ts
index d12384b6f..c9a0a6bfa 100644
--- a/src/vs/base/common/path.ts
+++ b/src/vs/base/common/path.ts
@@ -43,7 +43,7 @@ const CHAR_QUESTION_MARK = 63; /* ? */
 
 class ErrorInvalidArgType extends Error {
 	code: 'ERR_INVALID_ARG_TYPE';
-	constructor(name: string, expected: string, actual: any) {
+	constructor(name: string, expected: string, actual: unknown) {
 		// determiner: 'must be' or 'must not be'
 		let determiner;
 		if (typeof expected === 'string' && expected.indexOf('not ') === 0) {
@@ -215,7 +215,7 @@ export const win32: IPath = {
 				// absolute path, get cwd for that drive, or the process cwd if
 				// the drive cwd is not available. We're sure the device is not
 				// a UNC path at this points, because UNC paths are always absolute.
-				path = (process.env as any)[`=${resolvedDevice}`] || process.cwd();
+				path = process.env[`=${resolvedDevice}`] || process.cwd();
 
 				// Verify that a cwd was found and that it actually points
 				// to our drive. If not, default to the drive's root.
diff --git a/src/vs/base/common/performance.d.ts b/src/vs/base/common/performance.d.ts
index a26c1ebd7..fc233e6f8 100644
--- a/src/vs/base/common/performance.d.ts
+++ b/src/vs/base/common/performance.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface PerformanceEntry {
+export interface PerformanceMark {
 	readonly name: string;
 	readonly startTime: number;
 }
@@ -11,12 +11,6 @@ export interface PerformanceEntry {
 export function mark(name: string): void;
 
 /**
- * All entries filtered by type and sorted by `startTime`.
+ * Returns all marks, sorted by `startTime`.
  */
-export function getEntries(): PerformanceEntry[];
-
-export function getDuration(from: string, to: string): number;
-
-type ExportData = any[];
-export function importEntries(data: ExportData): void;
-export function exportEntries(): ExportData;
+export function getMarks(): PerformanceMark[];
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index b10f9b1d6..ac8c2cdb7 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -7,66 +7,88 @@
 
 //@ts-check
 
-function _factory(sharedObj) {
+/**
+ * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
+ */
+function _definePolyfillMarks(timeOrigin) {
 
-	sharedObj.MonacoPerformanceMarks = sharedObj.MonacoPerformanceMarks || [];
-
-	const _dataLen = 2;
-	const _nativeMark = typeof performance === 'object' && typeof performance.mark === 'function' ? performance.mark.bind(performance) : () => { };
-
-	function importEntries(entries) {
-		sharedObj.MonacoPerformanceMarks.splice(0, 0, ...entries);
+	const _data = [];
+	if (typeof timeOrigin === 'number') {
+		_data.push('code/timeOrigin', timeOrigin);
 	}
 
-	function exportEntries() {
-		return sharedObj.MonacoPerformanceMarks.slice(0);
+	function mark(name) {
+		_data.push(name, Date.now());
 	}
-
-	function getEntries() {
+	function getMarks() {
 		const result = [];
-		const entries = sharedObj.MonacoPerformanceMarks;
-		for (let i = 0; i < entries.length; i += _dataLen) {
+		for (let i = 0; i < _data.length; i += 2) {
 			result.push({
-				name: entries[i],
-				startTime: entries[i + 1],
+				name: _data[i],
+				startTime: _data[i + 1],
 			});
 		}
 		return result;
 	}
+	return { mark, getMarks };
+}
 
-	function getDuration(from, to) {
-		const entries = sharedObj.MonacoPerformanceMarks;
-		let target = to;
-		let endIndex = 0;
-		for (let i = entries.length - _dataLen; i >= 0; i -= _dataLen) {
-			if (entries[i] === target) {
-				if (target === to) {
-					// found `to` (end of interval)
-					endIndex = i;
-					target = from;
-				} else {
-					// found `from` (start of interval)
-					return entries[endIndex + 1] - entries[i + 1];
+/**
+ * @returns {{mark(name:string):void, getMarks():{name:string, startTime:number}[]}}
+ */
+function _define() {
+
+	if (typeof performance === 'object' && typeof performance.mark === 'function') {
+		// in a browser context, reuse performance-util
+
+		if (typeof performance.timeOrigin !== 'number' && !performance.timing) {
+			// safari & webworker: because there is no timeOrigin and no workaround
+			// we use the `Date.now`-based polyfill.
+			return _definePolyfillMarks();
+
+		} else {
+			// use "native" performance for mark and getMarks
+			return {
+				mark(name) {
+					performance.mark(name);
+				},
+				getMarks() {
+					let timeOrigin = performance.timeOrigin;
+					if (typeof timeOrigin !== 'number') {
+						// safari: there is no timerOrigin but in renderers there is the timing-property
+						// see https://bugs.webkit.org/show_bug.cgi?id=174862
+						timeOrigin = performance.timing.navigationStart || performance.timing.redirectStart || performance.timing.fetchStart;
+					}
+					const result = [{ name: 'code/timeOrigin', startTime: Math.round(timeOrigin) }];
+					for (const entry of performance.getEntriesByType('mark')) {
+						result.push({
+							name: entry.name,
+							startTime: Math.round(timeOrigin + entry.startTime)
+						});
+					}
+					return result;
 				}
-			}
+			};
 		}
-		return 0;
+
+	} else if (typeof process === 'object') {
+		// node.js: use the normal polyfill but add the timeOrigin
+		// from the node perf_hooks API as very first mark
+		const timeOrigin = Math.round((require.nodeRequire || require)('perf_hooks').performance.timeOrigin);
+		return _definePolyfillMarks(timeOrigin);
+
+	} else {
+		// unknown environment
+		console.trace('perf-util loaded in UNKNOWN environment');
+		return _definePolyfillMarks();
 	}
+}
 
-	function mark(name) {
-		sharedObj.MonacoPerformanceMarks.push(name, Date.now());
-		_nativeMark(name);
+function _factory(sharedObj) {
+	if (!sharedObj.MonacoPerformanceMarks) {
+		sharedObj.MonacoPerformanceMarks = _define();
 	}
-
-	const exports = {
-		mark: mark,
-		getEntries: getEntries,
-		getDuration: getDuration,
-		importEntries: importEntries,
-		exportEntries: exportEntries
-	};
-
-	return exports;
+	return sharedObj.MonacoPerformanceMarks;
 }
 
 // This module can be loaded in an amd and commonjs-context.
@@ -92,5 +114,6 @@ if (typeof define === 'function') {
 	// commonjs
 	module.exports = _factory(sharedObj);
 } else {
+	console.trace('perf-util defined in UNKNOWN context (neither requirejs or commonjs)');
 	sharedObj.perf = _factory(sharedObj);
 }
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 61fa4d71f..1718b5116 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -8,6 +8,7 @@ const LANGUAGE_DEFAULT = 'en';
 let _isWindows = false;
 let _isMacintosh = false;
 let _isLinux = false;
+let _isLinuxSnap = false;
 let _isNative = false;
 let _isWeb = false;
 let _isIOS = false;
@@ -61,6 +62,26 @@ if (typeof process !== 'undefined') {
 
 const isElectronRenderer = typeof nodeProcess?.versions?.electron === 'string' && nodeProcess.type === 'renderer';
 export const isElectronSandboxed = isElectronRenderer && nodeProcess?.sandboxed;
+export const browserCodeLoadingCacheStrategy: 'none' | 'code' | 'bypassHeatCheck' | 'bypassHeatCheckAndEagerCompile' | undefined = (() => {
+
+	// Always enabled when sandbox is enabled
+	if (isElectronSandboxed) {
+		return 'bypassHeatCheck';
+	}
+
+	// Otherwise, only enabled conditionally
+	const env = nodeProcess?.env['ENABLE_VSCODE_BROWSER_CODE_LOADING'];
+	if (typeof env === 'string') {
+		if (env === 'none' || env === 'code' || env === 'bypassHeatCheck' || env === 'bypassHeatCheckAndEagerCompile') {
+			return env;
+		}
+
+		return 'bypassHeatCheck';
+	}
+
+	return undefined;
+})();
+export const isPreferringBrowserCodeLoad = typeof browserCodeLoadingCacheStrategy === 'string';
 
 // Web environment
 if (typeof navigator === 'object' && !isElectronRenderer) {
@@ -79,6 +100,7 @@ else if (typeof nodeProcess === 'object') {
 	_isWindows = (nodeProcess.platform === 'win32');
 	_isMacintosh = (nodeProcess.platform === 'darwin');
 	_isLinux = (nodeProcess.platform === 'linux');
+	_isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION'];
 	_locale = LANGUAGE_DEFAULT;
 	_language = LANGUAGE_DEFAULT;
 	const rawNlsConfig = nodeProcess.env['VSCODE_NLS_CONFIG'];
@@ -128,6 +150,7 @@ if (_isMacintosh) {
 export const isWindows = _isWindows;
 export const isMacintosh = _isMacintosh;
 export const isLinux = _isLinux;
+export const isLinuxSnap = _isLinuxSnap;
 export const isNative = _isNative;
 export const isWeb = _isWeb;
 export const isIOS = _isIOS;
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
index 17895a851..6c52c3f9c 100644
--- a/src/vs/base/common/processes.ts
+++ b/src/vs/base/common/processes.ts
@@ -108,7 +108,6 @@ export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve
 	}, {} as Record<string, boolean>);
 	const keysToRemove = [
 		/^ELECTRON_.+$/,
-		/^GOOGLE_API_KEY$/,
 		/^VSCODE_.+$/,
 		/^SNAP(|_.*)$/,
 		/^GDK_PIXBUF_.+$/,
diff --git a/src/vs/base/common/scrollable.ts b/src/vs/base/common/scrollable.ts
index cb3fe20dc..73a862289 100644
--- a/src/vs/base/common/scrollable.ts
+++ b/src/vs/base/common/scrollable.ts
@@ -13,6 +13,8 @@ export const enum ScrollbarVisibility {
 }
 
 export interface ScrollEvent {
+	inSmoothScrolling: boolean;
+
 	oldWidth: number;
 	oldScrollWidth: number;
 	oldScrollLeft: number;
@@ -132,7 +134,7 @@ export class ScrollState implements IScrollDimensions, IScrollPosition {
 		);
 	}
 
-	public createScrollEvent(previous: ScrollState): ScrollEvent {
+	public createScrollEvent(previous: ScrollState, inSmoothScrolling: boolean): ScrollEvent {
 		const widthChanged = (this.width !== previous.width);
 		const scrollWidthChanged = (this.scrollWidth !== previous.scrollWidth);
 		const scrollLeftChanged = (this.scrollLeft !== previous.scrollLeft);
@@ -142,6 +144,7 @@ export class ScrollState implements IScrollDimensions, IScrollPosition {
 		const scrollTopChanged = (this.scrollTop !== previous.scrollTop);
 
 		return {
+			inSmoothScrolling: inSmoothScrolling,
 			oldWidth: previous.width,
 			oldScrollWidth: previous.scrollWidth,
 			oldScrollLeft: previous.scrollLeft,
@@ -242,7 +245,7 @@ export class Scrollable extends Disposable {
 
 	public setScrollDimensions(dimensions: INewScrollDimensions, useRawScrollPositions: boolean): void {
 		const newState = this._state.withScrollDimensions(dimensions, useRawScrollPositions);
-		this._setState(newState);
+		this._setState(newState, Boolean(this._smoothScrolling));
 
 		// Validate outstanding animated scroll position target
 		if (this._smoothScrolling) {
@@ -279,10 +282,10 @@ export class Scrollable extends Disposable {
 			this._smoothScrolling = null;
 		}
 
-		this._setState(newState);
+		this._setState(newState, false);
 	}
 
-	public setScrollPositionSmooth(update: INewScrollPosition): void {
+	public setScrollPositionSmooth(update: INewScrollPosition, reuseAnimation?: boolean): void {
 		if (this._smoothScrollDuration === 0) {
 			// Smooth scrolling not supported.
 			return this.setScrollPositionNow(update);
@@ -302,8 +305,12 @@ export class Scrollable extends Disposable {
 				// No need to interrupt or extend the current animation since we're going to the same place
 				return;
 			}
-
-			const newSmoothScrolling = this._smoothScrolling.combine(this._state, validTarget, this._smoothScrollDuration);
+			let newSmoothScrolling: SmoothScrollingOperation;
+			if (reuseAnimation) {
+				newSmoothScrolling = new SmoothScrollingOperation(this._smoothScrolling.from, validTarget, this._smoothScrolling.startTime, this._smoothScrolling.duration);
+			} else {
+				newSmoothScrolling = this._smoothScrolling.combine(this._state, validTarget, this._smoothScrollDuration);
+			}
 			this._smoothScrolling.dispose();
 			this._smoothScrolling = newSmoothScrolling;
 		} else {
@@ -330,7 +337,7 @@ export class Scrollable extends Disposable {
 		const update = this._smoothScrolling.tick();
 		const newState = this._state.withScrollPosition(update);
 
-		this._setState(newState);
+		this._setState(newState, true);
 
 		if (!this._smoothScrolling) {
 			// Looks like someone canceled the smooth scrolling
@@ -354,14 +361,14 @@ export class Scrollable extends Disposable {
 		});
 	}
 
-	private _setState(newState: ScrollState): void {
+	private _setState(newState: ScrollState, inSmoothScrolling: boolean): void {
 		const oldState = this._state;
 		if (oldState.equals(newState)) {
 			// no change
 			return;
 		}
 		this._state = newState;
-		this._onScroll.fire(this._state.createScrollEvent(oldState));
+		this._onScroll.fire(this._state.createScrollEvent(oldState, inSmoothScrolling));
 	}
 }
 
@@ -404,17 +411,17 @@ export class SmoothScrollingOperation {
 	public readonly from: ISmoothScrollPosition;
 	public to: ISmoothScrollPosition;
 	public readonly duration: number;
-	private readonly _startTime: number;
+	public readonly startTime: number;
 	public animationFrameDisposable: IDisposable | null;
 
 	private scrollLeft!: IAnimation;
 	private scrollTop!: IAnimation;
 
-	protected constructor(from: ISmoothScrollPosition, to: ISmoothScrollPosition, startTime: number, duration: number) {
+	constructor(from: ISmoothScrollPosition, to: ISmoothScrollPosition, startTime: number, duration: number) {
 		this.from = from;
 		this.to = to;
 		this.duration = duration;
-		this._startTime = startTime;
+		this.startTime = startTime;
 
 		this.animationFrameDisposable = null;
 
@@ -460,7 +467,7 @@ export class SmoothScrollingOperation {
 	}
 
 	protected _tick(now: number): SmoothScrollingUpdate {
-		const completion = (now - this._startTime) / this.duration;
+		const completion = (now - this.startTime) / this.duration;
 
 		if (completion < 1) {
 			const newScrollLeft = this.scrollLeft(completion);
diff --git a/src/vs/base/common/stopwatch.ts b/src/vs/base/common/stopwatch.ts
index 0280b20a4..ccba2ac58 100644
--- a/src/vs/base/common/stopwatch.ts
+++ b/src/vs/base/common/stopwatch.ts
@@ -35,6 +35,6 @@ export class StopWatch {
 	}
 
 	private _now(): number {
-		return this._highResolution ? globals.performance.now() : new Date().getTime();
+		return this._highResolution ? globals.performance.now() : Date.now();
 	}
 }
diff --git a/src/vs/base/common/stream.ts b/src/vs/base/common/stream.ts
index 260e13f02..47df4fcd7 100644
--- a/src/vs/base/common/stream.ts
+++ b/src/vs/base/common/stream.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 
 /**
@@ -229,7 +230,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 
 		// flowing: directly send the data to listeners
 		if (this.state.flowing) {
-			this.listeners.data.forEach(listener => listener(data));
+			this.emitData(data);
 		}
 
 		// not yet flowing: buffer data until flowing
@@ -250,7 +251,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 
 		// flowing: directly send the error to listeners
 		if (this.state.flowing) {
-			this.listeners.error.forEach(listener => listener(error));
+			this.emitError(error);
 		}
 
 		// not yet flowing: buffer errors until flowing
@@ -273,7 +274,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 
 		// flowing: send end event to listeners
 		if (this.state.flowing) {
-			this.listeners.end.forEach(listener => listener());
+			this.emitEnd();
 
 			this.destroy();
 		}
@@ -284,6 +285,22 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 		}
 	}
 
+	private emitData(data: T): void {
+		this.listeners.data.slice(0).forEach(listener => listener(data)); // slice to avoid listener mutation from delivering event
+	}
+
+	private emitError(error: Error): void {
+		if (this.listeners.error.length === 0) {
+			onUnexpectedError(error); // nobody listened to this error so we log it as unexpected
+		} else {
+			this.listeners.error.slice(0).forEach(listener => listener(error)); // slice to avoid listener mutation from delivering event
+		}
+	}
+
+	private emitEnd(): void {
+		this.listeners.end.slice(0).forEach(listener => listener()); // slice to avoid listener mutation from delivering event
+	}
+
 	on(event: 'data', callback: (data: T) => void): void;
 	on(event: 'error', callback: (err: Error) => void): void;
 	on(event: 'end', callback: () => void): void;
@@ -361,7 +378,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 		if (this.buffer.data.length > 0) {
 			const fullDataBuffer = this.reducer(this.buffer.data);
 
-			this.listeners.data.forEach(listener => listener(fullDataBuffer));
+			this.emitData(fullDataBuffer);
 
 			this.buffer.data.length = 0;
 
@@ -375,7 +392,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 	private flowErrors(): void {
 		if (this.listeners.error.length > 0) {
 			for (const error of this.buffer.error) {
-				this.listeners.error.forEach(listener => listener(error));
+				this.emitError(error);
 			}
 
 			this.buffer.error.length = 0;
@@ -384,7 +401,7 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 
 	private flowEnd(): boolean {
 		if (this.state.ended) {
-			this.listeners.end.forEach(listener => listener());
+			this.emitEnd();
 
 			return this.listeners.end.length > 0;
 		}
@@ -478,9 +495,13 @@ export function consumeStream<T>(stream: ReadableStreamEvents<T>, reducer: IRedu
 	return new Promise((resolve, reject) => {
 		const chunks: T[] = [];
 
-		stream.on('data', data => chunks.push(data));
 		stream.on('error', error => reject(error));
 		stream.on('end', () => resolve(reducer(chunks)));
+
+		// Adding the `data` listener will turn the stream
+		// into flowing mode. As such it is important to
+		// add this listener last (DO NOT CHANGE!)
+		stream.on('data', data => chunks.push(data));
 	});
 }
 
@@ -574,3 +595,40 @@ export function transform<Original, Transformed>(stream: ReadableStreamEvents<Or
 
 	return target;
 }
+
+export interface IReadableStreamObservable {
+
+	/**
+	 * A promise to await the `end` or `error` event
+	 * of a stream.
+	 */
+	errorOrEnd: () => Promise<void>;
+}
+
+/**
+ * Helper to observe a stream for certain events through
+ * a promise based API.
+ */
+export function observe(stream: ReadableStream<unknown>): IReadableStreamObservable {
+
+	// A stream is closed when it ended or errord
+	// We install this listener right from the
+	// beginning to catch the events early.
+	const errorOrEnd = Promise.race([
+		new Promise<void>(resolve => stream.on('end', () => resolve())),
+		new Promise<void>(resolve => stream.on('error', () => resolve()))
+	]);
+
+	return {
+		errorOrEnd(): Promise<void> {
+
+			// We need to ensure the stream is flowing so that our
+			// listeners are getting triggered. It is possible that
+			// the stream is not flowing because no `data` listener
+			// was attached yet.
+			stream.resume();
+
+			return errorOrEnd;
+		}
+	};
+}
diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts
index 8111602ef..55a39c0f3 100644
--- a/src/vs/base/common/uri.ts
+++ b/src/vs/base/common/uri.ts
@@ -108,7 +108,7 @@ export class URI implements UriComponents {
 			&& typeof (<URI>thing).path === 'string'
 			&& typeof (<URI>thing).query === 'string'
 			&& typeof (<URI>thing).scheme === 'string'
-			&& typeof (<URI>thing).fsPath === 'function'
+			&& typeof (<URI>thing).fsPath === 'string'
 			&& typeof (<URI>thing).with === 'function'
 			&& typeof (<URI>thing).toString === 'function';
 	}
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
index 2c64061da..be9ca50b1 100644
--- a/src/vs/base/node/languagePacks.js
+++ b/src/vs/base/node/languagePacks.js
@@ -186,10 +186,10 @@ function factory(nodeRequire, path, fs, perf) {
 
 		const initialLocale = locale;
 
-		perf.mark('nlsGeneration:start');
+		perf.mark('code/willGenerateNls');
 
 		const defaultResult = function (locale) {
-			perf.mark('nlsGeneration:end');
+			perf.mark('code/didGenerateNls');
 			return Promise.resolve({ locale: locale, availableLanguages: {} });
 		};
 		try {
@@ -240,7 +240,7 @@ function factory(nodeRequire, path, fs, perf) {
 							if (fileExists) {
 								// We don't wait for this. No big harm if we can't touch
 								touch(coreLocation).catch(() => { });
-								perf.mark('nlsGeneration:end');
+								perf.mark('code/didGenerateNls');
 								return result;
 							}
 							return mkdirp(coreLocation).then(() => {
@@ -279,7 +279,7 @@ function factory(nodeRequire, path, fs, perf) {
 								writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
 								return Promise.all(writes);
 							}).then(() => {
-								perf.mark('nlsGeneration:end');
+								perf.mark('code/didGenerateNls');
 								return result;
 							}).catch(err => {
 								console.error('Generating translation files failed.', err);
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 3a17bd3fc..11ef31262 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as fs from 'fs';
+import { tmpdir } from 'os';
 import { join } from 'vs/base/common/path';
 import { Queue } from 'vs/base/common/async';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as platform from 'vs/base/common/platform';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { Event } from 'vs/base/common/event';
 import { promisify } from 'util';
 import { isRootOrDriveLetter } from 'vs/base/common/extpath';
@@ -74,8 +74,8 @@ async function rimrafUnlink(path: string): Promise<void> {
 
 			// chmod as needed to allow for unlink
 			const mode = stat.mode;
-			if (!(mode & 128)) { // 128 === 0200
-				await chmod(path, mode | 128);
+			if (!(mode & fs.constants.S_IWUSR)) {
+				await chmod(path, mode | fs.constants.S_IWUSR);
 			}
 
 			return unlink(path);
@@ -89,7 +89,7 @@ async function rimrafUnlink(path: string): Promise<void> {
 
 async function rimrafMove(path: string): Promise<void> {
 	try {
-		const pathInTemp = join(os.tmpdir(), generateUuid());
+		const pathInTemp = join(tmpdir(), generateUuid());
 		try {
 			await rename(path, pathInTemp);
 		} catch (error) {
@@ -129,8 +129,8 @@ export function rimrafSync(path: string): void {
 
 			// chmod as needed to allow for unlink
 			const mode = stat.mode;
-			if (!(mode & 128)) { // 128 === 0200
-				fs.chmodSync(path, mode | 128);
+			if (!(mode & fs.constants.S_IWUSR)) {
+				fs.chmodSync(path, mode | fs.constants.S_IWUSR);
 			}
 
 			return fs.unlinkSync(path);
@@ -151,7 +151,7 @@ export async function readdirWithFileTypes(path: string): Promise<fs.Dirent[]> {
 
 	// Mac: uses NFD unicode form on disk, but we want NFC
 	// See also https://github.com/nodejs/node/issues/2165
-	if (platform.isMacintosh) {
+	if (isMacintosh) {
 		for (const child of children) {
 			child.name = normalizeNFC(child.name);
 		}
@@ -167,7 +167,7 @@ export function readdirSync(path: string): string[] {
 function handleDirectoryChildren(children: string[]): string[] {
 	// Mac: uses NFD unicode form on disk, but we want NFC
 	// See also https://github.com/nodejs/node/issues/2165
-	if (platform.isMacintosh) {
+	if (isMacintosh) {
 		return children.map(child => normalizeNFC(child));
 	}
 
@@ -231,6 +231,25 @@ export async function statLink(path: string): Promise<IStatAndLink> {
 			return { stat: lstats, symbolicLink: { dangling: true } };
 		}
 
+		// Windows: workaround a node.js bug where reparse points
+		// are not supported (https://github.com/nodejs/node/issues/36790)
+		if (isWindows && error.code === 'EACCES' && lstats) {
+			try {
+				const stats = await stat(await readlink(path));
+
+				return { stat: stats, symbolicLink: lstats.isSymbolicLink() ? { dangling: false } : undefined };
+			} catch (error) {
+
+				// If the link points to a non-existing file we still want
+				// to return it as result while setting dangling: true flag
+				if (error.code === 'ENOENT') {
+					return { stat: lstats, symbolicLink: { dangling: true } };
+				}
+
+				throw error;
+			}
+		}
+
 		throw error;
 	}
 }
@@ -247,6 +266,10 @@ export function renameIgnoreError(oldPath: string, newPath: string): Promise<voi
 	return new Promise(resolve => fs.rename(oldPath, newPath, () => resolve()));
 }
 
+export function readlink(path: string): Promise<string> {
+	return promisify(fs.readlink)(path);
+}
+
 export function unlink(path: string): Promise<void> {
 	return promisify(fs.unlink)(path);
 }
@@ -290,7 +313,7 @@ export function writeFile(path: string, data: string | Buffer | Uint8Array, opti
 
 function toQueueKey(path: string): string {
 	let queueKey = path;
-	if (platform.isWindows || platform.isMacintosh) {
+	if (isWindows || isMacintosh) {
 		queueKey = queueKey.toLowerCase(); // accommodate for case insensitive file systems
 	}
 
@@ -394,11 +417,11 @@ export function writeFileSync(path: string, data: string | Buffer, options?: IWr
 
 function ensureWriteOptions(options?: IWriteFileOptions): IEnsuredWriteFileOptions {
 	if (!options) {
-		return { mode: 0o666, flag: 'w' };
+		return { mode: 0o666 /* default node.js mode for files */, flag: 'w' };
 	}
 
 	return {
-		mode: typeof options.mode === 'number' ? options.mode : 0o666,
+		mode: typeof options.mode === 'number' ? options.mode : 0o666 /* default node.js mode for files */,
 		flag: typeof options.flag === 'string' ? options.flag : 'w'
 	};
 }
@@ -418,22 +441,26 @@ export async function readDirsInDir(dirPath: string): Promise<string[]> {
 
 export async function dirExists(path: string): Promise<boolean> {
 	try {
-		const fileStat = await stat(path);
+		const { stat, symbolicLink } = await statLink(path);
 
-		return fileStat.isDirectory();
+		return stat.isDirectory() && symbolicLink?.dangling !== true;
 	} catch (error) {
-		return false;
+		// Ignore, path might not exist
 	}
+
+	return false;
 }
 
 export async function fileExists(path: string): Promise<boolean> {
 	try {
-		const fileStat = await stat(path);
+		const { stat, symbolicLink } = await statLink(path);
 
-		return fileStat.isFile();
+		return stat.isFile() && symbolicLink?.dangling !== true;
 	} catch (error) {
-		return false;
+		// Ignore, path might not exist
 	}
+
+	return false;
 }
 
 export function whenDeleted(path: string): Promise<void> {
@@ -459,13 +486,13 @@ export function whenDeleted(path: string): Promise<void> {
 
 export async function move(source: string, target: string): Promise<void> {
 	if (source === target) {
-		return Promise.resolve();
+		return;
 	}
 
 	async function updateMtime(path: string): Promise<void> {
 		const stat = await lstat(path);
 		if (stat.isDirectory() || stat.isSymbolicLink()) {
-			return Promise.resolve(); // only for files
+			return; // only for files
 		}
 
 		const fd = await promisify(fs.open)(path, 'a');
@@ -501,28 +528,43 @@ export async function move(source: string, target: string): Promise<void> {
 	}
 }
 
-export async function copy(source: string, target: string, copiedSourcesIn?: { [path: string]: boolean }): Promise<void> {
-	const copiedSources = copiedSourcesIn ? copiedSourcesIn : Object.create(null);
+// When copying a file or folder, we want to preserve the mode
+// it had and as such provide it when creating. However, modes
+// can go beyond what we expect (see link below), so we mask it.
+// (https://github.com/nodejs/node-v0.x-archive/issues/3045#issuecomment-4862588)
+//
+// The `copy` method is very old so we should probably revisit
+// it's implementation and check wether this mask is still needed.
+const COPY_MODE_MASK = 0o777;
 
-	const fileStat = await stat(source);
-	if (!fileStat.isDirectory()) {
-		return doCopyFile(source, target, fileStat.mode & 511);
+export async function copy(source: string, target: string, handledSourcesIn?: { [path: string]: boolean }): Promise<void> {
+
+	// Keep track of paths already copied to prevent
+	// cycles from symbolic links to cause issues
+	const handledSources = handledSourcesIn ?? Object.create(null);
+	if (handledSources[source]) {
+		return;
+	} else {
+		handledSources[source] = true;
 	}
 
-	if (copiedSources[source]) {
-		return Promise.resolve(); // escape when there are cycles (can happen with symlinks)
+	const { stat, symbolicLink } = await statLink(source);
+	if (symbolicLink?.dangling) {
+		return; // skip over dangling symbolic links (https://github.com/microsoft/vscode/issues/111621)
 	}
 
-	copiedSources[source] = true; // remember as copied
+	if (!stat.isDirectory()) {
+		return doCopyFile(source, target, stat.mode & COPY_MODE_MASK);
+	}
 
 	// Create folder
-	await mkdirp(target, fileStat.mode & 511);
+	await mkdirp(target, stat.mode & COPY_MODE_MASK);
 
 	// Copy each file recursively
 	const files = await readdir(source);
 	for (let i = 0; i < files.length; i++) {
 		const file = files[i];
-		await copy(join(source, file), join(target, file), copiedSources);
+		await copy(join(source, file), join(target, file), handledSources);
 	}
 }
 
diff --git a/src/vs/base/node/powershell.ts b/src/vs/base/node/powershell.ts
new file mode 100644
index 000000000..29a7f5944
--- /dev/null
+++ b/src/vs/base/node/powershell.ts
@@ -0,0 +1,316 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as pfs from 'vs/base/node/pfs';
+import * as os from 'os';
+import * as path from 'vs/base/common/path';
+import { env } from 'vs/base/common/process';
+
+const WindowsPowerShell64BitLabel = 'Windows PowerShell';
+const WindowsPowerShell32BitLabel = 'Windows PowerShell (x86)';
+
+// This is required, since parseInt("7-preview") will return 7.
+const IntRegex: RegExp = /^\d+$/;
+
+const PwshMsixRegex: RegExp = /^Microsoft.PowerShell_.*/;
+const PwshPreviewMsixRegex: RegExp = /^Microsoft.PowerShellPreview_.*/;
+
+// The platform details descriptor for the platform we're on
+const isProcess64Bit: boolean = process.arch === 'x64';
+const isOS64Bit: boolean = isProcess64Bit || os.arch() === 'x64';
+
+export interface IPowerShellExeDetails {
+	readonly displayName: string;
+	readonly exePath: string;
+}
+
+export interface IPossiblePowerShellExe extends IPowerShellExeDetails {
+	exists(): Promise<boolean>;
+}
+
+class PossiblePowerShellExe implements IPossiblePowerShellExe {
+	constructor(
+		public readonly exePath: string,
+		public readonly displayName: string,
+		private knownToExist?: boolean) { }
+
+	public async exists(): Promise<boolean> {
+		if (this.knownToExist === undefined) {
+			this.knownToExist = await pfs.fileExists(this.exePath);
+		}
+		return this.knownToExist;
+	}
+}
+
+function getProgramFilesPath(
+	{ useAlternateBitness = false }: { useAlternateBitness?: boolean } = {}): string | null {
+
+	if (!useAlternateBitness) {
+		// Just use the native system bitness
+		return env.ProgramFiles || null;
+	}
+
+	// We might be a 64-bit process looking for 32-bit program files
+	if (isProcess64Bit) {
+		return env['ProgramFiles(x86)'] || null;
+	}
+
+	// We might be a 32-bit process looking for 64-bit program files
+	if (isOS64Bit) {
+		return env.ProgramW6432 || null;
+	}
+
+	// We're a 32-bit process on 32-bit Windows, there is no other Program Files dir
+	return null;
+}
+
+function getSystem32Path({ useAlternateBitness = false }: { useAlternateBitness?: boolean } = {}): string {
+	const windir: string = env.windir!;
+
+	if (!useAlternateBitness) {
+		// Just use the native system bitness
+		return path.join(windir, 'System32');
+	}
+
+	// We might be a 64-bit process looking for 32-bit system32
+	if (isProcess64Bit) {
+		return path.join(windir, 'SysWOW64');
+	}
+
+	// We might be a 32-bit process looking for 64-bit system32
+	if (isOS64Bit) {
+		return path.join(windir, 'Sysnative');
+	}
+
+	// We're on a 32-bit Windows, so no alternate bitness
+	return path.join(windir, 'System32');
+}
+
+async function findPSCoreWindowsInstallation(
+	{ useAlternateBitness = false, findPreview = false }:
+		{ useAlternateBitness?: boolean; findPreview?: boolean } = {}): Promise<IPossiblePowerShellExe | null> {
+
+	const programFilesPath = getProgramFilesPath({ useAlternateBitness });
+	if (!programFilesPath) {
+		return null;
+	}
+
+	const powerShellInstallBaseDir = path.join(programFilesPath, 'PowerShell');
+
+	// Ensure the base directory exists
+	if (!await pfs.dirExists(powerShellInstallBaseDir)) {
+		return null;
+	}
+
+	let highestSeenVersion: number = -1;
+	let pwshExePath: string | null = null;
+	for (const item of await pfs.readdir(powerShellInstallBaseDir)) {
+
+		let currentVersion: number = -1;
+		if (findPreview) {
+			// We are looking for something like "7-preview"
+
+			// Preview dirs all have dashes in them
+			const dashIndex = item.indexOf('-');
+			if (dashIndex < 0) {
+				continue;
+			}
+
+			// Verify that the part before the dash is an integer
+			// and that the part after the dash is "preview"
+			const intPart: string = item.substring(0, dashIndex);
+			if (!IntRegex.test(intPart) || item.substring(dashIndex + 1) !== 'preview') {
+				continue;
+			}
+
+			currentVersion = parseInt(intPart, 10);
+		} else {
+			// Search for a directory like "6" or "7"
+			if (!IntRegex.test(item)) {
+				continue;
+			}
+
+			currentVersion = parseInt(item, 10);
+		}
+
+		// Ensure we haven't already seen a higher version
+		if (currentVersion <= highestSeenVersion) {
+			continue;
+		}
+
+		// Now look for the file
+		const exePath = path.join(powerShellInstallBaseDir, item, 'pwsh.exe');
+		if (!await pfs.fileExists(exePath)) {
+			continue;
+		}
+
+		pwshExePath = exePath;
+		highestSeenVersion = currentVersion;
+	}
+
+	if (!pwshExePath) {
+		return null;
+	}
+
+	const bitness: string = programFilesPath.includes('x86') ? ' (x86)' : '';
+	const preview: string = findPreview ? ' Preview' : '';
+
+	return new PossiblePowerShellExe(pwshExePath, `PowerShell${preview}${bitness}`, true);
+}
+
+async function findPSCoreMsix({ findPreview }: { findPreview?: boolean } = {}): Promise<IPossiblePowerShellExe | null> {
+	// We can't proceed if there's no LOCALAPPDATA path
+	if (!env.LOCALAPPDATA) {
+		return null;
+	}
+
+	// Find the base directory for MSIX application exe shortcuts
+	const msixAppDir = path.join(env.LOCALAPPDATA, 'Microsoft', 'WindowsApps');
+
+	if (!await pfs.dirExists(msixAppDir)) {
+		return null;
+	}
+
+	// Define whether we're looking for the preview or the stable
+	const { pwshMsixDirRegex, pwshMsixName } = findPreview
+		? { pwshMsixDirRegex: PwshPreviewMsixRegex, pwshMsixName: 'PowerShell Preview (Store)' }
+		: { pwshMsixDirRegex: PwshMsixRegex, pwshMsixName: 'PowerShell (Store)' };
+
+	// We should find only one such application, so return on the first one
+	for (const subdir of await pfs.readdir(msixAppDir)) {
+		if (pwshMsixDirRegex.test(subdir)) {
+			const pwshMsixPath = path.join(msixAppDir, subdir, 'pwsh.exe');
+			return new PossiblePowerShellExe(pwshMsixPath, pwshMsixName);
+		}
+	}
+
+	// If we find nothing, return null
+	return null;
+}
+
+function findPSCoreDotnetGlobalTool(): IPossiblePowerShellExe {
+	const dotnetGlobalToolExePath: string = path.join(os.homedir(), '.dotnet', 'tools', 'pwsh.exe');
+
+	return new PossiblePowerShellExe(dotnetGlobalToolExePath, '.NET Core PowerShell Global Tool');
+}
+
+function findWinPS({ useAlternateBitness = false }: { useAlternateBitness?: boolean } = {}): IPossiblePowerShellExe | null {
+
+	// x86 and ARM only have one WinPS on them
+	if (!isOS64Bit && useAlternateBitness) {
+		return null;
+	}
+
+	const systemFolderPath = getSystem32Path({ useAlternateBitness });
+
+	const winPSPath = path.join(systemFolderPath, 'WindowsPowerShell', 'v1.0', 'powershell.exe');
+
+	let displayName: string;
+	if (isProcess64Bit) {
+		displayName = useAlternateBitness
+			? WindowsPowerShell32BitLabel
+			: WindowsPowerShell64BitLabel;
+	} else if (isOS64Bit) {
+		displayName = useAlternateBitness
+			? WindowsPowerShell64BitLabel
+			: WindowsPowerShell32BitLabel;
+	} else {
+		// NOTE: ARM Windows devices also have Windows PowerShell x86 on them. There is no
+		// "ARM Windows PowerShell".
+		displayName = WindowsPowerShell32BitLabel;
+	}
+
+	return new PossiblePowerShellExe(winPSPath, displayName, true);
+}
+
+/**
+ * Iterates through all the possible well-known PowerShell installations on a machine.
+ * Returned values may not exist, but come with an .exists property
+ * which will check whether the executable exists.
+ */
+async function* enumerateDefaultPowerShellInstallations(): AsyncIterable<IPossiblePowerShellExe> {
+	// Find PSCore stable first
+	let pwshExe = await findPSCoreWindowsInstallation();
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Windows may have a 32-bit pwsh.exe
+	pwshExe = await findPSCoreWindowsInstallation({ useAlternateBitness: true });
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Also look for the MSIX/UWP installation
+	pwshExe = await findPSCoreMsix();
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Look for the .NET global tool
+	// Some older versions of PowerShell have a bug in this where startup will fail,
+	// but this is fixed in newer versions
+	pwshExe = findPSCoreDotnetGlobalTool();
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Look for PSCore preview
+	pwshExe = await findPSCoreWindowsInstallation({ findPreview: true });
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Find a preview MSIX
+	pwshExe = await findPSCoreMsix({ findPreview: true });
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Look for pwsh-preview with the opposite bitness
+	pwshExe = await findPSCoreWindowsInstallation({ useAlternateBitness: true, findPreview: true });
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Finally, get Windows PowerShell
+
+	// Get the natural Windows PowerShell for the process bitness
+	pwshExe = findWinPS();
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
+	// Get the alternate bitness Windows PowerShell
+	pwshExe = findWinPS({ useAlternateBitness: true });
+	if (pwshExe) {
+		yield pwshExe;
+	}
+}
+
+/**
+ * Iterates through PowerShell installations on the machine according
+ * to configuration passed in through the constructor.
+ * PowerShell items returned by this object are verified
+ * to exist on the filesystem.
+ */
+export async function* enumeratePowerShellInstallations(): AsyncIterable<IPowerShellExeDetails> {
+	// Get the default PowerShell installations first
+	for await (const defaultPwsh of enumerateDefaultPowerShellInstallations()) {
+		if (await defaultPwsh.exists()) {
+			yield defaultPwsh;
+		}
+	}
+}
+
+/**
+* Returns the first available PowerShell executable found in the search order.
+*/
+export async function getFirstAvailablePowerShellInstallation(): Promise<IPowerShellExeDetails | null> {
+	for await (const pwsh of enumeratePowerShellInstallations()) {
+		return pwsh;
+	}
+	return null;
+}
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 213d0bdf5..de16ce24d 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -50,7 +50,7 @@ function terminateProcess(process: cp.ChildProcess, cwd?: string): Promise<Termi
 				options.cwd = cwd;
 			}
 			const killProcess = cp.execFile('taskkill', ['/T', '/F', '/PID', process.pid.toString()], options);
-			return new Promise((resolve, reject) => {
+			return new Promise(resolve => {
 				killProcess.once('error', (err) => {
 					resolve({ success: false, error: err });
 				});
@@ -68,7 +68,7 @@ function terminateProcess(process: cp.ChildProcess, cwd?: string): Promise<Termi
 	} else if (Platform.isLinux || Platform.isMacintosh) {
 		try {
 			const cmd = FileAccess.asFileUri('vs/base/node/terminateProcess.sh', require).fsPath;
-			return new Promise((resolve, reject) => {
+			return new Promise(resolve => {
 				cp.execFile(cmd, [process.pid.toString()], { encoding: 'utf8', shell: true } as cp.ExecFileOptions, (err, stdout, stderr) => {
 					if (err) {
 						resolve({ success: false, error: err });
@@ -86,8 +86,8 @@ function terminateProcess(process: cp.ChildProcess, cwd?: string): Promise<Termi
 	return Promise.resolve({ success: true });
 }
 
-export function getWindowsShell(environment: Platform.IProcessEnvironment = process.env as Platform.IProcessEnvironment): string {
-	return environment['comspec'] || 'cmd.exe';
+export function getWindowsShell(env = process.env as Platform.IProcessEnvironment): string {
+	return env['comspec'] || 'cmd.exe';
 }
 
 export abstract class AbstractProcess<TProgressData> {
@@ -447,8 +447,8 @@ export namespace win32 {
 			// to the current working directory.
 			return path.join(cwd, command);
 		}
-		if (paths === undefined && Types.isString(process.env.PATH)) {
-			paths = process.env.PATH.split(path.delimiter);
+		if (paths === undefined && Types.isString(process.env['PATH'])) {
+			paths = process.env['PATH'].split(path.delimiter);
 		}
 		// No PATH environment. Make path absolute to the cwd.
 		if (paths === undefined || paths.length === 0) {
diff --git a/src/vs/base/node/shell.ts b/src/vs/base/node/shell.ts
new file mode 100644
index 000000000..cacc2da4d
--- /dev/null
+++ b/src/vs/base/node/shell.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as os from 'os';
+import * as platform from 'vs/base/common/platform';
+import { getFirstAvailablePowerShellInstallation } from 'vs/base/node/powershell';
+import * as processes from 'vs/base/node/processes';
+
+/**
+ * Gets the detected default shell for the _system_, not to be confused with VS Code's _default_
+ * shell that the terminal uses by default.
+ * @param p The platform to detect the shell of.
+ */
+export async function getSystemShell(p: platform.Platform, env = process.env as platform.IProcessEnvironment): Promise<string> {
+	if (p === platform.Platform.Windows) {
+		if (platform.isWindows) {
+			return getSystemShellWindows();
+		}
+		// Don't detect Windows shell when not on Windows
+		return processes.getWindowsShell(env);
+	}
+
+	return getSystemShellUnixLike(p, env);
+}
+
+export function getSystemShellSync(p: platform.Platform, env = process.env as platform.IProcessEnvironment): string {
+	if (p === platform.Platform.Windows) {
+		if (platform.isWindows) {
+			return getSystemShellWindowsSync(env);
+		}
+		// Don't detect Windows shell when not on Windows
+		return processes.getWindowsShell(env);
+	}
+
+	return getSystemShellUnixLike(p, env);
+}
+
+let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string | null = null;
+function getSystemShellUnixLike(p: platform.Platform, env: platform.IProcessEnvironment): string {
+	// Only use $SHELL for the current OS
+	if (platform.isLinux && p === platform.Platform.Mac || platform.isMacintosh && p === platform.Platform.Linux) {
+		return '/bin/bash';
+	}
+
+	if (!_TERMINAL_DEFAULT_SHELL_UNIX_LIKE) {
+		let unixLikeTerminal: string;
+		if (platform.isWindows) {
+			unixLikeTerminal = '/bin/bash'; // for WSL
+		} else {
+			unixLikeTerminal = env['SHELL'];
+
+			if (!unixLikeTerminal) {
+				try {
+					// It's possible for $SHELL to be unset, this API reads /etc/passwd. See https://github.com/github/codespaces/issues/1639
+					// Node docs: "Throws a SystemError if a user has no username or homedir."
+					unixLikeTerminal = os.userInfo().shell;
+				} catch (err) { }
+			}
+
+			if (!unixLikeTerminal) {
+				unixLikeTerminal = 'sh';
+			}
+
+			// Some systems have $SHELL set to /bin/false which breaks the terminal
+			if (unixLikeTerminal === '/bin/false') {
+				unixLikeTerminal = '/bin/bash';
+			}
+		}
+		_TERMINAL_DEFAULT_SHELL_UNIX_LIKE = unixLikeTerminal;
+	}
+	return _TERMINAL_DEFAULT_SHELL_UNIX_LIKE;
+}
+
+let _TERMINAL_DEFAULT_SHELL_WINDOWS: string | null = null;
+async function getSystemShellWindows(): Promise<string> {
+	if (!_TERMINAL_DEFAULT_SHELL_WINDOWS) {
+		_TERMINAL_DEFAULT_SHELL_WINDOWS = (await getFirstAvailablePowerShellInstallation())!.exePath;
+	}
+	return _TERMINAL_DEFAULT_SHELL_WINDOWS;
+}
+
+function getSystemShellWindowsSync(env: platform.IProcessEnvironment): string {
+	if (_TERMINAL_DEFAULT_SHELL_WINDOWS) {
+		return _TERMINAL_DEFAULT_SHELL_WINDOWS;
+	}
+
+	const isAtLeastWindows10 = platform.isWindows && parseFloat(os.release()) >= 10;
+	const is32ProcessOn64Windows = env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+	const powerShellPath = `${env['windir']}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}\\WindowsPowerShell\\v1.0\\powershell.exe`;
+	return isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell(env);
+}
diff --git a/src/vs/base/parts/ipc/browser/ipc.mp.ts b/src/vs/base/parts/ipc/browser/ipc.mp.ts
new file mode 100644
index 000000000..a5871ddbf
--- /dev/null
+++ b/src/vs/base/parts/ipc/browser/ipc.mp.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+
+/**
+ * An implementation of a `IPCClient` on top of DOM `MessagePort`.
+ */
+export class Client extends MessagePortClient implements IDisposable {
+
+	/**
+	 * @param clientId a way to uniquely identify this client among
+	 * other clients. this is important for routing because every
+	 * client can also be a server
+	 */
+	constructor(port: MessagePort, clientId: string) {
+		super(port, clientId);
+	}
+}
diff --git a/src/vs/base/parts/ipc/common/ipc.electron.ts b/src/vs/base/parts/ipc/common/ipc.electron.ts
index 516351e15..ae5a30a8a 100644
--- a/src/vs/base/parts/ipc/common/ipc.electron.ts
+++ b/src/vs/base/parts/ipc/common/ipc.electron.ts
@@ -11,6 +11,11 @@ export interface Sender {
 	send(channel: string, msg: unknown): void;
 }
 
+/**
+ * The Electron `Protocol` leverages Electron style IPC communication (`ipcRenderer`, `ipcMain`)
+ * for the implementation of the `IMessagePassingProtocol`. That style of API requires a channel
+ * name for sending data.
+ */
 export class Protocol implements IMessagePassingProtocol {
 
 	constructor(private sender: Sender, readonly onMessage: Event<VSBuffer>) { }
@@ -23,7 +28,7 @@ export class Protocol implements IMessagePassingProtocol {
 		}
 	}
 
-	dispose(): void {
+	disconnect(): void {
 		this.sender.send('vscode:disconnect', null);
 	}
 }
diff --git a/src/vs/base/parts/ipc/common/ipc.mp.ts b/src/vs/base/parts/ipc/common/ipc.mp.ts
new file mode 100644
index 000000000..01c36e635
--- /dev/null
+++ b/src/vs/base/parts/ipc/common/ipc.mp.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from 'vs/base/common/event';
+import { IMessagePassingProtocol, IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { VSBuffer } from 'vs/base/common/buffer';
+
+/**
+ * Declare minimal `MessageEvent` and `MessagePort` interfaces here
+ * so that this utility can be used both from `browser` and
+ * `electron-main` namespace where message ports are available.
+ */
+
+export interface MessageEvent {
+
+	/**
+	 * For our use we only consider `Uint8Array` a valid data transfer
+	 * via message ports because our protocol implementation is buffer based.
+	 */
+	data: Uint8Array;
+}
+
+export interface MessagePort {
+
+	addEventListener(type: 'message', listener: (this: MessagePort, e: MessageEvent) => unknown): void;
+	removeEventListener(type: 'message', listener: (this: MessagePort, e: MessageEvent) => unknown): void;
+
+	postMessage(message: Uint8Array): void;
+
+	start(): void;
+	close(): void;
+}
+
+/**
+ * The MessagePort `Protocol` leverages MessagePort style IPC communication
+ * for the implementation of the `IMessagePassingProtocol`. That style of API
+ * is a simple `onmessage` / `postMessage` pattern.
+ */
+export class Protocol implements IMessagePassingProtocol {
+
+	readonly onMessage = Event.fromDOMEventEmitter<VSBuffer>(this.port, 'message', (e: MessageEvent) => VSBuffer.wrap(e.data));
+
+	constructor(private port: MessagePort) {
+
+		// we must call start() to ensure messages are flowing
+		port.start();
+	}
+
+	send(message: VSBuffer): void {
+		this.port.postMessage(message.buffer);
+	}
+
+	disconnect(): void {
+		this.port.close();
+	}
+}
+
+/**
+ * An implementation of a `IPCClient` on top of MessagePort style IPC communication.
+ */
+export class Client extends IPCClient implements IDisposable {
+
+	private protocol: Protocol;
+
+	constructor(port: MessagePort, clientId: string) {
+		const protocol = new Protocol(port);
+		super(protocol, clientId);
+
+		this.protocol = protocol;
+	}
+
+	dispose(): void {
+		this.protocol.disconnect();
+	}
+}
diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts
index b27c8734f..777d4379f 100644
--- a/src/vs/base/parts/ipc/common/ipc.net.ts
+++ b/src/vs/base/parts/ipc/common/ipc.net.ts
@@ -365,8 +365,8 @@ export class Protocol extends Disposable implements IMessagePassingProtocol {
 	private readonly _onMessage = new Emitter<VSBuffer>();
 	readonly onMessage: Event<VSBuffer> = this._onMessage.event;
 
-	private readonly _onClose = new Emitter<void>();
-	readonly onClose: Event<void> = this._onClose.event;
+	private readonly _onDidDispose = new Emitter<void>();
+	readonly onDidDispose: Event<void> = this._onDidDispose.event;
 
 	constructor(socket: ISocket) {
 		super();
@@ -380,7 +380,7 @@ export class Protocol extends Disposable implements IMessagePassingProtocol {
 			}
 		}));
 
-		this._register(this._socket.onClose(() => this._onClose.fire()));
+		this._register(this._socket.onClose(() => this._onDidDispose.fire()));
 	}
 
 	drain(): Promise<void> {
@@ -406,7 +406,7 @@ export class Client<TContext = string> extends IPCClient<TContext> {
 		return new Client(new Protocol(socket), id);
 	}
 
-	get onClose(): Event<void> { return this.protocol.onClose; }
+	get onDidDispose(): Event<void> { return this.protocol.onDidDispose; }
 
 	constructor(private protocol: Protocol | PersistentProtocol, id: TContext, ipcLogger: IIPCLogger | null = null) {
 		super(protocol, id, ipcLogger);
@@ -621,8 +621,8 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	private readonly _onMessage = new BufferedEmitter<VSBuffer>();
 	readonly onMessage: Event<VSBuffer> = this._onMessage.event;
 
-	private readonly _onClose = new BufferedEmitter<void>();
-	readonly onClose: Event<void> = this._onClose.event;
+	private readonly _onDidDispose = new BufferedEmitter<void>();
+	readonly onDidDispose: Event<void> = this._onDidDispose.event;
 
 	private readonly _onSocketClose = new BufferedEmitter<void>();
 	readonly onSocketClose: Event<void> = this._onSocketClose.event;
@@ -747,6 +747,10 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 		return this._socket;
 	}
 
+	public getMillisSinceLastIncomingData(): number {
+		return Date.now() - this._socketReader.lastReadTime;
+	}
+
 	public beginAcceptReconnection(socket: ISocket, initialDataChunk: VSBuffer | null): void {
 		this._isReconnecting = true;
 
@@ -783,7 +787,7 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 	}
 
 	public acceptDisconnect(): void {
-		this._onClose.fire();
+		this._onDidDispose.fire();
 	}
 
 	private _receiveMessage(msg: ProtocolMessage): void {
@@ -820,7 +824,7 @@ export class PersistentProtocol implements IMessagePassingProtocol {
 		} else if (msg.type === ProtocolMessageType.Control) {
 			this._onControlMessage.fire(msg.data);
 		} else if (msg.type === ProtocolMessageType.Disconnect) {
-			this._onClose.fire();
+			this._onDidDispose.fire();
 		} else if (msg.type === ProtocolMessageType.ReplayRequest) {
 			// Send again all unacknowledged messages
 			const toSend = this._outgoingUnackMsg.toArray();
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index a45ee66bb..535502f3e 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -505,6 +505,7 @@ export interface IIPCLogger {
 
 export class ChannelClient implements IChannelClient, IDisposable {
 
+	private isDisposed: boolean = false;
 	private state: State = State.Uninitialized;
 	private activeRequests = new Set<IDisposable>();
 	private handlers = new Map<number, IHandler>();
@@ -525,9 +526,15 @@ export class ChannelClient implements IChannelClient, IDisposable {
 
 		return {
 			call(command: string, arg?: any, cancellationToken?: CancellationToken) {
+				if (that.isDisposed) {
+					return Promise.reject(errors.canceled());
+				}
 				return that.requestPromise(channelName, command, arg, cancellationToken);
 			},
 			listen(event: string, arg: any) {
+				if (that.isDisposed) {
+					return Promise.reject(errors.canceled());
+				}
 				return that.requestEvent(channelName, event, arg);
 			}
 		} as T;
@@ -725,6 +732,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 	}
 
 	dispose(): void {
+		this.isDisposed = true;
 		if (this.protocolListener) {
 			this.protocolListener.dispose();
 			this.protocolListener = null;
diff --git a/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts
similarity index 90%
rename from src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts
rename to src/vs/base/parts/ipc/electron-main/ipc.electron.ts
index b84a1d653..594c9f758 100644
--- a/src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ipcMain, WebContents } from 'electron';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IPCServer, ClientConnectionEvent } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
-import { ipcMain, WebContents } from 'electron';
+import { Protocol as ElectronProtocol } from 'vs/base/parts/ipc/common/ipc.electron';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { VSBuffer } from 'vs/base/common/buffer';
 
@@ -18,9 +18,13 @@ interface IIPCEvent {
 function createScopedOnMessageEvent(senderId: number, eventName: string): Event<VSBuffer | null> {
 	const onMessage = Event.fromNodeEventEmitter<IIPCEvent>(ipcMain, eventName, (event, message) => ({ event, message }));
 	const onMessageFromSender = Event.filter(onMessage, ({ event }) => event.sender.id === senderId);
+
 	return Event.map(onMessageFromSender, ({ message }) => message ? VSBuffer.wrap(message) : message);
 }
 
+/**
+ * An implemention of `IPCServer` on top of Electron `ipcMain` API.
+ */
 export class Server extends IPCServer {
 
 	private static readonly Clients = new Map<number, IDisposable>();
@@ -41,7 +45,7 @@ export class Server extends IPCServer {
 
 			const onMessage = createScopedOnMessageEvent(id, 'vscode:message') as Event<VSBuffer>;
 			const onDidClientDisconnect = Event.any(Event.signal(createScopedOnMessageEvent(id, 'vscode:disconnect')), onDidClientReconnect.event);
-			const protocol = new Protocol(webContents, onMessage);
+			const protocol = new ElectronProtocol(webContents, onMessage);
 
 			return { protocol, onDidClientDisconnect };
 		});
diff --git a/src/vs/base/parts/ipc/electron-main/ipc.mp.ts b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts
new file mode 100644
index 000000000..5d9e1d49f
--- /dev/null
+++ b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BrowserWindow, ipcMain, IpcMainEvent, MessagePortMain } from 'electron';
+import { Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { generateUuid } from 'vs/base/common/uuid';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+
+/**
+ * An implementation of a `IPCClient` on top of Electron `MessagePortMain`.
+ */
+export class Client extends MessagePortClient implements IDisposable {
+
+	/**
+	 * @param clientId a way to uniquely identify this client among
+	 * other clients. this is important for routing because every
+	 * client can also be a server
+	 */
+	constructor(port: MessagePortMain, clientId: string) {
+		super({
+			addEventListener: (type, listener) => port.addListener(type, listener),
+			removeEventListener: (type, listener) => port.removeListener(type, listener),
+			postMessage: message => port.postMessage(message),
+			start: () => port.start(),
+			close: () => port.close()
+		}, clientId);
+	}
+}
+
+/**
+ * This method opens a message channel connection
+ * in the target window. The target window needs
+ * to use the `Server` from `electron-sandbox/ipc.mp`.
+ */
+export async function connect(window: BrowserWindow): Promise<MessagePortMain> {
+
+	// Assert healthy window to talk to
+	if (window.isDestroyed() || window.webContents.isDestroyed()) {
+		throw new Error('ipc.mp#connect: Cannot talk to window because it is closed or destroyed');
+	}
+
+	// Ask to create message channel inside the window
+	// and send over a UUID to correlate the response
+	const nonce = generateUuid();
+	window.webContents.send('vscode:createMessageChannel', nonce);
+
+	// Wait until the window has returned the `MessagePort`
+	// We need to filter by the `nonce` to ensure we listen
+	// to the right response.
+	const onMessageChannelResult = Event.fromNodeEventEmitter<{ nonce: string, port: MessagePortMain }>(ipcMain, 'vscode:createMessageChannelResult', (e: IpcMainEvent, nonce: string) => ({ nonce, port: e.ports[0] }));
+	const { port } = await Event.toPromise(Event.once(Event.filter(onMessageChannelResult, e => e.nonce === nonce)));
+
+	return port;
+}
diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron-sandbox.ts b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
similarity index 71%
rename from src/vs/base/parts/ipc/electron-sandbox/ipc.electron-sandbox.ts
rename to src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
index 19ca487c8..f2eaa8131 100644
--- a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron-sandbox.ts
+++ b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts
@@ -5,28 +5,34 @@
 
 import { Event } from 'vs/base/common/event';
 import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
-import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
+import { Protocol as ElectronProtocol } from 'vs/base/parts/ipc/common/ipc.electron';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 
+/**
+ * An implemention of `IPCClient` on top of Electron `ipcRenderer` IPC communication
+ * provided from sandbox globals (via preload script).
+ */
 export class Client extends IPCClient implements IDisposable {
 
-	private protocol: Protocol;
+	private protocol: ElectronProtocol;
 
-	private static createProtocol(): Protocol {
+	private static createProtocol(): ElectronProtocol {
 		const onMessage = Event.fromNodeEventEmitter<VSBuffer>(ipcRenderer, 'vscode:message', (_, message) => VSBuffer.wrap(message));
 		ipcRenderer.send('vscode:hello');
-		return new Protocol(ipcRenderer, onMessage);
+
+		return new ElectronProtocol(ipcRenderer, onMessage);
 	}
 
 	constructor(id: string) {
 		const protocol = Client.createProtocol();
 		super(protocol, id);
+
 		this.protocol = protocol;
 	}
 
 	dispose(): void {
-		this.protocol.dispose();
+		this.protocol.disconnect();
 	}
 }
diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts b/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
new file mode 100644
index 000000000..98e865fe9
--- /dev/null
+++ b/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { Event } from 'vs/base/common/event';
+import { ClientConnectionEvent, IPCServer } from 'vs/base/parts/ipc/common/ipc';
+import { Protocol as MessagePortProtocol } from 'vs/base/parts/ipc/common/ipc.mp';
+
+/**
+ * An implementation of a `IPCServer` on top of MessagePort style IPC communication.
+ * The clients register themselves via Electron IPC transfer.
+ */
+export class Server extends IPCServer {
+
+	private static getOnDidClientConnect(): Event<ClientConnectionEvent> {
+
+		// Clients connect via `vscode:createMessageChannel` to get a
+		// `MessagePort` that is ready to be used. For every connection
+		// we create a pair of message ports and send it back.
+		//
+		// The `nonce` is included so that the main side has a chance to
+		// correlate the response back to the sender.
+		const onCreateMessageChannel = Event.fromNodeEventEmitter<string>(ipcRenderer, 'vscode:createMessageChannel', (_, nonce: string) => nonce);
+
+		return Event.map(onCreateMessageChannel, nonce => {
+
+			// Create a new pair of ports and protocol for this connection
+			const { port1: incomingPort, port2: outgoingPort } = new MessageChannel();
+			const protocol = new MessagePortProtocol(incomingPort);
+
+			const result: ClientConnectionEvent = {
+				protocol,
+				// Not part of the standard spec, but in Electron we get a `close` event
+				// when the other side closes. We can use this to detect disconnects
+				// (https://github.com/electron/electron/blob/11-x-y/docs/api/message-port-main.md#event-close)
+				onDidClientDisconnect: Event.fromDOMEventEmitter(incomingPort, 'close')
+			};
+
+			// Send one port back to the requestor
+			ipcRenderer.postMessage('vscode:createMessageChannelResult', nonce, [outgoingPort]);
+
+			return result;
+		});
+	}
+
+	constructor() {
+		super(Server.getOnDidClientConnect());
+	}
+}
diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
index 39ef87b84..ae2d2a60c 100644
--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
@@ -5,6 +5,7 @@
 
 import { createHash } from 'crypto';
 import { Socket, Server as NetServer, createConnection, createServer } from 'net';
+import * as zlib from 'zlib';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ClientConnectionEvent, IPCServer } from 'vs/base/parts/ipc/common/ipc';
 import { join } from 'vs/base/common/path';
@@ -120,24 +121,130 @@ const enum ReadState {
 export class WebSocketNodeSocket extends Disposable implements ISocket {
 
 	public readonly socket: NodeSocket;
+	public readonly permessageDeflate: boolean;
+	private _totalIncomingWireBytes: number;
+	private _totalIncomingDataBytes: number;
+	private _totalOutgoingWireBytes: number;
+	private _totalOutgoingDataBytes: number;
+	private readonly _zlibInflate: zlib.InflateRaw | null;
+	private readonly _zlibDeflate: zlib.DeflateRaw | null;
+	private _zlibDeflateFlushWaitingCount: number;
+	private readonly _onDidZlibFlush = this._register(new Emitter<void>());
+	private readonly _recordInflateBytes: boolean;
+	private readonly _recordedInflateBytes: Buffer[] = [];
+	private readonly _pendingInflateData: Buffer[] = [];
+	private readonly _pendingDeflateData: Buffer[] = [];
 	private readonly _incomingData: ChunkStream;
 	private readonly _onData = this._register(new Emitter<VSBuffer>());
+	private readonly _onClose = this._register(new Emitter<void>());
+	private _isEnded: boolean = false;
 
 	private readonly _state = {
 		state: ReadState.PeekHeader,
 		readLen: Constants.MinHeaderByteSize,
+		fin: 0,
 		mask: 0
 	};
 
-	constructor(socket: NodeSocket) {
+	public get totalIncomingWireBytes(): number {
+		return this._totalIncomingWireBytes;
+	}
+
+	public get totalIncomingDataBytes(): number {
+		return this._totalIncomingDataBytes;
+	}
+
+	public get totalOutgoingWireBytes(): number {
+		return this._totalOutgoingWireBytes;
+	}
+
+	public get totalOutgoingDataBytes(): number {
+		return this._totalOutgoingDataBytes;
+	}
+
+	public get recordedInflateBytes(): VSBuffer {
+		if (this._recordInflateBytes) {
+			return VSBuffer.wrap(Buffer.concat(this._recordedInflateBytes));
+		}
+		return VSBuffer.alloc(0);
+	}
+
+	/**
+	 * Create a socket which can communicate using WebSocket frames.
+	 *
+	 * **NOTE**: When using the permessage-deflate WebSocket extension, if parts of inflating was done
+	 *  in a different zlib instance, we need to pass all those bytes into zlib, otherwise the inflate
+	 *  might hit an inflated portion referencing a distance too far back.
+	 *
+	 * @param socket The underlying socket
+	 * @param permessageDeflate Use the permessage-deflate WebSocket extension
+	 * @param inflateBytes "Seed" zlib inflate with these bytes.
+	 * @param recordInflateBytes Record all bytes sent to inflate
+	 */
+	constructor(socket: NodeSocket, permessageDeflate: boolean, inflateBytes: VSBuffer | null, recordInflateBytes: boolean) {
 		super();
 		this.socket = socket;
+		this._totalIncomingWireBytes = 0;
+		this._totalIncomingDataBytes = 0;
+		this._totalOutgoingWireBytes = 0;
+		this._totalOutgoingDataBytes = 0;
+		this.permessageDeflate = permessageDeflate;
+		this._recordInflateBytes = recordInflateBytes;
+		if (permessageDeflate) {
+			// See https://tools.ietf.org/html/rfc7692#page-16
+			// To simplify our logic, we don't negociate the window size
+			// and simply dedicate (2^15) / 32kb per web socket
+			this._zlibInflate = zlib.createInflateRaw({
+				windowBits: 15
+			});
+			this._zlibInflate.on('error', (err) => {
+				// zlib errors are fatal, since we have no idea how to recover
+				console.error(err);
+				onUnexpectedError(err);
+				this._onClose.fire();
+			});
+			this._zlibInflate.on('data', (data: Buffer) => {
+				this._pendingInflateData.push(data);
+			});
+			if (inflateBytes) {
+				this._zlibInflate.write(inflateBytes.buffer);
+				this._zlibInflate.flush(() => {
+					this._pendingInflateData.length = 0;
+				});
+			}
+
+			this._zlibDeflate = zlib.createDeflateRaw({
+				windowBits: 15
+			});
+			this._zlibDeflate.on('error', (err) => {
+				// zlib errors are fatal, since we have no idea how to recover
+				console.error(err);
+				onUnexpectedError(err);
+				this._onClose.fire();
+			});
+			this._zlibDeflate.on('data', (data: Buffer) => {
+				this._pendingDeflateData.push(data);
+			});
+		} else {
+			this._zlibInflate = null;
+			this._zlibDeflate = null;
+		}
+		this._zlibDeflateFlushWaitingCount = 0;
 		this._incomingData = new ChunkStream();
 		this._register(this.socket.onData(data => this._acceptChunk(data)));
+		this._register(this.socket.onClose(() => this._onClose.fire()));
 	}
 
 	public dispose(): void {
-		this.socket.dispose();
+		if (this._zlibDeflateFlushWaitingCount > 0) {
+			// Wait for any outstanding writes to finish before disposing
+			this._register(this._onDidZlibFlush.event(() => {
+				this.dispose();
+			}));
+		} else {
+			this.socket.dispose();
+			super.dispose();
+		}
 	}
 
 	public onData(listener: (e: VSBuffer) => void): IDisposable {
@@ -145,7 +252,7 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 	}
 
 	public onClose(listener: () => void): IDisposable {
-		return this.socket.onClose(listener);
+		return this._onClose.event(listener);
 	}
 
 	public onEnd(listener: () => void): IDisposable {
@@ -153,6 +260,36 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 	}
 
 	public write(buffer: VSBuffer): void {
+		this._totalOutgoingDataBytes += buffer.byteLength;
+
+		if (this._zlibDeflate) {
+			this._zlibDeflate.write(<Buffer>buffer.buffer);
+
+			this._zlibDeflateFlushWaitingCount++;
+			// See https://zlib.net/manual.html#Constants
+			this._zlibDeflate.flush(/*Z_SYNC_FLUSH*/2, () => {
+				this._zlibDeflateFlushWaitingCount--;
+				let data = Buffer.concat(this._pendingDeflateData);
+				this._pendingDeflateData.length = 0;
+
+				// See https://tools.ietf.org/html/rfc7692#section-7.2.1
+				data = data.slice(0, data.length - 4);
+
+				if (!this._isEnded) {
+					// Avoid ERR_STREAM_WRITE_AFTER_END
+					this._write(VSBuffer.wrap(data), true);
+				}
+
+				if (this._zlibDeflateFlushWaitingCount === 0) {
+					this._onDidZlibFlush.fire();
+				}
+			});
+		} else {
+			this._write(buffer, false);
+		}
+	}
+
+	private _write(buffer: VSBuffer, compressed: boolean): void {
 		let headerLen = Constants.MinHeaderByteSize;
 		if (buffer.byteLength < 126) {
 			headerLen += 0;
@@ -163,7 +300,12 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 		}
 		const header = VSBuffer.alloc(headerLen);
 
-		header.writeUInt8(0b10000010, 0);
+		if (compressed) {
+			// The RSV1 bit indicates a compressed frame
+			header.writeUInt8(0b11000010, 0);
+		} else {
+			header.writeUInt8(0b10000010, 0);
+		}
 		if (buffer.byteLength < 126) {
 			header.writeUInt8(buffer.byteLength, 1);
 		} else if (buffer.byteLength < 2 ** 16) {
@@ -184,10 +326,12 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 			header.writeUInt8((buffer.byteLength >>> 0) & 0b11111111, ++offset);
 		}
 
+		this._totalOutgoingWireBytes += header.byteLength + buffer.byteLength;
 		this.socket.write(VSBuffer.concat([header, buffer]));
 	}
 
 	public end(): void {
+		this._isEnded = true;
 		this.socket.end();
 	}
 
@@ -195,6 +339,7 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 		if (data.byteLength === 0) {
 			return;
 		}
+		this._totalIncomingWireBytes += data.byteLength;
 
 		this._incomingData.acceptChunk(data);
 
@@ -203,14 +348,15 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 			if (this._state.state === ReadState.PeekHeader) {
 				// peek to see if we can read the entire header
 				const peekHeader = this._incomingData.peek(this._state.readLen);
-				// const firstByte = peekHeader.readUInt8(0);
-				// const finBit = (firstByte & 0b10000000) >>> 7;
+				const firstByte = peekHeader.readUInt8(0);
+				const finBit = (firstByte & 0b10000000) >>> 7;
 				const secondByte = peekHeader.readUInt8(1);
 				const hasMask = (secondByte & 0b10000000) >>> 7;
 				const len = (secondByte & 0b01111111);
 
 				this._state.state = ReadState.ReadHeader;
 				this._state.readLen = Constants.MinHeaderByteSize + (hasMask ? 4 : 0) + (len === 126 ? 2 : 0) + (len === 127 ? 8 : 0);
+				this._state.fin = finBit;
 				this._state.mask = 0;
 
 			} else if (this._state.state === ReadState.ReadHeader) {
@@ -263,13 +409,37 @@ export class WebSocketNodeSocket extends Disposable implements ISocket {
 				this._state.readLen = Constants.MinHeaderByteSize;
 				this._state.mask = 0;
 
-				this._onData.fire(body);
+				if (this._zlibInflate) {
+					// See https://tools.ietf.org/html/rfc7692#section-7.2.2
+					if (this._recordInflateBytes) {
+						this._recordedInflateBytes.push(Buffer.from(<Buffer>body.buffer));
+					}
+					this._zlibInflate.write(<Buffer>body.buffer);
+					if (this._state.fin) {
+						if (this._recordInflateBytes) {
+							this._recordedInflateBytes.push(Buffer.from([0x00, 0x00, 0xff, 0xff]));
+						}
+						this._zlibInflate.write(Buffer.from([0x00, 0x00, 0xff, 0xff]));
+					}
+					this._zlibInflate.flush(() => {
+						const data = Buffer.concat(this._pendingInflateData);
+						this._pendingInflateData.length = 0;
+						this._totalIncomingDataBytes += data.length;
+						this._onData.fire(VSBuffer.wrap(data));
+					});
+				} else {
+					this._totalIncomingDataBytes += body.byteLength;
+					this._onData.fire(body);
+				}
 			}
 		}
 	}
 
-	public drain(): Promise<void> {
-		return this.socket.drain();
+	public async drain(): Promise<void> {
+		if (this._zlibDeflateFlushWaitingCount > 0) {
+			await Event.toPromise(this._onDidZlibFlush.event);
+		}
+		await this.socket.drain();
 	}
 }
 
diff --git a/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts b/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
new file mode 100644
index 000000000..86e03184a
--- /dev/null
+++ b/src/vs/base/parts/ipc/test/browser/ipc.mp.test.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Event } from 'vs/base/common/event';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/browser/ipc.mp';
+
+suite('IPC, MessagePorts', () => {
+
+	test('message passing', async () => {
+		const { port1, port2 } = new MessageChannel();
+
+		const client1 = new MessagePortClient(port1, 'client1');
+		const client2 = new MessagePortClient(port2, 'client2');
+
+		client1.registerChannel('client1', {
+			call(_: unknown, command: string, arg: any, cancellationToken: CancellationToken): Promise<any> {
+				switch (command) {
+					case 'testMethodClient1': return Promise.resolve('success1');
+					default: return Promise.reject(new Error('not implemented'));
+				}
+			},
+
+			listen(_: unknown, event: string, arg?: any): Event<any> {
+				switch (event) {
+					default: throw new Error('not implemented');
+				}
+			}
+		});
+
+		client2.registerChannel('client2', {
+			call(_: unknown, command: string, arg: any, cancellationToken: CancellationToken): Promise<any> {
+				switch (command) {
+					case 'testMethodClient2': return Promise.resolve('success2');
+					default: return Promise.reject(new Error('not implemented'));
+				}
+			},
+
+			listen(_: unknown, event: string, arg?: any): Event<any> {
+				switch (event) {
+					default: throw new Error('not implemented');
+				}
+			}
+		});
+
+		const channelClient1 = client2.getChannel('client1');
+		assert.strictEqual(await channelClient1.call('testMethodClient1'), 'success1');
+
+		const channelClient2 = client1.getChannel('client2');
+		assert.strictEqual(await channelClient2.call('testMethodClient2'), 'success2');
+
+		client1.dispose();
+		client2.dispose();
+	});
+});
diff --git a/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts b/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
new file mode 100644
index 000000000..118900279
--- /dev/null
+++ b/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/browser/ipc.mp';
+
+suite('IPC, MessagePorts', () => {
+
+	test('message port close event', async () => {
+		const { port1, port2 } = new MessageChannel();
+
+		new MessagePortClient(port1, 'client1');
+		const client2 = new MessagePortClient(port2, 'client2');
+
+		// This test ensures that Electron's API for the close event
+		// does not break because we rely on it to dispose client
+		// connections from the server.
+		//
+		// This event is not provided by browser MessagePort API though.
+		const whenClosed = new Promise<boolean>(resolve => port1.addEventListener('close', () => resolve(true)));
+
+		client2.dispose();
+
+		assert.ok(await whenClosed);
+	});
+});
diff --git a/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts b/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts
index 147a2be51..98dde9e4e 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.cp.test.ts
@@ -11,7 +11,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
 function createClient(): Client {
 	return new Client(getPathFromAmdModule(require, 'bootstrap-fork'), {
 		serverName: 'TestServer',
-		env: { AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
+		env: { VSCODE_AMD_ENTRYPOINT: 'vs/base/parts/ipc/test/node/testApp', verbose: true }
 	});
 }
 
diff --git a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
index 0f395deb9..d572f52f1 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts
@@ -135,13 +135,13 @@ suite('IPC, Socket Protocol', () => {
 
 		a.send(VSBuffer.fromString('foobarfarboo'));
 		const msg1 = await bMessages.waitForOne();
-		assert.equal(msg1.toString(), 'foobarfarboo');
+		assert.strictEqual(msg1.toString(), 'foobarfarboo');
 
 		const buffer = VSBuffer.alloc(1);
 		buffer.writeUInt8(123, 0);
 		a.send(buffer);
 		const msg2 = await bMessages.waitForOne();
-		assert.equal(msg2.readUInt8(0), 123);
+		assert.strictEqual(msg2.readUInt8(0), 123);
 	});
 
 
@@ -160,7 +160,7 @@ suite('IPC, Socket Protocol', () => {
 
 		a.send(VSBuffer.fromString(JSON.stringify(data)));
 		const msg = await bMessages.waitForOne();
-		assert.deepEqual(JSON.parse(msg.toString()), data);
+		assert.deepStrictEqual(JSON.parse(msg.toString()), data);
 	});
 
 });
@@ -179,49 +179,49 @@ suite('PersistentProtocol reconnection', () => {
 		const bMessages = new MessageStream(b);
 
 		a.send(VSBuffer.fromString('a1'));
-		assert.equal(a.unacknowledgedCount, 1);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a.unacknowledgedCount, 1);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		a.send(VSBuffer.fromString('a2'));
-		assert.equal(a.unacknowledgedCount, 2);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a.unacknowledgedCount, 2);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		a.send(VSBuffer.fromString('a3'));
-		assert.equal(a.unacknowledgedCount, 3);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a.unacknowledgedCount, 3);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		const a1 = await bMessages.waitForOne();
-		assert.equal(a1.toString(), 'a1');
-		assert.equal(a.unacknowledgedCount, 3);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a1.toString(), 'a1');
+		assert.strictEqual(a.unacknowledgedCount, 3);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		const a2 = await bMessages.waitForOne();
-		assert.equal(a2.toString(), 'a2');
-		assert.equal(a.unacknowledgedCount, 3);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a2.toString(), 'a2');
+		assert.strictEqual(a.unacknowledgedCount, 3);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		const a3 = await bMessages.waitForOne();
-		assert.equal(a3.toString(), 'a3');
-		assert.equal(a.unacknowledgedCount, 3);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(a3.toString(), 'a3');
+		assert.strictEqual(a.unacknowledgedCount, 3);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 
 		b.send(VSBuffer.fromString('b1'));
-		assert.equal(a.unacknowledgedCount, 3);
-		assert.equal(b.unacknowledgedCount, 1);
+		assert.strictEqual(a.unacknowledgedCount, 3);
+		assert.strictEqual(b.unacknowledgedCount, 1);
 
 		const b1 = await aMessages.waitForOne();
-		assert.equal(b1.toString(), 'b1');
-		assert.equal(a.unacknowledgedCount, 0);
-		assert.equal(b.unacknowledgedCount, 1);
+		assert.strictEqual(b1.toString(), 'b1');
+		assert.strictEqual(a.unacknowledgedCount, 0);
+		assert.strictEqual(b.unacknowledgedCount, 1);
 
 		a.send(VSBuffer.fromString('a4'));
-		assert.equal(a.unacknowledgedCount, 1);
-		assert.equal(b.unacknowledgedCount, 1);
+		assert.strictEqual(a.unacknowledgedCount, 1);
+		assert.strictEqual(b.unacknowledgedCount, 1);
 
 		const b2 = await bMessages.waitForOne();
-		assert.equal(b2.toString(), 'a4');
-		assert.equal(a.unacknowledgedCount, 1);
-		assert.equal(b.unacknowledgedCount, 0);
+		assert.strictEqual(b2.toString(), 'a4');
+		assert.strictEqual(a.unacknowledgedCount, 1);
+		assert.strictEqual(b.unacknowledgedCount, 0);
 	});
 });
 
diff --git a/src/vs/base/parts/quickinput/browser/media/quickInput.css b/src/vs/base/parts/quickinput/browser/media/quickInput.css
index 4489a73ac..016c23a5d 100644
--- a/src/vs/base/parts/quickinput/browser/media/quickInput.css
+++ b/src/vs/base/parts/quickinput/browser/media/quickInput.css
@@ -121,7 +121,7 @@
 	font-size: 11px;
 	padding: 0 6px;
 	display: flex;
-	height: 100%;
+	height: 27.5px;
 	align-items: center;
 }
 
diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts
index bddbd8a6e..038816012 100644
--- a/src/vs/base/parts/quickinput/browser/quickInput.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInput.ts
@@ -30,7 +30,7 @@ import { Color } from 'vs/base/common/color';
 import { registerCodicon, Codicon } from 'vs/base/common/codicons';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { escape } from 'vs/base/common/strings';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
 export interface IQuickInputOptions {
 	idPrefix: string;
@@ -72,7 +72,7 @@ const $ = dom.$;
 type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 
 
-const backButtonIcon = registerCodicon('quick-input-back', Codicon.arrowLeft, localize('backButtonIcon', 'Icon for the back button in the quick input dialog.'));
+const backButtonIcon = registerCodicon('quick-input-back', Codicon.arrowLeft);
 
 const backButton = {
 	iconClass: backButtonIcon.classNames,
@@ -967,7 +967,7 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		const validationMessage = this.validationMessage || '';
 		if (this._lastValidationMessage !== validationMessage) {
 			this._lastValidationMessage = validationMessage;
-			dom.reset(this.ui.message, ...renderCodicons(escape(validationMessage)));
+			dom.reset(this.ui.message, ...renderLabelWithIcons(escape(validationMessage)));
 			this.showMessageDecoration(this.validationMessage ? Severity.Error : Severity.Ignore);
 		}
 		this.ui.customButton.label = this.customLabel || '';
@@ -1103,7 +1103,7 @@ class InputBox extends QuickInput implements IInputBox {
 		const validationMessage = this.validationMessage || this.noValidationMessage;
 		if (this._lastValidationMessage !== validationMessage) {
 			this._lastValidationMessage = validationMessage;
-			dom.reset(this.ui.message, ...renderCodicons(validationMessage));
+			dom.reset(this.ui.message, ...renderLabelWithIcons(validationMessage));
 			this.showMessageDecoration(this.validationMessage ? Severity.Error : Severity.Ignore);
 		}
 	}
diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts
index ba8bbd023..7126af129 100644
--- a/src/vs/base/parts/quickinput/browser/quickInputList.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInputList.ts
@@ -9,7 +9,7 @@ import * as dom from 'vs/base/browser/dom';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/base/parts/quickinput/common/quickInput';
 import { IMatch } from 'vs/base/common/filters';
-import { matchesFuzzyCodiconAware, parseCodicons } from 'vs/base/common/codicon';
+import { matchesFuzzyIconAware, parseLabelWithIcons } from 'vs/base/common/iconLabels';
 import { compareAnything } from 'vs/base/common/comparers';
 import { Emitter, Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -34,6 +34,7 @@ interface IListElement {
 	readonly index: number;
 	readonly item: IQuickPickItem;
 	readonly saneLabel: string;
+	readonly saneMeta?: string;
 	readonly saneAriaLabel: string;
 	readonly saneDescription?: string;
 	readonly saneDetail?: string;
@@ -49,6 +50,7 @@ class ListElement implements IListElement, IDisposable {
 	index!: number;
 	item!: IQuickPickItem;
 	saneLabel!: string;
+	saneMeta!: string;
 	saneAriaLabel!: string;
 	saneDescription?: string;
 	saneDetail?: string;
@@ -127,7 +129,7 @@ class ListElementRenderer implements IListRenderer<ListElement, IListElementTemp
 		const row2 = dom.append(rows, $('.quick-input-list-row'));
 
 		// Label
-		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true, supportCodicons: true });
+		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true, supportIcons: true });
 
 		// Keybinding
 		const keybindingContainer = dom.append(row1, $('.quick-input-list-entry-keybinding'));
@@ -190,12 +192,11 @@ class ListElementRenderer implements IListRenderer<ListElement, IListElementTemp
 				if (button.alwaysVisible) {
 					cssClasses = cssClasses ? `${cssClasses} always-visible` : 'always-visible';
 				}
-				const action = new Action(`id-${index}`, '', cssClasses, true, () => {
+				const action = new Action(`id-${index}`, '', cssClasses, true, async () => {
 					element.fireButtonTriggered({
 						button,
 						item: element.item
 					});
-					return Promise.resolve();
 				});
 				action.tooltip = button.tooltip || '';
 				return action;
@@ -248,6 +249,7 @@ export class QuickInputList {
 	matchOnDescription = false;
 	matchOnDetail = false;
 	matchOnLabel = true;
+	matchOnMeta = true;
 	sortByLabel = true;
 	private readonly _onChangedAllVisibleChecked = new Emitter<boolean>();
 	onChangedAllVisibleChecked: Event<boolean> = this._onChangedAllVisibleChecked.event;
@@ -421,10 +423,11 @@ export class QuickInputList {
 			if (item.type !== 'separator') {
 				const previous = index && inputElements[index - 1];
 				const saneLabel = item.label && item.label.replace(/\r?\n/g, ' ');
+				const saneMeta = item.meta && item.meta.replace(/\r?\n/g, ' ');
 				const saneDescription = item.description && item.description.replace(/\r?\n/g, ' ');
 				const saneDetail = item.detail && item.detail.replace(/\r?\n/g, ' ');
 				const saneAriaLabel = item.ariaLabel || [saneLabel, saneDescription, saneDetail]
-					.map(s => s && parseCodicons(s).text)
+					.map(s => s && parseLabelWithIcons(s).text)
 					.filter(s => !!s)
 					.join(', ');
 
@@ -432,6 +435,7 @@ export class QuickInputList {
 					index,
 					item,
 					saneLabel,
+					saneMeta,
 					saneAriaLabel,
 					saneDescription,
 					saneDetail,
@@ -597,14 +601,15 @@ export class QuickInputList {
 			});
 		}
 
-		// Filter by value (since we support codicons, use codicon aware fuzzy matching)
+		// Filter by value (since we support icons in labels, use $(..) aware fuzzy matching)
 		else {
 			this.elements.forEach(element => {
-				const labelHighlights = this.matchOnLabel ? withNullAsUndefined(matchesFuzzyCodiconAware(query, parseCodicons(element.saneLabel))) : undefined;
-				const descriptionHighlights = this.matchOnDescription ? withNullAsUndefined(matchesFuzzyCodiconAware(query, parseCodicons(element.saneDescription || ''))) : undefined;
-				const detailHighlights = this.matchOnDetail ? withNullAsUndefined(matchesFuzzyCodiconAware(query, parseCodicons(element.saneDetail || ''))) : undefined;
+				const labelHighlights = this.matchOnLabel ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel))) : undefined;
+				const descriptionHighlights = this.matchOnDescription ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneDescription || ''))) : undefined;
+				const detailHighlights = this.matchOnDetail ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneDetail || ''))) : undefined;
+				const metaHighlights = this.matchOnMeta ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneMeta || ''))) : undefined;
 
-				if (labelHighlights || descriptionHighlights || detailHighlights) {
+				if (labelHighlights || descriptionHighlights || detailHighlights || metaHighlights) {
 					element.labelHighlights = labelHighlights;
 					element.descriptionHighlights = descriptionHighlights;
 					element.detailHighlights = detailHighlights;
diff --git a/src/vs/base/parts/quickinput/common/quickInput.ts b/src/vs/base/parts/quickinput/common/quickInput.ts
index 531236825..da566eaff 100644
--- a/src/vs/base/parts/quickinput/common/quickInput.ts
+++ b/src/vs/base/parts/quickinput/common/quickInput.ts
@@ -21,6 +21,7 @@ export interface IQuickPickItem {
 	type?: 'item';
 	id?: string;
 	label: string;
+	meta?: string;
 	ariaLabel?: string;
 	description?: string;
 	detail?: string;
diff --git a/src/vs/base/parts/sandbox/common/electronTypes.ts b/src/vs/base/parts/sandbox/common/electronTypes.ts
index cff3caccf..5c36ba595 100644
--- a/src/vs/base/parts/sandbox/common/electronTypes.ts
+++ b/src/vs/base/parts/sandbox/common/electronTypes.ts
@@ -7,7 +7,7 @@
 // #######################################################################
 // ###                                                                 ###
 // ###      electron.d.ts types we need in a common layer for reuse    ###
-// ###                    (copied from Electron 9.x)                   ###
+// ###                    (copied from Electron 11.x)                  ###
 // ###                                                                 ###
 // #######################################################################
 
@@ -212,7 +212,7 @@ export interface SaveDialogReturnValue {
 
 export interface FileFilter {
 
-	// Docs: http://electronjs.org/docs/api/structures/file-filter
+	// Docs: https://electronjs.org/docs/api/structures/file-filter
 
 	extensions: string[];
 	name: string;
@@ -220,7 +220,7 @@ export interface FileFilter {
 
 export interface InputEvent {
 
-	// Docs: http://electronjs.org/docs/api/structures/input-event
+	// Docs: https://electronjs.org/docs/api/structures/input-event
 
 	/**
 	 * An array of modifiers of the event, can be `shift`, `control`, `ctrl`, `alt`,
@@ -232,7 +232,7 @@ export interface InputEvent {
 
 export interface MouseInputEvent extends InputEvent {
 
-	// Docs: http://electronjs.org/docs/api/structures/mouse-input-event
+	// Docs: https://electronjs.org/docs/api/structures/mouse-input-event
 
 	/**
 	 * The button pressed, can be `left`, `middle`, `right`.
diff --git a/src/vs/base/parts/sandbox/electron-browser/preload.js b/src/vs/base/parts/sandbox/electron-browser/preload.js
index a1aa638f8..11984805d 100644
--- a/src/vs/base/parts/sandbox/electron-browser/preload.js
+++ b/src/vs/base/parts/sandbox/electron-browser/preload.js
@@ -35,6 +35,17 @@
 				}
 			},
 
+			/**
+			 * @param {string} channel
+			 * @param {any} message
+			 * @param {MessagePort[]} transfer
+			 */
+			postMessage(channel, message, transfer) {
+				if (validateIPC(channel)) {
+					ipcRenderer.postMessage(channel, message, transfer);
+				}
+			},
+
 			/**
 			 * @param {string} channel
 			 * @param {any[]} args
@@ -114,6 +125,7 @@
 		 */
 		process: {
 			get platform() { return process.platform; },
+			get arch() { return process.arch; },
 			get env() { return process.env; },
 			get versions() { return process.versions; },
 			get type() { return 'renderer'; },
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts b/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts
index ef8fd5642..1adb322d1 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts
+++ b/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts
@@ -7,35 +7,54 @@
 // #######################################################################
 // ###                                                                 ###
 // ###      electron.d.ts types we expose from electron-sandbox        ###
-// ###                    (copied from Electron 9.x)                   ###
+// ###                    (copied from Electron 11.x)                  ###
 // ###                                                                 ###
 // #######################################################################
 
+export interface IpcRendererEvent extends Event {
+
+	// Docs: https://electronjs.org/docs/api/structures/ipc-renderer-event
+
+	/**
+	 * A list of MessagePorts that were transferred with this message
+	 */
+	ports: MessagePort[];
+	/**
+	 * The `IpcRenderer` instance that emitted the event originally
+	 */
+	sender: IpcRenderer;
+	/**
+	 * The `webContents.id` that sent the message, you can call
+	 * `event.sender.sendTo(event.senderId, ...)` to reply to the message, see
+	 * ipcRenderer.sendTo for more information. This only applies to messages sent from
+	 * a different renderer. Messages sent directly from the main process set
+	 * `event.senderId` to `0`.
+	 */
+	senderId: number;
+}
 
 export interface IpcRenderer {
 	/**
 	 * Listens to `channel`, when a new message arrives `listener` would be called with
 	 * `listener(event, args...)`.
 	 */
-	on(channel: string, listener: (event: unknown, ...args: any[]) => void): void;
-
+	on(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): this;
 	/**
 	 * Adds a one time `listener` function for the event. This `listener` is invoked
 	 * only the next time a message is sent to `channel`, after which it is removed.
 	 */
-	once(channel: string, listener: (event: unknown, ...args: any[]) => void): void;
-
+	once(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): this;
 	/**
 	 * Removes the specified `listener` from the listener array for the specified
 	 * `channel`.
 	 */
-	removeListener(channel: string, listener: (event: unknown, ...args: any[]) => void): void;
-
+	removeListener(channel: string, listener: (...args: any[]) => void): this;
 	/**
 	 * Send an asynchronous message to the main process via `channel`, along with
 	 * arguments. Arguments will be serialized with the Structured Clone Algorithm,
-	 * just like `postMessage`, so prototype chains will not be included. Sending
-	 * Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an exception.
+	 * just like `window.postMessage`, so prototype chains will not be included.
+	 * Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an
+	 * exception.
 	 *
 	 * > **NOTE**: Sending non-standard JavaScript types such as DOM objects or special
 	 * Electron objects is deprecated, and will begin throwing an exception starting
@@ -43,8 +62,51 @@ export interface IpcRenderer {
 	 *
 	 * The main process handles it by listening for `channel` with the `ipcMain`
 	 * module.
+	 *
+	 * If you need to transfer a `MessagePort` to the main process, use
+	 * `ipcRenderer.postMessage`.
+	 *
+	 * If you want to receive a single response from the main process, like the result
+	 * of a method call, consider using `ipcRenderer.invoke`.
 	 */
 	send(channel: string, ...args: any[]): void;
+	/**
+	 * Resolves with the response from the main process.
+	 *
+	 * Send a message to the main process via `channel` and expect a result
+	 * asynchronously. Arguments will be serialized with the Structured Clone
+	 * Algorithm, just like `window.postMessage`, so prototype chains will not be
+	 * included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw
+	 * an exception.
+	 *
+	 * > **NOTE**: Sending non-standard JavaScript types such as DOM objects or special
+	 * Electron objects is deprecated, and will begin throwing an exception starting
+	 * with Electron 9.
+	 *
+	 * The main process should listen for `channel` with `ipcMain.handle()`.
+	 *
+	 * For example:
+	 *
+	 * If you need to transfer a `MessagePort` to the main process, use
+	 * `ipcRenderer.postMessage`.
+	 *
+	 * If you do not need a response to the message, consider using `ipcRenderer.send`.
+	 */
+	invoke(channel: string, ...args: any[]): Promise<any>;
+	/**
+	 * Send a message to the main process, optionally transferring ownership of zero or
+	 * more `MessagePort` objects.
+	 *
+	 * The transferred `MessagePort` objects will be available in the main process as
+	 * `MessagePortMain` objects by accessing the `ports` property of the emitted
+	 * event.
+	 *
+	 * For example:
+	 *
+	 * For more information on using `MessagePort` and `MessageChannel`, see the MDN
+	 * documentation.
+	 */
+	postMessage(channel: string, message: any, transfer?: MessagePort[]): void;
 }
 
 export interface WebFrame {
@@ -70,16 +132,23 @@ export interface CrashReporter {
 	 * with crashes that occur in other renderer processes or in the main process.
 	 *
 	 * **Note:** Parameters have limits on the length of the keys and values. Key names
-	 * must be no longer than 39 bytes, and values must be no longer than 127 bytes.
+	 * must be no longer than 39 bytes, and values must be no longer than 20320 bytes.
 	 * Keys with names longer than the maximum will be silently ignored. Key values
 	 * longer than the maximum length will be truncated.
+	 *
+	 * **Note:** On linux values that are longer than 127 bytes will be chunked into
+	 * multiple keys, each 127 bytes in length.  E.g. `addExtraParameter('foo',
+	 * 'a'.repeat(130))` will result in two chunked keys `foo__1` and `foo__2`, the
+	 * first will contain the first 127 bytes and the second will contain the remaining
+	 * 3 bytes.  On your crash reporting backend you should stitch together keys in
+	 * this format.
 	 */
 	addExtraParameter(key: string, value: string): void;
 }
 
 export interface ProcessMemoryInfo {
 
-	// Docs: http://electronjs.org/docs/api/structures/process-memory-info
+	// Docs: https://electronjs.org/docs/api/structures/process-memory-info
 
 	/**
 	 * The amount of memory not shared by other processes, such as JS heap or HTML
@@ -133,10 +202,7 @@ export interface CrashReporterStartOptions {
 	rateLimit?: boolean;
 	/**
 	 * If true, crash reports will be compressed and uploaded with `Content-Encoding:
-	 * gzip`. Not all collection servers support compressed payloads. Default is
-	 * `false`.
-	 *
-	 * @platform darwin,win32
+	 * gzip`. Default is `false`.
 	 */
 	compress?: boolean;
 	/**
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
index 69f3a2a86..36fda091b 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
+++ b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts
@@ -14,6 +14,12 @@ export interface ISandboxNodeProcess extends INodeProcess {
 	 */
 	readonly platform: 'win32' | 'linux' | 'darwin';
 
+	/**
+	 * The process.arch property returns a string identifying the CPU architecture
+	 * on which the Node.js process is running.
+	 */
+	readonly arch: string;
+
 	/**
 	 * The type will always be Electron renderer.
 	 */
@@ -48,7 +54,7 @@ export interface ISandboxNodeProcess extends INodeProcess {
 	 * The order of overwrites is `process.env` < `shellEnv` < `userEnv`.
 	 *
 	 * It is critical that every process awaits this method early on startup to get the right
-	 * set of environment in `process.env`. 
+	 * set of environment in `process.env`.
 	 */
 	resolveEnv(userEnv: IProcessEnvironment): Promise<void>;
 
@@ -76,7 +82,7 @@ export interface ISandboxNodeProcess extends INodeProcess {
 export interface ISandboxContext {
 
 	/**
-	 * Wether the renderer runs with `sandbox` enabled or not.
+	 * Whether the renderer runs with `sandbox` enabled or not.
 	 */
 	sandbox: boolean;
 }
diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts
index 8b55819cc..c2f5ff5a5 100644
--- a/src/vs/base/parts/storage/common/storage.ts
+++ b/src/vs/base/parts/storage/common/storage.ts
@@ -200,9 +200,9 @@ export class Storage extends Disposable implements IStorage {
 		return parseInt(value, 10);
 	}
 
-	set(key: string, value: string | boolean | number | null | undefined): Promise<void> {
+	async set(key: string, value: string | boolean | number | null | undefined): Promise<void> {
 		if (this.state === StorageState.Closed) {
-			return Promise.resolve(); // Return early if we are already closed
+			return; // Return early if we are already closed
 		}
 
 		// We remove the key for undefined/null values
@@ -216,7 +216,7 @@ export class Storage extends Disposable implements IStorage {
 		// Return early if value already set
 		const currentValue = this.cache.get(key);
 		if (currentValue === valueStr) {
-			return Promise.resolve();
+			return;
 		}
 
 		// Update in cache and pending
@@ -231,15 +231,15 @@ export class Storage extends Disposable implements IStorage {
 		return this.flushDelayer.trigger(() => this.flushPending());
 	}
 
-	delete(key: string): Promise<void> {
+	async delete(key: string): Promise<void> {
 		if (this.state === StorageState.Closed) {
-			return Promise.resolve(); // Return early if we are already closed
+			return; // Return early if we are already closed
 		}
 
 		// Remove from cache and add to pending
 		const wasDeleted = this.cache.delete(key);
 		if (!wasDeleted) {
-			return Promise.resolve(); // Return early if value already deleted
+			return; // Return early if value already deleted
 		}
 
 		if (!this.pendingDeletes.has(key)) {
@@ -257,7 +257,7 @@ export class Storage extends Disposable implements IStorage {
 
 	async close(): Promise<void> {
 		if (this.state === StorageState.Closed) {
-			return Promise.resolve(); // return if already closed
+			return; // return if already closed
 		}
 
 		// Update state
@@ -282,9 +282,9 @@ export class Storage extends Disposable implements IStorage {
 		return this.pendingInserts.size > 0 || this.pendingDeletes.size > 0;
 	}
 
-	private flushPending(): Promise<void> {
+	private async flushPending(): Promise<void> {
 		if (!this.hasPending) {
-			return Promise.resolve(); // return early if nothing to do
+			return; // return early if nothing to do
 		}
 
 		// Get pending data
@@ -305,9 +305,9 @@ export class Storage extends Disposable implements IStorage {
 		});
 	}
 
-	whenFlushed(): Promise<void> {
+	async whenFlushed(): Promise<void> {
 		if (!this.hasPending) {
-			return Promise.resolve(); // return early if nothing to do
+			return; // return early if nothing to do
 		}
 
 		return new Promise(resolve => this.whenFlushedCallbacks.push(resolve));
diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts
index d6eca3ac0..b99c08a35 100644
--- a/src/vs/base/parts/storage/node/storage.ts
+++ b/src/vs/base/parts/storage/node/storage.ts
@@ -412,11 +412,17 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 }
 
 class SQLiteStorageDatabaseLogger {
+
+	// to reduce lots of output, require an environment variable to enable tracing
+	// this helps when running with --verbose normally where the storage tracing
+	// might hide useful output to look at
+	static readonly VSCODE_TRACE_STORAGE = 'VSCODE_TRACE_STORAGE';
+
 	private readonly logTrace: ((msg: string) => void) | undefined;
 	private readonly logError: ((error: string | Error) => void) | undefined;
 
 	constructor(options?: ISQLiteStorageDatabaseLoggingOptions) {
-		if (options && typeof options.logTrace === 'function') {
+		if (options && typeof options.logTrace === 'function' && process.env[SQLiteStorageDatabaseLogger.VSCODE_TRACE_STORAGE]) {
 			this.logTrace = options.logTrace;
 		}
 
diff --git a/src/vs/base/parts/storage/test/node/storage.test.ts b/src/vs/base/parts/storage/test/node/storage.test.ts
index e735634c2..ecf8e4679 100644
--- a/src/vs/base/parts/storage/test/node/storage.test.ts
+++ b/src/vs/base/parts/storage/test/node/storage.test.ts
@@ -5,40 +5,39 @@
 
 import { SQLiteStorageDatabase, ISQLiteStorageDatabaseOptions } from 'vs/base/parts/storage/node/storage';
 import { Storage, IStorageDatabase, IStorageItemsChangeEvent } from 'vs/base/parts/storage/common/storage';
-import { generateUuid } from 'vs/base/common/uuid';
 import { join } from 'vs/base/common/path';
 import { tmpdir } from 'os';
-import { equal, ok } from 'assert';
-import { mkdirp, writeFile, exists, unlink, rimraf, RimRafMode } from 'vs/base/node/pfs';
+import { strictEqual, ok } from 'assert';
+import { mkdirp, writeFile, exists, unlink, rimraf } from 'vs/base/node/pfs';
 import { timeout } from 'vs/base/common/async';
 import { Event, Emitter } from 'vs/base/common/event';
 import { isWindows } from 'vs/base/common/platform';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { generateUuid } from 'vs/base/common/uuid';
 
-suite('Storage Library', function () {
+flakySuite('Storage Library', function () {
 
-	// Given issues such as https://github.com/microsoft/vscode/issues/108113
-	// we see random test failures when accessing the native file system.
-	this.retries(3);
-	this.timeout(1000 * 20);
+	let testDir: string;
 
-	function uniqueStorageDir(): string {
-		const id = generateUuid();
+	setup(function () {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'storagelibrary');
 
-		return join(tmpdir(), 'vsctests', id, 'storage2', id);
-	}
+		return mkdirp(testDir);
+	});
+
+	teardown(function () {
+		return rimraf(testDir);
+	});
 
 	test('basics', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
-
-		const storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		const storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 
 		await storage.init();
 
 		// Empty fallbacks
-		equal(storage.get('foo', 'bar'), 'bar');
-		equal(storage.getNumber('foo', 55), 55);
-		equal(storage.getBoolean('foo', true), true);
+		strictEqual(storage.get('foo', 'bar'), 'bar');
+		strictEqual(storage.getNumber('foo', 55), 55);
+		strictEqual(storage.getBoolean('foo', true), true);
 
 		let changes = new Set<string>();
 		storage.onDidChangeStorage(key => {
@@ -55,19 +54,19 @@ suite('Storage Library', function () {
 		let flushPromiseResolved = false;
 		storage.whenFlushed().then(() => flushPromiseResolved = true);
 
-		equal(storage.get('bar'), 'foo');
-		equal(storage.getNumber('barNumber'), 55);
-		equal(storage.getBoolean('barBoolean'), true);
+		strictEqual(storage.get('bar'), 'foo');
+		strictEqual(storage.getNumber('barNumber'), 55);
+		strictEqual(storage.getBoolean('barBoolean'), true);
 
-		equal(changes.size, 3);
+		strictEqual(changes.size, 3);
 		ok(changes.has('bar'));
 		ok(changes.has('barNumber'));
 		ok(changes.has('barBoolean'));
 
 		let setPromiseResolved = false;
 		await Promise.all([set1Promise, set2Promise, set3Promise]).then(() => setPromiseResolved = true);
-		equal(setPromiseResolved, true);
-		equal(flushPromiseResolved, true);
+		strictEqual(setPromiseResolved, true);
+		strictEqual(flushPromiseResolved, true);
 
 		changes = new Set<string>();
 
@@ -75,7 +74,7 @@ suite('Storage Library', function () {
 		storage.set('bar', 'foo');
 		storage.set('barNumber', 55);
 		storage.set('barBoolean', true);
-		equal(changes.size, 0);
+		strictEqual(changes.size, 0);
 
 		// Simple deletes
 		const delete1Promise = storage.delete('bar');
@@ -86,7 +85,7 @@ suite('Storage Library', function () {
 		ok(!storage.getNumber('barNumber'));
 		ok(!storage.getBoolean('barBoolean'));
 
-		equal(changes.size, 3);
+		strictEqual(changes.size, 3);
 		ok(changes.has('bar'));
 		ok(changes.has('barNumber'));
 		ok(changes.has('barBoolean'));
@@ -97,19 +96,16 @@ suite('Storage Library', function () {
 		storage.delete('bar');
 		storage.delete('barNumber');
 		storage.delete('barBoolean');
-		equal(changes.size, 0);
+		strictEqual(changes.size, 0);
 
 		let deletePromiseResolved = false;
 		await Promise.all([delete1Promise, delete2Promise, delete3Promise]).then(() => deletePromiseResolved = true);
-		equal(deletePromiseResolved, true);
+		strictEqual(deletePromiseResolved, true);
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('external changes', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
 
 		class TestSQLiteStorageDatabase extends SQLiteStorageDatabase {
 			private readonly _onDidChangeItemsExternal = new Emitter<IStorageItemsChangeEvent>();
@@ -120,7 +116,7 @@ suite('Storage Library', function () {
 			}
 		}
 
-		const database = new TestSQLiteStorageDatabase(join(storageDir, 'storage.db'));
+		const database = new TestSQLiteStorageDatabase(join(testDir, 'storage.db'));
 		const storage = new Storage(database);
 
 		let changes = new Set<string>();
@@ -138,35 +134,31 @@ suite('Storage Library', function () {
 		const changed = new Map<string, string>();
 		changed.set('foo', 'bar');
 		database.fireDidChangeItemsExternal({ changed });
-		equal(changes.size, 0);
+		strictEqual(changes.size, 0);
 
 		// Change is accepted if valid
 		changed.set('foo', 'bar1');
 		database.fireDidChangeItemsExternal({ changed });
 		ok(changes.has('foo'));
-		equal(storage.get('foo'), 'bar1');
+		strictEqual(storage.get('foo'), 'bar1');
 		changes.clear();
 
 		// Delete is accepted
 		const deleted = new Set<string>(['foo']);
 		database.fireDidChangeItemsExternal({ deleted });
 		ok(changes.has('foo'));
-		equal(storage.get('foo', undefined), undefined);
+		strictEqual(storage.get('foo', undefined), undefined);
 		changes.clear();
 
 		// Nothing happens if changing to same value
 		database.fireDidChangeItemsExternal({ deleted });
-		equal(changes.size, 0);
+		strictEqual(changes.size, 0);
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('close flushes data', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
-
-		let storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		let storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 		await storage.init();
 
 		const set1Promise = storage.set('foo', 'bar');
@@ -175,26 +167,26 @@ suite('Storage Library', function () {
 		let flushPromiseResolved = false;
 		storage.whenFlushed().then(() => flushPromiseResolved = true);
 
-		equal(storage.get('foo'), 'bar');
-		equal(storage.get('bar'), 'foo');
+		strictEqual(storage.get('foo'), 'bar');
+		strictEqual(storage.get('bar'), 'foo');
 
 		let setPromiseResolved = false;
 		Promise.all([set1Promise, set2Promise]).then(() => setPromiseResolved = true);
 
 		await storage.close();
 
-		equal(setPromiseResolved, true);
-		equal(flushPromiseResolved, true);
+		strictEqual(setPromiseResolved, true);
+		strictEqual(flushPromiseResolved, true);
 
-		storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 		await storage.init();
 
-		equal(storage.get('foo'), 'bar');
-		equal(storage.get('bar'), 'foo');
+		strictEqual(storage.get('foo'), 'bar');
+		strictEqual(storage.get('bar'), 'foo');
 
 		await storage.close();
 
-		storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 		await storage.init();
 
 		const delete1Promise = storage.delete('foo');
@@ -208,23 +200,19 @@ suite('Storage Library', function () {
 
 		await storage.close();
 
-		equal(deletePromiseResolved, true);
+		strictEqual(deletePromiseResolved, true);
 
-		storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 		await storage.init();
 
 		ok(!storage.get('foo'));
 		ok(!storage.get('bar'));
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('conflicting updates', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
-
-		let storage = new Storage(new SQLiteStorageDatabase(join(storageDir, 'storage.db')));
+		let storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db')));
 		await storage.init();
 
 		let changes = new Set<string>();
@@ -239,8 +227,8 @@ suite('Storage Library', function () {
 		let flushPromiseResolved = false;
 		storage.whenFlushed().then(() => flushPromiseResolved = true);
 
-		equal(storage.get('foo'), 'bar3');
-		equal(changes.size, 1);
+		strictEqual(storage.get('foo'), 'bar3');
+		strictEqual(changes.size, 1);
 		ok(changes.has('foo'));
 
 		let setPromiseResolved = false;
@@ -255,7 +243,7 @@ suite('Storage Library', function () {
 
 		ok(!storage.get('bar'));
 
-		equal(changes.size, 1);
+		strictEqual(changes.size, 1);
 		ok(changes.has('bar'));
 
 		let setAndDeletePromiseResolved = false;
@@ -263,14 +251,10 @@ suite('Storage Library', function () {
 		ok(setAndDeletePromiseResolved);
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('corrupt DB recovers', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
-
-		const storageFile = join(storageDir, 'storage.db');
+		const storageFile = join(testDir, 'storage.db');
 
 		let storage = new Storage(new SQLiteStorageDatabase(storageFile));
 		await storage.init();
@@ -281,34 +265,22 @@ suite('Storage Library', function () {
 
 		await storage.set('foo', 'bar');
 
-		equal(storage.get('bar'), 'foo');
-		equal(storage.get('foo'), 'bar');
+		strictEqual(storage.get('bar'), 'foo');
+		strictEqual(storage.get('foo'), 'bar');
 
 		await storage.close();
 
 		storage = new Storage(new SQLiteStorageDatabase(storageFile));
 		await storage.init();
 
-		equal(storage.get('bar'), 'foo');
-		equal(storage.get('foo'), 'bar');
+		strictEqual(storage.get('bar'), 'foo');
+		strictEqual(storage.get('foo'), 'bar');
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 });
 
-suite('SQLite Storage Library', function () {
-
-	// Given issues such as https://github.com/microsoft/vscode/issues/108113
-	// we see random test failures when accessing the native file system.
-	this.retries(3);
-	this.timeout(1000 * 20);
-
-	function uniqueStorageDir(): string {
-		const id = generateUuid();
-
-		return join(tmpdir(), 'vsctests', id, 'storage', id);
-	}
+flakySuite('SQLite Storage Library', function () {
 
 	function toSet(elements: string[]): Set<string> {
 		const set = new Set<string>();
@@ -317,6 +289,18 @@ suite('SQLite Storage Library', function () {
 		return set;
 	}
 
+	let storageDir: string;
+
+	setup(function () {
+		storageDir = getRandomTestPath(tmpdir(), 'vsctests', 'storagelibrary');
+
+		return mkdirp(storageDir);
+	});
+
+	teardown(function () {
+		return rimraf(storageDir);
+	});
+
 	async function testDBBasics(path: string, logError?: (error: Error | string) => void) {
 		let options!: ISQLiteStorageDatabaseOptions;
 		if (logError) {
@@ -335,49 +319,49 @@ suite('SQLite Storage Library', function () {
 		items.set(JSON.stringify({ foo: 'bar' }), JSON.stringify({ bar: 'foo' }));
 
 		let storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await storage.updateItems({ insert: items });
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
-		equal(storedItems.get('foo'), 'bar');
-		equal(storedItems.get('some/foo/path'), 'some/bar/path');
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.size, items.size);
+		strictEqual(storedItems.get('foo'), 'bar');
+		strictEqual(storedItems.get('some/foo/path'), 'some/bar/path');
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		await storage.updateItems({ delete: toSet(['foo']) });
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items.size - 1);
+		strictEqual(storedItems.size, items.size - 1);
 		ok(!storedItems.has('foo'));
-		equal(storedItems.get('some/foo/path'), 'some/bar/path');
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.get('some/foo/path'), 'some/bar/path');
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		await storage.updateItems({ insert: items });
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
-		equal(storedItems.get('foo'), 'bar');
-		equal(storedItems.get('some/foo/path'), 'some/bar/path');
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.size, items.size);
+		strictEqual(storedItems.get('foo'), 'bar');
+		strictEqual(storedItems.get('some/foo/path'), 'some/bar/path');
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		const itemsChange = new Map<string, string>();
 		itemsChange.set('foo', 'otherbar');
 		await storage.updateItems({ insert: itemsChange });
 
 		storedItems = await storage.getItems();
-		equal(storedItems.get('foo'), 'otherbar');
+		strictEqual(storedItems.get('foo'), 'otherbar');
 
 		await storage.updateItems({ delete: toSet(['foo', 'bar', 'some/foo/path', JSON.stringify({ foo: 'bar' })]) });
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await storage.updateItems({ insert: items, delete: toSet(['foo', 'some/foo/path', 'other']) });
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 1);
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.size, 1);
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		await storage.updateItems({ delete: toSet([JSON.stringify({ foo: 'bar' })]) });
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		let recoveryCalled = false;
 		await storage.close(() => {
@@ -386,35 +370,19 @@ suite('SQLite Storage Library', function () {
 			return new Map();
 		});
 
-		equal(recoveryCalled, false);
+		strictEqual(recoveryCalled, false);
 	}
 
 	test('basics', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		await testDBBasics(join(storageDir, 'storage.db'));
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('basics (open multiple times)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		await testDBBasics(join(storageDir, 'storage.db'));
 		await testDBBasics(join(storageDir, 'storage.db'));
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('basics (corrupt DB falls back to empty DB)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		const corruptDBPath = join(storageDir, 'broken.db');
 		await writeFile(corruptDBPath, 'This is a broken DB');
 
@@ -424,15 +392,9 @@ suite('SQLite Storage Library', function () {
 		});
 
 		ok(expectedError);
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('basics (corrupt DB restores from previous backup)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		const storagePath = join(storageDir, 'storage.db');
 		let storage = new SQLiteStorageDatabase(storagePath);
 
@@ -449,10 +411,10 @@ suite('SQLite Storage Library', function () {
 		storage = new SQLiteStorageDatabase(storagePath);
 
 		const storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
-		equal(storedItems.get('foo'), 'bar');
-		equal(storedItems.get('some/foo/path'), 'some/bar/path');
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.size, items.size);
+		strictEqual(storedItems.get('foo'), 'bar');
+		strictEqual(storedItems.get('some/foo/path'), 'some/bar/path');
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		let recoveryCalled = false;
 		await storage.close(() => {
@@ -461,16 +423,10 @@ suite('SQLite Storage Library', function () {
 			return new Map();
 		});
 
-		equal(recoveryCalled, false);
-
-		await rimraf(storageDir, RimRafMode.MOVE);
+		strictEqual(recoveryCalled, false);
 	});
 
 	test('basics (corrupt DB falls back to empty DB if backup is corrupt)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		const storagePath = join(storageDir, 'storage.db');
 		let storage = new SQLiteStorageDatabase(storagePath);
 
@@ -488,24 +444,12 @@ suite('SQLite Storage Library', function () {
 		storage = new SQLiteStorageDatabase(storagePath);
 
 		const storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await testDBBasics(storagePath);
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
-	test('basics (DB that becomes corrupt during runtime stores all state from cache on close)', async () => {
-		if (isWindows) {
-			await Promise.resolve(); // Windows will fail to write to open DB due to locking
-
-			return;
-		}
-
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
+	(isWindows ? test.skip /* Windows will fail to write to open DB due to locking */ : test)('basics (DB that becomes corrupt during runtime stores all state from cache on close)', async () => {
 		const storagePath = join(storageDir, 'storage.db');
 		let storage = new SQLiteStorageDatabase(storagePath);
 
@@ -518,7 +462,7 @@ suite('SQLite Storage Library', function () {
 		await storage.close();
 
 		const backupPath = `${storagePath}.backup`;
-		equal(await exists(backupPath), true);
+		strictEqual(await exists(backupPath), true);
 
 		storage = new SQLiteStorageDatabase(storagePath);
 		await storage.getItems();
@@ -540,16 +484,16 @@ suite('SQLite Storage Library', function () {
 			return items;
 		});
 
-		equal(recoveryCalled, true);
-		equal(await exists(backupPath), true);
+		strictEqual(recoveryCalled, true);
+		strictEqual(await exists(backupPath), true);
 
 		storage = new SQLiteStorageDatabase(storagePath);
 
 		const storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
-		equal(storedItems.get('foo'), 'bar');
-		equal(storedItems.get('some/foo/path'), 'some/bar/path');
-		equal(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
+		strictEqual(storedItems.size, items.size);
+		strictEqual(storedItems.get('foo'), 'bar');
+		strictEqual(storedItems.get('some/foo/path'), 'some/bar/path');
+		strictEqual(storedItems.get(JSON.stringify({ foo: 'bar' })), JSON.stringify({ bar: 'foo' }));
 
 		recoveryCalled = false;
 		await storage.close(() => {
@@ -558,16 +502,10 @@ suite('SQLite Storage Library', function () {
 			return new Map();
 		});
 
-		equal(recoveryCalled, false);
-
-		await rimraf(storageDir, RimRafMode.MOVE);
+		strictEqual(recoveryCalled, false);
 	});
 
 	test('real world example', async function () {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		let storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db'));
 
 		const items1 = new Map<string, string>();
@@ -587,7 +525,7 @@ suite('SQLite Storage Library', function () {
 		items3.set('very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.very.long.key.', 'is long');
 
 		let storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await Promise.all([
 			await storage.updateItems({ insert: items1 }),
@@ -595,28 +533,28 @@ suite('SQLite Storage Library', function () {
 			await storage.updateItems({ insert: items3 })
 		]);
 
-		equal(await storage.checkIntegrity(true), 'ok');
-		equal(await storage.checkIntegrity(false), 'ok');
+		strictEqual(await storage.checkIntegrity(true), 'ok');
+		strictEqual(await storage.checkIntegrity(false), 'ok');
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items1.size + items2.size + items3.size);
+		strictEqual(storedItems.size, items1.size + items2.size + items3.size);
 
 		const items1Keys: string[] = [];
 		items1.forEach((value, key) => {
 			items1Keys.push(key);
-			equal(storedItems.get(key), value);
+			strictEqual(storedItems.get(key), value);
 		});
 
 		const items2Keys: string[] = [];
 		items2.forEach((value, key) => {
 			items2Keys.push(key);
-			equal(storedItems.get(key), value);
+			strictEqual(storedItems.get(key), value);
 		});
 
 		const items3Keys: string[] = [];
 		items3.forEach((value, key) => {
 			items3Keys.push(key);
-			equal(storedItems.get(key), value);
+			strictEqual(storedItems.get(key), value);
 		});
 
 		await Promise.all([
@@ -626,7 +564,7 @@ suite('SQLite Storage Library', function () {
 		]);
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await Promise.all([
 			await storage.updateItems({ insert: items1 }),
@@ -638,27 +576,19 @@ suite('SQLite Storage Library', function () {
 		]);
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items1.size + items2.size + items3.size);
+		strictEqual(storedItems.size, items1.size + items2.size + items3.size);
 
 		await storage.close();
 
 		storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db'));
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, items1.size + items2.size + items3.size);
+		strictEqual(storedItems.size, items1.size + items2.size + items3.size);
 
 		await storage.close();
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('very large item value', async function () {
-		this.timeout(20000);
-
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		let storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db'));
 
 		const items = new Map<string, string>();
@@ -675,9 +605,9 @@ suite('SQLite Storage Library', function () {
 		await storage.updateItems({ insert: items });
 
 		let storedItems = await storage.getItems();
-		equal(items.get('colorthemedata'), storedItems.get('colorthemedata'));
-		equal(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
-		equal(items.get('super.large.string'), storedItems.get('super.large.string'));
+		strictEqual(items.get('colorthemedata'), storedItems.get('colorthemedata'));
+		strictEqual(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
+		strictEqual(items.get('super.large.string'), storedItems.get('super.large.string'));
 
 		uuid = generateUuid();
 		value = [];
@@ -689,27 +619,23 @@ suite('SQLite Storage Library', function () {
 		await storage.updateItems({ insert: items });
 
 		storedItems = await storage.getItems();
-		equal(items.get('colorthemedata'), storedItems.get('colorthemedata'));
-		equal(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
-		equal(items.get('super.large.string'), storedItems.get('super.large.string'));
+		strictEqual(items.get('colorthemedata'), storedItems.get('colorthemedata'));
+		strictEqual(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
+		strictEqual(items.get('super.large.string'), storedItems.get('super.large.string'));
 
 		const toDelete = new Set<string>();
 		toDelete.add('super.large.string');
 		await storage.updateItems({ delete: toDelete });
 
 		storedItems = await storage.getItems();
-		equal(items.get('colorthemedata'), storedItems.get('colorthemedata'));
-		equal(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
+		strictEqual(items.get('colorthemedata'), storedItems.get('colorthemedata'));
+		strictEqual(items.get('commandpalette.mru.cache'), storedItems.get('commandpalette.mru.cache'));
 		ok(!storedItems.get('super.large.string'));
 
 		await storage.close();
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('multiple concurrent writes execute in sequence', async () => {
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
 
 		class TestStorage extends Storage {
 			getStorage(): IStorageDatabase {
@@ -750,25 +676,19 @@ suite('SQLite Storage Library', function () {
 		await storage.set('some/foo3/path', 'some/bar/path');
 
 		const items = await storage.getStorage().getItems();
-		equal(items.get('foo'), 'bar');
-		equal(items.get('some/foo/path'), 'some/bar/path');
-		equal(items.has('foo1'), false);
-		equal(items.has('some/foo1/path'), false);
-		equal(items.get('foo2'), 'bar');
-		equal(items.get('some/foo2/path'), 'some/bar/path');
-		equal(items.get('foo3'), 'bar');
-		equal(items.get('some/foo3/path'), 'some/bar/path');
+		strictEqual(items.get('foo'), 'bar');
+		strictEqual(items.get('some/foo/path'), 'some/bar/path');
+		strictEqual(items.has('foo1'), false);
+		strictEqual(items.has('some/foo1/path'), false);
+		strictEqual(items.get('foo2'), 'bar');
+		strictEqual(items.get('some/foo2/path'), 'some/bar/path');
+		strictEqual(items.get('foo3'), 'bar');
+		strictEqual(items.get('some/foo3/path'), 'some/bar/path');
 
 		await storage.close();
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('lots of INSERT & DELETE (below inline max)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		const storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db'));
 
 		const items = new Map<string, string>();
@@ -784,23 +704,17 @@ suite('SQLite Storage Library', function () {
 		await storage.updateItems({ insert: items });
 
 		let storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
+		strictEqual(storedItems.size, items.size);
 
 		await storage.updateItems({ delete: keys });
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await storage.close();
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 
 	test('lots of INSERT & DELETE (above inline max)', async () => {
-		const storageDir = uniqueStorageDir();
-
-		await mkdirp(storageDir);
-
 		const storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db'));
 
 		const items = new Map<string, string>();
@@ -816,15 +730,13 @@ suite('SQLite Storage Library', function () {
 		await storage.updateItems({ insert: items });
 
 		let storedItems = await storage.getItems();
-		equal(storedItems.size, items.size);
+		strictEqual(storedItems.size, items.size);
 
 		await storage.updateItems({ delete: keys });
 
 		storedItems = await storage.getItems();
-		equal(storedItems.size, 0);
+		strictEqual(storedItems.size, 0);
 
 		await storage.close();
-
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 });
diff --git a/src/vs/base/test/browser/actionbar.test.ts b/src/vs/base/test/browser/actionbar.test.ts
index 049c4d48b..0fb8338d3 100644
--- a/src/vs/base/test/browser/actionbar.test.ts
+++ b/src/vs/base/test/browser/actionbar.test.ts
@@ -33,28 +33,28 @@ suite('Actionbar', () => {
 		let a2 = new Action('a2');
 
 		actionbar.push(a1);
-		assert.equal(actionbar.hasAction(a1), true);
-		assert.equal(actionbar.hasAction(a2), false);
+		assert.strictEqual(actionbar.hasAction(a1), true);
+		assert.strictEqual(actionbar.hasAction(a2), false);
 
 		actionbar.pull(0);
-		assert.equal(actionbar.hasAction(a1), false);
+		assert.strictEqual(actionbar.hasAction(a1), false);
 
 		actionbar.push(a1, { index: 1 });
 		actionbar.push(a2, { index: 0 });
-		assert.equal(actionbar.hasAction(a1), true);
-		assert.equal(actionbar.hasAction(a2), true);
+		assert.strictEqual(actionbar.hasAction(a1), true);
+		assert.strictEqual(actionbar.hasAction(a2), true);
 
 		actionbar.pull(0);
-		assert.equal(actionbar.hasAction(a1), true);
-		assert.equal(actionbar.hasAction(a2), false);
+		assert.strictEqual(actionbar.hasAction(a1), true);
+		assert.strictEqual(actionbar.hasAction(a2), false);
 
 		actionbar.pull(0);
-		assert.equal(actionbar.hasAction(a1), false);
-		assert.equal(actionbar.hasAction(a2), false);
+		assert.strictEqual(actionbar.hasAction(a1), false);
+		assert.strictEqual(actionbar.hasAction(a2), false);
 
 		actionbar.push(a1);
-		assert.equal(actionbar.hasAction(a1), true);
+		assert.strictEqual(actionbar.hasAction(a1), true);
 		actionbar.clear();
-		assert.equal(actionbar.hasAction(a1), false);
+		assert.strictEqual(actionbar.hasAction(a1), false);
 	});
 });
diff --git a/src/vs/base/test/browser/comparers.test.ts b/src/vs/base/test/browser/comparers.test.ts
index 77ec3adf6..5f85f7bed 100644
--- a/src/vs/base/test/browser/comparers.test.ts
+++ b/src/vs/base/test/browser/comparers.test.ts
@@ -123,8 +123,8 @@ suite('Comparers', () => {
 		// name-only comparisions
 		assert(compareFileExtensions('a', 'A') !== compareLocale('a', 'A'), 'the same letter of different case does not sort by locale');
 		assert(compareFileExtensions('â', 'Â') !== compareLocale('â', 'Â'), 'the same accented letter of different case does not sort by locale');
-		assert.notDeepEqual(['artichoke', 'Artichoke', 'art', 'Art'].sort(compareFileExtensions), ['artichoke', 'Artichoke', 'art', 'Art'].sort(compareLocale), 'words with the same root and different cases do not sort in locale order');
-		assert.notDeepEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileExtensions), ['email', 'Email', 'émail', 'Émail'].sort((a, b) => a.localeCompare(b)), 'the same base characters with different case or accents do not sort in locale order');
+		assert.notDeepStrictEqual(['artichoke', 'Artichoke', 'art', 'Art'].sort(compareFileExtensions), ['artichoke', 'Artichoke', 'art', 'Art'].sort(compareLocale), 'words with the same root and different cases do not sort in locale order');
+		assert.notDeepStrictEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileExtensions), ['email', 'Email', 'émail', 'Émail'].sort((a, b) => a.localeCompare(b)), 'the same base characters with different case or accents do not sort in locale order');
 
 		// name plus extension comparisons
 		assert(compareFileExtensions('a.MD', 'a.md') !== compareLocale('MD', 'md'), 'case differences in extensions do not sort by locale');
@@ -197,8 +197,7 @@ suite('Comparers', () => {
 		// name-only comparisons
 		assert(compareFileNamesDefault('a', 'A') === compareLocale('a', 'A'), 'the same letter sorts by locale');
 		assert(compareFileNamesDefault('â', 'Â') === compareLocale('â', 'Â'), 'the same accented letter sorts by locale');
-		// assert.deepEqual(['artichoke', 'Artichoke', 'art', 'Art'].sort(compareFileNamesDefault), ['artichoke', 'Artichoke', 'art', 'Art'].sort(compareLocale), 'words with the same root and different cases sort in locale order');
-		assert.deepEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileNamesDefault), ['email', 'Email', 'émail', 'Émail'].sort(compareLocale), 'the same base characters with different case or accents sort in locale order');
+		assert.deepStrictEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileNamesDefault), ['email', 'Email', 'émail', 'Émail'].sort(compareLocale), 'the same base characters with different case or accents sort in locale order');
 
 		// numeric comparisons
 		assert(compareFileNamesDefault('abc02.txt', 'abc002.txt') < 0, 'filenames with equivalent numbers and leading zeros sort shortest number first');
@@ -259,8 +258,7 @@ suite('Comparers', () => {
 		// name-only comparisons
 		assert(compareFileExtensionsDefault('a', 'A') === compareLocale('a', 'A'), 'the same letter of different case sorts by locale');
 		assert(compareFileExtensionsDefault('â', 'Â') === compareLocale('â', 'Â'), 'the same accented letter of different case sorts by locale');
-		// assert.deepEqual(['artichoke', 'Artichoke', 'art', 'Art'].sort(compareFileExtensionsDefault), ['artichoke', 'Artichoke', 'art', 'Art'].sort(compareLocale), 'words with the same root and different cases sort in locale order');
-		assert.deepEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileExtensionsDefault), ['email', 'Email', 'émail', 'Émail'].sort((a, b) => a.localeCompare(b)), 'the same base characters with different case or accents sort in locale order');
+		assert.deepStrictEqual(['email', 'Email', 'émail', 'Émail'].sort(compareFileExtensionsDefault), ['email', 'Email', 'émail', 'Émail'].sort((a, b) => a.localeCompare(b)), 'the same base characters with different case or accents sort in locale order');
 
 		// name plus extension comparisons
 		assert(compareFileExtensionsDefault('a.MD', 'a.md') === compareLocale('MD', 'md'), 'case differences in extensions sort by locale');
diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts
index 99b4f1b90..12a7c3ca7 100644
--- a/src/vs/base/test/browser/dom.test.ts
+++ b/src/vs/base/test/browser/dom.test.ts
@@ -73,8 +73,9 @@ suite('dom', () => {
 	});
 
 	test('multibyteAwareBtoa', () => {
-		assert.equal(dom.multibyteAwareBtoa('hello world'), dom.multibyteAwareBtoa('hello world'));
-		assert.ok(dom.multibyteAwareBtoa('平仮名'));
+		assert.ok(dom.multibyteAwareBtoa('hello world').length > 0);
+		assert.ok(dom.multibyteAwareBtoa('平仮名').length > 0);
+		assert.ok(dom.multibyteAwareBtoa(new Array(100000).fill('vs').join('')).length > 0); // https://github.com/microsoft/vscode/issues/112013
 	});
 
 	suite('$', () => {
diff --git a/src/vs/base/test/browser/codicons.test.ts b/src/vs/base/test/browser/iconLabels.test.ts
similarity index 61%
rename from src/vs/base/test/browser/codicons.test.ts
rename to src/vs/base/test/browser/iconLabels.test.ts
index fd5b0332a..db81e37a5 100644
--- a/src/vs/base/test/browser/codicons.test.ts
+++ b/src/vs/base/test/browser/iconLabels.test.ts
@@ -3,45 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import * as assert from 'assert';
 
-suite('renderCodicons', () => {
+suite('renderLabelWithIcons', () => {
 
-	test('no codicons', () => {
-		const result = renderCodicons(' hello World .');
+	test('no icons', () => {
+		const result = renderLabelWithIcons(' hello World .');
 
 		assert.equal(elementsToString(result), ' hello World .');
 	});
 
-	test('codicon only', () => {
-		const result = renderCodicons('$(alert)');
+	test('icons only', () => {
+		const result = renderLabelWithIcons('$(alert)');
 
 		assert.equal(elementsToString(result), '<span class="codicon codicon-alert"></span>');
 	});
 
-	test('codicon and non-codicon strings', () => {
-		const result = renderCodicons(` $(alert) Unresponsive`);
+	test('icon and non-icon strings', () => {
+		const result = renderLabelWithIcons(` $(alert) Unresponsive`);
 
 		assert.equal(elementsToString(result), ' <span class="codicon codicon-alert"></span> Unresponsive');
 	});
 
-	test('multiple codicons', () => {
-		const result = renderCodicons('$(check)$(error)');
+	test('multiple icons', () => {
+		const result = renderLabelWithIcons('$(check)$(error)');
 
 		assert.equal(elementsToString(result), '<span class="codicon codicon-check"></span><span class="codicon codicon-error"></span>');
 	});
 
-	test('escaped codicon', () => {
-		const result = renderCodicons('\\$(escaped)');
+	test('escaped icons', () => {
+		const result = renderLabelWithIcons('\\$(escaped)');
 
 		assert.equal(elementsToString(result), '$(escaped)');
 	});
 
-	test('codicon with animation', () => {
-		const result = renderCodicons('$(zip~anim)');
+	test('icon with animation', () => {
+		const result = renderLabelWithIcons('$(zip~anim)');
 
-		assert.equal(elementsToString(result), '<span class="codicon codicon-zip codicon-animation-anim"></span>');
+		assert.equal(elementsToString(result), '<span class="codicon codicon-zip codicon-modifier-anim"></span>');
 	});
 
 	const elementsToString = (elements: Array<HTMLElement | string>): string => {
diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
index 46fc3edf1..14de7bb45 100644
--- a/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
+++ b/src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts
@@ -53,7 +53,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, false);
+			assert.strictEqual(actual, false);
 		}
 	});
 
@@ -142,7 +142,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, false);
+			assert.strictEqual(actual, false);
 		}
 	});
 
@@ -202,7 +202,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, true);
+			assert.strictEqual(actual, true);
 		}
 	});
 
@@ -241,7 +241,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, true);
+			assert.strictEqual(actual, true);
 		}
 	});
 
@@ -285,7 +285,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, false);
+			assert.strictEqual(actual, false);
 		}
 	});
 
@@ -374,7 +374,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, true);
+			assert.strictEqual(actual, true);
 		}
 	});
 
@@ -464,7 +464,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, true);
+			assert.strictEqual(actual, true);
 		}
 	});
 
@@ -518,7 +518,7 @@ suite('MouseWheelClassifier', () => {
 			classifier.accept(timestamp, deltaX, deltaY);
 
 			const actual = classifier.isPhysicalMouseWheel();
-			assert.equal(actual, true);
+			assert.strictEqual(actual, true);
 		}
 	});
 });
diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
index 4d3c0944a..f5813d844 100644
--- a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
+++ b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts
@@ -10,52 +10,52 @@ suite('ScrollbarState', () => {
 	test('inflates slider size', () => {
 		let actual = new ScrollbarState(0, 14, 0, 339, 42423, 32787);
 
-		assert.equal(actual.getArrowSize(), 0);
-		assert.equal(actual.getScrollPosition(), 32787);
-		assert.equal(actual.getRectangleLargeSize(), 339);
-		assert.equal(actual.getRectangleSmallSize(), 14);
-		assert.equal(actual.isNeeded(), true);
-		assert.equal(actual.getSliderSize(), 20);
-		assert.equal(actual.getSliderPosition(), 249);
+		assert.strictEqual(actual.getArrowSize(), 0);
+		assert.strictEqual(actual.getScrollPosition(), 32787);
+		assert.strictEqual(actual.getRectangleLargeSize(), 339);
+		assert.strictEqual(actual.getRectangleSmallSize(), 14);
+		assert.strictEqual(actual.isNeeded(), true);
+		assert.strictEqual(actual.getSliderSize(), 20);
+		assert.strictEqual(actual.getSliderPosition(), 249);
 
-		assert.equal(actual.getDesiredScrollPositionFromOffset(259), 32849);
+		assert.strictEqual(actual.getDesiredScrollPositionFromOffset(259), 32849);
 
 		// 259 is greater than 230 so page down, 32787 + 339 =  33126
-		assert.equal(actual.getDesiredScrollPositionFromOffsetPaged(259), 33126);
+		assert.strictEqual(actual.getDesiredScrollPositionFromOffsetPaged(259), 33126);
 
 		actual.setScrollPosition(32849);
-		assert.equal(actual.getArrowSize(), 0);
-		assert.equal(actual.getScrollPosition(), 32849);
-		assert.equal(actual.getRectangleLargeSize(), 339);
-		assert.equal(actual.getRectangleSmallSize(), 14);
-		assert.equal(actual.isNeeded(), true);
-		assert.equal(actual.getSliderSize(), 20);
-		assert.equal(actual.getSliderPosition(), 249);
+		assert.strictEqual(actual.getArrowSize(), 0);
+		assert.strictEqual(actual.getScrollPosition(), 32849);
+		assert.strictEqual(actual.getRectangleLargeSize(), 339);
+		assert.strictEqual(actual.getRectangleSmallSize(), 14);
+		assert.strictEqual(actual.isNeeded(), true);
+		assert.strictEqual(actual.getSliderSize(), 20);
+		assert.strictEqual(actual.getSliderPosition(), 249);
 	});
 
 	test('inflates slider size with arrows', () => {
 		let actual = new ScrollbarState(12, 14, 0, 339, 42423, 32787);
 
-		assert.equal(actual.getArrowSize(), 12);
-		assert.equal(actual.getScrollPosition(), 32787);
-		assert.equal(actual.getRectangleLargeSize(), 339);
-		assert.equal(actual.getRectangleSmallSize(), 14);
-		assert.equal(actual.isNeeded(), true);
-		assert.equal(actual.getSliderSize(), 20);
-		assert.equal(actual.getSliderPosition(), 230);
+		assert.strictEqual(actual.getArrowSize(), 12);
+		assert.strictEqual(actual.getScrollPosition(), 32787);
+		assert.strictEqual(actual.getRectangleLargeSize(), 339);
+		assert.strictEqual(actual.getRectangleSmallSize(), 14);
+		assert.strictEqual(actual.isNeeded(), true);
+		assert.strictEqual(actual.getSliderSize(), 20);
+		assert.strictEqual(actual.getSliderPosition(), 230);
 
-		assert.equal(actual.getDesiredScrollPositionFromOffset(240 + 12), 32811);
+		assert.strictEqual(actual.getDesiredScrollPositionFromOffset(240 + 12), 32811);
 
 		// 240 + 12 = 252; greater than 230 so page down, 32787 + 339 =  33126
-		assert.equal(actual.getDesiredScrollPositionFromOffsetPaged(240 + 12), 33126);
+		assert.strictEqual(actual.getDesiredScrollPositionFromOffsetPaged(240 + 12), 33126);
 
 		actual.setScrollPosition(32811);
-		assert.equal(actual.getArrowSize(), 12);
-		assert.equal(actual.getScrollPosition(), 32811);
-		assert.equal(actual.getRectangleLargeSize(), 339);
-		assert.equal(actual.getRectangleSmallSize(), 14);
-		assert.equal(actual.isNeeded(), true);
-		assert.equal(actual.getSliderSize(), 20);
-		assert.equal(actual.getSliderPosition(), 230);
+		assert.strictEqual(actual.getArrowSize(), 12);
+		assert.strictEqual(actual.getScrollPosition(), 32811);
+		assert.strictEqual(actual.getRectangleLargeSize(), 339);
+		assert.strictEqual(actual.getRectangleSmallSize(), 14);
+		assert.strictEqual(actual.isNeeded(), true);
+		assert.strictEqual(actual.getSliderSize(), 20);
+		assert.strictEqual(actual.getSliderPosition(), 230);
 	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
index 18eb84d51..498b22e1b 100644
--- a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts
@@ -8,6 +8,7 @@ import { compress, ICompressedTreeElement, ICompressedTreeNode, decompress, Comp
 import { Iterable } from 'vs/base/common/iterator';
 import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
 import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { IObjectTreeModelSetChildrenOptions } from 'vs/base/browser/ui/tree/objectTreeModel';
 
 interface IResolvedCompressedTreeElement<T> extends ICompressedTreeElement<T> {
 	readonly element: T;
@@ -304,6 +305,16 @@ suite('CompressedObjectTree', function () {
 
 	suite('CompressedObjectTreeModel', function () {
 
+		/**
+		 * Calls that test function twice, once with an empty options and
+		 * once with `diffIdentityProvider`.
+		 */
+		function withSmartSplice(fn: (options: IObjectTreeModelSetChildrenOptions<number, any>) => void) {
+			fn({});
+			fn({ diffIdentityProvider: { getId: n => String(n) } });
+		}
+
+
 		test('ctor', () => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
 			const model = new CompressedObjectTreeModel<number>('test', toList(list));
@@ -312,7 +323,7 @@ suite('CompressedObjectTree', function () {
 			assert.equal(model.size, 0);
 		});
 
-		test('flat', () => {
+		test('flat', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
 			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
@@ -320,7 +331,7 @@ suite('CompressedObjectTree', function () {
 				{ element: 0 },
 				{ element: 1 },
 				{ element: 2 }
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[0], [1], [2]]);
 			assert.equal(model.size, 3);
@@ -329,17 +340,17 @@ suite('CompressedObjectTree', function () {
 				{ element: 3 },
 				{ element: 4 },
 				{ element: 5 },
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[3], [4], [5]]);
 			assert.equal(model.size, 3);
 
-			model.setChildren(null);
+			model.setChildren(null, [], options);
 			assert.deepEqual(toArray(list), []);
 			assert.equal(model.size, 0);
-		});
+		}));
 
-		test('nested', () => {
+		test('nested', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
 			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
@@ -353,7 +364,7 @@ suite('CompressedObjectTree', function () {
 				},
 				{ element: 1 },
 				{ element: 2 }
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[0], [10], [11], [12], [1], [2]]);
 			assert.equal(model.size, 6);
@@ -361,21 +372,21 @@ suite('CompressedObjectTree', function () {
 			model.setChildren(12, [
 				{ element: 120 },
 				{ element: 121 }
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[0], [10], [11], [12], [120], [121], [1], [2]]);
 			assert.equal(model.size, 8);
 
-			model.setChildren(0);
+			model.setChildren(0, [], options);
 			assert.deepEqual(toArray(list), [[0], [1], [2]]);
 			assert.equal(model.size, 3);
 
-			model.setChildren(null);
+			model.setChildren(null, [], options);
 			assert.deepEqual(toArray(list), []);
 			assert.equal(model.size, 0);
-		});
+		}));
 
-		test('compressed', () => {
+		test('compressed', () => withSmartSplice(options => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
 			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
@@ -391,7 +402,7 @@ suite('CompressedObjectTree', function () {
 						}]
 					}]
 				}
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[1, 11, 111], [1111], [1112], [1113]]);
 			assert.equal(model.size, 6);
@@ -400,21 +411,21 @@ suite('CompressedObjectTree', function () {
 				{ element: 111 },
 				{ element: 112 },
 				{ element: 113 },
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113]]);
 			assert.equal(model.size, 5);
 
 			model.setChildren(113, [
 				{ element: 1131 }
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131]]);
 			assert.equal(model.size, 6);
 
 			model.setChildren(1131, [
 				{ element: 1132 }
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131, 1132]]);
 			assert.equal(model.size, 7);
@@ -422,10 +433,10 @@ suite('CompressedObjectTree', function () {
 			model.setChildren(1131, [
 				{ element: 1132 },
 				{ element: 1133 },
-			]);
+			], options);
 
 			assert.deepEqual(toArray(list), [[1, 11], [111], [112], [113, 1131], [1132], [1133]]);
 			assert.equal(model.size, 8);
-		});
+		}));
 	});
 });
diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
index 6c9dfeae8..a96007cb5 100644
--- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
+++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { ITreeNode, ITreeFilter, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { IndexTreeModel, IIndexTreeNode, IList } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { ITreeNode, ITreeFilter, TreeVisibility, ITreeElement } from 'vs/base/browser/ui/tree/tree';
+import { IndexTreeModel, IIndexTreeNode, IList, IIndexTreeModelSpliceOptions } from 'vs/base/browser/ui/tree/indexTreeModel';
 
 function toList<T>(arr: T[]): IList<T> {
 	return {
@@ -20,7 +20,23 @@ function toArray<T>(list: ITreeNode<T>[]): T[] {
 	return list.map(i => i.element);
 }
 
-suite('IndexTreeModel', function () {
+
+function toElements<T>(node: ITreeNode<T>): any {
+	return node.children?.length ? { e: node.element, children: node.children.map(toElements) } : node.element;
+}
+
+const diffIdentityProvider = { getId: (n: number) => String(n) };
+
+/**
+ * Calls that test function twice, once with an empty options and
+ * once with `diffIdentityProvider`.
+ */
+function withSmartSplice(fn: (options: IIndexTreeModelSpliceOptions<number, any>) => void) {
+	fn({});
+	fn({ diffIdentityProvider });
+}
+
+suite('IndexTreeModel', () => {
 
 	test('ctor', () => {
 		const list: ITreeNode<number>[] = [];
@@ -29,7 +45,7 @@ suite('IndexTreeModel', function () {
 		assert.equal(list.length, 0);
 	});
 
-	test('insert', () => {
+	test('insert', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -37,7 +53,7 @@ suite('IndexTreeModel', function () {
 			{ element: 0 },
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 3);
 		assert.deepEqual(list[0].element, 0);
@@ -49,9 +65,9 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[2].element, 2);
 		assert.deepEqual(list[2].collapsed, false);
 		assert.deepEqual(list[2].depth, 1);
-	});
+	}));
 
-	test('deep insert', function () {
+	test('deep insert', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -86,9 +102,9 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[5].element, 2);
 		assert.deepEqual(list[5].collapsed, false);
 		assert.deepEqual(list[5].depth, 1);
-	});
+	}));
 
-	test('deep insert collapsed', function () {
+	test('deep insert collapsed', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -102,7 +118,7 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 3);
 		assert.deepEqual(list[0].element, 0);
@@ -114,9 +130,9 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[2].element, 2);
 		assert.deepEqual(list[2].collapsed, false);
 		assert.deepEqual(list[2].depth, 1);
-	});
+	}));
 
-	test('delete', () => {
+	test('delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -124,11 +140,11 @@ suite('IndexTreeModel', function () {
 			{ element: 0 },
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 3);
 
-		model.splice([1], 1);
+		model.splice([1], 1, undefined, options);
 		assert.deepEqual(list.length, 2);
 		assert.deepEqual(list[0].element, 0);
 		assert.deepEqual(list[0].collapsed, false);
@@ -137,11 +153,11 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[1].collapsed, false);
 		assert.deepEqual(list[1].depth, 1);
 
-		model.splice([0], 2);
+		model.splice([0], 2, undefined, options);
 		assert.deepEqual(list.length, 0);
-	});
+	}));
 
-	test('nested delete', function () {
+	test('nested delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -155,11 +171,11 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 6);
 
-		model.splice([1], 2);
+		model.splice([1], 2, undefined, options);
 		assert.deepEqual(list.length, 4);
 		assert.deepEqual(list[0].element, 0);
 		assert.deepEqual(list[0].collapsed, false);
@@ -173,9 +189,9 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[3].element, 12);
 		assert.deepEqual(list[3].collapsed, false);
 		assert.deepEqual(list[3].depth, 2);
-	});
+	}));
 
-	test('deep delete', function () {
+	test('deep delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -189,11 +205,11 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 6);
 
-		model.splice([0], 1);
+		model.splice([0], 1, undefined, options);
 		assert.deepEqual(list.length, 2);
 		assert.deepEqual(list[0].element, 1);
 		assert.deepEqual(list[0].collapsed, false);
@@ -201,9 +217,43 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[1].element, 2);
 		assert.deepEqual(list[1].collapsed, false);
 		assert.deepEqual(list[1].depth, 1);
+	}));
+
+	test('smart splice deep', () => {
+		const list: ITreeNode<number>[] = [];
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
+
+		model.splice([0], 0, [
+			{ element: 0 },
+			{ element: 1 },
+			{ element: 2 },
+			{ element: 3 },
+		], { diffIdentityProvider });
+
+		assert.deepStrictEqual(list.filter(l => l.depth === 1).map(toElements), [
+			0,
+			1,
+			2,
+			3,
+		]);
+
+		model.splice([0], 3, [
+			{ element: -0.5 },
+			{ element: 0, children: [{ element: 0.1 }] },
+			{ element: 1 },
+			{ element: 2, children: [{ element: 2.1 }, { element: 2.2, children: [{ element: 2.21 }] }] },
+		], { diffIdentityProvider, diffDepth: Infinity });
+
+		assert.deepStrictEqual(list.filter(l => l.depth === 1).map(toElements), [
+			-0.5,
+			{ e: 0, children: [0.1] },
+			1,
+			{ e: 2, children: [2.1, { e: 2.2, children: [2.21] }] },
+			3,
+		]);
 	});
 
-	test('hidden delete', function () {
+	test('hidden delete', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -217,18 +267,18 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 3);
 
-		model.splice([0, 1], 1);
+		model.splice([0, 1], 1, undefined, options);
 		assert.deepEqual(list.length, 3);
 
-		model.splice([0, 0], 2);
+		model.splice([0, 0], 2, undefined, options);
 		assert.deepEqual(list.length, 3);
-	});
+	}));
 
-	test('collapse', () => {
+	test('collapse', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -242,7 +292,7 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 6);
 
@@ -257,9 +307,33 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[2].element, 2);
 		assert.deepEqual(list[2].collapsed, false);
 		assert.deepEqual(list[2].depth, 1);
-	});
+	}));
 
-	test('expand', () => {
+	test('updates collapsible', () => withSmartSplice(options => {
+		const list: ITreeNode<number>[] = [];
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
+
+		model.splice([0], 0, [
+			{
+				element: 0, children: [
+					{ element: 1 },
+				]
+			},
+		], options);
+
+		assert.strictEqual(list[0].collapsible, true);
+		assert.strictEqual(list[1].collapsible, false);
+
+		model.splice([0, 0], 1, [], options);
+		assert.strictEqual(list[0].collapsible, false);
+		assert.strictEqual(list[1], undefined);
+
+		model.splice([0, 0], 0, [{ element: 1 }], options);
+		assert.strictEqual(list[0].collapsible, true);
+		assert.strictEqual(list[1].collapsible, false);
+	}));
+
+	test('expand', () => withSmartSplice(options => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -273,7 +347,7 @@ suite('IndexTreeModel', function () {
 			},
 			{ element: 1 },
 			{ element: 2 }
-		]);
+		], options);
 
 		assert.deepEqual(list.length, 3);
 
@@ -297,9 +371,52 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[5].element, 2);
 		assert.deepEqual(list[5].collapsed, false);
 		assert.deepEqual(list[5].depth, 1);
+	}));
+
+	test('smart diff consistency', () => {
+		const times = 500;
+		const minEdits = 1;
+		const maxEdits = 10;
+		const maxInserts = 5;
+
+		for (let i = 0; i < times; i++) {
+			const list: ITreeNode<number>[] = [];
+			const options = { diffIdentityProvider: { getId: (n: number) => String(n) } };
+			const model = new IndexTreeModel<number>('test', toList(list), -1);
+
+			const changes = [];
+			const expected: number[] = [];
+			let elementCounter = 0;
+
+			for (let edits = Math.random() * (maxEdits - minEdits) + minEdits; edits > 0; edits--) {
+				const spliceIndex = Math.floor(Math.random() * list.length);
+				const deleteCount = Math.ceil(Math.random() * (list.length - spliceIndex));
+				const insertCount = Math.floor(Math.random() * maxInserts + 1);
+
+				let inserts: ITreeElement<number>[] = [];
+				for (let i = 0; i < insertCount; i++) {
+					const element = elementCounter++;
+					inserts.push({ element, children: [] });
+				}
+
+				// move existing items
+				if (Math.random() < 0.5) {
+					const elements = list.slice(spliceIndex, spliceIndex + Math.floor(deleteCount / 2));
+					inserts.push(...elements.map(({ element }) => ({ element, children: [] })));
+				}
+
+				model.splice([spliceIndex], deleteCount, inserts, options);
+				expected.splice(spliceIndex, deleteCount, ...inserts.map(i => i.element));
+
+				const listElements = list.map(l => l.element);
+				changes.push(`splice(${spliceIndex}, ${deleteCount}, [${inserts.map(e => e.element).join(', ')}]) -> ${listElements.join(', ')}`);
+
+				assert.deepStrictEqual(expected, listElements, `Expected ${listElements.join(', ')} to equal ${expected.join(', ')}. Steps:\n\n${changes.join('\n')}`);
+			}
+		}
 	});
 
-	test('collapse should recursively adjust visible count', function () {
+	test('collapse should recursively adjust visible count', () => {
 		const list: ITreeNode<number>[] = [];
 		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -395,7 +512,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list[1].collapsed, false);
 	});
 
-	test('simple filter', function () {
+	test('simple filter', () => {
 		const list: ITreeNode<number>[] = [];
 		const filter = new class implements ITreeFilter<number> {
 			filter(element: number): TreeVisibility {
@@ -429,7 +546,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), [0, 2, 4, 6]);
 	});
 
-	test('recursive filter on initial model', function () {
+	test('recursive filter on initial model', () => {
 		const list: ITreeNode<number>[] = [];
 		const filter = new class implements ITreeFilter<number> {
 			filter(element: number): TreeVisibility {
@@ -451,7 +568,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), []);
 	});
 
-	test('refilter', function () {
+	test('refilter', () => {
 		const list: ITreeNode<number>[] = [];
 		let shouldFilter = false;
 		const filter = new class implements ITreeFilter<number> {
@@ -490,7 +607,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), [0, 1, 2, 3, 4, 5, 6, 7]);
 	});
 
-	test('recursive filter', function () {
+	test('recursive filter', () => {
 		const list: ITreeNode<string>[] = [];
 		let query = new RegExp('');
 		const filter = new class implements ITreeFilter<string> {
@@ -536,7 +653,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), ['vscode', '.build', 'github', 'build.js', 'build']);
 	});
 
-	test('recursive filter with collapse', function () {
+	test('recursive filter with collapse', () => {
 		const list: ITreeNode<string>[] = [];
 		let query = new RegExp('');
 		const filter = new class implements ITreeFilter<string> {
@@ -582,7 +699,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), ['vscode']);
 	});
 
-	test('recursive filter while collapsed', function () {
+	test('recursive filter while collapsed', () => {
 		const list: ITreeNode<string>[] = [];
 		let query = new RegExp('');
 		const filter = new class implements ITreeFilter<string> {
@@ -635,9 +752,9 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(list.length, 10);
 	});
 
-	suite('getNodeLocation', function () {
+	suite('getNodeLocation', () => {
 
-		test('simple', function () {
+		test('simple', () => {
 			const list: IIndexTreeNode<number>[] = [];
 			const model = new IndexTreeModel<number>('test', toList(list), -1);
 
@@ -661,7 +778,7 @@ suite('IndexTreeModel', function () {
 			assert.deepEqual(model.getNodeLocation(list[5]), [2]);
 		});
 
-		test('with filter', function () {
+		test('with filter', () => {
 			const list: IIndexTreeNode<number>[] = [];
 			const filter = new class implements ITreeFilter<number> {
 				filter(element: number): TreeVisibility {
@@ -692,7 +809,7 @@ suite('IndexTreeModel', function () {
 		});
 	});
 
-	test('refilter with filtered out nodes', function () {
+	test('refilter with filtered out nodes', () => {
 		const list: ITreeNode<string>[] = [];
 		let query = new RegExp('');
 		const filter = new class implements ITreeFilter<string> {
@@ -726,7 +843,7 @@ suite('IndexTreeModel', function () {
 		assert.deepEqual(toArray(list), ['platinum']);
 	});
 
-	test('explicit hidden nodes should have renderNodeCount == 0, issue #83211', function () {
+	test('explicit hidden nodes should have renderNodeCount == 0, issue #83211', () => {
 		const list: ITreeNode<string>[] = [];
 		let query = new RegExp('');
 		const filter = new class implements ITreeFilter<string> {
diff --git a/src/vs/base/test/browser/ui/tree/objectTree.test.ts b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
index 166a99c00..bb54623b8 100644
--- a/src/vs/base/test/browser/ui/tree/objectTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
@@ -59,30 +59,30 @@ suite('ObjectTree', function () {
 
 			const navigator = tree.navigate();
 
-			assert.equal(navigator.current(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.current(), 0);
-			assert.equal(navigator.next(), 10);
-			assert.equal(navigator.current(), 10);
-			assert.equal(navigator.next(), 11);
-			assert.equal(navigator.current(), 11);
-			assert.equal(navigator.next(), 12);
-			assert.equal(navigator.current(), 12);
-			assert.equal(navigator.next(), 1);
-			assert.equal(navigator.current(), 1);
-			assert.equal(navigator.next(), 2);
-			assert.equal(navigator.current(), 2);
-			assert.equal(navigator.previous(), 1);
-			assert.equal(navigator.current(), 1);
-			assert.equal(navigator.previous(), 12);
-			assert.equal(navigator.previous(), 11);
-			assert.equal(navigator.previous(), 10);
-			assert.equal(navigator.previous(), 0);
-			assert.equal(navigator.previous(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.next(), 10);
-			assert.equal(navigator.first(), 0);
-			assert.equal(navigator.last(), 2);
+			assert.strictEqual(navigator.current(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.current(), 0);
+			assert.strictEqual(navigator.next(), 10);
+			assert.strictEqual(navigator.current(), 10);
+			assert.strictEqual(navigator.next(), 11);
+			assert.strictEqual(navigator.current(), 11);
+			assert.strictEqual(navigator.next(), 12);
+			assert.strictEqual(navigator.current(), 12);
+			assert.strictEqual(navigator.next(), 1);
+			assert.strictEqual(navigator.current(), 1);
+			assert.strictEqual(navigator.next(), 2);
+			assert.strictEqual(navigator.current(), 2);
+			assert.strictEqual(navigator.previous(), 1);
+			assert.strictEqual(navigator.current(), 1);
+			assert.strictEqual(navigator.previous(), 12);
+			assert.strictEqual(navigator.previous(), 11);
+			assert.strictEqual(navigator.previous(), 10);
+			assert.strictEqual(navigator.previous(), 0);
+			assert.strictEqual(navigator.previous(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.next(), 10);
+			assert.strictEqual(navigator.first(), 0);
+			assert.strictEqual(navigator.last(), 2);
 		});
 
 		test('should skip collapsed nodes', () => {
@@ -100,18 +100,18 @@ suite('ObjectTree', function () {
 
 			const navigator = tree.navigate();
 
-			assert.equal(navigator.current(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.next(), 1);
-			assert.equal(navigator.next(), 2);
-			assert.equal(navigator.next(), null);
-			assert.equal(navigator.previous(), 2);
-			assert.equal(navigator.previous(), 1);
-			assert.equal(navigator.previous(), 0);
-			assert.equal(navigator.previous(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.first(), 0);
-			assert.equal(navigator.last(), 2);
+			assert.strictEqual(navigator.current(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.next(), 1);
+			assert.strictEqual(navigator.next(), 2);
+			assert.strictEqual(navigator.next(), null);
+			assert.strictEqual(navigator.previous(), 2);
+			assert.strictEqual(navigator.previous(), 1);
+			assert.strictEqual(navigator.previous(), 0);
+			assert.strictEqual(navigator.previous(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.first(), 0);
+			assert.strictEqual(navigator.last(), 2);
 		});
 
 		test('should skip filtered elements', () => {
@@ -131,21 +131,21 @@ suite('ObjectTree', function () {
 
 			const navigator = tree.navigate();
 
-			assert.equal(navigator.current(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.next(), 10);
-			assert.equal(navigator.next(), 12);
-			assert.equal(navigator.next(), 2);
-			assert.equal(navigator.next(), null);
-			assert.equal(navigator.previous(), 2);
-			assert.equal(navigator.previous(), 12);
-			assert.equal(navigator.previous(), 10);
-			assert.equal(navigator.previous(), 0);
-			assert.equal(navigator.previous(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.next(), 10);
-			assert.equal(navigator.first(), 0);
-			assert.equal(navigator.last(), 2);
+			assert.strictEqual(navigator.current(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.next(), 10);
+			assert.strictEqual(navigator.next(), 12);
+			assert.strictEqual(navigator.next(), 2);
+			assert.strictEqual(navigator.next(), null);
+			assert.strictEqual(navigator.previous(), 2);
+			assert.strictEqual(navigator.previous(), 12);
+			assert.strictEqual(navigator.previous(), 10);
+			assert.strictEqual(navigator.previous(), 0);
+			assert.strictEqual(navigator.previous(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.next(), 10);
+			assert.strictEqual(navigator.first(), 0);
+			assert.strictEqual(navigator.last(), 2);
 		});
 
 		test('should be able to start from node', () => {
@@ -163,20 +163,20 @@ suite('ObjectTree', function () {
 
 			const navigator = tree.navigate(1);
 
-			assert.equal(navigator.current(), 1);
-			assert.equal(navigator.next(), 2);
-			assert.equal(navigator.current(), 2);
-			assert.equal(navigator.previous(), 1);
-			assert.equal(navigator.current(), 1);
-			assert.equal(navigator.previous(), 12);
-			assert.equal(navigator.previous(), 11);
-			assert.equal(navigator.previous(), 10);
-			assert.equal(navigator.previous(), 0);
-			assert.equal(navigator.previous(), null);
-			assert.equal(navigator.next(), 0);
-			assert.equal(navigator.next(), 10);
-			assert.equal(navigator.first(), 0);
-			assert.equal(navigator.last(), 2);
+			assert.strictEqual(navigator.current(), 1);
+			assert.strictEqual(navigator.next(), 2);
+			assert.strictEqual(navigator.current(), 2);
+			assert.strictEqual(navigator.previous(), 1);
+			assert.strictEqual(navigator.current(), 1);
+			assert.strictEqual(navigator.previous(), 12);
+			assert.strictEqual(navigator.previous(), 11);
+			assert.strictEqual(navigator.previous(), 10);
+			assert.strictEqual(navigator.previous(), 0);
+			assert.strictEqual(navigator.previous(), null);
+			assert.strictEqual(navigator.next(), 0);
+			assert.strictEqual(navigator.next(), 10);
+			assert.strictEqual(navigator.first(), 0);
+			assert.strictEqual(navigator.last(), 2);
 		});
 	});
 
@@ -219,10 +219,10 @@ suite('ObjectTree', function () {
 	});
 });
 
-function toArray(list: NodeList): Node[] {
-	const result: Node[] = [];
-	list.forEach(node => result.push(node));
-	return result;
+function getRowsTextContent(container: HTMLElement): string[] {
+	const rows = [...container.querySelectorAll('.monaco-list-row')];
+	rows.sort((a, b) => parseInt(a.getAttribute('data-index')!) - parseInt(b.getAttribute('data-index')!));
+	return rows.map(row => row.querySelector('.monaco-tl-contents')!.textContent!);
 }
 
 suite('CompressibleObjectTree', function () {
@@ -254,8 +254,7 @@ suite('CompressibleObjectTree', function () {
 		const tree = new CompressibleObjectTree<number>('test', container, new Delegate(), [new Renderer()]);
 		tree.layout(200);
 
-		const rows = toArray(container.querySelectorAll('.monaco-tl-contents'));
-		assert.equal(rows.length, 0);
+		assert.strictEqual(getRowsTextContent(container).length, 0);
 	});
 
 	test('simple', function () {
@@ -278,8 +277,7 @@ suite('CompressibleObjectTree', function () {
 			{ element: 2 }
 		]);
 
-		const rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['0', '10', '11', '12', '1', '2']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['0', '10', '11', '12', '1', '2']);
 	});
 
 	test('compressed', () => {
@@ -304,8 +302,7 @@ suite('CompressibleObjectTree', function () {
 			}
 		]);
 
-		let rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11/111', '1111', '1112', '1113']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11/111', '1111', '1112', '1113']);
 
 		tree.setChildren(11, [
 			{ element: 111 },
@@ -313,30 +310,26 @@ suite('CompressibleObjectTree', function () {
 			{ element: 113 },
 		]);
 
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11', '111', '112', '113']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '111', '112', '113']);
 
 		tree.setChildren(113, [
 			{ element: 1131 }
 		]);
 
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11', '111', '112', '113/1131']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '111', '112', '113/1131']);
 
 		tree.setChildren(1131, [
 			{ element: 1132 }
 		]);
 
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11', '111', '112', '113/1131/1132']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '111', '112', '113/1131/1132']);
 
 		tree.setChildren(1131, [
 			{ element: 1132 },
 			{ element: 1133 },
 		]);
 
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11', '111', '112', '113/1131', '1132', '1133']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11', '111', '112', '113/1131', '1132', '1133']);
 	});
 
 	test('enableCompression', () => {
@@ -361,15 +354,12 @@ suite('CompressibleObjectTree', function () {
 			}
 		]);
 
-		let rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11/111', '1111', '1112', '1113']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11/111', '1111', '1112', '1113']);
 
 		tree.updateOptions({ compressionEnabled: false });
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1', '11', '111', '1111', '1112', '1113']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1', '11', '111', '1111', '1112', '1113']);
 
 		tree.updateOptions({ compressionEnabled: true });
-		rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
-		assert.deepEqual(rows, ['1/11/111', '1111', '1112', '1113']);
+		assert.deepStrictEqual(getRowsTextContent(container), ['1/11/111', '1111', '1112', '1113']);
 	});
 });
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index 8b202b6eb..192eda6ce 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -10,25 +10,25 @@ suite('Arrays', () => {
 		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
 
 		let idx = arrays.findFirstInSorted(array, e => e >= 0);
-		assert.equal(array[idx], 1);
+		assert.strictEqual(array[idx], 1);
 
 		idx = arrays.findFirstInSorted(array, e => e > 1);
-		assert.equal(array[idx], 4);
+		assert.strictEqual(array[idx], 4);
 
 		idx = arrays.findFirstInSorted(array, e => e >= 8);
-		assert.equal(array[idx], 55);
+		assert.strictEqual(array[idx], 55);
 
 		idx = arrays.findFirstInSorted(array, e => e >= 61);
-		assert.equal(array[idx], 61);
+		assert.strictEqual(array[idx], 61);
 
 		idx = arrays.findFirstInSorted(array, e => e >= 69);
-		assert.equal(array[idx], 69);
+		assert.strictEqual(array[idx], 69);
 
 		idx = arrays.findFirstInSorted(array, e => e >= 70);
-		assert.equal(idx, array.length);
+		assert.strictEqual(idx, array.length);
 
 		idx = arrays.findFirstInSorted([], e => e >= 0);
-		assert.equal(array[idx], 1);
+		assert.strictEqual(array[idx], 1);
 	});
 
 	test('quickSelect', () => {
@@ -36,10 +36,10 @@ suite('Arrays', () => {
 		function assertMedian(expexted: number, data: number[], nth: number = Math.floor(data.length / 2)) {
 			const compare = (a: number, b: number) => a - b;
 			let actual1 = arrays.quickSelect(nth, data, compare);
-			assert.equal(actual1, expexted);
+			assert.strictEqual(actual1, expexted);
 
 			let actual2 = data.slice().sort(compare)[nth];
-			assert.equal(actual2, expexted);
+			assert.strictEqual(actual2, expexted);
 		}
 
 		assertMedian(5, [9, 1, 0, 2, 3, 4, 6, 8, 7, 10, 5]);
@@ -72,18 +72,18 @@ suite('Arrays', () => {
 
 	test('mergeSort', () => {
 		let data = arrays.mergeSort([6, 5, 3, 1, 8, 7, 2, 4], (a, b) => a - b);
-		assert.deepEqual(data, [1, 2, 3, 4, 5, 6, 7, 8]);
+		assert.deepStrictEqual(data, [1, 2, 3, 4, 5, 6, 7, 8]);
 	});
 
 	test('mergeSort, sorted array', function () {
 		let data = arrays.mergeSort([1, 2, 3, 4, 5, 6], (a, b) => a - b);
-		assert.deepEqual(data, [1, 2, 3, 4, 5, 6]);
+		assert.deepStrictEqual(data, [1, 2, 3, 4, 5, 6]);
 	});
 
 	test('mergeSort, is stable', function () {
 
 		let numbers = arrays.mergeSort([33, 22, 11, 4, 99, 1], (a, b) => 0);
-		assert.deepEqual(numbers, [33, 22, 11, 4, 99, 1]);
+		assert.deepStrictEqual(numbers, [33, 22, 11, 4, 99, 1]);
 	});
 
 	test('mergeSort, many random numbers', function () {
@@ -129,40 +129,40 @@ suite('Arrays', () => {
 		}
 
 		let d = arrays.sortedDiff([1, 2, 4], [], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 3, toInsert: [] }
 		]);
 
 		d = arrays.sortedDiff([], [1, 2, 4], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 0, toInsert: [1, 2, 4] }
 		]);
 
 		d = arrays.sortedDiff([1, 2, 4], [1, 2, 4], compare);
-		assert.deepEqual(d, []);
+		assert.deepStrictEqual(d, []);
 
 		d = arrays.sortedDiff([1, 2, 4], [2, 3, 4, 5], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 1, toInsert: [] },
 			{ start: 2, deleteCount: 0, toInsert: [3] },
 			{ start: 3, deleteCount: 0, toInsert: [5] },
 		]);
 
 		d = arrays.sortedDiff([2, 3, 4, 5], [1, 2, 4], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 0, toInsert: [1] },
 			{ start: 1, deleteCount: 1, toInsert: [] },
 			{ start: 3, deleteCount: 1, toInsert: [] },
 		]);
 
 		d = arrays.sortedDiff([1, 3, 5, 7], [5, 9, 11], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 2, toInsert: [] },
 			{ start: 3, deleteCount: 1, toInsert: [9, 11] }
 		]);
 
 		d = arrays.sortedDiff([1, 3, 7], [5, 9, 11], compare);
-		assert.deepEqual(d, [
+		assert.deepStrictEqual(d, [
 			{ start: 0, deleteCount: 3, toInsert: [5, 9, 11] }
 		]);
 	});
@@ -173,32 +173,32 @@ suite('Arrays', () => {
 		}
 
 		let d = arrays.delta([1, 2, 4], [], compare);
-		assert.deepEqual(d.removed, [1, 2, 4]);
-		assert.deepEqual(d.added, []);
+		assert.deepStrictEqual(d.removed, [1, 2, 4]);
+		assert.deepStrictEqual(d.added, []);
 
 		d = arrays.delta([], [1, 2, 4], compare);
-		assert.deepEqual(d.removed, []);
-		assert.deepEqual(d.added, [1, 2, 4]);
+		assert.deepStrictEqual(d.removed, []);
+		assert.deepStrictEqual(d.added, [1, 2, 4]);
 
 		d = arrays.delta([1, 2, 4], [1, 2, 4], compare);
-		assert.deepEqual(d.removed, []);
-		assert.deepEqual(d.added, []);
+		assert.deepStrictEqual(d.removed, []);
+		assert.deepStrictEqual(d.added, []);
 
 		d = arrays.delta([1, 2, 4], [2, 3, 4, 5], compare);
-		assert.deepEqual(d.removed, [1]);
-		assert.deepEqual(d.added, [3, 5]);
+		assert.deepStrictEqual(d.removed, [1]);
+		assert.deepStrictEqual(d.added, [3, 5]);
 
 		d = arrays.delta([2, 3, 4, 5], [1, 2, 4], compare);
-		assert.deepEqual(d.removed, [3, 5]);
-		assert.deepEqual(d.added, [1]);
+		assert.deepStrictEqual(d.removed, [3, 5]);
+		assert.deepStrictEqual(d.added, [1]);
 
 		d = arrays.delta([1, 3, 5, 7], [5, 9, 11], compare);
-		assert.deepEqual(d.removed, [1, 3, 7]);
-		assert.deepEqual(d.added, [9, 11]);
+		assert.deepStrictEqual(d.removed, [1, 3, 7]);
+		assert.deepStrictEqual(d.added, [9, 11]);
 
 		d = arrays.delta([1, 3, 7], [5, 9, 11], compare);
-		assert.deepEqual(d.removed, [1, 3, 7]);
-		assert.deepEqual(d.added, [5, 9, 11]);
+		assert.deepStrictEqual(d.removed, [1, 3, 7]);
+		assert.deepStrictEqual(d.added, [5, 9, 11]);
 	});
 
 	test('binarySearch', () => {
@@ -207,13 +207,13 @@ suite('Arrays', () => {
 		}
 		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
 
-		assert.equal(arrays.binarySearch(array, 1, compare), 0);
-		assert.equal(arrays.binarySearch(array, 5, compare), 2);
+		assert.strictEqual(arrays.binarySearch(array, 1, compare), 0);
+		assert.strictEqual(arrays.binarySearch(array, 5, compare), 2);
 
 		// insertion point
-		assert.equal(arrays.binarySearch(array, 0, compare), ~0);
-		assert.equal(arrays.binarySearch(array, 6, compare), ~3);
-		assert.equal(arrays.binarySearch(array, 70, compare), ~10);
+		assert.strictEqual(arrays.binarySearch(array, 0, compare), ~0);
+		assert.strictEqual(arrays.binarySearch(array, 6, compare), ~3);
+		assert.strictEqual(arrays.binarySearch(array, 70, compare), ~10);
 
 	});
 
@@ -222,11 +222,11 @@ suite('Arrays', () => {
 			return a;
 		}
 
-		assert.deepEqual(arrays.distinct(['32', '4', '5'], compare), ['32', '4', '5']);
-		assert.deepEqual(arrays.distinct(['32', '4', '5', '4'], compare), ['32', '4', '5']);
-		assert.deepEqual(arrays.distinct(['32', 'constructor', '5', '1'], compare), ['32', 'constructor', '5', '1']);
-		assert.deepEqual(arrays.distinct(['32', 'constructor', 'proto', 'proto', 'constructor'], compare), ['32', 'constructor', 'proto']);
-		assert.deepEqual(arrays.distinct(['32', '4', '5', '32', '4', '5', '32', '4', '5', '5'], compare), ['32', '4', '5']);
+		assert.deepStrictEqual(arrays.distinct(['32', '4', '5'], compare), ['32', '4', '5']);
+		assert.deepStrictEqual(arrays.distinct(['32', '4', '5', '4'], compare), ['32', '4', '5']);
+		assert.deepStrictEqual(arrays.distinct(['32', 'constructor', '5', '1'], compare), ['32', 'constructor', '5', '1']);
+		assert.deepStrictEqual(arrays.distinct(['32', 'constructor', 'proto', 'proto', 'constructor'], compare), ['32', 'constructor', 'proto']);
+		assert.deepStrictEqual(arrays.distinct(['32', '4', '5', '32', '4', '5', '32', '4', '5', '5'], compare), ['32', '4', '5']);
 	});
 
 	test('top', () => {
@@ -236,13 +236,13 @@ suite('Arrays', () => {
 			return a - b;
 		};
 
-		assert.deepEqual(arrays.top([], cmp, 1), []);
-		assert.deepEqual(arrays.top([1], cmp, 0), []);
-		assert.deepEqual(arrays.top([1, 2], cmp, 1), [1]);
-		assert.deepEqual(arrays.top([2, 1], cmp, 1), [1]);
-		assert.deepEqual(arrays.top([1, 3, 2], cmp, 2), [1, 2]);
-		assert.deepEqual(arrays.top([3, 2, 1], cmp, 3), [1, 2, 3]);
-		assert.deepEqual(arrays.top([4, 6, 2, 7, 8, 3, 5, 1], cmp, 3), [1, 2, 3]);
+		assert.deepStrictEqual(arrays.top([], cmp, 1), []);
+		assert.deepStrictEqual(arrays.top([1], cmp, 0), []);
+		assert.deepStrictEqual(arrays.top([1, 2], cmp, 1), [1]);
+		assert.deepStrictEqual(arrays.top([2, 1], cmp, 1), [1]);
+		assert.deepStrictEqual(arrays.top([1, 3, 2], cmp, 2), [1, 2]);
+		assert.deepStrictEqual(arrays.top([3, 2, 1], cmp, 3), [1, 2, 3]);
+		assert.deepStrictEqual(arrays.top([4, 6, 2, 7, 8, 3, 5, 1], cmp, 3), [1, 2, 3]);
 	});
 
 	test('topAsync', async () => {
@@ -259,56 +259,56 @@ suite('Arrays', () => {
 	async function testTopAsync(cmp: any, m: number) {
 		{
 			const result = await arrays.topAsync([], cmp, 1, m);
-			assert.deepEqual(result, []);
+			assert.deepStrictEqual(result, []);
 		}
 		{
 			const result = await arrays.topAsync([1], cmp, 0, m);
-			assert.deepEqual(result, []);
+			assert.deepStrictEqual(result, []);
 		}
 		{
 			const result = await arrays.topAsync([1, 2], cmp, 1, m);
-			assert.deepEqual(result, [1]);
+			assert.deepStrictEqual(result, [1]);
 		}
 		{
 			const result = await arrays.topAsync([2, 1], cmp, 1, m);
-			assert.deepEqual(result, [1]);
+			assert.deepStrictEqual(result, [1]);
 		}
 		{
 			const result = await arrays.topAsync([1, 3, 2], cmp, 2, m);
-			assert.deepEqual(result, [1, 2]);
+			assert.deepStrictEqual(result, [1, 2]);
 		}
 		{
 			const result = await arrays.topAsync([3, 2, 1], cmp, 3, m);
-			assert.deepEqual(result, [1, 2, 3]);
+			assert.deepStrictEqual(result, [1, 2, 3]);
 		}
 		{
 			const result = await arrays.topAsync([4, 6, 2, 7, 8, 3, 5, 1], cmp, 3, m);
-			assert.deepEqual(result, [1, 2, 3]);
+			assert.deepStrictEqual(result, [1, 2, 3]);
 		}
 	}
 
 	test('coalesce', () => {
 		let a: Array<number | null> = arrays.coalesce([null, 1, null, 2, 3]);
-		assert.equal(a.length, 3);
-		assert.equal(a[0], 1);
-		assert.equal(a[1], 2);
-		assert.equal(a[2], 3);
+		assert.strictEqual(a.length, 3);
+		assert.strictEqual(a[0], 1);
+		assert.strictEqual(a[1], 2);
+		assert.strictEqual(a[2], 3);
 
 		arrays.coalesce([null, 1, null, undefined, undefined, 2, 3]);
-		assert.equal(a.length, 3);
-		assert.equal(a[0], 1);
-		assert.equal(a[1], 2);
-		assert.equal(a[2], 3);
+		assert.strictEqual(a.length, 3);
+		assert.strictEqual(a[0], 1);
+		assert.strictEqual(a[1], 2);
+		assert.strictEqual(a[2], 3);
 
 		let b: number[] = [];
 		b[10] = 1;
 		b[20] = 2;
 		b[30] = 3;
 		b = arrays.coalesce(b);
-		assert.equal(b.length, 3);
-		assert.equal(b[0], 1);
-		assert.equal(b[1], 2);
-		assert.equal(b[2], 3);
+		assert.strictEqual(b.length, 3);
+		assert.strictEqual(b[0], 1);
+		assert.strictEqual(b[1], 2);
+		assert.strictEqual(b[2], 3);
 
 		let sparse: number[] = [];
 		sparse[0] = 1;
@@ -317,36 +317,36 @@ suite('Arrays', () => {
 		sparse[1000] = 1;
 		sparse[1001] = 1;
 
-		assert.equal(sparse.length, 1002);
+		assert.strictEqual(sparse.length, 1002);
 
 		sparse = arrays.coalesce(sparse);
-		assert.equal(sparse.length, 5);
+		assert.strictEqual(sparse.length, 5);
 	});
 
 	test('coalesce - inplace', function () {
 		let a: Array<number | null> = [null, 1, null, 2, 3];
 		arrays.coalesceInPlace(a);
-		assert.equal(a.length, 3);
-		assert.equal(a[0], 1);
-		assert.equal(a[1], 2);
-		assert.equal(a[2], 3);
+		assert.strictEqual(a.length, 3);
+		assert.strictEqual(a[0], 1);
+		assert.strictEqual(a[1], 2);
+		assert.strictEqual(a[2], 3);
 
 		a = [null, 1, null, undefined!, undefined!, 2, 3];
 		arrays.coalesceInPlace(a);
-		assert.equal(a.length, 3);
-		assert.equal(a[0], 1);
-		assert.equal(a[1], 2);
-		assert.equal(a[2], 3);
+		assert.strictEqual(a.length, 3);
+		assert.strictEqual(a[0], 1);
+		assert.strictEqual(a[1], 2);
+		assert.strictEqual(a[2], 3);
 
 		let b: number[] = [];
 		b[10] = 1;
 		b[20] = 2;
 		b[30] = 3;
 		arrays.coalesceInPlace(b);
-		assert.equal(b.length, 3);
-		assert.equal(b[0], 1);
-		assert.equal(b[1], 2);
-		assert.equal(b[2], 3);
+		assert.strictEqual(b.length, 3);
+		assert.strictEqual(b[0], 1);
+		assert.strictEqual(b[1], 2);
+		assert.strictEqual(b[2], 3);
 
 		let sparse: number[] = [];
 		sparse[0] = 1;
@@ -355,18 +355,18 @@ suite('Arrays', () => {
 		sparse[1000] = 1;
 		sparse[1001] = 1;
 
-		assert.equal(sparse.length, 1002);
+		assert.strictEqual(sparse.length, 1002);
 
 		arrays.coalesceInPlace(sparse);
-		assert.equal(sparse.length, 5);
+		assert.strictEqual(sparse.length, 5);
 	});
 
 	test('insert, remove', function () {
 		const array: string[] = [];
 		const remove = arrays.insert(array, 'foo');
-		assert.equal(array[0], 'foo');
+		assert.strictEqual(array[0], 'foo');
 
 		remove();
-		assert.equal(array.length, 0);
+		assert.strictEqual(array.length, 0);
 	});
 });
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index d1baf9b5b..c92df5cd1 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -18,7 +18,7 @@ suite('Async', () => {
 			return new Promise(resolve => { /*never*/ });
 		});
 		let result = promise.then(_ => assert.ok(false), err => {
-			assert.equal(canceled, 1);
+			assert.strictEqual(canceled, 1);
 			assert.ok(isPromiseCanceledError(err));
 		});
 		promise.cancel();
@@ -33,7 +33,7 @@ suite('Async', () => {
 			return Promise.resolve(1234);
 		});
 		let result = promise.then(_ => assert.ok(false), err => {
-			assert.equal(canceled, 1);
+			assert.strictEqual(canceled, 1);
 			assert.ok(isPromiseCanceledError(err));
 		});
 		promise.cancel();
@@ -60,7 +60,7 @@ suite('Async', () => {
 		cancellablePromise.cancel();
 		order.push('afterCancel');
 
-		return promise.then(() => assert.deepEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
+		return promise.then(() => assert.deepStrictEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
 	});
 
 	// Cancelling an async cancelable promise is just the same as a sync cancellable promise.
@@ -82,7 +82,7 @@ suite('Async', () => {
 		cancellablePromise.cancel();
 		order.push('afterCancel');
 
-		return promise.then(() => assert.deepEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
+		return promise.then(() => assert.deepStrictEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally']));
 	});
 
 	test('cancelablePromise - get inner result', async function () {
@@ -91,7 +91,7 @@ suite('Async', () => {
 		});
 
 		let result = await promise;
-		assert.equal(result, 1234);
+		assert.strictEqual(result, 1234);
 	});
 
 	test('Throttler - non async', function () {
@@ -103,12 +103,12 @@ suite('Async', () => {
 		let throttler = new async.Throttler();
 
 		return Promise.all([
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); })
-		]).then(() => assert.equal(count, 2));
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 1); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); })
+		]).then(() => assert.strictEqual(count, 2));
 	});
 
 	test('Throttler', () => {
@@ -118,18 +118,18 @@ suite('Async', () => {
 		let throttler = new async.Throttler();
 
 		return Promise.all([
-			throttler.queue(factory).then((result) => { assert.equal(result, 1); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); }),
-			throttler.queue(factory).then((result) => { assert.equal(result, 2); })
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 1); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); }),
+			throttler.queue(factory).then((result) => { assert.strictEqual(result, 2); })
 		]).then(() => {
 			return Promise.all([
-				throttler.queue(factory).then((result) => { assert.equal(result, 3); }),
-				throttler.queue(factory).then((result) => { assert.equal(result, 4); }),
-				throttler.queue(factory).then((result) => { assert.equal(result, 4); }),
-				throttler.queue(factory).then((result) => { assert.equal(result, 4); }),
-				throttler.queue(factory).then((result) => { assert.equal(result, 4); })
+				throttler.queue(factory).then((result) => { assert.strictEqual(result, 3); }),
+				throttler.queue(factory).then((result) => { assert.strictEqual(result, 4); }),
+				throttler.queue(factory).then((result) => { assert.strictEqual(result, 4); }),
+				throttler.queue(factory).then((result) => { assert.strictEqual(result, 4); }),
+				throttler.queue(factory).then((result) => { assert.strictEqual(result, 4); })
 			]);
 		});
 	});
@@ -143,9 +143,9 @@ suite('Async', () => {
 
 		let promises: Promise<any>[] = [];
 
-		promises.push(throttler.queue(factoryFactory(1)).then((n) => { assert.equal(n, 1); }));
-		promises.push(throttler.queue(factoryFactory(2)).then((n) => { assert.equal(n, 3); }));
-		promises.push(throttler.queue(factoryFactory(3)).then((n) => { assert.equal(n, 3); }));
+		promises.push(throttler.queue(factoryFactory(1)).then((n) => { assert.strictEqual(n, 1); }));
+		promises.push(throttler.queue(factoryFactory(2)).then((n) => { assert.strictEqual(n, 3); }));
+		promises.push(throttler.queue(factoryFactory(3)).then((n) => { assert.strictEqual(n, 3); }));
 
 		return Promise.all(promises);
 	});
@@ -161,13 +161,13 @@ suite('Async', () => {
 
 		assert(!delayer.isTriggered());
 
-		promises.push(delayer.trigger(factory).then((result) => { assert.equal(result, 1); assert(!delayer.isTriggered()); }));
+		promises.push(delayer.trigger(factory).then((result) => { assert.strictEqual(result, 1); assert(!delayer.isTriggered()); }));
 		assert(delayer.isTriggered());
 
-		promises.push(delayer.trigger(factory).then((result) => { assert.equal(result, 1); assert(!delayer.isTriggered()); }));
+		promises.push(delayer.trigger(factory).then((result) => { assert.strictEqual(result, 1); assert(!delayer.isTriggered()); }));
 		assert(delayer.isTriggered());
 
-		promises.push(delayer.trigger(factory).then((result) => { assert.equal(result, 1); assert(!delayer.isTriggered()); }));
+		promises.push(delayer.trigger(factory).then((result) => { assert.strictEqual(result, 1); assert(!delayer.isTriggered()); }));
 		assert(delayer.isTriggered());
 
 		return Promise.all(promises).then(() => {
@@ -237,7 +237,7 @@ suite('Async', () => {
 		assert(!delayer.isTriggered());
 
 		const p = delayer.trigger(factory).then((result) => {
-			assert.equal(result, 1);
+			assert.strictEqual(result, 1);
 			assert(!delayer.isTriggered());
 
 			promises.push(delayer.trigger(factory).then(undefined, () => { assert(true, 'yes, it was cancelled'); }));
@@ -253,10 +253,10 @@ suite('Async', () => {
 
 				assert(!delayer.isTriggered());
 
-				promises.push(delayer.trigger(factory).then(() => { assert.equal(result, 1); assert(!delayer.isTriggered()); }));
+				promises.push(delayer.trigger(factory).then(() => { assert.strictEqual(result, 1); assert(!delayer.isTriggered()); }));
 				assert(delayer.isTriggered());
 
-				promises.push(delayer.trigger(factory).then(() => { assert.equal(result, 1); assert(!delayer.isTriggered()); }));
+				promises.push(delayer.trigger(factory).then(() => { assert.strictEqual(result, 1); assert(!delayer.isTriggered()); }));
 				assert(delayer.isTriggered());
 
 				const p = Promise.all(promises).then(() => {
@@ -286,9 +286,9 @@ suite('Async', () => {
 
 		assert(!delayer.isTriggered());
 
-		promises.push(delayer.trigger(factoryFactory(1)).then((n) => { assert.equal(n, 3); }));
-		promises.push(delayer.trigger(factoryFactory(2)).then((n) => { assert.equal(n, 3); }));
-		promises.push(delayer.trigger(factoryFactory(3)).then((n) => { assert.equal(n, 3); }));
+		promises.push(delayer.trigger(factoryFactory(1)).then((n) => { assert.strictEqual(n, 3); }));
+		promises.push(delayer.trigger(factoryFactory(2)).then((n) => { assert.strictEqual(n, 3); }));
+		promises.push(delayer.trigger(factoryFactory(3)).then((n) => { assert.strictEqual(n, 3); }));
 
 		const p = Promise.all(promises).then(() => {
 			assert(!delayer.isTriggered());
@@ -311,12 +311,12 @@ suite('Async', () => {
 			factoryFactory(4),
 			factoryFactory(5),
 		]).then((result) => {
-			assert.equal(5, result.length);
-			assert.equal(1, result[0]);
-			assert.equal(2, result[1]);
-			assert.equal(3, result[2]);
-			assert.equal(4, result[3]);
-			assert.equal(5, result[4]);
+			assert.strictEqual(5, result.length);
+			assert.strictEqual(1, result[0]);
+			assert.strictEqual(2, result[1]);
+			assert.strictEqual(3, result[2]);
+			assert.strictEqual(4, result[3]);
+			assert.strictEqual(5, result[4]);
 		});
 	});
 
@@ -331,7 +331,7 @@ suite('Async', () => {
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
-			assert.equal(10, res.length);
+			assert.strictEqual(10, res.length);
 
 			limiter = new async.Limiter(100);
 
@@ -339,7 +339,7 @@ suite('Async', () => {
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 			return Promise.all(promises).then((res) => {
-				assert.equal(10, res.length);
+				assert.strictEqual(10, res.length);
 			});
 		});
 	});
@@ -352,7 +352,7 @@ suite('Async', () => {
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
-			assert.equal(10, res.length);
+			assert.strictEqual(10, res.length);
 
 			limiter = new async.Limiter(100);
 
@@ -360,7 +360,7 @@ suite('Async', () => {
 			[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 			return Promise.all(promises).then((res) => {
-				assert.equal(10, res.length);
+				assert.strictEqual(10, res.length);
 			});
 		});
 	});
@@ -379,8 +379,8 @@ suite('Async', () => {
 		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n))));
 
 		return Promise.all(promises).then((res) => {
-			assert.equal(10, res.length);
-			assert.deepEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], res);
+			assert.strictEqual(10, res.length);
+			assert.deepStrictEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], res);
 		});
 	});
 
@@ -393,15 +393,15 @@ suite('Async', () => {
 		let asyncPromise = false;
 		let f2 = () => async.timeout(10).then(() => asyncPromise = true);
 
-		assert.equal(queue.size, 0);
+		assert.strictEqual(queue.size, 0);
 
 		queue.queue(f1);
-		assert.equal(queue.size, 1);
+		assert.strictEqual(queue.size, 1);
 
 		const p = queue.queue(f2);
-		assert.equal(queue.size, 2);
+		assert.strictEqual(queue.size, 2);
 		return p.then(() => {
-			assert.equal(queue.size, 0);
+			assert.strictEqual(queue.size, 0);
 			assert.ok(syncPromise);
 			assert.ok(asyncPromise);
 		});
@@ -423,11 +423,11 @@ suite('Async', () => {
 		queue.queue(f3);
 		queue.queue(f4);
 		return queue.queue(f5).then(() => {
-			assert.equal(res[0], 1);
-			assert.equal(res[1], 2);
-			assert.equal(res[2], 3);
-			assert.equal(res[3], 4);
-			assert.equal(res[4], 5);
+			assert.strictEqual(res[0], 1);
+			assert.strictEqual(res[1], 2);
+			assert.strictEqual(res[2], 3);
+			assert.strictEqual(res[3], 4);
+			assert.strictEqual(res[4], 5);
 		});
 	});
 
@@ -448,11 +448,11 @@ suite('Async', () => {
 		queue.queue(f3).then(undefined, () => error = true);
 		queue.queue(f4);
 		return queue.queue(f5).then(() => {
-			assert.equal(res[0], 1);
-			assert.equal(res[1], 2);
+			assert.strictEqual(res[0], 1);
+			assert.strictEqual(res[1], 2);
 			assert.ok(error);
-			assert.equal(res[2], 4);
-			assert.equal(res[3], 5);
+			assert.strictEqual(res[2], 4);
+			assert.strictEqual(res[3], 5);
 		});
 	});
 
@@ -472,11 +472,11 @@ suite('Async', () => {
 				return queue.queue(f3).then(() => {
 					return queue.queue(f4).then(() => {
 						return queue.queue(f5).then(() => {
-							assert.equal(res[0], 1);
-							assert.equal(res[1], 2);
-							assert.equal(res[2], 3);
-							assert.equal(res[3], 4);
-							assert.equal(res[4], 5);
+							assert.strictEqual(res[0], 1);
+							assert.strictEqual(res[1], 2);
+							assert.strictEqual(res[2], 3);
+							assert.strictEqual(res[3], 4);
+							assert.strictEqual(res[4], 5);
 						});
 					});
 				});
@@ -521,7 +521,7 @@ suite('Async', () => {
 
 		assert.ok(r1Queue);
 		assert.ok(r2Queue);
-		assert.equal(r1Queue, queue.queueFor(URI.file('/some/path'))); // same queue returned
+		assert.strictEqual(r1Queue, queue.queueFor(URI.file('/some/path'))); // same queue returned
 
 		let syncPromiseFactory = () => Promise.resolve(undefined);
 
@@ -545,7 +545,7 @@ suite('Async', () => {
 			return Promise.resolve(true);
 		}, 10, 3);
 
-		assert.equal(res, true);
+		assert.strictEqual(res, true);
 	});
 
 	test('retry - error case', async () => {
@@ -555,7 +555,7 @@ suite('Async', () => {
 				return Promise.reject(expectedError);
 			}, 10, 3);
 		} catch (error) {
-			assert.equal(error, error);
+			assert.strictEqual(error, error);
 		}
 	});
 
@@ -576,12 +576,12 @@ suite('Async', () => {
 		sequentializer.setPending(2, async.timeout(1));
 		assert.ok(sequentializer.hasPending());
 		assert.ok(sequentializer.hasPending(2));
-		assert.ok(!sequentializer.hasPending(1));
+		assert.strictEqual(sequentializer.hasPending(1), false);
 		assert.ok(sequentializer.pending);
 
 		await async.timeout(2);
-		assert.ok(!sequentializer.hasPending());
-		assert.ok(!sequentializer.hasPending(2));
+		assert.strictEqual(sequentializer.hasPending(), false);
+		assert.strictEqual(sequentializer.hasPending(2), false);
 		assert.ok(!sequentializer.pending);
 	});
 
@@ -673,7 +673,7 @@ suite('Async', () => {
 		await p1;
 
 		assert.ok(!triggered);
-		assert.equal(timedout, true);
+		assert.strictEqual(timedout, true);
 
 		// promise wins
 		timedout = false;
@@ -684,38 +684,42 @@ suite('Async', () => {
 		await p2;
 
 		assert.ok(triggered);
-		assert.equal(timedout, false);
+		assert.strictEqual(timedout, false);
 	});
 
 	test('SequencerByKey', async () => {
 		const s = new async.SequencerByKey<string>();
 
 		const r1 = await s.queue('key1', () => Promise.resolve('hello'));
-		assert.equal(r1, 'hello');
+		assert.strictEqual(r1, 'hello');
 
 		await s.queue('key2', () => Promise.reject(new Error('failed'))).then(() => {
 			throw new Error('should not be resolved');
 		}, err => {
 			// Expected error
-			assert.equal(err.message, 'failed');
+			assert.strictEqual(err.message, 'failed');
 		});
 
 		// Still works after a queued promise is rejected
 		const r3 = await s.queue('key2', () => Promise.resolve('hello'));
-		assert.equal(r3, 'hello');
+		assert.strictEqual(r3, 'hello');
 	});
 
 	test('IntervalCounter', async () => {
 		const counter = new async.IntervalCounter(10);
-		assert.equal(counter.increment(), 1);
-		assert.equal(counter.increment(), 2);
-		assert.equal(counter.increment(), 3);
+		assert.strictEqual(counter.increment(), 1);
+		assert.strictEqual(counter.increment(), 2);
+		assert.strictEqual(counter.increment(), 3);
 
+		const now = Date.now();
 		await async.timeout(20);
+		if (Date.now() - now < 11) {
+			return; // Firefox in Playwright seems to have a flaky timeout implementation (https://github.com/microsoft/vscode/issues/114028)
+		}
 
-		assert.equal(counter.increment(), 1);
-		assert.equal(counter.increment(), 2);
-		assert.equal(counter.increment(), 3);
+		assert.strictEqual(counter.increment(), 1);
+		assert.strictEqual(counter.increment(), 2);
+		assert.strictEqual(counter.increment(), 3);
 	});
 
 	test('firstParallel - simple', async () => {
@@ -724,19 +728,19 @@ suite('Async', () => {
 			Promise.resolve(2),
 			Promise.resolve(3),
 		], v => v === 2);
-		assert.equal(a, 2);
+		assert.strictEqual(a, 2);
 	});
 
 	test('firstParallel - uses null default', async () => {
-		assert.equal(await async.firstParallel([Promise.resolve(1)], v => v === 2), null);
+		assert.strictEqual(await async.firstParallel([Promise.resolve(1)], v => v === 2), null);
 	});
 
 	test('firstParallel - uses value default', async () => {
-		assert.equal(await async.firstParallel([Promise.resolve(1)], v => v === 2, 4), 4);
+		assert.strictEqual(await async.firstParallel([Promise.resolve(1)], v => v === 2, 4), 4);
 	});
 
 	test('firstParallel - empty', async () => {
-		assert.equal(await async.firstParallel([], v => v === 2, 4), 4);
+		assert.strictEqual(await async.firstParallel([], v => v === 2, 4), 4);
 	});
 
 	test('firstParallel - cancels', async () => {
@@ -753,9 +757,9 @@ suite('Async', () => {
 			return 2;
 		});
 
-		assert.equal(await async.firstParallel([p1, p2], v => v === 2, 4), 2);
-		assert.equal(ct1!.isCancellationRequested, true, 'should cancel a');
-		assert.equal(ct2!.isCancellationRequested, true, 'should cancel b');
+		assert.strictEqual(await async.firstParallel([p1, p2], v => v === 2, 4), 2);
+		assert.strictEqual(ct1!.isCancellationRequested, true, 'should cancel a');
+		assert.strictEqual(ct2!.isCancellationRequested, true, 'should cancel b');
 	});
 
 	test('firstParallel - rejection handling', async () => {
@@ -772,8 +776,35 @@ suite('Async', () => {
 			throw new Error('oh no');
 		});
 
-		assert.equal(await async.firstParallel([p1, p2], v => v === 2, 4).catch(() => 'ok'), 'ok');
-		assert.equal(ct1!.isCancellationRequested, true, 'should cancel a');
-		assert.equal(ct2!.isCancellationRequested, true, 'should cancel b');
+		assert.strictEqual(await async.firstParallel([p1, p2], v => v === 2, 4).catch(() => 'ok'), 'ok');
+		assert.strictEqual(ct1!.isCancellationRequested, true, 'should cancel a');
+		assert.strictEqual(ct2!.isCancellationRequested, true, 'should cancel b');
+	});
+
+	suite('DeferredPromise', () => {
+		test('resolves', async () => {
+			const deferred = new async.DeferredPromise<number>();
+			assert.strictEqual(deferred.isResolved, false);
+			deferred.complete(42);
+			assert.strictEqual(await deferred.p, 42);
+			assert.strictEqual(deferred.isResolved, true);
+		});
+
+		test('rejects', async () => {
+			const deferred = new async.DeferredPromise<number>();
+			assert.strictEqual(deferred.isRejected, false);
+			const err = new Error('oh no!');
+			deferred.error(err);
+			assert.strictEqual(await deferred.p.catch(e => e), err);
+			assert.strictEqual(deferred.isRejected, true);
+		});
+
+		test('cancels', async () => {
+			const deferred = new async.DeferredPromise<number>();
+			assert.strictEqual(deferred.isRejected, false);
+			deferred.cancel();
+			assert.strictEqual((await deferred.p.catch(e => e)).name, 'Canceled');
+			assert.strictEqual(deferred.isRejected, true);
+		});
 	});
 });
diff --git a/src/vs/base/test/node/buffer.test.ts b/src/vs/base/test/common/buffer.test.ts
similarity index 70%
rename from src/vs/base/test/node/buffer.test.ts
rename to src/vs/base/test/common/buffer.test.ts
index 4c7d0ba3a..e0a03caf2 100644
--- a/src/vs/base/test/node/buffer.test.ts
+++ b/src/vs/base/test/common/buffer.test.ts
@@ -13,28 +13,28 @@ suite('Buffer', () => {
 	test('issue #71993 - VSBuffer#toString returns numbers', () => {
 		const data = new Uint8Array([1, 2, 3, 'h'.charCodeAt(0), 'i'.charCodeAt(0), 4, 5]).buffer;
 		const buffer = VSBuffer.wrap(new Uint8Array(data, 3, 2));
-		assert.deepEqual(buffer.toString(), 'hi');
+		assert.deepStrictEqual(buffer.toString(), 'hi');
 	});
 
 	test('bufferToReadable / readableToBuffer', () => {
 		const content = 'Hello World';
 		const readable = bufferToReadable(VSBuffer.fromString(content));
 
-		assert.equal(readableToBuffer(readable).toString(), content);
+		assert.strictEqual(readableToBuffer(readable).toString(), content);
 	});
 
 	test('bufferToStream / streamToBuffer', async () => {
 		const content = 'Hello World';
 		const stream = bufferToStream(VSBuffer.fromString(content));
 
-		assert.equal((await streamToBuffer(stream)).toString(), content);
+		assert.strictEqual((await streamToBuffer(stream)).toString(), content);
 	});
 
 	test('bufferedStreamToBuffer', async () => {
 		const content = 'Hello World';
 		const stream = await peekStream(bufferToStream(VSBuffer.fromString(content)), 1);
 
-		assert.equal((await bufferedStreamToBuffer(stream)).toString(), content);
+		assert.strictEqual((await bufferedStreamToBuffer(stream)).toString(), content);
 	});
 
 	test('bufferWriteableStream - basics (no error)', async () => {
@@ -60,11 +60,11 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(VSBuffer.fromString('World'));
 
-		assert.equal(chunks.length, 2);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(chunks[1].toString(), 'World');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 2);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(chunks[1].toString(), 'World');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 0);
 	});
 
 	test('bufferWriteableStream - basics (error)', async () => {
@@ -90,10 +90,10 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(new Error());
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 1);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 1);
 	});
 
 	test('bufferWriteableStream - buffers data when no listener', async () => {
@@ -119,10 +119,10 @@ suite('Buffer', () => {
 			errors.push(error);
 		});
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'HelloWorld');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'HelloWorld');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 0);
 	});
 
 	test('bufferWriteableStream - buffers errors when no listener', async () => {
@@ -150,10 +150,10 @@ suite('Buffer', () => {
 
 		stream.end();
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 1);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 1);
 	});
 
 	test('bufferWriteableStream - buffers end when no listener', async () => {
@@ -179,10 +179,10 @@ suite('Buffer', () => {
 			errors.push(error);
 		});
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'HelloWorld');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'HelloWorld');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 0);
 	});
 
 	test('bufferWriteableStream - nothing happens after end()', async () => {
@@ -220,13 +220,13 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(VSBuffer.fromString('World'));
 
-		assert.equal(dataCalledAfterEnd, false);
-		assert.equal(errorCalledAfterEnd, false);
-		assert.equal(endCalledAfterEnd, false);
+		assert.strictEqual(dataCalledAfterEnd, false);
+		assert.strictEqual(errorCalledAfterEnd, false);
+		assert.strictEqual(endCalledAfterEnd, false);
 
-		assert.equal(chunks.length, 2);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(chunks[1].toString(), 'World');
+		assert.strictEqual(chunks.length, 2);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(chunks[1].toString(), 'World');
 	});
 
 	test('bufferWriteableStream - pause/resume (simple)', async () => {
@@ -254,16 +254,16 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(VSBuffer.fromString('World'));
 
-		assert.equal(chunks.length, 0);
-		assert.equal(errors.length, 0);
-		assert.equal(ended, false);
+		assert.strictEqual(chunks.length, 0);
+		assert.strictEqual(errors.length, 0);
+		assert.strictEqual(ended, false);
 
 		stream.resume();
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'HelloWorld');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'HelloWorld');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 0);
 	});
 
 	test('bufferWriteableStream - pause/resume (pause after first write)', async () => {
@@ -292,18 +292,18 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(VSBuffer.fromString('World'));
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(errors.length, 0);
-		assert.equal(ended, false);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(errors.length, 0);
+		assert.strictEqual(ended, false);
 
 		stream.resume();
 
-		assert.equal(chunks.length, 2);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(chunks[1].toString(), 'World');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 2);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(chunks[1].toString(), 'World');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 0);
 	});
 
 	test('bufferWriteableStream - pause/resume (error)', async () => {
@@ -331,16 +331,16 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(new Error());
 
-		assert.equal(chunks.length, 0);
-		assert.equal(ended, false);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 0);
+		assert.strictEqual(ended, false);
+		assert.strictEqual(errors.length, 0);
 
 		stream.resume();
 
-		assert.equal(chunks.length, 1);
-		assert.equal(chunks[0].toString(), 'Hello');
-		assert.equal(ended, true);
-		assert.equal(errors.length, 1);
+		assert.strictEqual(chunks.length, 1);
+		assert.strictEqual(chunks[0].toString(), 'Hello');
+		assert.strictEqual(ended, true);
+		assert.strictEqual(errors.length, 1);
 	});
 
 	test('bufferWriteableStream - destroy', async () => {
@@ -368,46 +368,46 @@ suite('Buffer', () => {
 		await timeout(0);
 		stream.end(VSBuffer.fromString('World'));
 
-		assert.equal(chunks.length, 0);
-		assert.equal(ended, false);
-		assert.equal(errors.length, 0);
+		assert.strictEqual(chunks.length, 0);
+		assert.strictEqual(ended, false);
+		assert.strictEqual(errors.length, 0);
 	});
 
-	test('Performance issue with VSBuffer#slice #76076', function () {
+	test('Performance issue with VSBuffer#slice #76076', function () { // TODO@alexdima this test seems to fail in web (https://github.com/microsoft/vscode/issues/114042)
 		// Buffer#slice creates a view
-		{
+		if (typeof Buffer !== 'undefined') {
 			const buff = Buffer.from([10, 20, 30, 40]);
 			const b2 = buff.slice(1, 3);
-			assert.equal(buff[1], 20);
-			assert.equal(b2[0], 20);
+			assert.strictEqual(buff[1], 20);
+			assert.strictEqual(b2[0], 20);
 
 			buff[1] = 17; // modify buff AND b2
-			assert.equal(buff[1], 17);
-			assert.equal(b2[0], 17);
+			assert.strictEqual(buff[1], 17);
+			assert.strictEqual(b2[0], 17);
 		}
 
 		// TypedArray#slice creates a copy
 		{
 			const unit = new Uint8Array([10, 20, 30, 40]);
 			const u2 = unit.slice(1, 3);
-			assert.equal(unit[1], 20);
-			assert.equal(u2[0], 20);
+			assert.strictEqual(unit[1], 20);
+			assert.strictEqual(u2[0], 20);
 
 			unit[1] = 17; // modify unit, NOT b2
-			assert.equal(unit[1], 17);
-			assert.equal(u2[0], 20);
+			assert.strictEqual(unit[1], 17);
+			assert.strictEqual(u2[0], 20);
 		}
 
 		// TypedArray#subarray creates a view
 		{
 			const unit = new Uint8Array([10, 20, 30, 40]);
 			const u2 = unit.subarray(1, 3);
-			assert.equal(unit[1], 20);
-			assert.equal(u2[0], 20);
+			assert.strictEqual(unit[1], 20);
+			assert.strictEqual(u2[0], 20);
 
 			unit[1] = 17; // modify unit AND b2
-			assert.equal(unit[1], 17);
-			assert.equal(u2[0], 17);
+			assert.strictEqual(unit[1], 17);
+			assert.strictEqual(u2[0], 17);
 		}
 	});
 });
diff --git a/src/vs/base/test/common/cancellation.test.ts b/src/vs/base/test/common/cancellation.test.ts
index 88d7d26e6..8f3c82c36 100644
--- a/src/vs/base/test/common/cancellation.test.ts
+++ b/src/vs/base/test/common/cancellation.test.ts
@@ -8,17 +8,17 @@ import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cance
 suite('CancellationToken', function () {
 
 	test('None', () => {
-		assert.equal(CancellationToken.None.isCancellationRequested, false);
-		assert.equal(typeof CancellationToken.None.onCancellationRequested, 'function');
+		assert.strictEqual(CancellationToken.None.isCancellationRequested, false);
+		assert.strictEqual(typeof CancellationToken.None.onCancellationRequested, 'function');
 	});
 
 	test('cancel before token', function (done) {
 
 		const source = new CancellationTokenSource();
-		assert.equal(source.token.isCancellationRequested, false);
+		assert.strictEqual(source.token.isCancellationRequested, false);
 		source.cancel();
 
-		assert.equal(source.token.isCancellationRequested, true);
+		assert.strictEqual(source.token.isCancellationRequested, true);
 
 		source.token.onCancellationRequested(function () {
 			assert.ok(true);
@@ -29,7 +29,7 @@ suite('CancellationToken', function () {
 	test('cancel happens only once', function () {
 
 		let source = new CancellationTokenSource();
-		assert.equal(source.token.isCancellationRequested, false);
+		assert.strictEqual(source.token.isCancellationRequested, false);
 
 		let cancelCount = 0;
 		function onCancel() {
@@ -41,7 +41,7 @@ suite('CancellationToken', function () {
 		source.cancel();
 		source.cancel();
 
-		assert.equal(cancelCount, 1);
+		assert.strictEqual(cancelCount, 1);
 	});
 
 	test('cancel calls all listeners', function () {
@@ -60,7 +60,7 @@ suite('CancellationToken', function () {
 		});
 
 		source.cancel();
-		assert.equal(count, 3);
+		assert.strictEqual(count, 3);
 	});
 
 	test('token stays the same', function () {
@@ -92,7 +92,7 @@ suite('CancellationToken', function () {
 
 		source.dispose();
 		source.cancel();
-		assert.equal(count, 0);
+		assert.strictEqual(count, 0);
 	});
 
 	test('dispose calls no listeners (unless told to cancel)', function () {
@@ -106,7 +106,7 @@ suite('CancellationToken', function () {
 
 		source.dispose(true);
 		// source.cancel();
-		assert.equal(count, 1);
+		assert.strictEqual(count, 1);
 	});
 
 	test('parent cancels child', function () {
@@ -119,8 +119,8 @@ suite('CancellationToken', function () {
 
 		parent.cancel();
 
-		assert.equal(count, 1);
-		assert.equal(child.token.isCancellationRequested, true);
-		assert.equal(parent.token.isCancellationRequested, true);
+		assert.strictEqual(count, 1);
+		assert.strictEqual(child.token.isCancellationRequested, true);
+		assert.strictEqual(parent.token.isCancellationRequested, true);
 	});
 });
diff --git a/src/vs/base/test/common/charCode.test.ts b/src/vs/base/test/common/charCode.test.ts
index a47ed336a..bf877878e 100644
--- a/src/vs/base/test/common/charCode.test.ts
+++ b/src/vs/base/test/common/charCode.test.ts
@@ -10,7 +10,7 @@ suite('CharCode', () => {
 	test('has good values', () => {
 
 		function assertValue(actual: CharCode, expected: string): void {
-			assert.equal(actual, expected.charCodeAt(0), 'char code ok for <<' + expected + '>>');
+			assert.strictEqual(actual, expected.charCodeAt(0), 'char code ok for <<' + expected + '>>');
 		}
 
 		assertValue(CharCode.Tab, '\t');
diff --git a/src/vs/base/test/common/codicon.test.ts b/src/vs/base/test/common/codicon.test.ts
deleted file mode 100644
index 8d974ea0a..000000000
--- a/src/vs/base/test/common/codicon.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { IMatch } from 'vs/base/common/filters';
-import { matchesFuzzyCodiconAware, parseCodicons, IParsedCodicons } from 'vs/base/common/codicon';
-import { stripCodicons } from 'vs/base/common/codicons';
-
-export interface ICodiconFilter {
-	// Returns null if word doesn't match.
-	(query: string, target: IParsedCodicons): IMatch[] | null;
-}
-
-function filterOk(filter: ICodiconFilter, word: string, target: IParsedCodicons, highlights?: { start: number; end: number; }[]) {
-	let r = filter(word, target);
-	assert(r);
-	if (highlights) {
-		assert.deepEqual(r, highlights);
-	}
-}
-
-suite('Codicon', () => {
-	test('matchesFuzzzyCodiconAware', () => {
-
-		// Camel Case
-
-		filterOk(matchesFuzzyCodiconAware, 'ccr', parseCodicons('$(codicon)CamelCaseRocks$(codicon)'), [
-			{ start: 10, end: 11 },
-			{ start: 15, end: 16 },
-			{ start: 19, end: 20 }
-		]);
-
-		filterOk(matchesFuzzyCodiconAware, 'ccr', parseCodicons('$(codicon) CamelCaseRocks $(codicon)'), [
-			{ start: 11, end: 12 },
-			{ start: 16, end: 17 },
-			{ start: 20, end: 21 }
-		]);
-
-		filterOk(matchesFuzzyCodiconAware, 'iut', parseCodicons('$(codicon) Indent $(octico) Using $(octic) Tpaces'), [
-			{ start: 11, end: 12 },
-			{ start: 28, end: 29 },
-			{ start: 43, end: 44 },
-		]);
-
-		// Prefix
-
-		filterOk(matchesFuzzyCodiconAware, 'using', parseCodicons('$(codicon) Indent Using Spaces'), [
-			{ start: 18, end: 23 },
-		]);
-
-		// Broken Codicon
-
-		filterOk(matchesFuzzyCodiconAware, 'codicon', parseCodicons('This $(codicon Indent Using Spaces'), [
-			{ start: 7, end: 14 },
-		]);
-
-		filterOk(matchesFuzzyCodiconAware, 'indent', parseCodicons('This $codicon Indent Using Spaces'), [
-			{ start: 14, end: 20 },
-		]);
-
-		// Testing #59343
-		filterOk(matchesFuzzyCodiconAware, 'unt', parseCodicons('$(primitive-dot) $(file-text) Untitled-1'), [
-			{ start: 30, end: 33 },
-		]);
-	});
-});
-
-suite('Codicons', () => {
-
-	test('stripCodicons', () => {
-		assert.equal(stripCodicons('Hello World'), 'Hello World');
-		assert.equal(stripCodicons('$(Hello World'), '$(Hello World');
-		assert.equal(stripCodicons('$(Hello) World'), ' World');
-		assert.equal(stripCodicons('$(Hello) W$(oi)rld'), ' Wrld');
-	});
-});
diff --git a/src/vs/base/test/node/console.test.ts b/src/vs/base/test/common/console.test.ts
similarity index 99%
rename from src/vs/base/test/node/console.test.ts
rename to src/vs/base/test/common/console.test.ts
index e7a243a2d..178c30373 100644
--- a/src/vs/base/test/node/console.test.ts
+++ b/src/vs/base/test/common/console.test.ts
@@ -45,4 +45,4 @@ suite('Console', () => {
 		assert.equal(frame.line, 18);
 		assert.equal(frame.column, 17);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/common/diff/diff.test.ts b/src/vs/base/test/common/diff/diff.test.ts
index ca40c6792..aa870c16e 100644
--- a/src/vs/base/test/common/diff/diff.test.ts
+++ b/src/vs/base/test/common/diff/diff.test.ts
@@ -49,11 +49,11 @@ function assertAnswer(originalStr: string, modifiedStr: string, changes: IDiffCh
 	let modifiedAnswer = maskBasedSubstring(modifiedStr, modifiedMask);
 
 	if (onlyLength) {
-		assert.equal(originalAnswer.length, answerStr.length);
-		assert.equal(modifiedAnswer.length, answerStr.length);
+		assert.strictEqual(originalAnswer.length, answerStr.length);
+		assert.strictEqual(modifiedAnswer.length, answerStr.length);
 	} else {
-		assert.equal(originalAnswer, answerStr);
-		assert.equal(modifiedAnswer, answerStr);
+		assert.strictEqual(originalAnswer, answerStr);
+		assert.strictEqual(modifiedAnswer, answerStr);
 	}
 }
 
@@ -106,18 +106,18 @@ suite('Diff - Ported from VS', () => {
 		let predicateCallCount = 0;
 
 		let diff = new LcsDiff(new StringDiffSequence(left), new StringDiffSequence(right), function (leftIndex, longestMatchSoFar) {
-			assert.equal(predicateCallCount, 0);
+			assert.strictEqual(predicateCallCount, 0);
 
 			predicateCallCount++;
 
-			assert.equal(leftIndex, 1);
+			assert.strictEqual(leftIndex, 1);
 
 			// cancel processing
 			return false;
 		});
 		let changes = diff.ComputeDiff(true).changes;
 
-		assert.equal(predicateCallCount, 1);
+		assert.strictEqual(predicateCallCount, 1);
 
 		// Doesn't include 'c', 'd', or 'e', since we quit on the first request
 		assertAnswer(left, right, changes, 'abf');
diff --git a/src/vs/base/test/common/extpath.test.ts b/src/vs/base/test/common/extpath.test.ts
index 03993437f..b05be8d83 100644
--- a/src/vs/base/test/common/extpath.test.ts
+++ b/src/vs/base/test/common/extpath.test.ts
@@ -11,39 +11,37 @@ import { CharCode } from 'vs/base/common/charCode';
 suite('Paths', () => {
 
 	test('toForwardSlashes', () => {
-		assert.equal(extpath.toSlashes('\\\\server\\share\\some\\path'), '//server/share/some/path');
-		assert.equal(extpath.toSlashes('c:\\test'), 'c:/test');
-		assert.equal(extpath.toSlashes('foo\\bar'), 'foo/bar');
-		assert.equal(extpath.toSlashes('/user/far'), '/user/far');
+		assert.strictEqual(extpath.toSlashes('\\\\server\\share\\some\\path'), '//server/share/some/path');
+		assert.strictEqual(extpath.toSlashes('c:\\test'), 'c:/test');
+		assert.strictEqual(extpath.toSlashes('foo\\bar'), 'foo/bar');
+		assert.strictEqual(extpath.toSlashes('/user/far'), '/user/far');
 	});
 
 	test('getRoot', () => {
-		assert.equal(extpath.getRoot('/user/far'), '/');
-		assert.equal(extpath.getRoot('\\\\server\\share\\some\\path'), '//server/share/');
-		assert.equal(extpath.getRoot('//server/share/some/path'), '//server/share/');
-		assert.equal(extpath.getRoot('//server/share'), '/');
-		assert.equal(extpath.getRoot('//server'), '/');
-		assert.equal(extpath.getRoot('//server//'), '/');
-		assert.equal(extpath.getRoot('c:/user/far'), 'c:/');
-		assert.equal(extpath.getRoot('c:user/far'), 'c:');
-		assert.equal(extpath.getRoot('http://www'), '');
-		assert.equal(extpath.getRoot('http://www/'), 'http://www/');
-		assert.equal(extpath.getRoot('file:///foo'), 'file:///');
-		assert.equal(extpath.getRoot('file://foo'), '');
+		assert.strictEqual(extpath.getRoot('/user/far'), '/');
+		assert.strictEqual(extpath.getRoot('\\\\server\\share\\some\\path'), '//server/share/');
+		assert.strictEqual(extpath.getRoot('//server/share/some/path'), '//server/share/');
+		assert.strictEqual(extpath.getRoot('//server/share'), '/');
+		assert.strictEqual(extpath.getRoot('//server'), '/');
+		assert.strictEqual(extpath.getRoot('//server//'), '/');
+		assert.strictEqual(extpath.getRoot('c:/user/far'), 'c:/');
+		assert.strictEqual(extpath.getRoot('c:user/far'), 'c:');
+		assert.strictEqual(extpath.getRoot('http://www'), '');
+		assert.strictEqual(extpath.getRoot('http://www/'), 'http://www/');
+		assert.strictEqual(extpath.getRoot('file:///foo'), 'file:///');
+		assert.strictEqual(extpath.getRoot('file://foo'), '');
 	});
 
-	test('isUNC', () => {
-		if (platform.isWindows) {
-			assert.ok(!extpath.isUNC('foo'));
-			assert.ok(!extpath.isUNC('/foo'));
-			assert.ok(!extpath.isUNC('\\foo'));
-			assert.ok(!extpath.isUNC('\\\\foo'));
-			assert.ok(extpath.isUNC('\\\\a\\b'));
-			assert.ok(!extpath.isUNC('//a/b'));
-			assert.ok(extpath.isUNC('\\\\server\\share'));
-			assert.ok(extpath.isUNC('\\\\server\\share\\'));
-			assert.ok(extpath.isUNC('\\\\server\\share\\path'));
-		}
+	(!platform.isWindows ? test.skip : test)('isUNC', () => {
+		assert.ok(!extpath.isUNC('foo'));
+		assert.ok(!extpath.isUNC('/foo'));
+		assert.ok(!extpath.isUNC('\\foo'));
+		assert.ok(!extpath.isUNC('\\\\foo'));
+		assert.ok(extpath.isUNC('\\\\a\\b'));
+		assert.ok(!extpath.isUNC('//a/b'));
+		assert.ok(extpath.isUNC('\\\\server\\share'));
+		assert.ok(extpath.isUNC('\\\\server\\share\\'));
+		assert.ok(extpath.isUNC('\\\\server\\share\\path'));
 	});
 
 	test('isValidBasename', () => {
@@ -75,41 +73,41 @@ suite('Paths', () => {
 
 	test('sanitizeFilePath', () => {
 		if (platform.isWindows) {
-			assert.equal(extpath.sanitizeFilePath('.', 'C:\\the\\cwd'), 'C:\\the\\cwd');
-			assert.equal(extpath.sanitizeFilePath('', 'C:\\the\\cwd'), 'C:\\the\\cwd');
+			assert.strictEqual(extpath.sanitizeFilePath('.', 'C:\\the\\cwd'), 'C:\\the\\cwd');
+			assert.strictEqual(extpath.sanitizeFilePath('', 'C:\\the\\cwd'), 'C:\\the\\cwd');
 
-			assert.equal(extpath.sanitizeFilePath('C:', 'C:\\the\\cwd'), 'C:\\');
-			assert.equal(extpath.sanitizeFilePath('C:\\', 'C:\\the\\cwd'), 'C:\\');
-			assert.equal(extpath.sanitizeFilePath('C:\\\\', 'C:\\the\\cwd'), 'C:\\');
+			assert.strictEqual(extpath.sanitizeFilePath('C:', 'C:\\the\\cwd'), 'C:\\');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\', 'C:\\the\\cwd'), 'C:\\');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\\\', 'C:\\the\\cwd'), 'C:\\');
 
-			assert.equal(extpath.sanitizeFilePath('C:\\folder\\my.txt', 'C:\\the\\cwd'), 'C:\\folder\\my.txt');
-			assert.equal(extpath.sanitizeFilePath('C:\\folder\\my', 'C:\\the\\cwd'), 'C:\\folder\\my');
-			assert.equal(extpath.sanitizeFilePath('C:\\folder\\..\\my', 'C:\\the\\cwd'), 'C:\\my');
-			assert.equal(extpath.sanitizeFilePath('C:\\folder\\my\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
-			assert.equal(extpath.sanitizeFilePath('C:\\folder\\my\\\\\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\folder\\my.txt', 'C:\\the\\cwd'), 'C:\\folder\\my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\folder\\my', 'C:\\the\\cwd'), 'C:\\folder\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\folder\\..\\my', 'C:\\the\\cwd'), 'C:\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\folder\\my\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('C:\\folder\\my\\\\\\', 'C:\\the\\cwd'), 'C:\\folder\\my');
 
-			assert.equal(extpath.sanitizeFilePath('my.txt', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
-			assert.equal(extpath.sanitizeFilePath('my.txt\\', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('my.txt', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('my.txt\\', 'C:\\the\\cwd'), 'C:\\the\\cwd\\my.txt');
 
-			assert.equal(extpath.sanitizeFilePath('\\\\localhost\\folder\\my', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
-			assert.equal(extpath.sanitizeFilePath('\\\\localhost\\folder\\my\\', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('\\\\localhost\\folder\\my', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
+			assert.strictEqual(extpath.sanitizeFilePath('\\\\localhost\\folder\\my\\', 'C:\\the\\cwd'), '\\\\localhost\\folder\\my');
 		} else {
-			assert.equal(extpath.sanitizeFilePath('.', '/the/cwd'), '/the/cwd');
-			assert.equal(extpath.sanitizeFilePath('', '/the/cwd'), '/the/cwd');
-			assert.equal(extpath.sanitizeFilePath('/', '/the/cwd'), '/');
+			assert.strictEqual(extpath.sanitizeFilePath('.', '/the/cwd'), '/the/cwd');
+			assert.strictEqual(extpath.sanitizeFilePath('', '/the/cwd'), '/the/cwd');
+			assert.strictEqual(extpath.sanitizeFilePath('/', '/the/cwd'), '/');
 
-			assert.equal(extpath.sanitizeFilePath('/folder/my.txt', '/the/cwd'), '/folder/my.txt');
-			assert.equal(extpath.sanitizeFilePath('/folder/my', '/the/cwd'), '/folder/my');
-			assert.equal(extpath.sanitizeFilePath('/folder/../my', '/the/cwd'), '/my');
-			assert.equal(extpath.sanitizeFilePath('/folder/my/', '/the/cwd'), '/folder/my');
-			assert.equal(extpath.sanitizeFilePath('/folder/my///', '/the/cwd'), '/folder/my');
+			assert.strictEqual(extpath.sanitizeFilePath('/folder/my.txt', '/the/cwd'), '/folder/my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('/folder/my', '/the/cwd'), '/folder/my');
+			assert.strictEqual(extpath.sanitizeFilePath('/folder/../my', '/the/cwd'), '/my');
+			assert.strictEqual(extpath.sanitizeFilePath('/folder/my/', '/the/cwd'), '/folder/my');
+			assert.strictEqual(extpath.sanitizeFilePath('/folder/my///', '/the/cwd'), '/folder/my');
 
-			assert.equal(extpath.sanitizeFilePath('my.txt', '/the/cwd'), '/the/cwd/my.txt');
-			assert.equal(extpath.sanitizeFilePath('my.txt/', '/the/cwd'), '/the/cwd/my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('my.txt', '/the/cwd'), '/the/cwd/my.txt');
+			assert.strictEqual(extpath.sanitizeFilePath('my.txt/', '/the/cwd'), '/the/cwd/my.txt');
 		}
 	});
 
-	test('isRoot', () => {
+	test('isRootOrDriveLetter', () => {
 		if (platform.isWindows) {
 			assert.ok(extpath.isRootOrDriveLetter('c:'));
 			assert.ok(extpath.isRootOrDriveLetter('D:'));
@@ -123,6 +121,34 @@ suite('Paths', () => {
 		}
 	});
 
+	test('hasDriveLetter', () => {
+		if (platform.isWindows) {
+			assert.ok(extpath.hasDriveLetter('c:'));
+			assert.ok(extpath.hasDriveLetter('D:'));
+			assert.ok(extpath.hasDriveLetter('D:/'));
+			assert.ok(extpath.hasDriveLetter('D:\\'));
+			assert.ok(extpath.hasDriveLetter('D:\\path'));
+			assert.ok(extpath.hasDriveLetter('D:/path'));
+		} else {
+			assert.ok(!extpath.hasDriveLetter('/'));
+			assert.ok(!extpath.hasDriveLetter('/path'));
+		}
+	});
+
+	test('getDriveLetter', () => {
+		if (platform.isWindows) {
+			assert.strictEqual(extpath.getDriveLetter('c:'), 'c');
+			assert.strictEqual(extpath.getDriveLetter('D:'), 'D');
+			assert.strictEqual(extpath.getDriveLetter('D:/'), 'D');
+			assert.strictEqual(extpath.getDriveLetter('D:\\'), 'D');
+			assert.strictEqual(extpath.getDriveLetter('D:\\path'), 'D');
+			assert.strictEqual(extpath.getDriveLetter('D:/path'), 'D');
+		} else {
+			assert.ok(!extpath.getDriveLetter('/'));
+			assert.ok(!extpath.getDriveLetter('/path'));
+		}
+	});
+
 	test('isWindowsDriveLetter', () => {
 		assert.ok(!extpath.isWindowsDriveLetter(0));
 		assert.ok(!extpath.isWindowsDriveLetter(-1));
@@ -131,47 +157,47 @@ suite('Paths', () => {
 	});
 
 	test('indexOfPath', () => {
-		assert.equal(extpath.indexOfPath('/foo', '/bar', true), -1);
-		assert.equal(extpath.indexOfPath('/foo', '/FOO', false), -1);
-		assert.equal(extpath.indexOfPath('/foo', '/FOO', true), 0);
-		assert.equal(extpath.indexOfPath('/some/long/path', '/some/long', false), 0);
-		assert.equal(extpath.indexOfPath('/some/long/path', '/PATH', true), 10);
+		assert.strictEqual(extpath.indexOfPath('/foo', '/bar', true), -1);
+		assert.strictEqual(extpath.indexOfPath('/foo', '/FOO', false), -1);
+		assert.strictEqual(extpath.indexOfPath('/foo', '/FOO', true), 0);
+		assert.strictEqual(extpath.indexOfPath('/some/long/path', '/some/long', false), 0);
+		assert.strictEqual(extpath.indexOfPath('/some/long/path', '/PATH', true), 10);
 	});
 
 	test('parseLineAndColumnAware', () => {
 		let res = extpath.parseLineAndColumnAware('/foo/bar');
-		assert.equal(res.path, '/foo/bar');
-		assert.equal(res.line, undefined);
-		assert.equal(res.column, undefined);
+		assert.strictEqual(res.path, '/foo/bar');
+		assert.strictEqual(res.line, undefined);
+		assert.strictEqual(res.column, undefined);
 
 		res = extpath.parseLineAndColumnAware('/foo/bar:33');
-		assert.equal(res.path, '/foo/bar');
-		assert.equal(res.line, 33);
-		assert.equal(res.column, 1);
+		assert.strictEqual(res.path, '/foo/bar');
+		assert.strictEqual(res.line, 33);
+		assert.strictEqual(res.column, 1);
 
 		res = extpath.parseLineAndColumnAware('/foo/bar:33:34');
-		assert.equal(res.path, '/foo/bar');
-		assert.equal(res.line, 33);
-		assert.equal(res.column, 34);
+		assert.strictEqual(res.path, '/foo/bar');
+		assert.strictEqual(res.line, 33);
+		assert.strictEqual(res.column, 34);
 
 		res = extpath.parseLineAndColumnAware('C:\\foo\\bar');
-		assert.equal(res.path, 'C:\\foo\\bar');
-		assert.equal(res.line, undefined);
-		assert.equal(res.column, undefined);
+		assert.strictEqual(res.path, 'C:\\foo\\bar');
+		assert.strictEqual(res.line, undefined);
+		assert.strictEqual(res.column, undefined);
 
 		res = extpath.parseLineAndColumnAware('C:\\foo\\bar:33');
-		assert.equal(res.path, 'C:\\foo\\bar');
-		assert.equal(res.line, 33);
-		assert.equal(res.column, 1);
+		assert.strictEqual(res.path, 'C:\\foo\\bar');
+		assert.strictEqual(res.line, 33);
+		assert.strictEqual(res.column, 1);
 
 		res = extpath.parseLineAndColumnAware('C:\\foo\\bar:33:34');
-		assert.equal(res.path, 'C:\\foo\\bar');
-		assert.equal(res.line, 33);
-		assert.equal(res.column, 34);
+		assert.strictEqual(res.path, 'C:\\foo\\bar');
+		assert.strictEqual(res.line, 33);
+		assert.strictEqual(res.column, 34);
 
 		res = extpath.parseLineAndColumnAware('/foo/bar:abb');
-		assert.equal(res.path, '/foo/bar:abb');
-		assert.equal(res.line, undefined);
-		assert.equal(res.column, undefined);
+		assert.strictEqual(res.path, '/foo/bar:abb');
+		assert.strictEqual(res.line, undefined);
+		assert.strictEqual(res.column, undefined);
 	});
 });
diff --git a/src/vs/base/test/common/filters.perf.test.ts b/src/vs/base/test/common/filters.perf.test.ts
index 3c20621a5..a8b33d7fc 100644
--- a/src/vs/base/test/common/filters.perf.test.ts
+++ b/src/vs/base/test/common/filters.perf.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as filters from 'vs/base/common/filters';
-import { data } from './filters.perf.data';
+import { data } from 'vs/base/test/common/filters.perf.data';
 
 const patterns = ['cci', 'ida', 'pos', 'CCI', 'enbled', 'callback', 'gGame', 'cons', 'zyx', 'aBc'];
 
 const _enablePerf = false;
 
-function perfSuite(name: string, callback: (this: Mocha.ISuiteCallbackContext) => void) {
+function perfSuite(name: string, callback: (this: Mocha.Suite) => void) {
 	if (_enablePerf) {
 		suite(name, callback);
 	}
@@ -17,6 +17,9 @@ function perfSuite(name: string, callback: (this: Mocha.ISuiteCallbackContext) =
 
 perfSuite('Performance - fuzzyMatch', function () {
 
+	// suiteSetup(() => console.profile());
+	// suiteTeardown(() => console.profileEnd());
+
 	console.log(`Matching ${data.length} items against ${patterns.length} patterns (${data.length * patterns.length} operations) `);
 
 	function perfTest(name: string, match: filters.FuzzyScorer) {
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
index 17a3f681c..3489c5fdd 100644
--- a/src/vs/base/test/common/filters.test.ts
+++ b/src/vs/base/test/common/filters.test.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import { IFilter, or, matchesPrefix, matchesStrictPrefix, matchesCamelCase, matchesSubString, matchesContiguousSubString, matchesWords, fuzzyScore, IMatch, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, createMatches } from 'vs/base/common/filters';
+import { IFilter, or, matchesPrefix, matchesStrictPrefix, matchesCamelCase, matchesSubString, matchesContiguousSubString, matchesWords, fuzzyScore, IMatch, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, createMatches, anyScore } from 'vs/base/common/filters';
 
 function filterOk(filter: IFilter, word: string, wordToMatchAgainst: string, highlights?: { start: number; end: number; }[]) {
 	let r = filter(word, wordToMatchAgainst);
 	assert(r, `${word} didn't match ${wordToMatchAgainst}`);
 	if (highlights) {
-		assert.deepEqual(r, highlights);
+		assert.deepStrictEqual(r, highlights);
 	}
 }
 
@@ -233,7 +233,7 @@ suite('Filters', () => {
 				pos = match.end;
 			}
 			actualWord += word.substring(pos);
-			assert.equal(actualWord, decoratedWord);
+			assert.strictEqual(actualWord, decoratedWord);
 		}
 	}
 
@@ -285,7 +285,7 @@ suite('Filters', () => {
 		assertMatches('LLLL', 'SVisualLoggerLogsList', undefined, fuzzyScore);
 		assertMatches('TEdit', 'TextEdit', '^Text^E^d^i^t', fuzzyScore);
 		assertMatches('TEdit', 'TextEditor', '^Text^E^d^i^tor', fuzzyScore);
-		assertMatches('TEdit', 'Textedit', '^T^exte^d^i^t', fuzzyScore);
+		assertMatches('TEdit', 'Textedit', '^Text^e^d^i^t', fuzzyScore);
 		assertMatches('TEdit', 'text_edit', '^text_^e^d^i^t', fuzzyScore);
 		assertMatches('TEditDit', 'TextEditorDecorationType', '^Text^E^d^i^tor^Decorat^ion^Type', fuzzyScore);
 		assertMatches('TEdit', 'TextEditorDecorationType', '^Text^E^d^i^torDecorationType', fuzzyScore);
@@ -442,7 +442,7 @@ suite('Filters', () => {
 				}
 			}
 		}
-		assert.equal(topIdx, expected, `${pattern} -> actual=${words[topIdx]} <> expected=${words[expected]}`);
+		assert.strictEqual(topIdx, expected, `${pattern} -> actual=${words[topIdx]} <> expected=${words[expected]}`);
 	}
 
 	test('topScore - fuzzyScore', function () {
@@ -521,6 +521,12 @@ suite('Filters', () => {
 			'ffffffffffffffffffffffffffffbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar_^f^o^o',
 			fuzzyScore
 		);
+		assertMatches(
+			'Aoo',
+			'Affffffffffffffffffffffffffffbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar_foo',
+			'^Affffffffffffffffffffffffffffbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar_f^o^o',
+			fuzzyScore
+		);
 		assertMatches(
 			'foo',
 			'Gffffffffffffffffffffffffffffbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar_foo',
@@ -534,8 +540,19 @@ suite('Filters', () => {
 		assert.ok(Boolean(match));
 	});
 
+	test('Wrong highlight after emoji #113404', function () {
+		assertMatches('di', '✨div classname=""></div>', '✨^d^iv classname=""></div>', fuzzyScore);
+		assertMatches('di', 'adiv classname=""></div>', 'adiv classname=""></^d^iv>', fuzzyScore);
+	});
+
 	test('Suggestion is not highlighted #85826', function () {
 		assertMatches('SemanticTokens', 'SemanticTokensEdits', '^S^e^m^a^n^t^i^c^T^o^k^e^n^sEdits', fuzzyScore);
 		assertMatches('SemanticTokens', 'SemanticTokensEdits', '^S^e^m^a^n^t^i^c^T^o^k^e^n^sEdits', fuzzyScoreGracefulAggressive);
 	});
+
+	test('IntelliSense completion not correctly highlighting text in front of cursor #115250', function () {
+		assertMatches('lo', 'log', '^l^og', fuzzyScore);
+		assertMatches('.lo', 'log', '^l^og', anyScore);
+		assertMatches('.', 'log', 'log', anyScore);
+	});
 });
diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts
index 5aac1fb98..59c52ce00 100644
--- a/src/vs/base/test/common/fuzzyScorer.test.ts
+++ b/src/vs/base/test/common/fuzzyScorer.test.ts
@@ -120,30 +120,30 @@ suite('Fuzzy Scorer', () => {
 
 		// Assert scoring order
 		let sortedScores = scores.concat().sort((a, b) => b[0] - a[0]);
-		assert.deepEqual(scores, sortedScores);
+		assert.deepStrictEqual(scores, sortedScores);
 
 		// Assert scoring positions
 		// let positions = scores[0][1];
-		// assert.equal(positions.length, 'HelLo-World'.length);
+		// assert.strictEqual(positions.length, 'HelLo-World'.length);
 
 		// positions = scores[2][1];
-		// assert.equal(positions.length, 'HW'.length);
-		// assert.equal(positions[0], 0);
-		// assert.equal(positions[1], 6);
+		// assert.strictEqual(positions.length, 'HW'.length);
+		// assert.strictEqual(positions[0], 0);
+		// assert.strictEqual(positions[1], 6);
 	});
 
 	test('score (non fuzzy)', function () {
 		const target = 'HeLlo-World';
 
 		assert.ok(_doScore(target, 'HelLo-World', false)[0] > 0);
-		assert.equal(_doScore(target, 'HelLo-World', false)[1].length, 'HelLo-World'.length);
+		assert.strictEqual(_doScore(target, 'HelLo-World', false)[1].length, 'HelLo-World'.length);
 
 		assert.ok(_doScore(target, 'hello-world', false)[0] > 0);
-		assert.equal(_doScore(target, 'HW', false)[0], 0);
+		assert.strictEqual(_doScore(target, 'HW', false)[0], 0);
 		assert.ok(_doScore(target, 'h', false)[0] > 0);
 		assert.ok(_doScore(target, 'ello', false)[0] > 0);
 		assert.ok(_doScore(target, 'ld', false)[0] > 0);
-		assert.equal(_doScore(target, 'eo', false)[0], 0);
+		assert.strictEqual(_doScore(target, 'eo', false)[0], 0);
 	});
 
 	test('scoreItem - matches are proper', function () {
@@ -158,52 +158,52 @@ suite('Fuzzy Scorer', () => {
 		// Path Identity
 		const identityRes = scoreItem(resource, ResourceAccessor.getItemPath(resource), true, ResourceAccessor);
 		assert.ok(identityRes.score);
-		assert.equal(identityRes.descriptionMatch!.length, 1);
-		assert.equal(identityRes.labelMatch!.length, 1);
-		assert.equal(identityRes.descriptionMatch![0].start, 0);
-		assert.equal(identityRes.descriptionMatch![0].end, ResourceAccessor.getItemDescription(resource).length);
-		assert.equal(identityRes.labelMatch![0].start, 0);
-		assert.equal(identityRes.labelMatch![0].end, ResourceAccessor.getItemLabel(resource).length);
+		assert.strictEqual(identityRes.descriptionMatch!.length, 1);
+		assert.strictEqual(identityRes.labelMatch!.length, 1);
+		assert.strictEqual(identityRes.descriptionMatch![0].start, 0);
+		assert.strictEqual(identityRes.descriptionMatch![0].end, ResourceAccessor.getItemDescription(resource).length);
+		assert.strictEqual(identityRes.labelMatch![0].start, 0);
+		assert.strictEqual(identityRes.labelMatch![0].end, ResourceAccessor.getItemLabel(resource).length);
 
 		// Basename Prefix
 		const basenamePrefixRes = scoreItem(resource, 'som', true, ResourceAccessor);
 		assert.ok(basenamePrefixRes.score);
 		assert.ok(!basenamePrefixRes.descriptionMatch);
-		assert.equal(basenamePrefixRes.labelMatch!.length, 1);
-		assert.equal(basenamePrefixRes.labelMatch![0].start, 0);
-		assert.equal(basenamePrefixRes.labelMatch![0].end, 'som'.length);
+		assert.strictEqual(basenamePrefixRes.labelMatch!.length, 1);
+		assert.strictEqual(basenamePrefixRes.labelMatch![0].start, 0);
+		assert.strictEqual(basenamePrefixRes.labelMatch![0].end, 'som'.length);
 
 		// Basename Camelcase
 		const basenameCamelcaseRes = scoreItem(resource, 'sF', true, ResourceAccessor);
 		assert.ok(basenameCamelcaseRes.score);
 		assert.ok(!basenameCamelcaseRes.descriptionMatch);
-		assert.equal(basenameCamelcaseRes.labelMatch!.length, 2);
-		assert.equal(basenameCamelcaseRes.labelMatch![0].start, 0);
-		assert.equal(basenameCamelcaseRes.labelMatch![0].end, 1);
-		assert.equal(basenameCamelcaseRes.labelMatch![1].start, 4);
-		assert.equal(basenameCamelcaseRes.labelMatch![1].end, 5);
+		assert.strictEqual(basenameCamelcaseRes.labelMatch!.length, 2);
+		assert.strictEqual(basenameCamelcaseRes.labelMatch![0].start, 0);
+		assert.strictEqual(basenameCamelcaseRes.labelMatch![0].end, 1);
+		assert.strictEqual(basenameCamelcaseRes.labelMatch![1].start, 4);
+		assert.strictEqual(basenameCamelcaseRes.labelMatch![1].end, 5);
 
 		// Basename Match
 		const basenameRes = scoreItem(resource, 'of', true, ResourceAccessor);
 		assert.ok(basenameRes.score);
 		assert.ok(!basenameRes.descriptionMatch);
-		assert.equal(basenameRes.labelMatch!.length, 2);
-		assert.equal(basenameRes.labelMatch![0].start, 1);
-		assert.equal(basenameRes.labelMatch![0].end, 2);
-		assert.equal(basenameRes.labelMatch![1].start, 4);
-		assert.equal(basenameRes.labelMatch![1].end, 5);
+		assert.strictEqual(basenameRes.labelMatch!.length, 2);
+		assert.strictEqual(basenameRes.labelMatch![0].start, 1);
+		assert.strictEqual(basenameRes.labelMatch![0].end, 2);
+		assert.strictEqual(basenameRes.labelMatch![1].start, 4);
+		assert.strictEqual(basenameRes.labelMatch![1].end, 5);
 
 		// Path Match
 		const pathRes = scoreItem(resource, 'xyz123', true, ResourceAccessor);
 		assert.ok(pathRes.score);
 		assert.ok(pathRes.descriptionMatch);
 		assert.ok(pathRes.labelMatch);
-		assert.equal(pathRes.labelMatch!.length, 1);
-		assert.equal(pathRes.labelMatch![0].start, 8);
-		assert.equal(pathRes.labelMatch![0].end, 11);
-		assert.equal(pathRes.descriptionMatch!.length, 1);
-		assert.equal(pathRes.descriptionMatch![0].start, 1);
-		assert.equal(pathRes.descriptionMatch![0].end, 4);
+		assert.strictEqual(pathRes.labelMatch!.length, 1);
+		assert.strictEqual(pathRes.labelMatch![0].start, 8);
+		assert.strictEqual(pathRes.labelMatch![0].end, 11);
+		assert.strictEqual(pathRes.descriptionMatch!.length, 1);
+		assert.strictEqual(pathRes.descriptionMatch![0].start, 1);
+		assert.strictEqual(pathRes.descriptionMatch![0].end, 4);
 
 		// No Match
 		const noRes = scoreItem(resource, '987', true, ResourceAccessor);
@@ -223,51 +223,51 @@ suite('Fuzzy Scorer', () => {
 
 		let res1 = scoreItem(resource, 'xyz some', true, ResourceAccessor);
 		assert.ok(res1.score);
-		assert.equal(res1.labelMatch?.length, 1);
-		assert.equal(res1.labelMatch![0].start, 0);
-		assert.equal(res1.labelMatch![0].end, 4);
-		assert.equal(res1.descriptionMatch?.length, 1);
-		assert.equal(res1.descriptionMatch![0].start, 1);
-		assert.equal(res1.descriptionMatch![0].end, 4);
+		assert.strictEqual(res1.labelMatch?.length, 1);
+		assert.strictEqual(res1.labelMatch![0].start, 0);
+		assert.strictEqual(res1.labelMatch![0].end, 4);
+		assert.strictEqual(res1.descriptionMatch?.length, 1);
+		assert.strictEqual(res1.descriptionMatch![0].start, 1);
+		assert.strictEqual(res1.descriptionMatch![0].end, 4);
 
 		let res2 = scoreItem(resource, 'some xyz', true, ResourceAccessor);
 		assert.ok(res2.score);
-		assert.equal(res1.score, res2.score);
-		assert.equal(res2.labelMatch?.length, 1);
-		assert.equal(res2.labelMatch![0].start, 0);
-		assert.equal(res2.labelMatch![0].end, 4);
-		assert.equal(res2.descriptionMatch?.length, 1);
-		assert.equal(res2.descriptionMatch![0].start, 1);
-		assert.equal(res2.descriptionMatch![0].end, 4);
+		assert.strictEqual(res1.score, res2.score);
+		assert.strictEqual(res2.labelMatch?.length, 1);
+		assert.strictEqual(res2.labelMatch![0].start, 0);
+		assert.strictEqual(res2.labelMatch![0].end, 4);
+		assert.strictEqual(res2.descriptionMatch?.length, 1);
+		assert.strictEqual(res2.descriptionMatch![0].start, 1);
+		assert.strictEqual(res2.descriptionMatch![0].end, 4);
 
 		let res3 = scoreItem(resource, 'some xyz file file123', true, ResourceAccessor);
 		assert.ok(res3.score);
 		assert.ok(res3.score > res2.score);
-		assert.equal(res3.labelMatch?.length, 1);
-		assert.equal(res3.labelMatch![0].start, 0);
-		assert.equal(res3.labelMatch![0].end, 11);
-		assert.equal(res3.descriptionMatch?.length, 1);
-		assert.equal(res3.descriptionMatch![0].start, 1);
-		assert.equal(res3.descriptionMatch![0].end, 4);
+		assert.strictEqual(res3.labelMatch?.length, 1);
+		assert.strictEqual(res3.labelMatch![0].start, 0);
+		assert.strictEqual(res3.labelMatch![0].end, 11);
+		assert.strictEqual(res3.descriptionMatch?.length, 1);
+		assert.strictEqual(res3.descriptionMatch![0].start, 1);
+		assert.strictEqual(res3.descriptionMatch![0].end, 4);
 
 		let res4 = scoreItem(resource, 'path z y', true, ResourceAccessor);
 		assert.ok(res4.score);
 		assert.ok(res4.score < res2.score);
-		assert.equal(res4.labelMatch?.length, 0);
-		assert.equal(res4.descriptionMatch?.length, 2);
-		assert.equal(res4.descriptionMatch![0].start, 2);
-		assert.equal(res4.descriptionMatch![0].end, 4);
-		assert.equal(res4.descriptionMatch![1].start, 10);
-		assert.equal(res4.descriptionMatch![1].end, 14);
+		assert.strictEqual(res4.labelMatch?.length, 0);
+		assert.strictEqual(res4.descriptionMatch?.length, 2);
+		assert.strictEqual(res4.descriptionMatch![0].start, 2);
+		assert.strictEqual(res4.descriptionMatch![0].end, 4);
+		assert.strictEqual(res4.descriptionMatch![1].start, 10);
+		assert.strictEqual(res4.descriptionMatch![1].end, 14);
 	});
 
 	test('scoreItem - invalid input', function () {
 
 		let res = scoreItem(null, null!, true, ResourceAccessor);
-		assert.equal(res.score, 0);
+		assert.strictEqual(res.score, 0);
 
 		res = scoreItem(null, 'null', true, ResourceAccessor);
-		assert.equal(res.score, 0);
+		assert.strictEqual(res.score, 0);
 	});
 
 	test('scoreItem - optimize for file paths', function () {
@@ -280,12 +280,12 @@ suite('Fuzzy Scorer', () => {
 		assert.ok(pathRes.score);
 		assert.ok(pathRes.descriptionMatch);
 		assert.ok(pathRes.labelMatch);
-		assert.equal(pathRes.labelMatch!.length, 1);
-		assert.equal(pathRes.labelMatch![0].start, 0);
-		assert.equal(pathRes.labelMatch![0].end, 7);
-		assert.equal(pathRes.descriptionMatch!.length, 1);
-		assert.equal(pathRes.descriptionMatch![0].start, 23);
-		assert.equal(pathRes.descriptionMatch![0].end, 26);
+		assert.strictEqual(pathRes.labelMatch!.length, 1);
+		assert.strictEqual(pathRes.labelMatch![0].start, 0);
+		assert.strictEqual(pathRes.labelMatch![0].end, 7);
+		assert.strictEqual(pathRes.descriptionMatch!.length, 1);
+		assert.strictEqual(pathRes.descriptionMatch![0].start, 23);
+		assert.strictEqual(pathRes.descriptionMatch![0].end, 26);
 	});
 
 	test('scoreItem - avoid match scattering (bug #36119)', function () {
@@ -295,9 +295,9 @@ suite('Fuzzy Scorer', () => {
 		assert.ok(pathRes.score);
 		assert.ok(pathRes.descriptionMatch);
 		assert.ok(pathRes.labelMatch);
-		assert.equal(pathRes.labelMatch!.length, 1);
-		assert.equal(pathRes.labelMatch![0].start, 0);
-		assert.equal(pathRes.labelMatch![0].end, 9);
+		assert.strictEqual(pathRes.labelMatch!.length, 1);
+		assert.strictEqual(pathRes.labelMatch![0].start, 0);
+		assert.strictEqual(pathRes.labelMatch![0].end, 9);
 	});
 
 	test('scoreItem - prefers more compact matches', function () {
@@ -309,11 +309,11 @@ suite('Fuzzy Scorer', () => {
 		assert.ok(res.score);
 		assert.ok(res.descriptionMatch);
 		assert.ok(!res.labelMatch!.length);
-		assert.equal(res.descriptionMatch!.length, 2);
-		assert.equal(res.descriptionMatch![0].start, 11);
-		assert.equal(res.descriptionMatch![0].end, 12);
-		assert.equal(res.descriptionMatch![1].start, 13);
-		assert.equal(res.descriptionMatch![1].end, 14);
+		assert.strictEqual(res.descriptionMatch!.length, 2);
+		assert.strictEqual(res.descriptionMatch![0].start, 11);
+		assert.strictEqual(res.descriptionMatch![0].end, 12);
+		assert.strictEqual(res.descriptionMatch![1].start, 13);
+		assert.strictEqual(res.descriptionMatch![1].end, 14);
 	});
 
 	test('scoreItem - proper target offset', function () {
@@ -328,9 +328,9 @@ suite('Fuzzy Scorer', () => {
 
 		const res = scoreItem(resource, 'de', true, ResourceAccessor);
 
-		assert.equal(res.labelMatch!.length, 1);
-		assert.equal(res.labelMatch![0].start, 1);
-		assert.equal(res.labelMatch![0].end, 3);
+		assert.strictEqual(res.labelMatch!.length, 1);
+		assert.strictEqual(res.labelMatch![0].start, 1);
+		assert.strictEqual(res.labelMatch![0].end, 3);
 	});
 
 	test('scoreItem - proper target offset #3', function () {
@@ -338,19 +338,19 @@ suite('Fuzzy Scorer', () => {
 
 		const res = scoreItem(resource, 'debug', true, ResourceAccessor);
 
-		assert.equal(res.descriptionMatch!.length, 3);
-		assert.equal(res.descriptionMatch![0].start, 9);
-		assert.equal(res.descriptionMatch![0].end, 10);
-		assert.equal(res.descriptionMatch![1].start, 36);
-		assert.equal(res.descriptionMatch![1].end, 37);
-		assert.equal(res.descriptionMatch![2].start, 40);
-		assert.equal(res.descriptionMatch![2].end, 41);
+		assert.strictEqual(res.descriptionMatch!.length, 3);
+		assert.strictEqual(res.descriptionMatch![0].start, 9);
+		assert.strictEqual(res.descriptionMatch![0].end, 10);
+		assert.strictEqual(res.descriptionMatch![1].start, 36);
+		assert.strictEqual(res.descriptionMatch![1].end, 37);
+		assert.strictEqual(res.descriptionMatch![2].start, 40);
+		assert.strictEqual(res.descriptionMatch![2].end, 41);
 
-		assert.equal(res.labelMatch!.length, 2);
-		assert.equal(res.labelMatch![0].start, 9);
-		assert.equal(res.labelMatch![0].end, 10);
-		assert.equal(res.labelMatch![1].start, 20);
-		assert.equal(res.labelMatch![1].end, 21);
+		assert.strictEqual(res.labelMatch!.length, 2);
+		assert.strictEqual(res.labelMatch![0].start, 9);
+		assert.strictEqual(res.labelMatch![0].end, 10);
+		assert.strictEqual(res.labelMatch![1].start, 20);
+		assert.strictEqual(res.labelMatch![1].end, 21);
 	});
 
 	test('scoreItem - no match unless query contained in sequence', function () {
@@ -394,27 +394,27 @@ suite('Fuzzy Scorer', () => {
 		let query = ResourceAccessor.getItemPath(resourceA);
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		// Full resource B path
 		query = ResourceAccessor.getItemPath(resourceB);
 
 		res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - basename prefix', function () {
@@ -426,27 +426,27 @@ suite('Fuzzy Scorer', () => {
 		let query = ResourceAccessor.getItemLabel(resourceA);
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		// Full resource B basename
 		query = ResourceAccessor.getItemLabel(resourceB);
 
 		res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - basename camelcase', function () {
@@ -458,27 +458,27 @@ suite('Fuzzy Scorer', () => {
 		let query = 'fA';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		// resource B camelcase
 		query = 'fB';
 
 		res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - basename scores', function () {
@@ -490,27 +490,27 @@ suite('Fuzzy Scorer', () => {
 		let query = 'fileA';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		// Resource B part of basename
 		query = 'fileB';
 
 		res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - path scores', function () {
@@ -522,27 +522,27 @@ suite('Fuzzy Scorer', () => {
 		let query = 'pathfileA';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		// Resource B part of path
 		query = 'pathfileB';
 
 		res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - prefer shorter basenames', function () {
@@ -554,14 +554,14 @@ suite('Fuzzy Scorer', () => {
 		let query = 'somepath';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - prefer shorter basenames (match on basename)', function () {
@@ -573,14 +573,14 @@ suite('Fuzzy Scorer', () => {
 		let query = 'file';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceC);
-		assert.equal(res[2], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceC);
+		assert.strictEqual(res[2], resourceB);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceC);
-		assert.equal(res[2], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceC);
+		assert.strictEqual(res[2], resourceB);
 	});
 
 	test('compareFilesByScore - prefer shorter paths', function () {
@@ -592,14 +592,14 @@ suite('Fuzzy Scorer', () => {
 		let query = 'somepath';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - prefer shorter paths (bug #17443)', function () {
@@ -610,9 +610,9 @@ suite('Fuzzy Scorer', () => {
 		let query = 'co/te';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
-		assert.equal(res[2], resourceC);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
+		assert.strictEqual(res[2], resourceC);
 	});
 
 	test('compareFilesByScore - prefer matches in label over description if scores are otherwise equal', function () {
@@ -622,8 +622,8 @@ suite('Fuzzy Scorer', () => {
 		let query = 'partsquick';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 	});
 
 	test('compareFilesByScore - prefer camel case matches', function () {
@@ -632,12 +632,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['npe', 'NPE']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 		}
 	});
 
@@ -648,12 +648,12 @@ suite('Fuzzy Scorer', () => {
 		let query = 'AH';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 	});
 
 	test('compareFilesByScore - prefer more compact matches (label)', function () {
@@ -663,12 +663,12 @@ suite('Fuzzy Scorer', () => {
 		let query = 'xp';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 	});
 
 	test('compareFilesByScore - prefer more compact matches (path)', function () {
@@ -678,12 +678,12 @@ suite('Fuzzy Scorer', () => {
 		let query = 'xp';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 	});
 
 	test('compareFilesByScore - prefer more compact matches (label and path)', function () {
@@ -693,12 +693,12 @@ suite('Fuzzy Scorer', () => {
 		let query = 'exfile';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #34210)', function () {
@@ -710,18 +710,18 @@ suite('Fuzzy Scorer', () => {
 		let query = isWindows ? 'modu1\\index.js' : 'modu1/index.js';
 
 		let res = [resourceA, resourceB, resourceC, resourceD].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 
 		res = [resourceC, resourceB, resourceA, resourceD].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 
 		query = isWindows ? 'un1\\index.js' : 'un1/index.js';
 
 		res = [resourceA, resourceB, resourceC, resourceD].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceC, resourceB, resourceA, resourceD].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #21019 1.)', function () {
@@ -732,10 +732,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'StatVideoindex';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #21019 2.)', function () {
@@ -745,10 +745,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'reproreduxts';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #26649)', function () {
@@ -759,10 +759,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'bookpageIndex';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceC);
+		assert.strictEqual(res[0], resourceC);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #33247)', function () {
@@ -772,10 +772,10 @@ suite('Fuzzy Scorer', () => {
 		let query = isWindows ? 'ui\\icons' : 'ui/icons';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #33247 comment)', function () {
@@ -785,10 +785,10 @@ suite('Fuzzy Scorer', () => {
 		let query = isWindows ? 'ui\\input\\index' : 'ui/input/index';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #36166)', function () {
@@ -798,10 +798,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'djancosig';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #32918)', function () {
@@ -812,14 +812,14 @@ suite('Fuzzy Scorer', () => {
 		let query = 'protectedconfig.php';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceC);
-		assert.equal(res[2], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceC);
+		assert.strictEqual(res[2], resourceB);
 
 		res = [resourceC, resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceC);
-		assert.equal(res[2], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceC);
+		assert.strictEqual(res[2], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #14879)', function () {
@@ -829,10 +829,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'gradientmain';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #14727 1)', function () {
@@ -842,10 +842,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'abc';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #14727 2)', function () {
@@ -855,10 +855,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'xyz';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #18381)', function () {
@@ -868,10 +868,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'async';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #35572)', function () {
@@ -881,10 +881,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'partisettings';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #36810)', function () {
@@ -894,10 +894,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'tipsindex.cshtml';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - prefer shorter hit (bug #20546)', function () {
@@ -907,10 +907,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'listview';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - avoid match scattering (bug #12095)', function () {
@@ -921,10 +921,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'filesexplorerview.ts';
 
 		let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceA, resourceC, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - prefer case match (bug #96122)', function () {
@@ -934,10 +934,10 @@ suite('Fuzzy Scorer', () => {
 		let query = 'Lists.php';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
+		assert.strictEqual(res[0], resourceB);
 	});
 
 	test('compareFilesByScore - prefer shorter match (bug #103052) - foo bar', function () {
@@ -946,12 +946,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['foo bar', 'foobar']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 		}
 	});
 
@@ -961,12 +961,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['payment model', 'paymentmodel']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 		}
 	});
 
@@ -976,12 +976,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['color js', 'colorjs']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceA);
-			assert.equal(res[1], resourceB);
+			assert.strictEqual(res[0], resourceA);
+			assert.strictEqual(res[1], resourceB);
 		}
 	});
 
@@ -992,22 +992,22 @@ suite('Fuzzy Scorer', () => {
 		let query = 'Color';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceB);
-		assert.equal(res[1], resourceA);
+		assert.strictEqual(res[0], resourceB);
+		assert.strictEqual(res[1], resourceA);
 
 		query = 'color';
 
 		res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
 	});
 
 	test('compareFilesByScore - prefer prefix (bug #103052)', function () {
@@ -1017,12 +1017,12 @@ suite('Fuzzy Scorer', () => {
 		let query = 'smoke main.ts';
 
 		let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
 
 		res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-		assert.equal(res[0], resourceA);
-		assert.equal(res[1], resourceB);
+		assert.strictEqual(res[0], resourceA);
+		assert.strictEqual(res[1], resourceB);
 	});
 
 	test('compareFilesByScore - boost better prefix match if multiple queries are used', function () {
@@ -1031,12 +1031,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['workbench.ts browser', 'browser workbench.ts', 'browser workbench', 'workbench browser']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 		}
 	});
 
@@ -1046,12 +1046,12 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['window browser', 'window.ts browser']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 		}
 	});
 
@@ -1061,73 +1061,73 @@ suite('Fuzzy Scorer', () => {
 
 		for (const query of ['m life, life m']) {
 			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 
 			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
-			assert.equal(res[0], resourceB);
-			assert.equal(res[1], resourceA);
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
 		}
 	});
 
 	test('prepareQuery', () => {
-		assert.equal(scorer.prepareQuery(' f*a ').normalized, 'fa');
-		assert.equal(scorer.prepareQuery('model Tester.ts').original, 'model Tester.ts');
-		assert.equal(scorer.prepareQuery('model Tester.ts').originalLowercase, 'model Tester.ts'.toLowerCase());
-		assert.equal(scorer.prepareQuery('model Tester.ts').normalized, 'modelTester.ts');
-		assert.equal(scorer.prepareQuery('Model Tester.ts').normalizedLowercase, 'modeltester.ts');
-		assert.equal(scorer.prepareQuery('ModelTester.ts').containsPathSeparator, false);
-		assert.equal(scorer.prepareQuery('Model' + sep + 'Tester.ts').containsPathSeparator, true);
+		assert.strictEqual(scorer.prepareQuery(' f*a ').normalized, 'fa');
+		assert.strictEqual(scorer.prepareQuery('model Tester.ts').original, 'model Tester.ts');
+		assert.strictEqual(scorer.prepareQuery('model Tester.ts').originalLowercase, 'model Tester.ts'.toLowerCase());
+		assert.strictEqual(scorer.prepareQuery('model Tester.ts').normalized, 'modelTester.ts');
+		assert.strictEqual(scorer.prepareQuery('Model Tester.ts').normalizedLowercase, 'modeltester.ts');
+		assert.strictEqual(scorer.prepareQuery('ModelTester.ts').containsPathSeparator, false);
+		assert.strictEqual(scorer.prepareQuery('Model' + sep + 'Tester.ts').containsPathSeparator, true);
 
 		// with spaces
 		let query = scorer.prepareQuery('He*llo World');
-		assert.equal(query.original, 'He*llo World');
-		assert.equal(query.normalized, 'HelloWorld');
-		assert.equal(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
-		assert.equal(query.values?.length, 2);
-		assert.equal(query.values?.[0].original, 'He*llo');
-		assert.equal(query.values?.[0].normalized, 'Hello');
-		assert.equal(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
-		assert.equal(query.values?.[1].original, 'World');
-		assert.equal(query.values?.[1].normalized, 'World');
-		assert.equal(query.values?.[1].normalizedLowercase, 'World'.toLowerCase());
+		assert.strictEqual(query.original, 'He*llo World');
+		assert.strictEqual(query.normalized, 'HelloWorld');
+		assert.strictEqual(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
+		assert.strictEqual(query.values?.length, 2);
+		assert.strictEqual(query.values?.[0].original, 'He*llo');
+		assert.strictEqual(query.values?.[0].normalized, 'Hello');
+		assert.strictEqual(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
+		assert.strictEqual(query.values?.[1].original, 'World');
+		assert.strictEqual(query.values?.[1].normalized, 'World');
+		assert.strictEqual(query.values?.[1].normalizedLowercase, 'World'.toLowerCase());
 
 		let restoredQuery = scorer.pieceToQuery(query.values!);
-		assert.equal(restoredQuery.original, query.original);
-		assert.equal(restoredQuery.values?.length, query.values?.length);
-		assert.equal(restoredQuery.containsPathSeparator, query.containsPathSeparator);
+		assert.strictEqual(restoredQuery.original, query.original);
+		assert.strictEqual(restoredQuery.values?.length, query.values?.length);
+		assert.strictEqual(restoredQuery.containsPathSeparator, query.containsPathSeparator);
 
 		// with spaces that are empty
 		query = scorer.prepareQuery(' Hello   World  	');
-		assert.equal(query.original, ' Hello   World  	');
-		assert.equal(query.originalLowercase, ' Hello   World  	'.toLowerCase());
-		assert.equal(query.normalized, 'HelloWorld');
-		assert.equal(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
-		assert.equal(query.values?.length, 2);
-		assert.equal(query.values?.[0].original, 'Hello');
-		assert.equal(query.values?.[0].originalLowercase, 'Hello'.toLowerCase());
-		assert.equal(query.values?.[0].normalized, 'Hello');
-		assert.equal(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
-		assert.equal(query.values?.[1].original, 'World');
-		assert.equal(query.values?.[1].originalLowercase, 'World'.toLowerCase());
-		assert.equal(query.values?.[1].normalized, 'World');
-		assert.equal(query.values?.[1].normalizedLowercase, 'World'.toLowerCase());
+		assert.strictEqual(query.original, ' Hello   World  	');
+		assert.strictEqual(query.originalLowercase, ' Hello   World  	'.toLowerCase());
+		assert.strictEqual(query.normalized, 'HelloWorld');
+		assert.strictEqual(query.normalizedLowercase, 'HelloWorld'.toLowerCase());
+		assert.strictEqual(query.values?.length, 2);
+		assert.strictEqual(query.values?.[0].original, 'Hello');
+		assert.strictEqual(query.values?.[0].originalLowercase, 'Hello'.toLowerCase());
+		assert.strictEqual(query.values?.[0].normalized, 'Hello');
+		assert.strictEqual(query.values?.[0].normalizedLowercase, 'Hello'.toLowerCase());
+		assert.strictEqual(query.values?.[1].original, 'World');
+		assert.strictEqual(query.values?.[1].originalLowercase, 'World'.toLowerCase());
+		assert.strictEqual(query.values?.[1].normalized, 'World');
+		assert.strictEqual(query.values?.[1].normalizedLowercase, 'World'.toLowerCase());
 
 		// Path related
 		if (isWindows) {
-			assert.equal(scorer.prepareQuery('C:\\some\\path').pathNormalized, 'C:\\some\\path');
-			assert.equal(scorer.prepareQuery('C:\\some\\path').normalized, 'C:\\some\\path');
-			assert.equal(scorer.prepareQuery('C:\\some\\path').containsPathSeparator, true);
-			assert.equal(scorer.prepareQuery('C:/some/path').pathNormalized, 'C:\\some\\path');
-			assert.equal(scorer.prepareQuery('C:/some/path').normalized, 'C:\\some\\path');
-			assert.equal(scorer.prepareQuery('C:/some/path').containsPathSeparator, true);
+			assert.strictEqual(scorer.prepareQuery('C:\\some\\path').pathNormalized, 'C:\\some\\path');
+			assert.strictEqual(scorer.prepareQuery('C:\\some\\path').normalized, 'C:\\some\\path');
+			assert.strictEqual(scorer.prepareQuery('C:\\some\\path').containsPathSeparator, true);
+			assert.strictEqual(scorer.prepareQuery('C:/some/path').pathNormalized, 'C:\\some\\path');
+			assert.strictEqual(scorer.prepareQuery('C:/some/path').normalized, 'C:\\some\\path');
+			assert.strictEqual(scorer.prepareQuery('C:/some/path').containsPathSeparator, true);
 		} else {
-			assert.equal(scorer.prepareQuery('/some/path').pathNormalized, '/some/path');
-			assert.equal(scorer.prepareQuery('/some/path').normalized, '/some/path');
-			assert.equal(scorer.prepareQuery('/some/path').containsPathSeparator, true);
-			assert.equal(scorer.prepareQuery('\\some\\path').pathNormalized, '/some/path');
-			assert.equal(scorer.prepareQuery('\\some\\path').normalized, '/some/path');
-			assert.equal(scorer.prepareQuery('\\some\\path').containsPathSeparator, true);
+			assert.strictEqual(scorer.prepareQuery('/some/path').pathNormalized, '/some/path');
+			assert.strictEqual(scorer.prepareQuery('/some/path').normalized, '/some/path');
+			assert.strictEqual(scorer.prepareQuery('/some/path').containsPathSeparator, true);
+			assert.strictEqual(scorer.prepareQuery('\\some\\path').pathNormalized, '/some/path');
+			assert.strictEqual(scorer.prepareQuery('\\some\\path').normalized, '/some/path');
+			assert.strictEqual(scorer.prepareQuery('\\some\\path').containsPathSeparator, true);
 		}
 	});
 
@@ -1138,18 +1138,18 @@ suite('Fuzzy Scorer', () => {
 			let [score, matches] = _doScore2(offset === 0 ? target : `123${target}`, 'HeLlo-World', offset);
 
 			assert.ok(score);
-			assert.equal(matches.length, 1);
-			assert.equal(matches[0].start, 0 + offset);
-			assert.equal(matches[0].end, target.length + offset);
+			assert.strictEqual(matches.length, 1);
+			assert.strictEqual(matches[0].start, 0 + offset);
+			assert.strictEqual(matches[0].end, target.length + offset);
 
 			[score, matches] = _doScore2(offset === 0 ? target : `123${target}`, 'HW', offset);
 
 			assert.ok(score);
-			assert.equal(matches.length, 2);
-			assert.equal(matches[0].start, 0 + offset);
-			assert.equal(matches[0].end, 1 + offset);
-			assert.equal(matches[1].start, 6 + offset);
-			assert.equal(matches[1].end, 7 + offset);
+			assert.strictEqual(matches.length, 2);
+			assert.strictEqual(matches[0].start, 0 + offset);
+			assert.strictEqual(matches[0].end, 1 + offset);
+			assert.strictEqual(matches[1].start, 6 + offset);
+			assert.strictEqual(matches[1].end, 7 + offset);
 		}
 	});
 
@@ -1169,8 +1169,8 @@ suite('Fuzzy Scorer', () => {
 				const firstAndSecondSingleMatch = firstAndSecondSingleMatches[i];
 
 				if (multiMatch && firstAndSecondSingleMatch) {
-					assert.equal(multiMatch.start, firstAndSecondSingleMatch.start);
-					assert.equal(multiMatch.end, firstAndSecondSingleMatch.end);
+					assert.strictEqual(multiMatch.start, firstAndSecondSingleMatch.start);
+					assert.strictEqual(multiMatch.end, firstAndSecondSingleMatch.end);
 				} else {
 					assert.fail();
 				}
@@ -1178,8 +1178,8 @@ suite('Fuzzy Scorer', () => {
 		}
 
 		function assertNoScore() {
-			assert.equal(multiScore, undefined);
-			assert.equal(multiMatches.length, 0);
+			assert.strictEqual(multiScore, undefined);
+			assert.strictEqual(multiMatches.length, 0);
 		}
 
 		assertScore();
diff --git a/src/vs/base/test/node/glob.test.ts b/src/vs/base/test/common/glob.test.ts
similarity index 98%
rename from src/vs/base/test/node/glob.test.ts
rename to src/vs/base/test/common/glob.test.ts
index 2c0288e38..25b838853 100644
--- a/src/vs/base/test/node/glob.test.ts
+++ b/src/vs/base/test/common/glob.test.ts
@@ -63,10 +63,12 @@ suite('Glob', () => {
 
 	function assertGlobMatch(pattern: string | glob.IRelativePattern, input: string) {
 		assert(glob.match(pattern, input), `${pattern} should match ${input}`);
+		assert(glob.match(pattern, nativeSep(input)), `${pattern} should match ${nativeSep(input)}`);
 	}
 
 	function assertNoGlobMatch(pattern: string | glob.IRelativePattern, input: string) {
 		assert(!glob.match(pattern, input), `${pattern} should not match ${input}`);
+		assert(!glob.match(pattern, nativeSep(input)), `${pattern} should not match ${nativeSep(input)}`);
 	}
 
 	test('simple', () => {
@@ -538,9 +540,13 @@ suite('Glob', () => {
 	});
 
 	test('full path', function () {
-		let p = 'testing/this/foo.txt';
+		assertGlobMatch('testing/this/foo.txt', 'testing/this/foo.txt');
+		// assertGlobMatch('testing/this/foo.txt', 'testing\\this\\foo.txt');
+	});
 
-		assert(glob.match(p, nativeSep('testing/this/foo.txt')));
+	test('ending path', function () {
+		assertGlobMatch('**/testing/this/foo.txt', 'some/path/testing/this/foo.txt');
+		// assertGlobMatch('**/testing/this/foo.txt', 'some\\path\\testing\\this\\foo.txt');
 	});
 
 	test('prefix agnostic', function () {
diff --git a/src/vs/base/test/common/iconLabels.test.ts b/src/vs/base/test/common/iconLabels.test.ts
new file mode 100644
index 000000000..998c68971
--- /dev/null
+++ b/src/vs/base/test/common/iconLabels.test.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { IMatch } from 'vs/base/common/filters';
+import { matchesFuzzyIconAware, parseLabelWithIcons, IParsedLabelWithIcons, stripIcons } from 'vs/base/common/iconLabels';
+
+export interface IIconFilter {
+	// Returns null if word doesn't match.
+	(query: string, target: IParsedLabelWithIcons): IMatch[] | null;
+}
+
+function filterOk(filter: IIconFilter, word: string, target: IParsedLabelWithIcons, highlights?: { start: number; end: number; }[]) {
+	let r = filter(word, target);
+	assert(r);
+	if (highlights) {
+		assert.deepEqual(r, highlights);
+	}
+}
+
+suite('Icon Labels', () => {
+	test('matchesFuzzyIconAware', () => {
+
+		// Camel Case
+
+		filterOk(matchesFuzzyIconAware, 'ccr', parseLabelWithIcons('$(codicon)CamelCaseRocks$(codicon)'), [
+			{ start: 10, end: 11 },
+			{ start: 15, end: 16 },
+			{ start: 19, end: 20 }
+		]);
+
+		filterOk(matchesFuzzyIconAware, 'ccr', parseLabelWithIcons('$(codicon) CamelCaseRocks $(codicon)'), [
+			{ start: 11, end: 12 },
+			{ start: 16, end: 17 },
+			{ start: 20, end: 21 }
+		]);
+
+		filterOk(matchesFuzzyIconAware, 'iut', parseLabelWithIcons('$(codicon) Indent $(octico) Using $(octic) Tpaces'), [
+			{ start: 11, end: 12 },
+			{ start: 28, end: 29 },
+			{ start: 43, end: 44 },
+		]);
+
+		// Prefix
+
+		filterOk(matchesFuzzyIconAware, 'using', parseLabelWithIcons('$(codicon) Indent Using Spaces'), [
+			{ start: 18, end: 23 },
+		]);
+
+		// Broken Codicon
+
+		filterOk(matchesFuzzyIconAware, 'codicon', parseLabelWithIcons('This $(codicon Indent Using Spaces'), [
+			{ start: 7, end: 14 },
+		]);
+
+		filterOk(matchesFuzzyIconAware, 'indent', parseLabelWithIcons('This $codicon Indent Using Spaces'), [
+			{ start: 14, end: 20 },
+		]);
+
+		// Testing #59343
+		filterOk(matchesFuzzyIconAware, 'unt', parseLabelWithIcons('$(primitive-dot) $(file-text) Untitled-1'), [
+			{ start: 30, end: 33 },
+		]);
+	});
+
+	test('stripIcons', () => {
+		assert.equal(stripIcons('Hello World'), 'Hello World');
+		assert.equal(stripIcons('$(Hello World'), '$(Hello World');
+		assert.equal(stripIcons('$(Hello) World'), ' World');
+		assert.equal(stripIcons('$(Hello) W$(oi)rld'), ' Wrld');
+	});
+});
diff --git a/src/vs/base/test/common/keyCodes.test.ts b/src/vs/base/test/common/keyCodes.test.ts
index f8b2b55a4..f5c5bcdcc 100644
--- a/src/vs/base/test/common/keyCodes.test.ts
+++ b/src/vs/base/test/common/keyCodes.test.ts
@@ -10,7 +10,7 @@ import { OperatingSystem } from 'vs/base/common/platform';
 suite('keyCodes', () => {
 
 	function testBinaryEncoding(expected: Keybinding | null, k: number, OS: OperatingSystem): void {
-		assert.deepEqual(createKeybinding(k, OS), expected);
+		assert.deepStrictEqual(createKeybinding(k, OS), expected);
 	}
 
 	test('MAC binary encoding', () => {
diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts
index a3e54c162..d7f0a401f 100644
--- a/src/vs/base/test/common/labels.test.ts
+++ b/src/vs/base/test/common/labels.test.ts
@@ -8,106 +8,98 @@ import * as labels from 'vs/base/common/labels';
 import * as platform from 'vs/base/common/platform';
 
 suite('Labels', () => {
-	test('shorten - windows', () => {
-		if (!platform.isWindows) {
-			assert.ok(true);
-			return;
-		}
+	(!platform.isWindows ? test.skip : test)('shorten - windows', () => {
 
 		// nothing to shorten
-		assert.deepEqual(labels.shorten(['a']), ['a']);
-		assert.deepEqual(labels.shorten(['a', 'b']), ['a', 'b']);
-		assert.deepEqual(labels.shorten(['a', 'b', 'c']), ['a', 'b', 'c']);
+		assert.deepStrictEqual(labels.shorten(['a']), ['a']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b']), ['a', 'b']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b', 'c']), ['a', 'b', 'c']);
 
 		// completely different paths
-		assert.deepEqual(labels.shorten(['a\\b', 'c\\d', 'e\\f']), ['…\\b', '…\\d', '…\\f']);
+		assert.deepStrictEqual(labels.shorten(['a\\b', 'c\\d', 'e\\f']), ['…\\b', '…\\d', '…\\f']);
 
 		// same beginning
-		assert.deepEqual(labels.shorten(['a', 'a\\b']), ['a', '…\\b']);
-		assert.deepEqual(labels.shorten(['a\\b', 'a\\b\\c']), ['…\\b', '…\\c']);
-		assert.deepEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c']), ['a', '…\\b', '…\\c']);
-		assert.deepEqual(labels.shorten(['x:\\a\\b', 'x:\\a\\c']), ['x:\\…\\b', 'x:\\…\\c']);
-		assert.deepEqual(labels.shorten(['\\\\a\\b', '\\\\a\\c']), ['\\\\a\\b', '\\\\a\\c']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a\\b']), ['a', '…\\b']);
+		assert.deepStrictEqual(labels.shorten(['a\\b', 'a\\b\\c']), ['…\\b', '…\\c']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c']), ['a', '…\\b', '…\\c']);
+		assert.deepStrictEqual(labels.shorten(['x:\\a\\b', 'x:\\a\\c']), ['x:\\…\\b', 'x:\\…\\c']);
+		assert.deepStrictEqual(labels.shorten(['\\\\a\\b', '\\\\a\\c']), ['\\\\a\\b', '\\\\a\\c']);
 
 		// same ending
-		assert.deepEqual(labels.shorten(['a', 'b\\a']), ['a', 'b\\…']);
-		assert.deepEqual(labels.shorten(['a\\b\\c', 'd\\b\\c']), ['a\\…', 'd\\…']);
-		assert.deepEqual(labels.shorten(['a\\b\\c\\d', 'f\\b\\c\\d']), ['a\\…', 'f\\…']);
-		assert.deepEqual(labels.shorten(['d\\e\\a\\b\\c', 'd\\b\\c']), ['…\\a\\…', 'd\\b\\…']);
-		assert.deepEqual(labels.shorten(['a\\b\\c\\d', 'a\\f\\b\\c\\d']), ['a\\b\\…', '…\\f\\…']);
-		assert.deepEqual(labels.shorten(['a\\b\\a', 'b\\b\\a']), ['a\\b\\…', 'b\\b\\…']);
-		assert.deepEqual(labels.shorten(['d\\f\\a\\b\\c', 'h\\d\\b\\c']), ['…\\a\\…', 'h\\…']);
-		assert.deepEqual(labels.shorten(['a\\b\\c', 'x:\\0\\a\\b\\c']), ['a\\b\\c', 'x:\\0\\…']);
-		assert.deepEqual(labels.shorten(['x:\\a\\b\\c', 'x:\\0\\a\\b\\c']), ['x:\\a\\…', 'x:\\0\\…']);
-		assert.deepEqual(labels.shorten(['x:\\a\\b', 'y:\\a\\b']), ['x:\\…', 'y:\\…']);
-		assert.deepEqual(labels.shorten(['x:\\a', 'x:\\c']), ['x:\\a', 'x:\\c']);
-		assert.deepEqual(labels.shorten(['x:\\a\\b', 'y:\\x\\a\\b']), ['x:\\…', 'y:\\…']);
-		assert.deepEqual(labels.shorten(['\\\\x\\b', '\\\\y\\b']), ['\\\\x\\…', '\\\\y\\…']);
-		assert.deepEqual(labels.shorten(['\\\\x\\a', '\\\\x\\b']), ['\\\\x\\a', '\\\\x\\b']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b\\a']), ['a', 'b\\…']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c', 'd\\b\\c']), ['a\\…', 'd\\…']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c\\d', 'f\\b\\c\\d']), ['a\\…', 'f\\…']);
+		assert.deepStrictEqual(labels.shorten(['d\\e\\a\\b\\c', 'd\\b\\c']), ['…\\a\\…', 'd\\b\\…']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c\\d', 'a\\f\\b\\c\\d']), ['a\\b\\…', '…\\f\\…']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\a', 'b\\b\\a']), ['a\\b\\…', 'b\\b\\…']);
+		assert.deepStrictEqual(labels.shorten(['d\\f\\a\\b\\c', 'h\\d\\b\\c']), ['…\\a\\…', 'h\\…']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c', 'x:\\0\\a\\b\\c']), ['a\\b\\c', 'x:\\0\\…']);
+		assert.deepStrictEqual(labels.shorten(['x:\\a\\b\\c', 'x:\\0\\a\\b\\c']), ['x:\\a\\…', 'x:\\0\\…']);
+		assert.deepStrictEqual(labels.shorten(['x:\\a\\b', 'y:\\a\\b']), ['x:\\…', 'y:\\…']);
+		assert.deepStrictEqual(labels.shorten(['x:\\a', 'x:\\c']), ['x:\\a', 'x:\\c']);
+		assert.deepStrictEqual(labels.shorten(['x:\\a\\b', 'y:\\x\\a\\b']), ['x:\\…', 'y:\\…']);
+		assert.deepStrictEqual(labels.shorten(['\\\\x\\b', '\\\\y\\b']), ['\\\\x\\…', '\\\\y\\…']);
+		assert.deepStrictEqual(labels.shorten(['\\\\x\\a', '\\\\x\\b']), ['\\\\x\\a', '\\\\x\\b']);
 
 		// same name ending
-		assert.deepEqual(labels.shorten(['a\\b', 'a\\c', 'a\\e-b']), ['…\\b', '…\\c', '…\\e-b']);
+		assert.deepStrictEqual(labels.shorten(['a\\b', 'a\\c', 'a\\e-b']), ['…\\b', '…\\c', '…\\e-b']);
 
 		// same in the middle
-		assert.deepEqual(labels.shorten(['a\\b\\c', 'd\\b\\e']), ['…\\c', '…\\e']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c', 'd\\b\\e']), ['…\\c', '…\\e']);
 
 		// case-sensetive
-		assert.deepEqual(labels.shorten(['a\\b\\c', 'd\\b\\C']), ['…\\c', '…\\C']);
+		assert.deepStrictEqual(labels.shorten(['a\\b\\c', 'd\\b\\C']), ['…\\c', '…\\C']);
 
 		// empty or null
-		assert.deepEqual(labels.shorten(['', null!]), ['.\\', null]);
+		assert.deepStrictEqual(labels.shorten(['', null!]), ['.\\', null]);
 
-		assert.deepEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']), ['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']);
-		assert.deepEqual(labels.shorten(['a', 'a\\b', 'b']), ['a', 'a\\b', 'b']);
-		assert.deepEqual(labels.shorten(['', 'a', 'b', 'b\\c', 'a\\c']), ['.\\', 'a', 'b', 'b\\c', 'a\\c']);
-		assert.deepEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-browser', 'src\\vs\\workbench\\parts\\execution\\electron-browser\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-browser']), ['…\\execution\\electron-browser', '…\\something', '…\\terminal\\…']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']), ['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'b']), ['a', 'a\\b', 'b']);
+		assert.deepStrictEqual(labels.shorten(['', 'a', 'b', 'b\\c', 'a\\c']), ['.\\', 'a', 'b', 'b\\c', 'a\\c']);
+		assert.deepStrictEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-browser', 'src\\vs\\workbench\\parts\\execution\\electron-browser\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-browser']), ['…\\execution\\electron-browser', '…\\something', '…\\terminal\\…']);
 	});
 
-	test('shorten - not windows', () => {
-		if (platform.isWindows) {
-			assert.ok(true);
-			return;
-		}
+	(platform.isWindows ? test.skip : test)('shorten - not windows', () => {
 
 		// nothing to shorten
-		assert.deepEqual(labels.shorten(['a']), ['a']);
-		assert.deepEqual(labels.shorten(['a', 'b']), ['a', 'b']);
-		assert.deepEqual(labels.shorten(['a', 'b', 'c']), ['a', 'b', 'c']);
+		assert.deepStrictEqual(labels.shorten(['a']), ['a']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b']), ['a', 'b']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b', 'c']), ['a', 'b', 'c']);
 
 		// completely different paths
-		assert.deepEqual(labels.shorten(['a/b', 'c/d', 'e/f']), ['…/b', '…/d', '…/f']);
+		assert.deepStrictEqual(labels.shorten(['a/b', 'c/d', 'e/f']), ['…/b', '…/d', '…/f']);
 
 		// same beginning
-		assert.deepEqual(labels.shorten(['a', 'a/b']), ['a', '…/b']);
-		assert.deepEqual(labels.shorten(['a/b', 'a/b/c']), ['…/b', '…/c']);
-		assert.deepEqual(labels.shorten(['a', 'a/b', 'a/b/c']), ['a', '…/b', '…/c']);
-		assert.deepEqual(labels.shorten(['/a/b', '/a/c']), ['/a/b', '/a/c']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a/b']), ['a', '…/b']);
+		assert.deepStrictEqual(labels.shorten(['a/b', 'a/b/c']), ['…/b', '…/c']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a/b', 'a/b/c']), ['a', '…/b', '…/c']);
+		assert.deepStrictEqual(labels.shorten(['/a/b', '/a/c']), ['/a/b', '/a/c']);
 
 		// same ending
-		assert.deepEqual(labels.shorten(['a', 'b/a']), ['a', 'b/…']);
-		assert.deepEqual(labels.shorten(['a/b/c', 'd/b/c']), ['a/…', 'd/…']);
-		assert.deepEqual(labels.shorten(['a/b/c/d', 'f/b/c/d']), ['a/…', 'f/…']);
-		assert.deepEqual(labels.shorten(['d/e/a/b/c', 'd/b/c']), ['…/a/…', 'd/b/…']);
-		assert.deepEqual(labels.shorten(['a/b/c/d', 'a/f/b/c/d']), ['a/b/…', '…/f/…']);
-		assert.deepEqual(labels.shorten(['a/b/a', 'b/b/a']), ['a/b/…', 'b/b/…']);
-		assert.deepEqual(labels.shorten(['d/f/a/b/c', 'h/d/b/c']), ['…/a/…', 'h/…']);
-		assert.deepEqual(labels.shorten(['/x/b', '/y/b']), ['/x/…', '/y/…']);
+		assert.deepStrictEqual(labels.shorten(['a', 'b/a']), ['a', 'b/…']);
+		assert.deepStrictEqual(labels.shorten(['a/b/c', 'd/b/c']), ['a/…', 'd/…']);
+		assert.deepStrictEqual(labels.shorten(['a/b/c/d', 'f/b/c/d']), ['a/…', 'f/…']);
+		assert.deepStrictEqual(labels.shorten(['d/e/a/b/c', 'd/b/c']), ['…/a/…', 'd/b/…']);
+		assert.deepStrictEqual(labels.shorten(['a/b/c/d', 'a/f/b/c/d']), ['a/b/…', '…/f/…']);
+		assert.deepStrictEqual(labels.shorten(['a/b/a', 'b/b/a']), ['a/b/…', 'b/b/…']);
+		assert.deepStrictEqual(labels.shorten(['d/f/a/b/c', 'h/d/b/c']), ['…/a/…', 'h/…']);
+		assert.deepStrictEqual(labels.shorten(['/x/b', '/y/b']), ['/x/…', '/y/…']);
 
 		// same name ending
-		assert.deepEqual(labels.shorten(['a/b', 'a/c', 'a/e-b']), ['…/b', '…/c', '…/e-b']);
+		assert.deepStrictEqual(labels.shorten(['a/b', 'a/c', 'a/e-b']), ['…/b', '…/c', '…/e-b']);
 
 		// same in the middle
-		assert.deepEqual(labels.shorten(['a/b/c', 'd/b/e']), ['…/c', '…/e']);
+		assert.deepStrictEqual(labels.shorten(['a/b/c', 'd/b/e']), ['…/c', '…/e']);
 
 		// case-sensitive
-		assert.deepEqual(labels.shorten(['a/b/c', 'd/b/C']), ['…/c', '…/C']);
+		assert.deepStrictEqual(labels.shorten(['a/b/c', 'd/b/C']), ['…/c', '…/C']);
 
 		// empty or null
-		assert.deepEqual(labels.shorten(['', null!]), ['./', null]);
+		assert.deepStrictEqual(labels.shorten(['', null!]), ['./', null]);
 
-		assert.deepEqual(labels.shorten(['a', 'a/b', 'a/b/c', 'd/b/c', 'd/b']), ['a', 'a/b', 'a/b/c', 'd/b/c', 'd/b']);
-		assert.deepEqual(labels.shorten(['a', 'a/b', 'b']), ['a', 'a/b', 'b']);
-		assert.deepEqual(labels.shorten(['', 'a', 'b', 'b/c', 'a/c']), ['./', 'a', 'b', 'b/c', 'a/c']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a/b', 'a/b/c', 'd/b/c', 'd/b']), ['a', 'a/b', 'a/b/c', 'd/b/c', 'd/b']);
+		assert.deepStrictEqual(labels.shorten(['a', 'a/b', 'b']), ['a', 'a/b', 'b']);
+		assert.deepStrictEqual(labels.shorten(['', 'a', 'b', 'b/c', 'a/c']), ['./', 'a', 'b', 'b/c', 'a/c']);
 	});
 
 	test('template', () => {
@@ -142,41 +134,32 @@ suite('Labels', () => {
 		assert.strictEqual(labels.template(t, { dirty: '* ', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), '* somefile.txt - monaco - Visual Studio Code');
 	});
 
-	test('getBaseLabel - unix', () => {
-		if (platform.isWindows) {
-			assert.ok(true);
-			return;
-		}
-
-		assert.equal(labels.getBaseLabel('/some/folder/file.txt'), 'file.txt');
-		assert.equal(labels.getBaseLabel('/some/folder'), 'folder');
-		assert.equal(labels.getBaseLabel('/'), '/');
+	(platform.isWindows ? test.skip : test)('getBaseLabel - unix', () => {
+		assert.strictEqual(labels.getBaseLabel('/some/folder/file.txt'), 'file.txt');
+		assert.strictEqual(labels.getBaseLabel('/some/folder'), 'folder');
+		assert.strictEqual(labels.getBaseLabel('/'), '/');
 	});
 
-	test('getBaseLabel - windows', () => {
-		if (!platform.isWindows) {
-			assert.ok(true);
-			return;
-		}
-
-		assert.equal(labels.getBaseLabel('c:'), 'C:');
-		assert.equal(labels.getBaseLabel('c:\\'), 'C:');
-		assert.equal(labels.getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
-		assert.equal(labels.getBaseLabel('c:\\some\\folder'), 'folder');
+	(!platform.isWindows ? test.skip : test)('getBaseLabel - windows', () => {
+		assert.strictEqual(labels.getBaseLabel('c:'), 'C:');
+		assert.strictEqual(labels.getBaseLabel('c:\\'), 'C:');
+		assert.strictEqual(labels.getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
+		assert.strictEqual(labels.getBaseLabel('c:\\some\\folder'), 'folder');
+		assert.strictEqual(labels.getBaseLabel('c:\\some\\f:older'), 'f:older'); // https://github.com/microsoft/vscode-remote-release/issues/4227
 	});
 
 	test('mnemonicButtonLabel', () => {
-		assert.equal(labels.mnemonicButtonLabel('Hello World'), 'Hello World');
-		assert.equal(labels.mnemonicButtonLabel(''), '');
+		assert.strictEqual(labels.mnemonicButtonLabel('Hello World'), 'Hello World');
+		assert.strictEqual(labels.mnemonicButtonLabel(''), '');
 		if (platform.isWindows) {
-			assert.equal(labels.mnemonicButtonLabel('Hello & World'), 'Hello && World');
-			assert.equal(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do &not Save && Continue');
+			assert.strictEqual(labels.mnemonicButtonLabel('Hello & World'), 'Hello && World');
+			assert.strictEqual(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do &not Save && Continue');
 		} else if (platform.isMacintosh) {
-			assert.equal(labels.mnemonicButtonLabel('Hello & World'), 'Hello & World');
-			assert.equal(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do not Save & Continue');
+			assert.strictEqual(labels.mnemonicButtonLabel('Hello & World'), 'Hello & World');
+			assert.strictEqual(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do not Save & Continue');
 		} else {
-			assert.equal(labels.mnemonicButtonLabel('Hello & World'), 'Hello & World');
-			assert.equal(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do _not Save & Continue');
+			assert.strictEqual(labels.mnemonicButtonLabel('Hello & World'), 'Hello & World');
+			assert.strictEqual(labels.mnemonicButtonLabel('Do &&not Save & Continue'), 'Do _not Save & Continue');
 		}
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/common/linkedList.test.ts b/src/vs/base/test/common/linkedList.test.ts
index dbb057a21..d4eb08320 100644
--- a/src/vs/base/test/common/linkedList.test.ts
+++ b/src/vs/base/test/common/linkedList.test.ts
@@ -11,19 +11,19 @@ suite('LinkedList', function () {
 	function assertElements<E>(list: LinkedList<E>, ...elements: E[]) {
 
 		// check size
-		assert.equal(list.size, elements.length);
+		assert.strictEqual(list.size, elements.length);
 
 		// assert toArray
-		assert.deepEqual(Array.from(list), elements);
+		assert.deepStrictEqual(Array.from(list), elements);
 
 		// assert Symbol.iterator (1)
-		assert.deepEqual([...list], elements);
+		assert.deepStrictEqual([...list], elements);
 
 		// assert Symbol.iterator (2)
 		for (const item of list) {
-			assert.equal(item, elements.shift());
+			assert.strictEqual(item, elements.shift());
 		}
-		assert.equal(elements.length, 0);
+		assert.strictEqual(elements.length, 0);
 	}
 
 	test('Push/Iter', () => {
@@ -123,14 +123,14 @@ suite('LinkedList', function () {
 		assertElements(list, 'a', 'b');
 
 		let a = list.shift();
-		assert.equal(a, 'a');
+		assert.strictEqual(a, 'a');
 		assertElements(list, 'b');
 
 		list.unshift('a');
 		assertElements(list, 'a', 'b');
 
 		let b = list.pop();
-		assert.equal(b, 'b');
+		assert.strictEqual(b, 'b');
 		assertElements(list, 'a');
 
 	});
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index 5781de52a..8988e8e68 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -16,8 +16,8 @@ suite('Map', () => {
 		map.set('bk', 'bv');
 		assert.deepStrictEqual([...map.keys()], ['ak', 'bk']);
 		assert.deepStrictEqual([...map.values()], ['av', 'bv']);
-		assert.equal(map.first, 'av');
-		assert.equal(map.last, 'bv');
+		assert.strictEqual(map.first, 'av');
+		assert.strictEqual(map.last, 'bv');
 	});
 
 	test('LinkedMap - Touch Old one', () => {
@@ -77,7 +77,7 @@ suite('Map', () => {
 	test('LinkedMap - basics', function () {
 		const map = new LinkedMap<string, any>();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 
 		map.set('1', 1);
 		map.set('2', '2');
@@ -89,23 +89,23 @@ suite('Map', () => {
 		const date = Date.now();
 		map.set('5', date);
 
-		assert.equal(map.size, 5);
-		assert.equal(map.get('1'), 1);
-		assert.equal(map.get('2'), '2');
-		assert.equal(map.get('3'), true);
-		assert.equal(map.get('4'), obj);
-		assert.equal(map.get('5'), date);
+		assert.strictEqual(map.size, 5);
+		assert.strictEqual(map.get('1'), 1);
+		assert.strictEqual(map.get('2'), '2');
+		assert.strictEqual(map.get('3'), true);
+		assert.strictEqual(map.get('4'), obj);
+		assert.strictEqual(map.get('5'), date);
 		assert.ok(!map.get('6'));
 
 		map.delete('6');
-		assert.equal(map.size, 5);
-		assert.equal(map.delete('1'), true);
-		assert.equal(map.delete('2'), true);
-		assert.equal(map.delete('3'), true);
-		assert.equal(map.delete('4'), true);
-		assert.equal(map.delete('5'), true);
+		assert.strictEqual(map.size, 5);
+		assert.strictEqual(map.delete('1'), true);
+		assert.strictEqual(map.delete('2'), true);
+		assert.strictEqual(map.delete('3'), true);
+		assert.strictEqual(map.delete('4'), true);
+		assert.strictEqual(map.delete('5'), true);
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 		assert.ok(!map.get('5'));
 		assert.ok(!map.get('4'));
 		assert.ok(!map.get('3'));
@@ -117,13 +117,13 @@ suite('Map', () => {
 		map.set('3', true);
 
 		assert.ok(map.has('1'));
-		assert.equal(map.get('1'), 1);
-		assert.equal(map.get('2'), '2');
-		assert.equal(map.get('3'), true);
+		assert.strictEqual(map.get('1'), 1);
+		assert.strictEqual(map.get('2'), '2');
+		assert.strictEqual(map.get('3'), true);
 
 		map.clear();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 		assert.ok(!map.get('1'));
 		assert.ok(!map.get('2'));
 		assert.ok(!map.get('3'));
@@ -231,7 +231,7 @@ suite('Map', () => {
 		for (let i = 11; i <= 20; i++) {
 			cache.set(i, i);
 		}
-		assert.deepEqual(cache.size, 15);
+		assert.deepStrictEqual(cache.size, 15);
 		let values: number[] = [];
 		for (let i = 6; i <= 20; i++) {
 			values.push(cache.get(i)!);
@@ -269,14 +269,14 @@ suite('Map', () => {
 		let i = 0;
 		map.forEach((value, key) => {
 			if (i === 0) {
-				assert.equal(key, 'ak');
-				assert.equal(value, 'av');
+				assert.strictEqual(key, 'ak');
+				assert.strictEqual(value, 'av');
 			} else if (i === 1) {
-				assert.equal(key, 'bk');
-				assert.equal(value, 'bv');
+				assert.strictEqual(key, 'bk');
+				assert.strictEqual(value, 'bv');
 			} else if (i === 2) {
-				assert.equal(key, 'ck');
-				assert.equal(value, 'cv');
+				assert.strictEqual(key, 'ck');
+				assert.strictEqual(value, 'cv');
 			}
 			i++;
 		});
@@ -285,44 +285,44 @@ suite('Map', () => {
 	test('LinkedMap - delete Head and Tail', function () {
 		const map = new LinkedMap<string, number>();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 
 		map.set('1', 1);
-		assert.equal(map.size, 1);
+		assert.strictEqual(map.size, 1);
 		map.delete('1');
-		assert.equal(map.get('1'), undefined);
-		assert.equal(map.size, 0);
-		assert.equal([...map.keys()].length, 0);
+		assert.strictEqual(map.get('1'), undefined);
+		assert.strictEqual(map.size, 0);
+		assert.strictEqual([...map.keys()].length, 0);
 	});
 
 	test('LinkedMap - delete Head', function () {
 		const map = new LinkedMap<string, number>();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 
 		map.set('1', 1);
 		map.set('2', 2);
-		assert.equal(map.size, 2);
+		assert.strictEqual(map.size, 2);
 		map.delete('1');
-		assert.equal(map.get('2'), 2);
-		assert.equal(map.size, 1);
-		assert.equal([...map.keys()].length, 1);
-		assert.equal([...map.keys()][0], 2);
+		assert.strictEqual(map.get('2'), 2);
+		assert.strictEqual(map.size, 1);
+		assert.strictEqual([...map.keys()].length, 1);
+		assert.strictEqual([...map.keys()][0], '2');
 	});
 
 	test('LinkedMap - delete Tail', function () {
 		const map = new LinkedMap<string, number>();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 
 		map.set('1', 1);
 		map.set('2', 2);
-		assert.equal(map.size, 2);
+		assert.strictEqual(map.size, 2);
 		map.delete('2');
-		assert.equal(map.get('1'), 1);
-		assert.equal(map.size, 1);
-		assert.equal([...map.keys()].length, 1);
-		assert.equal([...map.keys()][0], 1);
+		assert.strictEqual(map.get('1'), 1);
+		assert.strictEqual(map.size, 1);
+		assert.strictEqual([...map.keys()].length, 1);
+		assert.strictEqual([...map.keys()][0], '1');
 	});
 
 
@@ -330,100 +330,100 @@ suite('Map', () => {
 		const iter = new PathIterator();
 		iter.reset('file:///usr/bin/file.txt');
 
-		assert.equal(iter.value(), 'file:');
-		assert.equal(iter.hasNext(), true);
-		assert.equal(iter.cmp('file:'), 0);
+		assert.strictEqual(iter.value(), 'file:');
+		assert.strictEqual(iter.hasNext(), true);
+		assert.strictEqual(iter.cmp('file:'), 0);
 		assert.ok(iter.cmp('a') < 0);
 		assert.ok(iter.cmp('aile:') < 0);
 		assert.ok(iter.cmp('z') > 0);
 		assert.ok(iter.cmp('zile:') > 0);
 
 		iter.next();
-		assert.equal(iter.value(), 'usr');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'usr');
+		assert.strictEqual(iter.hasNext(), true);
 
 		iter.next();
-		assert.equal(iter.value(), 'bin');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'bin');
+		assert.strictEqual(iter.hasNext(), true);
 
 		iter.next();
-		assert.equal(iter.value(), 'file.txt');
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), 'file.txt');
+		assert.strictEqual(iter.hasNext(), false);
 
 		iter.next();
-		assert.equal(iter.value(), '');
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), '');
+		assert.strictEqual(iter.hasNext(), false);
 		iter.next();
-		assert.equal(iter.value(), '');
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), '');
+		assert.strictEqual(iter.hasNext(), false);
 
 		//
 		iter.reset('/foo/bar/');
-		assert.equal(iter.value(), 'foo');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'foo');
+		assert.strictEqual(iter.hasNext(), true);
 
 		iter.next();
-		assert.equal(iter.value(), 'bar');
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), 'bar');
+		assert.strictEqual(iter.hasNext(), false);
 	});
 
 	test('URIIterator', function () {
 		const iter = new UriIterator(() => false);
 		iter.reset(URI.parse('file:///usr/bin/file.txt'));
 
-		assert.equal(iter.value(), 'file');
-		// assert.equal(iter.cmp('FILE'), 0);
-		assert.equal(iter.cmp('file'), 0);
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'file');
+		// assert.strictEqual(iter.cmp('FILE'), 0);
+		assert.strictEqual(iter.cmp('file'), 0);
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
-		assert.equal(iter.value(), 'usr');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'usr');
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
-		assert.equal(iter.value(), 'bin');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'bin');
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
-		assert.equal(iter.value(), 'file.txt');
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), 'file.txt');
+		assert.strictEqual(iter.hasNext(), false);
 
 
 		iter.reset(URI.parse('file://share/usr/bin/file.txt?foo'));
 
 		// scheme
-		assert.equal(iter.value(), 'file');
-		// assert.equal(iter.cmp('FILE'), 0);
-		assert.equal(iter.cmp('file'), 0);
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'file');
+		// assert.strictEqual(iter.cmp('FILE'), 0);
+		assert.strictEqual(iter.cmp('file'), 0);
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
 		// authority
-		assert.equal(iter.value(), 'share');
-		assert.equal(iter.cmp('SHARe'), 0);
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'share');
+		assert.strictEqual(iter.cmp('SHARe'), 0);
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
 		// path
-		assert.equal(iter.value(), 'usr');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'usr');
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
 		// path
-		assert.equal(iter.value(), 'bin');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'bin');
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
 		// path
-		assert.equal(iter.value(), 'file.txt');
-		assert.equal(iter.hasNext(), true);
+		assert.strictEqual(iter.value(), 'file.txt');
+		assert.strictEqual(iter.hasNext(), true);
 		iter.next();
 
 		// query
-		assert.equal(iter.value(), 'foo');
-		assert.equal(iter.cmp('z') > 0, true);
-		assert.equal(iter.cmp('a') < 0, true);
-		assert.equal(iter.hasNext(), false);
+		assert.strictEqual(iter.value(), 'foo');
+		assert.strictEqual(iter.cmp('z') > 0, true);
+		assert.strictEqual(iter.cmp('a') < 0, true);
+		assert.strictEqual(iter.hasNext(), false);
 	});
 
 	function assertTernarySearchTree<E>(trie: TernarySearchTree<string, E>, ...elements: [string, E][]) {
@@ -432,24 +432,24 @@ suite('Map', () => {
 			map.set(key, value);
 		}
 		map.forEach((value, key) => {
-			assert.equal(trie.get(key), value);
+			assert.strictEqual(trie.get(key), value);
 		});
 
 		// forEach
 		let forEachCount = 0;
 		trie.forEach((element, key) => {
-			assert.equal(element, map.get(key));
+			assert.strictEqual(element, map.get(key));
 			forEachCount++;
 		});
-		assert.equal(map.size, forEachCount);
+		assert.strictEqual(map.size, forEachCount);
 
 		// iterator
 		let iterCount = 0;
 		for (let [key, value] of trie) {
-			assert.equal(value, map.get(key));
+			assert.strictEqual(value, map.get(key));
 			iterCount++;
 		}
-		assert.equal(map.size, iterCount);
+		assert.strictEqual(map.size, iterCount);
 	}
 
 	test('TernarySearchTree - set', function () {
@@ -493,13 +493,13 @@ suite('Map', () => {
 		trie.set('foobar', 2);
 		trie.set('foobaz', 3);
 
-		assert.equal(trie.findSubstr('f'), undefined);
-		assert.equal(trie.findSubstr('z'), undefined);
-		assert.equal(trie.findSubstr('foo'), 1);
-		assert.equal(trie.findSubstr('fooö'), 1);
-		assert.equal(trie.findSubstr('fooba'), 1);
-		assert.equal(trie.findSubstr('foobarr'), 2);
-		assert.equal(trie.findSubstr('foobazrr'), 3);
+		assert.strictEqual(trie.findSubstr('f'), undefined);
+		assert.strictEqual(trie.findSubstr('z'), undefined);
+		assert.strictEqual(trie.findSubstr('foo'), 1);
+		assert.strictEqual(trie.findSubstr('fooö'), 1);
+		assert.strictEqual(trie.findSubstr('fooba'), 1);
+		assert.strictEqual(trie.findSubstr('foobarr'), 2);
+		assert.strictEqual(trie.findSubstr('foobazrr'), 3);
 	});
 
 	test('TernarySearchTree - basics', function () {
@@ -509,27 +509,27 @@ suite('Map', () => {
 		trie.set('bar', 2);
 		trie.set('foobar', 3);
 
-		assert.equal(trie.get('foo'), 1);
-		assert.equal(trie.get('bar'), 2);
-		assert.equal(trie.get('foobar'), 3);
-		assert.equal(trie.get('foobaz'), undefined);
-		assert.equal(trie.get('foobarr'), undefined);
+		assert.strictEqual(trie.get('foo'), 1);
+		assert.strictEqual(trie.get('bar'), 2);
+		assert.strictEqual(trie.get('foobar'), 3);
+		assert.strictEqual(trie.get('foobaz'), undefined);
+		assert.strictEqual(trie.get('foobarr'), undefined);
 
-		assert.equal(trie.findSubstr('fo'), undefined);
-		assert.equal(trie.findSubstr('foo'), 1);
-		assert.equal(trie.findSubstr('foooo'), 1);
+		assert.strictEqual(trie.findSubstr('fo'), undefined);
+		assert.strictEqual(trie.findSubstr('foo'), 1);
+		assert.strictEqual(trie.findSubstr('foooo'), 1);
 
 
 		trie.delete('foobar');
 		trie.delete('bar');
-		assert.equal(trie.get('foobar'), undefined);
-		assert.equal(trie.get('bar'), undefined);
+		assert.strictEqual(trie.get('foobar'), undefined);
+		assert.strictEqual(trie.get('bar'), undefined);
 
 		trie.set('foobar', 17);
 		trie.set('barr', 18);
-		assert.equal(trie.get('foobar'), 17);
-		assert.equal(trie.get('barr'), 18);
-		assert.equal(trie.get('bar'), undefined);
+		assert.strictEqual(trie.get('foobar'), 17);
+		assert.strictEqual(trie.get('barr'), 18);
+		assert.strictEqual(trie.get('bar'), undefined);
 	});
 
 	test('TernarySearchTree - delete & cleanup', function () {
@@ -576,20 +576,20 @@ suite('Map', () => {
 		trie.set('/user/foo', 2);
 		trie.set('/user/foo/flip/flop', 3);
 
-		assert.equal(trie.get('/user/foo/bar'), 1);
-		assert.equal(trie.get('/user/foo'), 2);
-		assert.equal(trie.get('/user//foo'), 2);
-		assert.equal(trie.get('/user\\foo'), 2);
-		assert.equal(trie.get('/user/foo/flip/flop'), 3);
+		assert.strictEqual(trie.get('/user/foo/bar'), 1);
+		assert.strictEqual(trie.get('/user/foo'), 2);
+		assert.strictEqual(trie.get('/user//foo'), 2);
+		assert.strictEqual(trie.get('/user\\foo'), 2);
+		assert.strictEqual(trie.get('/user/foo/flip/flop'), 3);
 
-		assert.equal(trie.findSubstr('/user/bar'), undefined);
-		assert.equal(trie.findSubstr('/user/foo'), 2);
-		assert.equal(trie.findSubstr('\\user\\foo'), 2);
-		assert.equal(trie.findSubstr('/user//foo'), 2);
-		assert.equal(trie.findSubstr('/user/foo/ba'), 2);
-		assert.equal(trie.findSubstr('/user/foo/far/boo'), 2);
-		assert.equal(trie.findSubstr('/user/foo/bar'), 1);
-		assert.equal(trie.findSubstr('/user/foo/bar/far/boo'), 1);
+		assert.strictEqual(trie.findSubstr('/user/bar'), undefined);
+		assert.strictEqual(trie.findSubstr('/user/foo'), 2);
+		assert.strictEqual(trie.findSubstr('\\user\\foo'), 2);
+		assert.strictEqual(trie.findSubstr('/user//foo'), 2);
+		assert.strictEqual(trie.findSubstr('/user/foo/ba'), 2);
+		assert.strictEqual(trie.findSubstr('/user/foo/far/boo'), 2);
+		assert.strictEqual(trie.findSubstr('/user/foo/bar'), 1);
+		assert.strictEqual(trie.findSubstr('/user/foo/bar/far/boo'), 1);
 	});
 
 	test('TernarySearchTree (PathSegments) - lookup', function () {
@@ -599,11 +599,11 @@ suite('Map', () => {
 		map.set('/user/foo', 2);
 		map.set('/user/foo/flip/flop', 3);
 
-		assert.equal(map.get('/foo'), undefined);
-		assert.equal(map.get('/user'), undefined);
-		assert.equal(map.get('/user/foo'), 2);
-		assert.equal(map.get('/user/foo/bar'), 1);
-		assert.equal(map.get('/user/foo/bar/boo'), undefined);
+		assert.strictEqual(map.get('/foo'), undefined);
+		assert.strictEqual(map.get('/user'), undefined);
+		assert.strictEqual(map.get('/user/foo'), 2);
+		assert.strictEqual(map.get('/user/foo/bar'), 1);
+		assert.strictEqual(map.get('/user/foo/bar/boo'), undefined);
 	});
 
 	test('TernarySearchTree (PathSegments) - superstr', function () {
@@ -618,31 +618,31 @@ suite('Map', () => {
 		let iter = map.findSuperstr('/user');
 
 		item = iter!.next();
-		assert.equal(item.value[1], 2);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 2);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value[1], 1);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 1);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value[1], 3);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 3);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
 		iter = map.findSuperstr('/usr');
 		item = iter!.next();
-		assert.equal(item.value[1], 4);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 4);
+		assert.strictEqual(item.done, false);
 
 		item = iter!.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
-		assert.equal(map.findSuperstr('/not'), undefined);
-		assert.equal(map.findSuperstr('/us'), undefined);
-		assert.equal(map.findSuperstr('/usrr'), undefined);
-		assert.equal(map.findSuperstr('/userr'), undefined);
+		assert.strictEqual(map.findSuperstr('/not'), undefined);
+		assert.strictEqual(map.findSuperstr('/us'), undefined);
+		assert.strictEqual(map.findSuperstr('/usrr'), undefined);
+		assert.strictEqual(map.findSuperstr('/userr'), undefined);
 	});
 
 
@@ -688,16 +688,16 @@ suite('Map', () => {
 		trie.set(URI.file('/user/foo'), 2);
 		trie.set(URI.file('/user/foo/flip/flop'), 3);
 
-		assert.equal(trie.get(URI.file('/user/foo/bar')), 1);
-		assert.equal(trie.get(URI.file('/user/foo')), 2);
-		assert.equal(trie.get(URI.file('/user/foo/flip/flop')), 3);
+		assert.strictEqual(trie.get(URI.file('/user/foo/bar')), 1);
+		assert.strictEqual(trie.get(URI.file('/user/foo')), 2);
+		assert.strictEqual(trie.get(URI.file('/user/foo/flip/flop')), 3);
 
-		assert.equal(trie.findSubstr(URI.file('/user/bar')), undefined);
-		assert.equal(trie.findSubstr(URI.file('/user/foo')), 2);
-		assert.equal(trie.findSubstr(URI.file('/user/foo/ba')), 2);
-		assert.equal(trie.findSubstr(URI.file('/user/foo/far/boo')), 2);
-		assert.equal(trie.findSubstr(URI.file('/user/foo/bar')), 1);
-		assert.equal(trie.findSubstr(URI.file('/user/foo/bar/far/boo')), 1);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/bar')), undefined);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/foo')), 2);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/foo/ba')), 2);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/foo/far/boo')), 2);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar')), 1);
+		assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar/far/boo')), 1);
 	});
 
 	test('TernarySearchTree (URI) - lookup', function () {
@@ -708,23 +708,23 @@ suite('Map', () => {
 		map.set(URI.parse('http://foo.bar/user/foo?QUERY'), 3);
 		map.set(URI.parse('http://foo.bar/user/foo/flip/flop'), 3);
 
-		assert.equal(map.get(URI.parse('http://foo.bar/foo')), undefined);
-		assert.equal(map.get(URI.parse('http://foo.bar/user')), undefined);
-		assert.equal(map.get(URI.parse('http://foo.bar/user/foo/bar')), 1);
-		assert.equal(map.get(URI.parse('http://foo.bar/user/foo?query')), 2);
-		assert.equal(map.get(URI.parse('http://foo.bar/user/foo?Query')), undefined);
-		assert.equal(map.get(URI.parse('http://foo.bar/user/foo?QUERY')), 3);
-		assert.equal(map.get(URI.parse('http://foo.bar/user/foo/bar/boo')), undefined);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/foo')), undefined);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user')), undefined);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar')), 1);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?query')), 2);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?Query')), undefined);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?QUERY')), 3);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar/boo')), undefined);
 	});
 
 	test('TernarySearchTree (URI) - lookup, casing', function () {
 
 		const map = new TernarySearchTree<URI, number>(new UriIterator(uri => /^https?$/.test(uri.scheme)));
 		map.set(URI.parse('http://foo.bar/user/foo/bar'), 1);
-		assert.equal(map.get(URI.parse('http://foo.bar/USER/foo/bar')), 1);
+		assert.strictEqual(map.get(URI.parse('http://foo.bar/USER/foo/bar')), 1);
 
 		map.set(URI.parse('foo://foo.bar/user/foo/bar'), 1);
-		assert.equal(map.get(URI.parse('foo://foo.bar/USER/foo/bar')), undefined);
+		assert.strictEqual(map.get(URI.parse('foo://foo.bar/USER/foo/bar')), undefined);
 	});
 
 	test('TernarySearchTree (URI) - superstr', function () {
@@ -739,48 +739,48 @@ suite('Map', () => {
 		let iter = map.findSuperstr(URI.file('/user'))!;
 
 		item = iter.next();
-		assert.equal(item.value[1], 2);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 2);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value[1], 1);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 1);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value[1], 3);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 3);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
 		iter = map.findSuperstr(URI.file('/usr'))!;
 		item = iter.next();
-		assert.equal(item.value[1], 4);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 4);
+		assert.strictEqual(item.done, false);
 
 		item = iter.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
 		iter = map.findSuperstr(URI.file('/'))!;
 		item = iter.next();
-		assert.equal(item.value[1], 2);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 2);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value[1], 1);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 1);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value[1], 3);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 3);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value[1], 4);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 4);
+		assert.strictEqual(item.done, false);
 		item = iter.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
-		assert.equal(map.findSuperstr(URI.file('/not')), undefined);
-		assert.equal(map.findSuperstr(URI.file('/us')), undefined);
-		assert.equal(map.findSuperstr(URI.file('/usrr')), undefined);
-		assert.equal(map.findSuperstr(URI.file('/userr')), undefined);
+		assert.strictEqual(map.findSuperstr(URI.file('/not')), undefined);
+		assert.strictEqual(map.findSuperstr(URI.file('/us')), undefined);
+		assert.strictEqual(map.findSuperstr(URI.file('/usrr')), undefined);
+		assert.strictEqual(map.findSuperstr(URI.file('/userr')), undefined);
 	});
 
 	test('TernarySearchTree (ConfigKeySegments) - basics', function () {
@@ -790,16 +790,16 @@ suite('Map', () => {
 		trie.set('config.foo', 2);
 		trie.set('config.foo.flip.flop', 3);
 
-		assert.equal(trie.get('config.foo.bar'), 1);
-		assert.equal(trie.get('config.foo'), 2);
-		assert.equal(trie.get('config.foo.flip.flop'), 3);
+		assert.strictEqual(trie.get('config.foo.bar'), 1);
+		assert.strictEqual(trie.get('config.foo'), 2);
+		assert.strictEqual(trie.get('config.foo.flip.flop'), 3);
 
-		assert.equal(trie.findSubstr('config.bar'), undefined);
-		assert.equal(trie.findSubstr('config.foo'), 2);
-		assert.equal(trie.findSubstr('config.foo.ba'), 2);
-		assert.equal(trie.findSubstr('config.foo.far.boo'), 2);
-		assert.equal(trie.findSubstr('config.foo.bar'), 1);
-		assert.equal(trie.findSubstr('config.foo.bar.far.boo'), 1);
+		assert.strictEqual(trie.findSubstr('config.bar'), undefined);
+		assert.strictEqual(trie.findSubstr('config.foo'), 2);
+		assert.strictEqual(trie.findSubstr('config.foo.ba'), 2);
+		assert.strictEqual(trie.findSubstr('config.foo.far.boo'), 2);
+		assert.strictEqual(trie.findSubstr('config.foo.bar'), 1);
+		assert.strictEqual(trie.findSubstr('config.foo.bar.far.boo'), 1);
 	});
 
 	test('TernarySearchTree (ConfigKeySegments) - lookup', function () {
@@ -809,11 +809,11 @@ suite('Map', () => {
 		map.set('config.foo', 2);
 		map.set('config.foo.flip.flop', 3);
 
-		assert.equal(map.get('foo'), undefined);
-		assert.equal(map.get('config'), undefined);
-		assert.equal(map.get('config.foo'), 2);
-		assert.equal(map.get('config.foo.bar'), 1);
-		assert.equal(map.get('config.foo.bar.boo'), undefined);
+		assert.strictEqual(map.get('foo'), undefined);
+		assert.strictEqual(map.get('config'), undefined);
+		assert.strictEqual(map.get('config.foo'), 2);
+		assert.strictEqual(map.get('config.foo.bar'), 1);
+		assert.strictEqual(map.get('config.foo.bar.boo'), undefined);
 	});
 
 	test('TernarySearchTree (ConfigKeySegments) - superstr', function () {
@@ -828,21 +828,21 @@ suite('Map', () => {
 		let iter = map.findSuperstr('config');
 
 		item = iter!.next();
-		assert.equal(item.value[1], 2);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 2);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value[1], 1);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 1);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value[1], 3);
-		assert.equal(item.done, false);
+		assert.strictEqual(item.value[1], 3);
+		assert.strictEqual(item.done, false);
 		item = iter!.next();
-		assert.equal(item.value, undefined);
-		assert.equal(item.done, true);
+		assert.strictEqual(item.value, undefined);
+		assert.strictEqual(item.done, true);
 
-		assert.equal(map.findSuperstr('foo'), undefined);
-		assert.equal(map.findSuperstr('config.foo.no'), undefined);
-		assert.equal(map.findSuperstr('config.foop'), undefined);
+		assert.strictEqual(map.findSuperstr('foo'), undefined);
+		assert.strictEqual(map.findSuperstr('config.foo.no'), undefined);
+		assert.strictEqual(map.findSuperstr('config.foop'), undefined);
 	});
 
 
@@ -891,7 +891,7 @@ suite('Map', () => {
 		const resource5 = URI.parse('some://5');
 		const resource6 = URI.parse('some://6');
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 
 		let res = map.set(resource1, 1);
 		assert.ok(res === map);
@@ -899,13 +899,13 @@ suite('Map', () => {
 		map.set(resource3, true);
 
 		const values = [...map.values()];
-		assert.equal(values[0], 1);
-		assert.equal(values[1], '2');
-		assert.equal(values[2], true);
+		assert.strictEqual(values[0], 1);
+		assert.strictEqual(values[1], '2');
+		assert.strictEqual(values[2], true);
 
 		let counter = 0;
 		map.forEach((value, key, mapObj) => {
-			assert.equal(value, values[counter++]);
+			assert.strictEqual(value, values[counter++]);
 			assert.ok(URI.isUri(key));
 			assert.ok(map === mapObj);
 		});
@@ -916,23 +916,23 @@ suite('Map', () => {
 		const date = Date.now();
 		map.set(resource5, date);
 
-		assert.equal(map.size, 5);
-		assert.equal(map.get(resource1), 1);
-		assert.equal(map.get(resource2), '2');
-		assert.equal(map.get(resource3), true);
-		assert.equal(map.get(resource4), obj);
-		assert.equal(map.get(resource5), date);
+		assert.strictEqual(map.size, 5);
+		assert.strictEqual(map.get(resource1), 1);
+		assert.strictEqual(map.get(resource2), '2');
+		assert.strictEqual(map.get(resource3), true);
+		assert.strictEqual(map.get(resource4), obj);
+		assert.strictEqual(map.get(resource5), date);
 		assert.ok(!map.get(resource6));
 
 		map.delete(resource6);
-		assert.equal(map.size, 5);
+		assert.strictEqual(map.size, 5);
 		assert.ok(map.delete(resource1));
 		assert.ok(map.delete(resource2));
 		assert.ok(map.delete(resource3));
 		assert.ok(map.delete(resource4));
 		assert.ok(map.delete(resource5));
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 		assert.ok(!map.get(resource5));
 		assert.ok(!map.get(resource4));
 		assert.ok(!map.get(resource3));
@@ -944,13 +944,13 @@ suite('Map', () => {
 		map.set(resource3, true);
 
 		assert.ok(map.has(resource1));
-		assert.equal(map.get(resource1), 1);
-		assert.equal(map.get(resource2), '2');
-		assert.equal(map.get(resource3), true);
+		assert.strictEqual(map.get(resource1), 1);
+		assert.strictEqual(map.get(resource2), '2');
+		assert.strictEqual(map.get(resource3), true);
 
 		map.clear();
 
-		assert.equal(map.size, 0);
+		assert.strictEqual(map.size, 0);
 		assert.ok(!map.get(resource1));
 		assert.ok(!map.get(resource2));
 		assert.ok(!map.get(resource3));
@@ -971,16 +971,16 @@ suite('Map', () => {
 		const fileAUpper = URI.parse('file://SOME/FILEA');
 
 		map.set(fileA, 'true');
-		assert.equal(map.get(fileA), 'true');
+		assert.strictEqual(map.get(fileA), 'true');
 
 		assert.ok(!map.get(fileAUpper));
 
 		assert.ok(!map.get(fileB));
 
 		map.set(fileAUpper, 'false');
-		assert.equal(map.get(fileAUpper), 'false');
+		assert.strictEqual(map.get(fileAUpper), 'false');
 
-		assert.equal(map.get(fileA), 'true');
+		assert.strictEqual(map.get(fileA), 'true');
 
 		const windowsFile = URI.file('c:\\test with %25\\c#code');
 		const uncFile = URI.file('\\\\shäres\\path\\c#\\plugin.json');
@@ -988,8 +988,8 @@ suite('Map', () => {
 		map.set(windowsFile, 'true');
 		map.set(uncFile, 'true');
 
-		assert.equal(map.get(windowsFile), 'true');
-		assert.equal(map.get(uncFile), 'true');
+		assert.strictEqual(map.get(windowsFile), 'true');
+		assert.strictEqual(map.get(uncFile), 'true');
 	});
 
 	test('ResourceMap - files (ignorecase)', function () {
@@ -1000,16 +1000,16 @@ suite('Map', () => {
 		const fileAUpper = URI.parse('file://SOME/FILEA');
 
 		map.set(fileA, 'true');
-		assert.equal(map.get(fileA), 'true');
+		assert.strictEqual(map.get(fileA), 'true');
 
-		assert.equal(map.get(fileAUpper), 'true');
+		assert.strictEqual(map.get(fileAUpper), 'true');
 
 		assert.ok(!map.get(fileB));
 
 		map.set(fileAUpper, 'false');
-		assert.equal(map.get(fileAUpper), 'false');
+		assert.strictEqual(map.get(fileAUpper), 'false');
 
-		assert.equal(map.get(fileA), 'false');
+		assert.strictEqual(map.get(fileA), 'false');
 
 		const windowsFile = URI.file('c:\\test with %25\\c#code');
 		const uncFile = URI.file('\\\\shäres\\path\\c#\\plugin.json');
@@ -1017,7 +1017,7 @@ suite('Map', () => {
 		map.set(windowsFile, 'true');
 		map.set(uncFile, 'true');
 
-		assert.equal(map.get(windowsFile), 'true');
-		assert.equal(map.get(uncFile), 'true');
+		assert.strictEqual(map.get(windowsFile), 'true');
+		assert.strictEqual(map.get(uncFile), 'true');
 	});
 });
diff --git a/src/vs/base/test/common/markdownString.test.ts b/src/vs/base/test/common/markdownString.test.ts
index 424c2bd46..7d9d64f2b 100644
--- a/src/vs/base/test/common/markdownString.test.ts
+++ b/src/vs/base/test/common/markdownString.test.ts
@@ -11,13 +11,13 @@ suite('MarkdownString', () => {
 	test('Escape leading whitespace', function () {
 		const mds = new MarkdownString();
 		mds.appendText('Hello\n    Not a code block');
-		assert.equal(mds.value, 'Hello\n\n&nbsp;&nbsp;&nbsp;&nbsp;Not&nbsp;a&nbsp;code&nbsp;block');
+		assert.strictEqual(mds.value, 'Hello\n\n&nbsp;&nbsp;&nbsp;&nbsp;Not&nbsp;a&nbsp;code&nbsp;block');
 	});
 
 	test('MarkdownString.appendText doesn\'t escape quote #109040', function () {
 		const mds = new MarkdownString();
 		mds.appendText('> Text\n>More');
-		assert.equal(mds.value, '\\>&nbsp;Text\n\n\\>More');
+		assert.strictEqual(mds.value, '\\>&nbsp;Text\n\n\\>More');
 	});
 
 	test('appendText', () => {
@@ -25,7 +25,7 @@ suite('MarkdownString', () => {
 		const mds = new MarkdownString();
 		mds.appendText('# foo\n*bar*');
 
-		assert.equal(mds.value, '\\#&nbsp;foo\n\n\\*bar\\*');
+		assert.strictEqual(mds.value, '\\#&nbsp;foo\n\n\\*bar\\*');
 	});
 
 	suite('ThemeIcons', () => {
@@ -36,21 +36,21 @@ suite('MarkdownString', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: true });
 				mds.appendText('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '\\\\$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;\\\\$\\(add\\)');
+				assert.strictEqual(mds.value, '\\\\$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;\\\\$\\(add\\)');
 			});
 
 			test('appendMarkdown', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: true });
 				mds.appendMarkdown('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '$(zap) $(not a theme icon) $(add)');
+				assert.strictEqual(mds.value, '$(zap) $(not a theme icon) $(add)');
 			});
 
 			test('appendMarkdown with escaped icon', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: true });
 				mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '\\$(zap) $(not a theme icon) $(add)');
+				assert.strictEqual(mds.value, '\\$(zap) $(not a theme icon) $(add)');
 			});
 
 		});
@@ -61,21 +61,21 @@ suite('MarkdownString', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: false });
 				mds.appendText('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;$\\(add\\)');
+				assert.strictEqual(mds.value, '$\\(zap\\)&nbsp;$\\(not&nbsp;a&nbsp;theme&nbsp;icon\\)&nbsp;$\\(add\\)');
 			});
 
 			test('appendMarkdown', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: false });
 				mds.appendMarkdown('$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '$(zap) $(not a theme icon) $(add)');
+				assert.strictEqual(mds.value, '$(zap) $(not a theme icon) $(add)');
 			});
 
 			test('appendMarkdown with escaped icon', () => {
 				const mds = new MarkdownString(undefined, { supportThemeIcons: true });
 				mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)');
 
-				assert.equal(mds.value, '\\$(zap) $(not a theme icon) $(add)');
+				assert.strictEqual(mds.value, '\\$(zap) $(not a theme icon) $(add)');
 			});
 
 		});
diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts
index a7ac5a177..f2583fed4 100644
--- a/src/vs/base/test/common/mime.test.ts
+++ b/src/vs/base/test/common/mime.test.ts
@@ -11,38 +11,38 @@ suite('Mime', () => {
 
 	test('Dynamically Register Text Mime', () => {
 		let guess = guessMimeTypes(URI.file('foo.monaco'));
-		assert.deepEqual(guess, ['application/unknown']);
+		assert.deepStrictEqual(guess, ['application/unknown']);
 
 		registerTextMime({ id: 'monaco', extension: '.monaco', mime: 'text/monaco' });
 		guess = guessMimeTypes(URI.file('foo.monaco'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('.monaco'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 
 		registerTextMime({ id: 'codefile', filename: 'Codefile', mime: 'text/code' });
 		guess = guessMimeTypes(URI.file('Codefile'));
-		assert.deepEqual(guess, ['text/code', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/code', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('foo.Codefile'));
-		assert.deepEqual(guess, ['application/unknown']);
+		assert.deepStrictEqual(guess, ['application/unknown']);
 
 		registerTextMime({ id: 'docker', filepattern: 'Docker*', mime: 'text/docker' });
 		guess = guessMimeTypes(URI.file('Docker-debug'));
-		assert.deepEqual(guess, ['text/docker', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/docker', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('docker-PROD'));
-		assert.deepEqual(guess, ['text/docker', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/docker', 'text/plain']);
 
 		registerTextMime({ id: 'niceregex', mime: 'text/nice-regex', firstline: /RegexesAreNice/ });
 		guess = guessMimeTypes(URI.file('Randomfile.noregistration'), 'RegexesAreNice');
-		assert.deepEqual(guess, ['text/nice-regex', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/nice-regex', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('Randomfile.noregistration'), 'RegexesAreNotNice');
-		assert.deepEqual(guess, ['application/unknown']);
+		assert.deepStrictEqual(guess, ['application/unknown']);
 
 		guess = guessMimeTypes(URI.file('Codefile'), 'RegexesAreNice');
-		assert.deepEqual(guess, ['text/code', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/code', 'text/plain']);
 	});
 
 	test('Mimes Priority', () => {
@@ -50,36 +50,36 @@ suite('Mime', () => {
 		registerTextMime({ id: 'foobar', mime: 'text/foobar', firstline: /foobar/ });
 
 		let guess = guessMimeTypes(URI.file('foo.monaco'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('foo.monaco'), 'foobar');
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 
 		registerTextMime({ id: 'docker', filename: 'dockerfile', mime: 'text/winner' });
 		registerTextMime({ id: 'docker', filepattern: 'dockerfile*', mime: 'text/looser' });
 		guess = guessMimeTypes(URI.file('dockerfile'));
-		assert.deepEqual(guess, ['text/winner', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/winner', 'text/plain']);
 
 		registerTextMime({ id: 'azure-looser', mime: 'text/azure-looser', firstline: /azure/ });
 		registerTextMime({ id: 'azure-winner', mime: 'text/azure-winner', firstline: /azure/ });
 		guess = guessMimeTypes(URI.file('azure'), 'azure');
-		assert.deepEqual(guess, ['text/azure-winner', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/azure-winner', 'text/plain']);
 	});
 
 	test('Specificity priority 1', () => {
 		registerTextMime({ id: 'monaco2', extension: '.monaco2', mime: 'text/monaco2' });
 		registerTextMime({ id: 'monaco2', filename: 'specific.monaco2', mime: 'text/specific-monaco2' });
 
-		assert.deepEqual(guessMimeTypes(URI.file('specific.monaco2')), ['text/specific-monaco2', 'text/plain']);
-		assert.deepEqual(guessMimeTypes(URI.file('foo.monaco2')), ['text/monaco2', 'text/plain']);
+		assert.deepStrictEqual(guessMimeTypes(URI.file('specific.monaco2')), ['text/specific-monaco2', 'text/plain']);
+		assert.deepStrictEqual(guessMimeTypes(URI.file('foo.monaco2')), ['text/monaco2', 'text/plain']);
 	});
 
 	test('Specificity priority 2', () => {
 		registerTextMime({ id: 'monaco3', filename: 'specific.monaco3', mime: 'text/specific-monaco3' });
 		registerTextMime({ id: 'monaco3', extension: '.monaco3', mime: 'text/monaco3' });
 
-		assert.deepEqual(guessMimeTypes(URI.file('specific.monaco3')), ['text/specific-monaco3', 'text/plain']);
-		assert.deepEqual(guessMimeTypes(URI.file('foo.monaco3')), ['text/monaco3', 'text/plain']);
+		assert.deepStrictEqual(guessMimeTypes(URI.file('specific.monaco3')), ['text/specific-monaco3', 'text/plain']);
+		assert.deepStrictEqual(guessMimeTypes(URI.file('foo.monaco3')), ['text/monaco3', 'text/plain']);
 	});
 
 	test('Mimes Priority - Longest Extension wins', () => {
@@ -88,13 +88,13 @@ suite('Mime', () => {
 		registerTextMime({ id: 'monaco', extension: '.monaco.xml.build', mime: 'text/monaco-xml-build' });
 
 		let guess = guessMimeTypes(URI.file('foo.monaco'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('foo.monaco.xml'));
-		assert.deepEqual(guess, ['text/monaco-xml', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco-xml', 'text/plain']);
 
 		guess = guessMimeTypes(URI.file('foo.monaco.xml.build'));
-		assert.deepEqual(guess, ['text/monaco-xml-build', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco-xml-build', 'text/plain']);
 	});
 
 	test('Mimes Priority - User configured wins', () => {
@@ -102,7 +102,7 @@ suite('Mime', () => {
 		registerTextMime({ id: 'monaco', extension: '.monaco.xml', mime: 'text/monaco-xml' });
 
 		let guess = guessMimeTypes(URI.file('foo.monaco.xnl'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 	});
 
 	test('Mimes Priority - Pattern matches on path if specified', () => {
@@ -110,7 +110,7 @@ suite('Mime', () => {
 		registerTextMime({ id: 'other', filepattern: '*ot.other.xml', mime: 'text/other' });
 
 		let guess = guessMimeTypes(URI.file('/some/path/dot.monaco.xml'));
-		assert.deepEqual(guess, ['text/monaco', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/monaco', 'text/plain']);
 	});
 
 	test('Mimes Priority - Last registered mime wins', () => {
@@ -118,12 +118,12 @@ suite('Mime', () => {
 		registerTextMime({ id: 'other', filepattern: '**/dot.monaco.xml', mime: 'text/other' });
 
 		let guess = guessMimeTypes(URI.file('/some/path/dot.monaco.xml'));
-		assert.deepEqual(guess, ['text/other', 'text/plain']);
+		assert.deepStrictEqual(guess, ['text/other', 'text/plain']);
 	});
 
 	test('Data URIs', () => {
 		registerTextMime({ id: 'data', extension: '.data', mime: 'text/data' });
 
-		assert.deepEqual(guessMimeTypes(URI.parse(`data:;label:something.data;description:data,`)), ['text/data', 'text/plain']);
+		assert.deepStrictEqual(guessMimeTypes(URI.parse(`data:;label:something.data;description:data,`)), ['text/data', 'text/plain']);
 	});
 });
diff --git a/src/vs/base/test/common/network.test.ts b/src/vs/base/test/common/network.test.ts
index 1729d4b1c..240c1abc2 100644
--- a/src/vs/base/test/common/network.test.ts
+++ b/src/vs/base/test/common/network.test.ts
@@ -7,10 +7,10 @@ import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { isElectronSandboxed } from 'vs/base/common/platform';
+import { isPreferringBrowserCodeLoad } from 'vs/base/common/platform';
 
 suite('network', () => {
-	const enableTest = isElectronSandboxed;
+	const enableTest = isPreferringBrowserCodeLoad;
 
 	(!enableTest ? test.skip : test)('FileAccess: URI (native)', () => {
 
diff --git a/src/vs/base/test/common/paging.test.ts b/src/vs/base/test/common/paging.test.ts
index 3ce696633..da7ef18fa 100644
--- a/src/vs/base/test/common/paging.test.ts
+++ b/src/vs/base/test/common/paging.test.ts
@@ -101,7 +101,6 @@ suite('PagedModel', () => {
 	test('preemptive cancellation works', async function () {
 		const pager = new TestPager(() => {
 			assert(false);
-			return Promise.resolve([]);
 		});
 
 		const model = new PagedModel(pager);
diff --git a/src/vs/base/test/node/path.test.ts b/src/vs/base/test/common/path.test.ts
similarity index 99%
rename from src/vs/base/test/node/path.test.ts
rename to src/vs/base/test/common/path.test.ts
index 3150f8d60..d74ce9f7c 100644
--- a/src/vs/base/test/node/path.test.ts
+++ b/src/vs/base/test/common/path.test.ts
@@ -29,10 +29,11 @@
 
 import * as assert from 'assert';
 import * as path from 'vs/base/common/path';
-import { isWindows } from 'vs/base/common/platform';
+import { isWeb, isWindows } from 'vs/base/common/platform';
 import * as process from 'vs/base/common/process';
 
 suite('Paths (Node Implementation)', () => {
+	const __filename = 'path.test.js';
 	test('join', () => {
 		const failures = [] as string[];
 		const backslashRE = /\\/g;
@@ -175,9 +176,6 @@ suite('Paths (Node Implementation)', () => {
 	});
 
 	test('dirname', () => {
-		assert.strictEqual(path.dirname(path.normalize(__filename)).substr(-9),
-			isWindows ? 'test\\node' : 'test/node');
-
 		assert.strictEqual(path.posix.dirname('/a/b/'), '/a');
 		assert.strictEqual(path.posix.dirname('/a/b'), '/a');
 		assert.strictEqual(path.posix.dirname('/a'), '/');
@@ -362,7 +360,7 @@ suite('Paths (Node Implementation)', () => {
 		assert.equal(path.extname('far.boo/boo'), '');
 	});
 
-	test('resolve', () => {
+	(isWeb && isWindows ? test.skip : test)('resolve', () => { // TODO@sbatten fails on windows & browser only
 		const failures = [] as string[];
 		const slashRE = /\//g;
 		const backslashRE = /\\/g;
diff --git a/src/vs/base/test/common/processes.test.ts b/src/vs/base/test/common/processes.test.ts
index ee0d25c88..b5a89e2a0 100644
--- a/src/vs/base/test/common/processes.test.ts
+++ b/src/vs/base/test/common/processes.test.ts
@@ -15,7 +15,6 @@ suite('Processes', () => {
 			ELECTRON_NO_ASAR: 'x',
 			ELECTRON_NO_ATTACH_CONSOLE: 'x',
 			ELECTRON_RUN_AS_NODE: 'x',
-			GOOGLE_API_KEY: 'x',
 			VSCODE_CLI: 'x',
 			VSCODE_DEV: 'x',
 			VSCODE_IPC_HOOK: 'x',
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
index 8026e240b..a41725d83 100644
--- a/src/vs/base/test/common/resources.test.ts
+++ b/src/vs/base/test/common/resources.test.ts
@@ -22,10 +22,10 @@ suite('Resources', () => {
 		];
 
 		let distinct = distinctParents(resources, r => r);
-		assert.equal(distinct.length, 3);
-		assert.equal(distinct[0].toString(), resources[0].toString());
-		assert.equal(distinct[1].toString(), resources[1].toString());
-		assert.equal(distinct[2].toString(), resources[2].toString());
+		assert.strictEqual(distinct.length, 3);
+		assert.strictEqual(distinct[0].toString(), resources[0].toString());
+		assert.strictEqual(distinct[1].toString(), resources[1].toString());
+		assert.strictEqual(distinct[2].toString(), resources[2].toString());
 
 		// Parent / Child
 		resources = [
@@ -37,144 +37,144 @@ suite('Resources', () => {
 		];
 
 		distinct = distinctParents(resources, r => r);
-		assert.equal(distinct.length, 3);
-		assert.equal(distinct[0].toString(), resources[0].toString());
-		assert.equal(distinct[1].toString(), resources[3].toString());
-		assert.equal(distinct[2].toString(), resources[4].toString());
+		assert.strictEqual(distinct.length, 3);
+		assert.strictEqual(distinct[0].toString(), resources[0].toString());
+		assert.strictEqual(distinct[1].toString(), resources[3].toString());
+		assert.strictEqual(distinct[2].toString(), resources[4].toString());
 	});
 
 	test('dirname', () => {
 		if (isWindows) {
-			assert.equal(dirname(URI.file('c:\\some\\file\\test.txt')).toString(), 'file:///c%3A/some/file');
-			assert.equal(dirname(URI.file('c:\\some\\file')).toString(), 'file:///c%3A/some');
-			assert.equal(dirname(URI.file('c:\\some\\file\\')).toString(), 'file:///c%3A/some');
-			assert.equal(dirname(URI.file('c:\\some')).toString(), 'file:///c%3A/');
-			assert.equal(dirname(URI.file('C:\\some')).toString(), 'file:///c%3A/');
-			assert.equal(dirname(URI.file('c:\\')).toString(), 'file:///c%3A/');
+			assert.strictEqual(dirname(URI.file('c:\\some\\file\\test.txt')).toString(), 'file:///c%3A/some/file');
+			assert.strictEqual(dirname(URI.file('c:\\some\\file')).toString(), 'file:///c%3A/some');
+			assert.strictEqual(dirname(URI.file('c:\\some\\file\\')).toString(), 'file:///c%3A/some');
+			assert.strictEqual(dirname(URI.file('c:\\some')).toString(), 'file:///c%3A/');
+			assert.strictEqual(dirname(URI.file('C:\\some')).toString(), 'file:///c%3A/');
+			assert.strictEqual(dirname(URI.file('c:\\')).toString(), 'file:///c%3A/');
 		} else {
-			assert.equal(dirname(URI.file('/some/file/test.txt')).toString(), 'file:///some/file');
-			assert.equal(dirname(URI.file('/some/file/')).toString(), 'file:///some');
-			assert.equal(dirname(URI.file('/some/file')).toString(), 'file:///some');
+			assert.strictEqual(dirname(URI.file('/some/file/test.txt')).toString(), 'file:///some/file');
+			assert.strictEqual(dirname(URI.file('/some/file/')).toString(), 'file:///some');
+			assert.strictEqual(dirname(URI.file('/some/file')).toString(), 'file:///some');
 		}
-		assert.equal(dirname(URI.parse('foo://a/some/file/test.txt')).toString(), 'foo://a/some/file');
-		assert.equal(dirname(URI.parse('foo://a/some/file/')).toString(), 'foo://a/some');
-		assert.equal(dirname(URI.parse('foo://a/some/file')).toString(), 'foo://a/some');
-		assert.equal(dirname(URI.parse('foo://a/some')).toString(), 'foo://a/');
-		assert.equal(dirname(URI.parse('foo://a/')).toString(), 'foo://a/');
-		assert.equal(dirname(URI.parse('foo://a')).toString(), 'foo://a');
+		assert.strictEqual(dirname(URI.parse('foo://a/some/file/test.txt')).toString(), 'foo://a/some/file');
+		assert.strictEqual(dirname(URI.parse('foo://a/some/file/')).toString(), 'foo://a/some');
+		assert.strictEqual(dirname(URI.parse('foo://a/some/file')).toString(), 'foo://a/some');
+		assert.strictEqual(dirname(URI.parse('foo://a/some')).toString(), 'foo://a/');
+		assert.strictEqual(dirname(URI.parse('foo://a/')).toString(), 'foo://a/');
+		assert.strictEqual(dirname(URI.parse('foo://a')).toString(), 'foo://a');
 
 		// does not explode (https://github.com/microsoft/vscode/issues/41987)
 		dirname(URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }));
 
-		assert.equal(dirname(URI.parse('foo://a/b/c?q')).toString(), 'foo://a/b?q');
+		assert.strictEqual(dirname(URI.parse('foo://a/b/c?q')).toString(), 'foo://a/b?q');
 	});
 
 	test('basename', () => {
 		if (isWindows) {
-			assert.equal(basename(URI.file('c:\\some\\file\\test.txt')), 'test.txt');
-			assert.equal(basename(URI.file('c:\\some\\file')), 'file');
-			assert.equal(basename(URI.file('c:\\some\\file\\')), 'file');
-			assert.equal(basename(URI.file('C:\\some\\file\\')), 'file');
+			assert.strictEqual(basename(URI.file('c:\\some\\file\\test.txt')), 'test.txt');
+			assert.strictEqual(basename(URI.file('c:\\some\\file')), 'file');
+			assert.strictEqual(basename(URI.file('c:\\some\\file\\')), 'file');
+			assert.strictEqual(basename(URI.file('C:\\some\\file\\')), 'file');
 		} else {
-			assert.equal(basename(URI.file('/some/file/test.txt')), 'test.txt');
-			assert.equal(basename(URI.file('/some/file/')), 'file');
-			assert.equal(basename(URI.file('/some/file')), 'file');
-			assert.equal(basename(URI.file('/some')), 'some');
+			assert.strictEqual(basename(URI.file('/some/file/test.txt')), 'test.txt');
+			assert.strictEqual(basename(URI.file('/some/file/')), 'file');
+			assert.strictEqual(basename(URI.file('/some/file')), 'file');
+			assert.strictEqual(basename(URI.file('/some')), 'some');
 		}
-		assert.equal(basename(URI.parse('foo://a/some/file/test.txt')), 'test.txt');
-		assert.equal(basename(URI.parse('foo://a/some/file/')), 'file');
-		assert.equal(basename(URI.parse('foo://a/some/file')), 'file');
-		assert.equal(basename(URI.parse('foo://a/some')), 'some');
-		assert.equal(basename(URI.parse('foo://a/')), '');
-		assert.equal(basename(URI.parse('foo://a')), '');
+		assert.strictEqual(basename(URI.parse('foo://a/some/file/test.txt')), 'test.txt');
+		assert.strictEqual(basename(URI.parse('foo://a/some/file/')), 'file');
+		assert.strictEqual(basename(URI.parse('foo://a/some/file')), 'file');
+		assert.strictEqual(basename(URI.parse('foo://a/some')), 'some');
+		assert.strictEqual(basename(URI.parse('foo://a/')), '');
+		assert.strictEqual(basename(URI.parse('foo://a')), '');
 	});
 
 	test('joinPath', () => {
 		if (isWindows) {
-			assert.equal(joinPath(URI.file('c:\\foo\\bar'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), 'file.js').toString(), 'file:///c%3A/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\'), '/file.js').toString(), 'file:///c%3A/file.js');
-			assert.equal(joinPath(URI.file('c:\\'), 'bar/file.js').toString(), 'file:///c%3A/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo'), './file.js').toString(), 'file:///c%3A/foo/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo'), '/./file.js').toString(), 'file:///c%3A/foo/file.js');
-			assert.equal(joinPath(URI.file('C:\\foo'), '../file.js').toString(), 'file:///c%3A/file.js');
-			assert.equal(joinPath(URI.file('C:\\foo\\.'), '../file.js').toString(), 'file:///c%3A/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\foo\\bar'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\foo\\bar\\'), 'file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\foo\\bar\\'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\'), '/file.js').toString(), 'file:///c%3A/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\'), 'bar/file.js').toString(), 'file:///c%3A/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\foo'), './file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.strictEqual(joinPath(URI.file('c:\\foo'), '/./file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.strictEqual(joinPath(URI.file('C:\\foo'), '../file.js').toString(), 'file:///c%3A/file.js');
+			assert.strictEqual(joinPath(URI.file('C:\\foo\\.'), '../file.js').toString(), 'file:///c%3A/file.js');
 		} else {
-			assert.equal(joinPath(URI.file('/foo/bar'), '/file.js').toString(), 'file:///foo/bar/file.js');
-			assert.equal(joinPath(URI.file('/foo/bar'), 'file.js').toString(), 'file:///foo/bar/file.js');
-			assert.equal(joinPath(URI.file('/foo/bar/'), '/file.js').toString(), 'file:///foo/bar/file.js');
-			assert.equal(joinPath(URI.file('/'), '/file.js').toString(), 'file:///file.js');
-			assert.equal(joinPath(URI.file('/foo/bar'), './file.js').toString(), 'file:///foo/bar/file.js');
-			assert.equal(joinPath(URI.file('/foo/bar'), '/./file.js').toString(), 'file:///foo/bar/file.js');
-			assert.equal(joinPath(URI.file('/foo/bar'), '../file.js').toString(), 'file:///foo/file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar'), '/file.js').toString(), 'file:///foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar'), 'file.js').toString(), 'file:///foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar/'), '/file.js').toString(), 'file:///foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('/'), '/file.js').toString(), 'file:///file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar'), './file.js').toString(), 'file:///foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar'), '/./file.js').toString(), 'file:///foo/bar/file.js');
+			assert.strictEqual(joinPath(URI.file('/foo/bar'), '../file.js').toString(), 'file:///foo/file.js');
 		}
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar')).toString(), 'foo://a/foo/bar');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar'), 'file.js').toString(), 'foo://a/foo/bar/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/'), '/file.js').toString(), 'foo://a/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), './file.js').toString(), 'foo://a/foo/bar/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '/./file.js').toString(), 'foo://a/foo/bar/file.js');
-		assert.equal(joinPath(URI.parse('foo://a/foo/bar/'), '../file.js').toString(), 'foo://a/foo/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar')).toString(), 'foo://a/foo/bar');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar'), 'file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar/'), '/file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/'), '/file.js').toString(), 'foo://a/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar/'), './file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar/'), '/./file.js').toString(), 'foo://a/foo/bar/file.js');
+		assert.strictEqual(joinPath(URI.parse('foo://a/foo/bar/'), '../file.js').toString(), 'foo://a/foo/file.js');
 
-		assert.equal(
+		assert.strictEqual(
 			joinPath(URI.from({ scheme: 'myScheme', authority: 'authority', path: '/path', query: 'query', fragment: 'fragment' }), '/file.js').toString(),
 			'myScheme://authority/path/file.js?query#fragment');
 	});
 
 	test('normalizePath', () => {
 		if (isWindows) {
-			assert.equal(normalizePath(URI.file('c:\\foo\\.\\bar')).toString(), 'file:///c%3A/foo/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\.')).toString(), 'file:///c%3A/foo');
-			assert.equal(normalizePath(URI.file('c:\\foo\\.\\')).toString(), 'file:///c%3A/foo/');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..')).toString(), 'file:///c%3A/');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..\\bar')).toString(), 'file:///c%3A/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
-			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
-			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\some\\..\\bar')).toString(), 'file:///c%3A/foo/bar');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\.\\bar')).toString(), 'file:///c%3A/foo/bar');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\.')).toString(), 'file:///c%3A/foo');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\.\\')).toString(), 'file:///c%3A/foo/');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\..')).toString(), 'file:///c%3A/');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.strictEqual(normalizePath(URI.file('c:\\foo\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.strictEqual(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.strictEqual(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\some\\..\\bar')).toString(), 'file:///c%3A/foo/bar');
 		} else {
-			assert.equal(normalizePath(URI.file('/foo/./bar')).toString(), 'file:///foo/bar');
-			assert.equal(normalizePath(URI.file('/foo/.')).toString(), 'file:///foo');
-			assert.equal(normalizePath(URI.file('/foo/./')).toString(), 'file:///foo/');
-			assert.equal(normalizePath(URI.file('/foo/..')).toString(), 'file:///');
-			assert.equal(normalizePath(URI.file('/foo/../bar')).toString(), 'file:///bar');
-			assert.equal(normalizePath(URI.file('/foo/../../bar')).toString(), 'file:///bar');
-			assert.equal(normalizePath(URI.file('/foo/foo/../../bar')).toString(), 'file:///bar');
-			assert.equal(normalizePath(URI.file('/foo/foo/./../../bar')).toString(), 'file:///bar');
-			assert.equal(normalizePath(URI.file('/foo/foo/./../some/../bar')).toString(), 'file:///foo/bar');
-			assert.equal(normalizePath(URI.file('/f')).toString(), 'file:///f');
+			assert.strictEqual(normalizePath(URI.file('/foo/./bar')).toString(), 'file:///foo/bar');
+			assert.strictEqual(normalizePath(URI.file('/foo/.')).toString(), 'file:///foo');
+			assert.strictEqual(normalizePath(URI.file('/foo/./')).toString(), 'file:///foo/');
+			assert.strictEqual(normalizePath(URI.file('/foo/..')).toString(), 'file:///');
+			assert.strictEqual(normalizePath(URI.file('/foo/../bar')).toString(), 'file:///bar');
+			assert.strictEqual(normalizePath(URI.file('/foo/../../bar')).toString(), 'file:///bar');
+			assert.strictEqual(normalizePath(URI.file('/foo/foo/../../bar')).toString(), 'file:///bar');
+			assert.strictEqual(normalizePath(URI.file('/foo/foo/./../../bar')).toString(), 'file:///bar');
+			assert.strictEqual(normalizePath(URI.file('/foo/foo/./../some/../bar')).toString(), 'file:///foo/bar');
+			assert.strictEqual(normalizePath(URI.file('/f')).toString(), 'file:///f');
 		}
-		assert.equal(normalizePath(URI.parse('foo://a/foo/./bar')).toString(), 'foo://a/foo/bar');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/.')).toString(), 'foo://a/foo');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/./')).toString(), 'foo://a/foo/');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/..')).toString(), 'foo://a/');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/../bar')).toString(), 'foo://a/bar');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/../../bar')).toString(), 'foo://a/bar');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/../../bar')).toString(), 'foo://a/bar');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/./../../bar')).toString(), 'foo://a/bar');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/foo/./../some/../bar')).toString(), 'foo://a/foo/bar');
-		assert.equal(normalizePath(URI.parse('foo://a')).toString(), 'foo://a');
-		assert.equal(normalizePath(URI.parse('foo://a/')).toString(), 'foo://a/');
-		assert.equal(normalizePath(URI.parse('foo://a/foo/./bar?q=1')).toString(), URI.parse('foo://a/foo/bar?q%3D1').toString());
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/./bar')).toString(), 'foo://a/foo/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/.')).toString(), 'foo://a/foo');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/./')).toString(), 'foo://a/foo/');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/..')).toString(), 'foo://a/');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/../bar')).toString(), 'foo://a/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/../../bar')).toString(), 'foo://a/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/foo/../../bar')).toString(), 'foo://a/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/foo/./../../bar')).toString(), 'foo://a/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/foo/./../some/../bar')).toString(), 'foo://a/foo/bar');
+		assert.strictEqual(normalizePath(URI.parse('foo://a')).toString(), 'foo://a');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/')).toString(), 'foo://a/');
+		assert.strictEqual(normalizePath(URI.parse('foo://a/foo/./bar?q=1')).toString(), URI.parse('foo://a/foo/bar?q%3D1').toString());
 	});
 
 	test('isAbsolute', () => {
 		if (isWindows) {
-			assert.equal(isAbsolutePath(URI.file('c:\\foo\\')), true);
-			assert.equal(isAbsolutePath(URI.file('C:\\foo\\')), true);
-			assert.equal(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
+			assert.strictEqual(isAbsolutePath(URI.file('c:\\foo\\')), true);
+			assert.strictEqual(isAbsolutePath(URI.file('C:\\foo\\')), true);
+			assert.strictEqual(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
 		} else {
-			assert.equal(isAbsolutePath(URI.file('/foo/bar')), true);
-			assert.equal(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
+			assert.strictEqual(isAbsolutePath(URI.file('/foo/bar')), true);
+			assert.strictEqual(isAbsolutePath(URI.file('bar')), true); // URI normalizes all file URIs to be absolute
 		}
-		assert.equal(isAbsolutePath(URI.parse('foo:foo')), false);
-		assert.equal(isAbsolutePath(URI.parse('foo://a/foo/.')), true);
+		assert.strictEqual(isAbsolutePath(URI.parse('foo:foo')), false);
+		assert.strictEqual(isAbsolutePath(URI.parse('foo://a/foo/.')), true);
 	});
 
 	function assertTrailingSeparator(u1: URI, expected: boolean) {
-		assert.equal(hasTrailingPathSeparator(u1), expected, u1.toString());
+		assert.strictEqual(hasTrailingPathSeparator(u1), expected, u1.toString());
 	}
 
 	function assertRemoveTrailingSeparator(u1: URI, expected: URI) {
@@ -237,14 +237,14 @@ suite('Resources', () => {
 	function assertEqualURI(actual: URI, expected: URI, message?: string, ignoreCase?: boolean) {
 		let util = ignoreCase ? extUriIgnorePathCase : extUri;
 		if (!util.isEqual(expected, actual)) {
-			assert.equal(actual.toString(), expected.toString(), message);
+			assert.strictEqual(actual.toString(), expected.toString(), message);
 		}
 	}
 
 	function assertRelativePath(u1: URI, u2: URI, expectedPath: string | undefined, ignoreJoin?: boolean, ignoreCase?: boolean) {
 		let util = ignoreCase ? extUriIgnorePathCase : extUri;
 
-		assert.equal(util.relativePath(u1, u2), expectedPath, `from ${u1.toString()} to ${u2.toString()}`);
+		assert.strictEqual(util.relativePath(u1, u2), expectedPath, `from ${u1.toString()} to ${u2.toString()}`);
 		if (expectedPath !== undefined && !ignoreJoin) {
 			assertEqualURI(removeTrailingPathSeparator(joinPath(u1, expectedPath)), removeTrailingPathSeparator(u2), 'joinPath on relativePath should be equal', ignoreCase);
 		}
@@ -304,7 +304,7 @@ suite('Resources', () => {
 		if (!p.isAbsolute(path)) {
 			let expectedPath = isWindows ? toSlashes(path) : path;
 			expectedPath = expectedPath.startsWith('./') ? expectedPath.substr(2) : expectedPath;
-			assert.equal(relativePath(u1, actual), expectedPath, `relativePath (${u1.toString()}) on actual (${actual.toString()}) should be to path (${expectedPath})`);
+			assert.strictEqual(relativePath(u1, actual), expectedPath, `relativePath (${u1.toString()}) on actual (${actual.toString()}) should be to path (${expectedPath})`);
 		}
 	}
 
@@ -352,12 +352,12 @@ suite('Resources', () => {
 
 		let util = ignoreCase ? extUriIgnorePathCase : extUri;
 
-		assert.equal(util.isEqual(u1, u2), expected, `${u1.toString()}${expected ? '===' : '!=='}${u2.toString()}`);
-		assert.equal(util.compare(u1, u2) === 0, expected);
-		assert.equal(util.getComparisonKey(u1) === util.getComparisonKey(u2), expected, `comparison keys ${u1.toString()}, ${u2.toString()}`);
-		assert.equal(util.isEqualOrParent(u1, u2), expected, `isEqualOrParent ${u1.toString()}, ${u2.toString()}`);
+		assert.strictEqual(util.isEqual(u1, u2), expected, `${u1.toString()}${expected ? '===' : '!=='}${u2.toString()}`);
+		assert.strictEqual(util.compare(u1, u2) === 0, expected);
+		assert.strictEqual(util.getComparisonKey(u1) === util.getComparisonKey(u2), expected, `comparison keys ${u1.toString()}, ${u2.toString()}`);
+		assert.strictEqual(util.isEqualOrParent(u1, u2), expected, `isEqualOrParent ${u1.toString()}, ${u2.toString()}`);
 		if (!ignoreCase) {
-			assert.equal(u1.toString() === u2.toString(), expected);
+			assert.strictEqual(u1.toString() === u2.toString(), expected);
 		}
 	}
 
@@ -402,31 +402,31 @@ suite('Resources', () => {
 		let fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar');
 		let fileURI2 = isWindows ? URI.file('c:\\foo') : URI.file('/foo');
 		let fileURI2b = isWindows ? URI.file('C:\\Foo\\') : URI.file('/Foo/');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI), true, '1');
-		assert.equal(extUri.isEqualOrParent(fileURI, fileURI), true, '2');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI2), true, '3');
-		assert.equal(extUri.isEqualOrParent(fileURI, fileURI2), true, '4');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI2b), true, '5');
-		assert.equal(extUri.isEqualOrParent(fileURI, fileURI2b), false, '6');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI), true, '1');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI, fileURI), true, '2');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI2), true, '3');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI, fileURI2), true, '4');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI2b), true, '5');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI, fileURI2b), false, '6');
 
-		assert.equal(extUri.isEqualOrParent(fileURI2, fileURI), false, '7');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI2b, fileURI2), true, '8');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI2, fileURI), false, '7');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI2b, fileURI2), true, '8');
 
 		let fileURI3 = URI.parse('foo://server:453/foo/bar/goo');
 		let fileURI4 = URI.parse('foo://server:453/foo/');
 		let fileURI5 = URI.parse('foo://server:453/foo');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI3, true), true, '11');
-		assert.equal(extUri.isEqualOrParent(fileURI3, fileURI3), true, '12');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI4, true), true, '13');
-		assert.equal(extUri.isEqualOrParent(fileURI3, fileURI4), true, '14');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI, true), false, '15');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI5, fileURI5, true), true, '16');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI3, true), true, '11');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI3, fileURI3), true, '12');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI4, true), true, '13');
+		assert.strictEqual(extUri.isEqualOrParent(fileURI3, fileURI4), true, '14');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI, true), false, '15');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI5, fileURI5, true), true, '16');
 
 		let fileURI6 = URI.parse('foo://server:453/foo?q=1');
 		let fileURI7 = URI.parse('foo://server:453/foo/bar?q=1');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI5), false, '17');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI6), true, '18');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI7, fileURI6), true, '19');
-		assert.equal(extUriIgnorePathCase.isEqualOrParent(fileURI7, fileURI5), false, '20');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI5), false, '17');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI6), true, '18');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI7, fileURI6), true, '19');
+		assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI7, fileURI5), false, '20');
 	});
 });
diff --git a/src/vs/base/test/common/scrollable.test.ts b/src/vs/base/test/common/scrollable.test.ts
index 820862f2f..bf8e6cb00 100644
--- a/src/vs/base/test/common/scrollable.test.ts
+++ b/src/vs/base/test/common/scrollable.test.ts
@@ -57,7 +57,7 @@ suite('SmoothScrollingOperation', () => {
 
 	function assertSmoothScroll(from: number, to: number, expected: [number, number][]): void {
 		const actual = simulateSmoothScroll(from, to);
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('scroll 25 lines (40 fit)', () => {
diff --git a/src/vs/base/test/common/skipList.test.ts b/src/vs/base/test/common/skipList.test.ts
index f6a083e3c..ec3da0d10 100644
--- a/src/vs/base/test/common/skipList.test.ts
+++ b/src/vs/base/test/common/skipList.test.ts
@@ -12,45 +12,45 @@ import { binarySearch } from 'vs/base/common/arrays';
 suite('SkipList', function () {
 
 	function assertValues<V>(list: SkipList<any, V>, expected: V[]) {
-		assert.equal(list.size, expected.length);
-		assert.deepEqual([...list.values()], expected);
+		assert.strictEqual(list.size, expected.length);
+		assert.deepStrictEqual([...list.values()], expected);
 
 		let valuesFromEntries = [...list.entries()].map(entry => entry[1]);
-		assert.deepEqual(valuesFromEntries, expected);
+		assert.deepStrictEqual(valuesFromEntries, expected);
 
 		let valuesFromIter = [...list].map(entry => entry[1]);
-		assert.deepEqual(valuesFromIter, expected);
+		assert.deepStrictEqual(valuesFromIter, expected);
 
 		let i = 0;
 		list.forEach((value, _key, map) => {
 			assert.ok(map === list);
-			assert.deepEqual(value, expected[i++]);
+			assert.deepStrictEqual(value, expected[i++]);
 		});
 	}
 
 	function assertKeys<K>(list: SkipList<K, any>, expected: K[]) {
-		assert.equal(list.size, expected.length);
-		assert.deepEqual([...list.keys()], expected);
+		assert.strictEqual(list.size, expected.length);
+		assert.deepStrictEqual([...list.keys()], expected);
 
 		let keysFromEntries = [...list.entries()].map(entry => entry[0]);
-		assert.deepEqual(keysFromEntries, expected);
+		assert.deepStrictEqual(keysFromEntries, expected);
 
 		let keysFromIter = [...list].map(entry => entry[0]);
-		assert.deepEqual(keysFromIter, expected);
+		assert.deepStrictEqual(keysFromIter, expected);
 
 		let i = 0;
 		list.forEach((_value, key, map) => {
 			assert.ok(map === list);
-			assert.deepEqual(key, expected[i++]);
+			assert.deepStrictEqual(key, expected[i++]);
 		});
 	}
 
 	test('set/get/delete', function () {
 		let list = new SkipList<number, number>((a, b) => a - b);
 
-		assert.equal(list.get(3), undefined);
+		assert.strictEqual(list.get(3), undefined);
 		list.set(3, 1);
-		assert.equal(list.get(3), 1);
+		assert.strictEqual(list.get(3), 1);
 		assertValues(list, [1]);
 
 		list.set(3, 3);
@@ -58,17 +58,17 @@ suite('SkipList', function () {
 
 		list.set(1, 1);
 		list.set(4, 4);
-		assert.equal(list.get(3), 3);
-		assert.equal(list.get(1), 1);
-		assert.equal(list.get(4), 4);
+		assert.strictEqual(list.get(3), 3);
+		assert.strictEqual(list.get(1), 1);
+		assert.strictEqual(list.get(4), 4);
 		assertValues(list, [1, 3, 4]);
 
-		assert.equal(list.delete(17), false);
+		assert.strictEqual(list.delete(17), false);
 
-		assert.equal(list.delete(1), true);
-		assert.equal(list.get(1), undefined);
-		assert.equal(list.get(3), 3);
-		assert.equal(list.get(4), 4);
+		assert.strictEqual(list.delete(1), true);
+		assert.strictEqual(list.get(1), undefined);
+		assert.strictEqual(list.get(3), 3);
+		assert.strictEqual(list.get(4), 4);
 
 		assertValues(list, [3, 4]);
 	});
@@ -87,7 +87,7 @@ suite('SkipList', function () {
 		assertKeys(list, [3, 6, 7, 9, 12, 19, 21, 25]);
 
 		list.set(17, true);
-		assert.deepEqual(list.size, 9);
+		assert.deepStrictEqual(list.size, 9);
 		assertKeys(list, [3, 6, 7, 9, 12, 17, 19, 21, 25]);
 	});
 
@@ -141,8 +141,7 @@ suite('SkipList', function () {
 	}
 
 
-	test('perf', function () {
-		this.skip();
+	test.skip('perf', function () {
 
 		// data
 		const max = 2 ** 16;
diff --git a/src/vs/base/test/common/stream.test.ts b/src/vs/base/test/common/stream.test.ts
index 0ef3b7730..0fb36467b 100644
--- a/src/vs/base/test/common/stream.test.ts
+++ b/src/vs/base/test/common/stream.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { isReadableStream, newWriteableStream, Readable, consumeReadable, peekReadable, consumeStream, ReadableStream, toStream, toReadable, transform, peekStream, isReadableBufferedStream } from 'vs/base/common/stream';
+import { isReadableStream, newWriteableStream, Readable, consumeReadable, peekReadable, consumeStream, ReadableStream, toStream, toReadable, transform, peekStream, isReadableBufferedStream, observe } from 'vs/base/common/stream';
 import { timeout } from 'vs/base/common/async';
 
 suite('Stream', () => {
@@ -43,37 +43,37 @@ suite('Stream', () => {
 			chunks.push(data);
 		});
 
-		assert.equal(chunks[0], 'Hello');
+		assert.strictEqual(chunks[0], 'Hello');
 
 		stream.write('World');
-		assert.equal(chunks[1], 'World');
+		assert.strictEqual(chunks[1], 'World');
 
-		assert.equal(error, false);
-		assert.equal(end, false);
+		assert.strictEqual(error, false);
+		assert.strictEqual(end, false);
 
 		stream.pause();
 		stream.write('1');
 		stream.write('2');
 		stream.write('3');
 
-		assert.equal(chunks.length, 2);
+		assert.strictEqual(chunks.length, 2);
 
 		stream.resume();
 
-		assert.equal(chunks.length, 3);
-		assert.equal(chunks[2], '1,2,3');
+		assert.strictEqual(chunks.length, 3);
+		assert.strictEqual(chunks[2], '1,2,3');
 
 		stream.error(new Error());
-		assert.equal(error, true);
+		assert.strictEqual(error, true);
 
 		stream.end('Final Bit');
-		assert.equal(chunks.length, 4);
-		assert.equal(chunks[3], 'Final Bit');
+		assert.strictEqual(chunks.length, 4);
+		assert.strictEqual(chunks[3], 'Final Bit');
 
 		stream.destroy();
 
 		stream.write('Unexpected');
-		assert.equal(chunks.length, 4);
+		assert.strictEqual(chunks.length, 4);
 	});
 
 	test('WriteableStream - removeListener', () => {
@@ -92,22 +92,24 @@ suite('Stream', () => {
 		stream.on('data', dataListener);
 
 		stream.write('Hello');
-		assert.equal(data, true);
+		assert.strictEqual(data, true);
 
 		data = false;
 		stream.removeListener('data', dataListener);
 
 		stream.write('World');
-		assert.equal(data, false);
+		assert.strictEqual(data, false);
 
 		stream.error(new Error());
-		assert.equal(error, true);
+		assert.strictEqual(error, true);
 
 		error = false;
 		stream.removeListener('error', errorListener);
 
+		// always leave at least one error listener to streams to avoid unexpected errors during test running
+		stream.on('error', () => { });
 		stream.error(new Error());
-		assert.equal(error, false);
+		assert.strictEqual(error, false);
 	});
 
 	test('WriteableStream - highWaterMark', async () => {
@@ -147,14 +149,14 @@ suite('Stream', () => {
 		assert.ok(data);
 
 		await timeout(0);
-		assert.equal(drained1, true);
-		assert.equal(drained2, true);
+		assert.strictEqual(drained1, true);
+		assert.strictEqual(drained2, true);
 	});
 
 	test('consumeReadable', () => {
 		const readable = arrayToReadable(['1', '2', '3', '4', '5']);
 		const consumed = consumeReadable(readable, strings => strings.join());
-		assert.equal(consumed, '1,2,3,4,5');
+		assert.strictEqual(consumed, '1,2,3,4,5');
 	});
 
 	test('peekReadable', () => {
@@ -166,17 +168,17 @@ suite('Stream', () => {
 				assert.fail('Unexpected result');
 			} else {
 				const consumed = consumeReadable(consumedOrReadable, strings => strings.join());
-				assert.equal(consumed, '1,2,3,4,5');
+				assert.strictEqual(consumed, '1,2,3,4,5');
 			}
 		}
 
 		let readable = arrayToReadable(['1', '2', '3', '4', '5']);
 		let consumedOrReadable = peekReadable(readable, strings => strings.join(), 5);
-		assert.equal(consumedOrReadable, '1,2,3,4,5');
+		assert.strictEqual(consumedOrReadable, '1,2,3,4,5');
 
 		readable = arrayToReadable(['1', '2', '3', '4', '5']);
 		consumedOrReadable = peekReadable(readable, strings => strings.join(), 6);
-		assert.equal(consumedOrReadable, '1,2,3,4,5');
+		assert.strictEqual(consumedOrReadable, '1,2,3,4,5');
 	});
 
 	test('peekReadable - error handling', async () => {
@@ -265,7 +267,7 @@ suite('Stream', () => {
 	test('consumeStream', async () => {
 		const stream = readableToStream(arrayToReadable(['1', '2', '3', '4', '5']));
 		const consumed = await consumeStream(stream, strings => strings.join());
-		assert.equal(consumed, '1,2,3,4,5');
+		assert.strictEqual(consumed, '1,2,3,4,5');
 	});
 
 	test('peekStream', async () => {
@@ -273,11 +275,11 @@ suite('Stream', () => {
 			const stream = readableToStream(arrayToReadable(['1', '2', '3', '4', '5']));
 
 			const result = await peekStream(stream, i);
-			assert.equal(stream, result.stream);
+			assert.strictEqual(stream, result.stream);
 			if (result.ended) {
 				assert.fail('Unexpected result, stream should not have ended yet');
 			} else {
-				assert.equal(result.buffer.length, i + 1, `maxChunks: ${i}`);
+				assert.strictEqual(result.buffer.length, i + 1, `maxChunks: ${i}`);
 
 				const additionalResult: string[] = [];
 				await consumeStream(stream, strings => {
@@ -286,33 +288,33 @@ suite('Stream', () => {
 					return strings.join();
 				});
 
-				assert.equal([...result.buffer, ...additionalResult].join(), '1,2,3,4,5');
+				assert.strictEqual([...result.buffer, ...additionalResult].join(), '1,2,3,4,5');
 			}
 		}
 
 		let stream = readableToStream(arrayToReadable(['1', '2', '3', '4', '5']));
 		let result = await peekStream(stream, 5);
-		assert.equal(stream, result.stream);
-		assert.equal(result.buffer.join(), '1,2,3,4,5');
-		assert.equal(result.ended, true);
+		assert.strictEqual(stream, result.stream);
+		assert.strictEqual(result.buffer.join(), '1,2,3,4,5');
+		assert.strictEqual(result.ended, true);
 
 		stream = readableToStream(arrayToReadable(['1', '2', '3', '4', '5']));
 		result = await peekStream(stream, 6);
-		assert.equal(stream, result.stream);
-		assert.equal(result.buffer.join(), '1,2,3,4,5');
-		assert.equal(result.ended, true);
+		assert.strictEqual(stream, result.stream);
+		assert.strictEqual(result.buffer.join(), '1,2,3,4,5');
+		assert.strictEqual(result.ended, true);
 	});
 
 	test('toStream', async () => {
 		const stream = toStream('1,2,3,4,5', strings => strings.join());
 		const consumed = await consumeStream(stream, strings => strings.join());
-		assert.equal(consumed, '1,2,3,4,5');
+		assert.strictEqual(consumed, '1,2,3,4,5');
 	});
 
 	test('toReadable', async () => {
 		const readable = toReadable('1,2,3,4,5');
 		const consumed = await consumeReadable(readable, strings => strings.join());
-		assert.equal(consumed, '1,2,3,4,5');
+		assert.strictEqual(consumed, '1,2,3,4,5');
 	});
 
 	test('transform', async () => {
@@ -330,6 +332,47 @@ suite('Stream', () => {
 		}, 0);
 
 		const consumed = await consumeStream(result, strings => strings.join());
-		assert.equal(consumed, '11,22,33,44,55');
+		assert.strictEqual(consumed, '11,22,33,44,55');
+	});
+
+	test('observer', async () => {
+		const source1 = newWriteableStream<string>(strings => strings.join());
+		setTimeout(() => source1.error(new Error()));
+		await observe(source1).errorOrEnd();
+
+		const source2 = newWriteableStream<string>(strings => strings.join());
+		setTimeout(() => source2.end('Hello Test'));
+		await observe(source2).errorOrEnd();
+
+		const source3 = newWriteableStream<string>(strings => strings.join());
+		setTimeout(() => {
+			source3.write('Hello Test');
+			source3.error(new Error());
+		});
+		await observe(source3).errorOrEnd();
+
+		const source4 = newWriteableStream<string>(strings => strings.join());
+		setTimeout(() => {
+			source4.write('Hello Test');
+			source4.end();
+		});
+		await observe(source4).errorOrEnd();
+	});
+
+	test('events are delivered even if a listener is removed during delivery', () => {
+		const stream = newWriteableStream<string>(strings => strings.join());
+
+		let listener1Called = false;
+		let listener2Called = false;
+
+		const listener1 = () => { stream.removeListener('end', listener1); listener1Called = true; };
+		const listener2 = () => { listener2Called = true; };
+		stream.on('end', listener1);
+		stream.on('end', listener2);
+		stream.on('data', () => { });
+		stream.end('');
+
+		assert.strictEqual(listener1Called, true);
+		assert.strictEqual(listener2Called, true);
 	});
 });
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index d3366a1e5..dc8d9da5e 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -52,7 +52,7 @@ suite('Strings', () => {
 
 			let expected = strings.compare(a.toLowerCase(), b.toLowerCase());
 			expected = expected > 0 ? 1 : expected < 0 ? -1 : expected;
-			assert.equal(actual, expected, `${a} <> ${b}`);
+			assert.strictEqual(actual, expected, `${a} <> ${b}`);
 
 			if (recurse) {
 				assertCompareIgnoreCase(b, a, false);
@@ -89,7 +89,7 @@ suite('Strings', () => {
 
 			let expected = strings.compare(a.toLowerCase().substring(aStart, aEnd), b.toLowerCase().substring(bStart, bEnd));
 			expected = expected > 0 ? 1 : expected < 0 ? -1 : expected;
-			assert.equal(actual, expected, `${a} <> ${b}`);
+			assert.strictEqual(actual, expected, `${a} <> ${b}`);
 
 			if (recurse) {
 				assertCompareIgnoreCase(b, a, bStart, bEnd, aStart, aEnd, false);
@@ -188,36 +188,36 @@ suite('Strings', () => {
 	});
 
 	test('containsRTL', () => {
-		assert.equal(strings.containsRTL('a'), false);
-		assert.equal(strings.containsRTL(''), false);
-		assert.equal(strings.containsRTL(strings.UTF8_BOM_CHARACTER + 'a'), false);
-		assert.equal(strings.containsRTL('hello world!'), false);
-		assert.equal(strings.containsRTL('a📚📚b'), false);
-		assert.equal(strings.containsRTL('هناك حقيقة مثبتة منذ زمن طويل'), true);
-		assert.equal(strings.containsRTL('זוהי עובדה מבוססת שדעתו'), true);
+		assert.strictEqual(strings.containsRTL('a'), false);
+		assert.strictEqual(strings.containsRTL(''), false);
+		assert.strictEqual(strings.containsRTL(strings.UTF8_BOM_CHARACTER + 'a'), false);
+		assert.strictEqual(strings.containsRTL('hello world!'), false);
+		assert.strictEqual(strings.containsRTL('a📚📚b'), false);
+		assert.strictEqual(strings.containsRTL('هناك حقيقة مثبتة منذ زمن طويل'), true);
+		assert.strictEqual(strings.containsRTL('זוהי עובדה מבוססת שדעתו'), true);
 	});
 
 	test('containsEmoji', () => {
-		assert.equal(strings.containsEmoji('a'), false);
-		assert.equal(strings.containsEmoji(''), false);
-		assert.equal(strings.containsEmoji(strings.UTF8_BOM_CHARACTER + 'a'), false);
-		assert.equal(strings.containsEmoji('hello world!'), false);
-		assert.equal(strings.containsEmoji('هناك حقيقة مثبتة منذ زمن طويل'), false);
-		assert.equal(strings.containsEmoji('זוהי עובדה מבוססת שדעתו'), false);
+		assert.strictEqual(strings.containsEmoji('a'), false);
+		assert.strictEqual(strings.containsEmoji(''), false);
+		assert.strictEqual(strings.containsEmoji(strings.UTF8_BOM_CHARACTER + 'a'), false);
+		assert.strictEqual(strings.containsEmoji('hello world!'), false);
+		assert.strictEqual(strings.containsEmoji('هناك حقيقة مثبتة منذ زمن طويل'), false);
+		assert.strictEqual(strings.containsEmoji('זוהי עובדה מבוססת שדעתו'), false);
 
-		assert.equal(strings.containsEmoji('a📚📚b'), true);
-		assert.equal(strings.containsEmoji('1F600 # 😀 grinning face'), true);
-		assert.equal(strings.containsEmoji('1F47E # 👾 alien monster'), true);
-		assert.equal(strings.containsEmoji('1F467 1F3FD # 👧🏽 girl: medium skin tone'), true);
-		assert.equal(strings.containsEmoji('26EA # ⛪ church'), true);
-		assert.equal(strings.containsEmoji('231B # ⌛ hourglass'), true);
-		assert.equal(strings.containsEmoji('2702 # ✂ scissors'), true);
-		assert.equal(strings.containsEmoji('1F1F7 1F1F4  # 🇷🇴 Romania'), true);
+		assert.strictEqual(strings.containsEmoji('a📚📚b'), true);
+		assert.strictEqual(strings.containsEmoji('1F600 # 😀 grinning face'), true);
+		assert.strictEqual(strings.containsEmoji('1F47E # 👾 alien monster'), true);
+		assert.strictEqual(strings.containsEmoji('1F467 1F3FD # 👧🏽 girl: medium skin tone'), true);
+		assert.strictEqual(strings.containsEmoji('26EA # ⛪ church'), true);
+		assert.strictEqual(strings.containsEmoji('231B # ⌛ hourglass'), true);
+		assert.strictEqual(strings.containsEmoji('2702 # ✂ scissors'), true);
+		assert.strictEqual(strings.containsEmoji('1F1F7 1F1F4  # 🇷🇴 Romania'), true);
 	});
 
 	test('isBasicASCII', () => {
 		function assertIsBasicASCII(str: string, expected: boolean): void {
-			assert.equal(strings.isBasicASCII(str), expected, str + ` (${str.charCodeAt(0)})`);
+			assert.strictEqual(strings.isBasicASCII(str), expected, str + ` (${str.charCodeAt(0)})`);
 		}
 		assertIsBasicASCII('abcdefghijklmnopqrstuvwxyz', true);
 		assertIsBasicASCII('ABCDEFGHIJKLMNOPQRSTUVWXYZ', true);
@@ -245,16 +245,16 @@ suite('Strings', () => {
 		assert.throws(() => strings.createRegExp('', false));
 
 		// Escapes appropriately
-		assert.equal(strings.createRegExp('abc', false).source, 'abc');
-		assert.equal(strings.createRegExp('([^ ,.]*)', false).source, '\\(\\[\\^ ,\\.\\]\\*\\)');
-		assert.equal(strings.createRegExp('([^ ,.]*)', true).source, '([^ ,.]*)');
+		assert.strictEqual(strings.createRegExp('abc', false).source, 'abc');
+		assert.strictEqual(strings.createRegExp('([^ ,.]*)', false).source, '\\(\\[\\^ ,\\.\\]\\*\\)');
+		assert.strictEqual(strings.createRegExp('([^ ,.]*)', true).source, '([^ ,.]*)');
 
 		// Whole word
-		assert.equal(strings.createRegExp('abc', false, { wholeWord: true }).source, '\\babc\\b');
-		assert.equal(strings.createRegExp('abc', true, { wholeWord: true }).source, '\\babc\\b');
-		assert.equal(strings.createRegExp(' abc', true, { wholeWord: true }).source, ' abc\\b');
-		assert.equal(strings.createRegExp('abc ', true, { wholeWord: true }).source, '\\babc ');
-		assert.equal(strings.createRegExp(' abc ', true, { wholeWord: true }).source, ' abc ');
+		assert.strictEqual(strings.createRegExp('abc', false, { wholeWord: true }).source, '\\babc\\b');
+		assert.strictEqual(strings.createRegExp('abc', true, { wholeWord: true }).source, '\\babc\\b');
+		assert.strictEqual(strings.createRegExp(' abc', true, { wholeWord: true }).source, ' abc\\b');
+		assert.strictEqual(strings.createRegExp('abc ', true, { wholeWord: true }).source, '\\babc ');
+		assert.strictEqual(strings.createRegExp(' abc ', true, { wholeWord: true }).source, ' abc ');
 
 		const regExpWithoutFlags = strings.createRegExp('abc', true);
 		assert(!regExpWithoutFlags.global);
@@ -284,15 +284,15 @@ suite('Strings', () => {
 	});
 
 	test('getLeadingWhitespace', () => {
-		assert.equal(strings.getLeadingWhitespace('  foo'), '  ');
-		assert.equal(strings.getLeadingWhitespace('  foo', 2), '');
-		assert.equal(strings.getLeadingWhitespace('  foo', 1, 1), '');
-		assert.equal(strings.getLeadingWhitespace('  foo', 0, 1), ' ');
-		assert.equal(strings.getLeadingWhitespace('  '), '  ');
-		assert.equal(strings.getLeadingWhitespace('  ', 1), ' ');
-		assert.equal(strings.getLeadingWhitespace('  ', 0, 1), ' ');
-		assert.equal(strings.getLeadingWhitespace('\t\tfunction foo(){', 0, 1), '\t');
-		assert.equal(strings.getLeadingWhitespace('\t\tfunction foo(){', 0, 2), '\t\t');
+		assert.strictEqual(strings.getLeadingWhitespace('  foo'), '  ');
+		assert.strictEqual(strings.getLeadingWhitespace('  foo', 2), '');
+		assert.strictEqual(strings.getLeadingWhitespace('  foo', 1, 1), '');
+		assert.strictEqual(strings.getLeadingWhitespace('  foo', 0, 1), ' ');
+		assert.strictEqual(strings.getLeadingWhitespace('  '), '  ');
+		assert.strictEqual(strings.getLeadingWhitespace('  ', 1), ' ');
+		assert.strictEqual(strings.getLeadingWhitespace('  ', 0, 1), ' ');
+		assert.strictEqual(strings.getLeadingWhitespace('\t\tfunction foo(){', 0, 1), '\t');
+		assert.strictEqual(strings.getLeadingWhitespace('\t\tfunction foo(){', 0, 2), '\t\t');
 	});
 
 	test('fuzzyContains', () => {
@@ -316,11 +316,11 @@ suite('Strings', () => {
 	});
 
 	test('stripUTF8BOM', () => {
-		assert.equal(strings.stripUTF8BOM(strings.UTF8_BOM_CHARACTER), '');
-		assert.equal(strings.stripUTF8BOM(strings.UTF8_BOM_CHARACTER + 'foobar'), 'foobar');
-		assert.equal(strings.stripUTF8BOM('foobar' + strings.UTF8_BOM_CHARACTER), 'foobar' + strings.UTF8_BOM_CHARACTER);
-		assert.equal(strings.stripUTF8BOM('abc'), 'abc');
-		assert.equal(strings.stripUTF8BOM(''), '');
+		assert.strictEqual(strings.stripUTF8BOM(strings.UTF8_BOM_CHARACTER), '');
+		assert.strictEqual(strings.stripUTF8BOM(strings.UTF8_BOM_CHARACTER + 'foobar'), 'foobar');
+		assert.strictEqual(strings.stripUTF8BOM('foobar' + strings.UTF8_BOM_CHARACTER), 'foobar' + strings.UTF8_BOM_CHARACTER);
+		assert.strictEqual(strings.stripUTF8BOM('abc'), 'abc');
+		assert.strictEqual(strings.stripUTF8BOM(''), '');
 	});
 
 	test('containsUppercaseCharacter', () => {
@@ -340,7 +340,7 @@ suite('Strings', () => {
 			['FöÖ', true],
 			['\\Foo', true],
 		].forEach(([str, result]) => {
-			assert.equal(strings.containsUppercaseCharacter(<string>str), result, `Wrong result for ${str}`);
+			assert.strictEqual(strings.containsUppercaseCharacter(<string>str), result, `Wrong result for ${str}`);
 		});
 	});
 
@@ -352,7 +352,7 @@ suite('Strings', () => {
 
 			['Foo', true],
 		].forEach(([str, result]) => {
-			assert.equal(strings.containsUppercaseCharacter(<string>str, true), result, `Wrong result for ${str}`);
+			assert.strictEqual(strings.containsUppercaseCharacter(<string>str, true), result, `Wrong result for ${str}`);
 		});
 	});
 
@@ -364,20 +364,20 @@ suite('Strings', () => {
 			['123', '123'],
 			['.a', '.a'],
 		].forEach(([inStr, result]) => {
-			assert.equal(strings.uppercaseFirstLetter(inStr), result, `Wrong result for ${inStr}`);
+			assert.strictEqual(strings.uppercaseFirstLetter(inStr), result, `Wrong result for ${inStr}`);
 		});
 	});
 
 	test('getNLines', () => {
-		assert.equal(strings.getNLines('', 5), '');
-		assert.equal(strings.getNLines('foo', 5), 'foo');
-		assert.equal(strings.getNLines('foo\nbar', 5), 'foo\nbar');
-		assert.equal(strings.getNLines('foo\nbar', 2), 'foo\nbar');
+		assert.strictEqual(strings.getNLines('', 5), '');
+		assert.strictEqual(strings.getNLines('foo', 5), 'foo');
+		assert.strictEqual(strings.getNLines('foo\nbar', 5), 'foo\nbar');
+		assert.strictEqual(strings.getNLines('foo\nbar', 2), 'foo\nbar');
 
-		assert.equal(strings.getNLines('foo\nbar', 1), 'foo');
-		assert.equal(strings.getNLines('foo\nbar'), 'foo');
-		assert.equal(strings.getNLines('foo\nbar\nsomething', 2), 'foo\nbar');
-		assert.equal(strings.getNLines('foo', 0), '');
+		assert.strictEqual(strings.getNLines('foo\nbar', 1), 'foo');
+		assert.strictEqual(strings.getNLines('foo\nbar'), 'foo');
+		assert.strictEqual(strings.getNLines('foo\nbar\nsomething', 2), 'foo\nbar');
+		assert.strictEqual(strings.getNLines('foo', 0), '');
 	});
 
 	test('encodeUTF8', function () {
@@ -387,12 +387,12 @@ suite('Strings', () => {
 			for (let offset = 0; offset < actual.byteLength; offset++) {
 				actualArr[offset] = actual[offset];
 			}
-			assert.deepEqual(actualArr, expected);
+			assert.deepStrictEqual(actualArr, expected);
 		}
 
 		function assertDecodeUTF8(data: number[], expected: string): void {
 			const actual = strings.decodeUTF8(new Uint8Array(data));
-			assert.deepEqual(actual, expected);
+			assert.deepStrictEqual(actual, expected);
 		}
 
 		function assertEncodeDecodeUTF8(str: string, buff: number[]): void {
@@ -415,11 +415,11 @@ suite('Strings', () => {
 	});
 
 	test('getGraphemeBreakType', () => {
-		assert.equal(strings.getGraphemeBreakType(0xBC1), strings.GraphemeBreakType.SpacingMark);
+		assert.strictEqual(strings.getGraphemeBreakType(0xBC1), strings.GraphemeBreakType.SpacingMark);
 	});
 
 	test('truncate', () => {
-		assert.equal('hello world', strings.truncate('hello world', 100));
-		assert.equal('hello…', strings.truncate('hello world', 5));
+		assert.strictEqual('hello world', strings.truncate('hello world', 100));
+		assert.strictEqual('hello…', strings.truncate('hello world', 5));
 	});
 });
diff --git a/src/vs/base/test/common/troubleshooting.ts b/src/vs/base/test/common/troubleshooting.ts
new file mode 100644
index 000000000..1d9d99632
--- /dev/null
+++ b/src/vs/base/test/common/troubleshooting.ts
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, IDisposableTracker, setDisposableTracker } from 'vs/base/common/lifecycle';
+
+class DisposableTracker implements IDisposableTracker {
+	allDisposables: [IDisposable, string][] = [];
+	trackDisposable(x: IDisposable): void {
+		this.allDisposables.push([x, new Error().stack!]);
+	}
+	markTracked(x: IDisposable): void {
+		for (let idx = 0; idx < this.allDisposables.length; idx++) {
+			if (this.allDisposables[idx][0] === x) {
+				this.allDisposables.splice(idx, 1);
+				return;
+			}
+		}
+	}
+}
+
+let currentTracker: DisposableTracker | null = null;
+
+export function beginTrackingDisposables(): void {
+	currentTracker = new DisposableTracker();
+	setDisposableTracker(currentTracker);
+}
+
+export function endTrackingDisposables(): void {
+	if (currentTracker) {
+		setDisposableTracker(null);
+		console.log(currentTracker!.allDisposables.map(e => `${e[0]}\n${e[1]}`).join('\n\n'));
+		currentTracker = null;
+	}
+}
+
+export function beginLoggingFS(withStacks: boolean = false): void {
+	if ((<any>self).beginLoggingFS) {
+		(<any>self).beginLoggingFS(withStacks);
+	}
+}
+
+export function endLoggingFS(): void {
+	if ((<any>self).endLoggingFS) {
+		(<any>self).endLoggingFS();
+	}
+}
diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts
index 0bec27fcd..cb7dedbe2 100644
--- a/src/vs/base/test/common/types.test.ts
+++ b/src/vs/base/test/common/types.test.ts
@@ -57,7 +57,7 @@ suite('Types', () => {
 		assert(!types.isObject(/test/));
 		assert(!types.isObject(new RegExp('')));
 		assert(!types.isFunction(new Date()));
-		assert(!types.isObject(assert));
+		assert.strictEqual(types.isObject(assert), false);
 		assert(!types.isObject(function foo() { }));
 
 		assert(types.isObject({}));
@@ -75,7 +75,7 @@ suite('Types', () => {
 		assert(!types.isEmptyObject(/test/));
 		assert(!types.isEmptyObject(new RegExp('')));
 		assert(!types.isEmptyObject(new Date()));
-		assert(!types.isEmptyObject(assert));
+		assert.strictEqual(types.isEmptyObject(assert), false);
 		assert(!types.isEmptyObject(function foo() { /**/ }));
 		assert(!types.isEmptyObject({ foo: 'bar' }));
 
@@ -178,15 +178,15 @@ suite('Types', () => {
 		assert.throws(() => types.assertAllDefined(true, undefined));
 		assert.throws(() => types.assertAllDefined(undefined, false));
 
-		assert.equal(types.assertIsDefined(true), true);
-		assert.equal(types.assertIsDefined(false), false);
-		assert.equal(types.assertIsDefined('Hello'), 'Hello');
-		assert.equal(types.assertIsDefined(''), '');
+		assert.strictEqual(types.assertIsDefined(true), true);
+		assert.strictEqual(types.assertIsDefined(false), false);
+		assert.strictEqual(types.assertIsDefined('Hello'), 'Hello');
+		assert.strictEqual(types.assertIsDefined(''), '');
 
 		const res = types.assertAllDefined(1, true, 'Hello');
-		assert.equal(res[0], 1);
-		assert.equal(res[1], true);
-		assert.equal(res[2], 'Hello');
+		assert.strictEqual(res[0], 1);
+		assert.strictEqual(res[1], true);
+		assert.strictEqual(res[2], 'Hello');
 	});
 
 	test('validateConstraints', () => {
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index bc4e409c0..a05e4fc3d 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -9,82 +9,82 @@ import { isWindows } from 'vs/base/common/platform';
 
 suite('URI', () => {
 	test('file#toString', () => {
-		assert.equal(URI.file('c:/win/path').toString(), 'file:///c%3A/win/path');
-		assert.equal(URI.file('C:/win/path').toString(), 'file:///c%3A/win/path');
-		assert.equal(URI.file('c:/win/path/').toString(), 'file:///c%3A/win/path/');
-		assert.equal(URI.file('/c:/win/path').toString(), 'file:///c%3A/win/path');
+		assert.strictEqual(URI.file('c:/win/path').toString(), 'file:///c%3A/win/path');
+		assert.strictEqual(URI.file('C:/win/path').toString(), 'file:///c%3A/win/path');
+		assert.strictEqual(URI.file('c:/win/path/').toString(), 'file:///c%3A/win/path/');
+		assert.strictEqual(URI.file('/c:/win/path').toString(), 'file:///c%3A/win/path');
 	});
 
 	test('URI.file (win-special)', () => {
 		if (isWindows) {
-			assert.equal(URI.file('c:\\win\\path').toString(), 'file:///c%3A/win/path');
-			assert.equal(URI.file('c:\\win/path').toString(), 'file:///c%3A/win/path');
+			assert.strictEqual(URI.file('c:\\win\\path').toString(), 'file:///c%3A/win/path');
+			assert.strictEqual(URI.file('c:\\win/path').toString(), 'file:///c%3A/win/path');
 		} else {
-			assert.equal(URI.file('c:\\win\\path').toString(), 'file:///c%3A%5Cwin%5Cpath');
-			assert.equal(URI.file('c:\\win/path').toString(), 'file:///c%3A%5Cwin/path');
+			assert.strictEqual(URI.file('c:\\win\\path').toString(), 'file:///c%3A%5Cwin%5Cpath');
+			assert.strictEqual(URI.file('c:\\win/path').toString(), 'file:///c%3A%5Cwin/path');
 
 		}
 	});
 
 	test('file#fsPath (win-special)', () => {
 		if (isWindows) {
-			assert.equal(URI.file('c:\\win\\path').fsPath, 'c:\\win\\path');
-			assert.equal(URI.file('c:\\win/path').fsPath, 'c:\\win\\path');
+			assert.strictEqual(URI.file('c:\\win\\path').fsPath, 'c:\\win\\path');
+			assert.strictEqual(URI.file('c:\\win/path').fsPath, 'c:\\win\\path');
 
-			assert.equal(URI.file('c:/win/path').fsPath, 'c:\\win\\path');
-			assert.equal(URI.file('c:/win/path/').fsPath, 'c:\\win\\path\\');
-			assert.equal(URI.file('C:/win/path').fsPath, 'c:\\win\\path');
-			assert.equal(URI.file('/c:/win/path').fsPath, 'c:\\win\\path');
-			assert.equal(URI.file('./c/win/path').fsPath, '\\.\\c\\win\\path');
+			assert.strictEqual(URI.file('c:/win/path').fsPath, 'c:\\win\\path');
+			assert.strictEqual(URI.file('c:/win/path/').fsPath, 'c:\\win\\path\\');
+			assert.strictEqual(URI.file('C:/win/path').fsPath, 'c:\\win\\path');
+			assert.strictEqual(URI.file('/c:/win/path').fsPath, 'c:\\win\\path');
+			assert.strictEqual(URI.file('./c/win/path').fsPath, '\\.\\c\\win\\path');
 		} else {
-			assert.equal(URI.file('c:/win/path').fsPath, 'c:/win/path');
-			assert.equal(URI.file('c:/win/path/').fsPath, 'c:/win/path/');
-			assert.equal(URI.file('C:/win/path').fsPath, 'c:/win/path');
-			assert.equal(URI.file('/c:/win/path').fsPath, 'c:/win/path');
-			assert.equal(URI.file('./c/win/path').fsPath, '/./c/win/path');
+			assert.strictEqual(URI.file('c:/win/path').fsPath, 'c:/win/path');
+			assert.strictEqual(URI.file('c:/win/path/').fsPath, 'c:/win/path/');
+			assert.strictEqual(URI.file('C:/win/path').fsPath, 'c:/win/path');
+			assert.strictEqual(URI.file('/c:/win/path').fsPath, 'c:/win/path');
+			assert.strictEqual(URI.file('./c/win/path').fsPath, '/./c/win/path');
 		}
 	});
 
 	test('URI#fsPath - no `fsPath` when no `path`', () => {
 		const value = URI.parse('file://%2Fhome%2Fticino%2Fdesktop%2Fcpluscplus%2Ftest.cpp');
-		assert.equal(value.authority, '/home/ticino/desktop/cpluscplus/test.cpp');
-		assert.equal(value.path, '/');
+		assert.strictEqual(value.authority, '/home/ticino/desktop/cpluscplus/test.cpp');
+		assert.strictEqual(value.path, '/');
 		if (isWindows) {
-			assert.equal(value.fsPath, '\\');
+			assert.strictEqual(value.fsPath, '\\');
 		} else {
-			assert.equal(value.fsPath, '/');
+			assert.strictEqual(value.fsPath, '/');
 		}
 	});
 
 	test('http#toString', () => {
-		assert.equal(URI.from({ scheme: 'http', authority: 'www.msft.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
-		assert.equal(URI.from({ scheme: 'http', authority: 'www.msft.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
-		assert.equal(URI.from({ scheme: 'http', authority: 'www.MSFT.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
-		assert.equal(URI.from({ scheme: 'http', authority: '', path: 'my/path' }).toString(), 'http:/my/path');
-		assert.equal(URI.from({ scheme: 'http', authority: '', path: '/my/path' }).toString(), 'http:/my/path');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'www.msft.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'www.msft.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'www.MSFT.com', path: '/my/path' }).toString(), 'http://www.msft.com/my/path');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: '', path: 'my/path' }).toString(), 'http:/my/path');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: '', path: '/my/path' }).toString(), 'http:/my/path');
 		//http://a-test-site.com/#test=true
-		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(), 'http://a-test-site.com/?test%3Dtrue');
-		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(), 'http://a-test-site.com/#test%3Dtrue');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(), 'http://a-test-site.com/?test%3Dtrue');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(), 'http://a-test-site.com/#test%3Dtrue');
 	});
 
 	test('http#toString, encode=FALSE', () => {
-		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(true), 'http://a-test-site.com/?test=true');
-		assert.equal(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(true), 'http://a-test-site.com/#test=true');
-		assert.equal(URI.from({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: 'test=true' }).toString(true), 'http://a-test-site.com/?test=true');
+		assert.strictEqual(URI.from({ scheme: 'http', authority: 'a-test-site.com', path: '/', query: '', fragment: 'test=true' }).toString(true), 'http://a-test-site.com/#test=true');
+		assert.strictEqual(URI.from({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(true), 'http:/api/files/test.me?t=1234');
 
 		const value = URI.parse('file://shares/pröjects/c%23/#l12');
-		assert.equal(value.authority, 'shares');
-		assert.equal(value.path, '/pröjects/c#/');
-		assert.equal(value.fragment, 'l12');
-		assert.equal(value.toString(), 'file://shares/pr%C3%B6jects/c%23/#l12');
-		assert.equal(value.toString(true), 'file://shares/pröjects/c%23/#l12');
+		assert.strictEqual(value.authority, 'shares');
+		assert.strictEqual(value.path, '/pröjects/c#/');
+		assert.strictEqual(value.fragment, 'l12');
+		assert.strictEqual(value.toString(), 'file://shares/pr%C3%B6jects/c%23/#l12');
+		assert.strictEqual(value.toString(true), 'file://shares/pröjects/c%23/#l12');
 
 		const uri2 = URI.parse(value.toString(true));
 		const uri3 = URI.parse(value.toString());
-		assert.equal(uri2.authority, uri3.authority);
-		assert.equal(uri2.path, uri3.path);
-		assert.equal(uri2.query, uri3.query);
-		assert.equal(uri2.fragment, uri3.fragment);
+		assert.strictEqual(uri2.authority, uri3.authority);
+		assert.strictEqual(uri2.path, uri3.path);
+		assert.strictEqual(uri2.query, uri3.query);
+		assert.strictEqual(uri2.fragment, uri3.fragment);
 	});
 
 	test('with, identity', () => {
@@ -101,23 +101,23 @@ suite('URI', () => {
 	});
 
 	test('with, changes', () => {
-		assert.equal(URI.parse('before:some/file/path').with({ scheme: 'after' }).toString(), 'after:some/file/path');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
-		assert.equal(URI.from({ scheme: 's' }).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.parse('before:some/file/path').with({ scheme: 'after' }).toString(), 'after:some/file/path');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'http', path: '/api/files/test.me', query: 't=1234' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'http', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'http:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'https', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'https:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'HTTP', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTP:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'HTTPS', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'HTTPS:/api/files/test.me?t%3D1234');
+		assert.strictEqual(URI.from({ scheme: 's' }).with({ scheme: 'boo', authority: '', path: '/api/files/test.me', query: 't=1234', fragment: '' }).toString(), 'boo:/api/files/test.me?t%3D1234');
 	});
 
 	test('with, remove components #8465', () => {
-		assert.equal(URI.parse('scheme://authority/path').with({ authority: '' }).toString(), 'scheme:/path');
-		assert.equal(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ authority: '' }).toString(), 'scheme:/path');
-		assert.equal(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ authority: null }).toString(), 'scheme:/path');
-		assert.equal(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ path: '' }).toString(), 'scheme://authority');
-		assert.equal(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ path: null }).toString(), 'scheme://authority');
-		assert.equal(URI.parse('scheme:/path').with({ authority: '' }).toString(), 'scheme:/path');
-		assert.equal(URI.parse('scheme:/path').with({ authority: null }).toString(), 'scheme:/path');
+		assert.strictEqual(URI.parse('scheme://authority/path').with({ authority: '' }).toString(), 'scheme:/path');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ authority: '' }).toString(), 'scheme:/path');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ authority: null }).toString(), 'scheme:/path');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ path: '' }).toString(), 'scheme://authority');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: 'authority' }).with({ path: null }).toString(), 'scheme://authority');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: '' }).toString(), 'scheme:/path');
+		assert.strictEqual(URI.parse('scheme:/path').with({ authority: null }).toString(), 'scheme:/path');
 	});
 
 	test('with, validation', () => {
@@ -130,104 +130,104 @@ suite('URI', () => {
 
 	test('parse', () => {
 		let value = URI.parse('http:/api/files/test.me?t=1234');
-		assert.equal(value.scheme, 'http');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/api/files/test.me');
-		assert.equal(value.query, 't=1234');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'http');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/api/files/test.me');
+		assert.strictEqual(value.query, 't=1234');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('http://api/files/test.me?t=1234');
-		assert.equal(value.scheme, 'http');
-		assert.equal(value.authority, 'api');
-		assert.equal(value.path, '/files/test.me');
-		assert.equal(value.query, 't=1234');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'http');
+		assert.strictEqual(value.authority, 'api');
+		assert.strictEqual(value.path, '/files/test.me');
+		assert.strictEqual(value.query, 't=1234');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('file:///c:/test/me');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/c:/test/me');
-		assert.equal(value.fragment, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fsPath, isWindows ? 'c:\\test\\me' : 'c:/test/me');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/c:/test/me');
+		assert.strictEqual(value.fragment, '');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fsPath, isWindows ? 'c:\\test\\me' : 'c:/test/me');
 
 		value = URI.parse('file://shares/files/c%23/p.cs');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, 'shares');
-		assert.equal(value.path, '/files/c#/p.cs');
-		assert.equal(value.fragment, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fsPath, isWindows ? '\\\\shares\\files\\c#\\p.cs' : '//shares/files/c#/p.cs');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, 'shares');
+		assert.strictEqual(value.path, '/files/c#/p.cs');
+		assert.strictEqual(value.fragment, '');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fsPath, isWindows ? '\\\\shares\\files\\c#\\p.cs' : '//shares/files/c#/p.cs');
 
 		value = URI.parse('file:///c:/Source/Z%C3%BCrich%20or%20Zurich%20(%CB%88zj%CA%8A%C9%99r%C9%AAk,/Code/resources/app/plugins/c%23/plugin.json');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/c:/Source/Zürich or Zurich (ˈzjʊərɪk,/Code/resources/app/plugins/c#/plugin.json');
-		assert.equal(value.fragment, '');
-		assert.equal(value.query, '');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/c:/Source/Zürich or Zurich (ˈzjʊərɪk,/Code/resources/app/plugins/c#/plugin.json');
+		assert.strictEqual(value.fragment, '');
+		assert.strictEqual(value.query, '');
 
 		value = URI.parse('file:///c:/test %25/path');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/c:/test %/path');
-		assert.equal(value.fragment, '');
-		assert.equal(value.query, '');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/c:/test %/path');
+		assert.strictEqual(value.fragment, '');
+		assert.strictEqual(value.query, '');
 
 		value = URI.parse('inmemory:');
-		assert.equal(value.scheme, 'inmemory');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'inmemory');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('foo:api/files/test');
-		assert.equal(value.scheme, 'foo');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'api/files/test');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'foo');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, 'api/files/test');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('file:?q');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/');
-		assert.equal(value.query, 'q');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/');
+		assert.strictEqual(value.query, 'q');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('file:#d');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, 'd');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, 'd');
 
 		value = URI.parse('f3ile:#d');
-		assert.equal(value.scheme, 'f3ile');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, 'd');
+		assert.strictEqual(value.scheme, 'f3ile');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, 'd');
 
 		value = URI.parse('foo+bar:path');
-		assert.equal(value.scheme, 'foo+bar');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'path');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'foo+bar');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, 'path');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('foo-bar:path');
-		assert.equal(value.scheme, 'foo-bar');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'path');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'foo-bar');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, 'path');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, '');
 
 		value = URI.parse('foo.bar:path');
-		assert.equal(value.scheme, 'foo.bar');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, 'path');
-		assert.equal(value.query, '');
-		assert.equal(value.fragment, '');
+		assert.strictEqual(value.scheme, 'foo.bar');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, 'path');
+		assert.strictEqual(value.query, '');
+		assert.strictEqual(value.fragment, '');
 	});
 
 	test('parse, disallow //path when no authority', () => {
@@ -237,132 +237,132 @@ suite('URI', () => {
 	test('URI#file, win-speciale', () => {
 		if (isWindows) {
 			let value = URI.file('c:\\test\\drive');
-			assert.equal(value.path, '/c:/test/drive');
-			assert.equal(value.toString(), 'file:///c%3A/test/drive');
+			assert.strictEqual(value.path, '/c:/test/drive');
+			assert.strictEqual(value.toString(), 'file:///c%3A/test/drive');
 
 			value = URI.file('\\\\shäres\\path\\c#\\plugin.json');
-			assert.equal(value.scheme, 'file');
-			assert.equal(value.authority, 'shäres');
-			assert.equal(value.path, '/path/c#/plugin.json');
-			assert.equal(value.fragment, '');
-			assert.equal(value.query, '');
-			assert.equal(value.toString(), 'file://sh%C3%A4res/path/c%23/plugin.json');
+			assert.strictEqual(value.scheme, 'file');
+			assert.strictEqual(value.authority, 'shäres');
+			assert.strictEqual(value.path, '/path/c#/plugin.json');
+			assert.strictEqual(value.fragment, '');
+			assert.strictEqual(value.query, '');
+			assert.strictEqual(value.toString(), 'file://sh%C3%A4res/path/c%23/plugin.json');
 
 			value = URI.file('\\\\localhost\\c$\\GitDevelopment\\express');
-			assert.equal(value.scheme, 'file');
-			assert.equal(value.path, '/c$/GitDevelopment/express');
-			assert.equal(value.fsPath, '\\\\localhost\\c$\\GitDevelopment\\express');
-			assert.equal(value.query, '');
-			assert.equal(value.fragment, '');
-			assert.equal(value.toString(), 'file://localhost/c%24/GitDevelopment/express');
+			assert.strictEqual(value.scheme, 'file');
+			assert.strictEqual(value.path, '/c$/GitDevelopment/express');
+			assert.strictEqual(value.fsPath, '\\\\localhost\\c$\\GitDevelopment\\express');
+			assert.strictEqual(value.query, '');
+			assert.strictEqual(value.fragment, '');
+			assert.strictEqual(value.toString(), 'file://localhost/c%24/GitDevelopment/express');
 
 			value = URI.file('c:\\test with %\\path');
-			assert.equal(value.path, '/c:/test with %/path');
-			assert.equal(value.toString(), 'file:///c%3A/test%20with%20%25/path');
+			assert.strictEqual(value.path, '/c:/test with %/path');
+			assert.strictEqual(value.toString(), 'file:///c%3A/test%20with%20%25/path');
 
 			value = URI.file('c:\\test with %25\\path');
-			assert.equal(value.path, '/c:/test with %25/path');
-			assert.equal(value.toString(), 'file:///c%3A/test%20with%20%2525/path');
+			assert.strictEqual(value.path, '/c:/test with %25/path');
+			assert.strictEqual(value.toString(), 'file:///c%3A/test%20with%20%2525/path');
 
 			value = URI.file('c:\\test with %25\\c#code');
-			assert.equal(value.path, '/c:/test with %25/c#code');
-			assert.equal(value.toString(), 'file:///c%3A/test%20with%20%2525/c%23code');
+			assert.strictEqual(value.path, '/c:/test with %25/c#code');
+			assert.strictEqual(value.toString(), 'file:///c%3A/test%20with%20%2525/c%23code');
 
 			value = URI.file('\\\\shares');
-			assert.equal(value.scheme, 'file');
-			assert.equal(value.authority, 'shares');
-			assert.equal(value.path, '/'); // slash is always there
+			assert.strictEqual(value.scheme, 'file');
+			assert.strictEqual(value.authority, 'shares');
+			assert.strictEqual(value.path, '/'); // slash is always there
 
 			value = URI.file('\\\\shares\\');
-			assert.equal(value.scheme, 'file');
-			assert.equal(value.authority, 'shares');
-			assert.equal(value.path, '/');
+			assert.strictEqual(value.scheme, 'file');
+			assert.strictEqual(value.authority, 'shares');
+			assert.strictEqual(value.path, '/');
 		}
 	});
 
 	test('VSCode URI module\'s driveLetterPath regex is incorrect, #32961', function () {
 		let uri = URI.parse('file:///_:/path');
-		assert.equal(uri.fsPath, isWindows ? '\\_:\\path' : '/_:/path');
+		assert.strictEqual(uri.fsPath, isWindows ? '\\_:\\path' : '/_:/path');
 	});
 
 	test('URI#file, no path-is-uri check', () => {
 
 		// we don't complain here
 		let value = URI.file('file://path/to/file');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/file://path/to/file');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/file://path/to/file');
 	});
 
 	test('URI#file, always slash', () => {
 
 		let value = URI.file('a.file');
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/a.file');
-		assert.equal(value.toString(), 'file:///a.file');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/a.file');
+		assert.strictEqual(value.toString(), 'file:///a.file');
 
 		value = URI.parse(value.toString());
-		assert.equal(value.scheme, 'file');
-		assert.equal(value.authority, '');
-		assert.equal(value.path, '/a.file');
-		assert.equal(value.toString(), 'file:///a.file');
+		assert.strictEqual(value.scheme, 'file');
+		assert.strictEqual(value.authority, '');
+		assert.strictEqual(value.path, '/a.file');
+		assert.strictEqual(value.toString(), 'file:///a.file');
 	});
 
 	test('URI.toString, only scheme and query', () => {
 		const value = URI.parse('stuff:?qüery');
-		assert.equal(value.toString(), 'stuff:?q%C3%BCery');
+		assert.strictEqual(value.toString(), 'stuff:?q%C3%BCery');
 	});
 
 	test('URI#toString, upper-case percent espaces', () => {
 		const value = URI.parse('file://sh%c3%a4res/path');
-		assert.equal(value.toString(), 'file://sh%C3%A4res/path');
+		assert.strictEqual(value.toString(), 'file://sh%C3%A4res/path');
 	});
 
 	test('URI#toString, lower-case windows drive letter', () => {
-		assert.equal(URI.parse('untitled:c:/Users/jrieken/Code/abc.txt').toString(), 'untitled:c%3A/Users/jrieken/Code/abc.txt');
-		assert.equal(URI.parse('untitled:C:/Users/jrieken/Code/abc.txt').toString(), 'untitled:c%3A/Users/jrieken/Code/abc.txt');
+		assert.strictEqual(URI.parse('untitled:c:/Users/jrieken/Code/abc.txt').toString(), 'untitled:c%3A/Users/jrieken/Code/abc.txt');
+		assert.strictEqual(URI.parse('untitled:C:/Users/jrieken/Code/abc.txt').toString(), 'untitled:c%3A/Users/jrieken/Code/abc.txt');
 	});
 
 	test('URI#toString, escape all the bits', () => {
 
 		const value = URI.file('/Users/jrieken/Code/_samples/18500/Mödel + Other Thîngß/model.js');
-		assert.equal(value.toString(), 'file:///Users/jrieken/Code/_samples/18500/M%C3%B6del%20%2B%20Other%20Th%C3%AEng%C3%9F/model.js');
+		assert.strictEqual(value.toString(), 'file:///Users/jrieken/Code/_samples/18500/M%C3%B6del%20%2B%20Other%20Th%C3%AEng%C3%9F/model.js');
 	});
 
 	test('URI#toString, don\'t encode port', () => {
 		let value = URI.parse('http://localhost:8080/far');
-		assert.equal(value.toString(), 'http://localhost:8080/far');
+		assert.strictEqual(value.toString(), 'http://localhost:8080/far');
 
 		value = URI.from({ scheme: 'http', authority: 'löcalhost:8080', path: '/far', query: undefined, fragment: undefined });
-		assert.equal(value.toString(), 'http://l%C3%B6calhost:8080/far');
+		assert.strictEqual(value.toString(), 'http://l%C3%B6calhost:8080/far');
 	});
 
 	test('URI#toString, user information in authority', () => {
 		let value = URI.parse('http://foo:bar@localhost/far');
-		assert.equal(value.toString(), 'http://foo:bar@localhost/far');
+		assert.strictEqual(value.toString(), 'http://foo:bar@localhost/far');
 
 		value = URI.parse('http://foo@localhost/far');
-		assert.equal(value.toString(), 'http://foo@localhost/far');
+		assert.strictEqual(value.toString(), 'http://foo@localhost/far');
 
 		value = URI.parse('http://foo:bAr@localhost:8080/far');
-		assert.equal(value.toString(), 'http://foo:bAr@localhost:8080/far');
+		assert.strictEqual(value.toString(), 'http://foo:bAr@localhost:8080/far');
 
 		value = URI.parse('http://foo@localhost:8080/far');
-		assert.equal(value.toString(), 'http://foo@localhost:8080/far');
+		assert.strictEqual(value.toString(), 'http://foo@localhost:8080/far');
 
 		value = URI.from({ scheme: 'http', authority: 'föö:bör@löcalhost:8080', path: '/far', query: undefined, fragment: undefined });
-		assert.equal(value.toString(), 'http://f%C3%B6%C3%B6:b%C3%B6r@l%C3%B6calhost:8080/far');
+		assert.strictEqual(value.toString(), 'http://f%C3%B6%C3%B6:b%C3%B6r@l%C3%B6calhost:8080/far');
 	});
 
 	test('correctFileUriToFilePath2', () => {
 
 		const test = (input: string, expected: string) => {
 			const value = URI.parse(input);
-			assert.equal(value.fsPath, expected, 'Result for ' + input);
+			assert.strictEqual(value.fsPath, expected, 'Result for ' + input);
 			const value2 = URI.file(value.fsPath);
-			assert.equal(value2.fsPath, expected, 'Result for ' + input);
-			assert.equal(value.toString(), value2.toString());
+			assert.strictEqual(value2.fsPath, expected, 'Result for ' + input);
+			assert.strictEqual(value.toString(), value2.toString());
 		};
 
 		test('file:///c:/alex.txt', isWindows ? 'c:\\alex.txt' : 'c:/alex.txt');
@@ -374,104 +374,132 @@ suite('URI', () => {
 	test('URI - http, query & toString', function () {
 
 		let uri = URI.parse('https://go.microsoft.com/fwlink/?LinkId=518008');
-		assert.equal(uri.query, 'LinkId=518008');
-		assert.equal(uri.toString(true), 'https://go.microsoft.com/fwlink/?LinkId=518008');
-		assert.equal(uri.toString(), 'https://go.microsoft.com/fwlink/?LinkId%3D518008');
+		assert.strictEqual(uri.query, 'LinkId=518008');
+		assert.strictEqual(uri.toString(true), 'https://go.microsoft.com/fwlink/?LinkId=518008');
+		assert.strictEqual(uri.toString(), 'https://go.microsoft.com/fwlink/?LinkId%3D518008');
 
 		let uri2 = URI.parse(uri.toString());
-		assert.equal(uri2.query, 'LinkId=518008');
-		assert.equal(uri2.query, uri.query);
+		assert.strictEqual(uri2.query, 'LinkId=518008');
+		assert.strictEqual(uri2.query, uri.query);
 
 		uri = URI.parse('https://go.microsoft.com/fwlink/?LinkId=518008&foö&ké¥=üü');
-		assert.equal(uri.query, 'LinkId=518008&foö&ké¥=üü');
-		assert.equal(uri.toString(true), 'https://go.microsoft.com/fwlink/?LinkId=518008&foö&ké¥=üü');
-		assert.equal(uri.toString(), 'https://go.microsoft.com/fwlink/?LinkId%3D518008%26fo%C3%B6%26k%C3%A9%C2%A5%3D%C3%BC%C3%BC');
+		assert.strictEqual(uri.query, 'LinkId=518008&foö&ké¥=üü');
+		assert.strictEqual(uri.toString(true), 'https://go.microsoft.com/fwlink/?LinkId=518008&foö&ké¥=üü');
+		assert.strictEqual(uri.toString(), 'https://go.microsoft.com/fwlink/?LinkId%3D518008%26fo%C3%B6%26k%C3%A9%C2%A5%3D%C3%BC%C3%BC');
 
 		uri2 = URI.parse(uri.toString());
-		assert.equal(uri2.query, 'LinkId=518008&foö&ké¥=üü');
-		assert.equal(uri2.query, uri.query);
+		assert.strictEqual(uri2.query, 'LinkId=518008&foö&ké¥=üü');
+		assert.strictEqual(uri2.query, uri.query);
 
 		// #24849
 		uri = URI.parse('https://twitter.com/search?src=typd&q=%23tag');
-		assert.equal(uri.toString(true), 'https://twitter.com/search?src=typd&q=%23tag');
+		assert.strictEqual(uri.toString(true), 'https://twitter.com/search?src=typd&q=%23tag');
 	});
 
 
 	test('class URI cannot represent relative file paths #34449', function () {
 
 		let path = '/foo/bar';
-		assert.equal(URI.file(path).path, path);
+		assert.strictEqual(URI.file(path).path, path);
 		path = 'foo/bar';
-		assert.equal(URI.file(path).path, '/foo/bar');
+		assert.strictEqual(URI.file(path).path, '/foo/bar');
 		path = './foo/bar';
-		assert.equal(URI.file(path).path, '/./foo/bar'); // missing normalization
+		assert.strictEqual(URI.file(path).path, '/./foo/bar'); // missing normalization
 
 		const fileUri1 = URI.parse(`file:foo/bar`);
-		assert.equal(fileUri1.path, '/foo/bar');
-		assert.equal(fileUri1.authority, '');
+		assert.strictEqual(fileUri1.path, '/foo/bar');
+		assert.strictEqual(fileUri1.authority, '');
 		const uri = fileUri1.toString();
-		assert.equal(uri, 'file:///foo/bar');
+		assert.strictEqual(uri, 'file:///foo/bar');
 		const fileUri2 = URI.parse(uri);
-		assert.equal(fileUri2.path, '/foo/bar');
-		assert.equal(fileUri2.authority, '');
+		assert.strictEqual(fileUri2.path, '/foo/bar');
+		assert.strictEqual(fileUri2.authority, '');
 	});
 
 	test('Ctrl click to follow hash query param url gets urlencoded #49628', function () {
 		let input = 'http://localhost:3000/#/foo?bar=baz';
 		let uri = URI.parse(input);
-		assert.equal(uri.toString(true), input);
+		assert.strictEqual(uri.toString(true), input);
 
 		input = 'http://localhost:3000/foo?bar=baz';
 		uri = URI.parse(input);
-		assert.equal(uri.toString(true), input);
+		assert.strictEqual(uri.toString(true), input);
 	});
 
 	test('Unable to open \'%A0.txt\': URI malformed #76506', function () {
 
 		let uri = URI.file('/foo/%A0.txt');
 		let uri2 = URI.parse(uri.toString());
-		assert.equal(uri.scheme, uri2.scheme);
-		assert.equal(uri.path, uri2.path);
+		assert.strictEqual(uri.scheme, uri2.scheme);
+		assert.strictEqual(uri.path, uri2.path);
 
 		uri = URI.file('/foo/%2e.txt');
 		uri2 = URI.parse(uri.toString());
-		assert.equal(uri.scheme, uri2.scheme);
-		assert.equal(uri.path, uri2.path);
+		assert.strictEqual(uri.scheme, uri2.scheme);
+		assert.strictEqual(uri.path, uri2.path);
+	});
+
+	test('Bug in URI.isUri() that fails `thing` type comparison #114971', function () {
+		const uri = URI.file('/foo/bazz.txt');
+		assert.strictEqual(URI.isUri(uri), true);
+		assert.strictEqual(URI.isUri(uri.toJSON()), false);
+
+		// fsPath -> getter
+		assert.strictEqual(URI.isUri({
+			scheme: 'file',
+			authority: '',
+			path: '/foo/bazz.txt',
+			get fsPath() { return '/foo/bazz.txt'; },
+			query: '',
+			fragment: '',
+			with() { return this; },
+			toString() { return ''; }
+		}), true);
+
+		// fsPath -> property
+		assert.strictEqual(URI.isUri({
+			scheme: 'file',
+			authority: '',
+			path: '/foo/bazz.txt',
+			fsPath: '/foo/bazz.txt',
+			query: '',
+			fragment: '',
+			with() { return this; },
+			toString() { return ''; }
+		}), true);
 	});
 
 	test('Unable to open \'%A0.txt\': URI malformed #76506', function () {
-		assert.equal(URI.parse('file://some/%.txt'), 'file://some/%25.txt');
-		assert.equal(URI.parse('file://some/%A0.txt'), 'file://some/%25A0.txt');
+		assert.strictEqual(URI.parse('file://some/%.txt').toString(), 'file://some/%25.txt');
+		assert.strictEqual(URI.parse('file://some/%A0.txt').toString(), 'file://some/%25A0.txt');
 	});
 
-	test('Links in markdown are broken if url contains encoded parameters #79474', function () {
-		this.skip();
+	test.skip('Links in markdown are broken if url contains encoded parameters #79474', function () {
 		let strIn = 'https://myhost.com/Redirect?url=http%3A%2F%2Fwww.bing.com%3Fsearch%3Dtom';
 		let uri1 = URI.parse(strIn);
 		let strOut = uri1.toString();
 		let uri2 = URI.parse(strOut);
 
-		assert.equal(uri1.scheme, uri2.scheme);
-		assert.equal(uri1.authority, uri2.authority);
-		assert.equal(uri1.path, uri2.path);
-		assert.equal(uri1.query, uri2.query);
-		assert.equal(uri1.fragment, uri2.fragment);
-		assert.equal(strIn, strOut); // fails here!!
+		assert.strictEqual(uri1.scheme, uri2.scheme);
+		assert.strictEqual(uri1.authority, uri2.authority);
+		assert.strictEqual(uri1.path, uri2.path);
+		assert.strictEqual(uri1.query, uri2.query);
+		assert.strictEqual(uri1.fragment, uri2.fragment);
+		assert.strictEqual(strIn, strOut); // fails here!!
 	});
 
-	test('Uri#parse can break path-component #45515', function () {
-		this.skip();
+	test.skip('Uri#parse can break path-component #45515', function () {
 		let strIn = 'https://firebasestorage.googleapis.com/v0/b/brewlangerie.appspot.com/o/products%2FzVNZkudXJyq8bPGTXUxx%2FBetterave-Sesame.jpg?alt=media&token=0b2310c4-3ea6-4207-bbde-9c3710ba0437';
 		let uri1 = URI.parse(strIn);
 		let strOut = uri1.toString();
 		let uri2 = URI.parse(strOut);
 
-		assert.equal(uri1.scheme, uri2.scheme);
-		assert.equal(uri1.authority, uri2.authority);
-		assert.equal(uri1.path, uri2.path);
-		assert.equal(uri1.query, uri2.query);
-		assert.equal(uri1.fragment, uri2.fragment);
-		assert.equal(strIn, strOut); // fails here!!
+		assert.strictEqual(uri1.scheme, uri2.scheme);
+		assert.strictEqual(uri1.authority, uri2.authority);
+		assert.strictEqual(uri1.path, uri2.path);
+		assert.strictEqual(uri1.query, uri2.query);
+		assert.strictEqual(uri1.fragment, uri2.fragment);
+		assert.strictEqual(strIn, strOut); // fails here!!
 	});
 
 	test('URI - (de)serialize', function () {
@@ -492,13 +520,13 @@ suite('URI', () => {
 			let data = value.toJSON() as UriComponents;
 			let clone = URI.revive(data);
 
-			assert.equal(clone.scheme, value.scheme);
-			assert.equal(clone.authority, value.authority);
-			assert.equal(clone.path, value.path);
-			assert.equal(clone.query, value.query);
-			assert.equal(clone.fragment, value.fragment);
-			assert.equal(clone.fsPath, value.fsPath);
-			assert.equal(clone.toString(), value.toString());
+			assert.strictEqual(clone.scheme, value.scheme);
+			assert.strictEqual(clone.authority, value.authority);
+			assert.strictEqual(clone.path, value.path);
+			assert.strictEqual(clone.query, value.query);
+			assert.strictEqual(clone.fragment, value.fragment);
+			assert.strictEqual(clone.fsPath, value.fsPath);
+			assert.strictEqual(clone.toString(), value.toString());
 		}
 		// }
 		// console.profileEnd();
@@ -507,11 +535,11 @@ suite('URI', () => {
 		const baseUri = URI.parse(base);
 		const newUri = URI.joinPath(baseUri, fragment);
 		const actual = newUri.toString(true);
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 
 		if (checkWithUrl) {
 			const actualUrl = new URL(fragment, base).href;
-			assert.equal(actualUrl, expected, 'DIFFERENT from URL');
+			assert.strictEqual(actualUrl, expected, 'DIFFERENT from URL');
 		}
 	}
 	test('URI#joinPath', function () {
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
index a5ebd13e5..63b0541b4 100644
--- a/src/vs/base/test/common/utils.ts
+++ b/src/vs/base/test/common/utils.ts
@@ -5,47 +5,10 @@
 
 import { join } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
-import { canceled } from 'vs/base/common/errors';
 import { isWindows } from 'vs/base/common/platform';
 
 export type ValueCallback<T = any> = (value: T | Promise<T>) => void;
 
-export class DeferredPromise<T> {
-
-	private completeCallback!: ValueCallback<T>;
-	private errorCallback!: (err: any) => void;
-
-	public p: Promise<any>;
-
-	constructor() {
-		this.p = new Promise<any>((c, e) => {
-			this.completeCallback = c;
-			this.errorCallback = e;
-		});
-	}
-
-	public complete(value: T) {
-		return new Promise<void>(resolve => {
-			this.completeCallback(value);
-			resolve();
-		});
-	}
-
-	public error(err: any) {
-		return new Promise<void>(resolve => {
-			this.errorCallback(err);
-			resolve();
-		});
-	}
-
-	public cancel() {
-		new Promise<void>(resolve => {
-			this.errorCallback(canceled());
-			resolve();
-		});
-	}
-}
-
 export function toResource(this: any, path: string) {
 	if (isWindows) {
 		return URI.file(join('C:\\', btoa(this.test.fullTitle()), path));
@@ -60,7 +23,7 @@ export function suiteRepeat(n: number, description: string, callback: (this: any
 	}
 }
 
-export function testRepeat(n: number, description: string, callback: (this: any, done: MochaDone) => any): void {
+export function testRepeat(n: number, description: string, callback: (this: any) => any): void {
 	for (let i = 0; i < n; i++) {
 		test(`${description} (iteration ${i})`, callback);
 	}
diff --git a/src/vs/base/test/common/uuid.test.ts b/src/vs/base/test/common/uuid.test.ts
index ce07ab9cb..632366bc2 100644
--- a/src/vs/base/test/common/uuid.test.ts
+++ b/src/vs/base/test/common/uuid.test.ts
@@ -8,8 +8,8 @@ import * as uuid from 'vs/base/common/uuid';
 suite('UUID', () => {
 	test('generation', () => {
 		const asHex = uuid.generateUuid();
-		assert.equal(asHex.length, 36);
-		assert.equal(asHex[14], '4');
+		assert.strictEqual(asHex.length, 36);
+		assert.strictEqual(asHex[14], '4');
 		assert.ok(asHex[19] === '8' || asHex[19] === '9' || asHex[19] === 'a' || asHex[19] === 'b');
 	});
 
diff --git a/src/vs/base/test/node/crypto.test.ts b/src/vs/base/test/node/crypto.test.ts
index ad8dc4fa5..16cfc58fe 100644
--- a/src/vs/base/test/node/crypto.test.ts
+++ b/src/vs/base/test/node/crypto.test.ts
@@ -4,24 +4,29 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { checksum } from 'vs/base/node/crypto';
-import { generateUuid } from 'vs/base/common/uuid';
 import { join } from 'vs/base/common/path';
 import { tmpdir } from 'os';
-import { mkdirp, rimraf, RimRafMode, writeFile } from 'vs/base/node/pfs';
+import { mkdirp, rimraf, writeFile } from 'vs/base/node/pfs';
+import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 
 suite('Crypto', () => {
 
+	let testDir: string;
+
+	setup(function () {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'crypto');
+
+		return mkdirp(testDir);
+	});
+
+	teardown(function () {
+		return rimraf(testDir);
+	});
+
 	test('checksum', async () => {
-		const id = generateUuid();
-		const testDir = join(tmpdir(), 'vsctests', id);
 		const testFile = join(testDir, 'checksum.txt');
-
-		await mkdirp(testDir);
-
 		await writeFile(testFile, 'Hello World');
 
 		await checksum(testFile, '0a4d55a8d778e5022fab701977c5d840bbc486d0');
-
-		await rimraf(testDir, RimRafMode.MOVE);
 	});
 });
diff --git a/src/vs/base/test/node/decoder.test.ts b/src/vs/base/test/node/decoder.test.ts
index f4d34d02f..aa2e867c7 100644
--- a/src/vs/base/test/node/decoder.test.ts
+++ b/src/vs/base/test/node/decoder.test.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as decoder from 'vs/base/node/decoder';
+import { LineDecoder } from 'vs/base/node/decoder';
 
 suite('Decoder', () => {
 
 	test('decoding', () => {
-		const lineDecoder = new decoder.LineDecoder();
+		const lineDecoder = new LineDecoder();
 		let res = lineDecoder.write(Buffer.from('hello'));
-		assert.equal(res.length, 0);
+		assert.strictEqual(res.length, 0);
 
 		res = lineDecoder.write(Buffer.from('\nworld'));
-		assert.equal(res[0], 'hello');
-		assert.equal(res.length, 1);
+		assert.strictEqual(res[0], 'hello');
+		assert.strictEqual(res.length, 1);
 
-		assert.equal(lineDecoder.end(), 'world');
+		assert.strictEqual(lineDecoder.end(), 'world');
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/node/extpath.test.ts b/src/vs/base/test/node/extpath.test.ts
index e435d6248..056110be8 100644
--- a/src/vs/base/test/node/extpath.test.ts
+++ b/src/vs/base/test/node/extpath.test.ts
@@ -4,70 +4,52 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as uuid from 'vs/base/common/uuid';
-import * as pfs from 'vs/base/node/pfs';
+import { tmpdir } from 'os';
+import { mkdirp, rimraf } from 'vs/base/node/pfs';
 import { realcaseSync, realpath, realpathSync } from 'vs/base/node/extpath';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 
-suite('Extpath', () => {
+flakySuite('Extpath', () => {
+	let testDir: string;
+
+	setup(() => {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'extpath');
+
+		return mkdirp(testDir, 493);
+	});
+
+	teardown(() => {
+		return rimraf(testDir);
+	});
 
 	test('realcase', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'extpath', id);
-
-		await pfs.mkdirp(newDir, 493);
 
 		// assume case insensitive file system
 		if (process.platform === 'win32' || process.platform === 'darwin') {
-			const upper = newDir.toUpperCase();
+			const upper = testDir.toUpperCase();
 			const real = realcaseSync(upper);
 
 			if (real) { // can be null in case of permission errors
-				assert.notEqual(real, upper);
-				assert.equal(real.toUpperCase(), upper);
-				assert.equal(real, newDir);
+				assert.notStrictEqual(real, upper);
+				assert.strictEqual(real.toUpperCase(), upper);
+				assert.strictEqual(real, testDir);
 			}
 		}
 
 		// linux, unix, etc. -> assume case sensitive file system
 		else {
-			const real = realcaseSync(newDir);
-			assert.equal(real, newDir);
+			const real = realcaseSync(testDir);
+			assert.strictEqual(real, testDir);
 		}
-
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
 	});
 
 	test('realpath', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'extpath', id);
-
-		await pfs.mkdirp(newDir, 493);
-
-		const realpathVal = await realpath(newDir);
+		const realpathVal = await realpath(testDir);
 		assert.ok(realpathVal);
-
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
 	});
 
-	test('realpathSync', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'extpath', id);
-
-		await pfs.mkdirp(newDir, 493);
-
-		let realpath!: string;
-		try {
-			realpath = realpathSync(newDir);
-		} catch (error) {
-			assert.ok(!error);
-		}
-		assert.ok(realpath!);
-
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
+	test('realpathSync', () => {
+		const realpath = realpathSync(testDir);
+		assert.ok(realpath);
 	});
 });
diff --git a/src/vs/base/test/node/id.test.ts b/src/vs/base/test/node/id.test.ts
index 637afa5b5..4d1241632 100644
--- a/src/vs/base/test/node/id.test.ts
+++ b/src/vs/base/test/node/id.test.ts
@@ -2,22 +2,21 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import * as assert from 'assert';
 import { getMachineId } from 'vs/base/node/id';
 import { getMac } from 'vs/base/node/macAddress';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 
-suite('ID', () => {
+flakySuite('ID', () => {
 
-	test('getMachineId', function () {
-		this.timeout(20000);
-		return getMachineId().then(id => {
-			assert.ok(id);
-		});
+	test('getMachineId', async function () {
+		const id = await getMachineId();
+		assert.ok(id);
 	});
 
-	test('getMac', () => {
-		return getMac().then(macAddress => {
-			assert.ok(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/.test(macAddress), `Expected a MAC address, got: ${macAddress}`);
-		});
+	test('getMac', async () => {
+		const macAddress = await getMac();
+		assert.ok(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/.test(macAddress), `Expected a MAC address, got: ${macAddress}`);
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/base/test/node/keytar.test.ts b/src/vs/base/test/node/keytar.test.ts
index b2f7bab50..4e187264b 100644
--- a/src/vs/base/test/node/keytar.test.ts
+++ b/src/vs/base/test/node/keytar.test.ts
@@ -2,36 +2,30 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 import * as assert from 'assert';
-import * as platform from 'vs/base/common/platform';
+import { isLinux } from 'vs/base/common/platform';
 
 suite('Keytar', () => {
 
-	test('loads and is functional', function (done) {
-		if (platform.isLinux) {
-			// Skip test due to set up issue with Travis.
-			this.skip();
-			return;
-		}
-		(async () => {
-			const keytar = await import('keytar');
-			const name = `VSCode Test ${Math.floor(Math.random() * 1e9)}`;
+	(isLinux ? test.skip : test)('loads and is functional', async () => { // TODO@RMacfarlane test seems to fail on Linux (Error: Unknown or unsupported transport 'disabled' for address 'disabled:')
+		const keytar = await import('keytar');
+		const name = `VSCode Test ${Math.floor(Math.random() * 1e9)}`;
+		try {
+			await keytar.setPassword(name, 'foo', 'bar');
+			assert.strictEqual(await keytar.findPassword(name), 'bar');
+			assert.strictEqual((await keytar.findCredentials(name)).length, 1);
+			assert.strictEqual(await keytar.getPassword(name, 'foo'), 'bar');
+			await keytar.deletePassword(name, 'foo');
+			assert.strictEqual(await keytar.getPassword(name, 'foo'), null);
+		} catch (err) {
+			// try to clean up
 			try {
-				await keytar.setPassword(name, 'foo', 'bar');
-				assert.equal(await keytar.findPassword(name), 'bar');
-				assert.equal((await keytar.findCredentials(name)).length, 1);
-				assert.equal(await keytar.getPassword(name, 'foo'), 'bar');
 				await keytar.deletePassword(name, 'foo');
-				assert.equal(await keytar.getPassword(name, 'foo'), undefined);
-			} catch (err) {
-				// try to clean up
-				try {
-					await keytar.deletePassword(name, 'foo');
-				} finally {
-					// eslint-disable-next-line no-unsafe-finally
-					throw err;
-				}
+			} finally {
+				// eslint-disable-next-line no-unsafe-finally
+				throw err;
 			}
-		})().then(done, done);
+		}
 	});
 });
diff --git a/src/vs/base/test/node/pfs/pfs.test.ts b/src/vs/base/test/node/pfs/pfs.test.ts
index fd324076b..eeb380a62 100644
--- a/src/vs/base/test/node/pfs/pfs.test.ts
+++ b/src/vs/base/test/node/pfs/pfs.test.ts
@@ -4,388 +4,306 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
 import * as fs from 'fs';
-import * as uuid from 'vs/base/common/uuid';
-import * as pfs from 'vs/base/node/pfs';
+import { tmpdir } from 'os';
+import { join, sep } from 'vs/base/common/path';
+import { generateUuid } from 'vs/base/common/uuid';
+import { copy, exists, mkdirp, move, readdir, readDirsInDir, readdirWithFileTypes, readFile, renameIgnoreError, rimraf, RimRafMode, rimrafSync, statLink, writeFile, writeFileSync } from 'vs/base/node/pfs';
 import { timeout } from 'vs/base/common/async';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { isWindows } from 'vs/base/common/platform';
 import { canNormalize } from 'vs/base/common/normalization';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 
-suite('PFS', function () {
+flakySuite('PFS', function () {
 
-	// Given issues such as https://github.com/microsoft/vscode/issues/84066
-	// we see random test failures when accessing the native file system. To
-	// diagnose further, we retry node.js file access tests up to 3 times to
-	// rule out any random disk issue.
-	this.retries(3);
+	let testDir: string;
+
+	setup(() => {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'pfs');
+
+		return mkdirp(testDir, 493);
+	});
+
+	teardown(() => {
+		return rimraf(testDir);
+	});
 
 	test('writeFile', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile = path.join(newDir, 'writefile.txt');
+		const testFile = join(testDir, 'writefile.txt');
 
-		await pfs.mkdirp(newDir, 493);
-		assert.ok(fs.existsSync(newDir));
+		assert.ok(!(await exists(testFile)));
 
-		await pfs.writeFile(testFile, 'Hello World', (null!));
-		assert.equal(fs.readFileSync(testFile), 'Hello World');
+		await writeFile(testFile, 'Hello World', (null!));
 
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
+		assert.strictEqual((await readFile(testFile)).toString(), 'Hello World');
 	});
 
 	test('writeFile - parallel write on different files works', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile1 = path.join(newDir, 'writefile1.txt');
-		const testFile2 = path.join(newDir, 'writefile2.txt');
-		const testFile3 = path.join(newDir, 'writefile3.txt');
-		const testFile4 = path.join(newDir, 'writefile4.txt');
-		const testFile5 = path.join(newDir, 'writefile5.txt');
-
-		await pfs.mkdirp(newDir, 493);
-		assert.ok(fs.existsSync(newDir));
+		const testFile1 = join(testDir, 'writefile1.txt');
+		const testFile2 = join(testDir, 'writefile2.txt');
+		const testFile3 = join(testDir, 'writefile3.txt');
+		const testFile4 = join(testDir, 'writefile4.txt');
+		const testFile5 = join(testDir, 'writefile5.txt');
 
 		await Promise.all([
-			pfs.writeFile(testFile1, 'Hello World 1', (null!)),
-			pfs.writeFile(testFile2, 'Hello World 2', (null!)),
-			pfs.writeFile(testFile3, 'Hello World 3', (null!)),
-			pfs.writeFile(testFile4, 'Hello World 4', (null!)),
-			pfs.writeFile(testFile5, 'Hello World 5', (null!))
+			writeFile(testFile1, 'Hello World 1', (null!)),
+			writeFile(testFile2, 'Hello World 2', (null!)),
+			writeFile(testFile3, 'Hello World 3', (null!)),
+			writeFile(testFile4, 'Hello World 4', (null!)),
+			writeFile(testFile5, 'Hello World 5', (null!))
 		]);
-		assert.equal(fs.readFileSync(testFile1), 'Hello World 1');
-		assert.equal(fs.readFileSync(testFile2), 'Hello World 2');
-		assert.equal(fs.readFileSync(testFile3), 'Hello World 3');
-		assert.equal(fs.readFileSync(testFile4), 'Hello World 4');
-		assert.equal(fs.readFileSync(testFile5), 'Hello World 5');
-
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
+		assert.strictEqual(fs.readFileSync(testFile1).toString(), 'Hello World 1');
+		assert.strictEqual(fs.readFileSync(testFile2).toString(), 'Hello World 2');
+		assert.strictEqual(fs.readFileSync(testFile3).toString(), 'Hello World 3');
+		assert.strictEqual(fs.readFileSync(testFile4).toString(), 'Hello World 4');
+		assert.strictEqual(fs.readFileSync(testFile5).toString(), 'Hello World 5');
 	});
 
 	test('writeFile - parallel write on same files works and is sequentalized', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile = path.join(newDir, 'writefile.txt');
-
-		await pfs.mkdirp(newDir, 493);
-		assert.ok(fs.existsSync(newDir));
+		const testFile = join(testDir, 'writefile.txt');
 
 		await Promise.all([
-			pfs.writeFile(testFile, 'Hello World 1', undefined),
-			pfs.writeFile(testFile, 'Hello World 2', undefined),
-			timeout(10).then(() => pfs.writeFile(testFile, 'Hello World 3', undefined)),
-			pfs.writeFile(testFile, 'Hello World 4', undefined),
-			timeout(10).then(() => pfs.writeFile(testFile, 'Hello World 5', undefined))
+			writeFile(testFile, 'Hello World 1', undefined),
+			writeFile(testFile, 'Hello World 2', undefined),
+			timeout(10).then(() => writeFile(testFile, 'Hello World 3', undefined)),
+			writeFile(testFile, 'Hello World 4', undefined),
+			timeout(10).then(() => writeFile(testFile, 'Hello World 5', undefined))
 		]);
-		assert.equal(fs.readFileSync(testFile), 'Hello World 5');
-
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
+		assert.strictEqual(fs.readFileSync(testFile).toString(), 'Hello World 5');
 	});
 
 	test('rimraf - simple - unlink', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		await pfs.rimraf(newDir);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(testDir);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimraf - simple - move', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		await pfs.rimraf(newDir, pfs.RimRafMode.MOVE);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(testDir, RimRafMode.MOVE);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimraf - recursive folder structure - unlink', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
+		fs.mkdirSync(join(testDir, 'somefolder'));
+		fs.writeFileSync(join(testDir, 'somefolder', 'somefile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-		fs.mkdirSync(path.join(newDir, 'somefolder'));
-		fs.writeFileSync(path.join(newDir, 'somefolder', 'somefile.txt'), 'Contents');
-
-		await pfs.rimraf(newDir);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(testDir);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimraf - recursive folder structure - move', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
+		fs.mkdirSync(join(testDir, 'somefolder'));
+		fs.writeFileSync(join(testDir, 'somefolder', 'somefile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-		fs.mkdirSync(path.join(newDir, 'somefolder'));
-		fs.writeFileSync(path.join(newDir, 'somefolder', 'somefile.txt'), 'Contents');
-
-		await pfs.rimraf(newDir, pfs.RimRafMode.MOVE);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(testDir, RimRafMode.MOVE);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimraf - simple ends with dot - move', async () => {
-		const id = `${uuid.generateUuid()}.`;
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		await pfs.rimraf(newDir, pfs.RimRafMode.MOVE);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(testDir, RimRafMode.MOVE);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimraf - simple ends with dot slash/backslash - move', async () => {
-		const id = `${uuid.generateUuid()}.`;
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		await pfs.rimraf(`${newDir}${path.sep}`, pfs.RimRafMode.MOVE);
-		assert.ok(!fs.existsSync(newDir));
+		await rimraf(`${testDir}${sep}`, RimRafMode.MOVE);
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimrafSync - swallows file not found error', function () {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		const nonExistingDir = join(testDir, 'not-existing');
+		rimrafSync(nonExistingDir);
 
-		pfs.rimrafSync(newDir);
-
-		assert.ok(!fs.existsSync(newDir));
+		assert.ok(!fs.existsSync(nonExistingDir));
 	});
 
 	test('rimrafSync - simple', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
+		rimrafSync(testDir);
 
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		pfs.rimrafSync(newDir);
-
-		assert.ok(!fs.existsSync(newDir));
+		assert.ok(!fs.existsSync(testDir));
 	});
 
 	test('rimrafSync - recursive folder structure', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
+		fs.mkdirSync(join(testDir, 'somefolder'));
+		fs.writeFileSync(join(testDir, 'somefolder', 'somefile.txt'), 'Contents');
 
-		fs.mkdirSync(path.join(newDir, 'somefolder'));
-		fs.writeFileSync(path.join(newDir, 'somefolder', 'somefile.txt'), 'Contents');
+		rimrafSync(testDir);
 
-		pfs.rimrafSync(newDir);
-
-		assert.ok(!fs.existsSync(newDir));
+		assert.ok(!fs.existsSync(testDir));
 	});
 
-	test('moveIgnoreError', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-
-		await pfs.mkdirp(newDir, 493);
-		try {
-			await pfs.renameIgnoreError(path.join(newDir, 'foo'), path.join(newDir, 'bar'));
-			return pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
-		}
-		catch (error) {
-			assert.fail(error);
-		}
+	test('moveIgnoreError', () => {
+		return renameIgnoreError(join(testDir, 'foo'), join(testDir, 'bar'));
 	});
 
 	test('copy, move and delete', async () => {
-		const id = uuid.generateUuid();
-		const id2 = uuid.generateUuid();
+		const id = generateUuid();
+		const id2 = generateUuid();
 		const sourceDir = getPathFromAmdModule(require, './fixtures');
-		const parentDir = path.join(os.tmpdir(), 'vsctests', 'pfs');
-		const targetDir = path.join(parentDir, id);
-		const targetDir2 = path.join(parentDir, id2);
+		const parentDir = join(tmpdir(), 'vsctests', 'pfs');
+		const targetDir = join(parentDir, id);
+		const targetDir2 = join(parentDir, id2);
 
-		await pfs.copy(sourceDir, targetDir);
+		await copy(sourceDir, targetDir);
 
 		assert.ok(fs.existsSync(targetDir));
-		assert.ok(fs.existsSync(path.join(targetDir, 'index.html')));
-		assert.ok(fs.existsSync(path.join(targetDir, 'site.css')));
-		assert.ok(fs.existsSync(path.join(targetDir, 'examples')));
-		assert.ok(fs.statSync(path.join(targetDir, 'examples')).isDirectory());
-		assert.ok(fs.existsSync(path.join(targetDir, 'examples', 'small.jxs')));
+		assert.ok(fs.existsSync(join(targetDir, 'index.html')));
+		assert.ok(fs.existsSync(join(targetDir, 'site.css')));
+		assert.ok(fs.existsSync(join(targetDir, 'examples')));
+		assert.ok(fs.statSync(join(targetDir, 'examples')).isDirectory());
+		assert.ok(fs.existsSync(join(targetDir, 'examples', 'small.jxs')));
 
-		await pfs.move(targetDir, targetDir2);
+		await move(targetDir, targetDir2);
 
 		assert.ok(!fs.existsSync(targetDir));
 		assert.ok(fs.existsSync(targetDir2));
-		assert.ok(fs.existsSync(path.join(targetDir2, 'index.html')));
-		assert.ok(fs.existsSync(path.join(targetDir2, 'site.css')));
-		assert.ok(fs.existsSync(path.join(targetDir2, 'examples')));
-		assert.ok(fs.statSync(path.join(targetDir2, 'examples')).isDirectory());
-		assert.ok(fs.existsSync(path.join(targetDir2, 'examples', 'small.jxs')));
+		assert.ok(fs.existsSync(join(targetDir2, 'index.html')));
+		assert.ok(fs.existsSync(join(targetDir2, 'site.css')));
+		assert.ok(fs.existsSync(join(targetDir2, 'examples')));
+		assert.ok(fs.statSync(join(targetDir2, 'examples')).isDirectory());
+		assert.ok(fs.existsSync(join(targetDir2, 'examples', 'small.jxs')));
 
-		await pfs.move(path.join(targetDir2, 'index.html'), path.join(targetDir2, 'index_moved.html'));
+		await move(join(targetDir2, 'index.html'), join(targetDir2, 'index_moved.html'));
 
-		assert.ok(!fs.existsSync(path.join(targetDir2, 'index.html')));
-		assert.ok(fs.existsSync(path.join(targetDir2, 'index_moved.html')));
+		assert.ok(!fs.existsSync(join(targetDir2, 'index.html')));
+		assert.ok(fs.existsSync(join(targetDir2, 'index_moved.html')));
 
-		await pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
+		await rimraf(parentDir);
 
 		assert.ok(!fs.existsSync(parentDir));
 	});
 
-	test('mkdirp', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+	test('copy skips over dangling symbolic links', async () => {
+		const id1 = generateUuid();
+		const symbolicLinkTarget = join(testDir, id1);
 
-		await pfs.mkdirp(newDir, 493);
+		const id2 = generateUuid();
+		const symbolicLink = join(testDir, id2);
+
+		const id3 = generateUuid();
+		const copyTarget = join(testDir, id3);
+
+		await mkdirp(symbolicLinkTarget, 493);
+
+		fs.symlinkSync(symbolicLinkTarget, symbolicLink, 'junction');
+
+		await rimraf(symbolicLinkTarget);
+
+		await copy(symbolicLink, copyTarget); // this should not throw
+
+		assert.ok(!fs.existsSync(copyTarget));
+	});
+
+	test('mkdirp', async () => {
+		const newDir = join(testDir, generateUuid());
+
+		await mkdirp(newDir, 493);
 
 		assert.ok(fs.existsSync(newDir));
-
-		return pfs.rimraf(parentDir, pfs.RimRafMode.MOVE);
 	});
 
 	test('readDirsInDir', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
+		fs.mkdirSync(join(testDir, 'somefolder1'));
+		fs.mkdirSync(join(testDir, 'somefolder2'));
+		fs.mkdirSync(join(testDir, 'somefolder3'));
+		fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents');
+		fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents');
 
-		await pfs.mkdirp(newDir, 493);
-
-		fs.mkdirSync(path.join(newDir, 'somefolder1'));
-		fs.mkdirSync(path.join(newDir, 'somefolder2'));
-		fs.mkdirSync(path.join(newDir, 'somefolder3'));
-		fs.writeFileSync(path.join(newDir, 'somefile.txt'), 'Contents');
-		fs.writeFileSync(path.join(newDir, 'someOtherFile.txt'), 'Contents');
-
-		const result = await pfs.readDirsInDir(newDir);
-		assert.equal(result.length, 3);
+		const result = await readDirsInDir(testDir);
+		assert.strictEqual(result.length, 3);
 		assert.ok(result.indexOf('somefolder1') !== -1);
 		assert.ok(result.indexOf('somefolder2') !== -1);
 		assert.ok(result.indexOf('somefolder3') !== -1);
-
-		await pfs.rimraf(newDir);
 	});
 
 	test('stat link', async () => {
-		if (isWindows) {
-			return; // Symlinks are not the same on win, and we can not create them programitically without admin privileges
-		}
+		const id1 = generateUuid();
+		const directory = join(testDir, id1);
 
-		const id1 = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id1);
-		const directory = path.join(parentDir, 'pfs', id1);
+		const id2 = generateUuid();
+		const symbolicLink = join(testDir, id2);
 
-		const id2 = uuid.generateUuid();
-		const symbolicLink = path.join(parentDir, 'pfs', id2);
+		await mkdirp(directory, 493);
 
-		await pfs.mkdirp(directory, 493);
+		fs.symlinkSync(directory, symbolicLink, 'junction');
 
-		fs.symlinkSync(directory, symbolicLink);
-
-		let statAndIsLink = await pfs.statLink(directory);
+		let statAndIsLink = await statLink(directory);
 		assert.ok(!statAndIsLink?.symbolicLink);
 
-		statAndIsLink = await pfs.statLink(symbolicLink);
+		statAndIsLink = await statLink(symbolicLink);
 		assert.ok(statAndIsLink?.symbolicLink);
 		assert.ok(!statAndIsLink?.symbolicLink?.dangling);
-
-		pfs.rimrafSync(directory);
 	});
 
 	test('stat link (non existing target)', async () => {
-		if (isWindows) {
-			return; // Symlinks are not the same on win, and we can not create them programitically without admin privileges
-		}
+		const id1 = generateUuid();
+		const directory = join(testDir, id1);
 
-		const id1 = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id1);
-		const directory = path.join(parentDir, 'pfs', id1);
+		const id2 = generateUuid();
+		const symbolicLink = join(testDir, id2);
 
-		const id2 = uuid.generateUuid();
-		const symbolicLink = path.join(parentDir, 'pfs', id2);
+		await mkdirp(directory, 493);
 
-		await pfs.mkdirp(directory, 493);
+		fs.symlinkSync(directory, symbolicLink, 'junction');
 
-		fs.symlinkSync(directory, symbolicLink);
+		await rimraf(directory);
 
-		pfs.rimrafSync(directory);
-
-		const statAndIsLink = await pfs.statLink(symbolicLink);
+		const statAndIsLink = await statLink(symbolicLink);
 		assert.ok(statAndIsLink?.symbolicLink);
 		assert.ok(statAndIsLink?.symbolicLink?.dangling);
 	});
 
 	test('readdir', async () => {
 		if (canNormalize && typeof process.versions['electron'] !== 'undefined' /* needs electron */) {
-			const id = uuid.generateUuid();
-			const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-			const newDir = path.join(parentDir, 'pfs', id, 'öäü');
+			const id = generateUuid();
+			const newDir = join(testDir, 'pfs', id, 'öäü');
 
-			await pfs.mkdirp(newDir, 493);
+			await mkdirp(newDir, 493);
 
 			assert.ok(fs.existsSync(newDir));
 
-			const children = await pfs.readdir(path.join(parentDir, 'pfs', id));
-			assert.equal(children.some(n => n === 'öäü'), true); // Mac always converts to NFD, so
-
-			await pfs.rimraf(parentDir);
+			const children = await readdir(join(testDir, 'pfs', id));
+			assert.strictEqual(children.some(n => n === 'öäü'), true); // Mac always converts to NFD, so
 		}
 	});
 
 	test('readdirWithFileTypes', async () => {
 		if (canNormalize && typeof process.versions['electron'] !== 'undefined' /* needs electron */) {
-			const id = uuid.generateUuid();
-			const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-			const testDir = path.join(parentDir, 'pfs', id);
+			const newDir = join(testDir, 'öäü');
+			await mkdirp(newDir, 493);
 
-			const newDir = path.join(testDir, 'öäü');
-			await pfs.mkdirp(newDir, 493);
-
-			await pfs.writeFile(path.join(testDir, 'somefile.txt'), 'contents');
+			await writeFile(join(testDir, 'somefile.txt'), 'contents');
 
 			assert.ok(fs.existsSync(newDir));
 
-			const children = await pfs.readdirWithFileTypes(testDir);
+			const children = await readdirWithFileTypes(testDir);
 
-			assert.equal(children.some(n => n.name === 'öäü'), true); // Mac always converts to NFD, so
-			assert.equal(children.some(n => n.isDirectory()), true);
+			assert.strictEqual(children.some(n => n.name === 'öäü'), true); // Mac always converts to NFD, so
+			assert.strictEqual(children.some(n => n.isDirectory()), true);
 
-			assert.equal(children.some(n => n.name === 'somefile.txt'), true);
-			assert.equal(children.some(n => n.isFile()), true);
-
-			await pfs.rimraf(parentDir);
+			assert.strictEqual(children.some(n => n.name === 'somefile.txt'), true);
+			assert.strictEqual(children.some(n => n.isFile()), true);
 		}
 	});
 
@@ -416,65 +334,41 @@ suite('PFS', function () {
 		bigData: string | Buffer | Uint8Array,
 		bigDataValue: string
 	): Promise<void> {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile = path.join(newDir, 'flushed.txt');
+		const testFile = join(testDir, 'flushed.txt');
 
-		await pfs.mkdirp(newDir, 493);
-		assert.ok(fs.existsSync(newDir));
+		assert.ok(fs.existsSync(testDir));
 
-		await pfs.writeFile(testFile, smallData);
-		assert.equal(fs.readFileSync(testFile), smallDataValue);
+		await writeFile(testFile, smallData);
+		assert.strictEqual(fs.readFileSync(testFile).toString(), smallDataValue);
 
-		await pfs.writeFile(testFile, bigData);
-		assert.equal(fs.readFileSync(testFile), bigDataValue);
-
-		await pfs.rimraf(parentDir);
+		await writeFile(testFile, bigData);
+		assert.strictEqual(fs.readFileSync(testFile).toString(), bigDataValue);
 	}
 
 	test('writeFile (string, error handling)', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile = path.join(newDir, 'flushed.txt');
+		const testFile = join(testDir, 'flushed.txt');
 
-		await pfs.mkdirp(newDir, 493);
-
-		assert.ok(fs.existsSync(newDir));
-
-		fs.mkdirSync(testFile); // this will trigger an error because testFile is now a directory!
+		fs.mkdirSync(testFile); // this will trigger an error later because testFile is now a directory!
 
 		let expectedError: Error | undefined;
 		try {
-			await pfs.writeFile(testFile, 'Hello World');
+			await writeFile(testFile, 'Hello World');
 		} catch (error) {
 			expectedError = error;
 		}
 
 		assert.ok(expectedError);
-
-		await pfs.rimraf(parentDir);
 	});
 
 	test('writeFileSync', async () => {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const newDir = path.join(parentDir, 'pfs', id);
-		const testFile = path.join(newDir, 'flushed.txt');
+		const testFile = join(testDir, 'flushed.txt');
 
-		await pfs.mkdirp(newDir, 493);
-
-		assert.ok(fs.existsSync(newDir));
-
-		pfs.writeFileSync(testFile, 'Hello World');
-		assert.equal(fs.readFileSync(testFile), 'Hello World');
+		writeFileSync(testFile, 'Hello World');
+		assert.strictEqual(fs.readFileSync(testFile).toString(), 'Hello World');
 
 		const largeString = (new Array(100 * 1024)).join('Large String\n');
 
-		pfs.writeFileSync(testFile, largeString);
-		assert.equal(fs.readFileSync(testFile), largeString);
-
-		await pfs.rimraf(parentDir);
+		writeFileSync(testFile, largeString);
+		assert.strictEqual(fs.readFileSync(testFile).toString(), largeString);
 	});
 });
diff --git a/src/vs/base/test/node/port.test.ts b/src/vs/base/test/node/port.test.ts
index 87d8eca9e..120044651 100644
--- a/src/vs/base/test/node/port.test.ts
+++ b/src/vs/base/test/node/port.test.ts
@@ -6,14 +6,10 @@
 import * as assert from 'assert';
 import * as net from 'net';
 import * as ports from 'vs/base/node/ports';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 
-suite('Ports', () => {
-	test('Finds a free port (no timeout)', function (done) {
-		this.timeout(1000 * 10); // higher timeout for this test
-
-		if (process.env['VSCODE_PID']) {
-			return done(); // this test fails when run from within VS Code
-		}
+flakySuite('Ports', () => {
+	(process.env['VSCODE_PID'] ? test.skip /* this test fails when run from within VS Code */ : test)('Finds a free port (no timeout)', function (done) {
 
 		// get an initial freeport >= 7000
 		ports.findFreePort(7000, 100, 300000).then(initialPort => {
diff --git a/src/vs/base/test/node/powershell.test.ts b/src/vs/base/test/node/powershell.test.ts
new file mode 100644
index 000000000..6e88b0982
--- /dev/null
+++ b/src/vs/base/test/node/powershell.test.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as assert from 'assert';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as platform from 'vs/base/common/platform';
+import { enumeratePowerShellInstallations, getFirstAvailablePowerShellInstallation, IPowerShellExeDetails } from 'vs/base/node/powershell';
+
+function checkPath(exePath: string) {
+	// Check to see if the path exists
+	let pathCheckResult = false;
+	try {
+		const stat = fs.statSync(exePath);
+		pathCheckResult = stat.isFile();
+	} catch {
+		// fs.exists throws on Windows with SymbolicLinks so we
+		// also use lstat to try and see if the file exists.
+		try {
+			pathCheckResult = fs.statSync(fs.readlinkSync(exePath)).isFile();
+		} catch {
+
+		}
+	}
+
+	assert.strictEqual(pathCheckResult, true);
+}
+
+if (platform.isWindows) {
+	suite('PowerShell finder', () => {
+
+		test('Can find first available PowerShell', async () => {
+			const pwshExe = await getFirstAvailablePowerShellInstallation();
+			const exePath = pwshExe?.exePath;
+			assert.notStrictEqual(exePath, null);
+			assert.notStrictEqual(pwshExe?.displayName, null);
+
+			checkPath(exePath!);
+		});
+
+		test('Can enumerate PowerShells', async () => {
+			const isOS64Bit = os.arch() === 'x64';
+			const pwshs = new Array<IPowerShellExeDetails>();
+			for await (const p of enumeratePowerShellInstallations()) {
+				pwshs.push(p);
+			}
+
+			const powershellLog = 'Found these PowerShells:\n' + pwshs.map(p => `${p.displayName}: ${p.exePath}`).join('\n');
+			assert.strictEqual(pwshs.length >= (isOS64Bit ? 2 : 1), true, powershellLog);
+
+			for (const pwsh of pwshs) {
+				checkPath(pwsh.exePath);
+			}
+
+
+			const lastIndex = pwshs.length - 1;
+			const secondToLastIndex = pwshs.length - 2;
+
+			// 64bit process on 64bit OS
+			if (process.arch === 'x64') {
+				checkPath(pwshs[secondToLastIndex].exePath);
+				assert.strictEqual(pwshs[secondToLastIndex].displayName, 'Windows PowerShell', powershellLog);
+
+				checkPath(pwshs[lastIndex].exePath);
+				assert.strictEqual(pwshs[lastIndex].displayName, 'Windows PowerShell (x86)', powershellLog);
+			} else if (isOS64Bit) {
+				// 32bit process on 64bit OS
+
+				// Windows PowerShell x86 comes first if vscode is 32bit
+				checkPath(pwshs[secondToLastIndex].exePath);
+				assert.strictEqual(pwshs[secondToLastIndex].displayName, 'Windows PowerShell (x86)', powershellLog);
+
+				checkPath(pwshs[lastIndex].exePath);
+				assert.strictEqual(pwshs[lastIndex].displayName, 'Windows PowerShell', powershellLog);
+			} else {
+				// 32bit or ARM process
+				checkPath(pwshs[lastIndex].exePath);
+				assert.strictEqual(pwshs[lastIndex].displayName, 'Windows PowerShell (x86)', powershellLog);
+			}
+		});
+	});
+}
diff --git a/src/vs/base/test/node/processes/processes.test.ts b/src/vs/base/test/node/processes/processes.test.ts
index 76719506d..e9f922f33 100644
--- a/src/vs/base/test/node/processes/processes.test.ts
+++ b/src/vs/base/test/node/processes/processes.test.ts
@@ -13,9 +13,9 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
 function fork(id: string): cp.ChildProcess {
 	const opts: any = {
 		env: objects.mixin(objects.deepClone(process.env), {
-			AMD_ENTRYPOINT: id,
-			PIPE_LOGGING: 'true',
-			VERBOSE_LOGGING: true
+			VSCODE_AMD_ENTRYPOINT: id,
+			VSCODE_PIPE_LOGGING: 'true',
+			VSCODE_VERBOSE_LOGGING: true
 		})
 	};
 
@@ -59,11 +59,7 @@ suite('Processes', () => {
 		});
 	});
 
-	test('buffered sending - lots of data (potential deadlock on win32)', function (done: () => void) {
-		if (!platform.isWindows || process.env['VSCODE_PID']) {
-			return done(); // test is only relevant for Windows and seems to crash randomly on some Linux builds
-		}
-
+	(!platform.isWindows || process.env['VSCODE_PID'] ? test.skip : test)('buffered sending - lots of data (potential deadlock on win32)', function (done: () => void) { // test is only relevant for Windows and seems to crash randomly on some Linux builds
 		const child = fork('vs/base/test/node/processes/fixtures/fork_large');
 		const sender = processes.createQueuedSender(child);
 
diff --git a/src/vs/base/test/node/testUtils.ts b/src/vs/base/test/node/testUtils.ts
index 452e8ae07..802d9fd14 100644
--- a/src/vs/base/test/node/testUtils.ts
+++ b/src/vs/base/test/node/testUtils.ts
@@ -3,9 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { Suite } from 'mocha';
 import { join } from 'vs/base/common/path';
 import { generateUuid } from 'vs/base/common/uuid';
 
 export function getRandomTestPath(tmpdir: string, ...segments: string[]): string {
 	return join(tmpdir, ...segments, generateUuid());
 }
+
+export function flakySuite(title: string, fn: (this: Suite) => void): Suite {
+	return suite(title, function () {
+
+		// Flaky suites need retries and timeout to complete
+		// e.g. because they access the file system which can
+		// be unreliable depending on the environment.
+		this.retries(3);
+		this.timeout(1000 * 20);
+
+		// Invoke suite ensuring that `this` is
+		// properly wired in.
+		fn.call(this);
+	});
+}
diff --git a/src/vs/base/test/node/zip/zip.test.ts b/src/vs/base/test/node/zip/zip.test.ts
index f79bddaa9..a98b2609f 100644
--- a/src/vs/base/test/node/zip/zip.test.ts
+++ b/src/vs/base/test/node/zip/zip.test.ts
@@ -5,24 +5,33 @@
 
 import * as assert from 'assert';
 import * as path from 'vs/base/common/path';
-import * as os from 'os';
+import { tmpdir } from 'os';
 import { extract } from 'vs/base/node/zip';
-import { generateUuid } from 'vs/base/common/uuid';
-import { rimraf, exists } from 'vs/base/node/pfs';
+import { rimraf, exists, mkdirp } from 'vs/base/node/pfs';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { createCancelablePromise } from 'vs/base/common/async';
-
-const fixtures = getPathFromAmdModule(require, './fixtures');
+import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 
 suite('Zip', () => {
 
-	test('extract should handle directories', () => {
-		const fixture = path.join(fixtures, 'extract.zip');
-		const target = path.join(os.tmpdir(), generateUuid());
+	let testDir: string;
 
-		return createCancelablePromise(token => extract(fixture, target, {}, token)
-			.then(() => exists(path.join(target, 'extension')))
-			.then(exists => assert(exists))
-			.then(() => rimraf(target)));
+	setup(() => {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'zip');
+
+		return mkdirp(testDir);
+	});
+
+	teardown(() => {
+		return rimraf(testDir);
+	});
+
+	test('extract should handle directories', async () => {
+		const fixtures = getPathFromAmdModule(require, './fixtures');
+		const fixture = path.join(fixtures, 'extract.zip');
+
+		await createCancelablePromise(token => extract(fixture, testDir, {}, token));
+		const doesExist = await exists(path.join(testDir, 'extension'));
+		assert(doesExist);
 	});
 });
diff --git a/src/vs/base/worker/defaultWorkerFactory.ts b/src/vs/base/worker/defaultWorkerFactory.ts
index 51faabdf9..21b3935fc 100644
--- a/src/vs/base/worker/defaultWorkerFactory.ts
+++ b/src/vs/base/worker/defaultWorkerFactory.ts
@@ -6,6 +6,8 @@
 import { globals } from 'vs/base/common/platform';
 import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
 
+const ttPolicy = window.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value });
+
 function getWorker(workerId: string, label: string): Worker | Promise<Worker> {
 	// Option for hosts to overwrite the worker script (used in the standalone editor)
 	if (globals.MonacoEnvironment) {
@@ -13,7 +15,8 @@ function getWorker(workerId: string, label: string): Worker | Promise<Worker> {
 			return globals.MonacoEnvironment.getWorker(workerId, label);
 		}
 		if (typeof globals.MonacoEnvironment.getWorkerUrl === 'function') {
-			return new Worker(globals.MonacoEnvironment.getWorkerUrl(workerId, label));
+			const wokerUrl = <string>globals.MonacoEnvironment.getWorkerUrl(workerId, label);
+			return new Worker(ttPolicy ? ttPolicy.createScriptURL(wokerUrl) as unknown as string : wokerUrl, { name: label });
 		}
 	}
 	// ESM-comment-begin
@@ -21,7 +24,7 @@ function getWorker(workerId: string, label: string): Worker | Promise<Worker> {
 		// check if the JS lives on a different origin
 		const workerMain = require.toUrl('./' + workerId); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
 		const workerUrl = getWorkerBootstrapUrl(workerMain, label);
-		return new Worker(workerUrl, { name: label });
+		return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label });
 	}
 	// ESM-comment-end
 	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
index 8b1869294..2df6f8125 100644
--- a/src/vs/code/browser/workbench/workbench-dev.html
+++ b/src/vs/code/browser/workbench/workbench-dev.html
@@ -3,8 +3,7 @@
 <html>
 	<head>
 		<script>
-			globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || [];
-			globalThis.MonacoPerformanceMarks.push('renderer/started', Date.now());
+			performance.mark('code/didStartRenderer')
 		</script>
 		<meta charset="utf-8" />
 
@@ -56,7 +55,7 @@
 	</script>
 	<script src="./static/out/vs/loader.js"></script>
 	<script>
-		globalThis.MonacoPerformanceMarks.push('willLoadWorkbenchMain', Date.now());
+		performance.mark('code/willLoadWorkbenchMain');
 	</script>
 	<script>
 		require(['vs/code/browser/workbench/workbench'], function() {});
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 1dbdce5d6..2c3bf6351 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -3,8 +3,7 @@
 <html>
 	<head>
 		<script>
-			globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || [];
-			globalThis.MonacoPerformanceMarks.push('renderer/started', Date.now());
+			performance.mark('code/didStartRenderer')
 		</script>
 		<meta charset="utf-8" />
 
@@ -55,7 +54,7 @@
 	</script>
 	<script src="./static/out/vs/loader.js"></script>
 	<script>
-		globalThis.MonacoPerformanceMarks.push('willLoadWorkbenchMain', Date.now());
+		performance.mark('code/willLoadWorkbenchMain');
 	</script>
 	<script src="./static/out/vs/workbench/workbench.web.api.nls.js"></script>
 	<script src="./static/out/vs/workbench/workbench.web.api.js"></script>
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index d1dba0721..1ed7feec9 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -265,7 +265,6 @@ class PollingURLCallbackProvider extends Disposable implements IURLCallbackProvi
 			setTimeout(() => this.periodicFetchCallback(requestId, startTime), PollingURLCallbackProvider.FETCH_INTERVAL);
 		}
 	}
-
 }
 
 class WorkspaceProvider implements IWorkspaceProvider {
diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/deprecatedExtensionsCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/deprecatedExtensionsCleaner.ts
new file mode 100644
index 000000000..0ffa0870e
--- /dev/null
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/deprecatedExtensionsCleaner.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
+import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+
+export class DeprecatedExtensionsCleaner extends Disposable {
+
+	constructor(
+		@IExtensionManagementService private readonly extensionManagementService: ExtensionManagementService
+	) {
+		super();
+
+		this._register(extensionManagementService); // TODO@sandy081 this seems fishy
+
+		this.cleanUpDeprecatedExtensions();
+	}
+
+	private cleanUpDeprecatedExtensions(): void {
+		this.extensionManagementService.removeDeprecatedExtensions();
+	}
+}
diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater.ts b/src/vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater.ts
new file mode 100644
index 000000000..6c9bfa812
--- /dev/null
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater.ts
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
+
+export class LocalizationsUpdater extends Disposable {
+
+	constructor(
+		@ILocalizationsService private readonly localizationsService: LocalizationsService
+	) {
+		super();
+
+		this.updateLocalizations();
+	}
+
+	private updateLocalizations(): void {
+		this.localizationsService.update();
+	}
+}
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
index 8874e8720..2bb0a0bb7 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js
@@ -15,10 +15,7 @@
 
 	// Load shared process into window
 	bootstrapWindow.load(['vs/code/electron-browser/sharedProcess/sharedProcessMain'], function (sharedProcess, configuration) {
-		sharedProcess.startup({
-			machineId: configuration.machineId,
-			windowId: configuration.windowId
-		});
+		return sharedProcess.main(configuration);
 	});
 
 
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 3dcc360b5..3aa7cce16 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
-import * as platform from 'vs/base/common/platform';
 import product from 'vs/platform/product/common/product';
-import { serve, Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
+import * as fs from 'fs';
+import { release } from 'os';
+import { gracefulify } from 'graceful-fs';
+import { Server as MessagePortServer } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
+import { StaticRouter, createChannelSender, createChannelReceiver } from 'vs/base/parts/ipc/common/ipc';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { ExtensionManagementChannel, ExtensionTipsChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
 import { IExtensionManagementService, IExtensionGalleryService, IGlobalExtensionEnablementService, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -23,24 +24,23 @@ import { IRequestService } from 'vs/platform/request/common/request';
 import { RequestService } from 'vs/platform/request/browser/requestService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { combinedAppender, NullTelemetryService, ITelemetryAppender, NullAppender } from 'vs/platform/telemetry/common/telemetryUtils';
-import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
-import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
+import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
+import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
+import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import { ILogService, LogLevel, ILoggerService } from 'vs/platform/log/common/log';
+import { ILogService, ILoggerService, MultiplexLogService, ConsoleLogService } from 'vs/platform/log/common/log';
 import { LoggerChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-import { combinedDisposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IDownloadService } from 'vs/platform/download/common/download';
-import { IChannel, IServerChannel, StaticRouter, createChannelSender, createChannelReceiver } from 'vs/base/parts/ipc/common/ipc';
 import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
 import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner';
 import { StorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner';
 import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
+import { IMainProcessService, MessagePortMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
 import { DiagnosticsService, IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
 import { FileService } from 'vs/platform/files/common/fileService';
@@ -48,7 +48,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
 import { Schemas } from 'vs/base/common/network';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration, IUserDataSyncLogService, IUserDataSyncUtilService, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService, IUserDataSyncStoreManagementService, IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
+import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncLogService, IUserDataSyncUtilService, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService, IUserDataSyncStoreManagementService, IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
 import { UserDataSyncStoreService, UserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
 import { UserDataSyncChannel, UserDataSyncUtilServiceClient, UserDataAutoSyncChannel, UserDataSyncMachinesServiceChannel, UserDataSyncAccountServiceChannel, UserDataSyncStoreManagementServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
@@ -67,146 +67,184 @@ import { ExtensionTipsService } from 'vs/platform/extensionManagement/electron-s
 import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
 import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { ExtensionRecommendationNotificationServiceChannelClient } from 'vs/platform/extensionRecommendations/electron-sandbox/extensionRecommendationsIpc';
-import { ActiveWindowManager } from 'vs/platform/windows/common/windowTracker';
+import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
 import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
 import { UserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
 import { ExtensionsStorageSyncService, IExtensionsStorageSyncService } from 'vs/platform/userDataSync/common/extensionsStorageSync';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ISharedProcessConfiguration } from 'vs/platform/sharedProcess/node/sharedProcess';
+import { LocalizationsUpdater } from 'vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater';
+import { DeprecatedExtensionsCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/deprecatedExtensionsCleaner';
+import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
 
-export interface ISharedProcessConfiguration {
-	readonly machineId: string;
-	readonly windowId: number;
-}
+class SharedProcessMain extends Disposable {
 
-export function startup(configuration: ISharedProcessConfiguration) {
-	handshake(configuration);
-}
+	private server = this._register(new MessagePortServer());
 
-interface ISharedProcessInitData {
-	sharedIPCHandle: string;
-	args: NativeParsedArgs;
-	logLevel: LogLevel;
-	nodeCachedDataDir?: string;
-	backupWorkspacesPath: string;
-}
+	constructor(private configuration: ISharedProcessConfiguration) {
+		super();
 
-const eventPrefix = 'monacoworkbench';
+		// Enable gracefulFs
+		gracefulify(fs);
 
-class MainProcessService implements IMainProcessService {
-
-	constructor(
-		private server: Server,
-		private mainRouter: StaticRouter
-	) { }
-
-	declare readonly _serviceBrand: undefined;
-
-	getChannel(channelName: string): IChannel {
-		return this.server.getChannel(channelName, this.mainRouter);
+		this.registerListeners();
 	}
 
-	registerChannel(channelName: string, channel: IServerChannel<string>): void {
-		this.server.registerChannel(channelName, channel);
+	private registerListeners(): void {
+
+		// Dispose on exit
+		const onExit = () => this.dispose();
+		process.once('exit', onExit);
+		ipcRenderer.once('vscode:electron-main->shared-process=exit', onExit);
 	}
-}
 
-async function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): Promise<void> {
-	const services = new ServiceCollection();
+	async open(): Promise<void> {
 
-	const disposables = new DisposableStore();
+		// Services
+		const instantiationService = await this.initServices();
 
-	const onExit = () => disposables.dispose();
-	process.once('exit', onExit);
-	ipcRenderer.once('vscode:electron-main->shared-process=exit', onExit);
+		// Config
+		registerUserDataSyncConfiguration();
 
-	disposables.add(server);
+		instantiationService.invokeFunction(accessor => {
+			const logService = accessor.get(ILogService);
 
-	const environmentService = new NativeEnvironmentService(initData.args);
+			// Log info
+			logService.trace('sharedProcess configuration', JSON.stringify(this.configuration));
 
-	const mainRouter = new StaticRouter(ctx => ctx === 'main');
-	const loggerClient = new LoggerChannelClient(server.getChannel('logger', mainRouter));
-	const logService = new FollowerLogService(loggerClient, new SpdLogService('sharedprocess', environmentService.logsPath, initData.logLevel));
-	disposables.add(logService);
-	logService.info('main', JSON.stringify(configuration));
+			// Channels
+			this.initChannels(accessor);
 
-	const mainProcessService = new MainProcessService(server, mainRouter);
-	services.set(IMainProcessService, mainProcessService);
+			// Error handler
+			this.registerErrorHandler(logService);
+		});
 
-	// Files
-	const fileService = new FileService(logService);
-	services.set(IFileService, fileService);
-	disposables.add(fileService);
-	const diskFileSystemProvider = new DiskFileSystemProvider(logService);
-	disposables.add(diskFileSystemProvider);
-	fileService.registerProvider(Schemas.file, diskFileSystemProvider);
+		// Instantiate Contributions
+		this._register(combinedDisposable(
+			new NodeCachedDataCleaner(this.configuration.nodeCachedDataDir),
+			instantiationService.createInstance(LanguagePackCachedDataCleaner),
+			instantiationService.createInstance(StorageDataCleaner, this.configuration.backupWorkspacesPath),
+			instantiationService.createInstance(LogsDataCleaner),
+			instantiationService.createInstance(LocalizationsUpdater),
+			instantiationService.createInstance(DeprecatedExtensionsCleaner)
+		));
+	}
 
-	// Configuration
-	const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
-	disposables.add(configurationService);
-	await configurationService.initialize();
-
-	// Storage
-	const storageService = new NativeStorageService(new GlobalStorageDatabaseChannelClient(mainProcessService.getChannel('storage')), logService, environmentService);
-	await storageService.initialize();
-	services.set(IStorageService, storageService);
-	disposables.add(toDisposable(() => storageService.flush()));
-
-	services.set(IEnvironmentService, environmentService);
-	services.set(INativeEnvironmentService, environmentService);
-
-	services.set(IProductService, { _serviceBrand: undefined, ...product });
-	services.set(ILogService, logService);
-	services.set(IConfigurationService, configurationService);
-	services.set(IRequestService, new SyncDescriptor(RequestService));
-	services.set(ILoggerService, new SyncDescriptor(LoggerService));
-
-	const nativeHostService = createChannelSender<INativeHostService>(mainProcessService.getChannel('nativeHost'), { context: configuration.windowId });
-	services.set(INativeHostService, nativeHostService);
-	const activeWindowManager = new ActiveWindowManager(nativeHostService);
-	const activeWindowRouter = new StaticRouter(ctx => activeWindowManager.getActiveClientId().then(id => ctx === id));
-
-	services.set(IDownloadService, new SyncDescriptor(DownloadService));
-	services.set(IExtensionRecommendationNotificationService, new ExtensionRecommendationNotificationServiceChannelClient(server.getChannel('IExtensionRecommendationNotificationService', activeWindowRouter)));
-
-	const instantiationService = new InstantiationService(services);
-
-	let telemetryService: ITelemetryService;
-	instantiationService.invokeFunction(accessor => {
+	private async initServices(): Promise<IInstantiationService> {
 		const services = new ServiceCollection();
+
+		// Environment
+		const environmentService = new NativeEnvironmentService(this.configuration.args);
+		services.set(IEnvironmentService, environmentService);
+		services.set(INativeEnvironmentService, environmentService);
+
+		// Log
+		const mainRouter = new StaticRouter(ctx => ctx === 'main');
+		const loggerClient = new LoggerChannelClient(this.server.getChannel('logger', mainRouter)); // we only use this for log levels
+		const multiplexLogger = this._register(new MultiplexLogService([
+			this._register(new ConsoleLogService(this.configuration.logLevel)),
+			this._register(new SpdLogService('sharedprocess', environmentService.logsPath, this.configuration.logLevel))
+		]));
+
+		const logService = this._register(new FollowerLogService(loggerClient, multiplexLogger));
+		services.set(ILogService, logService);
+
+		// Main Process
+		const mainProcessService = new MessagePortMainProcessService(this.server, mainRouter);
+		services.set(IMainProcessService, mainProcessService);
+
+		// Files
+		const fileService = this._register(new FileService(logService));
+		services.set(IFileService, fileService);
+
+		const diskFileSystemProvider = this._register(new DiskFileSystemProvider(logService));
+		fileService.registerProvider(Schemas.file, diskFileSystemProvider);
+
+		// Configuration
+		const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService));
+		services.set(IConfigurationService, configurationService);
+
+		await configurationService.initialize();
+
+		// Storage
+		const storageService = new NativeStorageService(new GlobalStorageDatabaseChannelClient(mainProcessService.getChannel('storage')), logService, environmentService);
+		services.set(IStorageService, storageService);
+
+		await storageService.initialize();
+		this._register(toDisposable(() => storageService.flush()));
+
+		// Product
+		services.set(IProductService, { _serviceBrand: undefined, ...product });
+
+		// Request
+		services.set(IRequestService, new SyncDescriptor(RequestService));
+
+		// Native Host
+		const nativeHostService = createChannelSender<INativeHostService>(mainProcessService.getChannel('nativeHost'), { context: this.configuration.windowId });
+		services.set(INativeHostService, nativeHostService);
+
+		// Download
+		services.set(IDownloadService, new SyncDescriptor(DownloadService));
+
+		// Extension recommendations
+		const activeWindowManager = this._register(new ActiveWindowManager(nativeHostService));
+		const activeWindowRouter = new StaticRouter(ctx => activeWindowManager.getActiveClientId().then(id => ctx === id));
+		services.set(IExtensionRecommendationNotificationService, new ExtensionRecommendationNotificationServiceChannelClient(this.server.getChannel('extensionRecommendationNotification', activeWindowRouter)));
+
+		// Logger
+		const loggerService = this._register(new LoggerService(logService, fileService));
+		services.set(ILoggerService, loggerService);
+
+		// Telemetry
 		const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService;
 
-		let telemetryAppender: ITelemetryAppender = NullAppender;
+		let telemetryService: ITelemetryService;
+		let telemetryAppender: ITelemetryAppender;
 		if (!extensionDevelopmentLocationURI && !environmentService.disableTelemetry && product.enableTelemetry) {
-			telemetryAppender = new TelemetryLogAppender(accessor.get(ILoggerService), environmentService);
+			telemetryAppender = new TelemetryLogAppender(loggerService, environmentService);
+
+			// Application Insights
 			if (product.aiConfig && product.aiConfig.asimovKey && isBuilt) {
-				const appInsightsAppender = new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey);
-				disposables.add(toDisposable(() => appInsightsAppender!.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
+				const appInsightsAppender = new AppInsightsAppender('monacoworkbench', null, product.aiConfig.asimovKey);
+				this._register(toDisposable(() => appInsightsAppender.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
 				telemetryAppender = combinedAppender(appInsightsAppender, telemetryAppender);
 			}
-			const config: ITelemetryServiceConfig = {
+
+			telemetryService = new TelemetryService({
 				appender: telemetryAppender,
-				commonProperties: resolveCommonProperties(product.commit, product.version, configuration.machineId, product.msftInternalDomains, installSourcePath),
+				commonProperties: resolveCommonProperties(fileService, release(), process.arch, product.commit, product.version, this.configuration.machineId, product.msftInternalDomains, installSourcePath),
 				sendErrorTelemetry: true,
 				piiPaths: [appRoot, extensionsPath]
-			};
-
-			telemetryService = new TelemetryService(config, configurationService);
-			services.set(ITelemetryService, telemetryService);
+			}, configurationService);
 		} else {
 			telemetryService = NullTelemetryService;
-			services.set(ITelemetryService, NullTelemetryService);
+			telemetryAppender = NullAppender;
 		}
-		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(telemetryAppender));
 
+		this.server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(telemetryAppender));
+		services.set(ITelemetryService, telemetryService);
+
+		// Extension Management
 		services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
+
+		// Extension Gallery
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
-		services.set(ILocalizationsService, new SyncDescriptor(LocalizationsService));
-		services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService));
+
+		// Extension Tips
 		services.set(IExtensionTipsService, new SyncDescriptor(ExtensionTipsService));
 
+		// Localizations
+		services.set(ILocalizationsService, new SyncDescriptor(LocalizationsService));
+
+		// Diagnostics
+		services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService));
+
+		// Settings Sync
 		services.set(IUserDataSyncAccountService, new SyncDescriptor(UserDataSyncAccountService));
 		services.set(IUserDataSyncLogService, new SyncDescriptor(UserDataSyncLogService));
-		services.set(IUserDataSyncUtilService, new UserDataSyncUtilServiceClient(server.getChannel('userDataSyncUtil', client => client.ctx !== 'main')));
+		services.set(IUserDataSyncUtilService, new UserDataSyncUtilServiceClient(this.server.getChannel('userDataSyncUtil', client => client.ctx !== 'main')));
 		services.set(IGlobalExtensionEnablementService, new SyncDescriptor(GlobalExtensionEnablementService));
 		services.set(IIgnoredExtensionsManagementService, new SyncDescriptor(IgnoredExtensionsManagementService));
 		services.set(IExtensionsStorageSyncService, new SyncDescriptor(ExtensionsStorageSyncService));
@@ -217,114 +255,86 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 		services.set(IUserDataAutoSyncEnablementService, new SyncDescriptor(UserDataAutoSyncEnablementService));
 		services.set(IUserDataSyncResourceEnablementService, new SyncDescriptor(UserDataSyncResourceEnablementService));
 		services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService));
-		registerConfiguration();
 
-		const instantiationService2 = instantiationService.createChild(services);
-
-		instantiationService2.invokeFunction(accessor => {
-
-			const extensionManagementService = accessor.get(IExtensionManagementService);
-			const channel = new ExtensionManagementChannel(extensionManagementService, () => null);
-			server.registerChannel('extensions', channel);
-
-			const localizationsService = accessor.get(ILocalizationsService);
-			const localizationsChannel = createChannelReceiver(localizationsService);
-			server.registerChannel('localizations', localizationsChannel);
-
-			const diagnosticsService = accessor.get(IDiagnosticsService);
-			const diagnosticsChannel = createChannelReceiver(diagnosticsService);
-			server.registerChannel('diagnostics', diagnosticsChannel);
-
-			const extensionTipsService = accessor.get(IExtensionTipsService);
-			const extensionTipsChannel = new ExtensionTipsChannel(extensionTipsService);
-			server.registerChannel('extensionTipsService', extensionTipsChannel);
-
-			const userDataSyncMachinesService = accessor.get(IUserDataSyncMachinesService);
-			const userDataSyncMachineChannel = new UserDataSyncMachinesServiceChannel(userDataSyncMachinesService);
-			server.registerChannel('userDataSyncMachines', userDataSyncMachineChannel);
-
-			const authTokenService = accessor.get(IUserDataSyncAccountService);
-			const authTokenChannel = new UserDataSyncAccountServiceChannel(authTokenService);
-			server.registerChannel('userDataSyncAccount', authTokenChannel);
-
-			const userDataSyncStoreManagementService = accessor.get(IUserDataSyncStoreManagementService);
-			const userDataSyncStoreManagementChannel = new UserDataSyncStoreManagementServiceChannel(userDataSyncStoreManagementService);
-			server.registerChannel('userDataSyncStoreManagement', userDataSyncStoreManagementChannel);
-
-			const userDataSyncService = accessor.get(IUserDataSyncService);
-			const userDataSyncChannel = new UserDataSyncChannel(server, userDataSyncService, logService);
-			server.registerChannel('userDataSync', userDataSyncChannel);
-
-			const userDataAutoSync = instantiationService2.createInstance(UserDataAutoSyncService);
-			const userDataAutoSyncChannel = new UserDataAutoSyncChannel(userDataAutoSync);
-			server.registerChannel('userDataAutoSync', userDataAutoSyncChannel);
-
-			// clean up deprecated extensions
-			(extensionManagementService as ExtensionManagementService).removeDeprecatedExtensions();
-			// update localizations cache
-			(localizationsService as LocalizationsService).update();
-			// cache clean ups
-			disposables.add(combinedDisposable(
-				new NodeCachedDataCleaner(initData.nodeCachedDataDir),
-				instantiationService2.createInstance(LanguagePackCachedDataCleaner),
-				instantiationService2.createInstance(StorageDataCleaner, initData.backupWorkspacesPath),
-				instantiationService2.createInstance(LogsDataCleaner),
-				userDataAutoSync
-			));
-			disposables.add(extensionManagementService as ExtensionManagementService);
-		});
-	});
-}
-
-function setupIPC(hook: string): Promise<Server> {
-	function setup(retry: boolean): Promise<Server> {
-		return serve(hook).then(null, err => {
-			if (!retry || platform.isWindows || err.code !== 'EADDRINUSE') {
-				return Promise.reject(err);
-			}
-
-			// should retry, not windows and eaddrinuse
-
-			return connect(hook, '').then(
-				client => {
-					// we could connect to a running instance. this is not good, abort
-					client.dispose();
-					return Promise.reject(new Error('There is an instance already running.'));
-				},
-				err => {
-					// it happens on Linux and OS X that the pipe is left behind
-					// let's delete it, since we can't connect to it
-					// and the retry the whole thing
-					try {
-						fs.unlinkSync(hook);
-					} catch (e) {
-						return Promise.reject(new Error('Error deleting the shared ipc hook.'));
-					}
-
-					return setup(false);
-				}
-			);
-		});
+		return new InstantiationService(services);
 	}
 
-	return setup(true);
+	private initChannels(accessor: ServicesAccessor): void {
+
+		// Extensions Management
+		const extensionManagementService = accessor.get(IExtensionManagementService);
+		const channel = new ExtensionManagementChannel(extensionManagementService, () => null);
+		this.server.registerChannel('extensions', channel);
+
+		// Localizations
+		const localizationsService = accessor.get(ILocalizationsService);
+		const localizationsChannel = createChannelReceiver(localizationsService);
+		this.server.registerChannel('localizations', localizationsChannel);
+
+		// Diagnostics
+		const diagnosticsService = accessor.get(IDiagnosticsService);
+		const diagnosticsChannel = createChannelReceiver(diagnosticsService);
+		this.server.registerChannel('diagnostics', diagnosticsChannel);
+
+		// Extension Tips
+		const extensionTipsService = accessor.get(IExtensionTipsService);
+		const extensionTipsChannel = new ExtensionTipsChannel(extensionTipsService);
+		this.server.registerChannel('extensionTipsService', extensionTipsChannel);
+
+		// Settings Sync
+		const userDataSyncMachinesService = accessor.get(IUserDataSyncMachinesService);
+		const userDataSyncMachineChannel = new UserDataSyncMachinesServiceChannel(userDataSyncMachinesService);
+		this.server.registerChannel('userDataSyncMachines', userDataSyncMachineChannel);
+
+		const authTokenService = accessor.get(IUserDataSyncAccountService);
+		const authTokenChannel = new UserDataSyncAccountServiceChannel(authTokenService);
+		this.server.registerChannel('userDataSyncAccount', authTokenChannel);
+
+		const userDataSyncStoreManagementService = accessor.get(IUserDataSyncStoreManagementService);
+		const userDataSyncStoreManagementChannel = new UserDataSyncStoreManagementServiceChannel(userDataSyncStoreManagementService);
+		this.server.registerChannel('userDataSyncStoreManagement', userDataSyncStoreManagementChannel);
+
+		const userDataSyncService = accessor.get(IUserDataSyncService);
+		const userDataSyncChannel = new UserDataSyncChannel(this.server, userDataSyncService, accessor.get(ILogService));
+		this.server.registerChannel('userDataSync', userDataSyncChannel);
+
+		const userDataAutoSync = this._register(accessor.get(IInstantiationService).createInstance(UserDataAutoSyncService));
+		const userDataAutoSyncChannel = new UserDataAutoSyncChannel(userDataAutoSync);
+		this.server.registerChannel('userDataAutoSync', userDataAutoSyncChannel);
+	}
+
+	private registerErrorHandler(logService: ILogService): void {
+
+		// Listen on unhandled rejection events
+		window.addEventListener('unhandledrejection', (event: PromiseRejectionEvent) => {
+
+			// See https://developer.mozilla.org/en-US/docs/Web/API/PromiseRejectionEvent
+			onUnexpectedError(event.reason);
+
+			// Prevent the printing of this event to the console
+			event.preventDefault();
+		});
+
+		// Install handler for unexpected errors
+		setUnexpectedErrorHandler(error => {
+			const message = toErrorMessage(error, true);
+			if (!message) {
+				return;
+			}
+
+			logService.error(`[uncaught exception in sharedProcess]: ${message}`);
+		});
+	}
 }
 
-async function handshake(configuration: ISharedProcessConfiguration): Promise<void> {
+export async function main(configuration: ISharedProcessConfiguration): Promise<void> {
 
-	// receive payload from electron-main to start things
-	const data = await new Promise<ISharedProcessInitData>(c => {
-		ipcRenderer.once('vscode:electron-main->shared-process=payload', (event: unknown, r: ISharedProcessInitData) => c(r));
-
-		// tell electron-main we are ready to receive payload
-		ipcRenderer.send('vscode:shared-process->electron-main=ready-for-payload');
-	});
-
-	// await IPC connection and signal this back to electron-main
-	const server = await setupIPC(data.sharedIPCHandle);
+	// create shared process and signal back to main that we are
+	// ready to accept message ports as client connections
+	const sharedProcess = new SharedProcessMain(configuration);
 	ipcRenderer.send('vscode:shared-process->electron-main=ipc-ready');
 
 	// await initialization and signal this back to electron-main
-	await main(server, data, configuration);
+	await sharedProcess.open();
 	ipcRenderer.send('vscode:shared-process->electron-main=init-done');
 }
diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html
index 40737461d..f36737f2b 100644
--- a/src/vs/code/electron-browser/workbench/workbench.html
+++ b/src/vs/code/electron-browser/workbench/workbench.html
@@ -3,7 +3,8 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https: ws:; font-src 'self' https: vscode-remote-resource:;">
+		<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; trusted-types default TrustedFunctionWorkaround ExtensionScripts amdLoader cellRendererEditorText defaultWorkerFactory diffEditorWidget domLineBreaksComputer editorViewLayer diffReview extensionHostWorker insane notebookOutputRenderer safeInnerHtml standaloneColorizer tokenizeToString webNestedWorkerExtensionHost webWorkerExtensionHost;">
 	</head>
 	<body aria-label="">
 	</body>
diff --git a/src/vs/code/electron-browser/workbench/workbench.js b/src/vs/code/electron-browser/workbench/workbench.js
index 14c699461..64082146a 100644
--- a/src/vs/code/electron-browser/workbench/workbench.js
+++ b/src/vs/code/electron-browser/workbench/workbench.js
@@ -12,8 +12,7 @@
 	const bootstrapWindow = bootstrapWindowLib();
 
 	// Add a perf entry right from the top
-	const perf = bootstrapWindow.perfLib();
-	perf.mark('renderer/started');
+	performance.mark('code/didStartRenderer');
 
 	// Load workbench main JS, CSS and NLS all in parallel. This is an
 	// optimization to prevent a waterfall of loading to happen, because
@@ -24,10 +23,10 @@
 		'vs/nls!vs/workbench/workbench.desktop.main',
 		'vs/css!vs/workbench/workbench.desktop.main'
 	],
-		async function (workbench, configuration) {
+		function (_, configuration) {
 
 			// Mark start of workbench
-			perf.mark('didLoadWorkbenchMain');
+			performance.mark('code/didLoadWorkbenchMain');
 
 			// @ts-ignore
 			return require('vs/workbench/electron-browser/desktop.main').main(configuration);
@@ -41,19 +40,34 @@
 				loaderConfig.recordStats = true;
 			},
 			beforeRequire: function () {
-				perf.mark('willLoadWorkbenchMain');
+				performance.mark('code/willLoadWorkbenchMain');
 			}
 		}
 	);
 
+	// add default trustedTypes-policy for logging and to workaround
+	// lib/platform limitations
+	window.trustedTypes?.createPolicy('default', {
+		createHTML(value) {
+			// see https://github.com/electron/electron/issues/27211
+			// Electron webviews use a static innerHTML default value and
+			// that isn't trusted. We use a default policy to check for the
+			// exact value of that innerHTML-string and only allow that.
+			if (value === '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>') {
+				return value;
+			}
+			throw new Error('UNTRUSTED html usage, default trusted types policy should NEVER be reached');
+			// console.trace('UNTRUSTED html usage, default trusted types policy should NEVER be reached');
+			// return value;
+		}
+	});
 
 	//region Helpers
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown,
-	 *   globals: () => typeof import('../../../base/parts/sandbox/electron-sandbox/globals'),
-	 *   perfLib: () => { mark: (name: string) => void }
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => any, options: object) => unknown,
+	 *   globals: () => typeof import('../../../base/parts/sandbox/electron-sandbox/globals')
 	 * }}
 	 */
 	function bootstrapWindowLib() {
@@ -67,12 +81,11 @@
 	 *	colorScheme: ('light' | 'dark' | 'hc'),
 	 *	autoDetectHighContrast?: boolean,
 	 *	extensionDevelopmentPath?: string[],
-	 *	folderUri?: object,
-	 *	workspace?: object
+	 *	workspace?: import('../../../platform/workspaces/common/workspaces').IWorkspaceIdentifier | import('../../../platform/workspaces/common/workspaces').ISingleFolderWorkspaceIdentifier
 	 * }} configuration
 	 */
 	function showPartsSplash(configuration) {
-		perf.mark('willShowPartsSplash');
+		performance.mark('code/willShowPartsSplash');
 
 		let data;
 		if (typeof configuration.partsSplashPath === 'string') {
@@ -147,7 +160,7 @@
 			splash.appendChild(activityDiv);
 
 			// part: side bar (only when opening workspace/folder)
-			if (configuration.folderUri || configuration.workspace) {
+			if (configuration.workspace) {
 				// folder or workspace -> status bar color, sidebar
 				const sideDiv = document.createElement('div');
 				sideDiv.setAttribute('style', `position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: ${layoutInfo.activityBarWidth}px; width: ${layoutInfo.sideBarWidth}px; background-color: ${colorInfo.sideBarBackground};`);
@@ -156,13 +169,13 @@
 
 			// part: statusbar
 			const statusDiv = document.createElement('div');
-			statusDiv.setAttribute('style', `position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${configuration.folderUri || configuration.workspace ? colorInfo.statusBarBackground : colorInfo.statusBarNoFolderBackground};`);
+			statusDiv.setAttribute('style', `position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${configuration.workspace ? colorInfo.statusBarBackground : colorInfo.statusBarNoFolderBackground};`);
 			splash.appendChild(statusDiv);
 
 			document.body.appendChild(splash);
 		}
 
-		perf.mark('didShowPartsSplash');
+		performance.mark('code/didShowPartsSplash');
 	}
 
 	//#endregion
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 759c85bc7..3f85072d5 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -4,17 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { app, ipcMain, systemPreferences, contentTracing, protocol, BrowserWindow, dialog, session } from 'electron';
-import { IProcessEnvironment, isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
+import { release } from 'os';
+import { IProcessEnvironment, isWindows, isMacintosh, isLinux, isLinuxSnap } from 'vs/base/common/platform';
 import { WindowsMainService } from 'vs/platform/windows/electron-main/windowsMainService';
 import { IWindowOpenable } from 'vs/platform/windows/common/windows';
-import { OpenContext } from 'vs/platform/windows/node/window';
 import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { resolveShellEnv } from 'vs/code/node/shellEnv';
 import { IUpdateService } from 'vs/platform/update/common/update';
 import { UpdateChannel } from 'vs/platform/update/electron-main/updateIpc';
-import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron-main';
-import { Client } from 'vs/base/parts/ipc/common/ipc.net';
-import { Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
+import { getDelayedChannel, StaticRouter, createChannelReceiver, createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron';
+import { Server as NodeIPCServer } from 'vs/base/parts/ipc/node/ipc.net';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/electron-main/ipc.mp';
 import { SharedProcess } from 'vs/code/electron-main/sharedProcess';
 import { LaunchMainService, ILaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -28,19 +29,17 @@ import { IOpenURLOptions, IURLService } from 'vs/platform/url/common/url';
 import { URLHandlerChannelClient, URLHandlerRouter } from 'vs/platform/url/common/urlIpc';
 import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
+import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
-import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
-import { getDelayedChannel, StaticRouter, createChannelReceiver, createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
 import product from 'vs/platform/product/common/product';
 import { ProxyAuthHandler } from 'vs/code/electron-main/auth';
-import { ProxyAuthHandler2 } from 'vs/code/electron-main/auth2';
 import { FileProtocolHandler } from 'vs/code/electron-main/protocol';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+import { IWindowsMainService, ICodeWindow, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { URI } from 'vs/base/common/uri';
 import { hasWorkspaceFileExtension, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-import { WorkspacesService } from 'vs/platform/workspaces/electron-main/workspacesService';
+import { WorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
 import { getMachineId } from 'vs/base/node/id';
 import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
 import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
@@ -64,14 +63,13 @@ import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainSe
 import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
 import { WorkspacesHistoryMainService, IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
 import { NativeURLService } from 'vs/platform/url/common/urlService';
-import { WorkspacesMainService, IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { WorkspacesManagementMainService, IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { statSync } from 'fs';
 import { IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
 import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
 import { ElectronExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/electron-main/extensionHostDebugIpc';
 import { INativeHostMainService, NativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { ISharedProcessMainService, SharedProcessMainService } from 'vs/platform/ipc/electron-main/sharedProcessMainService';
-import { IDialogMainService, DialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { IDialogMainService, DialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { mnemonicButtonLabel, getPathLabel } from 'vs/base/common/labels';
 import { WebviewMainService } from 'vs/platform/webview/electron-main/webviewMainService';
@@ -81,7 +79,7 @@ import { stripComments } from 'vs/base/common/json';
 import { generateUuid } from 'vs/base/common/uuid';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { EncryptionMainService, IEncryptionMainService } from 'vs/platform/encryption/electron-main/encryptionMainService';
-import { ActiveWindowManager } from 'vs/platform/windows/common/windowTracker';
+import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
 import { IKeyboardLayoutMainService, KeyboardLayoutMainService } from 'vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { DisplayMainService, IDisplayMainService } from 'vs/platform/display/electron-main/displayMainService';
@@ -90,6 +88,7 @@ import { isEqualOrParent } from 'vs/base/common/extpath';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { IExtensionUrlTrustService } from 'vs/platform/extensionManagement/common/extensionUrlTrust';
 import { ExtensionUrlTrustService } from 'vs/platform/extensionManagement/node/extensionUrlTrustService';
+import { once } from 'vs/base/common/functional';
 
 export class CodeApplication extends Disposable {
 	private windowsMainService: IWindowsMainService | undefined;
@@ -97,7 +96,7 @@ export class CodeApplication extends Disposable {
 	private nativeHostMainService: INativeHostMainService | undefined;
 
 	constructor(
-		private readonly mainIpcServer: Server,
+		private readonly mainIpcServer: NodeIPCServer,
 		private readonly userEnv: IProcessEnvironment,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
@@ -150,19 +149,19 @@ export class CodeApplication extends Disposable {
 			event.preventDefault();
 		});
 		app.on('remote-get-global', (event, sender, module) => {
-			this.logService.trace(`App#on(remote-get-global): prevented on ${module}`);
+			this.logService.trace(`app#on(remote-get-global): prevented on ${module}`);
 
 			event.preventDefault();
 		});
 		app.on('remote-get-builtin', (event, sender, module) => {
-			this.logService.trace(`App#on(remote-get-builtin): prevented on ${module}`);
+			this.logService.trace(`app#on(remote-get-builtin): prevented on ${module}`);
 
 			if (module !== 'clipboard') {
 				event.preventDefault();
 			}
 		});
 		app.on('remote-get-current-window', event => {
-			this.logService.trace(`App#on(remote-get-current-window): prevented`);
+			this.logService.trace(`app#on(remote-get-current-window): prevented`);
 
 			event.preventDefault();
 		});
@@ -171,7 +170,7 @@ export class CodeApplication extends Disposable {
 				return; // the driver needs access to web contents
 			}
 
-			this.logService.trace(`App#on(remote-get-current-web-contents): prevented`);
+			this.logService.trace(`app#on(remote-get-current-web-contents): prevented`);
 
 			event.preventDefault();
 		});
@@ -271,9 +270,13 @@ export class CodeApplication extends Disposable {
 
 		//#region Bootstrap IPC Handlers
 
+		let slowShellResolveWarningShown = false;
 		ipcMain.on('vscode:fetchShellEnv', async event => {
+
+			// DO NOT remove: not only usual windows are fetching the
+			// shell environment but also shared process, issue reporter
+			// etc, so we need to reply via `webContents` always
 			const webContents = event.sender;
-			const window = this.windowsMainService?.getWindowByWebContents(event.sender);
 
 			let replied = false;
 
@@ -291,11 +294,19 @@ export class CodeApplication extends Disposable {
 			}
 
 			// Handle slow shell environment resolve calls:
-			// - a warning after 3s but continue to resolve
-			// - an error after 10s and stop trying to resolve
+			// - a warning after 3s but continue to resolve (only once in active window)
+			// - an error after 10s and stop trying to resolve (in every window where this happens)
 			const cts = new CancellationTokenSource();
-			const shellEnvSlowWarningHandle = setTimeout(() => window?.sendWhenReady('vscode:showShellEnvSlowWarning', cts.token), 3000);
-			const shellEnvTimeoutErrorHandle = setTimeout(function () {
+
+			const shellEnvSlowWarningHandle = setTimeout(() => {
+				if (!slowShellResolveWarningShown) {
+					this.windowsMainService?.sendToFocused('vscode:showShellEnvSlowWarning', cts.token);
+					slowShellResolveWarningShown = true;
+				}
+			}, 3000);
+
+			const window = this.windowsMainService?.getWindowByWebContents(event.sender); // Note: this can be `undefined` for the shared process!!
+			const shellEnvTimeoutErrorHandle = setTimeout(() => {
 				cts.dispose(true);
 				window?.sendWhenReady('vscode:showShellEnvTimeoutError', CancellationToken.None);
 				acceptShellEnv({});
@@ -304,8 +315,11 @@ export class CodeApplication extends Disposable {
 			// Prefer to use the args and env from the target window
 			// when resolving the shell env. It is possible that
 			// a first window was opened from the UI but a second
-			// from the CLI and that has implications for wether to
+			// from the CLI and that has implications for whether to
 			// resolve the shell environment or not.
+			//
+			// Window can be undefined for e.g. the shared process
+			// that is not part of our windows registry!
 			let args: NativeParsedArgs;
 			let env: NodeJS.ProcessEnv;
 			if (window?.config) {
@@ -321,10 +335,10 @@ export class CodeApplication extends Disposable {
 			acceptShellEnv(shellEnv);
 		});
 
-		ipcMain.handle('vscode:writeNlsFile', (event, path: unknown, data: unknown) => {
+		ipcMain.handle('vscode:writeNlsFile', async (event, path: unknown, data: unknown) => {
 			const uri = this.validateNlsPath([path]);
 			if (!uri || typeof data !== 'string') {
-				return Promise.reject('Invalid operation (vscode:writeNlsFile)');
+				throw new Error('Invalid operation (vscode:writeNlsFile)');
 			}
 
 			return this.fileService.writeFile(uri, VSBuffer.fromString(data));
@@ -333,7 +347,7 @@ export class CodeApplication extends Disposable {
 		ipcMain.handle('vscode:readNlsFile', async (event, ...paths: unknown[]) => {
 			const uri = this.validateNlsPath(paths);
 			if (!uri) {
-				return Promise.reject('Invalid operation (vscode:readNlsFile)');
+				throw new Error('Invalid operation (vscode:readNlsFile)');
 			}
 
 			return (await this.fileService.readFile(uri)).value.toString();
@@ -427,16 +441,20 @@ export class CodeApplication extends Disposable {
 
 		// Spawn shared process after the first window has opened and 3s have passed
 		const sharedProcess = this.instantiationService.createInstance(SharedProcess, machineId, this.userEnv);
-		const sharedProcessClient = sharedProcess.whenIpcReady().then(() => {
-			this.logService.trace('Shared process: IPC ready');
+		const sharedProcessClient = (async () => {
+			this.logService.trace('Main->SharedProcess#connect');
 
-			return connect(this.environmentService.sharedIPCHandle, 'main');
-		});
-		const sharedProcessReady = sharedProcess.whenReady().then(() => {
-			this.logService.trace('Shared process: init ready');
+			const port = await sharedProcess.connect();
+
+			this.logService.trace('Main->SharedProcess#connect: connection established');
+
+			return new MessagePortClient(port, 'main');
+		})();
+		const sharedProcessReady = (async () => {
+			await sharedProcess.whenReady();
 
 			return sharedProcessClient;
-		});
+		})();
 		this.lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen).then(() => {
 			this._register(new RunOnceScheduler(async () => {
 				sharedProcess.spawn(await resolveShellEnv(this.logService, this.environmentService.args, process.env));
@@ -454,12 +472,8 @@ export class CodeApplication extends Disposable {
 			this._register(server);
 		}
 
-		// Setup Auth Handler (TODO@ben remove old auth handler eventually)
-		if (this.configurationService.getValue('window.enableExperimentalProxyLoginDialog') === false) {
-			this._register(new ProxyAuthHandler());
-		} else {
-			this._register(appInstantiationService.createInstance(ProxyAuthHandler2));
-		}
+		// Setup Auth Handler
+		this._register(appInstantiationService.createInstance(ProxyAuthHandler));
 
 		// Open Windows
 		const windows = appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor, electronIpcServer, sharedProcessClient, fileProtocolHandler));
@@ -487,7 +501,7 @@ export class CodeApplication extends Disposable {
 		return machineId;
 	}
 
-	private async createServices(machineId: string, sharedProcess: SharedProcess, sharedProcessReady: Promise<Client<string>>): Promise<IInstantiationService> {
+	private async createServices(machineId: string, sharedProcess: SharedProcess, sharedProcessReady: Promise<MessagePortClient>): Promise<IInstantiationService> {
 		const services = new ServiceCollection();
 
 		switch (process.platform) {
@@ -496,8 +510,8 @@ export class CodeApplication extends Disposable {
 				break;
 
 			case 'linux':
-				if (process.env.SNAP && process.env.SNAP_REVISION) {
-					services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env.SNAP, process.env.SNAP_REVISION]));
+				if (isLinuxSnap) {
+					services.set(IUpdateService, new SyncDescriptor(SnapUpdateService, [process.env['SNAP'], process.env['SNAP_REVISION']]));
 				} else {
 					services.set(IUpdateService, new SyncDescriptor(LinuxUpdateService));
 				}
@@ -510,7 +524,6 @@ export class CodeApplication extends Disposable {
 
 		services.set(IWindowsMainService, new SyncDescriptor(WindowsMainService, [machineId, this.userEnv]));
 		services.set(IDialogMainService, new SyncDescriptor(DialogMainService));
-		services.set(ISharedProcessMainService, new SyncDescriptor(SharedProcessMainService, [sharedProcess]));
 		services.set(ILaunchMainService, new SyncDescriptor(LaunchMainService));
 		services.set(IDiagnosticsService, createChannelSender(getDelayedChannel(sharedProcessReady.then(client => client.getChannel('diagnostics')))));
 
@@ -518,9 +531,9 @@ export class CodeApplication extends Disposable {
 		services.set(IEncryptionMainService, new SyncDescriptor(EncryptionMainService, [machineId]));
 		services.set(IKeyboardLayoutMainService, new SyncDescriptor(KeyboardLayoutMainService));
 		services.set(IDisplayMainService, new SyncDescriptor(DisplayMainService));
-		services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService));
+		services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService, [sharedProcess]));
 		services.set(IWebviewManagerService, new SyncDescriptor(WebviewMainService));
-		services.set(IWorkspacesService, new SyncDescriptor(WorkspacesService));
+		services.set(IWorkspacesService, new SyncDescriptor(WorkspacesMainService));
 		services.set(IMenubarMainService, new SyncDescriptor(MenubarMainService));
 		services.set(IExtensionUrlTrustService, new SyncDescriptor(ExtensionUrlTrustService));
 
@@ -533,13 +546,13 @@ export class CodeApplication extends Disposable {
 
 		services.set(IWorkspacesHistoryMainService, new SyncDescriptor(WorkspacesHistoryMainService));
 		services.set(IURLService, new SyncDescriptor(NativeURLService));
-		services.set(IWorkspacesMainService, new SyncDescriptor(WorkspacesMainService));
+		services.set(IWorkspacesManagementMainService, new SyncDescriptor(WorkspacesManagementMainService));
 
 		// Telemetry
 		if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
 			const channel = getDelayedChannel(sharedProcessReady.then(client => client.getChannel('telemetryAppender')));
 			const appender = new TelemetryAppenderClient(channel);
-			const commonProperties = resolveCommonProperties(product.commit, product.version, machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
+			const commonProperties = resolveCommonProperties(this.fileService, release(), process.arch, product.commit, product.version, machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
 			const piiPaths = [this.environmentService.appRoot, this.environmentService.extensionsPath];
 			const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths, sendErrorTelemetry: true };
 
@@ -589,7 +602,7 @@ export class CodeApplication extends Disposable {
 		});
 	}
 
-	private openFirstWindow(accessor: ServicesAccessor, electronIpcServer: ElectronIPCServer, sharedProcessClient: Promise<Client<string>>, fileProtocolHandler: FileProtocolHandler): ICodeWindow[] {
+	private openFirstWindow(accessor: ServicesAccessor, electronIpcServer: ElectronIPCServer, sharedProcessClient: Promise<MessagePortClient>, fileProtocolHandler: FileProtocolHandler): ICodeWindow[] {
 
 		// Register more Main IPC services
 		const launchMainService = accessor.get(ILaunchMainService);
@@ -622,10 +635,6 @@ export class CodeApplication extends Disposable {
 		electronIpcServer.registerChannel('nativeHost', nativeHostChannel);
 		sharedProcessClient.then(client => client.registerChannel('nativeHost', nativeHostChannel));
 
-		const sharedProcessMainService = accessor.get(ISharedProcessMainService);
-		const sharedProcessChannel = createChannelReceiver(sharedProcessMainService);
-		electronIpcServer.registerChannel('sharedProcess', sharedProcessChannel);
-
 		const workspacesService = accessor.get(IWorkspacesService);
 		const workspacesChannel = createChannelReceiver(workspacesService);
 		electronIpcServer.registerChannel('workspaces', workspacesChannel);
@@ -705,6 +714,8 @@ export class CodeApplication extends Disposable {
 		});
 
 		// Create a URL handler to open file URIs in the active window
+		// or open new windows. The URL handler will be invoked from
+		// protocol invocations outside of VSCode.
 		const app = this;
 		const environmentService = this.environmentService;
 		urlService.registerHandler({
@@ -718,13 +729,15 @@ export class CodeApplication extends Disposable {
 				// Check for URIs to open in window
 				const windowOpenableFromProtocolLink = app.getWindowOpenableFromProtocolLink(uri);
 				if (windowOpenableFromProtocolLink) {
-					windowsMainService.open({
+					const [window] = windowsMainService.open({
 						context: OpenContext.API,
 						cli: { ...environmentService.args },
 						urisToOpen: [windowOpenableFromProtocolLink],
 						gotoLineMode: true
 					});
 
+					window.focus(); // this should help ensuring that the right window gets focus when multiple are opened
+
 					return true;
 				}
 
@@ -832,7 +845,7 @@ export class CodeApplication extends Disposable {
 					mnemonicButtonLabel(localize({ key: 'cancel', comment: ['&& denotes a mnemonic'] }, "&&No")),
 				],
 				cancelId: 1,
-				message: localize('confirmOpenMessage', "An external application wants to open '{0}' in {1}. Do you want to open this file or folder?", getPathLabel(uri.fsPath), product.nameShort),
+				message: localize('confirmOpenMessage', "An external application wants to open '{0}' in {1}. Do you want to open this file or folder?", getPathLabel(uri.fsPath, this.environmentService), product.nameShort),
 				detail: localize('confirmOpenDetail', "If you did not initiate this request, it may represent an attempted attack on your system. Unless you took an explicit action to initiate this request, you should press 'No'"),
 				noLink: true
 			});
@@ -901,8 +914,25 @@ export class CodeApplication extends Disposable {
 		// Signal phase: after window open
 		this.lifecycleMainService.phase = LifecycleMainPhase.AfterWindowOpen;
 
+		// Windows: install mutex
+		const win32MutexName = product.win32MutexName;
+		if (isWindows && win32MutexName) {
+			try {
+				const WindowsMutex = (require.__$__nodeRequire('windows-mutex') as typeof import('windows-mutex')).Mutex;
+				const mutex = new WindowsMutex(win32MutexName);
+				once(this.lifecycleMainService.onWillShutdown)(() => mutex.release());
+			} catch (error) {
+				this.logService.error(error);
+			}
+		}
+
 		// Remote Authorities
-		this.handleRemoteAuthorities();
+		protocol.registerHttpProtocol(Schemas.vscodeRemoteResource, (request, callback) => {
+			callback({
+				url: request.url.replace(/^vscode-remote-resource:/, 'http:'),
+				method: request.method
+			});
+		});
 
 		// Initialize update service
 		const updateService = accessor.get(IUpdateService);
@@ -934,19 +964,11 @@ export class CodeApplication extends Disposable {
 					'}'
 				];
 				const newArgvString = argvString.substring(0, argvString.length - 2).concat(',\n', additionalArgvContent.join('\n'));
+
 				await this.fileService.writeFile(this.environmentService.argvResource, VSBuffer.fromString(newArgvString));
 			}
 		} catch (error) {
 			this.logService.error(error);
 		}
 	}
-
-	private handleRemoteAuthorities(): void {
-		protocol.registerHttpProtocol(Schemas.vscodeRemoteResource, (request, callback) => {
-			callback({
-				url: request.url.replace(/^vscode-remote-resource:/, 'http:'),
-				method: request.method
-			});
-		});
-	}
 }
diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
index b40960186..b9669f983 100644
--- a/src/vs/code/electron-main/auth.ts
+++ b/src/vs/code/electron-main/auth.ts
@@ -3,18 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
-import { FileAccess } from 'vs/base/common/network';
-import { BrowserWindow, BrowserWindowConstructorOptions, app, AuthInfo, WebContents, Event as ElectronEvent } from 'electron';
+import { hash } from 'vs/base/common/hash';
+import { app, AuthInfo, WebContents, Event as ElectronEvent, AuthenticationResponseDetails } from 'electron';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
+import { IEncryptionMainService } from 'vs/platform/encryption/electron-main/encryptionMainService';
+import { generateUuid } from 'vs/base/common/uuid';
+import product from 'vs/platform/product/common/product';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+interface ElectronAuthenticationResponseDetails extends AuthenticationResponseDetails {
+	firstAuthAttempt?: boolean; // https://github.com/electron/electron/blob/84a42a050e7d45225e69df5bd2d2bf9f1037ea41/shell/browser/login_handler.cc#L70
+}
 
 type LoginEvent = {
 	event: ElectronEvent;
-	webContents: WebContents;
-	req: Request;
 	authInfo: AuthInfo;
-	cb: (username: string, password: string) => void;
+	req: ElectronAuthenticationResponseDetails;
+
+	callback: (username?: string, password?: string) => void;
 };
 
 type Credentials = {
@@ -22,81 +32,211 @@ type Credentials = {
 	password: string;
 };
 
+enum ProxyAuthState {
+
+	/**
+	 * Initial state: we will try to use stored credentials
+	 * first to reply to the auth challenge.
+	 */
+	Initial = 1,
+
+	/**
+	 * We used stored credentials and are still challenged,
+	 * so we will show a login dialog next.
+	 */
+	StoredCredentialsUsed,
+
+	/**
+	 * Finally, if we showed a login dialog already, we will
+	 * not show any more login dialogs until restart to reduce
+	 * the UI noise.
+	 */
+	LoginDialogShown
+}
+
 export class ProxyAuthHandler extends Disposable {
 
-	declare readonly _serviceBrand: undefined;
+	private static PROXY_CREDENTIALS_SERVICE_KEY = `${product.urlProtocol}.proxy-credentials`;
 
-	private retryCount = 0;
+	private pendingProxyResolve: Promise<Credentials | undefined> | undefined = undefined;
 
-	constructor() {
+	private state = ProxyAuthState.Initial;
+
+	private sessionCredentials: Credentials | undefined = undefined;
+
+	constructor(
+		@ILogService private readonly logService: ILogService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
+		@IEncryptionMainService private readonly encryptionMainService: IEncryptionMainService
+	) {
 		super();
 
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		const onLogin = Event.fromNodeEventEmitter<LoginEvent>(app, 'login', (event, webContents, req, authInfo, cb) => ({ event, webContents, req, authInfo, cb }));
+		const onLogin = Event.fromNodeEventEmitter<LoginEvent>(app, 'login', (event: ElectronEvent, webContents: WebContents, req: ElectronAuthenticationResponseDetails, authInfo: AuthInfo, callback) => ({ event, webContents, req, authInfo, callback }));
 		this._register(onLogin(this.onLogin, this));
 	}
 
-	private onLogin({ event, authInfo, cb }: LoginEvent): void {
+	private async onLogin({ event, authInfo, req, callback }: LoginEvent): Promise<void> {
 		if (!authInfo.isProxy) {
-			return;
+			return; // only for proxy
 		}
 
-		if (this.retryCount++ > 1) {
-			return;
+		if (!this.pendingProxyResolve && this.state === ProxyAuthState.LoginDialogShown && req.firstAuthAttempt) {
+			this.logService.trace('auth#onLogin (proxy) - exit - proxy dialog already shown');
+
+			return; // only one dialog per session at max (except when firstAuthAttempt: false which indicates a login problem)
 		}
 
+		// Signal we handle this event on our own, otherwise
+		// Electron will ignore our provided credentials.
 		event.preventDefault();
 
-		const opts: BrowserWindowConstructorOptions = {
-			alwaysOnTop: true,
-			skipTaskbar: true,
-			resizable: false,
-			width: 450,
-			height: 225,
-			show: true,
-			title: 'VS Code',
-			webPreferences: {
-				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
-				sandbox: true,
-				contextIsolation: true,
-				enableWebSQL: false,
-				enableRemoteModule: false,
-				spellcheck: false,
-				devTools: false
-			}
-		};
+		let credentials: Credentials | undefined = undefined;
+		if (!this.pendingProxyResolve) {
+			this.logService.trace('auth#onLogin (proxy) - no pending proxy handling found, starting new');
 
-		const focusedWindow = BrowserWindow.getFocusedWindow();
-		if (focusedWindow) {
-			opts.parent = focusedWindow;
-			opts.modal = true;
+			this.pendingProxyResolve = this.resolveProxyCredentials(authInfo);
+			try {
+				credentials = await this.pendingProxyResolve;
+			} finally {
+				this.pendingProxyResolve = undefined;
+			}
+		} else {
+			this.logService.trace('auth#onLogin (proxy) - pending proxy handling found');
+
+			credentials = await this.pendingProxyResolve;
 		}
 
-		const win = new BrowserWindow(opts);
-		const windowUrl = FileAccess.asBrowserUri('vs/code/electron-sandbox/proxy/auth.html', require);
-		const proxyUrl = `${authInfo.host}:${authInfo.port}`;
-		const title = localize('authRequire', "Proxy Authentication Required");
-		const message = localize('proxyauth', "The proxy {0} requires authentication.", proxyUrl);
+		// According to Electron docs, it is fine to call back without
+		// username or password to signal that the authentication was handled
+		// by us, even though without having credentials received:
+		//
+		// > If `callback` is called without a username or password, the authentication
+		// > request will be cancelled and the authentication error will be returned to the
+		// > page.
+		callback(credentials?.username, credentials?.password);
+	}
 
-		const onWindowClose = () => cb('', '');
-		win.on('close', onWindowClose);
+	private async resolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		this.logService.trace('auth#resolveProxyCredentials (proxy) - enter');
 
-		win.setMenu(null);
-		win.webContents.on('did-finish-load', () => {
-			const data = { title, message };
-			win.webContents.send('vscode:openProxyAuthDialog', data);
-		});
-		win.webContents.on('ipc-message', (event, channel, credentials: Credentials) => {
-			if (channel === 'vscode:proxyAuthResponse') {
-				const { username, password } = credentials;
-				cb(username, password);
-				win.removeListener('close', onWindowClose);
-				win.close();
+		try {
+			const credentials = await this.doResolveProxyCredentials(authInfo);
+			if (credentials) {
+				this.logService.trace('auth#resolveProxyCredentials (proxy) - got credentials');
+
+				return credentials;
+			} else {
+				this.logService.trace('auth#resolveProxyCredentials (proxy) - did not get credentials');
 			}
+		} finally {
+			this.logService.trace('auth#resolveProxyCredentials (proxy) - exit');
+		}
+
+		return undefined;
+	}
+
+	private async doResolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
+		this.logService.trace('auth#doResolveProxyCredentials - enter', authInfo);
+
+		// Compute a hash over the authentication info to be used
+		// with the credentials store to return the right credentials
+		// given the properties of the auth request
+		// (see https://github.com/microsoft/vscode/issues/109497)
+		const authInfoHash = String(hash({ scheme: authInfo.scheme, host: authInfo.host, port: authInfo.port }));
+
+		// Find any previously stored credentials
+		let storedUsername: string | undefined = undefined;
+		let storedPassword: string | undefined = undefined;
+		try {
+			const encryptedSerializedProxyCredentials = await this.nativeHostMainService.getPassword(undefined, ProxyAuthHandler.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash);
+			if (encryptedSerializedProxyCredentials) {
+				const credentials: Credentials = JSON.parse(await this.encryptionMainService.decrypt(encryptedSerializedProxyCredentials));
+
+				storedUsername = credentials.username;
+				storedPassword = credentials.password;
+			}
+		} catch (error) {
+			this.logService.error(error); // handle errors by asking user for login via dialog
+		}
+
+		// Reply with stored credentials unless we used them already.
+		// In that case we need to show a login dialog again because
+		// they seem invalid.
+		if (this.state !== ProxyAuthState.StoredCredentialsUsed && typeof storedUsername === 'string' && typeof storedPassword === 'string') {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found stored credentials to use');
+			this.state = ProxyAuthState.StoredCredentialsUsed;
+
+			return { username: storedUsername, password: storedPassword };
+		}
+
+		// Find suitable window to show dialog: prefer to show it in the
+		// active window because any other network request will wait on
+		// the credentials and we want the user to present the dialog.
+		const window = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
+		if (!window) {
+			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - no opened window found to show dialog in');
+
+			return undefined; // unexpected
+		}
+
+		this.logService.trace(`auth#doResolveProxyCredentials (proxy) - asking window ${window.id} to handle proxy login`);
+
+		// Open proxy dialog
+		const payload = {
+			authInfo,
+			username: this.sessionCredentials?.username ?? storedUsername, // prefer to show already used username (if any) over stored
+			password: this.sessionCredentials?.password ?? storedPassword, // prefer to show already used password (if any) over stored
+			replyChannel: `vscode:proxyAuthResponse:${generateUuid()}`
+		};
+		window.sendWhenReady('vscode:openProxyAuthenticationDialog', CancellationToken.None, payload);
+		this.state = ProxyAuthState.LoginDialogShown;
+
+		// Handle reply
+		const loginDialogCredentials = await new Promise<Credentials | undefined>(resolve => {
+			const proxyAuthResponseHandler = async (event: ElectronEvent, channel: string, reply: Credentials & { remember: boolean } | undefined /* canceled */) => {
+				if (channel === payload.replyChannel) {
+					this.logService.trace(`auth#doResolveProxyCredentials - exit - received credentials from window ${window.id}`);
+					window.win.webContents.off('ipc-message', proxyAuthResponseHandler);
+
+					// We got credentials from the window
+					if (reply) {
+						const credentials: Credentials = { username: reply.username, password: reply.password };
+
+						// Update stored credentials based on `remember` flag
+						try {
+							if (reply.remember) {
+								const encryptedSerializedCredentials = await this.encryptionMainService.encrypt(JSON.stringify(credentials));
+								await this.nativeHostMainService.setPassword(undefined, ProxyAuthHandler.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash, encryptedSerializedCredentials);
+							} else {
+								await this.nativeHostMainService.deletePassword(undefined, ProxyAuthHandler.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash);
+							}
+						} catch (error) {
+							this.logService.error(error); // handle gracefully
+						}
+
+						resolve({ username: credentials.username, password: credentials.password });
+					}
+
+					// We did not get any credentials from the window (e.g. cancelled)
+					else {
+						resolve(undefined);
+					}
+				}
+			};
+
+			window.win.webContents.on('ipc-message', proxyAuthResponseHandler);
 		});
-		win.loadURL(windowUrl.toString(true));
+
+		// Remember credentials for the session in case
+		// the credentials are wrong and we show the dialog
+		// again
+		this.sessionCredentials = loginDialogCredentials;
+
+		return loginDialogCredentials;
 	}
 }
diff --git a/src/vs/code/electron-main/auth2.ts b/src/vs/code/electron-main/auth2.ts
deleted file mode 100644
index 1b84d4bc4..000000000
--- a/src/vs/code/electron-main/auth2.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-import { hash } from 'vs/base/common/hash';
-import { app, AuthInfo, WebContents, Event as ElectronEvent, AuthenticationResponseDetails } from 'electron';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
-import { IEncryptionMainService } from 'vs/platform/encryption/electron-main/encryptionMainService';
-import { generateUuid } from 'vs/base/common/uuid';
-import product from 'vs/platform/product/common/product';
-import { CancellationToken } from 'vs/base/common/cancellation';
-
-interface ElectronAuthenticationResponseDetails extends AuthenticationResponseDetails {
-	firstAuthAttempt?: boolean; // https://github.com/electron/electron/blob/84a42a050e7d45225e69df5bd2d2bf9f1037ea41/shell/browser/login_handler.cc#L70
-}
-
-type LoginEvent = {
-	event: ElectronEvent;
-	authInfo: AuthInfo;
-	req: ElectronAuthenticationResponseDetails;
-
-	callback: (username?: string, password?: string) => void;
-};
-
-type Credentials = {
-	username: string;
-	password: string;
-};
-
-enum ProxyAuthState {
-
-	/**
-	 * Initial state: we will try to use stored credentials
-	 * first to reply to the auth challenge.
-	 */
-	Initial = 1,
-
-	/**
-	 * We used stored credentials and are still challenged,
-	 * so we will show a login dialog next.
-	 */
-	StoredCredentialsUsed,
-
-	/**
-	 * Finally, if we showed a login dialog already, we will
-	 * not show any more login dialogs until restart to reduce
-	 * the UI noise.
-	 */
-	LoginDialogShown
-}
-
-export class ProxyAuthHandler2 extends Disposable {
-
-	private static PROXY_CREDENTIALS_SERVICE_KEY = `${product.urlProtocol}.proxy-credentials`;
-
-	private pendingProxyResolve: Promise<Credentials | undefined> | undefined = undefined;
-
-	private state = ProxyAuthState.Initial;
-
-	private sessionCredentials: Credentials | undefined = undefined;
-
-	constructor(
-		@ILogService private readonly logService: ILogService,
-		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
-		@IEncryptionMainService private readonly encryptionMainService: IEncryptionMainService
-	) {
-		super();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		const onLogin = Event.fromNodeEventEmitter<LoginEvent>(app, 'login', (event: ElectronEvent, webContents: WebContents, req: ElectronAuthenticationResponseDetails, authInfo: AuthInfo, callback) => ({ event, webContents, req, authInfo, callback }));
-		this._register(onLogin(this.onLogin, this));
-	}
-
-	private async onLogin({ event, authInfo, req, callback }: LoginEvent): Promise<void> {
-		if (!authInfo.isProxy) {
-			return; // only for proxy
-		}
-
-		if (!this.pendingProxyResolve && this.state === ProxyAuthState.LoginDialogShown && req.firstAuthAttempt) {
-			this.logService.trace('auth#onLogin (proxy) - exit - proxy dialog already shown');
-
-			return; // only one dialog per session at max (except when firstAuthAttempt: false which indicates a login problem)
-		}
-
-		// Signal we handle this event on our own, otherwise
-		// Electron will ignore our provided credentials.
-		event.preventDefault();
-
-		let credentials: Credentials | undefined = undefined;
-		if (!this.pendingProxyResolve) {
-			this.logService.trace('auth#onLogin (proxy) - no pending proxy handling found, starting new');
-
-			this.pendingProxyResolve = this.resolveProxyCredentials(authInfo);
-			try {
-				credentials = await this.pendingProxyResolve;
-			} finally {
-				this.pendingProxyResolve = undefined;
-			}
-		} else {
-			this.logService.trace('auth#onLogin (proxy) - pending proxy handling found');
-
-			credentials = await this.pendingProxyResolve;
-		}
-
-		// According to Electron docs, it is fine to call back without
-		// username or password to signal that the authentication was handled
-		// by us, even though without having credentials received:
-		//
-		// > If `callback` is called without a username or password, the authentication
-		// > request will be cancelled and the authentication error will be returned to the
-		// > page.
-		callback(credentials?.username, credentials?.password);
-	}
-
-	private async resolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
-		this.logService.trace('auth#resolveProxyCredentials (proxy) - enter');
-
-		try {
-			const credentials = await this.doResolveProxyCredentials(authInfo);
-			if (credentials) {
-				this.logService.trace('auth#resolveProxyCredentials (proxy) - got credentials');
-
-				return credentials;
-			} else {
-				this.logService.trace('auth#resolveProxyCredentials (proxy) - did not get credentials');
-			}
-		} finally {
-			this.logService.trace('auth#resolveProxyCredentials (proxy) - exit');
-		}
-
-		return undefined;
-	}
-
-	private async doResolveProxyCredentials(authInfo: AuthInfo): Promise<Credentials | undefined> {
-		this.logService.trace('auth#doResolveProxyCredentials - enter', authInfo);
-
-		// Compute a hash over the authentication info to be used
-		// with the credentials store to return the right credentials
-		// given the properties of the auth request
-		// (see https://github.com/microsoft/vscode/issues/109497)
-		const authInfoHash = String(hash({ scheme: authInfo.scheme, host: authInfo.host, port: authInfo.port }));
-
-		// Find any previously stored credentials
-		let storedUsername: string | undefined = undefined;
-		let storedPassword: string | undefined = undefined;
-		try {
-			const encryptedSerializedProxyCredentials = await this.nativeHostMainService.getPassword(undefined, ProxyAuthHandler2.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash);
-			if (encryptedSerializedProxyCredentials) {
-				const credentials: Credentials = JSON.parse(await this.encryptionMainService.decrypt(encryptedSerializedProxyCredentials));
-
-				storedUsername = credentials.username;
-				storedPassword = credentials.password;
-			}
-		} catch (error) {
-			this.logService.error(error); // handle errors by asking user for login via dialog
-		}
-
-		// Reply with stored credentials unless we used them already.
-		// In that case we need to show a login dialog again because
-		// they seem invalid.
-		if (this.state !== ProxyAuthState.StoredCredentialsUsed && typeof storedUsername === 'string' && typeof storedPassword === 'string') {
-			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - found stored credentials to use');
-			this.state = ProxyAuthState.StoredCredentialsUsed;
-
-			return { username: storedUsername, password: storedPassword };
-		}
-
-		// Find suitable window to show dialog: prefer to show it in the
-		// active window because any other network request will wait on
-		// the credentials and we want the user to present the dialog.
-		const window = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
-		if (!window) {
-			this.logService.trace('auth#doResolveProxyCredentials (proxy) - exit - no opened window found to show dialog in');
-
-			return undefined; // unexpected
-		}
-
-		this.logService.trace(`auth#doResolveProxyCredentials (proxy) - asking window ${window.id} to handle proxy login`);
-
-		// Open proxy dialog
-		const payload = {
-			authInfo,
-			username: this.sessionCredentials?.username ?? storedUsername, // prefer to show already used username (if any) over stored
-			password: this.sessionCredentials?.password ?? storedPassword, // prefer to show already used password (if any) over stored
-			replyChannel: `vscode:proxyAuthResponse:${generateUuid()}`
-		};
-		window.sendWhenReady('vscode:openProxyAuthenticationDialog', CancellationToken.None, payload);
-		this.state = ProxyAuthState.LoginDialogShown;
-
-		// Handle reply
-		const loginDialogCredentials = await new Promise<Credentials | undefined>(resolve => {
-			const proxyAuthResponseHandler = async (event: ElectronEvent, channel: string, reply: Credentials & { remember: boolean } | undefined /* canceled */) => {
-				if (channel === payload.replyChannel) {
-					this.logService.trace(`auth#doResolveProxyCredentials - exit - received credentials from window ${window.id}`);
-					window.win.webContents.off('ipc-message', proxyAuthResponseHandler);
-
-					// We got credentials from the window
-					if (reply) {
-						const credentials: Credentials = { username: reply.username, password: reply.password };
-
-						// Update stored credentials based on `remember` flag
-						try {
-							if (reply.remember) {
-								const encryptedSerializedCredentials = await this.encryptionMainService.encrypt(JSON.stringify(credentials));
-								await this.nativeHostMainService.setPassword(undefined, ProxyAuthHandler2.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash, encryptedSerializedCredentials);
-							} else {
-								await this.nativeHostMainService.deletePassword(undefined, ProxyAuthHandler2.PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash);
-							}
-						} catch (error) {
-							this.logService.error(error); // handle gracefully
-						}
-
-						resolve({ username: credentials.username, password: credentials.password });
-					}
-
-					// We did not get any credentials from the window (e.g. cancelled)
-					else {
-						resolve(undefined);
-					}
-				}
-			};
-
-			window.win.webContents.on('ipc-message', proxyAuthResponseHandler);
-		});
-
-		// Remember credentials for the session in case
-		// the credentials are wrong and we show the dialog
-		// again
-		this.sessionCredentials = loginDialogCredentials;
-
-		return loginDialogCredentials;
-	}
-}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 783ac6fb5..f0d8b6d2d 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -5,15 +5,17 @@
 
 import 'vs/platform/update/common/update.config.contribution';
 import { app, dialog } from 'electron';
-import * as fs from 'fs';
+import { unlinkSync } from 'fs';
+import { localize } from 'vs/nls';
 import { isWindows, IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
 import product from 'vs/platform/product/common/product';
 import { parseMainProcessArgv, addArg } from 'vs/platform/environment/node/argvHelper';
 import { createWaitMarkerFile } from 'vs/platform/environment/node/waitMarkerFile';
 import { mkdirp } from 'vs/base/node/pfs';
 import { LifecycleMainService, ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { Server, serve, connect, XDG_RUNTIME_DIR } from 'vs/base/parts/ipc/node/ipc.net';
 import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+import { Server as NodeIPCServer, serve as nodeIPCServe, connect as nodeIPCConnect, XDG_RUNTIME_DIR } from 'vs/base/parts/ipc/node/ipc.net';
+import { Client as NodeIPCClient } from 'vs/base/parts/ipc/common/ipc.net';
 import { ILaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
@@ -29,17 +31,15 @@ import { ConfigurationService } from 'vs/platform/configuration/common/configura
 import { IRequestService } from 'vs/platform/request/common/request';
 import { RequestMainService } from 'vs/platform/request/electron-main/requestMainService';
 import { CodeApplication } from 'vs/code/electron-main/app';
-import { localize } from 'vs/nls';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
+import { getPathLabel, mnemonicButtonLabel } from 'vs/base/common/labels';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { Client } from 'vs/base/parts/ipc/common/ipc.net';
 import { once } from 'vs/base/common/functional';
 import { ISignService } from 'vs/platform/sign/common/sign';
 import { SignService } from 'vs/platform/sign/node/signService';
-import { IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
+import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
 import { Schemas } from 'vs/base/common/network';
@@ -53,6 +53,8 @@ import { rtrim, trim } from 'vs/base/common/strings';
 import { basename, resolve } from 'vs/base/common/path';
 import { coalesce, distinct } from 'vs/base/common/arrays';
 import { EnvironmentMainService, IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 
 class ExpectedError extends Error {
 	readonly isExpected = true;
@@ -212,14 +214,14 @@ class CodeMain {
 		return instanceEnvironment;
 	}
 
-	private async doStartup(args: NativeParsedArgs, logService: ILogService, environmentService: IEnvironmentMainService, lifecycleMainService: ILifecycleMainService, instantiationService: IInstantiationService, retry: boolean): Promise<Server> {
+	private async doStartup(args: NativeParsedArgs, logService: ILogService, environmentService: IEnvironmentMainService, lifecycleMainService: ILifecycleMainService, instantiationService: IInstantiationService, retry: boolean): Promise<NodeIPCServer> {
 
 		// Try to setup a server for running. If that succeeds it means
 		// we are the first instance to startup. Otherwise it is likely
 		// that another instance is already running.
-		let server: Server;
+		let server: NodeIPCServer;
 		try {
-			server = await serve(environmentService.mainIPCHandle);
+			server = await nodeIPCServe(environmentService.mainIPCHandle);
 			once(lifecycleMainService.onWillShutdown)(() => server.dispose());
 		} catch (error) {
 
@@ -235,9 +237,9 @@ class CodeMain {
 			}
 
 			// there's a running instance, let's connect to it
-			let client: Client<string>;
+			let client: NodeIPCClient<string>;
 			try {
-				client = await connect(environmentService.mainIPCHandle, 'main');
+				client = await nodeIPCConnect(environmentService.mainIPCHandle, 'main');
 			} catch (error) {
 
 				// Handle unexpected connection errors by showing a dialog to the user
@@ -256,7 +258,7 @@ class CodeMain {
 				// let's delete it, since we can't connect to it and then
 				// retry the whole thing
 				try {
-					fs.unlinkSync(environmentService.mainIPCHandle);
+					unlinkSync(environmentService.mainIPCHandle);
 				} catch (error) {
 					logService.warn('Could not delete obsolete instance handle', error);
 
@@ -293,11 +295,7 @@ class CodeMain {
 			// Process Info
 			if (args.status) {
 				return instantiationService.invokeFunction(async () => {
-
-					// Create a diagnostic service connected to the existing shared process
-					const sharedProcessClient = await connect(environmentService.sharedIPCHandle, 'main');
-					const diagnosticsChannel = sharedProcessClient.getChannel('diagnostics');
-					const diagnosticsService = createChannelSender<IDiagnosticsService>(diagnosticsChannel);
+					const diagnosticsService = new DiagnosticsService(NullTelemetryService);
 					const mainProcessInfo = await launchService.getMainProcessInfo();
 					const remoteDiagnostics = await launchService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true });
 					const diagnostics = await diagnosticsService.getDiagnostics(mainProcessInfo, remoteDiagnostics);
@@ -343,11 +341,11 @@ class CodeMain {
 
 	private handleStartupDataDirError(environmentService: IEnvironmentMainService, error: NodeJS.ErrnoException): void {
 		if (error.code === 'EACCES' || error.code === 'EPERM') {
-			const directories = coalesce([environmentService.userDataPath, environmentService.extensionsPath, XDG_RUNTIME_DIR]);
+			const directories = coalesce([environmentService.userDataPath, environmentService.extensionsPath, XDG_RUNTIME_DIR]).map(folder => getPathLabel(folder, environmentService));
 
 			this.showStartupWarningDialog(
 				localize('startupDataDirError', "Unable to write program user data."),
-				localize('startupUserDataAndExtensionsDirErrorDetail', "Please make sure the following directories are writeable:\n\n{0}", directories.join('\n'))
+				localize('startupUserDataAndExtensionsDirErrorDetail', "{0}\n\nPlease make sure the following directories are writeable:\n\n{1}", toErrorMessage(error), directories.join('\n'))
 			);
 		}
 	}
diff --git a/src/vs/code/electron-main/protocol.ts b/src/vs/code/electron-main/protocol.ts
index 36d093199..5bfbebb68 100644
--- a/src/vs/code/electron-main/protocol.ts
+++ b/src/vs/code/electron-main/protocol.ts
@@ -11,7 +11,7 @@ import { INativeEnvironmentService } from 'vs/platform/environment/common/enviro
 import { session } from 'electron';
 import { ILogService } from 'vs/platform/log/common/log';
 import { TernarySearchTree } from 'vs/base/common/map';
-import { isLinux } from 'vs/base/common/platform';
+import { isLinux, isPreferringBrowserCodeLoad } from 'vs/base/common/platform';
 import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
 
 type ProtocolCallback = { (result: string | Electron.FilePathWithHeaders | { error: number }): void };
@@ -37,15 +37,17 @@ export class FileProtocolHandler extends Disposable {
 		// Register vscode-file:// handler
 		defaultSession.protocol.registerFileProtocol(Schemas.vscodeFileResource, (request, callback) => this.handleResourceRequest(request, callback as unknown as ProtocolCallback));
 
-		// Block any file:// access (sandbox only)
-		if (environmentService.args.__sandbox) {
+		// Block any file:// access (explicitly enabled only)
+		if (isPreferringBrowserCodeLoad) {
+			this.logService.info(`Intercepting ${Schemas.file}: protocol and blocking it`);
+
 			defaultSession.protocol.interceptFileProtocol(Schemas.file, (request, callback) => this.handleFileRequest(request, callback as unknown as ProtocolCallback));
 		}
 
 		// Cleanup
 		this._register(toDisposable(() => {
 			defaultSession.protocol.unregisterProtocol(Schemas.vscodeFileResource);
-			if (environmentService.args.__sandbox) {
+			if (isPreferringBrowserCodeLoad) {
 				defaultSession.protocol.uninterceptProtocol(Schemas.file);
 			}
 		}));
diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
index dd721db92..812a4dd1e 100644
--- a/src/vs/code/electron-main/sharedProcess.ts
+++ b/src/vs/code/electron-main/sharedProcess.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { memoize } from 'vs/base/common/decorators';
+import { BrowserWindow, ipcMain, Event, MessagePortMain } from 'electron';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { BrowserWindow, ipcMain, WebContents, Event as ElectronEvent } from 'electron';
-import { ISharedProcess } from 'vs/platform/ipc/electron-main/sharedProcessMainService';
 import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
 import { FileAccess } from 'vs/base/common/network';
+import { browserCodeLoadingCacheStrategy } from 'vs/base/common/platform';
+import { ISharedProcess, ISharedProcessConfiguration } from 'vs/platform/sharedProcess/node/sharedProcess';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { connect as connectMessagePort } from 'vs/base/parts/ipc/electron-main/ipc.mp';
+import { assertIsDefined } from 'vs/base/common/types';
 
-export class SharedProcess implements ISharedProcess {
+export class SharedProcess extends Disposable implements ISharedProcess {
 
-	private barrier = new Barrier();
+	private readonly whenSpawnedBarrier = new Barrier();
 
-	private window: BrowserWindow | null = null;
-
-	private readonly _whenReady: Promise<void>;
+	private window: BrowserWindow | undefined = undefined;
+	private windowCloseListener: ((event: Event) => void) | undefined = undefined;
 
 	constructor(
 		private readonly machineId: string,
@@ -31,17 +31,125 @@ export class SharedProcess implements ISharedProcess {
 		@ILogService private readonly logService: ILogService,
 		@IThemeMainService private readonly themeMainService: IThemeMainService
 	) {
-		// overall ready promise when shared process signals initialization is done
-		this._whenReady = new Promise<void>(c => ipcMain.once('vscode:shared-process->electron-main=init-done', () => c(undefined)));
+		super();
+
+		this.registerListeners();
 	}
 
-	@memoize
-	private get _whenIpcReady(): Promise<void> {
+	private registerListeners(): void {
+
+		// Lifecycle
+		this._register(this.lifecycleMainService.onWillShutdown(() => this.onWillShutdown()));
+
+		// Shared process connections from workbench windows
+		ipcMain.on('vscode:createSharedProcessMessageChannel', async (e, nonce: string) => {
+			this.logService.trace('SharedProcess: on vscode:createSharedProcessMessageChannel');
+
+			// await the shared process to be overall ready
+			// we do not just wait for IPC ready because the
+			// workbench window will communicate directly
+			await this.whenReady();
+
+			// connect to the shared process window
+			const port = await this.connect();
+
+			// Check back if the requesting window meanwhile closed
+			// Since shared process is delayed on startup there is
+			// a chance that the window close before the shared process
+			// was ready for a connection.
+			if (e.sender.isDestroyed()) {
+				return port.close();
+			}
+
+			// send the port back to the requesting window
+			e.sender.postMessage('vscode:createSharedProcessMessageChannelResult', nonce, [port]);
+		});
+	}
+
+	private onWillShutdown(): void {
+		const window = this.window;
+		if (!window) {
+			return; // possibly too early before created
+		}
+
+		// Signal exit to shared process when shutting down
+		if (!window.isDestroyed() && !window.webContents.isDestroyed()) {
+			window.webContents.send('vscode:electron-main->shared-process=exit');
+		}
+
+		// Shut the shared process down when we are quitting
+		//
+		// Note: because we veto the window close, we must first remove our veto.
+		// Otherwise the application would never quit because the shared process
+		// window is refusing to close!
+		//
+		if (this.windowCloseListener) {
+			window.removeListener('close', this.windowCloseListener);
+			this.windowCloseListener = undefined;
+		}
+
+		// Electron seems to crash on Windows without this setTimeout :|
+		setTimeout(() => {
+			try {
+				window.close();
+			} catch (err) {
+				// ignore, as electron is already shutting down
+			}
+
+			this.window = undefined;
+		}, 0);
+	}
+
+	private _whenReady: Promise<void> | undefined = undefined;
+	whenReady(): Promise<void> {
+		if (!this._whenReady) {
+			// Overall signal that the shared process window was loaded and
+			// all services within have been created.
+			this._whenReady = new Promise<void>(resolve => ipcMain.once('vscode:shared-process->electron-main=init-done', () => {
+				this.logService.trace('SharedProcess: Overall ready');
+
+				resolve();
+			}));
+		}
+
+		return this._whenReady;
+	}
+
+	private _whenIpcReady: Promise<void> | undefined = undefined;
+	private get whenIpcReady() {
+		if (!this._whenIpcReady) {
+			this._whenIpcReady = (async () => {
+
+				// Always wait for `spawn()`
+				await this.whenSpawnedBarrier.wait();
+
+				// Create window for shared process
+				this.createWindow();
+
+				// Listeners
+				this.registerWindowListeners();
+
+				// Wait for window indicating that IPC connections are accepted
+				await new Promise<void>(resolve => ipcMain.once('vscode:shared-process->electron-main=ipc-ready', () => {
+					this.logService.trace('SharedProcess: IPC ready');
+
+					resolve();
+				}));
+			})();
+		}
+
+		return this._whenIpcReady;
+	}
+
+	private createWindow(): void {
+
+		// shared process is a hidden window by default
 		this.window = new BrowserWindow({
 			show: false,
 			backgroundColor: this.themeMainService.getBackgroundColor(),
 			webPreferences: {
 				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
+				v8CacheOptions: browserCodeLoadingCacheStrategy,
 				nodeIntegration: true,
 				enableWebSQL: false,
 				enableRemoteModule: false,
@@ -52,118 +160,85 @@ export class SharedProcess implements ISharedProcess {
 				disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
 			}
 		});
-		const config = {
-			appRoot: this.environmentService.appRoot,
+
+		const config: ISharedProcessConfiguration = {
 			machineId: this.machineId,
+			windowId: this.window.id,
+			appRoot: this.environmentService.appRoot,
 			nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
+			backupWorkspacesPath: this.environmentService.backupWorkspacesPath,
 			userEnv: this.userEnv,
-			windowId: this.window.id
+			sharedIPCHandle: this.environmentService.sharedIPCHandle,
+			args: this.environmentService.args,
+			logLevel: this.logService.getLevel()
 		};
 
-		const windowUrl = (this.environmentService.sandbox ?
-			FileAccess._asCodeFileUri('vs/code/electron-browser/sharedProcess/sharedProcess.html', require) :
-			FileAccess.asBrowserUri('vs/code/electron-browser/sharedProcess/sharedProcess.html', require))
-			.with({ query: `config=${encodeURIComponent(JSON.stringify(config))}` });
-		this.window.loadURL(windowUrl.toString(true));
+		// Load with config
+		this.window.loadURL(FileAccess
+			.asBrowserUri('vs/code/electron-browser/sharedProcess/sharedProcess.html', require)
+			.with({ query: `config=${encodeURIComponent(JSON.stringify(config))}` })
+			.toString(true)
+		);
+	}
 
-		// Prevent the window from dying
-		const onClose = (e: ElectronEvent) => {
+	private registerWindowListeners(): void {
+		if (!this.window) {
+			return;
+		}
+
+		// Prevent the window from closing
+		this.windowCloseListener = (e: Event) => {
 			this.logService.trace('SharedProcess#close prevented');
 
 			// We never allow to close the shared process unless we get explicitly disposed()
 			e.preventDefault();
 
 			// Still hide the window though if visible
-			if (this.window && this.window.isVisible()) {
+			if (this.window?.isVisible()) {
 				this.window.hide();
 			}
 		};
 
-		this.window.on('close', onClose);
+		this.window.on('close', this.windowCloseListener);
 
-		const disposables = new DisposableStore();
-
-		this.lifecycleMainService.onWillShutdown(() => {
-			disposables.dispose();
-
-			// Shut the shared process down when we are quitting
-			//
-			// Note: because we veto the window close, we must first remove our veto.
-			// Otherwise the application would never quit because the shared process
-			// window is refusing to close!
-			//
-			if (this.window) {
-				this.window.removeListener('close', onClose);
-			}
-
-			// Electron seems to crash on Windows without this setTimeout :|
-			setTimeout(() => {
-				try {
-					if (this.window) {
-						this.window.close();
-					}
-				} catch (err) {
-					// ignore, as electron is already shutting down
-				}
-
-				this.window = null;
-			}, 0);
-		});
-
-		return new Promise<void>(c => {
-			// send payload once shared process is ready to receive it
-			disposables.add(Event.once(Event.fromNodeEventEmitter(ipcMain, 'vscode:shared-process->electron-main=ready-for-payload', ({ sender }: { sender: WebContents }) => sender))(sender => {
-				sender.send('vscode:electron-main->shared-process=payload', {
-					sharedIPCHandle: this.environmentService.sharedIPCHandle,
-					args: this.environmentService.args,
-					logLevel: this.logService.getLevel(),
-					backupWorkspacesPath: this.environmentService.backupWorkspacesPath,
-					nodeCachedDataDir: this.environmentService.nodeCachedDataDir
-				});
-
-				// signal exit to shared process when we get disposed
-				disposables.add(toDisposable(() => sender.send('vscode:electron-main->shared-process=exit')));
-
-				// complete IPC-ready promise when shared process signals this to us
-				ipcMain.once('vscode:shared-process->electron-main=ipc-ready', () => c(undefined));
-			}));
-		});
+		// Crashes & Unrsponsive & Failed to load
+		this.window.webContents.on('render-process-gone', (event, details) => this.logService.error(`SharedProcess: crashed (detail: ${details?.reason})`));
+		this.window.on('unresponsive', () => this.logService.error('SharedProcess: detected unresponsive window'));
+		this.window.webContents.on('did-fail-load', (event, errorCode, errorDescription) => this.logService.warn('SharedProcess: failed to load window, ', errorDescription));
 	}
 
 	spawn(userEnv: NodeJS.ProcessEnv): void {
 		this.userEnv = { ...this.userEnv, ...userEnv };
-		this.barrier.open();
+
+		// Release barrier
+		this.whenSpawnedBarrier.open();
 	}
 
-	async whenReady(): Promise<void> {
-		await this.barrier.wait();
-		await this._whenReady;
+	async connect(): Promise<MessagePortMain> {
+
+		// Wait for shared process being ready to accept connection
+		await this.whenIpcReady;
+
+		// Connect and return message port
+		const window = assertIsDefined(this.window);
+		return connectMessagePort(window);
 	}
 
-	async whenIpcReady(): Promise<void> {
-		await this.barrier.wait();
-		await this._whenIpcReady;
-	}
+	async toggle(): Promise<void> {
 
-	toggle(): void {
-		if (!this.window || this.window.isVisible()) {
-			this.hide();
-		} else {
-			this.show();
+		// wait for window to be created
+		await this.whenIpcReady;
+
+		if (!this.window) {
+			return; // possibly disposed already
 		}
-	}
 
-	show(): void {
-		if (this.window) {
+		if (this.window.isVisible()) {
+			this.window.webContents.closeDevTools();
+			this.window.hide();
+		} else {
 			this.window.show();
 			this.window.webContents.openDevTools();
 		}
 	}
-
-	hide(): void {
-		if (this.window) {
-			this.window.webContents.closeDevTools();
-			this.window.hide();
-		}
-	}
 }
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index a9f47be81..6ce9e1dc8 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as nls from 'vs/nls';
-import * as perf from 'vs/base/common/performance';
+import { release } from 'os';
+import { join } from 'vs/base/common/path';
+import { localize } from 'vs/nls';
+import { getMarks, mark } from 'vs/base/common/performance';
 import { Emitter } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
-import { screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage, Rectangle, Display, TouchBarSegmentedControl, NativeImage, BrowserWindowConstructorOptions, SegmentedControlSegment, nativeTheme, Event, Details } from 'electron';
+import { screen, BrowserWindow, systemPreferences, app, TouchBar, nativeImage, Rectangle, Display, TouchBarSegmentedControl, NativeImage, BrowserWindowConstructorOptions, SegmentedControlSegment, nativeTheme, Event, RenderProcessGoneDetails } from 'electron';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -18,17 +18,17 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import product from 'vs/platform/product/common/product';
 import { WindowMinimumSize, IWindowSettings, MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, zoomLevelToZoomFactor, INativeWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { browserCodeLoadingCacheStrategy, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { ICodeWindow, IWindowState, WindowMode } from 'vs/platform/windows/electron-main/windows';
-import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
@@ -102,32 +102,32 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 	private hiddenTitleBarStyle: boolean | undefined;
 	private showTimeoutHandle: NodeJS.Timeout | undefined;
-	private _lastFocusTime: number;
-	private _readyState: ReadyState;
+	private _lastFocusTime = -1;
+	private _readyState = ReadyState.NONE;
 	private windowState: IWindowState;
 	private currentMenuBarVisibility: MenuBarVisibility | undefined;
 
 	private representedFilename: string | undefined;
 	private documentEdited: boolean | undefined;
 
-	private readonly whenReadyCallbacks: { (window: ICodeWindow): void }[];
+	private readonly whenReadyCallbacks: { (window: ICodeWindow): void }[] = [];
 
 	private marketplaceHeadersPromise: Promise<object>;
 
-	private readonly touchBarGroups: TouchBarSegmentedControl[];
+	private readonly touchBarGroups: TouchBarSegmentedControl[] = [];
 
-	private currentHttpProxy?: string;
-	private currentNoProxy?: string;
+	private currentHttpProxy: string | undefined = undefined;
+	private currentNoProxy: string | undefined = undefined;
 
 	constructor(
 		config: IWindowCreationOptions,
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentMainService private readonly environmentService: IEnvironmentMainService,
 		@IFileService private readonly fileService: IFileService,
-		@IStorageMainService private readonly storageService: IStorageMainService,
+		@IStorageMainService storageService: IStorageMainService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IThemeMainService private readonly themeMainService: IThemeMainService,
-		@IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService,
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@IBackupMainService private readonly backupMainService: IBackupMainService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
@@ -135,11 +135,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	) {
 		super();
 
-		this.touchBarGroups = [];
-		this._lastFocusTime = -1;
-		this._readyState = ReadyState.NONE;
-		this.whenReadyCallbacks = [];
-
 		//#region create browser window
 		{
 			// Load window state
@@ -164,6 +159,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				title: product.nameLong,
 				webPreferences: {
 					preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
+					v8CacheOptions: browserCodeLoadingCacheStrategy,
 					enableWebSQL: false,
 					enableRemoteModule: false,
 					spellcheck: false,
@@ -185,13 +181,17 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				}
 			};
 
+			if (browserCodeLoadingCacheStrategy) {
+				this.logService.info(`window#ctor: using vscode-file protocol and V8 cache options: ${browserCodeLoadingCacheStrategy}`);
+			}
+
 			// Apply icon to window
 			// Linux: always
 			// Windows: only when running out of sources, otherwise an icon is set by us on the executable
 			if (isLinux) {
-				options.icon = path.join(this.environmentService.appRoot, 'resources/linux/code.png');
+				options.icon = join(this.environmentService.appRoot, 'resources/linux/code.png');
 			} else if (isWindows && !this.environmentService.isBuilt) {
-				options.icon = path.join(this.environmentService.appRoot, 'resources/win32/code_150x150.png');
+				options.icon = join(this.environmentService.appRoot, 'resources/win32/code_150x150.png');
 			}
 
 			if (isMacintosh && !this.useNativeFullScreen()) {
@@ -233,7 +233,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				this._win.setSheetOffset(22); // offset dialogs by the height of the custom title bar if we have any
 			}
 
-			// TODO@Ben (Electron 4 regression): when running on multiple displays where the target display
+			// TODO@bpasero (Electron 4 regression): when running on multiple displays where the target display
 			// to open the window has a larger resolution than the primary display, the window will not size
 			// correctly unless we set the bounds again (https://github.com/microsoft/vscode/issues/74872)
 			//
@@ -275,10 +275,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		this.createTouchBar();
 
 		// Request handling
-		const that = this;
 		this.marketplaceHeadersPromise = resolveMarketplaceHeaders(product.version, this.environmentService, this.fileService, {
-			get(key) { return that.storageService.get(key); },
-			store(key, value) { that.storageService.store(key, value); }
+			get(key) { return storageService.get(key); },
+			store(key, value) { storageService.store(key, value); }
 		});
 
 		// Eventing
@@ -361,13 +360,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 	get lastFocusTime(): number { return this._lastFocusTime; }
 
-	get backupPath(): string | undefined { return this.currentConfig ? this.currentConfig.backupPath : undefined; }
+	get backupPath(): string | undefined { return this.currentConfig?.backupPath; }
 
-	get openedWorkspace(): IWorkspaceIdentifier | undefined { return this.currentConfig ? this.currentConfig.workspace : undefined; }
+	get openedWorkspace(): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined { return this.currentConfig?.workspace; }
 
-	get openedFolderUri(): URI | undefined { return this.currentConfig ? this.currentConfig.folderUri : undefined; }
-
-	get remoteAuthority(): string | undefined { return this.currentConfig ? this.currentConfig.remoteAuthority : undefined; }
+	get remoteAuthority(): string | undefined { return this.currentConfig?.remoteAuthority; }
 
 	setReady(): void {
 		this._readyState = ReadyState.READY;
@@ -413,9 +410,10 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 	private registerListeners(): void {
 
-		// Crashes & Unrsponsive
+		// Crashes & Unrsponsive & Failed to load
 		this._win.webContents.on('render-process-gone', (event, details) => this.onWindowError(WindowError.CRASHED, details));
 		this._win.on('unresponsive', () => this.onWindowError(WindowError.UNRESPONSIVE));
+		this._win.webContents.on('did-fail-load', (event, errorCode, errorDescription) => this.logService.warn('Main: failed to load workbench window, ', errorDescription));
 
 		// Window close
 		this._win.on('closed', () => {
@@ -424,24 +422,42 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			this.dispose();
 		});
 
-		// Prevent loading of svgs
-		this._win.webContents.session.webRequest.onBeforeRequest(null!, (details, callback) => {
-			if (details.url.indexOf('.svg') > 0) {
-				const uri = URI.parse(details.url);
-				if (uri && !uri.scheme.match(/file/i) && uri.path.endsWith('.svg')) {
+		const svgFileSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, Schemas.vscodeRemoteResource, 'devtools']);
+		this._win.webContents.session.webRequest.onBeforeRequest((details, callback) => {
+			const uri = URI.parse(details.url);
+			// Prevent loading of remote svgs
+			if (uri && uri.path.endsWith('.svg')) {
+				const safeScheme = svgFileSchemes.has(uri.scheme) ||
+					uri.path.includes(Schemas.vscodeRemoteResource);
+				if (!safeScheme) {
 					return callback({ cancel: true });
 				}
 			}
 
-			return callback({});
+			return callback({ cancel: false });
 		});
 
-		this._win.webContents.session.webRequest.onHeadersReceived(null!, (details, callback) => {
+		this._win.webContents.session.webRequest.onHeadersReceived((details, callback) => {
 			const responseHeaders = details.responseHeaders as Record<string, (string) | (string[])>;
-
 			const contentType = (responseHeaders['content-type'] || responseHeaders['Content-Type']);
-			if (contentType && Array.isArray(contentType) && contentType.some(x => x.toLowerCase().indexOf('image/svg') >= 0)) {
-				return callback({ cancel: true });
+
+			if (contentType && Array.isArray(contentType)) {
+				const uri = URI.parse(details.url);
+				// https://github.com/microsoft/vscode/issues/97564
+				// ensure local svg files have Content-Type image/svg+xml
+				if (uri && uri.path.endsWith('.svg')) {
+					if (svgFileSchemes.has(uri.scheme)) {
+						responseHeaders['Content-Type'] = ['image/svg+xml'];
+						return callback({ cancel: false, responseHeaders });
+					}
+				}
+
+				// remote extension schemes have the following format
+				// http://127.0.0.1:<port>/vscode-remote-resource?path=
+				if (!uri.path.includes(Schemas.vscodeRemoteResource) &&
+					contentType.some(x => x.toLowerCase().includes('image/svg'))) {
+					return callback({ cancel: true });
+				}
 			}
 
 			return callback({ cancel: false });
@@ -526,16 +542,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			this.sendWhenReady('vscode:leaveFullScreen', CancellationToken.None);
 		});
 
-		// Window Failed to load
-		this._win.webContents.on('did-fail-load', (event: Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
-			this.logService.warn('[electron event]: fail to load, ', errorDescription);
-		});
-
 		// Handle configuration changes
 		this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated()));
 
 		// Handle Workspace events
-		this._register(this.workspacesMainService.onUntitledWorkspaceDeleted(e => this.onUntitledWorkspaceDeleted(e)));
+		this._register(this.workspacesManagementMainService.onUntitledWorkspaceDeleted(e => this.onUntitledWorkspaceDeleted(e)));
 
 		// Inject headers when requests are incoming
 		const urls = ['https://marketplace.visualstudio.com/*', 'https://*.vsassets.io/*'];
@@ -544,9 +555,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	}
 
 	private onWindowError(error: WindowError.UNRESPONSIVE): void;
-	private onWindowError(error: WindowError.CRASHED, details: Details): void;
-	private onWindowError(error: WindowError, details?: Details): void {
-		this.logService.error(error === WindowError.CRASHED ? `[VS Code]: renderer process crashed (detail: ${details?.reason})` : '[VS Code]: detected unresponsive');
+	private onWindowError(error: WindowError.CRASHED, details: RenderProcessGoneDetails): void;
+	private onWindowError(error: WindowError, details?: RenderProcessGoneDetails): void {
+		this.logService.error(error === WindowError.CRASHED ? `Main: renderer process crashed (detail: ${details?.reason})` : 'Main: detected unresponsive');
 
 		// If we run extension tests from CLI, showing a dialog is not
 		// very helpful in this case. Rather, we bring down the test run
@@ -568,7 +579,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		// Unresponsive
 		if (error === WindowError.UNRESPONSIVE) {
 			if (this.isExtensionDevelopmentHost || this.isExtensionTestHost || (this._win && this._win.webContents && this._win.webContents.isDevToolsOpened())) {
-				// TODO@Ben Workaround for https://github.com/microsoft/vscode/issues/56994
+				// TODO@bpasero Workaround for https://github.com/microsoft/vscode/issues/56994
 				// In certain cases the window can report unresponsiveness because a breakpoint was hit
 				// and the process is stopped executing. The most typical cases are:
 				// - devtools are opened and debugging happens
@@ -581,9 +592,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			this.dialogMainService.showMessageBox({
 				title: product.nameLong,
 				type: 'warning',
-				buttons: [mnemonicButtonLabel(nls.localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")), mnemonicButtonLabel(nls.localize({ key: 'wait', comment: ['&& denotes a mnemonic'] }, "&&Keep Waiting")), mnemonicButtonLabel(nls.localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))],
-				message: nls.localize('appStalled', "The window is no longer responding"),
-				detail: nls.localize('appStalledDetail', "You can reopen or close the window or keep waiting."),
+				buttons: [mnemonicButtonLabel(localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")), mnemonicButtonLabel(localize({ key: 'wait', comment: ['&& denotes a mnemonic'] }, "&&Keep Waiting")), mnemonicButtonLabel(localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))],
+				message: localize('appStalled', "The window is no longer responding"),
+				detail: localize('appStalledDetail', "You can reopen or close the window or keep waiting."),
 				noLink: true
 			}, this._win).then(result => {
 				if (!this._win) {
@@ -591,6 +602,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				}
 
 				if (result.response === 0) {
+					this._win.webContents.forcefullyCrashRenderer(); // Calling reload() immediately after calling this method will force the reload to occur in a new process
 					this.reload();
 				} else if (result.response === 2) {
 					this.destroyWindow();
@@ -602,17 +614,17 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		else {
 			let message: string;
 			if (details && details.reason !== 'crashed') {
-				message = nls.localize('appCrashedDetails', "The window has crashed (reason: '{0}')", details?.reason);
+				message = localize('appCrashedDetails', "The window has crashed (reason: '{0}')", details?.reason);
 			} else {
-				message = nls.localize('appCrashed', "The window has crashed", details?.reason);
+				message = localize('appCrashed', "The window has crashed", details?.reason);
 			}
 
 			this.dialogMainService.showMessageBox({
 				title: product.nameLong,
 				type: 'warning',
-				buttons: [mnemonicButtonLabel(nls.localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")), mnemonicButtonLabel(nls.localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))],
+				buttons: [mnemonicButtonLabel(localize({ key: 'reopen', comment: ['&& denotes a mnemonic'] }, "&&Reopen")), mnemonicButtonLabel(localize({ key: 'close', comment: ['&& denotes a mnemonic'] }, "&&Close"))],
 				message,
-				detail: nls.localize('appCrashedDetail', "We are sorry for the inconvenience! You can reopen the window to continue where you left off."),
+				detail: localize('appCrashedDetail', "We are sorry for the inconvenience! You can reopen the window to continue where you left off."),
 				noLink: true
 			}, this._win).then(result => {
 				if (!this._win) {
@@ -643,31 +655,32 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	}
 
 	private onConfigurationUpdated(): void {
+
+		// Menubar
 		const newMenuBarVisibility = this.getMenuBarVisibility();
 		if (newMenuBarVisibility !== this.currentMenuBarVisibility) {
 			this.currentMenuBarVisibility = newMenuBarVisibility;
 			this.setMenuBarVisibility(newMenuBarVisibility);
 		}
-		// Do not set to empty configuration at startup if setting is empty to not override configuration through CLI options:
-		const env = process.env;
+
+		// Proxy
 		let newHttpProxy = (this.configurationService.getValue<string>('http.proxy') || '').trim()
-			|| (env.https_proxy || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.HTTP_PROXY || '').trim() // Not standardized.
+			|| (process.env['https_proxy'] || process.env['HTTPS_PROXY'] || process.env['http_proxy'] || process.env['HTTP_PROXY'] || '').trim() // Not standardized.
 			|| undefined;
+
 		if (newHttpProxy?.endsWith('/')) {
 			newHttpProxy = newHttpProxy.substr(0, newHttpProxy.length - 1);
 		}
-		const newNoProxy = (env.no_proxy || env.NO_PROXY || '').trim() || undefined; // Not standardized.
+
+		const newNoProxy = (process.env['no_proxy'] || process.env['NO_PROXY'] || '').trim() || undefined; // Not standardized.
 		if ((newHttpProxy || '').indexOf('@') === -1 && (newHttpProxy !== this.currentHttpProxy || newNoProxy !== this.currentNoProxy)) {
 			this.currentHttpProxy = newHttpProxy;
 			this.currentNoProxy = newNoProxy;
+
 			const proxyRules = newHttpProxy || '';
 			const proxyBypassRules = newNoProxy ? `${newNoProxy},<local>` : '<local>';
 			this.logService.trace(`Setting proxy to '${proxyRules}', bypassing '${proxyBypassRules}'`);
-			this._win.webContents.session.setProxy({
-				proxyRules,
-				proxyBypassRules,
-				pacScript: '',
-			});
+			this._win.webContents.session.setProxy({ proxyRules, proxyBypassRules, pacScript: '' });
 		}
 	}
 
@@ -677,7 +690,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		}
 	}
 
-	load(config: INativeWindowConfiguration, isReload?: boolean, disableExtensions?: boolean): void {
+	load(config: INativeWindowConfiguration, { isReload, disableExtensions }: { isReload?: boolean, disableExtensions?: boolean } = Object.create(null)): void {
 
 		// If this window was loaded before from the command line
 		// (as indicated by VSCODE_CLI environment), make sure to
@@ -689,6 +702,15 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			config.userEnv = { ...currentUserEnv, ...config.userEnv }; // still allow to override certain environment as passed in
 		}
 
+		// If named pipe was instantiated for the crashpad_handler process, reuse the same
+		// pipe for new app instances connecting to the original app instance.
+		// Ref: https://github.com/microsoft/vscode/issues/115874
+		if (process.env['CHROME_CRASHPAD_PIPE_NAME']) {
+			Object.assign(config.userEnv, {
+				CHROME_CRASHPAD_PIPE_NAME: process.env['CHROME_CRASHPAD_PIPE_NAME']
+			});
+		}
+
 		// If this is the first time the window is loaded, we associate the paths
 		// directly with the window because we assume the loading will just work
 		if (this._readyState === ReadyState.NONE) {
@@ -728,7 +750,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		}
 
 		// Load URL
-		perf.mark('main:loadWindow');
+		mark('code/willOpenNewWindow');
 		this._win.loadURL(this.getUrl(configuration));
 
 		// Make window visible if it did not open in N seconds because this indicates an error
@@ -747,11 +769,14 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		this._onLoad.fire();
 	}
 
-	reload(cli?: NativeParsedArgs): void {
+	async reload(cli?: NativeParsedArgs): Promise<void> {
 
 		// Copy our current config for reuse
 		const configuration = Object.assign({}, this.currentConfig);
 
+		// Validate workspace
+		configuration.workspace = await this.validateWorkspace(configuration);
+
 		// Delete some properties we do not want during reload
 		delete configuration.filesToOpenOrCreate;
 		delete configuration.filesToDiff;
@@ -761,17 +786,44 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		// in extension development mode. These options are all development related.
 		if (this.isExtensionDevelopmentHost && cli) {
 			configuration.verbose = cli.verbose;
+			configuration.debugId = cli.debugId;
 			configuration['inspect-extensions'] = cli['inspect-extensions'];
 			configuration['inspect-brk-extensions'] = cli['inspect-brk-extensions'];
-			configuration.debugId = cli.debugId;
 			configuration['extensions-dir'] = cli['extensions-dir'];
 		}
 
 		configuration.isInitialStartup = false; // since this is a reload
 
 		// Load config
-		const disableExtensions = cli ? cli['disable-extensions'] : undefined;
-		this.load(configuration, true, disableExtensions);
+		this.load(configuration, { isReload: true, disableExtensions: cli?.['disable-extensions'] });
+	}
+
+	private async validateWorkspace(configuration: INativeWindowConfiguration): Promise<IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined> {
+
+		// Multi folder
+		if (isWorkspaceIdentifier(configuration.workspace)) {
+			const configPath = configuration.workspace.configPath;
+			if (configPath.scheme === Schemas.file) {
+				const workspaceExists = await this.fileService.exists(configPath);
+				if (!workspaceExists) {
+					return undefined;
+				}
+			}
+		}
+
+		// Single folder
+		else if (isSingleFolderWorkspaceIdentifier(configuration.workspace)) {
+			const uri = configuration.workspace.uri;
+			if (uri.scheme === Schemas.file) {
+				const folderExists = await this.fileService.exists(uri);
+				if (!folderExists) {
+					return undefined;
+				}
+			}
+		}
+
+		// Workspace is valid
+		return configuration.workspace;
 	}
 
 	private getUrl(windowConfiguration: INativeWindowConfiguration): string {
@@ -780,6 +832,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		windowConfiguration.windowId = this._win.id;
 		windowConfiguration.sessionId = `window:${this._win.id}`;
 		windowConfiguration.logLevel = this.logService.getLevel();
+		windowConfiguration.logsPath = this.environmentService.logsPath;
 
 		// Set zoomlevel
 		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
@@ -803,14 +856,14 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		windowConfiguration.maximized = this._win.isMaximized();
 
 		// Dump Perf Counters
-		windowConfiguration.perfEntries = perf.exportEntries();
+		windowConfiguration.perfMarks = getMarks();
 
 		// Parts splash
-		windowConfiguration.partsSplashPath = path.join(this.environmentService.userDataPath, 'rapid_render.json');
+		windowConfiguration.partsSplashPath = join(this.environmentService.userDataPath, 'rapid_render.json');
 
 		// OS Info
 		windowConfiguration.os = {
-			release: os.release()
+			release: release()
 		};
 
 		// Config (combination of process.argv and window configuration)
@@ -848,10 +901,10 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			workbench = 'vs/code/electron-browser/workbench/workbench.html';
 		}
 
-		return (this.environmentService.sandbox ?
-			FileAccess._asCodeFileUri(workbench, require) :
-			FileAccess.asBrowserUri(workbench, require))
-			.with({ query: `config=${encodeURIComponent(JSON.stringify(config))}` }).toString(true);
+		return FileAccess
+			.asBrowserUri(workbench, require)
+			.with({ query: `config=${encodeURIComponent(JSON.stringify(config))}` })
+			.toString(true);
 	}
 
 	serializeWindowState(): IWindowState {
@@ -1161,7 +1214,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 		if (visibility === 'toggle') {
 			if (notify) {
-				this.send('vscode:showInfoMessage', nls.localize('hiddenMenuBar', "You can still access the menu bar by pressing the Alt-key."));
+				this.send('vscode:showInfoMessage', localize('hiddenMenuBar', "You can still access the menu bar by pressing the Alt-key."));
 			}
 		}
 
@@ -1256,6 +1309,11 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 
 	send(channel: string, ...args: any[]): void {
 		if (this._win) {
+			if (this._win.isDestroyed() || this._win.webContents.isDestroyed()) {
+				this.logService.warn(`Sending IPC message to channel ${channel} for window that is destroyed`);
+				return;
+			}
+
 			this._win.webContents.send(channel, ...args);
 		}
 	}
diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
index 252260a57..6d339e858 100644
--- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
@@ -7,11 +7,10 @@ import 'vs/css!./media/issueReporter';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
-import { ipcRenderer, process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { applyZoom, zoomIn, zoomOut } from 'vs/platform/windows/electron-sandbox/window';
 import { $, reset, safeInnerHtml, windowOpenNoOpener } from 'vs/base/browser/dom';
 import { Button } from 'vs/base/browser/ui/button/button';
-import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel';
 import * as collections from 'vs/base/common/collections';
 import { debounce } from 'vs/base/common/decorators';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -23,9 +22,11 @@ import BaseHtml from 'vs/code/electron-sandbox/issue/issueReporterPage';
 import { localize } from 'vs/nls';
 import { isRemoteDiagnosticError, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
+import { IMainProcessService, ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { IssueReporterData, IssueReporterExtensionData, IssueReporterFeatures, IssueReporterStyles, IssueType } from 'vs/platform/issue/common/issue';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
+import { Codicon } from 'vs/base/common/codicons';
+import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
 const MAX_URL_LENGTH = 2045;
 
@@ -82,14 +83,12 @@ export class IssueReporter extends Disposable {
 
 		this.initServices(configuration);
 
-		const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION;
-
 		const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id === configuration.data.extensionId) : undefined;
 		this.issueReporterModel = new IssueReporterModel({
 			issueType: configuration.data.issueType || IssueType.Bug,
 			versionInfo: {
 				vscodeVersion: `${configuration.product.nameShort} ${configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
-				os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${isSnap ? ' snap' : ''}`
+				os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${platform.isLinuxSnap ? ' snap' : ''}`
 			},
 			extensionsDisabled: !!configuration.disableExtensions,
 			fileOnExtension: configuration.data.extensionId ? !targetExtension?.isBuiltin : undefined,
@@ -267,7 +266,7 @@ export class IssueReporter extends Disposable {
 
 	private initServices(configuration: IssueReporterConfiguration): void {
 		const serviceCollection = new ServiceCollection();
-		const mainProcessService = new MainProcessService(configuration.windowId);
+		const mainProcessService = new ElectronIPCMainProcessService(configuration.windowId);
 		serviceCollection.set(IMainProcessService, mainProcessService);
 
 		this.nativeHostService = new NativeHostService(configuration.windowId, mainProcessService) as INativeHostService;
@@ -442,7 +441,11 @@ export class IssueReporter extends Disposable {
 
 	private updatePreviewButtonState() {
 		if (this.isPreviewEnabled()) {
-			this.previewButton.label = localize('previewOnGitHub', "Preview on GitHub");
+			if (this.configuration.data.githubAccessToken) {
+				this.previewButton.label = localize('createOnGitHub', "Create on GitHub");
+			} else {
+				this.previewButton.label = localize('previewOnGitHub', "Preview on GitHub");
+			}
 			this.previewButton.enabled = true;
 		} else {
 			this.previewButton.enabled = false;
@@ -598,8 +601,7 @@ export class IssueReporter extends Disposable {
 					issueState = $('span.issue-state');
 
 					const issueIcon = $('span.issue-icon');
-					const codicon = new CodiconLabel(issueIcon);
-					codicon.text = issue.state === 'open' ? '$(issue-opened)' : '$(issue-closed)';
+					issueIcon.appendChild(renderIcon(issue.state === 'open' ? Codicon.issueOpened : Codicon.issueClosed));
 
 					const issueStateLabel = $('span.issue-state.label');
 					issueStateLabel.textContent = issue.state === 'open' ? localize('open', "Open") : localize('closed', "Closed");
@@ -778,6 +780,35 @@ export class IssueReporter extends Disposable {
 		return isValid;
 	}
 
+	private async submitToGitHub(issueTitle: string, issueBody: string, gitHubDetails: { owner: string, repositoryName: string }): Promise<boolean> {
+		const url = `https://api.github.com/repos/${gitHubDetails.owner}/${gitHubDetails.repositoryName}/issues`;
+		const init = {
+			method: 'POST',
+			body: JSON.stringify({
+				title: issueTitle,
+				body: issueBody
+			}),
+			headers: new Headers({
+				'Content-Type': 'application/json',
+				'Authorization': `Bearer ${this.configuration.data.githubAccessToken}`
+			})
+		};
+
+		return new Promise((resolve, reject) => {
+			window.fetch(url, init).then((response) => {
+				if (response.ok) {
+					response.json().then(result => {
+						ipcRenderer.send('vscode:openExternal', result.html_url);
+						ipcRenderer.send('vscode:closeIssueReporter');
+						resolve(true);
+					});
+				} else {
+					resolve(false);
+				}
+			});
+		});
+	}
+
 	private async createIssue(): Promise<boolean> {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
@@ -810,8 +841,16 @@ export class IssueReporter extends Disposable {
 
 		this.hasBeenSubmitted = true;
 
-		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value);
+		const issueTitle = (<HTMLInputElement>this.getElementById('issue-title')).value;
 		const issueBody = this.issueReporterModel.serialize();
+
+		const issueUrl = this.issueReporterModel.fileOnExtension() ? this.getExtensionGitHubUrl() : this.configuration.product.reportIssueUrl!;
+		const gitHubDetails = this.parseGitHubUrl(issueUrl);
+		if (this.configuration.data.githubAccessToken && gitHubDetails) {
+			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
+		}
+
+		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
 
 		if (url.length > MAX_URL_LENGTH) {
@@ -841,6 +880,20 @@ export class IssueReporter extends Disposable {
 		});
 	}
 
+	private parseGitHubUrl(url: string): undefined | { repositoryName: string, owner: string } {
+		// Assumes a GitHub url to a particular repo, https://github.com/repositoryName/owner.
+		// Repository name and owner cannot contain '/'
+		const match = /^https?:\/\/github\.com\/([^\/]*)\/([^\/]*).*/.exec(url);
+		if (match && match.length) {
+			return {
+				owner: match[1],
+				repositoryName: match[2]
+			};
+		}
+
+		return undefined;
+	}
+
 	private getExtensionGitHubUrl(): string {
 		let repositoryUrl = '';
 		const bugsUrl = this.getExtensionBugsUrl();
diff --git a/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css b/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css
index add9cdae2..095663c05 100644
--- a/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css
+++ b/src/vs/code/electron-sandbox/processExplorer/media/processExplorer.css
@@ -49,28 +49,12 @@ body {
 	width: 90px;
 }
 
-.process-item {
-	line-height: 22px;
+.monaco-list-row:first-of-type {
+	border-bottom: 1px solid;
 }
 
-table {
-	border-collapse: collapse;
-	width: 100%;
-	table-layout: fixed;
-}
-
-th[scope='col'] {
-	vertical-align: bottom;
-	border-bottom: 1px solid #cccccc;
-	padding: .5rem;
-	border-top: 1px solid #cccccc;
-	cursor: default;
-}
-
-td {
-	padding: .25rem;
-	vertical-align: top;
-	cursor: default;
+.row {
+	display: flex;
 }
 
 .centered {
@@ -79,6 +63,9 @@ td {
 
 .nameLabel{
 	text-align: left;
+	width: calc(100% - 185px);
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .data {
@@ -93,15 +80,3 @@ td {
 	padding-left: 20px;
 	white-space: nowrap;
 }
-
-tbody > tr:hover {
-	background-color: #2A2D2E;
-}
-
-.hidden {
-	display: none;
-}
-
-.header {
-	display: flex;
-}
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
index 517805abd..73d89eac3 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html
@@ -6,7 +6,7 @@
 		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
 	</head>
 	<body aria-label="">
-		<table id="process-list"></table>
+		<div id="process-list"></div>
 	</body>
 
 	<!-- Init Bootstrap Helpers -->
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
index ef93a1c52..e4e7be122 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -14,38 +14,226 @@ import { applyZoom, zoomIn, zoomOut } from 'vs/platform/windows/electron-sandbox
 import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
 import { ProcessItem } from 'vs/base/common/processes';
-import { addDisposableListener, $ } from 'vs/base/browser/dom';
+import * as dom from 'vs/base/browser/dom';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
-import { MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel';
+import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { ByteSize } from 'vs/platform/files/common/files';
+import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
+import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
 
 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
 
-interface FormattedProcessItem {
-	cpu: number;
-	memory: number;
-	pid: string;
+class ProcessListDelegate implements IListVirtualDelegate<MachineProcessInformation | ProcessItem | IRemoteDiagnosticError> {
+	getHeight(element: MachineProcessInformation | ProcessItem | IRemoteDiagnosticError) {
+		return 22;
+	}
+
+	getTemplateId(element: ProcessInformation | MachineProcessInformation | ProcessItem | IRemoteDiagnosticError) {
+		if (isProcessItem(element)) {
+			return 'process';
+		}
+
+		if (isMachineProcessInformation(element)) {
+			return 'machine';
+		}
+
+		if (isRemoteDiagnosticError(element)) {
+			return 'error';
+		}
+
+		if (isProcessInformation(element)) {
+			return 'header';
+		}
+
+		return '';
+	}
+}
+
+interface IProcessItemTemplateData extends IProcessRowTemplateData {
+	CPU: HTMLElement;
+	memory: HTMLElement;
+	PID: HTMLElement;
+}
+
+interface IProcessRowTemplateData {
+	name: HTMLElement;
+}
+
+class ProcessTreeDataSource implements IDataSource<ProcessTree, ProcessInformation | MachineProcessInformation | ProcessItem | IRemoteDiagnosticError>  {
+	hasChildren(element: ProcessTree | ProcessInformation | MachineProcessInformation | ProcessItem | IRemoteDiagnosticError): boolean {
+		if (isRemoteDiagnosticError(element)) {
+			return false;
+		}
+
+		if (isProcessItem(element)) {
+			return !!element.children?.length;
+		} else {
+			return true;
+		}
+	}
+
+	getChildren(element: ProcessTree | ProcessInformation | MachineProcessInformation | ProcessItem | IRemoteDiagnosticError) {
+		if (isProcessItem(element)) {
+			return element.children ? element.children : [];
+		}
+
+		if (isRemoteDiagnosticError(element)) {
+			return [];
+		}
+
+		if (isProcessInformation(element)) {
+			// If there are multiple process roots, return these, otherwise go directly to the root process
+			if (element.processRoots.length > 1) {
+				return element.processRoots;
+			} else {
+				return [element.processRoots[0].rootProcess];
+			}
+		}
+
+		if (isMachineProcessInformation(element)) {
+			return [element.rootProcess];
+		}
+
+		return [element.processes];
+	}
+}
+
+class ProcessHeaderTreeRenderer implements ITreeRenderer<ProcessInformation, void, IProcessItemTemplateData> {
+	templateId: string = 'header';
+	renderTemplate(container: HTMLElement): IProcessItemTemplateData {
+		const data = Object.create(null);
+		const row = dom.append(container, dom.$('.row'));
+		data.name = dom.append(row, dom.$('.nameLabel'));
+		data.CPU = dom.append(row, dom.$('.cpu'));
+		data.memory = dom.append(row, dom.$('.memory'));
+		data.PID = dom.append(row, dom.$('.pid'));
+		return data;
+	}
+	renderElement(node: ITreeNode<ProcessInformation, void>, index: number, templateData: IProcessItemTemplateData, height: number | undefined): void {
+		templateData.name.textContent = localize('name', "Process Name");
+		templateData.CPU.textContent = localize('cpu', "CPU %");
+		templateData.PID.textContent = localize('pid', "PID");
+		templateData.memory.textContent = localize('memory', "Memory (MB)");
+
+	}
+	disposeTemplate(templateData: any): void {
+		// Nothing to do
+	}
+}
+
+class MachineRenderer implements ITreeRenderer<MachineProcessInformation, void, IProcessRowTemplateData> {
+	templateId: string = 'machine';
+	renderTemplate(container: HTMLElement): IProcessRowTemplateData {
+		const data = Object.create(null);
+		const row = dom.append(container, dom.$('.row'));
+		data.name = dom.append(row, dom.$('.nameLabel'));
+		return data;
+	}
+	renderElement(node: ITreeNode<MachineProcessInformation, void>, index: number, templateData: IProcessRowTemplateData, height: number | undefined): void {
+		templateData.name.textContent = node.element.name;
+	}
+	disposeTemplate(templateData: IProcessRowTemplateData): void {
+		// Nothing to do
+	}
+}
+
+class ErrorRenderer implements ITreeRenderer<IRemoteDiagnosticError, void, IProcessRowTemplateData> {
+	templateId: string = 'error';
+	renderTemplate(container: HTMLElement): IProcessRowTemplateData {
+		const data = Object.create(null);
+		const row = dom.append(container, dom.$('.row'));
+		data.name = dom.append(row, dom.$('.nameLabel'));
+		return data;
+	}
+	renderElement(node: ITreeNode<IRemoteDiagnosticError, void>, index: number, templateData: IProcessRowTemplateData, height: number | undefined): void {
+		templateData.name.textContent = node.element.errorMessage;
+	}
+	disposeTemplate(templateData: IProcessRowTemplateData): void {
+		// Nothing to do
+	}
+}
+
+
+class ProcessRenderer implements ITreeRenderer<ProcessItem, void, IProcessItemTemplateData> {
+	constructor(private platform: string, private totalMem: number, private mapPidToWindowTitle: Map<number, string>) { }
+
+	templateId: string = 'process';
+	renderTemplate(container: HTMLElement): IProcessItemTemplateData {
+		const data = <IProcessItemTemplateData>Object.create(null);
+		const row = dom.append(container, dom.$('.row'));
+
+		data.name = dom.append(row, dom.$('.nameLabel'));
+		data.CPU = dom.append(row, dom.$('.cpu'));
+		data.memory = dom.append(row, dom.$('.memory'));
+		data.PID = dom.append(row, dom.$('.pid'));
+
+		return data;
+	}
+	renderElement(node: ITreeNode<ProcessItem, void>, index: number, templateData: IProcessItemTemplateData, height: number | undefined): void {
+		const { element } = node;
+
+		let name = element.name;
+		if (name === 'window') {
+			const windowTitle = this.mapPidToWindowTitle.get(element.pid);
+			name = windowTitle !== undefined ? `${name} (${this.mapPidToWindowTitle.get(element.pid)})` : name;
+		}
+
+		templateData.name.textContent = name;
+		templateData.name.title = element.cmd;
+
+		templateData.CPU.textContent = element.load.toFixed(0);
+		templateData.PID.textContent = element.pid.toFixed(0);
+
+		const memory = this.platform === 'win32' ? element.mem : (this.totalMem * (element.mem / 100));
+		templateData.memory.textContent = (memory / ByteSize.MB).toFixed(0);
+	}
+
+	disposeTemplate(templateData: IProcessItemTemplateData): void {
+		// Nothing to do
+	}
+}
+
+interface MachineProcessInformation {
 	name: string;
-	formattedName: string;
-	cmd: string;
+	rootProcess: ProcessItem | IRemoteDiagnosticError
+}
+
+interface ProcessInformation {
+	processRoots: MachineProcessInformation[];
+}
+
+interface ProcessTree {
+	processes: ProcessInformation;
+}
+
+function isMachineProcessInformation(item: any): item is MachineProcessInformation {
+	return !!item.name && !!item.rootProcess;
+}
+
+function isProcessInformation(item: any): item is ProcessInformation {
+	return !!item.processRoots;
+}
+
+function isProcessItem(item: any): item is ProcessItem {
+	return !!item.pid;
 }
 
 class ProcessExplorer {
 	private lastRequestTime: number;
 
-	private collapsedStateCache: Map<string, boolean> = new Map<string, boolean>();
-
 	private mapPidToWindowTitle = new Map<number, string>();
 
 	private listeners = new DisposableStore();
 
 	private nativeHostService: INativeHostService;
 
+	private tree: DataTree<any, ProcessTree | MachineProcessInformation | ProcessItem | ProcessInformation | IRemoteDiagnosticError, any> | undefined;
+
 	constructor(windowId: number, private data: ProcessExplorerData) {
-		const mainProcessService = new MainProcessService(windowId);
+		const mainProcessService = new ElectronIPCMainProcessService(windowId);
 		this.nativeHostService = new NativeHostService(windowId, mainProcessService) as INativeHostService;
 
 		this.applyStyles(data.styles);
@@ -56,8 +244,19 @@ class ProcessExplorer {
 			windows.forEach(window => this.mapPidToWindowTitle.set(window.pid, window.title));
 		});
 
-		ipcRenderer.on('vscode:listProcessesResponse', (event: unknown, processRoots: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]) => {
-			this.updateProcessInfo(processRoots);
+		ipcRenderer.on('vscode:listProcessesResponse', async (event: unknown, processRoots: MachineProcessInformation[]) => {
+			processRoots.forEach((info, index) => {
+				if (isProcessItem(info.rootProcess)) {
+					info.rootProcess.name = index === 0 ? `${this.data.applicationName} main` : 'remote agent';
+				}
+			});
+
+			if (!this.tree) {
+				await this.createProcessTree(processRoots);
+			} else {
+				this.tree.setInput({ processes: { processRoots } });
+			}
+
 			this.requestProcessList(0);
 		});
 
@@ -66,54 +265,58 @@ class ProcessExplorer {
 		ipcRenderer.send('vscode:listProcesses');
 	}
 
-	private getProcessList(rootProcess: ProcessItem, isLocal: boolean, totalMem: number): FormattedProcessItem[] {
-		const processes: FormattedProcessItem[] = [];
-		const handledProcesses = new Set<number>();
-
-		if (rootProcess) {
-			this.getProcessItem(processes, rootProcess, 0, isLocal, totalMem, handledProcesses);
+	private async createProcessTree(processRoots: MachineProcessInformation[]): Promise<void> {
+		const container = document.getElementById('process-list');
+		if (!container) {
+			return;
 		}
 
-		return processes;
-	}
+		const { totalmem } = await this.nativeHostService.getOSStatistics();
 
-	private getProcessItem(processes: FormattedProcessItem[], item: ProcessItem, indent: number, isLocal: boolean, totalMem: number, handledProcesses: Set<number>): void {
-		const isRoot = (indent === 0);
+		const renderers = [
+			new ProcessRenderer(this.data.platform, totalmem, this.mapPidToWindowTitle),
+			new ProcessHeaderTreeRenderer(),
+			new MachineRenderer(),
+			new ErrorRenderer()
+		];
 
-		handledProcesses.add(item.pid);
+		this.tree = new DataTree('processExplorer',
+			container,
+			new ProcessListDelegate(),
+			renderers,
+			new ProcessTreeDataSource(),
+			{
+				identityProvider:
+				{
+					getId: (element: ProcessTree | ProcessItem | MachineProcessInformation | ProcessInformation | IRemoteDiagnosticError) => {
+						if (isProcessItem(element)) {
+							return element.pid.toString();
+						}
 
-		let name = item.name;
-		if (isRoot) {
-			name = isLocal ? `${this.data.applicationName} main` : 'remote agent';
-		}
+						if (isRemoteDiagnosticError(element)) {
+							return element.hostName;
+						}
 
-		if (name === 'window') {
-			const windowTitle = this.mapPidToWindowTitle.get(item.pid);
-			name = windowTitle !== undefined ? `${name} (${this.mapPidToWindowTitle.get(item.pid)})` : name;
-		}
+						if (isProcessInformation(element)) {
+							return 'processes';
+						}
 
-		// Format name with indent
-		const formattedName = isRoot ? name : `${'    '.repeat(indent)} ${name}`;
-		const memory = this.data.platform === 'win32' ? item.mem : (totalMem * (item.mem / 100));
-		processes.push({
-			cpu: item.load,
-			memory: (memory / ByteSize.MB),
-			pid: item.pid.toFixed(0),
-			name,
-			formattedName,
-			cmd: item.cmd
-		});
+						if (isMachineProcessInformation(element)) {
+							return element.name;
+						}
 
-		// Recurse into children if any
-		if (Array.isArray(item.children)) {
-			item.children.forEach(child => {
-				if (!child || handledProcesses.has(child.pid)) {
-					return; // prevent loops
+						return 'header';
+					}
 				}
-
-				this.getProcessItem(processes, child, indent + 1, isLocal, totalMem, handledProcesses);
 			});
-		}
+
+		this.tree.setInput({ processes: { processRoots } });
+		this.tree.layout(window.innerHeight, window.innerWidth);
+		this.tree.onContextMenu(e => {
+			if (isProcessItem(e.element)) {
+				this.showContextMenu(e.element, true);
+			}
+		});
 	}
 
 	private isDebuggable(cmd: string): boolean {
@@ -121,7 +324,7 @@ class ProcessExplorer {
 		return (matches && matches.length >= 2) || cmd.indexOf('node ') >= 0 || cmd.indexOf('node.exe') >= 0;
 	}
 
-	private attachTo(item: FormattedProcessItem) {
+	private attachTo(item: ProcessItem) {
 		const config: any = {
 			type: 'node',
 			request: 'attach',
@@ -150,179 +353,16 @@ class ProcessExplorer {
 		ipcRenderer.send('vscode:workbenchCommand', { id: 'debug.startFromConfig', from: 'processExplorer', args: [config] });
 	}
 
-	private getProcessIdWithHighestProperty(processList: any[], propertyName: string) {
-		let max = 0;
-		let maxProcessId;
-		processList.forEach(process => {
-			if (process[propertyName] > max) {
-				max = process[propertyName];
-				maxProcessId = process.pid;
-			}
-		});
-
-		return maxProcessId;
-	}
-
-	private updateSectionCollapsedState(shouldExpand: boolean, body: HTMLElement, twistie: CodiconLabel, sectionName: string) {
-		if (shouldExpand) {
-			body.classList.remove('hidden');
-			this.collapsedStateCache.set(sectionName, false);
-			twistie.text = '$(chevron-down)';
-		} else {
-			body.classList.add('hidden');
-			this.collapsedStateCache.set(sectionName, true);
-			twistie.text = '$(chevron-right)';
-		}
-	}
-
-	private renderProcessFetchError(sectionName: string, errorMessage: string) {
-		const container = document.getElementById('process-list');
-		if (!container) {
-			return;
-		}
-
-		const body = document.createElement('tbody');
-
-		this.renderProcessGroupHeader(sectionName, body, container);
-
-		const errorRow = document.createElement('tr');
-		const data = document.createElement('td');
-		data.textContent = errorMessage;
-		data.className = 'error';
-		data.colSpan = 4;
-		errorRow.appendChild(data);
-
-		body.appendChild(errorRow);
-		container.appendChild(body);
-	}
-
-	private renderProcessGroupHeader(sectionName: string, body: HTMLElement, container: HTMLElement) {
-		const headerRow = document.createElement('tr');
-
-		const headerData = document.createElement('td');
-		headerData.colSpan = 4;
-		headerRow.appendChild(headerData);
-
-		const headerContainer = document.createElement('div');
-		headerContainer.className = 'header';
-		headerData.appendChild(headerContainer);
-
-		const twistieContainer = document.createElement('div');
-		const twistieCodicon = new CodiconLabel(twistieContainer);
-		this.updateSectionCollapsedState(!this.collapsedStateCache.get(sectionName), body, twistieCodicon, sectionName);
-		headerContainer.appendChild(twistieContainer);
-
-		const headerLabel = document.createElement('span');
-		headerLabel.textContent = sectionName;
-		headerContainer.appendChild(headerLabel);
-
-		this.listeners.add(addDisposableListener(headerData, 'click', (e) => {
-			const isHidden = body.classList.contains('hidden');
-			this.updateSectionCollapsedState(isHidden, body, twistieCodicon, sectionName);
-		}));
-
-		container.appendChild(headerRow);
-	}
-
-	private renderTableSection(sectionName: string, processList: FormattedProcessItem[], renderManySections: boolean, sectionIsLocal: boolean): void {
-		const container = document.getElementById('process-list');
-		if (!container) {
-			return;
-		}
-
-		const highestCPUProcess = this.getProcessIdWithHighestProperty(processList, 'cpu');
-		const highestMemoryProcess = this.getProcessIdWithHighestProperty(processList, 'memory');
-
-		const body = document.createElement('tbody');
-
-		if (renderManySections) {
-			this.renderProcessGroupHeader(sectionName, body, container);
-		}
-
-		processList.forEach(p => {
-			const row = document.createElement('tr');
-			row.id = p.pid.toString();
-
-			const cpu = document.createElement('td');
-			p.pid === highestCPUProcess
-				? cpu.classList.add('centered', 'highest')
-				: cpu.classList.add('centered');
-			cpu.textContent = p.cpu.toFixed(0);
-
-			const memory = document.createElement('td');
-			p.pid === highestMemoryProcess
-				? memory.classList.add('centered', 'highest')
-				: memory.classList.add('centered');
-			memory.textContent = p.memory.toFixed(0);
-
-			const pid = document.createElement('td');
-			pid.classList.add('centered');
-			pid.textContent = p.pid;
-
-			const name = document.createElement('th');
-			name.scope = 'row';
-			name.classList.add('data');
-			name.title = p.cmd;
-			name.textContent = p.formattedName;
-
-			row.append(cpu, memory, pid, name);
-
-			this.listeners.add(addDisposableListener(row, 'contextmenu', (e) => {
-				this.showContextMenu(e, p, sectionIsLocal);
-			}));
-
-			body.appendChild(row);
-		});
-
-		container.appendChild(body);
-	}
-
-	private async updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]): Promise<void> {
-		const container = document.getElementById('process-list');
-		if (!container) {
-			return;
-		}
-
-		container.innerText = '';
-		this.listeners.clear();
-
-		const tableHead = $('thead', undefined);
-		const row = $('tr');
-		tableHead.append(row);
-
-		row.append($('th.cpu', { scope: 'col' }, localize('cpu', "CPU %")));
-		row.append($('th.memory', { scope: 'col' }, localize('memory', "Memory (MB)")));
-		row.append($('th.pid', { scope: 'col' }, localize('pid', "PID")));
-		row.append($('th.nameLabel', { scope: 'col' }, localize('name', "Name")));
-
-		container.append(tableHead);
-
-		const hasMultipleMachines = Object.keys(processLists).length > 1;
-		const { totalmem } = await this.nativeHostService.getOSStatistics();
-		processLists.forEach((remote, i) => {
-			const isLocal = i === 0;
-			if (isRemoteDiagnosticError(remote.rootProcess)) {
-				this.renderProcessFetchError(remote.name, remote.rootProcess.errorMessage);
-			} else {
-				this.renderTableSection(remote.name, this.getProcessList(remote.rootProcess, isLocal, totalmem), hasMultipleMachines, isLocal);
-			}
-		});
-	}
-
 	private applyStyles(styles: ProcessExplorerStyles): void {
 		const styleTag = document.createElement('style');
 		const content: string[] = [];
 
 		if (styles.hoverBackground) {
-			content.push(`tbody > tr:hover, table > tr:hover  { background-color: ${styles.hoverBackground}; }`);
+			content.push(`.monaco-list-row:hover  { background-color: ${styles.hoverBackground}; }`);
 		}
 
 		if (styles.hoverForeground) {
-			content.push(`tbody > tr:hover, table > tr:hover { color: ${styles.hoverForeground}; }`);
-		}
-
-		if (styles.highlightForeground) {
-			content.push(`.highest { color: ${styles.highlightForeground}; }`);
+			content.push(`.monaco-list-row:hover { color: ${styles.hoverForeground}; }`);
 		}
 
 		styleTag.textContent = content.join('\n');
@@ -334,9 +374,7 @@ class ProcessExplorer {
 		}
 	}
 
-	private showContextMenu(e: MouseEvent, item: FormattedProcessItem, isLocal: boolean) {
-		e.preventDefault();
-
+	private showContextMenu(item: ProcessItem, isLocal: boolean) {
 		const items: IContextMenuItem[] = [];
 		const pid = Number(item.pid);
 
@@ -417,8 +455,6 @@ class ProcessExplorer {
 	}
 }
 
-
-
 export function startup(windowId: number, data: ProcessExplorerData): void {
 	const platformClass = data.platform === 'win32' ? 'windows' : data.platform === 'linux' ? 'linux' : 'mac';
 	document.body.classList.add(platformClass); // used by our fonts
diff --git a/src/vs/code/electron-sandbox/proxy/auth.html b/src/vs/code/electron-sandbox/proxy/auth.html
deleted file mode 100644
index 788b68fce..000000000
--- a/src/vs/code/electron-sandbox/proxy/auth.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="utf-8" />
-	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
-	<style>
-		html,
-		body {
-			margin: 0;
-			padding: 0;
-			height: 100%;
-			width: 100%;
-			overflow: hidden;
-			user-select: none;
-		}
-
-		body {
-			font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", system-ui, "Ubuntu", "Droid Sans", sans-serif;
-			font-size: 10pt;
-			background-color: #F3F3F3;
-		}
-
-		#main {
-			box-sizing: border-box;
-			padding: 10px;
-		}
-
-		h1 {
-			margin: 0;
-			padding: 10px 0;
-			font-size: 16px;
-			background-color: #555;
-			color: #f0f0f0;
-			text-align: center;
-		}
-
-		#form {
-			margin-top: 10px;
-		}
-
-		#username,
-		#password {
-			padding: 6px 10px;
-			font-size: 12px;
-			box-sizing: border-box;
-			width: 100%;
-		}
-
-		#buttons {
-			text-align: center;
-		}
-
-		p {
-			margin: 6px 0;
-		}
-
-		input {
-			font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", system-ui, "Ubuntu", "Droid Sans", sans-serif !important;
-		}
-	</style>
-</head>
-
-<body>
-	<h1 id="title"></h1>
-	<section id="main">
-		<p id="message"></p>
-		<form id="form">
-			<p><input type="text" id="username" placeholder="Username" required /></p>
-			<p><input type="password" id="password" placeholder="Password" required /></p>
-			<p id="buttons">
-				<input id="ok" type="submit" value="OK" />
-				<input id="cancel" type="button" value="Cancel" />
-			</p>
-		</form>
-	</section>
-</body>
-
-<script src="auth.js"></script>
-
-</html>
diff --git a/src/vs/code/electron-sandbox/proxy/auth.js b/src/vs/code/electron-sandbox/proxy/auth.js
deleted file mode 100644
index 5e0db3c2d..000000000
--- a/src/vs/code/electron-sandbox/proxy/auth.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const { ipcRenderer } = window.vscode;
-
-function promptForCredentials(data) {
-	return new Promise((c, e) => {
-		const $title = document.getElementById('title');
-		const $username = document.getElementById('username');
-		const $password = document.getElementById('password');
-		const $form = document.getElementById('form');
-		const $cancel = document.getElementById('cancel');
-		const $message = document.getElementById('message');
-
-		function submit() {
-			c({ username: $username.value, password: $password.value });
-			return false;
-		}
-
-		function cancel() {
-			c({ username: '', password: '' });
-			return false;
-		}
-
-		$form.addEventListener('submit', submit);
-		$cancel.addEventListener('click', cancel);
-
-		document.body.addEventListener('keydown', function (e) {
-			switch (e.keyCode) {
-				case 27: e.preventDefault(); e.stopPropagation(); return cancel();
-				case 13: e.preventDefault(); e.stopPropagation(); return submit();
-			}
-		});
-
-		$title.textContent = data.title;
-		$message.textContent = data.message;
-		$username.focus();
-	});
-}
-
-ipcRenderer.on('vscode:openProxyAuthDialog', async (event, data) => {
-	const response = await promptForCredentials(data);
-	ipcRenderer.send('vscode:proxyAuthResponse', response);
-});
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.html b/src/vs/code/electron-sandbox/workbench/workbench.html
index 40737461d..f36737f2b 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.html
+++ b/src/vs/code/electron-sandbox/workbench/workbench.html
@@ -3,7 +3,8 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https: vscode-remote-resource:;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data: blob: vscode-remote-resource:; media-src 'none'; frame-src 'self' vscode-webview: https://*.vscode-webview-test.com; object-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src 'self' https: ws:; font-src 'self' https: vscode-remote-resource:;">
+		<meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; trusted-types default TrustedFunctionWorkaround ExtensionScripts amdLoader cellRendererEditorText defaultWorkerFactory diffEditorWidget domLineBreaksComputer editorViewLayer diffReview extensionHostWorker insane notebookOutputRenderer safeInnerHtml standaloneColorizer tokenizeToString webNestedWorkerExtensionHost webWorkerExtensionHost;">
 	</head>
 	<body aria-label="">
 	</body>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
index 6a46ef2b0..c5cb1debb 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ b/src/vs/code/electron-sandbox/workbench/workbench.js
@@ -12,8 +12,7 @@
 	const bootstrapWindow = bootstrapWindowLib();
 
 	// Add a perf entry right from the top
-	const perf = bootstrapWindow.perfLib();
-	perf.mark('renderer/started');
+	performance.mark('code/didStartRenderer');
 
 	// Load workbench main JS, CSS and NLS all in parallel. This is an
 	// optimization to prevent a waterfall of loading to happen, because
@@ -24,10 +23,10 @@
 		'vs/nls!vs/workbench/workbench.desktop.main',
 		'vs/css!vs/workbench/workbench.desktop.main'
 	],
-		async function (workbench, configuration) {
+		function (_, configuration) {
 
 			// Mark start of workbench
-			perf.mark('didLoadWorkbenchMain');
+			performance.mark('code/didLoadWorkbenchMain');
 
 			// @ts-ignore
 			return require('vs/workbench/electron-sandbox/desktop.main').main(configuration);
@@ -41,19 +40,34 @@
 				loaderConfig.recordStats = true;
 			},
 			beforeRequire: function () {
-				perf.mark('willLoadWorkbenchMain');
+				performance.mark('code/willLoadWorkbenchMain');
 			}
 		}
 	);
 
+	// add default trustedTypes-policy for logging and to workaround
+	// lib/platform limitations
+	window.trustedTypes?.createPolicy('default', {
+		createHTML(value) {
+			// see https://github.com/electron/electron/issues/27211
+			// Electron webviews use a static innerHTML default value and
+			// that isn't trusted. We use a default policy to check for the
+			// exact value of that innerHTML-string and only allow that.
+			if (value === '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>') {
+				return value;
+			}
+			throw new Error('UNTRUSTED html usage, default trusted types policy should NEVER be reached');
+			// console.trace('UNTRUSTED html usage, default trusted types policy should NEVER be reached');
+			// return value;
+		}
+	});
 
 	//region Helpers
 
 	/**
 	 * @returns {{
-	 *   load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown,
-	 *   globals: () => typeof import('../../../base/parts/sandbox/electron-sandbox/globals'),
-	 *   perfLib: () => { mark: (name: string) => void }
+	 *   load: (modules: string[], resultCallback: (result, configuration: import('../../../platform/windows/common/windows').INativeWindowConfiguration) => any, options: object) => unknown,
+	 *   globals: () => typeof import('../../../base/parts/sandbox/electron-sandbox/globals')
 	 * }}
 	 */
 	function bootstrapWindowLib() {
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index c6415a551..ac5570189 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as os from 'os';
-import * as fs from 'fs';
+import { homedir } from 'os';
+import { constants, existsSync, statSync, unlinkSync, chmodSync, truncateSync, readFileSync } from 'fs';
 import { spawn, ChildProcess, SpawnOptions } from 'child_process';
 import { buildHelpMessage, buildVersionMessage, OPTIONS } from 'vs/platform/environment/node/argv';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { parseCLIProcessArgv, addArg } from 'vs/platform/environment/node/argvHelper';
 import { createWaitMarkerFile } from 'vs/platform/environment/node/waitMarkerFile';
 import product from 'vs/platform/product/common/product';
-import * as paths from 'vs/base/common/path';
+import { isAbsolute, join } from 'vs/base/common/path';
 import { whenDeleted, writeFileSync } from 'vs/base/node/pfs';
 import { findFreePort, randomPort } from 'vs/base/node/ports';
 import { isWindows, isLinux } from 'vs/base/common/platform';
@@ -69,10 +69,10 @@ export async function main(argv: string[]): Promise<any> {
 
 		// Validate
 		if (
-			!source || !target || source === target ||					// make sure source and target are provided and are not the same
-			!paths.isAbsolute(source) || !paths.isAbsolute(target) ||	// make sure both source and target are absolute paths
-			!fs.existsSync(source) || !fs.statSync(source).isFile() ||	// make sure source exists as file
-			!fs.existsSync(target) || !fs.statSync(target).isFile()		// make sure target exists as file
+			!source || !target || source === target ||				// make sure source and target are provided and are not the same
+			!isAbsolute(source) || !isAbsolute(target) ||			// make sure both source and target are absolute paths
+			!existsSync(source) || !statSync(source).isFile() ||	// make sure source exists as file
+			!existsSync(target) || !statSync(target).isFile()		// make sure target exists as file
 		) {
 			throw new Error('Using --file-write with invalid arguments.');
 		}
@@ -83,15 +83,15 @@ export async function main(argv: string[]): Promise<any> {
 			let targetMode: number = 0;
 			let restoreMode = false;
 			if (!!args['file-chmod']) {
-				targetMode = fs.statSync(target).mode;
-				if (!(targetMode & 128) /* readonly */) {
-					fs.chmodSync(target, targetMode | 128);
+				targetMode = statSync(target).mode;
+				if (!(targetMode & constants.S_IWUSR)) {
+					chmodSync(target, targetMode | constants.S_IWUSR);
 					restoreMode = true;
 				}
 			}
 
 			// Write source to target
-			const data = fs.readFileSync(source);
+			const data = readFileSync(source);
 			if (isWindows) {
 				// On Windows we use a different strategy of saving the file
 				// by first truncating the file and then writing with r+ mode.
@@ -99,7 +99,7 @@ export async function main(argv: string[]): Promise<any> {
 				// (see https://github.com/microsoft/vscode/issues/931) and
 				// prevent removing alternate data streams
 				// (see https://github.com/microsoft/vscode/issues/6363)
-				fs.truncateSync(target, 0);
+				truncateSync(target, 0);
 				writeFileSync(target, data, { flag: 'r+' });
 			} else {
 				writeFileSync(target, data);
@@ -107,7 +107,7 @@ export async function main(argv: string[]): Promise<any> {
 
 			// Restore previous mode as needed
 			if (restoreMode) {
-				fs.chmodSync(target, targetMode);
+				chmodSync(target, targetMode);
 			}
 		} catch (error) {
 			error.message = `Error using --file-write: ${error.message}`;
@@ -215,7 +215,7 @@ export async function main(argv: string[]): Promise<any> {
 				throw new Error('Failed to find free ports for profiler. Make sure to shutdown all instances of the editor first.');
 			}
 
-			const filenamePrefix = paths.join(os.homedir(), 'prof-' + Math.random().toString(16).slice(-4));
+			const filenamePrefix = join(homedir(), 'prof-' + Math.random().toString(16).slice(-4));
 
 			addArg(argv, `--inspect-brk=${portMain}`);
 			addArg(argv, `--remote-debugging-port=${portRenderer}`);
@@ -338,7 +338,7 @@ export async function main(argv: string[]): Promise<any> {
 
 				// Make sure to delete the tmp stdin file if we have any
 				if (stdinFilePath) {
-					fs.unlinkSync(stdinFilePath);
+					unlinkSync(stdinFilePath);
 				}
 			});
 		}
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 84fa06d76..ee189f832 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { release } from 'os';
+import * as fs from 'fs';
+import { gracefulify } from 'graceful-fs';
+import { isAbsolute, join } from 'vs/base/common/path';
 import { raceTimeout } from 'vs/base/common/async';
-import * as semver from 'vs/base/common/semver/semver';
 import product from 'vs/platform/product/common/product';
-import * as path from 'vs/base/common/path';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -15,416 +16,147 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { IExtensionManagementService, IExtensionGalleryService, IGalleryExtension, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionGalleryService, IExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
-import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
+import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { RequestService } from 'vs/platform/request/node/requestService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
 import { mkdirp, writeFile } from 'vs/base/node/pfs';
-import { getBaseLabel } from 'vs/base/common/labels';
 import { IStateService } from 'vs/platform/state/node/state';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { ILogService, getLogLevel, LogLevel, ConsoleLogService, MultiplexLogService } from 'vs/platform/log/common/log';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
-import { areSameExtensions, adoptToGalleryExtensionId, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { URI } from 'vs/base/common/uri';
-import { getManifest } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
-import { IExtensionManifest, ExtensionType, isLanguagePackExtension, EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { Schemas } from 'vs/base/common/network';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
 import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService';
+import { URI } from 'vs/base/common/uri';
+import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
+import { toErrorMessage } from 'vs/base/common/errorMessage';
 
-const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
-const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
-const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, e.g.: {0}", 'ms-dotnettools.csharp');
-
-function getId(manifest: IExtensionManifest, withVersion?: boolean): string {
-	if (withVersion) {
-		return `${manifest.publisher}.${manifest.name}@${manifest.version}`;
-	} else {
-		return `${manifest.publisher}.${manifest.name}`;
-	}
-}
-
-const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/;
-
-export function getIdAndVersion(id: string): [string, string | undefined] {
-	const matches = EXTENSION_ID_REGEX.exec(id);
-	if (matches && matches[1]) {
-		return [adoptToGalleryExtensionId(matches[1]), matches[2]];
-	}
-	return [adoptToGalleryExtensionId(id), undefined];
-}
-
-type InstallExtensionInfo = { id: string, version?: string, installOptions: InstallOptions };
-
-export class Main {
+class CliMain extends Disposable {
 
 	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
-		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
-	) { }
+		private argv: NativeParsedArgs
+	) {
+		super();
 
-	async run(argv: NativeParsedArgs): Promise<void> {
-		if (argv['install-source']) {
-			await this.setInstallSource(argv['install-source']);
-		} else if (argv['list-extensions']) {
-			await this.listExtensions(!!argv['show-versions'], argv['category']);
-		} else if (argv['install-extension'] || argv['install-builtin-extension']) {
-			await this.installExtensions(argv['install-extension'] || [], argv['install-builtin-extension'] || [], !!argv['do-not-sync'], !!argv['force']);
-		} else if (argv['uninstall-extension']) {
-			await this.uninstallExtension(argv['uninstall-extension'], !!argv['force']);
-		} else if (argv['locate-extension']) {
-			await this.locateExtension(argv['locate-extension']);
-		} else if (argv['telemetry']) {
-			console.log(buildTelemetryMessage(this.environmentService.appRoot, this.environmentService.extensionsPath));
-		}
+		// Enable gracefulFs
+		gracefulify(fs);
+
+		this.registerListeners();
 	}
 
-	private setInstallSource(installSource: string): Promise<void> {
-		return writeFile(this.environmentService.installSourcePath, installSource.slice(0, 30));
+	private registerListeners(): void {
+
+		// Dispose on exit
+		process.once('exit', () => this.dispose());
 	}
 
-	private async listExtensions(showVersions: boolean, category?: string): Promise<void> {
-		let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
-		const categories = EXTENSION_CATEGORIES.map(c => c.toLowerCase());
-		if (category && category !== '') {
-			if (categories.indexOf(category.toLowerCase()) < 0) {
-				console.log('Invalid category please enter a valid category. To list valid categories run --category without a category specified');
-				return;
-			}
-			extensions = extensions.filter(e => {
-				if (e.manifest.categories) {
-					const lowerCaseCategories: string[] = e.manifest.categories.map(c => c.toLowerCase());
-					return lowerCaseCategories.indexOf(category.toLowerCase()) > -1;
-				}
-				return false;
-			});
-		} else if (category === '') {
-			console.log('Possible Categories: ');
-			categories.forEach(category => {
-				console.log(category);
-			});
-			return;
-		}
-		extensions.forEach(e => console.log(getId(e.manifest, showVersions)));
-	}
+	async run(): Promise<void> {
 
-	async installExtensions(extensions: string[], builtinExtensionIds: string[], isMachineScoped: boolean, force: boolean): Promise<void> {
-		const failed: string[] = [];
-		const installedExtensionsManifests: IExtensionManifest[] = [];
-		if (extensions.length) {
-			console.log(localize('installingExtensions', "Installing extensions..."));
-		}
+		// Services
+		const [instantiationService, appenders] = await this.initServices();
 
-		const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
-		const checkIfNotInstalled = (id: string, version?: string): boolean => {
-			const installedExtension = installed.find(i => areSameExtensions(i.identifier, { id }));
-			if (installedExtension) {
-				if (!version && !force) {
-					console.log(localize('alreadyInstalled-checkAndUpdate', "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.", id, installedExtension.manifest.version, id));
-					return false;
-				}
-				if (version && installedExtension.manifest.version === version) {
-					console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", `${id}@${version}`));
-					return false;
-				}
-			}
-			return true;
-		};
-		const vsixs: string[] = [];
-		const installExtensionInfos: InstallExtensionInfo[] = [];
-		for (const extension of extensions) {
-			if (/\.vsix$/i.test(extension)) {
-				vsixs.push(extension);
-			} else {
-				const [id, version] = getIdAndVersion(extension);
-				if (checkIfNotInstalled(id, version)) {
-					installExtensionInfos.push({ id, version, installOptions: { isBuiltin: false, isMachineScoped } });
-				}
-			}
-		}
-		for (const extension of builtinExtensionIds) {
-			const [id, version] = getIdAndVersion(extension);
-			if (checkIfNotInstalled(id, version)) {
-				installExtensionInfos.push({ id, version, installOptions: { isBuiltin: true, isMachineScoped: false } });
-			}
-		}
+		return instantiationService.invokeFunction(async accessor => {
+			const logService = accessor.get(ILogService);
+			const environmentService = accessor.get(INativeEnvironmentService);
+			const extensionManagementCLIService = accessor.get(IExtensionManagementCLIService);
 
-		if (vsixs.length) {
-			await Promise.all(vsixs.map(async vsix => {
-				try {
-					const manifest = await this.installVSIX(vsix, force);
-					if (manifest) {
-						installedExtensionsManifests.push(manifest);
-					}
-				} catch (err) {
-					console.error(err.message || err.stack || err);
-					failed.push(vsix);
-				}
-			}));
-		}
+			// Log info
+			logService.info('CLI main', this.argv);
 
-		if (installExtensionInfos.length) {
+			// Error handler
+			this.registerErrorHandler(logService);
 
-			const galleryExtensions = await this.getGalleryExtensions(installExtensionInfos);
+			// Run based on argv
+			await this.doRun(environmentService, extensionManagementCLIService);
 
-			await Promise.all(installExtensionInfos.map(async extensionInfo => {
-				const gallery = galleryExtensions.get(extensionInfo.id.toLowerCase());
-				if (gallery) {
-					try {
-						const manifest = await this.installFromGallery(extensionInfo, gallery, installed, force);
-						if (manifest) {
-							installedExtensionsManifests.push(manifest);
-						}
-					} catch (err) {
-						console.error(err.message || err.stack || err);
-						failed.push(extensionInfo.id);
-					}
-				} else {
-					console.error(`${notFound(extensionInfo.version ? `${extensionInfo.id}@${extensionInfo.version}` : extensionInfo.id)}\n${useId}`);
-					failed.push(extensionInfo.id);
-				}
-			}));
-
-		}
-
-		if (installedExtensionsManifests.some(manifest => isLanguagePackExtension(manifest))) {
-			await this.updateLocalizationsCache();
-		}
-
-		if (failed.length) {
-			throw new Error(localize('installation failed', "Failed Installing Extensions: {0}", failed.join(', ')));
-		}
-	}
-
-	private async installVSIX(vsix: string, force: boolean): Promise<IExtensionManifest | null> {
-		vsix = path.isAbsolute(vsix) ? vsix : path.join(process.cwd(), vsix);
-		const manifest = await getManifest(vsix);
-		const valid = await this.validate(manifest, force);
-		if (valid) {
-			try {
-				await this.extensionManagementService.install(URI.file(vsix));
-				console.log(localize('successVsixInstall', "Extension '{0}' was successfully installed.", getBaseLabel(vsix)));
-				return manifest;
-			} catch (error) {
-				if (isPromiseCanceledError(error)) {
-					console.log(localize('cancelVsixInstall', "Cancelled installing extension '{0}'.", getBaseLabel(vsix)));
-					return null;
-				} else {
-					throw error;
-				}
-			}
-		}
-		return null;
-	}
-
-	private async getGalleryExtensions(extensions: InstallExtensionInfo[]): Promise<Map<string, IGalleryExtension>> {
-		const extensionIds = extensions.filter(({ version }) => version === undefined).map(({ id }) => id);
-		const extensionsWithIdAndVersion = extensions.filter(({ version }) => version !== undefined);
-
-		const galleryExtensions = new Map<string, IGalleryExtension>();
-		await Promise.all([
-			(async () => {
-				const result = await this.extensionGalleryService.getExtensions(extensionIds, CancellationToken.None);
-				result.forEach(extension => galleryExtensions.set(extension.identifier.id.toLowerCase(), extension));
-			})(),
-			Promise.all(extensionsWithIdAndVersion.map(async ({ id, version }) => {
-				const extension = await this.extensionGalleryService.getCompatibleExtension({ id }, version);
-				if (extension) {
-					galleryExtensions.set(extension.identifier.id.toLowerCase(), extension);
-				}
-			}))
-		]);
-
-		return galleryExtensions;
-	}
-
-	private async installFromGallery({ id, version, installOptions }: InstallExtensionInfo, galleryExtension: IGalleryExtension, installed: ILocalExtension[], force: boolean): Promise<IExtensionManifest | null> {
-		const manifest = await this.extensionGalleryService.getManifest(galleryExtension, CancellationToken.None);
-		const installedExtension = installed.find(e => areSameExtensions(e.identifier, galleryExtension.identifier));
-		if (installedExtension) {
-			if (galleryExtension.version === installedExtension.manifest.version) {
-				console.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", version ? `${id}@${version}` : id));
-				return null;
-			}
-			console.log(localize('updateMessage', "Updating the extension '{0}' to the version {1}", id, galleryExtension.version));
-		}
-
-		try {
-			if (installOptions.isBuiltin) {
-				console.log(localize('installing builtin ', "Installing builtin extension '{0}' v{1}...", id, galleryExtension.version));
-			} else {
-				console.log(localize('installing', "Installing extension '{0}' v{1}...", id, galleryExtension.version));
-			}
-			await this.extensionManagementService.installFromGallery(galleryExtension, installOptions);
-			console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed.", id, galleryExtension.version));
-			return manifest;
-		} catch (error) {
-			if (isPromiseCanceledError(error)) {
-				console.log(localize('cancelInstall', "Cancelled installing extension '{0}'.", id));
-				return null;
-			} else {
-				throw error;
-			}
-		}
-	}
-
-	private async validate(manifest: IExtensionManifest, force: boolean): Promise<boolean> {
-		if (!manifest) {
-			throw new Error('Invalid vsix');
-		}
-
-		const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
-		const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
-		const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version));
-
-		if (newer && !force) {
-			console.log(localize('forceDowngrade', "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version));
-			return false;
-		}
-
-		return true;
-	}
-
-	private async uninstallExtension(extensions: string[], force: boolean): Promise<void> {
-		async function getExtensionId(extensionDescription: string): Promise<string> {
-			if (!/\.vsix$/i.test(extensionDescription)) {
-				return extensionDescription;
-			}
-
-			const zipPath = path.isAbsolute(extensionDescription) ? extensionDescription : path.join(process.cwd(), extensionDescription);
-			const manifest = await getManifest(zipPath);
-			return getId(manifest);
-		}
-
-		const uninstalledExtensions: ILocalExtension[] = [];
-		for (const extension of extensions) {
-			const id = await getExtensionId(extension);
-			const installed = await this.extensionManagementService.getInstalled();
-			const extensionToUninstall = installed.find(e => areSameExtensions(e.identifier, { id }));
-			if (!extensionToUninstall) {
-				throw new Error(`${notInstalled(id)}\n${useId}`);
-			}
-			if (extensionToUninstall.type === ExtensionType.System) {
-				console.log(localize('builtin', "Extension '{0}' is a Built-in extension and cannot be installed", id));
-				return;
-			}
-			if (extensionToUninstall.isBuiltin && !force) {
-				console.log(localize('forceUninstall', "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.", id));
-				return;
-			}
-			console.log(localize('uninstalling', "Uninstalling {0}...", id));
-			await this.extensionManagementService.uninstall(extensionToUninstall);
-			uninstalledExtensions.push(extensionToUninstall);
-			console.log(localize('successUninstall', "Extension '{0}' was successfully uninstalled!", id));
-		}
-
-		if (uninstalledExtensions.some(e => isLanguagePackExtension(e.manifest))) {
-			await this.updateLocalizationsCache();
-		}
-	}
-
-	private async locateExtension(extensions: string[]): Promise<void> {
-		const installed = await this.extensionManagementService.getInstalled();
-		extensions.forEach(e => {
-			installed.forEach(i => {
-				if (i.identifier.id === e) {
-					if (i.location.scheme === Schemas.file) {
-						console.log(i.location.fsPath);
-						return;
-					}
-				}
-			});
+			// Flush the remaining data in AI adapter (with 1s timeout)
+			return raceTimeout(combinedAppender(...appenders).flush(), 1000);
 		});
 	}
 
-	private async updateLocalizationsCache(): Promise<void> {
-		const localizationService = this.instantiationService.createInstance(LocalizationsService);
-		await localizationService.update();
-		localizationService.dispose();
-	}
-}
+	private async initServices(): Promise<[IInstantiationService, AppInsightsAppender[]]> {
+		const services = new ServiceCollection();
 
-const eventPrefix = 'monacoworkbench';
+		// Environment
+		const environmentService = new NativeEnvironmentService(this.argv);
+		services.set(IEnvironmentService, environmentService);
+		services.set(INativeEnvironmentService, environmentService);
 
-export async function main(argv: NativeParsedArgs): Promise<void> {
-	const services = new ServiceCollection();
-	const disposables = new DisposableStore();
+		// Init folders
+		await Promise.all([environmentService.appSettingsHome.fsPath, environmentService.extensionsPath].map(path => path ? mkdirp(path) : undefined));
 
-	const environmentService = new NativeEnvironmentService(argv);
-	const logLevel = getLogLevel(environmentService);
-	const loggers: ILogService[] = [];
-	loggers.push(new SpdLogService('cli', environmentService.logsPath, logLevel));
-	if (logLevel === LogLevel.Trace) {
-		loggers.push(new ConsoleLogService(logLevel));
-	}
-	const logService = new MultiplexLogService(loggers);
-	process.once('exit', () => logService.dispose());
-	logService.info('main', argv);
+		// Log
+		const logLevel = getLogLevel(environmentService);
+		const loggers: ILogService[] = [];
+		loggers.push(new SpdLogService('cli', environmentService.logsPath, logLevel));
+		if (logLevel === LogLevel.Trace) {
+			loggers.push(new ConsoleLogService(logLevel));
+		}
 
-	await Promise.all<void | undefined>([environmentService.appSettingsHome.fsPath, environmentService.extensionsPath]
-		.map((path): undefined | Promise<void> => path ? mkdirp(path) : undefined));
+		const logService = this._register(new MultiplexLogService(loggers));
+		services.set(ILogService, logService);
 
-	// Files
-	const fileService = new FileService(logService);
-	disposables.add(fileService);
-	services.set(IFileService, fileService);
+		// Files
+		const fileService = this._register(new FileService(logService));
+		services.set(IFileService, fileService);
 
-	const diskFileSystemProvider = new DiskFileSystemProvider(logService);
-	disposables.add(diskFileSystemProvider);
-	fileService.registerProvider(Schemas.file, diskFileSystemProvider);
+		const diskFileSystemProvider = this._register(new DiskFileSystemProvider(logService));
+		fileService.registerProvider(Schemas.file, diskFileSystemProvider);
 
-	const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
-	disposables.add(configurationService);
-	await configurationService.initialize();
+		// Configuration
+		const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService));
+		services.set(IConfigurationService, configurationService);
 
-	services.set(IEnvironmentService, environmentService);
-	services.set(INativeEnvironmentService, environmentService);
+		// Init config
+		await configurationService.initialize();
 
-	services.set(ILogService, logService);
-	services.set(IConfigurationService, configurationService);
-	services.set(IStateService, new SyncDescriptor(StateService));
-	services.set(IProductService, { _serviceBrand: undefined, ...product });
+		// State
+		const stateService = new StateService(environmentService, logService);
+		services.set(IStateService, stateService);
 
-	const instantiationService: IInstantiationService = new InstantiationService(services);
-
-	return instantiationService.invokeFunction(async accessor => {
-		const stateService = accessor.get(IStateService);
+		// Product
+		services.set(IProductService, { _serviceBrand: undefined, ...product });
 
 		const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService;
 
-		const services = new ServiceCollection();
+		// Request
 		services.set(IRequestService, new SyncDescriptor(RequestService));
+
+		// Extensions
 		services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
+		services.set(IExtensionManagementCLIService, new SyncDescriptor(ExtensionManagementCLIService));
 
+		// Localizations
+		services.set(ILocalizationsService, new SyncDescriptor(LocalizationsService));
+
+		// Telemetry
 		const appenders: AppInsightsAppender[] = [];
 		if (isBuilt && !extensionDevelopmentLocationURI && !environmentService.disableTelemetry && product.enableTelemetry) {
 			if (product.aiConfig && product.aiConfig.asimovKey) {
-				appenders.push(new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey));
+				appenders.push(new AppInsightsAppender('monacoworkbench', null, product.aiConfig.asimovKey));
 			}
 
 			const config: ITelemetryServiceConfig = {
 				appender: combinedAppender(...appenders),
 				sendErrorTelemetry: false,
-				commonProperties: resolveCommonProperties(product.commit, product.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
+				commonProperties: resolveCommonProperties(fileService, release(), process.arch, product.commit, product.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
 				piiPaths: [appRoot, extensionsPath]
 			};
 
@@ -434,17 +166,70 @@ export async function main(argv: NativeParsedArgs): Promise<void> {
 			services.set(ITelemetryService, NullTelemetryService);
 		}
 
-		const instantiationService2 = instantiationService.createChild(services);
-		const main = instantiationService2.createInstance(Main);
+		return [new InstantiationService(services), appenders];
+	}
 
-		try {
-			await main.run(argv);
+	private registerErrorHandler(logService: ILogService): void {
 
-			// Flush the remaining data in AI adapter.
-			// If it does not complete in 1 second, exit the process.
-			await raceTimeout(combinedAppender(...appenders).flush(), 1000);
-		} finally {
-			disposables.dispose();
+		// Install handler for unexpected errors
+		setUnexpectedErrorHandler(error => {
+			const message = toErrorMessage(error, true);
+			if (!message) {
+				return;
+			}
+
+			logService.error(`[uncaught exception in CLI]: ${message}`);
+		});
+	}
+
+	private async doRun(environmentService: INativeEnvironmentService, extensionManagementCLIService: IExtensionManagementCLIService): Promise<void> {
+
+		// Install Source
+		if (this.argv['install-source']) {
+			return this.setInstallSource(environmentService, this.argv['install-source']);
 		}
-	});
+
+		// List Extensions
+		if (this.argv['list-extensions']) {
+			return extensionManagementCLIService.listExtensions(!!this.argv['show-versions'], this.argv['category']);
+		}
+
+		// Install Extension
+		else if (this.argv['install-extension'] || this.argv['install-builtin-extension']) {
+			return extensionManagementCLIService.installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.argv['install-builtin-extension'] || [], !!this.argv['do-not-sync'], !!this.argv['force']);
+		}
+
+		// Uninstall Extension
+		else if (this.argv['uninstall-extension']) {
+			return extensionManagementCLIService.uninstallExtensions(this.asExtensionIdOrVSIX(this.argv['uninstall-extension']), !!this.argv['force']);
+		}
+
+		// Locate Extension
+		else if (this.argv['locate-extension']) {
+			return extensionManagementCLIService.locateExtension(this.argv['locate-extension']);
+		}
+
+		// Telemetry
+		else if (this.argv['telemetry']) {
+			console.log(buildTelemetryMessage(environmentService.appRoot, environmentService.extensionsPath));
+		}
+	}
+
+	private asExtensionIdOrVSIX(inputs: string[]): (string | URI)[] {
+		return inputs.map(input => /\.vsix$/i.test(input) ? URI.file(isAbsolute(input) ? input : join(process.cwd(), input)) : input);
+	}
+
+	private setInstallSource(environmentService: INativeEnvironmentService, installSource: string): Promise<void> {
+		return writeFile(environmentService.installSourcePath, installSource.slice(0, 30));
+	}
+}
+
+export async function main(argv: NativeParsedArgs): Promise<void> {
+	const cliMain = new CliMain(argv);
+
+	try {
+		await cliMain.run();
+	} finally {
+		cliMain.dispose();
+	}
 }
diff --git a/src/vs/code/node/shellEnv.ts b/src/vs/code/node/shellEnv.ts
index 29ef8c143..9454f1d47 100644
--- a/src/vs/code/node/shellEnv.ts
+++ b/src/vs/code/node/shellEnv.ts
@@ -5,11 +5,12 @@
 
 import { spawn } from 'child_process';
 import { generateUuid } from 'vs/base/common/uuid';
-import { isWindows } from 'vs/base/common/platform';
+import { isWindows, platform } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { getSystemShell } from 'vs/base/node/shell';
 
 /**
  * We need to get the environment from a user's shell.
@@ -58,7 +59,7 @@ export async function resolveShellEnv(logService: ILogService, args: NativeParse
 let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined;
 
 async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof process.env> {
-	const promise = new Promise<typeof process.env>((resolve, reject) => {
+	const promise = new Promise<typeof process.env>(async (resolve, reject) => {
 		const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
 		logService.trace('getUnixShellEnvironment#runAsNode', runAsNode);
 
@@ -78,7 +79,8 @@ async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof pr
 		logService.trace('getUnixShellEnvironment#env', env);
 		logService.trace('getUnixShellEnvironment#spawn', command);
 
-		const child = spawn(process.env.SHELL!, ['-ilc', command], {
+		const systemShellUnix = await getSystemShell(platform);
+		const child = spawn(systemShellUnix, ['-ilc', command], {
 			detached: true,
 			stdio: ['ignore', 'pipe', process.stderr],
 			env
diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
index ee76fd4b9..545d1321e 100644
--- a/src/vs/editor/browser/config/configuration.ts
+++ b/src/vs/editor/browser/config/configuration.ts
@@ -12,7 +12,7 @@ import { CharWidthRequest, CharWidthRequestType, readCharWidths } from 'vs/edito
 import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
 import { CommonEditorConfiguration, IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
 import { EditorOption, EditorFontLigatures } from 'vs/editor/common/config/editorOptions';
-import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
+import { BareFontInfo, FontInfo, SERIALIZED_FONT_INFO_VERSION } from 'vs/editor/common/config/fontInfo';
 import { IDimension } from 'vs/editor/common/editorCommon';
 import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { IEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
@@ -76,11 +76,13 @@ export function serializeFontInfo(): ISerializedFontInfo[] | null {
 }
 
 export interface ISerializedFontInfo {
+	readonly version: number;
 	readonly zoomLevel: number;
+	readonly pixelRatio: number;
 	readonly fontFamily: string;
 	readonly fontWeight: string;
 	readonly fontSize: number;
-	fontFeatureSettings: string;
+	readonly fontFeatureSettings: string;
 	readonly lineHeight: number;
 	readonly letterSpacing: number;
 	readonly isMonospace: boolean;
@@ -88,8 +90,8 @@ export interface ISerializedFontInfo {
 	readonly typicalFullwidthCharacterWidth: number;
 	readonly canUseHalfwidthRightwardsArrow: boolean;
 	readonly spaceWidth: number;
-	middotWidth: number;
-	wsmiddotWidth: number;
+	readonly middotWidth: number;
+	readonly wsmiddotWidth: number;
 	readonly maxDigitWidth: number;
 }
 
@@ -138,8 +140,7 @@ class CSSBasedConfiguration extends Disposable {
 	private _evictUntrustedReadings(): void {
 		const values = this._cache.getValues();
 		let somethingRemoved = false;
-		for (let i = 0, len = values.length; i < len; i++) {
-			const item = values[i];
+		for (const item of values) {
 			if (!item.isTrusted) {
 				somethingRemoved = true;
 				this._cache.remove(item);
@@ -158,12 +159,11 @@ class CSSBasedConfiguration extends Disposable {
 	public restoreFontInfo(savedFontInfos: ISerializedFontInfo[]): void {
 		// Take all the saved font info and insert them in the cache without the trusted flag.
 		// The reason for this is that a font might have been installed on the OS in the meantime.
-		for (let i = 0, len = savedFontInfos.length; i < len; i++) {
-			const savedFontInfo = savedFontInfos[i];
-			// compatibility with older versions of VS Code which did not store this...
-			savedFontInfo.fontFeatureSettings = savedFontInfo.fontFeatureSettings || EditorFontLigatures.OFF;
-			savedFontInfo.middotWidth = savedFontInfo.middotWidth || savedFontInfo.spaceWidth;
-			savedFontInfo.wsmiddotWidth = savedFontInfo.wsmiddotWidth || savedFontInfo.spaceWidth;
+		for (const savedFontInfo of savedFontInfos) {
+			if (savedFontInfo.version !== SERIALIZED_FONT_INFO_VERSION) {
+				// cannot use older version
+				continue;
+			}
 			const fontInfo = new FontInfo(savedFontInfo, false);
 			this._writeToCache(fontInfo, fontInfo);
 		}
@@ -177,6 +177,7 @@ class CSSBasedConfiguration extends Disposable {
 				// Hey, it's Bug 14341 ... we couldn't read
 				readConfig = new FontInfo({
 					zoomLevel: browser.getZoomLevel(),
+					pixelRatio: browser.getPixelRatio(),
 					fontFamily: readConfig.fontFamily,
 					fontWeight: readConfig.fontWeight,
 					fontSize: readConfig.fontSize,
@@ -289,6 +290,7 @@ class CSSBasedConfiguration extends Disposable {
 		const canTrustBrowserZoomLevel = (browser.getTimeSinceLastZoomLevelChanged() > 2000);
 		return new FontInfo({
 			zoomLevel: browser.getZoomLevel(),
+			pixelRatio: browser.getPixelRatio(),
 			fontFamily: bareFontInfo.fontFamily,
 			fontWeight: bareFontInfo.fontWeight,
 			fontSize: bareFontInfo.fontSize,
@@ -331,15 +333,15 @@ export class Configuration extends CommonEditorConfiguration {
 
 	constructor(
 		isSimpleWidget: boolean,
-		options: IEditorConstructionOptions,
+		options: Readonly<IEditorConstructionOptions>,
 		referenceDomElement: HTMLElement | null = null,
 		private readonly accessibilityService: IAccessibilityService
 	) {
 		super(isSimpleWidget, options);
 
-		this._elementSizeObserver = this._register(new ElementSizeObserver(referenceDomElement, options.dimension, () => this._onReferenceDomElementSizeChanged()));
+		this._elementSizeObserver = this._register(new ElementSizeObserver(referenceDomElement, options.dimension, () => this._recomputeOptions()));
 
-		this._register(CSSBasedConfiguration.INSTANCE.onDidChange(() => this._onCSSBasedConfigurationChanged()));
+		this._register(CSSBasedConfiguration.INSTANCE.onDidChange(() => this._recomputeOptions()));
 
 		if (this._validatedOptions.get(EditorOption.automaticLayout)) {
 			this._elementSizeObserver.startObserving();
@@ -351,28 +353,24 @@ export class Configuration extends CommonEditorConfiguration {
 		this._recomputeOptions();
 	}
 
-	private _onReferenceDomElementSizeChanged(): void {
-		this._recomputeOptions();
-	}
-
-	private _onCSSBasedConfigurationChanged(): void {
-		this._recomputeOptions();
-	}
-
 	public observeReferenceElement(dimension?: IDimension): void {
 		this._elementSizeObserver.observe(dimension);
 	}
 
-	public dispose(): void {
-		super.dispose();
+	public updatePixelRatio(): void {
+		this._recomputeOptions();
 	}
 
-	private _getExtraEditorClassName(): string {
+	private static _getExtraEditorClassName(): string {
 		let extra = '';
 		if (!browser.isSafari && !browser.isWebkitWebView) {
 			// Use user-select: none in all browsers except Safari and native macOS WebView
 			extra += 'no-user-select ';
 		}
+		if (browser.isSafari) {
+			// See https://github.com/microsoft/vscode/issues/108822
+			extra += 'no-minimap-shadow ';
+		}
 		if (platform.isMacintosh) {
 			extra += 'mac ';
 		}
@@ -381,7 +379,7 @@ export class Configuration extends CommonEditorConfiguration {
 
 	protected _getEnvConfiguration(): IEnvConfiguration {
 		return {
-			extraEditorClassName: this._getExtraEditorClassName(),
+			extraEditorClassName: Configuration._getExtraEditorClassName(),
 			outerWidth: this._elementSizeObserver.getWidth(),
 			outerHeight: this._elementSizeObserver.getHeight(),
 			emptySelectionClipboard: browser.isWebKit || browser.isFirefox,
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 06eecaa6a..31f3a0b68 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -110,7 +110,12 @@ export class MouseHandler extends ViewEventHandler {
 				return;
 			}
 			const e = new StandardWheelEvent(browserEvent);
-			if (e.browserEvent!.ctrlKey || e.browserEvent!.metaKey) {
+			const doMouseWheelZoom = (
+				platform.isMacintosh
+					? (browserEvent.metaKey && !browserEvent.ctrlKey && !browserEvent.shiftKey && !browserEvent.altKey)
+					: (browserEvent.ctrlKey && !browserEvent.metaKey && !browserEvent.shiftKey && !browserEvent.altKey)
+			);
+			if (doMouseWheelZoom) {
 				const zoomLevel: number = EditorZoom.getZoomLevel();
 				const delta = e.deltaY > 0 ? 1 : -1;
 				EditorZoom.setZoomLevel(zoomLevel + delta);
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
index 37c1d8b05..ada5f46af 100644
--- a/src/vs/editor/browser/controller/mouseTarget.ts
+++ b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -269,11 +269,11 @@ export class HitTestContext {
 		const viewZoneWhitespace = context.viewLayout.getWhitespaceAtVerticalOffset(mouseVerticalOffset);
 
 		if (viewZoneWhitespace) {
-			let viewZoneMiddle = viewZoneWhitespace.verticalOffset + viewZoneWhitespace.height / 2,
-				lineCount = context.model.getLineCount(),
-				positionBefore: Position | null = null,
-				position: Position | null,
-				positionAfter: Position | null = null;
+			const viewZoneMiddle = viewZoneWhitespace.verticalOffset + viewZoneWhitespace.height / 2;
+			const lineCount = context.model.getLineCount();
+			let positionBefore: Position | null = null;
+			let position: Position | null;
+			let positionAfter: Position | null = null;
 
 			if (viewZoneWhitespace.afterLineNumber !== lineCount) {
 				// There are more lines after this view zone
@@ -767,7 +767,7 @@ export class MouseTargetFactory {
 		const lineWidth = ctx.getLineWidth(lineNumber);
 
 		if (request.mouseContentHorizontalOffset > lineWidth) {
-			if (browser.isEdge && pos.column === 1) {
+			if (browser.isEdgeLegacy && pos.column === 1) {
 				// See https://github.com/microsoft/vscode/issues/10875
 				const detail = createEmptyContentDataInLines(request.mouseContentHorizontalOffset - lineWidth);
 				return request.fulfill(MouseTargetType.CONTENT_EMPTY, new Position(lineNumber, ctx.model.getLineMaxColumn(lineNumber)), undefined, detail);
@@ -940,12 +940,16 @@ export class MouseTargetFactory {
 			}
 		}
 
-		// For inline decorations, Gecko returns the `<span>` of the line and the offset is the `<span>` with the inline decoration
+		// For inline decorations, Gecko sometimes returns the `<span>` of the line and the offset is the `<span>` with the inline decoration
+		// Some other times, it returns the `<span>` with the inline decoration
 		if (hitResult.offsetNode.nodeType === hitResult.offsetNode.ELEMENT_NODE) {
-			const parent1 = hitResult.offsetNode.parentNode; // expected to be the view line div
+			const parent1 = hitResult.offsetNode.parentNode;
 			const parent1ClassName = parent1 && parent1.nodeType === parent1.ELEMENT_NODE ? (<HTMLElement>parent1).className : null;
+			const parent2 = parent1 ? parent1.parentNode : null;
+			const parent2ClassName = parent2 && parent2.nodeType === parent2.ELEMENT_NODE ? (<HTMLElement>parent2).className : null;
 
 			if (parent1ClassName === ViewLine.CLASS_NAME) {
+				// it returned the `<span>` of the line and the offset is the `<span>` with the inline decoration
 				const tokenSpan = hitResult.offsetNode.childNodes[Math.min(hitResult.offset, hitResult.offsetNode.childNodes.length - 1)];
 				if (tokenSpan) {
 					const p = ctx.getPositionFromDOMInfo(<HTMLElement>tokenSpan, 0);
@@ -954,6 +958,13 @@ export class MouseTargetFactory {
 						hitTarget: null
 					};
 				}
+			} else if (parent2ClassName === ViewLine.CLASS_NAME) {
+				// it returned the `<span>` with the inline decoration
+				const p = ctx.getPositionFromDOMInfo(<HTMLElement>hitResult.offsetNode, 0);
+				return {
+					position: p,
+					hitTarget: null
+				};
 			}
 		}
 
@@ -1014,12 +1025,11 @@ export class MouseTargetFactory {
 	}
 
 	private static _snapToSoftTabBoundary(position: Position, viewModel: IViewModel): Position {
-		const minColumn = viewModel.getLineMinColumn(position.lineNumber);
 		const lineContent = viewModel.getLineContent(position.lineNumber);
 		const { tabSize } = viewModel.getTextModelOptions();
-		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - minColumn, tabSize, Direction.Nearest);
+		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - 1, tabSize, Direction.Nearest);
 		if (newPosition !== -1) {
-			return new Position(position.lineNumber, newPosition + minColumn);
+			return new Position(position.lineNumber, newPosition + 1);
 		}
 		return position;
 	}
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index 2f26618aa..b2f38304e 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -54,7 +54,7 @@ class VisibleTextAreaData {
 	}
 }
 
-const canUseZeroSizeTextarea = (browser.isEdge || browser.isFirefox);
+const canUseZeroSizeTextarea = (browser.isFirefox);
 
 export class TextAreaHandler extends ViewPart {
 
@@ -280,14 +280,8 @@ export class TextAreaHandler extends ViewPart {
 		}));
 
 		this._register(this._textAreaInput.onCompositionUpdate((e: ICompositionData) => {
-			if (browser.isEdge) {
-				// Due to isEdgeOrIE (where the textarea was not cleared initially)
-				// we cannot assume the text consists only of the composited text
-				this._visibleTextArea = this._visibleTextArea!.setWidth(0);
-			} else {
-				// adjust width by its size
-				this._visibleTextArea = this._visibleTextArea!.setWidth(measureText(e.data, this._fontInfo));
-			}
+			// adjust width by its size
+			this._visibleTextArea = this._visibleTextArea!.setWidth(measureText(e.data, this._fontInfo));
 			this._render();
 		}));
 
diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index bc1e26c1c..60627babe 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -13,7 +13,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import { ITextAreaWrapper, ITypeData, TextAreaState } from 'vs/editor/browser/controller/textAreaState';
+import { ITextAreaWrapper, ITypeData, TextAreaState, _debugComposition } from 'vs/editor/browser/controller/textAreaState';
 import { Position } from 'vs/editor/common/core/position';
 import { Selection } from 'vs/editor/common/core/selection';
 import { BrowserFeatures } from 'vs/base/browser/canIUse';
@@ -147,6 +147,7 @@ export class TextAreaInput extends Disposable {
 	private readonly _host: ITextAreaInputHost;
 	private readonly _textArea: TextAreaWrapper;
 	private readonly _asyncTriggerCut: RunOnceScheduler;
+	private readonly _asyncFocusGainWriteScreenReaderContent: RunOnceScheduler;
 
 	private _textAreaState: TextAreaState;
 	private _selectionChangeListener: IDisposable | null;
@@ -160,6 +161,7 @@ export class TextAreaInput extends Disposable {
 		this._host = host;
 		this._textArea = this._register(new TextAreaWrapper(textArea));
 		this._asyncTriggerCut = this._register(new RunOnceScheduler(() => this._onCut.fire(), 0));
+		this._asyncFocusGainWriteScreenReaderContent = this._register(new RunOnceScheduler(() => this.writeScreenReaderContent('asyncFocusGain'), 0));
 
 		this._textAreaState = TextAreaState.EMPTY;
 		this._selectionChangeListener = null;
@@ -193,6 +195,10 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionstart', (e: CompositionEvent) => {
+			if (_debugComposition) {
+				console.log(`[compositionstart]`, e);
+			}
+
 			if (this._isDoingComposition) {
 				return;
 			}
@@ -209,6 +215,9 @@ export class TextAreaInput extends Disposable {
 			) {
 				// Handling long press case on macOS + arrow key => pretend the character was selected
 				if (lastKeyDown.code === 'ArrowRight' || lastKeyDown.code === 'ArrowLeft') {
+					if (_debugComposition) {
+						console.log(`[compositionstart] Handling long press case on macOS + arrow key`, e);
+					}
 					moveOneCharacterLeft = true;
 				}
 			}
@@ -221,8 +230,7 @@ export class TextAreaInput extends Disposable {
 					this._textAreaState.selectionStartPosition ? new Position(this._textAreaState.selectionStartPosition.lineNumber, this._textAreaState.selectionStartPosition.column - 1) : null,
 					this._textAreaState.selectionEndPosition
 				);
-			} else if (!browser.isEdge) {
-				// In IE we cannot set .value when handling 'compositionstart' because the entire composition will get canceled.
+			} else {
 				this._setAndWriteTextAreaState('compositionstart', TextAreaState.EMPTY);
 			}
 
@@ -251,27 +259,10 @@ export class TextAreaInput extends Disposable {
 			return [newState, typeInput];
 		};
 
-		const compositionDataInValid = (locale: string): boolean => {
-			// https://github.com/microsoft/monaco-editor/issues/339
-			// Multi-part Japanese compositions reset cursor in Edge/IE, Chinese and Korean IME don't have this issue.
-			// The reason that we can't use this path for all CJK IME is IE and Edge behave differently when handling Korean IME,
-			// which breaks this path of code.
-			if (browser.isEdge && locale === 'ja') {
-				return true;
-			}
-
-			return false;
-		};
-
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionupdate', (e: CompositionEvent) => {
-			if (compositionDataInValid(e.locale)) {
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
-				this._textAreaState = newState;
-				this._onType.fire(typeInput);
-				this._onCompositionUpdate.fire(e);
-				return;
+			if (_debugComposition) {
+				console.log(`[compositionupdate]`, e);
 			}
-
 			const [newState, typeInput] = deduceComposition(e.data || '');
 			this._textAreaState = newState;
 			this._onType.fire(typeInput);
@@ -279,28 +270,23 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionend', (e: CompositionEvent) => {
+			if (_debugComposition) {
+				console.log(`[compositionend]`, e);
+			}
 			// https://github.com/microsoft/monaco-editor/issues/1663
 			// On iOS 13.2, Chinese system IME randomly trigger an additional compositionend event with empty data
 			if (!this._isDoingComposition) {
 				return;
 			}
-			if (compositionDataInValid(e.locale)) {
-				// https://github.com/microsoft/monaco-editor/issues/339
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
-				this._textAreaState = newState;
-				this._onType.fire(typeInput);
-			} else {
-				const [newState, typeInput] = deduceComposition(e.data || '');
-				this._textAreaState = newState;
-				this._onType.fire(typeInput);
-			}
 
-			// Due to
-			// isEdgeOrIE (where the textarea was not cleared initially)
-			// and isChrome (the textarea is not updated correctly when composition ends)
-			// and isFirefox (the textare ais not updated correctly after inserting emojis)
-			// we cannot assume the text at the end consists only of the composited text
-			if (browser.isEdge || browser.isChrome || browser.isFirefox) {
+			const [newState, typeInput] = deduceComposition(e.data || '');
+			this._textAreaState = newState;
+			this._onType.fire(typeInput);
+
+			// isChrome: the textarea is not updated correctly when composition ends
+			// isFirefox: the textarea is not updated correctly after inserting emojis
+			// => we cannot assume the text at the end consists only of the composited text
+			if (browser.isChrome || browser.isFirefox) {
 				this._textAreaState = TextAreaState.readFromTextArea(this._textArea);
 			}
 
@@ -375,9 +361,31 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'focus', () => {
+			const hadFocus = this._hasFocus;
+
 			this._setHasFocus(true);
+
+			if (browser.isSafari && !hadFocus && this._hasFocus) {
+				// When "tabbing into" the textarea, immediately after dispatching the 'focus' event,
+				// Safari will always move the selection at offset 0 in the textarea
+				this._asyncFocusGainWriteScreenReaderContent.schedule();
+			}
 		}));
 		this._register(dom.addDisposableListener(textArea.domNode, 'blur', () => {
+			if (this._isDoingComposition) {
+				// See https://github.com/microsoft/vscode/issues/112621
+				// where compositionend is not triggered when the editor
+				// is taken off-dom during a composition
+
+				// Clear the flag to be able to write to the textarea
+				this._isDoingComposition = false;
+
+				// Clear the textarea to avoid an unwanted cursor type
+				this.writeScreenReaderContent('blurWithoutCompositionEnd');
+
+				// Fire artificial composition end
+				this._onCompositionEnd.fire();
+			}
 			this._setHasFocus(false);
 		}));
 	}
@@ -513,13 +521,7 @@ export class TextAreaInput extends Disposable {
 		}
 
 		if (this._hasFocus) {
-			if (browser.isEdge) {
-				// Edge has a bug where setting the selection range while the focus event
-				// is dispatching doesn't work. To reproduce, "tab into" the editor.
-				this._setAndWriteTextAreaState('focusgain', TextAreaState.EMPTY);
-			} else {
-				this.writeScreenReaderContent('focusgain');
-			}
+			this.writeScreenReaderContent('focusgain');
 		}
 
 		if (this._hasFocus) {
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/textAreaState.ts
index 65c815e38..d8a2f2013 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/textAreaState.ts
@@ -8,6 +8,8 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { EndOfLinePreference } from 'vs/editor/common/model';
 
+export const _debugComposition = false;
+
 export interface ITextAreaWrapper {
 	getValue(): string;
 	setValue(reason: string, value: string): void;
@@ -59,7 +61,9 @@ export class TextAreaState {
 	}
 
 	public writeToTextArea(reason: string, textArea: ITextAreaWrapper, select: boolean): void {
-		// console.log(Date.now() + ': writeToTextArea ' + reason + ': ' + this.toString());
+		if (_debugComposition) {
+			console.log('writeToTextArea ' + reason + ': ' + this.toString());
+		}
 		textArea.setValue(reason, this.value);
 		if (select) {
 			textArea.setSelectionRange(reason, this.selectionStart, this.selectionEnd);
@@ -105,9 +109,11 @@ export class TextAreaState {
 			};
 		}
 
-		// console.log('------------------------deduceInput');
-		// console.log('PREVIOUS STATE: ' + previousState.toString());
-		// console.log('CURRENT STATE: ' + currentState.toString());
+		if (_debugComposition) {
+			console.log('------------------------deduceInput');
+			console.log('PREVIOUS STATE: ' + previousState.toString());
+			console.log('CURRENT STATE: ' + currentState.toString());
+		}
 
 		let previousValue = previousState.value;
 		let previousSelectionStart = previousState.selectionStart;
@@ -133,8 +139,10 @@ export class TextAreaState {
 		currentSelectionEnd -= prefixLength;
 		previousSelectionEnd -= prefixLength;
 
-		// console.log('AFTER DIFFING PREVIOUS STATE: <' + previousValue + '>, selectionStart: ' + previousSelectionStart + ', selectionEnd: ' + previousSelectionEnd);
-		// console.log('AFTER DIFFING CURRENT STATE: <' + currentValue + '>, selectionStart: ' + currentSelectionStart + ', selectionEnd: ' + currentSelectionEnd);
+		if (_debugComposition) {
+			console.log('AFTER DIFFING PREVIOUS STATE: <' + previousValue + '>, selectionStart: ' + previousSelectionStart + ', selectionEnd: ' + previousSelectionEnd);
+			console.log('AFTER DIFFING CURRENT STATE: <' + currentValue + '>, selectionStart: ' + currentSelectionStart + ', selectionEnd: ' + currentSelectionEnd);
+		}
 
 		if (couldBeEmojiInput && currentSelectionStart === currentSelectionEnd && previousValue.length > 0) {
 			// on OSX, emojis from the emoji picker are inserted at random locations
@@ -196,7 +204,9 @@ export class TextAreaState {
 
 			// no current selection
 			const replacePreviousCharacters = (previousPrefix.length - prefixLength);
-			// console.log('REMOVE PREVIOUS: ' + (previousPrefix.length - prefixLength) + ' chars');
+			if (_debugComposition) {
+				console.log('REMOVE PREVIOUS: ' + (previousPrefix.length - prefixLength) + ' chars');
+			}
 
 			return {
 				text: currentValue,
diff --git a/src/vs/editor/browser/core/markdownRenderer.ts b/src/vs/editor/browser/core/markdownRenderer.ts
index e1eb76c8a..ec24b6b5d 100644
--- a/src/vs/editor/browser/core/markdownRenderer.ts
+++ b/src/vs/editor/browser/core/markdownRenderer.ts
@@ -88,9 +88,7 @@ export class MarkdownRenderer {
 
 				const element = document.createElement('span');
 
-				element.innerHTML = MarkdownRenderer._ttpTokenizer
-					? MarkdownRenderer._ttpTokenizer.createHTML(value, tokenization) as unknown as string
-					: tokenizeToString(value, tokenization);
+				element.innerHTML = (MarkdownRenderer._ttpTokenizer?.createHTML(value, tokenization) ?? tokenizeToString(value, tokenization)) as string;
 
 				// use "good" font
 				let fontFamily = this._options.codeBlockFontFamily;
@@ -105,7 +103,7 @@ export class MarkdownRenderer {
 			},
 			asyncRenderCallback: () => this._onDidRenderAsync.fire(),
 			actionHandler: {
-				callback: (content) => this._openerService.open(content, { fromUserGesture: true }).catch(onUnexpectedError),
+				callback: (content) => this._openerService.open(content, { fromUserGesture: true, allowContributedOpeners: true }).catch(onUnexpectedError),
 				disposeables
 			}
 		};
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
index 43305c283..bfa07b8dc 100644
--- a/src/vs/editor/browser/editorBrowser.ts
+++ b/src/vs/editor/browser/editorBrowser.ts
@@ -361,6 +361,11 @@ export interface IEditorConstructionOptions extends IEditorOptions {
 }
 
 export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
+	/**
+	 * The initial editor dimension (to avoid measuring the container).
+	 */
+	dimension?: editorCommon.IDimension;
+
 	/**
 	 * Place overflow widgets inside an external DOM node.
 	 * Defaults to an internal DOM node.
@@ -1047,7 +1052,7 @@ export interface IDiffEditor extends editorCommon.IEditor {
 /**
  *@internal
  */
-export function isCodeEditor(thing: any): thing is ICodeEditor {
+export function isCodeEditor(thing: unknown): thing is ICodeEditor {
 	if (thing && typeof (<ICodeEditor>thing).getEditorType === 'function') {
 		return (<ICodeEditor>thing).getEditorType() === editorCommon.EditorType.ICodeEditor;
 	} else {
@@ -1058,7 +1063,7 @@ export function isCodeEditor(thing: any): thing is ICodeEditor {
 /**
  *@internal
  */
-export function isDiffEditor(thing: any): thing is IDiffEditor {
+export function isDiffEditor(thing: unknown): thing is IDiffEditor {
 	if (thing && typeof (<IDiffEditor>thing).getEditorType === 'function') {
 		return (<IDiffEditor>thing).getEditorType() === editorCommon.EditorType.IDiffEditor;
 	} else {
@@ -1069,8 +1074,8 @@ export function isDiffEditor(thing: any): thing is IDiffEditor {
 /**
  *@internal
  */
-export function isCompositeEditor(thing: any): thing is editorCommon.ICompositeCodeEditor {
-	return thing
+export function isCompositeEditor(thing: unknown): thing is editorCommon.ICompositeCodeEditor {
+	return !!thing
 		&& typeof thing === 'object'
 		&& typeof (<editorCommon.ICompositeCodeEditor>thing).onDidChangeActiveEditor === 'function';
 
@@ -1079,7 +1084,7 @@ export function isCompositeEditor(thing: any): thing is editorCommon.ICompositeC
 /**
  *@internal
  */
-export function getCodeEditor(thing: any): ICodeEditor | null {
+export function getCodeEditor(thing: unknown): ICodeEditor | null {
 	if (isCodeEditor(thing)) {
 		return thing;
 	}
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
index a9e8b99dc..5a49c330f 100644
--- a/src/vs/editor/browser/services/bulkEditService.ts
+++ b/src/vs/editor/browser/services/bulkEditService.ts
@@ -69,11 +69,11 @@ export interface IBulkEditOptions {
 	progress?: IProgress<IProgressStep>;
 	token?: CancellationToken;
 	showPreview?: boolean;
-	suppressPreview?: boolean;
 	label?: string;
 	quotableLabel?: string;
 	undoRedoSource?: UndoRedoSource;
 	undoRedoGroupId?: number;
+	confirmBeforeUndo?: boolean;
 }
 
 export interface IBulkEditResult {
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
index c961bfd79..952b317c6 100644
--- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts
+++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -347,6 +347,8 @@ const _CSS_MAP: { [prop: string]: string; } = {
 
 	fontStyle: 'font-style:{0};',
 	fontWeight: 'font-weight:{0};',
+	fontSize: 'font-size:{0};',
+	fontFamily: 'font-family:{0};',
 	textDecoration: 'text-decoration:{0};',
 	cursor: 'cursor:{0};',
 	letterSpacing: 'letter-spacing:{0};',
@@ -357,6 +359,7 @@ const _CSS_MAP: { [prop: string]: string; } = {
 	contentText: 'content:\'{0}\';',
 	contentIconPath: 'content:{0};',
 	margin: 'margin:{0};',
+	padding: 'padding:{0};',
 	width: 'width:{0};',
 	height: 'height:{0};'
 };
@@ -529,7 +532,7 @@ class DecorationCSSRules {
 
 				cssTextArr.push(strings.format(_CSS_MAP.contentText, escaped));
 			}
-			this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin'], cssTextArr);
+			this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'fontSize', 'fontFamily', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin', 'padding'], cssTextArr);
 			if (this.collectCSSText(opts, ['width', 'height'], cssTextArr)) {
 				cssTextArr.push('display:inline-block;');
 			}
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
index 1360871f7..dd329d44f 100644
--- a/src/vs/editor/browser/services/openerService.ts
+++ b/src/vs/editor/browser/services/openerService.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { LinkedList } from 'vs/base/common/linkedList';
+import { ResourceMap } from 'vs/base/common/map';
 import { parse } from 'vs/base/common/marshalling';
 import { Schemas } from 'vs/base/common/network';
 import { normalizePath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IOpener, IOpenerService, IValidator, IExternalUriResolver, OpenOptions, ResolveExternalUriOptions, IResolvedExternalUri, IExternalOpener, matchesScheme } from 'vs/platform/opener/common/opener';
 import { EditorOpenContext } from 'vs/platform/editor/common/editor';
-import { ResourceMap } from 'vs/base/common/map';
-
+import { IExternalOpener, IExternalUriResolver, IOpener, IOpenerService, IResolvedExternalUri, IValidator, matchesScheme, OpenOptions, ResolveExternalUriOptions } from 'vs/platform/opener/common/opener';
 
 class CommandOpener implements IOpener {
 
@@ -100,15 +100,16 @@ export class OpenerService implements IOpenerService {
 	private readonly _resolvers = new LinkedList<IExternalUriResolver>();
 	private readonly _resolvedUriTargets = new ResourceMap<URI>(uri => uri.with({ path: null, fragment: null, query: null }).toString());
 
-	private _externalOpener: IExternalOpener;
+	private _defaultExternalOpener: IExternalOpener;
+	private readonly _externalOpeners = new LinkedList<IExternalOpener>();
 
 	constructor(
 		@ICodeEditorService editorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 	) {
 		// Default external opener is going through window.open()
-		this._externalOpener = {
-			openExternal: href => {
+		this._defaultExternalOpener = {
+			openExternal: async href => {
 				// ensure to open HTTP/HTTPS links into new windows
 				// to not trigger a navigation. Any other link is
 				// safe to be set as HREF to prevent a blank window
@@ -118,11 +119,11 @@ export class OpenerService implements IOpenerService {
 				} else {
 					window.location.href = href;
 				}
-				return Promise.resolve(true);
+				return true;
 			}
 		};
 
-		// Default opener: maito, http(s), command, and catch-all-editors
+		// Default opener: any external, maito, http(s), command, and catch-all-editors
 		this._openers.push({
 			open: async (target: URI | string, options?: OpenOptions) => {
 				if (options?.openExternal || matchesScheme(target, Schemas.mailto) || matchesScheme(target, Schemas.http) || matchesScheme(target, Schemas.https)) {
@@ -152,8 +153,13 @@ export class OpenerService implements IOpenerService {
 		return { dispose: remove };
 	}
 
-	setExternalOpener(externalOpener: IExternalOpener): void {
-		this._externalOpener = externalOpener;
+	setDefaultExternalOpener(externalOpener: IExternalOpener): void {
+		this._defaultExternalOpener = externalOpener;
+	}
+
+	registerExternalOpener(opener: IExternalOpener): IDisposable {
+		const remove = this._externalOpeners.push(opener);
+		return { dispose: remove };
 	}
 
 	async open(target: URI | string, options?: OpenOptions): Promise<boolean> {
@@ -196,13 +202,29 @@ export class OpenerService implements IOpenerService {
 		const uri = typeof resource === 'string' ? URI.parse(resource) : resource;
 		const { resolved } = await this.resolveExternalUri(uri, options);
 
+		let href: string;
 		if (typeof resource === 'string' && uri.toString() === resolved.toString()) {
 			// open the url-string AS IS
-			return this._externalOpener.openExternal(resource);
+			href = resource;
 		} else {
 			// open URI using the toString(noEncode)+encodeURI-trick
-			return this._externalOpener.openExternal(encodeURI(resolved.toString(true)));
+			href = encodeURI(resolved.toString(true));
 		}
+
+		if (options?.allowContributedOpeners) {
+			const preferredOpenerId = typeof options?.allowContributedOpeners === 'string' ? options?.allowContributedOpeners : undefined;
+			for (const opener of this._externalOpeners) {
+				const didOpen = await opener.openExternal(href, {
+					sourceUri: uri,
+					preferredOpenerId,
+				}, CancellationToken.None);
+				if (didOpen) {
+					return true;
+				}
+			}
+		}
+
+		return this._defaultExternalOpener.openExternal(href, { sourceUri: uri }, CancellationToken.None);
 	}
 
 	dispose() {
diff --git a/src/vs/editor/browser/view/domLineBreaksComputer.ts b/src/vs/editor/browser/view/domLineBreaksComputer.ts
index 87c6461d5..cd486fc27 100644
--- a/src/vs/editor/browser/view/domLineBreaksComputer.ts
+++ b/src/vs/editor/browser/view/domLineBreaksComputer.ts
@@ -111,8 +111,8 @@ function createLineBreaks(requests: string[], fontInfo: FontInfo, tabSize: numbe
 		allVisibleColumns[i] = tmp[1];
 	}
 	const html = sb.build();
-	const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
-	containerDomNode.innerHTML = trustedhtml as unknown as string;
+	const trustedhtml = ttPolicy?.createHTML(html) ?? html;
+	containerDomNode.innerHTML = trustedhtml as string;
 
 	containerDomNode.style.position = 'absolute';
 	containerDomNode.style.top = '10000';
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
index b656a3f8e..e0620c2a6 100644
--- a/src/vs/editor/browser/view/viewImpl.ts
+++ b/src/vs/editor/browser/view/viewImpl.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import * as browser from 'vs/base/browser/browser';
 import { Selection } from 'vs/editor/common/core/selection';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -65,6 +66,7 @@ export class View extends ViewEventHandler {
 
 	private readonly _scrollbar: EditorScrollbar;
 	private readonly _context: ViewContext;
+	private _configPixelRatio: number;
 	private _selections: Selection[];
 
 	// The view lines
@@ -104,6 +106,7 @@ export class View extends ViewEventHandler {
 
 		// The view context is passed on to most classes (basically to reduce param. counts in ctors)
 		this._context = new ViewContext(configuration, themeService.getColorTheme(), model);
+		this._configPixelRatio = this._configPixelRatio = this._context.configuration.options.get(EditorOption.pixelRatio);
 
 		// Ensure the view is the first event handler in order to update the layout
 		this._context.addEventHandler(this);
@@ -298,6 +301,7 @@ export class View extends ViewEventHandler {
 		this._scheduleRender();
 	}
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
+		this._configPixelRatio = this._context.configuration.options.get(EditorOption.pixelRatio);
 		this.domNode.setClassName(this._getEditorClassName());
 		this._applyLayout();
 		return false;
@@ -330,8 +334,8 @@ export class View extends ViewEventHandler {
 		this._viewLines.dispose();
 
 		// Destroy view parts
-		for (let i = 0, len = this._viewParts.length; i < len; i++) {
-			this._viewParts[i].dispose();
+		for (const viewPart of this._viewParts) {
+			viewPart.dispose();
 		}
 
 		super.dispose();
@@ -354,8 +358,7 @@ export class View extends ViewEventHandler {
 
 	private _getViewPartsToRender(): ViewPart[] {
 		let result: ViewPart[] = [], resultLen = 0;
-		for (let i = 0, len = this._viewParts.length; i < len; i++) {
-			const viewPart = this._viewParts[i];
+		for (const viewPart of this._viewParts) {
 			if (viewPart.shouldRender()) {
 				result[resultLen++] = viewPart;
 			}
@@ -401,16 +404,20 @@ export class View extends ViewEventHandler {
 		const renderingContext = new RenderingContext(this._context.viewLayout, viewportData, this._viewLines);
 
 		// Render the rest of the parts
-		for (let i = 0, len = viewPartsToRender.length; i < len; i++) {
-			const viewPart = viewPartsToRender[i];
+		for (const viewPart of viewPartsToRender) {
 			viewPart.prepareRender(renderingContext);
 		}
 
-		for (let i = 0, len = viewPartsToRender.length; i < len; i++) {
-			const viewPart = viewPartsToRender[i];
+		for (const viewPart of viewPartsToRender) {
 			viewPart.render(renderingContext);
 			viewPart.onDidRender();
 		}
+
+		// Try to detect browser zooming and paint again if necessary
+		if (Math.abs(browser.getPixelRatio() - this._configPixelRatio) > 0.001) {
+			// looks like the pixel ratio has changed
+			this._context.configuration.updatePixelRatio();
+		}
 	}
 
 	// --- BEGIN CodeEditor helpers
@@ -462,8 +469,7 @@ export class View extends ViewEventHandler {
 		if (everything) {
 			// Force everything to render...
 			this._viewLines.forceShouldRender();
-			for (let i = 0, len = this._viewParts.length; i < len; i++) {
-				const viewPart = this._viewParts[i];
+			for (const viewPart of this._viewParts) {
 				viewPart.forceShouldRender();
 			}
 		}
diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts
index 89de8468f..0a1a7ddc0 100644
--- a/src/vs/editor/browser/view/viewLayer.ts
+++ b/src/vs/editor/browser/view/viewLayer.ts
@@ -506,15 +506,15 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		ctx.lines.splice(removeIndex, removeCount);
 	}
 
-	private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string, wasNew: boolean[]): void {
+	private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string | TrustedHTML, wasNew: boolean[]): void {
 		if (ViewLayerRenderer._ttPolicy) {
-			newLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(newLinesHTML) as unknown as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393
+			newLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(newLinesHTML as string);
 		}
 		const lastChild = <HTMLElement>this.domNode.lastChild;
 		if (domNodeIsEmpty || !lastChild) {
-			this.domNode.innerHTML = newLinesHTML;
+			this.domNode.innerHTML = newLinesHTML as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393;
 		} else {
-			lastChild.insertAdjacentHTML('afterend', newLinesHTML);
+			lastChild.insertAdjacentHTML('afterend', newLinesHTML as string);
 		}
 
 		let currChild = <HTMLElement>this.domNode.lastChild;
@@ -527,13 +527,13 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		}
 	}
 
-	private _finishRenderingInvalidLines(ctx: IRendererContext<T>, invalidLinesHTML: string, wasInvalid: boolean[]): void {
+	private _finishRenderingInvalidLines(ctx: IRendererContext<T>, invalidLinesHTML: string | TrustedHTML, wasInvalid: boolean[]): void {
 		const hugeDomNode = document.createElement('div');
 
 		if (ViewLayerRenderer._ttPolicy) {
-			invalidLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(invalidLinesHTML) as unknown as string;
+			invalidLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(invalidLinesHTML as string);
 		}
-		hugeDomNode.innerHTML = invalidLinesHTML;
+		hugeDomNode.innerHTML = invalidLinesHTML as string;
 
 		for (let i = 0; i < ctx.linesLength; i++) {
 			const line = ctx.lines[i];
diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
index 6208c89fb..b3ab2991e 100644
--- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
+++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
@@ -42,8 +42,8 @@ export abstract class AbstractLineHighlightOverlay extends DynamicViewOverlay {
 		this._contentWidth = layoutInfo.contentWidth;
 		this._selectionIsEmpty = true;
 		this._focused = false;
-		this._cursorLineNumbers = [];
-		this._selections = [];
+		this._cursorLineNumbers = [1];
+		this._selections = [new Selection(1, 1, 1, 1)];
 		this._renderData = null;
 
 		this._context.addEventHandler(this);
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index d80556fb9..96754ec4b 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -44,7 +44,7 @@ const canUseFastRenderedViewLine = (function () {
 
 let monospaceAssumptionsAreValid = true;
 
-const alwaysRenderInlineSelection = (browser.isEdge);
+const alwaysRenderInlineSelection = (browser.isEdgeLegacy);
 
 export class DomReadingContext {
 
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.css b/src/vs/editor/browser/viewParts/minimap/minimap.css
index f3692e7e4..f4663ece0 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.css
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.css
@@ -25,3 +25,8 @@
 	left: -6px;
 	width: 6px;
 }
+.monaco-editor.no-minimap-shadow .minimap-shadow-visible {
+	position: absolute;
+	left: -1px;
+	width: 1px;
+}
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 7ca33211a..348315fa9 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -862,6 +862,7 @@ export class Minimap extends ViewPart implements IMinimapModel {
 		}
 	}
 	public onTokensColorsChanged(e: viewEvents.ViewTokensColorsChangedEvent): boolean {
+		this._onOptionsMaybeChanged();
 		return this._actual.onTokensColorsChanged();
 	}
 	public onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts
index cdb00570c..81417f0be 100644
--- a/src/vs/editor/browser/viewParts/selections/selections.ts
+++ b/src/vs/editor/browser/viewParts/selections/selections.ts
@@ -60,7 +60,7 @@ function toStyled(item: LineVisibleRanges): LineVisibleRangesWithStyle {
 // TODO@Alex: Remove this once IE11 fixes Bug #524217
 // The problem in IE11 is that it does some sort of auto-zooming to accomodate for displays with different pixel density.
 // Unfortunately, this auto-zooming is buggy around dealing with rounded borders
-const isIEWithZoomingIssuesNearRoundedBorders = browser.isEdge;
+const isIEWithZoomingIssuesNearRoundedBorders = browser.isEdgeLegacy;
 
 
 export class SelectionsOverlay extends DynamicViewOverlay {
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index 4c87ce2bb..15cd2f345 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -24,7 +24,7 @@ import { ViewUserInputEvents } from 'vs/editor/browser/view/viewUserInputEvents'
 import { ConfigurationChangedEvent, EditorLayoutInfo, IEditorOptions, EditorOption, IComputedEditorOptions, FindComputedEditorOptionValueById, filterValidationDecorations } from 'vs/editor/common/config/editorOptions';
 import { Cursor } from 'vs/editor/common/controller/cursor';
 import { CursorColumns } from 'vs/editor/common/controller/cursorCommon';
-import { ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
+import { CursorChangeReason, ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
@@ -241,7 +241,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 	constructor(
 		domElement: HTMLElement,
-		options: editorBrowser.IEditorConstructionOptions,
+		_options: Readonly<editorBrowser.IEditorConstructionOptions>,
 		codeEditorWidgetOptions: ICodeEditorWidgetOptions,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
@@ -253,10 +253,11 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	) {
 		super();
 
-		options = options || {};
+		const options = { ..._options };
 
 		this._domElement = domElement;
 		this._overflowWidgetsDomNode = options.overflowWidgetsDomNode;
+		delete options.overflowWidgetsDomNode;
 		this._id = (++EDITOR_ID);
 		this._decorationTypeKeysToIds = {};
 		this._decorationTypeSubtypes = {};
@@ -331,7 +332,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._codeEditorService.addCodeEditor(this);
 	}
 
-	protected _createConfiguration(options: editorBrowser.IEditorConstructionOptions, accessibilityService: IAccessibilityService): editorCommon.IConfiguration {
+	protected _createConfiguration(options: Readonly<editorBrowser.IEditorConstructionOptions>, accessibilityService: IAccessibilityService): editorCommon.IConfiguration {
 		return new Configuration(this.isSimpleWidget, options, this._domElement, accessibilityService);
 	}
 
@@ -366,7 +367,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		return this._instantiationService.invokeFunction(fn);
 	}
 
-	public updateOptions(newOptions: IEditorOptions): void {
+	public updateOptions(newOptions: Readonly<IEditorOptions>): void {
 		this._configuration.updateOptions(newOptions);
 	}
 
@@ -811,7 +812,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		);
 	}
 
-	public setSelections(ranges: readonly ISelection[], source: string = 'api'): void {
+	public setSelections(ranges: readonly ISelection[], source: string = 'api', reason = CursorChangeReason.NotSet): void {
 		if (!this._modelData) {
 			return;
 		}
@@ -823,7 +824,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 				throw new Error('Invalid arguments');
 			}
 		}
-		this._modelData.viewModel.setSelections(source, ranges);
+		this._modelData.viewModel.setSelections(source, ranges, reason);
 	}
 
 	public getContentWidth(): number {
@@ -1834,6 +1835,7 @@ export class EditorModeContext extends Disposable {
 	private readonly _hasMultipleDocumentFormattingProvider: IContextKey<boolean>;
 	private readonly _hasMultipleDocumentSelectionFormattingProvider: IContextKey<boolean>;
 	private readonly _hasSignatureHelpProvider: IContextKey<boolean>;
+	private readonly _hasInlineHintsProvider: IContextKey<boolean>;
 	private readonly _isInWalkThrough: IContextKey<boolean>;
 
 	constructor(
@@ -1856,6 +1858,7 @@ export class EditorModeContext extends Disposable {
 		this._hasReferenceProvider = EditorContextKeys.hasReferenceProvider.bindTo(_contextKeyService);
 		this._hasRenameProvider = EditorContextKeys.hasRenameProvider.bindTo(_contextKeyService);
 		this._hasSignatureHelpProvider = EditorContextKeys.hasSignatureHelpProvider.bindTo(_contextKeyService);
+		this._hasInlineHintsProvider = EditorContextKeys.hasInlineHintsProvider.bindTo(_contextKeyService);
 		this._hasDocumentFormattingProvider = EditorContextKeys.hasDocumentFormattingProvider.bindTo(_contextKeyService);
 		this._hasDocumentSelectionFormattingProvider = EditorContextKeys.hasDocumentSelectionFormattingProvider.bindTo(_contextKeyService);
 		this._hasMultipleDocumentFormattingProvider = EditorContextKeys.hasMultipleDocumentFormattingProvider.bindTo(_contextKeyService);
@@ -1884,6 +1887,7 @@ export class EditorModeContext extends Disposable {
 		this._register(modes.DocumentFormattingEditProviderRegistry.onDidChange(update));
 		this._register(modes.DocumentRangeFormattingEditProviderRegistry.onDidChange(update));
 		this._register(modes.SignatureHelpProviderRegistry.onDidChange(update));
+		this._register(modes.InlineHintsProviderRegistry.onDidChange(update));
 
 		update();
 	}
@@ -1935,6 +1939,7 @@ export class EditorModeContext extends Disposable {
 			this._hasReferenceProvider.set(modes.ReferenceProviderRegistry.has(model));
 			this._hasRenameProvider.set(modes.RenameProviderRegistry.has(model));
 			this._hasSignatureHelpProvider.set(modes.SignatureHelpProviderRegistry.has(model));
+			this._hasInlineHintsProvider.set(modes.InlineHintsProviderRegistry.has(model));
 			this._hasDocumentFormattingProvider.set(modes.DocumentFormattingEditProviderRegistry.has(model) || modes.DocumentRangeFormattingEditProviderRegistry.has(model));
 			this._hasDocumentSelectionFormattingProvider.set(modes.DocumentRangeFormattingEditProviderRegistry.has(model));
 			this._hasMultipleDocumentFormattingProvider.set(modes.DocumentFormattingEditProviderRegistry.all(model).length + modes.DocumentRangeFormattingEditProviderRegistry.all(model).length > 1);
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 0730e4f00..53615b318 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -12,15 +12,14 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import * as objects from 'vs/base/common/objects';
 import { URI } from 'vs/base/common/uri';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
 import { DiffReview } from 'vs/editor/browser/widget/diffReview';
-import { IDiffEditorOptions, IEditorOptions, EditorLayoutInfo, EditorOption, EditorOptions, EditorFontLigatures, stringSet as validateStringSetOption, boolean as validateBooleanOption } from 'vs/editor/common/config/editorOptions';
+import { IDiffEditorOptions, EditorLayoutInfo, EditorOption, EditorOptions, EditorFontLigatures, stringSet as validateStringSetOption, boolean as validateBooleanOption } from 'vs/editor/common/config/editorOptions';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
@@ -54,6 +53,11 @@ import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 
+export interface IDiffCodeEditorWidgetOptions {
+	originalEditor?: ICodeEditorWidgetOptions;
+	modifiedEditor?: ICodeEditorWidgetOptions;
+}
+
 interface IEditorDiffDecorations {
 	decorations: IModelDeltaDecoration[];
 	overviewZones: OverviewRulerZone[];
@@ -109,7 +113,7 @@ class VisualEditorState {
 		this._decorations = editor.deltaDecorations(this._decorations, []);
 	}
 
-	public apply(editor: CodeEditorWidget, overviewRuler: editorBrowser.IOverviewRuler, newDecorations: IEditorDiffDecorationsWithZones, restoreScrollState: boolean): void {
+	public apply(editor: CodeEditorWidget, overviewRuler: editorBrowser.IOverviewRuler | null, newDecorations: IEditorDiffDecorationsWithZones, restoreScrollState: boolean): void {
 
 		const scrollState = restoreScrollState ? StableEditorScrollState.capture(editor) : null;
 
@@ -212,6 +216,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	private _maxComputationTime: number;
 	private _renderIndicators: boolean;
 	private _enableSplitViewResizing: boolean;
+	private _renderOverviewRuler: boolean;
 	private _strategy!: DiffEditorWidgetStyle;
 
 	private readonly _updateDecorationsRunner: RunOnceScheduler;
@@ -226,7 +231,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 
 	constructor(
 		domElement: HTMLElement,
-		options: editorBrowser.IDiffEditorConstructionOptions,
+		options: Readonly<editorBrowser.IDiffEditorConstructionOptions>,
+		codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
 		@IClipboardService clipboardService: IClipboardService,
 		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -287,6 +293,11 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 			this._contextKeyService.createKey('isInEmbeddedDiffEditor', false);
 		}
 
+		this._renderOverviewRuler = true;
+		if (typeof options.renderOverviewRuler !== 'undefined') {
+			this._renderOverviewRuler = Boolean(options.renderOverviewRuler);
+		}
+
 		this._updateDecorationsRunner = this._register(new RunOnceScheduler(() => this._updateDecorations(), 0));
 
 		this._containerDomElement = document.createElement('div');
@@ -308,7 +319,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._register(dom.addStandardDisposableListener(this._overviewDomElement, 'mousedown', (e) => {
 			this._modifiedEditor.delegateVerticalScrollbarMouseDown(e);
 		}));
-		this._containerDomElement.appendChild(this._overviewDomElement);
+		if (this._renderOverviewRuler) {
+			this._containerDomElement.appendChild(this._overviewDomElement);
+		}
 
 		// Create left side
 		this._originalDomNode = document.createElement('div');
@@ -334,7 +347,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._isVisible = true;
 		this._isHandlingScrollEvent = false;
 
-		this._elementSizeObserver = this._register(new ElementSizeObserver(this._containerDomElement, undefined, () => this._onDidContainerSizeChanged()));
+		this._elementSizeObserver = this._register(new ElementSizeObserver(this._containerDomElement, options.dimension, () => this._onDidContainerSizeChanged()));
 		if (options.automaticLayout) {
 			this._elementSizeObserver.startObserving();
 		}
@@ -353,8 +366,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		rightServices.set(IContextKeyService, rightContextKeyService);
 		const rightScopedInstantiationService = instantiationService.createChild(rightServices);
 
-		this._originalEditor = this._createLeftHandSideEditor(options, leftScopedInstantiationService, leftContextKeyService);
-		this._modifiedEditor = this._createRightHandSideEditor(options, rightScopedInstantiationService, rightContextKeyService);
+		this._originalEditor = this._createLeftHandSideEditor(options, codeEditorWidgetOptions.originalEditor || {}, leftScopedInstantiationService, leftContextKeyService);
+		this._modifiedEditor = this._createRightHandSideEditor(options, codeEditorWidgetOptions.modifiedEditor || {}, rightScopedInstantiationService, rightContextKeyService);
 
 		this._originalOverviewRuler = null;
 		this._modifiedOverviewRuler = null;
@@ -415,6 +428,10 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		return this._modifiedEditor.getContentHeight();
 	}
 
+	public getViewWidth(): number {
+		return this._elementSizeObserver.getWidth();
+	}
+
 	private _setState(newState: editorBrowser.DiffEditorState): void {
 		if (this._state === newState) {
 			return;
@@ -453,6 +470,10 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	}
 
 	private _recreateOverviewRulers(): void {
+		if (!this._renderOverviewRuler) {
+			return;
+		}
+
 		if (this._originalOverviewRuler) {
 			this._overviewDomElement.removeChild(this._originalOverviewRuler.getDomNode());
 			this._originalOverviewRuler.dispose();
@@ -474,8 +495,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._layoutOverviewRulers();
 	}
 
-	private _createLeftHandSideEditor(options: editorBrowser.IDiffEditorConstructionOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService): CodeEditorWidget {
-		const editor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options));
+	private _createLeftHandSideEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService): CodeEditorWidget {
+		const editor = this._createInnerEditor(instantiationService, this._originalDomNode, this._adjustOptionsForLeftHandSide(options), codeEditorWidgetOptions);
 
 		this._register(editor.onDidScrollChange((e) => {
 			if (this._isHandlingScrollEvent) {
@@ -536,8 +557,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		return editor;
 	}
 
-	private _createRightHandSideEditor(options: editorBrowser.IDiffEditorConstructionOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService): CodeEditorWidget {
-		const editor = this._createInnerEditor(instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options));
+	private _createRightHandSideEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions, instantiationService: IInstantiationService, contextKeyService: IContextKeyService): CodeEditorWidget {
+		const editor = this._createInnerEditor(instantiationService, this._modifiedDomNode, this._adjustOptionsForRightHandSide(options), codeEditorWidgetOptions);
 
 		this._register(editor.onDidScrollChange((e) => {
 			if (this._isHandlingScrollEvent) {
@@ -604,8 +625,8 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		return editor;
 	}
 
-	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: IEditorOptions): CodeEditorWidget {
-		return instantiationService.createInstance(CodeEditorWidget, container, options, {});
+	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<editorBrowser.IEditorConstructionOptions>, editorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
+		return instantiationService.createInstance(CodeEditorWidget, container, options, editorWidgetOptions);
 	}
 
 	public dispose(): void {
@@ -627,7 +648,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 			this._modifiedOverviewRuler.dispose();
 		}
 		this._overviewDomElement.removeChild(this._overviewViewportDomElement.domNode);
-		this._containerDomElement.removeChild(this._overviewDomElement);
+		if (this._renderOverviewRuler) {
+			this._containerDomElement.removeChild(this._overviewDomElement);
+		}
 
 		this._containerDomElement.removeChild(this._originalDomNode);
 		this._originalEditor.dispose();
@@ -678,7 +701,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		return this._modifiedEditor;
 	}
 
-	public updateOptions(newOptions: IDiffEditorOptions): void {
+	public updateOptions(newOptions: Readonly<IDiffEditorOptions>): void {
 
 		// Handle side by side
 		let renderSideBySideChanged = false;
@@ -740,6 +763,16 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 			// Update class name
 			this._containerDomElement.className = DiffEditorWidget._getClassName(this._themeService.getColorTheme(), this._renderSideBySide);
 		}
+
+		// renderOverviewRuler
+		if (typeof newOptions.renderOverviewRuler !== 'undefined' && this._renderOverviewRuler !== newOptions.renderOverviewRuler) {
+			this._renderOverviewRuler = newOptions.renderOverviewRuler;
+			if (this._renderOverviewRuler) {
+				this._containerDomElement.appendChild(this._overviewDomElement);
+			} else {
+				this._containerDomElement.removeChild(this._overviewDomElement);
+			}
+		}
 	}
 
 	public getModel(): editorCommon.IDiffEditorModel {
@@ -749,7 +782,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		};
 	}
 
-	public setModel(model: editorCommon.IDiffEditorModel): void {
+	public setModel(model: editorCommon.IDiffEditorModel | null): void {
 		// Guard us against partial null model
 		if (model && (!model.original || !model.modified)) {
 			throw new Error(!model.original ? 'DiffEditorWidget.setModel: Original model is null' : 'DiffEditorWidget.setModel: Modified model is null');
@@ -911,7 +944,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	}
 
 	public restoreViewState(s: editorCommon.IDiffEditorViewState): void {
-		if (s.original && s.modified) {
+		if (s && s.original && s.modified) {
 			const diffEditorState = <editorCommon.IDiffEditorViewState>s;
 			this._originalEditor.restoreViewState(diffEditorState.original);
 			this._modifiedEditor.restoreViewState(diffEditorState.modified);
@@ -969,6 +1002,10 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	}
 
 	private _layoutOverviewRulers(): void {
+		if (!this._renderOverviewRuler) {
+			return;
+		}
+
 		if (!this._originalOverviewRuler || !this._modifiedOverviewRuler) {
 			return;
 		}
@@ -1079,9 +1116,10 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 	}
 
 	private _updateDecorations(): void {
-		if (!this._originalEditor.getModel() || !this._modifiedEditor.getModel() || !this._originalOverviewRuler || !this._modifiedOverviewRuler) {
+		if (!this._originalEditor.getModel() || !this._modifiedEditor.getModel()) {
 			return;
 		}
+
 		const lineChanges = (this._diffComputationResult ? this._diffComputationResult.changes : []);
 
 		const foreignOriginal = this._originalEditorState.getForeignViewZones(this._originalEditor.getWhitespaces());
@@ -1098,25 +1136,24 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		}
 	}
 
-	private _adjustOptionsForSubEditor(options: editorBrowser.IDiffEditorConstructionOptions): editorBrowser.IDiffEditorConstructionOptions {
-		const clonedOptions: editorBrowser.IDiffEditorConstructionOptions = objects.deepClone(options || {});
+	private _adjustOptionsForSubEditor(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): editorBrowser.IEditorConstructionOptions {
+		const clonedOptions = { ...options };
 		clonedOptions.inDiffEditor = true;
 		clonedOptions.automaticLayout = false;
-		clonedOptions.scrollbar = clonedOptions.scrollbar || {};
+		// Clone scrollbar options before changing them
+		clonedOptions.scrollbar = { ...(clonedOptions.scrollbar || {}) };
 		clonedOptions.scrollbar.vertical = 'visible';
 		clonedOptions.folding = false;
 		clonedOptions.codeLens = this._diffCodeLens;
 		clonedOptions.fixedOverflowWidgets = true;
-		clonedOptions.overflowWidgetsDomNode = options.overflowWidgetsDomNode;
 		// clonedOptions.lineDecorationsWidth = '2ch';
-		if (!clonedOptions.minimap) {
-			clonedOptions.minimap = {};
-		}
+		// Clone minimap options before changing them
+		clonedOptions.minimap = { ...(clonedOptions.minimap || {}) };
 		clonedOptions.minimap.enabled = false;
 		return clonedOptions;
 	}
 
-	private _adjustOptionsForLeftHandSide(options: editorBrowser.IDiffEditorConstructionOptions): editorBrowser.IEditorConstructionOptions {
+	private _adjustOptionsForLeftHandSide(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): editorBrowser.IEditorConstructionOptions {
 		const result = this._adjustOptionsForSubEditor(options);
 		if (!this._renderSideBySide) {
 			// never wrap hidden editor
@@ -1126,16 +1163,28 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		}
 		result.readOnly = !this._originalIsEditable;
 		result.extraEditorClassName = 'original-in-monaco-diff-editor';
-		return result;
+		return {
+			...result,
+			dimension: {
+				height: 0,
+				width: 0
+			}
+		};
 	}
 
-	private _adjustOptionsForRightHandSide(options: editorBrowser.IDiffEditorConstructionOptions): editorBrowser.IEditorConstructionOptions {
+	private _adjustOptionsForRightHandSide(options: Readonly<editorBrowser.IDiffEditorConstructionOptions>): editorBrowser.IEditorConstructionOptions {
 		const result = this._adjustOptionsForSubEditor(options);
 		result.wordWrapOverride1 = this._diffWordWrap;
 		result.revealHorizontalRightPadding = EditorOptions.revealHorizontalRightPadding.defaultValue + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
 		result.scrollbar!.verticalHasArrows = false;
 		result.extraEditorClassName = 'modified-in-monaco-diff-editor';
-		return result;
+		return {
+			...result,
+			dimension: {
+				height: 0,
+				width: 0
+			}
+		};
 	}
 
 	public doLayout(): void {
@@ -1164,7 +1213,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 		this._overviewViewportDomElement.setHeight(30);
 
 		this._originalEditor.layout({ width: splitPoint, height: (height - reviewHeight) });
-		this._modifiedEditor.layout({ width: width - splitPoint - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH, height: (height - reviewHeight) });
+		this._modifiedEditor.layout({ width: width - splitPoint - (this._renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), height: (height - reviewHeight) });
 
 		if (this._originalOverviewRuler || this._modifiedOverviewRuler) {
 			this._layoutOverviewRulers();
@@ -1218,6 +1267,12 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 				return (this._elementSizeObserver.getHeight() - this._getReviewHeight());
 			},
 
+			getOptions: () => {
+				return {
+					renderOverviewRuler: this._renderOverviewRuler
+				};
+			},
+
 			getContainerDomNode: () => {
 				return this._containerDomElement;
 			},
@@ -1347,6 +1402,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
 interface IDataSource {
 	getWidth(): number;
 	getHeight(): number;
+	getOptions(): { renderOverviewRuler: boolean; };
 	getContainerDomNode(): HTMLElement;
 	relayoutEditors(): void;
 
@@ -1806,7 +1862,7 @@ class DiffEditorWidgetSideBySide extends DiffEditorWidgetStyle implements IVerti
 
 	public layout(sashRatio: number | null = this._sashRatio): number {
 		const w = this._dataSource.getWidth();
-		const contentWidth = w - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
+		const contentWidth = w - (this._dataSource.getOptions().renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0);
 
 		let sashPosition = Math.floor((sashRatio || 0.5) * contentWidth);
 		const midPoint = Math.floor(0.5 * contentWidth);
@@ -1839,7 +1895,7 @@ class DiffEditorWidgetSideBySide extends DiffEditorWidgetStyle implements IVerti
 
 	private _onSashDrag(e: ISashEvent): void {
 		const w = this._dataSource.getWidth();
-		const contentWidth = w - DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH;
+		const contentWidth = w - (this._dataSource.getOptions().renderOverviewRuler ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0);
 		const sashPosition = this.layout((this._startSashPosition! + (e.currentX - e.startX)) / contentWidth);
 
 		this._sashRatio = sashPosition / contentWidth;
@@ -2370,7 +2426,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 
 			const html = sb.build();
 			const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
-			domNode.innerHTML = trustedhtml as unknown as string;
+			domNode.innerHTML = trustedhtml as string;
 			viewZone.minWidthInPx = (maxCharsPerLine * typicalHalfwidthCharacterWidth);
 
 			if (viewLineCounts) {
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index fd53314e1..2fb0eaed0 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -80,6 +80,8 @@ const diffReviewCloseIcon = registerIcon('diff-review-close', Codicon.close, nls
 
 export class DiffReview extends Disposable {
 
+	private static _ttPolicy = window.trustedTypes?.createPolicy('diffReview', { createHTML: value => value });
+
 	private readonly _diffEditor: DiffEditorWidget;
 	private _isVisible: boolean;
 	public readonly shadow: FastDomNode<HTMLElement>;
@@ -734,14 +736,18 @@ export class DiffReview extends Disposable {
 
 			let lineContent: string;
 			if (modifiedLine !== 0) {
-				cell.insertAdjacentHTML('beforeend',
-					this._renderLine(modifiedModel, modifiedOptions, modifiedModelOpts.tabSize, modifiedLine)
-				);
+				let html: string | TrustedHTML = this._renderLine(modifiedModel, modifiedOptions, modifiedModelOpts.tabSize, modifiedLine);
+				if (DiffReview._ttPolicy) {
+					html = DiffReview._ttPolicy.createHTML(html as string);
+				}
+				cell.insertAdjacentHTML('beforeend', html as string);
 				lineContent = modifiedModel.getLineContent(modifiedLine);
 			} else {
-				cell.insertAdjacentHTML('beforeend',
-					this._renderLine(originalModel, originalOptions, originalModelOpts.tabSize, originalLine)
-				);
+				let html: string | TrustedHTML = this._renderLine(originalModel, originalOptions, originalModelOpts.tabSize, originalLine);
+				if (DiffReview._ttPolicy) {
+					html = DiffReview._ttPolicy.createHTML(html as string);
+				}
+				cell.insertAdjacentHTML('beforeend', html as string);
 				lineContent = originalModel.getLineContent(originalLine);
 			}
 
diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
index 5dd98c444..3836a4ec0 100644
--- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
@@ -82,7 +82,7 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
 		@IClipboardService clipboardService: IClipboardService,
 		@IEditorProgressService editorProgressService: IEditorProgressService,
 	) {
-		super(domElement, parentEditor.getRawOptions(), clipboardService, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
+		super(domElement, parentEditor.getRawOptions(), {}, clipboardService, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
 
 		this._parentEditor = parentEditor;
 		this._overwriteOptions = options;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index bf1d608fc..c3805bf44 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -272,7 +272,7 @@ function migrateOptions(options: IEditorOptions): void {
 	}
 }
 
-function deepCloneAndMigrateOptions(_options: IEditorOptions): IEditorOptions {
+function deepCloneAndMigrateOptions(_options: Readonly<IEditorOptions>): IEditorOptions {
 	const options = objects.deepClone(_options);
 	migrateOptions(options);
 	return options;
@@ -298,7 +298,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC
 	private _readOptions: RawEditorOptions;
 	protected _validatedOptions: ValidatedEditorOptions;
 
-	constructor(isSimpleWidget: boolean, _options: IEditorOptions) {
+	constructor(isSimpleWidget: boolean, _options: Readonly<IEditorOptions>) {
 		super();
 		this.isSimpleWidget = isSimpleWidget;
 
@@ -318,8 +318,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC
 	public observeReferenceElement(dimension?: IDimension): void {
 	}
 
-	public dispose(): void {
-		super.dispose();
+	public updatePixelRatio(): void {
 	}
 
 	protected _recomputeOptions(): void {
@@ -348,7 +347,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC
 
 	private _computeInternalOptions(): ComputedEditorOptions {
 		const partialEnv = this._getEnvConfiguration();
-		const bareFontInfo = BareFontInfo.createFromValidatedSettings(this._validatedOptions, partialEnv.zoomLevel, this.isSimpleWidget);
+		const bareFontInfo = BareFontInfo.createFromValidatedSettings(this._validatedOptions, partialEnv.zoomLevel, partialEnv.pixelRatio, this.isSimpleWidget);
 		const env: IEnvironmentalOptions = {
 			memory: this._computeOptionsMemory,
 			outerWidth: partialEnv.outerWidth,
@@ -394,7 +393,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC
 		return true;
 	}
 
-	public updateOptions(_newOptions: IEditorOptions): void {
+	public updateOptions(_newOptions: Readonly<IEditorOptions>): void {
 		if (typeof _newOptions === 'undefined') {
 			return;
 		}
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 1c6b481c7..bce855361 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -625,6 +625,10 @@ export interface IEditorOptions {
 	 * Controls strikethrough deprecated variables.
 	 */
 	showDeprecated?: boolean;
+	/**
+	 * Control the behavior and rendering of the inline hints.
+	 */
+	inlineHints?: IEditorInlineHintsOptions;
 }
 
 /**
@@ -677,6 +681,11 @@ export interface IDiffEditorOptions extends IEditorOptions {
 	 * Defaults to false
 	 */
 	isInEmbeddedEditor?: boolean;
+	/**
+	 * Is the diff editor should render overview ruler
+	 * Defaults to true
+	 */
+	renderOverviewRuler?: boolean;
 	/**
 	 * Control the wrapping of the diff editor.
 	 */
@@ -2364,6 +2373,74 @@ class EditorLightbulb extends BaseEditorOption<EditorOption.lightbulb, EditorLig
 
 //#endregion
 
+//#region inlineHints
+
+/**
+ * Configuration options for editor inlineHints
+ */
+export interface IEditorInlineHintsOptions {
+	/**
+	 * Enable the inline hints.
+	 * Defaults to true.
+	 */
+	enabled?: boolean;
+
+	/**
+	 * Font size of inline hints.
+	 * Default to 90% of the editor font size.
+	 */
+	fontSize?: number;
+
+	/**
+	 * Font family of inline hints.
+	 * Defaults to editor font family.
+	 */
+	fontFamily?: string;
+}
+
+export type EditorInlineHintsOptions = Readonly<Required<IEditorInlineHintsOptions>>;
+
+class EditorInlineHints extends BaseEditorOption<EditorOption.inlineHints, EditorInlineHintsOptions> {
+
+	constructor() {
+		const defaults: EditorInlineHintsOptions = { enabled: true, fontSize: 0, fontFamily: EDITOR_FONT_DEFAULTS.fontFamily };
+		super(
+			EditorOption.inlineHints, 'inlineHints', defaults,
+			{
+				'editor.inlineHints.enabled': {
+					type: 'boolean',
+					default: defaults.enabled,
+					description: nls.localize('inlineHints.enable', "Enables the inline hints in the editor.")
+				},
+				'editor.inlineHints.fontSize': {
+					type: 'number',
+					default: defaults.fontSize,
+					description: nls.localize('inlineHints.fontSize', "Controls font size of inline hints in the editor. When set to `0`, the 90% of `#editor.fontSize#` is used.")
+				},
+				'editor.inlineHints.fontFamily': {
+					type: 'string',
+					default: defaults.fontFamily,
+					description: nls.localize('inlineHints.fontFamily', "Controls font family of inline hints in the editor.")
+				},
+			}
+		);
+	}
+
+	public validate(_input: any): EditorInlineHintsOptions {
+		if (!_input || typeof _input !== 'object') {
+			return this.defaultValue;
+		}
+		const input = _input as IEditorInlineHintsOptions;
+		return {
+			enabled: boolean(input.enabled, this.defaultValue.enabled),
+			fontSize: EditorIntOption.clampedInt(input.fontSize, this.defaultValue.fontSize, 0, 100),
+			fontFamily: EditorStringOption.string(input.fontFamily, this.defaultValue.fontFamily)
+		};
+	}
+}
+
+//#endregion
+
 //#region lineHeight
 
 class EditorLineHeight extends EditorIntOption<EditorOption.lineHeight> {
@@ -3273,7 +3350,7 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 				'editor.suggest.showInlineDetails': {
 					type: 'boolean',
 					default: defaults.showInlineDetails,
-					description: nls.localize('suggest.showInlineDetails', "Controls whether sugget details show inline with the label or only in the details widget")
+					description: nls.localize('suggest.showInlineDetails', "Controls whether suggest details show inline with the label or only in the details widget")
 				},
 				'editor.suggest.maxVisibleSuggestions': {
 					type: 'number',
@@ -3754,7 +3831,7 @@ export const enum EditorOption {
 	wrappingIndent,
 	wrappingStrategy,
 	showDeprecated,
-
+	inlineHints,
 	// Leave these at the end (because they have dependencies!)
 	editorClassName,
 	pixelRatio,
@@ -4258,6 +4335,7 @@ export const EditorOptions = {
 		EditorOption.showDeprecated, 'showDeprecated', true,
 		{ description: nls.localize('showDeprecated', "Controls strikethrough deprecated variables.") }
 	)),
+	inlineHints: register(new EditorInlineHints()),
 	snippetSuggestions: register(new EditorStringEnumOption(
 		EditorOption.snippetSuggestions, 'snippetSuggestions',
 		'inline' as 'top' | 'bottom' | 'inline' | 'none',
diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts
index e5d21cb62..44a275044 100644
--- a/src/vs/editor/common/config/fontInfo.ts
+++ b/src/vs/editor/common/config/fontInfo.ts
@@ -24,33 +24,33 @@ export class BareFontInfo {
 	/**
 	 * @internal
 	 */
-	public static createFromValidatedSettings(options: ValidatedEditorOptions, zoomLevel: number, ignoreEditorZoom: boolean): BareFontInfo {
+	public static createFromValidatedSettings(options: ValidatedEditorOptions, zoomLevel: number, pixelRatio: number, ignoreEditorZoom: boolean): BareFontInfo {
 		const fontFamily = options.get(EditorOption.fontFamily);
 		const fontWeight = options.get(EditorOption.fontWeight);
 		const fontSize = options.get(EditorOption.fontSize);
 		const fontFeatureSettings = options.get(EditorOption.fontLigatures);
 		const lineHeight = options.get(EditorOption.lineHeight);
 		const letterSpacing = options.get(EditorOption.letterSpacing);
-		return BareFontInfo._create(fontFamily, fontWeight, fontSize, fontFeatureSettings, lineHeight, letterSpacing, zoomLevel, ignoreEditorZoom);
+		return BareFontInfo._create(fontFamily, fontWeight, fontSize, fontFeatureSettings, lineHeight, letterSpacing, zoomLevel, pixelRatio, ignoreEditorZoom);
 	}
 
 	/**
 	 * @internal
 	 */
-	public static createFromRawSettings(opts: { fontFamily?: string; fontWeight?: string; fontSize?: number; fontLigatures?: boolean | string; lineHeight?: number; letterSpacing?: number; }, zoomLevel: number, ignoreEditorZoom: boolean = false): BareFontInfo {
+	public static createFromRawSettings(opts: { fontFamily?: string; fontWeight?: string; fontSize?: number; fontLigatures?: boolean | string; lineHeight?: number; letterSpacing?: number; }, zoomLevel: number, pixelRatio: number, ignoreEditorZoom: boolean = false): BareFontInfo {
 		const fontFamily = EditorOptions.fontFamily.validate(opts.fontFamily);
 		const fontWeight = EditorOptions.fontWeight.validate(opts.fontWeight);
 		const fontSize = EditorOptions.fontSize.validate(opts.fontSize);
 		const fontFeatureSettings = EditorOptions.fontLigatures2.validate(opts.fontLigatures);
 		const lineHeight = EditorOptions.lineHeight.validate(opts.lineHeight);
 		const letterSpacing = EditorOptions.letterSpacing.validate(opts.letterSpacing);
-		return BareFontInfo._create(fontFamily, fontWeight, fontSize, fontFeatureSettings, lineHeight, letterSpacing, zoomLevel, ignoreEditorZoom);
+		return BareFontInfo._create(fontFamily, fontWeight, fontSize, fontFeatureSettings, lineHeight, letterSpacing, zoomLevel, pixelRatio, ignoreEditorZoom);
 	}
 
 	/**
 	 * @internal
 	 */
-	private static _create(fontFamily: string, fontWeight: string, fontSize: number, fontFeatureSettings: string, lineHeight: number, letterSpacing: number, zoomLevel: number, ignoreEditorZoom: boolean): BareFontInfo {
+	private static _create(fontFamily: string, fontWeight: string, fontSize: number, fontFeatureSettings: string, lineHeight: number, letterSpacing: number, zoomLevel: number, pixelRatio: number, ignoreEditorZoom: boolean): BareFontInfo {
 		if (lineHeight === 0) {
 			lineHeight = Math.round(GOLDEN_LINE_HEIGHT_RATIO * fontSize);
 		} else if (lineHeight < MINIMUM_LINE_HEIGHT) {
@@ -63,6 +63,7 @@ export class BareFontInfo {
 
 		return new BareFontInfo({
 			zoomLevel: zoomLevel,
+			pixelRatio: pixelRatio,
 			fontFamily: fontFamily,
 			fontWeight: fontWeight,
 			fontSize: fontSize,
@@ -73,6 +74,7 @@ export class BareFontInfo {
 	}
 
 	readonly zoomLevel: number;
+	readonly pixelRatio: number;
 	readonly fontFamily: string;
 	readonly fontWeight: string;
 	readonly fontSize: number;
@@ -85,6 +87,7 @@ export class BareFontInfo {
 	 */
 	protected constructor(opts: {
 		zoomLevel: number;
+		pixelRatio: number;
 		fontFamily: string;
 		fontWeight: string;
 		fontSize: number;
@@ -93,6 +96,7 @@ export class BareFontInfo {
 		letterSpacing: number;
 	}) {
 		this.zoomLevel = opts.zoomLevel;
+		this.pixelRatio = opts.pixelRatio;
 		this.fontFamily = String(opts.fontFamily);
 		this.fontWeight = String(opts.fontWeight);
 		this.fontSize = opts.fontSize;
@@ -105,7 +109,7 @@ export class BareFontInfo {
 	 * @internal
 	 */
 	public getId(): string {
-		return this.zoomLevel + '-' + this.fontFamily + '-' + this.fontWeight + '-' + this.fontSize + '-' + this.fontFeatureSettings + '-' + this.lineHeight + '-' + this.letterSpacing;
+		return this.zoomLevel + '-' + this.pixelRatio + '-' + this.fontFamily + '-' + this.fontWeight + '-' + this.fontSize + '-' + this.fontFeatureSettings + '-' + this.lineHeight + '-' + this.letterSpacing;
 	}
 
 	/**
@@ -125,9 +129,13 @@ export class BareFontInfo {
 	}
 }
 
+// change this whenever `FontInfo` members are changed
+export const SERIALIZED_FONT_INFO_VERSION = 1;
+
 export class FontInfo extends BareFontInfo {
 	readonly _editorStylingBrand: void;
 
+	readonly version: number = SERIALIZED_FONT_INFO_VERSION;
 	readonly isTrusted: boolean;
 	readonly isMonospace: boolean;
 	readonly typicalHalfwidthCharacterWidth: number;
@@ -143,6 +151,7 @@ export class FontInfo extends BareFontInfo {
 	 */
 	constructor(opts: {
 		zoomLevel: number;
+		pixelRatio: number;
 		fontFamily: string;
 		fontWeight: string;
 		fontSize: number;
diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 2bb67894d..6c4bbdc6b 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -393,8 +393,8 @@ export class Cursor extends Disposable {
 		return this._cursors.getPrimaryCursor().modelState.position;
 	}
 
-	public setSelections(eventsCollector: ViewModelEventsCollector, source: string | null | undefined, selections: readonly ISelection[]): void {
-		this.setStates(eventsCollector, source, CursorChangeReason.NotSet, CursorState.fromModelSelections(selections));
+	public setSelections(eventsCollector: ViewModelEventsCollector, source: string | null | undefined, selections: readonly ISelection[], reason: CursorChangeReason): void {
+		this.setStates(eventsCollector, source, reason, CursorState.fromModelSelections(selections));
 	}
 
 	public getPrevEditOperationType(): EditOperationType {
@@ -584,7 +584,7 @@ export class Cursor extends Disposable {
 		});
 		if (selections) {
 			this._isHandling = false;
-			this.setSelections(eventsCollector, source, selections);
+			this.setSelections(eventsCollector, source, selections, CursorChangeReason.NotSet);
 		}
 		if (autoClosedCharactersRanges.length > 0) {
 			this._pushAutoClosedAction(autoClosedCharactersRanges, autoClosedEnclosingRanges);
diff --git a/src/vs/editor/common/controller/cursorMoveOperations.ts b/src/vs/editor/common/controller/cursorMoveOperations.ts
index 9229c2e35..ac505bdcd 100644
--- a/src/vs/editor/common/controller/cursorMoveOperations.ts
+++ b/src/vs/editor/common/controller/cursorMoveOperations.ts
@@ -39,11 +39,11 @@ export class MoveOperations {
 	public static leftPositionAtomicSoftTabs(model: ICursorSimpleModel, lineNumber: number, column: number, tabSize: number): Position {
 		const minColumn = model.getLineMinColumn(lineNumber);
 		const lineContent = model.getLineContent(lineNumber);
-		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - minColumn, tabSize, Direction.Left);
-		if (newPosition === -1) {
+		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - 1, tabSize, Direction.Left);
+		if (newPosition === -1 || newPosition + 1 < minColumn) {
 			return this.leftPosition(model, lineNumber, column);
 		}
-		return new Position(lineNumber, minColumn + newPosition);
+		return new Position(lineNumber, newPosition + 1);
 	}
 
 	public static left(config: CursorConfiguration, model: ICursorSimpleModel, lineNumber: number, column: number): CursorPosition {
@@ -81,13 +81,12 @@ export class MoveOperations {
 	}
 
 	public static rightPositionAtomicSoftTabs(model: ICursorSimpleModel, lineNumber: number, column: number, tabSize: number, indentSize: number): Position {
-		const minColumn = model.getLineMinColumn(lineNumber);
 		const lineContent = model.getLineContent(lineNumber);
-		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - minColumn, tabSize, Direction.Right);
+		const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, column - 1, tabSize, Direction.Right);
 		if (newPosition === -1) {
 			return this.rightPosition(model, lineNumber, column);
 		}
-		return new Position(lineNumber, minColumn + newPosition);
+		return new Position(lineNumber, newPosition + 1);
 	}
 
 	public static right(config: CursorConfiguration, model: ICursorSimpleModel, lineNumber: number, column: number): CursorPosition {
diff --git a/src/vs/editor/common/controller/cursorTypeOperations.ts b/src/vs/editor/common/controller/cursorTypeOperations.ts
index 75da04850..0c618026d 100644
--- a/src/vs/editor/common/controller/cursorTypeOperations.ts
+++ b/src/vs/editor/common/controller/cursorTypeOperations.ts
@@ -351,13 +351,6 @@ export class TypeOperations {
 			if (ir) {
 				let oldEndViewColumn = CursorColumns.visibleColumnFromColumn2(config, model, range.getEndPosition());
 				const oldEndColumn = range.endColumn;
-
-				let beforeText = '\n';
-				if (indentation !== config.normalizeIndentation(ir.beforeEnter)) {
-					beforeText = config.normalizeIndentation(ir.beforeEnter) + lineText.substring(indentation.length, range.startColumn - 1) + '\n';
-					range = new Range(range.startLineNumber, 1, range.endLineNumber, range.endColumn);
-				}
-
 				const newLineContent = model.getLineContent(range.endLineNumber);
 				const firstNonWhitespace = strings.firstNonWhitespaceIndex(newLineContent);
 				if (firstNonWhitespace >= 0) {
@@ -367,7 +360,7 @@ export class TypeOperations {
 				}
 
 				if (keepPosition) {
-					return new ReplaceCommandWithoutChangingPosition(range, beforeText + config.normalizeIndentation(ir.afterEnter), true);
+					return new ReplaceCommandWithoutChangingPosition(range, '\n' + config.normalizeIndentation(ir.afterEnter), true);
 				} else {
 					let offset = 0;
 					if (oldEndColumn <= firstNonWhitespace + 1) {
@@ -376,7 +369,7 @@ export class TypeOperations {
 						}
 						offset = Math.min(oldEndViewColumn + 1 - config.normalizeIndentation(ir.afterEnter).length - 1, 0);
 					}
-					return new ReplaceCommandWithOffsetCursorState(range, beforeText + config.normalizeIndentation(ir.afterEnter), 0, offset, true);
+					return new ReplaceCommandWithOffsetCursorState(range, '\n' + config.normalizeIndentation(ir.afterEnter), 0, offset, true);
 				}
 			}
 		}
diff --git a/src/vs/editor/common/diff/diffComputer.ts b/src/vs/editor/common/diff/diffComputer.ts
index ebf854605..cac0acd99 100644
--- a/src/vs/editor/common/diff/diffComputer.ts
+++ b/src/vs/editor/common/diff/diffComputer.ts
@@ -313,6 +313,13 @@ export class DiffComputer {
 
 		if (this.original.lines.length === 1 && this.original.lines[0].length === 0) {
 			// empty original => fast path
+			if (this.modified.lines.length === 1 && this.modified.lines[0].length === 0) {
+				return {
+					quitEarly: false,
+					changes: []
+				};
+			}
+
 			return {
 				quitEarly: false,
 				changes: [{
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
index 94c4a3c48..e2372db8d 100644
--- a/src/vs/editor/common/editorCommon.ts
+++ b/src/vs/editor/common/editorCommon.ts
@@ -157,9 +157,10 @@ export interface IConfiguration extends IDisposable {
 
 	setMaxLineNumber(maxLineNumber: number): void;
 	setViewLineCount(viewLineCount: number): void;
-	updateOptions(newOptions: IEditorOptions): void;
+	updateOptions(newOptions: Readonly<IEditorOptions>): void;
 	getRawOptions(): IEditorOptions;
 	observeReferenceElement(dimension?: IDimension): void;
+	updatePixelRatio(): void;
 	setIsDominatedByLongLines(isDominatedByLongLines: boolean): void;
 }
 
@@ -605,6 +606,7 @@ export interface IThemeDecorationRenderOptions {
 
 	fontStyle?: string;
 	fontWeight?: string;
+	fontSize?: string;
 	textDecoration?: string;
 	cursor?: string;
 	color?: string | ThemeColor;
@@ -629,13 +631,17 @@ export interface IContentDecorationRenderOptions {
 
 	border?: string;
 	borderColor?: string | ThemeColor;
+	borderRadius?: string;
 	fontStyle?: string;
 	fontWeight?: string;
+	fontSize?: string;
+	fontFamily?: string;
 	textDecoration?: string;
 	color?: string | ThemeColor;
 	backgroundColor?: string | ThemeColor;
 
 	margin?: string;
+	padding?: string;
 	width?: string;
 	height?: string;
 }
diff --git a/src/vs/editor/common/editorContextKeys.ts b/src/vs/editor/common/editorContextKeys.ts
index a3a3b3de1..2f24e3118 100644
--- a/src/vs/editor/common/editorContextKeys.ts
+++ b/src/vs/editor/common/editorContextKeys.ts
@@ -61,6 +61,7 @@ export namespace EditorContextKeys {
 	export const hasReferenceProvider = new RawContextKey<boolean>('editorHasReferenceProvider', false);
 	export const hasRenameProvider = new RawContextKey<boolean>('editorHasRenameProvider', false);
 	export const hasSignatureHelpProvider = new RawContextKey<boolean>('editorHasSignatureHelpProvider', false);
+	export const hasInlineHintsProvider = new RawContextKey<boolean>('editorHasInlineHintsProvider', false);
 
 	// -- mode context keys: formatting
 	export const hasDocumentFormattingProvider = new RawContextKey<boolean>('editorHasDocumentFormattingProvider', false);
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 8f4d53a84..3f1a239dc 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -600,12 +600,6 @@ export interface ITextModel {
 	 */
 	setValue(newValue: string): void;
 
-	/**
-	 * Replace the entire text buffer value contained in this model.
-	 * @internal
-	 */
-	setValueFromTextBuffer(newValue: ITextBuffer): void;
-
 	/**
 	 * Get the text stored in this model.
 	 * @param eol The end of line character preference. Defaults to `EndOfLinePreference.TextDefined`.
@@ -1276,7 +1270,7 @@ export interface ITextBufferBuilder {
  * @internal
  */
 export interface ITextBufferFactory {
-	create(defaultEOL: DefaultEndOfLine): ITextBuffer;
+	create(defaultEOL: DefaultEndOfLine): { textBuffer: ITextBuffer; disposable: IDisposable; };
 	getFirstLineText(lengthLimit: number): string;
 }
 
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
index d134517ba..b65b87a0c 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CharCode } from 'vs/base/common/charCode';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import { DefaultEndOfLine, ITextBuffer, ITextBufferBuilder, ITextBufferFactory } from 'vs/editor/common/model';
 import { StringBuffer, createLineStarts, createLineStartsFast } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
@@ -38,7 +39,7 @@ export class PieceTreeTextBufferFactory implements ITextBufferFactory {
 		return '\n';
 	}
 
-	public create(defaultEOL: DefaultEndOfLine): ITextBuffer {
+	public create(defaultEOL: DefaultEndOfLine): { textBuffer: ITextBuffer; disposable: IDisposable; } {
 		const eol = this._getEOL(defaultEOL);
 		let chunks = this._chunks;
 
@@ -54,7 +55,8 @@ export class PieceTreeTextBufferFactory implements ITextBufferFactory {
 			}
 		}
 
-		return new PieceTreeTextBuffer(chunks, this._bom, eol, this._containsRTL, this._containsUnusualLineTerminators, this._isBasicASCII, this._normalizeEOL);
+		const textBuffer = new PieceTreeTextBuffer(chunks, this._bom, eol, this._containsRTL, this._containsUnusualLineTerminators, this._isBasicASCII, this._normalizeEOL);
+		return { textBuffer: textBuffer, disposable: textBuffer };
 	}
 
 	public getFirstLineText(lengthLimit: number): string {
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 35dd46640..aab72a48c 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -37,6 +37,7 @@ import { EditorTheme } from 'vs/editor/common/view/viewContext';
 import { IUndoRedoService, ResourceEditStackSnapshot } from 'vs/platform/undoRedo/common/undoRedo';
 import { TextChange } from 'vs/editor/common/model/textChange';
 import { Constants } from 'vs/base/common/uint';
+import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 function createTextBufferBuilder() {
 	return new PieceTreeTextBufferBuilder();
@@ -106,7 +107,7 @@ export function createTextBufferFactoryFromSnapshot(snapshot: model.ITextSnapsho
 	return builder.finish();
 }
 
-export function createTextBuffer(value: string | model.ITextBufferFactory, defaultEOL: model.DefaultEndOfLine): model.ITextBuffer {
+export function createTextBuffer(value: string | model.ITextBufferFactory, defaultEOL: model.DefaultEndOfLine): { textBuffer: model.ITextBuffer; disposable: IDisposable; } {
 	const factory = (typeof value === 'string' ? createTextBufferFactory(value) : value);
 	return factory.create(defaultEOL);
 }
@@ -268,6 +269,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 	private readonly _undoRedoService: IUndoRedoService;
 	private _attachedEditorCount: number;
 	private _buffer: model.ITextBuffer;
+	private _bufferDisposable: IDisposable;
 	private _options: model.TextModelResolvedOptions;
 
 	private _isDisposed: boolean;
@@ -328,7 +330,9 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this._undoRedoService = undoRedoService;
 		this._attachedEditorCount = 0;
 
-		this._buffer = createTextBuffer(source, creationOptions.defaultEOL);
+		const { textBuffer, disposable } = createTextBuffer(source, creationOptions.defaultEOL);
+		this._buffer = textBuffer;
+		this._bufferDisposable = disposable;
 
 		this._options = TextModel.resolveOptions(this._buffer, creationOptions);
 
@@ -386,10 +390,13 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this._tokenization.dispose();
 		this._isDisposed = true;
 		super.dispose();
+		this._bufferDisposable.dispose();
 		this._isDisposing = false;
 		// Manually release reference to previous text buffer to avoid large leaks
 		// in case someone leaks a TextModel reference
-		this._buffer = createTextBuffer('', this._options.defaultEOL);
+		const emptyDisposedTextBuffer = new PieceTreeTextBuffer([], '', '\n', false, false, true, true);
+		emptyDisposedTextBuffer.dispose();
+		this._buffer = emptyDisposedTextBuffer;
 	}
 
 	private _assertNotDisposed(): void {
@@ -423,8 +430,8 @@ export class TextModel extends Disposable implements model.ITextModel {
 			return;
 		}
 
-		const textBuffer = createTextBuffer(value, this._options.defaultEOL);
-		this.setValueFromTextBuffer(textBuffer);
+		const { textBuffer, disposable } = createTextBuffer(value, this._options.defaultEOL);
+		this._setValueFromTextBuffer(textBuffer, disposable);
 	}
 
 	private _createContentChanged2(range: Range, rangeOffset: number, rangeLength: number, text: string, isUndoing: boolean, isRedoing: boolean, isFlush: boolean): IModelContentChangedEvent {
@@ -443,18 +450,16 @@ export class TextModel extends Disposable implements model.ITextModel {
 		};
 	}
 
-	public setValueFromTextBuffer(textBuffer: model.ITextBuffer): void {
+	private _setValueFromTextBuffer(textBuffer: model.ITextBuffer, textBufferDisposable: IDisposable): void {
 		this._assertNotDisposed();
-		if (textBuffer === null) {
-			// There's nothing to do
-			return;
-		}
 		const oldFullModelRange = this.getFullModelRange();
 		const oldModelValueLength = this.getValueLengthInRange(oldFullModelRange);
 		const endLineNumber = this.getLineCount();
 		const endColumn = this.getLineMaxColumn(endLineNumber);
 
 		this._buffer = textBuffer;
+		this._bufferDisposable.dispose();
+		this._bufferDisposable = textBufferDisposable;
 		this._increaseVersionId();
 
 		// Flush all tokens
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
index e127f50e3..3cf7bc9a2 100644
--- a/src/vs/editor/common/model/textModelTokens.ts
+++ b/src/vs/editor/common/model/textModelTokens.ts
@@ -359,7 +359,7 @@ export class TextModelTokenization extends Disposable {
 			const text = this._textModel.getLineContent(lineIndex + 1);
 			const lineStartState = this._tokenizationStateStore.getBeginState(lineIndex);
 
-			const r = safeTokenize(languageIdentifier, this._tokenizationSupport, text, lineStartState!);
+			const r = safeTokenize(languageIdentifier, this._tokenizationSupport, text, true, lineStartState!);
 			builder.add(lineIndex + 1, r.tokens);
 			this._tokenizationStateStore.setEndState(linesLength, lineIndex, r.endState);
 			lineIndex = this._tokenizationStateStore.invalidLineStartIndex - 1; // -1 because the outer loop increments it
@@ -410,13 +410,13 @@ export class TextModelTokenization extends Disposable {
 		const languageIdentifier = this._textModel.getLanguageIdentifier();
 		let state = initialState;
 		for (let i = fakeLines.length - 1; i >= 0; i--) {
-			let r = safeTokenize(languageIdentifier, this._tokenizationSupport, fakeLines[i], state);
+			let r = safeTokenize(languageIdentifier, this._tokenizationSupport, fakeLines[i], false, state);
 			state = r.endState;
 		}
 
 		for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
 			let text = this._textModel.getLineContent(lineNumber);
-			let r = safeTokenize(languageIdentifier, this._tokenizationSupport, text, state);
+			let r = safeTokenize(languageIdentifier, this._tokenizationSupport, text, true, state);
 			builder.add(lineNumber, r.tokens);
 			this._tokenizationStateStore.setFakeTokens(lineNumber - 1);
 			state = r.endState;
@@ -443,12 +443,12 @@ function initializeTokenization(textModel: TextModel): [ITokenizationSupport | n
 	return [tokenizationSupport, initialState];
 }
 
-function safeTokenize(languageIdentifier: LanguageIdentifier, tokenizationSupport: ITokenizationSupport | null, text: string, state: IState): TokenizationResult2 {
+function safeTokenize(languageIdentifier: LanguageIdentifier, tokenizationSupport: ITokenizationSupport | null, text: string, hasEOL: boolean, state: IState): TokenizationResult2 {
 	let r: TokenizationResult2 | null = null;
 
 	if (tokenizationSupport) {
 		try {
-			r = tokenizationSupport.tokenize2(text, state.clone(), 0);
+			r = tokenizationSupport.tokenize2(text, hasEOL, state.clone(), 0);
 		} catch (e) {
 			onUnexpectedError(e);
 		}
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index fe0d7335d..204a4503e 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -211,9 +211,9 @@ export interface ITokenizationSupport {
 	getInitialState(): IState;
 
 	// add offsetDelta to each of the returned indices
-	tokenize(line: string, state: IState, offsetDelta: number): TokenizationResult;
+	tokenize(line: string, hasEOL: boolean, state: IState, offsetDelta: number): TokenizationResult;
 
-	tokenize2(line: string, state: IState, offsetDelta: number): TokenizationResult2;
+	tokenize2(line: string, hasEOL: boolean, state: IState, offsetDelta: number): TokenizationResult2;
 }
 
 /**
@@ -1659,6 +1659,19 @@ export interface CodeLensProvider {
 	resolveCodeLens?(model: model.ITextModel, codeLens: CodeLens, token: CancellationToken): ProviderResult<CodeLens>;
 }
 
+export interface InlineHint {
+	text: string;
+	range: IRange;
+	description?: string | IMarkdownString;
+	whitespaceBefore?: boolean;
+	whitespaceAfter?: boolean;
+}
+
+export interface InlineHintsProvider {
+	onDidChangeInlineHints?: Event<void> | undefined;
+	provideInlineHints(model: model.ITextModel, range: Range, token: CancellationToken): ProviderResult<InlineHint[]>;
+}
+
 export interface SemanticTokensLegend {
 	readonly tokenTypes: string[];
 	readonly tokenModifiers: string[];
@@ -1764,6 +1777,11 @@ export const TypeDefinitionProviderRegistry = new LanguageFeatureRegistry<TypeDe
  */
 export const CodeLensProviderRegistry = new LanguageFeatureRegistry<CodeLensProvider>();
 
+/**
+ * @internal
+ */
+export const InlineHintsProviderRegistry = new LanguageFeatureRegistry<InlineHintsProvider>();
+
 /**
  * @internal
  */
@@ -1876,3 +1894,14 @@ export interface ITokenizationRegistry {
  * @internal
  */
 export const TokenizationRegistry = new TokenizationRegistryImpl();
+
+
+/**
+ * @internal
+ */
+export enum ExternalUriOpenerPriority {
+	None = 0,
+	Option = 1,
+	Default = 2,
+	Preferred = 3,
+}
diff --git a/src/vs/editor/common/modes/languageConfiguration.ts b/src/vs/editor/common/modes/languageConfiguration.ts
index a383c57e9..3542fa74f 100644
--- a/src/vs/editor/common/modes/languageConfiguration.ts
+++ b/src/vs/editor/common/modes/languageConfiguration.ts
@@ -150,7 +150,7 @@ export interface OnEnterRule {
 	/**
 	 * This rule will only execute if the text above the this line matches this regular expression.
 	 */
-	oneLineAboveText?: RegExp;
+	previousLineText?: RegExp;
 	/**
 	 * The action to execute.
 	 */
diff --git a/src/vs/editor/common/modes/languageConfigurationRegistry.ts b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
index ccd20e376..6074e34cc 100644
--- a/src/vs/editor/common/modes/languageConfigurationRegistry.ts
+++ b/src/vs/editor/common/modes/languageConfigurationRegistry.ts
@@ -101,11 +101,11 @@ export class RichEditSupport {
 		return this._electricCharacter;
 	}
 
-	public onEnter(autoIndent: EditorAutoIndentStrategy, oneLineAboveText: string, beforeEnterText: string, afterEnterText: string): EnterAction | null {
+	public onEnter(autoIndent: EditorAutoIndentStrategy, previousLineText: string, beforeEnterText: string, afterEnterText: string): EnterAction | null {
 		if (!this._onEnterSupport) {
 			return null;
 		}
-		return this._onEnterSupport.onEnter(autoIndent, oneLineAboveText, beforeEnterText, afterEnterText);
+		return this._onEnterSupport.onEnter(autoIndent, previousLineText, beforeEnterText, afterEnterText);
 	}
 
 	private static _mergeConf(prev: LanguageConfiguration | null, current: LanguageConfiguration): LanguageConfiguration {
@@ -700,17 +700,17 @@ export class LanguageConfigurationRegistryImpl {
 			afterEnterText = endScopedLineTokens.getLineContent().substr(range.endColumn - 1 - scopedLineTokens.firstCharOffset);
 		}
 
-		let oneLineAboveText = '';
+		let previousLineText = '';
 		if (range.startLineNumber > 1 && scopedLineTokens.firstCharOffset === 0) {
 			// This is not the first line and the entire line belongs to this mode
 			const oneLineAboveScopedLineTokens = this.getScopedLineTokens(model, range.startLineNumber - 1);
 			if (oneLineAboveScopedLineTokens.languageId === scopedLineTokens.languageId) {
 				// The line above ends with text belonging to the same mode
-				oneLineAboveText = oneLineAboveScopedLineTokens.getLineContent();
+				previousLineText = oneLineAboveScopedLineTokens.getLineContent();
 			}
 		}
 
-		const enterResult = richEditSupport.onEnter(autoIndent, oneLineAboveText, beforeEnterText, afterEnterText);
+		const enterResult = richEditSupport.onEnter(autoIndent, previousLineText, beforeEnterText, afterEnterText);
 		if (!enterResult) {
 			return null;
 		}
@@ -729,6 +729,8 @@ export class LanguageConfigurationRegistryImpl {
 			} else {
 				appendText = '';
 			}
+		} else if (indentAction === IndentAction.Indent) {
+			appendText = '\t' + appendText;
 		}
 
 		let indentation = this.getIndentationAtPosition(model, range.startLineNumber, range.startColumn);
diff --git a/src/vs/editor/common/modes/modesRegistry.ts b/src/vs/editor/common/modes/modesRegistry.ts
index c2ef63388..ffc97c246 100644
--- a/src/vs/editor/common/modes/modesRegistry.ts
+++ b/src/vs/editor/common/modes/modesRegistry.ts
@@ -58,11 +58,12 @@ export const ModesRegistry = new EditorModesRegistry();
 Registry.add(Extensions.ModesRegistry, ModesRegistry);
 
 export const PLAINTEXT_MODE_ID = 'plaintext';
+export const PLAINTEXT_EXTENSION = '.txt';
 export const PLAINTEXT_LANGUAGE_IDENTIFIER = new LanguageIdentifier(PLAINTEXT_MODE_ID, LanguageId.PlainText);
 
 ModesRegistry.registerLanguage({
 	id: PLAINTEXT_MODE_ID,
-	extensions: ['.txt'],
+	extensions: [PLAINTEXT_EXTENSION],
 	aliases: [nls.localize('plainText.alias', "Plain Text"), 'text'],
 	mimetypes: ['text/plain']
 });
diff --git a/src/vs/editor/common/modes/supports/onEnter.ts b/src/vs/editor/common/modes/supports/onEnter.ts
index f42cc4a4d..c03b52439 100644
--- a/src/vs/editor/common/modes/supports/onEnter.ts
+++ b/src/vs/editor/common/modes/supports/onEnter.ts
@@ -49,7 +49,7 @@ export class OnEnterSupport {
 		this._regExpRules = opts.onEnterRules || [];
 	}
 
-	public onEnter(autoIndent: EditorAutoIndentStrategy, oneLineAboveText: string, beforeEnterText: string, afterEnterText: string): EnterAction | null {
+	public onEnter(autoIndent: EditorAutoIndentStrategy, previousLineText: string, beforeEnterText: string, afterEnterText: string): EnterAction | null {
 		// (1): `regExpRules`
 		if (autoIndent >= EditorAutoIndentStrategy.Advanced) {
 			for (let i = 0, len = this._regExpRules.length; i < len; i++) {
@@ -61,8 +61,8 @@ export class OnEnterSupport {
 					reg: rule.afterText,
 					text: afterEnterText
 				}, {
-					reg: rule.oneLineAboveText,
-					text: oneLineAboveText
+					reg: rule.previousLineText,
+					text: previousLineText
 				}].every((obj): boolean => {
 					return obj.reg ? obj.reg.test(obj.text) : true;
 				});
diff --git a/src/vs/editor/common/modes/textToHtmlTokenizer.ts b/src/vs/editor/common/modes/textToHtmlTokenizer.ts
index c48666416..a0eb66d20 100644
--- a/src/vs/editor/common/modes/textToHtmlTokenizer.ts
+++ b/src/vs/editor/common/modes/textToHtmlTokenizer.ts
@@ -12,12 +12,12 @@ import { NULL_STATE, nullTokenize2 } from 'vs/editor/common/modes/nullMode';
 
 export interface IReducedTokenizationSupport {
 	getInitialState(): IState;
-	tokenize2(line: string, state: IState, offsetDelta: number): TokenizationResult2;
+	tokenize2(line: string, hasEOL: boolean, state: IState, offsetDelta: number): TokenizationResult2;
 }
 
 const fallback: IReducedTokenizationSupport = {
 	getInitialState: () => NULL_STATE,
-	tokenize2: (buffer: string, state: IState, deltaOffset: number) => nullTokenize2(LanguageId.Null, buffer, state, deltaOffset)
+	tokenize2: (buffer: string, hasEOL: boolean, state: IState, deltaOffset: number) => nullTokenize2(LanguageId.Null, buffer, state, deltaOffset)
 };
 
 export function tokenizeToString(text: string, tokenizationSupport: IReducedTokenizationSupport = fallback): string {
@@ -110,7 +110,7 @@ function _tokenizeToString(text: string, tokenizationSupport: IReducedTokenizati
 			result += `<br/>`;
 		}
 
-		let tokenizationResult = tokenizationSupport.tokenize2(line, currentState, 0);
+		let tokenizationResult = tokenizationSupport.tokenize2(line, true, currentState, 0);
 		LineTokens.convertToEndOffset(tokenizationResult.tokens, line.length);
 		let lineTokens = new LineTokens(tokenizationResult.tokens, line);
 		let viewLineTokens = lineTokens.inflate();
diff --git a/src/vs/editor/common/services/getSemanticTokens.ts b/src/vs/editor/common/services/getSemanticTokens.ts
new file mode 100644
index 000000000..b0317a83a
--- /dev/null
+++ b/src/vs/editor/common/services/getSemanticTokens.ts
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
+import { ITextModel } from 'vs/editor/common/model';
+import { DocumentSemanticTokensProviderRegistry, DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend, DocumentRangeSemanticTokensProviderRegistry, DocumentRangeSemanticTokensProvider } from 'vs/editor/common/modes';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
+import { assertType } from 'vs/base/common/types';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { encodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
+import { Range } from 'vs/editor/common/core/range';
+
+export function isSemanticTokens(v: SemanticTokens | SemanticTokensEdits): v is SemanticTokens {
+	return v && !!((<SemanticTokens>v).data);
+}
+
+export function isSemanticTokensEdits(v: SemanticTokens | SemanticTokensEdits): v is SemanticTokensEdits {
+	return v && Array.isArray((<SemanticTokensEdits>v).edits);
+}
+
+export interface IDocumentSemanticTokensResult {
+	provider: DocumentSemanticTokensProvider;
+	request: Promise<SemanticTokens | SemanticTokensEdits | null | undefined>;
+}
+
+export function getDocumentSemanticTokens(model: ITextModel, lastResultId: string | null, token: CancellationToken): IDocumentSemanticTokensResult | null {
+	const provider = _getDocumentSemanticTokensProvider(model);
+	if (!provider) {
+		return null;
+	}
+	return {
+		provider: provider,
+		request: Promise.resolve(provider.provideDocumentSemanticTokens(model, lastResultId, token))
+	};
+}
+
+function _getDocumentSemanticTokensProvider(model: ITextModel): DocumentSemanticTokensProvider | null {
+	const result = DocumentSemanticTokensProviderRegistry.ordered(model);
+	return (result.length > 0 ? result[0] : null);
+}
+
+export function getDocumentRangeSemanticTokensProvider(model: ITextModel): DocumentRangeSemanticTokensProvider | null {
+	const result = DocumentRangeSemanticTokensProviderRegistry.ordered(model);
+	return (result.length > 0 ? result[0] : null);
+}
+
+CommandsRegistry.registerCommand('_provideDocumentSemanticTokensLegend', async (accessor, ...args): Promise<SemanticTokensLegend | undefined> => {
+	const [uri] = args;
+	assertType(uri instanceof URI);
+
+	const model = accessor.get(IModelService).getModel(uri);
+	if (!model) {
+		return undefined;
+	}
+
+	const provider = _getDocumentSemanticTokensProvider(model);
+	if (!provider) {
+		// there is no provider => fall back to a document range semantic tokens provider
+		return accessor.get(ICommandService).executeCommand('_provideDocumentRangeSemanticTokensLegend', uri);
+	}
+
+	return provider.getLegend();
+});
+
+CommandsRegistry.registerCommand('_provideDocumentSemanticTokens', async (accessor, ...args): Promise<VSBuffer | undefined> => {
+	const [uri] = args;
+	assertType(uri instanceof URI);
+
+	const model = accessor.get(IModelService).getModel(uri);
+	if (!model) {
+		return undefined;
+	}
+
+	const r = getDocumentSemanticTokens(model, null, CancellationToken.None);
+	if (!r) {
+		// there is no provider => fall back to a document range semantic tokens provider
+		return accessor.get(ICommandService).executeCommand('_provideDocumentRangeSemanticTokens', uri, model.getFullModelRange());
+	}
+
+	const { provider, request } = r;
+
+	let result: SemanticTokens | SemanticTokensEdits | null | undefined;
+	try {
+		result = await request;
+	} catch (err) {
+		onUnexpectedExternalError(err);
+		return undefined;
+	}
+
+	if (!result || !isSemanticTokens(result)) {
+		return undefined;
+	}
+
+	const buff = encodeSemanticTokensDto({
+		id: 0,
+		type: 'full',
+		data: result.data
+	});
+	if (result.resultId) {
+		provider.releaseDocumentSemanticTokens(result.resultId);
+	}
+	return buff;
+});
+
+CommandsRegistry.registerCommand('_provideDocumentRangeSemanticTokensLegend', async (accessor, ...args): Promise<SemanticTokensLegend | undefined> => {
+	const [uri] = args;
+	assertType(uri instanceof URI);
+
+	const model = accessor.get(IModelService).getModel(uri);
+	if (!model) {
+		return undefined;
+	}
+
+	const provider = getDocumentRangeSemanticTokensProvider(model);
+	if (!provider) {
+		return undefined;
+	}
+
+	return provider.getLegend();
+});
+
+CommandsRegistry.registerCommand('_provideDocumentRangeSemanticTokens', async (accessor, ...args): Promise<VSBuffer | undefined> => {
+	const [uri, range] = args;
+	assertType(uri instanceof URI);
+	assertType(Range.isIRange(range));
+
+	const model = accessor.get(IModelService).getModel(uri);
+	if (!model) {
+		return undefined;
+	}
+
+	const provider = getDocumentRangeSemanticTokensProvider(model);
+	if (!provider) {
+		// there is no provider
+		return undefined;
+	}
+
+	let result: SemanticTokens | null | undefined;
+	try {
+		result = await provider.provideDocumentRangeSemanticTokens(model, Range.lift(range), CancellationToken.None);
+	} catch (err) {
+		onUnexpectedExternalError(err);
+		return undefined;
+	}
+
+	if (!result || !isSemanticTokens(result)) {
+		return undefined;
+	}
+
+	return encodeSemanticTokensDto({
+		id: 0,
+		type: 'full',
+		data: result.data
+	});
+});
diff --git a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts
index eb2d6795d..a80302ddb 100644
--- a/src/vs/editor/common/services/markerDecorationsServiceImpl.ts
+++ b/src/vs/editor/common/services/markerDecorationsServiceImpl.ts
@@ -87,13 +87,13 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
 		this._markerDecorations.clear();
 	}
 
-	getMarker(model: ITextModel, decoration: IModelDecoration): IMarker | null {
-		const markerDecorations = this._markerDecorations.get(MODEL_ID(model.uri));
+	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null {
+		const markerDecorations = this._markerDecorations.get(MODEL_ID(uri));
 		return markerDecorations ? (markerDecorations.getMarker(decoration) || null) : null;
 	}
 
-	getLiveMarkers(model: ITextModel): [Range, IMarker][] {
-		const markerDecorations = this._markerDecorations.get(MODEL_ID(model.uri));
+	getLiveMarkers(uri: URI): [Range, IMarker][] {
+		const markerDecorations = this._markerDecorations.get(MODEL_ID(uri));
 		return markerDecorations ? markerDecorations.getMarkers() : [];
 	}
 
diff --git a/src/vs/editor/common/services/markersDecorationService.ts b/src/vs/editor/common/services/markersDecorationService.ts
index 745260c88..221f72379 100644
--- a/src/vs/editor/common/services/markersDecorationService.ts
+++ b/src/vs/editor/common/services/markersDecorationService.ts
@@ -8,6 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IMarker } from 'vs/platform/markers/common/markers';
 import { Event } from 'vs/base/common/event';
 import { Range } from 'vs/editor/common/core/range';
+import { URI } from 'vs/base/common/uri';
 
 export const IMarkerDecorationsService = createDecorator<IMarkerDecorationsService>('markerDecorationsService');
 
@@ -16,7 +17,7 @@ export interface IMarkerDecorationsService {
 
 	onDidChangeMarker: Event<ITextModel>;
 
-	getMarker(model: ITextModel, decoration: IModelDecoration): IMarker | null;
+	getMarker(uri: URI, decoration: IModelDecoration): IMarker | null;
 
-	getLiveMarkers(model: ITextModel): [Range, IMarker][];
+	getLiveMarkers(uri: URI): [Range, IMarker][];
 }
diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts
index 2739d6525..e52fbf61a 100644
--- a/src/vs/editor/common/services/modeService.ts
+++ b/src/vs/editor/common/services/modeService.ts
@@ -50,7 +50,7 @@ export interface IModeService {
 	// --- instantiation
 	create(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): ILanguageSelection;
 	createByLanguageName(languageName: string): ILanguageSelection;
-	createByFilepathOrFirstLine(rsource: URI | null, firstLine?: string): ILanguageSelection;
+	createByFilepathOrFirstLine(resource: URI | null, firstLine?: string): ILanguageSelection;
 
 	triggerMode(commaSeparatedMimetypesOrCommaSeparatedIds: string): void;
 }
diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
index 6b2fd6f80..f5a6eba1d 100644
--- a/src/vs/editor/common/services/modeServiceImpl.ts
+++ b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -40,23 +40,24 @@ class LanguageSelection extends Disposable implements ILanguageSelection {
 	}
 }
 
-export class ModeServiceImpl implements IModeService {
+export class ModeServiceImpl extends Disposable implements IModeService {
 	public _serviceBrand: undefined;
 
 	private readonly _instantiatedModes: { [modeId: string]: IMode; };
 	private readonly _registry: LanguagesRegistry;
 
-	private readonly _onDidCreateMode = new Emitter<IMode>();
+	private readonly _onDidCreateMode = this._register(new Emitter<IMode>());
 	public readonly onDidCreateMode: Event<IMode> = this._onDidCreateMode.event;
 
-	protected readonly _onLanguagesMaybeChanged = new Emitter<void>();
+	protected readonly _onLanguagesMaybeChanged = this._register(new Emitter<void>());
 	public readonly onLanguagesMaybeChanged: Event<void> = this._onLanguagesMaybeChanged.event;
 
 	constructor(warnOnOverwrite = false) {
+		super();
 		this._instantiatedModes = {};
 
-		this._registry = new LanguagesRegistry(true, warnOnOverwrite);
-		this._registry.onDidChange(() => this._onLanguagesMaybeChanged.fire());
+		this._registry = this._register(new LanguagesRegistry(true, warnOnOverwrite));
+		this._register(this._registry.onDidChange(() => this._onLanguagesMaybeChanged.fire()));
 	}
 
 	protected _onReady(): Promise<boolean> {
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index 866727686..15824fd70 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -29,6 +29,7 @@ import { StringSHA1 } from 'vs/base/common/hash';
 import { EditStackElement, isEditStackElement } from 'vs/editor/common/model/editStack';
 import { Schemas } from 'vs/base/common/network';
 import { SemanticTokensProviderStyling, toMultilineTokens2 } from 'vs/editor/common/services/semanticTokensProviderStyling';
+import { getDocumentSemanticTokens, isSemanticTokens, isSemanticTokensEdits } from 'vs/editor/common/services/getSemanticTokens';
 
 export interface IEditorSemanticHighlightingOptions {
 	enabled: true | false | 'configuredByTheme';
@@ -412,10 +413,11 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 
 	public updateModel(model: ITextModel, value: string | ITextBufferFactory): void {
 		const options = this.getCreationOptions(model.getLanguageIdentifier().language, model.uri, model.isForSimpleWidget);
-		const textBuffer = createTextBuffer(value, options.defaultEOL);
+		const { textBuffer, disposable } = createTextBuffer(value, options.defaultEOL);
 
 		// Return early if the text is already set in that form
 		if (model.equalsTextBuffer(textBuffer)) {
+			disposable.dispose();
 			return;
 		}
 
@@ -428,6 +430,7 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 			() => []
 		);
 		model.pushStackElement();
+		disposable.dispose();
 	}
 
 	private static _commonPrefix(a: ILineSequence, aLen: number, aDelta: number, b: ILineSequence, bLen: number, bDelta: number): number {
@@ -513,58 +516,6 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 		if (!modelData) {
 			return;
 		}
-		const model = modelData.model;
-		const sharesUndoRedoStack = (this._undoRedoService.getUriComparisonKey(model.uri) !== model.uri.toString());
-		let maintainUndoRedoStack = false;
-		let heapSize = 0;
-		if (sharesUndoRedoStack || (this._shouldRestoreUndoStack() && schemaShouldMaintainUndoRedoElements(resource))) {
-			const elements = this._undoRedoService.getElements(resource);
-			if (elements.past.length > 0 || elements.future.length > 0) {
-				for (const element of elements.past) {
-					if (isEditStackElement(element) && element.matchesResource(resource)) {
-						maintainUndoRedoStack = true;
-						heapSize += element.heapSize(resource);
-						element.setModel(resource); // remove reference from text buffer instance
-					}
-				}
-				for (const element of elements.future) {
-					if (isEditStackElement(element) && element.matchesResource(resource)) {
-						maintainUndoRedoStack = true;
-						heapSize += element.heapSize(resource);
-						element.setModel(resource); // remove reference from text buffer instance
-					}
-				}
-			}
-		}
-
-		if (!maintainUndoRedoStack) {
-			if (!sharesUndoRedoStack) {
-				const initialUndoRedoSnapshot = modelData.model.getInitialUndoRedoSnapshot();
-				if (initialUndoRedoSnapshot !== null) {
-					this._undoRedoService.restoreSnapshot(initialUndoRedoSnapshot);
-				}
-			}
-			modelData.model.dispose();
-			return;
-		}
-
-		const maxMemory = ModelServiceImpl.MAX_MEMORY_FOR_CLOSED_FILES_UNDO_STACK;
-		if (!sharesUndoRedoStack && heapSize > maxMemory) {
-			// the undo stack for this file would never fit in the configured memory, so don't bother with it.
-			const initialUndoRedoSnapshot = modelData.model.getInitialUndoRedoSnapshot();
-			if (initialUndoRedoSnapshot !== null) {
-				this._undoRedoService.restoreSnapshot(initialUndoRedoSnapshot);
-			}
-			modelData.model.dispose();
-			return;
-		}
-
-		this._ensureDisposedModelsHeapSize(maxMemory - heapSize);
-
-		// We only invalidate the elements, but they remain in the undo-redo service.
-		this._undoRedoService.setElementsValidFlag(resource, false, (element) => (isEditStackElement(element) && element.matchesResource(resource)));
-		this._insertDisposedModel(new DisposedModelInfo(resource, modelData.model.getInitialUndoRedoSnapshot(), Date.now(), sharesUndoRedoStack, heapSize, computeModelSha1(model), model.getVersionId(), model.getAlternativeVersionId()));
-
 		modelData.model.dispose();
 	}
 
@@ -599,6 +550,50 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 		const modelId = MODEL_ID(model.uri);
 		const modelData = this._models[modelId];
 
+		const sharesUndoRedoStack = (this._undoRedoService.getUriComparisonKey(model.uri) !== model.uri.toString());
+		let maintainUndoRedoStack = false;
+		let heapSize = 0;
+		if (sharesUndoRedoStack || (this._shouldRestoreUndoStack() && schemaShouldMaintainUndoRedoElements(model.uri))) {
+			const elements = this._undoRedoService.getElements(model.uri);
+			if (elements.past.length > 0 || elements.future.length > 0) {
+				for (const element of elements.past) {
+					if (isEditStackElement(element) && element.matchesResource(model.uri)) {
+						maintainUndoRedoStack = true;
+						heapSize += element.heapSize(model.uri);
+						element.setModel(model.uri); // remove reference from text buffer instance
+					}
+				}
+				for (const element of elements.future) {
+					if (isEditStackElement(element) && element.matchesResource(model.uri)) {
+						maintainUndoRedoStack = true;
+						heapSize += element.heapSize(model.uri);
+						element.setModel(model.uri); // remove reference from text buffer instance
+					}
+				}
+			}
+		}
+
+		const maxMemory = ModelServiceImpl.MAX_MEMORY_FOR_CLOSED_FILES_UNDO_STACK;
+		if (!maintainUndoRedoStack) {
+			if (!sharesUndoRedoStack) {
+				const initialUndoRedoSnapshot = modelData.model.getInitialUndoRedoSnapshot();
+				if (initialUndoRedoSnapshot !== null) {
+					this._undoRedoService.restoreSnapshot(initialUndoRedoSnapshot);
+				}
+			}
+		} else if (!sharesUndoRedoStack && heapSize > maxMemory) {
+			// the undo stack for this file would never fit in the configured memory, so don't bother with it.
+			const initialUndoRedoSnapshot = modelData.model.getInitialUndoRedoSnapshot();
+			if (initialUndoRedoSnapshot !== null) {
+				this._undoRedoService.restoreSnapshot(initialUndoRedoSnapshot);
+			}
+		} else {
+			this._ensureDisposedModelsHeapSize(maxMemory - heapSize);
+			// We only invalidate the elements, but they remain in the undo-redo service.
+			this._undoRedoService.setElementsValidFlag(model.uri, false, (element) => (isEditStackElement(element) && element.matchesResource(model.uri)));
+			this._insertDisposedModel(new DisposedModelInfo(model.uri, modelData.model.getInitialUndoRedoSnapshot(), Date.now(), sharesUndoRedoStack, heapSize, computeModelSha1(model), model.getVersionId(), model.getAlternativeVersionId()));
+		}
+
 		delete this._models[modelId];
 		modelData.dispose();
 
@@ -718,7 +713,9 @@ class SemanticTokensResponse {
 	}
 }
 
-class ModelSemanticColoring extends Disposable {
+export class ModelSemanticColoring extends Disposable {
+
+	public static FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY = 300;
 
 	private _isDisposed: boolean;
 	private readonly _model: ITextModel;
@@ -734,7 +731,7 @@ class ModelSemanticColoring extends Disposable {
 		this._isDisposed = false;
 		this._model = model;
 		this._semanticStyling = stylingProvider;
-		this._fetchDocumentSemanticTokens = this._register(new RunOnceScheduler(() => this._fetchDocumentSemanticTokensNow(), 300));
+		this._fetchDocumentSemanticTokens = this._register(new RunOnceScheduler(() => this._fetchDocumentSemanticTokensNow(), ModelSemanticColoring.FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY));
 		this._currentDocumentResponse = null;
 		this._currentDocumentRequestCancellationTokenSource = null;
 		this._documentProvidersChangeListeners = [];
@@ -788,15 +785,21 @@ class ModelSemanticColoring extends Disposable {
 			// there is already a request running, let it finish...
 			return;
 		}
-		const provider = this._getSemanticColoringProvider();
-		if (!provider) {
+
+		const cancellationTokenSource = new CancellationTokenSource();
+		const lastResultId = this._currentDocumentResponse ? this._currentDocumentResponse.resultId || null : null;
+		const r = getDocumentSemanticTokens(this._model, lastResultId, cancellationTokenSource.token);
+		if (!r) {
+			// there is no provider
 			if (this._currentDocumentResponse) {
 				// there are semantic tokens set
 				this._model.setSemanticTokens(null, false);
 			}
 			return;
 		}
-		this._currentDocumentRequestCancellationTokenSource = new CancellationTokenSource();
+
+		const { provider, request } = r;
+		this._currentDocumentRequestCancellationTokenSource = cancellationTokenSource;
 
 		const pendingChanges: IModelContentChangedEvent[] = [];
 		const contentChangeListener = this._model.onDidChangeContent((e) => {
@@ -805,15 +808,13 @@ class ModelSemanticColoring extends Disposable {
 
 		const styling = this._semanticStyling.get(provider);
 
-		const lastResultId = this._currentDocumentResponse ? this._currentDocumentResponse.resultId || null : null;
-		const request = Promise.resolve(provider.provideDocumentSemanticTokens(this._model, lastResultId, this._currentDocumentRequestCancellationTokenSource.token));
-
 		request.then((res) => {
 			this._currentDocumentRequestCancellationTokenSource = null;
 			contentChangeListener.dispose();
 			this._setDocumentSemanticTokens(provider, res || null, styling, pendingChanges);
 		}, (err) => {
-			if (!err || typeof err.message !== 'string' || err.message.indexOf('busy') === -1) {
+			const isExpectedError = err && (errors.isPromiseCanceledError(err) || (typeof err.message === 'string' && err.message.indexOf('busy') !== -1));
+			if (!isExpectedError) {
 				errors.onUnexpectedError(err);
 			}
 
@@ -831,14 +832,6 @@ class ModelSemanticColoring extends Disposable {
 		});
 	}
 
-	private static _isSemanticTokens(v: SemanticTokens | SemanticTokensEdits): v is SemanticTokens {
-		return v && !!((<SemanticTokens>v).data);
-	}
-
-	private static _isSemanticTokensEdits(v: SemanticTokens | SemanticTokensEdits): v is SemanticTokensEdits {
-		return v && Array.isArray((<SemanticTokensEdits>v).edits);
-	}
-
 	private static _copy(src: Uint32Array, srcOffset: number, dest: Uint32Array, destOffset: number, length: number): void {
 		for (let i = 0; i < length; i++) {
 			dest[destOffset + i] = src[srcOffset + i];
@@ -847,6 +840,12 @@ class ModelSemanticColoring extends Disposable {
 
 	private _setDocumentSemanticTokens(provider: DocumentSemanticTokensProvider | null, tokens: SemanticTokens | SemanticTokensEdits | null, styling: SemanticTokensProviderStyling | null, pendingChanges: IModelContentChangedEvent[]): void {
 		const currentResponse = this._currentDocumentResponse;
+		const rescheduleIfNeeded = () => {
+			if (pendingChanges.length > 0 && !this._fetchDocumentSemanticTokens.isScheduled()) {
+				this._fetchDocumentSemanticTokens.schedule();
+			}
+		};
+
 		if (this._currentDocumentResponse) {
 			this._currentDocumentResponse.dispose();
 			this._currentDocumentResponse = null;
@@ -864,10 +863,11 @@ class ModelSemanticColoring extends Disposable {
 		}
 		if (!tokens) {
 			this._model.setSemanticTokens(null, true);
+			rescheduleIfNeeded();
 			return;
 		}
 
-		if (ModelSemanticColoring._isSemanticTokensEdits(tokens)) {
+		if (isSemanticTokensEdits(tokens)) {
 			if (!currentResponse) {
 				// not possible!
 				this._model.setSemanticTokens(null, true);
@@ -918,7 +918,7 @@ class ModelSemanticColoring extends Disposable {
 			}
 		}
 
-		if (ModelSemanticColoring._isSemanticTokens(tokens)) {
+		if (isSemanticTokens(tokens)) {
 
 			this._currentDocumentResponse = new SemanticTokensResponse(provider, tokens.resultId, tokens.data);
 
@@ -937,21 +937,13 @@ class ModelSemanticColoring extends Disposable {
 						}
 					}
 				}
-
-				if (!this._fetchDocumentSemanticTokens.isScheduled()) {
-					this._fetchDocumentSemanticTokens.schedule();
-				}
 			}
 
 			this._model.setSemanticTokens(result, true);
-			return;
+		} else {
+			this._model.setSemanticTokens(null, true);
 		}
 
-		this._model.setSemanticTokens(null, true);
-	}
-
-	private _getSemanticColoringProvider(): DocumentSemanticTokensProvider | null {
-		const result = DocumentSemanticTokensProviderRegistry.ordered(this._model);
-		return (result.length > 0 ? result[0] : null);
+		rescheduleIfNeeded();
 	}
 }
diff --git a/src/vs/workbench/api/common/shared/semanticTokensDto.ts b/src/vs/editor/common/services/semanticTokensDto.ts
similarity index 100%
rename from src/vs/workbench/api/common/shared/semanticTokensDto.ts
rename to src/vs/editor/common/services/semanticTokensDto.ts
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
index 8c772e3c3..ad85fc86c 100644
--- a/src/vs/editor/common/standalone/standaloneEnums.ts
+++ b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -287,11 +287,12 @@ export enum EditorOption {
 	wrappingIndent = 117,
 	wrappingStrategy = 118,
 	showDeprecated = 119,
-	editorClassName = 120,
-	pixelRatio = 121,
-	tabFocusMode = 122,
-	layoutInfo = 123,
-	wrappingInfo = 124
+	inlineHints = 120,
+	editorClassName = 121,
+	pixelRatio = 122,
+	tabFocusMode = 123,
+	layoutInfo = 124,
+	wrappingInfo = 125
 }
 
 /**
diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
index 24059d23a..9d5583ee0 100644
--- a/src/vs/editor/common/viewLayout/viewLayout.ts
+++ b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -255,7 +255,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
 
 		let result = this._linesLayout.getLinesTotalHeight();
 		if (options.get(EditorOption.scrollBeyondLastLine)) {
-			result += height - options.get(EditorOption.lineHeight);
+			result += Math.max(0, height - options.get(EditorOption.lineHeight) - options.get(EditorOption.padding).bottom);
 		} else {
 			result += this._getHorizontalScrollbarHeight(width, contentWidth);
 		}
diff --git a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
index 67a3b90fa..9640d0076 100644
--- a/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
+++ b/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.ts
@@ -303,6 +303,19 @@ function createLineBreaksFromPreviousLineBreaks(classifier: WrappingCharacterCla
 			breakOffsetVisibleColumn = forcedBreakOffsetVisibleColumn;
 		}
 
+		if (breakOffset <= lastBreakingOffset) {
+			// Make sure that we are advancing (at least one character)
+			const charCode = lineText.charCodeAt(lastBreakingOffset);
+			if (strings.isHighSurrogate(charCode)) {
+				// A surrogate pair must always be considered as a single unit, so it is never to be broken
+				breakOffset = lastBreakingOffset + 2;
+				breakOffsetVisibleColumn = lastBreakingOffsetVisibleColumn + 2;
+			} else {
+				breakOffset = lastBreakingOffset + 1;
+				breakOffsetVisibleColumn = lastBreakingOffsetVisibleColumn + computeCharWidth(charCode, lastBreakingOffsetVisibleColumn, tabSize, columnsForFullWidthChar);
+			}
+		}
+
 		lastBreakingOffset = breakOffset;
 		breakingOffsets[breakingOffsetsCount] = breakOffset;
 		lastBreakingOffsetVisibleColumn = breakOffsetVisibleColumn;
@@ -435,6 +448,10 @@ function computeCharWidth(charCode: number, visibleColumn: number, tabSize: numb
 	if (strings.isFullWidthCharacter(charCode)) {
 		return columnsForFullWidthChar;
 	}
+	if (charCode < 32) {
+		// when using `editor.renderControlCharacters`, the substitutions are often wide
+		return columnsForFullWidthChar;
+	}
 	return 1;
 }
 
diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts
index 50765f8ee..89ca90006 100644
--- a/src/vs/editor/common/viewModel/splitLinesCollection.ts
+++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts
@@ -503,15 +503,8 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
 			return null;
 		}
 
-		let hiddenAreas = this.getHiddenAreas();
-		let isInHiddenArea = false;
-		let testPosition = new Position(fromLineNumber, 1);
-		for (const hiddenArea of hiddenAreas) {
-			if (hiddenArea.containsPosition(testPosition)) {
-				isInHiddenArea = true;
-				break;
-			}
-		}
+		// cannot use this.getHiddenAreas() because those decorations have already seen the effect of this model change
+		const isInHiddenArea = (fromLineNumber > 2 && !this.lines[fromLineNumber - 2].isVisible());
 
 		let outputFromLineNumber = (fromLineNumber === 1 ? 1 : this.prefixSumComputer.getAccumulatedValue(fromLineNumber - 2) + 1);
 
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 932f6917e..a469a79bb 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -916,8 +916,8 @@ export class ViewModel extends Disposable implements IViewModel {
 	public getPosition(): Position {
 		return this._cursor.getPrimaryCursorState().modelState.position;
 	}
-	public setSelections(source: string | null | undefined, selections: readonly ISelection[]): void {
-		this._withViewEventsCollector(eventsCollector => this._cursor.setSelections(eventsCollector, source, selections));
+	public setSelections(source: string | null | undefined, selections: readonly ISelection[], reason = CursorChangeReason.NotSet): void {
+		this._withViewEventsCollector(eventsCollector => this._cursor.setSelections(eventsCollector, source, selections, reason));
 	}
 	public saveCursorState(): ICursorState[] {
 		return this._cursor.saveState();
diff --git a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts
index 0a11a1a5f..c59956eb2 100644
--- a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts
+++ b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts
@@ -39,20 +39,20 @@ suite('bracket matching', () => {
 			// start on closing bracket
 			editor.setPosition(new Position(1, 20));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 9));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 9));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 19));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 19));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 9));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 9));
 
 			// start on opening bracket
 			editor.setPosition(new Position(1, 23));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 31));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 31));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 23));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 23));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 31));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 31));
 
 			bracketMatchingController.dispose();
 		});
@@ -71,25 +71,25 @@ suite('bracket matching', () => {
 			// start position between brackets
 			editor.setPosition(new Position(1, 16));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 18));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 18));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 14));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 14));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 18));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 18));
 
 			// skip brackets in comments
 			editor.setPosition(new Position(1, 21));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 23));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 23));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 24));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 24));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 23));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 23));
 
 			// do not break if no brackets are available
 			editor.setPosition(new Position(1, 26));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getPosition(), new Position(1, 26));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 26));
 
 			bracketMatchingController.dispose();
 		});
@@ -109,32 +109,32 @@ suite('bracket matching', () => {
 			// start position in open brackets
 			editor.setPosition(new Position(1, 9));
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getPosition(), new Position(1, 20));
-			assert.deepEqual(editor.getSelection(), new Selection(1, 9, 1, 20));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 20));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 9, 1, 20));
 
 			// start position in close brackets
 			editor.setPosition(new Position(1, 20));
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getPosition(), new Position(1, 20));
-			assert.deepEqual(editor.getSelection(), new Selection(1, 9, 1, 20));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 20));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 9, 1, 20));
 
 			// start position between brackets
 			editor.setPosition(new Position(1, 16));
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getPosition(), new Position(1, 19));
-			assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 19));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 19));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 14, 1, 19));
 
 			// start position outside brackets
 			editor.setPosition(new Position(1, 21));
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getPosition(), new Position(1, 25));
-			assert.deepEqual(editor.getSelection(), new Selection(1, 23, 1, 25));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 25));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 23, 1, 25));
 
 			// do not break if no brackets are available
 			editor.setPosition(new Position(1, 26));
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getPosition(), new Position(1, 26));
-			assert.deepEqual(editor.getSelection(), new Selection(1, 26, 1, 26));
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 26));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 26, 1, 26));
 
 			bracketMatchingController.dispose();
 		});
@@ -159,7 +159,7 @@ suite('bracket matching', () => {
 
 			editor.setPosition(new Position(3, 5));
 			bracketMatchingController.jumpToBracket();
-			assert.deepEqual(editor.getSelection(), new Selection(5, 1, 5, 1));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(5, 1, 5, 1));
 
 			bracketMatchingController.dispose();
 		});
@@ -184,7 +184,7 @@ suite('bracket matching', () => {
 
 			editor.setPosition(new Position(3, 5));
 			bracketMatchingController.selectToBracket(false);
-			assert.deepEqual(editor.getSelection(), new Selection(1, 12, 5, 1));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 12, 5, 1));
 
 			bracketMatchingController.dispose();
 		});
@@ -207,7 +207,7 @@ suite('bracket matching', () => {
 				new Selection(1, 17, 1, 17)
 			]);
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(1, 8, 1, 13),
 				new Selection(1, 16, 1, 19)
@@ -220,7 +220,7 @@ suite('bracket matching', () => {
 				new Selection(1, 14, 1, 14)
 			]);
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(1, 8, 1, 13),
 				new Selection(1, 16, 1, 19)
@@ -233,7 +233,7 @@ suite('bracket matching', () => {
 				new Selection(1, 19, 1, 19)
 			]);
 			bracketMatchingController.selectToBracket(true);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(1, 8, 1, 13),
 				new Selection(1, 16, 1, 19)
diff --git a/src/vs/editor/contrib/clipboard/clipboard.ts b/src/vs/editor/contrib/clipboard/clipboard.ts
index 6860a7bb6..8a0f08ffc 100644
--- a/src/vs/editor/contrib/clipboard/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/clipboard.ts
@@ -24,10 +24,11 @@ const CLIPBOARD_CONTEXT_MENU_GROUP = '9_cutcopypaste';
 const supportsCut = (platform.isNative || document.queryCommandSupported('cut'));
 const supportsCopy = (platform.isNative || document.queryCommandSupported('copy'));
 // IE and Edge have trouble with setting html content in clipboard
-const supportsCopyWithSyntaxHighlighting = (supportsCopy && !browser.isEdge);
+const supportsCopyWithSyntaxHighlighting = (supportsCopy && !browser.isEdgeLegacy);
 // Firefox only supports navigator.clipboard.readText() in browser extensions.
 // See https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/readText#Browser_compatibility
-const supportsPaste = (browser.isFirefox ? document.queryCommandSupported('paste') : true);
+// When loading over http, navigator.clipboard can be undefined. See https://github.com/microsoft/monaco-editor/issues/2313
+const supportsPaste = (typeof navigator.clipboard === 'undefined' || browser.isFirefox) ? document.queryCommandSupported('paste') : true;
 
 function registerCommand<T extends Command>(command: T): T {
 	command.register();
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index 3fddfdff3..da622e6ef 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -98,14 +98,17 @@ export class CodeLensContribution implements IEditorContribution {
 		const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
 		const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
 
+		const fontFamilyVar = `--codelens-font-family${this._styleClassName}`;
+
 		let newStyle = `
 		.monaco-editor .codelens-decoration.${this._styleClassName} { line-height: ${codeLensHeight}px; font-size: ${fontSize}px; padding-right: ${Math.round(fontSize * 0.5)}px; font-feature-settings: ${editorFontInfo.fontFeatureSettings} }
 		.monaco-editor .codelens-decoration.${this._styleClassName} span.codicon { line-height: ${codeLensHeight}px; font-size: ${fontSize}px; }
 		`;
 		if (fontFamily) {
-			newStyle += `.monaco-editor .codelens-decoration.${this._styleClassName} { font-family: '${fontFamily}'}`;
+			newStyle += `.monaco-editor .codelens-decoration.${this._styleClassName} { font-family: var(${fontFamilyVar})}`;
 		}
 		this._styleElement.textContent = newStyle;
+		this._editor.getDomNode()?.style.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
 
 		//
 		this._editor.changeViewZones(accessor => {
diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
index f77b2dfc5..9014c904a 100644
--- a/src/vs/editor/contrib/codelens/codelensWidget.ts
+++ b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -14,7 +14,7 @@ import { editorCodeLensForeground } from 'vs/editor/common/view/editorColorRegis
 import { CodeLensItem } from 'vs/editor/contrib/codelens/codelens';
 import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
 class CodeLensViewZone implements IViewZone {
 
@@ -88,7 +88,7 @@ class CodeLensContentWidget implements IContentWidget {
 			}
 			hasSymbol = true;
 			if (lens.command) {
-				const title = renderCodicons(lens.command.title.trim());
+				const title = renderLabelWithIcons(lens.command.title.trim());
 				if (lens.command.id) {
 					children.push(dom.$('a', { id: String(i) }, ...title));
 					this._commands.set(String(i), lens.command);
diff --git a/src/vs/editor/contrib/colorPicker/colorContributions.ts b/src/vs/editor/contrib/colorPicker/colorContributions.ts
index 4a997061b..90f91a846 100644
--- a/src/vs/editor/contrib/colorPicker/colorContributions.ts
+++ b/src/vs/editor/contrib/colorPicker/colorContributions.ts
@@ -47,7 +47,7 @@ export class ColorContribution extends Disposable implements IEditorContribution
 		}
 
 		const hoverController = this._editor.getContribution<ModesHoverController>(ModesHoverController.ID);
-		if (!hoverController.contentWidget.isColorPickerVisible()) {
+		if (!hoverController.isColorPickerVisible()) {
 			const range = new Range(mouseEvent.target.range.startLineNumber, mouseEvent.target.range.startColumn + 1, mouseEvent.target.range.endLineNumber, mouseEvent.target.range.endColumn + 1);
 			hoverController.showContentHover(range, HoverStartMode.Delayed, false);
 		}
diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
index 2a4329ba9..81b47f075 100644
--- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
@@ -96,25 +96,25 @@ suite('Editor Contrib - Line Comment Command', () => {
 			throw new Error(`unexpected`);
 		}
 
-		assert.equal(r.shouldRemoveComments, false);
+		assert.strictEqual(r.shouldRemoveComments, false);
 
 		// Does not change `commentStr`
-		assert.equal(r.lines[0].commentStr, '//');
-		assert.equal(r.lines[1].commentStr, 'rem');
-		assert.equal(r.lines[2].commentStr, '!@#');
-		assert.equal(r.lines[3].commentStr, '!@#');
+		assert.strictEqual(r.lines[0].commentStr, '//');
+		assert.strictEqual(r.lines[1].commentStr, 'rem');
+		assert.strictEqual(r.lines[2].commentStr, '!@#');
+		assert.strictEqual(r.lines[3].commentStr, '!@#');
 
 		// Fills in `isWhitespace`
-		assert.equal(r.lines[0].ignore, true);
-		assert.equal(r.lines[1].ignore, true);
-		assert.equal(r.lines[2].ignore, false);
-		assert.equal(r.lines[3].ignore, false);
+		assert.strictEqual(r.lines[0].ignore, true);
+		assert.strictEqual(r.lines[1].ignore, true);
+		assert.strictEqual(r.lines[2].ignore, false);
+		assert.strictEqual(r.lines[3].ignore, false);
 
 		// Fills in `commentStrOffset`
-		assert.equal(r.lines[0].commentStrOffset, 2);
-		assert.equal(r.lines[1].commentStrOffset, 4);
-		assert.equal(r.lines[2].commentStrOffset, 4);
-		assert.equal(r.lines[3].commentStrOffset, 2);
+		assert.strictEqual(r.lines[0].commentStrOffset, 2);
+		assert.strictEqual(r.lines[1].commentStrOffset, 4);
+		assert.strictEqual(r.lines[2].commentStrOffset, 4);
+		assert.strictEqual(r.lines[3].commentStrOffset, 2);
 
 
 		r = LineCommentCommand._analyzeLines(Type.Toggle, true, createSimpleModel([
@@ -127,31 +127,31 @@ suite('Editor Contrib - Line Comment Command', () => {
 			throw new Error(`unexpected`);
 		}
 
-		assert.equal(r.shouldRemoveComments, true);
+		assert.strictEqual(r.shouldRemoveComments, true);
 
 		// Does not change `commentStr`
-		assert.equal(r.lines[0].commentStr, '//');
-		assert.equal(r.lines[1].commentStr, 'rem');
-		assert.equal(r.lines[2].commentStr, '!@#');
-		assert.equal(r.lines[3].commentStr, '!@#');
+		assert.strictEqual(r.lines[0].commentStr, '//');
+		assert.strictEqual(r.lines[1].commentStr, 'rem');
+		assert.strictEqual(r.lines[2].commentStr, '!@#');
+		assert.strictEqual(r.lines[3].commentStr, '!@#');
 
 		// Fills in `isWhitespace`
-		assert.equal(r.lines[0].ignore, true);
-		assert.equal(r.lines[1].ignore, false);
-		assert.equal(r.lines[2].ignore, false);
-		assert.equal(r.lines[3].ignore, false);
+		assert.strictEqual(r.lines[0].ignore, true);
+		assert.strictEqual(r.lines[1].ignore, false);
+		assert.strictEqual(r.lines[2].ignore, false);
+		assert.strictEqual(r.lines[3].ignore, false);
 
 		// Fills in `commentStrOffset`
-		assert.equal(r.lines[0].commentStrOffset, 2);
-		assert.equal(r.lines[1].commentStrOffset, 4);
-		assert.equal(r.lines[2].commentStrOffset, 4);
-		assert.equal(r.lines[3].commentStrOffset, 2);
+		assert.strictEqual(r.lines[0].commentStrOffset, 2);
+		assert.strictEqual(r.lines[1].commentStrOffset, 4);
+		assert.strictEqual(r.lines[2].commentStrOffset, 4);
+		assert.strictEqual(r.lines[3].commentStrOffset, 2);
 
 		// Fills in `commentStrLength`
-		assert.equal(r.lines[0].commentStrLength, 2);
-		assert.equal(r.lines[1].commentStrLength, 4);
-		assert.equal(r.lines[2].commentStrLength, 4);
-		assert.equal(r.lines[3].commentStrLength, 3);
+		assert.strictEqual(r.lines[0].commentStrLength, 2);
+		assert.strictEqual(r.lines[1].commentStrLength, 4);
+		assert.strictEqual(r.lines[2].commentStrLength, 4);
+		assert.strictEqual(r.lines[3].commentStrLength, 3);
 	});
 
 	test('_normalizeInsertionPoint', () => {
@@ -166,7 +166,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 			});
 			LineCommentCommand._normalizeInsertionPoint(model, offsets, 1, tabSize);
 			const actual = offsets.map(item => item.commentStrOffset);
-			assert.deepEqual(actual, expected, testName);
+			assert.deepStrictEqual(actual, expected, testName);
 		};
 
 		// Bug 16696:[comment] comments not aligned in this case
@@ -1083,7 +1083,7 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
 				tokenize: () => {
 					throw new Error('not implemented');
 				},
-				tokenize2: (line: string, state: modes.IState): TokenizationResult2 => {
+				tokenize2: (line: string, hasEOL: boolean, state: modes.IState): TokenizationResult2 => {
 					let languageId = (/^  /.test(line) ? INNER_LANGUAGE_ID : OUTER_LANGUAGE_ID);
 
 					let tokens = new Uint32Array(1 << 1);
diff --git a/src/vs/editor/contrib/cursorUndo/test/cursorUndo.test.ts b/src/vs/editor/contrib/cursorUndo/test/cursorUndo.test.ts
index 308484142..4a398b498 100644
--- a/src/vs/editor/contrib/cursorUndo/test/cursorUndo.test.ts
+++ b/src/vs/editor/contrib/cursorUndo/test/cursorUndo.test.ts
@@ -29,16 +29,16 @@ suite('FindController', () => {
 
 			// press Delete
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, {});
-			assert.deepEqual(editor.getValue(), 'hell');
-			assert.deepEqual(editor.getSelections(), [new Selection(1, 5, 1, 5)]);
+			assert.deepStrictEqual(editor.getValue(), 'hell');
+			assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 5, 1, 5)]);
 
 			// press left
 			CoreNavigationCommands.CursorLeft.runEditorCommand(null, editor, {});
-			assert.deepEqual(editor.getSelections(), [new Selection(1, 4, 1, 4)]);
+			assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 4, 1, 4)]);
 
 			// press Ctrl+U
 			cursorUndoAction.run(null!, editor, {});
-			assert.deepEqual(editor.getSelections(), [new Selection(1, 5, 1, 5)]);
+			assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 5, 1, 5)]);
 		});
 	});
 
@@ -52,12 +52,12 @@ suite('FindController', () => {
 			// type hello
 			editor.trigger('test', Handler.Type, { text: 'hell' });
 			editor.trigger('test', Handler.Type, { text: 'o' });
-			assert.deepEqual(editor.getValue(), 'hello');
-			assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
+			assert.deepStrictEqual(editor.getValue(), 'hello');
+			assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
 
 			// press Ctrl+U
 			cursorUndoAction.run(null!, editor, {});
-			assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
+			assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
 		});
 	});
 });
diff --git a/src/vs/editor/contrib/dnd/dnd.ts b/src/vs/editor/contrib/dnd/dnd.ts
index b1b4a06b7..d535bb906 100644
--- a/src/vs/editor/contrib/dnd/dnd.ts
+++ b/src/vs/editor/contrib/dnd/dnd.ts
@@ -20,6 +20,7 @@ import { IModelDeltaDecoration } from 'vs/editor/common/model';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
 
 function hasTriggerModifier(e: IKeyboardEvent | IMouseEvent): boolean {
 	if (isMacintosh) {
@@ -176,8 +177,8 @@ export class DragAndDropController extends Disposable implements IEditorContribu
 						}
 					});
 				}
-				// Use `mouse` as the source instead of `api`.
-				(<CodeEditorWidget>this._editor).setSelections(newSelections || [], 'mouse');
+				// Use `mouse` as the source instead of `api` and setting the reason to explicit (to behave like any other mouse operation).
+				(<CodeEditorWidget>this._editor).setSelections(newSelections || [], 'mouse', CursorChangeReason.Explicit);
 			} else if (!this._dragSelection.containsPosition(newCursorPosition) ||
 				(
 					(
diff --git a/src/vs/editor/contrib/gotoSymbol/documentSymbols.ts b/src/vs/editor/contrib/documentSymbols/documentSymbols.ts
similarity index 54%
rename from src/vs/editor/contrib/gotoSymbol/documentSymbols.ts
rename to src/vs/editor/contrib/documentSymbols/documentSymbols.ts
index 51702b59e..64f5fa0de 100644
--- a/src/vs/editor/contrib/gotoSymbol/documentSymbols.ts
+++ b/src/vs/editor/contrib/documentSymbols/documentSymbols.ts
@@ -4,62 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { DocumentSymbol } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { OutlineModel, OutlineElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { OutlineModel } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { assertType } from 'vs/base/common/types';
-import { Iterable } from 'vs/base/common/iterator';
 
 export async function getDocumentSymbols(document: ITextModel, flat: boolean, token: CancellationToken): Promise<DocumentSymbol[]> {
-
 	const model = await OutlineModel.create(document, token);
-	const roots: DocumentSymbol[] = [];
-	for (const child of model.children.values()) {
-		if (child instanceof OutlineElement) {
-			roots.push(child.symbol);
-		} else {
-			roots.push(...Iterable.map(child.children.values(), child => child.symbol));
-		}
-	}
-
-	let flatEntries: DocumentSymbol[] = [];
-	if (token.isCancellationRequested) {
-		return flatEntries;
-	}
-	if (flat) {
-		flatten(flatEntries, roots, '');
-	} else {
-		flatEntries = roots;
-	}
-
-	return flatEntries.sort(compareEntriesUsingStart);
-}
-
-function compareEntriesUsingStart(a: DocumentSymbol, b: DocumentSymbol): number {
-	return Range.compareRangesUsingStarts(a.range, b.range);
-}
-
-function flatten(bucket: DocumentSymbol[], entries: DocumentSymbol[], overrideContainerLabel: string): void {
-	for (let entry of entries) {
-		bucket.push({
-			kind: entry.kind,
-			tags: entry.tags,
-			name: entry.name,
-			detail: entry.detail,
-			containerName: entry.containerName || overrideContainerLabel,
-			range: entry.range,
-			selectionRange: entry.selectionRange,
-			children: undefined, // we flatten it...
-		});
-		if (entry.children) {
-			flatten(bucket, entry.children, entry.name);
-		}
-	}
+	return flat
+		? model.asListOfDocumentSymbols()
+		: model.getTopLevelSymbols();
 }
 
 CommandsRegistry.registerCommand('_executeDocumentSymbolProvider', async function (accessor, ...args) {
diff --git a/src/vs/editor/contrib/documentSymbols/outline.ts b/src/vs/editor/contrib/documentSymbols/outline.ts
deleted file mode 100644
index 1dc949017..000000000
--- a/src/vs/editor/contrib/documentSymbols/outline.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-
-export const OutlineViewId = 'outline';
-
-export const OutlineViewFiltered = new RawContextKey('outlineFiltered', false);
-export const OutlineViewFocused = new RawContextKey('outlineFocused', false);
-
-export const enum OutlineConfigKeys {
-	'icons' = 'outline.icons',
-	'problemsEnabled' = 'outline.problems.enabled',
-	'problemsColors' = 'outline.problems.colors',
-	'problemsBadges' = 'outline.problems.badges'
-}
diff --git a/src/vs/editor/contrib/documentSymbols/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
index c85081502..5638223f9 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineModel.ts
+++ b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
@@ -14,8 +14,8 @@ import { ITextModel } from 'vs/editor/common/model';
 import { DocumentSymbol, DocumentSymbolProvider, DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
 import { MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { Iterable } from 'vs/base/common/iterator';
-import { URI } from 'vs/base/common/uri';
 import { LanguageFeatureRequestDelays } from 'vs/editor/common/modes/languageFeatureRegistry';
+import { URI } from 'vs/base/common/uri';
 
 export abstract class TreeElement {
 
@@ -204,8 +204,6 @@ export class OutlineGroup extends TreeElement {
 	}
 }
 
-
-
 export class OutlineModel extends TreeElement {
 
 	private static readonly _requestDurations = new LanguageFeatureRequestDelays(DocumentSymbolProviderRegistry, 350);
@@ -445,4 +443,43 @@ export class OutlineModel extends TreeElement {
 			group.updateMarker(marker.slice(0));
 		}
 	}
+
+	getTopLevelSymbols(): DocumentSymbol[] {
+		const roots: DocumentSymbol[] = [];
+		for (const child of this.children.values()) {
+			if (child instanceof OutlineElement) {
+				roots.push(child.symbol);
+			} else {
+				roots.push(...Iterable.map(child.children.values(), child => child.symbol));
+			}
+		}
+		return roots.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+	}
+
+	asListOfDocumentSymbols(): DocumentSymbol[] {
+		const roots = this.getTopLevelSymbols();
+		const bucket: DocumentSymbol[] = [];
+		OutlineModel._flattenDocumentSymbols(bucket, roots, '');
+		return bucket.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+	}
+
+	private static _flattenDocumentSymbols(bucket: DocumentSymbol[], entries: DocumentSymbol[], overrideContainerLabel: string): void {
+		for (const entry of entries) {
+			bucket.push({
+				kind: entry.kind,
+				tags: entry.tags,
+				name: entry.name,
+				detail: entry.detail,
+				containerName: entry.containerName || overrideContainerLabel,
+				range: entry.range,
+				selectionRange: entry.selectionRange,
+				children: undefined, // we flatten it...
+			});
+
+			// Recurse over children
+			if (entry.children) {
+				OutlineModel._flattenDocumentSymbols(bucket, entry.children, entry.name);
+			}
+		}
+	}
 }
diff --git a/src/vs/editor/contrib/find/findWidget.css b/src/vs/editor/contrib/find/findWidget.css
index 15ed9eb3f..86efb77c2 100644
--- a/src/vs/editor/contrib/find/findWidget.css
+++ b/src/vs/editor/contrib/find/findWidget.css
@@ -60,14 +60,14 @@
 }
 
 
-.monaco-editor .find-widget > .replace-part .monaco-inputbox > .wrapper > .mirror {
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .mirror {
 	padding-right: 22px;
 }
 
-.monaco-editor .find-widget > .find-part .monaco-inputbox > .wrapper > .input,
-.monaco-editor .find-widget > .find-part .monaco-inputbox > .wrapper > .mirror,
-.monaco-editor .find-widget > .replace-part .monaco-inputbox > .wrapper > .input,
-.monaco-editor .find-widget > .replace-part .monaco-inputbox > .wrapper > .mirror {
+.monaco-editor .find-widget > .find-part .monaco-inputbox > .ibwrapper > .input,
+.monaco-editor .find-widget > .find-part .monaco-inputbox > .ibwrapper > .mirror,
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .input,
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .mirror {
 	padding-top: 2px;
 	padding-bottom: 2px;
 }
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index 597af6c32..89981ba44 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -1044,7 +1044,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
 
 		// Toggle selection button
 		this._toggleSelectionFind = this._register(new Checkbox({
-			icon: ThemeIcon.asCSSIcon(findSelectionIcon),
+			icon: findSelectionIcon,
 			title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand),
 			isChecked: false
 		}));
diff --git a/src/vs/editor/contrib/find/test/find.test.ts b/src/vs/editor/contrib/find/test/find.test.ts
index 98f31f328..55490860d 100644
--- a/src/vs/editor/contrib/find/test/find.test.ts
+++ b/src/vs/editor/contrib/find/test/find.test.ts
@@ -20,17 +20,17 @@ suite('Find', () => {
 
 			// The cursor is at the very top, of the file, at the first ABC
 			let searchStringAtTop = getSelectionSearchString(editor);
-			assert.equal(searchStringAtTop, 'ABC');
+			assert.strictEqual(searchStringAtTop, 'ABC');
 
 			// Move cursor to the end of ABC
 			editor.setPosition(new Position(1, 3));
 			let searchStringAfterABC = getSelectionSearchString(editor);
-			assert.equal(searchStringAfterABC, 'ABC');
+			assert.strictEqual(searchStringAfterABC, 'ABC');
 
 			// Move cursor to DEF
 			editor.setPosition(new Position(1, 5));
 			let searchStringInsideDEF = getSelectionSearchString(editor);
-			assert.equal(searchStringInsideDEF, 'DEF');
+			assert.strictEqual(searchStringInsideDEF, 'DEF');
 
 		});
 	});
@@ -44,17 +44,17 @@ suite('Find', () => {
 			// Select A of ABC
 			editor.setSelection(new Range(1, 1, 1, 2));
 			let searchStringSelectionA = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionA, 'A');
+			assert.strictEqual(searchStringSelectionA, 'A');
 
 			// Select BC of ABC
 			editor.setSelection(new Range(1, 2, 1, 4));
 			let searchStringSelectionBC = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionBC, 'BC');
+			assert.strictEqual(searchStringSelectionBC, 'BC');
 
 			// Select BC DE
 			editor.setSelection(new Range(1, 2, 1, 7));
 			let searchStringSelectionBCDE = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionBCDE, 'BC DE');
+			assert.strictEqual(searchStringSelectionBCDE, 'BC DE');
 
 		});
 	});
@@ -68,17 +68,17 @@ suite('Find', () => {
 			// Select first line and newline
 			editor.setSelection(new Range(1, 1, 2, 1));
 			let searchStringSelectionWholeLine = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionWholeLine, null);
+			assert.strictEqual(searchStringSelectionWholeLine, null);
 
 			// Select first line and chunk of second
 			editor.setSelection(new Range(1, 1, 2, 4));
 			let searchStringSelectionTwoLines = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionTwoLines, null);
+			assert.strictEqual(searchStringSelectionTwoLines, null);
 
 			// Select end of first line newline and chunk of second
 			editor.setSelection(new Range(1, 7, 2, 4));
 			let searchStringSelectionSpanLines = getSelectionSearchString(editor);
-			assert.equal(searchStringSelectionSpanLines, null);
+			assert.strictEqual(searchStringSelectionSpanLines, null);
 
 		});
 	});
diff --git a/src/vs/editor/contrib/find/test/findController.test.ts b/src/vs/editor/contrib/find/test/findController.test.ts
index 8d9216ea0..3f55711c1 100644
--- a/src/vs/editor/contrib/find/test/findController.test.ts
+++ b/src/vs/editor/contrib/find/test/findController.test.ts
@@ -102,7 +102,7 @@ suite('FindController', async () => {
 			// I hit Ctrl+F to show the Find dialog
 			startFindAction.run(null, editor);
 
-			assert.deepEqual(findController.getGlobalBufferTerm(), findController.getState().searchString);
+			assert.deepStrictEqual(findController.getGlobalBufferTerm(), findController.getState().searchString);
 			findController.dispose();
 		});
 	});
@@ -126,9 +126,9 @@ suite('FindController', async () => {
 			let nextMatchFindAction = new NextMatchFindAction();
 
 			nextMatchFindAction.run(null, editor);
-			assert.equal(findState.searchString, 'ABC');
+			assert.strictEqual(findState.searchString, 'ABC');
 
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
 
 			findController.dispose();
 		});
@@ -152,7 +152,7 @@ suite('FindController', async () => {
 
 			findState.change({ searchString: 'ABC' }, true);
 
-			assert.deepEqual(findController.getGlobalBufferTerm(), 'ABC');
+			assert.deepStrictEqual(findController.getGlobalBufferTerm(), 'ABC');
 
 			findController.dispose();
 		});
@@ -181,14 +181,14 @@ suite('FindController', async () => {
 			findState.change({ searchString: 'ABC' }, true);
 
 			// The first ABC is highlighted.
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
 
 			// I hit Esc to exit the Find dialog.
 			findController.closeFindWidget();
 			findController.hasFocus = false;
 
 			// The cursor is now at end of the first line, with ABC on that line highlighted.
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 1, 1, 4]);
 
 			// I hit delete to remove it and change the text to XYZ.
 			editor.pushUndoStop();
@@ -201,16 +201,16 @@ suite('FindController', async () => {
 			//   ABC
 			//   XYZ
 			//   ABC
-			assert.equal(editor.getModel()!.getLineContent(1), 'XYZ');
+			assert.strictEqual(editor.getModel()!.getLineContent(1), 'XYZ');
 
 			// The cursor is at end of the first line.
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 4, 1, 4]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 4, 1, 4]);
 
 			// I hit F3 to "Find Next" to find the next occurrence of ABC, but instead it searches for XYZ.
 			await nextMatchFindAction.run(null, editor);
 
-			assert.equal(findState.searchString, 'ABC');
-			assert.equal(findController.hasFocus, false);
+			assert.strictEqual(findState.searchString, 'ABC');
+			assert.strictEqual(findController.hasFocus, false);
 
 			findController.dispose();
 		});
@@ -230,10 +230,10 @@ suite('FindController', async () => {
 			});
 
 			await nextMatchFindAction.run(null, editor);
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 26, 1, 29]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 26, 1, 29]);
 
 			await nextMatchFindAction.run(null, editor);
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 8, 1, 11]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 8, 1, 11]);
 
 			findController.dispose();
 		});
@@ -256,10 +256,10 @@ suite('FindController', async () => {
 			await startFindAction.run(null, editor);
 
 			await nextMatchFindAction.run(null, editor);
-			assert.deepEqual(fromSelection(editor.getSelection()!), [2, 9, 2, 13]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [2, 9, 2, 13]);
 
 			await nextMatchFindAction.run(null, editor);
-			assert.deepEqual(fromSelection(editor.getSelection()!), [1, 9, 1, 13]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [1, 9, 1, 13]);
 
 			findController.dispose();
 		});
@@ -288,7 +288,7 @@ suite('FindController', async () => {
 			await nextMatchFindAction.run(null, editor);
 			await startFindReplaceAction.run(null, editor);
 
-			assert.equal(findController.getState().searchString, testRegexString);
+			assert.strictEqual(findController.getState().searchString, testRegexString);
 
 			findController.dispose();
 		});
@@ -312,16 +312,16 @@ suite('FindController', async () => {
 				loop: true
 			});
 
-			assert.equal(findController.getState().searchScope, null);
+			assert.strictEqual(findController.getState().searchScope, null);
 
 			findController.getState().change({
 				searchScope: [new Range(1, 1, 1, 5)]
 			}, false);
 
-			assert.deepEqual(findController.getState().searchScope, [new Range(1, 1, 1, 5)]);
+			assert.deepStrictEqual(findController.getState().searchScope, [new Range(1, 1, 1, 5)]);
 
 			findController.closeFindWidget();
-			assert.equal(findController.getState().searchScope, null);
+			assert.strictEqual(findController.getState().searchScope, null);
 		});
 	});
 
@@ -338,13 +338,13 @@ suite('FindController', async () => {
 			findController.getState().change({ searchString: '\\b\\s{3}\\b', replaceString: ' ', isRegex: true }, false);
 			findController.moveToNextMatch();
 
-			assert.deepEqual(editor.getSelections()!.map(fromSelection), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromSelection), [
 				[1, 39, 1, 42]
 			]);
 
 			findController.replace();
 
-			assert.deepEqual(editor.getValue(), 'HRESULT OnAmbientPropertyChange(DISPID dispid);');
+			assert.deepStrictEqual(editor.getValue(), 'HRESULT OnAmbientPropertyChange(DISPID dispid);');
 
 			findController.dispose();
 		});
@@ -365,13 +365,13 @@ suite('FindController', async () => {
 			findController.getState().change({ searchString: '^', replaceString: 'x', isRegex: true }, false);
 			findController.moveToNextMatch();
 
-			assert.deepEqual(editor.getSelections()!.map(fromSelection), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromSelection), [
 				[2, 1, 2, 1]
 			]);
 
 			findController.replace();
 
-			assert.deepEqual(editor.getValue(), '\nxline2\nline3');
+			assert.deepStrictEqual(editor.getValue(), '\nxline2\nline3');
 
 			findController.dispose();
 		});
@@ -396,7 +396,7 @@ suite('FindController', async () => {
 			// cmd+f3
 			await nextSelectionMatchFindAction.run(null, editor);
 
-			assert.deepEqual(editor.getSelections()!.map(fromSelection), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromSelection), [
 				[3, 1, 3, 9]
 			]);
 
@@ -427,7 +427,7 @@ suite('FindController', async () => {
 			// cmd+f3
 			await nextSelectionMatchFindAction.run(null, editor);
 
-			assert.deepEqual(editor.getSelections()!.map(fromSelection), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromSelection), [
 				[3, 1, 3, 9]
 			]);
 
@@ -458,7 +458,7 @@ suite('FindController', async () => {
 			await startFindWithSelectionAction.run(null, editor);
 			let findState = findController.getState();
 
-			assert.deepEqual(findState.searchString.split(/\r\n|\r|\n/g), ['ABC', 'ABC']);
+			assert.deepStrictEqual(findState.searchString.split(/\r\n|\r|\n/g), ['ABC', 'ABC']);
 
 			editor.setSelection(new Selection(3, 1, 3, 1));
 			await startFindWithSelectionAction.run(null, editor);
@@ -483,7 +483,7 @@ suite('FindController', async () => {
 			startFindWithSelectionAction.run(null, editor);
 
 			let findState = findController.getState();
-			assert.deepEqual(findState.searchString, 'ABC');
+			assert.deepStrictEqual(findState.searchString, 'ABC');
 			findController.dispose();
 		});
 	});
@@ -531,7 +531,7 @@ suite('FindController query options persistence', async () => {
 			// I type ABC.
 			findState.change({ searchString: 'ABC' }, true);
 			// The second ABC is highlighted as matchCase is true.
-			assert.deepEqual(fromSelection(editor.getSelection()!), [2, 1, 2, 4]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [2, 1, 2, 4]);
 
 			findController.dispose();
 		});
@@ -558,7 +558,7 @@ suite('FindController query options persistence', async () => {
 			// I type AB.
 			findState.change({ searchString: 'AB' }, true);
 			// The second AB is highlighted as wholeWord is true.
-			assert.deepEqual(fromSelection(editor.getSelection()!), [2, 1, 2, 3]);
+			assert.deepStrictEqual(fromSelection(editor.getSelection()!), [2, 1, 2, 3]);
 
 			findController.dispose();
 		});
@@ -575,7 +575,7 @@ suite('FindController query options persistence', async () => {
 			// The cursor is at the very top, of the file, at the first ABC
 			let findController = editor.registerAndInstantiateContribution(TestFindController.ID, TestFindController);
 			findController.toggleRegex();
-			assert.equal(queryState['editor.isRegex'], true);
+			assert.strictEqual(queryState['editor.isRegex'], true);
 
 			findController.dispose();
 		});
@@ -601,13 +601,13 @@ suite('FindController query options persistence', async () => {
 
 			editor.setSelection(new Range(1, 1, 2, 1));
 			findController.start(findConfig);
-			assert.deepEqual(findController.getState().searchScope, [new Selection(1, 1, 2, 1)]);
+			assert.deepStrictEqual(findController.getState().searchScope, [new Selection(1, 1, 2, 1)]);
 
 			findController.closeFindWidget();
 
 			editor.setSelections([new Selection(1, 1, 2, 1), new Selection(2, 1, 2, 5)]);
 			findController.start(findConfig);
-			assert.deepEqual(findController.getState().searchScope, [new Selection(1, 1, 2, 1), new Selection(2, 1, 2, 5)]);
+			assert.deepStrictEqual(findController.getState().searchScope, [new Selection(1, 1, 2, 1), new Selection(2, 1, 2, 5)]);
 		});
 	});
 
@@ -631,7 +631,7 @@ suite('FindController query options persistence', async () => {
 				loop: true
 			});
 
-			assert.deepEqual(findController.getState().searchScope, null);
+			assert.deepStrictEqual(findController.getState().searchScope, null);
 		});
 	});
 
@@ -655,7 +655,7 @@ suite('FindController query options persistence', async () => {
 				loop: true
 			});
 
-			assert.deepEqual(findController.getState().searchScope, [new Selection(1, 2, 1, 3)]);
+			assert.deepStrictEqual(findController.getState().searchScope, [new Selection(1, 2, 1, 3)]);
 		});
 	});
 
@@ -680,7 +680,7 @@ suite('FindController query options persistence', async () => {
 				loop: true
 			});
 
-			assert.deepEqual(findController.getState().searchScope, [new Selection(1, 6, 2, 1)]);
+			assert.deepStrictEqual(findController.getState().searchScope, [new Selection(1, 6, 2, 1)]);
 		});
 	});
 });
diff --git a/src/vs/editor/contrib/find/test/findModel.test.ts b/src/vs/editor/contrib/find/test/findModel.test.ts
index 70c549498..10c7ae326 100644
--- a/src/vs/editor/contrib/find/test/findModel.test.ts
+++ b/src/vs/editor/contrib/find/test/findModel.test.ts
@@ -81,13 +81,13 @@ suite('FindModel', () => {
 	}
 
 	function assertFindState(editor: ICodeEditor, cursor: number[], highlighted: number[] | null, findDecorations: number[][]): void {
-		assert.deepEqual(fromRange(editor.getSelection()!), cursor, 'cursor');
+		assert.deepStrictEqual(fromRange(editor.getSelection()!), cursor, 'cursor');
 
 		let expectedState = {
 			highlighted: highlighted ? [highlighted] : [],
 			findDecorations: findDecorations
 		};
-		assert.deepEqual(_getFindState(editor), expectedState, 'state');
+		assert.deepStrictEqual(_getFindState(editor), expectedState, 'state');
 	}
 
 	findTest('incremental find from beginning of file', (editor) => {
@@ -245,7 +245,7 @@ suite('FindModel', () => {
 		findState.change({ searchString: 'hello' }, false);
 		let findModel = new FindModelBoundToEditorModel(editor, findState);
 
-		assert.equal(findState.matchesCount, 5);
+		assert.strictEqual(findState.matchesCount, 5);
 		assertFindState(
 			editor,
 			[1, 1, 1, 1],
@@ -275,7 +275,7 @@ suite('FindModel', () => {
 		findState.change({ searchString: 'hello' }, false);
 		let findModel = new FindModelBoundToEditorModel(editor, findState);
 
-		assert.equal(findState.matchesCount, 5);
+		assert.strictEqual(findState.matchesCount, 5);
 		assertFindState(
 			editor,
 			[1, 1, 1, 1],
@@ -290,7 +290,7 @@ suite('FindModel', () => {
 		);
 
 		findState.change({ searchString: 'helloo' }, false);
-		assert.equal(findState.matchesCount, 0);
+		assert.strictEqual(findState.matchesCount, 0);
 		assertFindState(
 			editor,
 			[1, 1, 1, 1],
@@ -1306,7 +1306,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1320,7 +1320,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1333,7 +1333,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, hi!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, hi!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1345,7 +1345,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1356,7 +1356,7 @@ suite('FindModel', () => {
 				[6, 14, 6, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1365,7 +1365,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, hi!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, hi!" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1398,7 +1398,7 @@ suite('FindModel', () => {
 				[11, 10, 11, 13]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// blablablaciao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// blablablaciao');
 
 		findModel.replace();
 		assertFindState(
@@ -1410,7 +1410,7 @@ suite('FindModel', () => {
 				[11, 11, 11, 14]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// ciaoblablaciao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// ciaoblablaciao');
 
 		findModel.replace();
 		assertFindState(
@@ -1421,7 +1421,7 @@ suite('FindModel', () => {
 				[11, 12, 11, 15]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// ciaociaoblaciao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// ciaociaoblaciao');
 
 		findModel.replace();
 		assertFindState(
@@ -1430,7 +1430,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// ciaociaociaociao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// ciaociaociaociao');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1467,7 +1467,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
 
 		findModel.replaceAll();
 		assertFindState(
@@ -1476,9 +1476,9 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, hi!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, hi!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1517,10 +1517,10 @@ suite('FindModel', () => {
 				[9, 1, 9, 3]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '  cout << "hello world, Hello!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '  cout << "hello world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '  cout << "Hello world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(9), '  cout << "helloworld again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '  cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '  cout << "hello world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '  cout << "Hello world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(9), '  cout << "helloworld again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1549,7 +1549,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// ciaociaociaociao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// ciaociaociaociao');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1578,10 +1578,10 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(11), '// <');
-		assert.equal(editor.getModel()!.getLineContent(12), '\t><');
-		assert.equal(editor.getModel()!.getLineContent(13), '\t><');
-		assert.equal(editor.getModel()!.getLineContent(14), '\t>ciao');
+		assert.strictEqual(editor.getModel()!.getLineContent(11), '// <');
+		assert.strictEqual(editor.getModel()!.getLineContent(12), '\t><');
+		assert.strictEqual(editor.getModel()!.getLineContent(13), '\t><');
+		assert.strictEqual(editor.getModel()!.getLineContent(14), '\t>ciao');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1610,8 +1610,8 @@ suite('FindModel', () => {
 			[]
 		);
 
-		assert.equal(editor.getModel()!.getLineContent(2), '#bar "cool.h"');
-		assert.equal(editor.getModel()!.getLineContent(3), '#bar <iostream>');
+		assert.strictEqual(editor.getModel()!.getLineContent(2), '#bar "cool.h"');
+		assert.strictEqual(editor.getModel()!.getLineContent(3), '#bar <iostream>');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1665,7 +1665,7 @@ suite('FindModel', () => {
 
 		findModel.selectAllMatches();
 
-		assert.deepEqual(editor!.getSelections()!.map(s => s.toString()), [
+		assert.deepStrictEqual(editor!.getSelections()!.map(s => s.toString()), [
 			new Selection(6, 14, 6, 19),
 			new Selection(6, 27, 6, 32),
 			new Selection(7, 14, 7, 19),
@@ -1709,14 +1709,14 @@ suite('FindModel', () => {
 
 		findModel.selectAllMatches();
 
-		assert.deepEqual(editor!.getSelections()!.map(s => s.toString()), [
+		assert.deepStrictEqual(editor!.getSelections()!.map(s => s.toString()), [
 			new Selection(7, 14, 7, 19),
 			new Selection(6, 14, 6, 19),
 			new Selection(6, 27, 6, 32),
 			new Selection(8, 14, 8, 19)
 		].map(s => s.toString()));
 
-		assert.deepEqual(editor!.getSelection()!.toString(), new Selection(7, 14, 7, 19).toString());
+		assert.deepStrictEqual(editor!.getSelection()!.toString(), new Selection(7, 14, 7, 19).toString());
 
 		assertFindState(
 			editor,
@@ -1800,7 +1800,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1812,7 +1812,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1823,7 +1823,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1832,7 +1832,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1871,7 +1871,7 @@ suite('FindModel', () => {
 			]
 		);
 
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "Hello world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "Hello world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1883,7 +1883,7 @@ suite('FindModel', () => {
 				[7, 14, 7, 19],
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1894,7 +1894,7 @@ suite('FindModel', () => {
 				[7, 14, 7, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1903,7 +1903,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -1927,9 +1927,9 @@ suite('FindModel', () => {
 
 		findModel.replaceAll();
 
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hi world again" << endl;');
 
 		assertFindState(
 			editor,
@@ -1970,7 +1970,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1982,7 +1982,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hilo world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hilo world, Hello!" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -1993,7 +1993,7 @@ suite('FindModel', () => {
 				[8, 14, 8, 19]
 			]
 		);
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hilo world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hilo world again" << endl;');
 
 		findModel.replace();
 		assertFindState(
@@ -2002,7 +2002,7 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "hilo world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "hilo world again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -2027,10 +2027,10 @@ suite('FindModel', () => {
 
 		findModel.replaceAll();
 
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello girl, Hello!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hello girl again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "Hello girl again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(9), '    cout << "hellogirl again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello girl, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hello girl again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "Hello girl again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(9), '    cout << "hellogirl again" << endl;');
 
 		assertFindState(
 			editor,
@@ -2060,8 +2060,8 @@ suite('FindModel', () => {
 
 		findModel.replaceAll();
 
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hello girl, Hello!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "Hello girl again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hello girl, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "Hello girl again" << endl;');
 
 		assertFindState(
 			editor,
@@ -2094,10 +2094,10 @@ suite('FindModel', () => {
 
 		findModel.replaceAll();
 
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "goodbye world, Goodbye!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "goodbye world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << "Goodbye world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(9), '    cout << "goodbyeworld again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "goodbye world, Goodbye!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "goodbye world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << "Goodbye world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(9), '    cout << "goodbyeworld again" << endl;');
 
 		assertFindState(
 			editor,
@@ -2134,9 +2134,9 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << " world, !" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << " world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(8), '    cout << " world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << " world, !" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << " world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(8), '    cout << " world again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -2159,7 +2159,7 @@ suite('FindModel', () => {
 			expectedText += 'a line' + i + '\n';
 		}
 		expectedText += 'a ';
-		assert.equal(editor!.getModel()!.getValue(), expectedText);
+		assert.strictEqual(editor!.getModel()!.getValue(), expectedText);
 
 		findModel.dispose();
 		findState.dispose();
@@ -2188,9 +2188,9 @@ suite('FindModel', () => {
 			null,
 			[]
 		);
-		assert.equal(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
-		assert.equal(editor.getModel()!.getLineContent(9), '    cout << "hiworld again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(6), '    cout << "hi world, Hello!" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(7), '    cout << "hi world again" << endl;');
+		assert.strictEqual(editor.getModel()!.getLineContent(9), '    cout << "hiworld again" << endl;');
 
 		findModel.dispose();
 		findState.dispose();
@@ -2219,78 +2219,78 @@ suite('FindModel', () => {
 		findState.change({ searchString: 'hello', loop: false }, false);
 		let findModel = new FindModelBoundToEditorModel(editor, findState);
 
-		assert.equal(findState.matchesCount, 5);
+		assert.strictEqual(findState.matchesCount, 5);
 
 		// Test next operations
-		assert.equal(findState.matchesPosition, 0);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 0);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), false);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), false);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 2);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 2);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 3);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 3);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 4);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 4);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 5);
-		assert.equal(findState.canNavigateForward(), false);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 5);
+		assert.strictEqual(findState.canNavigateForward(), false);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 5);
-		assert.equal(findState.canNavigateForward(), false);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 5);
+		assert.strictEqual(findState.canNavigateForward(), false);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 5);
-		assert.equal(findState.canNavigateForward(), false);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 5);
+		assert.strictEqual(findState.canNavigateForward(), false);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		// Test previous operations
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 4);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 4);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 3);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 3);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 2);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 2);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), false);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), false);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), false);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), false);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), false);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), false);
 
 	});
 
@@ -2299,78 +2299,78 @@ suite('FindModel', () => {
 		findState.change({ searchString: 'hello' }, false);
 		let findModel = new FindModelBoundToEditorModel(editor, findState);
 
-		assert.equal(findState.matchesCount, 5);
+		assert.strictEqual(findState.matchesCount, 5);
 
 		// Test next operations
-		assert.equal(findState.matchesPosition, 0);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 0);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 2);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 2);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 3);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 3);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 4);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 4);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 5);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 5);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToNextMatch();
-		assert.equal(findState.matchesPosition, 2);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 2);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		// Test previous operations
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 5);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 5);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 4);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 4);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 3);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 3);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 2);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 2);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 		findModel.moveToPrevMatch();
-		assert.equal(findState.matchesPosition, 1);
-		assert.equal(findState.canNavigateForward(), true);
-		assert.equal(findState.canNavigateBack(), true);
+		assert.strictEqual(findState.matchesPosition, 1);
+		assert.strictEqual(findState.canNavigateForward(), true);
+		assert.strictEqual(findState.canNavigateBack(), true);
 
 	});
 
diff --git a/src/vs/editor/contrib/find/test/replacePattern.test.ts b/src/vs/editor/contrib/find/test/replacePattern.test.ts
index 907292fd7..d94918640 100644
--- a/src/vs/editor/contrib/find/test/replacePattern.test.ts
+++ b/src/vs/editor/contrib/find/test/replacePattern.test.ts
@@ -13,7 +13,7 @@ suite('Replace Pattern test', () => {
 		let testParse = (input: string, expectedPieces: ReplacePiece[]) => {
 			let actual = parseReplaceString(input);
 			let expected = new ReplacePattern(expectedPieces);
-			assert.deepEqual(actual, expected, 'Parsing ' + input);
+			assert.deepStrictEqual(actual, expected, 'Parsing ' + input);
 		};
 
 		// no backslash => no treatment
@@ -73,14 +73,14 @@ suite('Replace Pattern test', () => {
 		let testParse = (input: string, expectedPieces: ReplacePiece[]) => {
 			let actual = parseReplaceString(input);
 			let expected = new ReplacePattern(expectedPieces);
-			assert.deepEqual(actual, expected, 'Parsing ' + input);
+			assert.deepStrictEqual(actual, expected, 'Parsing ' + input);
 		};
 		function assertReplace(target: string, search: RegExp, replaceString: string, expected: string): void {
 			let replacePattern = parseReplaceString(replaceString);
 			let m = search.exec(target);
 			let actual = replacePattern.buildReplaceString(m);
 
-			assert.equal(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
+			assert.strictEqual(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
 		}
 
 		// \U, \u => uppercase  \L, \l => lowercase  \E => cancel
@@ -107,7 +107,7 @@ suite('Replace Pattern test', () => {
 			let m = search.exec(target);
 			let actual = replacePattern.buildReplaceString(m);
 
-			assert.deepEqual(actual, expected, `${target}.replace(${search}, ${replaceString})`);
+			assert.deepStrictEqual(actual, expected, `${target}.replace(${search}, ${replaceString})`);
 		};
 
 		testJSReplaceSemantics('hi', /hi/, 'hello', 'hi'.replace(/hi/, 'hello'));
@@ -136,7 +136,7 @@ suite('Replace Pattern test', () => {
 			let m = search.exec(target);
 			let actual = replacePattern.buildReplaceString(m);
 
-			assert.equal(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
+			assert.strictEqual(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
 		}
 
 		assertReplace('bla', /bla/, 'hello', 'hello');
@@ -162,7 +162,7 @@ suite('Replace Pattern test', () => {
 			let m = search.exec(target);
 			let actual = replacePattern.buildReplaceString(m);
 
-			assert.equal(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
+			assert.strictEqual(actual, expected, `${target}.replace(${search}, ${replaceString}) === ${expected}`);
 		}
 		assertReplace('this is a bla text', /bla/, 'hello', 'hello');
 		assertReplace('this is a bla text', /this(?=.*bla)/, 'that', 'that');
@@ -184,14 +184,14 @@ suite('Replace Pattern test', () => {
 		let replacePattern = parseReplaceString('a{$1}');
 		let matches = /a(z)?/.exec('abcd');
 		let actual = replacePattern.buildReplaceString(matches);
-		assert.equal(actual, 'a{}');
+		assert.strictEqual(actual, 'a{}');
 	});
 
 	test('buildReplaceStringWithCasePreserved test', () => {
 		function assertReplace(target: string[], replaceString: string, expected: string): void {
 			let actual: string = '';
 			actual = buildReplaceStringWithCasePreserved(target, replaceString);
-			assert.equal(actual, expected);
+			assert.strictEqual(actual, expected);
 		}
 
 		assertReplace(['abc'], 'Def', 'def');
@@ -219,7 +219,7 @@ suite('Replace Pattern test', () => {
 		function assertReplace(target: string[], replaceString: string, expected: string): void {
 			let replacePattern = parseReplaceString(replaceString);
 			let actual = replacePattern.buildReplaceString(target, true);
-			assert.equal(actual, expected);
+			assert.strictEqual(actual, expected);
 		}
 
 		assertReplace(['abc'], 'Def', 'def');
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
index 10a503f67..8096baa17 100644
--- a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -16,13 +16,12 @@ import { Color } from 'vs/base/common/color';
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ScrollType } from 'vs/editor/common/editorCommon';
-import { getBaseLabel, getPathLabel } from 'vs/base/common/labels';
+import { getBaseLabel } from 'vs/base/common/labels';
 import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
 import { PeekViewWidget, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/peekView/peekView';
 import { basename } from 'vs/base/common/resources';
 import { IAction } from 'vs/base/common/actions';
-import { IActionBarOptions, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -31,6 +30,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { splitLines } from 'vs/base/common/strings';
+import { ILabelService } from 'vs/platform/label/common/label';
 
 class MessageWidget {
 
@@ -51,6 +51,7 @@ class MessageWidget {
 		editor: ICodeEditor,
 		onRelatedInformation: (related: IRelatedInformation) => void,
 		private readonly _openerService: IOpenerService,
+		private readonly _labelService: ILabelService
 	) {
 		this._editor = editor;
 
@@ -169,7 +170,7 @@ class MessageWidget {
 				let relatedResource = document.createElement('a');
 				relatedResource.classList.add('filename');
 				relatedResource.innerText = `${getBaseLabel(related.resource)}(${related.startLineNumber}, ${related.startColumn}): `;
-				relatedResource.title = getPathLabel(related.resource, undefined);
+				relatedResource.title = this._labelService.getUriLabel(related.resource);
 				this._relatedDiagnostics.set(relatedResource, related);
 
 				let relatedMessage = document.createElement('span');
@@ -248,7 +249,8 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IMenuService private readonly _menuService: IMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ILabelService private readonly _labelService: ILabelService
 	) {
 		super(editor, { showArrow: true, showFrame: true, isAccessible: true }, instantiationService);
 		this._severity = MarkerSeverity.Warning;
@@ -310,13 +312,6 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		this._icon = dom.append(container, dom.$(''));
 	}
 
-	protected _getActionBarOptions(): IActionBarOptions {
-		return {
-			...super._getActionBarOptions(),
-			orientation: ActionsOrientation.HORIZONTAL
-		};
-	}
-
 	protected _fillBody(container: HTMLElement): void {
 		this._parentContainer = container;
 		container.classList.add('marker-widget');
@@ -326,7 +321,7 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		this._container = document.createElement('div');
 		container.appendChild(this._container);
 
-		this._message = new MessageWidget(this._container, this.editor, related => this._onDidSelectRelatedInformation.fire(related), this._openerService);
+		this._message = new MessageWidget(this._container, this.editor, related => this._onDidSelectRelatedInformation.fire(related), this._openerService, this._labelService);
 		this._disposables.add(this._message);
 	}
 
diff --git a/src/vs/editor/contrib/gotoSymbol/referencesModel.ts b/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
index 334928f3c..63f6b9527 100644
--- a/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
+++ b/src/vs/editor/contrib/gotoSymbol/referencesModel.ts
@@ -51,7 +51,7 @@ export class OneReference {
 			);
 		} else {
 			return localize(
-				'aria.oneReference.preview', "symbol in {0} on line {1} at column {2}, {3}",
+				{ key: 'aria.oneReference.preview', comment: ['Placeholders are: 0: filename, 1:line number, 2: column number, 3: preview snippet of source code'] }, "symbol in {0} on line {1} at column {2}, {3}",
 				basename(this.uri), this.range.startLineNumber, this.range.startColumn, preview.value
 			);
 		}
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index c57fbadbb..071253cbd 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { IEmptyContentData } from 'vs/editor/browser/controller/mouseTarget';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
@@ -22,11 +22,10 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { editorHoverBackground, editorHoverBorder, editorHoverHighlight, textCodeBlockBackground, textLinkForeground, editorHoverStatusBarBackground, editorHoverForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export class ModesHoverController implements IEditorContribution {
 
@@ -35,22 +34,8 @@ export class ModesHoverController implements IEditorContribution {
 	private readonly _toUnhook = new DisposableStore();
 	private readonly _didChangeConfigurationHandler: IDisposable;
 
-	private readonly _contentWidget = new MutableDisposable<ModesContentHoverWidget>();
-	private readonly _glyphWidget = new MutableDisposable<ModesGlyphHoverWidget>();
-
-	get contentWidget(): ModesContentHoverWidget {
-		if (!this._contentWidget.value) {
-			this._createHoverWidgets();
-		}
-		return this._contentWidget.value!;
-	}
-
-	get glyphWidget(): ModesGlyphHoverWidget {
-		if (!this._glyphWidget.value) {
-			this._createHoverWidgets();
-		}
-		return this._glyphWidget.value!;
-	}
+	private _contentWidget: ModesContentHoverWidget | null;
+	private _glyphWidget: ModesGlyphHoverWidget | null;
 
 	private _isMouseDown: boolean;
 	private _hoverClicked: boolean;
@@ -64,15 +49,16 @@ export class ModesHoverController implements IEditorContribution {
 	}
 
 	constructor(private readonly _editor: ICodeEditor,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IModeService private readonly _modeService: IModeService,
-		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IContextKeyService _contextKeyService: IContextKeyService
 	) {
 		this._isMouseDown = false;
 		this._hoverClicked = false;
+		this._contentWidget = null;
+		this._glyphWidget = null;
 
 		this._hookEvents();
 
@@ -113,8 +99,8 @@ export class ModesHoverController implements IEditorContribution {
 	}
 
 	private _onModelDecorationsChanged(): void {
-		this.contentWidget.onModelDecorationsChanged();
-		this.glyphWidget.onModelDecorationsChanged();
+		this._contentWidget?.onModelDecorationsChanged();
+		this._glyphWidget?.onModelDecorationsChanged();
 	}
 
 	private _onEditorScrollChanged(e: IScrollEvent): void {
@@ -153,7 +139,7 @@ export class ModesHoverController implements IEditorContribution {
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
 		let targetType = mouseEvent.target.type;
 
-		if (this._isMouseDown && this._hoverClicked && this.contentWidget.isColorPickerVisible()) {
+		if (this._isMouseDown && this._hoverClicked) {
 			return;
 		}
 
@@ -162,10 +148,14 @@ export class ModesHoverController implements IEditorContribution {
 			return;
 		}
 
+		if (this._isHoverSticky && !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) {
+			// selected text within content hover widget
+			return;
+		}
 
 		if (
 			!this._isHoverSticky && targetType === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === ModesContentHoverWidget.ID
-			&& this._contentWidget.value?.isColorPickerVisible()
+			&& this._contentWidget?.isColorPickerVisible()
 		) {
 			// though the hover is not sticky, the color picker needs to.
 			return;
@@ -186,26 +176,31 @@ export class ModesHoverController implements IEditorContribution {
 		}
 
 		if (targetType === MouseTargetType.CONTENT_TEXT) {
-			this.glyphWidget.hide();
+			this._glyphWidget?.hide();
 
 			if (this._isHoverEnabled && mouseEvent.target.range) {
 				// TODO@rebornix. This should be removed if we move Color Picker out of Hover component.
 				// Check if mouse is hovering on color decorator
 				const hoverOnColorDecorator = [...mouseEvent.target.element?.classList.values() || []].find(className => className.startsWith('ced-colorBox'))
 					&& mouseEvent.target.range.endColumn - mouseEvent.target.range.startColumn === 1;
-				if (hoverOnColorDecorator) {
-					// shift the mouse focus by one as color decorator is a `before` decoration of next character.
-					this.contentWidget.startShowingAt(new Range(mouseEvent.target.range.startLineNumber, mouseEvent.target.range.startColumn + 1, mouseEvent.target.range.endLineNumber, mouseEvent.target.range.endColumn + 1), HoverStartMode.Delayed, false);
-				} else {
-					this.contentWidget.startShowingAt(mouseEvent.target.range, HoverStartMode.Delayed, false);
+				const showAtRange = (
+					hoverOnColorDecorator // shift the mouse focus by one as color decorator is a `before` decoration of next character.
+						? new Range(mouseEvent.target.range.startLineNumber, mouseEvent.target.range.startColumn + 1, mouseEvent.target.range.endLineNumber, mouseEvent.target.range.endColumn + 1)
+						: mouseEvent.target.range
+				);
+				if (!this._contentWidget) {
+					this._contentWidget = new ModesContentHoverWidget(this._editor, this._hoverVisibleKey, this._instantiationService, this._themeService);
 				}
-
+				this._contentWidget.startShowingAt(showAtRange, HoverStartMode.Delayed, false);
 			}
 		} else if (targetType === MouseTargetType.GUTTER_GLYPH_MARGIN) {
-			this.contentWidget.hide();
+			this._contentWidget?.hide();
 
 			if (this._isHoverEnabled && mouseEvent.target.position) {
-				this.glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
+				if (!this._glyphWidget) {
+					this._glyphWidget = new ModesGlyphHoverWidget(this._editor, this._modeService, this._openerService);
+				}
+				this._glyphWidget.startShowingAt(mouseEvent.target.position.lineNumber);
 			}
 		} else {
 			this._hideWidgets();
@@ -220,29 +215,32 @@ export class ModesHoverController implements IEditorContribution {
 	}
 
 	private _hideWidgets(): void {
-		if (!this._glyphWidget.value || !this._contentWidget.value || (this._isMouseDown && this._hoverClicked && this._contentWidget.value.isColorPickerVisible())) {
+		if ((this._isMouseDown && this._hoverClicked && this._contentWidget?.isColorPickerVisible())) {
 			return;
 		}
 
-		this._glyphWidget.value.hide();
-		this._contentWidget.value.hide();
+		this._hoverClicked = false;
+		this._glyphWidget?.hide();
+		this._contentWidget?.hide();
 	}
 
-	private _createHoverWidgets() {
-		this._contentWidget.value = new ModesContentHoverWidget(this._editor, this._hoverVisibleKey, this._markerDecorationsService, this._keybindingService, this._themeService, this._modeService, this._openerService);
-		this._glyphWidget.value = new ModesGlyphHoverWidget(this._editor, this._modeService, this._openerService);
+	public isColorPickerVisible(): boolean {
+		return this._contentWidget?.isColorPickerVisible() || false;
 	}
 
 	public showContentHover(range: Range, mode: HoverStartMode, focus: boolean): void {
-		this.contentWidget.startShowingAt(range, mode, focus);
+		if (!this._contentWidget) {
+			this._contentWidget = new ModesContentHoverWidget(this._editor, this._hoverVisibleKey, this._instantiationService, this._themeService);
+		}
+		this._contentWidget.startShowingAt(range, mode, focus);
 	}
 
 	public dispose(): void {
 		this._unhookEvents();
 		this._toUnhook.dispose();
 		this._didChangeConfigurationHandler.dispose();
-		this._glyphWidget.dispose();
-		this._contentWidget.dispose();
+		this._glyphWidget?.dispose();
+		this._contentWidget?.dispose();
 	}
 }
 
diff --git a/src/vs/editor/contrib/hover/hoverWidgets.ts b/src/vs/editor/contrib/hover/hoverWidgets.ts
index cb8c02807..ecc374f22 100644
--- a/src/vs/editor/contrib/hover/hoverWidgets.ts
+++ b/src/vs/editor/contrib/hover/hoverWidgets.ts
@@ -3,168 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Widget } from 'vs/base/browser/ui/widget';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPositionPreference, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import { renderHoverAction, HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
-
-export class ContentHoverWidget extends Widget implements IContentWidget {
-
-	protected readonly _hover: HoverWidget;
-	private readonly _id: string;
-	protected _editor: ICodeEditor;
-	private _isVisible: boolean;
-	protected _showAtPosition: Position | null;
-	protected _showAtRange: Range | null;
-	private _stoleFocus: boolean;
-
-	// Editor.IContentWidget.allowEditorOverflow
-	public allowEditorOverflow = true;
-
-	protected get isVisible(): boolean {
-		return this._isVisible;
-	}
-
-	protected set isVisible(value: boolean) {
-		this._isVisible = value;
-		this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
-	}
-
-	constructor(
-		id: string,
-		editor: ICodeEditor,
-		private readonly _hoverVisibleKey: IContextKey<boolean>,
-		private readonly _keybindingService: IKeybindingService
-	) {
-		super();
-
-		this._hover = this._register(new HoverWidget());
-		this._id = id;
-		this._editor = editor;
-		this._isVisible = false;
-		this._stoleFocus = false;
-
-		this.onkeydown(this._hover.containerDomNode, (e: IKeyboardEvent) => {
-			if (e.equals(KeyCode.Escape)) {
-				this.hide();
-			}
-		});
-
-		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
-			if (e.hasChanged(EditorOption.fontInfo)) {
-				this.updateFont();
-			}
-		}));
-
-		this._editor.onDidLayoutChange(e => this.layout());
-
-		this.layout();
-		this._editor.addContentWidget(this);
-		this._showAtPosition = null;
-		this._showAtRange = null;
-		this._stoleFocus = false;
-	}
-
-	public getId(): string {
-		return this._id;
-	}
-
-	public getDomNode(): HTMLElement {
-		return this._hover.containerDomNode;
-	}
-
-	public showAt(position: Position, range: Range | null, focus: boolean): void {
-		// Position has changed
-		this._showAtPosition = position;
-		this._showAtRange = range;
-		this._hoverVisibleKey.set(true);
-		this.isVisible = true;
-
-		this._editor.layoutContentWidget(this);
-		// Simply force a synchronous render on the editor
-		// such that the widget does not really render with left = '0px'
-		this._editor.render();
-		this._stoleFocus = focus;
-		if (focus) {
-			this._hover.containerDomNode.focus();
-		}
-	}
-
-	public hide(): void {
-		if (!this.isVisible) {
-			return;
-		}
-
-		setTimeout(() => {
-			// Give commands a chance to see the key
-			if (!this.isVisible) {
-				this._hoverVisibleKey.set(false);
-			}
-		}, 0);
-		this.isVisible = false;
-
-		this._editor.layoutContentWidget(this);
-		if (this._stoleFocus) {
-			this._editor.focus();
-		}
-	}
-
-	public getPosition(): IContentWidgetPosition | null {
-		if (this.isVisible) {
-			return {
-				position: this._showAtPosition,
-				range: this._showAtRange,
-				preference: [
-					ContentWidgetPositionPreference.ABOVE,
-					ContentWidgetPositionPreference.BELOW
-				]
-			};
-		}
-		return null;
-	}
-
-	public dispose(): void {
-		this._editor.removeContentWidget(this);
-		super.dispose();
-	}
-
-	private updateFont(): void {
-		const codeClasses: HTMLElement[] = Array.prototype.slice.call(this._hover.contentsDomNode.getElementsByClassName('code'));
-		codeClasses.forEach(node => this._editor.applyFontInfo(node));
-	}
-
-	protected updateContents(node: Node): void {
-		this._hover.contentsDomNode.textContent = '';
-		this._hover.contentsDomNode.appendChild(node);
-		this.updateFont();
-
-		this._editor.layoutContentWidget(this);
-		this._hover.onContentsChanged();
-	}
-
-	protected _renderAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }): IDisposable {
-		const keybinding = this._keybindingService.lookupKeybinding(actionOptions.commandId);
-		const keybindingLabel = keybinding ? keybinding.getLabel() : null;
-		return renderHoverAction(parent, actionOptions, keybindingLabel);
-	}
-
-	private layout(): void {
-		const height = Math.max(this._editor.getLayoutInfo().height / 4, 250);
-		const { fontSize, lineHeight } = this._editor.getOption(EditorOption.fontInfo);
-
-		this._hover.contentsDomNode.style.fontSize = `${fontSize}px`;
-		this._hover.contentsDomNode.style.lineHeight = `${lineHeight}px`;
-		this._hover.contentsDomNode.style.maxHeight = `${height}px`;
-		this._hover.contentsDomNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`;
-	}
-}
 
 export class GlyphHoverWidget extends Widget implements IOverlayWidget {
 
diff --git a/src/vs/editor/contrib/hover/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/markdownHoverParticipant.ts
new file mode 100644
index 000000000..ec4442dbd
--- /dev/null
+++ b/src/vs/editor/contrib/hover/markdownHoverParticipant.ts
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import * as dom from 'vs/base/browser/dom';
+import { IMarkdownString, MarkdownString, isEmptyMarkdownString, markedStringsEquals } from 'vs/base/common/htmlContent';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Range } from 'vs/editor/common/core/range';
+import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
+import { asArray } from 'vs/base/common/arrays';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { IModelDecoration } from 'vs/editor/common/model';
+import { IEditorHover, IEditorHoverParticipant, IHoverPart } from 'vs/editor/contrib/hover/modesContentHover';
+import { HoverProviderRegistry } from 'vs/editor/common/modes';
+import { getHover } from 'vs/editor/contrib/hover/getHover';
+import { Position } from 'vs/editor/common/core/position';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+const $ = dom.$;
+
+export class MarkdownHover implements IHoverPart {
+
+	constructor(
+		public readonly range: Range,
+		public readonly contents: IMarkdownString[]
+	) { }
+
+	public equals(other: IHoverPart): boolean {
+		if (other instanceof MarkdownHover) {
+			return markedStringsEquals(this.contents, other.contents);
+		}
+		return false;
+	}
+}
+
+export class MarkdownHoverParticipant implements IEditorHoverParticipant<MarkdownHover> {
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _hover: IEditorHover,
+		@IModeService private readonly _modeService: IModeService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+	) { }
+
+	public createLoadingMessage(range: Range): MarkdownHover {
+		return new MarkdownHover(range, [new MarkdownString().appendText(nls.localize('modesContentHover.loading', "Loading..."))]);
+	}
+
+	public computeSync(hoverRange: Range, lineDecorations: IModelDecoration[]): MarkdownHover[] {
+		if (!this._editor.hasModel()) {
+			return [];
+		}
+
+		const model = this._editor.getModel();
+		const lineNumber = hoverRange.startLineNumber;
+		const maxColumn = model.getLineMaxColumn(lineNumber);
+		const result: MarkdownHover[] = [];
+		for (const d of lineDecorations) {
+			const startColumn = (d.range.startLineNumber === lineNumber) ? d.range.startColumn : 1;
+			const endColumn = (d.range.endLineNumber === lineNumber) ? d.range.endColumn : maxColumn;
+
+			const hoverMessage = d.options.hoverMessage;
+			if (!hoverMessage || isEmptyMarkdownString(hoverMessage)) {
+				continue;
+			}
+
+			const range = new Range(hoverRange.startLineNumber, startColumn, hoverRange.startLineNumber, endColumn);
+			result.push(new MarkdownHover(range, asArray(hoverMessage)));
+		}
+
+		return result;
+	}
+
+	public async computeAsync(range: Range, token: CancellationToken): Promise<MarkdownHover[]> {
+		if (!this._editor.hasModel() || !range) {
+			return Promise.resolve([]);
+		}
+
+		const model = this._editor.getModel();
+
+		if (!HoverProviderRegistry.has(model)) {
+			return Promise.resolve([]);
+		}
+
+		const hovers = await getHover(model, new Position(
+			range.startLineNumber,
+			range.startColumn
+		), token);
+
+		const result: MarkdownHover[] = [];
+		for (const hover of hovers) {
+			if (isEmptyMarkdownString(hover.contents)) {
+				continue;
+			}
+			const rng = hover.range ? Range.lift(hover.range) : range;
+			result.push(new MarkdownHover(rng, hover.contents));
+		}
+		return result;
+	}
+
+	public renderHoverParts(hoverParts: MarkdownHover[], fragment: DocumentFragment): IDisposable {
+		const disposables = new DisposableStore();
+		for (const hoverPart of hoverParts) {
+			for (const contents of hoverPart.contents) {
+				if (isEmptyMarkdownString(contents)) {
+					continue;
+				}
+				const markdownHoverElement = $('div.hover-row.markdown-hover');
+				const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents'));
+				const renderer = disposables.add(new MarkdownRenderer({ editor: this._editor }, this._modeService, this._openerService));
+				disposables.add(renderer.onDidRenderAsync(() => {
+					hoverContentsElement.className = 'hover-contents code-hover-contents';
+					this._hover.onContentsChanged();
+				}));
+				const renderedContents = disposables.add(renderer.render(contents));
+				hoverContentsElement.appendChild(renderedContents.element);
+				fragment.appendChild(markdownHoverElement);
+			}
+		}
+		return disposables;
+	}
+}
diff --git a/src/vs/editor/contrib/hover/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/markerHoverParticipant.ts
new file mode 100644
index 000000000..ad739c892
--- /dev/null
+++ b/src/vs/editor/contrib/hover/markerHoverParticipant.ts
@@ -0,0 +1,257 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import * as dom from 'vs/base/browser/dom';
+import { IDisposable, toDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Range } from 'vs/editor/common/core/range';
+import { CodeActionTriggerType } from 'vs/editor/common/modes';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
+import { IMarker, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
+import { basename } from 'vs/base/common/resources';
+import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { MarkerController, NextMarkerAction } from 'vs/editor/contrib/gotoError/gotoError';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { CancelablePromise, createCancelablePromise, disposableTimeout } from 'vs/base/common/async';
+import { getCodeActions, CodeActionSet } from 'vs/editor/contrib/codeAction/codeAction';
+import { QuickFixAction, QuickFixController } from 'vs/editor/contrib/codeAction/codeActionCommands';
+import { CodeActionKind, CodeActionTrigger } from 'vs/editor/contrib/codeAction/types';
+import { IModelDecoration } from 'vs/editor/common/model';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { Progress } from 'vs/platform/progress/common/progress';
+import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
+import { renderHoverAction } from 'vs/base/browser/ui/hover/hoverWidget';
+import { IEditorHover, IEditorHoverParticipant, IHoverPart } from 'vs/editor/contrib/hover/modesContentHover';
+
+const $ = dom.$;
+
+export class MarkerHover implements IHoverPart {
+
+	constructor(
+		public readonly range: Range,
+		public readonly marker: IMarker,
+	) { }
+
+	public equals(other: IHoverPart): boolean {
+		if (other instanceof MarkerHover) {
+			return IMarkerData.makeKey(this.marker) === IMarkerData.makeKey(other.marker);
+		}
+		return false;
+	}
+}
+
+const markerCodeActionTrigger: CodeActionTrigger = {
+	type: CodeActionTriggerType.Manual,
+	filter: { include: CodeActionKind.QuickFix }
+};
+
+export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHover> {
+
+	private recentMarkerCodeActionsInfo: { marker: IMarker, hasCodeActions: boolean } | undefined = undefined;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _hover: IEditorHover,
+		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+	) { }
+
+	public computeSync(hoverRange: Range, lineDecorations: IModelDecoration[]): MarkerHover[] {
+		if (!this._editor.hasModel()) {
+			return [];
+		}
+
+		const model = this._editor.getModel();
+		const lineNumber = hoverRange.startLineNumber;
+		const maxColumn = model.getLineMaxColumn(lineNumber);
+		const result: MarkerHover[] = [];
+		for (const d of lineDecorations) {
+			const startColumn = (d.range.startLineNumber === lineNumber) ? d.range.startColumn : 1;
+			const endColumn = (d.range.endLineNumber === lineNumber) ? d.range.endColumn : maxColumn;
+
+			const marker = this._markerDecorationsService.getMarker(model.uri, d);
+			if (!marker) {
+				continue;
+			}
+
+			const range = new Range(hoverRange.startLineNumber, startColumn, hoverRange.startLineNumber, endColumn);
+			result.push(new MarkerHover(range, marker));
+		}
+
+		return result;
+	}
+
+	public renderHoverParts(hoverParts: MarkerHover[], fragment: DocumentFragment): IDisposable {
+		if (!hoverParts.length) {
+			return Disposable.None;
+		}
+		const disposables = new DisposableStore();
+		hoverParts.forEach(msg => fragment.appendChild(this.renderMarkerHover(msg, disposables)));
+		const markerHoverForStatusbar = hoverParts.length === 1 ? hoverParts[0] : hoverParts.sort((a, b) => MarkerSeverity.compare(a.marker.severity, b.marker.severity))[0];
+		fragment.appendChild(this.renderMarkerStatusbar(markerHoverForStatusbar, disposables));
+		return disposables;
+	}
+
+	private renderMarkerHover(markerHover: MarkerHover, disposables: DisposableStore): HTMLElement {
+		const hoverElement = $('div.hover-row');
+		const markerElement = dom.append(hoverElement, $('div.marker.hover-contents'));
+		const { source, message, code, relatedInformation } = markerHover.marker;
+
+		this._editor.applyFontInfo(markerElement);
+		const messageElement = dom.append(markerElement, $('span'));
+		messageElement.style.whiteSpace = 'pre-wrap';
+		messageElement.innerText = message;
+
+		if (source || code) {
+			// Code has link
+			if (code && typeof code !== 'string') {
+				const sourceAndCodeElement = $('span');
+				if (source) {
+					const sourceElement = dom.append(sourceAndCodeElement, $('span'));
+					sourceElement.innerText = source;
+				}
+				const codeLink = dom.append(sourceAndCodeElement, $('a.code-link'));
+				codeLink.setAttribute('href', code.target.toString());
+
+				disposables.add(dom.addDisposableListener(codeLink, 'click', (e) => {
+					this._openerService.open(code.target);
+					e.preventDefault();
+					e.stopPropagation();
+				}));
+
+				const codeElement = dom.append(codeLink, $('span'));
+				codeElement.innerText = code.value;
+
+				const detailsElement = dom.append(markerElement, sourceAndCodeElement);
+				detailsElement.style.opacity = '0.6';
+				detailsElement.style.paddingLeft = '6px';
+			} else {
+				const detailsElement = dom.append(markerElement, $('span'));
+				detailsElement.style.opacity = '0.6';
+				detailsElement.style.paddingLeft = '6px';
+				detailsElement.innerText = source && code ? `${source}(${code})` : source ? source : `(${code})`;
+			}
+		}
+
+		if (isNonEmptyArray(relatedInformation)) {
+			for (const { message, resource, startLineNumber, startColumn } of relatedInformation) {
+				const relatedInfoContainer = dom.append(markerElement, $('div'));
+				relatedInfoContainer.style.marginTop = '8px';
+				const a = dom.append(relatedInfoContainer, $('a'));
+				a.innerText = `${basename(resource)}(${startLineNumber}, ${startColumn}): `;
+				a.style.cursor = 'pointer';
+				disposables.add(dom.addDisposableListener(a, 'click', (e) => {
+					e.stopPropagation();
+					e.preventDefault();
+					if (this._openerService) {
+						this._openerService.open(resource, {
+							fromUserGesture: true,
+							editorOptions: <ITextEditorOptions>{ selection: { startLineNumber, startColumn } }
+						}).catch(onUnexpectedError);
+					}
+				}));
+				const messageElement = dom.append<HTMLAnchorElement>(relatedInfoContainer, $('span'));
+				messageElement.innerText = message;
+				this._editor.applyFontInfo(messageElement);
+			}
+		}
+
+		return hoverElement;
+	}
+
+	private renderMarkerStatusbar(markerHover: MarkerHover, disposables: DisposableStore): HTMLElement {
+		const hoverElement = $('div.hover-row.status-bar');
+		const actionsElement = dom.append(hoverElement, $('div.actions'));
+		if (markerHover.marker.severity === MarkerSeverity.Error || markerHover.marker.severity === MarkerSeverity.Warning || markerHover.marker.severity === MarkerSeverity.Info) {
+			disposables.add(this.renderAction(actionsElement, {
+				label: nls.localize('peek problem', "Peek Problem"),
+				commandId: NextMarkerAction.ID,
+				run: () => {
+					this._hover.hide();
+					MarkerController.get(this._editor).showAtMarker(markerHover.marker);
+					this._editor.focus();
+				}
+			}));
+		}
+
+		if (!this._editor.getOption(EditorOption.readOnly)) {
+			const quickfixPlaceholderElement = dom.append(actionsElement, $('div'));
+			if (this.recentMarkerCodeActionsInfo) {
+				if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
+					if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
+						quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+					}
+				} else {
+					this.recentMarkerCodeActionsInfo = undefined;
+				}
+			}
+			const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposables.add(disposableTimeout(() => quickfixPlaceholderElement.textContent = nls.localize('checkingForQuickFixes', "Checking for quick fixes..."), 200));
+			if (!quickfixPlaceholderElement.textContent) {
+				// Have some content in here to avoid flickering
+				quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0); // &nbsp;
+			}
+			const codeActionsPromise = this.getCodeActions(markerHover.marker);
+			disposables.add(toDisposable(() => codeActionsPromise.cancel()));
+			codeActionsPromise.then(actions => {
+				updatePlaceholderDisposable.dispose();
+				this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
+
+				if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
+					actions.dispose();
+					quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
+					return;
+				}
+				quickfixPlaceholderElement.style.display = 'none';
+
+				let showing = false;
+				disposables.add(toDisposable(() => {
+					if (!showing) {
+						actions.dispose();
+					}
+				}));
+
+				disposables.add(this.renderAction(actionsElement, {
+					label: nls.localize('quick fixes', "Quick Fix..."),
+					commandId: QuickFixAction.Id,
+					run: (target) => {
+						showing = true;
+						const controller = QuickFixController.get(this._editor);
+						const elementPosition = dom.getDomNodePagePosition(target);
+						// Hide the hover pre-emptively, otherwise the editor can close the code actions
+						// context menu as well when using keyboard navigation
+						this._hover.hide();
+						controller.showCodeActions(markerCodeActionTrigger, actions, {
+							x: elementPosition.left + 6,
+							y: elementPosition.top + elementPosition.height + 6
+						});
+					}
+				}));
+			});
+		}
+
+		return hoverElement;
+	}
+
+	private renderAction(parent: HTMLElement, actionOptions: { label: string, iconClass?: string, run: (target: HTMLElement) => void, commandId: string }): IDisposable {
+		const keybinding = this._keybindingService.lookupKeybinding(actionOptions.commandId);
+		const keybindingLabel = keybinding ? keybinding.getLabel() : null;
+		return renderHoverAction(parent, actionOptions, keybindingLabel);
+	}
+
+	private getCodeActions(marker: IMarker): CancelablePromise<CodeActionSet> {
+		return createCancelablePromise(cancellationToken => {
+			return getCodeActions(
+				this._editor.getModel()!,
+				new Range(marker.startLineNumber, marker.startColumn, marker.endLineNumber, marker.endColumn),
+				markerCodeActionTrigger,
+				Progress.None,
+				cancellationToken);
+		});
+	}
+}
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index ad2d6b272..ee10d9b80 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -3,228 +3,242 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Color, RGBA } from 'vs/base/common/color';
-import { IMarkdownString, MarkdownString, isEmptyMarkdownString, markedStringsEquals } from 'vs/base/common/htmlContent';
-import { IDisposable, toDisposable, DisposableStore, combinedDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { IDisposable, DisposableStore, combinedDisposable } from 'vs/base/common/lifecycle';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { Position } from 'vs/editor/common/core/position';
-import { IRange, Range } from 'vs/editor/common/core/range';
+import { Range } from 'vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { DocumentColorProvider, Hover as MarkdownHover, HoverProviderRegistry, IColor, TokenizationRegistry, CodeActionTriggerType } from 'vs/editor/common/modes';
+import { DocumentColorProvider, IColor, TokenizationRegistry } from 'vs/editor/common/modes';
 import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color';
 import { ColorDetector } from 'vs/editor/contrib/colorPicker/colorDetector';
 import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel';
 import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/colorPickerWidget';
-import { getHover } from 'vs/editor/contrib/hover/getHover';
 import { HoverOperation, HoverStartMode, IHoverComputer } from 'vs/editor/contrib/hover/hoverOperation';
-import { ContentHoverWidget } from 'vs/editor/contrib/hover/hoverWidgets';
-import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
 import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { coalesce, isNonEmptyArray, asArray } from 'vs/base/common/arrays';
-import { IMarker, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { basename } from 'vs/base/common/resources';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { IOpenerService, NullOpenerService } from 'vs/platform/opener/common/opener';
-import { MarkerController, NextMarkerAction } from 'vs/editor/contrib/gotoError/gotoError';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { CancelablePromise, createCancelablePromise, disposableTimeout } from 'vs/base/common/async';
-import { getCodeActions, CodeActionSet } from 'vs/editor/contrib/codeAction/codeAction';
-import { QuickFixAction, QuickFixController } from 'vs/editor/contrib/codeAction/codeActionCommands';
-import { CodeActionKind, CodeActionTrigger } from 'vs/editor/contrib/codeAction/types';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { IIdentifiedSingleEditOperation, TrackedRangeStickiness } from 'vs/editor/common/model';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { coalesce } from 'vs/base/common/arrays';
+import { IIdentifiedSingleEditOperation, IModelDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Constants } from 'vs/base/common/uint';
 import { textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { Progress } from 'vs/platform/progress/common/progress';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { Widget } from 'vs/base/browser/ui/widget';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
+import { MarkerHover, MarkerHoverParticipant } from 'vs/editor/contrib/hover/markerHoverParticipant';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { MarkdownHover, MarkdownHoverParticipant } from 'vs/editor/contrib/hover/markdownHoverParticipant';
 
-const $ = dom.$;
+export interface IHoverPart {
+	readonly range: Range;
+	equals(other: IHoverPart): boolean;
+}
 
-class ColorHover {
+export interface IEditorHover {
+	hide(): void;
+	onContentsChanged(): void;
+}
+
+export interface IEditorHoverParticipant<T extends IHoverPart = IHoverPart> {
+	computeSync(hoverRange: Range, lineDecorations: IModelDecoration[]): T[];
+	computeAsync?(range: Range, token: CancellationToken): Promise<T[]>;
+	renderHoverParts(hoverParts: T[], fragment: DocumentFragment): IDisposable;
+}
+
+class ColorHover implements IHoverPart {
 
 	constructor(
-		public readonly range: IRange,
+		public readonly range: Range,
 		public readonly color: IColor,
 		public readonly provider: DocumentColorProvider
 	) { }
+
+	equals(other: IHoverPart): boolean {
+		return false;
+	}
 }
 
-class MarkerHover {
-
+class HoverPartInfo {
 	constructor(
-		public readonly range: IRange,
-		public readonly marker: IMarker,
+		public readonly owner: IEditorHoverParticipant | null,
+		public readonly data: IHoverPart
 	) { }
 }
 
-type HoverPart = MarkdownHover | ColorHover | MarkerHover;
-
-class ModesContentComputer implements IHoverComputer<HoverPart[]> {
+class ModesContentComputer implements IHoverComputer<HoverPartInfo[]> {
 
 	private readonly _editor: ICodeEditor;
-	private _result: HoverPart[];
-	private _range?: Range;
+	private _result: HoverPartInfo[];
+	private _range: Range | null;
 
 	constructor(
 		editor: ICodeEditor,
-		private readonly _markerDecorationsService: IMarkerDecorationsService
+		private readonly _markerHoverParticipant: IEditorHoverParticipant<MarkerHover>,
+		private readonly _markdownHoverParticipant: MarkdownHoverParticipant
 	) {
 		this._editor = editor;
 		this._result = [];
+		this._range = null;
 	}
 
-	setRange(range: Range): void {
+	public setRange(range: Range): void {
 		this._range = range;
 		this._result = [];
 	}
 
-	clearResult(): void {
+	public clearResult(): void {
 		this._result = [];
 	}
 
-	computeAsync(token: CancellationToken): Promise<HoverPart[]> {
+	public async computeAsync(token: CancellationToken): Promise<HoverPartInfo[]> {
 		if (!this._editor.hasModel() || !this._range) {
 			return Promise.resolve([]);
 		}
 
-		const model = this._editor.getModel();
-
-		if (!HoverProviderRegistry.has(model)) {
-			return Promise.resolve([]);
-		}
-
-		return getHover(model, new Position(
-			this._range.startLineNumber,
-			this._range.startColumn
-		), token);
+		const markdownHovers = await this._markdownHoverParticipant.computeAsync(this._range, token);
+		return markdownHovers.map(h => new HoverPartInfo(this._markdownHoverParticipant, h));
 	}
 
-	computeSync(): HoverPart[] {
+	public computeSync(): HoverPartInfo[] {
 		if (!this._editor.hasModel() || !this._range) {
 			return [];
 		}
 
 		const model = this._editor.getModel();
-		const lineNumber = this._range.startLineNumber;
+		const hoverRange = this._range;
+		const lineNumber = hoverRange.startLineNumber;
 
 		if (lineNumber > this._editor.getModel().getLineCount()) {
 			// Illegal line number => no results
 			return [];
 		}
 
-		const colorDetector = ColorDetector.get(this._editor);
 		const maxColumn = model.getLineMaxColumn(lineNumber);
-		const lineDecorations = this._editor.getLineDecorations(lineNumber);
-		let didFindColor = false;
-
-		const hoverRange = this._range;
-		const result = lineDecorations.map((d): HoverPart | null => {
+		const lineDecorations = this._editor.getLineDecorations(lineNumber).filter((d) => {
 			const startColumn = (d.range.startLineNumber === lineNumber) ? d.range.startColumn : 1;
 			const endColumn = (d.range.endLineNumber === lineNumber) ? d.range.endColumn : maxColumn;
-
 			if (startColumn > hoverRange.startColumn || hoverRange.endColumn > endColumn) {
-				return null;
-			}
-
-			const range = new Range(hoverRange.startLineNumber, startColumn, hoverRange.startLineNumber, endColumn);
-			const marker = this._markerDecorationsService.getMarker(model, d);
-			if (marker) {
-				return new MarkerHover(range, marker);
-			}
-
-			const colorData = colorDetector.getColorData(d.range.getStartPosition());
-
-			if (!didFindColor && colorData) {
-				didFindColor = true;
-
-				const { color, range } = colorData.colorInfo;
-				return new ColorHover(range, color, colorData.provider);
-			} else {
-				if (isEmptyMarkdownString(d.options.hoverMessage)) {
-					return null;
-				}
-
-				const contents: IMarkdownString[] = d.options.hoverMessage ? asArray(d.options.hoverMessage) : [];
-				return { contents, range };
+				return false;
 			}
+			return true;
 		});
 
+		let result: HoverPartInfo[] = [];
+
+		const colorDetector = ColorDetector.get(this._editor);
+		for (const d of lineDecorations) {
+			const colorData = colorDetector.getColorData(d.range.getStartPosition());
+			if (colorData) {
+				const { color, range } = colorData.colorInfo;
+				result.push(new HoverPartInfo(null, new ColorHover(Range.lift(range), color, colorData.provider)));
+				break;
+			}
+		}
+
+		const markdownHovers = this._markdownHoverParticipant.computeSync(this._range, lineDecorations);
+		result = result.concat(markdownHovers.map(h => new HoverPartInfo(this._markdownHoverParticipant, h)));
+
+		const markerHovers = this._markerHoverParticipant.computeSync(this._range, lineDecorations);
+		result = result.concat(markerHovers.map(h => new HoverPartInfo(this._markerHoverParticipant, h)));
+
 		return coalesce(result);
 	}
 
-	onResult(result: HoverPart[], isFromSynchronousComputation: boolean): void {
+	public onResult(result: HoverPartInfo[], isFromSynchronousComputation: boolean): void {
 		// Always put synchronous messages before asynchronous ones
 		if (isFromSynchronousComputation) {
-			this._result = result.concat(this._result.sort((a, b) => {
-				if (a instanceof ColorHover) { // sort picker messages at to the top
-					return -1;
-				} else if (b instanceof ColorHover) {
-					return 1;
-				}
-				return 0;
-			}));
+			this._result = result.concat(this._result);
 		} else {
 			this._result = this._result.concat(result);
 		}
 	}
 
-	getResult(): HoverPart[] {
+	public getResult(): HoverPartInfo[] {
 		return this._result.slice(0);
 	}
 
-	getResultWithLoadingMessage(): HoverPart[] {
-		return this._result.slice(0).concat([this._getLoadingMessage()]);
-	}
+	public getResultWithLoadingMessage(): HoverPartInfo[] {
+		if (this._range) {
+			const loadingMessage = new HoverPartInfo(this._markdownHoverParticipant, this._markdownHoverParticipant.createLoadingMessage(this._range));
+			return this._result.slice(0).concat([loadingMessage]);
 
-	private _getLoadingMessage(): HoverPart {
-		return {
-			range: this._range,
-			contents: [new MarkdownString().appendText(nls.localize('modesContentHover.loading', "Loading..."))]
-		};
+		}
+		return this._result.slice(0);
 	}
 }
 
-const markerCodeActionTrigger: CodeActionTrigger = {
-	type: CodeActionTriggerType.Manual,
-	filter: { include: CodeActionKind.QuickFix }
-};
-
-export class ModesContentHoverWidget extends ContentHoverWidget {
+export class ModesContentHoverWidget extends Widget implements IContentWidget, IEditorHover {
 
 	static readonly ID = 'editor.contrib.modesContentHoverWidget';
 
-	private _messages: HoverPart[];
+	private readonly _markerHoverParticipant: IEditorHoverParticipant<MarkerHover>;
+	private readonly _markdownHoverParticipant: MarkdownHoverParticipant;
+
+	private readonly _hover: HoverWidget;
+	private readonly _id: string;
+	private readonly _editor: ICodeEditor;
+	private _isVisible: boolean;
+	private _showAtPosition: Position | null;
+	private _showAtRange: Range | null;
+	private _stoleFocus: boolean;
+
+	// IContentWidget.allowEditorOverflow
+	public readonly allowEditorOverflow = true;
+
+	private _messages: HoverPartInfo[];
 	private _lastRange: Range | null;
 	private readonly _computer: ModesContentComputer;
-	private readonly _hoverOperation: HoverOperation<HoverPart[]>;
+	private readonly _hoverOperation: HoverOperation<HoverPartInfo[]>;
 	private _highlightDecorations: string[];
 	private _isChangingDecorations: boolean;
 	private _shouldFocus: boolean;
 	private _colorPicker: ColorPickerWidget | null;
-
-	private _codeLink?: HTMLElement;
-
-	private readonly renderDisposable = this._register(new MutableDisposable<IDisposable>());
+	private _renderDisposable: IDisposable | null;
 
 	constructor(
 		editor: ICodeEditor,
-		_hoverVisibleKey: IContextKey<boolean>,
-		markerDecorationsService: IMarkerDecorationsService,
-		keybindingService: IKeybindingService,
+		private readonly _hoverVisibleKey: IContextKey<boolean>,
+		instantiationService: IInstantiationService,
 		private readonly _themeService: IThemeService,
-		private readonly _modeService: IModeService,
-		private readonly _openerService: IOpenerService = NullOpenerService,
 	) {
-		super(ModesContentHoverWidget.ID, editor, _hoverVisibleKey, keybindingService);
+		super();
+
+		this._markerHoverParticipant = instantiationService.createInstance(MarkerHoverParticipant, editor, this);
+		this._markdownHoverParticipant = instantiationService.createInstance(MarkdownHoverParticipant, editor, this);
+
+		this._hover = this._register(new HoverWidget());
+		this._id = ModesContentHoverWidget.ID;
+		this._editor = editor;
+		this._isVisible = false;
+		this._stoleFocus = false;
+		this._renderDisposable = null;
+
+		this.onkeydown(this._hover.containerDomNode, (e: IKeyboardEvent) => {
+			if (e.equals(KeyCode.Escape)) {
+				this.hide();
+			}
+		});
+
+		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+			if (e.hasChanged(EditorOption.fontInfo)) {
+				this._updateFont();
+			}
+		}));
+
+		this._editor.onDidLayoutChange(() => this.layout());
+
+		this.layout();
+		this._editor.addContentWidget(this);
+		this._showAtPosition = null;
+		this._showAtRange = null;
+		this._stoleFocus = false;
 
 		this._messages = [];
 		this._lastRange = null;
-		this._computer = new ModesContentComputer(this._editor, markerDecorationsService);
+		this._computer = new ModesContentComputer(this._editor, this._markerHoverParticipant, this._markdownHoverParticipant);
 		this._highlightDecorations = [];
 		this._isChangingDecorations = false;
 		this._shouldFocus = false;
@@ -246,15 +260,15 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._register(dom.addStandardDisposableListener(this.getDomNode(), dom.EventType.BLUR, () => {
 			this.getDomNode().classList.remove('colorpicker-hover');
 		}));
-		this._register(editor.onDidChangeConfiguration((e) => {
+		this._register(editor.onDidChangeConfiguration(() => {
 			this._hoverOperation.setHoverTime(this._editor.getOption(EditorOption.hover).delay);
 		}));
-		this._register(TokenizationRegistry.onDidChange((e) => {
-			if (this.isVisible && this._lastRange && this._messages.length > 0) {
+		this._register(TokenizationRegistry.onDidChange(() => {
+			if (this._isVisible && this._lastRange && this._messages.length > 0) {
 				this._messages = this._messages.map(msg => {
 					// If a color hover is visible, we need to update the message that
 					// created it so that the color matches the last chosen color
-					if (msg instanceof ColorHover && !!this._lastRange?.intersectRanges(msg.range) && this._colorPicker?.model.color) {
+					if (msg.data instanceof ColorHover && !!this._lastRange?.intersectRanges(msg.data.range) && this._colorPicker?.model.color) {
 						const color = this._colorPicker.model.color;
 						const newColor = {
 							red: color.rgba.r / 255,
@@ -262,7 +276,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 							blue: color.rgba.b / 255,
 							alpha: color.rgba.a
 						};
-						return new ColorHover(msg.range, newColor, msg.provider);
+						return new HoverPartInfo(msg.owner, new ColorHover(msg.data.range, newColor, msg.data.provider));
 					} else {
 						return msg;
 					}
@@ -274,16 +288,81 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		}));
 	}
 
-	dispose(): void {
+	public dispose(): void {
 		this._hoverOperation.cancel();
+		this._editor.removeContentWidget(this);
 		super.dispose();
 	}
 
-	onModelDecorationsChanged(): void {
+	public getId(): string {
+		return this._id;
+	}
+
+	public getDomNode(): HTMLElement {
+		return this._hover.containerDomNode;
+	}
+
+	public showAt(position: Position, range: Range | null, focus: boolean): void {
+		// Position has changed
+		this._showAtPosition = position;
+		this._showAtRange = range;
+		this._hoverVisibleKey.set(true);
+		this._isVisible = true;
+		this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
+
+		this._editor.layoutContentWidget(this);
+		// Simply force a synchronous render on the editor
+		// such that the widget does not really render with left = '0px'
+		this._editor.render();
+		this._stoleFocus = focus;
+		if (focus) {
+			this._hover.containerDomNode.focus();
+		}
+	}
+
+	public getPosition(): IContentWidgetPosition | null {
+		if (this._isVisible) {
+			return {
+				position: this._showAtPosition,
+				range: this._showAtRange,
+				preference: [
+					ContentWidgetPositionPreference.ABOVE,
+					ContentWidgetPositionPreference.BELOW
+				]
+			};
+		}
+		return null;
+	}
+
+	private _updateFont(): void {
+		const codeClasses: HTMLElement[] = Array.prototype.slice.call(this._hover.contentsDomNode.getElementsByClassName('code'));
+		codeClasses.forEach(node => this._editor.applyFontInfo(node));
+	}
+
+	private _updateContents(node: Node): void {
+		this._hover.contentsDomNode.textContent = '';
+		this._hover.contentsDomNode.appendChild(node);
+		this._updateFont();
+
+		this._editor.layoutContentWidget(this);
+		this._hover.onContentsChanged();
+	}
+
+	private layout(): void {
+		const height = Math.max(this._editor.getLayoutInfo().height / 4, 250);
+		const { fontSize, lineHeight } = this._editor.getOption(EditorOption.fontInfo);
+
+		this._hover.contentsDomNode.style.fontSize = `${fontSize}px`;
+		this._hover.contentsDomNode.style.lineHeight = `${lineHeight}px`;
+		this._hover.contentsDomNode.style.maxHeight = `${height}px`;
+		this._hover.contentsDomNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`;
+	}
+
+	public onModelDecorationsChanged(): void {
 		if (this._isChangingDecorations) {
 			return;
 		}
-		if (this.isVisible) {
+		if (this._isVisible) {
 			// The decorations have changed and the hover is visible,
 			// we need to recompute the displayed text
 			this._hoverOperation.cancel();
@@ -295,7 +374,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		}
 	}
 
-	startShowingAt(range: Range, mode: HoverStartMode, focus: boolean): void {
+	public startShowingAt(range: Range, mode: HoverStartMode, focus: boolean): void {
 		if (this._lastRange && this._lastRange.equalsRange(range)) {
 			// We have to show the widget at the exact same range as before, so no work is needed
 			return;
@@ -303,17 +382,17 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 
 		this._hoverOperation.cancel();
 
-		if (this.isVisible) {
+		if (this._isVisible) {
 			// The range might have changed, but the hover is visible
 			// Instead of hiding it completely, filter out messages that are still in the new range and
 			// kick off a new computation
 			if (!this._showAtPosition || this._showAtPosition.lineNumber !== range.startLineNumber) {
 				this.hide();
 			} else {
-				let filteredMessages: HoverPart[] = [];
+				let filteredMessages: HoverPartInfo[] = [];
 				for (let i = 0, len = this._messages.length; i < len; i++) {
 					const msg = this._messages[i];
-					const rng = msg.range;
+					const rng = msg.data.range;
 					if (rng && rng.startColumn <= range.startColumn && rng.endColumn >= range.endColumn) {
 						filteredMessages.push(msg);
 					}
@@ -335,25 +414,45 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._hoverOperation.start(mode);
 	}
 
-	hide(): void {
+	public hide(): void {
 		this._lastRange = null;
 		this._hoverOperation.cancel();
-		super.hide();
+
+		if (this._isVisible) {
+			setTimeout(() => {
+				// Give commands a chance to see the key
+				if (!this._isVisible) {
+					this._hoverVisibleKey.set(false);
+				}
+			}, 0);
+			this._isVisible = false;
+			this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
+
+			this._editor.layoutContentWidget(this);
+			if (this._stoleFocus) {
+				this._editor.focus();
+			}
+		}
+
 		this._isChangingDecorations = true;
 		this._highlightDecorations = this._editor.deltaDecorations(this._highlightDecorations, []);
 		this._isChangingDecorations = false;
-		this.renderDisposable.clear();
+		if (this._renderDisposable) {
+			this._renderDisposable.dispose();
+			this._renderDisposable = null;
+		}
 		this._colorPicker = null;
 	}
 
-	isColorPickerVisible(): boolean {
-		if (this._colorPicker) {
-			return true;
-		}
-		return false;
+	public isColorPickerVisible(): boolean {
+		return !!this._colorPicker;
 	}
 
-	private _withResult(result: HoverPart[], complete: boolean): void {
+	public onContentsChanged(): void {
+		this._hover.onContentsChanged();
+	}
+
+	private _withResult(result: HoverPartInfo[], complete: boolean): void {
 		this._messages = result;
 
 		if (this._lastRange && this._messages.length > 0) {
@@ -363,20 +462,24 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		}
 	}
 
-	private _renderMessages(renderRange: Range, messages: HoverPart[]): void {
-		this.renderDisposable.dispose();
+	private _renderMessages(renderRange: Range, messages: HoverPartInfo[]): void {
+		if (this._renderDisposable) {
+			this._renderDisposable.dispose();
+			this._renderDisposable = null;
+		}
 		this._colorPicker = null;
 
 		// update column from which to show
 		let renderColumn = Constants.MAX_SAFE_SMALL_INTEGER;
-		let highlightRange: Range | null = messages[0].range ? Range.lift(messages[0].range) : null;
+		let highlightRange: Range | null = messages[0].data.range ? Range.lift(messages[0].data.range) : null;
 		let fragment = document.createDocumentFragment();
-		let isEmptyHoverContent = true;
 
 		let containColorPicker = false;
-		const markdownDisposeables = new DisposableStore();
+		const disposables = new DisposableStore();
 		const markerMessages: MarkerHover[] = [];
-		messages.forEach((msg) => {
+		const markdownParts: MarkdownHover[] = [];
+		messages.forEach((_msg) => {
+			const msg = _msg.data;
 			if (!msg.range) {
 				return;
 			}
@@ -464,46 +567,37 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 
 					this._colorPicker = widget;
 					this.showAt(range.getStartPosition(), range, this._shouldFocus);
-					this.updateContents(fragment);
+					this._updateContents(fragment);
 					this._colorPicker.layout();
 
-					this.renderDisposable.value = combinedDisposable(colorListener, colorChangeListener, widget, markdownDisposeables);
+					this._renderDisposable = combinedDisposable(colorListener, colorChangeListener, widget, disposables);
 				});
 			} else {
 				if (msg instanceof MarkerHover) {
 					markerMessages.push(msg);
-					isEmptyHoverContent = false;
 				} else {
-					msg.contents
-						.filter(contents => !isEmptyMarkdownString(contents))
-						.forEach(contents => {
-							const markdownHoverElement = $('div.hover-row.markdown-hover');
-							const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents'));
-							const renderer = markdownDisposeables.add(new MarkdownRenderer({ editor: this._editor }, this._modeService, this._openerService));
-							markdownDisposeables.add(renderer.onDidRenderAsync(() => {
-								hoverContentsElement.className = 'hover-contents code-hover-contents';
-								this._hover.onContentsChanged();
-							}));
-							const renderedContents = markdownDisposeables.add(renderer.render(contents));
-							hoverContentsElement.appendChild(renderedContents.element);
-							fragment.appendChild(markdownHoverElement);
-							isEmptyHoverContent = false;
-						});
+					if (msg instanceof MarkdownHover) {
+						markdownParts.push(msg);
+					}
 				}
 			}
 		});
 
-		if (markerMessages.length) {
-			markerMessages.forEach(msg => fragment.appendChild(this.renderMarkerHover(msg)));
-			const markerHoverForStatusbar = markerMessages.length === 1 ? markerMessages[0] : markerMessages.sort((a, b) => MarkerSeverity.compare(a.marker.severity, b.marker.severity))[0];
-			fragment.appendChild(this.renderMarkerStatusbar(markerHoverForStatusbar));
+		if (markdownParts.length > 0) {
+			disposables.add(this._markdownHoverParticipant.renderHoverParts(markdownParts, fragment));
 		}
 
+		if (markerMessages.length) {
+			disposables.add(this._markerHoverParticipant.renderHoverParts(markerMessages, fragment));
+		}
+
+		this._renderDisposable = disposables;
+
 		// show
 
-		if (!containColorPicker && !isEmptyHoverContent) {
+		if (!containColorPicker && fragment.hasChildNodes()) {
 			this.showAt(new Position(renderRange.startLineNumber, renderColumn), highlightRange, this._shouldFocus);
-			this.updateContents(fragment);
+			this._updateContents(fragment);
 		}
 
 		this._isChangingDecorations = true;
@@ -514,175 +608,17 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._isChangingDecorations = false;
 	}
 
-	private renderMarkerHover(markerHover: MarkerHover): HTMLElement {
-		const hoverElement = $('div.hover-row');
-		const markerElement = dom.append(hoverElement, $('div.marker.hover-contents'));
-		const { source, message, code, relatedInformation } = markerHover.marker;
-
-		this._editor.applyFontInfo(markerElement);
-		const messageElement = dom.append(markerElement, $('span'));
-		messageElement.style.whiteSpace = 'pre-wrap';
-		messageElement.innerText = message;
-
-		if (source || code) {
-			// Code has link
-			if (code && typeof code !== 'string') {
-				const sourceAndCodeElement = $('span');
-				if (source) {
-					const sourceElement = dom.append(sourceAndCodeElement, $('span'));
-					sourceElement.innerText = source;
-				}
-				this._codeLink = dom.append(sourceAndCodeElement, $('a.code-link'));
-				this._codeLink.setAttribute('href', code.target.toString());
-
-				this._codeLink.onclick = (e) => {
-					this._openerService.open(code.target);
-					e.preventDefault();
-					e.stopPropagation();
-				};
-
-				const codeElement = dom.append(this._codeLink, $('span'));
-				codeElement.innerText = code.value;
-
-				const detailsElement = dom.append(markerElement, sourceAndCodeElement);
-				detailsElement.style.opacity = '0.6';
-				detailsElement.style.paddingLeft = '6px';
-			} else {
-				const detailsElement = dom.append(markerElement, $('span'));
-				detailsElement.style.opacity = '0.6';
-				detailsElement.style.paddingLeft = '6px';
-				detailsElement.innerText = source && code ? `${source}(${code})` : source ? source : `(${code})`;
-			}
-		}
-
-		if (isNonEmptyArray(relatedInformation)) {
-			for (const { message, resource, startLineNumber, startColumn } of relatedInformation) {
-				const relatedInfoContainer = dom.append(markerElement, $('div'));
-				relatedInfoContainer.style.marginTop = '8px';
-				const a = dom.append(relatedInfoContainer, $('a'));
-				a.innerText = `${basename(resource)}(${startLineNumber}, ${startColumn}): `;
-				a.style.cursor = 'pointer';
-				a.onclick = e => {
-					e.stopPropagation();
-					e.preventDefault();
-					if (this._openerService) {
-						this._openerService.open(resource.with({ fragment: `${startLineNumber},${startColumn}` }), { fromUserGesture: true }).catch(onUnexpectedError);
-					}
-				};
-				const messageElement = dom.append<HTMLAnchorElement>(relatedInfoContainer, $('span'));
-				messageElement.innerText = message;
-				this._editor.applyFontInfo(messageElement);
-			}
-		}
-
-		return hoverElement;
-	}
-
-	private recentMarkerCodeActionsInfo: { marker: IMarker, hasCodeActions: boolean } | undefined = undefined;
-	private renderMarkerStatusbar(markerHover: MarkerHover): HTMLElement {
-		const hoverElement = $('div.hover-row.status-bar');
-		const disposables = new DisposableStore();
-		const actionsElement = dom.append(hoverElement, $('div.actions'));
-		if (markerHover.marker.severity === MarkerSeverity.Error || markerHover.marker.severity === MarkerSeverity.Warning || markerHover.marker.severity === MarkerSeverity.Info) {
-			disposables.add(this._renderAction(actionsElement, {
-				label: nls.localize('peek problem', "Peek Problem"),
-				commandId: NextMarkerAction.ID,
-				run: () => {
-					this.hide();
-					MarkerController.get(this._editor).showAtMarker(markerHover.marker);
-					this._editor.focus();
-				}
-			}));
-		}
-
-		if (!this._editor.getOption(EditorOption.readOnly)) {
-			const quickfixPlaceholderElement = dom.append(actionsElement, $('div'));
-			if (this.recentMarkerCodeActionsInfo) {
-				if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
-					if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-						quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
-					}
-				} else {
-					this.recentMarkerCodeActionsInfo = undefined;
-				}
-			}
-			const updatePlaceholderDisposable = disposables.add(disposableTimeout(() => quickfixPlaceholderElement.textContent = nls.localize('checkingForQuickFixes', "Checking for quick fixes..."), 64));
-			const codeActionsPromise = this.getCodeActions(markerHover.marker);
-			disposables.add(toDisposable(() => codeActionsPromise.cancel()));
-			codeActionsPromise.then(actions => {
-				updatePlaceholderDisposable.dispose();
-				this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
-
-				if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-					actions.dispose();
-					quickfixPlaceholderElement.textContent = nls.localize('noQuickFixes', "No quick fixes available");
-					return;
-				}
-				quickfixPlaceholderElement.style.display = 'none';
-
-				let showing = false;
-				disposables.add(toDisposable(() => {
-					if (!showing) {
-						actions.dispose();
-					}
-				}));
-
-				disposables.add(this._renderAction(actionsElement, {
-					label: nls.localize('quick fixes', "Quick Fix..."),
-					commandId: QuickFixAction.Id,
-					run: (target) => {
-						showing = true;
-						const controller = QuickFixController.get(this._editor);
-						const elementPosition = dom.getDomNodePagePosition(target);
-						// Hide the hover pre-emptively, otherwise the editor can close the code actions
-						// context menu as well when using keyboard navigation
-						this.hide();
-						controller.showCodeActions(markerCodeActionTrigger, actions, {
-							x: elementPosition.left + 6,
-							y: elementPosition.top + elementPosition.height + 6
-						});
-					}
-				}));
-			});
-		}
-
-		this.renderDisposable.value = disposables;
-		return hoverElement;
-	}
-
-	private getCodeActions(marker: IMarker): CancelablePromise<CodeActionSet> {
-		return createCancelablePromise(cancellationToken => {
-			return getCodeActions(
-				this._editor.getModel()!,
-				new Range(marker.startLineNumber, marker.startColumn, marker.endLineNumber, marker.endColumn),
-				markerCodeActionTrigger,
-				Progress.None,
-				cancellationToken);
-		});
-	}
-
 	private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({
 		className: 'hoverHighlight'
 	});
 }
 
-function hoverContentsEquals(first: HoverPart[], second: HoverPart[]): boolean {
-	if ((!first && second) || (first && !second) || first.length !== second.length) {
+function hoverContentsEquals(first: HoverPartInfo[], second: HoverPartInfo[]): boolean {
+	if (first.length !== second.length) {
 		return false;
 	}
 	for (let i = 0; i < first.length; i++) {
-		const firstElement = first[i];
-		const secondElement = second[i];
-		if (firstElement instanceof MarkerHover && secondElement instanceof MarkerHover) {
-			return IMarkerData.makeKey(firstElement.marker) === IMarkerData.makeKey(secondElement.marker);
-		}
-		if (firstElement instanceof ColorHover || secondElement instanceof ColorHover) {
-			return false;
-		}
-		if (firstElement instanceof MarkerHover || secondElement instanceof MarkerHover) {
-			return false;
-		}
-		if (!markedStringsEquals(firstElement.contents, secondElement.contents)) {
+		if (!first[i].data.equals(second[i].data)) {
 			return false;
 		}
 	}
diff --git a/src/vs/editor/contrib/inlineHints/inlineHintsController.ts b/src/vs/editor/contrib/inlineHints/inlineHintsController.ts
new file mode 100644
index 000000000..43750f989
--- /dev/null
+++ b/src/vs/editor/contrib/inlineHints/inlineHintsController.ts
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { onUnexpectedExternalError } from 'vs/base/common/errors';
+import { hash } from 'vs/base/common/hash';
+import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { IContentDecorationRenderOptions, IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
+import { InlineHintsProvider, InlineHintsProviderRegistry, InlineHint } from 'vs/editor/common/modes';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { flatten } from 'vs/base/common/arrays';
+import { editorInlineHintForeground, editorInlineHintBackground } from 'vs/platform/theme/common/colorRegistry';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { Range } from 'vs/editor/common/core/range';
+import { LanguageFeatureRequestDelays } from 'vs/editor/common/modes/languageFeatureRegistry';
+import { MarkdownString } from 'vs/base/common/htmlContent';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { URI } from 'vs/base/common/uri';
+import { IRange } from 'vs/base/common/range';
+import { assertType } from 'vs/base/common/types';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+
+const MAX_DECORATORS = 500;
+
+export interface InlineHintsData {
+	list: InlineHint[];
+	provider: InlineHintsProvider;
+}
+
+export async function getInlineHints(model: ITextModel, ranges: Range[], token: CancellationToken): Promise<InlineHintsData[]> {
+	const datas: InlineHintsData[] = [];
+	const providers = InlineHintsProviderRegistry.ordered(model).reverse();
+	const promises = flatten(providers.map(provider => ranges.map(range => Promise.resolve(provider.provideInlineHints(model, range, token)).then(result => {
+		if (result) {
+			datas.push({ list: result, provider });
+		}
+	}, err => {
+		onUnexpectedExternalError(err);
+	}))));
+
+	await Promise.all(promises);
+
+	return datas;
+}
+
+export class InlineHintsController implements IEditorContribution {
+
+	static readonly ID: string = 'editor.contrib.InlineHints';
+
+	// static get(editor: ICodeEditor): InlineHintsController {
+	// 	return editor.getContribution<InlineHintsController>(this.ID);
+	// }
+
+	private readonly _disposables = new DisposableStore();
+	private readonly _sessionDisposables = new DisposableStore();
+	private readonly _getInlineHintsDelays = new LanguageFeatureRequestDelays(InlineHintsProviderRegistry, 250, 2500);
+
+	private _decorationsTypeIds: string[] = [];
+	private _decorationIds: string[] = [];
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IThemeService private readonly _themeService: IThemeService,
+	) {
+		this._disposables.add(InlineHintsProviderRegistry.onDidChange(() => this._update()));
+		this._disposables.add(_themeService.onDidColorThemeChange(() => this._update()));
+		this._disposables.add(_editor.onDidChangeModel(() => this._update()));
+		this._disposables.add(_editor.onDidChangeModelLanguage(() => this._update()));
+		this._disposables.add(_editor.onDidChangeConfiguration(e => {
+			if (e.hasChanged(EditorOption.inlineHints)) {
+				this._update();
+			}
+		}));
+
+		this._update();
+	}
+
+	dispose(): void {
+		this._sessionDisposables.dispose();
+		this._removeAllDecorations();
+		this._disposables.dispose();
+	}
+
+	private _update(): void {
+		this._sessionDisposables.clear();
+
+		if (!this._editor.getOption(EditorOption.inlineHints).enabled) {
+			this._removeAllDecorations();
+			return;
+		}
+
+		const model = this._editor.getModel();
+		if (!model || !InlineHintsProviderRegistry.has(model)) {
+			this._removeAllDecorations();
+			return;
+		}
+
+		const scheduler = new RunOnceScheduler(async () => {
+			const t1 = Date.now();
+
+			const cts = new CancellationTokenSource();
+			this._sessionDisposables.add(toDisposable(() => cts.dispose(true)));
+
+			const visibleRanges = this._editor.getVisibleRangesPlusViewportAboveBelow();
+			const result = await getInlineHints(model, visibleRanges, cts.token);
+
+			// update moving average
+			const newDelay = this._getInlineHintsDelays.update(model, Date.now() - t1);
+			scheduler.delay = newDelay;
+
+			// render hints
+			this._updateHintsDecorators(result);
+
+		}, this._getInlineHintsDelays.get(model));
+
+		this._sessionDisposables.add(scheduler);
+
+		// update inline hints when content or scroll position changes
+		this._sessionDisposables.add(this._editor.onDidChangeModelContent(() => scheduler.schedule()));
+		this._disposables.add(this._editor.onDidScrollChange(() => scheduler.schedule()));
+		scheduler.schedule();
+
+		// update inline hints when any any provider fires an event
+		const providerListener = new DisposableStore();
+		this._sessionDisposables.add(providerListener);
+		for (const provider of InlineHintsProviderRegistry.all(model)) {
+			if (typeof provider.onDidChangeInlineHints === 'function') {
+				providerListener.add(provider.onDidChangeInlineHints(() => scheduler.schedule()));
+			}
+		}
+	}
+
+	private _updateHintsDecorators(hintsData: InlineHintsData[]): void {
+		const { fontSize, fontFamily } = this._getLayoutInfo();
+		const backgroundColor = this._themeService.getColorTheme().getColor(editorInlineHintBackground);
+		const fontColor = this._themeService.getColorTheme().getColor(editorInlineHintForeground);
+
+		const newDecorationsTypeIds: string[] = [];
+		const newDecorationsData: IModelDeltaDecoration[] = [];
+
+		for (const { list: hints } of hintsData) {
+
+			for (let j = 0; j < hints.length && newDecorationsData.length < MAX_DECORATORS; j++) {
+				const { text, range, description: hoverMessage, whitespaceBefore, whitespaceAfter } = hints[j];
+				const marginBefore = whitespaceBefore ? (fontSize / 3) | 0 : 0;
+				const marginAfter = whitespaceAfter ? (fontSize / 3) | 0 : 0;
+
+				const before: IContentDecorationRenderOptions = {
+					contentText: text,
+					backgroundColor: `${backgroundColor}`,
+					color: `${fontColor}`,
+					margin: `0px ${marginAfter}px 0px ${marginBefore}px`,
+					fontSize: `${fontSize}px`,
+					fontFamily: fontFamily,
+					padding: `0px ${(fontSize / 4) | 0}px`,
+					borderRadius: `${(fontSize / 4) | 0}px`,
+				};
+				const key = 'inlineHints-' + hash(before).toString(16);
+				this._codeEditorService.registerDecorationType(key, { before }, undefined, this._editor);
+
+				// decoration types are ref-counted which means we only need to
+				// call register und remove equally often
+				newDecorationsTypeIds.push(key);
+
+				const options = this._codeEditorService.resolveDecorationOptions(key, true);
+				if (typeof hoverMessage === 'string') {
+					options.hoverMessage = new MarkdownString().appendText(hoverMessage);
+				} else if (hoverMessage) {
+					options.hoverMessage = hoverMessage;
+				}
+
+				newDecorationsData.push({
+					range,
+					options
+				});
+			}
+		}
+
+		this._decorationsTypeIds.forEach(this._codeEditorService.removeDecorationType, this._codeEditorService);
+		this._decorationsTypeIds = newDecorationsTypeIds;
+
+		this._decorationIds = this._editor.deltaDecorations(this._decorationIds, newDecorationsData);
+	}
+
+	private _getLayoutInfo() {
+		const options = this._editor.getOption(EditorOption.inlineHints);
+		const editorFontSize = this._editor.getOption(EditorOption.fontSize);
+		let fontSize = options.fontSize;
+		if (!fontSize || fontSize < 5 || fontSize > editorFontSize) {
+			fontSize = (editorFontSize * .9) | 0;
+		}
+		const fontFamily = options.fontFamily;
+		return { fontSize, fontFamily };
+	}
+
+	private _removeAllDecorations(): void {
+		this._decorationIds = this._editor.deltaDecorations(this._decorationIds, []);
+		this._decorationsTypeIds.forEach(this._codeEditorService.removeDecorationType, this._codeEditorService);
+		this._decorationsTypeIds = [];
+	}
+}
+
+registerEditorContribution(InlineHintsController.ID, InlineHintsController);
+
+CommandsRegistry.registerCommand('_executeInlineHintProvider', async (accessor, ...args: [URI, IRange]): Promise<InlineHint[]> => {
+
+	const [uri, range] = args;
+	assertType(URI.isUri(uri));
+	assertType(Range.isIRange(range));
+
+	const ref = await accessor.get(ITextModelService).createModelReference(uri);
+	try {
+		const data = await getInlineHints(ref.object.textEditorModel, [Range.lift(range)], CancellationToken.None);
+		return flatten(data.map(item => item.list)).sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+
+	} finally {
+		ref.dispose();
+	}
+});
diff --git a/src/vs/editor/contrib/linesOperations/linesOperations.ts b/src/vs/editor/contrib/linesOperations/linesOperations.ts
index 9c365d507..54fcba6ac 100644
--- a/src/vs/editor/contrib/linesOperations/linesOperations.ts
+++ b/src/vs/editor/contrib/linesOperations/linesOperations.ts
@@ -939,43 +939,39 @@ export class TransposeAction extends EditorAction {
 
 export abstract class AbstractCaseAction extends EditorAction {
 	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
-		let selections = editor.getSelections();
+		const selections = editor.getSelections();
 		if (selections === null) {
 			return;
 		}
 
-		let model = editor.getModel();
+		const model = editor.getModel();
 		if (model === null) {
 			return;
 		}
 
-		let wordSeparators = editor.getOption(EditorOption.wordSeparators);
+		const wordSeparators = editor.getOption(EditorOption.wordSeparators);
+		const textEdits: IIdentifiedSingleEditOperation[] = [];
 
-		let commands: ICommand[] = [];
-
-		for (let i = 0, len = selections.length; i < len; i++) {
-			let selection = selections[i];
+		for (const selection of selections) {
 			if (selection.isEmpty()) {
-				let cursor = selection.getStartPosition();
+				const cursor = selection.getStartPosition();
 				const word = editor.getConfiguredWordAtPosition(cursor);
 
 				if (!word) {
 					continue;
 				}
 
-				let wordRange = new Range(cursor.lineNumber, word.startColumn, cursor.lineNumber, word.endColumn);
-				let text = model.getValueInRange(wordRange);
-				commands.push(new ReplaceCommandThatPreservesSelection(wordRange, this._modifyText(text, wordSeparators),
-					new Selection(cursor.lineNumber, cursor.column, cursor.lineNumber, cursor.column)));
-
+				const wordRange = new Range(cursor.lineNumber, word.startColumn, cursor.lineNumber, word.endColumn);
+				const text = model.getValueInRange(wordRange);
+				textEdits.push(EditOperation.replace(wordRange, this._modifyText(text, wordSeparators)));
 			} else {
-				let text = model.getValueInRange(selection);
-				commands.push(new ReplaceCommandThatPreservesSelection(selection, this._modifyText(text, wordSeparators), selection));
+				const text = model.getValueInRange(selection);
+				textEdits.push(EditOperation.replace(selection, this._modifyText(text, wordSeparators)));
 			}
 		}
 
 		editor.pushUndoStop();
-		editor.executeCommands(this.id, commands);
+		editor.executeEdits(this.id, textEdits);
 		editor.pushUndoStop();
 	}
 
@@ -1049,6 +1045,25 @@ export class TitleCaseAction extends AbstractCaseAction {
 	}
 }
 
+export class SnakeCaseAction extends AbstractCaseAction {
+	constructor() {
+		super({
+			id: 'editor.action.transformToSnakecase',
+			label: nls.localize('editor.transformToSnakecase', "Transform to Snake Case"),
+			alias: 'Transform to Snake Case',
+			precondition: EditorContextKeys.writable
+		});
+	}
+
+	protected _modifyText(text: string, wordSeparators: string): string {
+		return (text
+			.replace(/(\p{Ll})(\p{Lu})/gmu, '$1_$2')
+			.replace(/([^\b_])(\p{Lu})(\p{Ll})/gmu, '$1_$2$3')
+			.toLocaleLowerCase()
+		);
+	}
+}
+
 registerEditorAction(CopyLinesUpAction);
 registerEditorAction(CopyLinesDownAction);
 registerEditorAction(DuplicateSelectionAction);
@@ -1069,3 +1084,4 @@ registerEditorAction(TransposeAction);
 registerEditorAction(UpperCaseAction);
 registerEditorAction(LowerCaseAction);
 registerEditorAction(TitleCaseAction);
+registerEditorAction(SnakeCaseAction);
diff --git a/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts
index 681c8f027..6cdc4a4d0 100644
--- a/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts
+++ b/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts
@@ -299,13 +299,13 @@ export class MoveLinesCommand implements ICommand {
 		}
 	}
 
-	private matchEnterRule(model: ITextModel, indentConverter: IIndentConverter, tabSize: number, line: number, oneLineAbove: number, oneLineAboveText?: string) {
+	private matchEnterRule(model: ITextModel, indentConverter: IIndentConverter, tabSize: number, line: number, oneLineAbove: number, previousLineText?: string) {
 		let validPrecedingLine = oneLineAbove;
 		while (validPrecedingLine >= 1) {
 			// ship empty lines as empty lines just inherit indentation
 			let lineContent;
-			if (validPrecedingLine === oneLineAbove && oneLineAboveText !== undefined) {
-				lineContent = oneLineAboveText;
+			if (validPrecedingLine === oneLineAbove && previousLineText !== undefined) {
+				lineContent = previousLineText;
 			} else {
 				lineContent = model.getLineContent(validPrecedingLine);
 			}
diff --git a/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts
index 6777693d4..64f3c7a5d 100644
--- a/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts
@@ -207,8 +207,8 @@ suite('Editor Contrib - Duplicate Selection', () => {
 		withTestCodeEditor(lines.join('\n'), {}, (editor) => {
 			editor.setSelections(selections);
 			duplicateSelectionAction.run(null!, editor, {});
-			assert.deepEqual(editor.getValue(), expectedLines.join('\n'));
-			assert.deepEqual(editor.getSelections()!.map(s => s.toString()), expectedSelections.map(s => s.toString()));
+			assert.deepStrictEqual(editor.getValue(), expectedLines.join('\n'));
+			assert.deepStrictEqual(editor.getSelections()!.map(s => s.toString()), expectedSelections.map(s => s.toString()));
 		});
 	}
 
diff --git a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
index cdcb7f491..b3cbe4bdc 100644
--- a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
@@ -8,7 +8,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Handler } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
-import { TitleCaseAction, DeleteAllLeftAction, DeleteAllRightAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, LowerCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TransposeAction, UpperCaseAction, DeleteLinesAction } from 'vs/editor/contrib/linesOperations/linesOperations';
+import { TitleCaseAction, DeleteAllLeftAction, DeleteAllRightAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, LowerCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TransposeAction, UpperCaseAction, DeleteLinesAction, SnakeCaseAction } from 'vs/editor/contrib/linesOperations/linesOperations';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
 import type { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -19,7 +19,7 @@ function assertSelection(editor: ICodeEditor, expected: Selection | Selection[])
 	if (!Array.isArray(expected)) {
 		expected = [expected];
 	}
-	assert.deepEqual(editor.getSelections(), expected);
+	assert.deepStrictEqual(editor.getSelections(), expected);
 }
 
 function executeAction(action: EditorAction, editor: ICodeEditor): void {
@@ -40,7 +40,7 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(1, 1, 3, 5));
 					executeAction(sortLinesAscendingAction, editor);
-					assert.deepEqual(model.getLinesContent(), [
+					assert.deepStrictEqual(model.getLinesContent(), [
 						'alpha',
 						'beta',
 						'omicron'
@@ -65,7 +65,7 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelections([new Selection(1, 1, 3, 5), new Selection(5, 1, 7, 5)]);
 					executeAction(sortLinesAscendingAction, editor);
-					assert.deepEqual(model.getLinesContent(), [
+					assert.deepStrictEqual(model.getLinesContent(), [
 						'alpha',
 						'beta',
 						'omicron',
@@ -79,7 +79,7 @@ suite('Editor Contrib - Line Operations', () => {
 						new Selection(5, 1, 7, 7)
 					];
 					editor.getSelections()!.forEach((actualSelection, index) => {
-						assert.deepEqual(actualSelection.toString(), expectedSelections[index].toString());
+						assert.deepStrictEqual(actualSelection.toString(), expectedSelections[index].toString());
 					});
 				});
 		});
@@ -98,7 +98,7 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(1, 1, 3, 7));
 					executeAction(sortLinesDescendingAction, editor);
-					assert.deepEqual(model.getLinesContent(), [
+					assert.deepStrictEqual(model.getLinesContent(), [
 						'omicron',
 						'beta',
 						'alpha'
@@ -123,7 +123,7 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelections([new Selection(1, 1, 3, 7), new Selection(5, 1, 7, 7)]);
 					executeAction(sortLinesDescendingAction, editor);
-					assert.deepEqual(model.getLinesContent(), [
+					assert.deepStrictEqual(model.getLinesContent(), [
 						'omicron',
 						'beta',
 						'alpha',
@@ -137,7 +137,7 @@ suite('Editor Contrib - Line Operations', () => {
 						new Selection(5, 1, 7, 5)
 					];
 					editor.getSelections()!.forEach((actualSelection, index) => {
-						assert.deepEqual(actualSelection.toString(), expectedSelections[index].toString());
+						assert.deepStrictEqual(actualSelection.toString(), expectedSelections[index].toString());
 					});
 				});
 		});
@@ -157,12 +157,12 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(1, 2, 1, 2));
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(1), 'ne');
+					assert.strictEqual(model.getLineContent(1), 'ne');
 
 					editor.setSelections([new Selection(2, 2, 2, 2), new Selection(3, 2, 3, 2)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(2), 'wo');
-					assert.equal(model.getLineContent(3), 'hree');
+					assert.strictEqual(model.getLineContent(2), 'wo');
+					assert.strictEqual(model.getLineContent(3), 'hree');
 				});
 		});
 
@@ -178,16 +178,16 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(2, 1, 2, 1));
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(1), 'onetwo');
+					assert.strictEqual(model.getLineContent(1), 'onetwo');
 
 					editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLinesContent()[0], 'onetwothree');
-					assert.equal(model.getLinesContent().length, 1);
+					assert.strictEqual(model.getLinesContent()[0], 'onetwothree');
+					assert.strictEqual(model.getLinesContent().length, 1);
 
 					editor.setSelection(new Selection(1, 1, 1, 1));
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLinesContent()[0], 'onetwothree');
+					assert.strictEqual(model.getLinesContent()[0], 'onetwothree');
 				});
 		});
 
@@ -213,25 +213,25 @@ suite('Editor Contrib - Line Operations', () => {
 					executeAction(deleteAllLeftAction, editor);
 					let selections = editor.getSelections()!;
 
-					assert.equal(model.getLineContent(2), '');
-					assert.equal(model.getLineContent(3), ' waso waso');
-					assert.equal(model.getLineContent(5), '');
+					assert.strictEqual(model.getLineContent(2), '');
+					assert.strictEqual(model.getLineContent(3), ' waso waso');
+					assert.strictEqual(model.getLineContent(5), '');
 
-					assert.deepEqual([
+					assert.deepStrictEqual([
 						selections[0].startLineNumber,
 						selections[0].startColumn,
 						selections[0].endLineNumber,
 						selections[0].endColumn
 					], [3, 1, 3, 1]);
 
-					assert.deepEqual([
+					assert.deepStrictEqual([
 						selections[1].startLineNumber,
 						selections[1].startColumn,
 						selections[1].endLineNumber,
 						selections[1].endColumn
 					], [2, 1, 2, 1]);
 
-					assert.deepEqual([
+					assert.deepStrictEqual([
 						selections[2].startLineNumber,
 						selections[2].startColumn,
 						selections[2].endLineNumber,
@@ -241,17 +241,17 @@ suite('Editor Contrib - Line Operations', () => {
 					executeAction(deleteAllLeftAction, editor);
 					selections = editor.getSelections()!;
 
-					assert.equal(model.getLineContent(1), 'hi my name is Carlos Matos waso waso');
-					assert.equal(selections.length, 2);
+					assert.strictEqual(model.getLineContent(1), 'hi my name is Carlos Matos waso waso');
+					assert.strictEqual(selections.length, 2);
 
-					assert.deepEqual([
+					assert.deepStrictEqual([
 						selections[0].startLineNumber,
 						selections[0].startColumn,
 						selections[0].endLineNumber,
 						selections[0].endColumn
 					], [1, 27, 1, 27]);
 
-					assert.deepEqual([
+					assert.deepStrictEqual([
 						selections[1].startLineNumber,
 						selections[1].startColumn,
 						selections[1].endLineNumber,
@@ -277,23 +277,23 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelections([new Selection(1, 2, 1, 2), new Selection(1, 4, 1, 4)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(1), 'lo');
+					assert.strictEqual(model.getLineContent(1), 'lo');
 
 					editor.setSelections([new Selection(2, 2, 2, 2), new Selection(2, 4, 2, 5)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(2), 'd');
+					assert.strictEqual(model.getLineContent(2), 'd');
 
 					editor.setSelections([new Selection(3, 2, 3, 5), new Selection(3, 7, 3, 7)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(3), 'world');
+					assert.strictEqual(model.getLineContent(3), 'world');
 
 					editor.setSelections([new Selection(4, 3, 4, 3), new Selection(4, 5, 5, 4)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(4), 'jour');
+					assert.strictEqual(model.getLineContent(4), 'jour');
 
 					editor.setSelections([new Selection(5, 3, 6, 3), new Selection(6, 5, 7, 5), new Selection(7, 7, 7, 7)]);
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(5), 'world');
+					assert.strictEqual(model.getLineContent(5), 'world');
 				});
 		});
 
@@ -310,16 +310,16 @@ suite('Editor Contrib - Line Operations', () => {
 					editor.setSelection(new Selection(1, 1, 1, 1));
 
 					editor.trigger('keyboard', Handler.Type, { text: 'Typing some text here on line ' });
-					assert.equal(model.getLineContent(1), 'Typing some text here on line one');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 31, 1, 31));
+					assert.strictEqual(model.getLineContent(1), 'Typing some text here on line one');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 31, 1, 31));
 
 					executeAction(deleteAllLeftAction, editor);
-					assert.equal(model.getLineContent(1), 'one');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 1, 1, 1));
+					assert.strictEqual(model.getLineContent(1), 'one');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 1, 1, 1));
 
 					CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-					assert.equal(model.getLineContent(1), 'Typing some text here on line one');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 31, 1, 31));
+					assert.strictEqual(model.getLineContent(1), 'Typing some text here on line one');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 31, 1, 31));
 				});
 		});
 	});
@@ -345,27 +345,27 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(1, 2, 1, 2));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(1), 'hello world');
+					assert.strictEqual(model.getLineContent(1), 'hello world');
 					assertSelection(editor, new Selection(1, 6, 1, 6));
 
 					editor.setSelection(new Selection(2, 2, 2, 2));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(2), 'hello world');
+					assert.strictEqual(model.getLineContent(2), 'hello world');
 					assertSelection(editor, new Selection(2, 7, 2, 7));
 
 					editor.setSelection(new Selection(3, 2, 3, 2));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(3), 'hello world');
+					assert.strictEqual(model.getLineContent(3), 'hello world');
 					assertSelection(editor, new Selection(3, 7, 3, 7));
 
 					editor.setSelection(new Selection(4, 2, 5, 3));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(4), 'hello world');
+					assert.strictEqual(model.getLineContent(4), 'hello world');
 					assertSelection(editor, new Selection(4, 2, 4, 8));
 
 					editor.setSelection(new Selection(5, 1, 7, 3));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(5), 'hello world');
+					assert.strictEqual(model.getLineContent(5), 'hello world');
 					assertSelection(editor, new Selection(5, 1, 5, 3));
 				});
 		});
@@ -381,8 +381,8 @@ suite('Editor Contrib - Line Operations', () => {
 
 					editor.setSelection(new Selection(2, 1, 2, 1));
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(1), 'hello');
-					assert.equal(model.getLineContent(2), 'world');
+					assert.strictEqual(model.getLineContent(1), 'hello');
+					assert.strictEqual(model.getLineContent(2), 'world');
 					assertSelection(editor, new Selection(2, 6, 2, 6));
 				});
 		});
@@ -416,7 +416,7 @@ suite('Editor Contrib - Line Operations', () => {
 					]);
 
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLinesContent().join('\n'), 'hello world\nhello world\nhello world\nhello world\n\nhello world');
+					assert.strictEqual(model.getLinesContent().join('\n'), 'hello world\nhello world\nhello world\nhello world\n\nhello world');
 					assertSelection(editor, [
 						/** primary cursor */
 						new Selection(3, 4, 3, 8),
@@ -440,16 +440,16 @@ suite('Editor Contrib - Line Operations', () => {
 					editor.setSelection(new Selection(1, 6, 1, 6));
 
 					editor.trigger('keyboard', Handler.Type, { text: ' my dear' });
-					assert.equal(model.getLineContent(1), 'hello my dear');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
+					assert.strictEqual(model.getLineContent(1), 'hello my dear');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
 
 					executeAction(joinLinesAction, editor);
-					assert.equal(model.getLineContent(1), 'hello my dear world');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
+					assert.strictEqual(model.getLineContent(1), 'hello my dear world');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
 
 					CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-					assert.equal(model.getLineContent(1), 'hello my dear');
-					assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
+					assert.strictEqual(model.getLineContent(1), 'hello my dear');
+					assert.deepStrictEqual(editor.getSelection(), new Selection(1, 14, 1, 14));
 				});
 		});
 	});
@@ -467,27 +467,27 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 1, 1, 1));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(1), 'hello world');
+				assert.strictEqual(model.getLineContent(1), 'hello world');
 				assertSelection(editor, new Selection(1, 2, 1, 2));
 
 				editor.setSelection(new Selection(1, 6, 1, 6));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(1), 'hell oworld');
+				assert.strictEqual(model.getLineContent(1), 'hell oworld');
 				assertSelection(editor, new Selection(1, 7, 1, 7));
 
 				editor.setSelection(new Selection(1, 12, 1, 12));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(1), 'hell oworl');
+				assert.strictEqual(model.getLineContent(1), 'hell oworl');
 				assertSelection(editor, new Selection(2, 2, 2, 2));
 
 				editor.setSelection(new Selection(3, 1, 3, 1));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(3), '');
+				assert.strictEqual(model.getLineContent(3), '');
 				assertSelection(editor, new Selection(4, 1, 4, 1));
 
 				editor.setSelection(new Selection(4, 2, 4, 2));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(4), '   ');
+				assert.strictEqual(model.getLineContent(4), '   ');
 				assertSelection(editor, new Selection(4, 3, 4, 3));
 			}
 		);
@@ -509,22 +509,22 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 1, 1, 1));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(2), '');
+				assert.strictEqual(model.getLineContent(2), '');
 				assertSelection(editor, new Selection(2, 1, 2, 1));
 
 				editor.setSelection(new Selection(3, 6, 3, 6));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(4), 'oworld');
+				assert.strictEqual(model.getLineContent(4), 'oworld');
 				assertSelection(editor, new Selection(4, 2, 4, 2));
 
 				editor.setSelection(new Selection(6, 12, 6, 12));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(7), 'd');
+				assert.strictEqual(model.getLineContent(7), 'd');
 				assertSelection(editor, new Selection(7, 2, 7, 2));
 
 				editor.setSelection(new Selection(8, 12, 8, 12));
 				executeAction(transposeAction, editor);
-				assert.equal(model.getLineContent(8), 'hello world');
+				assert.strictEqual(model.getLineContent(8), 'hello world');
 				assertSelection(editor, new Selection(8, 12, 8, 12));
 			}
 		);
@@ -534,52 +534,131 @@ suite('Editor Contrib - Line Operations', () => {
 		withTestCodeEditor(
 			[
 				'hello world',
-				'öçşğü'
+				'öçşğü',
+				'parseHTMLString',
+				'getElementById',
+				'insertHTML',
+				'PascalCase',
+				'CSSSelectorsList',
+				'iD',
+				'tEST',
+				'öçşÖÇŞğüĞÜ',
+				'audioConverter.convertM4AToMP3();',
+				'snake_case',
+				'Capital_Snake_Case',
+				`function helloWorld() {
+				return someGlobalObject.printHelloWorld("en", "utf-8");
+				}
+				helloWorld();`.replace(/^\s+/gm, '')
 			], {}, (editor) => {
 				let model = editor.getModel()!;
 				let uppercaseAction = new UpperCaseAction();
 				let lowercaseAction = new LowerCaseAction();
 				let titlecaseAction = new TitleCaseAction();
+				let snakecaseAction = new SnakeCaseAction();
 
 				editor.setSelection(new Selection(1, 1, 1, 12));
 				executeAction(uppercaseAction, editor);
-				assert.equal(model.getLineContent(1), 'HELLO WORLD');
+				assert.strictEqual(model.getLineContent(1), 'HELLO WORLD');
 				assertSelection(editor, new Selection(1, 1, 1, 12));
 
 				editor.setSelection(new Selection(1, 1, 1, 12));
 				executeAction(lowercaseAction, editor);
-				assert.equal(model.getLineContent(1), 'hello world');
+				assert.strictEqual(model.getLineContent(1), 'hello world');
 				assertSelection(editor, new Selection(1, 1, 1, 12));
 
 				editor.setSelection(new Selection(1, 3, 1, 3));
 				executeAction(uppercaseAction, editor);
-				assert.equal(model.getLineContent(1), 'HELLO world');
+				assert.strictEqual(model.getLineContent(1), 'HELLO world');
 				assertSelection(editor, new Selection(1, 3, 1, 3));
 
 				editor.setSelection(new Selection(1, 4, 1, 4));
 				executeAction(lowercaseAction, editor);
-				assert.equal(model.getLineContent(1), 'hello world');
+				assert.strictEqual(model.getLineContent(1), 'hello world');
 				assertSelection(editor, new Selection(1, 4, 1, 4));
 
 				editor.setSelection(new Selection(1, 1, 1, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(1), 'Hello World');
+				assert.strictEqual(model.getLineContent(1), 'Hello World');
 				assertSelection(editor, new Selection(1, 1, 1, 12));
 
 				editor.setSelection(new Selection(2, 1, 2, 6));
 				executeAction(uppercaseAction, editor);
-				assert.equal(model.getLineContent(2), 'ÖÇŞĞÜ');
+				assert.strictEqual(model.getLineContent(2), 'ÖÇŞĞÜ');
 				assertSelection(editor, new Selection(2, 1, 2, 6));
 
 				editor.setSelection(new Selection(2, 1, 2, 6));
 				executeAction(lowercaseAction, editor);
-				assert.equal(model.getLineContent(2), 'öçşğü');
+				assert.strictEqual(model.getLineContent(2), 'öçşğü');
 				assertSelection(editor, new Selection(2, 1, 2, 6));
 
 				editor.setSelection(new Selection(2, 1, 2, 6));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(2), 'Öçşğü');
+				assert.strictEqual(model.getLineContent(2), 'Öçşğü');
 				assertSelection(editor, new Selection(2, 1, 2, 6));
+
+				editor.setSelection(new Selection(3, 1, 3, 16));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(3), 'parse_html_string');
+				assertSelection(editor, new Selection(3, 1, 3, 18));
+
+				editor.setSelection(new Selection(4, 1, 4, 15));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(4), 'get_element_by_id');
+				assertSelection(editor, new Selection(4, 1, 4, 18));
+
+				editor.setSelection(new Selection(5, 1, 5, 11));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(5), 'insert_html');
+				assertSelection(editor, new Selection(5, 1, 5, 12));
+
+				editor.setSelection(new Selection(6, 1, 6, 11));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(6), 'pascal_case');
+				assertSelection(editor, new Selection(6, 1, 6, 12));
+
+				editor.setSelection(new Selection(7, 1, 7, 17));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(7), 'css_selectors_list');
+				assertSelection(editor, new Selection(7, 1, 7, 19));
+
+				editor.setSelection(new Selection(8, 1, 8, 3));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(8), 'i_d');
+				assertSelection(editor, new Selection(8, 1, 8, 4));
+
+				editor.setSelection(new Selection(9, 1, 9, 5));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(9), 't_est');
+				assertSelection(editor, new Selection(9, 1, 9, 6));
+
+				editor.setSelection(new Selection(10, 1, 10, 11));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(10), 'öçş_öç_şğü_ğü');
+				assertSelection(editor, new Selection(10, 1, 10, 14));
+
+				editor.setSelection(new Selection(11, 1, 11, 34));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(11), 'audio_converter.convert_m4a_to_mp3();');
+				assertSelection(editor, new Selection(11, 1, 11, 38));
+
+				editor.setSelection(new Selection(12, 1, 12, 11));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(12), 'snake_case');
+				assertSelection(editor, new Selection(12, 1, 12, 11));
+
+				editor.setSelection(new Selection(13, 1, 13, 19));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getLineContent(13), 'capital_snake_case');
+				assertSelection(editor, new Selection(13, 1, 13, 19));
+
+				editor.setSelection(new Selection(14, 1, 17, 14));
+				executeAction(snakecaseAction, editor);
+				assert.strictEqual(model.getValueInRange(new Selection(14, 1, 17, 15)), `function hello_world() {
+					return some_global_object.print_hello_world("en", "utf-8");
+				}
+				hello_world();`.replace(/^\s+/gm, ''));
+				assertSelection(editor, new Selection(14, 1, 17, 15));
 			}
 		);
 
@@ -597,27 +676,27 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 1, 1, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(1), 'Foo Bar Baz');
+				assert.strictEqual(model.getLineContent(1), 'Foo Bar Baz');
 
 				editor.setSelection(new Selection(2, 1, 2, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(2), 'Foo\'Bar\'Baz');
+				assert.strictEqual(model.getLineContent(2), 'Foo\'Bar\'Baz');
 
 				editor.setSelection(new Selection(3, 1, 3, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(3), 'Foo[Bar]Baz');
+				assert.strictEqual(model.getLineContent(3), 'Foo[Bar]Baz');
 
 				editor.setSelection(new Selection(4, 1, 4, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(4), 'Foo`Bar~Baz');
+				assert.strictEqual(model.getLineContent(4), 'Foo`Bar~Baz');
 
 				editor.setSelection(new Selection(5, 1, 5, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(5), 'Foo^Bar%Baz');
+				assert.strictEqual(model.getLineContent(5), 'Foo^Bar%Baz');
 
 				editor.setSelection(new Selection(6, 1, 6, 12));
 				executeAction(titlecaseAction, editor);
-				assert.equal(model.getLineContent(6), 'Foo$Bar!Baz');
+				assert.strictEqual(model.getLineContent(6), 'Foo$Bar!Baz');
 			}
 		);
 
@@ -632,22 +711,22 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 1, 1, 1));
 				executeAction(uppercaseAction, editor);
-				assert.equal(model.getLineContent(1), '');
+				assert.strictEqual(model.getLineContent(1), '');
 				assertSelection(editor, new Selection(1, 1, 1, 1));
 
 				editor.setSelection(new Selection(1, 1, 1, 1));
 				executeAction(lowercaseAction, editor);
-				assert.equal(model.getLineContent(1), '');
+				assert.strictEqual(model.getLineContent(1), '');
 				assertSelection(editor, new Selection(1, 1, 1, 1));
 
 				editor.setSelection(new Selection(2, 2, 2, 2));
 				executeAction(uppercaseAction, editor);
-				assert.equal(model.getLineContent(2), '   ');
+				assert.strictEqual(model.getLineContent(2), '   ');
 				assertSelection(editor, new Selection(2, 2, 2, 2));
 
 				editor.setSelection(new Selection(2, 2, 2, 2));
 				executeAction(lowercaseAction, editor);
-				assert.equal(model.getLineContent(2), '   ');
+				assert.strictEqual(model.getLineContent(2), '   ');
 				assertSelection(editor, new Selection(2, 2, 2, 2));
 			}
 		);
@@ -660,18 +739,18 @@ suite('Editor Contrib - Line Operations', () => {
 				const action = new DeleteAllRightAction();
 
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
 
 				editor.setSelection(new Selection(1, 1, 1, 1));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
 
 				editor.setSelections([new Selection(1, 1, 1, 1), new Selection(1, 1, 1, 1), new Selection(1, 1, 1, 1)]);
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
 			});
 		});
 
@@ -685,18 +764,18 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 2, 1, 5));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['ho', 'world']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 2, 1, 2)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['ho', 'world']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 2, 1, 2)]);
 
 				editor.setSelection(new Selection(1, 1, 2, 4));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['ld']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['ld']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
 
 				editor.setSelection(new Selection(1, 1, 1, 3));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 1, 1, 1)]);
 			});
 		});
 
@@ -710,13 +789,13 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 3, 1, 3));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['he', 'world']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 3, 1, 3)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['he', 'world']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 3, 1, 3)]);
 
 				editor.setSelection(new Selection(2, 1, 2, 1));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['he', '']);
-				assert.deepEqual(editor.getSelections(), [new Selection(2, 1, 2, 1)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['he', '']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(2, 1, 2, 1)]);
 			});
 		});
 
@@ -730,18 +809,18 @@ suite('Editor Contrib - Line Operations', () => {
 
 				editor.setSelection(new Selection(1, 6, 1, 6));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['helloworld']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['helloworld']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
 
 				editor.setSelection(new Selection(1, 6, 1, 6));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['hello']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['hello']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
 
 				editor.setSelection(new Selection(1, 6, 1, 6));
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['hello']);
-				assert.deepEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
+				assert.deepStrictEqual(model.getLinesContent(), ['hello']);
+				assert.deepStrictEqual(editor.getSelections(), [new Selection(1, 6, 1, 6)]);
 			});
 		});
 
@@ -760,35 +839,35 @@ suite('Editor Contrib - Line Operations', () => {
 					new Selection(3, 4, 3, 4),
 				]);
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['hethere', 'wor']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['hethere', 'wor']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(2, 4, 2, 4)
 				]);
 
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['he', 'wor']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['he', 'wor']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(2, 4, 2, 4)
 				]);
 
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['hewor']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['hewor']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(1, 6, 1, 6)
 				]);
 
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['he']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['he']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3)
 				]);
 
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['he']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['he']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3)
 				]);
 			});
@@ -809,20 +888,20 @@ suite('Editor Contrib - Line Operations', () => {
 					new Selection(3, 4, 3, 4),
 				]);
 				executeAction(action, editor);
-				assert.deepEqual(model.getLinesContent(), ['hethere', 'wor']);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(model.getLinesContent(), ['hethere', 'wor']);
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(2, 4, 2, 4)
 				]);
 
 				CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(1, 6, 1, 6),
 					new Selection(3, 4, 3, 4)
 				]);
 				CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 3, 1, 3),
 					new Selection(2, 4, 2, 4)
 				]);
@@ -847,27 +926,27 @@ suite('Editor Contrib - Line Operations', () => {
 		}
 
 		testInsertLineBefore(1, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(1, 1, 1, 1));
-			assert.equal(model.getLineContent(1), '');
-			assert.equal(model.getLineContent(2), 'First line');
-			assert.equal(model.getLineContent(3), 'Second line');
-			assert.equal(model.getLineContent(4), 'Third line');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(1, 1, 1, 1));
+			assert.strictEqual(model.getLineContent(1), '');
+			assert.strictEqual(model.getLineContent(2), 'First line');
+			assert.strictEqual(model.getLineContent(3), 'Second line');
+			assert.strictEqual(model.getLineContent(4), 'Third line');
 		});
 
 		testInsertLineBefore(2, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(2, 1, 2, 1));
-			assert.equal(model.getLineContent(1), 'First line');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), 'Second line');
-			assert.equal(model.getLineContent(4), 'Third line');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(2, 1, 2, 1));
+			assert.strictEqual(model.getLineContent(1), 'First line');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), 'Second line');
+			assert.strictEqual(model.getLineContent(4), 'Third line');
 		});
 
 		testInsertLineBefore(3, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(3, 1, 3, 1));
-			assert.equal(model.getLineContent(1), 'First line');
-			assert.equal(model.getLineContent(2), 'Second line');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), 'Third line');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(3, 1, 3, 1));
+			assert.strictEqual(model.getLineContent(1), 'First line');
+			assert.strictEqual(model.getLineContent(2), 'Second line');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), 'Third line');
 		});
 	});
 
@@ -888,27 +967,27 @@ suite('Editor Contrib - Line Operations', () => {
 		}
 
 		testInsertLineAfter(1, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(2, 1, 2, 1));
-			assert.equal(model.getLineContent(1), 'First line');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), 'Second line');
-			assert.equal(model.getLineContent(4), 'Third line');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(2, 1, 2, 1));
+			assert.strictEqual(model.getLineContent(1), 'First line');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), 'Second line');
+			assert.strictEqual(model.getLineContent(4), 'Third line');
 		});
 
 		testInsertLineAfter(2, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(3, 1, 3, 1));
-			assert.equal(model.getLineContent(1), 'First line');
-			assert.equal(model.getLineContent(2), 'Second line');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), 'Third line');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(3, 1, 3, 1));
+			assert.strictEqual(model.getLineContent(1), 'First line');
+			assert.strictEqual(model.getLineContent(2), 'Second line');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), 'Third line');
 		});
 
 		testInsertLineAfter(3, 3, (model, viewModel) => {
-			assert.deepEqual(viewModel.getSelection(), new Selection(4, 1, 4, 1));
-			assert.equal(model.getLineContent(1), 'First line');
-			assert.equal(model.getLineContent(2), 'Second line');
-			assert.equal(model.getLineContent(3), 'Third line');
-			assert.equal(model.getLineContent(4), '');
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(4, 1, 4, 1));
+			assert.strictEqual(model.getLineContent(1), 'First line');
+			assert.strictEqual(model.getLineContent(2), 'Second line');
+			assert.strictEqual(model.getLineContent(3), 'Third line');
+			assert.strictEqual(model.getLineContent(4), '');
 		});
 	});
 
@@ -928,11 +1007,11 @@ suite('Editor Contrib - Line Operations', () => {
 			editor.setPosition(new Position(1, 2));
 
 			executeAction(indentLinesAction, editor);
-			assert.equal(model.getLineContent(1), '\tfunction baz() {');
-			assert.deepEqual(editor.getSelection(), new Selection(1, 3, 1, 3));
+			assert.strictEqual(model.getLineContent(1), '\tfunction baz() {');
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 3, 1, 3));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '\tf\tunction baz() {');
+			assert.strictEqual(model.getLineContent(1), '\tf\tunction baz() {');
 		});
 
 		model.dispose();
@@ -953,8 +1032,8 @@ suite('Editor Contrib - Line Operations', () => {
 			editor.setPosition(new Position(1, 1));
 
 			executeAction(indentLinesAction, editor);
-			assert.equal(model.getLineContent(1), '\tSome text');
-			assert.deepEqual(editor.getSelection(), new Selection(1, 2, 1, 2));
+			assert.strictEqual(model.getLineContent(1), '\tSome text');
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 2, 1, 2));
 		});
 
 		model.dispose();
@@ -972,8 +1051,8 @@ suite('Editor Contrib - Line Operations', () => {
 			editor.setPosition(new Position(1, 1));
 
 			executeAction(indentLinesAction, editor);
-			assert.equal(model.getLineContent(1), '    ');
-			assert.deepEqual(editor.getSelection(), new Selection(1, 5, 1, 5));
+			assert.strictEqual(model.getLineContent(1), '    ');
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 5, 1, 5));
 		});
 
 		model.dispose();
@@ -995,7 +1074,7 @@ suite('Editor Contrib - Line Operations', () => {
 			const deleteLinesAction = new DeleteLinesAction();
 			executeAction(deleteLinesAction, editor);
 
-			assert.equal(editor.getValue(), 'a\nc');
+			assert.strictEqual(editor.getValue(), 'a\nc');
 		});
 	});
 
@@ -1007,8 +1086,8 @@ suite('Editor Contrib - Line Operations', () => {
 			const deleteLinesAction = new DeleteLinesAction();
 			executeAction(deleteLinesAction, editor);
 
-			assert.equal(editor.getValue(), resultingText.join('\n'));
-			assert.deepEqual(editor.getSelections(), resultingSelections);
+			assert.strictEqual(editor.getValue(), resultingText.join('\n'));
+			assert.deepStrictEqual(editor.getSelections(), resultingSelections);
 		});
 	}
 
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index 04e8b8aa0..8997154ce 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -57,7 +57,7 @@ function getHoverMessage(link: Link, useMetaKey: boolean): MarkdownString {
 				nativeLabel = ` "${nativeLabelText}"`;
 			}
 		}
-		const hoverMessage = new MarkdownString('', true).appendMarkdown(`[${label}](${link.url.toString()}${nativeLabel}) (${kb})`);
+		const hoverMessage = new MarkdownString('', true).appendMarkdown(`[${label}](${link.url.toString(true)}${nativeLabel}) (${kb})`);
 		return hoverMessage;
 	} else {
 		return new MarkdownString().appendText(`${label} (${kb})`);
@@ -327,7 +327,7 @@ export class LinkDetector implements IEditorContribution {
 				}
 			}
 
-			return this.openerService.open(uri, { openToSide, fromUserGesture });
+			return this.openerService.open(uri, { openToSide, fromUserGesture, allowContributedOpeners: true });
 
 		}, err => {
 			const messageOrError =
diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts
index 3606348fb..599948853 100644
--- a/src/vs/editor/contrib/multicursor/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/multicursor.ts
@@ -850,7 +850,6 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 					this.updateSoon.schedule();
 				} else {
 					this._setState(null);
-
 				}
 			} else {
 				this._update();
@@ -1016,11 +1015,6 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 		});
 
 		this.decorations = this.editor.deltaDecorations(this.decorations, decorations);
-
-		const currentFindState = CommonFindController.get(this.editor).getState();
-		if (currentFindState.isRegex || currentFindState.matchCase || currentFindState.wholeWord) {
-			CommonFindController.get(this.editor).highlightFindOptions(true);
-		}
 	}
 
 	private static readonly _SELECTION_HIGHLIGHT_OVERVIEW = ModelDecorationOptions.register({
diff --git a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts
index 6e1e0a9be..5a0e7e198 100644
--- a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts
+++ b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts
@@ -25,7 +25,7 @@ suite('Multicursor', () => {
 
 			editor.setSelection(new Selection(2, 1, 2, 1));
 			addCursorUpAction.run(null!, editor, {});
-			assert.equal(viewModel.getSelections().length, 2);
+			assert.strictEqual(viewModel.getSelections().length, 2);
 
 			editor.trigger('test', Handler.Paste, {
 				text: '1\n2',
@@ -35,8 +35,8 @@ suite('Multicursor', () => {
 				]
 			});
 
-			assert.equal(editor.getModel()!.getLineContent(1), '1abc');
-			assert.equal(editor.getModel()!.getLineContent(2), '2def');
+			assert.strictEqual(editor.getModel()!.getLineContent(1), '1abc');
+			assert.strictEqual(editor.getModel()!.getLineContent(2), '2def');
 		});
 	});
 
@@ -46,7 +46,7 @@ suite('Multicursor', () => {
 		], {}, (editor, viewModel) => {
 			let addCursorDownAction = new InsertCursorBelow();
 			addCursorDownAction.run(null!, editor, {});
-			assert.equal(viewModel.getSelections().length, 1);
+			assert.strictEqual(viewModel.getSelections().length, 1);
 		});
 	});
 
@@ -90,7 +90,7 @@ suite('Multicursor selection', () => {
 			editor.setSelection(new Selection(2, 9, 2, 16));
 
 			selectHighlightsAction.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[2, 9, 2, 16],
 				[1, 9, 1, 16],
 				[3, 9, 3, 16],
@@ -98,7 +98,7 @@ suite('Multicursor selection', () => {
 
 			editor.trigger('test', 'removeSecondaryCursors', null);
 
-			assert.deepEqual(fromRange(editor.getSelection()!), [2, 9, 2, 16]);
+			assert.deepStrictEqual(fromRange(editor.getSelection()!), [2, 9, 2, 16]);
 
 			multiCursorSelectController.dispose();
 			findController.dispose();
@@ -121,13 +121,13 @@ suite('Multicursor selection', () => {
 			findController.getState().change({ searchString: 'some+thing', isRegex: true, isRevealed: true }, false);
 
 			selectHighlightsAction.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[1, 1, 1, 10],
 				[2, 1, 2, 11],
 				[3, 1, 3, 12],
 			]);
 
-			assert.equal(findController.getState().searchString, 'some+thing');
+			assert.strictEqual(findController.getState().searchString, 'some+thing');
 
 			multiCursorSelectController.dispose();
 			findController.dispose();
@@ -154,14 +154,14 @@ suite('Multicursor selection', () => {
 			editor.setSelection(new Selection(2, 1, 3, 4));
 
 			addSelectionToNextFindMatch.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[2, 1, 3, 4],
 				[8, 1, 9, 4]
 			]);
 
 			editor.trigger('test', 'removeSecondaryCursors', null);
 
-			assert.deepEqual(fromRange(editor.getSelection()!), [2, 1, 3, 4]);
+			assert.deepStrictEqual(fromRange(editor.getSelection()!), [2, 1, 3, 4]);
 
 			multiCursorSelectController.dispose();
 			findController.dispose();
@@ -182,7 +182,7 @@ suite('Multicursor selection', () => {
 			editor.setSelection(new Selection(1, 1, 1, 4));
 
 			addSelectionToNextFindMatch.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[1, 1, 1, 4],
 				[1, 4, 1, 7]
 			]);
@@ -190,7 +190,7 @@ suite('Multicursor selection', () => {
 			addSelectionToNextFindMatch.run(null!, editor);
 			addSelectionToNextFindMatch.run(null!, editor);
 			addSelectionToNextFindMatch.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[1, 1, 1, 4],
 				[1, 4, 1, 7],
 				[2, 1, 2, 4],
@@ -199,14 +199,14 @@ suite('Multicursor selection', () => {
 			]);
 
 			editor.trigger('test', Handler.Type, { text: 'z' });
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[1, 2, 1, 2],
 				[1, 3, 1, 3],
 				[2, 2, 2, 2],
 				[3, 2, 3, 2],
 				[3, 3, 3, 3]
 			]);
-			assert.equal(editor.getValue(), [
+			assert.strictEqual(editor.getValue(), [
 				'zz',
 				'z',
 				'zz',
@@ -239,14 +239,14 @@ suite('Multicursor selection', () => {
 			editor.setSelection(new Selection(2, 1, 3, 4));
 
 			addSelectionToNextFindMatch.run(null!, editor);
-			assert.deepEqual(editor.getSelections()!.map(fromRange), [
+			assert.deepStrictEqual(editor.getSelections()!.map(fromRange), [
 				[2, 1, 3, 4],
 				[8, 1, 9, 4]
 			]);
 
 			editor.trigger('test', 'removeSecondaryCursors', null);
 
-			assert.deepEqual(fromRange(editor.getSelection()!), [2, 1, 3, 4]);
+			assert.deepStrictEqual(fromRange(editor.getSelection()!), [2, 1, 3, 4]);
 
 			multiCursorSelectController.dispose();
 			findController.dispose();
@@ -284,25 +284,25 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
@@ -323,20 +323,20 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
@@ -357,20 +357,20 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
@@ -392,14 +392,14 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 4),
 				new Selection(2, 1, 2, 4),
 				new Selection(3, 1, 3, 4),
@@ -421,14 +421,14 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 5, 1, 10),
 				new Selection(2, 5, 2, 10),
 				new Selection(3, 5, 3, 8),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 5, 1, 10),
 				new Selection(2, 5, 2, 10),
 				new Selection(3, 5, 3, 8),
@@ -450,20 +450,20 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(2, 1, 2, 5),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(2, 1, 2, 5),
 				new Selection(3, 1, 3, 5),
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(2, 1, 2, 5),
 				new Selection(3, 1, 3, 5),
@@ -471,7 +471,7 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(2, 1, 2, 5),
 				new Selection(3, 1, 3, 5),
@@ -480,7 +480,7 @@ suite('Multicursor selection', () => {
 			]);
 
 			action.run(null!, editor);
-			assert.deepEqual(editor.getSelections(), [
+			assert.deepStrictEqual(editor.getSelections(), [
 				new Selection(1, 1, 1, 5),
 				new Selection(2, 1, 2, 5),
 				new Selection(3, 1, 3, 5),
@@ -508,18 +508,18 @@ suite('Multicursor selection', () => {
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(4, 1, 4, 4),
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(4, 1, 4, 4),
 					new Selection(6, 2, 6, 5),
@@ -534,12 +534,12 @@ suite('Multicursor selection', () => {
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(4, 1, 4, 4),
 				]);
@@ -550,7 +550,7 @@ suite('Multicursor selection', () => {
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(2, 1, 2, 4),
 				]);
@@ -565,14 +565,14 @@ suite('Multicursor selection', () => {
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(4, 1, 4, 4),
 					new Selection(6, 2, 6, 5),
 				]);
 
 				action.run(null!, editor);
-				assert.deepEqual(editor.getSelections(), [
+				assert.deepStrictEqual(editor.getSelections(), [
 					new Selection(1, 1, 1, 4),
 					new Selection(4, 1, 4, 4),
 					new Selection(6, 2, 6, 5),
diff --git a/src/vs/editor/contrib/parameterHints/parameterHints.css b/src/vs/editor/contrib/parameterHints/parameterHints.css
index 03c4e2640..64f277ccf 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHints.css
+++ b/src/vs/editor/contrib/parameterHints/parameterHints.css
@@ -10,7 +10,7 @@
 	line-height: 1.5em;
 }
 
-.monaco-editor .parameter-hints-widget > .wrapper {
+.monaco-editor .parameter-hints-widget > .phwrapper {
 	max-width: 440px;
 	display: flex;
 	flex-direction: row;
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
index 54b7a807b..2f41f4892 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -14,7 +14,7 @@ import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentW
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import * as modes from 'vs/editor/common/modes';
 import { IModeService } from 'vs/editor/common/services/modeService';
-import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
+import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
 import { Context } from 'vs/editor/contrib/parameterHints/provideSignatureHelp';
 import * as nls from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -27,6 +27,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { assertIsDefined } from 'vs/base/common/types';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { IMarkdownString } from 'vs/base/common/htmlContent';
 
 const $ = dom.$;
 
@@ -81,7 +82,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 
 	private createParamaterHintDOMNodes() {
 		const element = $('.editor-widget.parameter-hints-widget');
-		const wrapper = dom.append(element, $('.wrapper'));
+		const wrapper = dom.append(element, $('.phwrapper'));
 		wrapper.tabIndex = -1;
 
 		const controls = dom.append(wrapper, $('.controls'));
@@ -225,8 +226,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 			if (typeof activeParameter.documentation === 'string') {
 				documentation.textContent = activeParameter.documentation;
 			} else {
-				const renderedContents = this.renderDisposeables.add(this.markdownRenderer.render(activeParameter.documentation));
-				renderedContents.element.classList.add('markdown-docs');
+				const renderedContents = this.renderMarkdownDocs(activeParameter.documentation);
 				documentation.appendChild(renderedContents.element);
 			}
 			dom.append(this.domNodes.docs, $('p', {}, documentation));
@@ -237,8 +237,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		} else if (typeof signature.documentation === 'string') {
 			dom.append(this.domNodes.docs, $('p', {}, signature.documentation));
 		} else {
-			const renderedContents = this.renderDisposeables.add(this.markdownRenderer.render(signature.documentation));
-			renderedContents.element.classList.add('markdown-docs');
+			const renderedContents = this.renderMarkdownDocs(signature.documentation);
 			dom.append(this.domNodes.docs, renderedContents.element);
 		}
 
@@ -265,6 +264,16 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		this.domNodes.scrollbar.scanDomNode();
 	}
 
+	private renderMarkdownDocs(markdown: IMarkdownString | undefined): IMarkdownRenderResult {
+		const renderedContents = this.renderDisposeables.add(this.markdownRenderer.render(markdown, {
+			asyncRenderCallback: () => {
+				this.domNodes?.scrollbar.scanDomNode();
+			}
+		}));
+		renderedContents.element.classList.add('markdown-docs');
+		return renderedContents;
+	}
+
 	private hasDocs(signature: modes.SignatureInformation, activeParameter: modes.ParameterInformation | undefined): boolean {
 		if (activeParameter && typeof activeParameter.documentation === 'string' && assertIsDefined(activeParameter.documentation).length > 0) {
 			return true;
@@ -360,7 +369,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		const height = Math.max(this.editor.getLayoutInfo().height / 4, 250);
 		const maxHeight = `${height}px`;
 		this.domNodes.element.style.maxHeight = maxHeight;
-		const wrapper = this.domNodes.element.getElementsByClassName('wrapper') as HTMLCollectionOf<HTMLElement>;
+		const wrapper = this.domNodes.element.getElementsByClassName('phwrapper') as HTMLCollectionOf<HTMLElement>;
 		if (wrapper.length) {
 			wrapper[0].style.maxHeight = maxHeight;
 		}
diff --git a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
index d513ef4b9..6cfa1e420 100644
--- a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
+++ b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { first } from 'vs/base/common/async';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { ITextModel } from 'vs/editor/common/model';
@@ -20,19 +19,26 @@ export const Context = {
 	MultipleSignatures: new RawContextKey<boolean>('parameterHintsMultipleSignatures', false),
 };
 
-export function provideSignatureHelp(
+export async function provideSignatureHelp(
 	model: ITextModel,
 	position: Position,
 	context: modes.SignatureHelpContext,
 	token: CancellationToken
-): Promise<modes.SignatureHelpResult | null | undefined> {
+): Promise<modes.SignatureHelpResult | undefined> {
 
 	const supports = modes.SignatureHelpProviderRegistry.ordered(model);
 
-	return first(supports.map(support => () => {
-		return Promise.resolve(support.provideSignatureHelp(model, position, token, context))
-			.catch<modes.SignatureHelpResult | undefined>(e => onUnexpectedExternalError(e));
-	}));
+	for (const support of supports) {
+		try {
+			const result = await support.provideSignatureHelp(model, position, token, context);
+			if (result) {
+				return result;
+			}
+		} catch (err) {
+			onUnexpectedExternalError(err);
+		}
+	}
+	return undefined;
 }
 
 CommandsRegistry.registerCommand('_executeSignatureHelpProvider', async (accessor, ...args: [URI, IPosition, string?]) => {
diff --git a/src/vs/editor/contrib/peekView/peekView.ts b/src/vs/editor/contrib/peekView/peekView.ts
index f265a4bfd..36db5b2b3 100644
--- a/src/vs/editor/contrib/peekView/peekView.ts
+++ b/src/vs/editor/contrib/peekView/peekView.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/peekViewWidget';
 import * as dom from 'vs/base/browser/dom';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { ActionBar, IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar, ActionsOrientation, IActionBarOptions } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
 import { Color } from 'vs/base/common/color';
 import { Emitter } from 'vs/base/common/event';
@@ -25,8 +25,7 @@ import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { registerColor, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { Codicon } from 'vs/base/common/codicons';
-import { MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 
 export const IPeekViewService = createDecorator<IPeekViewService>('IPeekViewService');
 export interface IPeekViewService {
@@ -107,6 +106,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
 
 	private readonly _onDidClose = new Emitter<PeekViewWidget>();
 	readonly onDidClose = this._onDidClose.event;
+	private disposed?: true;
 
 	protected _headElement?: HTMLDivElement;
 	protected _primaryHeading?: HTMLElement;
@@ -125,8 +125,11 @@ export abstract class PeekViewWidget extends ZoneWidget {
 	}
 
 	dispose(): void {
-		super.dispose();
-		this._onDidClose.fire(this);
+		if (!this.disposed) {
+			this.disposed = true; // prevent consumers who dispose on onDidClose from looping
+			super.dispose();
+			this._onDidClose.fire(this);
+		}
 	}
 
 	style(styles: IPeekViewStyles): void {
@@ -204,15 +207,8 @@ export abstract class PeekViewWidget extends ZoneWidget {
 
 	protected _getActionBarOptions(): IActionBarOptions {
 		return {
-			actionViewItemProvider: action => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-				} else if (action instanceof SubmenuItemAction) {
-					return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-				}
-
-				return undefined;
-			}
+			actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
+			orientation: ActionsOrientation.HORIZONTAL
 		};
 	}
 
diff --git a/src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts b/src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts
index 7db794fa8..ec7d2ab92 100644
--- a/src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts
@@ -10,7 +10,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { stripCodicons } from 'vs/base/common/codicons';
+import { stripIcons } from 'vs/base/common/iconLabels';
 
 export abstract class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
 
@@ -41,7 +41,7 @@ export abstract class AbstractEditorCommandsQuickAccessProvider extends Abstract
 			editorCommandPicks.push({
 				commandId: editorAction.id,
 				commandAlias: editorAction.alias,
-				label: stripCodicons(editorAction.label) || editorAction.id,
+				label: stripIcons(editorAction.label) || editorAction.id,
 			});
 		}
 
diff --git a/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
index 9fb3e3d3c..96c0a9be6 100644
--- a/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
@@ -12,11 +12,10 @@ import { ITextModel } from 'vs/editor/common/model';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { AbstractEditorNavigationQuickAccessProvider, IEditorNavigationQuickAccessOptions, IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/editorNavigationQuickAccess';
 import { DocumentSymbol, SymbolKinds, SymbolTag, DocumentSymbolProviderRegistry, SymbolKind } from 'vs/editor/common/modes';
-import { OutlineModel, OutlineElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { OutlineModel } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { trim, format } from 'vs/base/common/strings';
 import { prepareQuery, IPreparedQuery, pieceToQuery, scoreFuzzy2 } from 'vs/base/common/fuzzyScorer';
 import { IMatch } from 'vs/base/common/filters';
-import { Iterable } from 'vs/base/common/iterator';
 import { Codicon } from 'vs/base/common/codicons';
 
 export interface IGotoSymbolQuickPickItem extends IQuickPickItem {
@@ -144,7 +143,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 
 		// Resolve symbols from document once and reuse this
 		// request for all filtering and typing then on
-		const symbolsPromise = this.getDocumentSymbols(model, true, token);
+		const symbolsPromise = this.getDocumentSymbols(model, token);
 
 		// Set initial picks and update on type
 		let picksCts: CancellationTokenSource | undefined = undefined;
@@ -418,49 +417,9 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return result;
 	}
 
-	protected async getDocumentSymbols(document: ITextModel, flatten: boolean, token: CancellationToken): Promise<DocumentSymbol[]> {
+	protected async getDocumentSymbols(document: ITextModel, token: CancellationToken): Promise<DocumentSymbol[]> {
 		const model = await OutlineModel.create(document, token);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		const roots: DocumentSymbol[] = [];
-		for (const child of model.children.values()) {
-			if (child instanceof OutlineElement) {
-				roots.push(child.symbol);
-			} else {
-				roots.push(...Iterable.map(child.children.values(), child => child.symbol));
-			}
-		}
-
-		let flatEntries: DocumentSymbol[] = [];
-		if (flatten) {
-			this.flattenDocumentSymbols(flatEntries, roots, '');
-		} else {
-			flatEntries = roots;
-		}
-
-		return flatEntries.sort((symbolA, symbolB) => Range.compareRangesUsingStarts(symbolA.range, symbolB.range));
-	}
-
-	private flattenDocumentSymbols(bucket: DocumentSymbol[], entries: DocumentSymbol[], overrideContainerLabel: string): void {
-		for (const entry of entries) {
-			bucket.push({
-				kind: entry.kind,
-				tags: entry.tags,
-				name: entry.name,
-				detail: entry.detail,
-				containerName: entry.containerName || overrideContainerLabel,
-				range: entry.range,
-				selectionRange: entry.selectionRange,
-				children: undefined, // we flatten it...
-			});
-
-			// Recurse over children
-			if (entry.children) {
-				this.flattenDocumentSymbols(bucket, entry.children, entry.name);
-			}
-		}
+		return token.isCancellationRequested ? [] : model.asListOfDocumentSymbols();
 	}
 }
 
diff --git a/src/vs/editor/contrib/smartSelect/bracketSelections.ts b/src/vs/editor/contrib/smartSelect/bracketSelections.ts
index 3842ad87b..af7496f4c 100644
--- a/src/vs/editor/contrib/smartSelect/bracketSelections.ts
+++ b/src/vs/editor/contrib/smartSelect/bracketSelections.ts
@@ -26,7 +26,7 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
 		return result;
 	}
 
-	private static readonly _maxDuration = 30;
+	public static _maxDuration = 30;
 	private static readonly _maxRounds = 2;
 
 	private static _bracketsRightYield(resolve: () => void, round: number, model: ITextModel, pos: Position, ranges: Map<string, LinkedList<Range>>): void {
diff --git a/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
index 4c566492b..862a0febe 100644
--- a/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
@@ -16,7 +16,7 @@ import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/bra
 import { provideSelectionRanges } from 'vs/editor/contrib/smartSelect/smartSelect';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { WordSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/wordSelections';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/modelService.test';
+import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
@@ -45,6 +45,16 @@ class MockJSMode extends MockMode {
 
 suite('SmartSelect', () => {
 
+	const OriginalBracketSelectionRangeProviderMaxDuration = BracketSelectionRangeProvider._maxDuration;
+
+	suiteSetup(() => {
+		BracketSelectionRangeProvider._maxDuration = 5000; // 5 seconds
+	});
+
+	suiteTeardown(() => {
+		BracketSelectionRangeProvider._maxDuration = OriginalBracketSelectionRangeProviderMaxDuration;
+	});
+
 	let modelService: ModelServiceImpl;
 	let mode: MockJSMode;
 
diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts
index bdfe96e7c..0113f8636 100644
--- a/src/vs/editor/contrib/snippet/snippetVariables.ts
+++ b/src/vs/editor/contrib/snippet/snippetVariables.ts
@@ -12,11 +12,11 @@ import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/snip
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace, splitLines } from 'vs/base/common/strings';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { toWorkspaceIdentifier, WORKSPACE_EXTENSION, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { URI } from 'vs/base/common/uri';
 import { OvertypingCapturer } from 'vs/editor/contrib/suggest/suggestOvertypingCapturer';
+import { generateUuid } from 'vs/base/common/uuid';
 
 export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze({
 	'CURRENT_YEAR': true,
@@ -42,6 +42,7 @@ export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze(
 	'TM_FILENAME_BASE': true,
 	'TM_DIRECTORY': true,
 	'TM_FILEPATH': true,
+	'RELATIVE_FILEPATH': true,
 	'BLOCK_COMMENT_START': true,
 	'BLOCK_COMMENT_END': true,
 	'LINE_COMMENT': true,
@@ -49,6 +50,7 @@ export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze(
 	'WORKSPACE_FOLDER': true,
 	'RANDOM': true,
 	'RANDOM_HEX': true,
+	'UUID': true
 });
 
 export class CompositeSnippetVariableResolver implements VariableResolver {
@@ -177,6 +179,8 @@ export class ModelBasedVariableResolver implements VariableResolver {
 
 		} else if (name === 'TM_FILEPATH' && this._labelService) {
 			return this._labelService.getUriLabel(this._model.uri);
+		} else if (name === 'RELATIVE_FILEPATH' && this._labelService) {
+			return this._labelService.getUriLabel(this._model.uri, { relative: true, noPrefix: true });
 		}
 
 		return undefined;
@@ -309,9 +313,9 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
 
 		return undefined;
 	}
-	private _resolveWorkspaceName(workspaceIdentifier: IWorkspaceIdentifier | URI): string | undefined {
+	private _resolveWorkspaceName(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier): string | undefined {
 		if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
-			return path.basename(workspaceIdentifier.path);
+			return path.basename(workspaceIdentifier.uri.path);
 		}
 
 		let filename = path.basename(workspaceIdentifier.configPath.path);
@@ -320,9 +324,9 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
 		}
 		return filename;
 	}
-	private _resoveWorkspacePath(workspaceIdentifier: IWorkspaceIdentifier | URI): string | undefined {
+	private _resoveWorkspacePath(workspaceIdentifier: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier): string | undefined {
 		if (isSingleFolderWorkspaceIdentifier(workspaceIdentifier)) {
-			return normalizeDriveLetter(workspaceIdentifier.fsPath);
+			return normalizeDriveLetter(workspaceIdentifier.uri.fsPath);
 		}
 
 		let filename = path.basename(workspaceIdentifier.configPath.path);
@@ -340,9 +344,10 @@ export class RandomBasedVariableResolver implements VariableResolver {
 
 		if (name === 'RANDOM') {
 			return Math.random().toString().slice(-6);
-		}
-		else if (name === 'RANDOM_HEX') {
+		} else if (name === 'RANDOM_HEX') {
 			return Math.random().toString(16).slice(-6);
+		} else if (name === 'UUID') {
+			return generateUuid();
 		}
 
 		return undefined;
diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
index 8c9be33cf..2559a4219 100644
--- a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts
@@ -62,34 +62,34 @@ suite('SnippetController', () => {
 			editor.setPosition({ lineNumber: 4, column: 2 });
 
 			snippetController.insert(template);
-			assert.equal(editor.getModel()!.getLineContent(4), '\tfor (var index; index < array.length; index++) {');
-			assert.equal(editor.getModel()!.getLineContent(5), '\t\tvar element = array[index];');
-			assert.equal(editor.getModel()!.getLineContent(6), '\t\t');
-			assert.equal(editor.getModel()!.getLineContent(7), '\t}');
+			assert.strictEqual(editor.getModel()!.getLineContent(4), '\tfor (var index; index < array.length; index++) {');
+			assert.strictEqual(editor.getModel()!.getLineContent(5), '\t\tvar element = array[index];');
+			assert.strictEqual(editor.getModel()!.getLineContent(6), '\t\t');
+			assert.strictEqual(editor.getModel()!.getLineContent(7), '\t}');
 
 			editor.trigger('test', 'type', { text: 'i' });
-			assert.equal(editor.getModel()!.getLineContent(4), '\tfor (var i; i < array.length; i++) {');
-			assert.equal(editor.getModel()!.getLineContent(5), '\t\tvar element = array[i];');
-			assert.equal(editor.getModel()!.getLineContent(6), '\t\t');
-			assert.equal(editor.getModel()!.getLineContent(7), '\t}');
+			assert.strictEqual(editor.getModel()!.getLineContent(4), '\tfor (var i; i < array.length; i++) {');
+			assert.strictEqual(editor.getModel()!.getLineContent(5), '\t\tvar element = array[i];');
+			assert.strictEqual(editor.getModel()!.getLineContent(6), '\t\t');
+			assert.strictEqual(editor.getModel()!.getLineContent(7), '\t}');
 
 			snippetController.next();
 			editor.trigger('test', 'type', { text: 'arr' });
-			assert.equal(editor.getModel()!.getLineContent(4), '\tfor (var i; i < arr.length; i++) {');
-			assert.equal(editor.getModel()!.getLineContent(5), '\t\tvar element = arr[i];');
-			assert.equal(editor.getModel()!.getLineContent(6), '\t\t');
-			assert.equal(editor.getModel()!.getLineContent(7), '\t}');
+			assert.strictEqual(editor.getModel()!.getLineContent(4), '\tfor (var i; i < arr.length; i++) {');
+			assert.strictEqual(editor.getModel()!.getLineContent(5), '\t\tvar element = arr[i];');
+			assert.strictEqual(editor.getModel()!.getLineContent(6), '\t\t');
+			assert.strictEqual(editor.getModel()!.getLineContent(7), '\t}');
 
 			snippetController.prev();
 			editor.trigger('test', 'type', { text: 'j' });
-			assert.equal(editor.getModel()!.getLineContent(4), '\tfor (var j; j < arr.length; j++) {');
-			assert.equal(editor.getModel()!.getLineContent(5), '\t\tvar element = arr[j];');
-			assert.equal(editor.getModel()!.getLineContent(6), '\t\t');
-			assert.equal(editor.getModel()!.getLineContent(7), '\t}');
+			assert.strictEqual(editor.getModel()!.getLineContent(4), '\tfor (var j; j < arr.length; j++) {');
+			assert.strictEqual(editor.getModel()!.getLineContent(5), '\t\tvar element = arr[j];');
+			assert.strictEqual(editor.getModel()!.getLineContent(6), '\t\t');
+			assert.strictEqual(editor.getModel()!.getLineContent(7), '\t}');
 
 			snippetController.next();
 			snippetController.next();
-			assert.deepEqual(editor.getPosition(), new Position(6, 3));
+			assert.deepStrictEqual(editor.getPosition(), new Position(6, 3));
 		});
 	});
 
@@ -98,13 +98,13 @@ suite('SnippetController', () => {
 			editor.setPosition({ lineNumber: 4, column: 2 });
 
 			snippetController.insert(template);
-			assert.equal(editor.getModel()!.getLineContent(4), '\tfor (var index; index < array.length; index++) {');
-			assert.equal(editor.getModel()!.getLineContent(5), '\t\tvar element = array[index];');
-			assert.equal(editor.getModel()!.getLineContent(6), '\t\t');
-			assert.equal(editor.getModel()!.getLineContent(7), '\t}');
+			assert.strictEqual(editor.getModel()!.getLineContent(4), '\tfor (var index; index < array.length; index++) {');
+			assert.strictEqual(editor.getModel()!.getLineContent(5), '\t\tvar element = array[index];');
+			assert.strictEqual(editor.getModel()!.getLineContent(6), '\t\t');
+			assert.strictEqual(editor.getModel()!.getLineContent(7), '\t}');
 
 			snippetController.cancel();
-			assert.deepEqual(editor.getPosition(), new Position(4, 16));
+			assert.deepStrictEqual(editor.getPosition(), new Position(4, 16));
 		});
 	});
 
@@ -121,7 +121,7 @@ suite('SnippetController', () => {
 	// 			text: null
 	// 		}]);
 
-	// 		assert.equal(snippetController.isInSnippetMode(), false);
+	// 		assert.strictEqual(snippetController.isInSnippetMode(), false);
 	// 	});
 	// });
 
@@ -138,7 +138,7 @@ suite('SnippetController', () => {
 	// 			text: null
 	// 		}]);
 
-	// 		assert.equal(snippetController.isInSnippetMode(), false);
+	// 		assert.strictEqual(snippetController.isInSnippetMode(), false);
 	// 	});
 	// });
 
@@ -155,7 +155,7 @@ suite('SnippetController', () => {
 	// 			text: '\nHello'
 	// 		}]);
 
-	// 		assert.equal(snippetController.isInSnippetMode(), false);
+	// 		assert.strictEqual(snippetController.isInSnippetMode(), false);
 	// 	});
 	// });
 
@@ -172,7 +172,7 @@ suite('SnippetController', () => {
 	// 			text: '\nHello'
 	// 		}]);
 
-	// 		assert.equal(snippetController.isInSnippetMode(), false);
+	// 		assert.strictEqual(snippetController.isInSnippetMode(), false);
 	// 	});
 	// });
 
@@ -183,7 +183,7 @@ suite('SnippetController', () => {
 
 			editor.getModel()!.setValue('goodbye');
 
-			assert.equal(snippetController.isInSnippetMode(), false);
+			assert.strictEqual(snippetController.isInSnippetMode(), false);
 		});
 	});
 
@@ -194,7 +194,7 @@ suite('SnippetController', () => {
 
 			editor.getModel()!.undo();
 
-			assert.equal(snippetController.isInSnippetMode(), false);
+			assert.strictEqual(snippetController.isInSnippetMode(), false);
 		});
 	});
 
@@ -205,7 +205,7 @@ suite('SnippetController', () => {
 
 			editor.setPosition({ lineNumber: 1, column: 1 });
 
-			assert.equal(snippetController.isInSnippetMode(), false);
+			assert.strictEqual(snippetController.isInSnippetMode(), false);
 		});
 	});
 
@@ -216,7 +216,7 @@ suite('SnippetController', () => {
 
 			editor.setModel(null);
 
-			assert.equal(snippetController.isInSnippetMode(), false);
+			assert.strictEqual(snippetController.isInSnippetMode(), false);
 		});
 	});
 
@@ -227,7 +227,7 @@ suite('SnippetController', () => {
 
 			snippetController.dispose();
 
-			assert.equal(snippetController.isInSnippetMode(), false);
+			assert.strictEqual(snippetController.isInSnippetMode(), false);
 		});
 	});
 
@@ -241,7 +241,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'foo$0';
 			snippetController.insert(codeSnippet);
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 			assert.ok(first.equalsRange({ startLineNumber: 1, startColumn: 4, endLineNumber: 1, endColumn: 4 }), first.toString());
 			assert.ok(second.equalsRange({ startLineNumber: 2, startColumn: 4, endLineNumber: 2, endColumn: 4 }), second.toString());
@@ -256,7 +256,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'foo$0bar';
 			snippetController.insert(codeSnippet);
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 			assert.ok(first.equalsRange({ startLineNumber: 1, startColumn: 4, endLineNumber: 1, endColumn: 4 }), first.toString());
 			assert.ok(second.equalsRange({ startLineNumber: 2, startColumn: 4, endLineNumber: 2, endColumn: 4 }), second.toString());
@@ -271,7 +271,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'foo$0bar';
 			snippetController.insert(codeSnippet);
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 			assert.ok(first.equalsRange({ startLineNumber: 1, startColumn: 4, endLineNumber: 1, endColumn: 4 }), first.toString());
 			assert.ok(second.equalsRange({ startLineNumber: 1, startColumn: 14, endLineNumber: 1, endColumn: 14 }), second.toString());
@@ -286,7 +286,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'foo\n$0\nbar';
 			snippetController.insert(codeSnippet);
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 			assert.ok(first.equalsRange({ startLineNumber: 2, startColumn: 1, endLineNumber: 2, endColumn: 1 }), first.toString());
 			assert.ok(second.equalsRange({ startLineNumber: 4, startColumn: 1, endLineNumber: 4, endColumn: 1 }), second.toString());
@@ -301,7 +301,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'foo\n$0\nbar';
 			snippetController.insert(codeSnippet);
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 			assert.ok(first.equalsRange({ startLineNumber: 2, startColumn: 1, endLineNumber: 2, endColumn: 1 }), first.toString());
 			assert.ok(second.equalsRange({ startLineNumber: 4, startColumn: 1, endLineNumber: 4, endColumn: 1 }), second.toString());
@@ -315,7 +315,7 @@ suite('SnippetController', () => {
 			codeSnippet = 'xo$0r';
 			snippetController.insert(codeSnippet, { overwriteBefore: 1 });
 
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			assert.ok(editor.getSelection()!.equalsRange({ startLineNumber: 2, startColumn: 8, endColumn: 8, endLineNumber: 2 }));
 		});
 	});
@@ -328,9 +328,9 @@ suite('SnippetController', () => {
 			codeSnippet = '{{% url_**$1** %}}';
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
 
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			assert.ok(editor.getSelection()!.equalsRange({ startLineNumber: 1, startColumn: 27, endLineNumber: 1, endColumn: 27 }));
-			assert.equal(editor.getModel()!.getValue(), 'example example {{% url_**** %}}');
+			assert.strictEqual(editor.getModel()!.getValue(), 'example example {{% url_**** %}}');
 
 		}, ['example example sc']);
 
@@ -346,9 +346,9 @@ suite('SnippetController', () => {
 
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
 
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			assert.ok(editor.getSelection()!.equalsRange({ startLineNumber: 2, startColumn: 2, endLineNumber: 2, endColumn: 2 }), editor.getSelection()!.toString());
-			assert.equal(editor.getModel()!.getValue(), 'afterEach((done) => {\n\ttest\n});');
+			assert.strictEqual(editor.getModel()!.getValue(), 'afterEach((done) => {\n\ttest\n});');
 
 		}, ['af']);
 
@@ -364,9 +364,9 @@ suite('SnippetController', () => {
 
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
 
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			assert.ok(editor.getSelection()!.equalsRange({ startLineNumber: 2, startColumn: 1, endLineNumber: 2, endColumn: 1 }), editor.getSelection()!.toString());
-			assert.equal(editor.getModel()!.getValue(), 'afterEach((done) => {\n\ttest\n});');
+			assert.strictEqual(editor.getModel()!.getValue(), 'afterEach((done) => {\n\ttest\n});');
 
 		}, ['af']);
 
@@ -380,8 +380,8 @@ suite('SnippetController', () => {
 
 			controller.insert(codeSnippet, { overwriteBefore: 8 });
 
-			assert.equal(editor.getModel()!.getValue(), 'after');
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getModel()!.getValue(), 'after');
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			assert.ok(editor.getSelection()!.equalsRange({ startLineNumber: 1, startColumn: 4, endLineNumber: 1, endColumn: 4 }), editor.getSelection()!.toString());
 
 		}, ['afterone']);
@@ -404,7 +404,7 @@ suite('SnippetController', () => {
 
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
 
-			assert.equal(editor.getSelections()!.length, 2);
+			assert.strictEqual(editor.getSelections()!.length, 2);
 			const [first, second] = editor.getSelections()!;
 
 			assert.ok(first.equalsRange({ startLineNumber: 5, startColumn: 3, endLineNumber: 5, endColumn: 3 }), first.toString());
@@ -429,7 +429,7 @@ suite('SnippetController', () => {
 
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
 
-			assert.equal(editor.getSelections()!.length, 1);
+			assert.strictEqual(editor.getSelections()!.length, 1);
 			const [first] = editor.getSelections()!;
 
 			assert.ok(first.equalsRange({ startLineNumber: 2, startColumn: 3, endLineNumber: 2, endColumn: 3 }), first.toString());
@@ -465,7 +465,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = '_foo';
 			controller.insert(codeSnippet, { overwriteBefore: 1 });
-			assert.equal(editor.getModel()!.getValue(), 'this._foo\nabc_foo');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this._foo\nabc_foo');
 
 		}, ['this._', 'abc']);
 
@@ -478,7 +478,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = 'XX';
 			controller.insert(codeSnippet, { overwriteBefore: 1 });
-			assert.equal(editor.getModel()!.getValue(), 'this.XX\nabcXX');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this.XX\nabcXX');
 
 		}, ['this._', 'abc']);
 
@@ -492,7 +492,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = '_foo';
 			controller.insert(codeSnippet, { overwriteBefore: 1 });
-			assert.equal(editor.getModel()!.getValue(), 'this._foo\nabc_foo\ndef_foo');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this._foo\nabc_foo\ndef_foo');
 
 		}, ['this._', 'abc', 'def_']);
 
@@ -506,7 +506,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = '._foo';
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
-			assert.equal(editor.getModel()!.getValue(), 'this._foo\nabc._foo\ndef._foo');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this._foo\nabc._foo\ndef._foo');
 
 		}, ['this._', 'abc', 'def._']);
 
@@ -520,7 +520,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = '._foo';
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
-			assert.equal(editor.getModel()!.getValue(), 'this._foo\nabc._foo\ndef._foo');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this._foo\nabc._foo\ndef._foo');
 
 		}, ['this._', 'abc', 'def._']);
 
@@ -534,7 +534,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = '._foo';
 			controller.insert(codeSnippet, { overwriteBefore: 2 });
-			assert.equal(editor.getModel()!.getValue(), 'this._._foo\na._foo\ndef._._foo');
+			assert.strictEqual(editor.getModel()!.getValue(), 'this._._foo\na._foo\ndef._._foo');
 
 		}, ['this._', 'abc', 'def._']);
 
@@ -550,7 +550,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = 'document';
 			controller.insert(codeSnippet, { overwriteBefore: 3 });
-			assert.equal(editor.getModel()!.getValue(), '{document}\n{document && true}');
+			assert.strictEqual(editor.getModel()!.getValue(), '{document}\n{document && true}');
 
 		}, ['{foo}', '{foo && true}']);
 	});
@@ -565,7 +565,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = 'for (var ${1:i}=0; ${1:i}<len; ${1:i}++) { $0 }';
 			controller.insert(codeSnippet);
-			assert.equal(editor.getModel()!.getValue(), 'for (var i=0; i<len; i++) {  }for (var i=0; i<len; i++) {  }');
+			assert.strictEqual(editor.getModel()!.getValue(), 'for (var i=0; i<len; i++) {  }for (var i=0; i<len; i++) {  }');
 
 		}, ['for (var i=0; i<len; i++) {  }']);
 
@@ -578,7 +578,7 @@ suite('SnippetController', () => {
 
 			codeSnippet = 'for (let ${1:i}=0; ${1:i}<len; ${1:i}++) { $0 }';
 			controller.insert(codeSnippet);
-			assert.equal(editor.getModel()!.getValue(), 'for (let i=0; i<len; i++) {  }for (var i=0; i<len; i++) {  }');
+			assert.strictEqual(editor.getModel()!.getValue(), 'for (let i=0; i<len; i++) {  }for (var i=0; i<len; i++) {  }');
 
 		}, ['for (var i=0; i<len; i++) {  }']);
 
diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.test.ts
index 7ec294769..02e235d8d 100644
--- a/src/vs/editor/contrib/snippet/test/snippetController2.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetController2.test.ts
@@ -21,13 +21,13 @@ suite('SnippetController2', function () {
 			const actual = s.shift()!;
 			assert.ok(selection.equalsSelection(actual), `actual=${selection.toString()} <> expected=${actual.toString()}`);
 		}
-		assert.equal(s.length, 0);
+		assert.strictEqual(s.length, 0);
 	}
 
 	function assertContextKeys(service: MockContextKeyService, inSnippet: boolean, hasPrev: boolean, hasNext: boolean): void {
-		assert.equal(SnippetController2.InSnippetMode.getValue(service), inSnippet, `inSnippetMode`);
-		assert.equal(SnippetController2.HasPrevTabstop.getValue(service), hasPrev, `HasPrevTabstop`);
-		assert.equal(SnippetController2.HasNextTabstop.getValue(service), hasNext, `HasNextTabstop`);
+		assert.strictEqual(SnippetController2.InSnippetMode.getValue(service), inSnippet, `inSnippetMode`);
+		assert.strictEqual(SnippetController2.HasPrevTabstop.getValue(service), hasPrev, `HasPrevTabstop`);
+		assert.strictEqual(SnippetController2.HasNextTabstop.getValue(service), hasNext, `HasNextTabstop`);
 	}
 
 	let editor: ICodeEditor;
@@ -40,7 +40,7 @@ suite('SnippetController2', function () {
 		model = createTextModel('if\n    $state\nfi');
 		editor = createTestCodeEditor({ model: model });
 		editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 5, 2, 5)]);
-		assert.equal(model.getEOL(), '\n');
+		assert.strictEqual(model.getEOL(), '\n');
 	});
 
 	teardown(function () {
@@ -78,9 +78,9 @@ suite('SnippetController2', function () {
 		assertContextKeys(contextKeys, false, false, false);
 
 		editor.trigger('test', 'type', { text: '\t' });
-		assert.equal(SnippetController2.InSnippetMode.getValue(contextKeys), false);
-		assert.equal(SnippetController2.HasNextTabstop.getValue(contextKeys), false);
-		assert.equal(SnippetController2.HasPrevTabstop.getValue(contextKeys), false);
+		assert.strictEqual(SnippetController2.InSnippetMode.getValue(contextKeys), false);
+		assert.strictEqual(SnippetController2.HasNextTabstop.getValue(contextKeys), false);
+		assert.strictEqual(SnippetController2.HasPrevTabstop.getValue(contextKeys), false);
 	});
 
 	test('insert, insert -> cursor moves out (left/right)', function () {
@@ -111,7 +111,7 @@ suite('SnippetController2', function () {
 		const ctrl = new SnippetController2(editor, logService, contextKeys);
 
 		ctrl.insert('foo${1:bar}foo$0');
-		assert.equal(SnippetController2.InSnippetMode.getValue(contextKeys), true);
+		assert.strictEqual(SnippetController2.InSnippetMode.getValue(contextKeys), true);
 		assertSelections(editor, new Selection(1, 4, 1, 7), new Selection(2, 8, 2, 11));
 
 		// bad selection change
diff --git a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
index ba019cdc3..ed5dcc443 100644
--- a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts
@@ -531,8 +531,8 @@ suite('SnippetParser', () => {
 		let snippet = new SnippetParser().parse('This ${1:is ${2:nested}}$0', true);
 		let [first, second] = snippet.placeholders;
 
-		assert.deepEqual(snippet.enclosingPlaceholders(first), []);
-		assert.deepEqual(snippet.enclosingPlaceholders(second), [first]);
+		assert.deepStrictEqual(snippet.enclosingPlaceholders(first), []);
+		assert.deepStrictEqual(snippet.enclosingPlaceholders(second), [first]);
 	});
 
 	test('TextmateSnippet#offset', () => {
diff --git a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
index 458555cb0..a65de3d53 100644
--- a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts
@@ -23,14 +23,14 @@ suite('SnippetSession', function () {
 			const actual = s.shift()!;
 			assert.ok(selection.equalsSelection(actual), `actual=${selection.toString()} <> expected=${actual.toString()}`);
 		}
-		assert.equal(s.length, 0);
+		assert.strictEqual(s.length, 0);
 	}
 
 	setup(function () {
 		model = createTextModel('function foo() {\n    console.log(a);\n}');
 		editor = createTestCodeEditor({ model: model }) as IActiveCodeEditor;
 		editor.setSelections([new Selection(1, 1, 1, 1), new Selection(2, 5, 2, 5)]);
-		assert.equal(model.getEOL(), '\n');
+		assert.strictEqual(model.getEOL(), '\n');
 	});
 
 	teardown(function () {
@@ -43,7 +43,7 @@ suite('SnippetSession', function () {
 		function assertNormalized(position: IPosition, input: string, expected: string): void {
 			const snippet = new SnippetParser().parse(input);
 			SnippetSession.adjustWhitespace(model, position, snippet, true, true);
-			assert.equal(snippet.toTextmateString(), expected);
+			assert.strictEqual(snippet.toTextmateString(), expected);
 		}
 
 		assertNormalized(new Position(1, 1), 'foo', 'foo');
@@ -73,7 +73,7 @@ suite('SnippetSession', function () {
 	test('text edits & selection', function () {
 		const session = new SnippetSession(editor, 'foo${1:bar}foo$0');
 		session.insert();
-		assert.equal(editor.getModel()!.getValue(), 'foobarfoofunction foo() {\n    foobarfooconsole.log(a);\n}');
+		assert.strictEqual(editor.getModel()!.getValue(), 'foobarfoofunction foo() {\n    foobarfooconsole.log(a);\n}');
 
 		assertSelections(editor, new Selection(1, 4, 1, 7), new Selection(2, 8, 2, 11));
 		session.next();
@@ -86,7 +86,7 @@ suite('SnippetSession', function () {
 		editor.setSelections([new Selection(2, 5, 2, 5), new Selection(1, 1, 1, 1)]);
 
 		session.insert();
-		assert.equal(model.getValue(), 'barfunction foo() {\n    barconsole.log(a);\n}');
+		assert.strictEqual(model.getValue(), 'barfunction foo() {\n    barconsole.log(a);\n}');
 		assertSelections(editor, new Selection(2, 5, 2, 8), new Selection(1, 1, 1, 4));
 	});
 
@@ -107,7 +107,7 @@ suite('SnippetSession', function () {
 	test('snippets, just text', function () {
 		const session = new SnippetSession(editor, 'foobar');
 		session.insert();
-		assert.equal(model.getValue(), 'foobarfunction foo() {\n    foobarconsole.log(a);\n}');
+		assert.strictEqual(model.getValue(), 'foobarfunction foo() {\n    foobarconsole.log(a);\n}');
 		assertSelections(editor, new Selection(1, 7, 1, 7), new Selection(2, 11, 2, 11));
 	});
 
@@ -116,7 +116,7 @@ suite('SnippetSession', function () {
 		const session = new SnippetSession(editor, 'foo\n\t${1:bar}\n$0');
 		session.insert();
 
-		assert.equal(editor.getModel()!.getValue(), 'foo\n    bar\nfunction foo() {\n    foo\n        bar\n    console.log(a);\n}');
+		assert.strictEqual(editor.getModel()!.getValue(), 'foo\n    bar\nfunction foo() {\n    foo\n        bar\n    console.log(a);\n}');
 
 		assertSelections(editor, new Selection(2, 5, 2, 8), new Selection(5, 9, 5, 12));
 
@@ -129,7 +129,7 @@ suite('SnippetSession', function () {
 		editor.setSelection(new Selection(2, 5, 2, 5));
 		const session = new SnippetSession(editor, 'abc\n    foo\n        bar\n$0', { overwriteBefore: 0, overwriteAfter: 0, adjustWhitespace: false, clipboardText: undefined, overtypingCapturer: undefined });
 		session.insert();
-		assert.equal(editor.getModel()!.getValue(), 'function foo() {\n    abc\n    foo\n        bar\nconsole.log(a);\n}');
+		assert.strictEqual(editor.getModel()!.getValue(), 'function foo() {\n    abc\n    foo\n        bar\nconsole.log(a);\n}');
 	});
 
 	test('snippets, selections -> next/prev', () => {
@@ -171,7 +171,7 @@ suite('SnippetSession', function () {
 
 		// go to final tabstop
 		session.next();
-		assert.equal(model.getValue(), 'fX_bar_function foo() {\n    fX_bar_console.log(a);\n}');
+		assert.strictEqual(model.getValue(), 'fX_bar_function foo() {\n    fX_bar_console.log(a);\n}');
 		assertSelections(editor, new Selection(1, 8, 1, 8), new Selection(2, 12, 2, 12));
 	});
 
@@ -180,7 +180,7 @@ suite('SnippetSession', function () {
 		editor.setSelections([new Selection(1, 1, 1, 4), new Selection(1, 9, 1, 12)]);
 
 		new SnippetSession(editor, 'x$0').insert();
-		assert.equal(model.getValue(), 'x_bar_x');
+		assert.strictEqual(model.getValue(), 'x_bar_x');
 		assertSelections(editor, new Selection(1, 2, 1, 2), new Selection(1, 8, 1, 8));
 	});
 
@@ -189,7 +189,7 @@ suite('SnippetSession', function () {
 		editor.setSelections([new Selection(1, 1, 1, 4), new Selection(1, 9, 1, 12)]);
 
 		new SnippetSession(editor, 'LONGER$0').insert();
-		assert.equal(model.getValue(), 'LONGER_bar_LONGER');
+		assert.strictEqual(model.getValue(), 'LONGER_bar_LONGER');
 		assertSelections(editor, new Selection(1, 7, 1, 7), new Selection(1, 18, 1, 18));
 	});
 
@@ -203,11 +203,11 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'foo-' });
 
 		session.next();
-		assert.equal(model.getValue(), 'foo_foo-bar_foo');
+		assert.strictEqual(model.getValue(), 'foo_foo-bar_foo');
 		assertSelections(editor, new Selection(1, 12, 1, 12));
 
 		editor.trigger('test', 'type', { text: 'XXX' });
-		assert.equal(model.getValue(), 'foo_foo-barXXX_foo');
+		assert.strictEqual(model.getValue(), 'foo_foo-barXXX_foo');
 		session.prev();
 		assertSelections(editor, new Selection(1, 5, 1, 9));
 		session.next();
@@ -242,7 +242,7 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: '333' });
 
 		session.next();
-		assert.equal(model.getValue(), '111222333function foo() {\n    111222333console.log(a);\n}');
+		assert.strictEqual(model.getValue(), '111222333function foo() {\n    111222333console.log(a);\n}');
 		assertSelections(editor, new Selection(1, 10, 1, 10), new Selection(2, 14, 2, 14));
 
 		session.prev();
@@ -269,22 +269,22 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: '333' });
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 	});
 
 	test('snippets, gracefully move over final tabstop', function () {
 		const session = new SnippetSession(editor, '${1}bar$0');
 		session.insert();
 
-		assert.equal(session.isAtLastPlaceholder, false);
+		assert.strictEqual(session.isAtLastPlaceholder, false);
 		assertSelections(editor, new Selection(1, 1, 1, 1), new Selection(2, 5, 2, 5));
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 4, 1, 4), new Selection(2, 8, 2, 8));
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 4, 1, 4), new Selection(2, 8, 2, 8));
 	});
 
@@ -294,46 +294,46 @@ suite('SnippetSession', function () {
 		assertSelections(editor, new Selection(1, 5, 1, 7), new Selection(2, 9, 2, 11));
 
 		editor.trigger('test', 'type', { text: 'XXX' });
-		assert.equal(model.getValue(), 'log(XXX);function foo() {\n    log(XXX);console.log(a);\n}');
+		assert.strictEqual(model.getValue(), 'log(XXX);function foo() {\n    log(XXX);console.log(a);\n}');
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, false);
+		assert.strictEqual(session.isAtLastPlaceholder, false);
 		// assertSelections(editor, new Selection(1, 7, 1, 7), new Selection(2, 11, 2, 11));
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 10, 1, 10), new Selection(2, 14, 2, 14));
 	});
 
 	test('snippets, selections and snippet ranges', function () {
 		const session = new SnippetSession(editor, '${1:foo}farboo${2:bar}$0');
 		session.insert();
-		assert.equal(model.getValue(), 'foofarboobarfunction foo() {\n    foofarboobarconsole.log(a);\n}');
+		assert.strictEqual(model.getValue(), 'foofarboobarfunction foo() {\n    foofarboobarconsole.log(a);\n}');
 		assertSelections(editor, new Selection(1, 1, 1, 4), new Selection(2, 5, 2, 8));
 
-		assert.equal(session.isSelectionWithinPlaceholders(), true);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), true);
 
 		editor.setSelections([new Selection(1, 1, 1, 1)]);
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
 
 		editor.setSelections([new Selection(1, 6, 1, 6), new Selection(2, 10, 2, 10)]);
-		assert.equal(session.isSelectionWithinPlaceholders(), false); // in snippet, outside placeholder
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false); // in snippet, outside placeholder
 
 		editor.setSelections([new Selection(1, 6, 1, 6), new Selection(2, 10, 2, 10), new Selection(1, 1, 1, 1)]);
-		assert.equal(session.isSelectionWithinPlaceholders(), false); // in snippet, outside placeholder
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false); // in snippet, outside placeholder
 
 		editor.setSelections([new Selection(1, 6, 1, 6), new Selection(2, 10, 2, 10), new Selection(2, 20, 2, 21)]);
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
 
 		// reset selection to placeholder
 		session.next();
-		assert.equal(session.isSelectionWithinPlaceholders(), true);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), true);
 		assertSelections(editor, new Selection(1, 10, 1, 13), new Selection(2, 14, 2, 17));
 
 		// reset selection to placeholder
 		session.next();
-		assert.equal(session.isSelectionWithinPlaceholders(), true);
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 13, 1, 13), new Selection(2, 17, 2, 17));
 	});
 
@@ -344,20 +344,20 @@ suite('SnippetSession', function () {
 
 		const first = new SnippetSession(editor, 'foo${2:bar}foo$0');
 		first.insert();
-		assert.equal(model.getValue(), 'foobarfoo');
+		assert.strictEqual(model.getValue(), 'foobarfoo');
 		assertSelections(editor, new Selection(1, 4, 1, 7));
 
 		const second = new SnippetSession(editor, 'ba${1:zzzz}$0');
 		second.insert();
-		assert.equal(model.getValue(), 'foobazzzzfoo');
+		assert.strictEqual(model.getValue(), 'foobazzzzfoo');
 		assertSelections(editor, new Selection(1, 6, 1, 10));
 
 		second.next();
-		assert.equal(second.isAtLastPlaceholder, true);
+		assert.strictEqual(second.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 10, 1, 10));
 
 		first.next();
-		assert.equal(first.isAtLastPlaceholder, true);
+		assert.strictEqual(first.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 13, 1, 13));
 	});
 
@@ -365,11 +365,11 @@ suite('SnippetSession', function () {
 
 		const session = new SnippetSession(editor, 'farboo$0');
 		session.insert();
-		assert.equal(session.isAtLastPlaceholder, true);
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
 
 		editor.trigger('test', 'type', { text: 'XXX' });
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
 	});
 
 	test('snippets, typing at beginning', function () {
@@ -379,12 +379,12 @@ suite('SnippetSession', function () {
 		session.insert();
 
 		editor.setSelection(new Selection(1, 2, 1, 2));
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 
 		editor.trigger('test', 'type', { text: 'XXX' });
-		assert.equal(model.getLineContent(1), 'fXXXfarboounction foo() {');
-		assert.equal(session.isSelectionWithinPlaceholders(), false);
+		assert.strictEqual(model.getLineContent(1), 'fXXXfarboounction foo() {');
+		assert.strictEqual(session.isSelectionWithinPlaceholders(), false);
 
 		session.next();
 		assertSelections(editor, new Selection(1, 11, 1, 11));
@@ -412,7 +412,7 @@ suite('SnippetSession', function () {
 		const session = new SnippetSession(editor, '@line=$TM_LINE_NUMBER$0');
 		session.insert();
 
-		assert.equal(model.getValue(), '@line=1function foo() {\n    @line=2console.log(a);\n}');
+		assert.strictEqual(model.getValue(), '@line=1function foo() {\n    @line=2console.log(a);\n}');
 		assertSelections(editor, new Selection(1, 8, 1, 8), new Selection(2, 12, 2, 12));
 	});
 
@@ -428,10 +428,10 @@ suite('SnippetSession', function () {
 
 		session.next();
 		assertSelections(editor, new Selection(1, 22, 1, 22));
-		assert.equal(session.isAtLastPlaceholder, false);
+		assert.strictEqual(session.isAtLastPlaceholder, false);
 
 		session.next();
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 23, 1, 23));
 
 		session.prev();
@@ -456,8 +456,8 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'foo' });
 		session.next();
 
-		assert.equal(model.getValue(), 'bar');
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), 'bar');
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 4, 1, 4));
 	});
 
@@ -471,8 +471,8 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'foo' });
 		session.next();
 
-		assert.equal(model.getValue(), 'foo baz bar');
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), 'foo baz bar');
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 12, 1, 12));
 	});
 
@@ -493,8 +493,8 @@ suite('SnippetSession', function () {
 		assertSelections(editor, new Selection(1, 16, 1, 16));
 		session.next();
 
-		assert.equal(model.getValue(), 'clk : std_logic;\n');
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), 'clk : std_logic;\n');
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(2, 1, 2, 1));
 	});
 
@@ -532,8 +532,8 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: 'string' });
 		session.next();
 
-		assert.equal(model.getValue(), expected);
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), expected);
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(4, 2, 4, 2));
 
 	});
@@ -556,8 +556,8 @@ suite('SnippetSession', function () {
 		editor.trigger('test', 'type', { text: ' := \'1\'' });
 		session.next();
 
-		assert.equal(model.getValue(), 'clk : std_logic := \'1\';\n');
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), 'clk : std_logic := \'1\';\n');
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(2, 1, 2, 1));
 	});
 
@@ -570,13 +570,13 @@ suite('SnippetSession', function () {
 		assertSelections(editor, new Selection(1, 1, 1, 2), new Selection(1, 5, 1, 6));
 		session.next();
 
-		assert.equal(model.getValue(), '{fff}');
+		assert.strictEqual(model.getValue(), '{fff}');
 		assertSelections(editor, new Selection(1, 2, 1, 5));
 		editor.trigger('test', 'type', { text: 'ggg' });
 		session.next();
 
-		assert.equal(model.getValue(), '{ggg}');
-		assert.equal(session.isAtLastPlaceholder, true);
+		assert.strictEqual(model.getValue(), '{ggg}');
+		assert.strictEqual(session.isAtLastPlaceholder, true);
 		assertSelections(editor, new Selection(1, 6, 1, 6));
 	});
 
@@ -584,7 +584,7 @@ suite('SnippetSession', function () {
 		editor.getModel().setValue('');
 		const session = new SnippetSession(editor, '${1:{}${2:fff}${1/[\\{]/}/}$0');
 		session.insert();
-		assert.equal(editor.getModel().getValue(), '{fff{');
+		assert.strictEqual(editor.getModel().getValue(), '{fff{');
 
 		assertSelections(editor, new Selection(1, 1, 1, 2), new Selection(1, 5, 1, 6));
 		session.next();
@@ -599,25 +599,25 @@ suite('SnippetSession', function () {
 
 		editor.trigger('test', 'type', { text: '1' });
 		editor.trigger('test', 'type', { text: '\n' });
-		assert.equal(editor.getModel()!.getValue(), 'test 1\n');
+		assert.strictEqual(editor.getModel()!.getValue(), 'test 1\n');
 
 		session.merge('test ${1:replaceme}');
 		editor.trigger('test', 'type', { text: '2' });
 		editor.trigger('test', 'type', { text: '\n' });
 
-		assert.equal(editor.getModel()!.getValue(), 'test 1\ntest 2\n');
+		assert.strictEqual(editor.getModel()!.getValue(), 'test 1\ntest 2\n');
 
 		session.merge('test ${1:replaceme}');
 		editor.trigger('test', 'type', { text: '3' });
 		editor.trigger('test', 'type', { text: '\n' });
 
-		assert.equal(editor.getModel()!.getValue(), 'test 1\ntest 2\ntest 3\n');
+		assert.strictEqual(editor.getModel()!.getValue(), 'test 1\ntest 2\ntest 3\n');
 
 		session.merge('test ${1:replaceme}');
 		editor.trigger('test', 'type', { text: '4' });
 		editor.trigger('test', 'type', { text: '\n' });
 
-		assert.equal(editor.getModel()!.getValue(), 'test 1\ntest 2\ntest 3\ntest 4\n');
+		assert.strictEqual(editor.getModel()!.getValue(), 'test 1\ntest 2\ntest 3\ntest 4\n');
 	});
 
 	test('Snippet variable text isn\'t whitespace normalised, #31124', function () {
@@ -642,7 +642,7 @@ suite('SnippetSession', function () {
 			'end'
 		].join('\n');
 
-		assert.equal(editor.getModel()!.getValue(), expected);
+		assert.strictEqual(editor.getModel()!.getValue(), expected);
 
 		editor.getModel()!.setValue([
 			'start',
@@ -665,7 +665,7 @@ suite('SnippetSession', function () {
 			'end'
 		].join('\n');
 
-		assert.equal(editor.getModel()!.getValue(), expected);
+		assert.strictEqual(editor.getModel()!.getValue(), expected);
 	});
 
 	test('Selecting text from left to right, and choosing item messes up code, #31199', function () {
@@ -680,7 +680,7 @@ suite('SnippetSession', function () {
 
 		editor.setSelections([new Selection(1, 9, 1, 12)]);
 		new SnippetSession(editor, 'far', { overwriteBefore: 3, overwriteAfter: 0, adjustWhitespace: true, clipboardText: undefined, overtypingCapturer: undefined }).insert();
-		assert.equal(model.getValue(), 'console.far');
+		assert.strictEqual(model.getValue(), 'console.far');
 	});
 
 	test('Tabs don\'t get replaced with spaces in snippet transformations #103818', function () {
diff --git a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
index 8e939a5ac..dff2a64be 100644
--- a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
+++ b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
@@ -9,11 +9,14 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables';
 import { SnippetParser, Variable, VariableResolver } from 'vs/editor/contrib/snippet/snippetParser';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { toWorkspaceFolders, IWorkspace, IWorkspaceContextService, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IWorkspace, IWorkspaceContextService, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { mock } from 'vs/base/test/common/mock';
 import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
 import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { sep } from 'vs/base/common/path';
+import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
 
 suite('Snippet Variables Resolver', function () {
 
@@ -48,9 +51,9 @@ suite('Snippet Variables Resolver', function () {
 		const variable = <Variable>snippet.children[0];
 		variable.resolve(resolver);
 		if (variable.children.length === 0) {
-			assert.equal(undefined, expected);
+			assert.strictEqual(undefined, expected);
 		} else {
-			assert.equal(variable.toString(), expected);
+			assert.strictEqual(variable.toString(), expected);
 		}
 	}
 
@@ -127,17 +130,17 @@ suite('Snippet Variables Resolver', function () {
 
 	test('TextmateSnippet, resolve variable', function () {
 		const snippet = new SnippetParser().parse('"$TM_CURRENT_WORD"', true);
-		assert.equal(snippet.toString(), '""');
+		assert.strictEqual(snippet.toString(), '""');
 		snippet.resolveVariables(resolver);
-		assert.equal(snippet.toString(), '"this"');
+		assert.strictEqual(snippet.toString(), '"this"');
 
 	});
 
 	test('TextmateSnippet, resolve variable with default', function () {
 		const snippet = new SnippetParser().parse('"${TM_CURRENT_WORD:foo}"', true);
-		assert.equal(snippet.toString(), '"foo"');
+		assert.strictEqual(snippet.toString(), '"foo"');
 		snippet.resolveVariables(resolver);
-		assert.equal(snippet.toString(), '"this"');
+		assert.strictEqual(snippet.toString(), '"this"');
 	});
 
 	test('More useful environment variables for snippets, #32737', function () {
@@ -169,14 +172,14 @@ suite('Snippet Variables Resolver', function () {
 			.resolveVariables({ resolve(variable) { return varValue || variable.name; } });
 
 		const actual = snippet.toString();
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	}
 
 	test('Variable Snippet Transform', function () {
 
 		const snippet = new SnippetParser().parse('name=${TM_FILENAME/(.*)\\..+$/$1/}', true);
 		snippet.resolveVariables(resolver);
-		assert.equal(snippet.toString(), 'name=text');
+		assert.strictEqual(snippet.toString(), 'name=text');
 
 		assertVariableResolve2('${ThisIsAVar/([A-Z]).*(Var)/$2/}', 'Var');
 		assertVariableResolve2('${ThisIsAVar/([A-Z]).*(Var)/$2-${1:/downcase}/}', 'Var-t');
@@ -267,7 +270,7 @@ suite('Snippet Variables Resolver', function () {
 		const snippet = new SnippetParser().parse(`$${varName}`);
 		const variable = <Variable>snippet.children[0];
 
-		assert.equal(variable.resolve(resolver), true, `${varName} failed to resolve`);
+		assert.strictEqual(variable.resolve(resolver), true, `${varName} failed to resolve`);
 	}
 
 	test('Add time variables for snippets #41631, #43140', function () {
@@ -292,10 +295,10 @@ suite('Snippet Variables Resolver', function () {
 
 		const snippet = new SnippetParser().parse('${TM_LINE_NUMBER/(10)/${1:?It is:It is not}/} line 10', true);
 		snippet.resolveVariables({ resolve() { return '10'; } });
-		assert.equal(snippet.toString(), 'It is line 10');
+		assert.strictEqual(snippet.toString(), 'It is line 10');
 
 		snippet.resolveVariables({ resolve() { return '11'; } });
-		assert.equal(snippet.toString(), 'It is not line 10');
+		assert.strictEqual(snippet.toString(), 'It is not line 10');
 	});
 
 	test('Add workspace name and folder variables for snippets #68261', function () {
@@ -332,10 +335,55 @@ suite('Snippet Variables Resolver', function () {
 
 		// workspace with config
 		const workspaceConfigPath = URI.file('testWorkspace.code-workspace');
-		workspace = new Workspace('', toWorkspaceFolders([{ path: 'folderName' }], workspaceConfigPath), workspaceConfigPath);
+		workspace = new Workspace('', toWorkspaceFolders([{ path: 'folderName' }], workspaceConfigPath, extUriBiasedIgnorePathCase), workspaceConfigPath);
 		assertVariableResolve(resolver, 'WORKSPACE_NAME', 'testWorkspace');
 		if (!isWindows) {
 			assertVariableResolve(resolver, 'WORKSPACE_FOLDER', '/');
 		}
 	});
+
+	test('Add RELATIVE_FILEPATH snippet variable #114208', function () {
+
+		let resolver: VariableResolver;
+
+		// Mock a label service (only coded for file uris)
+		const workspaceLabelService = ((rootPath: string): ILabelService => {
+			const labelService = new class extends mock<ILabelService>() {
+				getUriLabel(uri: URI, options: { relative?: boolean } = {}) {
+					const rootFsPath = URI.file(rootPath).fsPath + sep;
+					const fsPath = uri.fsPath;
+					if (options.relative && rootPath && fsPath.startsWith(rootFsPath)) {
+						return fsPath.substring(rootFsPath.length);
+					}
+					return fsPath;
+				}
+			};
+			return labelService;
+		});
+
+		const model = createTextModel('', undefined, undefined, URI.parse('file:///foo/files/text.txt'));
+
+		// empty workspace
+		resolver = new ModelBasedVariableResolver(
+			workspaceLabelService(''),
+			model
+		);
+
+		if (!isWindows) {
+			assertVariableResolve(resolver, 'RELATIVE_FILEPATH', '/foo/files/text.txt');
+		} else {
+			assertVariableResolve(resolver, 'RELATIVE_FILEPATH', '\\foo\\files\\text.txt');
+		}
+
+		// single folder workspace
+		resolver = new ModelBasedVariableResolver(
+			workspaceLabelService('/foo'),
+			model
+		);
+		if (!isWindows) {
+			assertVariableResolve(resolver, 'RELATIVE_FILEPATH', 'files/text.txt');
+		} else {
+			assertVariableResolve(resolver, 'RELATIVE_FILEPATH', 'files\\text.txt');
+		}
+	});
 });
diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts
index 9a88e1ccc..747f78a4b 100644
--- a/src/vs/editor/contrib/suggest/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/suggestModel.ts
@@ -443,10 +443,6 @@ export class SuggestModel implements IDisposable {
 
 			this._requestToken?.dispose();
 
-			if (this._state === State.Idle) {
-				return;
-			}
-
 			if (!this._editor.hasModel()) {
 				return;
 			}
@@ -456,6 +452,10 @@ export class SuggestModel implements IDisposable {
 				clipboardText = await this._clipboardService.readText();
 			}
 
+			if (this._state === State.Idle) {
+				return;
+			}
+
 			const model = this._editor.getModel();
 			let items = completions.items;
 
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 02f6233f2..158e38015 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!./media/suggest';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // The codicon symbol styles are defined here and must be loaded
-import 'vs/editor/contrib/documentSymbols/outlineTree'; // The codicon symbol colors are defined here and must be loaded
 import * as nls from 'vs/nls';
 import * as strings from 'vs/base/common/strings';
 import * as dom from 'vs/base/browser/dom';
@@ -436,6 +435,7 @@ export class SuggestWidget implements IDisposable {
 			case State.Hidden:
 				dom.hide(this._messageElement, this._listElement, this._status.element);
 				this._details.hide(true);
+				this._status.hide();
 				this._contentWidget.hide();
 				this._ctxSuggestWidgetVisible.reset();
 				this._ctxSuggestWidgetMultipleSuggestions.reset();
@@ -483,6 +483,7 @@ export class SuggestWidget implements IDisposable {
 	}
 
 	private _show(): void {
+		this._status.show();
 		this._contentWidget.show();
 		this._layout(this._persistedSize.restore());
 		this._ctxSuggestWidgetVisible.set(true);
@@ -702,6 +703,14 @@ export class SuggestWidget implements IDisposable {
 		this._loadingTimeout?.dispose();
 		this._setState(State.Hidden);
 		this._onDidHide.fire(this);
+
+		// ensure that a reasonable widget height is persisted so that
+		// accidential "resize-to-single-items" cases aren't happening
+		const dim = this._persistedSize.restore();
+		const minPersistedHeight = Math.ceil(this.getLayoutInfo().itemHeight * 4.3);
+		if (dim && dim.height < minPersistedHeight) {
+			this._persistedSize.store(dim.with(undefined, minPersistedHeight));
+		}
 	}
 
 	isFrozen(): boolean {
@@ -734,12 +743,16 @@ export class SuggestWidget implements IDisposable {
 			return;
 		}
 
-		let height = size?.height;
-		let width = size?.width;
-
 		const bodyBox = dom.getClientArea(document.body);
 		const info = this.getLayoutInfo();
 
+		if (!size) {
+			size = info.defaultSize;
+		}
+
+		let height = size.height;
+		let width = size.width;
+
 		// status bar
 		this._status.element.style.lineHeight = `${info.itemHeight}px`;
 
@@ -756,9 +769,6 @@ export class SuggestWidget implements IDisposable {
 
 			// width math
 			const maxWidth = bodyBox.width - info.borderHeight - 2 * info.horizontalPadding;
-			if (width === undefined) {
-				width = info.defaultSize.width;
-			}
 			if (width > maxWidth) {
 				width = maxWidth;
 			}
@@ -766,7 +776,6 @@ export class SuggestWidget implements IDisposable {
 
 			// height math
 			const fullHeight = info.statusBarHeight + this._list.contentHeight + info.borderHeight;
-			const preferredHeight = info.defaultSize.height;
 			const minHeight = info.itemHeight + info.statusBarHeight;
 			const editorBox = dom.getDomNodePagePosition(this.editor.getDomNode());
 			const cursorBox = this.editor.getScrolledVisiblePosition(this.editor.getPosition());
@@ -775,15 +784,12 @@ export class SuggestWidget implements IDisposable {
 			const maxHeightAbove = Math.min(editorBox.top + cursorBox.top - info.verticalPadding, fullHeight);
 			let maxHeight = Math.min(Math.max(maxHeightAbove, maxHeightBelow) + info.borderHeight, fullHeight);
 
-			if (height && height === this._cappedHeight?.capped) {
+			if (height === this._cappedHeight?.capped) {
 				// Restore the old (wanted) height when the current
 				// height is capped to fit
 				height = this._cappedHeight.wanted;
 			}
 
-			if (height === undefined) {
-				height = Math.min(preferredHeight, fullHeight);
-			}
 			if (height < minHeight) {
 				height = minHeight;
 			}
@@ -801,14 +807,14 @@ export class SuggestWidget implements IDisposable {
 				this.element.enableSashes(false, true, true, false);
 				maxHeight = maxHeightBelow;
 			}
-			this.element.preferredSize = new dom.Dimension(preferredWidth, preferredHeight);
+			this.element.preferredSize = new dom.Dimension(preferredWidth, info.defaultSize.height);
 			this.element.maxSize = new dom.Dimension(maxWidth, maxHeight);
 			this.element.minSize = new dom.Dimension(220, minHeight);
 
 			// Know when the height was capped to fit and remember
 			// the wanted height for later. This is required when going
 			// left to widen suggestions.
-			this._cappedHeight = size && height === fullHeight
+			this._cappedHeight = height === fullHeight
 				? { wanted: this._cappedHeight?.wanted ?? size.height, capped: height }
 				: undefined;
 		}
diff --git a/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts b/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
index 26cdc77ae..71098fe06 100644
--- a/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts
@@ -117,7 +117,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 		data.left = append(main, $('span.left'));
 		data.right = append(main, $('span.right'));
 
-		data.iconLabel = new IconLabel(data.left, { supportHighlights: true, supportCodicons: true });
+		data.iconLabel = new IconLabel(data.left, { supportHighlights: true, supportIcons: true });
 		data.disposables.add(data.iconLabel);
 
 		data.parametersLabel = append(data.left, $('span.signature-label'));
diff --git a/src/vs/editor/contrib/suggest/suggestWidgetStatus.ts b/src/vs/editor/contrib/suggest/suggestWidgetStatus.ts
index eafca367a..3aa92bca3 100644
--- a/src/vs/editor/contrib/suggest/suggestWidgetStatus.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidgetStatus.ts
@@ -36,28 +36,35 @@ export class SuggestWidgetStatus {
 
 	readonly element: HTMLElement;
 
-	private readonly _disposables = new DisposableStore();
+	private readonly _leftActions: ActionBar;
+	private readonly _rightActions: ActionBar;
+	private readonly _menuDisposables = new DisposableStore();
 
 	constructor(
 		container: HTMLElement,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IMenuService menuService: IMenuService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IMenuService private _menuService: IMenuService,
+		@IContextKeyService private _contextKeyService: IContextKeyService,
 	) {
 		this.element = dom.append(container, dom.$('.suggest-status-bar'));
 
 		const actionViewItemProvider = <IActionViewItemProvider>(action => {
-			return action instanceof MenuItemAction
-				? instantiationService.createInstance(StatusBarViewItem, action)
-				: undefined;
+			return action instanceof MenuItemAction ? instantiationService.createInstance(StatusBarViewItem, action) : undefined;
 		});
-		const leftActions = new ActionBar(this.element, { actionViewItemProvider });
-		const rightActions = new ActionBar(this.element, { actionViewItemProvider });
-		const menu = menuService.createMenu(suggestWidgetStatusbarMenu, contextKeyService);
+		this._leftActions = new ActionBar(this.element, { actionViewItemProvider });
+		this._rightActions = new ActionBar(this.element, { actionViewItemProvider });
 
-		leftActions.domNode.classList.add('left');
-		rightActions.domNode.classList.add('right');
+		this._leftActions.domNode.classList.add('left');
+		this._rightActions.domNode.classList.add('right');
+	}
 
+	dispose(): void {
+		this._menuDisposables.dispose();
+		this.element.remove();
+	}
+
+	show(): void {
+		const menu = this._menuService.createMenu(suggestWidgetStatusbarMenu, this._contextKeyService);
 		const renderMenu = () => {
 			const left: IAction[] = [];
 			const right: IAction[] = [];
@@ -68,17 +75,16 @@ export class SuggestWidgetStatus {
 					right.push(...actions);
 				}
 			}
-			leftActions.clear();
-			leftActions.push(left);
-			rightActions.clear();
-			rightActions.push(right);
+			this._leftActions.clear();
+			this._leftActions.push(left);
+			this._rightActions.clear();
+			this._rightActions.push(right);
 		};
-		this._disposables.add(menu.onDidChange(() => renderMenu()));
-		this._disposables.add(menu);
+		this._menuDisposables.add(menu.onDidChange(() => renderMenu()));
+		this._menuDisposables.add(menu);
 	}
 
-	dispose(): void {
-		this._disposables.dispose();
-		this.element.remove();
+	hide(): void {
+		this._menuDisposables.clear();
 	}
 }
diff --git a/src/vs/editor/contrib/suggest/test/suggestController.test.ts b/src/vs/editor/contrib/suggest/test/suggestController.test.ts
index 8644d4498..491a75739 100644
--- a/src/vs/editor/contrib/suggest/test/suggestController.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestController.test.ts
@@ -57,6 +57,7 @@ suite('SuggestController', function () {
 				createMenu() {
 					return new class extends mock<IMenu>() {
 						onDidChange = Event.None;
+						dispose() { }
 					};
 				}
 			}]
diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
index 3193c6787..ce99f9758 100644
--- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
@@ -71,7 +71,7 @@ suite('SuggestModel - Context', function () {
 			this._register(TokenizationRegistry.register(this.getLanguageIdentifier().language, {
 				getInitialState: (): IState => NULL_STATE,
 				tokenize: undefined!,
-				tokenize2: (line: string, state: IState): TokenizationResult2 => {
+				tokenize2: (line: string, hasEOL: boolean, state: IState): TokenizationResult2 => {
 					const tokensArr: number[] = [];
 					let prevLanguageId: LanguageIdentifier | undefined = undefined;
 					for (let i = 0; i < line.length; i++) {
diff --git a/src/vs/editor/contrib/viewportSemanticTokens/viewportSemanticTokens.ts b/src/vs/editor/contrib/viewportSemanticTokens/viewportSemanticTokens.ts
index 44ca58390..43fdcc903 100644
--- a/src/vs/editor/contrib/viewportSemanticTokens/viewportSemanticTokens.ts
+++ b/src/vs/editor/contrib/viewportSemanticTokens/viewportSemanticTokens.ts
@@ -16,6 +16,7 @@ import { toMultilineTokens2, SemanticTokensProviderStyling } from 'vs/editor/com
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { isSemanticColoringEnabled, SEMANTIC_HIGHLIGHTING_SETTING_ID } from 'vs/editor/common/services/modelServiceImpl';
+import { getDocumentRangeSemanticTokensProvider } from 'vs/editor/common/services/getSemanticTokens';
 
 class ViewportSemanticTokensContribution extends Disposable implements IEditorContribution {
 
@@ -66,11 +67,6 @@ class ViewportSemanticTokensContribution extends Disposable implements IEditorCo
 		}));
 	}
 
-	private static _getSemanticColoringProvider(model: ITextModel): DocumentRangeSemanticTokensProvider | null {
-		const result = DocumentRangeSemanticTokensProviderRegistry.ordered(model);
-		return (result.length > 0 ? result[0] : null);
-	}
-
 	private _cancelAll(): void {
 		for (const request of this._outstandingRequests) {
 			request.cancel();
@@ -101,7 +97,7 @@ class ViewportSemanticTokensContribution extends Disposable implements IEditorCo
 			}
 			return;
 		}
-		const provider = ViewportSemanticTokensContribution._getSemanticColoringProvider(model);
+		const provider = getDocumentRangeSemanticTokensProvider(model);
 		if (!provider) {
 			if (model.hasSomeSemanticTokens()) {
 				model.setSemanticTokens(null, false);
diff --git a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
index 49433e1f6..ee2eb0738 100644
--- a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
+++ b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
@@ -110,7 +110,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordLeft - with selection', () => {
@@ -123,7 +123,7 @@ suite('WordOperations', () => {
 		], {}, (editor) => {
 			editor.setPosition(new Position(5, 2));
 			cursorWordLeft(editor, true);
-			assert.deepEqual(editor.getSelection(), new Selection(5, 2, 5, 1));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(5, 2, 5, 1));
 		});
 	});
 
@@ -138,7 +138,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordLeft - issue #48046: Word selection doesn\'t work as usual', () => {
@@ -154,7 +154,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordLeftSelect - issue #74369: cursorWordLeft and cursorWordLeftSelect do not behave consistently', () => {
@@ -170,7 +170,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordStartLeft', () => {
@@ -185,7 +185,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordStartLeft - issue #51119: regression makes VS compatibility impossible', () => {
@@ -200,7 +200,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('issue #51275 - cursorWordStartLeft does not push undo/redo stack element', () => {
@@ -212,16 +212,16 @@ suite('WordOperations', () => {
 
 		withTestCodeEditor('', {}, (editor, viewModel) => {
 			type(viewModel, 'foo bar baz');
-			assert.equal(editor.getValue(), 'foo bar baz');
+			assert.strictEqual(editor.getValue(), 'foo bar baz');
 
 			cursorWordStartLeft(editor);
 			cursorWordStartLeft(editor);
 			type(viewModel, 'q');
 
-			assert.equal(editor.getValue(), 'foo qbar baz');
+			assert.strictEqual(editor.getValue(), 'foo qbar baz');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(editor.getValue(), 'foo bar baz');
+			assert.strictEqual(editor.getValue(), 'foo bar baz');
 		});
 	});
 
@@ -236,7 +236,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordRight - simple', () => {
@@ -256,7 +256,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(5, 2))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordRight - selection', () => {
@@ -269,7 +269,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			editor.setPosition(new Position(1, 1));
 			cursorWordRight(editor, true);
-			assert.deepEqual(editor.getSelection(), new Selection(1, 1, 1, 8));
+			assert.deepStrictEqual(editor.getSelection(), new Selection(1, 1, 1, 8));
 		});
 	});
 
@@ -286,7 +286,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 50))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordRight - issue #41199', () => {
@@ -302,7 +302,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 17))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('moveWordEndRight', () => {
@@ -318,7 +318,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 50))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('moveWordStartRight', () => {
@@ -335,7 +335,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 50))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('issue #51119: cursorWordStartRight regression makes VS compatibility impossible', () => {
@@ -350,7 +350,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 15))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('issue #64810: cursorWordStartRight skips first word after newline', () => {
@@ -365,7 +365,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(2, 12))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordAccessibilityLeft', () => {
@@ -379,7 +379,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordAccessibilityRight', () => {
@@ -393,7 +393,7 @@ suite('WordOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 50))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordLeft for non-empty selection', () => {
@@ -407,8 +407,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setSelection(new Selection(3, 7, 3, 9));
 			deleteWordLeft(editor);
-			assert.equal(model.getLineContent(3), '    Thd Line🐶');
-			assert.deepEqual(editor.getPosition(), new Position(3, 7));
+			assert.strictEqual(model.getLineContent(3), '    Thd Line🐶');
+			assert.deepStrictEqual(editor.getPosition(), new Position(3, 7));
 		});
 	});
 
@@ -423,8 +423,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 1));
 			deleteWordLeft(editor);
-			assert.equal(model.getLineContent(1), '    \tMy First Line\t ');
-			assert.deepEqual(editor.getPosition(), new Position(1, 1));
+			assert.strictEqual(model.getLineContent(1), '    \tMy First Line\t ');
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 1));
 		});
 	});
 
@@ -439,8 +439,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(3, 11));
 			deleteWordLeft(editor);
-			assert.equal(model.getLineContent(3), '    Line🐶');
-			assert.deepEqual(editor.getPosition(), new Position(3, 5));
+			assert.strictEqual(model.getLineContent(3), '    Line🐶');
+			assert.deepStrictEqual(editor.getPosition(), new Position(3, 5));
 		});
 	});
 
@@ -455,8 +455,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 11));
 			deleteWordLeft(editor);
-			assert.equal(model.getLineContent(2), '\tMy  Line');
-			assert.deepEqual(editor.getPosition(), new Position(2, 5));
+			assert.strictEqual(model.getLineContent(2), '\tMy  Line');
+			assert.deepStrictEqual(editor.getPosition(), new Position(2, 5));
 		});
 	});
 
@@ -471,8 +471,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 12));
 			deleteWordLeft(editor);
-			assert.equal(model.getLineContent(1), '    \tMy st Line\t ');
-			assert.deepEqual(editor.getPosition(), new Position(1, 9));
+			assert.strictEqual(model.getLineContent(1), '    \tMy st Line\t ');
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 9));
 		});
 	});
 
@@ -487,8 +487,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setSelection(new Selection(3, 7, 3, 9));
 			deleteWordRight(editor);
-			assert.equal(model.getLineContent(3), '    Thd Line🐶');
-			assert.deepEqual(editor.getPosition(), new Position(3, 7));
+			assert.strictEqual(model.getLineContent(3), '    Thd Line🐶');
+			assert.deepStrictEqual(editor.getPosition(), new Position(3, 7));
 		});
 	});
 
@@ -503,8 +503,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(5, 3));
 			deleteWordRight(editor);
-			assert.equal(model.getLineContent(5), '1');
-			assert.deepEqual(editor.getPosition(), new Position(5, 2));
+			assert.strictEqual(model.getLineContent(5), '1');
+			assert.deepStrictEqual(editor.getPosition(), new Position(5, 2));
 		});
 	});
 
@@ -519,8 +519,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(3, 1));
 			deleteWordRight(editor);
-			assert.equal(model.getLineContent(3), 'Third Line🐶');
-			assert.deepEqual(editor.getPosition(), new Position(3, 1));
+			assert.strictEqual(model.getLineContent(3), 'Third Line🐶');
+			assert.deepStrictEqual(editor.getPosition(), new Position(3, 1));
 		});
 	});
 
@@ -535,8 +535,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 5));
 			deleteWordRight(editor);
-			assert.equal(model.getLineContent(2), '\tMy  Line');
-			assert.deepEqual(editor.getPosition(), new Position(2, 5));
+			assert.strictEqual(model.getLineContent(2), '\tMy  Line');
+			assert.deepStrictEqual(editor.getPosition(), new Position(2, 5));
 		});
 	});
 
@@ -551,8 +551,8 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 11));
 			deleteWordRight(editor);
-			assert.equal(model.getLineContent(1), '    \tMy Fi Line\t ');
-			assert.deepEqual(editor.getPosition(), new Position(1, 11));
+			assert.strictEqual(model.getLineContent(1), '    \tMy Fi Line\t ');
+			assert.deepStrictEqual(editor.getPosition(), new Position(1, 11));
 		});
 	});
 
@@ -569,7 +569,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordStartLeft', () => {
@@ -585,7 +585,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordEndLeft', () => {
@@ -601,7 +601,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordLeft - issue #24947', () => {
@@ -611,7 +611,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 1));
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), '{}');
+			deleteWordLeft(editor); assert.strictEqual(model.getLineContent(1), '{}');
 		});
 
 		withTestCodeEditor([
@@ -620,7 +620,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 1));
-			deleteWordStartLeft(editor); assert.equal(model.getLineContent(1), '{}');
+			deleteWordStartLeft(editor); assert.strictEqual(model.getLineContent(1), '{}');
 		});
 
 		withTestCodeEditor([
@@ -629,7 +629,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 1));
-			deleteWordEndLeft(editor); assert.equal(model.getLineContent(1), '{}');
+			deleteWordEndLeft(editor); assert.strictEqual(model.getLineContent(1), '{}');
 		});
 	});
 
@@ -644,7 +644,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordRight - issue #3882', () => {
@@ -654,7 +654,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 24));
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), 'public void Add( int x,int y )', '001');
+			deleteWordRight(editor); assert.strictEqual(model.getLineContent(1), 'public void Add( int x,int y )', '001');
 		});
 	});
 
@@ -665,7 +665,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 24));
-			deleteWordStartRight(editor); assert.equal(model.getLineContent(1), 'public void Add( int x,int y )', '001');
+			deleteWordStartRight(editor); assert.strictEqual(model.getLineContent(1), 'public void Add( int x,int y )', '001');
 		});
 	});
 
@@ -676,7 +676,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 24));
-			deleteWordEndRight(editor); assert.equal(model.getLineContent(1), 'public void Add( int x,int y )', '001');
+			deleteWordEndRight(editor); assert.strictEqual(model.getLineContent(1), 'public void Add( int x,int y )', '001');
 		});
 	});
 
@@ -691,7 +691,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordEndRight', () => {
@@ -705,7 +705,7 @@ suite('WordOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordRight - issue #3882 (1): Ctrl+Delete removing entire line when used at the end of line', () => {
@@ -715,7 +715,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 18));
-			deleteWordRight(editor); assert.equal(model.getLineContent(1), 'A line with text.And another one', '001');
+			deleteWordRight(editor); assert.strictEqual(model.getLineContent(1), 'A line with text.And another one', '001');
 		});
 	});
 
@@ -726,7 +726,7 @@ suite('WordOperations', () => {
 		], {}, (editor, _) => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 1));
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), 'A line with text.   And another one', '001');
+			deleteWordLeft(editor); assert.strictEqual(model.getLineContent(1), 'A line with text.   And another one', '001');
 		});
 	});
 
@@ -748,7 +748,7 @@ suite('WordOperations', () => {
 
 		withTestCodeEditor(null, { model }, (editor, _) => {
 			editor.setPosition(new Position(1, 4));
-			deleteWordLeft(editor); assert.equal(model.getLineContent(1), 'a ');
+			deleteWordLeft(editor); assert.strictEqual(model.getLineContent(1), 'a ');
 		});
 
 		model.dispose();
@@ -764,7 +764,7 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(2, 1));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'Line1\nLine2');
+			assert.strictEqual(model.getValue(), 'Line1\nLine2');
 		});
 	});
 
@@ -775,7 +775,7 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 6));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'Justsome text.');
+			assert.strictEqual(model.getValue(), 'Justsome text.');
 		});
 	});
 
@@ -786,7 +786,7 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 6));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'Justsome text.');
+			assert.strictEqual(model.getValue(), 'Justsome text.');
 		});
 	});
 
@@ -797,19 +797,19 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 6));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'Just"some text.');
+			assert.strictEqual(model.getValue(), 'Just"some text.');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '"some text.');
+			assert.strictEqual(model.getValue(), '"some text.');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'some text.');
+			assert.strictEqual(model.getValue(), 'some text.');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'text.');
+			assert.strictEqual(model.getValue(), 'text.');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '.');
+			assert.strictEqual(model.getValue(), '.');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 		});
 	});
 
@@ -820,19 +820,19 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 7));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'x=3+45+6');
+			assert.strictEqual(model.getValue(), 'x=3+45+6');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'x=3++6');
+			assert.strictEqual(model.getValue(), 'x=3++6');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'x=36');
+			assert.strictEqual(model.getValue(), 'x=36');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'x=');
+			assert.strictEqual(model.getValue(), 'x=');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'x');
+			assert.strictEqual(model.getValue(), 'x');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 		});
 	});
 
@@ -843,13 +843,13 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 7));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'This interesting');
+			assert.strictEqual(model.getValue(), 'This interesting');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'This');
+			assert.strictEqual(model.getValue(), 'This');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 		});
 	});
 
@@ -860,13 +860,13 @@ suite('WordOperations', () => {
 			const model = editor.getModel()!;
 			editor.setPosition(new Position(1, 7));
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'This  interesting');
+			assert.strictEqual(model.getValue(), 'This  interesting');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), 'This');
+			assert.strictEqual(model.getValue(), 'This');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 			deleteInsideWord(editor);
-			assert.equal(model.getValue(), '');
+			assert.strictEqual(model.getValue(), '');
 		});
 	});
 });
diff --git a/src/vs/editor/contrib/wordOperations/wordOperations.ts b/src/vs/editor/contrib/wordOperations/wordOperations.ts
index 82dcbddc5..ac3f987de 100644
--- a/src/vs/editor/contrib/wordOperations/wordOperations.ts
+++ b/src/vs/editor/contrib/wordOperations/wordOperations.ts
@@ -55,7 +55,7 @@ export abstract class MoveWordCommand extends EditorCommand {
 		});
 
 		model.pushStackElement();
-		editor._getViewModel().setCursorStates('moveWordCommand', CursorChangeReason.NotSet, result.map(r => CursorState.fromModelSelection(r)));
+		editor._getViewModel().setCursorStates('moveWordCommand', CursorChangeReason.Explicit, result.map(r => CursorState.fromModelSelection(r)));
 		if (result.length === 1) {
 			const pos = new Position(result[0].positionLineNumber, result[0].positionColumn);
 			editor.revealPosition(pos, ScrollType.Smooth);
diff --git a/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts b/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts
index 70e9c87c6..446711f2a 100644
--- a/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts
+++ b/src/vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts
@@ -49,7 +49,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartLeft - issue #53899: whitespace', () => {
@@ -63,7 +63,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartLeft - issue #53899: underscores', () => {
@@ -77,7 +77,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartRight - basic', () => {
@@ -95,7 +95,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(3, 9))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartRight - issue #53899: whitespace', () => {
@@ -109,7 +109,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 52))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartRight - issue #53899: underscores', () => {
@@ -123,7 +123,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 52))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('cursorWordPartRight - issue #53899: second case', () => {
@@ -142,7 +142,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(4, 7))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('issue #93239 - cursorWordPartRight', () => {
@@ -158,7 +158,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 8))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('issue #93239 - cursorWordPartLeft', () => {
@@ -174,7 +174,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getPosition()!.equals(new Position(1, 1))
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordPartLeft - basic', () => {
@@ -188,7 +188,7 @@ suite('WordPartOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 
 	test('deleteWordPartRight - basic', () => {
@@ -202,6 +202,6 @@ suite('WordPartOperations', () => {
 			ed => ed.getValue().length === 0
 		);
 		const actual = serializePipePositions(text, actualStops);
-		assert.deepEqual(actual, EXPECTED);
+		assert.deepStrictEqual(actual, EXPECTED);
 	});
 });
diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts
index 904283213..9b4870b45 100644
--- a/src/vs/editor/editor.all.ts
+++ b/src/vs/editor/editor.all.ts
@@ -23,12 +23,13 @@ import 'vs/editor/contrib/find/findController';
 import 'vs/editor/contrib/folding/folding';
 import 'vs/editor/contrib/fontZoom/fontZoom';
 import 'vs/editor/contrib/format/formatActions';
-import 'vs/editor/contrib/gotoSymbol/documentSymbols';
+import 'vs/editor/contrib/documentSymbols/documentSymbols';
 import 'vs/editor/contrib/gotoSymbol/goToCommands';
 import 'vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition';
 import 'vs/editor/contrib/gotoError/gotoError';
 import 'vs/editor/contrib/hover/hover';
 import 'vs/editor/contrib/indentation/indentation';
+import 'vs/editor/contrib/inlineHints/inlineHintsController';
 import 'vs/editor/contrib/inPlaceReplace/inPlaceReplace';
 import 'vs/editor/contrib/linesOperations/linesOperations';
 import 'vs/editor/contrib/linkedEditing/linkedEditing';
diff --git a/src/vs/editor/editor.api.ts b/src/vs/editor/editor.api.ts
index 0e4c48c34..6b2cc6c04 100644
--- a/src/vs/editor/editor.api.ts
+++ b/src/vs/editor/editor.api.ts
@@ -7,6 +7,8 @@ import { EditorOptions, WrappingIndent, EditorAutoIndentStrategy } from 'vs/edit
 import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
 import { createMonacoEditorAPI } from 'vs/editor/standalone/browser/standaloneEditor';
 import { createMonacoLanguagesAPI } from 'vs/editor/standalone/browser/standaloneLanguages';
+import { globals } from 'vs/base/common/platform';
+import { FormattingConflicts } from 'vs/editor/contrib/format/format';
 
 // Set defaults for standalone editor
 EditorOptions.wrappingIndent.defaultValue = WrappingIndent.None;
@@ -14,6 +16,10 @@ EditorOptions.glyphMargin.defaultValue = false;
 EditorOptions.autoIndent.defaultValue = EditorAutoIndentStrategy.Advanced;
 EditorOptions.overviewRulerLanes.defaultValue = 2;
 
+// We need to register a formatter selector which simply picks the first available formatter.
+// See https://github.com/microsoft/monaco-editor/issues/2327
+FormattingConflicts.setFormatterSelector((formatter, document, mode) => Promise.resolve(formatter[0]));
+
 const api = createMonacoBaseAPI();
 api.editor = createMonacoEditorAPI();
 api.languages = createMonacoLanguagesAPI();
@@ -32,7 +38,9 @@ export const Token = api.Token;
 export const editor = api.editor;
 export const languages = api.languages;
 
-self.monaco = api;
+if (globals.MonacoEnvironment?.globalAPI || globals.define?.amd) {
+	self.monaco = api;
+}
 
 if (typeof self.require !== 'undefined' && typeof self.require.config === 'function') {
 	self.require.config({
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 22bad13e9..f9d335696 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -42,8 +42,8 @@ export class Colorizer {
 		let text = domNode.firstChild ? domNode.firstChild.nodeValue : '';
 		domNode.className += ' ' + theme;
 		let render = (str: string) => {
-			const trustedhtml = ttPolicy ? ttPolicy.createHTML(str) : str;
-			domNode.innerHTML = trustedhtml as unknown as string;
+			const trustedhtml = ttPolicy?.createHTML(str) ?? str;
+			domNode.innerHTML = trustedhtml as string;
 		};
 		return this.colorize(modeService, text || '', mimeType, options).then(render, (err) => console.error(err));
 	}
@@ -222,7 +222,7 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 
 	for (let i = 0, length = lines.length; i < length; i++) {
 		let line = lines[i];
-		let tokenizeResult = tokenizationSupport.tokenize2(line, state, 0);
+		let tokenizeResult = tokenizationSupport.tokenize2(line, true, state, 0);
 		LineTokens.convertToEndOffset(tokenizeResult.tokens, line.length);
 		let lineTokens = new LineTokens(tokenizeResult.tokens, line);
 		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, /* check for basic ASCII */true);
diff --git a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
index 192f92185..88b54c867 100644
--- a/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
+++ b/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.ts
@@ -137,8 +137,8 @@ function getSafeTokenizationSupport(languageIdentifier: LanguageIdentifier): ITo
 	}
 	return {
 		getInitialState: () => NULL_STATE,
-		tokenize: (line: string, state: IState, deltaOffset: number) => nullTokenize(languageIdentifier.language, line, state, deltaOffset),
-		tokenize2: (line: string, state: IState, deltaOffset: number) => nullTokenize2(languageIdentifier.id, line, state, deltaOffset)
+		tokenize: (line: string, hasEOL: boolean, state: IState, deltaOffset: number) => nullTokenize(languageIdentifier.language, line, state, deltaOffset),
+		tokenize2: (line: string, hasEOL: boolean, state: IState, deltaOffset: number) => nullTokenize2(languageIdentifier.id, line, state, deltaOffset)
 	};
 }
 
@@ -293,8 +293,8 @@ class InspectTokensWidget extends Disposable implements IContentWidget {
 	private _getTokensAtLine(lineNumber: number): ICompleteLineTokenization {
 		let stateBeforeLine = this._getStateBeforeLine(lineNumber);
 
-		let tokenizationResult1 = this._tokenizationSupport.tokenize(this._model.getLineContent(lineNumber), stateBeforeLine, 0);
-		let tokenizationResult2 = this._tokenizationSupport.tokenize2(this._model.getLineContent(lineNumber), stateBeforeLine, 0);
+		let tokenizationResult1 = this._tokenizationSupport.tokenize(this._model.getLineContent(lineNumber), true, stateBeforeLine, 0);
+		let tokenizationResult2 = this._tokenizationSupport.tokenize2(this._model.getLineContent(lineNumber), true, stateBeforeLine, 0);
 
 		return {
 			startState: stateBeforeLine,
@@ -308,7 +308,7 @@ class InspectTokensWidget extends Disposable implements IContentWidget {
 		let state: IState = this._tokenizationSupport.getInitialState();
 
 		for (let i = 1; i < lineNumber; i++) {
-			let tokenizationResult = this._tokenizationSupport.tokenize(this._model.getLineContent(i), state, 0);
+			let tokenizationResult = this._tokenizationSupport.tokenize(this._model.getLineContent(i), true, state, 0);
 			state = tokenizationResult.endState;
 		}
 
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index ba51dfd9e..3410b5860 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -176,8 +176,8 @@ export class SimpleEditorProgressService implements IEditorProgressService {
 		return SimpleEditorProgressService.NULL_PROGRESS_RUNNER;
 	}
 
-	showWhile(promise: Promise<any>, delay?: number): Promise<void> {
-		return Promise.resolve(undefined);
+	async showWhile(promise: Promise<any>, delay?: number): Promise<void> {
+		await promise;
 	}
 }
 
@@ -638,12 +638,12 @@ export class SimpleWorkspaceContextService implements IWorkspaceContextService {
 		return resource && resource.scheme === SimpleWorkspaceContextService.SCHEME;
 	}
 
-	public isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean {
+	public isCurrentWorkspace(workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean {
 		return true;
 	}
 }
 
-export function applyConfigurationValues(configurationService: IConfigurationService, source: any, isDiffEditor: boolean): void {
+export function updateConfigurationService(configurationService: IConfigurationService, source: any, isDiffEditor: boolean): void {
 	if (!source) {
 		return;
 	}
@@ -736,7 +736,7 @@ export class SimpleUriLabelService implements ILabelService {
 		return basename(resource);
 	}
 
-	public getWorkspaceLabel(workspace: IWorkspaceIdentifier | URI | IWorkspace, options?: { verbose: boolean; }): string {
+	public getWorkspaceLabel(workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace, options?: { verbose: boolean; }): string {
 		return '';
 	}
 
diff --git a/src/vs/editor/standalone/browser/standalone-tokens.css b/src/vs/editor/standalone/browser/standalone-tokens.css
index e97572e05..174273006 100644
--- a/src/vs/editor/standalone/browser/standalone-tokens.css
+++ b/src/vs/editor/standalone/browser/standalone-tokens.css
@@ -23,6 +23,19 @@
 	margin: 0;
 }
 
+/*
+In certain cases, the default positioning of the aria container (left: -999em) can cause scrollbars to appear.
+So here we try to avoid that by using a different technique. See https://stackoverflow.com/a/26032207
+*/
+.monaco-aria-container {
+	position: absolute !important;
+	height: 1px;
+	width: 1px;
+	left: inherit !important;
+	overflow: hidden;
+	clip: rect(1px, 1px, 1px, 1px);
+}
+
 /* The hc-black theme is already high contrast optimized */
 .monaco-editor.hc-black {
 	-ms-high-contrast-adjust: none;
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 9344ee801..4e3c939d2 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -14,7 +14,7 @@ import { InternalEditorAction } from 'vs/editor/common/editorAction';
 import { IModelChangedEvent } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
-import { StandaloneKeybindingService, applyConfigurationValues } from 'vs/editor/standalone/browser/simpleServices';
+import { StandaloneKeybindingService, updateConfigurationService } from 'vs/editor/standalone/browser/simpleServices';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
 import { IMenuItem, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
@@ -31,6 +31,9 @@ import { StandaloneCodeEditorNLS } from 'vs/editor/common/standaloneStrings';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standaloneThemeServiceImpl';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ILanguageSelection, IModeService } from 'vs/editor/common/services/modeService';
+import { URI } from 'vs/base/common/uri';
 
 /**
  * Description of an action contribution
@@ -227,7 +230,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 
 	constructor(
 		domElement: HTMLElement,
-		options: IStandaloneEditorConstructionOptions,
+		_options: Readonly<IStandaloneEditorConstructionOptions>,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
@@ -237,7 +240,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 		@INotificationService notificationService: INotificationService,
 		@IAccessibilityService accessibilityService: IAccessibilityService
 	) {
-		options = options || {};
+		const options = { ..._options };
 		options.ariaLabel = options.ariaLabel || StandaloneCodeEditorNLS.editorViewAccessibleLabel;
 		options.ariaLabel = options.ariaLabel + ';' + (StandaloneCodeEditorNLS.accessibilityHelpMessage);
 		super(domElement, options, {}, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService);
@@ -353,7 +356,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 
 	constructor(
 		domElement: HTMLElement,
-		options: IStandaloneEditorConstructionOptions | undefined,
+		_options: Readonly<IStandaloneEditorConstructionOptions> | undefined,
 		toDispose: IDisposable,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
@@ -364,11 +367,13 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		@IStandaloneThemeService themeService: IStandaloneThemeService,
 		@INotificationService notificationService: INotificationService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IAccessibilityService accessibilityService: IAccessibilityService
+		@IAccessibilityService accessibilityService: IAccessibilityService,
+		@IModelService modelService: IModelService,
+		@IModeService modeService: IModeService,
 	) {
-		applyConfigurationValues(configurationService, options, false);
+		const options = { ..._options };
+		updateConfigurationService(configurationService, options, false);
 		const themeDomRegistration = (<StandaloneThemeServiceImpl>themeService).registerEditorContainer(domElement);
-		options = options || {};
 		if (typeof options.theme === 'string') {
 			themeService.setTheme(options.theme);
 		}
@@ -384,7 +389,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 
 		let model: ITextModel | null;
 		if (typeof _model === 'undefined') {
-			model = (<any>self).monaco.editor.createModel(options.value || '', options.language || 'text/plain');
+			model = createTextModel(modelService, modeService, options.value || '', options.language || 'text/plain', undefined);
 			this._ownsModel = true;
 		} else {
 			model = _model;
@@ -405,8 +410,8 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		super.dispose();
 	}
 
-	public updateOptions(newOptions: IEditorOptions & IGlobalEditorOptions): void {
-		applyConfigurationValues(this._configurationService, newOptions, false);
+	public updateOptions(newOptions: Readonly<IEditorOptions & IGlobalEditorOptions>): void {
+		updateConfigurationService(this._configurationService, newOptions, false);
 		if (typeof newOptions.theme === 'string') {
 			this._standaloneThemeService.setTheme(newOptions.theme);
 		}
@@ -437,7 +442,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 
 	constructor(
 		domElement: HTMLElement,
-		options: IDiffEditorConstructionOptions | undefined,
+		_options: Readonly<IDiffEditorConstructionOptions> | undefined,
 		toDispose: IDisposable,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -452,14 +457,14 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 		@IEditorProgressService editorProgressService: IEditorProgressService,
 		@IClipboardService clipboardService: IClipboardService,
 	) {
-		applyConfigurationValues(configurationService, options, true);
+		const options = { ..._options };
+		updateConfigurationService(configurationService, options, true);
 		const themeDomRegistration = (<StandaloneThemeServiceImpl>themeService).registerEditorContainer(domElement);
-		options = options || {};
 		if (typeof options.theme === 'string') {
 			options.theme = themeService.setTheme(options.theme);
 		}
 
-		super(domElement, options, clipboardService, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
+		super(domElement, options, {}, clipboardService, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
 
 		this._contextViewService = <ContextViewService>contextViewService;
 		this._configurationService = configurationService;
@@ -475,15 +480,15 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 		super.dispose();
 	}
 
-	public updateOptions(newOptions: IDiffEditorOptions & IGlobalEditorOptions): void {
-		applyConfigurationValues(this._configurationService, newOptions, true);
+	public updateOptions(newOptions: Readonly<IDiffEditorOptions & IGlobalEditorOptions>): void {
+		updateConfigurationService(this._configurationService, newOptions, true);
 		if (typeof newOptions.theme === 'string') {
 			this._standaloneThemeService.setTheme(newOptions.theme);
 		}
 		super.updateOptions(newOptions);
 	}
 
-	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: IEditorOptions): CodeEditorWidget {
+	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorOptions>): CodeEditorWidget {
 		return instantiationService.createInstance(StandaloneCodeEditor, container, options);
 	}
 
@@ -507,3 +512,26 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 		return this.getModifiedEditor().addAction(descriptor);
 	}
 }
+
+/**
+ * @internal
+ */
+export function createTextModel(modelService: IModelService, modeService: IModeService, value: string, language: string | undefined, uri: URI | undefined): ITextModel {
+	value = value || '';
+	if (!language) {
+		const firstLF = value.indexOf('\n');
+		let firstLine = value;
+		if (firstLF !== -1) {
+			firstLine = value.substring(0, firstLF);
+		}
+		return doCreateModel(modelService, value, modeService.createByFilepathOrFirstLine(uri || null, firstLine), uri);
+	}
+	return doCreateModel(modelService, value, modeService.create(language), uri);
+}
+
+/**
+ * @internal
+ */
+function doCreateModel(modelService: IModelService, value: string, languageSelection: ILanguageSelection, uri: URI | undefined): ITextModel {
+	return modelService.createModel(value, languageSelection, uri);
+}
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 6d5fc9c32..295f2cb68 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -18,16 +18,16 @@ import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/commo
 import * as modes from 'vs/editor/common/modes';
 import { NULL_STATE, nullTokenize } from 'vs/editor/common/modes/nullMode';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
-import { ILanguageSelection } from 'vs/editor/common/services/modeService';
+import { IModeService } from 'vs/editor/common/services/modeService';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/common/services/webWorker';
 import * as standaloneEnums from 'vs/editor/common/standalone/standaloneEnums';
 import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/editor/standalone/browser/colorizer';
 import { SimpleEditorModelResolverService } from 'vs/editor/standalone/browser/simpleServices';
-import { IDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor, StandaloneDiffEditor, StandaloneEditor } from 'vs/editor/standalone/browser/standaloneCodeEditor';
+import { IDiffEditorConstructionOptions, IStandaloneEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor, StandaloneDiffEditor, StandaloneEditor, createTextModel } from 'vs/editor/standalone/browser/standaloneCodeEditor';
 import { DynamicStandaloneServices, IEditorOverrideServices, StaticServices } from 'vs/editor/standalone/browser/standaloneServices';
 import { IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -42,6 +42,7 @@ import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standaloneThemeServiceImpl';
 import { splitLines } from 'vs/base/common/strings';
+import { IModelService } from 'vs/editor/common/services/modelService';
 
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
@@ -87,7 +88,9 @@ export function create(domElement: HTMLElement, options?: IStandaloneEditorConst
 			services.get(IStandaloneThemeService),
 			services.get(INotificationService),
 			services.get(IConfigurationService),
-			services.get(IAccessibilityService)
+			services.get(IAccessibilityService),
+			services.get(IModelService),
+			services.get(IModeService),
 		);
 	});
 }
@@ -140,27 +143,18 @@ export function createDiffNavigator(diffEditor: IStandaloneDiffEditor, opts?: ID
 	return new DiffNavigator(diffEditor, opts);
 }
 
-function doCreateModel(value: string, languageSelection: ILanguageSelection, uri?: URI): ITextModel {
-	return StaticServices.modelService.get().createModel(value, languageSelection, uri);
-}
-
 /**
  * Create a new editor model.
  * You can specify the language that should be set for this model or let the language be inferred from the `uri`.
  */
 export function createModel(value: string, language?: string, uri?: URI): ITextModel {
-	value = value || '';
-
-	if (!language) {
-		let firstLF = value.indexOf('\n');
-		let firstLine = value;
-		if (firstLF !== -1) {
-			firstLine = value.substring(0, firstLF);
-		}
-
-		return doCreateModel(value, StaticServices.modeService.get().createByFilepathOrFirstLine(uri || null, firstLine), uri);
-	}
-	return doCreateModel(value, StaticServices.modeService.get().create(language), uri);
+	return createTextModel(
+		StaticServices.modelService.get(),
+		StaticServices.modeService.get(),
+		value,
+		language,
+		uri
+	);
 }
 
 /**
@@ -188,6 +182,14 @@ export function getModelMarkers(filter: { owner?: string, resource?: URI, take?:
 	return StaticServices.markerService.get().read(filter);
 }
 
+/**
+ * Emitted when markers change for a model.
+ * @event
+ */
+export function onDidChangeMarkers(listener: (e: readonly URI[]) => void): IDisposable {
+	return StaticServices.markerService.get().onMarkerChanged(listener);
+}
+
 /**
  * Get the model that has `uri` if it exists.
  */
@@ -276,7 +278,7 @@ function getSafeTokenizationSupport(language: string): Omit<modes.ITokenizationS
 	}
 	return {
 		getInitialState: () => NULL_STATE,
-		tokenize: (line: string, state: modes.IState, deltaOffset: number) => nullTokenize(language, line, state, deltaOffset)
+		tokenize: (line: string, hasEOL: boolean, state: modes.IState, deltaOffset: number) => nullTokenize(language, line, state, deltaOffset)
 	};
 }
 
@@ -294,7 +296,7 @@ export function tokenize(text: string, languageId: string): Token[][] {
 	let state = tokenizationSupport.getInitialState();
 	for (let i = 0, len = lines.length; i < len; i++) {
 		let line = lines[i];
-		let tokenizationResult = tokenizationSupport.tokenize(line, state, 0);
+		let tokenizationResult = tokenizationSupport.tokenize(line, true, state, 0);
 
 		result[i] = tokenizationResult.tokens;
 		state = tokenizationResult.endState;
@@ -323,6 +325,13 @@ export function remeasureFonts(): void {
 	clearAllFontInfos();
 }
 
+/**
+ * Register a command.
+ */
+export function registerCommand(id: string, handler: (accessor: any, ...args: any[]) => void): IDisposable {
+	return CommandsRegistry.registerCommand({ id, handler });
+}
+
 /**
  * @internal
  */
@@ -338,6 +347,7 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		setModelLanguage: <any>setModelLanguage,
 		setModelMarkers: <any>setModelMarkers,
 		getModelMarkers: <any>getModelMarkers,
+		onDidChangeMarkers: <any>onDidChangeMarkers,
 		getModels: <any>getModels,
 		getModel: <any>getModel,
 		onDidCreateModel: <any>onDidCreateModel,
@@ -353,6 +363,7 @@ export function createMonacoEditorAPI(): typeof monaco.editor {
 		defineTheme: <any>defineTheme,
 		setTheme: <any>setTheme,
 		remeasureFonts: remeasureFonts,
+		registerCommand: registerCommand,
 
 		// enums
 		AccessibilitySupport: standaloneEnums.AccessibilitySupport,
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index dbf225a6c..b75a81443 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -87,14 +88,14 @@ export class EncodedTokenizationSupport2Adapter implements modes.ITokenizationSu
 		return this._actual.getInitialState();
 	}
 
-	public tokenize(line: string, state: modes.IState, offsetDelta: number): TokenizationResult {
+	public tokenize(line: string, hasEOL: boolean, state: modes.IState, offsetDelta: number): TokenizationResult {
 		if (typeof this._actual.tokenize === 'function') {
 			return TokenizationSupport2Adapter.adaptTokenize(this._languageIdentifier.language, <{ tokenize(line: string, state: modes.IState): ILineTokens; }>this._actual, line, state, offsetDelta);
 		}
 		throw new Error('Not supported!');
 	}
 
-	public tokenize2(line: string, state: modes.IState): TokenizationResult2 {
+	public tokenize2(line: string, hasEOL: boolean, state: modes.IState): TokenizationResult2 {
 		let result = this._actual.tokenizeEncoded(line, state);
 		return new TokenizationResult2(result.tokens, result.endState);
 	}
@@ -157,7 +158,7 @@ export class TokenizationSupport2Adapter implements modes.ITokenizationSupport {
 		return new TokenizationResult(tokens, endState);
 	}
 
-	public tokenize(line: string, state: modes.IState, offsetDelta: number): TokenizationResult {
+	public tokenize(line: string, hasEOL: boolean, state: modes.IState, offsetDelta: number): TokenizationResult {
 		return TokenizationSupport2Adapter.adaptTokenize(this._languageIdentifier.language, this._actual, line, state, offsetDelta);
 	}
 
@@ -199,7 +200,7 @@ export class TokenizationSupport2Adapter implements modes.ITokenizationSupport {
 		return actualResult;
 	}
 
-	public tokenize2(line: string, state: modes.IState, offsetDelta: number): TokenizationResult2 {
+	public tokenize2(line: string, hasEOL: boolean, state: modes.IState, offsetDelta: number): TokenizationResult2 {
 		let actualResult = this._actual.tokenize(line, state);
 		let tokens = this._toBinaryTokens(actualResult.tokens, offsetDelta);
 
@@ -310,6 +311,22 @@ function isThenable<T>(obj: any): obj is Thenable<T> {
 	return obj && typeof obj.then === 'function';
 }
 
+/**
+ * Change the color map that is used for token colors.
+ * Supported formats (hex): #RRGGBB, $RRGGBBAA, #RGB, #RGBA
+ */
+export function setColorMap(colorMap: string[] | null): void {
+	if (colorMap) {
+		const result: Color[] = [null!];
+		for (let i = 1, len = colorMap.length; i < len; i++) {
+			result[i] = Color.fromHex(colorMap[i]);
+		}
+		StaticServices.standaloneThemeService.get().setColorMapOverride(result);
+	} else {
+		StaticServices.standaloneThemeService.get().setColorMapOverride(null);
+	}
+}
+
 /**
  * Set the tokens provider for a language (manual implementation).
  */
@@ -570,6 +587,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 
 		// provider methods
 		setLanguageConfiguration: <any>setLanguageConfiguration,
+		setColorMap: setColorMap,
 		setTokensProvider: <any>setTokensProvider,
 		setMonarchTokensProvider: <any>setMonarchTokensProvider,
 		registerReferenceProvider: <any>registerReferenceProvider,
diff --git a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
index 544d7b07a..f61c9de85 100644
--- a/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
+++ b/src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts
@@ -39,7 +39,11 @@ class StandaloneTheme implements IStandaloneTheme {
 		this.themeData = standaloneThemeData;
 		let base = standaloneThemeData.base;
 		if (name.length > 0) {
-			this.id = base + ' ' + name;
+			if (isBuiltinTheme(name)) {
+				this.id = name;
+			} else {
+				this.id = base + ' ' + name;
+			}
 			this.themeName = name;
 		} else {
 			this.id = base;
@@ -199,6 +203,7 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
 	private _allCSS: string;
 	private _globalStyleElement: HTMLStyleElement | null;
 	private _styleElements: HTMLStyleElement[];
+	private _colorMapOverride: Color[] | null;
 	private _theme!: IStandaloneTheme;
 
 	constructor() {
@@ -216,6 +221,7 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
 		this._allCSS = `${this._codiconCSS}\n${this._themeCSS}`;
 		this._globalStyleElement = null;
 		this._styleElements = [];
+		this._colorMapOverride = null;
 		this.setTheme(VS_THEME_NAME);
 
 		iconRegistry.onDidChange(() => {
@@ -284,6 +290,11 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
 		return this._theme;
 	}
 
+	public setColorMapOverride(colorMapOverride: Color[] | null): void {
+		this._colorMapOverride = colorMapOverride;
+		this._updateThemeOrColorMap();
+	}
+
 	public setTheme(themeName: string): string {
 		let theme: StandaloneTheme;
 		if (this._knownThemes.has(themeName)) {
@@ -296,7 +307,11 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
 			return theme.id;
 		}
 		this._theme = theme;
+		this._updateThemeOrColorMap();
+		return theme.id;
+	}
 
+	private _updateThemeOrColorMap(): void {
 		let cssRules: string[] = [];
 		let hasRule: { [rule: string]: boolean; } = {};
 		let ruleCollector: ICssStyleCollector = {
@@ -307,19 +322,16 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
 				}
 			}
 		};
-		themingRegistry.getThemingParticipants().forEach(p => p(theme, ruleCollector, this._environment));
+		themingRegistry.getThemingParticipants().forEach(p => p(this._theme, ruleCollector, this._environment));
 
-		let tokenTheme = theme.tokenTheme;
-		let colorMap = tokenTheme.getColorMap();
+		const colorMap = this._colorMapOverride || this._theme.tokenTheme.getColorMap();
 		ruleCollector.addRule(generateTokensCSSForColorMap(colorMap));
 
 		this._themeCSS = cssRules.join('\n');
 		this._updateCSS();
 
 		TokenizationRegistry.setColorMap(colorMap);
-		this._onColorThemeChange.fire(theme);
-
-		return theme.id;
+		this._onColorThemeChange.fire(this._theme);
 	}
 
 	private _updateCSS(): void {
diff --git a/src/vs/editor/standalone/common/monarch/monarchCommon.ts b/src/vs/editor/standalone/common/monarch/monarchCommon.ts
index 6dbf14dc8..bd96a9f08 100644
--- a/src/vs/editor/standalone/common/monarch/monarchCommon.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchCommon.ts
@@ -22,6 +22,7 @@ export const enum MonarchBracket {
 
 export interface ILexerMin {
 	languageId: string;
+	includeLF: boolean;
 	noThrow: boolean;
 	ignoreCase: boolean;
 	unicode: boolean;
diff --git a/src/vs/editor/standalone/common/monarch/monarchCompile.ts b/src/vs/editor/standalone/common/monarch/monarchCompile.ts
index 289d045ab..aa487e7e6 100644
--- a/src/vs/editor/standalone/common/monarch/monarchCompile.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchCompile.ts
@@ -395,6 +395,7 @@ export function compile(languageId: string, json: IMonarchLanguage): monarchComm
 	// Create our lexer
 	let lexer: monarchCommon.ILexer = <monarchCommon.ILexer>{};
 	lexer.languageId = languageId;
+	lexer.includeLF = bool(json.includeLF, false);
 	lexer.noThrow = false; // raise exceptions during compilation
 	lexer.maxStack = 100;
 
@@ -411,6 +412,7 @@ export function compile(languageId: string, json: IMonarchLanguage): monarchComm
 	// For calling compileAction later on
 	let lexerMin: monarchCommon.ILexerMin = <any>json;
 	lexerMin.languageId = languageId;
+	lexerMin.includeLF = lexer.includeLF;
 	lexerMin.ignoreCase = lexer.ignoreCase;
 	lexerMin.unicode = lexer.unicode;
 	lexerMin.noThrow = lexer.noThrow;
diff --git a/src/vs/editor/standalone/common/monarch/monarchLexer.ts b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
index e566f7589..dc8b86443 100644
--- a/src/vs/editor/standalone/common/monarch/monarchLexer.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
@@ -231,7 +231,7 @@ class MonarchLineState implements modes.IState {
 interface IMonarchTokensCollector {
 	enterMode(startOffset: number, modeId: string): void;
 	emit(startOffset: number, type: string): void;
-	nestedModeTokenize(embeddedModeLine: string, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState;
+	nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState;
 }
 
 class MonarchClassicTokensCollector implements IMonarchTokensCollector {
@@ -261,7 +261,7 @@ class MonarchClassicTokensCollector implements IMonarchTokensCollector {
 		this._tokens.push(new Token(startOffset, type, this._language!));
 	}
 
-	public nestedModeTokenize(embeddedModeLine: string, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState {
+	public nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState {
 		const nestedModeId = embeddedModeData.modeId;
 		const embeddedModeState = embeddedModeData.state;
 
@@ -272,7 +272,7 @@ class MonarchClassicTokensCollector implements IMonarchTokensCollector {
 			return embeddedModeState;
 		}
 
-		let nestedResult = nestedModeTokenizationSupport.tokenize(embeddedModeLine, embeddedModeState, offsetDelta);
+		let nestedResult = nestedModeTokenizationSupport.tokenize(embeddedModeLine, hasEOL, embeddedModeState, offsetDelta);
 		this._tokens = this._tokens.concat(nestedResult.tokens);
 		this._lastTokenType = null;
 		this._lastTokenLanguage = null;
@@ -345,7 +345,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector {
 		return result;
 	}
 
-	public nestedModeTokenize(embeddedModeLine: string, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState {
+	public nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState {
 		const nestedModeId = embeddedModeData.modeId;
 		const embeddedModeState = embeddedModeData.state;
 
@@ -356,7 +356,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector {
 			return embeddedModeState;
 		}
 
-		let nestedResult = nestedModeTokenizationSupport.tokenize2(embeddedModeLine, embeddedModeState, offsetDelta);
+		let nestedResult = nestedModeTokenizationSupport.tokenize2(embeddedModeLine, hasEOL, embeddedModeState, offsetDelta);
 		this._prependTokens = MonarchModernTokensCollector._merge(this._prependTokens, this._tokens, nestedResult.tokens);
 		this._tokens = [];
 		this._currentLanguageId = 0;
@@ -456,23 +456,23 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 		return MonarchLineStateFactory.create(rootState, null);
 	}
 
-	public tokenize(line: string, lineState: modes.IState, offsetDelta: number): TokenizationResult {
+	public tokenize(line: string, hasEOL: boolean, lineState: modes.IState, offsetDelta: number): TokenizationResult {
 		let tokensCollector = new MonarchClassicTokensCollector();
-		let endLineState = this._tokenize(line, <MonarchLineState>lineState, offsetDelta, tokensCollector);
+		let endLineState = this._tokenize(line, hasEOL, <MonarchLineState>lineState, offsetDelta, tokensCollector);
 		return tokensCollector.finalize(endLineState);
 	}
 
-	public tokenize2(line: string, lineState: modes.IState, offsetDelta: number): TokenizationResult2 {
+	public tokenize2(line: string, hasEOL: boolean, lineState: modes.IState, offsetDelta: number): TokenizationResult2 {
 		let tokensCollector = new MonarchModernTokensCollector(this._modeService, this._standaloneThemeService.getColorTheme().tokenTheme);
-		let endLineState = this._tokenize(line, <MonarchLineState>lineState, offsetDelta, tokensCollector);
+		let endLineState = this._tokenize(line, hasEOL, <MonarchLineState>lineState, offsetDelta, tokensCollector);
 		return tokensCollector.finalize(endLineState);
 	}
 
-	private _tokenize(line: string, lineState: MonarchLineState, offsetDelta: number, collector: IMonarchTokensCollector): MonarchLineState {
+	private _tokenize(line: string, hasEOL: boolean, lineState: MonarchLineState, offsetDelta: number, collector: IMonarchTokensCollector): MonarchLineState {
 		if (lineState.embeddedModeData) {
-			return this._nestedTokenize(line, lineState, offsetDelta, collector);
+			return this._nestedTokenize(line, hasEOL, lineState, offsetDelta, collector);
 		} else {
-			return this._myTokenize(line, lineState, offsetDelta, collector);
+			return this._myTokenize(line, hasEOL, lineState, offsetDelta, collector);
 		}
 	}
 
@@ -518,24 +518,24 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 		return popOffset;
 	}
 
-	private _nestedTokenize(line: string, lineState: MonarchLineState, offsetDelta: number, tokensCollector: IMonarchTokensCollector): MonarchLineState {
+	private _nestedTokenize(line: string, hasEOL: boolean, lineState: MonarchLineState, offsetDelta: number, tokensCollector: IMonarchTokensCollector): MonarchLineState {
 
 		let popOffset = this._findLeavingNestedModeOffset(line, lineState);
 
 		if (popOffset === -1) {
 			// tokenization will not leave nested mode
-			let nestedEndState = tokensCollector.nestedModeTokenize(line, lineState.embeddedModeData!, offsetDelta);
+			let nestedEndState = tokensCollector.nestedModeTokenize(line, hasEOL, lineState.embeddedModeData!, offsetDelta);
 			return MonarchLineStateFactory.create(lineState.stack, new EmbeddedModeData(lineState.embeddedModeData!.modeId, nestedEndState));
 		}
 
 		let nestedModeLine = line.substring(0, popOffset);
 		if (nestedModeLine.length > 0) {
 			// tokenize with the nested mode
-			tokensCollector.nestedModeTokenize(nestedModeLine, lineState.embeddedModeData!, offsetDelta);
+			tokensCollector.nestedModeTokenize(nestedModeLine, false, lineState.embeddedModeData!, offsetDelta);
 		}
 
 		let restOfTheLine = line.substring(popOffset);
-		return this._myTokenize(restOfTheLine, lineState, offsetDelta + popOffset, tokensCollector);
+		return this._myTokenize(restOfTheLine, hasEOL, lineState, offsetDelta + popOffset, tokensCollector);
 	}
 
 	private _safeRuleName(rule: monarchCommon.IRule | null): string {
@@ -545,9 +545,11 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 		return '(unknown)';
 	}
 
-	private _myTokenize(line: string, lineState: MonarchLineState, offsetDelta: number, tokensCollector: IMonarchTokensCollector): MonarchLineState {
+	private _myTokenize(lineWithoutLF: string, hasEOL: boolean, lineState: MonarchLineState, offsetDelta: number, tokensCollector: IMonarchTokensCollector): MonarchLineState {
 		tokensCollector.enterMode(offsetDelta, this._modeId);
 
+		const lineWithoutLFLength = lineWithoutLF.length;
+		const line = (hasEOL && this._lexer.includeLF ? lineWithoutLF + '\n' : lineWithoutLF);
 		const lineLength = line.length;
 
 		let embeddedModeData = lineState.embeddedModeData;
@@ -563,7 +565,7 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 		}
 		let groupMatching: GroupMatching | null = null;
 
-		// See https://github.com/microsoft/monaco-editor/issues/1235:
+		// See https://github.com/microsoft/monaco-editor/issues/1235
 		// Evaluate rules at least once for an empty line
 		let forceEvaluation = true;
 
@@ -752,8 +754,8 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 
 				if (pos < lineLength) {
 					// there is content from the embedded mode on this line
-					const restOfLine = line.substr(pos);
-					return this._nestedTokenize(restOfLine, MonarchLineStateFactory.create(stack, embeddedModeData), offsetDelta + pos, tokensCollector);
+					const restOfLine = lineWithoutLF.substr(pos);
+					return this._nestedTokenize(restOfLine, hasEOL, MonarchLineStateFactory.create(stack, embeddedModeData), offsetDelta + pos, tokensCollector);
 				} else {
 					return MonarchLineStateFactory.create(stack, embeddedModeData);
 				}
@@ -831,7 +833,9 @@ export class MonarchTokenizer implements modes.ITokenizationSupport {
 					tokenType = monarchCommon.sanitize(token);
 				}
 
-				tokensCollector.emit(pos0 + offsetDelta, tokenType);
+				if (pos0 < lineWithoutLFLength) {
+					tokensCollector.emit(pos0 + offsetDelta, tokenType);
+				}
 			}
 
 			if (enteringEmbeddedMode !== null) {
diff --git a/src/vs/editor/standalone/common/monarch/monarchTypes.ts b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
index 19936be8d..5e3a798c6 100644
--- a/src/vs/editor/standalone/common/monarch/monarchTypes.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchTypes.ts
@@ -41,6 +41,11 @@ export interface IMonarchLanguage {
 	 * attach this to every token class (by default '.' + name)
 	 */
 	tokenPostfix?: string;
+	/**
+	 * include line feeds (in the form of a \n character) at the end of lines
+	 * Defaults to false
+	 */
+	includeLF?: boolean;
 }
 
 /**
diff --git a/src/vs/editor/standalone/common/standaloneThemeService.ts b/src/vs/editor/standalone/common/standaloneThemeService.ts
index c70a713dd..afefd369d 100644
--- a/src/vs/editor/standalone/common/standaloneThemeService.ts
+++ b/src/vs/editor/standalone/common/standaloneThemeService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Color } from 'vs/base/common/color';
 import { ITokenThemeRule, TokenTheme } from 'vs/editor/common/modes/supports/tokenization';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
@@ -33,4 +34,7 @@ export interface IStandaloneThemeService extends IThemeService {
 	defineTheme(themeName: string, themeData: IStandaloneThemeData): void;
 
 	getColorTheme(): IStandaloneTheme;
+
+	setColorMapOverride(colorMapOverride: Color[] | null): void;
+
 }
diff --git a/src/vs/editor/standalone/common/themes.ts b/src/vs/editor/standalone/common/themes.ts
index 4c7761e66..9e07df46b 100644
--- a/src/vs/editor/standalone/common/themes.ts
+++ b/src/vs/editor/standalone/common/themes.ts
@@ -65,7 +65,7 @@ export const vs: IStandaloneThemeData = {
 		{ token: 'operator.scss', foreground: '666666' },
 		{ token: 'operator.sql', foreground: '778899' },
 		{ token: 'operator.swift', foreground: '666666' },
-		{ token: 'predefined.sql', foreground: 'FF00FF' },
+		{ token: 'predefined.sql', foreground: 'C700C7' },
 	],
 	colors: {
 		[editorBackground]: '#FFFFFE',
diff --git a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
index e3c7a31f1..bd4399d6c 100644
--- a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
@@ -68,7 +68,8 @@ suite('TokenizationSupport2Adapter', () => {
 				tokenColorMap: []
 			};
 		}
-
+		setColorMapOverride(colorMapOverride: Color[] | null): void {
+		}
 		public getFileIconTheme(): IFileIconTheme {
 			return {
 				hasFileIcons: false,
@@ -107,15 +108,15 @@ suite('TokenizationSupport2Adapter', () => {
 
 		const adapter = new TokenizationSupport2Adapter(new MockThemeService(), languageIdentifier, new BadTokensProvider());
 
-		const actualClassicTokens = adapter.tokenize('whatever', MockState.INSTANCE, offsetDelta);
-		assert.deepEqual(actualClassicTokens.tokens, expectedClassicTokens);
+		const actualClassicTokens = adapter.tokenize('whatever', true, MockState.INSTANCE, offsetDelta);
+		assert.deepStrictEqual(actualClassicTokens.tokens, expectedClassicTokens);
 
-		const actualModernTokens = adapter.tokenize2('whatever', MockState.INSTANCE, offsetDelta);
+		const actualModernTokens = adapter.tokenize2('whatever', true, MockState.INSTANCE, offsetDelta);
 		const modernTokens: number[] = [];
 		for (let i = 0; i < actualModernTokens.tokens.length; i++) {
 			modernTokens[i] = actualModernTokens.tokens[i];
 		}
-		assert.deepEqual(modernTokens, expectedModernTokens);
+		assert.deepStrictEqual(modernTokens, expectedModernTokens);
 	}
 
 	test('tokens always start at index 0 (no offset delta)', () => {
diff --git a/src/vs/editor/standalone/test/monarch/monarch.test.ts b/src/vs/editor/standalone/test/monarch/monarch.test.ts
index 89eb03cef..61fcafe55 100644
--- a/src/vs/editor/standalone/test/monarch/monarch.test.ts
+++ b/src/vs/editor/standalone/test/monarch/monarch.test.ts
@@ -68,39 +68,154 @@ suite('Monarch', () => {
 		const actualTokens: Token[][] = [];
 		let state = tokenizer.getInitialState();
 		for (const line of lines) {
-			const result = tokenizer.tokenize(line, state, 0);
+			const result = tokenizer.tokenize(line, true, state, 0);
 			actualTokens.push(result.tokens);
 			state = result.endState;
 		}
 
-		assert.deepEqual(actualTokens, [
+		assert.deepStrictEqual(actualTokens, [
 			[
-				{ 'offset': 0, 'type': 'source.test1', 'language': 'test1' },
-				{ 'offset': 12, 'type': 'string.quote.test1', 'language': 'test1' },
-				{ 'offset': 15, 'type': 'token.sql', 'language': 'sql' },
-				{ 'offset': 61, 'type': 'string.quote.test1', 'language': 'test1' },
-				{ 'offset': 64, 'type': 'source.test1', 'language': 'test1' }
+				new Token(0, 'source.test1', 'test1'),
+				new Token(12, 'string.quote.test1', 'test1'),
+				new Token(15, 'token.sql', 'sql'),
+				new Token(61, 'string.quote.test1', 'test1'),
+				new Token(64, 'source.test1', 'test1')
 			],
 			[
-				{ 'offset': 0, 'type': 'source.test1', 'language': 'test1' },
-				{ 'offset': 12, 'type': 'string.quote.test1', 'language': 'test1' }
+				new Token(0, 'source.test1', 'test1'),
+				new Token(12, 'string.quote.test1', 'test1')
 			],
 			[
-				{ 'offset': 0, 'type': 'token.sql', 'language': 'sql' }
+				new Token(0, 'token.sql', 'sql')
 			],
 			[
-				{ 'offset': 0, 'type': 'token.sql', 'language': 'sql' }
+				new Token(0, 'token.sql', 'sql')
 			],
 			[
-				{ 'offset': 0, 'type': 'token.sql', 'language': 'sql' }
+				new Token(0, 'token.sql', 'sql')
 			],
 			[
-				{ 'offset': 0, 'type': 'string.quote.test1', 'language': 'test1' },
-				{ 'offset': 3, 'type': 'source.test1', 'language': 'test1' }
+				new Token(0, 'string.quote.test1', 'test1'),
+				new Token(3, 'source.test1', 'test1')
 			]
 		]);
 		innerModeTokenizationRegistration.dispose();
 		innerModeRegistration.dispose();
 	});
 
+	test('microsoft/monaco-editor#1235: Empty Line Handling', () => {
+		const modeService = new ModeServiceImpl();
+		const tokenizer = createMonarchTokenizer(modeService, 'test', {
+			tokenizer: {
+				root: [
+					{ include: '@comments' },
+				],
+
+				comments: [
+					[/\/\/$/, 'comment'], // empty single-line comment
+					[/\/\//, 'comment', '@comment_cpp'],
+				],
+
+				comment_cpp: [
+					[/(?:[^\\]|(?:\\.))+$/, 'comment', '@pop'],
+					[/.+$/, 'comment'],
+					[/$/, 'comment', '@pop']
+					// No possible rule to detect an empty line and @pop?
+				],
+			},
+		});
+
+		const lines = [
+			`// This comment \\`,
+			`   continues on the following line`,
+			``,
+			`// This comment does NOT continue \\\\`,
+			`   because the escape char was itself escaped`,
+			``,
+			`// This comment DOES continue because \\\\\\`,
+			`   the 1st '\\' escapes the 2nd; the 3rd escapes EOL`,
+			``,
+			`// This comment continues to the following line \\`,
+			``,
+			`But the line was empty. This line should not be commented.`,
+		];
+
+		const actualTokens: Token[][] = [];
+		let state = tokenizer.getInitialState();
+		for (const line of lines) {
+			const result = tokenizer.tokenize(line, true, state, 0);
+			actualTokens.push(result.tokens);
+			state = result.endState;
+		}
+
+		assert.deepStrictEqual(actualTokens, [
+			[new Token(0, 'comment.test', 'test')],
+			[new Token(0, 'comment.test', 'test')],
+			[],
+			[new Token(0, 'comment.test', 'test')],
+			[new Token(0, 'source.test', 'test')],
+			[],
+			[new Token(0, 'comment.test', 'test')],
+			[new Token(0, 'comment.test', 'test')],
+			[],
+			[new Token(0, 'comment.test', 'test')],
+			[],
+			[new Token(0, 'source.test', 'test')]
+		]);
+
+	});
+
+	test('microsoft/monaco-editor#2265: Exit a state at end of line', () => {
+		const modeService = new ModeServiceImpl();
+		const tokenizer = createMonarchTokenizer(modeService, 'test', {
+			includeLF: true,
+			tokenizer: {
+				root: [
+					[/^\*/, '', '@inner'],
+					[/\:\*/, '', '@inner'],
+					[/[^*:]+/, 'string'],
+					[/[*:]/, 'string']
+				],
+				inner: [
+					[/\n/, '', '@pop'],
+					[/\d+/, 'number'],
+					[/[^\d]+/, '']
+				]
+			}
+		});
+
+		const lines = [
+			`PRINT 10 * 20`,
+			`*FX200, 3`,
+			`PRINT 2*3:*FX200, 3`
+		];
+
+		const actualTokens: Token[][] = [];
+		let state = tokenizer.getInitialState();
+		for (const line of lines) {
+			const result = tokenizer.tokenize(line, true, state, 0);
+			actualTokens.push(result.tokens);
+			state = result.endState;
+		}
+
+		assert.deepStrictEqual(actualTokens, [
+			[
+				new Token(0, 'string.test', 'test'),
+			],
+			[
+				new Token(0, '', 'test'),
+				new Token(3, 'number.test', 'test'),
+				new Token(6, '', 'test'),
+				new Token(8, 'number.test', 'test'),
+			],
+			[
+				new Token(0, 'string.test', 'test'),
+				new Token(9, '', 'test'),
+				new Token(13, 'number.test', 'test'),
+				new Token(16, '', 'test'),
+				new Token(18, 'number.test', 'test'),
+			]
+		]);
+	});
+
 });
diff --git a/src/vs/editor/test/browser/commands/shiftCommand.test.ts b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
index 755aac5bc..c31f8e4bf 100644
--- a/src/vs/editor/test/browser/commands/shiftCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/shiftCommand.test.ts
@@ -964,7 +964,7 @@ suite('Editor Commands - ShiftCommand', () => {
 					autoIndent: EditorAutoIndentStrategy.Full,
 				});
 				let actual = getEditOperation(model, op);
-				assert.deepEqual(actual, expected);
+				assert.deepStrictEqual(actual, expected);
 			});
 		}
 
@@ -979,7 +979,7 @@ suite('Editor Commands - ShiftCommand', () => {
 					autoIndent: EditorAutoIndentStrategy.Full,
 				});
 				let actual = getEditOperation(model, op);
-				assert.deepEqual(actual, expected);
+				assert.deepStrictEqual(actual, expected);
 			});
 		}
 	});
diff --git a/src/vs/editor/test/browser/commands/sideEditing.test.ts b/src/vs/editor/test/browser/commands/sideEditing.test.ts
index be07a5682..f8a8bbae5 100644
--- a/src/vs/editor/test/browser/commands/sideEditing.test.ts
+++ b/src/vs/editor/test/browser/commands/sideEditing.test.ts
@@ -19,10 +19,10 @@ function testCommand(lines: string[], selections: Selection[], edits: IIdentifie
 
 		model.applyEdits(edits);
 
-		assert.deepEqual(model.getLinesContent(), expectedLines);
+		assert.deepStrictEqual(model.getLinesContent(), expectedLines);
 
 		let actualSelections = viewModel.getSelections();
-		assert.deepEqual(actualSelections.map(s => s.toString()), expectedSelections.map(s => s.toString()));
+		assert.deepStrictEqual(actualSelections.map(s => s.toString()), expectedSelections.map(s => s.toString()));
 
 	});
 }
@@ -202,7 +202,7 @@ suite('SideEditing', () => {
 				forceMoveMarkers: editForceMoveMarkers
 			}]);
 			const actual = viewModel.getSelection();
-			assert.deepEqual(actual.toString(), expected.toString(), msg);
+			assert.deepStrictEqual(actual.toString(), expected.toString(), msg);
 		});
 	}
 
diff --git a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
index af0c64e53..d9fdfc1bd 100644
--- a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
@@ -37,14 +37,14 @@ function assertTrimTrailingWhitespaceCommand(text: string[], expected: IIdentifi
 	return withEditorModel(text, (model) => {
 		let op = new TrimTrailingWhitespaceCommand(new Selection(1, 1, 1, 1), []);
 		let actual = getEditOperation(model, op);
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	});
 }
 
 function assertTrimTrailingWhitespace(text: string[], cursors: Position[], expected: IIdentifiedSingleEditOperation[]): void {
 	return withEditorModel(text, (model) => {
 		let actual = trimTrailingWhitespace(model, cursors);
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	});
 }
 
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index cb202a3f8..489af4718 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -115,7 +115,7 @@ function assertCursor(viewModel: ViewModel, what: Position | Selection | Selecti
 	let actual = viewModel.getSelections().map(s => s.toString());
 	let expected = selections.map(s => s.toString());
 
-	assert.deepEqual(actual, expected);
+	assert.deepStrictEqual(actual, expected);
 }
 
 suite('Editor Controller - Cursor', () => {
@@ -795,11 +795,11 @@ suite('Editor Controller - Cursor', () => {
 			viewModel.onEvent((e) => {
 				if (e.kind === OutgoingViewModelEventKind.CursorStateChanged) {
 					events++;
-					assert.deepEqual(e.selections, [new Selection(1, 2, 1, 2)]);
+					assert.deepStrictEqual(e.selections, [new Selection(1, 2, 1, 2)]);
 				}
 			});
 			moveTo(editor, viewModel, 1, 2);
-			assert.equal(events, 1, 'receives 1 event');
+			assert.strictEqual(events, 1, 'receives 1 event');
 		});
 	});
 
@@ -809,11 +809,11 @@ suite('Editor Controller - Cursor', () => {
 			viewModel.onEvent((e) => {
 				if (e.kind === OutgoingViewModelEventKind.CursorStateChanged) {
 					events++;
-					assert.deepEqual(e.selections, [new Selection(1, 1, 1, 2)]);
+					assert.deepStrictEqual(e.selections, [new Selection(1, 1, 1, 2)]);
 				}
 			});
 			moveTo(editor, viewModel, 1, 2, true);
-			assert.equal(events, 1, 'receives 1 event');
+			assert.strictEqual(events, 1, 'receives 1 event');
 		});
 	});
 
@@ -1311,7 +1311,7 @@ suite('Editor Controller - Regression tests', () => {
 
 			// Check that indenting maintains the selection start at column 1
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.deepEqual(viewModel.getSelection(), new Selection(1, 1, 1, 14));
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(1, 1, 1, 14));
 		});
 
 		model.dispose();
@@ -1330,49 +1330,49 @@ suite('Editor Controller - Regression tests', () => {
 
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n', 'assert1');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n', 'assert1');
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t', 'assert2');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t', 'assert2');
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\n\t', 'assert3');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\n\t', 'assert3');
 
 			viewModel.type('x');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert4');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert4');
 
 			CoreNavigationCommands.CursorLeft.runCoreEditorCommand(viewModel, {});
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert5');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert5');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert6');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert6');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\tx', 'assert7');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\tx', 'assert7');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert8');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert8');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'x', 'assert9');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'x', 'assert9');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert10');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert10');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert11');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert11');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert12');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\n\tx', 'assert12');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert13');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t\nx', 'assert13');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert14');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert14');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'x', 'assert15');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'x', 'assert15');
 		});
 
 		model.dispose();
@@ -1387,13 +1387,13 @@ suite('Editor Controller - Regression tests', () => {
 
 			assertCursor(viewModel, new Position(1, 1));
 			model.setEOL(EndOfLineSequence.LF);
-			assert.equal(model.getValue(), 'Hello\nworld');
+			assert.strictEqual(model.getValue(), 'Hello\nworld');
 
 			model.pushEOL(EndOfLineSequence.CRLF);
-			assert.equal(model.getValue(), 'Hello\r\nworld');
+			assert.strictEqual(model.getValue(), 'Hello\r\nworld');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), 'Hello\nworld');
+			assert.strictEqual(model.getValue(), 'Hello\nworld');
 		});
 	});
 
@@ -1415,10 +1415,10 @@ suite('Editor Controller - Regression tests', () => {
 			editor.setSelection(new Selection(1, 1, 1, 2));
 
 			viewModel.type('%', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '%\'%👁\'', 'assert1');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '%\'%👁\'', 'assert1');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\'👁\'', 'assert2');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\'👁\'', 'assert2');
 		});
 
 		model.dispose();
@@ -1433,50 +1433,50 @@ suite('Editor Controller - Regression tests', () => {
 			viewModel.type(' ', 'keyboard');
 			viewModel.type('world', 'keyboard');
 			viewModel.type(' ', 'keyboard');
-			assert.equal(model.getLineContent(1), 'Hello world ');
+			assert.strictEqual(model.getLineContent(1), 'Hello world ');
 			assertCursor(viewModel, new Position(1, 13));
 
 			moveLeft(editor, viewModel);
 			moveRight(editor, viewModel);
 
 			model.pushEditOperations([], [EditOperation.replaceMove(new Range(1, 12, 1, 13), '')], () => []);
-			assert.equal(model.getLineContent(1), 'Hello world');
+			assert.strictEqual(model.getLineContent(1), 'Hello world');
 			assertCursor(viewModel, new Position(1, 12));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world ');
+			assert.strictEqual(model.getLineContent(1), 'Hello world ');
 			assertCursor(viewModel, new Selection(1, 12, 1, 13));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world');
+			assert.strictEqual(model.getLineContent(1), 'Hello world');
 			assertCursor(viewModel, new Position(1, 12));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello');
+			assert.strictEqual(model.getLineContent(1), 'Hello');
 			assertCursor(viewModel, new Position(1, 6));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '');
+			assert.strictEqual(model.getLineContent(1), '');
 			assertCursor(viewModel, new Position(1, 1));
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello');
+			assert.strictEqual(model.getLineContent(1), 'Hello');
 			assertCursor(viewModel, new Position(1, 6));
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world');
+			assert.strictEqual(model.getLineContent(1), 'Hello world');
 			assertCursor(viewModel, new Position(1, 12));
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world ');
+			assert.strictEqual(model.getLineContent(1), 'Hello world ');
 			assertCursor(viewModel, new Position(1, 13));
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world');
+			assert.strictEqual(model.getLineContent(1), 'Hello world');
 			assertCursor(viewModel, new Position(1, 12));
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'Hello world');
+			assert.strictEqual(model.getLineContent(1), 'Hello world');
 			assertCursor(viewModel, new Position(1, 12));
 		});
 
@@ -1498,7 +1498,7 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(1, 6, 1, 6));
 
 			CoreEditingCommands.Outdent.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    function baz() {');
+			assert.strictEqual(model.getLineContent(1), '    function baz() {');
 			assertCursor(viewModel, new Selection(1, 5, 1, 5));
 		});
 
@@ -1518,7 +1518,7 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(1, 7, 1, 7));
 
 			CoreEditingCommands.Outdent.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(1), '    ');
 			assertCursor(viewModel, new Selection(1, 5, 1, 5));
 		});
 
@@ -1540,7 +1540,7 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(1, 9, 1, 9));
 
 			CoreEditingCommands.Outdent.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(1), '    ');
 			assertCursor(viewModel, new Selection(1, 5, 1, 5));
 		});
 
@@ -1568,7 +1568,7 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(7, 1, 7, 1));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(7), '\t');
+			assert.strictEqual(model.getLineContent(7), '\t');
 			assertCursor(viewModel, new Selection(7, 2, 7, 2));
 		});
 
@@ -1588,8 +1588,8 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			viewModel.cut('keyboard');
-			assert.equal(model.getLineCount(), 1);
-			assert.equal(model.getLineContent(1), 'asdasd');
+			assert.strictEqual(model.getLineCount(), 1);
+			assert.strictEqual(model.getLineContent(1), 'asdasd');
 
 		});
 
@@ -1604,12 +1604,12 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			viewModel.cut('keyboard');
-			assert.equal(model.getLineCount(), 1);
-			assert.equal(model.getLineContent(1), 'asdasd');
+			assert.strictEqual(model.getLineCount(), 1);
+			assert.strictEqual(model.getLineContent(1), 'asdasd');
 
 			viewModel.cut('keyboard');
-			assert.equal(model.getLineCount(), 1);
-			assert.equal(model.getLineContent(1), '');
+			assert.strictEqual(model.getLineCount(), 1);
+			assert.strictEqual(model.getLineContent(1), '');
 		});
 	});
 
@@ -1651,8 +1651,8 @@ suite('Editor Controller - Regression tests', () => {
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			assertCursor(viewModel, new Selection(1, 14, 1, 14));
-			assert.equal(model.getLineCount(), 1);
-			assert.equal(model.getLineContent(1), 'function baz(;');
+			assert.strictEqual(model.getLineCount(), 1);
+			assert.strictEqual(model.getLineContent(1), 'function baz(;');
 		});
 
 		model.dispose();
@@ -1671,9 +1671,9 @@ suite('Editor Controller - Regression tests', () => {
 
 			viewModel.paste('line1\n', true);
 
-			assert.equal(model.getLineContent(1), 'line1');
-			assert.equal(model.getLineContent(2), 'line1');
-			assert.equal(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(1), 'line1');
+			assert.strictEqual(model.getLineContent(2), 'line1');
+			assert.strictEqual(model.getLineContent(3), '');
 		});
 	});
 
@@ -1689,10 +1689,10 @@ suite('Editor Controller - Regression tests', () => {
 
 			viewModel.paste('line1\n', true);
 
-			assert.equal(model.getLineContent(1), 'line1');
-			assert.equal(model.getLineContent(2), 'line line1');
-			assert.equal(model.getLineContent(3), ' 2');
-			assert.equal(model.getLineContent(4), 'line3');
+			assert.strictEqual(model.getLineContent(1), 'line1');
+			assert.strictEqual(model.getLineContent(2), 'line line1');
+			assert.strictEqual(model.getLineContent(3), ' 2');
+			assert.strictEqual(model.getLineContent(4), 'line3');
 		});
 	});
 
@@ -1715,7 +1715,7 @@ suite('Editor Controller - Regression tests', () => {
 				]
 			);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'a',
 				'bline1',
 				'c',
@@ -1747,7 +1747,7 @@ suite('Editor Controller - Regression tests', () => {
 				null
 			);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'aaa',
 				'bbb',
 				'ccc',
@@ -1790,7 +1790,7 @@ suite('Editor Controller - Regression tests', () => {
 				null
 			);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'aaa',
 				'bbb',
 				'ccc',
@@ -1815,7 +1815,7 @@ suite('Editor Controller - Regression tests', () => {
 				null
 			);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'aline1',
 				'bline2',
 				'cline3'
@@ -1839,7 +1839,7 @@ suite('Editor Controller - Regression tests', () => {
 				null
 			);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'aline1',
 				'bline2',
 				'cline3'
@@ -1869,26 +1869,26 @@ suite('Editor Controller - Regression tests', () => {
 			});
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'\t just some text'
 			].join('\n'), '001');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'    some lines',
 				'    and more lines',
 				'    just some text',
 			].join('\n'), '002');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'some lines',
 				'and more lines',
 				'just some text',
 			].join('\n'), '003');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'some lines',
 				'and more lines',
 				'just some text',
@@ -1911,7 +1911,7 @@ suite('Editor Controller - Regression tests', () => {
 
 			viewModel.type('😍', 'keyboard');
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'some lines',
 				'and more lines',
 				'😍just some text',
@@ -1933,7 +1933,7 @@ suite('Editor Controller - Regression tests', () => {
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			moveTo(editor, viewModel, 3, 2, false);
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(3), '\t    \tx: 3');
+			assert.strictEqual(model.getLineContent(3), '\t    \tx: 3');
 		});
 
 		model.dispose();
@@ -1954,7 +1954,7 @@ suite('Editor Controller - Regression tests', () => {
 			moveTo(editor, viewModel, 1, 15, false);
 			moveTo(editor, viewModel, 1, 22, true);
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'var foo = 123;\t// this is a comment');
+			assert.strictEqual(model.getLineContent(1), 'var foo = 123;\t// this is a comment');
 		});
 
 		model.dispose();
@@ -1982,8 +1982,8 @@ suite('Editor Controller - Regression tests', () => {
 					CoreNavigationCommands.WordSelectDrag.runCoreEditorCommand(viewModel, args);
 				}
 
-				assert.equal(viewModel.getSelection().startColumn, 1, 'TEST FOR ' + col);
-				assert.equal(viewModel.getSelection().endColumn, expectedCol, 'TEST FOR ' + col);
+				assert.strictEqual(viewModel.getSelection().startColumn, 1, 'TEST FOR ' + col);
+				assert.strictEqual(viewModel.getSelection().endColumn, expectedCol, 'TEST FOR ' + col);
 			}
 
 			assertWordRight(1, '   '.length + 1);
@@ -2048,10 +2048,10 @@ suite('Editor Controller - Regression tests', () => {
 
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			CoreNavigationCommands.WordSelect.runCoreEditorCommand(viewModel, { position: new Position(1, 8) });
-			assert.deepEqual(viewModel.getSelection(), new Selection(1, 6, 1, 10));
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(1, 6, 1, 10));
 
 			CoreNavigationCommands.WordSelectDrag.runCoreEditorCommand(viewModel, { position: new Position(1, 8) });
-			assert.deepEqual(viewModel.getSelection(), new Selection(1, 6, 1, 10));
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(1, 6, 1, 10));
 		});
 
 		model.dispose();
@@ -2066,7 +2066,7 @@ suite('Editor Controller - Regression tests', () => {
 
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			CoreNavigationCommands.WordSelect.runCoreEditorCommand(viewModel, { position: new Position(1, 5) });
-			assert.deepEqual(viewModel.getSelection(), new Selection(1, 5, 1, 8));
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(1, 5, 1, 8));
 		});
 
 		model.dispose();
@@ -2090,11 +2090,11 @@ suite('Editor Controller - Regression tests', () => {
 			viewModel.replacePreviousChar('せんせい', 4);
 			viewModel.replacePreviousChar('せんせい', 4);
 
-			assert.equal(model.getLineContent(1), 'せんせい');
+			assert.strictEqual(model.getLineContent(1), 'せんせい');
 			assertCursor(viewModel, new Position(1, 5));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '');
+			assert.strictEqual(model.getLineContent(1), '');
 			assertCursor(viewModel, new Position(1, 1));
 		});
 	});
@@ -2121,11 +2121,11 @@ suite('Editor Controller - Regression tests', () => {
 			viewModel.type('n', 'keyboard');
 
 			for (let i = 0; i < LINE_CNT; i++) {
-				assert.equal(model.getLineContent(i + 1), 'nnasd', 'line #' + (i + 1));
+				assert.strictEqual(model.getLineContent(i + 1), 'nnasd', 'line #' + (i + 1));
 			}
 
-			assert.equal(viewModel.getSelections().length, LINE_CNT);
-			assert.equal(viewModel.getSelections()[LINE_CNT - 1].startLineNumber, LINE_CNT);
+			assert.strictEqual(viewModel.getSelections().length, LINE_CNT);
+			assert.strictEqual(viewModel.getSelections()[LINE_CNT - 1].startLineNumber, LINE_CNT);
 		});
 	});
 
@@ -2349,6 +2349,37 @@ suite('Editor Controller - Regression tests', () => {
 		});
 	});
 
+	test('issue #112301: new stickyTabStops feature interferes with word wrap', () => {
+		withTestCodeEditor([
+			[
+				'function hello() {',
+				'        console.log(`this is a long console message`)',
+				'}',
+			].join('\n')
+		], { wordWrap: 'wordWrapColumn', wordWrapColumn: 32, stickyTabStops: true }, (editor, viewModel) => {
+			viewModel.setSelections('test', [
+				new Selection(2, 31, 2, 31)
+			]);
+			moveRight(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 32));
+
+			moveRight(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 33));
+
+			moveRight(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 34));
+
+			moveLeft(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 33));
+
+			moveLeft(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 32));
+
+			moveLeft(editor, viewModel, false);
+			assertCursor(viewModel, new Position(2, 31));
+		});
+	});
+
 	test('issue #44805: Should not be able to undo in readonly editor', () => {
 		let model = createTextModel(
 			[
@@ -2361,10 +2392,10 @@ suite('Editor Controller - Regression tests', () => {
 				range: new Range(1, 1, 1, 1),
 				text: 'Hello world!'
 			}], () => [new Selection(1, 1, 1, 1)]);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'Hello world!');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'Hello world!');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'Hello world!');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'Hello world!');
 		});
 
 		model.dispose();
@@ -2375,7 +2406,7 @@ suite('Editor Controller - Regression tests', () => {
 		const tokenizationSupport: ITokenizationSupport = {
 			getInitialState: () => NULL_STATE,
 			tokenize: undefined!,
-			tokenize2: (line: string, state: IState): TokenizationResult2 => {
+			tokenize2: (line: string, hasEOL: boolean, state: IState): TokenizationResult2 => {
 				return new TokenizationResult2(new Uint32Array(0), state);
 			}
 		};
@@ -2426,8 +2457,8 @@ suite('Editor Controller - Regression tests', () => {
 
 			viewModel.type('\'', 'keyboard');
 
-			assert.equal(model.getLineContent(1), 'const a = \'foo\';');
-			assert.equal(model.getLineContent(2), 'const b = \'\'');
+			assert.strictEqual(model.getLineContent(1), 'const a = \'foo\';');
+			assert.strictEqual(model.getLineContent(2), 'const b = \'\'');
 		});
 
 		model.dispose();
@@ -2518,7 +2549,7 @@ suite('Editor Controller - Regression tests', () => {
 				new Selection(2, 1, 2, 1)
 			]);
 			viewModel.paste('something\n', true);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'abc123',
 				'something',
 				''
@@ -2542,22 +2573,22 @@ suite('Editor Controller - Regression tests', () => {
 			]);
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'สวัสด');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'สวัสด');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'สวัส');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'สวัส');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'สวั');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'สวั');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'สว');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'สว');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'ส');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'ส');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '');
 		});
 
 		model.dispose();
@@ -2578,8 +2609,8 @@ suite('Editor Controller - Cursor Configuration', () => {
 		}, (editor, model, viewModel) => {
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(1, 21), source: 'keyboard' });
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    \tMy First Line\t ');
-			assert.equal(model.getLineContent(2), '        ');
+			assert.strictEqual(model.getLineContent(1), '    \tMy First Line\t ');
+			assert.strictEqual(model.getLineContent(2), '        ');
 		});
 	});
 
@@ -2602,56 +2633,56 @@ suite('Editor Controller - Cursor Configuration', () => {
 			// Tab on column 1
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 1) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '             My Second Line123');
+			assert.strictEqual(model.getLineContent(2), '             My Second Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 2
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 2) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'M            y Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'M            y Second Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 3
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 3) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My            Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My            Second Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 4
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 4) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My           Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My           Second Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 5
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 5) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My S         econd Line123');
+			assert.strictEqual(model.getLineContent(2), 'My S         econd Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 5
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 5) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My S         econd Line123');
+			assert.strictEqual(model.getLineContent(2), 'My S         econd Line123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 13
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 13) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My Second Li ne123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Li ne123');
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
 
 			// Tab on column 14
-			assert.equal(model.getLineContent(2), 'My Second Line123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Line123');
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(viewModel, { position: new Position(2, 14) });
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'My Second Lin             e123');
+			assert.strictEqual(model.getLineContent(2), 'My Second Lin             e123');
 		});
 
 		model.dispose();
@@ -2669,7 +2700,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			assertCursor(viewModel, new Selection(1, 7, 1, 7));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.CRLF), '\thello\r\n        ');
+			assert.strictEqual(model.getValue(EndOfLinePreference.CRLF), '\thello\r\n        ');
 		});
 		mode.dispose();
 	});
@@ -2686,7 +2717,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			assertCursor(viewModel, new Selection(1, 7, 1, 7));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.CRLF), '\thello\r\n    ');
+			assert.strictEqual(model.getValue(EndOfLinePreference.CRLF), '\thello\r\n    ');
 		});
 		mode.dispose();
 	});
@@ -2703,7 +2734,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			assertCursor(viewModel, new Selection(1, 7, 1, 7));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.CRLF), '\thell(\r\n        \r\n    )');
+			assert.strictEqual(model.getValue(EndOfLinePreference.CRLF), '\thell(\r\n        \r\n    )');
 		});
 		mode.dispose();
 	});
@@ -2721,14 +2752,14 @@ suite('Editor Controller - Cursor Configuration', () => {
 			// Move cursor to the end, verify that we do not trim whitespaces if line has values
 			moveTo(editor, viewModel, 1, model.getLineContent(1).length + 1);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '    ');
 
 			// Try to enter again, we should trimmed previous line
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '    ');
-			assert.equal(model.getLineContent(3), '    ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(3), '    ');
 		});
 	});
 
@@ -2740,16 +2771,47 @@ suite('Editor Controller - Cursor Configuration', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 1, model.getLineContent(1).length + 1);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    ');
-			assert.equal(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(2), '    ');
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    ');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), '    ');
+			assert.strictEqual(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), '    ');
 		});
 	});
 
+	test('issue #115033: indent and appendText', () => {
+		const mode = new class extends MockMode {
+			constructor() {
+				super(new LanguageIdentifier('onEnterMode', 3));
+				this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+					onEnterRules: [{
+						beforeText: /.*/,
+						action: {
+							indentAction: IndentAction.Indent,
+							appendText: 'x'
+						}
+					}]
+				}));
+			}
+		}();
+		usingCursor({
+			text: [
+				'text'
+			],
+			languageIdentifier: mode.getLanguageIdentifier(),
+		}, (editor, model, viewModel) => {
+
+			moveTo(editor, viewModel, 1, 5);
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getLineContent(1), 'text');
+			assert.strictEqual(model.getLineContent(2), '    x');
+			assertCursor(viewModel, new Position(2, 6));
+		});
+		mode.dispose();
+	});
+
 	test('issue #6862: Editor removes auto inserted indentation when formatting on type', () => {
 		let mode = new OnEnterMode(IndentAction.IndentOutdent);
 		usingCursor({
@@ -2761,9 +2823,9 @@ suite('Editor Controller - Cursor Configuration', () => {
 
 			moveTo(editor, viewModel, 1, 32);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), 'function foo (params: string) {');
-			assert.equal(model.getLineContent(2), '    ');
-			assert.equal(model.getLineContent(3), '}');
+			assert.strictEqual(model.getLineContent(1), 'function foo (params: string) {');
+			assert.strictEqual(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(3), '}');
 
 			class TestCommand implements ICommand {
 
@@ -2781,9 +2843,9 @@ suite('Editor Controller - Cursor Configuration', () => {
 			}
 
 			viewModel.executeCommand(new TestCommand(), 'autoFormat');
-			assert.equal(model.getLineContent(1), 'function foo(params: string) {');
-			assert.equal(model.getLineContent(2), '    ');
-			assert.equal(model.getLineContent(3), '}');
+			assert.strictEqual(model.getLineContent(1), 'function foo(params: string) {');
+			assert.strictEqual(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(3), '}');
 		});
 		mode.dispose();
 	});
@@ -2803,27 +2865,27 @@ suite('Editor Controller - Cursor Configuration', () => {
 
 			moveTo(editor, viewModel, 3, 1);
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    if (a) {');
-			assert.equal(model.getLineContent(2), '        ');
-			assert.equal(model.getLineContent(3), '    ');
-			assert.equal(model.getLineContent(4), '');
-			assert.equal(model.getLineContent(5), '    }');
+			assert.strictEqual(model.getLineContent(1), '    if (a) {');
+			assert.strictEqual(model.getLineContent(2), '        ');
+			assert.strictEqual(model.getLineContent(3), '    ');
+			assert.strictEqual(model.getLineContent(4), '');
+			assert.strictEqual(model.getLineContent(5), '    }');
 
 			moveTo(editor, viewModel, 4, 1);
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    if (a) {');
-			assert.equal(model.getLineContent(2), '        ');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), '    ');
-			assert.equal(model.getLineContent(5), '    }');
+			assert.strictEqual(model.getLineContent(1), '    if (a) {');
+			assert.strictEqual(model.getLineContent(2), '        ');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), '    ');
+			assert.strictEqual(model.getLineContent(5), '    }');
 
 			moveTo(editor, viewModel, 5, model.getLineMaxColumn(5));
 			viewModel.type('something', 'keyboard');
-			assert.equal(model.getLineContent(1), '    if (a) {');
-			assert.equal(model.getLineContent(2), '        ');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), '');
-			assert.equal(model.getLineContent(5), '    }something');
+			assert.strictEqual(model.getLineContent(1), '    if (a) {');
+			assert.strictEqual(model.getLineContent(2), '        ');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), '');
+			assert.strictEqual(model.getLineContent(5), '    }something');
 		});
 
 		model.dispose();
@@ -2841,46 +2903,46 @@ suite('Editor Controller - Cursor Configuration', () => {
 			// Move cursor to the end, verify that we do not trim whitespaces if line has values
 			moveTo(editor, viewModel, 1, model.getLineContent(1).length + 1);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '    ');
 
 			// Try to enter again, we should trimmed previous line
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), '    ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), '    ');
 
 			// More whitespaces
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), '        ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), '        ');
 
 			// Enter and verify that trimmed again
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    some  line abc  ');
-			assert.equal(model.getLineContent(2), '');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), '        ');
+			assert.strictEqual(model.getLineContent(1), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), '        ');
 
 			// Trimmed if we will keep only text
 			moveTo(editor, viewModel, 1, 5);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    ');
-			assert.equal(model.getLineContent(2), '    some  line abc  ');
-			assert.equal(model.getLineContent(3), '');
-			assert.equal(model.getLineContent(4), '');
-			assert.equal(model.getLineContent(5), '');
+			assert.strictEqual(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(2), '    some  line abc  ');
+			assert.strictEqual(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(4), '');
+			assert.strictEqual(model.getLineContent(5), '');
 
 			// Trimmed if we will keep only text by selection
 			moveTo(editor, viewModel, 2, 5);
 			moveTo(editor, viewModel, 3, 1, true);
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(1), '    ');
-			assert.equal(model.getLineContent(2), '    ');
-			assert.equal(model.getLineContent(3), '    ');
-			assert.equal(model.getLineContent(4), '');
-			assert.equal(model.getLineContent(5), '');
+			assert.strictEqual(model.getLineContent(1), '    ');
+			assert.strictEqual(model.getLineContent(2), '    ');
+			assert.strictEqual(model.getLineContent(3), '    ');
+			assert.strictEqual(model.getLineContent(4), '');
+			assert.strictEqual(model.getLineContent(5), '');
 		});
 
 		model.dispose();
@@ -2901,7 +2963,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			moveTo(editor, viewModel, 3, model.getLineMaxColumn(3));
 			viewModel.type('\n', 'keyboard');
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'    function f() {',
 				'        // I\'m gonna copy this line',
 				'        return 3;',
@@ -2911,7 +2973,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			assertCursor(viewModel, new Position(4, model.getLineMaxColumn(4)));
 
 			viewModel.paste('        // I\'m gonna copy this line\n', true);
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'    function f() {',
 				'        // I\'m gonna copy this line',
 				'        return 3;',
@@ -2941,7 +3003,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			editor.setSelections([new Selection(4, 10, 4, 10)]);
 			viewModel.paste('        // I\'m gonna copy this line\n', true);
 
-			assert.equal(model.getValue(), [
+			assert.strictEqual(model.getValue(), [
 				'    function f() {',
 				'        // I\'m gonna copy this line',
 				'        // Another line',
@@ -2968,7 +3030,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			// DeleteLeft removes just one whitespace
 			moveTo(editor, viewModel, 2, 9);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '       a    ');
+			assert.strictEqual(model.getLineContent(2), '       a    ');
 		});
 
 		model.dispose();
@@ -2987,54 +3049,54 @@ suite('Editor Controller - Cursor Configuration', () => {
 			// DeleteLeft does not remove tab size, because some text exists before
 			moveTo(editor, viewModel, 2, model.getLineContent(2).length + 1);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '        a   ');
+			assert.strictEqual(model.getLineContent(2), '        a   ');
 
 			// DeleteLeft removes tab size = 4
 			moveTo(editor, viewModel, 2, 9);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '    a   ');
+			assert.strictEqual(model.getLineContent(2), '    a   ');
 
 			// DeleteLeft removes tab size = 4
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'a   ');
+			assert.strictEqual(model.getLineContent(2), 'a   ');
 
 			// Undo DeleteLeft - get us back to original indentation
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '        a   ');
+			assert.strictEqual(model.getLineContent(2), '        a   ');
 
 			// Nothing is broken when cursor is in (1,1)
 			moveTo(editor, viewModel, 1, 1);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), ' \t \t     x');
+			assert.strictEqual(model.getLineContent(1), ' \t \t     x');
 
 			// DeleteLeft stops at tab stops even in mixed whitespace case
 			moveTo(editor, viewModel, 1, 10);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), ' \t \t    x');
+			assert.strictEqual(model.getLineContent(1), ' \t \t    x');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), ' \t \tx');
+			assert.strictEqual(model.getLineContent(1), ' \t \tx');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), ' \tx');
+			assert.strictEqual(model.getLineContent(1), ' \tx');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'x');
+			assert.strictEqual(model.getLineContent(1), 'x');
 
 			// DeleteLeft on last line
 			moveTo(editor, viewModel, 3, model.getLineContent(3).length + 1);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(3), '');
+			assert.strictEqual(model.getLineContent(3), '');
 
 			// DeleteLeft with removing new line symbol
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'x\n        a   ');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'x\n        a   ');
 
 			// In case of selection DeleteLeft only deletes selected text
 			moveTo(editor, viewModel, 2, 3);
 			moveTo(editor, viewModel, 2, 4, true);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '       a   ');
+			assert.strictEqual(model.getLineContent(2), '       a   ');
 		});
 
 		model.dispose();
@@ -3052,55 +3114,55 @@ suite('Editor Controller - Cursor Configuration', () => {
 
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n', 'assert1');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n', 'assert1');
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\t', 'assert2');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\t', 'assert2');
 
 			viewModel.type('y', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty', 'assert2');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty', 'assert2');
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\n\t', 'assert3');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\n\t', 'assert3');
 
 			viewModel.type('x');
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert4');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert4');
 
 			CoreNavigationCommands.CursorLeft.runCoreEditorCommand(viewModel, {});
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert5');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert5');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert6');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert6');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\tyx', 'assert7');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\tyx', 'assert7');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\tx', 'assert8');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\tx', 'assert8');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert9');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert9');
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'x', 'assert10');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'x', 'assert10');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert11');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert11');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert12');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert12');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert13');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\n\tx', 'assert13');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert14');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\n\ty\nx', 'assert14');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), '\nx', 'assert15');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\nx', 'assert15');
 
 			CoreEditingCommands.Redo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'x', 'assert16');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'x', 'assert16');
 		});
 
 		model.dispose();
@@ -3124,8 +3186,8 @@ suite('Editor Controller - Cursor Configuration', () => {
 			const afterVersion = model.getVersionId();
 			const afterAltVersion = model.getAlternativeVersionId();
 
-			assert.notEqual(beforeVersion, afterVersion);
-			assert.equal(beforeAltVersion, afterAltVersion);
+			assert.notStrictEqual(beforeVersion, afterVersion);
+			assert.strictEqual(beforeAltVersion, afterAltVersion);
 		});
 
 		model.dispose();
@@ -3181,7 +3243,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('}', 'keyboard');
 			assertCursor(viewModel, new Selection(2, 2, 2, 2));
-			assert.equal(model.getLineContent(2), '}', '001');
+			assert.strictEqual(model.getLineContent(2), '}', '001');
 		});
 	});
 
@@ -3274,7 +3336,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 1, 4, 1));
-			assert.equal(model.getLineContent(3), 'return true;', '001');
+			assert.strictEqual(model.getLineContent(3), 'return true;', '001');
 		});
 	});
 
@@ -3295,7 +3357,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(5, 1, 5, 1));
-			assert.equal(model.getLineContent(4), '\t}', '001');
+			assert.strictEqual(model.getLineContent(4), '\t}', '001');
 		});
 	});
 
@@ -3363,7 +3425,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(3, 16, 3, 16));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(3), '    if (true) {');
+			assert.strictEqual(model.getLineContent(3), '    if (true) {');
 			assertCursor(viewModel, new Selection(4, 9, 4, 9));
 		});
 	});
@@ -3388,7 +3450,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(3, 16, 3, 16));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(3), '    if (true) {');
+			assert.strictEqual(model.getLineContent(3), '    if (true) {');
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
 		});
 	});
@@ -3411,7 +3473,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(5, 4, 5, 4));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(5), '\t\t}');
+			assert.strictEqual(model.getLineContent(5), '\t\t}');
 			assertCursor(viewModel, new Selection(6, 3, 6, 3));
 		});
 	});
@@ -3432,7 +3494,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
-			assert.equal(model.getLineContent(4), '\t\t true;', '001');
+			assert.strictEqual(model.getLineContent(4), '\t\t true;', '001');
 		});
 	});
 
@@ -3452,7 +3514,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
-			assert.equal(model.getLineContent(4), '\t\treturn true;', '001');
+			assert.strictEqual(model.getLineContent(4), '\t\treturn true;', '001');
 		});
 	});
 
@@ -3471,7 +3533,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 5, 4, 5));
-			assert.equal(model.getLineContent(4), '     true;', '001');
+			assert.strictEqual(model.getLineContent(4), '     true;', '001');
 		});
 	});
 
@@ -3491,14 +3553,14 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 2, 4, 2));
-			assert.equal(model.getLineContent(4), '\t\treturn true;', '001');
+			assert.strictEqual(model.getLineContent(4), '\t\treturn true;', '001');
 
 			moveTo(editor, viewModel, 4, 1, false);
 			assertCursor(viewModel, new Selection(4, 1, 4, 1));
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(5, 1, 5, 1));
-			assert.equal(model.getLineContent(5), '\t\treturn true;', '002');
+			assert.strictEqual(model.getLineContent(5), '\t\treturn true;', '002');
 		});
 	});
 
@@ -3518,14 +3580,14 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
-			assert.equal(model.getLineContent(4), '\t\t\treturn true;', '001');
+			assert.strictEqual(model.getLineContent(4), '\t\t\treturn true;', '001');
 
 			moveTo(editor, viewModel, 4, 1, false);
 			assertCursor(viewModel, new Selection(4, 1, 4, 1));
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(5, 1, 5, 1));
-			assert.equal(model.getLineContent(5), '\t\t\treturn true;', '002');
+			assert.strictEqual(model.getLineContent(5), '\t\t\treturn true;', '002');
 		});
 	});
 
@@ -3544,12 +3606,12 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 2, 4, 2));
-			assert.equal(model.getLineContent(4), '    return true;', '001');
+			assert.strictEqual(model.getLineContent(4), '    return true;', '001');
 
 			moveTo(editor, viewModel, 4, 3, false);
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(5, 3, 5, 3));
-			assert.equal(model.getLineContent(5), '    return true;', '002');
+			assert.strictEqual(model.getLineContent(5), '    return true;', '002');
 		});
 	});
 
@@ -3577,12 +3639,12 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 4, 4, 4));
-			assert.equal(model.getLineContent(4), '    return true;', '001');
+			assert.strictEqual(model.getLineContent(4), '    return true;', '001');
 
 			moveTo(editor, viewModel, 9, 4, false);
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(10, 5, 10, 5));
-			assert.equal(model.getLineContent(10), '    return true;', '001');
+			assert.strictEqual(model.getLineContent(10), '    return true;', '001');
 		});
 	});
 
@@ -3604,7 +3666,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
-			assert.equal(model.getLineContent(4), '    return true;', '001');
+			assert.strictEqual(model.getLineContent(4), '    return true;', '001');
 		});
 	});
 
@@ -3626,7 +3688,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(3, 8, 2, 12));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(3), '\treturn x;');
+			assert.strictEqual(model.getLineContent(3), '\treturn x;');
 			assertCursor(viewModel, new Position(3, 2));
 		});
 	});
@@ -3649,7 +3711,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(2, 12, 3, 8));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(3), '\treturn x;');
+			assert.strictEqual(model.getLineContent(3), '\treturn x;');
 			assertCursor(viewModel, new Position(3, 2));
 		});
 	});
@@ -3670,9 +3732,9 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(5, 3, 5, 3));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getLineContent(6), '\t');
+			assert.strictEqual(model.getLineContent(6), '\t');
 			assertCursor(viewModel, new Selection(6, 2, 6, 2));
-			assert.equal(model.getLineContent(5), '\t}');
+			assert.strictEqual(model.getLineContent(5), '\t}');
 		});
 	});
 
@@ -3690,7 +3752,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('\n', 'keyboard');
 			assertCursor(viewModel, new Selection(4, 2, 4, 2));
-			assert.equal(model.getLineContent(4), '\t');
+			assert.strictEqual(model.getLineContent(4), '\t');
 		});
 	});
 
@@ -3715,7 +3777,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 1, 4, 1));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(4), '\t\t');
+			assert.strictEqual(model.getLineContent(4), '\t\t');
 		});
 
 		model.dispose();
@@ -3743,7 +3805,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 2, 4, 2));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(4), '\t\t\t');
+			assert.strictEqual(model.getLineContent(4), '\t\t\t');
 		});
 
 		model.dispose();
@@ -3771,7 +3833,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 1, 4, 1));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(4), '\t\t\t');
+			assert.strictEqual(model.getLineContent(4), '\t\t\t');
 		});
 
 		model.dispose();
@@ -3798,7 +3860,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 3, 4, 3));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(4), '\t\t\t\t');
+			assert.strictEqual(model.getLineContent(4), '\t\t\t\t');
 		});
 
 		model.dispose();
@@ -3825,7 +3887,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 4, 4, 4));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(4), '\t\t\t\t\t');
+			assert.strictEqual(model.getLineContent(4), '\t\t\t\t\t');
 		});
 
 		model.dispose();
@@ -3849,11 +3911,11 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			moveTo(editor, viewModel, 3, 1);
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), '    if (a) {');
-			assert.equal(model.getLineContent(2), '        ');
-			assert.equal(model.getLineContent(3), '        ');
-			assert.equal(model.getLineContent(4), '');
-			assert.equal(model.getLineContent(5), '    }');
+			assert.strictEqual(model.getLineContent(1), '    if (a) {');
+			assert.strictEqual(model.getLineContent(2), '        ');
+			assert.strictEqual(model.getLineContent(3), '        ');
+			assert.strictEqual(model.getLineContent(4), '');
+			assert.strictEqual(model.getLineContent(5), '    }');
 		});
 
 		model.dispose();
@@ -3880,7 +3942,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(4, 7, 4, 7));
 
 			viewModel.type('d', 'keyboard');
-			assert.equal(model.getLineContent(4), '  end');
+			assert.strictEqual(model.getLineContent(4), '  end');
 		});
 
 		rubyMode.dispose();
@@ -3903,7 +3965,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('e', 'keyboard');
 			assertCursor(viewModel, new Selection(5, 4, 5, 4));
-			assert.equal(model.getLineContent(5), '\t}e', 'This line should not decrease indent');
+			assert.strictEqual(model.getLineContent(5), '\t}e', 'This line should not decrease indent');
 		});
 	});
 
@@ -3924,7 +3986,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type(' ', 'keyboard');
 			assertCursor(viewModel, new Selection(2, 4, 2, 4));
-			assert.equal(model.getLineContent(2), '\t  ) {', 'This line should not decrease indent');
+			assert.strictEqual(model.getLineContent(2), '\t  ) {', 'This line should not decrease indent');
 		});
 	});
 
@@ -3943,7 +4005,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 			viewModel.type('}', 'keyboard');
 			assertCursor(viewModel, new Selection(3, 2, 3, 2));
-			assert.equal(model.getLineContent(3), '}');
+			assert.strictEqual(model.getLineContent(3), '}');
 		});
 	});
 
@@ -3990,7 +4052,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(7, 6, 7, 6));
 
 			viewModel.type('\n', 'keyboard');
-			assert.equal(model.getValue(),
+			assert.strictEqual(model.getValue(),
 				[
 					'class ItemCtrl {',
 					'    getPropertiesByItemId(id) {',
@@ -4010,6 +4072,47 @@ suite('Editor Controller - Indentation Rules', () => {
 		mode.dispose();
 	});
 
+	test('issue #115304: OnEnter broken for TS', () => {
+		class JSMode extends MockMode {
+			private static readonly _id = new LanguageIdentifier('indentRulesMode', 4);
+			constructor() {
+				super(JSMode._id);
+				this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+					onEnterRules: javascriptOnEnterRules
+				}));
+			}
+		}
+
+		const mode = new JSMode();
+		const model = createTextModel(
+			[
+				'/** */',
+				'function f() {}',
+			].join('\n'),
+			undefined,
+			mode.getLanguageIdentifier()
+		);
+
+		withTestCodeEditor(null, { model: model, autoIndent: 'advanced' }, (editor, viewModel) => {
+			moveTo(editor, viewModel, 1, 4, false);
+			assertCursor(viewModel, new Selection(1, 4, 1, 4));
+
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(),
+				[
+					'/**',
+					' * ',
+					' */',
+					'function f() {}',
+				].join('\n')
+			);
+			assertCursor(viewModel, new Selection(2, 4, 2, 4));
+		});
+
+		model.dispose();
+		mode.dispose();
+	});
+
 	test('issue #38261: TAB key results in bizarre indentation in C++ mode ', () => {
 		class CppMode extends MockMode {
 			private static readonly _id = new LanguageIdentifier('indentRulesMode', 4);
@@ -4054,7 +4157,7 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(8, 1, 8, 1));
 
 			CoreEditingCommands.Tab.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(),
+			assert.strictEqual(model.getValue(),
 				[
 					'int main() {',
 					'  return 0;',
@@ -4067,7 +4170,7 @@ suite('Editor Controller - Indentation Rules', () => {
 					')',
 				].join('\n')
 			);
-			assert.deepEqual(viewModel.getSelection(), new Selection(8, 3, 8, 3));
+			assert.deepStrictEqual(viewModel.getSelection(), new Selection(8, 3, 8, 3));
 		});
 
 		model.dispose();
@@ -4144,31 +4247,43 @@ suite('Editor Controller - Indentation Rules', () => {
 			assertCursor(viewModel, new Selection(3, 19, 3, 19));
 
 			viewModel.type('\n', 'keyboard');
-			assert.deepEqual(model.getLineContent(4), '    ');
+			assert.deepStrictEqual(model.getLineContent(4), '    ');
 
 			moveTo(editor, viewModel, 5, 18, false);
 			assertCursor(viewModel, new Selection(5, 18, 5, 18));
 
 			viewModel.type('\n', 'keyboard');
-			assert.deepEqual(model.getLineContent(6), '    ');
+			assert.deepStrictEqual(model.getLineContent(6), '    ');
 
 			moveTo(editor, viewModel, 7, 15, false);
 			assertCursor(viewModel, new Selection(7, 15, 7, 15));
 
 			viewModel.type('\n', 'keyboard');
-			assert.deepEqual(model.getLineContent(8), '      ');
-			assert.deepEqual(model.getLineContent(9), '    ]');
+			assert.deepStrictEqual(model.getLineContent(8), '      ');
+			assert.deepStrictEqual(model.getLineContent(9), '    ]');
 
 			moveTo(editor, viewModel, 10, 18, false);
 			assertCursor(viewModel, new Selection(10, 18, 10, 18));
 
 			viewModel.type('\n', 'keyboard');
-			assert.deepEqual(model.getLineContent(11), '    ]');
+			assert.deepStrictEqual(model.getLineContent(11), '    ]');
 		});
 
 		model.dispose();
 		mode.dispose();
 	});
+
+	test('issue #111128: Multicursor `Enter` issue with indentation', () => {
+		const model = createTextModel('    let a, b, c;', { detectIndentation: false, insertSpaces: false, tabSize: 4 }, mode.getLanguageIdentifier());
+		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
+			editor.setSelections([
+				new Selection(1, 11, 1, 11),
+				new Selection(1, 14, 1, 14),
+			]);
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), '    let a,\n\t b,\n\t c;');
+		});
+	});
 });
 
 interface ICursorOpts {
@@ -4218,7 +4333,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 1);
 			viewModel.type('*', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '*');
+			assert.deepStrictEqual(model.getLineContent(2), '*');
 		});
 		mode.dispose();
 	});
@@ -4234,7 +4349,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 1);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  }');
+			assert.deepStrictEqual(model.getLineContent(2), '  }');
 		});
 		mode.dispose();
 	});
@@ -4250,7 +4365,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 5);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  }');
+			assert.deepStrictEqual(model.getLineContent(2), '  }');
 		});
 		mode.dispose();
 	});
@@ -4268,7 +4383,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 4, 1);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(4), '  }    ');
+			assert.deepStrictEqual(model.getLineContent(4), '  }    ');
 		});
 		mode.dispose();
 	});
@@ -4286,7 +4401,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 4, 6);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(4), '  }  }');
+			assert.deepStrictEqual(model.getLineContent(4), '  }  }');
 		});
 		mode.dispose();
 	});
@@ -4302,7 +4417,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 1);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  }// hello');
+			assert.deepStrictEqual(model.getLineContent(2), '  }// hello');
 		});
 		mode.dispose();
 	});
@@ -4318,7 +4433,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 3);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  }');
+			assert.deepStrictEqual(model.getLineContent(2), '  }');
 		});
 		mode.dispose();
 	});
@@ -4334,7 +4449,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 2);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), 'a}');
+			assert.deepStrictEqual(model.getLineContent(2), 'a}');
 		});
 		mode.dispose();
 	});
@@ -4351,7 +4466,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 13);
 			viewModel.type('*', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  ( 1 + 2 ) *');
+			assert.deepStrictEqual(model.getLineContent(2), '  ( 1 + 2 ) *');
 		});
 		mode.dispose();
 	});
@@ -4370,8 +4485,8 @@ suite('ElectricCharacter', () => {
 				changeText = e.changes[0].text;
 			});
 			viewModel.type(')', 'keyboard');
-			assert.deepEqual(model.getLineContent(1), '(div)');
-			assert.deepEqual(changeText, ')');
+			assert.deepStrictEqual(model.getLineContent(1), '(div)');
+			assert.deepStrictEqual(changeText, ')');
 		});
 		mode.dispose();
 	});
@@ -4388,7 +4503,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 3, 3);
 			viewModel.type(')', 'keyboard');
-			assert.deepEqual(model.getLineContent(3), '\t3)');
+			assert.deepStrictEqual(model.getLineContent(3), '\t3)');
 		});
 		mode.dispose();
 	});
@@ -4404,7 +4519,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 3);
 			viewModel.type('*', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '/** */');
+			assert.deepStrictEqual(model.getLineContent(2), '/** */');
 		});
 		mode.dispose();
 	});
@@ -4420,7 +4535,7 @@ suite('ElectricCharacter', () => {
 		}, (editor, model, viewModel) => {
 			moveTo(editor, viewModel, 2, 5);
 			viewModel.type('*', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '  /** */');
+			assert.deepStrictEqual(model.getLineContent(2), '  /** */');
 		});
 		mode.dispose();
 	});
@@ -4437,7 +4552,7 @@ suite('ElectricCharacter', () => {
 			moveTo(editor, viewModel, 2, 5);
 			moveTo(editor, viewModel, 2, 1, true);
 			viewModel.type('}', 'keyboard');
-			assert.deepEqual(model.getLineContent(2), '}');
+			assert.deepStrictEqual(model.getLineContent(2), '}');
 		});
 		mode.dispose();
 	});
@@ -4513,7 +4628,7 @@ suite('autoClosingPairs', () => {
 		let expected = lineContent.substr(0, column - 1) + expectedInsert + lineContent.substr(column - 1);
 		moveTo(editor, viewModel, lineNumber, column);
 		viewModel.type(chr, 'keyboard');
-		assert.deepEqual(model.getLineContent(lineNumber), expected, message);
+		assert.deepStrictEqual(model.getLineContent(lineNumber), expected, message);
 		model.undo();
 	}
 
@@ -4783,12 +4898,12 @@ suite('autoClosingPairs', () => {
 			// type a `
 			viewModel.type('`', 'keyboard');
 
-			assert.equal(model.getValue(), '`var` a = `asd`');
+			assert.strictEqual(model.getValue(), '`var` a = `asd`');
 
 			// type a (
 			viewModel.type('(', 'keyboard');
 
-			assert.equal(model.getValue(), '`(var)` a = `(asd)`');
+			assert.strictEqual(model.getValue(), '`(var)` a = `(asd)`');
 		});
 
 		usingCursor({
@@ -4808,7 +4923,7 @@ suite('autoClosingPairs', () => {
 			// type a `
 			viewModel.type('`', 'keyboard');
 
-			assert.equal(model.getValue(), '` a = asd');
+			assert.strictEqual(model.getValue(), '` a = asd');
 		});
 
 		usingCursor({
@@ -4827,11 +4942,11 @@ suite('autoClosingPairs', () => {
 
 			// type a `
 			viewModel.type('`', 'keyboard');
-			assert.equal(model.getValue(), '`var` a = asd');
+			assert.strictEqual(model.getValue(), '`var` a = asd');
 
 			// type a (
 			viewModel.type('(', 'keyboard');
-			assert.equal(model.getValue(), '`(` a = asd');
+			assert.strictEqual(model.getValue(), '`(` a = asd');
 		});
 
 		usingCursor({
@@ -4850,11 +4965,11 @@ suite('autoClosingPairs', () => {
 
 			// type a (
 			viewModel.type('(', 'keyboard');
-			assert.equal(model.getValue(), '(var) a = asd');
+			assert.strictEqual(model.getValue(), '(var) a = asd');
 
 			// type a `
 			viewModel.type('`', 'keyboard');
-			assert.equal(model.getValue(), '(`) a = asd');
+			assert.strictEqual(model.getValue(), '(`) a = asd');
 		});
 		mode.dispose();
 	});
@@ -5047,50 +5162,50 @@ suite('autoClosingPairs', () => {
 			// First gif
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste1 = teste\' ok');
-			assert.equal(model.getLineContent(1), 'teste1 = teste\' ok');
+			assert.strictEqual(model.getLineContent(1), 'teste1 = teste\' ok');
 
 			viewModel.setSelections('test', [new Selection(1, 1000, 1, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste2 = teste \'ok');
-			assert.equal(model.getLineContent(2), 'teste2 = teste \'ok\'');
+			assert.strictEqual(model.getLineContent(2), 'teste2 = teste \'ok\'');
 
 			viewModel.setSelections('test', [new Selection(2, 1000, 2, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste3 = teste" ok');
-			assert.equal(model.getLineContent(3), 'teste3 = teste" ok');
+			assert.strictEqual(model.getLineContent(3), 'teste3 = teste" ok');
 
 			viewModel.setSelections('test', [new Selection(3, 1000, 3, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste4 = teste "ok');
-			assert.equal(model.getLineContent(4), 'teste4 = teste "ok"');
+			assert.strictEqual(model.getLineContent(4), 'teste4 = teste "ok"');
 
 			// Second gif
 			viewModel.setSelections('test', [new Selection(4, 1000, 4, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste \'');
-			assert.equal(model.getLineContent(5), 'teste \'\'');
+			assert.strictEqual(model.getLineContent(5), 'teste \'\'');
 
 			viewModel.setSelections('test', [new Selection(5, 1000, 5, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste "');
-			assert.equal(model.getLineContent(6), 'teste ""');
+			assert.strictEqual(model.getLineContent(6), 'teste ""');
 
 			viewModel.setSelections('test', [new Selection(6, 1000, 6, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste\'');
-			assert.equal(model.getLineContent(7), 'teste\'');
+			assert.strictEqual(model.getLineContent(7), 'teste\'');
 
 			viewModel.setSelections('test', [new Selection(7, 1000, 7, 1000)]);
 			typeCharacters(viewModel, '\n');
 			model.forceTokenization(model.getLineCount());
 			typeCharacters(viewModel, 'teste"');
-			assert.equal(model.getLineContent(8), 'teste"');
+			assert.strictEqual(model.getLineContent(8), 'teste"');
 		});
 		mode.dispose();
 	});
@@ -5337,7 +5452,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('è', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), 'è');
+			assert.strictEqual(model.getValue(), 'è');
 		});
 		mode.dispose();
 	});
@@ -5359,7 +5474,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), '\'test\'');
+			assert.strictEqual(model.getValue(), '\'test\'');
 		});
 		mode.dispose();
 	});
@@ -5376,16 +5491,16 @@ suite('autoClosingPairs', () => {
 			viewModel.setSelections('test', [new Selection(1, 13, 1, 13)]);
 
 			viewModel.type('\'', 'keyboard');
-			assert.equal(model.getValue(), 'console.log(\'\');');
+			assert.strictEqual(model.getValue(), 'console.log(\'\');');
 
 			viewModel.type('it', 'keyboard');
-			assert.equal(model.getValue(), 'console.log(\'it\');');
+			assert.strictEqual(model.getValue(), 'console.log(\'it\');');
 
 			viewModel.type('\\', 'keyboard');
-			assert.equal(model.getValue(), 'console.log(\'it\\\');');
+			assert.strictEqual(model.getValue(), 'console.log(\'it\\\');');
 
 			viewModel.type('\'', 'keyboard');
-			assert.equal(model.getValue(), 'console.log(\'it\\\'\');');
+			assert.strictEqual(model.getValue(), 'console.log(\'it\\\'\');');
 		});
 		mode.dispose();
 	});
@@ -5402,19 +5517,19 @@ suite('autoClosingPairs', () => {
 			viewModel.setSelections('test', [new Selection(1, 1, 1, 1)]);
 
 			viewModel.type('\\', 'keyboard');
-			assert.equal(model.getValue(), '\\');
+			assert.strictEqual(model.getValue(), '\\');
 
 			viewModel.type('(', 'keyboard');
-			assert.equal(model.getValue(), '\\()');
+			assert.strictEqual(model.getValue(), '\\()');
 
 			viewModel.type('abc', 'keyboard');
-			assert.equal(model.getValue(), '\\(abc)');
+			assert.strictEqual(model.getValue(), '\\(abc)');
 
 			viewModel.type('\\', 'keyboard');
-			assert.equal(model.getValue(), '\\(abc\\)');
+			assert.strictEqual(model.getValue(), '\\(abc\\)');
 
 			viewModel.type(')', 'keyboard');
-			assert.equal(model.getValue(), '\\(abc\\)');
+			assert.strictEqual(model.getValue(), '\\(abc\\)');
 		});
 		mode.dispose();
 	});
@@ -5439,7 +5554,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('`', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), '`hello\nworld');
+			assert.strictEqual(model.getValue(), '`hello\nworld');
 			assertCursor(viewModel, new Selection(1, 2, 2, 2));
 		});
 		mode.dispose();
@@ -5462,14 +5577,14 @@ suite('autoClosingPairs', () => {
 			viewModel.type('\'', 'keyboard');
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
-			assert.equal(model.getValue(), '\'\'');
+			assert.strictEqual(model.getValue(), '\'\'');
 
 			// Typing one more ' + space
 			viewModel.startComposition();
 			viewModel.type('\'', 'keyboard');
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
-			assert.equal(model.getValue(), '\'\'');
+			assert.strictEqual(model.getValue(), '\'\'');
 
 			// Typing ' as a closing tag
 			model.setValue('\'abc');
@@ -5479,7 +5594,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), '\'abc\'');
+			assert.strictEqual(model.getValue(), '\'abc\'');
 
 			// quotes before the newly added character are all paired.
 			model.setValue('\'abc\'def ');
@@ -5489,7 +5604,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), '\'abc\'def \'\'');
+			assert.strictEqual(model.getValue(), '\'abc\'def \'\'');
 
 			// No auto closing if there is non-whitespace character after the cursor
 			model.setValue('abc');
@@ -5507,7 +5622,7 @@ suite('autoClosingPairs', () => {
 			viewModel.replacePreviousChar('\'', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
 
-			assert.equal(model.getValue(), 'abc\'');
+			assert.strictEqual(model.getValue(), 'abc\'');
 		});
 		mode.dispose();
 	});
@@ -5527,7 +5642,7 @@ suite('autoClosingPairs', () => {
 			viewModel.type('a', 'keyboard');
 			viewModel.replacePreviousChar('', 1, 'keyboard');
 			viewModel.endComposition('keyboard');
-			assert.equal(model.getValue(), '{}');
+			assert.strictEqual(model.getValue(), '{}');
 		});
 		mode.dispose();
 	});
@@ -5549,7 +5664,7 @@ suite('autoClosingPairs', () => {
 			// type a `
 			viewModel.type('`', 'keyboard');
 
-			assert.equal(model.getValue(), 'var a = `asd`');
+			assert.strictEqual(model.getValue(), 'var a = `asd`');
 		});
 		mode.dispose();
 	});
@@ -5577,14 +5692,14 @@ suite('autoClosingPairs', () => {
 				new Selection(1, 12, 1, 13)
 			]);
 			viewModel.type('"', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'var x = "hi";', 'assert1');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'var x = "hi";', 'assert1');
 
 			editor.setSelections([
 				new Selection(1, 9, 1, 10),
 				new Selection(1, 12, 1, 13)
 			]);
 			viewModel.type('\'', 'keyboard');
-			assert.equal(model.getValue(EndOfLinePreference.LF), 'var x = \'hi\';', 'assert2');
+			assert.strictEqual(model.getValue(EndOfLinePreference.LF), 'var x = \'hi\';', 'assert2');
 		});
 
 		model.dispose();
@@ -5610,7 +5725,7 @@ suite('autoClosingPairs', () => {
 			// delete left
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 
-			assert.equal(model.getValue(), 'va a = )');
+			assert.strictEqual(model.getValue(), 'va a = )');
 		});
 		model.dispose();
 		mode.dispose();
@@ -5657,20 +5772,20 @@ suite('Undo stops', () => {
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.setSelections('test', [new Selection(1, 3, 1, 3)]);
 			viewModel.type('first', 'keyboard');
-			assert.equal(model.getLineContent(1), 'A first line');
+			assert.strictEqual(model.getLineContent(1), 'A first line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A fir line');
+			assert.strictEqual(model.getLineContent(1), 'A fir line');
 			assertCursor(viewModel, new Selection(1, 6, 1, 6));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A first line');
+			assert.strictEqual(model.getLineContent(1), 'A first line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A  line');
+			assert.strictEqual(model.getLineContent(1), 'A  line');
 			assertCursor(viewModel, new Selection(1, 3, 1, 3));
 		});
 	});
@@ -5686,20 +5801,20 @@ suite('Undo stops', () => {
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.setSelections('test', [new Selection(1, 3, 1, 3)]);
 			viewModel.type('first', 'keyboard');
-			assert.equal(model.getLineContent(1), 'A first line');
+			assert.strictEqual(model.getLineContent(1), 'A first line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A firstine');
+			assert.strictEqual(model.getLineContent(1), 'A firstine');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A first line');
+			assert.strictEqual(model.getLineContent(1), 'A first line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A  line');
+			assert.strictEqual(model.getLineContent(1), 'A  line');
 			assertCursor(viewModel, new Selection(1, 3, 1, 3));
 		});
 	});
@@ -5721,19 +5836,19 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), ' line');
+			assert.strictEqual(model.getLineContent(2), ' line');
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			viewModel.type('Second', 'keyboard');
-			assert.equal(model.getLineContent(2), 'Second line');
+			assert.strictEqual(model.getLineContent(2), 'Second line');
 			assertCursor(viewModel, new Selection(2, 7, 2, 7));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), ' line');
+			assert.strictEqual(model.getLineContent(2), ' line');
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another line');
+			assert.strictEqual(model.getLineContent(2), 'Another line');
 			assertCursor(viewModel, new Selection(2, 8, 2, 8));
 		});
 	});
@@ -5755,7 +5870,7 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), ' line');
+			assert.strictEqual(model.getLineContent(2), ' line');
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
@@ -5763,15 +5878,15 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), '');
+			assert.strictEqual(model.getLineContent(2), '');
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), ' line');
+			assert.strictEqual(model.getLineContent(2), ' line');
 			assertCursor(viewModel, new Selection(2, 1, 2, 1));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another line');
+			assert.strictEqual(model.getLineContent(2), 'Another line');
 			assertCursor(viewModel, new Selection(2, 8, 2, 8));
 		});
 	});
@@ -5790,19 +5905,19 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another ');
+			assert.strictEqual(model.getLineContent(2), 'Another ');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 
 			viewModel.type('text', 'keyboard');
-			assert.equal(model.getLineContent(2), 'Another text');
+			assert.strictEqual(model.getLineContent(2), 'Another text');
 			assertCursor(viewModel, new Selection(2, 13, 2, 13));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another ');
+			assert.strictEqual(model.getLineContent(2), 'Another ');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another line');
+			assert.strictEqual(model.getLineContent(2), 'Another line');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 		});
 	});
@@ -5821,7 +5936,7 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteRight.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another ');
+			assert.strictEqual(model.getLineContent(2), 'Another ');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
@@ -5830,15 +5945,15 @@ suite('Undo stops', () => {
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
 			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'An');
+			assert.strictEqual(model.getLineContent(2), 'An');
 			assertCursor(viewModel, new Selection(2, 3, 2, 3));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another ');
+			assert.strictEqual(model.getLineContent(2), 'Another ');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(2), 'Another line');
+			assert.strictEqual(model.getLineContent(2), 'Another line');
 			assertCursor(viewModel, new Selection(2, 9, 2, 9));
 		});
 	});
@@ -5854,19 +5969,19 @@ suite('Undo stops', () => {
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.setSelections('test', [new Selection(1, 3, 1, 3)]);
 			viewModel.type('first and interesting', 'keyboard');
-			assert.equal(model.getLineContent(1), 'A first and interesting line');
+			assert.strictEqual(model.getLineContent(1), 'A first and interesting line');
 			assertCursor(viewModel, new Selection(1, 24, 1, 24));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A first and line');
+			assert.strictEqual(model.getLineContent(1), 'A first and line');
 			assertCursor(viewModel, new Selection(1, 12, 1, 12));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A first line');
+			assert.strictEqual(model.getLineContent(1), 'A first line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getLineContent(1), 'A  line');
+			assert.strictEqual(model.getLineContent(1), 'A  line');
 			assertCursor(viewModel, new Selection(1, 3, 1, 3));
 		});
 	});
@@ -5882,15 +5997,15 @@ suite('Undo stops', () => {
 		withTestCodeEditor(null, { model: model }, (editor, viewModel) => {
 			viewModel.setSelections('test', [new Selection(1, 3, 1, 3)]);
 			viewModel.type('first', 'keyboard');
-			assert.equal(model.getValue(), 'A first line\nAnother line');
+			assert.strictEqual(model.getValue(), 'A first line\nAnother line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			model.pushEOL(EndOfLineSequence.CRLF);
-			assert.equal(model.getValue(), 'A first line\r\nAnother line');
+			assert.strictEqual(model.getValue(), 'A first line\r\nAnother line');
 			assertCursor(viewModel, new Selection(1, 8, 1, 8));
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), 'A  line\nAnother line');
+			assert.strictEqual(model.getValue(), 'A  line\nAnother line');
 			assertCursor(viewModel, new Selection(1, 3, 1, 3));
 		});
 	});
@@ -5909,10 +6024,10 @@ suite('Undo stops', () => {
 				new Selection(1, 7, 1, 12),
 			]);
 			viewModel.type('no', 'keyboard');
-			assert.equal(model.getValue(), 'hello no\nhello no');
+			assert.strictEqual(model.getValue(), 'hello no\nhello no');
 
 			CoreEditingCommands.Undo.runEditorCommand(null, editor, null);
-			assert.equal(model.getValue(), 'hello world\nhello world');
+			assert.strictEqual(model.getValue(), 'hello world\nhello world');
 		});
 	});
 });
diff --git a/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts b/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
index 3c85cc22e..55abff9fa 100644
--- a/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
+++ b/src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts
@@ -484,11 +484,11 @@ function cursorEqual(viewModel: ViewModel, posLineNumber: number, posColumn: num
 }
 
 function positionEqual(position: Position, lineNumber: number, column: number) {
-	assert.deepEqual(position, new Position(lineNumber, column), 'position equal');
+	assert.deepStrictEqual(position, new Position(lineNumber, column), 'position equal');
 }
 
 function selectionEqual(selection: Selection, posLineNumber: number, posColumn: number, selLineNumber: number, selColumn: number) {
-	assert.deepEqual({
+	assert.deepStrictEqual({
 		selectionStartLineNumber: selection.selectionStartLineNumber,
 		selectionStartColumn: selection.selectionStartColumn,
 		positionLineNumber: selection.positionLineNumber,
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index 163e9de54..4ae25e14a 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -84,8 +84,8 @@ suite('TextAreaState', () => {
 		let actual = TextAreaState.readFromTextArea(textArea);
 
 		assertTextAreaState(actual, 'Hello world!', 1, 12);
-		assert.equal(actual.value, 'Hello world!');
-		assert.equal(actual.selectionStart, 1);
+		assert.strictEqual(actual.value, 'Hello world!');
+		assert.strictEqual(actual.selectionStart, 1);
 
 		actual = actual.collapseSelection();
 		assertTextAreaState(actual, 'Hello world!', 12, 12);
@@ -102,23 +102,23 @@ suite('TextAreaState', () => {
 		let state = new TextAreaState('Hi world!', 2, 2, null, null);
 		state.writeToTextArea('test', textArea, false);
 
-		assert.equal(textArea._value, 'Hi world!');
-		assert.equal(textArea._selectionStart, 9);
-		assert.equal(textArea._selectionEnd, 9);
+		assert.strictEqual(textArea._value, 'Hi world!');
+		assert.strictEqual(textArea._selectionStart, 9);
+		assert.strictEqual(textArea._selectionEnd, 9);
 
 		state = new TextAreaState('Hi world!', 3, 3, null, null);
 		state.writeToTextArea('test', textArea, false);
 
-		assert.equal(textArea._value, 'Hi world!');
-		assert.equal(textArea._selectionStart, 9);
-		assert.equal(textArea._selectionEnd, 9);
+		assert.strictEqual(textArea._value, 'Hi world!');
+		assert.strictEqual(textArea._selectionStart, 9);
+		assert.strictEqual(textArea._selectionEnd, 9);
 
 		state = new TextAreaState('Hi world!', 0, 2, null, null);
 		state.writeToTextArea('test', textArea, true);
 
-		assert.equal(textArea._value, 'Hi world!');
-		assert.equal(textArea._selectionStart, 0);
-		assert.equal(textArea._selectionEnd, 2);
+		assert.strictEqual(textArea._value, 'Hi world!');
+		assert.strictEqual(textArea._selectionStart, 0);
+		assert.strictEqual(textArea._selectionEnd, 2);
 
 		textArea.dispose();
 	});
@@ -134,8 +134,8 @@ suite('TextAreaState', () => {
 		let newState = TextAreaState.readFromTextArea(textArea);
 		let actual = TextAreaState.deduceInput(prevState, newState, couldBeEmojiInput);
 
-		assert.equal(actual.text, expected);
-		assert.equal(actual.replaceCharCnt, expectedCharReplaceCnt);
+		assert.strictEqual(actual.text, expected);
+		assert.strictEqual(actual.replaceCharCnt, expectedCharReplaceCnt);
 
 		textArea.dispose();
 	}
diff --git a/src/vs/editor/test/browser/core/editorState.test.ts b/src/vs/editor/test/browser/core/editorState.test.ts
index 1915af4f7..32534c2b7 100644
--- a/src/vs/editor/test/browser/core/editorState.test.ts
+++ b/src/vs/editor/test/browser/core/editorState.test.ts
@@ -29,7 +29,7 @@ suite('Editor Core - Editor State', () => {
 
 	test('empty editor state should be valid', () => {
 		let result = validate({}, {});
-		assert.equal(result, true);
+		assert.strictEqual(result, true);
 	});
 
 	test('different model URIs should be invalid', () => {
@@ -38,7 +38,7 @@ suite('Editor Core - Editor State', () => {
 			{ model: { uri: URI.parse('http://test2') } }
 		);
 
-		assert.equal(result, false);
+		assert.strictEqual(result, false);
 	});
 
 	test('different model versions should be invalid', () => {
@@ -47,7 +47,7 @@ suite('Editor Core - Editor State', () => {
 			{ model: { version: 2 } }
 		);
 
-		assert.equal(result, false);
+		assert.strictEqual(result, false);
 	});
 
 	test('different positions should be invalid', () => {
@@ -56,7 +56,7 @@ suite('Editor Core - Editor State', () => {
 			{ position: new Position(2, 3) }
 		);
 
-		assert.equal(result, false);
+		assert.strictEqual(result, false);
 	});
 
 	test('different selections should be invalid', () => {
@@ -65,7 +65,7 @@ suite('Editor Core - Editor State', () => {
 			{ selection: new Selection(5, 2, 3, 4) }
 		);
 
-		assert.equal(result, false);
+		assert.strictEqual(result, false);
 	});
 
 	test('different scroll positions should be invalid', () => {
@@ -74,7 +74,7 @@ suite('Editor Core - Editor State', () => {
 			{ scroll: { left: 3, top: 2 } }
 		);
 
-		assert.equal(result, false);
+		assert.strictEqual(result, false);
 	});
 
 
diff --git a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
index 9c8c6c6ed..37055a854 100644
--- a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
+++ b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
@@ -60,12 +60,12 @@ suite('Decoration Render Options', () => {
 	test('register and resolve decoration type', () => {
 		let s = new TestCodeEditorServiceImpl(themeServiceMock);
 		s.registerDecorationType('example', options);
-		assert.notEqual(s.resolveDecorationOptions('example', false), undefined);
+		assert.notStrictEqual(s.resolveDecorationOptions('example', false), undefined);
 	});
 	test('remove decoration type', () => {
 		let s = new TestCodeEditorServiceImpl(themeServiceMock);
 		s.registerDecorationType('example', options);
-		assert.notEqual(s.resolveDecorationOptions('example', false), undefined);
+		assert.notStrictEqual(s.resolveDecorationOptions('example', false), undefined);
 		s.removeDecorationType('example');
 		assert.throws(() => s.resolveDecorationOptions('example', false));
 	});
@@ -95,16 +95,16 @@ suite('Decoration Render Options', () => {
 		}));
 		const s = new TestCodeEditorServiceImpl(themeService, styleSheet);
 		s.registerDecorationType('example', options);
-		assert.equal(readStyleSheet(styleSheet), '.monaco-editor .ced-example-0 {background-color:#ff0000;border-color:transparent;box-sizing: border-box;}');
+		assert.strictEqual(readStyleSheet(styleSheet), '.monaco-editor .ced-example-0 {background-color:#ff0000;border-color:transparent;box-sizing: border-box;}');
 
 		themeService.setTheme(new TestColorTheme({
 			editorBackground: '#EE0000',
 			editorBorder: '#00FFFF'
 		}));
-		assert.equal(readStyleSheet(styleSheet), '.monaco-editor .ced-example-0 {background-color:#ee0000;border-color:#00ffff;box-sizing: border-box;}');
+		assert.strictEqual(readStyleSheet(styleSheet), '.monaco-editor .ced-example-0 {background-color:#ee0000;border-color:#00ffff;box-sizing: border-box;}');
 
 		s.removeDecorationType('example');
-		assert.equal(readStyleSheet(styleSheet), '');
+		assert.strictEqual(readStyleSheet(styleSheet), '');
 	});
 
 	test('theme overrides', () => {
@@ -134,10 +134,10 @@ suite('Decoration Render Options', () => {
 			'.vs.monaco-editor .ced-example-1 {color:#FF00FF !important;}',
 			'.monaco-editor .ced-example-1 {color:#ff0000 !important;}'
 		].join('\n');
-		assert.equal(readStyleSheet(styleSheet), expected);
+		assert.strictEqual(readStyleSheet(styleSheet), expected);
 
 		s.removeDecorationType('example');
-		assert.equal(readStyleSheet(styleSheet), '');
+		assert.strictEqual(readStyleSheet(styleSheet), '');
 	});
 
 	test('css properties, gutterIconPaths', () => {
diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts
index cc39f3044..da4aac219 100644
--- a/src/vs/editor/test/browser/testCodeEditor.ts
+++ b/src/vs/editor/test/browser/testCodeEditor.ts
@@ -31,10 +31,10 @@ export interface ITestCodeEditor extends IActiveCodeEditor {
 	registerAndInstantiateContribution<T extends IEditorContribution, Services extends BrandedService[]>(id: string, ctor: new (editor: ICodeEditor, ...services: Services) => T): T;
 }
 
-class TestCodeEditor extends CodeEditorWidget implements ICodeEditor {
+export class TestCodeEditor extends CodeEditorWidget implements ICodeEditor {
 
 	//#region testing overrides
-	protected _createConfiguration(options: IEditorConstructionOptions): IConfiguration {
+	protected _createConfiguration(options: Readonly<IEditorConstructionOptions>): IConfiguration {
 		return new TestConfiguration(options);
 	}
 	protected _createView(viewModel: ViewModel): [View, boolean] {
@@ -52,6 +52,9 @@ class TestCodeEditor extends CodeEditorWidget implements ICodeEditor {
 		this._contributions[id] = r;
 		return r;
 	}
+}
+
+class TestCodeEditorWithAutoModelDisposal extends TestCodeEditor {
 	public dispose() {
 		super.dispose();
 		if (this._modelData) {
@@ -144,7 +147,7 @@ export function createTestCodeEditor(options: TestCodeEditorCreationOptions): IT
 		contributions: []
 	};
 	const editor = instantiationService.createInstance(
-		TestCodeEditor,
+		TestCodeEditorWithAutoModelDisposal,
 		<HTMLElement><any>new TestEditorDomElement(),
 		options,
 		codeEditorWidgetOptions
diff --git a/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts b/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
index cde867901..81aed990b 100644
--- a/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
+++ b/src/vs/editor/test/browser/view/minimapCharRenderer.test.ts
@@ -85,7 +85,7 @@ suite('MinimapCharRenderer', () => {
 			actual[i] = imageData.data[i];
 		}
 
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			0x2D, 0x2D, 0x2D, 0xFF, 0xAC, 0xAC, 0xAC, 0xFF,
 			0xC6, 0xC6, 0xC6, 0xFF, 0xC8, 0xC8, 0xC8, 0xFF,
 			0xC0, 0xC0, 0xC0, 0xFF, 0xCB, 0xCB, 0xCB, 0xFF,
@@ -115,7 +115,7 @@ suite('MinimapCharRenderer', () => {
 			actual[i] = imageData.data[i];
 		}
 
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			0xCB, 0xCB, 0xCB, 0xFF,
 			0x81, 0x81, 0x81, 0xFF,
 		]);
diff --git a/src/vs/editor/test/browser/view/viewLayer.test.ts b/src/vs/editor/test/browser/view/viewLayer.test.ts
index bffb2f8b1..eba81ff74 100644
--- a/src/vs/editor/test/browser/view/viewLayer.test.ts
+++ b/src/vs/editor/test/browser/view/viewLayer.test.ts
@@ -36,7 +36,7 @@ function assertState(col: RenderedLinesCollection<TestLine>, state: ILinesCollec
 		actualState.lines.push(col.getLine(lineNumber).id);
 		actualState.pinged.push(col.getLine(lineNumber)._pinged);
 	}
-	assert.deepEqual(actualState, state);
+	assert.deepStrictEqual(actualState, state);
 }
 
 suite('RenderedLinesCollection onLinesDeleted', () => {
@@ -54,7 +54,7 @@ suite('RenderedLinesCollection onLinesDeleted', () => {
 		if (actualDeleted1) {
 			actualDeleted = actualDeleted1.map(line => line.id);
 		}
-		assert.deepEqual(actualDeleted, expectedDeleted);
+		assert.deepStrictEqual(actualDeleted, expectedDeleted);
 		assertState(col, expectedState);
 	}
 
@@ -325,7 +325,7 @@ suite('RenderedLinesCollection onLineChanged', () => {
 			new TestLine('old9')
 		]);
 		let actualPinged = col.onLinesChanged(changedLineNumber, changedLineNumber);
-		assert.deepEqual(actualPinged, expectedPinged);
+		assert.deepStrictEqual(actualPinged, expectedPinged);
 		assertState(col, expectedState);
 	}
 
@@ -410,7 +410,7 @@ suite('RenderedLinesCollection onLinesInserted', () => {
 		if (actualDeleted1) {
 			actualDeleted = actualDeleted1.map(line => line.id);
 		}
-		assert.deepEqual(actualDeleted, expectedDeleted);
+		assert.deepStrictEqual(actualDeleted, expectedDeleted);
 		assertState(col, expectedState);
 	}
 
@@ -682,7 +682,7 @@ suite('RenderedLinesCollection onTokensChanged', () => {
 			new TestLine('old9')
 		]);
 		let actualPinged = col.onTokensChanged([{ fromLineNumber: changedFromLineNumber, toLineNumber: changedToLineNumber }]);
-		assert.deepEqual(actualPinged, expectedPinged);
+		assert.deepStrictEqual(actualPinged, expectedPinged);
 		assertState(col, expectedState);
 	}
 
diff --git a/src/vs/editor/test/common/config/commonEditorConfig.test.ts b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
index d0edc8f44..1faca7a17 100644
--- a/src/vs/editor/test/common/config/commonEditorConfig.test.ts
+++ b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
@@ -16,40 +16,40 @@ suite('Common Editor Config', () => {
 		const zoom = EditorZoom;
 
 		zoom.setZoomLevel(0);
-		assert.equal(zoom.getZoomLevel(), 0);
+		assert.strictEqual(zoom.getZoomLevel(), 0);
 
 		zoom.setZoomLevel(-0);
-		assert.equal(zoom.getZoomLevel(), 0);
+		assert.strictEqual(zoom.getZoomLevel(), 0);
 
 		zoom.setZoomLevel(5);
-		assert.equal(zoom.getZoomLevel(), 5);
+		assert.strictEqual(zoom.getZoomLevel(), 5);
 
 		zoom.setZoomLevel(-1);
-		assert.equal(zoom.getZoomLevel(), -1);
+		assert.strictEqual(zoom.getZoomLevel(), -1);
 
 		zoom.setZoomLevel(9);
-		assert.equal(zoom.getZoomLevel(), 9);
+		assert.strictEqual(zoom.getZoomLevel(), 9);
 
 		zoom.setZoomLevel(-9);
-		assert.equal(zoom.getZoomLevel(), -5);
+		assert.strictEqual(zoom.getZoomLevel(), -5);
 
 		zoom.setZoomLevel(20);
-		assert.equal(zoom.getZoomLevel(), 20);
+		assert.strictEqual(zoom.getZoomLevel(), 20);
 
 		zoom.setZoomLevel(-10);
-		assert.equal(zoom.getZoomLevel(), -5);
+		assert.strictEqual(zoom.getZoomLevel(), -5);
 
 		zoom.setZoomLevel(9.1);
-		assert.equal(zoom.getZoomLevel(), 9.1);
+		assert.strictEqual(zoom.getZoomLevel(), 9.1);
 
 		zoom.setZoomLevel(-9.1);
-		assert.equal(zoom.getZoomLevel(), -5);
+		assert.strictEqual(zoom.getZoomLevel(), -5);
 
 		zoom.setZoomLevel(Infinity);
-		assert.equal(zoom.getZoomLevel(), 20);
+		assert.strictEqual(zoom.getZoomLevel(), 20);
 
 		zoom.setZoomLevel(Number.NEGATIVE_INFINITY);
-		assert.equal(zoom.getZoomLevel(), -5);
+		assert.strictEqual(zoom.getZoomLevel(), -5);
 	});
 
 	class TestWrappingConfiguration extends TestConfiguration {
@@ -69,8 +69,8 @@ suite('Common Editor Config', () => {
 	function assertWrapping(config: TestConfiguration, isViewportWrapping: boolean, wrappingColumn: number): void {
 		const options = config.options;
 		const wrappingInfo = options.get(EditorOption.wrappingInfo);
-		assert.equal(wrappingInfo.isViewportWrapping, isViewportWrapping);
-		assert.equal(wrappingInfo.wrappingColumn, wrappingColumn);
+		assert.strictEqual(wrappingInfo.isViewportWrapping, isViewportWrapping);
+		assert.strictEqual(wrappingInfo.wrappingColumn, wrappingColumn);
 	}
 
 	test('wordWrap default', () => {
@@ -186,26 +186,26 @@ suite('Common Editor Config', () => {
 		});
 		let config = new TestConfiguration({ hover: hoverOptions });
 
-		assert.equal(config.options.get(EditorOption.hover).enabled, true);
+		assert.strictEqual(config.options.get(EditorOption.hover).enabled, true);
 		config.updateOptions({ hover: { enabled: false } });
-		assert.equal(config.options.get(EditorOption.hover).enabled, false);
+		assert.strictEqual(config.options.get(EditorOption.hover).enabled, false);
 	});
 
 	test('does not emit event when nothing changes', () => {
 		const config = new TestConfiguration({ glyphMargin: true, roundedSelection: false });
 		let event: ConfigurationChangedEvent | null = null;
 		config.onDidChange(e => event = e);
-		assert.equal(config.options.get(EditorOption.glyphMargin), true);
+		assert.strictEqual(config.options.get(EditorOption.glyphMargin), true);
 
 		config.updateOptions({ glyphMargin: true });
 		config.updateOptions({ roundedSelection: false });
-		assert.equal(event, null);
+		assert.strictEqual(event, null);
 	});
 
 	test('issue #94931: Unable to open source file', () => {
 		const config = new TestConfiguration({ quickSuggestions: null! });
 		const actual = <Readonly<Required<IQuickSuggestionsOptions>>>config.options.get(EditorOption.quickSuggestions);
-		assert.deepEqual(actual, {
+		assert.deepStrictEqual(actual, {
 			other: true,
 			comments: false,
 			strings: false
@@ -216,7 +216,7 @@ suite('Common Editor Config', () => {
 		const config = new TestConfiguration({ quickSuggestions: null! });
 		config.updateOptions({ quickSuggestions: { strings: true } });
 		const actual = <Readonly<Required<IQuickSuggestionsOptions>>>config.options.get(EditorOption.quickSuggestions);
-		assert.deepEqual(actual, {
+		assert.deepStrictEqual(actual, {
 			other: true,
 			comments: false,
 			strings: true
diff --git a/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts b/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
index e7cd6b4b3..e07042281 100644
--- a/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
+++ b/src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
@@ -8,41 +8,41 @@ import { CursorColumns } from 'vs/editor/common/controller/cursorCommon';
 suite('CursorMove', () => {
 
 	test('nextRenderTabStop', () => {
-		assert.equal(CursorColumns.nextRenderTabStop(0, 4), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(1, 4), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(2, 4), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(3, 4), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(4, 4), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(5, 4), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(6, 4), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(7, 4), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(8, 4), 12);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 4), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 4), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 4), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 4), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 4), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 4), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 4), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 4), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 4), 12);
 
-		assert.equal(CursorColumns.nextRenderTabStop(0, 2), 2);
-		assert.equal(CursorColumns.nextRenderTabStop(1, 2), 2);
-		assert.equal(CursorColumns.nextRenderTabStop(2, 2), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(3, 2), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(4, 2), 6);
-		assert.equal(CursorColumns.nextRenderTabStop(5, 2), 6);
-		assert.equal(CursorColumns.nextRenderTabStop(6, 2), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(7, 2), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(8, 2), 10);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 2), 2);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 2), 2);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 2), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 2), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 2), 6);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 2), 6);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 2), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 2), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 2), 10);
 
-		assert.equal(CursorColumns.nextRenderTabStop(0, 1), 1);
-		assert.equal(CursorColumns.nextRenderTabStop(1, 1), 2);
-		assert.equal(CursorColumns.nextRenderTabStop(2, 1), 3);
-		assert.equal(CursorColumns.nextRenderTabStop(3, 1), 4);
-		assert.equal(CursorColumns.nextRenderTabStop(4, 1), 5);
-		assert.equal(CursorColumns.nextRenderTabStop(5, 1), 6);
-		assert.equal(CursorColumns.nextRenderTabStop(6, 1), 7);
-		assert.equal(CursorColumns.nextRenderTabStop(7, 1), 8);
-		assert.equal(CursorColumns.nextRenderTabStop(8, 1), 9);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(0, 1), 1);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(1, 1), 2);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(2, 1), 3);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(3, 1), 4);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(4, 1), 5);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(5, 1), 6);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(6, 1), 7);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(7, 1), 8);
+		assert.strictEqual(CursorColumns.nextRenderTabStop(8, 1), 9);
 	});
 
 	test('visibleColumnFromColumn', () => {
 
 		function testVisibleColumnFromColumn(text: string, tabSize: number, column: number, expected: number): void {
-			assert.equal(CursorColumns.visibleColumnFromColumn(text, column, tabSize), expected);
+			assert.strictEqual(CursorColumns.visibleColumnFromColumn(text, column, tabSize), expected);
 		}
 
 		testVisibleColumnFromColumn('\t\tvar x = 3;', 4, 1, 0);
@@ -101,7 +101,7 @@ suite('CursorMove', () => {
 	test('columnFromVisibleColumn', () => {
 
 		function testColumnFromVisibleColumn(text: string, tabSize: number, visibleColumn: number, expected: number): void {
-			assert.equal(CursorColumns.columnFromVisibleColumn(text, visibleColumn, tabSize), expected);
+			assert.strictEqual(CursorColumns.columnFromVisibleColumn(text, visibleColumn, tabSize), expected);
 		}
 
 		// testColumnFromVisibleColumn('\t\tvar x = 3;', 4, 0, 1);
@@ -177,7 +177,7 @@ suite('CursorMove', () => {
 	test('toStatusbarColumn', () => {
 
 		function t(text: string, tabSize: number, column: number, expected: number): void {
-			assert.equal(CursorColumns.toStatusbarColumn(text, column, tabSize), expected, `<<t('${text}', ${tabSize}, ${column}, ${expected})>>`);
+			assert.strictEqual(CursorColumns.toStatusbarColumn(text, column, tabSize), expected, `<<t('${text}', ${tabSize}, ${column}, ${expected})>>`);
 		}
 
 		t('    spaces', 4, 1, 1);
diff --git a/src/vs/editor/test/common/core/characterClassifier.test.ts b/src/vs/editor/test/common/core/characterClassifier.test.ts
index de9effc74..9d3bf750c 100644
--- a/src/vs/editor/test/common/core/characterClassifier.test.ts
+++ b/src/vs/editor/test/common/core/characterClassifier.test.ts
@@ -11,27 +11,27 @@ suite('CharacterClassifier', () => {
 	test('works', () => {
 		let classifier = new CharacterClassifier<number>(0);
 
-		assert.equal(classifier.get(-1), 0);
-		assert.equal(classifier.get(0), 0);
-		assert.equal(classifier.get(CharCode.a), 0);
-		assert.equal(classifier.get(CharCode.b), 0);
-		assert.equal(classifier.get(CharCode.z), 0);
-		assert.equal(classifier.get(255), 0);
-		assert.equal(classifier.get(1000), 0);
-		assert.equal(classifier.get(2000), 0);
+		assert.strictEqual(classifier.get(-1), 0);
+		assert.strictEqual(classifier.get(0), 0);
+		assert.strictEqual(classifier.get(CharCode.a), 0);
+		assert.strictEqual(classifier.get(CharCode.b), 0);
+		assert.strictEqual(classifier.get(CharCode.z), 0);
+		assert.strictEqual(classifier.get(255), 0);
+		assert.strictEqual(classifier.get(1000), 0);
+		assert.strictEqual(classifier.get(2000), 0);
 
 		classifier.set(CharCode.a, 1);
 		classifier.set(CharCode.z, 2);
 		classifier.set(1000, 3);
 
-		assert.equal(classifier.get(-1), 0);
-		assert.equal(classifier.get(0), 0);
-		assert.equal(classifier.get(CharCode.a), 1);
-		assert.equal(classifier.get(CharCode.b), 0);
-		assert.equal(classifier.get(CharCode.z), 2);
-		assert.equal(classifier.get(255), 0);
-		assert.equal(classifier.get(1000), 3);
-		assert.equal(classifier.get(2000), 0);
+		assert.strictEqual(classifier.get(-1), 0);
+		assert.strictEqual(classifier.get(0), 0);
+		assert.strictEqual(classifier.get(CharCode.a), 1);
+		assert.strictEqual(classifier.get(CharCode.b), 0);
+		assert.strictEqual(classifier.get(CharCode.z), 2);
+		assert.strictEqual(classifier.get(255), 0);
+		assert.strictEqual(classifier.get(1000), 3);
+		assert.strictEqual(classifier.get(2000), 0);
 	});
 
-});
\ No newline at end of file
+});
diff --git a/src/vs/editor/test/common/core/lineTokens.test.ts b/src/vs/editor/test/common/core/lineTokens.test.ts
index d3a9924fb..2ffff0c7e 100644
--- a/src/vs/editor/test/common/core/lineTokens.test.ts
+++ b/src/vs/editor/test/common/core/lineTokens.test.ts
@@ -45,64 +45,64 @@ suite('LineTokens', () => {
 	test('basics', () => {
 		const lineTokens = createTestLineTokens();
 
-		assert.equal(lineTokens.getLineContent(), 'Hello world, this is a lovely day');
-		assert.equal(lineTokens.getLineContent().length, 33);
-		assert.equal(lineTokens.getCount(), 7);
+		assert.strictEqual(lineTokens.getLineContent(), 'Hello world, this is a lovely day');
+		assert.strictEqual(lineTokens.getLineContent().length, 33);
+		assert.strictEqual(lineTokens.getCount(), 7);
 
-		assert.equal(lineTokens.getStartOffset(0), 0);
-		assert.equal(lineTokens.getEndOffset(0), 6);
-		assert.equal(lineTokens.getStartOffset(1), 6);
-		assert.equal(lineTokens.getEndOffset(1), 13);
-		assert.equal(lineTokens.getStartOffset(2), 13);
-		assert.equal(lineTokens.getEndOffset(2), 18);
-		assert.equal(lineTokens.getStartOffset(3), 18);
-		assert.equal(lineTokens.getEndOffset(3), 21);
-		assert.equal(lineTokens.getStartOffset(4), 21);
-		assert.equal(lineTokens.getEndOffset(4), 23);
-		assert.equal(lineTokens.getStartOffset(5), 23);
-		assert.equal(lineTokens.getEndOffset(5), 30);
-		assert.equal(lineTokens.getStartOffset(6), 30);
-		assert.equal(lineTokens.getEndOffset(6), 33);
+		assert.strictEqual(lineTokens.getStartOffset(0), 0);
+		assert.strictEqual(lineTokens.getEndOffset(0), 6);
+		assert.strictEqual(lineTokens.getStartOffset(1), 6);
+		assert.strictEqual(lineTokens.getEndOffset(1), 13);
+		assert.strictEqual(lineTokens.getStartOffset(2), 13);
+		assert.strictEqual(lineTokens.getEndOffset(2), 18);
+		assert.strictEqual(lineTokens.getStartOffset(3), 18);
+		assert.strictEqual(lineTokens.getEndOffset(3), 21);
+		assert.strictEqual(lineTokens.getStartOffset(4), 21);
+		assert.strictEqual(lineTokens.getEndOffset(4), 23);
+		assert.strictEqual(lineTokens.getStartOffset(5), 23);
+		assert.strictEqual(lineTokens.getEndOffset(5), 30);
+		assert.strictEqual(lineTokens.getStartOffset(6), 30);
+		assert.strictEqual(lineTokens.getEndOffset(6), 33);
 	});
 
 	test('findToken', () => {
 		const lineTokens = createTestLineTokens();
 
-		assert.equal(lineTokens.findTokenIndexAtOffset(0), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(1), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(2), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(3), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(4), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(5), 0);
-		assert.equal(lineTokens.findTokenIndexAtOffset(6), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(7), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(8), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(9), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(10), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(11), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(12), 1);
-		assert.equal(lineTokens.findTokenIndexAtOffset(13), 2);
-		assert.equal(lineTokens.findTokenIndexAtOffset(14), 2);
-		assert.equal(lineTokens.findTokenIndexAtOffset(15), 2);
-		assert.equal(lineTokens.findTokenIndexAtOffset(16), 2);
-		assert.equal(lineTokens.findTokenIndexAtOffset(17), 2);
-		assert.equal(lineTokens.findTokenIndexAtOffset(18), 3);
-		assert.equal(lineTokens.findTokenIndexAtOffset(19), 3);
-		assert.equal(lineTokens.findTokenIndexAtOffset(20), 3);
-		assert.equal(lineTokens.findTokenIndexAtOffset(21), 4);
-		assert.equal(lineTokens.findTokenIndexAtOffset(22), 4);
-		assert.equal(lineTokens.findTokenIndexAtOffset(23), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(24), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(25), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(26), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(27), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(28), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(29), 5);
-		assert.equal(lineTokens.findTokenIndexAtOffset(30), 6);
-		assert.equal(lineTokens.findTokenIndexAtOffset(31), 6);
-		assert.equal(lineTokens.findTokenIndexAtOffset(32), 6);
-		assert.equal(lineTokens.findTokenIndexAtOffset(33), 6);
-		assert.equal(lineTokens.findTokenIndexAtOffset(34), 6);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(0), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(1), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(2), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(3), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(4), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(5), 0);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(6), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(7), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(8), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(9), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(10), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(11), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(12), 1);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(13), 2);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(14), 2);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(15), 2);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(16), 2);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(17), 2);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(18), 3);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(19), 3);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(20), 3);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(21), 4);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(22), 4);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(23), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(24), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(25), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(26), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(27), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(28), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(29), 5);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(30), 6);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(31), 6);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(32), 6);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(33), 6);
+		assert.strictEqual(lineTokens.findTokenIndexAtOffset(34), 6);
 	});
 
 	interface ITestViewLineToken {
@@ -118,7 +118,7 @@ suite('LineTokens', () => {
 				foreground: _actual.getForeground(i)
 			};
 		}
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('inflate', () => {
diff --git a/src/vs/editor/test/common/core/range.test.ts b/src/vs/editor/test/common/core/range.test.ts
index 5420ae452..26415e8c6 100644
--- a/src/vs/editor/test/common/core/range.test.ts
+++ b/src/vs/editor/test/common/core/range.test.ts
@@ -9,47 +9,47 @@ import { Range } from 'vs/editor/common/core/range';
 suite('Editor Core - Range', () => {
 	test('empty range', () => {
 		let s = new Range(1, 1, 1, 1);
-		assert.equal(s.startLineNumber, 1);
-		assert.equal(s.startColumn, 1);
-		assert.equal(s.endLineNumber, 1);
-		assert.equal(s.endColumn, 1);
-		assert.equal(s.isEmpty(), true);
+		assert.strictEqual(s.startLineNumber, 1);
+		assert.strictEqual(s.startColumn, 1);
+		assert.strictEqual(s.endLineNumber, 1);
+		assert.strictEqual(s.endColumn, 1);
+		assert.strictEqual(s.isEmpty(), true);
 	});
 
 	test('swap start and stop same line', () => {
 		let s = new Range(1, 2, 1, 1);
-		assert.equal(s.startLineNumber, 1);
-		assert.equal(s.startColumn, 1);
-		assert.equal(s.endLineNumber, 1);
-		assert.equal(s.endColumn, 2);
-		assert.equal(s.isEmpty(), false);
+		assert.strictEqual(s.startLineNumber, 1);
+		assert.strictEqual(s.startColumn, 1);
+		assert.strictEqual(s.endLineNumber, 1);
+		assert.strictEqual(s.endColumn, 2);
+		assert.strictEqual(s.isEmpty(), false);
 	});
 
 	test('swap start and stop', () => {
 		let s = new Range(2, 1, 1, 2);
-		assert.equal(s.startLineNumber, 1);
-		assert.equal(s.startColumn, 2);
-		assert.equal(s.endLineNumber, 2);
-		assert.equal(s.endColumn, 1);
-		assert.equal(s.isEmpty(), false);
+		assert.strictEqual(s.startLineNumber, 1);
+		assert.strictEqual(s.startColumn, 2);
+		assert.strictEqual(s.endLineNumber, 2);
+		assert.strictEqual(s.endColumn, 1);
+		assert.strictEqual(s.isEmpty(), false);
 	});
 
 	test('no swap same line', () => {
 		let s = new Range(1, 1, 1, 2);
-		assert.equal(s.startLineNumber, 1);
-		assert.equal(s.startColumn, 1);
-		assert.equal(s.endLineNumber, 1);
-		assert.equal(s.endColumn, 2);
-		assert.equal(s.isEmpty(), false);
+		assert.strictEqual(s.startLineNumber, 1);
+		assert.strictEqual(s.startColumn, 1);
+		assert.strictEqual(s.endLineNumber, 1);
+		assert.strictEqual(s.endColumn, 2);
+		assert.strictEqual(s.isEmpty(), false);
 	});
 
 	test('no swap', () => {
 		let s = new Range(1, 1, 2, 1);
-		assert.equal(s.startLineNumber, 1);
-		assert.equal(s.startColumn, 1);
-		assert.equal(s.endLineNumber, 2);
-		assert.equal(s.endColumn, 1);
-		assert.equal(s.isEmpty(), false);
+		assert.strictEqual(s.startLineNumber, 1);
+		assert.strictEqual(s.startColumn, 1);
+		assert.strictEqual(s.endLineNumber, 2);
+		assert.strictEqual(s.endColumn, 1);
+		assert.strictEqual(s.isEmpty(), false);
 	});
 
 	test('compareRangesUsingEnds', () => {
@@ -93,36 +93,36 @@ suite('Editor Core - Range', () => {
 	});
 
 	test('containsPosition', () => {
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(1, 3)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(2, 1)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(2, 2)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(2, 3)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(3, 1)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(5, 9)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(5, 10)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(5, 11)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsPosition(new Position(6, 1)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(1, 3)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(2, 1)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(2, 2)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(2, 3)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(3, 1)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(5, 9)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(5, 10)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(5, 11)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsPosition(new Position(6, 1)), false);
 	});
 
 	test('containsRange', () => {
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(1, 3, 2, 2)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 1, 2, 2)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 5, 11)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 6, 1)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(5, 9, 6, 1)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(5, 10, 6, 1)), false);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 5, 10)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 3, 5, 9)), true);
-		assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(3, 100, 4, 100)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(1, 3, 2, 2)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(2, 1, 2, 2)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 5, 11)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 6, 1)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(5, 9, 6, 1)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(5, 10, 6, 1)), false);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(2, 2, 5, 10)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(2, 3, 5, 9)), true);
+		assert.strictEqual(new Range(2, 2, 5, 10).containsRange(new Range(3, 100, 4, 100)), true);
 	});
 
 	test('areIntersecting', () => {
-		assert.equal(Range.areIntersecting(new Range(2, 2, 3, 2), new Range(4, 2, 5, 2)), false);
-		assert.equal(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(2, 2, 3, 2)), false);
-		assert.equal(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(5, 2, 6, 2)), false);
-		assert.equal(Range.areIntersecting(new Range(5, 2, 6, 2), new Range(4, 2, 5, 2)), false);
-		assert.equal(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 6)), true);
-		assert.equal(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 9)), true);
-		assert.equal(Range.areIntersecting(new Range(2, 4, 2, 9), new Range(2, 2, 2, 7)), true);
+		assert.strictEqual(Range.areIntersecting(new Range(2, 2, 3, 2), new Range(4, 2, 5, 2)), false);
+		assert.strictEqual(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(2, 2, 3, 2)), false);
+		assert.strictEqual(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(5, 2, 6, 2)), false);
+		assert.strictEqual(Range.areIntersecting(new Range(5, 2, 6, 2), new Range(4, 2, 5, 2)), false);
+		assert.strictEqual(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 6)), true);
+		assert.strictEqual(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 9)), true);
+		assert.strictEqual(Range.areIntersecting(new Range(2, 4, 2, 9), new Range(2, 2, 2, 7)), true);
 	});
 });
diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts
index 9361e05d6..32dd4bce0 100644
--- a/src/vs/editor/test/common/diff/diffComputer.test.ts
+++ b/src/vs/editor/test/common/diff/diffComputer.test.ts
@@ -64,7 +64,7 @@ function assertDiff(originalLines: string[], modifiedLines: string[], expectedCh
 	for (let i = 0; i < changes.length; i++) {
 		extracted.push(extractLineChangeRepresentation(changes[i], <ILineChange>(i < expectedChanges.length ? expectedChanges[i] : null)));
 	}
-	assert.deepEqual(extracted, expectedChanges);
+	assert.deepStrictEqual(extracted, expectedChanges);
 }
 
 function createLineDeletion(startLineNumber: number, endLineNumber: number, modifiedLineNumber: number): ILineChange {
@@ -462,6 +462,13 @@ suite('Editor Diff - DiffComputer', () => {
 		assertDiff(original, modified, expected, true, false, true);
 	});
 
+	test('empty diff 5', () => {
+		let original = [''];
+		let modified = [''];
+		let expected: ILineChange[] = [];
+		assertDiff(original, modified, expected, true, false, true);
+	});
+
 	test('pretty diff 1', () => {
 		let original = [
 			'suite(function () {',
diff --git a/src/vs/editor/test/common/mocks/testConfiguration.ts b/src/vs/editor/test/common/mocks/testConfiguration.ts
index a30fbc237..ec94f2201 100644
--- a/src/vs/editor/test/common/mocks/testConfiguration.ts
+++ b/src/vs/editor/test/common/mocks/testConfiguration.ts
@@ -30,6 +30,7 @@ export class TestConfiguration extends CommonEditorConfiguration {
 	protected readConfiguration(styling: BareFontInfo): FontInfo {
 		return new FontInfo({
 			zoomLevel: 0,
+			pixelRatio: 1,
 			fontFamily: 'mockFont',
 			fontWeight: 'normal',
 			fontSize: 14,
diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index 79d4e1e46..357d3bb55 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -58,7 +58,7 @@ export class BenchmarkSuite {
 				let timeDiffTotal = 0;
 				for (let j = 0; j < this.iterations; j++) {
 					let factory = benchmark.buildBuffer(builder);
-					let buffer = factory.create(DefaultEndOfLine.LF);
+					let buffer = factory.create(DefaultEndOfLine.LF).textBuffer;
 					benchmark.preCycle(buffer);
 					let start = process.hrtime();
 					benchmark.fn(buffer);
diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts
index 67c8a119e..c0e4be805 100644
--- a/src/vs/editor/test/common/model/editableTextModel.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModel.test.ts
@@ -22,10 +22,10 @@ suite('EditorModel - EditableTextModel.applyEdits updates mightContainRTL', () =
 		let model = createEditableTextModelFromString(original.join('\n'));
 		model.setEOL(EndOfLineSequence.LF);
 
-		assert.equal(model.mightContainRTL(), before);
+		assert.strictEqual(model.mightContainRTL(), before);
 
 		model.applyEdits(edits);
-		assert.equal(model.mightContainRTL(), after);
+		assert.strictEqual(model.mightContainRTL(), after);
 		model.dispose();
 	}
 
@@ -68,10 +68,10 @@ suite('EditorModel - EditableTextModel.applyEdits updates mightContainNonBasicAS
 		let model = createEditableTextModelFromString(original.join('\n'));
 		model.setEOL(EndOfLineSequence.LF);
 
-		assert.equal(model.mightContainNonBasicASCII(), before);
+		assert.strictEqual(model.mightContainNonBasicASCII(), before);
 
 		model.applyEdits(edits);
-		assert.equal(model.mightContainNonBasicASCII(), after);
+		assert.strictEqual(model.mightContainNonBasicASCII(), after);
 		model.dispose();
 	}
 
@@ -1043,7 +1043,7 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 
 	test('issue #1580: Changes in line endings are not correctly reflected in the extension host, leading to invalid offsets sent to external refactoring tools', () => {
 		let model = createEditableTextModelFromString('Hello\nWorld!');
-		assert.equal(model.getEOL(), '\n');
+		assert.strictEqual(model.getEOL(), '\n');
 
 		let mirrorModel2 = new MirrorTextModel(null!, model.getLinesContent(), model.getEOL(), model.getVersionId());
 		let mirrorModel2PrevVersionId = model.getVersionId();
@@ -1058,8 +1058,8 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 		});
 
 		let assertMirrorModels = () => {
-			assert.equal(mirrorModel2.getText(), model.getValue(), 'mirror model 2 text OK');
-			assert.equal(mirrorModel2.version, model.getVersionId(), 'mirror model 2 version OK');
+			assert.strictEqual(mirrorModel2.getText(), model.getValue(), 'mirror model 2 text OK');
+			assert.strictEqual(mirrorModel2.version, model.getVersionId(), 'mirror model 2 version OK');
 		};
 
 		model.setEOL(EndOfLineSequence.CRLF);
@@ -1077,16 +1077,16 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 			{ range: new Range(1, 2, 1, 2), text: '"' },
 		]);
 
-		assert.equal(model.getValue(EndOfLinePreference.LF), '"\'"👁\'');
+		assert.strictEqual(model.getValue(EndOfLinePreference.LF), '"\'"👁\'');
 
-		assert.deepEqual(model.validateRange(new Range(1, 3, 1, 4)), new Range(1, 3, 1, 4));
+		assert.deepStrictEqual(model.validateRange(new Range(1, 3, 1, 4)), new Range(1, 3, 1, 4));
 
 		model.applyEdits([
 			{ range: new Range(1, 1, 1, 2), text: null },
 			{ range: new Range(1, 3, 1, 4), text: null },
 		]);
 
-		assert.equal(model.getValue(EndOfLinePreference.LF), '\'👁\'');
+		assert.strictEqual(model.getValue(EndOfLinePreference.LF), '\'👁\'');
 
 		model.dispose();
 	});
@@ -1108,7 +1108,7 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 
 		model.applyEdits(undoEdits);
 
-		assert.deepEqual(model.getValue(), 'line1\nline2\nline3\n');
+		assert.deepStrictEqual(model.getValue(), 'line1\nline2\nline3\n');
 
 		model.dispose();
 	});
diff --git a/src/vs/editor/test/common/model/intervalTree.test.ts b/src/vs/editor/test/common/model/intervalTree.test.ts
index be89c0160..58e534c09 100644
--- a/src/vs/editor/test/common/model/intervalTree.test.ts
+++ b/src/vs/editor/test/common/model/intervalTree.test.ts
@@ -111,7 +111,7 @@ suite('IntervalTree', () => {
 				let actualNodes = this._tree.intervalSearch(op.begin, op.end, 0, false, 0);
 				let actual = actualNodes.map(n => new Interval(n.cachedAbsoluteStart, n.cachedAbsoluteEnd));
 				let expected = this._oracle.search(new Interval(op.begin, op.end));
-				assert.deepEqual(actual, expected);
+				assert.deepStrictEqual(actual, expected);
 				return;
 			}
 
@@ -123,7 +123,7 @@ suite('IntervalTree', () => {
 
 			let actual = this._tree.getAllInOrder().map(n => new Interval(n.cachedAbsoluteStart, n.cachedAbsoluteEnd));
 			let expected = this._oracle.intervals;
-			assert.deepEqual(actual, expected);
+			assert.deepStrictEqual(actual, expected);
 		}
 
 		public getExistingNodeId(index: number): number {
@@ -500,7 +500,7 @@ suite('IntervalTree', () => {
 		function assertIntervalSearch(start: number, end: number, expected: [number, number][]): void {
 			let actualNodes = T.intervalSearch(start, end, 0, false, 0);
 			let actual = actualNodes.map((n) => <[number, number]>[n.cachedAbsoluteStart, n.cachedAbsoluteEnd]);
-			assert.deepEqual(actual, expected);
+			assert.deepStrictEqual(actual, expected);
 		}
 
 		test('cormen 1->2', () => {
@@ -559,7 +559,7 @@ suite('IntervalTree', () => {
 		let node = new IntervalNode('', nodeStart, nodeEnd);
 		setNodeStickiness(node, nodeStickiness);
 		nodeAcceptEdit(node, start, end, textLength, forceMoveMarkers);
-		assert.deepEqual([node.start, node.end], [expectedNodeStart, expectedNodeEnd], msg);
+		assert.deepStrictEqual([node.start, node.end], [expectedNodeStart, expectedNodeEnd], msg);
 	}
 
 	test('nodeAcceptEdit', () => {
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
index 4c9bd0d18..f385fdda9 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
@@ -33,7 +33,7 @@ suite('PieceTreeTextBuffer._getInverseEdits', () => {
 
 	function assertInverseEdits(ops: IValidatedEditOperation[], expected: Range[]): void {
 		let actual = PieceTreeTextBuffer._getInverseEditRanges(ops);
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('single insert', () => {
@@ -282,10 +282,10 @@ suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
 	}
 
 	function testToSingleEditOperation(original: string[], edits: IValidatedEditOperation[], expected: IValidatedEditOperation): void {
-		const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(original.join('\n')).create(DefaultEndOfLine.LF);
+		const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(original.join('\n')).create(DefaultEndOfLine.LF).textBuffer;
 
 		const actual = textBuffer._toSingleEditOperation(edits);
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('one edit op is unchanged', () => {
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
index dafa53c07..83b4a90d9 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
@@ -10,11 +10,11 @@ import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 
 export function testTextBufferFactory(text: string, eol: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean): void {
-	const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(text).create(DefaultEndOfLine.LF);
+	const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(text).create(DefaultEndOfLine.LF).textBuffer;
 
-	assert.equal(textBuffer.mightContainNonBasicASCII(), mightContainNonBasicASCII);
-	assert.equal(textBuffer.mightContainRTL(), mightContainRTL);
-	assert.equal(textBuffer.getEOL(), eol);
+	assert.strictEqual(textBuffer.mightContainNonBasicASCII(), mightContainNonBasicASCII);
+	assert.strictEqual(textBuffer.mightContainRTL(), mightContainRTL);
+	assert.strictEqual(textBuffer.getEOL(), eol);
 }
 
 suite('ModelBuilder', () => {
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
index 4f87bf638..069b5553b 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
@@ -6,7 +6,7 @@
 import { CharCode } from 'vs/base/common/charCode';
 import { splitLines } from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
-import { DefaultEndOfLine, ITextBuffer, ITextBufferBuilder, ValidAnnotatedEditOperation } from 'vs/editor/common/model';
+import { ValidAnnotatedEditOperation } from 'vs/editor/common/model';
 
 export function getRandomInt(min: number, max: number): number {
 	return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -127,25 +127,6 @@ export function generateRandomReplaces(chunks: string[], editCnt: number, search
 	return ops;
 }
 
-export function createMockText(lineCount: number, minColumn: number, maxColumn: number) {
-	let fixedEOL = getRandomEOLSequence();
-	let lines: string[] = [];
-	for (let i = 0; i < lineCount; i++) {
-		if (i !== 0) {
-			lines.push(fixedEOL);
-		}
-		lines.push(getRandomString(minColumn, maxColumn));
-	}
-	return lines.join('');
-}
-
-export function createMockBuffer(str: string, bufferBuilder: ITextBufferBuilder): ITextBuffer {
-	bufferBuilder.acceptChunk(str);
-	let bufferFactory = bufferBuilder.finish();
-	let buffer = bufferFactory.create(DefaultEndOfLine.LF);
-	return buffer;
-}
-
 export function generateRandomChunkWithLF(minLength: number, maxLength: number): string {
 	let length = getRandomInt(minLength, maxLength);
 	let r = '';
diff --git a/src/vs/editor/test/common/model/model.line.test.ts b/src/vs/editor/test/common/model/model.line.test.ts
index 139b169bf..b07f24810 100644
--- a/src/vs/editor/test/common/model/model.line.test.ts
+++ b/src/vs/editor/test/common/model/model.line.test.ts
@@ -39,13 +39,13 @@ function assertLineTokens(__actual: LineTokens, _expected: TestToken[]): void {
 			type: token.getType()
 		};
 	};
-	assert.deepEqual(actual, expected.map(decode));
+	assert.deepStrictEqual(actual, expected.map(decode));
 }
 
 suite('ModelLine - getIndentLevel', () => {
 	function assertIndentLevel(text: string, expected: number, tabSize: number = 4): void {
 		let actual = TextModel.computeIndentLevel(text, tabSize);
-		assert.equal(actual, expected, text);
+		assert.strictEqual(actual, expected, text);
 	}
 
 	test('getIndentLevel', () => {
@@ -126,7 +126,7 @@ suite('ModelLinesTokens', () => {
 		for (let lineIndex = 0; lineIndex < expected.length; lineIndex++) {
 			const actualLine = model.getLineContent(lineIndex + 1);
 			const actualTokens = model.getLineTokens(lineIndex + 1);
-			assert.equal(actualLine, expected[lineIndex].text);
+			assert.strictEqual(actualLine, expected[lineIndex].text);
 			assertLineTokens(actualTokens, expected[lineIndex].tokens);
 		}
 	}
diff --git a/src/vs/editor/test/common/model/model.modes.test.ts b/src/vs/editor/test/common/model/model.modes.test.ts
index ce313b77a..1d255659e 100644
--- a/src/vs/editor/test/common/model/model.modes.test.ts
+++ b/src/vs/editor/test/common/model/model.modes.test.ts
@@ -21,14 +21,14 @@ suite('Editor Model - Model Modes 1', () => {
 	let calledFor: string[] = [];
 
 	function checkAndClear(arr: string[]) {
-		assert.deepEqual(calledFor, arr);
+		assert.deepStrictEqual(calledFor, arr);
 		calledFor = [];
 	}
 
 	const tokenizationSupport: modes.ITokenizationSupport = {
 		getInitialState: () => NULL_STATE,
 		tokenize: undefined!,
-		tokenize2: (line: string, state: modes.IState): TokenizationResult2 => {
+		tokenize2: (line: string, hasEOL: boolean, state: modes.IState): TokenizationResult2 => {
 			calledFor.push(line.charAt(0));
 			return new TokenizationResult2(new Uint32Array(0), state);
 		}
@@ -106,7 +106,7 @@ suite('Editor Model - Model Modes 1', () => {
 		checkAndClear(['1', '2', '3', '4', '5']);
 
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), '0\n-\n+')]);
-		assert.equal(thisModel.getLineCount(), 7);
+		assert.strictEqual(thisModel.getLineCount(), 7);
 		thisModel.forceTokenization(7);
 		checkAndClear(['0', '-', '+']);
 
@@ -174,14 +174,14 @@ suite('Editor Model - Model Modes 2', () => {
 	let calledFor: string[] = [];
 
 	function checkAndClear(arr: string[]): void {
-		assert.deepEqual(calledFor, arr);
+		assert.deepStrictEqual(calledFor, arr);
 		calledFor = [];
 	}
 
 	const tokenizationSupport: modes.ITokenizationSupport = {
 		getInitialState: () => new ModelState2(''),
 		tokenize: undefined!,
-		tokenize2: (line: string, state: modes.IState): TokenizationResult2 => {
+		tokenize2: (line: string, hasEOL: boolean, state: modes.IState): TokenizationResult2 => {
 			calledFor.push(line);
 			(<ModelState2>state).prevLineContent = line;
 			return new TokenizationResult2(new Uint32Array(0), state);
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index ed6787bc5..bfdcfc946 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -46,50 +46,50 @@ suite('Editor Model - Model', () => {
 	// --------- insert text
 
 	test('model getValue', () => {
-		assert.equal(thisModel.getValue(), 'My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
+		assert.strictEqual(thisModel.getValue(), 'My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
 	});
 
 	test('model insert empty text', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), '')]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'My First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'My First Line');
 	});
 
 	test('model insert text without newline 1', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), 'foo ')]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'foo My First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'foo My First Line');
 	});
 
 	test('model insert text without newline 2', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' foo')]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'My foo First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'My foo First Line');
 	});
 
 	test('model insert text with one newline', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nNo longer')]);
-		assert.equal(thisModel.getLineCount(), 6);
-		assert.equal(thisModel.getLineContent(1), 'My new line');
-		assert.equal(thisModel.getLineContent(2), 'No longer First Line');
+		assert.strictEqual(thisModel.getLineCount(), 6);
+		assert.strictEqual(thisModel.getLineContent(1), 'My new line');
+		assert.strictEqual(thisModel.getLineContent(2), 'No longer First Line');
 	});
 
 	test('model insert text with two newlines', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nOne more line in the middle\nNo longer')]);
-		assert.equal(thisModel.getLineCount(), 7);
-		assert.equal(thisModel.getLineContent(1), 'My new line');
-		assert.equal(thisModel.getLineContent(2), 'One more line in the middle');
-		assert.equal(thisModel.getLineContent(3), 'No longer First Line');
+		assert.strictEqual(thisModel.getLineCount(), 7);
+		assert.strictEqual(thisModel.getLineContent(1), 'My new line');
+		assert.strictEqual(thisModel.getLineContent(2), 'One more line in the middle');
+		assert.strictEqual(thisModel.getLineContent(3), 'No longer First Line');
 	});
 
 	test('model insert text with many newlines', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 3), '\n\n\n\n')]);
-		assert.equal(thisModel.getLineCount(), 9);
-		assert.equal(thisModel.getLineContent(1), 'My');
-		assert.equal(thisModel.getLineContent(2), '');
-		assert.equal(thisModel.getLineContent(3), '');
-		assert.equal(thisModel.getLineContent(4), '');
-		assert.equal(thisModel.getLineContent(5), ' First Line');
+		assert.strictEqual(thisModel.getLineCount(), 9);
+		assert.strictEqual(thisModel.getLineContent(1), 'My');
+		assert.strictEqual(thisModel.getLineContent(2), '');
+		assert.strictEqual(thisModel.getLineContent(3), '');
+		assert.strictEqual(thisModel.getLineContent(4), '');
+		assert.strictEqual(thisModel.getLineContent(5), ' First Line');
 	});
 
 
@@ -111,7 +111,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), 'foo ')]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, 'foo My First Line')
 			],
@@ -130,7 +130,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nNo longer')]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, 'My new line'),
 				new ModelRawLinesInserted(2, 2, ['No longer First Line']),
@@ -146,47 +146,47 @@ suite('Editor Model - Model', () => {
 
 	test('model delete empty text', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 1))]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'My First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'My First Line');
 	});
 
 	test('model delete text from one line', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'y First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'y First Line');
 	});
 
 	test('model delete text from one line 2', () => {
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), 'a')]);
-		assert.equal(thisModel.getLineContent(1), 'aMy First Line');
+		assert.strictEqual(thisModel.getLineContent(1), 'aMy First Line');
 
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 2, 1, 4))]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), 'a First Line');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), 'a First Line');
 	});
 
 	test('model delete all text from a line', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 14))]);
-		assert.equal(thisModel.getLineCount(), 5);
-		assert.equal(thisModel.getLineContent(1), '');
+		assert.strictEqual(thisModel.getLineCount(), 5);
+		assert.strictEqual(thisModel.getLineContent(1), '');
 	});
 
 	test('model delete text from two lines', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]);
-		assert.equal(thisModel.getLineCount(), 4);
-		assert.equal(thisModel.getLineContent(1), 'My Second Line');
+		assert.strictEqual(thisModel.getLineCount(), 4);
+		assert.strictEqual(thisModel.getLineContent(1), 'My Second Line');
 	});
 
 	test('model delete text from many lines', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]);
-		assert.equal(thisModel.getLineCount(), 3);
-		assert.equal(thisModel.getLineContent(1), 'My Third Line');
+		assert.strictEqual(thisModel.getLineCount(), 3);
+		assert.strictEqual(thisModel.getLineContent(1), 'My Third Line');
 	});
 
 	test('model delete everything', () => {
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 5, 2))]);
-		assert.equal(thisModel.getLineCount(), 1);
-		assert.equal(thisModel.getLineContent(1), '');
+		assert.strictEqual(thisModel.getLineCount(), 1);
+		assert.strictEqual(thisModel.getLineContent(1), '');
 	});
 
 	// --------- delete text eventing
@@ -207,7 +207,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, 'y First Line'),
 			],
@@ -226,7 +226,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 14))]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, ''),
 			],
@@ -245,7 +245,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, 'My Second Line'),
 				new ModelRawLinesDeleted(2, 2),
@@ -265,7 +265,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]);
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawLineChanged(1, 'My Third Line'),
 				new ModelRawLinesDeleted(2, 3),
@@ -279,31 +279,31 @@ suite('Editor Model - Model', () => {
 	// --------- getValueInRange
 
 	test('getValueInRange', () => {
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 1, 1)), '');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 1, 2)), 'M');
-		assert.equal(thisModel.getValueInRange(new Range(1, 2, 1, 3)), 'y');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 1, 14)), 'My First Line');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 2, 1)), 'My First Line\n');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 2, 2)), 'My First Line\n\t');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 2, 3)), 'My First Line\n\t\t');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n');
-		assert.equal(thisModel.getValueInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n    Third Line\n');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 1, 1)), '');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 1, 2)), 'M');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 2, 1, 3)), 'y');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 1, 14)), 'My First Line');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 2, 1)), 'My First Line\n');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 2, 2)), 'My First Line\n\t');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 2, 3)), 'My First Line\n\t\t');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n');
+		assert.strictEqual(thisModel.getValueInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n    Third Line\n');
 	});
 
 	// --------- getValueLengthInRange
 
 	test('getValueLengthInRange', () => {
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\n'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 2)), 'My First Line\n\t'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 3)), 'My First Line\n\t\t'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n'.length);
-		assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n    Third Line\n'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\n'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 2, 2)), 'My First Line\n\t'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 2, 3)), 'My First Line\n\t\t'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n'.length);
+		assert.strictEqual(thisModel.getValueLengthInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n    Third Line\n'.length);
 	});
 
 	// --------- setValue
@@ -316,7 +316,7 @@ suite('Editor Model - Model', () => {
 			e = _e;
 		});
 		thisModel.setValue('new value');
-		assert.deepEqual(e, new ModelRawContentChangedEvent(
+		assert.deepStrictEqual(e, new ModelRawContentChangedEvent(
 			[
 				new ModelRawFlush()
 			],
@@ -332,8 +332,8 @@ suite('Editor Model - Model', () => {
 			{ range: new Range(1, 1, 1, 1), text: 'b' },
 		], true);
 
-		assert.deepEqual(res[0].range, new Range(2, 1, 2, 2));
-		assert.deepEqual(res[1].range, new Range(1, 1, 1, 2));
+		assert.deepStrictEqual(res[0].range, new Range(2, 1, 2, 2));
+		assert.deepStrictEqual(res[1].range, new Range(1, 1, 1, 2));
 	});
 });
 
@@ -358,17 +358,17 @@ suite('Editor Model - Model Line Separators', () => {
 	});
 
 	test('model getValue', () => {
-		assert.equal(thisModel.getValue(), 'My First Line\u2028\t\tMy Second Line\n    Third Line\u2028\n1');
+		assert.strictEqual(thisModel.getValue(), 'My First Line\u2028\t\tMy Second Line\n    Third Line\u2028\n1');
 	});
 
 	test('model lines', () => {
-		assert.equal(thisModel.getLineCount(), 3);
+		assert.strictEqual(thisModel.getLineCount(), 3);
 	});
 
 	test('Bug 13333:Model should line break on lonely CR too', () => {
 		let model = createTextModel('Hello\rWorld!\r\nAnother line');
-		assert.equal(model.getLineCount(), 3);
-		assert.equal(model.getValue(), 'Hello\r\nWorld!\r\nAnother line');
+		assert.strictEqual(model.getLineCount(), 3);
+		assert.strictEqual(model.getValue(), 'Hello\r\nWorld!\r\nAnother line');
 		model.dispose();
 	});
 });
@@ -389,7 +389,7 @@ suite('Editor Model - Words', () => {
 			this._register(TokenizationRegistry.register(this.getLanguageIdentifier().language, {
 				getInitialState: (): IState => NULL_STATE,
 				tokenize: undefined!,
-				tokenize2: (line: string, state: IState): TokenizationResult2 => {
+				tokenize2: (line: string, hasEOL: boolean, state: IState): TokenizationResult2 => {
 					const tokensArr: number[] = [];
 					let prevLanguageId: LanguageIdentifier | undefined = undefined;
 					for (let i = 0; i < line.length; i++) {
@@ -434,17 +434,17 @@ suite('Editor Model - Words', () => {
 		const thisModel = createTextModel(text.join('\n'));
 		disposables.push(thisModel);
 
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 1)), { word: 'This', startColumn: 1, endColumn: 5 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 2)), { word: 'This', startColumn: 1, endColumn: 5 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 4)), { word: 'This', startColumn: 1, endColumn: 5 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 5)), { word: 'This', startColumn: 1, endColumn: 5 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 6)), { word: 'text', startColumn: 6, endColumn: 10 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 19)), { word: 'some', startColumn: 15, endColumn: 19 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 20)), null);
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 21)), { word: 'words', startColumn: 21, endColumn: 26 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 26)), { word: 'words', startColumn: 21, endColumn: 26 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 27)), null);
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 28)), null);
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 1)), { word: 'This', startColumn: 1, endColumn: 5 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 2)), { word: 'This', startColumn: 1, endColumn: 5 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 4)), { word: 'This', startColumn: 1, endColumn: 5 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 5)), { word: 'This', startColumn: 1, endColumn: 5 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 6)), { word: 'text', startColumn: 6, endColumn: 10 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 19)), { word: 'some', startColumn: 15, endColumn: 19 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 20)), null);
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 21)), { word: 'words', startColumn: 21, endColumn: 26 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 26)), { word: 'words', startColumn: 21, endColumn: 26 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 27)), null);
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 28)), null);
 	});
 
 	test('getWordAtPosition at embedded language boundaries', () => {
@@ -455,13 +455,13 @@ suite('Editor Model - Words', () => {
 		const model = createTextModel('ab<xx>ab<x>', undefined, outerMode.getLanguageIdentifier());
 		disposables.push(model);
 
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 1)), { word: 'ab', startColumn: 1, endColumn: 3 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 2)), { word: 'ab', startColumn: 1, endColumn: 3 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 3)), { word: 'ab', startColumn: 1, endColumn: 3 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 4)), { word: 'xx', startColumn: 4, endColumn: 6 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 5)), { word: 'xx', startColumn: 4, endColumn: 6 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 6)), { word: 'xx', startColumn: 4, endColumn: 6 });
-		assert.deepEqual(model.getWordAtPosition(new Position(1, 7)), { word: 'ab', startColumn: 7, endColumn: 9 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 1)), { word: 'ab', startColumn: 1, endColumn: 3 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 2)), { word: 'ab', startColumn: 1, endColumn: 3 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 3)), { word: 'ab', startColumn: 1, endColumn: 3 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 4)), { word: 'xx', startColumn: 4, endColumn: 6 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 5)), { word: 'xx', startColumn: 4, endColumn: 6 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 6)), { word: 'xx', startColumn: 4, endColumn: 6 });
+		assert.deepStrictEqual(model.getWordAtPosition(new Position(1, 7)), { word: 'ab', startColumn: 7, endColumn: 9 });
 	});
 
 	test('issue #61296: VS code freezes when editing CSS file with emoji', () => {
@@ -480,13 +480,13 @@ suite('Editor Model - Words', () => {
 		const thisModel = createTextModel('.🐷-a-b', undefined, MODE_ID);
 		disposables.push(thisModel);
 
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 1)), { word: '.', startColumn: 1, endColumn: 2 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 2)), { word: '.', startColumn: 1, endColumn: 2 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 3)), null);
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 4)), { word: '-a-b', startColumn: 4, endColumn: 8 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 5)), { word: '-a-b', startColumn: 4, endColumn: 8 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 6)), { word: '-a-b', startColumn: 4, endColumn: 8 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 7)), { word: '-a-b', startColumn: 4, endColumn: 8 });
-		assert.deepEqual(thisModel.getWordAtPosition(new Position(1, 8)), { word: '-a-b', startColumn: 4, endColumn: 8 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 1)), { word: '.', startColumn: 1, endColumn: 2 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 2)), { word: '.', startColumn: 1, endColumn: 2 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 3)), null);
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 4)), { word: '-a-b', startColumn: 4, endColumn: 8 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 5)), { word: '-a-b', startColumn: 4, endColumn: 8 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 6)), { word: '-a-b', startColumn: 4, endColumn: 8 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 7)), { word: '-a-b', startColumn: 4, endColumn: 8 });
+		assert.deepStrictEqual(thisModel.getWordAtPosition(new Position(1, 8)), { word: '-a-b', startColumn: 4, endColumn: 8 });
 	});
 });
diff --git a/src/vs/editor/test/common/model/modelDecorations.test.ts b/src/vs/editor/test/common/model/modelDecorations.test.ts
index 4f7690f11..da7b00939 100644
--- a/src/vs/editor/test/common/model/modelDecorations.test.ts
+++ b/src/vs/editor/test/common/model/modelDecorations.test.ts
@@ -28,7 +28,7 @@ function modelHasDecorations(model: TextModel, decorations: ILightWeightDecorati
 		});
 	}
 	modelDecorations.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
-	assert.deepEqual(modelDecorations, decorations);
+	assert.deepStrictEqual(modelDecorations, decorations);
 }
 
 function modelHasDecoration(model: TextModel, startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, className: string) {
@@ -39,7 +39,7 @@ function modelHasDecoration(model: TextModel, startLineNumber: number, startColu
 }
 
 function modelHasNoDecorations(model: TextModel) {
-	assert.equal(model.getAllDecorations().length, 0, 'Model has no decoration');
+	assert.strictEqual(model.getAllDecorations().length, 0, 'Model has no decoration');
 }
 
 function addDecoration(model: TextModel, startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, className: string): string {
@@ -60,7 +60,7 @@ function lineHasDecorations(model: TextModel, lineNumber: number, decorations: {
 			className: decs[i].options.className
 		});
 	}
-	assert.deepEqual(lineDecorations, decorations, 'Line decorations');
+	assert.deepStrictEqual(lineDecorations, decorations, 'Line decorations');
 }
 
 function lineHasNoDecorations(model: TextModel, lineNumber: number) {
@@ -122,12 +122,12 @@ suite('Editor Model - Model Decorations', () => {
 		addDecoration(thisModel, 1, 1, 2, 1, 'myType');
 
 		let line1Decorations = thisModel.getLineDecorations(1);
-		assert.equal(line1Decorations.length, 1);
-		assert.equal(line1Decorations[0].options.className, 'myType');
+		assert.strictEqual(line1Decorations.length, 1);
+		assert.strictEqual(line1Decorations[0].options.className, 'myType');
 
 		let line2Decorations = thisModel.getLineDecorations(1);
-		assert.equal(line2Decorations.length, 1);
-		assert.equal(line2Decorations[0].options.className, 'myType');
+		assert.strictEqual(line2Decorations.length, 1);
+		assert.strictEqual(line2Decorations[0].options.className, 'myType');
 
 		lineHasNoDecorations(thisModel, 3);
 		lineHasNoDecorations(thisModel, 4);
@@ -138,16 +138,16 @@ suite('Editor Model - Model Decorations', () => {
 		addDecoration(thisModel, 1, 2, 3, 2, 'myType');
 
 		let line1Decorations = thisModel.getLineDecorations(1);
-		assert.equal(line1Decorations.length, 1);
-		assert.equal(line1Decorations[0].options.className, 'myType');
+		assert.strictEqual(line1Decorations.length, 1);
+		assert.strictEqual(line1Decorations[0].options.className, 'myType');
 
 		let line2Decorations = thisModel.getLineDecorations(1);
-		assert.equal(line2Decorations.length, 1);
-		assert.equal(line2Decorations[0].options.className, 'myType');
+		assert.strictEqual(line2Decorations.length, 1);
+		assert.strictEqual(line2Decorations[0].options.className, 'myType');
 
 		let line3Decorations = thisModel.getLineDecorations(1);
-		assert.equal(line3Decorations.length, 1);
-		assert.equal(line3Decorations[0].options.className, 'myType');
+		assert.strictEqual(line3Decorations.length, 1);
+		assert.strictEqual(line3Decorations[0].options.className, 'myType');
 
 		lineHasNoDecorations(thisModel, 4);
 		lineHasNoDecorations(thisModel, 5);
@@ -209,7 +209,7 @@ suite('Editor Model - Model Decorations', () => {
 			listenerCalled++;
 		});
 		addDecoration(thisModel, 1, 2, 3, 2, 'myType');
-		assert.equal(listenerCalled, 1, 'listener called');
+		assert.strictEqual(listenerCalled, 1, 'listener called');
 	});
 
 	test('decorations emit event on change', () => {
@@ -221,7 +221,7 @@ suite('Editor Model - Model Decorations', () => {
 		thisModel.changeDecorations((changeAccessor) => {
 			changeAccessor.changeDecoration(decId, new Range(1, 1, 1, 2));
 		});
-		assert.equal(listenerCalled, 1, 'listener called');
+		assert.strictEqual(listenerCalled, 1, 'listener called');
 	});
 
 	test('decorations emit event on remove', () => {
@@ -233,7 +233,7 @@ suite('Editor Model - Model Decorations', () => {
 		thisModel.changeDecorations((changeAccessor) => {
 			changeAccessor.removeDecoration(decId);
 		});
-		assert.equal(listenerCalled, 1, 'listener called');
+		assert.strictEqual(listenerCalled, 1, 'listener called');
 	});
 
 	test('decorations emit event when inserting one line text before it', () => {
@@ -245,7 +245,7 @@ suite('Editor Model - Model Decorations', () => {
 		});
 
 		thisModel.applyEdits([EditOperation.insert(new Position(1, 1), 'Hallo ')]);
-		assert.equal(listenerCalled, 1, 'listener called');
+		assert.strictEqual(listenerCalled, 1, 'listener called');
 	});
 
 	test('decorations do not emit event on no-op deltaDecorations', () => {
@@ -260,7 +260,7 @@ suite('Editor Model - Model Decorations', () => {
 			accessor.deltaDecorations([], []);
 		});
 
-		assert.equal(listenerCalled, 0, 'listener not called');
+		assert.strictEqual(listenerCalled, 0, 'listener not called');
 	});
 
 	// --------- editing text & effects on decorations
@@ -429,7 +429,7 @@ suite('Decorations and editing', () => {
 			forceMoveMarkers: editForceMoveMarkers
 		}]);
 		const actual = model.getDecorationRange(id);
-		assert.deepEqual(actual, expectedDecRange, msg);
+		assert.deepStrictEqual(actual, expectedDecRange, msg);
 
 		model.dispose();
 	}
@@ -1155,20 +1155,20 @@ suite('deltaDecorations', () => {
 		let initialIds = model.deltaDecorations([], decorations.map(toModelDeltaDecoration));
 		let actualDecorations = readModelDecorations(model, initialIds);
 
-		assert.equal(initialIds.length, decorations.length, 'returns expected cnt of ids');
-		assert.equal(initialIds.length, model.getAllDecorations().length, 'does not leak decorations');
+		assert.strictEqual(initialIds.length, decorations.length, 'returns expected cnt of ids');
+		assert.strictEqual(initialIds.length, model.getAllDecorations().length, 'does not leak decorations');
 		actualDecorations.sort((a, b) => strcmp(a.id, b.id));
 		decorations.sort((a, b) => strcmp(a.id, b.id));
-		assert.deepEqual(actualDecorations, decorations);
+		assert.deepStrictEqual(actualDecorations, decorations);
 
 		let newIds = model.deltaDecorations(initialIds, newDecorations.map(toModelDeltaDecoration));
 		let actualNewDecorations = readModelDecorations(model, newIds);
 
-		assert.equal(newIds.length, newDecorations.length, 'returns expected cnt of ids');
-		assert.equal(newIds.length, model.getAllDecorations().length, 'does not leak decorations');
+		assert.strictEqual(newIds.length, newDecorations.length, 'returns expected cnt of ids');
+		assert.strictEqual(newIds.length, model.getAllDecorations().length, 'does not leak decorations');
 		actualNewDecorations.sort((a, b) => strcmp(a.id, b.id));
 		newDecorations.sort((a, b) => strcmp(a.id, b.id));
-		assert.deepEqual(actualDecorations, decorations);
+		assert.deepStrictEqual(actualDecorations, decorations);
 
 		model.dispose();
 	}
@@ -1188,8 +1188,8 @@ suite('deltaDecorations', () => {
 			toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
 		]);
 
-		assert.deepEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
-		assert.deepEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
+		assert.deepStrictEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
+		assert.deepStrictEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
 
 		model.dispose();
 	});
@@ -1294,7 +1294,7 @@ suite('deltaDecorations', () => {
 
 		let actualDecoration = model.getDecorationOptions(ids[0]);
 
-		assert.deepEqual(actualDecoration!.hoverMessage, { value: 'hello2' });
+		assert.deepStrictEqual(actualDecoration!.hoverMessage, { value: 'hello2' });
 
 		model.dispose();
 	});
@@ -1326,16 +1326,16 @@ suite('deltaDecorations', () => {
 			toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
 		]);
 
-		assert.deepEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
-		assert.deepEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
+		assert.deepStrictEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
+		assert.deepStrictEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
 
 		ids = model.deltaDecorations(ids, [
 			toModelDeltaDecoration(decoration('a', 1, 1, 1, 12)),
 			toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
 		]);
 
-		assert.deepEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
-		assert.deepEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
+		assert.deepStrictEqual(model.getDecorationRange(ids[0]), range(1, 1, 1, 12));
+		assert.deepStrictEqual(model.getDecorationRange(ids[1]), range(2, 1, 2, 13));
 
 		model.dispose();
 	});
@@ -1365,7 +1365,7 @@ suite('deltaDecorations', () => {
 
 		let inRangeClassNames = inRange.map(d => d.options.className);
 		inRangeClassNames.sort();
-		assert.deepEqual(inRangeClassNames, ['x1', 'x2', 'x3', 'x4']);
+		assert.deepStrictEqual(inRangeClassNames, ['x1', 'x2', 'x3', 'x4']);
 
 		model.dispose();
 	});
@@ -1383,7 +1383,7 @@ suite('deltaDecorations', () => {
 			forceMoveMarkers: false
 		}]);
 		const actual = model.getDecorationRange(id);
-		assert.deepEqual(actual, new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(actual, new Range(1, 1, 1, 1));
 
 		model.dispose();
 	});
diff --git a/src/vs/editor/test/common/model/modelEditOperation.test.ts b/src/vs/editor/test/common/model/modelEditOperation.test.ts
index 058c5d3d5..d6c2af9b9 100644
--- a/src/vs/editor/test/common/model/modelEditOperation.test.ts
+++ b/src/vs/editor/test/common/model/modelEditOperation.test.ts
@@ -52,19 +52,19 @@ suite('Editor Model - Model Edit Operation', () => {
 
 		let inverseEditOp = model.applyEdits(editOp, true);
 
-		assert.equal(model.getLineCount(), editedLines.length);
+		assert.strictEqual(model.getLineCount(), editedLines.length);
 		for (let i = 0; i < editedLines.length; i++) {
-			assert.equal(model.getLineContent(i + 1), editedLines[i]);
+			assert.strictEqual(model.getLineContent(i + 1), editedLines[i]);
 		}
 
 		let originalOp = model.applyEdits(inverseEditOp, true);
 
-		assert.equal(model.getLineCount(), 5);
-		assert.equal(model.getLineContent(1), LINE1);
-		assert.equal(model.getLineContent(2), LINE2);
-		assert.equal(model.getLineContent(3), LINE3);
-		assert.equal(model.getLineContent(4), LINE4);
-		assert.equal(model.getLineContent(5), LINE5);
+		assert.strictEqual(model.getLineCount(), 5);
+		assert.strictEqual(model.getLineContent(1), LINE1);
+		assert.strictEqual(model.getLineContent(2), LINE2);
+		assert.strictEqual(model.getLineContent(3), LINE3);
+		assert.strictEqual(model.getLineContent(4), LINE4);
+		assert.strictEqual(model.getLineContent(5), LINE5);
 
 		const simplifyEdit = (edit: IIdentifiedSingleEditOperation) => {
 			return {
@@ -75,7 +75,7 @@ suite('Editor Model - Model Edit Operation', () => {
 				isAutoWhitespaceEdit: edit.isAutoWhitespaceEdit || false
 			};
 		};
-		assert.deepEqual(originalOp.map(simplifyEdit), editOp.map(simplifyEdit));
+		assert.deepStrictEqual(originalOp.map(simplifyEdit), editOp.map(simplifyEdit));
 	}
 
 	test('Insert inline', () => {
diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
index 019b23f4f..04fc6d743 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -77,11 +77,11 @@ function trimLineFeed(text: string): string {
 
 function testLinesContent(str: string, pieceTable: PieceTreeBase) {
 	let lines = splitLines(str);
-	assert.equal(pieceTable.getLineCount(), lines.length);
-	assert.equal(pieceTable.getLinesRawContent(), str);
+	assert.strictEqual(pieceTable.getLineCount(), lines.length);
+	assert.strictEqual(pieceTable.getLinesRawContent(), str);
 	for (let i = 0; i < lines.length; i++) {
-		assert.equal(pieceTable.getLineContent(i + 1), lines[i]);
-		assert.equal(
+		assert.strictEqual(pieceTable.getLineContent(i + 1), lines[i]);
+		assert.strictEqual(
 			trimLineFeed(
 				pieceTable.getValueInRange(
 					new Range(
@@ -136,16 +136,16 @@ function testLineStarts(str: string, pieceTable: PieceTreeBase) {
 	} while (m);
 
 	for (let i = 0; i < lineStarts.length; i++) {
-		assert.deepEqual(
+		assert.deepStrictEqual(
 			pieceTable.getPositionAt(lineStarts[i]),
 			new Position(i + 1, 1)
 		);
-		assert.equal(pieceTable.getOffsetAt(i + 1, 1), lineStarts[i]);
+		assert.strictEqual(pieceTable.getOffsetAt(i + 1, 1), lineStarts[i]);
 	}
 
 	for (let i = 1; i < lineStarts.length; i++) {
 		let pos = pieceTable.getPositionAt(lineStarts[i] - 1);
-		assert.equal(
+		assert.strictEqual(
 			pieceTable.getOffsetAt(pos.lineNumber, pos.column),
 			lineStarts[i] - 1
 		);
@@ -158,7 +158,7 @@ function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTre
 		bufferBuilder.acceptChunk(chunk);
 	}
 	let factory = bufferBuilder.finish(normalizeEOL);
-	return (<PieceTreeTextBuffer>factory.create(DefaultEndOfLine.LF)).getPieceTree();
+	return (<PieceTreeTextBuffer>factory.create(DefaultEndOfLine.LF).textBuffer).getPieceTree();
 }
 
 function assertTreeInvariants(T: PieceTreeBase): void {
@@ -219,12 +219,12 @@ suite('inserts and deletes', () => {
 		]);
 
 		pieceTable.insert(34, 'This is some more text to insert at offset 34.');
-		assert.equal(
+		assert.strictEqual(
 			pieceTable.getLinesRawContent(),
 			'This is a document with some text.This is some more text to insert at offset 34.'
 		);
 		pieceTable.delete(42, 5);
-		assert.equal(
+		assert.strictEqual(
 			pieceTable.getLinesRawContent(),
 			'This is a document with some text.This is more text to insert at offset 34.'
 		);
@@ -235,28 +235,28 @@ suite('inserts and deletes', () => {
 		let pt = createTextBuffer(['']);
 
 		pt.insert(0, 'AAA');
-		assert.equal(pt.getLinesRawContent(), 'AAA');
+		assert.strictEqual(pt.getLinesRawContent(), 'AAA');
 		pt.insert(0, 'BBB');
-		assert.equal(pt.getLinesRawContent(), 'BBBAAA');
+		assert.strictEqual(pt.getLinesRawContent(), 'BBBAAA');
 		pt.insert(6, 'CCC');
-		assert.equal(pt.getLinesRawContent(), 'BBBAAACCC');
+		assert.strictEqual(pt.getLinesRawContent(), 'BBBAAACCC');
 		pt.insert(5, 'DDD');
-		assert.equal(pt.getLinesRawContent(), 'BBBAADDDACCC');
+		assert.strictEqual(pt.getLinesRawContent(), 'BBBAADDDACCC');
 		assertTreeInvariants(pt);
 	});
 
 	test('more deletes', () => {
 		let pt = createTextBuffer(['012345678']);
 		pt.delete(8, 1);
-		assert.equal(pt.getLinesRawContent(), '01234567');
+		assert.strictEqual(pt.getLinesRawContent(), '01234567');
 		pt.delete(0, 1);
-		assert.equal(pt.getLinesRawContent(), '1234567');
+		assert.strictEqual(pt.getLinesRawContent(), '1234567');
 		pt.delete(5, 1);
-		assert.equal(pt.getLinesRawContent(), '123457');
+		assert.strictEqual(pt.getLinesRawContent(), '123457');
 		pt.delete(5, 1);
-		assert.equal(pt.getLinesRawContent(), '12345');
+		assert.strictEqual(pt.getLinesRawContent(), '12345');
 		pt.delete(0, 5);
-		assert.equal(pt.getLinesRawContent(), '');
+		assert.strictEqual(pt.getLinesRawContent(), '');
 		assertTreeInvariants(pt);
 	});
 
@@ -265,17 +265,17 @@ suite('inserts and deletes', () => {
 		let pieceTable = createTextBuffer(['']);
 		pieceTable.insert(0, 'ceLPHmFzvCtFeHkCBej ');
 		str = str.substring(0, 0) + 'ceLPHmFzvCtFeHkCBej ' + str.substring(0);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		pieceTable.insert(8, 'gDCEfNYiBUNkSwtvB K ');
 		str = str.substring(0, 8) + 'gDCEfNYiBUNkSwtvB K ' + str.substring(8);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		pieceTable.insert(38, 'cyNcHxjNPPoehBJldLS ');
 		str = str.substring(0, 38) + 'cyNcHxjNPPoehBJldLS ' + str.substring(38);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		pieceTable.insert(59, 'ejMx\nOTgWlbpeDExjOk ');
 		str = str.substring(0, 59) + 'ejMx\nOTgWlbpeDExjOk ' + str.substring(59);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -293,7 +293,7 @@ suite('inserts and deletes', () => {
 		pieceTable.insert(10, 'Gbtp ');
 		str = str.substring(0, 10) + 'Gbtp ' + str.substring(10);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -310,7 +310,7 @@ suite('inserts and deletes', () => {
 		str = str.substring(0, 2) + 'GGZB' + str.substring(2);
 		pieceTable.insert(12, 'wXpq');
 		str = str.substring(0, 12) + 'wXpq' + str.substring(12);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 	});
 
 	test('random delete 1', () => {
@@ -319,30 +319,30 @@ suite('inserts and deletes', () => {
 
 		pieceTable.insert(0, 'vfb');
 		str = str.substring(0, 0) + 'vfb' + str.substring(0);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		pieceTable.insert(0, 'zRq');
 		str = str.substring(0, 0) + 'zRq' + str.substring(0);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		pieceTable.delete(5, 1);
 		str = str.substring(0, 5) + str.substring(5 + 1);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		pieceTable.insert(1, 'UNw');
 		str = str.substring(0, 1) + 'UNw' + str.substring(1);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		pieceTable.delete(4, 3);
 		str = str.substring(0, 4) + str.substring(4 + 3);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		pieceTable.delete(1, 4);
 		str = str.substring(0, 1) + str.substring(1 + 4);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		pieceTable.delete(0, 1);
 		str = str.substring(0, 0) + str.substring(0 + 1);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -368,7 +368,7 @@ suite('inserts and deletes', () => {
 		str = str.substring(0, 6) + str.substring(6 + 7);
 		pieceTable.delete(3, 5);
 		str = str.substring(0, 3) + str.substring(3 + 5);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -401,7 +401,7 @@ suite('inserts and deletes', () => {
 		str = str.substring(0, 5) + str.substring(5 + 8);
 		pieceTable.delete(3, 4);
 		str = str.substring(0, 3) + str.substring(3 + 4);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -427,7 +427,7 @@ suite('inserts and deletes', () => {
 		pieceTable.insert(5, '\n\na\r');
 		str = str.substring(0, 5) + '\n\na\r' + str.substring(5);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -455,7 +455,7 @@ suite('inserts and deletes', () => {
 		pieceTable.insert(2, 'a\ra\n');
 		str = str.substring(0, 2) + 'a\ra\n' + str.substring(2);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -480,11 +480,11 @@ suite('inserts and deletes', () => {
 		str = str.substring(0, 5) + '\n\na\r' + str.substring(5);
 		pieceTable.insert(10, '\r\r\n\r');
 		str = str.substring(0, 10) + '\r\r\n\r' + str.substring(10);
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		pieceTable.delete(21, 3);
 		str = str.substring(0, 21) + str.substring(21 + 3);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -512,7 +512,7 @@ suite('inserts and deletes', () => {
 		pieceTable.insert(3, 'a\naa');
 		str = str.substring(0, 3) + 'a\naa' + str.substring(3);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 	test('random insert/delete \\r bug 5', () => {
@@ -539,7 +539,7 @@ suite('inserts and deletes', () => {
 		pieceTable.insert(15, '\n\r\r\r');
 		str = str.substring(0, 15) + '\n\r\r\r' + str.substring(15);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		assertTreeInvariants(pieceTable);
 	});
 });
@@ -548,22 +548,22 @@ suite('prefix sum for line feed', () => {
 	test('basic', () => {
 		let pieceTable = createTextBuffer(['1\n2\n3\n4']);
 
-		assert.equal(pieceTable.getLineCount(), 4);
-		assert.deepEqual(pieceTable.getPositionAt(0), new Position(1, 1));
-		assert.deepEqual(pieceTable.getPositionAt(1), new Position(1, 2));
-		assert.deepEqual(pieceTable.getPositionAt(2), new Position(2, 1));
-		assert.deepEqual(pieceTable.getPositionAt(3), new Position(2, 2));
-		assert.deepEqual(pieceTable.getPositionAt(4), new Position(3, 1));
-		assert.deepEqual(pieceTable.getPositionAt(5), new Position(3, 2));
-		assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1));
+		assert.strictEqual(pieceTable.getLineCount(), 4);
+		assert.deepStrictEqual(pieceTable.getPositionAt(0), new Position(1, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(1), new Position(1, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(2), new Position(2, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(3), new Position(2, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(4), new Position(3, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(5), new Position(3, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(6), new Position(4, 1));
 
-		assert.equal(pieceTable.getOffsetAt(1, 1), 0);
-		assert.equal(pieceTable.getOffsetAt(1, 2), 1);
-		assert.equal(pieceTable.getOffsetAt(2, 1), 2);
-		assert.equal(pieceTable.getOffsetAt(2, 2), 3);
-		assert.equal(pieceTable.getOffsetAt(3, 1), 4);
-		assert.equal(pieceTable.getOffsetAt(3, 2), 5);
-		assert.equal(pieceTable.getOffsetAt(4, 1), 6);
+		assert.strictEqual(pieceTable.getOffsetAt(1, 1), 0);
+		assert.strictEqual(pieceTable.getOffsetAt(1, 2), 1);
+		assert.strictEqual(pieceTable.getOffsetAt(2, 1), 2);
+		assert.strictEqual(pieceTable.getOffsetAt(2, 2), 3);
+		assert.strictEqual(pieceTable.getOffsetAt(3, 1), 4);
+		assert.strictEqual(pieceTable.getOffsetAt(3, 2), 5);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 1), 6);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -571,9 +571,9 @@ suite('prefix sum for line feed', () => {
 		let pieceTable = createTextBuffer(['a\nb\nc\nde']);
 		pieceTable.insert(8, 'fh\ni\njk');
 
-		assert.equal(pieceTable.getLineCount(), 6);
-		assert.deepEqual(pieceTable.getPositionAt(9), new Position(4, 4));
-		assert.equal(pieceTable.getOffsetAt(1, 1), 0);
+		assert.strictEqual(pieceTable.getLineCount(), 6);
+		assert.deepStrictEqual(pieceTable.getPositionAt(9), new Position(4, 4));
+		assert.strictEqual(pieceTable.getOffsetAt(1, 1), 0);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -581,22 +581,22 @@ suite('prefix sum for line feed', () => {
 		let pieceTable = createTextBuffer(['a\nb\nc\nde']);
 		pieceTable.insert(7, 'fh\ni\njk');
 
-		assert.equal(pieceTable.getLineCount(), 6);
-		assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1));
-		assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2));
-		assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3));
-		assert.deepEqual(pieceTable.getPositionAt(9), new Position(4, 4));
-		assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 1));
-		assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 2));
-		assert.deepEqual(pieceTable.getPositionAt(14), new Position(6, 3));
+		assert.strictEqual(pieceTable.getLineCount(), 6);
+		assert.deepStrictEqual(pieceTable.getPositionAt(6), new Position(4, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(7), new Position(4, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(8), new Position(4, 3));
+		assert.deepStrictEqual(pieceTable.getPositionAt(9), new Position(4, 4));
+		assert.deepStrictEqual(pieceTable.getPositionAt(12), new Position(6, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(13), new Position(6, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(14), new Position(6, 3));
 
-		assert.equal(pieceTable.getOffsetAt(4, 1), 6);
-		assert.equal(pieceTable.getOffsetAt(4, 2), 7);
-		assert.equal(pieceTable.getOffsetAt(4, 3), 8);
-		assert.equal(pieceTable.getOffsetAt(4, 4), 9);
-		assert.equal(pieceTable.getOffsetAt(6, 1), 12);
-		assert.equal(pieceTable.getOffsetAt(6, 2), 13);
-		assert.equal(pieceTable.getOffsetAt(6, 3), 14);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 1), 6);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 2), 7);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 3), 8);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 4), 9);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 1), 12);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 2), 13);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 3), 14);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -604,23 +604,23 @@ suite('prefix sum for line feed', () => {
 		let pieceTable = createTextBuffer(['a\nb\nc\ndefh\ni\njk']);
 		pieceTable.delete(7, 2);
 
-		assert.equal(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk');
-		assert.equal(pieceTable.getLineCount(), 6);
-		assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1));
-		assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2));
-		assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3));
-		assert.deepEqual(pieceTable.getPositionAt(9), new Position(5, 1));
-		assert.deepEqual(pieceTable.getPositionAt(11), new Position(6, 1));
-		assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 2));
-		assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 3));
+		assert.strictEqual(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk');
+		assert.strictEqual(pieceTable.getLineCount(), 6);
+		assert.deepStrictEqual(pieceTable.getPositionAt(6), new Position(4, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(7), new Position(4, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(8), new Position(4, 3));
+		assert.deepStrictEqual(pieceTable.getPositionAt(9), new Position(5, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(11), new Position(6, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(12), new Position(6, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(13), new Position(6, 3));
 
-		assert.equal(pieceTable.getOffsetAt(4, 1), 6);
-		assert.equal(pieceTable.getOffsetAt(4, 2), 7);
-		assert.equal(pieceTable.getOffsetAt(4, 3), 8);
-		assert.equal(pieceTable.getOffsetAt(5, 1), 9);
-		assert.equal(pieceTable.getOffsetAt(6, 1), 11);
-		assert.equal(pieceTable.getOffsetAt(6, 2), 12);
-		assert.equal(pieceTable.getOffsetAt(6, 3), 13);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 1), 6);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 2), 7);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 3), 8);
+		assert.strictEqual(pieceTable.getOffsetAt(5, 1), 9);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 1), 11);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 2), 12);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 3), 13);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -629,23 +629,23 @@ suite('prefix sum for line feed', () => {
 		pieceTable.insert(8, 'fh\ni\njk');
 		pieceTable.delete(7, 2);
 
-		assert.equal(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk');
-		assert.equal(pieceTable.getLineCount(), 6);
-		assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1));
-		assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2));
-		assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3));
-		assert.deepEqual(pieceTable.getPositionAt(9), new Position(5, 1));
-		assert.deepEqual(pieceTable.getPositionAt(11), new Position(6, 1));
-		assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 2));
-		assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 3));
+		assert.strictEqual(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk');
+		assert.strictEqual(pieceTable.getLineCount(), 6);
+		assert.deepStrictEqual(pieceTable.getPositionAt(6), new Position(4, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(7), new Position(4, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(8), new Position(4, 3));
+		assert.deepStrictEqual(pieceTable.getPositionAt(9), new Position(5, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(11), new Position(6, 1));
+		assert.deepStrictEqual(pieceTable.getPositionAt(12), new Position(6, 2));
+		assert.deepStrictEqual(pieceTable.getPositionAt(13), new Position(6, 3));
 
-		assert.equal(pieceTable.getOffsetAt(4, 1), 6);
-		assert.equal(pieceTable.getOffsetAt(4, 2), 7);
-		assert.equal(pieceTable.getOffsetAt(4, 3), 8);
-		assert.equal(pieceTable.getOffsetAt(5, 1), 9);
-		assert.equal(pieceTable.getOffsetAt(6, 1), 11);
-		assert.equal(pieceTable.getOffsetAt(6, 2), 12);
-		assert.equal(pieceTable.getOffsetAt(6, 3), 13);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 1), 6);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 2), 7);
+		assert.strictEqual(pieceTable.getOffsetAt(4, 3), 8);
+		assert.strictEqual(pieceTable.getOffsetAt(5, 1), 9);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 1), 11);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 2), 12);
+		assert.strictEqual(pieceTable.getOffsetAt(6, 3), 13);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -661,7 +661,7 @@ suite('prefix sum for line feed', () => {
 		str =
 			str.substring(0, 14) + 'X ZZ\nYZZYZXXY Y XY\n ' + str.substring(14);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -675,7 +675,7 @@ suite('prefix sum for line feed', () => {
 		pieceTable.insert(3, 'XXY \n\nY Y YYY  ZYXY ');
 		str = str.substring(0, 3) + 'XXY \n\nY Y YYY  ZYXY ' + str.substring(3);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -803,12 +803,12 @@ suite('get text in range', () => {
 		pieceTable.delete(7, 2);
 		// 'a\nb\nc\ndh\ni\njk'
 
-		assert.equal(pieceTable.getValueInRange(new Range(1, 1, 1, 3)), 'a\n');
-		assert.equal(pieceTable.getValueInRange(new Range(2, 1, 2, 3)), 'b\n');
-		assert.equal(pieceTable.getValueInRange(new Range(3, 1, 3, 3)), 'c\n');
-		assert.equal(pieceTable.getValueInRange(new Range(4, 1, 4, 4)), 'dh\n');
-		assert.equal(pieceTable.getValueInRange(new Range(5, 1, 5, 3)), 'i\n');
-		assert.equal(pieceTable.getValueInRange(new Range(6, 1, 6, 3)), 'jk');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(1, 1, 1, 3)), 'a\n');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(2, 1, 2, 3)), 'b\n');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(3, 1, 3, 3)), 'c\n');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(4, 1, 4, 4)), 'dh\n');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(5, 1, 5, 3)), 'i\n');
+		assert.strictEqual(pieceTable.getValueInRange(new Range(6, 1, 6, 3)), 'jk');
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -902,18 +902,18 @@ suite('get text in range', () => {
 
 	test('get line content', () => {
 		let pieceTable = createTextBuffer(['1']);
-		assert.equal(pieceTable.getLineRawContent(1), '1');
+		assert.strictEqual(pieceTable.getLineRawContent(1), '1');
 		pieceTable.insert(1, '2');
-		assert.equal(pieceTable.getLineRawContent(1), '12');
+		assert.strictEqual(pieceTable.getLineRawContent(1), '12');
 		assertTreeInvariants(pieceTable);
 	});
 
 	test('get line content basic', () => {
 		let pieceTable = createTextBuffer(['1\n2\n3\n4']);
-		assert.equal(pieceTable.getLineRawContent(1), '1\n');
-		assert.equal(pieceTable.getLineRawContent(2), '2\n');
-		assert.equal(pieceTable.getLineRawContent(3), '3\n');
-		assert.equal(pieceTable.getLineRawContent(4), '4');
+		assert.strictEqual(pieceTable.getLineRawContent(1), '1\n');
+		assert.strictEqual(pieceTable.getLineRawContent(2), '2\n');
+		assert.strictEqual(pieceTable.getLineRawContent(3), '3\n');
+		assert.strictEqual(pieceTable.getLineRawContent(4), '4');
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -923,12 +923,12 @@ suite('get text in range', () => {
 		pieceTable.delete(7, 2);
 		// 'a\nb\nc\ndh\ni\njk'
 
-		assert.equal(pieceTable.getLineRawContent(1), 'a\n');
-		assert.equal(pieceTable.getLineRawContent(2), 'b\n');
-		assert.equal(pieceTable.getLineRawContent(3), 'c\n');
-		assert.equal(pieceTable.getLineRawContent(4), 'dh\n');
-		assert.equal(pieceTable.getLineRawContent(5), 'i\n');
-		assert.equal(pieceTable.getLineRawContent(6), 'jk');
+		assert.strictEqual(pieceTable.getLineRawContent(1), 'a\n');
+		assert.strictEqual(pieceTable.getLineRawContent(2), 'b\n');
+		assert.strictEqual(pieceTable.getLineRawContent(3), 'c\n');
+		assert.strictEqual(pieceTable.getLineRawContent(4), 'dh\n');
+		assert.strictEqual(pieceTable.getLineRawContent(5), 'i\n');
+		assert.strictEqual(pieceTable.getLineRawContent(6), 'jk');
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -973,7 +973,7 @@ suite('CRLF', () => {
 		pieceTable.insert(0, 'a\r\nb');
 		pieceTable.delete(0, 2);
 
-		assert.equal(pieceTable.getLineCount(), 2);
+		assert.strictEqual(pieceTable.getLineCount(), 2);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -982,7 +982,7 @@ suite('CRLF', () => {
 		pieceTable.insert(0, 'a\r\nb');
 		pieceTable.delete(2, 2);
 
-		assert.equal(pieceTable.getLineCount(), 2);
+		assert.strictEqual(pieceTable.getLineCount(), 2);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -999,7 +999,7 @@ suite('CRLF', () => {
 		str = str.substring(0, 2) + str.substring(2 + 3);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 	test('random bug 2', () => {
@@ -1014,7 +1014,7 @@ suite('CRLF', () => {
 		str = str.substring(0, 4) + str.substring(4 + 1);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 	test('random bug 3', () => {
@@ -1035,7 +1035,7 @@ suite('CRLF', () => {
 		str = str.substring(0, 3) + '\r\r\r\n' + str.substring(3);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 	test('random bug 4', () => {
@@ -1185,14 +1185,14 @@ suite('centralized lineStarts with CRLF', () => {
 	test('delete CR in CRLF 1', () => {
 		let pieceTable = createTextBuffer(['a\r\nb'], false);
 		pieceTable.delete(2, 2);
-		assert.equal(pieceTable.getLineCount(), 2);
+		assert.strictEqual(pieceTable.getLineCount(), 2);
 		assertTreeInvariants(pieceTable);
 	});
 	test('delete CR in CRLF 2', () => {
 		let pieceTable = createTextBuffer(['a\r\nb']);
 		pieceTable.delete(0, 2);
 
-		assert.equal(pieceTable.getLineCount(), 2);
+		assert.strictEqual(pieceTable.getLineCount(), 2);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -1207,7 +1207,7 @@ suite('centralized lineStarts with CRLF', () => {
 		str = str.substring(0, 2) + str.substring(2 + 3);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 	test('random bug 2', () => {
@@ -1220,7 +1220,7 @@ suite('centralized lineStarts with CRLF', () => {
 		str = str.substring(0, 4) + str.substring(4 + 1);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -1240,7 +1240,7 @@ suite('centralized lineStarts with CRLF', () => {
 		str = str.substring(0, 3) + '\r\r\r\n' + str.substring(3);
 
 		let lines = splitLines(str);
-		assert.equal(pieceTable.getLineCount(), lines.length);
+		assert.strictEqual(pieceTable.getLineCount(), lines.length);
 		assertTreeInvariants(pieceTable);
 	});
 
@@ -1386,7 +1386,7 @@ suite('centralized lineStarts with CRLF', () => {
 		pieceTable.insert(7, '\r\r\r\r');
 		str = str.substring(0, 7) + '\r\r\r\r' + str.substring(7);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -1407,7 +1407,7 @@ suite('centralized lineStarts with CRLF', () => {
 		pieceTable.delete(11, 2);
 		str = str.substring(0, 11) + str.substring(11 + 2);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -1424,7 +1424,7 @@ suite('centralized lineStarts with CRLF', () => {
 		pieceTable.delete(1, 2);
 		str = str.substring(0, 1) + str.substring(1 + 2);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -1437,7 +1437,7 @@ suite('centralized lineStarts with CRLF', () => {
 		pieceTable.insert(3, '\r\n\n\n');
 		str = str.substring(0, 3) + '\r\n\n\n' + str.substring(3);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		assertTreeInvariants(pieceTable);
 	});
@@ -1469,7 +1469,7 @@ suite('random is unsupervised', () => {
 		pieceTable.insert(0, 'VZXXZYZX\r');
 		str = str.substring(0, 0) + 'VZXXZYZX\r' + str.substring(0);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		testLineStarts(str, pieceTable);
 		testLinesContent(str, pieceTable);
@@ -1507,7 +1507,7 @@ suite('random is unsupervised', () => {
 		}
 		// console.log(output);
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 
 		testLineStarts(str, pieceTable);
 		testLinesContent(str, pieceTable);
@@ -1543,7 +1543,7 @@ suite('random is unsupervised', () => {
 			}
 		}
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		testLinesContent(str, pieceTable);
 		assertTreeInvariants(pieceTable);
@@ -1577,7 +1577,7 @@ suite('random is unsupervised', () => {
 			testLinesContent(str, pieceTable);
 		}
 
-		assert.equal(pieceTable.getLinesRawContent(), str);
+		assert.strictEqual(pieceTable.getLinesRawContent(), str);
 		testLineStarts(str, pieceTable);
 		testLinesContent(str, pieceTable);
 		assertTreeInvariants(pieceTable);
@@ -1612,33 +1612,33 @@ suite('buffer api', () => {
 
 	test('getLineCharCode - issue #45735', () => {
 		let pieceTable = createTextBuffer(['LINE1\nline2']);
-		assert.equal(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
-		assert.equal(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
-		assert.equal(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
-		assert.equal(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
-		assert.equal(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
-		assert.equal(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
-		assert.equal(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
-		assert.equal(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
-		assert.equal(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
-		assert.equal(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
-		assert.equal(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
 	});
 
 
 	test('getLineCharCode - issue #47733', () => {
 		let pieceTable = createTextBuffer(['', 'LINE1\n', 'line2']);
-		assert.equal(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
-		assert.equal(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
-		assert.equal(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
-		assert.equal(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
-		assert.equal(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
-		assert.equal(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
-		assert.equal(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
-		assert.equal(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
-		assert.equal(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
-		assert.equal(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
-		assert.equal(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
+		assert.strictEqual(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
+		assert.strictEqual(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
 	});
 });
 
@@ -1771,7 +1771,7 @@ suite('snapshot', () => {
 		]);
 		const snapshot = model.createSnapshot();
 		const snapshot1 = model.createSnapshot();
-		assert.equal(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
+		assert.strictEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
 
 		model.applyEdits([
 			{
@@ -1786,7 +1786,7 @@ suite('snapshot', () => {
 			}
 		]);
 
-		assert.equal(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot1));
+		assert.strictEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot1));
 	});
 
 	test('immutable snapshot 1', () => {
@@ -1806,7 +1806,7 @@ suite('snapshot', () => {
 			}
 		]);
 
-		assert.equal(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
+		assert.strictEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
 	});
 
 	test('immutable snapshot 2', () => {
@@ -1826,7 +1826,7 @@ suite('snapshot', () => {
 			}
 		]);
 
-		assert.equal(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
+		assert.strictEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
 	});
 
 	test('immutable snapshot 3', () => {
@@ -1845,7 +1845,7 @@ suite('snapshot', () => {
 			}
 		]);
 
-		assert.notEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
+		assert.notStrictEqual(model.getLinesContent().join('\n'), getValueInSnapshot(snapshot));
 	});
 });
 
@@ -1854,7 +1854,7 @@ suite('chunk based search', () => {
 		let pieceTree = createTextBuffer(['']);
 		pieceTree.delete(0, 1);
 		let ret = pieceTree.findMatchesLineByLine(new Range(1, 1, 1, 1), new SearchData(/abc/, new WordCharacterClassifier(',./'), 'abc'), true, 1000);
-		assert.equal(ret.length, 0);
+		assert.strictEqual(ret.length, 0);
 	});
 
 	test('#45770. FindInNode should not cross node boundary.', () => {
@@ -1873,11 +1873,11 @@ suite('chunk based search', () => {
 
 		pieceTree.insert(16, ' ');
 		let ret = pieceTree.findMatchesLineByLine(new Range(1, 1, 4, 13), new SearchData(/\[/gi, new WordCharacterClassifier(',./'), '['), true, 1000);
-		assert.equal(ret.length, 3);
+		assert.strictEqual(ret.length, 3);
 
-		assert.deepEqual(ret[0].range, new Range(2, 3, 2, 4));
-		assert.deepEqual(ret[1].range, new Range(3, 3, 3, 4));
-		assert.deepEqual(ret[2].range, new Range(4, 3, 4, 4));
+		assert.deepStrictEqual(ret[0].range, new Range(2, 3, 2, 4));
+		assert.deepStrictEqual(ret[1].range, new Range(3, 3, 3, 4));
+		assert.deepStrictEqual(ret[2].range, new Range(4, 3, 4, 4));
 	});
 
 	test('search searching from the middle', () => {
@@ -1889,12 +1889,12 @@ suite('chunk based search', () => {
 		]);
 		pieceTree.delete(4, 1);
 		let ret = pieceTree.findMatchesLineByLine(new Range(2, 3, 2, 6), new SearchData(/a/gi, null, 'a'), true, 1000);
-		assert.equal(ret.length, 1);
-		assert.deepEqual(ret[0].range, new Range(2, 3, 2, 4));
+		assert.strictEqual(ret.length, 1);
+		assert.deepStrictEqual(ret[0].range, new Range(2, 3, 2, 4));
 
 		pieceTree.delete(4, 1);
 		ret = pieceTree.findMatchesLineByLine(new Range(2, 2, 2, 5), new SearchData(/a/gi, null, 'a'), true, 1000);
-		assert.equal(ret.length, 1);
-		assert.deepEqual(ret[0].range, new Range(2, 2, 2, 3));
+		assert.strictEqual(ret.length, 1);
+		assert.deepStrictEqual(ret[0].range, new Range(2, 2, 2, 3));
 	});
 });
diff --git a/src/vs/editor/test/common/model/textChange.test.ts b/src/vs/editor/test/common/model/textChange.test.ts
index d6d42dfc6..bbc29ea57 100644
--- a/src/vs/editor/test/common/model/textChange.test.ts
+++ b/src/vs/editor/test/common/model/textChange.test.ts
@@ -75,7 +75,7 @@ suite('TextChangeCompressor', () => {
 			};
 		});
 		let actualDoResult = getResultingContent(initialText, compressedDoTextEdits);
-		assert.equal(actualDoResult, finalText);
+		assert.strictEqual(actualDoResult, finalText);
 
 		let compressedUndoTextEdits: IGeneratedEdit[] = compressedTextChanges.map((change) => {
 			return {
@@ -85,7 +85,7 @@ suite('TextChangeCompressor', () => {
 			};
 		});
 		let actualUndoResult = getResultingContent(finalText, compressedUndoTextEdits);
-		assert.equal(actualUndoResult, initialText);
+		assert.strictEqual(actualUndoResult, initialText);
 	}
 
 	test('simple 1', () => {
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index 2da334170..2d8e6bbde 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -22,8 +22,8 @@ function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: numb
 	let r = m.getOptions();
 	m.dispose();
 
-	assert.equal(r.insertSpaces, expectedInsertSpaces, msg);
-	assert.equal(r.tabSize, expectedTabSize, msg);
+	assert.strictEqual(r.insertSpaces, expectedInsertSpaces, msg);
+	assert.strictEqual(r.tabSize, expectedTabSize, msg);
 }
 
 function assertGuess(expectedInsertSpaces: boolean | undefined, expectedTabSize: number | undefined | [number], text: string[], msg?: string): void {
@@ -75,14 +75,14 @@ suite('TextModelData.fromString', () => {
 	}
 
 	function testTextModelDataFromString(text: string, expected: ITextBufferData): void {
-		const textBuffer = createTextBuffer(text, TextModel.DEFAULT_CREATION_OPTIONS.defaultEOL);
+		const textBuffer = createTextBuffer(text, TextModel.DEFAULT_CREATION_OPTIONS.defaultEOL).textBuffer;
 		let actual: ITextBufferData = {
 			EOL: textBuffer.getEOL(),
 			lines: textBuffer.getLinesContent(),
 			containsRTL: textBuffer.mightContainRTL(),
 			isBasicASCII: !textBuffer.mightContainNonBasicASCII()
 		};
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('one line text', () => {
@@ -164,30 +164,30 @@ suite('Editor Model - TextModel', () => {
 	test('getValueLengthInRange', () => {
 
 		let m = createTextModel('My First Line\r\nMy Second Line\r\nMy Third Line');
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\r\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 1)), 'y First Line\r\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 2)), 'y First Line\r\nM'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 1000)), 'y First Line\r\nMy Second Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\r\nMy Second Line\r\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\r\nMy Second Line\r\nMy Third Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\r\nMy Second Line\r\nMy Third Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\r\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 1)), 'y First Line\r\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 2)), 'y First Line\r\nM'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 1000)), 'y First Line\r\nMy Second Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\r\nMy Second Line\r\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\r\nMy Second Line\r\nMy Third Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\r\nMy Second Line\r\nMy Third Line'.length);
 
 		m = createTextModel('My First Line\nMy Second Line\nMy Third Line');
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 1)), 'y First Line\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 2)), 'y First Line\nM'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 2, 1000)), 'y First Line\nMy Second Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\nMy Second Line\n'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\nMy Second Line\nMy Third Line'.length);
-		assert.equal(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\nMy Second Line\nMy Third Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1, 14)), 'My First Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 2, 1)), 'My First Line\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 1)), 'y First Line\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 2)), 'y First Line\nM'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 2, 1000)), 'y First Line\nMy Second Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\nMy Second Line\n'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\nMy Second Line\nMy Third Line'.length);
+		assert.strictEqual(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\nMy Second Line\nMy Third Line'.length);
 	});
 
 	test('guess indentation 1', () => {
@@ -664,69 +664,69 @@ suite('Editor Model - TextModel', () => {
 
 		let m = createTextModel('line one\nline two');
 
-		assert.deepEqual(m.validatePosition(new Position(0, 0)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(0, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(0, 0)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(0, 1)), new Position(1, 1));
 
-		assert.deepEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
-		assert.deepEqual(m.validatePosition(new Position(1, 30)), new Position(1, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 30)), new Position(1, 9));
 
-		assert.deepEqual(m.validatePosition(new Position(2, 0)), new Position(2, 1));
-		assert.deepEqual(m.validatePosition(new Position(2, 1)), new Position(2, 1));
-		assert.deepEqual(m.validatePosition(new Position(2, 2)), new Position(2, 2));
-		assert.deepEqual(m.validatePosition(new Position(2, 30)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 0)), new Position(2, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 1)), new Position(2, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 2)), new Position(2, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 30)), new Position(2, 9));
 
-		assert.deepEqual(m.validatePosition(new Position(3, 0)), new Position(2, 9));
-		assert.deepEqual(m.validatePosition(new Position(3, 1)), new Position(2, 9));
-		assert.deepEqual(m.validatePosition(new Position(3, 30)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(3, 0)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(3, 1)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(3, 30)), new Position(2, 9));
 
-		assert.deepEqual(m.validatePosition(new Position(30, 30)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(30, 30)), new Position(2, 9));
 
-		assert.deepEqual(m.validatePosition(new Position(-123.123, -0.5)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(Number.MIN_VALUE, Number.MIN_VALUE)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(-123.123, -0.5)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(Number.MIN_VALUE, Number.MIN_VALUE)), new Position(1, 1));
 
-		assert.deepEqual(m.validatePosition(new Position(Number.MAX_VALUE, Number.MAX_VALUE)), new Position(2, 9));
-		assert.deepEqual(m.validatePosition(new Position(123.23, 47.5)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(Number.MAX_VALUE, Number.MAX_VALUE)), new Position(2, 9));
+		assert.deepStrictEqual(m.validatePosition(new Position(123.23, 47.5)), new Position(2, 9));
 	});
 
 	test('validatePosition around high-low surrogate pairs 1', () => {
 
 		let m = createTextModel('a📚b');
 
-		assert.deepEqual(m.validatePosition(new Position(0, 0)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(0, 1)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(0, 7)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(0, 0)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(0, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(0, 7)), new Position(1, 1));
 
-		assert.deepEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
-		assert.deepEqual(m.validatePosition(new Position(1, 3)), new Position(1, 2));
-		assert.deepEqual(m.validatePosition(new Position(1, 4)), new Position(1, 4));
-		assert.deepEqual(m.validatePosition(new Position(1, 5)), new Position(1, 5));
-		assert.deepEqual(m.validatePosition(new Position(1, 30)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 3)), new Position(1, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 4)), new Position(1, 4));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 5)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 30)), new Position(1, 5));
 
-		assert.deepEqual(m.validatePosition(new Position(2, 0)), new Position(1, 5));
-		assert.deepEqual(m.validatePosition(new Position(2, 1)), new Position(1, 5));
-		assert.deepEqual(m.validatePosition(new Position(2, 2)), new Position(1, 5));
-		assert.deepEqual(m.validatePosition(new Position(2, 30)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 0)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 1)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 2)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 30)), new Position(1, 5));
 
-		assert.deepEqual(m.validatePosition(new Position(-123.123, -0.5)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(Number.MIN_VALUE, Number.MIN_VALUE)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(-123.123, -0.5)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(Number.MIN_VALUE, Number.MIN_VALUE)), new Position(1, 1));
 
-		assert.deepEqual(m.validatePosition(new Position(Number.MAX_VALUE, Number.MAX_VALUE)), new Position(1, 5));
-		assert.deepEqual(m.validatePosition(new Position(123.23, 47.5)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(Number.MAX_VALUE, Number.MAX_VALUE)), new Position(1, 5));
+		assert.deepStrictEqual(m.validatePosition(new Position(123.23, 47.5)), new Position(1, 5));
 	});
 
 	test('validatePosition around high-low surrogate pairs 2', () => {
 
 		let m = createTextModel('a📚📚b');
 
-		assert.deepEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
-		assert.deepEqual(m.validatePosition(new Position(1, 3)), new Position(1, 2));
-		assert.deepEqual(m.validatePosition(new Position(1, 4)), new Position(1, 4));
-		assert.deepEqual(m.validatePosition(new Position(1, 5)), new Position(1, 4));
-		assert.deepEqual(m.validatePosition(new Position(1, 6)), new Position(1, 6));
-		assert.deepEqual(m.validatePosition(new Position(1, 7)), new Position(1, 7));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 2)), new Position(1, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 3)), new Position(1, 2));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 4)), new Position(1, 4));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 5)), new Position(1, 4));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 6)), new Position(1, 6));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 7)), new Position(1, 7));
 
 	});
 
@@ -734,133 +734,133 @@ suite('Editor Model - TextModel', () => {
 
 		let m = createTextModel('line one\nline two');
 
-		assert.deepEqual(m.validatePosition(new Position(NaN, 1)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(1, NaN)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(NaN, 1)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(1, NaN)), new Position(1, 1));
 
-		assert.deepEqual(m.validatePosition(new Position(NaN, NaN)), new Position(1, 1));
-		assert.deepEqual(m.validatePosition(new Position(2, NaN)), new Position(2, 1));
-		assert.deepEqual(m.validatePosition(new Position(NaN, 3)), new Position(1, 3));
+		assert.deepStrictEqual(m.validatePosition(new Position(NaN, NaN)), new Position(1, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(2, NaN)), new Position(2, 1));
+		assert.deepStrictEqual(m.validatePosition(new Position(NaN, 3)), new Position(1, 3));
 	});
 
 	test('issue #71480: validatePosition handle floats', () => {
 		let m = createTextModel('line one\nline two');
 
-		assert.deepEqual(m.validatePosition(new Position(0.2, 1)), new Position(1, 1), 'a');
-		assert.deepEqual(m.validatePosition(new Position(1.2, 1)), new Position(1, 1), 'b');
-		assert.deepEqual(m.validatePosition(new Position(1.5, 2)), new Position(1, 2), 'c');
-		assert.deepEqual(m.validatePosition(new Position(1.8, 3)), new Position(1, 3), 'd');
-		assert.deepEqual(m.validatePosition(new Position(1, 0.3)), new Position(1, 1), 'e');
-		assert.deepEqual(m.validatePosition(new Position(2, 0.8)), new Position(2, 1), 'f');
-		assert.deepEqual(m.validatePosition(new Position(1, 1.2)), new Position(1, 1), 'g');
-		assert.deepEqual(m.validatePosition(new Position(2, 1.5)), new Position(2, 1), 'h');
+		assert.deepStrictEqual(m.validatePosition(new Position(0.2, 1)), new Position(1, 1), 'a');
+		assert.deepStrictEqual(m.validatePosition(new Position(1.2, 1)), new Position(1, 1), 'b');
+		assert.deepStrictEqual(m.validatePosition(new Position(1.5, 2)), new Position(1, 2), 'c');
+		assert.deepStrictEqual(m.validatePosition(new Position(1.8, 3)), new Position(1, 3), 'd');
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 0.3)), new Position(1, 1), 'e');
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 0.8)), new Position(2, 1), 'f');
+		assert.deepStrictEqual(m.validatePosition(new Position(1, 1.2)), new Position(1, 1), 'g');
+		assert.deepStrictEqual(m.validatePosition(new Position(2, 1.5)), new Position(2, 1), 'h');
 	});
 
 	test('issue #71480: validateRange handle floats', () => {
 		let m = createTextModel('line one\nline two');
 
-		assert.deepEqual(m.validateRange(new Range(0.2, 1.5, 0.8, 2.5)), new Range(1, 1, 1, 1));
-		assert.deepEqual(m.validateRange(new Range(1.2, 1.7, 1.8, 2.2)), new Range(1, 1, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(0.2, 1.5, 0.8, 2.5)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(1.2, 1.7, 1.8, 2.2)), new Range(1, 1, 1, 2));
 	});
 
 	test('validateRange around high-low surrogate pairs 1', () => {
 
 		let m = createTextModel('a📚b');
 
-		assert.deepEqual(m.validateRange(new Range(0, 0, 0, 1)), new Range(1, 1, 1, 1));
-		assert.deepEqual(m.validateRange(new Range(0, 0, 0, 7)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(0, 0, 0, 1)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(0, 0, 0, 7)), new Range(1, 1, 1, 1));
 
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 1)), new Range(1, 1, 1, 1));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 2)), new Range(1, 1, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 3)), new Range(1, 1, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 4)), new Range(1, 1, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 5)), new Range(1, 1, 1, 5));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 1)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 2)), new Range(1, 1, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 3)), new Range(1, 1, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 4)), new Range(1, 1, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 5)), new Range(1, 1, 1, 5));
 
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 2)), new Range(1, 2, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 3)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 4)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 5)), new Range(1, 2, 1, 5));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 2)), new Range(1, 2, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 3)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 4)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 5)), new Range(1, 2, 1, 5));
 
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 3)), new Range(1, 2, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 4)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 5)), new Range(1, 2, 1, 5));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 3)), new Range(1, 2, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 4)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 5)), new Range(1, 2, 1, 5));
 
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 4)), new Range(1, 4, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 5)), new Range(1, 4, 1, 5));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 4)), new Range(1, 4, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 5)), new Range(1, 4, 1, 5));
 
-		assert.deepEqual(m.validateRange(new Range(1, 5, 1, 5)), new Range(1, 5, 1, 5));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 5, 1, 5)), new Range(1, 5, 1, 5));
 	});
 
 	test('validateRange around high-low surrogate pairs 2', () => {
 
 		let m = createTextModel('a📚📚b');
 
-		assert.deepEqual(m.validateRange(new Range(0, 0, 0, 1)), new Range(1, 1, 1, 1));
-		assert.deepEqual(m.validateRange(new Range(0, 0, 0, 7)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(0, 0, 0, 1)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(0, 0, 0, 7)), new Range(1, 1, 1, 1));
 
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 1)), new Range(1, 1, 1, 1));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 2)), new Range(1, 1, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 3)), new Range(1, 1, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 4)), new Range(1, 1, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 5)), new Range(1, 1, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 6)), new Range(1, 1, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 1, 1, 7)), new Range(1, 1, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 1)), new Range(1, 1, 1, 1));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 2)), new Range(1, 1, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 3)), new Range(1, 1, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 4)), new Range(1, 1, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 5)), new Range(1, 1, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 6)), new Range(1, 1, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 1, 1, 7)), new Range(1, 1, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 2)), new Range(1, 2, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 3)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 4)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 5)), new Range(1, 2, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 6)), new Range(1, 2, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 2, 1, 7)), new Range(1, 2, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 2)), new Range(1, 2, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 3)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 4)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 5)), new Range(1, 2, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 6)), new Range(1, 2, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 2, 1, 7)), new Range(1, 2, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 3)), new Range(1, 2, 1, 2));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 4)), new Range(1, 2, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 5)), new Range(1, 2, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 6)), new Range(1, 2, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 3, 1, 7)), new Range(1, 2, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 3)), new Range(1, 2, 1, 2));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 4)), new Range(1, 2, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 5)), new Range(1, 2, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 6)), new Range(1, 2, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 3, 1, 7)), new Range(1, 2, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 4)), new Range(1, 4, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 5)), new Range(1, 4, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 6)), new Range(1, 4, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 4, 1, 7)), new Range(1, 4, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 4)), new Range(1, 4, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 5)), new Range(1, 4, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 6)), new Range(1, 4, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 4, 1, 7)), new Range(1, 4, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 5, 1, 5)), new Range(1, 4, 1, 4));
-		assert.deepEqual(m.validateRange(new Range(1, 5, 1, 6)), new Range(1, 4, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 5, 1, 7)), new Range(1, 4, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 5, 1, 5)), new Range(1, 4, 1, 4));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 5, 1, 6)), new Range(1, 4, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 5, 1, 7)), new Range(1, 4, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 6, 1, 6)), new Range(1, 6, 1, 6));
-		assert.deepEqual(m.validateRange(new Range(1, 6, 1, 7)), new Range(1, 6, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 6, 1, 6)), new Range(1, 6, 1, 6));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 6, 1, 7)), new Range(1, 6, 1, 7));
 
-		assert.deepEqual(m.validateRange(new Range(1, 7, 1, 7)), new Range(1, 7, 1, 7));
+		assert.deepStrictEqual(m.validateRange(new Range(1, 7, 1, 7)), new Range(1, 7, 1, 7));
 	});
 
 	test('modifyPosition', () => {
 
 		let m = createTextModel('line one\nline two');
-		assert.deepEqual(m.modifyPosition(new Position(1, 1), 0), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(0, 0), 0), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(30, 1), 0), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 1), 0), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(0, 0), 0), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(30, 1), 0), new Position(2, 9));
 
-		assert.deepEqual(m.modifyPosition(new Position(1, 1), 17), new Position(2, 9));
-		assert.deepEqual(m.modifyPosition(new Position(1, 1), 1), new Position(1, 2));
-		assert.deepEqual(m.modifyPosition(new Position(1, 1), 3), new Position(1, 4));
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), 10), new Position(2, 3));
-		assert.deepEqual(m.modifyPosition(new Position(1, 5), 13), new Position(2, 9));
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), 16), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 1), 17), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 1), 1), new Position(1, 2));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 1), 3), new Position(1, 4));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), 10), new Position(2, 3));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 5), 13), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), 16), new Position(2, 9));
 
-		assert.deepEqual(m.modifyPosition(new Position(2, 9), -17), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), -1), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(1, 4), -3), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(2, 3), -10), new Position(1, 2));
-		assert.deepEqual(m.modifyPosition(new Position(2, 9), -13), new Position(1, 5));
-		assert.deepEqual(m.modifyPosition(new Position(2, 9), -16), new Position(1, 2));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 9), -17), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), -1), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 4), -3), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 3), -10), new Position(1, 2));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 9), -13), new Position(1, 5));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 9), -16), new Position(1, 2));
 
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), 17), new Position(2, 9));
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), 100), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), 17), new Position(2, 9));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), 100), new Position(2, 9));
 
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), -2), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(1, 2), -100), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(2, 2), -100), new Position(1, 1));
-		assert.deepEqual(m.modifyPosition(new Position(2, 9), -18), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), -2), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(1, 2), -100), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 2), -100), new Position(1, 1));
+		assert.deepStrictEqual(m.modifyPosition(new Position(2, 9), -18), new Position(1, 1));
 	});
 
 	test('normalizeIndentation 1', () => {
@@ -870,27 +870,27 @@ suite('Editor Model - TextModel', () => {
 			}
 		);
 
-		assert.equal(model.normalizeIndentation('\t'), '\t');
-		assert.equal(model.normalizeIndentation('    '), '\t');
-		assert.equal(model.normalizeIndentation('   '), '   ');
-		assert.equal(model.normalizeIndentation('  '), '  ');
-		assert.equal(model.normalizeIndentation(' '), ' ');
-		assert.equal(model.normalizeIndentation(''), '');
-		assert.equal(model.normalizeIndentation(' \t   '), '\t\t');
-		assert.equal(model.normalizeIndentation(' \t  '), '\t   ');
-		assert.equal(model.normalizeIndentation(' \t '), '\t  ');
-		assert.equal(model.normalizeIndentation(' \t'), '\t ');
+		assert.strictEqual(model.normalizeIndentation('\t'), '\t');
+		assert.strictEqual(model.normalizeIndentation('    '), '\t');
+		assert.strictEqual(model.normalizeIndentation('   '), '   ');
+		assert.strictEqual(model.normalizeIndentation('  '), '  ');
+		assert.strictEqual(model.normalizeIndentation(' '), ' ');
+		assert.strictEqual(model.normalizeIndentation(''), '');
+		assert.strictEqual(model.normalizeIndentation(' \t   '), '\t\t');
+		assert.strictEqual(model.normalizeIndentation(' \t  '), '\t   ');
+		assert.strictEqual(model.normalizeIndentation(' \t '), '\t  ');
+		assert.strictEqual(model.normalizeIndentation(' \t'), '\t ');
 
-		assert.equal(model.normalizeIndentation('\ta'), '\ta');
-		assert.equal(model.normalizeIndentation('    a'), '\ta');
-		assert.equal(model.normalizeIndentation('   a'), '   a');
-		assert.equal(model.normalizeIndentation('  a'), '  a');
-		assert.equal(model.normalizeIndentation(' a'), ' a');
-		assert.equal(model.normalizeIndentation('a'), 'a');
-		assert.equal(model.normalizeIndentation(' \t   a'), '\t\ta');
-		assert.equal(model.normalizeIndentation(' \t  a'), '\t   a');
-		assert.equal(model.normalizeIndentation(' \t a'), '\t  a');
-		assert.equal(model.normalizeIndentation(' \ta'), '\t a');
+		assert.strictEqual(model.normalizeIndentation('\ta'), '\ta');
+		assert.strictEqual(model.normalizeIndentation('    a'), '\ta');
+		assert.strictEqual(model.normalizeIndentation('   a'), '   a');
+		assert.strictEqual(model.normalizeIndentation('  a'), '  a');
+		assert.strictEqual(model.normalizeIndentation(' a'), ' a');
+		assert.strictEqual(model.normalizeIndentation('a'), 'a');
+		assert.strictEqual(model.normalizeIndentation(' \t   a'), '\t\ta');
+		assert.strictEqual(model.normalizeIndentation(' \t  a'), '\t   a');
+		assert.strictEqual(model.normalizeIndentation(' \t a'), '\t  a');
+		assert.strictEqual(model.normalizeIndentation(' \ta'), '\t a');
 
 		model.dispose();
 	});
@@ -898,16 +898,16 @@ suite('Editor Model - TextModel', () => {
 	test('normalizeIndentation 2', () => {
 		let model = createTextModel('');
 
-		assert.equal(model.normalizeIndentation('\ta'), '    a');
-		assert.equal(model.normalizeIndentation('    a'), '    a');
-		assert.equal(model.normalizeIndentation('   a'), '   a');
-		assert.equal(model.normalizeIndentation('  a'), '  a');
-		assert.equal(model.normalizeIndentation(' a'), ' a');
-		assert.equal(model.normalizeIndentation('a'), 'a');
-		assert.equal(model.normalizeIndentation(' \t   a'), '        a');
-		assert.equal(model.normalizeIndentation(' \t  a'), '       a');
-		assert.equal(model.normalizeIndentation(' \t a'), '      a');
-		assert.equal(model.normalizeIndentation(' \ta'), '     a');
+		assert.strictEqual(model.normalizeIndentation('\ta'), '    a');
+		assert.strictEqual(model.normalizeIndentation('    a'), '    a');
+		assert.strictEqual(model.normalizeIndentation('   a'), '   a');
+		assert.strictEqual(model.normalizeIndentation('  a'), '  a');
+		assert.strictEqual(model.normalizeIndentation(' a'), ' a');
+		assert.strictEqual(model.normalizeIndentation('a'), 'a');
+		assert.strictEqual(model.normalizeIndentation(' \t   a'), '        a');
+		assert.strictEqual(model.normalizeIndentation(' \t  a'), '       a');
+		assert.strictEqual(model.normalizeIndentation(' \t a'), '      a');
+		assert.strictEqual(model.normalizeIndentation(' \ta'), '     a');
 
 		model.dispose();
 	});
@@ -928,18 +928,18 @@ suite('Editor Model - TextModel', () => {
 			''
 		].join('\n'));
 
-		assert.equal(model.getLineFirstNonWhitespaceColumn(1), 1, '1');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(2), 2, '2');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(3), 2, '3');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(4), 3, '4');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(5), 3, '5');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(6), 0, '6');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(7), 0, '7');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(8), 0, '8');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(9), 0, '9');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(10), 4, '10');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(11), 0, '11');
-		assert.equal(model.getLineFirstNonWhitespaceColumn(12), 0, '12');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(1), 1, '1');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(2), 2, '2');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(3), 2, '3');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(4), 3, '4');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(5), 3, '5');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(6), 0, '6');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(7), 0, '7');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(8), 0, '8');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(9), 0, '9');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(10), 4, '10');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(11), 0, '11');
+		assert.strictEqual(model.getLineFirstNonWhitespaceColumn(12), 0, '12');
 	});
 
 	test('getLineLastNonWhitespaceColumn', () => {
@@ -958,24 +958,24 @@ suite('Editor Model - TextModel', () => {
 			''
 		].join('\n'));
 
-		assert.equal(model.getLineLastNonWhitespaceColumn(1), 4, '1');
-		assert.equal(model.getLineLastNonWhitespaceColumn(2), 4, '2');
-		assert.equal(model.getLineLastNonWhitespaceColumn(3), 4, '3');
-		assert.equal(model.getLineLastNonWhitespaceColumn(4), 4, '4');
-		assert.equal(model.getLineLastNonWhitespaceColumn(5), 4, '5');
-		assert.equal(model.getLineLastNonWhitespaceColumn(6), 0, '6');
-		assert.equal(model.getLineLastNonWhitespaceColumn(7), 0, '7');
-		assert.equal(model.getLineLastNonWhitespaceColumn(8), 0, '8');
-		assert.equal(model.getLineLastNonWhitespaceColumn(9), 0, '9');
-		assert.equal(model.getLineLastNonWhitespaceColumn(10), 4, '10');
-		assert.equal(model.getLineLastNonWhitespaceColumn(11), 0, '11');
-		assert.equal(model.getLineLastNonWhitespaceColumn(12), 0, '12');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(1), 4, '1');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(2), 4, '2');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(3), 4, '3');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(4), 4, '4');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(5), 4, '5');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(6), 0, '6');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(7), 0, '7');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(8), 0, '8');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(9), 0, '9');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(10), 4, '10');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(11), 0, '11');
+		assert.strictEqual(model.getLineLastNonWhitespaceColumn(12), 0, '12');
 	});
 
 	test('#50471. getValueInRange with invalid range', () => {
 		let m = createTextModel('My First Line\r\nMy Second Line\r\nMy Third Line');
-		assert.equal(m.getValueInRange(new Range(1, NaN, 1, 3)), 'My');
-		assert.equal(m.getValueInRange(new Range(NaN, NaN, NaN, NaN)), '');
+		assert.strictEqual(m.getValueInRange(new Range(1, NaN, 1, 3)), 'My');
+		assert.strictEqual(m.getValueInRange(new Range(NaN, NaN, NaN, NaN)), '');
 	});
 });
 
@@ -983,26 +983,26 @@ suite('TextModel.mightContainRTL', () => {
 
 	test('nope', () => {
 		let model = createTextModel('hello world!');
-		assert.equal(model.mightContainRTL(), false);
+		assert.strictEqual(model.mightContainRTL(), false);
 	});
 
 	test('yes', () => {
 		let model = createTextModel('Hello,\nזוהי עובדה מבוססת שדעתו');
-		assert.equal(model.mightContainRTL(), true);
+		assert.strictEqual(model.mightContainRTL(), true);
 	});
 
 	test('setValue resets 1', () => {
 		let model = createTextModel('hello world!');
-		assert.equal(model.mightContainRTL(), false);
+		assert.strictEqual(model.mightContainRTL(), false);
 		model.setValue('Hello,\nזוהי עובדה מבוססת שדעתו');
-		assert.equal(model.mightContainRTL(), true);
+		assert.strictEqual(model.mightContainRTL(), true);
 	});
 
 	test('setValue resets 2', () => {
 		let model = createTextModel('Hello,\nهناك حقيقة مثبتة منذ زمن طويل');
-		assert.equal(model.mightContainRTL(), true);
+		assert.strictEqual(model.mightContainRTL(), true);
 		model.setValue('hello world!');
-		assert.equal(model.mightContainRTL(), false);
+		assert.strictEqual(model.mightContainRTL(), false);
 	});
 
 });
@@ -1012,24 +1012,24 @@ suite('TextModel.createSnapshot', () => {
 	test('empty file', () => {
 		let model = createTextModel('');
 		let snapshot = model.createSnapshot();
-		assert.equal(snapshot.read(), null);
+		assert.strictEqual(snapshot.read(), null);
 		model.dispose();
 	});
 
 	test('file with BOM', () => {
 		let model = createTextModel(UTF8_BOM_CHARACTER + 'Hello');
-		assert.equal(model.getLineContent(1), 'Hello');
+		assert.strictEqual(model.getLineContent(1), 'Hello');
 		let snapshot = model.createSnapshot(true);
-		assert.equal(snapshot.read(), UTF8_BOM_CHARACTER + 'Hello');
-		assert.equal(snapshot.read(), null);
+		assert.strictEqual(snapshot.read(), UTF8_BOM_CHARACTER + 'Hello');
+		assert.strictEqual(snapshot.read(), null);
 		model.dispose();
 	});
 
 	test('regular file', () => {
 		let model = createTextModel('My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
 		let snapshot = model.createSnapshot();
-		assert.equal(snapshot.read(), 'My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
-		assert.equal(snapshot.read(), null);
+		assert.strictEqual(snapshot.read(), 'My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
+		assert.strictEqual(snapshot.read(), null);
 		model.dispose();
 	});
 
@@ -1054,10 +1054,10 @@ suite('TextModel.createSnapshot', () => {
 			// all good
 		} else {
 			actual += tmp2;
-			assert.equal(snapshot.read(), null);
+			assert.strictEqual(snapshot.read(), null);
 		}
 
-		assert.equal(actual, text);
+		assert.strictEqual(actual, text);
 
 		model.dispose();
 	});
diff --git a/src/vs/editor/test/common/model/textModelSearch.test.ts b/src/vs/editor/test/common/model/textModelSearch.test.ts
index 715cd3032..558664746 100644
--- a/src/vs/editor/test/common/model/textModelSearch.test.ts
+++ b/src/vs/editor/test/common/model/textModelSearch.test.ts
@@ -19,31 +19,31 @@ suite('TextModelSearch', () => {
 	const usualWordSeparators = getMapForWordSeparators(USUAL_WORD_SEPARATORS);
 
 	function assertFindMatch(actual: FindMatch | null, expectedRange: Range, expectedMatches: string[] | null = null): void {
-		assert.deepEqual(actual, new FindMatch(expectedRange, expectedMatches));
+		assert.deepStrictEqual(actual, new FindMatch(expectedRange, expectedMatches));
 	}
 
 	function _assertFindMatches(model: TextModel, searchParams: SearchParams, expectedMatches: FindMatch[]): void {
 		let actual = TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), false, 1000);
-		assert.deepEqual(actual, expectedMatches, 'findMatches OK');
+		assert.deepStrictEqual(actual, expectedMatches, 'findMatches OK');
 
 		// test `findNextMatch`
 		let startPos = new Position(1, 1);
 		let match = TextModelSearch.findNextMatch(model, searchParams, startPos, false);
-		assert.deepEqual(match, expectedMatches[0], `findNextMatch ${startPos}`);
+		assert.deepStrictEqual(match, expectedMatches[0], `findNextMatch ${startPos}`);
 		for (const expectedMatch of expectedMatches) {
 			startPos = expectedMatch.range.getStartPosition();
 			match = TextModelSearch.findNextMatch(model, searchParams, startPos, false);
-			assert.deepEqual(match, expectedMatch, `findNextMatch ${startPos}`);
+			assert.deepStrictEqual(match, expectedMatch, `findNextMatch ${startPos}`);
 		}
 
 		// test `findPrevMatch`
 		startPos = new Position(model.getLineCount(), model.getLineMaxColumn(model.getLineCount()));
 		match = TextModelSearch.findPreviousMatch(model, searchParams, startPos, false);
-		assert.deepEqual(match, expectedMatches[expectedMatches.length - 1], `findPrevMatch ${startPos}`);
+		assert.deepStrictEqual(match, expectedMatches[expectedMatches.length - 1], `findPrevMatch ${startPos}`);
 		for (const expectedMatch of expectedMatches) {
 			startPos = expectedMatch.range.getEndPosition();
 			match = TextModelSearch.findPreviousMatch(model, searchParams, startPos, false);
-			assert.deepEqual(match, expectedMatch, `findPrevMatch ${startPos}`);
+			assert.deepStrictEqual(match, expectedMatch, `findPrevMatch ${startPos}`);
 		}
 	}
 
@@ -486,7 +486,7 @@ suite('TextModelSearch', () => {
 		let searchParams = new SearchParams('(l(in)e)', true, false, null);
 
 		let actual = TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), true, 100);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			new FindMatch(new Range(1, 5, 1, 9), ['line', 'line', 'in']),
 			new FindMatch(new Range(1, 10, 1, 14), ['line', 'line', 'in']),
 			new FindMatch(new Range(2, 5, 2, 9), ['line', 'line', 'in']),
@@ -501,7 +501,7 @@ suite('TextModelSearch', () => {
 		let searchParams = new SearchParams('(l(in)e)\\n', true, false, null);
 
 		let actual = TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), true, 100);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			new FindMatch(new Range(1, 10, 2, 1), ['line\n', 'line', 'in']),
 			new FindMatch(new Range(2, 5, 3, 1), ['line\n', 'line', 'in']),
 		]);
@@ -556,7 +556,7 @@ suite('TextModelSearch', () => {
 	test('\\n matches \\r\\n', () => {
 		let model = createTextModel('a\r\nb\r\nc\r\nd\r\ne\r\nf\r\ng\r\nh\r\ni');
 
-		assert.equal(model.getEOL(), '\r\n');
+		assert.strictEqual(model.getEOL(), '\r\n');
 
 		let searchParams = new SearchParams('h\\n', true, false, null);
 		let actual = TextModelSearch.findNextMatch(model, searchParams, new Position(1, 1), true);
@@ -579,12 +579,12 @@ suite('TextModelSearch', () => {
 	test('\\r can never be found', () => {
 		let model = createTextModel('a\r\nb\r\nc\r\nd\r\ne\r\nf\r\ng\r\nh\r\ni');
 
-		assert.equal(model.getEOL(), '\r\n');
+		assert.strictEqual(model.getEOL(), '\r\n');
 
 		let searchParams = new SearchParams('\\r\\n', true, false, null);
 		let actual = TextModelSearch.findNextMatch(model, searchParams, new Position(1, 1), true);
-		assert.equal(actual, null);
-		assert.deepEqual(TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), true, 1000), []);
+		assert.strictEqual(actual, null);
+		assert.deepStrictEqual(TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), true, 1000), []);
 
 		model.dispose();
 	});
@@ -596,8 +596,8 @@ suite('TextModelSearch', () => {
 		if (expected === null) {
 			assert.ok(actual === null);
 		} else {
-			assert.deepEqual(actual!.regex, expected.regex);
-			assert.deepEqual(actual!.simpleSearch, expected.simpleSearch);
+			assert.deepStrictEqual(actual!.regex, expected.regex);
+			assert.deepStrictEqual(actual!.simpleSearch, expected.simpleSearch);
 			if (wordSeparators) {
 				assert.ok(actual!.wordSeparators !== null);
 			} else {
@@ -769,7 +769,7 @@ suite('TextModelSearch', () => {
 		let searchParams = new SearchParams('\\d*', true, false, null);
 
 		let actual = TextModelSearch.findMatches(model, searchParams, model.getFullModelRange(), true, 100);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			new FindMatch(new Range(1, 1, 1, 3), ['10']),
 			new FindMatch(new Range(1, 3, 1, 3), ['']),
 			new FindMatch(new Range(1, 4, 1, 7), ['243']),
diff --git a/src/vs/editor/test/common/model/textModelWithTokens.test.ts b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
index efb1cf1de..e4560fd82 100644
--- a/src/vs/editor/test/common/model/textModelWithTokens.test.ts
+++ b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
@@ -100,7 +100,7 @@ suite('TextModelWithTokens', () => {
 						column: column
 					});
 
-					assert.deepEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findPrevBracket of ' + lineNumber + ', ' + column);
+					assert.deepStrictEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findPrevBracket of ' + lineNumber + ', ' + column);
 				}
 			}
 		}
@@ -126,7 +126,7 @@ suite('TextModelWithTokens', () => {
 						column: column
 					});
 
-					assert.deepEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findNextBracket of ' + lineNumber + ', ' + column);
+					assert.deepStrictEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findNextBracket of ' + lineNumber + ', ' + column);
 				}
 			}
 		}
@@ -148,12 +148,12 @@ suite('TextModelWithTokens', () => {
 
 function assertIsNotBracket(model: TextModel, lineNumber: number, column: number) {
 	const match = model.matchBracket(new Position(lineNumber, column));
-	assert.equal(match, null, 'is not matching brackets at ' + lineNumber + ', ' + column);
+	assert.strictEqual(match, null, 'is not matching brackets at ' + lineNumber + ', ' + column);
 }
 
 function assertIsBracket(model: TextModel, testPosition: Position, expected: [Range, Range]): void {
 	const actual = model.matchBracket(testPosition);
-	assert.deepEqual(actual, expected, 'matches brackets at ' + testPosition);
+	assert.deepStrictEqual(actual, expected, 'matches brackets at ' + testPosition);
 }
 
 suite('TextModelWithTokens - bracket matching', () => {
@@ -351,7 +351,7 @@ suite('TextModelWithTokens', () => {
 		const tokenizationSupport: ITokenizationSupport = {
 			getInitialState: () => NULL_STATE,
 			tokenize: undefined!,
-			tokenize2: (line, state) => {
+			tokenize2: (line, hasEOL, state) => {
 				switch (line) {
 					case 'function hello() {': {
 						const tokens = new Uint32Array([
@@ -399,8 +399,8 @@ suite('TextModelWithTokens', () => {
 		model.forceTokenization(2);
 		model.forceTokenization(3);
 
-		assert.deepEqual(model.matchBracket(new Position(2, 23)), null);
-		assert.deepEqual(model.matchBracket(new Position(2, 20)), null);
+		assert.deepStrictEqual(model.matchBracket(new Position(2, 23)), null);
+		assert.deepStrictEqual(model.matchBracket(new Position(2, 20)), null);
 
 		model.dispose();
 		registration1.dispose();
@@ -434,7 +434,7 @@ suite('TextModelWithTokens regression tests', () => {
 					foreground: token.getForeground()
 				};
 			};
-			assert.deepEqual(actual, expected.map(decode));
+			assert.deepStrictEqual(actual, expected.map(decode));
 		}
 
 		let _tokenId = 10;
@@ -446,7 +446,7 @@ suite('TextModelWithTokens regression tests', () => {
 		const tokenizationSupport: ITokenizationSupport = {
 			getInitialState: () => NULL_STATE,
 			tokenize: undefined!,
-			tokenize2: (line, state) => {
+			tokenize2: (line, hasEOL, state) => {
 				let myId = ++_tokenId;
 				let tokens = new Uint32Array(2);
 				tokens[0] = 0;
@@ -512,7 +512,7 @@ suite('TextModelWithTokens regression tests', () => {
 		].join('\n'), undefined, languageIdentifier);
 
 		let actual = model.matchBracket(new Position(4, 1));
-		assert.deepEqual(actual, [new Range(4, 1, 4, 7), new Range(9, 1, 9, 11)]);
+		assert.deepStrictEqual(actual, [new Range(4, 1, 4, 7), new Range(9, 1, 9, 11)]);
 
 		model.dispose();
 		registration.dispose();
@@ -537,7 +537,7 @@ suite('TextModelWithTokens regression tests', () => {
 		].join('\n'), undefined, languageIdentifier);
 
 		let actual = model.matchBracket(new Position(3, 9));
-		assert.deepEqual(actual, [new Range(3, 6, 3, 17), new Range(2, 6, 2, 14)]);
+		assert.deepStrictEqual(actual, [new Range(3, 6, 3, 17), new Range(2, 6, 2, 14)]);
 
 		model.dispose();
 		registration.dispose();
@@ -550,7 +550,7 @@ suite('TextModelWithTokens regression tests', () => {
 		const tokenizationSupport: ITokenizationSupport = {
 			getInitialState: () => NULL_STATE,
 			tokenize: undefined!,
-			tokenize2: (line, state) => {
+			tokenize2: (line, hasEOL, state) => {
 				let tokens = new Uint32Array(2);
 				tokens[0] = 0;
 				tokens[1] = (
@@ -565,7 +565,7 @@ suite('TextModelWithTokens regression tests', () => {
 		let model = createTextModel('A model with one line', undefined, outerMode);
 
 		model.forceTokenization(1);
-		assert.equal(model.getLanguageIdAtPosition(1, 1), innerMode.id);
+		assert.strictEqual(model.getLanguageIdAtPosition(1, 1), innerMode.id);
 
 		model.dispose();
 		registration.dispose();
@@ -586,7 +586,7 @@ suite('TextModel.getLineIndentGuide', () => {
 			actual[line - 1] = [actualIndents[line - 1], activeIndentGuide.startLineNumber, activeIndentGuide.endLineNumber, activeIndentGuide.indent, model.getLineContent(line)];
 		}
 
-		assert.deepEqual(actual, lines);
+		assert.deepStrictEqual(actual, lines);
 
 		model.dispose();
 	}
@@ -764,7 +764,7 @@ suite('TextModel.getLineIndentGuide', () => {
 		].join('\n'));
 
 		const actual = model.getActiveIndentGuide(2, 4, 9);
-		assert.deepEqual(actual, { startLineNumber: 2, endLineNumber: 9, indent: 1 });
+		assert.deepStrictEqual(actual, { startLineNumber: 2, endLineNumber: 9, indent: 1 });
 		model.dispose();
 	});
 
diff --git a/src/vs/editor/test/common/model/tokensStore.test.ts b/src/vs/editor/test/common/model/tokensStore.test.ts
index ee8b438b4..e883d551e 100644
--- a/src/vs/editor/test/common/model/tokensStore.test.ts
+++ b/src/vs/editor/test/common/model/tokensStore.test.ts
@@ -104,7 +104,7 @@ suite('TokensStore', () => {
 		model.applyEdits(edits);
 
 		const actualState = extractState(model);
-		assert.deepEqual(actualState, rawFinalState);
+		assert.deepStrictEqual(actualState, rawFinalState);
 
 		model.dispose();
 	}
@@ -191,7 +191,7 @@ suite('TokensStore', () => {
 			decodedTokens.push(lineTokens.getEndOffset(i), lineTokens.getMetadata(i));
 		}
 
-		assert.deepEqual(decodedTokens, [
+		assert.deepStrictEqual(decodedTokens, [
 			20, 16793600,
 			24, 17022976,
 			25, 16793600,
@@ -252,7 +252,7 @@ suite('TokensStore', () => {
 		]);
 
 		const lineTokens = store.addSemanticTokens(10, new LineTokens(new Uint32Array([12, 1]), `enum Enum1 {`));
-		assert.equal(lineTokens.getCount(), 3);
+		assert.strictEqual(lineTokens.getCount(), 3);
 	});
 
 	test('partial tokens 2', () => {
@@ -293,7 +293,7 @@ suite('TokensStore', () => {
 		]);
 
 		const lineTokens = store.addSemanticTokens(20, new LineTokens(new Uint32Array([12, 1]), `enum Enum1 {`));
-		assert.equal(lineTokens.getCount(), 3);
+		assert.strictEqual(lineTokens.getCount(), 3);
 	});
 
 	test('partial tokens 3', () => {
@@ -320,7 +320,7 @@ suite('TokensStore', () => {
 		]);
 
 		const lineTokens = store.addSemanticTokens(5, new LineTokens(new Uint32Array([12, 1]), `enum Enum1 {`));
-		assert.equal(lineTokens.getCount(), 3);
+		assert.strictEqual(lineTokens.getCount(), 3);
 	});
 
 	test('issue #94133: Semantic colors stick around when using (only) range provider', () => {
@@ -337,7 +337,7 @@ suite('TokensStore', () => {
 		store.setPartial(new Range(1, 1, 1, 20), []);
 
 		const lineTokens = store.addSemanticTokens(1, new LineTokens(new Uint32Array([12, 1]), `enum Enum1 {`));
-		assert.equal(lineTokens.getCount(), 1);
+		assert.strictEqual(lineTokens.getCount(), 1);
 	});
 
 	test('bug', () => {
@@ -385,7 +385,7 @@ suite('TokensStore', () => {
 		);
 
 		const lineTokens = store.addSemanticTokens(36451, new LineTokens(new Uint32Array([60, 1]), `                        if (flags & ModifierFlags.Ambient) {`));
-		assert.equal(lineTokens.getCount(), 7);
+		assert.strictEqual(lineTokens.getCount(), 7);
 	});
 
 
@@ -424,7 +424,7 @@ suite('TokensStore', () => {
 		]), `const hello = 123;`));
 
 		const actual = toArr(lineTokens);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			5, createTMMetadata(5, FontStyle.Bold, 53),
 			6, createTMMetadata(1, FontStyle.None, 53),
 			11, createTMMetadata(1, FontStyle.None, 53),
diff --git a/src/vs/editor/test/common/modes/languageConfiguration.test.ts b/src/vs/editor/test/common/modes/languageConfiguration.test.ts
index e898568a7..3acba6ddf 100644
--- a/src/vs/editor/test/common/modes/languageConfiguration.test.ts
+++ b/src/vs/editor/test/common/modes/languageConfiguration.test.ts
@@ -11,81 +11,81 @@ suite('StandardAutoClosingPairConditional', () => {
 
 	test('Missing notIn', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}' });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('Empty notIn', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: [] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('Invalid notIn', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['bla'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('notIn in strings', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['string'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), false);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), false);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('notIn in comments', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['comment'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), false);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), false);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('notIn in regex', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['regex'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), false);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), false);
 	});
 
 	test('notIn in strings nor comments', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['string', 'comment'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), false);
-		assert.equal(v.isOK(StandardTokenType.String), false);
-		assert.equal(v.isOK(StandardTokenType.RegEx), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), false);
+		assert.strictEqual(v.isOK(StandardTokenType.String), false);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), true);
 	});
 
 	test('notIn in strings nor regex', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['string', 'regex'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), true);
-		assert.equal(v.isOK(StandardTokenType.String), false);
-		assert.equal(v.isOK(StandardTokenType.RegEx), false);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), true);
+		assert.strictEqual(v.isOK(StandardTokenType.String), false);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), false);
 	});
 
 	test('notIn in comments nor regex', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['comment', 'regex'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), false);
-		assert.equal(v.isOK(StandardTokenType.String), true);
-		assert.equal(v.isOK(StandardTokenType.RegEx), false);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), false);
+		assert.strictEqual(v.isOK(StandardTokenType.String), true);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), false);
 	});
 
 	test('notIn in strings, comments nor regex', () => {
 		let v = new StandardAutoClosingPairConditional({ open: '{', close: '}', notIn: ['string', 'comment', 'regex'] });
-		assert.equal(v.isOK(StandardTokenType.Other), true);
-		assert.equal(v.isOK(StandardTokenType.Comment), false);
-		assert.equal(v.isOK(StandardTokenType.String), false);
-		assert.equal(v.isOK(StandardTokenType.RegEx), false);
+		assert.strictEqual(v.isOK(StandardTokenType.Other), true);
+		assert.strictEqual(v.isOK(StandardTokenType.Comment), false);
+		assert.strictEqual(v.isOK(StandardTokenType.String), false);
+		assert.strictEqual(v.isOK(StandardTokenType.RegEx), false);
 	});
 });
diff --git a/src/vs/editor/test/common/modes/languageSelector.test.ts b/src/vs/editor/test/common/modes/languageSelector.test.ts
index 0886c65bb..dc06141f6 100644
--- a/src/vs/editor/test/common/modes/languageSelector.test.ts
+++ b/src/vs/editor/test/common/modes/languageSelector.test.ts
@@ -15,18 +15,18 @@ suite('LanguageSelector', function () {
 	};
 
 	test('score, invalid selector', function () {
-		assert.equal(score({}, model.uri, model.language, true), 0);
-		assert.equal(score(undefined!, model.uri, model.language, true), 0);
-		assert.equal(score(null!, model.uri, model.language, true), 0);
-		assert.equal(score('', model.uri, model.language, true), 0);
+		assert.strictEqual(score({}, model.uri, model.language, true), 0);
+		assert.strictEqual(score(undefined!, model.uri, model.language, true), 0);
+		assert.strictEqual(score(null!, model.uri, model.language, true), 0);
+		assert.strictEqual(score('', model.uri, model.language, true), 0);
 	});
 
 	test('score, any language', function () {
-		assert.equal(score({ language: '*' }, model.uri, model.language, true), 5);
-		assert.equal(score('*', model.uri, model.language, true), 5);
+		assert.strictEqual(score({ language: '*' }, model.uri, model.language, true), 5);
+		assert.strictEqual(score('*', model.uri, model.language, true), 5);
 
-		assert.equal(score('*', URI.parse('foo:bar'), model.language, true), 5);
-		assert.equal(score('farboo', URI.parse('foo:bar'), model.language, true), 10);
+		assert.strictEqual(score('*', URI.parse('foo:bar'), model.language, true), 5);
+		assert.strictEqual(score('farboo', URI.parse('foo:bar'), model.language, true), 10);
 	});
 
 	test('score, default schemes', function () {
@@ -34,50 +34,50 @@ suite('LanguageSelector', function () {
 		const uri = URI.parse('git:foo/file.txt');
 		const language = 'farboo';
 
-		assert.equal(score('*', uri, language, true), 5);
-		assert.equal(score('farboo', uri, language, true), 10);
-		assert.equal(score({ language: 'farboo', scheme: '' }, uri, language, true), 10);
-		assert.equal(score({ language: 'farboo', scheme: 'git' }, uri, language, true), 10);
-		assert.equal(score({ language: 'farboo', scheme: '*' }, uri, language, true), 10);
-		assert.equal(score({ language: 'farboo' }, uri, language, true), 10);
-		assert.equal(score({ language: '*' }, uri, language, true), 5);
+		assert.strictEqual(score('*', uri, language, true), 5);
+		assert.strictEqual(score('farboo', uri, language, true), 10);
+		assert.strictEqual(score({ language: 'farboo', scheme: '' }, uri, language, true), 10);
+		assert.strictEqual(score({ language: 'farboo', scheme: 'git' }, uri, language, true), 10);
+		assert.strictEqual(score({ language: 'farboo', scheme: '*' }, uri, language, true), 10);
+		assert.strictEqual(score({ language: 'farboo' }, uri, language, true), 10);
+		assert.strictEqual(score({ language: '*' }, uri, language, true), 5);
 
-		assert.equal(score({ scheme: '*' }, uri, language, true), 5);
-		assert.equal(score({ scheme: 'git' }, uri, language, true), 10);
+		assert.strictEqual(score({ scheme: '*' }, uri, language, true), 5);
+		assert.strictEqual(score({ scheme: 'git' }, uri, language, true), 10);
 	});
 
 	test('score, filter', function () {
-		assert.equal(score('farboo', model.uri, model.language, true), 10);
-		assert.equal(score({ language: 'farboo' }, model.uri, model.language, true), 10);
-		assert.equal(score({ language: 'farboo', scheme: 'file' }, model.uri, model.language, true), 10);
-		assert.equal(score({ language: 'farboo', scheme: 'http' }, model.uri, model.language, true), 0);
+		assert.strictEqual(score('farboo', model.uri, model.language, true), 10);
+		assert.strictEqual(score({ language: 'farboo' }, model.uri, model.language, true), 10);
+		assert.strictEqual(score({ language: 'farboo', scheme: 'file' }, model.uri, model.language, true), 10);
+		assert.strictEqual(score({ language: 'farboo', scheme: 'http' }, model.uri, model.language, true), 0);
 
-		assert.equal(score({ pattern: '**/*.fb' }, model.uri, model.language, true), 10);
-		assert.equal(score({ pattern: '**/*.fb', scheme: 'file' }, model.uri, model.language, true), 10);
-		assert.equal(score({ pattern: '**/*.fb' }, URI.parse('foo:bar'), model.language, true), 0);
-		assert.equal(score({ pattern: '**/*.fb', scheme: 'foo' }, URI.parse('foo:bar'), model.language, true), 0);
+		assert.strictEqual(score({ pattern: '**/*.fb' }, model.uri, model.language, true), 10);
+		assert.strictEqual(score({ pattern: '**/*.fb', scheme: 'file' }, model.uri, model.language, true), 10);
+		assert.strictEqual(score({ pattern: '**/*.fb' }, URI.parse('foo:bar'), model.language, true), 0);
+		assert.strictEqual(score({ pattern: '**/*.fb', scheme: 'foo' }, URI.parse('foo:bar'), model.language, true), 0);
 
 		let doc = {
 			uri: URI.parse('git:/my/file.js'),
 			langId: 'javascript'
 		};
-		assert.equal(score('javascript', doc.uri, doc.langId, true), 10); // 0;
-		assert.equal(score({ language: 'javascript', scheme: 'git' }, doc.uri, doc.langId, true), 10); // 10;
-		assert.equal(score('*', doc.uri, doc.langId, true), 5); // 5
-		assert.equal(score('fooLang', doc.uri, doc.langId, true), 0); // 0
-		assert.equal(score(['fooLang', '*'], doc.uri, doc.langId, true), 5); // 5
+		assert.strictEqual(score('javascript', doc.uri, doc.langId, true), 10); // 0;
+		assert.strictEqual(score({ language: 'javascript', scheme: 'git' }, doc.uri, doc.langId, true), 10); // 10;
+		assert.strictEqual(score('*', doc.uri, doc.langId, true), 5); // 5
+		assert.strictEqual(score('fooLang', doc.uri, doc.langId, true), 0); // 0
+		assert.strictEqual(score(['fooLang', '*'], doc.uri, doc.langId, true), 5); // 5
 	});
 
 	test('score, max(filters)', function () {
 		let match = { language: 'farboo', scheme: 'file' };
 		let fail = { language: 'farboo', scheme: 'http' };
 
-		assert.equal(score(match, model.uri, model.language, true), 10);
-		assert.equal(score(fail, model.uri, model.language, true), 0);
-		assert.equal(score([match, fail], model.uri, model.language, true), 10);
-		assert.equal(score([fail, fail], model.uri, model.language, true), 0);
-		assert.equal(score(['farboo', '*'], model.uri, model.language, true), 10);
-		assert.equal(score(['*', 'farboo'], model.uri, model.language, true), 10);
+		assert.strictEqual(score(match, model.uri, model.language, true), 10);
+		assert.strictEqual(score(fail, model.uri, model.language, true), 0);
+		assert.strictEqual(score([match, fail], model.uri, model.language, true), 10);
+		assert.strictEqual(score([fail, fail], model.uri, model.language, true), 0);
+		assert.strictEqual(score(['farboo', '*'], model.uri, model.language, true), 10);
+		assert.strictEqual(score(['*', 'farboo'], model.uri, model.language, true), 10);
 	});
 
 	test('score hasAccessToAllModels', function () {
@@ -85,14 +85,14 @@ suite('LanguageSelector', function () {
 			uri: URI.parse('file:/my/file.js'),
 			langId: 'javascript'
 		};
-		assert.equal(score('javascript', doc.uri, doc.langId, false), 0);
-		assert.equal(score({ language: 'javascript', scheme: 'file' }, doc.uri, doc.langId, false), 0);
-		assert.equal(score('*', doc.uri, doc.langId, false), 0);
-		assert.equal(score('fooLang', doc.uri, doc.langId, false), 0);
-		assert.equal(score(['fooLang', '*'], doc.uri, doc.langId, false), 0);
+		assert.strictEqual(score('javascript', doc.uri, doc.langId, false), 0);
+		assert.strictEqual(score({ language: 'javascript', scheme: 'file' }, doc.uri, doc.langId, false), 0);
+		assert.strictEqual(score('*', doc.uri, doc.langId, false), 0);
+		assert.strictEqual(score('fooLang', doc.uri, doc.langId, false), 0);
+		assert.strictEqual(score(['fooLang', '*'], doc.uri, doc.langId, false), 0);
 
-		assert.equal(score({ language: 'javascript', scheme: 'file', hasAccessToAllModels: true }, doc.uri, doc.langId, false), 10);
-		assert.equal(score(['fooLang', '*', { language: '*', hasAccessToAllModels: true }], doc.uri, doc.langId, false), 5);
+		assert.strictEqual(score({ language: 'javascript', scheme: 'file', hasAccessToAllModels: true }, doc.uri, doc.langId, false), 10);
+		assert.strictEqual(score(['fooLang', '*', { language: '*', hasAccessToAllModels: true }], doc.uri, doc.langId, false), 5);
 	});
 
 	test('Document selector match - unexpected result value #60232', function () {
@@ -102,7 +102,7 @@ suite('LanguageSelector', function () {
 			pattern: '**/*.interface.json'
 		};
 		let value = score(selector, URI.parse('file:///C:/Users/zlhe/Desktop/test.interface.json'), 'json', true);
-		assert.equal(value, 10);
+		assert.strictEqual(value, 10);
 	});
 
 	test('Document selector match - platform paths #99938', function () {
@@ -113,6 +113,6 @@ suite('LanguageSelector', function () {
 			}
 		};
 		let value = score(selector, URI.file('/home/user/Desktop/test.json'), 'json', true);
-		assert.equal(value, 10);
+		assert.strictEqual(value, 10);
 	});
 });
diff --git a/src/vs/editor/test/common/modes/linkComputer.test.ts b/src/vs/editor/test/common/modes/linkComputer.test.ts
index 9cf9ca77c..5bb34c911 100644
--- a/src/vs/editor/test/common/modes/linkComputer.test.ts
+++ b/src/vs/editor/test/common/modes/linkComputer.test.ts
@@ -49,7 +49,7 @@ function assertLink(text: string, extractedLink: string): void {
 	}
 
 	let r = myComputeLinks([text]);
-	assert.deepEqual(r, [{
+	assert.deepStrictEqual(r, [{
 		range: {
 			startLineNumber: 1,
 			startColumn: startColumn,
@@ -64,7 +64,7 @@ suite('Editor Modes - Link Computer', () => {
 
 	test('Null model', () => {
 		let r = computeLinks(null);
-		assert.deepEqual(r, []);
+		assert.deepStrictEqual(r, []);
 	});
 
 	test('Parsing', () => {
diff --git a/src/vs/editor/test/common/modes/supports/characterPair.test.ts b/src/vs/editor/test/common/modes/supports/characterPair.test.ts
index e244d6b47..ce1c31ee9 100644
--- a/src/vs/editor/test/common/modes/supports/characterPair.test.ts
+++ b/src/vs/editor/test/common/modes/supports/characterPair.test.ts
@@ -13,44 +13,44 @@ suite('CharacterPairSupport', () => {
 
 	test('only autoClosingPairs', () => {
 		let characaterPairSupport = new CharacterPairSupport({ autoClosingPairs: [{ open: 'a', close: 'b' }] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), [{ open: 'a', close: 'b', _standardTokenMask: 0 }]);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), [{ open: 'a', close: 'b', _standardTokenMask: 0 }]);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), [new StandardAutoClosingPairConditional({ open: 'a', close: 'b' })]);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), [new StandardAutoClosingPairConditional({ open: 'a', close: 'b' })]);
 	});
 
 	test('only empty autoClosingPairs', () => {
 		let characaterPairSupport = new CharacterPairSupport({ autoClosingPairs: [] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), []);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), []);
 	});
 
 	test('only brackets', () => {
 		let characaterPairSupport = new CharacterPairSupport({ brackets: [['a', 'b']] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), [{ open: 'a', close: 'b', _standardTokenMask: 0 }]);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), [{ open: 'a', close: 'b', _standardTokenMask: 0 }]);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), [new StandardAutoClosingPairConditional({ open: 'a', close: 'b' })]);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), [new StandardAutoClosingPairConditional({ open: 'a', close: 'b' })]);
 	});
 
 	test('only empty brackets', () => {
 		let characaterPairSupport = new CharacterPairSupport({ brackets: [] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), []);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), []);
 	});
 
 	test('only surroundingPairs', () => {
 		let characaterPairSupport = new CharacterPairSupport({ surroundingPairs: [{ open: 'a', close: 'b' }] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), []);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), [{ open: 'a', close: 'b' }]);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), [{ open: 'a', close: 'b' }]);
 	});
 
 	test('only empty surroundingPairs', () => {
 		let characaterPairSupport = new CharacterPairSupport({ surroundingPairs: [] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), []);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), []);
 	});
 
 	test('brackets is ignored when having autoClosingPairs', () => {
 		let characaterPairSupport = new CharacterPairSupport({ autoClosingPairs: [], brackets: [['a', 'b']] });
-		assert.deepEqual(characaterPairSupport.getAutoClosingPairs(), []);
-		assert.deepEqual(characaterPairSupport.getSurroundingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getAutoClosingPairs(), []);
+		assert.deepStrictEqual(characaterPairSupport.getSurroundingPairs(), []);
 	});
 
 	function findAutoClosingPair(characterPairSupport: CharacterPairSupport, character: string): StandardAutoClosingPairConditional | undefined {
@@ -67,64 +67,64 @@ suite('CharacterPairSupport', () => {
 
 	test('shouldAutoClosePair in empty line', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}', notIn: ['string', 'comment'] }] });
-		assert.equal(testShouldAutoClose(sup, [], 'a', 1), false);
-		assert.equal(testShouldAutoClose(sup, [], '{', 1), true);
+		assert.strictEqual(testShouldAutoClose(sup, [], 'a', 1), false);
+		assert.strictEqual(testShouldAutoClose(sup, [], '{', 1), true);
 	});
 
 	test('shouldAutoClosePair in not interesting line 1', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}', notIn: ['string', 'comment'] }] });
-		assert.equal(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.Other }], '{', 3), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.Other }], 'a', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.Other }], '{', 3), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.Other }], 'a', 3), false);
 	});
 
 	test('shouldAutoClosePair in not interesting line 2', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}' }] });
-		assert.equal(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.String }], '{', 3), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.String }], 'a', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.String }], '{', 3), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'do', type: StandardTokenType.String }], 'a', 3), false);
 	});
 
 	test('shouldAutoClosePair in interesting line 1', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}', notIn: ['string', 'comment'] }] });
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 1), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 1), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 2), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 2), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 3), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 3), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 4), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 1), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 1), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 2), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 2), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], '{', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: '"a"', type: StandardTokenType.String }], 'a', 4), false);
 	});
 
 	test('shouldAutoClosePair in interesting line 2', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}', notIn: ['string', 'comment'] }] });
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 1), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 1), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 2), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 2), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 3), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 3), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 4), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 4), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 5), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 5), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 6), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 6), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 7), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 7), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 1), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 1), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 2), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 2), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 3), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 5), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 5), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 6), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 6), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], '{', 7), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: 'x=', type: StandardTokenType.Other }, { text: '"a"', type: StandardTokenType.String }, { text: ';', type: StandardTokenType.Other }], 'a', 7), false);
 	});
 
 	test('shouldAutoClosePair in interesting line 3', () => {
 		let sup = new CharacterPairSupport({ autoClosingPairs: [{ open: '{', close: '}', notIn: ['string', 'comment'] }] });
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 1), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 1), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 2), true);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 2), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 3), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 3), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 4), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 4), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 5), false);
-		assert.equal(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 5), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 1), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 1), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 2), true);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 2), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 3), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 4), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], '{', 5), false);
+		assert.strictEqual(testShouldAutoClose(sup, [{ text: ' ', type: StandardTokenType.Other }, { text: '//a', type: StandardTokenType.Comment }], 'a', 5), false);
 	});
 
 });
diff --git a/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts b/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
index 22b818c6b..ba609bdb4 100644
--- a/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
+++ b/src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
@@ -18,12 +18,12 @@ suite('Editor Modes - Auto Indentation', () => {
 
 	function testDoesNothing(electricCharacterSupport: BracketElectricCharacterSupport, line: TokenText[], character: string, offset: number): void {
 		let actual = _testOnElectricCharacter(electricCharacterSupport, line, character, offset);
-		assert.deepEqual(actual, null);
+		assert.deepStrictEqual(actual, null);
 	}
 
 	function testMatchBracket(electricCharacterSupport: BracketElectricCharacterSupport, line: TokenText[], character: string, offset: number, matchOpenBracket: string): void {
 		let actual = _testOnElectricCharacter(electricCharacterSupport, line, character, offset);
-		assert.deepEqual(actual, { matchOpenBracket: matchOpenBracket });
+		assert.deepStrictEqual(actual, { matchOpenBracket: matchOpenBracket });
 	}
 
 	test('getElectricCharacters uses all sources and dedups', () => {
@@ -34,7 +34,7 @@ suite('Editor Modes - Auto Indentation', () => {
 			])
 		);
 
-		assert.deepEqual(sup.getElectricCharacters(), ['}', ')']);
+		assert.deepStrictEqual(sup.getElectricCharacters(), ['}', ')']);
 	});
 
 	test('matchOpenBracket', () => {
diff --git a/src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts b/src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts
index 722204807..83d8a6ced 100644
--- a/src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts
+++ b/src/vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts
@@ -18,7 +18,7 @@ export const javascriptOnEnterRules = [
 	}, {
 		// e.g.  * ...|
 		beforeText: /^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/,
-		oneLineAboveText: /(?=^(\s*(\/\*\*|\*)).*)(?=(?!(\s*\*\/)))/,
+		previousLineText: /(?=^(\s*(\/\*\*|\*)).*)(?=(?!(\s*\*\/)))/,
 		action: { indentAction: IndentAction.None, appendText: '* ' }
 	}, {
 		// e.g.  */|
diff --git a/src/vs/editor/test/common/modes/supports/onEnter.test.ts b/src/vs/editor/test/common/modes/supports/onEnter.test.ts
index f799c66e7..1af36e9ef 100644
--- a/src/vs/editor/test/common/modes/supports/onEnter.test.ts
+++ b/src/vs/editor/test/common/modes/supports/onEnter.test.ts
@@ -21,9 +21,9 @@ suite('OnEnter', () => {
 		let testIndentAction = (beforeText: string, afterText: string, expected: IndentAction) => {
 			let actual = support.onEnter(EditorAutoIndentStrategy.Advanced, '', beforeText, afterText);
 			if (expected === IndentAction.None) {
-				assert.equal(actual, null);
+				assert.strictEqual(actual, null);
 			} else {
-				assert.equal(actual!.indentAction, expected);
+				assert.strictEqual(actual!.indentAction, expected);
 			}
 		};
 
@@ -51,18 +51,18 @@ suite('OnEnter', () => {
 		let support = new OnEnterSupport({
 			onEnterRules: javascriptOnEnterRules
 		});
-		let testIndentAction = (oneLineAboveText: string, beforeText: string, afterText: string, expectedIndentAction: IndentAction | null, expectedAppendText: string | null, removeText: number = 0) => {
-			let actual = support.onEnter(EditorAutoIndentStrategy.Advanced, oneLineAboveText, beforeText, afterText);
+		let testIndentAction = (previousLineText: string, beforeText: string, afterText: string, expectedIndentAction: IndentAction | null, expectedAppendText: string | null, removeText: number = 0) => {
+			let actual = support.onEnter(EditorAutoIndentStrategy.Advanced, previousLineText, beforeText, afterText);
 			if (expectedIndentAction === null) {
-				assert.equal(actual, null, 'isNull:' + beforeText);
+				assert.strictEqual(actual, null, 'isNull:' + beforeText);
 			} else {
-				assert.equal(actual !== null, true, 'isNotNull:' + beforeText);
-				assert.equal(actual!.indentAction, expectedIndentAction, 'indentAction:' + beforeText);
+				assert.strictEqual(actual !== null, true, 'isNotNull:' + beforeText);
+				assert.strictEqual(actual!.indentAction, expectedIndentAction, 'indentAction:' + beforeText);
 				if (expectedAppendText !== null) {
-					assert.equal(actual!.appendText, expectedAppendText, 'appendText:' + beforeText);
+					assert.strictEqual(actual!.appendText, expectedAppendText, 'appendText:' + beforeText);
 				}
 				if (removeText !== 0) {
-					assert.equal(actual!.removeText, removeText, 'removeText:' + beforeText);
+					assert.strictEqual(actual!.removeText, removeText, 'removeText:' + beforeText);
 				}
 			}
 		};
diff --git a/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts b/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
index 40ae7e628..cf6bb9997 100644
--- a/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
+++ b/src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
@@ -19,61 +19,61 @@ suite('richEditBrackets', () => {
 
 	test('findPrevBracketInToken one char 1', () => {
 		let result = findPrevBracketInRange(/(\{)|(\})/i, '{', 0, 1);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 2);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 2);
 	});
 
 	test('findPrevBracketInToken one char 2', () => {
 		let result = findPrevBracketInRange(/(\{)|(\})/i, '{{', 0, 1);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 2);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 2);
 	});
 
 	test('findPrevBracketInToken one char 3', () => {
 		let result = findPrevBracketInRange(/(\{)|(\})/i, '{hello world!', 0, 13);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 2);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 2);
 	});
 
 	test('findPrevBracketInToken more chars 1', () => {
 		let result = findPrevBracketInRange(/(olleh)/i, 'hello world!', 0, 12);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 6);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 6);
 	});
 
 	test('findPrevBracketInToken more chars 2', () => {
 		let result = findPrevBracketInRange(/(olleh)/i, 'hello world!', 0, 5);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 6);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 6);
 	});
 
 	test('findPrevBracketInToken more chars 3', () => {
 		let result = findPrevBracketInRange(/(olleh)/i, ' hello world!', 0, 6);
-		assert.equal(result!.startColumn, 2);
-		assert.equal(result!.endColumn, 7);
+		assert.strictEqual(result!.startColumn, 2);
+		assert.strictEqual(result!.endColumn, 7);
 	});
 
 	test('findNextBracketInToken one char', () => {
 		let result = findNextBracketInRange(/(\{)|(\})/i, '{', 0, 1);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 2);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 2);
 	});
 
 	test('findNextBracketInToken more chars', () => {
 		let result = findNextBracketInRange(/(world)/i, 'hello world!', 0, 12);
-		assert.equal(result!.startColumn, 7);
-		assert.equal(result!.endColumn, 12);
+		assert.strictEqual(result!.startColumn, 7);
+		assert.strictEqual(result!.endColumn, 12);
 	});
 
 	test('findNextBracketInToken with emoty result', () => {
 		let result = findNextBracketInRange(/(\{)|(\})/i, '', 0, 0);
-		assert.equal(result, null);
+		assert.strictEqual(result, null);
 	});
 
 	test('issue #3894: [Handlebars] Curly braces edit issues', () => {
 		let result = findPrevBracketInRange(/(\-\-!<)|(>\-\-)|(\{\{)|(\}\})/i, '{{asd}}', 0, 2);
-		assert.equal(result!.startColumn, 1);
-		assert.equal(result!.endColumn, 3);
+		assert.strictEqual(result!.startColumn, 1);
+		assert.strictEqual(result!.endColumn, 3);
 	});
 
 });
diff --git a/src/vs/editor/test/common/modes/supports/tokenization.test.ts b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
index 9f2bd1b99..a8f904085 100644
--- a/src/vs/editor/test/common/modes/supports/tokenization.test.ts
+++ b/src/vs/editor/test/common/modes/supports/tokenization.test.ts
@@ -24,7 +24,7 @@ suite('Token theme matching', () => {
 
 		let actual = theme._match('punctuation.definition.string.begin.html');
 
-		assert.deepEqual(actual, new ThemeTrieElementRule(FontStyle.None, _D, _B));
+		assert.deepStrictEqual(actual, new ThemeTrieElementRule(FontStyle.None, _D, _B));
 	});
 
 	test('can match', () => {
@@ -55,7 +55,7 @@ suite('Token theme matching', () => {
 
 		function assertMatch(scopeName: string, expected: ThemeTrieElementRule): void {
 			let actual = theme._match(scopeName);
-			assert.deepEqual(actual, expected, 'when matching <<' + scopeName + '>>');
+			assert.deepStrictEqual(actual, expected, 'when matching <<' + scopeName + '>>');
 		}
 
 		function assertSimpleMatch(scopeName: string, fontStyle: FontStyle, foreground: number, background: number): void {
@@ -152,7 +152,7 @@ suite('Token theme parsing', () => {
 			new ParsedTokenThemeRule('constant.numeric.dec', 10, FontStyle.None, '0000ff', null),
 		];
 
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	});
 });
 
@@ -162,7 +162,7 @@ suite('Token theme resolving', () => {
 		let actual = ['bar', 'z', 'zu', 'a', 'ab', ''].sort(strcmp);
 
 		let expected = ['', 'a', 'ab', 'bar', 'z', 'zu'];
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	});
 
 	test('always has defaults', () => {
@@ -170,8 +170,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
 	});
 
 	test('respects incoming defaults 1', () => {
@@ -181,8 +181,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
 	});
 
 	test('respects incoming defaults 2', () => {
@@ -192,8 +192,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
 	});
 
 	test('respects incoming defaults 3', () => {
@@ -203,8 +203,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ffffff');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _A, _B)));
 	});
 
 	test('respects incoming defaults 4', () => {
@@ -214,8 +214,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('ff0000');
 		const _B = colorMap.getId('ffffff');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
 	});
 
 	test('respects incoming defaults 5', () => {
@@ -225,8 +225,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('000000');
 		const _B = colorMap.getId('ff0000');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B)));
 	});
 
 	test('can merge incoming defaults', () => {
@@ -238,8 +238,8 @@ suite('Token theme resolving', () => {
 		let colorMap = new ColorMap();
 		const _A = colorMap.getId('00ff00');
 		const _B = colorMap.getId('ff0000');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
-		assert.deepEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _A, _B)));
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getThemeTrieElement(), new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _A, _B)));
 	});
 
 	test('defaults are inherited', () => {
@@ -251,7 +251,7 @@ suite('Token theme resolving', () => {
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
 		const _C = colorMap.getId('ff0000');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
 		let root = new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B), {
 			'var': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _C, _B))
 		});
@@ -268,7 +268,7 @@ suite('Token theme resolving', () => {
 		const _A = colorMap.getId('F8F8F2');
 		const _B = colorMap.getId('272822');
 		const _C = colorMap.getId('ff0000');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
 		let root = new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B), {
 			'var': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _C, _B))
 		});
@@ -286,7 +286,7 @@ suite('Token theme resolving', () => {
 		const _B = colorMap.getId('272822');
 		const _C = colorMap.getId('ff0000');
 		const _D = colorMap.getId('00ff00');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
 		let root = new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B), {
 			'var': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _C, _B), {
 				'identifier': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _D, _B))
@@ -314,7 +314,7 @@ suite('Token theme resolving', () => {
 		const _E = colorMap.getId('300000');
 		const _F = colorMap.getId('ff0000');
 		const _G = colorMap.getId('00ff00');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
 		let root = new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.None, _A, _B), {
 			'var': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _F, _B), {
 				'identifier': new ExternalThemeTrieElement(new ThemeTrieElementRule(FontStyle.Bold, _G, _B))
@@ -341,6 +341,6 @@ suite('Token theme resolving', () => {
 		colorMap.getId('FFFFFF');
 		colorMap.getId('0F0F0F');
 		colorMap.getId('F8F8F2');
-		assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
+		assert.deepStrictEqual(actual.getColorMap(), colorMap.getColorMap());
 	});
 });
diff --git a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
index fb4c4028b..aaa8f060f 100644
--- a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
+++ b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
@@ -31,7 +31,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		];
 		let expectedStr = `<div class="monaco-tokenized-source">${toStr(expected)}</div>`;
 
-		assert.equal(actual, expectedStr);
+		assert.strictEqual(actual, expectedStr);
 
 		mode.dispose();
 	});
@@ -61,7 +61,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		let expectedStr2 = toStr(expected2);
 		let expectedStr = `<div class="monaco-tokenized-source">${expectedStr1}<br/>${expectedStr2}</div>`;
 
-		assert.equal(actual, expectedStr);
+		assert.strictEqual(actual, expectedStr);
 
 		mode.dispose();
 	});
@@ -104,7 +104,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		]);
 		const colorMap = [null!, '#000000', '#ffffff', '#ff0000', '#00ff00', '#0000ff'];
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 17, 4, true),
 			[
 				'<div>',
@@ -117,7 +117,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 12, 4, true),
 			[
 				'<div>',
@@ -130,7 +130,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 11, 4, true),
 			[
 				'<div>',
@@ -142,7 +142,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 1, 11, 4, true),
 			[
 				'<div>',
@@ -154,7 +154,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 4, 11, 4, true),
 			[
 				'<div>',
@@ -165,7 +165,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 5, 11, 4, true),
 			[
 				'<div>',
@@ -175,7 +175,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 5, 10, 4, true),
 			[
 				'<div>',
@@ -184,7 +184,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 6, 9, 4, true),
 			[
 				'<div>',
@@ -237,7 +237,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 		]);
 		const colorMap = [null!, '#000000', '#ffffff', '#ff0000', '#00ff00', '#0000ff'];
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 21, 4, true),
 			[
 				'<div>',
@@ -251,7 +251,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 17, 4, true),
 			[
 				'<div>',
@@ -265,7 +265,7 @@ suite('Editor Modes - textToHtmlTokenizer', () => {
 			].join('')
 		);
 
-		assert.equal(
+		assert.strictEqual(
 			tokenizeLineToHTML(text, lineTokens, colorMap, 0, 3, 4, true),
 			[
 				'<div>',
@@ -287,7 +287,7 @@ class Mode extends MockMode {
 		this._register(TokenizationRegistry.register(this.getId(), {
 			getInitialState: (): IState => null!,
 			tokenize: undefined!,
-			tokenize2: (line: string, state: IState): TokenizationResult2 => {
+			tokenize2: (line: string, hasEOL: boolean, state: IState): TokenizationResult2 => {
 				let tokensArr: number[] = [];
 				let prevColor: ColorId = -1;
 				for (let i = 0; i < line.length; i++) {
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index 54f73ed0e..bcfafe9d0 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -43,13 +43,13 @@ suite('EditorSimpleWorker', () => {
 
 	function assertPositionAt(offset: number, line: number, column: number) {
 		let position = model.positionAt(offset);
-		assert.equal(position.lineNumber, line);
-		assert.equal(position.column, column);
+		assert.strictEqual(position.lineNumber, line);
+		assert.strictEqual(position.column, column);
 	}
 
 	function assertOffsetAt(lineNumber: number, column: number, offset: number) {
 		let actual = model.offsetAt({ lineNumber, column });
-		assert.equal(actual, offset);
+		assert.strictEqual(actual, offset);
 	}
 
 	test('ICommonModel#offsetAt', () => {
@@ -83,16 +83,16 @@ suite('EditorSimpleWorker', () => {
 
 	test('ICommonModel#validatePosition, issue #15882', function () {
 		let model = worker.addModel(['{"id": "0001","type": "donut","name": "Cake","image":{"url": "images/0001.jpg","width": 200,"height": 200},"thumbnail":{"url": "images/thumbnails/0001.jpg","width": 32,"height": 32}}']);
-		assert.equal(model.offsetAt({ lineNumber: 1, column: 2 }), 1);
+		assert.strictEqual(model.offsetAt({ lineNumber: 1, column: 2 }), 1);
 	});
 
 	test('MoreMinimal', () => {
 
 		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: 'This is line One', range: new Range(1, 1, 1, 17) }]).then(edits => {
-			assert.equal(edits.length, 1);
+			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
-			assert.equal(first.text, 'O');
-			assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 14, endLineNumber: 1, endColumn: 15 });
+			assert.strictEqual(first.text, 'O');
+			assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 14, endLineNumber: 1, endColumn: 15 });
 		});
 	});
 
@@ -105,7 +105,7 @@ suite('EditorSimpleWorker', () => {
 		], '\n');
 
 		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"a":1\r\n}', range: new Range(1, 1, 3, 2) }]).then(edits => {
-			assert.equal(edits.length, 0);
+			assert.strictEqual(edits.length, 0);
 		});
 	});
 
@@ -118,10 +118,10 @@ suite('EditorSimpleWorker', () => {
 		], '\n');
 
 		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"b":1\r\n}', range: new Range(1, 1, 3, 2) }]).then(edits => {
-			assert.equal(edits.length, 1);
+			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
-			assert.equal(first.text, 'b');
-			assert.deepEqual(first.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 2, endColumn: 4 });
+			assert.strictEqual(first.text, 'b');
+			assert.deepStrictEqual(first.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 2, endColumn: 4 });
 		});
 	});
 
@@ -134,10 +134,10 @@ suite('EditorSimpleWorker', () => {
 		]);
 
 		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '\n', range: new Range(3, 2, 4, 1000) }]).then(edits => {
-			assert.equal(edits.length, 1);
+			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
-			assert.equal(first.text, '\n');
-			assert.deepEqual(first.range, { startLineNumber: 3, startColumn: 2, endLineNumber: 3, endColumn: 2 });
+			assert.strictEqual(first.text, '\n');
+			assert.deepStrictEqual(first.range, { startLineNumber: 3, startColumn: 2, endLineNumber: 3, endColumn: 2 });
 		});
 	});
 
@@ -151,7 +151,7 @@ suite('EditorSimpleWorker', () => {
 		]);
 
 		const value = model.getValueInRange({ startLineNumber: 3, startColumn: 1, endLineNumber: 4, endColumn: 1 });
-		assert.equal(value, '}');
+		assert.strictEqual(value, '}');
 	});
 
 
@@ -165,11 +165,10 @@ suite('EditorSimpleWorker', () => {
 		return worker.textualSuggest([model.uri.toString()], 'f', '[a-z]+', 'img').then((result) => {
 			if (!result) {
 				assert.ok(false);
-				return;
 			}
-			assert.equal(result.words.length, 1);
-			assert.equal(typeof result.duration, 'number');
-			assert.equal(result.words[0], 'foobar');
+			assert.strictEqual(result.words.length, 1);
+			assert.strictEqual(typeof result.duration, 'number');
+			assert.strictEqual(result.words[0], 'foobar');
 		});
 	});
 
@@ -187,6 +186,6 @@ suite('EditorSimpleWorker', () => {
 
 		let words: string[] = [...model.words(/[a-z]+/img)];
 
-		assert.deepEqual(words, ['one', 'line', 'two', 'line', 'past', 'empty', 'single', 'and', 'now', 'we', 'are', 'done']);
+		assert.deepStrictEqual(words, ['one', 'line', 'two', 'line', 'past', 'empty', 'single', 'and', 'now', 'we', 'are', 'done']);
 	});
 });
diff --git a/src/vs/editor/test/common/services/languagesRegistry.test.ts b/src/vs/editor/test/common/services/languagesRegistry.test.ts
index 09ef74cd0..d0eac05b5 100644
--- a/src/vs/editor/test/common/services/languagesRegistry.test.ts
+++ b/src/vs/editor/test/common/services/languagesRegistry.test.ts
@@ -19,7 +19,7 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['outputModeMimeType'],
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), []);
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), []);
 	});
 
 	test('mode with alias does have a name', () => {
@@ -32,8 +32,8 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['bla'],
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['ModeName']);
-		assert.deepEqual(registry.getLanguageName('modeId'), 'ModeName');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['ModeName']);
+		assert.deepStrictEqual(registry.getLanguageName('modeId'), 'ModeName');
 	});
 
 	test('mode without alias gets a name', () => {
@@ -45,8 +45,8 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['bla'],
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['modeId']);
-		assert.deepEqual(registry.getLanguageName('modeId'), 'modeId');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['modeId']);
+		assert.deepStrictEqual(registry.getLanguageName('modeId'), 'modeId');
 	});
 
 	test('bug #4360: f# not shown in status bar', () => {
@@ -66,8 +66,8 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['bla'],
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['ModeName']);
-		assert.deepEqual(registry.getLanguageName('modeId'), 'ModeName');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['ModeName']);
+		assert.deepStrictEqual(registry.getLanguageName('modeId'), 'ModeName');
 	});
 
 	test('issue #5278: Extension cannot override language name anymore', () => {
@@ -87,8 +87,8 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['bla'],
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['BetterModeName']);
-		assert.deepEqual(registry.getLanguageName('modeId'), 'BetterModeName');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['BetterModeName']);
+		assert.deepStrictEqual(registry.getLanguageName('modeId'), 'BetterModeName');
 	});
 
 	test('mimetypes are generated if necessary', () => {
@@ -98,7 +98,7 @@ suite('LanguagesRegistry', () => {
 			id: 'modeId'
 		}]);
 
-		assert.deepEqual(registry.getMimeForMode('modeId'), 'text/x-modeId');
+		assert.deepStrictEqual(registry.getMimeForMode('modeId'), 'text/x-modeId');
 	});
 
 	test('first mimetype wins', () => {
@@ -109,7 +109,7 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['text/modeId', 'text/modeId2']
 		}]);
 
-		assert.deepEqual(registry.getMimeForMode('modeId'), 'text/modeId');
+		assert.deepStrictEqual(registry.getMimeForMode('modeId'), 'text/modeId');
 	});
 
 	test('first mimetype wins 2', () => {
@@ -124,7 +124,7 @@ suite('LanguagesRegistry', () => {
 			mimetypes: ['text/modeId']
 		}]);
 
-		assert.deepEqual(registry.getMimeForMode('modeId'), 'text/x-modeId');
+		assert.deepStrictEqual(registry.getMimeForMode('modeId'), 'text/x-modeId');
 	});
 
 	test('aliases', () => {
@@ -134,42 +134,42 @@ suite('LanguagesRegistry', () => {
 			id: 'a'
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
-		assert.deepEqual(registry.getLanguageName('a'), 'a');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
+		assert.deepStrictEqual(registry.getLanguageName('a'), 'a');
 
 		registry._registerLanguages([{
 			id: 'a',
 			aliases: ['A1', 'A2']
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['A1']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('a'), []);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A1'), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A2'), []);
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a1'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a2'), 'a');
-		assert.deepEqual(registry.getLanguageName('a'), 'A1');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['A1']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('a'), []);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A1'), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A2'), []);
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a1'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a2'), 'a');
+		assert.deepStrictEqual(registry.getLanguageName('a'), 'A1');
 
 		registry._registerLanguages([{
 			id: 'a',
 			aliases: ['A3', 'A4']
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['A3']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('a'), []);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A1'), []);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A2'), []);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A3'), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('A4'), []);
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a1'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a2'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a3'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a4'), 'a');
-		assert.deepEqual(registry.getLanguageName('a'), 'A3');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['A3']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('a'), []);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A1'), []);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A2'), []);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A3'), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('A4'), []);
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a1'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a2'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a3'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a4'), 'a');
+		assert.deepStrictEqual(registry.getLanguageName('a'), 'A3');
 	});
 
 	test('empty aliases array means no alias', () => {
@@ -179,23 +179,23 @@ suite('LanguagesRegistry', () => {
 			id: 'a'
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
-		assert.deepEqual(registry.getLanguageName('a'), 'a');
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
+		assert.deepStrictEqual(registry.getLanguageName('a'), 'a');
 
 		registry._registerLanguages([{
 			id: 'b',
 			aliases: []
 		}]);
 
-		assert.deepEqual(registry.getRegisteredLanguageNames(), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
-		assert.deepEqual(registry.getModeIdsFromLanguageName('b'), []);
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
-		assert.deepEqual(registry.getModeIdForLanguageNameLowercase('b'), 'b');
-		assert.deepEqual(registry.getLanguageName('a'), 'a');
-		assert.deepEqual(registry.getLanguageName('b'), null);
+		assert.deepStrictEqual(registry.getRegisteredLanguageNames(), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('a'), ['a']);
+		assert.deepStrictEqual(registry.getModeIdsFromLanguageName('b'), []);
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('a'), 'a');
+		assert.deepStrictEqual(registry.getModeIdForLanguageNameLowercase('b'), 'b');
+		assert.deepStrictEqual(registry.getLanguageName('a'), 'a');
+		assert.deepStrictEqual(registry.getLanguageName('b'), null);
 	});
 
 	test('extensions', () => {
@@ -207,18 +207,18 @@ suite('LanguagesRegistry', () => {
 			extensions: ['aExt']
 		}]);
 
-		assert.deepEqual(registry.getExtensions('a'), []);
-		assert.deepEqual(registry.getExtensions('aname'), []);
-		assert.deepEqual(registry.getExtensions('aName'), ['aExt']);
+		assert.deepStrictEqual(registry.getExtensions('a'), []);
+		assert.deepStrictEqual(registry.getExtensions('aname'), []);
+		assert.deepStrictEqual(registry.getExtensions('aName'), ['aExt']);
 
 		registry._registerLanguages([{
 			id: 'a',
 			extensions: ['aExt2']
 		}]);
 
-		assert.deepEqual(registry.getExtensions('a'), []);
-		assert.deepEqual(registry.getExtensions('aname'), []);
-		assert.deepEqual(registry.getExtensions('aName'), ['aExt', 'aExt2']);
+		assert.deepStrictEqual(registry.getExtensions('a'), []);
+		assert.deepStrictEqual(registry.getExtensions('aname'), []);
+		assert.deepStrictEqual(registry.getExtensions('aName'), ['aExt', 'aExt2']);
 	});
 
 	test('extensions of primary language registration come first', () => {
@@ -229,7 +229,7 @@ suite('LanguagesRegistry', () => {
 			extensions: ['aExt3']
 		}]);
 
-		assert.deepEqual(registry.getExtensions('a')[0], 'aExt3');
+		assert.deepStrictEqual(registry.getExtensions('a')[0], 'aExt3');
 
 		registry._registerLanguages([{
 			id: 'a',
@@ -237,14 +237,14 @@ suite('LanguagesRegistry', () => {
 			extensions: ['aExt']
 		}]);
 
-		assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
+		assert.deepStrictEqual(registry.getExtensions('a')[0], 'aExt');
 
 		registry._registerLanguages([{
 			id: 'a',
 			extensions: ['aExt2']
 		}]);
 
-		assert.deepEqual(registry.getExtensions('a')[0], 'aExt');
+		assert.deepStrictEqual(registry.getExtensions('a')[0], 'aExt');
 	});
 
 	test('filenames', () => {
@@ -256,18 +256,18 @@ suite('LanguagesRegistry', () => {
 			filenames: ['aFilename']
 		}]);
 
-		assert.deepEqual(registry.getFilenames('a'), []);
-		assert.deepEqual(registry.getFilenames('aname'), []);
-		assert.deepEqual(registry.getFilenames('aName'), ['aFilename']);
+		assert.deepStrictEqual(registry.getFilenames('a'), []);
+		assert.deepStrictEqual(registry.getFilenames('aname'), []);
+		assert.deepStrictEqual(registry.getFilenames('aName'), ['aFilename']);
 
 		registry._registerLanguages([{
 			id: 'a',
 			filenames: ['aFilename2']
 		}]);
 
-		assert.deepEqual(registry.getFilenames('a'), []);
-		assert.deepEqual(registry.getFilenames('aname'), []);
-		assert.deepEqual(registry.getFilenames('aName'), ['aFilename', 'aFilename2']);
+		assert.deepStrictEqual(registry.getFilenames('a'), []);
+		assert.deepStrictEqual(registry.getFilenames('aname'), []);
+		assert.deepStrictEqual(registry.getFilenames('aName'), ['aFilename', 'aFilename2']);
 	});
 
 	test('configuration', () => {
@@ -279,17 +279,17 @@ suite('LanguagesRegistry', () => {
 			configuration: URI.file('/path/to/aFilename')
 		}]);
 
-		assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename')]);
-		assert.deepEqual(registry.getConfigurationFiles('aname'), []);
-		assert.deepEqual(registry.getConfigurationFiles('aName'), []);
+		assert.deepStrictEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename')]);
+		assert.deepStrictEqual(registry.getConfigurationFiles('aname'), []);
+		assert.deepStrictEqual(registry.getConfigurationFiles('aName'), []);
 
 		registry._registerLanguages([{
 			id: 'a',
 			configuration: URI.file('/path/to/aFilename2')
 		}]);
 
-		assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename'), URI.file('/path/to/aFilename2')]);
-		assert.deepEqual(registry.getConfigurationFiles('aname'), []);
-		assert.deepEqual(registry.getConfigurationFiles('aName'), []);
+		assert.deepStrictEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename'), URI.file('/path/to/aFilename2')]);
+		assert.deepStrictEqual(registry.getConfigurationFiles('aname'), []);
+		assert.deepStrictEqual(registry.getConfigurationFiles('aName'), []);
 	});
 });
diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts
index 52672ffe3..23e0f8f2a 100644
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -11,18 +11,26 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { createStringBuilder } from 'vs/editor/common/core/stringBuilder';
-import { DefaultEndOfLine } from 'vs/editor/common/model';
+import { DefaultEndOfLine, ITextModel } from 'vs/editor/common/model';
 import { createTextBuffer } from 'vs/editor/common/model/textModel';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ModelSemanticColoring, ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import { TestColorTheme, TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
 import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DocumentSemanticTokensProvider, DocumentSemanticTokensProviderRegistry, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from 'vs/editor/common/modes';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Barrier, timeout } from 'vs/base/common/async';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
+import { ColorScheme } from 'vs/platform/theme/common/theme';
+import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
 
 const GENERATE_TESTS = false;
 
@@ -47,9 +55,9 @@ suite('ModelService', () => {
 		const model2 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\myroot\\myfile.txt' : '/myroot/myfile.txt'));
 		const model3 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\other\\myfile.txt' : '/other/myfile.txt'));
 
-		assert.equal(model1.getOptions().defaultEOL, DefaultEndOfLine.LF);
-		assert.equal(model2.getOptions().defaultEOL, DefaultEndOfLine.CRLF);
-		assert.equal(model3.getOptions().defaultEOL, DefaultEndOfLine.LF);
+		assert.strictEqual(model1.getOptions().defaultEOL, DefaultEndOfLine.LF);
+		assert.strictEqual(model2.getOptions().defaultEOL, DefaultEndOfLine.CRLF);
+		assert.strictEqual(model3.getOptions().defaultEOL, DefaultEndOfLine.LF);
 	});
 
 	test('_computeEdits no change', function () {
@@ -71,11 +79,11 @@ suite('ModelService', () => {
 				'and finished with the fourth.', //29
 			].join('\n'),
 			DefaultEndOfLine.LF
-		);
+		).textBuffer;
 
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
-		assert.deepEqual(actual, []);
+		assert.deepStrictEqual(actual, []);
 	});
 
 	test('_computeEdits first line changed', function () {
@@ -97,11 +105,11 @@ suite('ModelService', () => {
 				'and finished with the fourth.', //29
 			].join('\n'),
 			DefaultEndOfLine.LF
-		);
+		).textBuffer;
 
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			EditOperation.replaceMove(new Range(1, 1, 2, 1), 'This is line One\n')
 		]);
 	});
@@ -125,11 +133,11 @@ suite('ModelService', () => {
 				'and finished with the fourth.', //29
 			].join('\r\n'),
 			DefaultEndOfLine.LF
-		);
+		).textBuffer;
 
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
-		assert.deepEqual(actual, []);
+		assert.deepStrictEqual(actual, []);
 	});
 
 	test('_computeEdits EOL and other change 1', function () {
@@ -151,11 +159,11 @@ suite('ModelService', () => {
 				'and finished with the fourth.', //29
 			].join('\r\n'),
 			DefaultEndOfLine.LF
-		);
+		).textBuffer;
 
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			EditOperation.replaceMove(
 				new Range(1, 1, 4, 1),
 				[
@@ -186,11 +194,11 @@ suite('ModelService', () => {
 				''
 			].join('\r\n'),
 			DefaultEndOfLine.LF
-		);
+		).textBuffer;
 
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			EditOperation.replaceMove(new Range(3, 2, 3, 2), '\r\n')
 		]);
 	});
@@ -317,7 +325,7 @@ suite('ModelService', () => {
 		const model1 = modelService.createModel('text', null, resource);
 		// make an edit
 		model1.pushEditOperations(null, [{ range: new Range(1, 5, 1, 5), text: '1' }], () => [new Selection(1, 5, 1, 5)]);
-		assert.equal(model1.getValue(), 'text1');
+		assert.strictEqual(model1.getValue(), 'text1');
 		// dispose it
 		modelService.destroyModel(resource);
 
@@ -325,7 +333,7 @@ suite('ModelService', () => {
 		const model2 = modelService.createModel('text1', null, resource);
 		// undo
 		model2.undo();
-		assert.equal(model2.getValue(), 'text');
+		assert.strictEqual(model2.getValue(), 'text');
 	});
 
 	test('maintains version id and alternative version id for same resource and same content', () => {
@@ -335,7 +343,7 @@ suite('ModelService', () => {
 		const model1 = modelService.createModel('text', null, resource);
 		// make an edit
 		model1.pushEditOperations(null, [{ range: new Range(1, 5, 1, 5), text: '1' }], () => [new Selection(1, 5, 1, 5)]);
-		assert.equal(model1.getValue(), 'text1');
+		assert.strictEqual(model1.getValue(), 'text1');
 		const versionId = model1.getVersionId();
 		const alternativeVersionId = model1.getAlternativeVersionId();
 		// dispose it
@@ -343,8 +351,8 @@ suite('ModelService', () => {
 
 		// create a new model with the same content
 		const model2 = modelService.createModel('text1', null, resource);
-		assert.equal(model2.getVersionId(), versionId);
-		assert.equal(model2.getAlternativeVersionId(), alternativeVersionId);
+		assert.strictEqual(model2.getVersionId(), versionId);
+		assert.strictEqual(model2.getAlternativeVersionId(), alternativeVersionId);
 	});
 
 	test('does not maintain undo for same resource and different content', () => {
@@ -354,7 +362,7 @@ suite('ModelService', () => {
 		const model1 = modelService.createModel('text', null, resource);
 		// make an edit
 		model1.pushEditOperations(null, [{ range: new Range(1, 5, 1, 5), text: '1' }], () => [new Selection(1, 5, 1, 5)]);
-		assert.equal(model1.getValue(), 'text1');
+		assert.strictEqual(model1.getValue(), 'text1');
 		// dispose it
 		modelService.destroyModel(resource);
 
@@ -362,7 +370,7 @@ suite('ModelService', () => {
 		const model2 = modelService.createModel('text2', null, resource);
 		// undo
 		model2.undo();
-		assert.equal(model2.getValue(), 'text2');
+		assert.strictEqual(model2.getValue(), 'text2');
 	});
 
 	test('setValue should clear undo stack', () => {
@@ -370,17 +378,98 @@ suite('ModelService', () => {
 
 		const model = modelService.createModel('text', null, resource);
 		model.pushEditOperations(null, [{ range: new Range(1, 5, 1, 5), text: '1' }], () => [new Selection(1, 5, 1, 5)]);
-		assert.equal(model.getValue(), 'text1');
+		assert.strictEqual(model.getValue(), 'text1');
 
 		model.setValue('text2');
 		model.undo();
-		assert.equal(model.getValue(), 'text2');
+		assert.strictEqual(model.getValue(), 'text2');
+	});
+});
+
+suite('ModelSemanticColoring', () => {
+
+	const disposables = new DisposableStore();
+	const ORIGINAL_FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY = ModelSemanticColoring.FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY;
+	let modelService: IModelService;
+	let modeService: IModeService;
+
+	setup(() => {
+		ModelSemanticColoring.FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY = 0;
+
+		const configService = new TestConfigurationService({ editor: { semanticHighlighting: true } });
+		const themeService = new TestThemeService();
+		themeService.setTheme(new TestColorTheme({}, ColorScheme.DARK, true));
+		modelService = disposables.add(new ModelServiceImpl(
+			configService,
+			new TestTextResourcePropertiesService(configService),
+			themeService,
+			new NullLogService(),
+			new UndoRedoService(new TestDialogService(), new TestNotificationService())
+		));
+		modeService = disposables.add(new ModeServiceImpl(false));
+	});
+
+	teardown(() => {
+		disposables.clear();
+		ModelSemanticColoring.FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY = ORIGINAL_FETCH_DOCUMENT_SEMANTIC_TOKENS_DELAY;
+	});
+
+	test('DocumentSemanticTokens should be fetched when the result is empty if there are pending changes', async () => {
+
+		disposables.add(ModesRegistry.registerLanguage({ id: 'testMode' }));
+
+		const inFirstCall = new Barrier();
+		const delayFirstResult = new Barrier();
+		const secondResultProvided = new Barrier();
+		let callCount = 0;
+
+		disposables.add(DocumentSemanticTokensProviderRegistry.register('testMode', new class implements DocumentSemanticTokensProvider {
+			getLegend(): SemanticTokensLegend {
+				return { tokenTypes: ['class'], tokenModifiers: [] };
+			}
+			async provideDocumentSemanticTokens(model: ITextModel, lastResultId: string | null, token: CancellationToken): Promise<SemanticTokens | SemanticTokensEdits | null> {
+				callCount++;
+				if (callCount === 1) {
+					assert.ok('called once');
+					inFirstCall.open();
+					await delayFirstResult.wait();
+					await timeout(0); // wait for the simple scheduler to fire to check that we do actually get rescheduled
+					return null;
+				}
+				if (callCount === 2) {
+					assert.ok('called twice');
+					secondResultProvided.open();
+					return null;
+				}
+				assert.fail('Unexpected call');
+			}
+			releaseDocumentSemanticTokens(resultId: string | undefined): void {
+			}
+		}));
+
+		const textModel = disposables.add(modelService.createModel('Hello world', modeService.create('testMode')));
+
+		// wait for the provider to be called
+		await inFirstCall.wait();
+
+		// the provider is now in the provide call
+		// change the text buffer while the provider is running
+		textModel.applyEdits([{ range: new Range(1, 1, 1, 1), text: 'x' }]);
+
+		// let the provider finish its first result
+		delayFirstResult.open();
+
+		// we need to check that the provider is called again, even if it returns null
+		await secondResultProvided.wait();
+
+		// assert that it got called twice
+		assert.strictEqual(callCount, 2);
 	});
 });
 
 function assertComputeEdits(lines1: string[], lines2: string[]): void {
 	const model = createTextModel(lines1.join('\n'));
-	const textBuffer = createTextBuffer(lines2.join('\n'), DefaultEndOfLine.LF);
+	const textBuffer = createTextBuffer(lines2.join('\n'), DefaultEndOfLine.LF).textBuffer;
 
 	// compute required edits
 	// let start = Date.now();
@@ -390,7 +479,7 @@ function assertComputeEdits(lines1: string[], lines2: string[]): void {
 	// apply edits
 	model.pushEditOperations([], edits, null);
 
-	assert.equal(model.getValue(), lines2.join('\n'));
+	assert.strictEqual(model.getValue(), lines2.join('\n'));
 }
 
 function getRandomInt(min: number, max: number): number {
@@ -439,21 +528,3 @@ assertComputeEdits(file1, file2);
 		}
 	}
 }
-
-export class TestTextResourcePropertiesService implements ITextResourcePropertiesService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-	) {
-	}
-
-	getEOL(resource: URI, language?: string): string {
-		const eol = this.configurationService.getValue<string>('files.eol', { overrideIdentifier: language, resource });
-		if (eol && eol !== 'auto') {
-			return eol;
-		}
-		return (platform.isLinux || platform.isMacintosh) ? '\n' : '\r\n';
-	}
-}
diff --git a/src/vs/workbench/test/common/api/semanticTokensDto.test.ts b/src/vs/editor/test/common/services/semanticTokensDto.test.ts
similarity index 95%
rename from src/vs/workbench/test/common/api/semanticTokensDto.test.ts
rename to src/vs/editor/test/common/services/semanticTokensDto.test.ts
index 091bc24e2..9cedebd29 100644
--- a/src/vs/workbench/test/common/api/semanticTokensDto.test.ts
+++ b/src/vs/editor/test/common/services/semanticTokensDto.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { IFullSemanticTokensDto, IDeltaSemanticTokensDto, encodeSemanticTokensDto, ISemanticTokensDto, decodeSemanticTokensDto } from 'vs/workbench/api/common/shared/semanticTokensDto';
+import { IFullSemanticTokensDto, IDeltaSemanticTokensDto, encodeSemanticTokensDto, ISemanticTokensDto, decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
 import { VSBuffer } from 'vs/base/common/buffer';
 
 suite('SemanticTokensDto', () => {
@@ -25,7 +25,7 @@ suite('SemanticTokensDto', () => {
 				data: toArr(dto.data)
 			};
 		};
-		assert.deepEqual(convert(actual), convert(expected));
+		assert.deepStrictEqual(convert(actual), convert(expected));
 	}
 
 	function assertEqualDelta(actual: IDeltaSemanticTokensDto, expected: IDeltaSemanticTokensDto): void {
@@ -46,7 +46,7 @@ suite('SemanticTokensDto', () => {
 				deltas: dto.deltas.map(convertOne)
 			};
 		};
-		assert.deepEqual(convert(actual), convert(expected));
+		assert.deepStrictEqual(convert(actual), convert(expected));
 	}
 
 	function testRoundTrip(value: ISemanticTokensDto): void {
diff --git a/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts b/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
new file mode 100644
index 000000000..f5ac31d5f
--- /dev/null
+++ b/src/vs/editor/test/common/services/testTextResourcePropertiesService.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as platform from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+
+export class TestTextResourcePropertiesService implements ITextResourcePropertiesService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+	}
+
+	getEOL(resource: URI, language?: string): string {
+		const eol = this.configurationService.getValue<string>('files.eol', { overrideIdentifier: language, resource });
+		if (eol && eol !== 'auto') {
+			return eol;
+		}
+		return (platform.isLinux || platform.isMacintosh) ? '\n' : '\r\n';
+	}
+}
diff --git a/src/vs/editor/test/common/view/overviewZoneManager.test.ts b/src/vs/editor/test/common/view/overviewZoneManager.test.ts
index 39c104fbb..ee8c8ed7d 100644
--- a/src/vs/editor/test/common/view/overviewZoneManager.test.ts
+++ b/src/vs/editor/test/common/view/overviewZoneManager.test.ts
@@ -26,7 +26,7 @@ suite('Editor View - OverviewZoneManager', () => {
 		]);
 
 		// one line = 12, but cap is at 6
-		assert.deepEqual(manager.resolveColorZones(), [
+		assert.deepStrictEqual(manager.resolveColorZones(), [
 			new ColorZone(12, 24, 1), //
 			new ColorZone(120, 132, 2), // 120 -> 132
 			new ColorZone(360, 384, 3), // 360 -> 372 [360 -> 384]
@@ -52,7 +52,7 @@ suite('Editor View - OverviewZoneManager', () => {
 		]);
 
 		// one line = 6, cap is at 6
-		assert.deepEqual(manager.resolveColorZones(), [
+		assert.deepStrictEqual(manager.resolveColorZones(), [
 			new ColorZone(6, 12, 1), //
 			new ColorZone(60, 66, 2), // 60 -> 66
 			new ColorZone(180, 192, 3), // 180 -> 192
@@ -78,7 +78,7 @@ suite('Editor View - OverviewZoneManager', () => {
 		]);
 
 		// one line = 6, cap is at 12
-		assert.deepEqual(manager.resolveColorZones(), [
+		assert.deepStrictEqual(manager.resolveColorZones(), [
 			new ColorZone(12, 24, 1), //
 			new ColorZone(120, 132, 2), // 120 -> 132
 			new ColorZone(360, 384, 3), // 360 -> 384
diff --git a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
index 910165a0e..a0fa69bc8 100644
--- a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
+++ b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
@@ -95,7 +95,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 			maxDigitWidth: input.maxDigitWidth,
 			pixelRatio: input.pixelRatio,
 		});
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('EditorLayoutProvider 1', () => {
diff --git a/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts b/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
index 8be7627bc..e8939e784 100644
--- a/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
+++ b/src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
@@ -17,7 +17,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
 		]);
 
-		assert.deepEqual(result, [
+		assert.deepStrictEqual(result, [
 			new DecorationSegment(0, 1, 'c1', 0),
 			new DecorationSegment(2, 2, 'c2 c1', 0),
 			new DecorationSegment(3, 9, 'c1', 0),
@@ -31,7 +31,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new LineDecoration(20, 21, 'inline-folded', InlineDecorationType.Regular),
 		]);
 
-		assert.deepEqual(result, [
+		assert.deepStrictEqual(result, [
 			new DecorationSegment(14, 18, 'mtkw', 0),
 			new DecorationSegment(19, 19, 'mtkw inline-folded', 0)
 		]);
@@ -43,7 +43,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new InlineDecoration(new Range(2, 12, 3, 30), 'detected-link', InlineDecorationType.Regular)
 		], 3, 12, 500);
 
-		assert.deepEqual(result, [
+		assert.deepStrictEqual(result, [
 			new LineDecoration(12, 30, 'detected-link', InlineDecorationType.Regular),
 		]);
 	});
@@ -54,7 +54,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new InlineDecoration(new Range(4, 0, 4, 1), 'after', InlineDecorationType.After),
 		], 4, 1, 500);
 
-		assert.deepEqual(result, [
+		assert.deepStrictEqual(result, [
 			new LineDecoration(1, 2, 'before', InlineDecorationType.Before),
 			new LineDecoration(0, 1, 'after', InlineDecorationType.After),
 		]);
@@ -62,7 +62,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 
 	test('ViewLineParts', () => {
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 2, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
 		]), [
@@ -70,7 +70,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c2', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 3, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
 		]), [
@@ -78,7 +78,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c2', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 4, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
 		]), [
@@ -86,7 +86,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c1 c2', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 4, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1*', InlineDecorationType.Regular),
 			new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
@@ -95,7 +95,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c1 c1* c2', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 4, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1*', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1**', InlineDecorationType.Regular),
@@ -105,7 +105,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c1 c1* c1** c2', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 4, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1*', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1**', InlineDecorationType.Regular),
@@ -116,7 +116,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
 			new DecorationSegment(2, 2, 'c1 c1* c1** c2 c2*', 0)
 		]);
 
-		assert.deepEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
+		assert.deepStrictEqual(LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
 			new LineDecoration(1, 4, 'c1', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1*', InlineDecorationType.Regular),
 			new LineDecoration(1, 4, 'c1**', InlineDecorationType.Regular),
diff --git a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
index 3205a10ce..6d619cf60 100644
--- a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
+++ b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
@@ -34,105 +34,105 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: -
-		assert.equal(linesLayout.getLinesTotalHeight(), 100);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 30);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 50);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 60);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 70);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 80);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 90);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 100);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 50);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 60);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 70);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 80);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 90);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(5), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(11), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(29), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(5), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(11), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(29), 3);
 
 		// Add whitespace of height 5px after 2nd line
 		insertWhitespace(linesLayout, 2, 0, 5, 0);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5)
-		assert.equal(linesLayout.getLinesTotalHeight(), 105);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 25);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 35);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 45);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 105);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 25);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 35);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 45);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(45), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(104), 10);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(105), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(45), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(104), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(105), 10);
 
 		// Add two more whitespaces of height 5px
 		insertWhitespace(linesLayout, 3, 0, 5, 0);
 		insertWhitespace(linesLayout, 4, 0, 5, 0);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5), b(3, 5), c(4, 5)
-		assert.equal(linesLayout.getLinesTotalHeight(), 115);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 25);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 55);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 65);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 115);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 25);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 55);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 65);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(64), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(65), 6);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(64), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(65), 6);
 
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(0), 20); // 20 -> 25
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(1), 35); // 35 -> 40
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(2), 50);
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(0), 20); // 20 -> 25
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(1), 35); // 35 -> 40
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(2), 50);
 
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(0), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(19), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(20), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(21), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(22), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(23), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(24), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(25), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(26), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(34), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(35), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(36), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(39), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(40), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(41), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(49), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(50), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(51), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(54), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(55), -1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(1000), -1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(0), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(19), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(20), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(21), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(22), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(23), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(24), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(25), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(26), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(34), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(35), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(36), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(39), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(40), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(41), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(49), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(50), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(51), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(54), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(55), -1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(1000), -1);
 
 	});
 
@@ -144,94 +144,94 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// 10 lines
 		// whitespace: - a(2,5)
-		assert.equal(linesLayout.getLinesTotalHeight(), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 7);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 8);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 9);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 11);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 12);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 13);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 14);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 7);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 8);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 9);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 11);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 12);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 13);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 14);
 
 		// Change whitespace height
 		// 10 lines
 		// whitespace: - a(2,10)
 		changeOneWhitespace(linesLayout, a, 2, 10);
-		assert.equal(linesLayout.getLinesTotalHeight(), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 12);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 13);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 14);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 19);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 12);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 13);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 14);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 19);
 
 		// Change whitespace position
 		// 10 lines
 		// whitespace: - a(5,10)
 		changeOneWhitespace(linesLayout, a, 5, 10);
-		assert.equal(linesLayout.getLinesTotalHeight(), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 4);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 19);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 4);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 19);
 
 		// Pretend that lines 5 and 6 were deleted
 		// 8 lines
 		// whitespace: - a(4,10)
 		linesLayout.onLinesDeleted(5, 6);
-		assert.equal(linesLayout.getLinesTotalHeight(), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 14);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 14);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
 
 		// Insert two lines at the beginning
 		// 10 lines
 		// whitespace: - a(6,10)
 		linesLayout.onLinesInserted(1, 2);
-		assert.equal(linesLayout.getLinesTotalHeight(), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 4);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 5);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 19);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 4);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 5);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 19);
 
 		// Remove whitespace
 		// 10 lines
 		removeWhitespace(linesLayout, a);
-		assert.equal(linesLayout.getLinesTotalHeight(), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 4);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 5);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 6);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 7);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 8);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 9);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 4);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 5);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 6);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 7);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 8);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 9);
 	});
 
 	test('LinesLayout Padding', () => {
@@ -240,93 +240,93 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: -
-		assert.equal(linesLayout.getLinesTotalHeight(), 135);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 25);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 35);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 45);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 55);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 65);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 75);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 85);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 95);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 105);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 135);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 25);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 35);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 45);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 55);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 65);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 75);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 85);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 95);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 105);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
 
 		// Add whitespace of height 5px after 2nd line
 		insertWhitespace(linesLayout, 2, 0, 5, 0);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5)
-		assert.equal(linesLayout.getLinesTotalHeight(), 140);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 25);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 50);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 140);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 25);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 50);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(39), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(40), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(41), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(25), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(34), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(39), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(40), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(41), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 4);
 
 		// Add two more whitespaces of height 5px
 		insertWhitespace(linesLayout, 3, 0, 5, 0);
 		insertWhitespace(linesLayout, 4, 0, 5, 0);
 		// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 		// whitespace: a(2,5), b(3, 5), c(4, 5)
-		assert.equal(linesLayout.getLinesTotalHeight(), 150);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 15);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 25);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 55);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 70);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 80);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 150);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 15);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 25);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 55);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 70);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 80);
 
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(30), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(39), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(40), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(54), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(55), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(64), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(65), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(69), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(70), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(80), 6);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(24), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(30), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(35), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(39), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(40), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(49), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(50), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(54), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(55), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(64), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(65), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(69), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(70), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(80), 6);
 
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(0), 35); // 35 -> 40
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(1), 50); // 50 -> 55
-		assert.equal(linesLayout.getVerticalOffsetForWhitespaceIndex(2), 65);
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(0), 35); // 35 -> 40
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(1), 50); // 50 -> 55
+		assert.strictEqual(linesLayout.getVerticalOffsetForWhitespaceIndex(2), 65);
 
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(0), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(34), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(35), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(39), 0);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(40), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(49), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(50), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(54), 1);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(55), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(64), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(65), 2);
-		assert.equal(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(70), -1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(0), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(34), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(35), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(39), 0);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(40), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(49), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(50), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(54), 1);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(55), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(64), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(65), 2);
+		assert.strictEqual(linesLayout.getWhitespaceIndexAtOrAfterVerticallOffset(70), -1);
 	});
 
 	test('LinesLayout getLineNumberAtOrAfterVerticalOffset', () => {
@@ -335,47 +335,47 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// 10 lines
 		// whitespace: - a(6,10)
-		assert.equal(linesLayout.getLinesTotalHeight(), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 4);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 5);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 19);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 4);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 5);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 19);
 
 		// Do some hit testing
 		// line      [1, 2, 3, 4, 5, 6,  7,  8,  9, 10]
 		// vertical: [0, 1, 2, 3, 4, 5, 16, 17, 18, 19]
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(-100), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(-1), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 2);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(2), 3);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(3), 4);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(4), 5);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(5), 6);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(6), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(7), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(8), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(11), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(12), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(13), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(14), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(16), 7);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(17), 8);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(18), 9);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 10);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 10);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 10);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(22), 10);
-		assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(23), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(-100), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(-1), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(0), 1);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(1), 2);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(2), 3);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(3), 4);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(4), 5);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(5), 6);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(6), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(7), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(8), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(9), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(10), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(11), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(12), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(13), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(14), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(15), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(16), 7);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(17), 8);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(18), 9);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(19), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(20), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(21), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(22), 10);
+		assert.strictEqual(linesLayout.getLineNumberAtOrAfterVerticalOffset(23), 10);
 	});
 
 	test('LinesLayout getCenteredLineInViewport', () => {
@@ -384,81 +384,81 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// 10 lines
 		// whitespace: - a(6,10)
-		assert.equal(linesLayout.getLinesTotalHeight(), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 1);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 2);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 3);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 4);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 5);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 16);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 17);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 18);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 19);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 1);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 2);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 3);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 4);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 5);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 16);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 17);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 18);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 19);
 
 		// Find centered line in viewport 1
 		// line      [1, 2, 3, 4, 5, 6,  7,  8,  9, 10]
 		// vertical: [0, 1, 2, 3, 4, 5, 16, 17, 18, 19]
-		assert.equal(linesLayout.getLinesViewportData(0, 1).centeredLineNumber, 1);
-		assert.equal(linesLayout.getLinesViewportData(0, 2).centeredLineNumber, 2);
-		assert.equal(linesLayout.getLinesViewportData(0, 3).centeredLineNumber, 2);
-		assert.equal(linesLayout.getLinesViewportData(0, 4).centeredLineNumber, 3);
-		assert.equal(linesLayout.getLinesViewportData(0, 5).centeredLineNumber, 3);
-		assert.equal(linesLayout.getLinesViewportData(0, 6).centeredLineNumber, 4);
-		assert.equal(linesLayout.getLinesViewportData(0, 7).centeredLineNumber, 4);
-		assert.equal(linesLayout.getLinesViewportData(0, 8).centeredLineNumber, 5);
-		assert.equal(linesLayout.getLinesViewportData(0, 9).centeredLineNumber, 5);
-		assert.equal(linesLayout.getLinesViewportData(0, 10).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 11).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 12).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 13).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 14).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 15).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 16).centeredLineNumber, 6);
-		assert.equal(linesLayout.getLinesViewportData(0, 17).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 18).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 19).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 21).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 22).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 23).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 24).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 25).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 26).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 27).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 28).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 29).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 30).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 31).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 32).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(0, 33).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 1).centeredLineNumber, 1);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 2).centeredLineNumber, 2);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 3).centeredLineNumber, 2);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 4).centeredLineNumber, 3);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 5).centeredLineNumber, 3);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 6).centeredLineNumber, 4);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 7).centeredLineNumber, 4);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 8).centeredLineNumber, 5);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 9).centeredLineNumber, 5);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 10).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 11).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 12).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 13).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 14).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 15).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 16).centeredLineNumber, 6);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 17).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 18).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 19).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 21).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 22).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 23).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 24).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 25).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 26).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 27).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 28).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 29).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 30).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 31).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 32).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 33).centeredLineNumber, 7);
 
 		// Find centered line in viewport 2
 		// line      [1, 2, 3, 4, 5, 6,  7,  8,  9, 10]
 		// vertical: [0, 1, 2, 3, 4, 5, 16, 17, 18, 19]
-		assert.equal(linesLayout.getLinesViewportData(0, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(1, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(2, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(3, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(4, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(5, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(6, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(7, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(8, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(9, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(10, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(11, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(12, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(13, 20).centeredLineNumber, 7);
-		assert.equal(linesLayout.getLinesViewportData(14, 20).centeredLineNumber, 8);
-		assert.equal(linesLayout.getLinesViewportData(15, 20).centeredLineNumber, 8);
-		assert.equal(linesLayout.getLinesViewportData(16, 20).centeredLineNumber, 9);
-		assert.equal(linesLayout.getLinesViewportData(17, 20).centeredLineNumber, 9);
-		assert.equal(linesLayout.getLinesViewportData(18, 20).centeredLineNumber, 10);
-		assert.equal(linesLayout.getLinesViewportData(19, 20).centeredLineNumber, 10);
-		assert.equal(linesLayout.getLinesViewportData(20, 23).centeredLineNumber, 10);
-		assert.equal(linesLayout.getLinesViewportData(21, 23).centeredLineNumber, 10);
-		assert.equal(linesLayout.getLinesViewportData(22, 23).centeredLineNumber, 10);
+		assert.strictEqual(linesLayout.getLinesViewportData(0, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(1, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(2, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(3, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(4, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(5, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(6, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(7, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(8, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(9, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(10, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(11, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(12, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(13, 20).centeredLineNumber, 7);
+		assert.strictEqual(linesLayout.getLinesViewportData(14, 20).centeredLineNumber, 8);
+		assert.strictEqual(linesLayout.getLinesViewportData(15, 20).centeredLineNumber, 8);
+		assert.strictEqual(linesLayout.getLinesViewportData(16, 20).centeredLineNumber, 9);
+		assert.strictEqual(linesLayout.getLinesViewportData(17, 20).centeredLineNumber, 9);
+		assert.strictEqual(linesLayout.getLinesViewportData(18, 20).centeredLineNumber, 10);
+		assert.strictEqual(linesLayout.getLinesViewportData(19, 20).centeredLineNumber, 10);
+		assert.strictEqual(linesLayout.getLinesViewportData(20, 23).centeredLineNumber, 10);
+		assert.strictEqual(linesLayout.getLinesViewportData(21, 23).centeredLineNumber, 10);
+		assert.strictEqual(linesLayout.getLinesViewportData(22, 23).centeredLineNumber, 10);
 	});
 
 	test('LinesLayout getLinesViewportData 1', () => {
@@ -467,131 +467,131 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// 10 lines
 		// whitespace: - a(6,100)
-		assert.equal(linesLayout.getLinesTotalHeight(), 200);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 30);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 50);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 160);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 170);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 180);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 190);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 200);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 50);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 160);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 170);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 180);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 190);
 
 		// viewport 0->50
 		let viewportData = linesLayout.getLinesViewportData(0, 50);
-		assert.equal(viewportData.startLineNumber, 1);
-		assert.equal(viewportData.endLineNumber, 5);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 1);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40]);
+		assert.strictEqual(viewportData.startLineNumber, 1);
+		assert.strictEqual(viewportData.endLineNumber, 5);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 1);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 5);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40]);
 
 		// viewport 1->51
 		viewportData = linesLayout.getLinesViewportData(1, 51);
-		assert.equal(viewportData.startLineNumber, 1);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
+		assert.strictEqual(viewportData.startLineNumber, 1);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 5);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
 
 		// viewport 5->55
 		viewportData = linesLayout.getLinesViewportData(5, 55);
-		assert.equal(viewportData.startLineNumber, 1);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
+		assert.strictEqual(viewportData.startLineNumber, 1);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 5);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
 
 		// viewport 10->60
 		viewportData = linesLayout.getLinesViewportData(10, 60);
-		assert.equal(viewportData.startLineNumber, 2);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [10, 20, 30, 40, 50]);
+		assert.strictEqual(viewportData.startLineNumber, 2);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 6);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [10, 20, 30, 40, 50]);
 
 		// viewport 50->100
 		viewportData = linesLayout.getLinesViewportData(50, 100);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 6);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50]);
 
 		// viewport 60->110
 		viewportData = linesLayout.getLinesViewportData(60, 110);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160]);
 
 		// viewport 65->115
 		viewportData = linesLayout.getLinesViewportData(65, 115);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160]);
 
 		// viewport 50->159
 		viewportData = linesLayout.getLinesViewportData(50, 159);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 6);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50]);
 
 		// viewport 50->160
 		viewportData = linesLayout.getLinesViewportData(50, 160);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 6);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50]);
 
 		// viewport 51->161
 		viewportData = linesLayout.getLinesViewportData(51, 161);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50, 160]);
 
 
 		// viewport 150->169
 		viewportData = linesLayout.getLinesViewportData(150, 169);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160]);
 
 		// viewport 159->169
 		viewportData = linesLayout.getLinesViewportData(159, 169);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160]);
 
 		// viewport 160->169
 		viewportData = linesLayout.getLinesViewportData(160, 169);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160]);
 
 
 		// viewport 160->1000
 		viewportData = linesLayout.getLinesViewportData(160, 1000);
-		assert.equal(viewportData.startLineNumber, 7);
-		assert.equal(viewportData.endLineNumber, 10);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 10);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [160, 170, 180, 190]);
+		assert.strictEqual(viewportData.startLineNumber, 7);
+		assert.strictEqual(viewportData.endLineNumber, 10);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 10);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [160, 170, 180, 190]);
 	});
 
 	test('LinesLayout getLinesViewportData 2 & getWhitespaceViewportData', () => {
@@ -601,27 +601,27 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// 10 lines
 		// whitespace: - a(6,100), b(7, 50)
-		assert.equal(linesLayout.getLinesTotalHeight(), 250);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(1), 0);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(2), 10);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(3), 20);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(4), 30);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(5), 40);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(6), 50);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(7), 160);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(8), 220);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(9), 230);
-		assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 240);
+		assert.strictEqual(linesLayout.getLinesTotalHeight(), 250);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(2), 10);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(3), 20);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(5), 40);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(6), 50);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(7), 160);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(8), 220);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(9), 230);
+		assert.strictEqual(linesLayout.getVerticalOffsetForLineNumber(10), 240);
 
 		// viewport 50->160
 		let viewportData = linesLayout.getLinesViewportData(50, 160);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 6);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50]);
 		let whitespaceData = linesLayout.getWhitespaceViewportData(50, 160);
-		assert.deepEqual(whitespaceData, [{
+		assert.deepStrictEqual(whitespaceData, [{
 			id: a,
 			afterLineNumber: 6,
 			verticalOffset: 60,
@@ -630,13 +630,13 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// viewport 50->219
 		viewportData = linesLayout.getLinesViewportData(50, 219);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50, 160]);
 		whitespaceData = linesLayout.getWhitespaceViewportData(50, 219);
-		assert.deepEqual(whitespaceData, [{
+		assert.deepStrictEqual(whitespaceData, [{
 			id: a,
 			afterLineNumber: 6,
 			verticalOffset: 60,
@@ -650,19 +650,19 @@ suite('Editor ViewLayout - LinesLayout', () => {
 
 		// viewport 50->220
 		viewportData = linesLayout.getLinesViewportData(50, 220);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 7);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 7);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 7);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50, 160]);
 
 		// viewport 50->250
 		viewportData = linesLayout.getLinesViewportData(50, 250);
-		assert.equal(viewportData.startLineNumber, 6);
-		assert.equal(viewportData.endLineNumber, 10);
-		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
-		assert.equal(viewportData.completelyVisibleEndLineNumber, 10);
-		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160, 220, 230, 240]);
+		assert.strictEqual(viewportData.startLineNumber, 6);
+		assert.strictEqual(viewportData.endLineNumber, 10);
+		assert.strictEqual(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.strictEqual(viewportData.completelyVisibleEndLineNumber, 10);
+		assert.deepStrictEqual(viewportData.relativeVerticalOffset, [50, 160, 220, 230, 240]);
 	});
 
 	test('LinesLayout getWhitespaceAtVerticalOffset', () => {
@@ -671,40 +671,40 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		let b = insertWhitespace(linesLayout, 7, 0, 50, 0);
 
 		let whitespace = linesLayout.getWhitespaceAtVerticalOffset(0);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(59);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(60);
-		assert.equal(whitespace!.id, a);
+		assert.strictEqual(whitespace!.id, a);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(61);
-		assert.equal(whitespace!.id, a);
+		assert.strictEqual(whitespace!.id, a);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(159);
-		assert.equal(whitespace!.id, a);
+		assert.strictEqual(whitespace!.id, a);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(160);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(161);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(169);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(170);
-		assert.equal(whitespace!.id, b);
+		assert.strictEqual(whitespace!.id, b);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(171);
-		assert.equal(whitespace!.id, b);
+		assert.strictEqual(whitespace!.id, b);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(219);
-		assert.equal(whitespace!.id, b);
+		assert.strictEqual(whitespace!.id, b);
 
 		whitespace = linesLayout.getWhitespaceAtVerticalOffset(220);
-		assert.equal(whitespace, null);
+		assert.strictEqual(whitespace, null);
 	});
 
 	test('LinesLayout', () => {
@@ -714,230 +714,230 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		// Insert a whitespace after line number 2, of height 10
 		const a = insertWhitespace(linesLayout, 2, 0, 10, 0);
 		// whitespaces: a(2, 10)
-		assert.equal(linesLayout.getWhitespacesCount(), 1);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 10);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 10);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 10);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 10);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 1);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 10);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 10);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 10);
 
 		// Insert a whitespace again after line number 2, of height 20
 		let b = insertWhitespace(linesLayout, 2, 0, 20, 0);
 		// whitespaces: a(2, 10), b(2, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 10);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 30);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 30);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 30);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 10);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 30);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 30);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 30);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
 
 		// Change last inserted whitespace height to 30
 		changeOneWhitespace(linesLayout, b, 2, 30);
 		// whitespaces: a(2, 10), b(2, 30)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 10);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 30);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 40);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 40);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 40);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 40);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 10);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 30);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 40);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 40);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 40);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 40);
 
 		// Remove last inserted whitespace
 		removeWhitespace(linesLayout, b);
 		// whitespaces: a(2, 10)
-		assert.equal(linesLayout.getWhitespacesCount(), 1);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 10);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 10);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 10);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 10);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 1);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 10);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 10);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 10);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 10);
 
 		// Add a whitespace before the first line of height 50
 		b = insertWhitespace(linesLayout, 0, 0, 50, 0);
 		// whitespaces: b(0, 50), a(2, 10)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 50);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 10);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 60);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 60);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 50);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 10);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 60);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 60);
 
 		// Add a whitespace after line 4 of height 20
 		insertWhitespace(linesLayout, 4, 0, 20, 0);
 		// whitespaces: b(0, 50), a(2, 10), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 3);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 50);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 10);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(2), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(2), 80);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 80);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 60);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 80);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 3);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 50);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 10);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(2), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(2), 80);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 80);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 60);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 80);
 
 		// Add a whitespace after line 3 of height 30
 		insertWhitespace(linesLayout, 3, 0, 30, 0);
 		// whitespaces: b(0, 50), a(2, 10), d(3, 30), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 4);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 50);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 10);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(2), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(3), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(3), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(2), 90);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(3), 110);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 110);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 90);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 110);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 4);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 50);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 10);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(2), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(3), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(3), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 60);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(2), 90);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(3), 110);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 110);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 60);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 90);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 110);
 
 		// Change whitespace after line 2 to height of 100
 		changeOneWhitespace(linesLayout, a, 2, 100);
 		// whitespaces: b(0, 50), a(2, 100), d(3, 30), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 4);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 50);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 100);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(2), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(3), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(3), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 150);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(2), 180);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(3), 200);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 200);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 150);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 180);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 200);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 4);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 50);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 100);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(2), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(3), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(3), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 150);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(2), 180);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(3), 200);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 200);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 150);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 180);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 200);
 
 		// Remove whitespace after line 2
 		removeWhitespace(linesLayout, a);
 		// whitespaces: b(0, 50), d(3, 30), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 3);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 50);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(2), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 80);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(2), 100);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 100);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 80);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 100);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 3);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 50);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(2), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 50);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 80);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(2), 100);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 100);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 80);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 100);
 
 		// Remove whitespace before line 1
 		removeWhitespace(linesLayout, b);
 		// whitespaces: d(3, 30), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Delete line 1
 		linesLayout.onLinesDeleted(1, 1);
 		// whitespaces: d(2, 30), c(3, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 30);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 30);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Insert a line before line 1
 		linesLayout.onLinesInserted(1, 1);
 		// whitespaces: d(3, 30), c(4, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 4);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 4);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 30);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
 
 		// Delete line 4
 		linesLayout.onLinesDeleted(4, 4);
 		// whitespaces: d(3, 30), c(3, 20)
-		assert.equal(linesLayout.getWhitespacesCount(), 2);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(0), 30);
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getHeightForWhitespaceIndex(1), 20);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
-		assert.equal(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
-		assert.equal(linesLayout.getWhitespacesTotalHeight(), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 50);
-		assert.equal(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
+		assert.strictEqual(linesLayout.getWhitespacesCount(), 2);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(0), 30);
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getHeightForWhitespaceIndex(1), 20);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(0), 30);
+		assert.strictEqual(linesLayout.getWhitespacesAccumulatedHeight(1), 50);
+		assert.strictEqual(linesLayout.getWhitespacesTotalHeight(), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(1), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(2), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(3), 0);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(4), 50);
+		assert.strictEqual(linesLayout.getWhitespaceAccumulatedHeightBeforeLineNumber(5), 50);
 	});
 
 	test('LinesLayout findInsertionIndex', () => {
@@ -949,114 +949,114 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		let arr: EditorWhitespace[];
 
 		arr = makeInternalWhitespace([]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 0);
 
 		arr = makeInternalWhitespace([1]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
 
 		arr = makeInternalWhitespace([1, 3]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
 
 		arr = makeInternalWhitespace([1, 3, 5]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
 
 		arr = makeInternalWhitespace([1, 3, 5], 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
 
 		arr = makeInternalWhitespace([1, 3, 5, 7]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
 
 		arr = makeInternalWhitespace([1, 3, 5, 7, 9]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
 
 		arr = makeInternalWhitespace([1, 3, 5, 7, 9, 11]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
 
 		arr = makeInternalWhitespace([1, 3, 5, 7, 9, 11, 13]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 13, 0), 7);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 14, 0), 7);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 13, 0), 7);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 14, 0), 7);
 
 		arr = makeInternalWhitespace([1, 3, 5, 7, 9, 11, 13, 15]);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 13, 0), 7);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 14, 0), 7);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 15, 0), 8);
-		assert.equal(LinesLayout.findInsertionIndex(arr, 16, 0), 8);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 0, 0), 0);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 1, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 2, 0), 1);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 3, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 4, 0), 2);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 5, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 6, 0), 3);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 7, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 8, 0), 4);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 9, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 10, 0), 5);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 11, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 12, 0), 6);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 13, 0), 7);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 14, 0), 7);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 15, 0), 8);
+		assert.strictEqual(LinesLayout.findInsertionIndex(arr, 16, 0), 8);
 	});
 
 	test('LinesLayout changeWhitespaceAfterLineNumber & getFirstWhitespaceIndexAfterLineNumber', () => {
@@ -1066,121 +1066,121 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		const b = insertWhitespace(linesLayout, 7, 0, 1, 0);
 		const c = insertWhitespace(linesLayout, 3, 0, 1, 0);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), c); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 0);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), c); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 
 		// Do not really move a
 		changeOneWhitespace(linesLayout, a, 1, 1);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 1
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 1);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), c); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 1
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 1);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), c); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 
 
 		// Do not really move a
 		changeOneWhitespace(linesLayout, a, 2, 1);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 2
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), c); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 2
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 2);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), c); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 1); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 
 
 		// Change a to conflict with c => a gets placed after c
 		changeOneWhitespace(linesLayout, a, 3, 1);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), c); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), a); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), c); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), a); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 
 
 		// Make a no-op
 		changeOneWhitespace(linesLayout, c, 3, 1);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), c); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), a); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), c); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), a); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // c
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // c
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 2); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 
 
 
 		// Conflict c with b => c gets placed after b
 		changeOneWhitespace(linesLayout, c, 7, 1);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 3
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), b); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 7);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), c); // 7
-		assert.equal(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 3
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(0), 3);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), b); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(1), 7);
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), c); // 7
+		assert.strictEqual(linesLayout.getAfterLineNumberForWhitespaceIndex(2), 7);
 
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // a
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 1); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 1); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 1); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 1); // b
-		assert.equal(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(1), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(2), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(3), 0); // a
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(4), 1); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(5), 1); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(6), 1); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(7), 1); // b
+		assert.strictEqual(linesLayout.getFirstWhitespaceIndexAfterLineNumber(8), -1); // --
 	});
 
 	test('LinesLayout Bug', () => {
@@ -1189,53 +1189,53 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		const a = insertWhitespace(linesLayout, 0, 0, 1, 0);
 		const b = insertWhitespace(linesLayout, 7, 0, 1, 0);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), b); // 7
 
 		const c = insertWhitespace(linesLayout, 3, 0, 1, 0);
 
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), b); // 7
 
 		const d = insertWhitespace(linesLayout, 2, 0, 1, 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), d); // 2
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(3), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), d); // 2
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(3), b); // 7
 
 		const e = insertWhitespace(linesLayout, 8, 0, 1, 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), d); // 2
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(3), b); // 7
-		assert.equal(linesLayout.getIdForWhitespaceIndex(4), e); // 8
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), d); // 2
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(3), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(4), e); // 8
 
 		const f = insertWhitespace(linesLayout, 11, 0, 1, 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), d); // 2
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(3), b); // 7
-		assert.equal(linesLayout.getIdForWhitespaceIndex(4), e); // 8
-		assert.equal(linesLayout.getIdForWhitespaceIndex(5), f); // 11
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), d); // 2
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(3), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(4), e); // 8
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(5), f); // 11
 
 		const g = insertWhitespace(linesLayout, 10, 0, 1, 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), d); // 2
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(3), b); // 7
-		assert.equal(linesLayout.getIdForWhitespaceIndex(4), e); // 8
-		assert.equal(linesLayout.getIdForWhitespaceIndex(5), g); // 10
-		assert.equal(linesLayout.getIdForWhitespaceIndex(6), f); // 11
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), d); // 2
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(3), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(4), e); // 8
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(5), g); // 10
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(6), f); // 11
 
 		const h = insertWhitespace(linesLayout, 0, 0, 1, 0);
-		assert.equal(linesLayout.getIdForWhitespaceIndex(0), a); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(1), h); // 0
-		assert.equal(linesLayout.getIdForWhitespaceIndex(2), d); // 2
-		assert.equal(linesLayout.getIdForWhitespaceIndex(3), c); // 3
-		assert.equal(linesLayout.getIdForWhitespaceIndex(4), b); // 7
-		assert.equal(linesLayout.getIdForWhitespaceIndex(5), e); // 8
-		assert.equal(linesLayout.getIdForWhitespaceIndex(6), g); // 10
-		assert.equal(linesLayout.getIdForWhitespaceIndex(7), f); // 11
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(0), a); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(1), h); // 0
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(2), d); // 2
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(3), c); // 3
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(4), b); // 7
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(5), e); // 8
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(6), g); // 10
+		assert.strictEqual(linesLayout.getIdForWhitespaceIndex(7), f); // 11
 	});
 });
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index 46f369013..672a4a86f 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -48,7 +48,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span><span class="mtk0">' + expected + '</span></span>');
+		assert.strictEqual(_actual.html, '<span><span class="mtk0">' + expected + '</span></span>');
 		assertCharacterMapping(_actual.characterMapping, expectedCharOffsetInPart, expectedPartLengts);
 	}
 
@@ -101,7 +101,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span>' + expected + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expected + '</span>');
 		assertCharacterMapping(_actual.characterMapping, expectedCharOffsetInPart, expectedPartLengts);
 	}
 
@@ -167,7 +167,7 @@ suite('viewLineRenderer.renderLine', () => {
 			'<span>&hellip;</span>'
 		].join('');
 
-		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expectedOutput + '</span>');
 		assertCharacterMapping(_actual.characterMapping,
 			[
 				[0],
@@ -252,7 +252,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expectedOutput + '</span>');
 		assertCharacterMapping(_actual.characterMapping, expectedOffsetsArr, [4, 4, 6, 1, 5, 1, 4, 1, 1, 1, 3, 15, 2, 3]);
 	});
 
@@ -318,7 +318,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expectedOutput + '</span>');
 		assertCharacterMapping(_actual.characterMapping, expectedOffsetsArr, [12, 12, 24, 1, 21, 2, 1, 20, 1, 1]);
 	});
 
@@ -384,7 +384,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expectedOutput + '</span>');
 		assertCharacterMapping(_actual.characterMapping, expectedOffsetsArr, [12, 12, 24, 1, 21, 2, 1, 20, 1, 1]);
 	});
 
@@ -444,7 +444,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(actual.html, '<span>' + expectedOutput + '</span>');
 		assertCharacterMapping2(actual.characterMapping, expectedCharacterMapping);
 	});
 
@@ -487,8 +487,8 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span dir="ltr">' + expectedOutput + '</span>');
-		assert.equal(_actual.containsRTL, true);
+		assert.strictEqual(_actual.html, '<span dir="ltr">' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.containsRTL, true);
 	});
 
 	test('issue #6885: Splits large tokens', () => {
@@ -520,7 +520,7 @@ suite('viewLineRenderer.renderLine', () => {
 				false,
 				null
 			));
-			assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
+			assert.strictEqual(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
 		}
 
 		// A token with 49 chars
@@ -624,7 +624,7 @@ suite('viewLineRenderer.renderLine', () => {
 				true,
 				null
 			));
-			assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
+			assert.strictEqual(actual.html, '<span>' + expectedOutput.join('') + '</span>', message);
 		}
 
 		// A token with 101 chars
@@ -669,7 +669,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let expectedOutput = [
 			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
 		];
-		assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>');
+		assert.strictEqual(actual.html, '<span>' + expectedOutput.join('') + '</span>');
 	});
 
 	test('issue #6885: Does not split large tokens in RTL text', () => {
@@ -699,8 +699,8 @@ suite('viewLineRenderer.renderLine', () => {
 			false,
 			null
 		));
-		assert.equal(actual.html, '<span dir="ltr">' + expectedOutput.join('') + '</span>');
-		assert.equal(actual.containsRTL, true);
+		assert.strictEqual(actual.html, '<span dir="ltr">' + expectedOutput.join('') + '</span>');
+		assert.strictEqual(actual.containsRTL, true);
 	});
 
 	test('issue #95685: Uses unicode replacement character for Paragraph Separator', () => {
@@ -730,7 +730,7 @@ suite('viewLineRenderer.renderLine', () => {
 			false,
 			null
 		));
-		assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>');
+		assert.strictEqual(actual.html, '<span>' + expectedOutput.join('') + '</span>');
 	});
 
 	test('issue #19673: Monokai Theme bad-highlighting in line wrap', () => {
@@ -780,7 +780,7 @@ suite('viewLineRenderer.renderLine', () => {
 			null
 		));
 
-		assert.equal(_actual.html, '<span>' + expectedOutput + '</span>');
+		assert.strictEqual(_actual.html, '<span>' + expectedOutput + '</span>');
 	});
 
 	interface ICharMappingData {
@@ -807,7 +807,7 @@ suite('viewLineRenderer.renderLine', () => {
 	function assertCharacterMapping2(actual: CharacterMapping, expected: CharacterMapping): void {
 		const _actual = decodeCharacterMapping(actual);
 		const _expected = decodeCharacterMapping(expected);
-		assert.deepEqual(_actual, _expected);
+		assert.deepStrictEqual(_actual, _expected);
 	}
 
 	function assertCharacterMapping(actual: CharacterMapping, expectedCharPartOffsets: number[][], expectedPartLengths: number[]): void {
@@ -830,7 +830,7 @@ suite('viewLineRenderer.renderLine', () => {
 		for (let i = 0; i < tmp.length; i++) {
 			actualCharOffset[i] = tmp[i];
 		}
-		assert.deepEqual(actualCharOffset, expectedCharAbsoluteOffset);
+		assert.deepStrictEqual(actualCharOffset, expectedCharAbsoluteOffset);
 	}
 
 	function assertCharPartOffsets(actual: CharacterMapping, expected: number[][]): void {
@@ -844,7 +844,7 @@ suite('viewLineRenderer.renderLine', () => {
 				let actualPartIndex = CharacterMapping.getPartIndex(_actualPartData);
 				let actualCharIndex = CharacterMapping.getCharIndex(_actualPartData);
 
-				assert.deepEqual(
+				assert.deepStrictEqual(
 					{ partIndex: actualPartIndex, charIndex: actualCharIndex },
 					{ partIndex: partIndex, charIndex: charIndex },
 					`character mapping for offset ${charOffset}`
@@ -853,7 +853,7 @@ suite('viewLineRenderer.renderLine', () => {
 				// here
 				let actualOffset = actual.partDataToCharOffset(partIndex, part[part.length - 1] + 1, charIndex);
 
-				assert.equal(
+				assert.strictEqual(
 					actualOffset,
 					charOffset,
 					`character mapping for part ${partIndex}, ${charIndex}`
@@ -863,7 +863,7 @@ suite('viewLineRenderer.renderLine', () => {
 			}
 		}
 
-		assert.equal(actual.length, charOffset);
+		assert.strictEqual(actual.length, charOffset);
 	}
 });
 
@@ -892,7 +892,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			selections
 		));
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	}
 
 	test('issue #18616: Inline decorations ending at the text length are no longer rendered', () => {
@@ -927,7 +927,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #19207: Link in Monokai is not rendered correctly', () => {
@@ -976,7 +976,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('createLineParts simple', () => {
@@ -1477,7 +1477,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		// bb---------
 		// -cccccc----
 
-		assert.deepEqual(actual.html, [
+		assert.deepStrictEqual(actual.html, [
 			'<span>',
 			'<span class="mtk0 b">H</span>',
 			'<span class="mtk0 b c">e</span>',
@@ -1522,7 +1522,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #32436: Non-monospace font + visible whitespace + After decorator causes line to "jump"', () => {
@@ -1559,7 +1559,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #30133: Empty lines don\'t render inline decorations', () => {
@@ -1594,7 +1594,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #37208: Collapsing bullet point containing emoji in Markdown document results in [??] character', () => {
@@ -1628,7 +1628,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #37401 #40127: Allow both before and after decorations on empty line', () => {
@@ -1665,7 +1665,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #38935: GitLens end-of-line blame no longer rendering', () => {
@@ -1702,7 +1702,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #22832: Consider fullwidth characters when rendering tabs', () => {
@@ -1735,7 +1735,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #22832: Consider fullwidth characters when rendering tabs (render whitespace)', () => {
@@ -1774,7 +1774,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
@@ -1807,7 +1807,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
@@ -1842,7 +1842,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #42700: Hindi characters are not being rendered properly', () => {
@@ -1877,7 +1877,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #38123: editor.renderWhitespace: "boundary" renders whitespace at line wrap point when line is wrapped', () => {
@@ -1909,7 +1909,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #33525: Long line with ligatures takes a long time to paint decorations', () => {
@@ -1945,7 +1945,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #33525: Long line with ligatures takes a long time to paint decorations - not possible', () => {
@@ -1977,7 +1977,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 	test('issue #91936: Semantic token color highlighting fails on line with selected text', () => {
@@ -2062,7 +2062,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			'</span>'
 		].join('');
 
-		assert.deepEqual(actual.html, expected);
+		assert.deepStrictEqual(actual.html, expected);
 	});
 
 
@@ -2092,7 +2092,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		return (partIndex: number, partLength: number, offset: number, expected: number) => {
 			let charOffset = renderLineOutput.characterMapping.partDataToCharOffset(partIndex, partLength, offset);
 			let actual = charOffset + 1;
-			assert.equal(actual, expected, 'getColumnOfLinePartOffset for ' + partIndex + ' @ ' + offset);
+			assert.strictEqual(actual, expected, 'getColumnOfLinePartOffset for ' + partIndex + ' @ ' + offset);
 		};
 	}
 
diff --git a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
index 670f42407..eec0e2b27 100644
--- a/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
+++ b/src/vs/editor/test/common/viewModel/monospaceLineBreaksComputer.test.ts
@@ -47,6 +47,7 @@ function toAnnotatedText(text: string, lineBreakData: LineBreakData | null): str
 function getLineBreakData(factory: ILineBreaksComputerFactory, tabSize: number, breakAfter: number, columnsForFullWidthChar: number, wrappingIndent: WrappingIndent, text: string, previousLineBreakData: LineBreakData | null): LineBreakData | null {
 	const fontInfo = new FontInfo({
 		zoomLevel: 0,
+		pixelRatio: 1,
 		fontFamily: 'testFontFamily',
 		fontWeight: 'normal',
 		fontSize: 14,
@@ -55,7 +56,7 @@ function getLineBreakData(factory: ILineBreaksComputerFactory, tabSize: number,
 		letterSpacing: 0,
 		isMonospace: true,
 		typicalHalfwidthCharacterWidth: 7,
-		typicalFullwidthCharacterWidth: 14,
+		typicalFullwidthCharacterWidth: 7 * columnsForFullWidthChar,
 		canUseHalfwidthRightwardsArrow: true,
 		spaceWidth: 7,
 		middotWidth: 7,
@@ -74,7 +75,7 @@ function assertLineBreaks(factory: ILineBreaksComputerFactory, tabSize: number,
 	const lineBreakData = getLineBreakData(factory, tabSize, breakAfter, 2, wrappingIndent, text, null);
 	const actualAnnotatedText = toAnnotatedText(text, lineBreakData);
 
-	assert.equal(actualAnnotatedText, annotatedText);
+	assert.strictEqual(actualAnnotatedText, annotatedText);
 
 	return lineBreakData;
 }
@@ -122,28 +123,41 @@ suite('Editor ViewModel - MonospaceLineBreaksComputer', () => {
 		assertLineBreaks(factory, 4, 5, 'aa.(.|).aaa');
 	});
 
-	function assertIncrementalLineBreaks(factory: ILineBreaksComputerFactory, text: string, tabSize: number, breakAfter1: number, annotatedText1: string, breakAfter2: number, annotatedText2: string, wrappingIndent = WrappingIndent.None): void {
+	function assertLineBreakDataEqual(a: LineBreakData | null, b: LineBreakData | null): void {
+		if (!a || !b) {
+			assert.deepStrictEqual(a, b);
+			return;
+		}
+		assert.deepStrictEqual(a.breakOffsets, b.breakOffsets);
+		assert.deepStrictEqual(a.wrappedTextIndentLength, b.wrappedTextIndentLength);
+		for (let i = 0; i < a.breakOffsetsVisibleColumn.length; i++) {
+			const diff = a.breakOffsetsVisibleColumn[i] - b.breakOffsetsVisibleColumn[i];
+			assert.ok(diff < 0.001);
+		}
+	}
+
+	function assertIncrementalLineBreaks(factory: ILineBreaksComputerFactory, text: string, tabSize: number, breakAfter1: number, annotatedText1: string, breakAfter2: number, annotatedText2: string, wrappingIndent = WrappingIndent.None, columnsForFullWidthChar: number = 2): void {
 		// sanity check the test
-		assert.equal(text, parseAnnotatedText(annotatedText1).text);
-		assert.equal(text, parseAnnotatedText(annotatedText2).text);
+		assert.strictEqual(text, parseAnnotatedText(annotatedText1).text);
+		assert.strictEqual(text, parseAnnotatedText(annotatedText2).text);
 
 		// check that the direct mapping is ok for 1
-		const directLineBreakData1 = getLineBreakData(factory, tabSize, breakAfter1, 2, wrappingIndent, text, null);
-		assert.equal(toAnnotatedText(text, directLineBreakData1), annotatedText1);
+		const directLineBreakData1 = getLineBreakData(factory, tabSize, breakAfter1, columnsForFullWidthChar, wrappingIndent, text, null);
+		assert.strictEqual(toAnnotatedText(text, directLineBreakData1), annotatedText1);
 
 		// check that the direct mapping is ok for 2
-		const directLineBreakData2 = getLineBreakData(factory, tabSize, breakAfter2, 2, wrappingIndent, text, null);
-		assert.equal(toAnnotatedText(text, directLineBreakData2), annotatedText2);
+		const directLineBreakData2 = getLineBreakData(factory, tabSize, breakAfter2, columnsForFullWidthChar, wrappingIndent, text, null);
+		assert.strictEqual(toAnnotatedText(text, directLineBreakData2), annotatedText2);
 
 		// check that going from 1 to 2 is ok
-		const lineBreakData2from1 = getLineBreakData(factory, tabSize, breakAfter2, 2, wrappingIndent, text, directLineBreakData1);
-		assert.equal(toAnnotatedText(text, lineBreakData2from1), annotatedText2);
-		assert.deepEqual(lineBreakData2from1, directLineBreakData2);
+		const lineBreakData2from1 = getLineBreakData(factory, tabSize, breakAfter2, columnsForFullWidthChar, wrappingIndent, text, directLineBreakData1);
+		assert.strictEqual(toAnnotatedText(text, lineBreakData2from1), annotatedText2);
+		assertLineBreakDataEqual(lineBreakData2from1, directLineBreakData2);
 
 		// check that going from 2 to 1 is ok
-		const lineBreakData1from2 = getLineBreakData(factory, tabSize, breakAfter1, 2, wrappingIndent, text, directLineBreakData2);
-		assert.equal(toAnnotatedText(text, lineBreakData1from2), annotatedText1);
-		assert.deepEqual(lineBreakData1from2, directLineBreakData1);
+		const lineBreakData1from2 = getLineBreakData(factory, tabSize, breakAfter1, columnsForFullWidthChar, wrappingIndent, text, directLineBreakData2);
+		assert.strictEqual(toAnnotatedText(text, lineBreakData1from2), annotatedText1);
+		assertLineBreakDataEqual(lineBreakData1from2, directLineBreakData1);
 	}
 
 	test('MonospaceLineBreaksComputer incremental 1', () => {
@@ -216,6 +230,19 @@ suite('Editor ViewModel - MonospaceLineBreaksComputer', () => {
 		);
 	});
 
+	test('issue #110392: Occasional crash when resize with panel on the right', () => {
+		const factory = new MonospaceLineBreaksComputerFactory(EditorOptions.wordWrapBreakBeforeCharacters.defaultValue, EditorOptions.wordWrapBreakAfterCharacters.defaultValue);
+		assertIncrementalLineBreaks(
+			factory,
+			'你好 **hello** **hello** **hello-world** hey there!',
+			4,
+			15, '你好 **hello** |**hello** |**hello-world**| hey there!',
+			1, '你|好| |*|*|h|e|l|l|o|*|*| |*|*|h|e|l|l|o|*|*| |*|*|h|e|l|l|o|-|w|o|r|l|d|*|*| |h|e|y| |t|h|e|r|e|!',
+			WrappingIndent.Same,
+			1.6605405405405405
+		);
+	});
+
 	test('MonospaceLineBreaksComputer - CJK and Kinsoku Shori', () => {
 		let factory = new MonospaceLineBreaksComputerFactory('(', '\t)');
 		assertLineBreaks(factory, 4, 5, 'aa \u5b89|\u5b89');
@@ -239,7 +266,7 @@ suite('Editor ViewModel - MonospaceLineBreaksComputer', () => {
 	test('issue #35162: wrappingIndent not consistently working', () => {
 		let factory = new MonospaceLineBreaksComputerFactory('', '\t ');
 		let mapper = assertLineBreaks(factory, 4, 24, '                t h i s |i s |a l |o n |g l |i n |e', WrappingIndent.Indent);
-		assert.equal(mapper!.wrappedTextIndentLength, '                    '.length);
+		assert.strictEqual(mapper!.wrappedTextIndentLength, '                    '.length);
 	});
 
 	test('issue #75494: surrogate pairs', () => {
@@ -260,11 +287,16 @@ suite('Editor ViewModel - MonospaceLineBreaksComputer', () => {
 	test('MonospaceLineBreaksComputer - WrappingIndent.DeepIndent', () => {
 		let factory = new MonospaceLineBreaksComputerFactory('', '\t ');
 		let mapper = assertLineBreaks(factory, 4, 26, '        W e A r e T e s t |i n g D e |e p I n d |e n t a t |i o n', WrappingIndent.DeepIndent);
-		assert.equal(mapper!.wrappedTextIndentLength, '                '.length);
+		assert.strictEqual(mapper!.wrappedTextIndentLength, '                '.length);
 	});
 
 	test('issue #33366: Word wrap algorithm behaves differently around punctuation', () => {
 		const factory = new MonospaceLineBreaksComputerFactory(EditorOptions.wordWrapBreakBeforeCharacters.defaultValue, EditorOptions.wordWrapBreakAfterCharacters.defaultValue);
 		assertLineBreaks(factory, 4, 23, 'this is a line of |text, text that sits |on a line', WrappingIndent.Same);
 	});
+
+	test('issue #112382: Word wrap doesn\'t work well with control characters', () => {
+		const factory = new MonospaceLineBreaksComputerFactory(EditorOptions.wordWrapBreakBeforeCharacters.defaultValue, EditorOptions.wordWrapBreakAfterCharacters.defaultValue);
+		assertLineBreaks(factory, 4, 6, '\x06\x06\x06|\x06\x06\x06', WrappingIndent.Same);
+	});
 });
diff --git a/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts b/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
index 65cc26efd..80df1a94e 100644
--- a/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
+++ b/src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
@@ -22,158 +22,158 @@ suite('Editor ViewModel - PrefixSumComputer', () => {
 		let indexOfResult: PrefixSumIndexOfResult;
 
 		let psc = new PrefixSumComputer(toUint32Array([1, 1, 2, 1, 3]));
-		assert.equal(psc.getTotalValue(), 8);
-		assert.equal(psc.getAccumulatedValue(-1), 0);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 2);
-		assert.equal(psc.getAccumulatedValue(2), 4);
-		assert.equal(psc.getAccumulatedValue(3), 5);
-		assert.equal(psc.getAccumulatedValue(4), 8);
+		assert.strictEqual(psc.getTotalValue(), 8);
+		assert.strictEqual(psc.getAccumulatedValue(-1), 0);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 2);
+		assert.strictEqual(psc.getAccumulatedValue(2), 4);
+		assert.strictEqual(psc.getAccumulatedValue(3), 5);
+		assert.strictEqual(psc.getAccumulatedValue(4), 8);
 		indexOfResult = psc.getIndexOf(0);
-		assert.equal(indexOfResult.index, 0);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 0);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(1);
-		assert.equal(indexOfResult.index, 1);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 1);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(2);
-		assert.equal(indexOfResult.index, 2);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 2);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(3);
-		assert.equal(indexOfResult.index, 2);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 2);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(4);
-		assert.equal(indexOfResult.index, 3);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 3);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(5);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(6);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(7);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 2);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 2);
 		indexOfResult = psc.getIndexOf(8);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 3);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 3);
 
 		// [1, 2, 2, 1, 3]
 		psc.changeValue(1, 2);
-		assert.equal(psc.getTotalValue(), 9);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 3);
-		assert.equal(psc.getAccumulatedValue(2), 5);
-		assert.equal(psc.getAccumulatedValue(3), 6);
-		assert.equal(psc.getAccumulatedValue(4), 9);
+		assert.strictEqual(psc.getTotalValue(), 9);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 3);
+		assert.strictEqual(psc.getAccumulatedValue(2), 5);
+		assert.strictEqual(psc.getAccumulatedValue(3), 6);
+		assert.strictEqual(psc.getAccumulatedValue(4), 9);
 
 		// [1, 0, 2, 1, 3]
 		psc.changeValue(1, 0);
-		assert.equal(psc.getTotalValue(), 7);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 1);
-		assert.equal(psc.getAccumulatedValue(2), 3);
-		assert.equal(psc.getAccumulatedValue(3), 4);
-		assert.equal(psc.getAccumulatedValue(4), 7);
+		assert.strictEqual(psc.getTotalValue(), 7);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 1);
+		assert.strictEqual(psc.getAccumulatedValue(2), 3);
+		assert.strictEqual(psc.getAccumulatedValue(3), 4);
+		assert.strictEqual(psc.getAccumulatedValue(4), 7);
 		indexOfResult = psc.getIndexOf(0);
-		assert.equal(indexOfResult.index, 0);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 0);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(1);
-		assert.equal(indexOfResult.index, 2);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 2);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(2);
-		assert.equal(indexOfResult.index, 2);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 2);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(3);
-		assert.equal(indexOfResult.index, 3);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 3);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(4);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(5);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(6);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 2);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 2);
 		indexOfResult = psc.getIndexOf(7);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 3);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 3);
 
 		// [1, 0, 0, 1, 3]
 		psc.changeValue(2, 0);
-		assert.equal(psc.getTotalValue(), 5);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 1);
-		assert.equal(psc.getAccumulatedValue(2), 1);
-		assert.equal(psc.getAccumulatedValue(3), 2);
-		assert.equal(psc.getAccumulatedValue(4), 5);
+		assert.strictEqual(psc.getTotalValue(), 5);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 1);
+		assert.strictEqual(psc.getAccumulatedValue(2), 1);
+		assert.strictEqual(psc.getAccumulatedValue(3), 2);
+		assert.strictEqual(psc.getAccumulatedValue(4), 5);
 		indexOfResult = psc.getIndexOf(0);
-		assert.equal(indexOfResult.index, 0);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 0);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(1);
-		assert.equal(indexOfResult.index, 3);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 3);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(2);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(3);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(4);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 2);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 2);
 		indexOfResult = psc.getIndexOf(5);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 3);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 3);
 
 		// [1, 0, 0, 0, 3]
 		psc.changeValue(3, 0);
-		assert.equal(psc.getTotalValue(), 4);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 1);
-		assert.equal(psc.getAccumulatedValue(2), 1);
-		assert.equal(psc.getAccumulatedValue(3), 1);
-		assert.equal(psc.getAccumulatedValue(4), 4);
+		assert.strictEqual(psc.getTotalValue(), 4);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 1);
+		assert.strictEqual(psc.getAccumulatedValue(2), 1);
+		assert.strictEqual(psc.getAccumulatedValue(3), 1);
+		assert.strictEqual(psc.getAccumulatedValue(4), 4);
 		indexOfResult = psc.getIndexOf(0);
-		assert.equal(indexOfResult.index, 0);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 0);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(1);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(2);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 1);
 		indexOfResult = psc.getIndexOf(3);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 2);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 2);
 		indexOfResult = psc.getIndexOf(4);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 3);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 3);
 
 		// [1, 1, 0, 1, 1]
 		psc.changeValue(1, 1);
 		psc.changeValue(3, 1);
 		psc.changeValue(4, 1);
-		assert.equal(psc.getTotalValue(), 4);
-		assert.equal(psc.getAccumulatedValue(0), 1);
-		assert.equal(psc.getAccumulatedValue(1), 2);
-		assert.equal(psc.getAccumulatedValue(2), 2);
-		assert.equal(psc.getAccumulatedValue(3), 3);
-		assert.equal(psc.getAccumulatedValue(4), 4);
+		assert.strictEqual(psc.getTotalValue(), 4);
+		assert.strictEqual(psc.getAccumulatedValue(0), 1);
+		assert.strictEqual(psc.getAccumulatedValue(1), 2);
+		assert.strictEqual(psc.getAccumulatedValue(2), 2);
+		assert.strictEqual(psc.getAccumulatedValue(3), 3);
+		assert.strictEqual(psc.getAccumulatedValue(4), 4);
 		indexOfResult = psc.getIndexOf(0);
-		assert.equal(indexOfResult.index, 0);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 0);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(1);
-		assert.equal(indexOfResult.index, 1);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 1);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(2);
-		assert.equal(indexOfResult.index, 3);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 3);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(3);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 0);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 0);
 		indexOfResult = psc.getIndexOf(4);
-		assert.equal(indexOfResult.index, 4);
-		assert.equal(indexOfResult.remainder, 1);
+		assert.strictEqual(indexOfResult.index, 4);
+		assert.strictEqual(indexOfResult.remainder, 1);
 	});
 });
diff --git a/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts b/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
index 3156be0e1..3f7978952 100644
--- a/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
+++ b/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
@@ -25,42 +25,42 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 		let model1 = createModel('My First LineMy Second LineAnd another one');
 		let line1 = createSplitLine([13, 14, 15], [13, 13 + 14, 13 + 14 + 15], 0);
 
-		assert.equal(line1.getViewLineCount(), 3);
-		assert.equal(line1.getViewLineContent(model1, 1, 0), 'My First Line');
-		assert.equal(line1.getViewLineContent(model1, 1, 1), 'My Second Line');
-		assert.equal(line1.getViewLineContent(model1, 1, 2), 'And another one');
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 0), 14);
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 1), 15);
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 2), 16);
+		assert.strictEqual(line1.getViewLineCount(), 3);
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 0), 'My First Line');
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 1), 'My Second Line');
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 2), 'And another one');
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 0), 14);
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 1), 15);
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 2), 16);
 		for (let col = 1; col <= 14; col++) {
-			assert.equal(line1.getModelColumnOfViewPosition(0, col), col, 'getInputColumnOfOutputPosition(0, ' + col + ')');
+			assert.strictEqual(line1.getModelColumnOfViewPosition(0, col), col, 'getInputColumnOfOutputPosition(0, ' + col + ')');
 		}
 		for (let col = 1; col <= 15; col++) {
-			assert.equal(line1.getModelColumnOfViewPosition(1, col), 13 + col, 'getInputColumnOfOutputPosition(1, ' + col + ')');
+			assert.strictEqual(line1.getModelColumnOfViewPosition(1, col), 13 + col, 'getInputColumnOfOutputPosition(1, ' + col + ')');
 		}
 		for (let col = 1; col <= 16; col++) {
-			assert.equal(line1.getModelColumnOfViewPosition(2, col), 13 + 14 + col, 'getInputColumnOfOutputPosition(2, ' + col + ')');
+			assert.strictEqual(line1.getModelColumnOfViewPosition(2, col), 13 + 14 + col, 'getInputColumnOfOutputPosition(2, ' + col + ')');
 		}
 		for (let col = 1; col <= 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(0, col), 'getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(0, col), 'getOutputPositionOfInputPosition(' + col + ')');
 		}
 		for (let col = 1 + 13; col <= 14 + 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(1, col - 13), 'getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(1, col - 13), 'getOutputPositionOfInputPosition(' + col + ')');
 		}
 		for (let col = 1 + 13 + 14; col <= 15 + 14 + 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(2, col - 13 - 14), 'getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(2, col - 13 - 14), 'getOutputPositionOfInputPosition(' + col + ')');
 		}
 
 		model1 = createModel('My First LineMy Second LineAnd another one');
 		line1 = createSplitLine([13, 14, 15], [13, 13 + 14, 13 + 14 + 15], 4);
 
-		assert.equal(line1.getViewLineCount(), 3);
-		assert.equal(line1.getViewLineContent(model1, 1, 0), 'My First Line');
-		assert.equal(line1.getViewLineContent(model1, 1, 1), '    My Second Line');
-		assert.equal(line1.getViewLineContent(model1, 1, 2), '    And another one');
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 0), 14);
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 1), 19);
-		assert.equal(line1.getViewLineMaxColumn(model1, 1, 2), 20);
+		assert.strictEqual(line1.getViewLineCount(), 3);
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 0), 'My First Line');
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 1), '    My Second Line');
+		assert.strictEqual(line1.getViewLineContent(model1, 1, 2), '    And another one');
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 0), 14);
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 1), 19);
+		assert.strictEqual(line1.getViewLineMaxColumn(model1, 1, 2), 20);
 
 		let actualViewColumnMapping: number[][] = [];
 		for (let lineIndex = 0; lineIndex < line1.getViewLineCount(); lineIndex++) {
@@ -70,20 +70,20 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 			}
 			actualViewColumnMapping.push(actualLineViewColumnMapping);
 		}
-		assert.deepEqual(actualViewColumnMapping, [
+		assert.deepStrictEqual(actualViewColumnMapping, [
 			[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
 			[14, 14, 14, 14, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28],
 			[28, 28, 28, 28, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43],
 		]);
 
 		for (let col = 1; col <= 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(0, col), '6.getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(0, col), '6.getOutputPositionOfInputPosition(' + col + ')');
 		}
 		for (let col = 1 + 13; col <= 14 + 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(1, 4 + col - 13), '7.getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(1, 4 + col - 13), '7.getOutputPositionOfInputPosition(' + col + ')');
 		}
 		for (let col = 1 + 13 + 14; col <= 15 + 14 + 13; col++) {
-			assert.deepEqual(line1.getViewPositionOfModelPosition(0, col), pos(2, 4 + col - 13 - 14), '8.getOutputPositionOfInputPosition(' + col + ')');
+			assert.deepStrictEqual(line1.getViewPositionOfModelPosition(0, col), pos(2, 4 + col - 13 - 14), '8.getOutputPositionOfInputPosition(' + col + ')');
 		}
 	});
 
@@ -136,65 +136,65 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 		].join('\n');
 
 		withSplitLinesCollection(text, (model, linesCollection) => {
-			assert.equal(linesCollection.getViewLineCount(), 6);
+			assert.strictEqual(linesCollection.getViewLineCount(), 6);
 
 			// getOutputIndentGuide
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(-1, -1), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(0, 0), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(1, 1), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(2, 2), [1]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(3, 3), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(4, 4), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(5, 5), [1]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(6, 6), [0]);
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(7, 7), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(-1, -1), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(0, 0), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(1, 1), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(2, 2), [1]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(3, 3), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(4, 4), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(5, 5), [1]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(6, 6), [0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(7, 7), [0]);
 
-			assert.deepEqual(linesCollection.getViewLinesIndentGuides(0, 7), [0, 1, 0, 0, 1, 0]);
+			assert.deepStrictEqual(linesCollection.getViewLinesIndentGuides(0, 7), [0, 1, 0, 0, 1, 0]);
 
 			// getOutputLineContent
-			assert.equal(linesCollection.getViewLineContent(-1), 'int main() {');
-			assert.equal(linesCollection.getViewLineContent(0), 'int main() {');
-			assert.equal(linesCollection.getViewLineContent(1), 'int main() {');
-			assert.equal(linesCollection.getViewLineContent(2), '\tprintf("Hello world!");');
-			assert.equal(linesCollection.getViewLineContent(3), '}');
-			assert.equal(linesCollection.getViewLineContent(4), 'int main() {');
-			assert.equal(linesCollection.getViewLineContent(5), '\tprintf("Hello world!");');
-			assert.equal(linesCollection.getViewLineContent(6), '}');
-			assert.equal(linesCollection.getViewLineContent(7), '}');
+			assert.strictEqual(linesCollection.getViewLineContent(-1), 'int main() {');
+			assert.strictEqual(linesCollection.getViewLineContent(0), 'int main() {');
+			assert.strictEqual(linesCollection.getViewLineContent(1), 'int main() {');
+			assert.strictEqual(linesCollection.getViewLineContent(2), '\tprintf("Hello world!");');
+			assert.strictEqual(linesCollection.getViewLineContent(3), '}');
+			assert.strictEqual(linesCollection.getViewLineContent(4), 'int main() {');
+			assert.strictEqual(linesCollection.getViewLineContent(5), '\tprintf("Hello world!");');
+			assert.strictEqual(linesCollection.getViewLineContent(6), '}');
+			assert.strictEqual(linesCollection.getViewLineContent(7), '}');
 
 			// getOutputLineMinColumn
-			assert.equal(linesCollection.getViewLineMinColumn(-1), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(0), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(1), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(2), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(3), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(4), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(5), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(6), 1);
-			assert.equal(linesCollection.getViewLineMinColumn(7), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(-1), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(0), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(1), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(2), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(3), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(4), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(5), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(6), 1);
+			assert.strictEqual(linesCollection.getViewLineMinColumn(7), 1);
 
 			// getOutputLineMaxColumn
-			assert.equal(linesCollection.getViewLineMaxColumn(-1), 13);
-			assert.equal(linesCollection.getViewLineMaxColumn(0), 13);
-			assert.equal(linesCollection.getViewLineMaxColumn(1), 13);
-			assert.equal(linesCollection.getViewLineMaxColumn(2), 25);
-			assert.equal(linesCollection.getViewLineMaxColumn(3), 2);
-			assert.equal(linesCollection.getViewLineMaxColumn(4), 13);
-			assert.equal(linesCollection.getViewLineMaxColumn(5), 25);
-			assert.equal(linesCollection.getViewLineMaxColumn(6), 2);
-			assert.equal(linesCollection.getViewLineMaxColumn(7), 2);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(-1), 13);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(0), 13);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(1), 13);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(2), 25);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(3), 2);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(4), 13);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(5), 25);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(6), 2);
+			assert.strictEqual(linesCollection.getViewLineMaxColumn(7), 2);
 
 			// convertOutputPositionToInputPosition
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(-1, 1), new Position(1, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(0, 1), new Position(1, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(1, 1), new Position(1, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(2, 1), new Position(2, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(3, 1), new Position(3, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(4, 1), new Position(4, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(5, 1), new Position(5, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(6, 1), new Position(6, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(7, 1), new Position(6, 1));
-			assert.deepEqual(linesCollection.convertViewPositionToModelPosition(8, 1), new Position(6, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(-1, 1), new Position(1, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(0, 1), new Position(1, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(1, 1), new Position(1, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(2, 1), new Position(2, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(3, 1), new Position(3, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(4, 1), new Position(4, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(5, 1), new Position(5, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(6, 1), new Position(6, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(7, 1), new Position(6, 1));
+			assert.deepStrictEqual(linesCollection.convertViewPositionToModelPosition(8, 1), new Position(6, 1));
 		});
 	});
 
@@ -216,7 +216,7 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 			]);
 
 			let viewLineCount = linesCollection.getViewLineCount();
-			assert.equal(viewLineCount, 1, 'getOutputLineCount()');
+			assert.strictEqual(viewLineCount, 1, 'getOutputLineCount()');
 
 			let modelLineCount = model.getLineCount();
 			for (let lineNumber = 0; lineNumber <= modelLineCount + 1; lineNumber++) {
@@ -244,7 +244,7 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 						viewColumn = viewMaxColumn;
 					}
 					let validViewPosition = new Position(viewLineNumber, viewColumn);
-					assert.equal(viewPosition.toString(), validViewPosition.toString(), 'model->view for ' + lineNumber + ', ' + column);
+					assert.strictEqual(viewPosition.toString(), validViewPosition.toString(), 'model->view for ' + lineNumber + ', ' + column);
 				}
 			}
 
@@ -254,7 +254,7 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 				for (let column = lineMinColumn - 1; column <= lineMaxColumn + 1; column++) {
 					let modelPosition = linesCollection.convertViewPositionToModelPosition(lineNumber, column);
 					let validModelPosition = model.validatePosition(modelPosition);
-					assert.equal(modelPosition.toString(), validModelPosition.toString(), 'view->model for ' + lineNumber + ', ' + column);
+					assert.strictEqual(modelPosition.toString(), validModelPosition.toString(), 'view->model for ' + lineNumber + ', ' + column);
 				}
 			}
 		});
@@ -333,7 +333,7 @@ suite('SplitLinesCollection', () => {
 		const tokenizationSupport: modes.ITokenizationSupport = {
 			getInitialState: () => NULL_STATE,
 			tokenize: undefined!,
-			tokenize2: (line: string, state: modes.IState): TokenizationResult2 => {
+			tokenize2: (line: string, hasEOL: boolean, state: modes.IState): TokenizationResult2 => {
 				let tokens = _tokens[_lineIndex++];
 
 				let result = new Uint32Array(2 * tokens.length);
@@ -374,7 +374,7 @@ suite('SplitLinesCollection', () => {
 				value: _actual.getForeground(i)
 			};
 		}
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	interface ITestMinimapLineRenderingData {
@@ -391,16 +391,15 @@ suite('SplitLinesCollection', () => {
 		}
 		if (expected === null) {
 			assert.ok(false);
-			return;
 		}
-		assert.equal(actual.content, expected.content);
-		assert.equal(actual.minColumn, expected.minColumn);
-		assert.equal(actual.maxColumn, expected.maxColumn);
+		assert.strictEqual(actual.content, expected.content);
+		assert.strictEqual(actual.minColumn, expected.minColumn);
+		assert.strictEqual(actual.maxColumn, expected.maxColumn);
 		assertViewLineTokens(actual.tokens, expected.tokens);
 	}
 
 	function assertMinimapLinesRenderingData(actual: ViewLineData[], expected: Array<ITestMinimapLineRenderingData | null>): void {
-		assert.equal(actual.length, expected.length);
+		assert.strictEqual(actual.length, expected.length);
 		for (let i = 0; i < expected.length; i++) {
 			assertMinimapLineRenderingData(actual[i], expected[i]);
 		}
@@ -429,15 +428,15 @@ suite('SplitLinesCollection', () => {
 
 	test('getViewLinesData - no wrapping', () => {
 		withSplitLinesCollection(model!, 'off', 0, (splitLinesCollection) => {
-			assert.equal(splitLinesCollection.getViewLineCount(), 8);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(1, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(2, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(3, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(4, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(5, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(6, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(7, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(8, 1), true);
+			assert.strictEqual(splitLinesCollection.getViewLineCount(), 8);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(1, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(2, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(3, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(4, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(5, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(6, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(7, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(8, 1), true);
 
 			let _expected: ITestMinimapLineRenderingData[] = [
 				{
@@ -541,15 +540,15 @@ suite('SplitLinesCollection', () => {
 			]);
 
 			splitLinesCollection.setHiddenAreas([new Range(2, 1, 4, 1)]);
-			assert.equal(splitLinesCollection.getViewLineCount(), 5);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(1, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(2, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(3, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(4, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(5, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(6, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(7, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(8, 1), true);
+			assert.strictEqual(splitLinesCollection.getViewLineCount(), 5);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(1, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(2, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(3, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(4, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(5, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(6, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(7, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(8, 1), true);
 
 			assertAllMinimapLinesRenderingData(splitLinesCollection, [
 				_expected[0],
@@ -563,15 +562,15 @@ suite('SplitLinesCollection', () => {
 
 	test('getViewLinesData - with wrapping', () => {
 		withSplitLinesCollection(model!, 'wordWrapColumn', 30, (splitLinesCollection) => {
-			assert.equal(splitLinesCollection.getViewLineCount(), 12);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(1, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(2, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(3, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(4, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(5, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(6, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(7, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(8, 1), true);
+			assert.strictEqual(splitLinesCollection.getViewLineCount(), 12);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(1, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(2, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(3, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(4, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(5, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(6, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(7, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(8, 1), true);
 
 			let _expected: ITestMinimapLineRenderingData[] = [
 				{
@@ -711,15 +710,15 @@ suite('SplitLinesCollection', () => {
 			]);
 
 			splitLinesCollection.setHiddenAreas([new Range(2, 1, 4, 1)]);
-			assert.equal(splitLinesCollection.getViewLineCount(), 8);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(1, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(2, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(3, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(4, 1), false);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(5, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(6, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(7, 1), true);
-			assert.equal(splitLinesCollection.modelPositionIsVisible(8, 1), true);
+			assert.strictEqual(splitLinesCollection.getViewLineCount(), 8);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(1, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(2, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(3, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(4, 1), false);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(5, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(6, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(7, 1), true);
+			assert.strictEqual(splitLinesCollection.modelPositionIsVisible(8, 1), true);
 
 			assertAllMinimapLinesRenderingData(splitLinesCollection, [
 				_expected[0],
diff --git a/src/vs/editor/test/common/viewModel/viewModelDecorations.test.ts b/src/vs/editor/test/common/viewModel/viewModelDecorations.test.ts
index cd9906811..9b2862773 100644
--- a/src/vs/editor/test/common/viewModel/viewModelDecorations.test.ts
+++ b/src/vs/editor/test/common/viewModel/viewModelDecorations.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { Range } from 'vs/editor/common/core/range';
-import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
+import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 import { testViewModel } from 'vs/editor/test/common/viewModel/testViewModel';
 
 suite('ViewModelDecorations', () => {
@@ -19,11 +19,11 @@ suite('ViewModelDecorations', () => {
 			wordWrapColumn: 13
 		};
 		testViewModel(text, opts, (viewModel, model) => {
-			assert.equal(viewModel.getLineContent(1), 'hello world, ');
-			assert.equal(viewModel.getLineContent(2), 'this is a ');
-			assert.equal(viewModel.getLineContent(3), 'buffer that ');
-			assert.equal(viewModel.getLineContent(4), 'will be ');
-			assert.equal(viewModel.getLineContent(5), 'wrapped');
+			assert.strictEqual(viewModel.getLineContent(1), 'hello world, ');
+			assert.strictEqual(viewModel.getLineContent(2), 'this is a ');
+			assert.strictEqual(viewModel.getLineContent(3), 'buffer that ');
+			assert.strictEqual(viewModel.getLineContent(4), 'will be ');
+			assert.strictEqual(viewModel.getLineContent(5), 'wrapped');
 
 			model.changeDecorations((accessor) => {
 				let createOpts = (id: string) => {
@@ -79,7 +79,7 @@ suite('ViewModelDecorations', () => {
 				return dec.options.className;
 			}).filter(Boolean);
 
-			assert.deepEqual(actualDecorations, [
+			assert.deepStrictEqual(actualDecorations, [
 				'dec1',
 				'dec2',
 				'dec3',
@@ -102,112 +102,28 @@ suite('ViewModelDecorations', () => {
 			).inlineDecorations;
 
 			// view line 2: (1,14 -> 1,24)
-			assert.deepEqual(inlineDecorations1, [
-				{
-					range: new Range(1, 2, 2, 2),
-					inlineClassName: 'i-dec3',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 2, 2, 2),
-					inlineClassName: 'a-dec3',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(1, 2, 3, 13),
-					inlineClassName: 'i-dec4',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(1, 2, 5, 8),
-					inlineClassName: 'i-dec5',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'i-dec6',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'b-dec6',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'a-dec6',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(2, 1, 2, 3),
-					inlineClassName: 'i-dec7',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'b-dec7',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 3, 2, 3),
-					inlineClassName: 'a-dec7',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(2, 1, 3, 13),
-					inlineClassName: 'i-dec8',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'b-dec8',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 1, 5, 8),
-					inlineClassName: 'i-dec9',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 2, 1),
-					inlineClassName: 'b-dec9',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 3, 2, 5),
-					inlineClassName: 'i-dec10',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 3, 2, 3),
-					inlineClassName: 'b-dec10',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 5, 2, 5),
-					inlineClassName: 'a-dec10',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(2, 3, 3, 13),
-					inlineClassName: 'i-dec11',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 3, 2, 3),
-					inlineClassName: 'b-dec11',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(2, 3, 5, 8),
-					inlineClassName: 'i-dec12',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 3, 2, 3),
-					inlineClassName: 'b-dec12',
-					type: InlineDecorationType.Before
-				},
+			assert.deepStrictEqual(inlineDecorations1, [
+				new InlineDecoration(new Range(1, 2, 2, 2), 'i-dec3', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 2, 2, 2), 'a-dec3', InlineDecorationType.After),
+				new InlineDecoration(new Range(1, 2, 3, 13), 'i-dec4', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(1, 2, 5, 8), 'i-dec5', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'i-dec6', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'b-dec6', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'a-dec6', InlineDecorationType.After),
+				new InlineDecoration(new Range(2, 1, 2, 3), 'i-dec7', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'b-dec7', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 3, 2, 3), 'a-dec7', InlineDecorationType.After),
+				new InlineDecoration(new Range(2, 1, 3, 13), 'i-dec8', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'b-dec8', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 1, 5, 8), 'i-dec9', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 2, 1), 'b-dec9', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 3, 2, 5), 'i-dec10', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 3, 2, 3), 'b-dec10', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 5, 2, 5), 'a-dec10', InlineDecorationType.After),
+				new InlineDecoration(new Range(2, 3, 3, 13), 'i-dec11', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 3, 2, 3), 'b-dec11', InlineDecorationType.Before),
+				new InlineDecoration(new Range(2, 3, 5, 8), 'i-dec12', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 3, 2, 3), 'b-dec12', InlineDecorationType.Before),
 			]);
 
 			let inlineDecorations2 = viewModel.getViewLineRenderingData(
@@ -216,52 +132,16 @@ suite('ViewModelDecorations', () => {
 			).inlineDecorations;
 
 			// view line 3 (24 -> 36)
-			assert.deepEqual(inlineDecorations2, [
-				{
-					range: new Range(1, 2, 3, 13),
-					inlineClassName: 'i-dec4',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(3, 13, 3, 13),
-					inlineClassName: 'a-dec4',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(1, 2, 5, 8),
-					inlineClassName: 'i-dec5',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 1, 3, 13),
-					inlineClassName: 'i-dec8',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(3, 13, 3, 13),
-					inlineClassName: 'a-dec8',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(2, 1, 5, 8),
-					inlineClassName: 'i-dec9',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(2, 3, 3, 13),
-					inlineClassName: 'i-dec11',
-					type: InlineDecorationType.Regular
-				},
-				{
-					range: new Range(3, 13, 3, 13),
-					inlineClassName: 'a-dec11',
-					type: InlineDecorationType.After
-				},
-				{
-					range: new Range(2, 3, 5, 8),
-					inlineClassName: 'i-dec12',
-					type: InlineDecorationType.Regular
-				},
+			assert.deepStrictEqual(inlineDecorations2, [
+				new InlineDecoration(new Range(1, 2, 3, 13), 'i-dec4', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(3, 13, 3, 13), 'a-dec4', InlineDecorationType.After),
+				new InlineDecoration(new Range(1, 2, 5, 8), 'i-dec5', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 1, 3, 13), 'i-dec8', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(3, 13, 3, 13), 'a-dec8', InlineDecorationType.After),
+				new InlineDecoration(new Range(2, 1, 5, 8), 'i-dec9', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(2, 3, 3, 13), 'i-dec11', InlineDecorationType.Regular),
+				new InlineDecoration(new Range(3, 13, 3, 13), 'a-dec11', InlineDecorationType.After),
+				new InlineDecoration(new Range(2, 3, 5, 8), 'i-dec12', InlineDecorationType.Regular),
 			]);
 		});
 	});
@@ -275,11 +155,11 @@ suite('ViewModelDecorations', () => {
 			wordWrapColumn: 13
 		};
 		testViewModel(text, opts, (viewModel, model) => {
-			assert.equal(viewModel.getLineContent(1), 'hello world, ');
-			assert.equal(viewModel.getLineContent(2), 'this is a ');
-			assert.equal(viewModel.getLineContent(3), 'buffer that ');
-			assert.equal(viewModel.getLineContent(4), 'will be ');
-			assert.equal(viewModel.getLineContent(5), 'wrapped');
+			assert.strictEqual(viewModel.getLineContent(1), 'hello world, ');
+			assert.strictEqual(viewModel.getLineContent(2), 'this is a ');
+			assert.strictEqual(viewModel.getLineContent(3), 'buffer that ');
+			assert.strictEqual(viewModel.getLineContent(4), 'will be ');
+			assert.strictEqual(viewModel.getLineContent(5), 'wrapped');
 
 			model.changeDecorations((accessor) => {
 				accessor.addDecoration(
@@ -293,19 +173,19 @@ suite('ViewModelDecorations', () => {
 			let decorations = viewModel.getDecorationsInViewport(
 				new Range(2, viewModel.getLineMinColumn(2), 3, viewModel.getLineMaxColumn(3))
 			).filter(x => Boolean(x.options.beforeContentClassName));
-			assert.deepEqual(decorations, []);
+			assert.deepStrictEqual(decorations, []);
 
 			let inlineDecorations1 = viewModel.getViewLineRenderingData(
 				new Range(2, viewModel.getLineMinColumn(2), 3, viewModel.getLineMaxColumn(3)),
 				2
 			).inlineDecorations;
-			assert.deepEqual(inlineDecorations1, []);
+			assert.deepStrictEqual(inlineDecorations1, []);
 
 			let inlineDecorations2 = viewModel.getViewLineRenderingData(
 				new Range(2, viewModel.getLineMinColumn(2), 3, viewModel.getLineMaxColumn(3)),
 				3
 			).inlineDecorations;
-			assert.deepEqual(inlineDecorations2, []);
+			assert.deepStrictEqual(inlineDecorations2, []);
 		});
 	});
 
@@ -329,17 +209,9 @@ suite('ViewModelDecorations', () => {
 				new Range(1, 1, 1, 1),
 				1
 			).inlineDecorations;
-			assert.deepEqual(inlineDecorations, [
-				{
-					range: new Range(1, 1, 1, 1),
-					inlineClassName: 'before1',
-					type: InlineDecorationType.Before
-				},
-				{
-					range: new Range(1, 1, 1, 1),
-					inlineClassName: 'after1',
-					type: InlineDecorationType.After
-				}
+			assert.deepStrictEqual(inlineDecorations, [
+				new InlineDecoration(new Range(1, 1, 1, 1), 'before1', InlineDecorationType.Before),
+				new InlineDecoration(new Range(1, 1, 1, 1), 'after1', InlineDecorationType.After)
 			]);
 		});
 	});
diff --git a/src/vs/editor/test/common/viewModel/viewModelImpl.test.ts b/src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
index 6fe30a128..d556f3da7 100644
--- a/src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
+++ b/src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
@@ -18,7 +18,7 @@ suite('ViewModel', () => {
 			lineNumbersMinChars: 1
 		};
 		testViewModel(text, opts, (viewModel, model) => {
-			assert.equal(viewModel.getLineCount(), 1);
+			assert.strictEqual(viewModel.getLineCount(), 1);
 
 			viewModel.setViewport(1, 1, 1);
 
@@ -38,14 +38,14 @@ suite('ViewModel', () => {
 				].join('\n')
 			}]);
 
-			assert.equal(viewModel.getLineCount(), 10);
+			assert.strictEqual(viewModel.getLineCount(), 10);
 		});
 	});
 
 	test('issue #44805: SplitLinesCollection: attempt to access a \'newer\' model', () => {
 		const text = [''];
 		testViewModel(text, {}, (viewModel, model) => {
-			assert.equal(viewModel.getLineCount(), 1);
+			assert.strictEqual(viewModel.getLineCount(), 1);
 
 			model.pushEditOperations([], [{
 				range: new Range(1, 1, 1, 1),
@@ -74,7 +74,7 @@ suite('ViewModel', () => {
 			model.undo();
 			viewLineCount.push(viewModel.getLineCount());
 
-			assert.deepEqual(viewLineCount, [4, 1, 1, 1, 1]);
+			assert.deepStrictEqual(viewLineCount, [4, 1, 1, 1, 1]);
 		});
 	});
 
@@ -85,7 +85,7 @@ suite('ViewModel', () => {
 			'line3'
 		];
 		testViewModel(text, {}, (viewModel, model) => {
-			assert.equal(viewModel.getLineCount(), 3);
+			assert.strictEqual(viewModel.getLineCount(), 3);
 			viewModel.setHiddenAreas([new Range(1, 1, 3, 1)]);
 			assert.ok(viewModel.getVisibleRanges() !== null);
 		});
@@ -96,7 +96,7 @@ suite('ViewModel', () => {
 			''
 		];
 		testViewModel(text, {}, (viewModel, model) => {
-			assert.equal(viewModel.getLineCount(), 1);
+			assert.strictEqual(viewModel.getLineCount(), 1);
 
 			model.pushEditOperations([], [{
 				range: new Range(1, 1, 1, 1),
@@ -104,7 +104,7 @@ suite('ViewModel', () => {
 			}], () => ([]));
 
 			viewModel.setHiddenAreas([new Range(1, 1, 1, 1)]);
-			assert.equal(viewModel.getLineCount(), 2);
+			assert.strictEqual(viewModel.getLineCount(), 2);
 
 			model.undo();
 			assert.ok(viewModel.getVisibleRanges() !== null);
@@ -114,7 +114,7 @@ suite('ViewModel', () => {
 	function assertGetPlainTextToCopy(text: string[], ranges: Range[], emptySelectionClipboard: boolean, expected: string | string[]): void {
 		testViewModel(text, {}, (viewModel, model) => {
 			let actual = viewModel.getPlainTextToCopy(ranges, emptySelectionClipboard, false);
-			assert.deepEqual(actual, expected);
+			assert.deepStrictEqual(actual, expected);
 		});
 	}
 
@@ -259,7 +259,39 @@ suite('ViewModel', () => {
 		testViewModel(USUAL_TEXT, {}, (viewModel, model) => {
 			model.setEOL(EndOfLineSequence.LF);
 			let actual = viewModel.getPlainTextToCopy([new Range(2, 1, 5, 1)], true, true);
-			assert.deepEqual(actual, 'line2\r\nline3\r\nline4\r\n');
+			assert.deepStrictEqual(actual, 'line2\r\nline3\r\nline4\r\n');
 		});
 	});
+
+	test('issue #40926: Incorrect spacing when inserting new line after multiple folded blocks of code', () => {
+		testViewModel(
+			[
+				'foo = {',
+				'    foobar: function() {',
+				'        this.foobar();',
+				'    },',
+				'    foobar: function() {',
+				'        this.foobar();',
+				'    },',
+				'    foobar: function() {',
+				'        this.foobar();',
+				'    },',
+				'}',
+			], {}, (viewModel, model) => {
+				viewModel.setHiddenAreas([
+					new Range(3, 1, 3, 1),
+					new Range(6, 1, 6, 1),
+					new Range(9, 1, 9, 1),
+				]);
+
+				model.applyEdits([
+					{ range: new Range(4, 7, 4, 7), text: '\n    ' },
+					{ range: new Range(7, 7, 7, 7), text: '\n    ' },
+					{ range: new Range(10, 7, 10, 7), text: '\n    ' }
+				]);
+
+				assert.strictEqual(viewModel.getLineCount(), 11);
+			}
+		);
+	});
 });
diff --git a/src/vs/editor/test/node/classification/typescript.test.ts b/src/vs/editor/test/node/classification/typescript.test.ts
index 5e399061a..19c7b901e 100644
--- a/src/vs/editor/test/node/classification/typescript.test.ts
+++ b/src/vs/editor/test/node/classification/typescript.test.ts
@@ -126,7 +126,7 @@ function executeTest(fileName: string, parseFunc: IParseFunc): void {
 			actual[3 * actualIndex] + actual[3 * actualIndex + 1] >= assertion.startOffset + assertion.length,
 			`Line ${assertion.testLineNumber} : length : ${actual[3 * actualIndex]} + ${actual[3 * actualIndex + 1]} >= ${assertion.startOffset} + ${assertion.length}.`
 		);
-		assert.equal(
+		assert.strictEqual(
 			actual[3 * actualIndex + 2],
 			assertion.tokenType,
 			`Line ${assertion.testLineNumber} : tokenType`);
diff --git a/src/vs/loader.js b/src/vs/loader.js
index 76db97736..a9ac0018c 100644
--- a/src/vs/loader.js
+++ b/src/vs/loader.js
@@ -36,7 +36,7 @@ var AMDLoader;
                 this._detect();
                 return this._isWindows;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         Object.defineProperty(Environment.prototype, "isNode", {
@@ -44,7 +44,7 @@ var AMDLoader;
                 this._detect();
                 return this._isNode;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         Object.defineProperty(Environment.prototype, "isElectronRenderer", {
@@ -52,7 +52,7 @@ var AMDLoader;
                 this._detect();
                 return this._isElectronRenderer;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         Object.defineProperty(Environment.prototype, "isWebWorker", {
@@ -60,7 +60,7 @@ var AMDLoader;
                 this._detect();
                 return this._isWebWorker;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         Environment.prototype._detect = function () {
@@ -199,6 +199,7 @@ var AMDLoader;
                 return obj;
             }
             if (!Array.isArray(obj) && Object.getPrototypeOf(obj) !== Object.prototype) {
+                // only clone "simple" objects
                 return obj;
             }
             var result = Array.isArray(obj) ? [] : {};
@@ -740,8 +741,8 @@ var AMDLoader;
                         // nothing
                     }
                 };
-                require.resolve = function resolve(request) {
-                    return Module._resolveFilename(request, mod);
+                require.resolve = function resolve(request, options) {
+                    return Module._resolveFilename(request, mod, false, options);
                 };
                 require.main = process.mainModule;
                 require.extensions = Module._extensions;
@@ -862,7 +863,7 @@ var AMDLoader;
             }
         };
         NodeScriptLoader.prototype._getCachedDataPath = function (config, filename) {
-            var hash = this._crypto.createHash('md5').update(filename, 'utf8').update(config.seed, 'utf8').digest('hex');
+            var hash = this._crypto.createHash('md5').update(filename, 'utf8').update(config.seed, 'utf8').update(process.arch, '').digest('hex');
             var basename = this._path.basename(filename).replace(/\.js$/, '');
             return this._path.join(config.path, basename + "-" + hash + ".code");
         };
@@ -1217,6 +1218,7 @@ var AMDLoader;
             this._requireFunc = requireFunc;
             this._moduleIdProvider = new ModuleIdProvider();
             this._config = new AMDLoader.Configuration(this._env);
+            this._hasDependencyCycle = false;
             this._modules2 = [];
             this._knownModules2 = [];
             this._inverseDependencies2 = [];
@@ -1561,6 +1563,9 @@ var AMDLoader;
             result.getStats = function () {
                 return _this.getLoaderEvents();
             };
+            result.hasDependencyCycle = function () {
+                return _this._hasDependencyCycle;
+            };
             result.config = function (params, shouldOverwrite) {
                 if (shouldOverwrite === void 0) { shouldOverwrite = false; }
                 _this.configure(params, shouldOverwrite);
@@ -1666,6 +1671,7 @@ var AMDLoader;
                         continue;
                     }
                     if (this._hasDependencyPath(dependency.id, module.id)) {
+                        this._hasDependencyCycle = true;
                         console.warn('There is a dependency cycle between \'' + this._moduleIdProvider.getStrModuleId(dependency.id) + '\' and \'' + this._moduleIdProvider.getStrModuleId(module.id) + '\'. The cyclic path follows:');
                         var cyclePath = this._findCyclePath(dependency.id, module.id, 0) || [];
                         cyclePath.reverse();
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 2cb6913f7..227452ee5 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -10,6 +10,7 @@ declare namespace monaco {
 	export type Thenable<T> = PromiseLike<T>;
 
 	export interface Environment {
+		globalAPI?: boolean;
 		baseUrl?: string;
 		getWorker?(workerId: string, label: string): Worker;
 		getWorkerUrl?(workerId: string, label: string): string;
@@ -897,6 +898,12 @@ declare namespace monaco.editor {
 		take?: number;
 	}): IMarker[];
 
+	/**
+	 * Emitted when markers change for a model.
+	 * @event
+	 */
+	export function onDidChangeMarkers(listener: (e: readonly Uri[]) => void): IDisposable;
+
 	/**
 	 * Get the model that has `uri` if it exists.
 	 */
@@ -969,6 +976,11 @@ declare namespace monaco.editor {
 	 */
 	export function remeasureFonts(): void;
 
+	/**
+	 * Register a command.
+	 */
+	export function registerCommand(id: string, handler: (accessor: any, ...args: any[]) => void): IDisposable;
+
 	export type BuiltinTheme = 'vs' | 'vs-dark' | 'hc-black';
 
 	export interface IStandaloneThemeData {
@@ -3176,6 +3188,10 @@ declare namespace monaco.editor {
 		 * Controls strikethrough deprecated variables.
 		 */
 		showDeprecated?: boolean;
+		/**
+		 * Control the behavior and rendering of the inline hints.
+		 */
+		inlineHints?: IEditorInlineHintsOptions;
 	}
 
 	/**
@@ -3222,6 +3238,11 @@ declare namespace monaco.editor {
 		 * Defaults to false
 		 */
 		isInEmbeddedEditor?: boolean;
+		/**
+		 * Is the diff editor should render overview ruler
+		 * Defaults to true
+		 */
+		renderOverviewRuler?: boolean;
 		/**
 		 * Control the wrapping of the diff editor.
 		 */
@@ -3522,6 +3543,29 @@ declare namespace monaco.editor {
 
 	export type EditorLightbulbOptions = Readonly<Required<IEditorLightbulbOptions>>;
 
+	/**
+	 * Configuration options for editor inlineHints
+	 */
+	export interface IEditorInlineHintsOptions {
+		/**
+		 * Enable the inline hints.
+		 * Defaults to true.
+		 */
+		enabled?: boolean;
+		/**
+		 * Font size of inline hints.
+		 * Default to 90% of the editor font size.
+		 */
+		fontSize?: number;
+		/**
+		 * Font family of inline hints.
+		 * Defaults to editor font family.
+		 */
+		fontFamily?: string;
+	}
+
+	export type EditorInlineHintsOptions = Readonly<Required<IEditorInlineHintsOptions>>;
+
 	/**
 	 * Configuration options for editor minimap
 	 */
@@ -4023,11 +4067,12 @@ declare namespace monaco.editor {
 		wrappingIndent = 117,
 		wrappingStrategy = 118,
 		showDeprecated = 119,
-		editorClassName = 120,
-		pixelRatio = 121,
-		tabFocusMode = 122,
-		layoutInfo = 123,
-		wrappingInfo = 124
+		inlineHints = 120,
+		editorClassName = 121,
+		pixelRatio = 122,
+		tabFocusMode = 123,
+		layoutInfo = 124,
+		wrappingInfo = 125
 	}
 	export const EditorOptions: {
 		acceptSuggestionOnCommitCharacter: IEditorOption<EditorOption.acceptSuggestionOnCommitCharacter, boolean>;
@@ -4128,6 +4173,7 @@ declare namespace monaco.editor {
 		showFoldingControls: IEditorOption<EditorOption.showFoldingControls, 'always' | 'mouseover'>;
 		showUnused: IEditorOption<EditorOption.showUnused, boolean>;
 		showDeprecated: IEditorOption<EditorOption.showDeprecated, boolean>;
+		inlineHints: IEditorOption<EditorOption.inlineHints, any>;
 		snippetSuggestions: IEditorOption<EditorOption.snippetSuggestions, 'none' | 'top' | 'bottom' | 'inline'>;
 		smartSelect: IEditorOption<EditorOption.smartSelect, any>;
 		smoothScrolling: IEditorOption<EditorOption.smoothScrolling, boolean>;
@@ -4492,6 +4538,10 @@ declare namespace monaco.editor {
 	}
 
 	export interface IDiffEditorConstructionOptions extends IDiffEditorOptions {
+		/**
+		 * The initial editor dimension (to avoid measuring the container).
+		 */
+		dimension?: IDimension;
 		/**
 		 * Place overflow widgets inside an external DOM node.
 		 * Defaults to an internal DOM node.
@@ -4935,6 +4985,7 @@ declare namespace monaco.editor {
 
 	export class FontInfo extends BareFontInfo {
 		readonly _editorStylingBrand: void;
+		readonly version: number;
 		readonly isTrusted: boolean;
 		readonly isMonospace: boolean;
 		readonly typicalHalfwidthCharacterWidth: number;
@@ -4949,6 +5000,7 @@ declare namespace monaco.editor {
 	export class BareFontInfo {
 		readonly _bareFontInfoBrand: void;
 		readonly zoomLevel: number;
+		readonly pixelRatio: number;
 		readonly fontFamily: string;
 		readonly fontWeight: string;
 		readonly fontSize: number;
@@ -5075,6 +5127,12 @@ declare namespace monaco.languages {
 		tokenize?(line: string, state: IState): ILineTokens;
 	}
 
+	/**
+	 * Change the color map that is used for token colors.
+	 * Supported formats (hex): #RRGGBB, $RRGGBBAA, #RGB, #RGBA
+	 */
+	export function setColorMap(colorMap: string[] | null): void;
+
 	/**
 	 * Set the tokens provider for a language (manual implementation).
 	 */
@@ -5366,7 +5424,7 @@ declare namespace monaco.languages {
 		/**
 		 * This rule will only execute if the text above the this line matches this regular expression.
 		 */
-		oneLineAboveText?: RegExp;
+		previousLineText?: RegExp;
 		/**
 		 * The action to execute.
 		 */
@@ -6352,6 +6410,19 @@ declare namespace monaco.languages {
 		resolveCodeLens?(model: editor.ITextModel, codeLens: CodeLens, token: CancellationToken): ProviderResult<CodeLens>;
 	}
 
+	export interface InlineHint {
+		text: string;
+		range: IRange;
+		description?: string | IMarkdownString;
+		whitespaceBefore?: boolean;
+		whitespaceAfter?: boolean;
+	}
+
+	export interface InlineHintsProvider {
+		onDidChangeInlineHints?: IEvent<void> | undefined;
+		provideInlineHints(model: editor.ITextModel, range: Range, token: CancellationToken): ProviderResult<InlineHint[]>;
+	}
+
 	export interface SemanticTokensLegend {
 		readonly tokenTypes: string[];
 		readonly tokenModifiers: string[];
@@ -6429,6 +6500,11 @@ declare namespace monaco.languages {
 		 * attach this to every token class (by default '.' + name)
 		 */
 		tokenPostfix?: string;
+		/**
+		 * include line feeds (in the form of a \n character) at the end of lines
+		 * Defaults to false
+		 */
+		includeLF?: boolean;
 	}
 
 	/**
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.css b/src/vs/platform/actions/browser/menuEntryActionViewItem.css
new file mode 100644
index 000000000..5ef85311a
--- /dev/null
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.css
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-action-bar .action-item.menu-entry .action-label {
+	background-image: var(--menu-entry-icon-light);
+	display: inline-flex;
+}
+
+.vs-dark .monaco-action-bar .action-item.menu-entry .action-label,
+.hc-black .monaco-action-bar .action-item.menu-entry .action-label {
+	background-image: var(--menu-entry-icon-dark);
+}
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 1344ea900..fbfdd035a 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createCSSRule, asCSSUrl, ModifierKeyEmitter } from 'vs/base/browser/dom';
+import 'vs/css!./menuEntryActionViewItem';
+import { asCSSUrl, ModifierKeyEmitter } from 'vs/base/browser/dom';
 import { domEvent } from 'vs/base/browser/event';
 import { IAction, Separator } from 'vs/base/common/actions';
-import { IdGenerator } from 'vs/base/common/idGenerator';
 import { IDisposable, toDisposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { ICommandAction, IMenu, IMenuActionOptions, MenuItemAction, SubmenuItemAction, Icon } from 'vs/platform/actions/common/actions';
@@ -17,6 +17,7 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
 import { isWindows, isLinux } from 'vs/base/common/platform';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export function createAndFillInContextMenuActions(menu: IMenu, options: IMenuActionOptions | undefined, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, isPrimaryGroup?: (group: string) => boolean): IDisposable {
 	const groups = menu.getActions(options);
@@ -44,8 +45,7 @@ function asDisposable(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActio
 }
 
 function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemAction | SubmenuItemAction>]>, target: IAction[] | { primary: IAction[]; secondary: IAction[]; }, useAlternativeActions: boolean, isPrimaryGroup: (group: string) => boolean = group => group === 'navigation'): void {
-	for (let tuple of groups) {
-		let [group, actions] = tuple;
+	for (let [group, actions] of groups) {
 		if (useAlternativeActions) {
 			actions = actions.map(a => (a instanceof MenuItemAction) && !!a.alt ? a.alt : a);
 		}
@@ -66,10 +66,6 @@ function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActi
 	}
 }
 
-const ids = new IdGenerator('menu-item-action-item-icon-');
-
-const ICON_PATH_TO_CSS_RULES = new Map<string /* path*/, string /* CSS rule */>();
-
 export class MenuEntryActionViewItem extends ActionViewItem {
 
 	private _wantsAltCommand: boolean = false;
@@ -85,7 +81,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 		this._altKey = ModifierKeyEmitter.getInstance();
 	}
 
-	protected get _commandAction(): IAction {
+	protected get _commandAction(): MenuItemAction {
 		return this._wantsAltCommand && (<MenuItemAction>this._action).alt || this._action;
 	}
 
@@ -93,12 +89,14 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 		event.preventDefault();
 		event.stopPropagation();
 
-		this.actionRunner.run(this._commandAction, this._context)
-			.then(undefined, err => this._notificationService.error(err));
+		this.actionRunner
+			.run(this._commandAction, this._context)
+			.catch(err => this._notificationService.error(err));
 	}
 
 	render(container: HTMLElement): void {
 		super.render(container);
+		container.classList.add('menu-entry');
 
 		this._updateItemClass(this._action.item);
 
@@ -167,46 +165,39 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 	private _updateItemClass(item: ICommandAction): void {
 		this._itemClassDispose.value = undefined;
 
+		const { element, label } = this;
+		if (!element || !label) {
+			return;
+		}
+
 		const icon = this._commandAction.checked && (item.toggled as { icon?: Icon })?.icon ? (item.toggled as { icon: Icon }).icon : item.icon;
 
+		if (!icon) {
+			return;
+		}
+
 		if (ThemeIcon.isThemeIcon(icon)) {
 			// theme icons
 			const iconClass = ThemeIcon.asClassName(icon);
-			if (this.label && iconClass) {
-				this.label.classList.add(...iconClass.split(' '));
-				this._itemClassDispose.value = toDisposable(() => {
-					if (this.label) {
-						this.label.classList.remove(...iconClass.split(' '));
-					}
-				});
+			label.classList.add(...iconClass.split(' '));
+			this._itemClassDispose.value = toDisposable(() => {
+				label.classList.remove(...iconClass.split(' '));
+			});
+
+		} else {
+			// icon path/url
+			if (icon.light) {
+				label.style.setProperty('--menu-entry-icon-light', asCSSUrl(icon.light));
 			}
-
-		} else if (icon) {
-			// icon path
-			let iconClass: string;
-
-			if (icon.dark?.scheme) {
-
-				const iconPathMapKey = icon.dark.toString();
-
-				if (ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
-					iconClass = ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
-				} else {
-					iconClass = ids.nextId();
-					createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(icon.light || icon.dark)}`);
-					createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(icon.dark)}`);
-					ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
-				}
-
-				if (this.label) {
-					this.label.classList.add('icon', ...iconClass.split(' '));
-					this._itemClassDispose.value = toDisposable(() => {
-						if (this.label) {
-							this.label.classList.remove('icon', ...iconClass.split(' '));
-						}
-					});
-				}
+			if (icon.dark) {
+				label.style.setProperty('--menu-entry-icon-dark', asCSSUrl(icon.dark));
 			}
+			label.classList.add('icon');
+			this._itemClassDispose.value = toDisposable(() => {
+				label.classList.remove('icon');
+				label.style.removeProperty('--menu-entry-icon-light');
+				label.style.removeProperty('--menu-entry-icon-dark');
+			});
 		}
 	}
 }
@@ -215,29 +206,41 @@ export class SubmenuEntryActionViewItem extends DropdownMenuActionViewItem {
 
 	constructor(
 		action: SubmenuItemAction,
-		@INotificationService _notificationService: INotificationService,
-		@IContextMenuService _contextMenuService: IContextMenuService
+		@IContextMenuService contextMenuService: IContextMenuService
 	) {
-		let classNames: string | string[] | undefined;
+		super(action, { getActions: () => action.actions }, contextMenuService, {
+			menuAsChild: true,
+			classNames: ThemeIcon.isThemeIcon(action.item.icon) ? ThemeIcon.asClassName(action.item.icon) : undefined,
+		});
+	}
 
-		if (action.item.icon) {
-			if (ThemeIcon.isThemeIcon(action.item.icon)) {
-				classNames = ThemeIcon.asClassName(action.item.icon)!;
-			} else if (action.item.icon.dark?.scheme) {
-				const iconPathMapKey = action.item.icon.dark.toString();
-
-				if (ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
-					classNames = ['icon', ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!];
-				} else {
-					const className = ids.nextId();
-					classNames = ['icon', className];
-					createCSSRule(`.icon.${className}`, `background-image: ${asCSSUrl(action.item.icon.light || action.item.icon.dark)}`);
-					createCSSRule(`.vs-dark .icon.${className}, .hc-black .icon.${className}`, `background-image: ${asCSSUrl(action.item.icon.dark)}`);
-					ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, className);
+	render(container: HTMLElement): void {
+		super.render(container);
+		if (this.element) {
+			container.classList.add('menu-entry');
+			const { icon } = (<SubmenuItemAction>this._action).item;
+			if (icon && !ThemeIcon.isThemeIcon(icon)) {
+				this.element.classList.add('icon');
+				if (icon.light) {
+					this.element.style.setProperty('--menu-entry-icon-light', asCSSUrl(icon.light));
+				}
+				if (icon.dark) {
+					this.element.style.setProperty('--menu-entry-icon-dark', asCSSUrl(icon.dark));
 				}
 			}
 		}
-
-		super(action, action.actions, _contextMenuService, { classNames: classNames, menuAsChild: true });
+	}
+}
+
+/**
+ * Creates action view items for menu actions or submenu actions.
+ */
+export function createActionViewItem(instaService: IInstantiationService, action: IAction): undefined | MenuEntryActionViewItem | SubmenuEntryActionViewItem {
+	if (action instanceof MenuItemAction) {
+		return instaService.createInstance(MenuEntryActionViewItem, action);
+	} else if (action instanceof SubmenuItemAction) {
+		return instaService.createInstance(SubmenuEntryActionViewItem, action);
+	} else {
+		return undefined;
 	}
 }
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index c06a3511b..514fc0bd6 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -16,22 +16,36 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { UriDto } from 'vs/base/common/types';
 import { Iterable } from 'vs/base/common/iterator';
 import { LinkedList } from 'vs/base/common/linkedList';
+import { CSSIcon } from 'vs/base/common/codicons';
 
 export interface ILocalizedString {
+	/**
+	 * The localized value of the string.
+	 */
 	value: string;
+	/**
+	 * The original (non localized value of the string)
+	 */
 	original: string;
 }
 
+export interface ICommandActionTitle extends ILocalizedString {
+	/**
+	 * The title with a mnemonic designation. && precedes the mnemonic.
+	 */
+	mnemonicTitle?: string;
+}
+
 export type Icon = { dark?: URI; light?: URI; } | ThemeIcon;
 
 export interface ICommandAction {
 	id: string;
-	title: string | ILocalizedString;
+	title: string | ICommandActionTitle;
 	category?: string | ILocalizedString;
-	tooltip?: string | ILocalizedString;
+	tooltip?: string;
 	icon?: Icon;
 	precondition?: ContextKeyExpression;
-	toggled?: ContextKeyExpression | { condition: ContextKeyExpression, icon?: Icon, tooltip?: string | ILocalizedString };
+	toggled?: ContextKeyExpression | { condition: ContextKeyExpression, icon?: Icon, tooltip?: string };
 }
 
 export type ISerializableCommandAction = UriDto<ICommandAction>;
@@ -45,7 +59,7 @@ export interface IMenuItem {
 }
 
 export interface ISubmenuItem {
-	title: string | ILocalizedString;
+	title: string | ICommandActionTitle;
 	submenu: MenuId;
 	icon?: Icon;
 	when?: ContextKeyExpression;
@@ -112,6 +126,7 @@ export class MenuId {
 	static readonly TunnelInline = new MenuId('TunnelInline');
 	static readonly TunnelTitle = new MenuId('TunnelTitle');
 	static readonly ViewItemContext = new MenuId('ViewItemContext');
+	static readonly ViewContainerTitle = new MenuId('ViewContainerTitle');
 	static readonly ViewContainerTitleContext = new MenuId('ViewContainerTitleContext');
 	static readonly ViewTitle = new MenuId('ViewTitle');
 	static readonly ViewTitleContext = new MenuId('ViewTitleContext');
@@ -132,6 +147,7 @@ export class MenuId {
 	static readonly TimelineTitle = new MenuId('TimelineTitle');
 	static readonly TimelineTitleContext = new MenuId('TimelineTitleContext');
 	static readonly AccountsContext = new MenuId('AccountsContext');
+	static readonly PanelTitle = new MenuId('PanelTitle');
 
 	readonly id: number;
 	readonly _debugName: string;
@@ -148,7 +164,7 @@ export interface IMenuActionOptions {
 }
 
 export interface IMenu extends IDisposable {
-	readonly onDidChange: Event<IMenu | undefined>;
+	readonly onDidChange: Event<IMenu>;
 	getActions(options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][];
 }
 
@@ -334,61 +350,71 @@ export class SubmenuItemAction extends SubmenuAction {
 	}
 }
 
-export class MenuItemAction extends ExecuteCommandAction {
+// implements IAction, does NOT extend Action, so that no one
+// subscribes to events of Action or modified properties
+export class MenuItemAction implements IAction {
 
 	readonly item: ICommandAction;
 	readonly alt: MenuItemAction | undefined;
 
-	private _options: IMenuActionOptions;
+	private readonly _options: IMenuActionOptions | undefined;
+
+	readonly id: string;
+	readonly label: string;
+	readonly tooltip: string;
+	readonly class: string | undefined;
+	readonly enabled: boolean;
+	readonly checked: boolean;
 
 	constructor(
 		item: ICommandAction,
 		alt: ICommandAction | undefined,
-		options: IMenuActionOptions,
+		options: IMenuActionOptions | undefined,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICommandService commandService: ICommandService
+		@ICommandService private _commandService: ICommandService
 	) {
-		typeof item.title === 'string' ? super(item.id, item.title, commandService) : super(item.id, item.title.value, commandService);
-
-		this._cssClass = undefined;
-		this._enabled = !item.precondition || contextKeyService.contextMatchesRules(item.precondition);
-		this._tooltip = item.tooltip ? typeof item.tooltip === 'string' ? item.tooltip : item.tooltip.value : undefined;
+		this.id = item.id;
+		this.label = typeof item.title === 'string' ? item.title : item.title.value;
+		this.tooltip = item.tooltip ?? '';
+		this.enabled = !item.precondition || contextKeyService.contextMatchesRules(item.precondition);
+		this.checked = false;
 
 		if (item.toggled) {
 			const toggled = ((item.toggled as { condition: ContextKeyExpression }).condition ? item.toggled : { condition: item.toggled }) as {
 				condition: ContextKeyExpression, icon?: Icon, tooltip?: string | ILocalizedString
 			};
-			this._checked = contextKeyService.contextMatchesRules(toggled.condition);
-			if (this._checked && toggled.tooltip) {
-				this._tooltip = typeof toggled.tooltip === 'string' ? toggled.tooltip : toggled.tooltip.value;
+			this.checked = contextKeyService.contextMatchesRules(toggled.condition);
+			if (this.checked && toggled.tooltip) {
+				this.tooltip = typeof toggled.tooltip === 'string' ? toggled.tooltip : toggled.tooltip.value;
 			}
 		}
 
-		this._options = options || {};
-
 		this.item = item;
-		this.alt = alt ? new MenuItemAction(alt, undefined, this._options, contextKeyService, commandService) : undefined;
+		this.alt = alt ? new MenuItemAction(alt, undefined, options, contextKeyService, _commandService) : undefined;
+		this._options = options;
+		if (ThemeIcon.isThemeIcon(item.icon)) {
+			this.class = CSSIcon.asClassName(item.icon);
+		}
 	}
 
 	dispose(): void {
-		if (this.alt) {
-			this.alt.dispose();
-		}
-		super.dispose();
+		// there is NOTHING to dispose and the MenuItemAction should
+		// never have anything to dispose as it is a convenience type
+		// to bridge into the rendering world.
 	}
 
 	run(...args: any[]): Promise<any> {
 		let runArgs: any[] = [];
 
-		if (this._options.arg) {
+		if (this._options?.arg) {
 			runArgs = [...runArgs, this._options.arg];
 		}
 
-		if (this._options.shouldForwardArgs) {
+		if (this._options?.shouldForwardArgs) {
 			runArgs = [...runArgs, ...args];
 		}
 
-		return super.run(...runArgs);
+		return this._commandService.executeCommand(this.id, ...runArgs);
 	}
 }
 
diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts
index 6ea4c5a08..eaabf117b 100644
--- a/src/vs/platform/actions/common/menuService.ts
+++ b/src/vs/platform/actions/common/menuService.ts
@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IMenu, IMenuActionOptions, IMenuItem, IMenuService, isIMenuItem, ISubmenuItem, MenuId, MenuItemAction, MenuRegistry, SubmenuItemAction, ILocalizedString } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextKeyService, IContextKeyChangeEvent, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 
 export class MenuService implements IMenuService {
 
@@ -29,9 +30,11 @@ type MenuItemGroup = [string, Array<IMenuItem | ISubmenuItem>];
 
 class Menu implements IMenu {
 
-	private readonly _onDidChange = new Emitter<IMenu | undefined>();
 	private readonly _dispoables = new DisposableStore();
 
+	private readonly _onDidChange = new Emitter<IMenu>();
+	readonly onDidChange: Event<IMenu> = this._onDidChange.event;
+
 	private _menuGroups: MenuItemGroup[] = [];
 	private _contextKeys: Set<string> = new Set();
 
@@ -45,19 +48,23 @@ class Menu implements IMenu {
 
 		// rebuild this menu whenever the menu registry reports an
 		// event for this MenuId
-		this._dispoables.add(Event.debounce(
-			Event.filter(MenuRegistry.onDidChangeMenu, set => set.has(this._id)),
-			() => { },
-			50
-		)(this._build, this));
+		const rebuildMenuSoon = new RunOnceScheduler(() => this._build(), 50);
+		this._dispoables.add(rebuildMenuSoon);
+		this._dispoables.add(MenuRegistry.onDidChangeMenu(e => {
+			if (e.has(_id)) {
+				rebuildMenuSoon.schedule();
+			}
+		}));
 
 		// when context keys change we need to check if the menu also
 		// has changed
-		this._dispoables.add(Event.debounce<IContextKeyChangeEvent, boolean>(
-			this._contextKeyService.onDidChangeContext,
-			(last, event) => last || event.affectsSome(this._contextKeys),
-			50
-		)(e => e && this._onDidChange.fire(undefined), this));
+		const fireChangeSoon = new RunOnceScheduler(() => this._onDidChange.fire(this), 50);
+		this._dispoables.add(fireChangeSoon);
+		this._dispoables.add(_contextKeyService.onDidChangeContext(e => {
+			if (e.affectsSome(this._contextKeys)) {
+				fireChangeSoon.schedule();
+			}
+		}));
 	}
 
 	dispose(): void {
@@ -88,25 +95,22 @@ class Menu implements IMenu {
 			// keep keys for eventing
 			Menu._fillInKbExprKeys(item.when, this._contextKeys);
 
-			// keep precondition keys for event if applicable
-			if (isIMenuItem(item) && item.command.precondition) {
-				Menu._fillInKbExprKeys(item.command.precondition, this._contextKeys);
-			}
-
-			// keep toggled keys for event if applicable
-			if (isIMenuItem(item) && item.command.toggled) {
-				const toggledExpression: ContextKeyExpression = (item.command.toggled as { condition: ContextKeyExpression }).condition || item.command.toggled;
-				Menu._fillInKbExprKeys(toggledExpression, this._contextKeys);
+			if (isIMenuItem(item)) {
+				// keep precondition keys for event if applicable
+				if (item.command.precondition) {
+					Menu._fillInKbExprKeys(item.command.precondition, this._contextKeys);
+				}
+				// keep toggled keys for event if applicable
+				if (item.command.toggled) {
+					const toggledExpression: ContextKeyExpression = (item.command.toggled as { condition: ContextKeyExpression }).condition || item.command.toggled;
+					Menu._fillInKbExprKeys(toggledExpression, this._contextKeys);
+				}
 			}
 		}
 		this._onDidChange.fire(this);
 	}
 
-	get onDidChange(): Event<IMenu | undefined> {
-		return this._onDidChange.event;
-	}
-
-	getActions(options: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][] {
+	getActions(options?: IMenuActionOptions): [string, Array<MenuItemAction | SubmenuItemAction>][] {
 		const result: [string, Array<MenuItemAction | SubmenuItemAction>][] = [];
 		for (let group of this._menuGroups) {
 			const [id, items] = group;
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
index 42e2636d8..75b2cac37 100644
--- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
+++ b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -20,39 +20,14 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { ConsoleLogMainService } from 'vs/platform/log/common/log';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { createHash } from 'crypto';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
 
-suite('BackupMainService', () => {
+flakySuite('BackupMainService', () => {
 
 	function assertEqualUris(actual: URI[], expected: URI[]) {
-		assert.deepEqual(actual.map(a => a.toString()), expected.map(a => a.toString()));
-	}
-
-	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupservice');
-	const backupHome = path.join(parentDir, 'Backups');
-	const backupWorkspacesPath = path.join(backupHome, 'workspaces.json');
-
-	const environmentService = new EnvironmentMainService(parseArgs(process.argv, OPTIONS));
-
-	class TestBackupMainService extends BackupMainService {
-
-		constructor(backupHome: string, backupWorkspacesPath: string, configService: TestConfigurationService) {
-			super(environmentService, configService, new ConsoleLogMainService());
-
-			this.backupHome = backupHome;
-			this.workspacesJsonPath = backupWorkspacesPath;
-		}
-
-		toBackupPath(arg: URI | string): string {
-			const id = arg instanceof URI ? super.getFolderHash(arg) : arg;
-			return path.join(this.backupHome, id);
-		}
-
-		getFolderHash(folderUri: URI): string {
-			return super.getFolderHash(folderUri);
-		}
+		assert.deepStrictEqual(actual.map(a => a.toString()), expected.map(a => a.toString()));
 	}
 
 	function toWorkspace(path: string): IWorkspaceIdentifier {
@@ -79,20 +54,23 @@ suite('BackupMainService', () => {
 		};
 	}
 
-	async function ensureFolderExists(uri: URI): Promise<void> {
+	function ensureFolderExists(uri: URI): Promise<void> {
 		if (!fs.existsSync(uri.fsPath)) {
 			fs.mkdirSync(uri.fsPath);
 		}
+
 		const backupFolder = service.toBackupPath(uri);
-		await createBackupFolder(backupFolder);
+		return createBackupFolder(backupFolder);
 	}
 
 	async function ensureWorkspaceExists(workspace: IWorkspaceIdentifier): Promise<IWorkspaceIdentifier> {
 		if (!fs.existsSync(workspace.configPath.fsPath)) {
 			await pfs.writeFile(workspace.configPath.fsPath, 'Hello');
 		}
+
 		const backupFolder = service.toBackupPath(workspace.id);
 		await createBackupFolder(backupFolder);
+
 		return workspace;
 	}
 
@@ -111,29 +89,52 @@ suite('BackupMainService', () => {
 	const fooFile = URI.file(platform.isWindows ? 'C:\\foo' : '/foo');
 	const barFile = URI.file(platform.isWindows ? 'C:\\bar' : '/bar');
 
-	const existingTestFolder1 = URI.file(path.join(parentDir, 'folder1'));
-
-	let service: TestBackupMainService;
+	let service: BackupMainService & { toBackupPath(arg: URI | string): string, getFolderHash(folderUri: URI): string };
 	let configService: TestConfigurationService;
 
-	setup(async () => {
+	let environmentService: EnvironmentMainService;
+	let testDir: string;
+	let backupHome: string;
+	let backupWorkspacesPath: string;
+	let existingTestFolder1: URI;
+
+	setup(async () => {
+		testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupmainservice');
+		backupHome = path.join(testDir, 'Backups');
+		backupWorkspacesPath = path.join(backupHome, 'workspaces.json');
+		existingTestFolder1 = URI.file(path.join(testDir, 'folder1'));
+
+		environmentService = new EnvironmentMainService(parseArgs(process.argv, OPTIONS));
 
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
 		await pfs.mkdirp(backupHome);
 
 		configService = new TestConfigurationService();
-		service = new TestBackupMainService(backupHome, backupWorkspacesPath, configService);
+		service = new class TestBackupMainService extends BackupMainService {
+			constructor() {
+				super(environmentService, configService, new ConsoleLogMainService());
+
+				this.backupHome = backupHome;
+				this.workspacesJsonPath = backupWorkspacesPath;
+			}
+
+			toBackupPath(arg: URI | string): string {
+				const id = arg instanceof URI ? super.getFolderHash(arg) : arg;
+				return path.join(this.backupHome, id);
+			}
+
+			getFolderHash(folderUri: URI): string {
+				return super.getFolderHash(folderUri);
+			}
+		};
 
 		return service.initialize();
 	});
 
 	teardown(() => {
-		return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
+		return pfs.rimraf(testDir);
 	});
 
 	test('service validates backup workspaces on startup and cleans up (folder workspaces)', async function () {
-		this.timeout(1000 * 10); // increase timeout for this test
 
 		// 1) backup workspace path does not exist
 		service.registerFolderBackupSync(fooFile);
@@ -170,22 +171,21 @@ suite('BackupMainService', () => {
 		fs.mkdirSync(service.toBackupPath(barFile));
 		fs.mkdirSync(fileBackups);
 		service.registerFolderBackupSync(fooFile);
-		assert.equal(service.getFolderBackupPaths().length, 1);
-		assert.equal(service.getEmptyWindowBackupPaths().length, 0);
+		assert.strictEqual(service.getFolderBackupPaths().length, 1);
+		assert.strictEqual(service.getEmptyWindowBackupPaths().length, 0);
 		fs.writeFileSync(path.join(fileBackups, 'backup.txt'), '');
 		await service.initialize();
-		assert.equal(service.getFolderBackupPaths().length, 0);
-		assert.equal(service.getEmptyWindowBackupPaths().length, 1);
+		assert.strictEqual(service.getFolderBackupPaths().length, 0);
+		assert.strictEqual(service.getEmptyWindowBackupPaths().length, 1);
 	});
 
 	test('service validates backup workspaces on startup and cleans up (root workspaces)', async function () {
-		this.timeout(1000 * 10); // increase timeout for this test
 
 		// 1) backup workspace path does not exist
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath));
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(barFile.fsPath));
 		await service.initialize();
-		assert.deepEqual(service.getWorkspaceBackups(), []);
+		assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 
 		// 2) backup workspace path exists with empty contents within
 		fs.mkdirSync(service.toBackupPath(fooFile));
@@ -193,7 +193,7 @@ suite('BackupMainService', () => {
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath));
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(barFile.fsPath));
 		await service.initialize();
-		assert.deepEqual(service.getWorkspaceBackups(), []);
+		assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
 		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
@@ -205,7 +205,7 @@ suite('BackupMainService', () => {
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath));
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(barFile.fsPath));
 		await service.initialize();
-		assert.deepEqual(service.getWorkspaceBackups(), []);
+		assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		assert.ok(!fs.existsSync(service.toBackupPath(fooFile)));
 		assert.ok(!fs.existsSync(service.toBackupPath(barFile)));
 
@@ -216,12 +216,12 @@ suite('BackupMainService', () => {
 		fs.mkdirSync(service.toBackupPath(barFile));
 		fs.mkdirSync(fileBackups);
 		service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath));
-		assert.equal(service.getWorkspaceBackups().length, 1);
-		assert.equal(service.getEmptyWindowBackupPaths().length, 0);
+		assert.strictEqual(service.getWorkspaceBackups().length, 1);
+		assert.strictEqual(service.getEmptyWindowBackupPaths().length, 0);
 		fs.writeFileSync(path.join(fileBackups, 'backup.txt'), '');
 		await service.initialize();
-		assert.equal(service.getWorkspaceBackups().length, 0);
-		assert.equal(service.getEmptyWindowBackupPaths().length, 1);
+		assert.strictEqual(service.getWorkspaceBackups().length, 0);
+		assert.strictEqual(service.getEmptyWindowBackupPaths().length, 1);
 	});
 
 	test('service supports to migrate backup data from another location', () => {
@@ -237,7 +237,7 @@ suite('BackupMainService', () => {
 		assert.ok(!fs.existsSync(backupPathToMigrate));
 
 		const emptyBackups = service.getEmptyWindowBackupPaths();
-		assert.equal(0, emptyBackups.length);
+		assert.strictEqual(0, emptyBackups.length);
 	});
 
 	test('service backup migration makes sure to preserve existing backups', () => {
@@ -258,8 +258,8 @@ suite('BackupMainService', () => {
 		assert.ok(!fs.existsSync(backupPathToMigrate));
 
 		const emptyBackups = service.getEmptyWindowBackupPaths();
-		assert.equal(1, emptyBackups.length);
-		assert.equal(1, fs.readdirSync(path.join(backupHome, emptyBackups[0].backupFolder!)).length);
+		assert.strictEqual(1, emptyBackups.length);
+		assert.strictEqual(1, fs.readdirSync(path.join(backupHome, emptyBackups[0].backupFolder!)).length);
 	});
 
 	suite('loadSync', () => {
@@ -315,121 +315,120 @@ suite('BackupMainService', () => {
 		});
 
 		test('getWorkspaceBackups() should return [] when workspaces.json doesn\'t exist', () => {
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when workspaces.json is not properly formed JSON', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{]');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, 'foo');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when folderWorkspaces in workspaces.json is absent', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '{}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when rootWorkspaces in workspaces.json is not a object array', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":{}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":{"foo": ["bar"]}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":{"foo": []}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":{"foo": "bar"}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":"foo"}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootWorkspaces":1}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when rootURIWorkspaces in workspaces.json is not a object array', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":{}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":{"foo": ["bar"]}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":{"foo": []}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":{"foo": "bar"}}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":"foo"}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"rootURIWorkspaces":1}');
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getWorkspaceBackups() should return [] when files.hotExit = "onExitAndWindowClose"', async () => {
 			const upperFooPath = fooFile.fsPath.toUpperCase();
 			service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(upperFooPath));
-			assert.equal(service.getWorkspaceBackups().length, 1);
+			assert.strictEqual(service.getWorkspaceBackups().length, 1);
 			assertEqualUris(service.getWorkspaceBackups().map(r => r.workspace.configPath), [URI.file(upperFooPath)]);
 			configService.setUserConfiguration('files.hotExit', HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE);
 			await service.initialize();
-			assert.deepEqual(service.getWorkspaceBackups(), []);
+			assert.deepStrictEqual(service.getWorkspaceBackups(), []);
 		});
 
 		test('getEmptyWorkspaceBackupPaths() should return [] when workspaces.json doesn\'t exist', () => {
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 		});
 
 		test('getEmptyWorkspaceBackupPaths() should return [] when workspaces.json is not properly formed JSON', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{]');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, 'foo');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 		});
 
 		test('getEmptyWorkspaceBackupPaths() should return [] when folderWorkspaces in workspaces.json is absent', async () => {
 			fs.writeFileSync(backupWorkspacesPath, '{}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 		});
 
 		test('getEmptyWorkspaceBackupPaths() should return [] when folderWorkspaces in workspaces.json is not a string array', async function () {
-			this.timeout(5000);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":{}}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":{"foo": ["bar"]}}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":{"foo": []}}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":{"foo": "bar"}}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":"foo"}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 			fs.writeFileSync(backupWorkspacesPath, '{"emptyWorkspaces":1}');
 			await service.initialize();
-			assert.deepEqual(service.getEmptyWindowBackupPaths(), []);
+			assert.deepStrictEqual(service.getEmptyWindowBackupPaths(), []);
 		});
 	});
 
@@ -448,7 +447,7 @@ suite('BackupMainService', () => {
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-			assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
+			assert.deepStrictEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
 		});
 
 		test('should ignore duplicates on Windows and Mac (folder workspace)', async () => {
@@ -464,14 +463,13 @@ suite('BackupMainService', () => {
 			await service.initialize();
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-			assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
+			assert.deepStrictEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
 		});
 
 		test('should ignore duplicates on Windows and Mac (root workspace)', async () => {
-
-			const workspacePath = path.join(parentDir, 'Foo.code-workspace');
-			const workspacePath1 = path.join(parentDir, 'FOO.code-workspace');
-			const workspacePath2 = path.join(parentDir, 'foo.code-workspace');
+			const workspacePath = path.join(testDir, 'Foo.code-workspace');
+			const workspacePath1 = path.join(testDir, 'FOO.code-workspace');
+			const workspacePath2 = path.join(testDir, 'foo.code-workspace');
 
 			const workspace1 = await ensureWorkspaceExists(toWorkspace(workspacePath));
 			const workspace2 = await ensureWorkspaceExists(toWorkspace(workspacePath1));
@@ -487,11 +485,11 @@ suite('BackupMainService', () => {
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-			assert.equal(json.rootURIWorkspaces.length, platform.isLinux ? 3 : 1);
+			assert.strictEqual(json.rootURIWorkspaces.length, platform.isLinux ? 3 : 1);
 			if (platform.isLinux) {
-				assert.deepEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [URI.file(workspacePath).toString(), URI.file(workspacePath1).toString(), URI.file(workspacePath2).toString()]);
+				assert.deepStrictEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [URI.file(workspacePath).toString(), URI.file(workspacePath1).toString(), URI.file(workspacePath2).toString()]);
 			} else {
-				assert.deepEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [URI.file(workspacePath).toString()], 'should return the first duplicated entry');
+				assert.deepStrictEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [URI.file(workspacePath).toString()], 'should return the first duplicated entry');
 			}
 		});
 	});
@@ -503,7 +501,7 @@ suite('BackupMainService', () => {
 			assertEqualUris(service.getFolderBackupPaths(), [fooFile, barFile]);
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-			assert.deepEqual(json.folderURIWorkspaces, [fooFile.toString(), barFile.toString()]);
+			assert.deepStrictEqual(json.folderURIWorkspaces, [fooFile.toString(), barFile.toString()]);
 		});
 
 		test('should persist paths to workspaces.json (root workspace)', async () => {
@@ -513,15 +511,15 @@ suite('BackupMainService', () => {
 			service.registerWorkspaceBackupSync(ws2);
 
 			assertEqualUris(service.getWorkspaceBackups().map(b => b.workspace.configPath), [fooFile, barFile]);
-			assert.equal(ws1.workspace.id, service.getWorkspaceBackups()[0].workspace.id);
-			assert.equal(ws2.workspace.id, service.getWorkspaceBackups()[1].workspace.id);
+			assert.strictEqual(ws1.workspace.id, service.getWorkspaceBackups()[0].workspace.id);
+			assert.strictEqual(ws2.workspace.id, service.getWorkspaceBackups()[1].workspace.id);
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
 
-			assert.deepEqual(json.rootURIWorkspaces.map(b => b.configURIPath), [fooFile.toString(), barFile.toString()]);
-			assert.equal(ws1.workspace.id, json.rootURIWorkspaces[0].id);
-			assert.equal(ws2.workspace.id, json.rootURIWorkspaces[1].id);
+			assert.deepStrictEqual(json.rootURIWorkspaces.map(b => b.configURIPath), [fooFile.toString(), barFile.toString()]);
+			assert.strictEqual(ws1.workspace.id, json.rootURIWorkspaces[0].id);
+			assert.strictEqual(ws2.workspace.id, json.rootURIWorkspaces[1].id);
 		});
 	});
 
@@ -531,7 +529,7 @@ suite('BackupMainService', () => {
 
 		const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 		const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
-		assert.deepEqual(json.folderURIWorkspaces, [URI.file(fooFile.fsPath.toUpperCase()).toString()]);
+		assert.deepStrictEqual(json.folderURIWorkspaces, [URI.file(fooFile.fsPath.toUpperCase()).toString()]);
 	});
 
 	test('should always store the workspace path in workspaces.json using the case given, regardless of whether the file system is case-sensitive (root workspace)', async () => {
@@ -541,7 +539,7 @@ suite('BackupMainService', () => {
 
 		const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 		const json = (<IBackupWorkspacesFormat>JSON.parse(buffer));
-		assert.deepEqual(json.rootURIWorkspaces.map(b => b.configURIPath), [URI.file(upperFooPath).toString()]);
+		assert.deepStrictEqual(json.rootURIWorkspaces.map(b => b.configURIPath), [URI.file(upperFooPath).toString()]);
 	});
 
 	suite('removeBackupPathSync', () => {
@@ -552,12 +550,12 @@ suite('BackupMainService', () => {
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = (<IBackupWorkspacesFormat>JSON.parse(buffer));
-			assert.deepEqual(json.folderURIWorkspaces, [barFile.toString()]);
+			assert.deepStrictEqual(json.folderURIWorkspaces, [barFile.toString()]);
 			service.unregisterFolderBackupSync(barFile);
 
 			const content = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json2 = (<IBackupWorkspacesFormat>JSON.parse(content));
-			assert.deepEqual(json2.folderURIWorkspaces, []);
+			assert.deepStrictEqual(json2.folderURIWorkspaces, []);
 		});
 
 		test('should remove folder workspaces from workspaces.json (root workspace)', async () => {
@@ -569,12 +567,12 @@ suite('BackupMainService', () => {
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = (<IBackupWorkspacesFormat>JSON.parse(buffer));
-			assert.deepEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [barFile.toString()]);
+			assert.deepStrictEqual(json.rootURIWorkspaces.map(r => r.configURIPath), [barFile.toString()]);
 			service.unregisterWorkspaceBackupSync(ws2.workspace);
 
 			const content = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json2 = (<IBackupWorkspacesFormat>JSON.parse(content));
-			assert.deepEqual(json2.rootURIWorkspaces, []);
+			assert.deepStrictEqual(json2.rootURIWorkspaces, []);
 		});
 
 		test('should remove empty workspaces from workspaces.json', async () => {
@@ -584,12 +582,12 @@ suite('BackupMainService', () => {
 
 			const buffer = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = (<IBackupWorkspacesFormat>JSON.parse(buffer));
-			assert.deepEqual(json.emptyWorkspaceInfos, [{ backupFolder: 'bar' }]);
+			assert.deepStrictEqual(json.emptyWorkspaceInfos, [{ backupFolder: 'bar' }]);
 			service.unregisterEmptyWindowBackupSync('bar');
 
 			const content = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json2 = (<IBackupWorkspacesFormat>JSON.parse(content));
-			assert.deepEqual(json2.emptyWorkspaceInfos, []);
+			assert.deepStrictEqual(json2.emptyWorkspaceInfos, []);
 		});
 
 		test('should fail gracefully when removing a path that doesn\'t exist', async () => {
@@ -603,24 +601,18 @@ suite('BackupMainService', () => {
 			service.unregisterEmptyWindowBackupSync('test');
 			const content = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = (<IBackupWorkspacesFormat>JSON.parse(content));
-			assert.deepEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
+			assert.deepStrictEqual(json.folderURIWorkspaces, [existingTestFolder1.toString()]);
 		});
 	});
 
 	suite('getWorkspaceHash', () => {
-
-		test('should ignore case on Windows and Mac', () => {
-			// Skip test on Linux
-			if (platform.isLinux) {
-				return;
-			}
-
+		(platform.isLinux ? test.skip : test)('should ignore case on Windows and Mac', () => {
 			if (platform.isMacintosh) {
-				assert.equal(service.getFolderHash(URI.file('/foo')), service.getFolderHash(URI.file('/FOO')));
+				assert.strictEqual(service.getFolderHash(URI.file('/foo')), service.getFolderHash(URI.file('/FOO')));
 			}
 
 			if (platform.isWindows) {
-				assert.equal(service.getFolderHash(URI.file('c:\\foo')), service.getFolderHash(URI.file('C:\\FOO')));
+				assert.strictEqual(service.getFolderHash(URI.file('c:\\foo')), service.getFolderHash(URI.file('C:\\FOO')));
 			}
 		});
 	});
@@ -631,9 +623,9 @@ suite('BackupMainService', () => {
 			service.registerFolderBackupSync(URI.file(fooFile.fsPath.toUpperCase()));
 
 			if (platform.isLinux) {
-				assert.equal(service.getFolderBackupPaths().length, 2);
+				assert.strictEqual(service.getFolderBackupPaths().length, 2);
 			} else {
-				assert.equal(service.getFolderBackupPaths().length, 1);
+				assert.strictEqual(service.getFolderBackupPaths().length, 1);
 			}
 		});
 
@@ -642,9 +634,9 @@ suite('BackupMainService', () => {
 			service.registerWorkspaceBackupSync(toWorkspaceBackupInfo(fooFile.fsPath.toUpperCase()));
 
 			if (platform.isLinux) {
-				assert.equal(service.getWorkspaceBackups().length, 2);
+				assert.strictEqual(service.getWorkspaceBackups().length, 2);
 			} else {
-				assert.equal(service.getWorkspaceBackups().length, 1);
+				assert.strictEqual(service.getWorkspaceBackups().length, 1);
 			}
 		});
 
@@ -653,16 +645,16 @@ suite('BackupMainService', () => {
 			// same case
 			service.registerFolderBackupSync(fooFile);
 			service.unregisterFolderBackupSync(fooFile);
-			assert.equal(service.getFolderBackupPaths().length, 0);
+			assert.strictEqual(service.getFolderBackupPaths().length, 0);
 
 			// mixed case
 			service.registerFolderBackupSync(fooFile);
 			service.unregisterFolderBackupSync(URI.file(fooFile.fsPath.toUpperCase()));
 
 			if (platform.isLinux) {
-				assert.equal(service.getFolderBackupPaths().length, 1);
+				assert.strictEqual(service.getFolderBackupPaths().length, 1);
 			} else {
-				assert.equal(service.getFolderBackupPaths().length, 0);
+				assert.strictEqual(service.getFolderBackupPaths().length, 0);
 			}
 		});
 	});
@@ -674,7 +666,7 @@ suite('BackupMainService', () => {
 			const backupWorkspaceInfo = toWorkspaceBackupInfo(fooFile.fsPath);
 			const workspaceBackupPath = service.registerWorkspaceBackupSync(backupWorkspaceInfo);
 
-			assert.equal(((await service.getDirtyWorkspaces()).length), 0);
+			assert.strictEqual(((await service.getDirtyWorkspaces()).length), 0);
 
 			try {
 				await pfs.mkdirp(path.join(folderBackupPath, Schemas.file));
@@ -683,13 +675,13 @@ suite('BackupMainService', () => {
 				// ignore - folder might exist already
 			}
 
-			assert.equal(((await service.getDirtyWorkspaces()).length), 0);
+			assert.strictEqual(((await service.getDirtyWorkspaces()).length), 0);
 
 			fs.writeFileSync(path.join(folderBackupPath, Schemas.file, '594a4a9d82a277a899d4713a5b08f504'), '');
 			fs.writeFileSync(path.join(workspaceBackupPath, Schemas.untitled, '594a4a9d82a277a899d4713a5b08f504'), '');
 
 			const dirtyWorkspaces = await service.getDirtyWorkspaces();
-			assert.equal(dirtyWorkspaces.length, 2);
+			assert.strictEqual(dirtyWorkspaces.length, 2);
 
 			let found = 0;
 			for (const dirtyWorkpspace of dirtyWorkspaces) {
@@ -704,7 +696,7 @@ suite('BackupMainService', () => {
 				}
 			}
 
-			assert.equal(found, 2);
+			assert.strictEqual(found, 2);
 		});
 	});
 });
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index 5af10fc31..c6928a8ac 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -16,7 +16,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IFileService } from 'vs/platform/files/common/files';
-import { dirname } from 'vs/base/common/resources';
+import { IExtUri } from 'vs/base/common/resources';
 
 export class ConfigurationModel implements IConfigurationModel {
 
@@ -348,11 +348,12 @@ export class UserSettings extends Disposable {
 	constructor(
 		private readonly userSettingsResource: URI,
 		private readonly scopes: ConfigurationScope[] | undefined,
+		extUri: IExtUri,
 		private readonly fileService: IFileService
 	) {
 		super();
 		this.parser = new ConfigurationModelParser(this.userSettingsResource.toString(), this.scopes);
-		this._register(this.fileService.watch(dirname(this.userSettingsResource)));
+		this._register(this.fileService.watch(extUri.dirname(this.userSettingsResource)));
 		this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.userSettingsResource))(() => this._onDidChange.fire()));
 	}
 
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 07680c0f2..7504cb721 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -112,6 +112,13 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
 	scope?: ConfigurationScope;
 	included?: boolean;
 	tags?: string[];
+	/**
+	 * When enabled this setting is ignored during sync and user can override this.
+	 */
+	ignoreSync?: boolean;
+	/**
+	 * When enabled this setting is ignored during sync and user cannot override this.
+	 */
 	disallowSyncIgnore?: boolean;
 	enumItemLabels?: string[];
 }
diff --git a/src/vs/platform/configuration/common/configurationService.ts b/src/vs/platform/configuration/common/configurationService.ts
index 2e8b85b1f..3fd1df3f5 100644
--- a/src/vs/platform/configuration/common/configurationService.ts
+++ b/src/vs/platform/configuration/common/configurationService.ts
@@ -12,6 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
 import { IFileService } from 'vs/platform/files/common/files';
 import { RunOnceScheduler } from 'vs/base/common/async';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 
 export class ConfigurationService extends Disposable implements IConfigurationService, IDisposable {
 
@@ -29,7 +30,7 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
 		fileService: IFileService
 	) {
 		super();
-		this.userConfiguration = this._register(new UserSettings(this.settingsResource, undefined, fileService));
+		this.userConfiguration = this._register(new UserSettings(this.settingsResource, undefined, extUriBiasedIgnorePathCase, fileService));
 		this.configuration = new Configuration(new DefaultConfigurationModel(), new ConfigurationModel());
 
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.reloadConfiguration(), 50));
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index 21320c0d6..df2e5b70d 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
+import { Emitter, PauseableEmitter } from 'vs/base/common/event';
 import { Iterable } from 'vs/base/common/iterator';
-import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { distinct } from 'vs/base/common/objects';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -244,12 +244,14 @@ class CompositeContextKeyChangeEvent implements IContextKeyChangeEvent {
 }
 
 export abstract class AbstractContextKeyService implements IContextKeyService {
-	public _serviceBrand: undefined;
+	declare _serviceBrand: undefined;
 
 	protected _isDisposed: boolean;
-	protected _onDidChangeContext = new PauseableEmitter<IContextKeyChangeEvent>({ merge: input => new CompositeContextKeyChangeEvent(input) });
 	protected _myContextId: number;
 
+	protected _onDidChangeContext = new PauseableEmitter<IContextKeyChangeEvent>({ merge: input => new CompositeContextKeyChangeEvent(input) });
+	readonly onDidChangeContext = this._onDidChangeContext.event;
+
 	constructor(myContextId: number) {
 		this._isDisposed = false;
 		this._myContextId = myContextId;
@@ -268,9 +270,6 @@ export abstract class AbstractContextKeyService implements IContextKeyService {
 		return new ContextKey(this, key, defaultValue);
 	}
 
-	public get onDidChangeContext(): Event<IContextKeyChangeEvent> {
-		return this._onDidChangeContext.event;
-	}
 
 	bufferChangeEvents(callback: Function): void {
 		this._onDidChangeContext.pause();
@@ -371,6 +370,7 @@ export class ContextKeyService extends AbstractContextKeyService implements ICon
 	}
 
 	public dispose(): void {
+		this._onDidChangeContext.dispose();
 		this._isDisposed = true;
 		this._toDispose.dispose();
 	}
@@ -407,34 +407,34 @@ class ScopedContextKeyService extends AbstractContextKeyService {
 	private _parent: AbstractContextKeyService;
 	private _domNode: IContextKeyServiceTarget | undefined;
 
-	private _parentChangeListener: IDisposable | undefined;
+	private readonly _parentChangeListener = new MutableDisposable();
 
 	constructor(parent: AbstractContextKeyService, domNode?: IContextKeyServiceTarget) {
 		super(parent.createChildContext());
 		this._parent = parent;
-		this.updateParentChangeListener();
+		this._updateParentChangeListener();
 
 		if (domNode) {
 			this._domNode = domNode;
 			if (this._domNode.hasAttribute(KEYBINDING_CONTEXT_ATTR)) {
-				console.error('Element already has context attribute');
+				let extraInfo = '';
+				if ((this._domNode as HTMLElement).classList) {
+					extraInfo = Array.from((this._domNode as HTMLElement).classList.values()).join(', ');
+				}
+
+				console.error(`Element already has context attribute${extraInfo ? ': ' + extraInfo : ''}`);
 			}
 			this._domNode.setAttribute(KEYBINDING_CONTEXT_ATTR, String(this._myContextId));
 		}
 	}
 
-	private updateParentChangeListener(): void {
-		if (this._parentChangeListener) {
-			this._parentChangeListener.dispose();
-		}
-
-		this._parentChangeListener = this._parent.onDidChangeContext(e => {
-			// Forward parent events to this listener. Parent will change.
-			this._onDidChangeContext.fire(e);
-		});
+	private _updateParentChangeListener(): void {
+		// Forward parent events to this listener. Parent will change.
+		this._parentChangeListener.value = this._parent.onDidChangeContext(this._onDidChangeContext.fire, this._onDidChangeContext);
 	}
 
 	public dispose(): void {
+		this._onDidChangeContext.dispose();
 		this._isDisposed = true;
 		this._parent.disposeContext(this._myContextId);
 		this._parentChangeListener?.dispose();
@@ -444,10 +444,6 @@ class ScopedContextKeyService extends AbstractContextKeyService {
 		}
 	}
 
-	public get onDidChangeContext(): Event<IContextKeyChangeEvent> {
-		return this._onDidChangeContext.event;
-	}
-
 	public getContextValuesContainer(contextId: number): Context {
 		if (this._isDisposed) {
 			return NullContext.INSTANCE;
@@ -473,7 +469,7 @@ class ScopedContextKeyService extends AbstractContextKeyService {
 		const thisContainer = this._parent.getContextValuesContainer(this._myContextId);
 		const oldAllValues = thisContainer.collectAllValues();
 		this._parent = parentContextKeyService;
-		this.updateParentChangeListener();
+		this._updateParentChangeListener();
 		const newParentContainer = this._parent.getContextValuesContainer(this._parent.contextId);
 		thisContainer.updateParent(newParentContainer);
 
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index ea7c83876..fde5606ea 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -1278,11 +1278,11 @@ export class RawContextKey<T> extends ContextKeyDefinedExpr {
 		return ContextKeyExpr.not(this.key);
 	}
 
-	public isEqualTo(value: string): ContextKeyExpression {
+	public isEqualTo(value: any): ContextKeyExpression {
 		return ContextKeyExpr.equals(this.key, value);
 	}
 
-	public notEqualsTo(value: string): ContextKeyExpression {
+	public notEqualsTo(value: any): ContextKeyExpression {
 		return ContextKeyExpr.notEquals(this.key, value);
 	}
 }
diff --git a/src/vs/platform/contextkey/test/browser/contextkey.test.ts b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
index d436b6cdf..aca26b1dd 100644
--- a/src/vs/platform/contextkey/test/browser/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
@@ -34,10 +34,10 @@ suite('ContextKeyService', () => {
 				assert.ok(e.affectsSome(new Set(['testC'])), 'testC changed');
 				assert.ok(!e.affectsSome(new Set(['testD'])), 'testD did not change');
 
-				assert.equal(child.getContextKeyValue('testA'), 3);
-				assert.equal(child.getContextKeyValue('testB'), undefined);
-				assert.equal(child.getContextKeyValue('testC'), 4);
-				assert.equal(child.getContextKeyValue('testD'), 0);
+				assert.strictEqual(child.getContextKeyValue('testA'), 3);
+				assert.strictEqual(child.getContextKeyValue('testB'), undefined);
+				assert.strictEqual(child.getContextKeyValue('testC'), 4);
+				assert.strictEqual(child.getContextKeyValue('testD'), 0);
 			} catch (err) {
 				reject(err);
 				return;
diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts
index 91a548be6..1abe1a076 100644
--- a/src/vs/platform/contextkey/test/common/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/common/contextkey.test.ts
@@ -67,7 +67,7 @@ suite('ContextKeyExpr', () => {
 		function testExpression(expr: string, expected: boolean): void {
 			// console.log(expr + ' ' + expected);
 			let rules = ContextKeyExpr.deserialize(expr);
-			assert.equal(rules!.evaluate(context), expected, expr);
+			assert.strictEqual(rules!.evaluate(context), expected, expr);
 		}
 		function testBatch(expr: string, value: any): void {
 			/* eslint-disable eqeqeq */
@@ -153,17 +153,17 @@ suite('ContextKeyExpr', () => {
 
 	test('ContextKeyInExpr', () => {
 		const ainb = ContextKeyExpr.deserialize('a in b')!;
-		assert.equal(ainb.evaluate(createContext({ 'a': 3, 'b': [3, 2, 1] })), true);
-		assert.equal(ainb.evaluate(createContext({ 'a': 3, 'b': [1, 2, 3] })), true);
-		assert.equal(ainb.evaluate(createContext({ 'a': 3, 'b': [1, 2] })), false);
-		assert.equal(ainb.evaluate(createContext({ 'a': 3 })), false);
-		assert.equal(ainb.evaluate(createContext({ 'a': 3, 'b': null })), false);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': ['x'] })), true);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': ['y'] })), false);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': {} })), false);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': false } })), true);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': true } })), true);
-		assert.equal(ainb.evaluate(createContext({ 'a': 'prototype', 'b': {} })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 3, 'b': [3, 2, 1] })), true);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 3, 'b': [1, 2, 3] })), true);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 3, 'b': [1, 2] })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 3 })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 3, 'b': null })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'x', 'b': ['x'] })), true);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'x', 'b': ['y'] })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'x', 'b': {} })), false);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': false } })), true);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': true } })), true);
+		assert.strictEqual(ainb.evaluate(createContext({ 'a': 'prototype', 'b': {} })), false);
 	});
 
 	test('issue #106524: distributing AND should normalize', () => {
@@ -184,13 +184,13 @@ suite('ContextKeyExpr', () => {
 				ContextKeyExpr.has('c')
 			)
 		);
-		assert.equal(actual!.equals(expected!), true);
+		assert.strictEqual(actual!.equals(expected!), true);
 	});
 
 	test('Greater, GreaterEquals, Smaller, SmallerEquals evaluate', () => {
 		function checkEvaluate(expr: string, ctx: any, expected: any): void {
 			const _expr = ContextKeyExpr.deserialize(expr)!;
-			assert.equal(_expr.evaluate(createContext(ctx)), expected);
+			assert.strictEqual(_expr.evaluate(createContext(ctx)), expected);
 		}
 
 		checkEvaluate('a>1', {}, false);
@@ -236,7 +236,7 @@ suite('ContextKeyExpr', () => {
 		function checkNegate(expr: string, expected: string): void {
 			const a = ContextKeyExpr.deserialize(expr)!;
 			const b = a.negate();
-			assert.equal(b.serialize(), expected);
+			assert.strictEqual(b.serialize(), expected);
 		}
 
 		checkNegate('a>1', 'a <= 1');
diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts
index 1788290cc..0b515dc51 100644
--- a/src/vs/platform/contextview/browser/contextMenuHandler.ts
+++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts
@@ -158,7 +158,7 @@ export class ContextMenuHandler {
 	}
 
 	private onDidActionRun(e: IRunEvent): void {
-		if (e.error && this.notificationService) {
+		if (e.error) {
 			this.notificationService.error(e.error);
 		}
 	}
diff --git a/src/vs/platform/debug/common/extensionHostDebug.ts b/src/vs/platform/debug/common/extensionHostDebug.ts
index b263bdd9c..b30c4e44e 100644
--- a/src/vs/platform/debug/common/extensionHostDebug.ts
+++ b/src/vs/platform/debug/common/extensionHostDebug.ts
@@ -5,7 +5,6 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
-import { IRemoteConsoleLog } from 'vs/base/common/console';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 
 export const IExtensionHostDebugService = createDecorator<IExtensionHostDebugService>('extensionHostDebugService');
@@ -16,11 +15,6 @@ export interface IAttachSessionEvent {
 	port: number;
 }
 
-export interface ILogToSessionEvent {
-	sessionId: string;
-	log: IRemoteConsoleLog;
-}
-
 export interface ITerminateSessionEvent {
 	sessionId: string;
 	subId?: string;
@@ -50,9 +44,6 @@ export interface IExtensionHostDebugService {
 	attachSession(sessionId: string, port: number, subId?: string): void;
 	readonly onAttachSession: Event<IAttachSessionEvent>;
 
-	logToSession(sessionId: string, log: IRemoteConsoleLog): void;
-	readonly onLogToSession: Event<ILogToSessionEvent>;
-
 	terminateSession(sessionId: string, subId?: string): void;
 	readonly onTerminateSession: Event<ITerminateSessionEvent>;
 
diff --git a/src/vs/platform/debug/common/extensionHostDebugIpc.ts b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
index 60011be13..09c2a1916 100644
--- a/src/vs/platform/debug/common/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/common/extensionHostDebugIpc.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IServerChannel, IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IReloadSessionEvent, ICloseSessionEvent, IAttachSessionEvent, ILogToSessionEvent, ITerminateSessionEvent, IExtensionHostDebugService, IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
+import { IReloadSessionEvent, ICloseSessionEvent, IAttachSessionEvent, ITerminateSessionEvent, IExtensionHostDebugService, IOpenExtensionWindowResult } from 'vs/platform/debug/common/extensionHostDebug';
 import { Event, Emitter } from 'vs/base/common/event';
-import { IRemoteConsoleLog } from 'vs/base/common/console';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 
@@ -17,7 +16,6 @@ export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChan
 	private readonly _onCloseEmitter = new Emitter<ICloseSessionEvent>();
 	private readonly _onReloadEmitter = new Emitter<IReloadSessionEvent>();
 	private readonly _onTerminateEmitter = new Emitter<ITerminateSessionEvent>();
-	private readonly _onLogToEmitter = new Emitter<ILogToSessionEvent>();
 	private readonly _onAttachEmitter = new Emitter<IAttachSessionEvent>();
 
 	call(ctx: TContext, command: string, arg?: any): Promise<any> {
@@ -28,8 +26,6 @@ export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChan
 				return Promise.resolve(this._onReloadEmitter.fire({ sessionId: arg[0] }));
 			case 'terminate':
 				return Promise.resolve(this._onTerminateEmitter.fire({ sessionId: arg[0] }));
-			case 'log':
-				return Promise.resolve(this._onLogToEmitter.fire({ sessionId: arg[0], log: arg[1] }));
 			case 'attach':
 				return Promise.resolve(this._onAttachEmitter.fire({ sessionId: arg[0], port: arg[1], subId: arg[2] }));
 		}
@@ -44,8 +40,6 @@ export class ExtensionHostDebugBroadcastChannel<TContext> implements IServerChan
 				return this._onReloadEmitter.event;
 			case 'terminate':
 				return this._onTerminateEmitter.event;
-			case 'log':
-				return this._onLogToEmitter.event;
 			case 'attach':
 				return this._onAttachEmitter.event;
 		}
@@ -85,14 +79,6 @@ export class ExtensionHostDebugChannelClient extends Disposable implements IExte
 		return this.channel.listen('attach');
 	}
 
-	logToSession(sessionId: string, log: IRemoteConsoleLog): void {
-		this.channel.call('log', [sessionId, log]);
-	}
-
-	get onLogToSession(): Event<ILogToSessionEvent> {
-		return this.channel.listen('log');
-	}
-
 	terminateSession(sessionId: string, subId?: string): void {
 		this.channel.call('terminate', [sessionId, subId]);
 	}
diff --git a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
index d05bd7ca0..f0ac255cb 100644
--- a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
@@ -8,8 +8,7 @@ import { IProcessEnvironment } from 'vs/base/common/platform';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { createServer, AddressInfo } from 'net';
 import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { OpenContext } from 'vs/platform/windows/node/window';
+import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
 
 export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends ExtensionHostDebugBroadcastChannel<TContext> {
 
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index 2fe576f1b..2f2711440 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -314,10 +314,10 @@ export class DiagnosticsService implements IDiagnosticsService {
 
 		if (isLinux) {
 			systemInfo.linuxEnv = {
-				desktopSession: process.env.DESKTOP_SESSION,
-				xdgSessionDesktop: process.env.XDG_SESSION_DESKTOP,
-				xdgCurrentDesktop: process.env.XDG_CURRENT_DESKTOP,
-				xdgSessionType: process.env.XDG_SESSION_TYPE
+				desktopSession: process.env['DESKTOP_SESSION'],
+				xdgSessionDesktop: process.env['XDG_SESSION_DESKTOP'],
+				xdgCurrentDesktop: process.env['XDG_CURRENT_DESKTOP'],
+				xdgSessionType: process.env['XDG_SESSION_TYPE']
 			};
 		}
 
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index 8f7bb194d..25e49ef1c 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -181,6 +181,7 @@ export interface IDialogOptions {
 	cancelId?: number;
 	detail?: string;
 	checkbox?: ICheckbox;
+	useCustom?: boolean;
 }
 
 export interface IInput {
diff --git a/src/vs/platform/dialogs/electron-main/dialogs.ts b/src/vs/platform/dialogs/electron-main/dialogMainService.ts
similarity index 100%
rename from src/vs/platform/dialogs/electron-main/dialogs.ts
rename to src/vs/platform/dialogs/electron-main/dialogMainService.ts
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index e719e129c..019410e6a 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -28,6 +28,7 @@ export interface NativeParsedArgs {
 	'prof-startup'?: boolean;
 	'prof-startup-prefix'?: string;
 	'prof-append-timers'?: string;
+	'prof-v8-extensions'?: boolean;
 	verbose?: boolean;
 	trace?: boolean;
 	'trace-category-filter'?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 7263bcbf7..7b6a60b57 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -53,8 +53,8 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'extensions-download-dir': { type: 'string' },
 	'builtin-extensions-dir': { type: 'string' },
 	'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
-	'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extension.") },
-	'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extension.") },
+	'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extensions.") },
+	'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extensions.") },
 	'install-extension': { type: 'string[]', cat: 'e', args: 'extension-id[@version] | path-to-vsix', description: localize('installExtension', "Installs or updates the extension. The identifier of an extension is always `${publisher}.${name}`. Use `--force` argument to update to latest version. To install a specific version provide `@${version}`. For example: 'vscode.csharp@1.2.3'.") },
 	'uninstall-extension': { type: 'string[]', cat: 'e', args: 'extension-id', description: localize('uninstallExtension', "Uninstalls an extension.") },
 	'enable-proposed-api': { type: 'string[]', cat: 'e', args: 'extension-id', description: localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.") },
@@ -66,6 +66,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'prof-startup': { type: 'boolean', cat: 't', description: localize('prof-startup', "Run CPU profiler during startup") },
 	'prof-append-timers': { type: 'string' },
 	'prof-startup-prefix': { type: 'string' },
+	'prof-v8-extensions': { type: 'boolean' },
 	'disable-extensions': { type: 'boolean', deprecates: 'disableExtensions', cat: 't', description: localize('disableExtensions', "Disable all installed extensions.") },
 	'disable-extension': { type: 'string[]', cat: 't', args: 'extension-id', description: localize('disableExtension', "Disable an extension.") },
 	'sync': { type: 'string', cat: 't', description: localize('turn sync', "Turn sync on or off"), args: ['on', 'off'] },
@@ -149,10 +150,6 @@ export function parseArgs<T>(args: string[], options: OptionDescriptions<T>, err
 	const string: string[] = [];
 	const boolean: string[] = [];
 	for (let optionId in options) {
-		if (optionId[0] === '_') {
-			continue;
-		}
-
 		const o = options[optionId];
 		if (o.alias) {
 			alias[optionId] = o.alias;
diff --git a/src/vs/platform/environment/test/node/environmentService.test.ts b/src/vs/platform/environment/test/node/environmentService.test.ts
index d30dc8a68..ca33c2260 100644
--- a/src/vs/platform/environment/test/node/environmentService.test.ts
+++ b/src/vs/platform/environment/test/node/environmentService.test.ts
@@ -13,35 +13,35 @@ suite('EnvironmentService', () => {
 	test('parseExtensionHostPort when built', () => {
 		const parse = (a: string[]) => parseExtensionHostPort(parseArgs(a, OPTIONS), true);
 
-		assert.deepEqual(parse([]), { port: null, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost']), { port: null, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost=1234']), { port: 1234, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugBrkPluginHost']), { port: null, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
+		assert.deepStrictEqual(parse([]), { port: null, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost']), { port: null, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost=1234']), { port: 1234, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugBrkPluginHost']), { port: null, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
 
-		assert.deepEqual(parse(['--inspect-extensions']), { port: null, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-extensions=1234']), { port: 1234, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-brk-extensions']), { port: null, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-brk-extensions=5678']), { port: 5678, break: true, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-extensions=1234', '--inspect-brk-extensions=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
+		assert.deepStrictEqual(parse(['--inspect-extensions']), { port: null, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-extensions=1234']), { port: 1234, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-brk-extensions']), { port: null, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-brk-extensions=5678']), { port: 5678, break: true, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-extensions=1234', '--inspect-brk-extensions=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
 	});
 
 	test('parseExtensionHostPort when unbuilt', () => {
 		const parse = (a: string[]) => parseExtensionHostPort(parseArgs(a, OPTIONS), false);
 
-		assert.deepEqual(parse([]), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost']), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost=1234']), { port: 1234, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugBrkPluginHost']), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true, debugId: undefined });
-		assert.deepEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
+		assert.deepStrictEqual(parse([]), { port: 5870, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost']), { port: 5870, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost=1234']), { port: 1234, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugBrkPluginHost']), { port: 5870, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugBrkPluginHost=5678']), { port: 5678, break: true, debugId: undefined });
+		assert.deepStrictEqual(parse(['--debugPluginHost=1234', '--debugBrkPluginHost=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
 
-		assert.deepEqual(parse(['--inspect-extensions']), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-extensions=1234']), { port: 1234, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-brk-extensions']), { port: 5870, break: false, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-brk-extensions=5678']), { port: 5678, break: true, debugId: undefined });
-		assert.deepEqual(parse(['--inspect-extensions=1234', '--inspect-brk-extensions=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
+		assert.deepStrictEqual(parse(['--inspect-extensions']), { port: 5870, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-extensions=1234']), { port: 1234, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-brk-extensions']), { port: 5870, break: false, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-brk-extensions=5678']), { port: 5678, break: true, debugId: undefined });
+		assert.deepStrictEqual(parse(['--inspect-extensions=1234', '--inspect-brk-extensions=5678', '--debugId=7']), { port: 5678, break: true, debugId: '7' });
 	});
 
 	test('userDataPath', () => {
@@ -57,10 +57,10 @@ suite('EnvironmentService', () => {
 	test('careful with boolean file names', function () {
 		let actual = parseArgs(['-r', 'arg.txt'], OPTIONS);
 		assert(actual['reuse-window']);
-		assert.deepEqual(actual._, ['arg.txt']);
+		assert.deepStrictEqual(actual._, ['arg.txt']);
 
 		actual = parseArgs(['-r', 'true.txt'], OPTIONS);
 		assert(actual['reuse-window']);
-		assert.deepEqual(actual._, ['true.txt']);
+		assert.deepStrictEqual(actual._, ['true.txt']);
 	});
 });
diff --git a/src/vs/platform/environment/test/node/nativeModules.test.ts b/src/vs/platform/environment/test/node/nativeModules.test.ts
index b64282f62..28013dfcd 100644
--- a/src/vs/platform/environment/test/node/nativeModules.test.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.test.ts
@@ -37,11 +37,6 @@ suite('Native Modules (all platforms)', () => {
 		assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('spdlog'));
 	});
 
-	test('v8-inspect-profiler', async () => {
-		const profiler = await import('v8-inspect-profiler');
-		assert.ok(typeof profiler.startProfiling === 'function', testErrorMessage('v8-inspect-profiler'));
-	});
-
 	test('vscode-nsfw', async () => {
 		const nsfWatcher = await import('vscode-nsfw');
 		assert.ok(typeof nsfWatcher === 'function', testErrorMessage('vscode-nsfw'));
@@ -90,7 +85,7 @@ suite('Native Modules (all platforms)', () => {
 	test('vscode-windows-ca-certs', async () => {
 		// @ts-ignore Windows only
 		const windowsCerts = await import('vscode-windows-ca-certs');
-		const store = windowsCerts();
+		const store = new windowsCerts.Crypt32();
 		assert.ok(windowsCerts, testErrorMessage('vscode-windows-ca-certs'));
 		let certCount = 0;
 		try {
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 3f0dd835c..45d3b68c4 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -9,7 +9,7 @@ import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGallery
 import { getOrDefault } from 'vs/base/common/objects';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IPager } from 'vs/base/common/paging';
-import { IRequestService, asJson, asText } from 'vs/platform/request/common/request';
+import { IRequestService, asJson, asText, isSuccess } from 'vs/platform/request/common/request';
 import { IRequestOptions, IRequestContext, IHeaders } from 'vs/base/parts/request/common/request';
 import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -147,6 +147,35 @@ const DefaultQueryState: IQueryState = {
 	assetTypes: []
 };
 
+type GalleryServiceQueryClassification = {
+	filterTypes: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	sortBy: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	sortOrder: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	duration: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', 'isMeasurement': true };
+	success: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	requestBodySize: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	responseBodySize?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	statusCode?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	errorCode?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	count?: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+};
+
+type QueryTelemetryData = {
+	filterTypes: string[];
+	sortBy: string;
+	sortOrder: string;
+};
+
+type GalleryServiceQueryEvent = QueryTelemetryData & {
+	duration: number;
+	success: boolean;
+	requestBodySize: string;
+	responseBodySize?: string;
+	statusCode?: string;
+	errorCode?: string;
+	count?: string;
+};
+
 class Query {
 
 	constructor(private state = DefaultQueryState) { }
@@ -196,6 +225,14 @@ class Query {
 		const criterium = this.state.criteria.filter(criterium => criterium.filterType === FilterType.SearchText)[0];
 		return criterium && criterium.value ? criterium.value : '';
 	}
+
+	get telemetryData(): QueryTelemetryData {
+		return {
+			filterTypes: this.state.criteria.map(criterium => String(criterium.filterType)),
+			sortBy: String(this.sortBy),
+			sortOrder: String(this.sortOrder)
+		};
+	}
 }
 
 function getStatistic(statistics: IRawGalleryExtensionStatistics[], name: string): number {
@@ -447,20 +484,9 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			throw new Error('No extension gallery service configured.');
 		}
 
-		const type = options.names ? 'ids' : (options.text ? 'text' : 'all');
 		let text = options.text || '';
 		const pageSize = getOrDefault(options, o => o.pageSize, 50);
 
-		type GalleryServiceQueryClassification = {
-			type: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-			text: { classification: 'CustomerContent', purpose: 'FeatureInsight' };
-		};
-		type GalleryServiceQueryEvent = {
-			type: string;
-			text: string;
-		};
-		this.telemetryService.publicLog2<GalleryServiceQueryEvent, GalleryServiceQueryClassification>('galleryService:query', { type, text });
-
 		let query = new Query()
 			.withFlags(Flags.IncludeLatestVersionOnly, Flags.IncludeAssetUri, Flags.IncludeStatistics, Flags.IncludeFiles, Flags.IncludeVersionProperties)
 			.withPage(1, pageSize)
@@ -543,27 +569,49 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			'Content-Length': String(data.length)
 		};
 
-		const context = await this.requestService.request({
-			type: 'POST',
-			url: this.api('/extensionquery'),
-			data,
-			headers
-		}, token);
+		const startTime = new Date().getTime();
+		let context: IRequestContext | undefined, error: any, total: number = 0;
 
-		if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
-			return { galleryExtensions: [], total: 0 };
+		try {
+			context = await this.requestService.request({
+				type: 'POST',
+				url: this.api('/extensionquery'),
+				data,
+				headers
+			}, token);
+
+			if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
+				return { galleryExtensions: [], total };
+			}
+
+			const result = await asJson<IRawGalleryQueryResult>(context);
+			if (result) {
+				const r = result.results[0];
+				const galleryExtensions = r.extensions;
+				const resultCount = r.resultMetadata && r.resultMetadata.filter(m => m.metadataType === 'ResultCount')[0];
+				total = resultCount && resultCount.metadataItems.filter(i => i.name === 'TotalCount')[0].count || 0;
+
+				return { galleryExtensions, total };
+			}
+			return { galleryExtensions: [], total };
+
+		} catch (e) {
+			error = e;
+			throw e;
+		} finally {
+			this.telemetryService.publicLog2<GalleryServiceQueryEvent, GalleryServiceQueryClassification>('galleryService:query', {
+				...query.telemetryData,
+				requestBodySize: String(data.length),
+				duration: new Date().getTime() - startTime,
+				success: !!context && isSuccess(context),
+				responseBodySize: context?.res.headers['Content-Length'],
+				statusCode: context ? String(context.res.statusCode) : undefined,
+				errorCode: error
+					? isPromiseCanceledError(error) ? 'canceled' : getErrorMessage(error).startsWith('XHR timeout') ? 'timeout' : 'failed'
+					: undefined,
+				count: String(total)
+			});
 		}
-
-		const result = await asJson<IRawGalleryQueryResult>(context);
-		if (result) {
-			const r = result.results[0];
-			const galleryExtensions = r.extensions;
-			const resultCount = r.resultMetadata && r.resultMetadata.filter(m => m.metadataType === 'ResultCount')[0];
-			const total = resultCount && resultCount.metadataItems.filter(i => i.name === 'TotalCount')[0].count || 0;
-
-			return { galleryExtensions, total };
-		}
-		return { galleryExtensions: [], total: 0 };
 	}
 
 	async reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void> {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 0e46a92d6..50531800e 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -278,3 +278,19 @@ export const ExtensionsLocalizedLabel = { value: ExtensionsLabel, original: 'Ext
 export const ExtensionsChannelId = 'extensions';
 export const PreferencesLabel = localize('preferences', "Preferences");
 export const PreferencesLocalizedLabel = { value: PreferencesLabel, original: 'Preferences' };
+
+
+export interface CLIOutput {
+	log(s: string): void;
+	error(s: string): void;
+}
+
+export const IExtensionManagementCLIService = createDecorator<IExtensionManagementCLIService>('IExtensionManagementCLIService');
+export interface IExtensionManagementCLIService {
+	readonly _serviceBrand: undefined;
+
+	listExtensions(showVersions: boolean, category?: string, output?: CLIOutput): Promise<void>;
+	installExtensions(extensions: (string | URI)[], builtinExtensionIds: string[], isMachineScoped: boolean, force: boolean, output?: CLIOutput): Promise<void>;
+	uninstallExtensions(extensions: (string | URI)[], force: boolean, output?: CLIOutput): Promise<void>;
+	locateExtension(extensions: string[], output?: CLIOutput): Promise<void>;
+}
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts b/src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts
new file mode 100644
index 000000000..532a550c5
--- /dev/null
+++ b/src/vs/platform/extensionManagement/common/extensionManagementCLIService.ts
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+
+import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
+import { gt } from 'vs/base/common/semver/semver';
+import { CLIOutput, IExtensionGalleryService, IExtensionManagementCLIService, IExtensionManagementService, IGalleryExtension, ILocalExtension, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { ExtensionType, EXTENSION_CATEGORIES, IExtensionManifest, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
+import { getBaseLabel } from 'vs/base/common/labels';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Schemas } from 'vs/base/common/network';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+
+const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
+const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, e.g.: {0}", 'ms-dotnettools.csharp');
+
+
+function getId(manifest: IExtensionManifest, withVersion?: boolean): string {
+	if (withVersion) {
+		return `${manifest.publisher}.${manifest.name}@${manifest.version}`;
+	} else {
+		return `${manifest.publisher}.${manifest.name}`;
+	}
+}
+
+const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/;
+
+export function getIdAndVersion(id: string): [string, string | undefined] {
+	const matches = EXTENSION_ID_REGEX.exec(id);
+	if (matches && matches[1]) {
+		return [adoptToGalleryExtensionId(matches[1]), matches[2]];
+	}
+	return [adoptToGalleryExtensionId(id), undefined];
+}
+
+type InstallExtensionInfo = { id: string, version?: string, installOptions: InstallOptions };
+
+
+export class ExtensionManagementCLIService implements IExtensionManagementCLIService {
+
+	_serviceBrand: any;
+
+	constructor(
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@ILocalizationsService private readonly localizationsService: ILocalizationsService
+	) { }
+
+	protected get location(): string | undefined {
+		return undefined;
+	}
+
+	public async listExtensions(showVersions: boolean, category?: string, output: CLIOutput = console): Promise<void> {
+		let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const categories = EXTENSION_CATEGORIES.map(c => c.toLowerCase());
+		if (category && category !== '') {
+			if (categories.indexOf(category.toLowerCase()) < 0) {
+				output.log('Invalid category please enter a valid category. To list valid categories run --category without a category specified');
+				return;
+			}
+			extensions = extensions.filter(e => {
+				if (e.manifest.categories) {
+					const lowerCaseCategories: string[] = e.manifest.categories.map(c => c.toLowerCase());
+					return lowerCaseCategories.indexOf(category.toLowerCase()) > -1;
+				}
+				return false;
+			});
+		} else if (category === '') {
+			output.log('Possible Categories: ');
+			categories.forEach(category => {
+				output.log(category);
+			});
+			return;
+		}
+		if (this.location) {
+			output.log(localize('listFromLocation', "Extensions installed on {0}:", this.location));
+		}
+
+		extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
+		let lastId: string | undefined = undefined;
+		for (let extension of extensions) {
+			if (lastId !== extension.identifier.id) {
+				lastId = extension.identifier.id;
+				output.log(getId(extension.manifest, showVersions));
+			}
+		}
+	}
+
+	public async installExtensions(extensions: (string | URI)[], builtinExtensionIds: string[], isMachineScoped: boolean, force: boolean, output: CLIOutput = console): Promise<void> {
+		const failed: string[] = [];
+		const installedExtensionsManifests: IExtensionManifest[] = [];
+		if (extensions.length) {
+			output.log(this.location ? localize('installingExtensionsOnLocation', "Installing extensions on {0}...", this.location) : localize('installingExtensions', "Installing extensions..."));
+		}
+
+		const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const checkIfNotInstalled = (id: string, version?: string): boolean => {
+			const installedExtension = installed.find(i => areSameExtensions(i.identifier, { id }));
+			if (installedExtension) {
+				if (!version && !force) {
+					output.log(localize('alreadyInstalled-checkAndUpdate', "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.", id, installedExtension.manifest.version, id));
+					return false;
+				}
+				if (version && installedExtension.manifest.version === version) {
+					output.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", `${id}@${version}`));
+					return false;
+				}
+			}
+			return true;
+		};
+		const vsixs: URI[] = [];
+		const installExtensionInfos: InstallExtensionInfo[] = [];
+		for (const extension of extensions) {
+			if (extension instanceof URI) {
+				vsixs.push(extension);
+			} else {
+				const [id, version] = getIdAndVersion(extension);
+				if (checkIfNotInstalled(id, version)) {
+					installExtensionInfos.push({ id, version, installOptions: { isBuiltin: false, isMachineScoped } });
+				}
+			}
+		}
+		for (const extension of builtinExtensionIds) {
+			const [id, version] = getIdAndVersion(extension);
+			if (checkIfNotInstalled(id, version)) {
+				installExtensionInfos.push({ id, version, installOptions: { isBuiltin: true, isMachineScoped: false } });
+			}
+		}
+
+		if (vsixs.length) {
+			await Promise.all(vsixs.map(async vsix => {
+				try {
+					const manifest = await this.installVSIX(vsix, force, output);
+					if (manifest) {
+						installedExtensionsManifests.push(manifest);
+					}
+				} catch (err) {
+					output.error(err.message || err.stack || err);
+					failed.push(vsix.toString());
+				}
+			}));
+		}
+
+		if (installExtensionInfos.length) {
+
+			const galleryExtensions = await this.getGalleryExtensions(installExtensionInfos);
+
+			await Promise.all(installExtensionInfos.map(async extensionInfo => {
+				const gallery = galleryExtensions.get(extensionInfo.id.toLowerCase());
+				if (gallery) {
+					try {
+						const manifest = await this.installFromGallery(extensionInfo, gallery, installed, force, output);
+						if (manifest) {
+							installedExtensionsManifests.push(manifest);
+						}
+					} catch (err) {
+						output.error(err.message || err.stack || err);
+						failed.push(extensionInfo.id);
+					}
+				} else {
+					output.error(`${notFound(extensionInfo.version ? `${extensionInfo.id}@${extensionInfo.version}` : extensionInfo.id)}\n${useId}`);
+					failed.push(extensionInfo.id);
+				}
+			}));
+
+		}
+
+		if (installedExtensionsManifests.some(manifest => isLanguagePackExtension(manifest))) {
+			await this.updateLocalizationsCache();
+		}
+
+		if (failed.length) {
+			throw new Error(localize('installation failed', "Failed Installing Extensions: {0}", failed.join(', ')));
+		}
+	}
+
+	private async installVSIX(vsix: URI, force: boolean, output: CLIOutput): Promise<IExtensionManifest | null> {
+
+		const manifest = await this.extensionManagementService.getManifest(vsix);
+		if (!manifest) {
+			throw new Error('Invalid vsix');
+		}
+
+		const valid = await this.validateVSIX(manifest, force, output);
+		if (valid) {
+			try {
+				await this.extensionManagementService.install(vsix);
+				output.log(localize('successVsixInstall', "Extension '{0}' was successfully installed.", getBaseLabel(vsix)));
+				return manifest;
+			} catch (error) {
+				if (isPromiseCanceledError(error)) {
+					output.log(localize('cancelVsixInstall', "Cancelled installing extension '{0}'.", getBaseLabel(vsix)));
+					return null;
+				} else {
+					throw error;
+				}
+			}
+		}
+		return null;
+	}
+
+	private async getGalleryExtensions(extensions: InstallExtensionInfo[]): Promise<Map<string, IGalleryExtension>> {
+		const extensionIds = extensions.filter(({ version }) => version === undefined).map(({ id }) => id);
+		const extensionsWithIdAndVersion = extensions.filter(({ version }) => version !== undefined);
+
+		const galleryExtensions = new Map<string, IGalleryExtension>();
+		await Promise.all([
+			(async () => {
+				const result = await this.extensionGalleryService.getExtensions(extensionIds, CancellationToken.None);
+				result.forEach(extension => galleryExtensions.set(extension.identifier.id.toLowerCase(), extension));
+			})(),
+			Promise.all(extensionsWithIdAndVersion.map(async ({ id, version }) => {
+				const extension = await this.extensionGalleryService.getCompatibleExtension({ id }, version);
+				if (extension) {
+					galleryExtensions.set(extension.identifier.id.toLowerCase(), extension);
+				}
+			}))
+		]);
+
+		return galleryExtensions;
+	}
+
+	private async installFromGallery({ id, version, installOptions }: InstallExtensionInfo, galleryExtension: IGalleryExtension, installed: ILocalExtension[], force: boolean, output: CLIOutput): Promise<IExtensionManifest | null> {
+		const manifest = await this.extensionGalleryService.getManifest(galleryExtension, CancellationToken.None);
+		if (manifest && !this.validateExtensionKind(manifest, output)) {
+			return null;
+		}
+
+		const installedExtension = installed.find(e => areSameExtensions(e.identifier, galleryExtension.identifier));
+		if (installedExtension) {
+			if (galleryExtension.version === installedExtension.manifest.version) {
+				output.log(localize('alreadyInstalled', "Extension '{0}' is already installed.", version ? `${id}@${version}` : id));
+				return null;
+			}
+			output.log(localize('updateMessage', "Updating the extension '{0}' to the version {1}", id, galleryExtension.version));
+		}
+
+		try {
+			if (installOptions.isBuiltin) {
+				output.log(localize('installing builtin ', "Installing builtin extension '{0}' v{1}...", id, galleryExtension.version));
+			} else {
+				output.log(localize('installing', "Installing extension '{0}' v{1}...", id, galleryExtension.version));
+			}
+
+			await this.extensionManagementService.installFromGallery(galleryExtension, installOptions);
+			output.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed.", id, galleryExtension.version));
+			return manifest;
+		} catch (error) {
+			if (isPromiseCanceledError(error)) {
+				output.log(localize('cancelInstall', "Cancelled installing extension '{0}'.", id));
+				return null;
+			} else {
+				throw error;
+			}
+		}
+	}
+
+	protected validateExtensionKind(_manifest: IExtensionManifest, output: CLIOutput): boolean {
+		return true;
+	}
+
+	private async validateVSIX(manifest: IExtensionManifest, force: boolean, output: CLIOutput): Promise<boolean> {
+		const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
+		const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
+		const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && gt(local.manifest.version, manifest.version));
+
+		if (newer && !force) {
+			output.log(localize('forceDowngrade', "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version));
+			return false;
+		}
+
+		return this.validateExtensionKind(manifest, output);
+	}
+
+	public async uninstallExtensions(extensions: (string | URI)[], force: boolean, output: CLIOutput = console): Promise<void> {
+		const getExtensionId = async (extensionDescription: string | URI): Promise<string> => {
+			if (extensionDescription instanceof URI) {
+				const manifest = await this.extensionManagementService.getManifest(extensionDescription);
+				return getId(manifest);
+			}
+			return extensionDescription;
+		};
+
+		const uninstalledExtensions: ILocalExtension[] = [];
+		for (const extension of extensions) {
+			const id = await getExtensionId(extension);
+			const installed = await this.extensionManagementService.getInstalled();
+			const extensionsToUninstall = installed.filter(e => areSameExtensions(e.identifier, { id }));
+			if (!extensionsToUninstall.length) {
+				throw new Error(`${this.notInstalled(id)}\n${useId}`);
+			}
+			if (extensionsToUninstall.some(e => e.type === ExtensionType.System)) {
+				output.log(localize('builtin', "Extension '{0}' is a Built-in extension and cannot be uninstalled", id));
+				return;
+			}
+			if (!force && extensionsToUninstall.some(e => e.isBuiltin)) {
+				output.log(localize('forceUninstall', "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.", id));
+				return;
+			}
+			output.log(localize('uninstalling', "Uninstalling {0}...", id));
+			for (const extensionToUninstall of extensionsToUninstall) {
+				await this.extensionManagementService.uninstall(extensionToUninstall);
+				uninstalledExtensions.push(extensionToUninstall);
+			}
+
+			if (this.location) {
+				output.log(localize('successUninstallFromLocation', "Extension '{0}' was successfully uninstalled from {1}!", id, this.location));
+			} else {
+				output.log(localize('successUninstall', "Extension '{0}' was successfully uninstalled!", id));
+			}
+
+		}
+
+		if (uninstalledExtensions.some(e => isLanguagePackExtension(e.manifest))) {
+			await this.updateLocalizationsCache();
+		}
+	}
+
+	public async locateExtension(extensions: string[], output: CLIOutput = console): Promise<void> {
+		const installed = await this.extensionManagementService.getInstalled();
+		extensions.forEach(e => {
+			installed.forEach(i => {
+				if (i.identifier.id === e) {
+					if (i.location.scheme === Schemas.file) {
+						output.log(i.location.fsPath);
+						return;
+					}
+				}
+			});
+		});
+	}
+
+
+	private updateLocalizationsCache(): Promise<boolean> {
+		return this.localizationsService.update();
+	}
+
+	private notInstalled(id: string) {
+		return this.location ? localize('notInstalleddOnLocation', "Extension '{0}' is not installed on {1}.", id, this.location) : localize('notInstalled', "Extension '{0}' is not installed.", id);
+	}
+
+}
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 20d24771d..393745571 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -42,12 +42,16 @@ export class ExtensionIdentifierWithVersion implements IExtensionIdentifierWithV
 	}
 }
 
+export function getExtensionId(publisher: string, name: string): string {
+	return `${publisher}.${name}`;
+}
+
 export function adoptToGalleryExtensionId(id: string): string {
 	return id.toLocaleLowerCase();
 }
 
 export function getGalleryExtensionId(publisher: string, name: string): string {
-	return `${publisher.toLocaleLowerCase()}.${name.toLocaleLowerCase()}`;
+	return adoptToGalleryExtensionId(getExtensionId(publisher, name));
 }
 
 export function groupByExtension<T>(extensions: T[], getExtensionIdentifier: (t: T) => IExtensionIdentifier): T[][] {
diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
index 7d17d9ef3..a9ec2f35a 100644
--- a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
+++ b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
@@ -21,6 +21,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { localize } from 'vs/nls';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Event } from 'vs/base/common/event';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 
 type ExeExtensionRecommendationsClassification = {
 	extensionId: { classification: 'PublicNonPersonalData', purpose: 'FeatureInsight' };
@@ -52,6 +54,7 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IStorageService private readonly storageService: IStorageService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@IExtensionRecommendationNotificationService private readonly extensionRecommendationNotificationService: IExtensionRecommendationNotificationService,
 		@IFileService fileService: IFileService,
 		@IProductService productService: IProductService,
@@ -172,6 +175,11 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 					case RecommendationsNotificationResult.Ignored:
 						this.highImportanceTipsByExe.delete(exeName);
 						break;
+					case RecommendationsNotificationResult.IncompatibleWindow:
+						// Recommended in incompatible window. Schedule the prompt after active window change
+						const onActiveWindowChange = Event.once(Event.latch(Event.any(this.nativeHostService.onDidOpenWindow, this.nativeHostService.onDidFocusWindow)));
+						this._register(onActiveWindowChange(() => this.promptHighImportanceExeBasedTip()));
+						break;
 					case RecommendationsNotificationResult.TooMany:
 						// Too many notifications. Schedule the prompt after one hour
 						const disposable = this._register(disposableTimeout(() => { disposable.dispose(); this.promptHighImportanceExeBasedTip(); }, 60 * 60 * 1000 /* 1 hour */));
@@ -217,6 +225,12 @@ export class ExtensionTipsService extends BaseExtensionTipsService {
 						this.promptMediumImportanceExeBasedTip();
 						break;
 
+					case RecommendationsNotificationResult.IncompatibleWindow:
+						// Recommended in incompatible window. Schedule the prompt after active window change
+						const onActiveWindowChange = Event.once(Event.latch(Event.any(this.nativeHostService.onDidOpenWindow, this.nativeHostService.onDidFocusWindow)));
+						this._register(onActiveWindowChange(() => this.promptMediumImportanceExeBasedTip()));
+						break;
+
 					case RecommendationsNotificationResult.TooMany:
 						// Too many notifications. Schedule the prompt after one hour
 						const disposable2 = this._register(disposableTimeout(() => { disposable2.dispose(); this.promptMediumImportanceExeBasedTip(); }, 60 * 60 * 1000 /* 1 hour */));
diff --git a/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
new file mode 100644
index 000000000..c1085576c
--- /dev/null
+++ b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { isUUID } from 'vs/base/common/uuid';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import product from 'vs/platform/product/common/product';
+import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { URI } from 'vs/base/common/uri';
+import { joinPath } from 'vs/base/common/resources';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { mock } from 'vs/base/test/common/mock';
+
+class EnvironmentServiceMock extends mock<IEnvironmentService>() {
+	constructor(readonly serviceMachineIdResource: URI) {
+		super();
+	}
+}
+
+suite('Extension Gallery Service', () => {
+	const disposables: DisposableStore = new DisposableStore();
+	let fileService: IFileService, environmentService: IEnvironmentService, storageService: IStorageService;
+
+	setup(() => {
+		const serviceMachineIdResource = joinPath(URI.file('tests').with({ scheme: 'vscode-tests' }), 'machineid');
+		environmentService = new EnvironmentServiceMock(serviceMachineIdResource);
+		fileService = disposables.add(new FileService(new NullLogService()));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(serviceMachineIdResource.scheme, fileSystemProvider);
+		storageService = new InMemoryStorageService();
+	});
+
+	teardown(() => disposables.clear());
+
+	test('marketplace machine id', async () => {
+		const headers = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.ok(isUUID(headers['X-Market-User-Id']));
+		const headers2 = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.equal(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
+	});
+});
diff --git a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts
deleted file mode 100644
index e2a7ed43a..000000000
--- a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as os from 'os';
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { join } from 'vs/base/common/path';
-import { mkdirp, RimRafMode, rimraf } from 'vs/base/node/pfs';
-import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { isUUID } from 'vs/base/common/uuid';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { Schemas } from 'vs/base/common/network';
-import product from 'vs/platform/product/common/product';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-
-suite('Extension Gallery Service', () => {
-	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'extensiongalleryservice');
-	const marketplaceHome = join(parentDir, 'Marketplace');
-	let fileService: IFileService;
-	let disposables: DisposableStore;
-
-	setup(done => {
-
-		disposables = new DisposableStore();
-		fileService = new FileService(new NullLogService());
-		disposables.add(fileService);
-
-		const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
-		disposables.add(diskFileSystemProvider);
-		fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-
-		// Delete any existing backups completely and then re-create it.
-		rimraf(marketplaceHome, RimRafMode.MOVE).then(() => {
-			mkdirp(marketplaceHome).then(() => {
-				done();
-			}, error => done(error));
-		}, error => done(error));
-	});
-
-	teardown(done => {
-		disposables.clear();
-		rimraf(marketplaceHome, RimRafMode.MOVE).then(done, done);
-	});
-
-	test('marketplace machine id', () => {
-		const args = ['--user-data-dir', marketplaceHome];
-		const environmentService = new NativeEnvironmentService(parseArgs(args, OPTIONS));
-		const storageService: IStorageService = new TestStorageService();
-
-		return resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService).then(headers => {
-			assert.ok(isUUID(headers['X-Market-User-Id']));
-
-			return resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService).then(headers2 => {
-				assert.equal(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
-			});
-		});
-	});
-});
diff --git a/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts b/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
index cea1c09e2..c3eff4b7a 100644
--- a/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
+++ b/src/vs/platform/extensionRecommendations/common/extensionRecommendations.ts
@@ -11,10 +11,19 @@ export const enum RecommendationSource {
 	EXE = 3
 }
 
+export function RecommendationSourceToString(source: RecommendationSource) {
+	switch (source) {
+		case RecommendationSource.FILE: return 'file';
+		case RecommendationSource.WORKSPACE: return 'workspace';
+		case RecommendationSource.EXE: return 'exe';
+	}
+}
+
 export const enum RecommendationsNotificationResult {
 	Ignored = 'ignored',
 	Cancelled = 'cancelled',
 	TooMany = 'toomany',
+	IncompatibleWindow = 'incompatibleWindow',
 	Accepted = 'reacted',
 }
 
diff --git a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
index b5bdc6235..c863c64bf 100644
--- a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
@@ -8,14 +8,24 @@ import { IFileSystemProviderWithFileReadWriteCapability, FileSystemProviderCapab
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { joinPath, extUri, dirname } from 'vs/base/common/resources';
+import { Throttler } from 'vs/base/common/async';
 import { localize } from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
+import { joinPath } from 'vs/base/common/resources';
 
 const INDEXEDDB_VSCODE_DB = 'vscode-web-db';
 export const INDEXEDDB_USERDATA_OBJECT_STORE = 'vscode-userdata-store';
 export const INDEXEDDB_LOGS_OBJECT_STORE = 'vscode-logs-store';
 
+// Standard FS Errors (expected to be thrown in production when invalid FS operations are requested)
+const ERR_FILE_NOT_FOUND = createFileSystemProviderError(localize('fileNotExists', "File does not exist"), FileSystemProviderErrorCode.FileNotFound);
+const ERR_FILE_IS_DIR = createFileSystemProviderError(localize('fileIsDirectory', "File is Directory"), FileSystemProviderErrorCode.FileIsADirectory);
+const ERR_FILE_NOT_DIR = createFileSystemProviderError(localize('fileNotDirectory', "File is not a directory"), FileSystemProviderErrorCode.FileNotADirectory);
+const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(localize('dirIsNotEmpty', "Directory is not empty"), FileSystemProviderErrorCode.Unknown);
+
+// Arbitrary Internal Errors (should never be thrown in production)
+const ERR_UNKNOWN_INTERNAL = (message: string) => createFileSystemProviderError(localize('internal', "Internal error occured in IndexedDB File System Provider. ({0})", message), FileSystemProviderErrorCode.Unknown);
+
 export class IndexedDB {
 
 	private indexedDBPromise: Promise<IDBDatabase | null>;
@@ -38,7 +48,7 @@ export class IndexedDB {
 	}
 
 	private openIndexedDB(name: string, version: number, stores: string[]): Promise<IDBDatabase | null> {
-		if (browser.isEdge) {
+		if (browser.isEdgeLegacy) {
 			return Promise.resolve(null);
 		}
 		return new Promise((c, e) => {
@@ -65,13 +75,140 @@ export class IndexedDB {
 			};
 		});
 	}
-
 }
 
 export interface IIndexedDBFileSystemProvider extends Disposable, IFileSystemProviderWithFileReadWriteCapability {
 	reset(): Promise<void>;
 }
 
+type DirEntry = [string, FileType];
+
+type IndexedDBFileSystemEntry =
+	| {
+		path: string,
+		type: FileType.Directory,
+		children: Map<string, IndexedDBFileSystemNode>,
+	}
+	| {
+		path: string,
+		type: FileType.File,
+		size: number | undefined,
+	};
+
+class IndexedDBFileSystemNode {
+	public type: FileType;
+
+	constructor(private entry: IndexedDBFileSystemEntry) {
+		this.type = entry.type;
+	}
+
+
+	read(path: string) {
+		return this.doRead(path.split('/').filter(p => p.length));
+	}
+
+	private doRead(pathParts: string[]): IndexedDBFileSystemEntry | undefined {
+		if (pathParts.length === 0) { return this.entry; }
+		if (this.entry.type !== FileType.Directory) {
+			throw ERR_UNKNOWN_INTERNAL('Internal error reading from IndexedDBFSNode -- expected directory at ' + this.entry.path);
+		}
+		const next = this.entry.children.get(pathParts[0]);
+
+		if (!next) { return undefined; }
+		return next.doRead(pathParts.slice(1));
+	}
+
+	delete(path: string) {
+		const toDelete = path.split('/').filter(p => p.length);
+		if (toDelete.length === 0) {
+			if (this.entry.type !== FileType.Directory) {
+				throw ERR_UNKNOWN_INTERNAL(`Internal error deleting from IndexedDBFSNode. Expected root entry to be directory`);
+			}
+			this.entry.children.clear();
+		} else {
+			return this.doDelete(toDelete, path);
+		}
+	}
+
+	private doDelete = (pathParts: string[], originalPath: string) => {
+		if (pathParts.length === 0) {
+			throw ERR_UNKNOWN_INTERNAL(`Internal error deleting from IndexedDBFSNode -- got no deletion path parts (encountered while deleting ${originalPath})`);
+		}
+		else if (this.entry.type !== FileType.Directory) {
+			throw ERR_UNKNOWN_INTERNAL('Internal error deleting from IndexedDBFSNode -- expected directory at ' + this.entry.path);
+		}
+		else if (pathParts.length === 1) {
+			this.entry.children.delete(pathParts[0]);
+		}
+		else {
+			const next = this.entry.children.get(pathParts[0]);
+			if (!next) {
+				throw ERR_UNKNOWN_INTERNAL('Internal error deleting from IndexedDBFSNode -- expected entry at ' + this.entry.path + '/' + next);
+			}
+			next.doDelete(pathParts.slice(1), originalPath);
+		}
+	};
+
+	add(path: string, entry: { type: 'file', size?: number } | { type: 'dir' }) {
+		this.doAdd(path.split('/').filter(p => p.length), entry, path);
+	}
+
+	private doAdd(pathParts: string[], entry: { type: 'file', size?: number } | { type: 'dir' }, originalPath: string) {
+		if (pathParts.length === 0) {
+			throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- adding empty path (encountered while adding ${originalPath})`);
+		}
+		else if (this.entry.type !== FileType.Directory) {
+			throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- parent is not a directory (encountered while adding ${originalPath})`);
+		}
+		else if (pathParts.length === 1) {
+			const next = pathParts[0];
+			const existing = this.entry.children.get(next);
+			if (entry.type === 'dir') {
+				if (existing?.entry.type === FileType.File) {
+					throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- overwriting file with directory: ${this.entry.path}/${next} (encountered while adding ${originalPath})`);
+				}
+				this.entry.children.set(next, existing ?? new IndexedDBFileSystemNode({
+					type: FileType.Directory,
+					path: this.entry.path + '/' + next,
+					children: new Map(),
+				}));
+			} else {
+				if (existing?.entry.type === FileType.Directory) {
+					throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- overwriting directory with file: ${this.entry.path}/${next} (encountered while adding ${originalPath})`);
+				}
+				this.entry.children.set(next, new IndexedDBFileSystemNode({
+					type: FileType.File,
+					path: this.entry.path + '/' + next,
+					size: entry.size,
+				}));
+			}
+		}
+		else if (pathParts.length > 1) {
+			const next = pathParts[0];
+			let childNode = this.entry.children.get(next);
+			if (!childNode) {
+				childNode = new IndexedDBFileSystemNode({
+					children: new Map(),
+					path: this.entry.path + '/' + next,
+					type: FileType.Directory
+				});
+				this.entry.children.set(next, childNode);
+			}
+			else if (childNode.type === FileType.File) {
+				throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- overwriting file entry with directory: ${this.entry.path}/${next} (encountered while adding ${originalPath})`);
+			}
+			childNode.doAdd(pathParts.slice(1), entry, originalPath);
+		}
+	}
+
+	print(indentation = '') {
+		console.log(indentation + this.entry.path);
+		if (this.entry.type === FileType.Directory) {
+			this.entry.children.forEach(child => child.print(indentation + ' '));
+		}
+	}
+}
+
 class IndexedDBFileSystemProvider extends Disposable implements IIndexedDBFileSystemProvider {
 
 	readonly capabilities: FileSystemProviderCapabilities =
@@ -83,11 +220,14 @@ class IndexedDBFileSystemProvider extends Disposable implements IIndexedDBFileSy
 	readonly onDidChangeFile: Event<readonly IFileChange[]> = this._onDidChangeFile.event;
 
 	private readonly versions: Map<string, number> = new Map<string, number>();
-	private readonly dirs: Set<string> = new Set<string>();
 
-	constructor(private readonly scheme: string, private readonly database: IDBDatabase, private readonly store: string) {
+	private cachedFiletree: Promise<IndexedDBFileSystemNode> | undefined;
+	private writeManyThrottler: Throttler;
+
+	constructor(scheme: string, private readonly database: IDBDatabase, private readonly store: string) {
 		super();
-		this.dirs.add('/');
+		this.writeManyThrottler = new Throttler();
+
 	}
 
 	watch(resource: URI, opts: IWatchOptions): IDisposable {
@@ -98,29 +238,22 @@ class IndexedDBFileSystemProvider extends Disposable implements IIndexedDBFileSy
 		try {
 			const resourceStat = await this.stat(resource);
 			if (resourceStat.type === FileType.File) {
-				throw createFileSystemProviderError(localize('fileNotDirectory', "File is not a directory"), FileSystemProviderErrorCode.FileNotADirectory);
+				throw ERR_FILE_NOT_DIR;
 			}
 		} catch (error) { /* Ignore */ }
-
-		// Make sure parent dir exists
-		await this.stat(dirname(resource));
-
-		this.dirs.add(resource.path);
+		(await this.getFiletree()).add(resource.path, { type: 'dir' });
 	}
 
 	async stat(resource: URI): Promise<IStat> {
-		try {
-			const content = await this.readFile(resource);
+		const content = (await this.getFiletree()).read(resource.path);
+		if (content?.type === FileType.File) {
 			return {
 				type: FileType.File,
 				ctime: 0,
 				mtime: this.versions.get(resource.toString()) || 0,
-				size: content.byteLength
+				size: content.size ?? (await this.readFile(resource)).byteLength
 			};
-		} catch (e) {
-		}
-		const files = await this.readdir(resource);
-		if (files.length) {
+		} else if (content?.type === FileType.Directory) {
 			return {
 				type: FileType.Directory,
 				ctime: 0,
@@ -128,75 +261,112 @@ class IndexedDBFileSystemProvider extends Disposable implements IIndexedDBFileSy
 				size: 0
 			};
 		}
-		if (this.dirs.has(resource.path)) {
-			return {
-				type: FileType.Directory,
-				ctime: 0,
-				mtime: 0,
-				size: 0
-			};
+		else {
+			throw ERR_FILE_NOT_FOUND;
 		}
-		throw createFileSystemProviderError(localize('fileNotExists', "File does not exist"), FileSystemProviderErrorCode.FileNotFound);
 	}
 
-	async readdir(resource: URI): Promise<[string, FileType][]> {
-		const hasKey = await this.hasKey(resource.path);
-		if (hasKey) {
-			throw createFileSystemProviderError(localize('fileNotDirectory', "File is not a directory"), FileSystemProviderErrorCode.FileNotADirectory);
+	async readdir(resource: URI): Promise<DirEntry[]> {
+		const entry = (await this.getFiletree()).read(resource.path);
+		if (!entry) {
+			// Dirs aren't saved to disk, so empty dirs will be lost on reload.
+			// Thus we have two options for what happens when you try to read a dir and nothing is found:
+			// - Throw FileSystemProviderErrorCode.FileNotFound
+			// - Return []
+			// We choose to return [] as creating a dir then reading it (even after reload) should not throw an error.
+			return [];
 		}
-		const keys = await this.getAllKeys();
-		const files: Map<string, [string, FileType]> = new Map<string, [string, FileType]>();
-		for (const key of keys) {
-			const keyResource = this.toResource(key);
-			if (extUri.isEqualOrParent(keyResource, resource)) {
-				const path = extUri.relativePath(resource, keyResource);
-				if (path) {
-					const keySegments = path.split('/');
-					files.set(keySegments[0], [keySegments[0], keySegments.length === 1 ? FileType.File : FileType.Directory]);
-				}
-			}
+		if (entry.type !== FileType.Directory) {
+			throw ERR_FILE_NOT_DIR;
+		}
+		else {
+			return [...entry.children.entries()].map(([name, node]) => [name, node.type]);
 		}
-		return [...files.values()];
 	}
 
 	async readFile(resource: URI): Promise<Uint8Array> {
-		const hasKey = await this.hasKey(resource.path);
-		if (!hasKey) {
-			throw createFileSystemProviderError(localize('fileNotFound', "File not found"), FileSystemProviderErrorCode.FileNotFound);
-		}
-		const value = await this.getValue(resource.path);
-		if (typeof value === 'string') {
-			return VSBuffer.fromString(value).buffer;
-		} else {
-			return value;
-		}
+		const buffer = await new Promise<Uint8Array>((c, e) => {
+			const transaction = this.database.transaction([this.store]);
+			const objectStore = transaction.objectStore(this.store);
+			const request = objectStore.get(resource.path);
+			request.onerror = () => e(request.error);
+			request.onsuccess = () => {
+				if (request.result instanceof Uint8Array) {
+					c(request.result);
+				} else if (typeof request.result === 'string') {
+					c(VSBuffer.fromString(request.result).buffer);
+				}
+				else {
+					if (request.result === undefined) {
+						e(ERR_FILE_NOT_FOUND);
+					} else {
+						e(ERR_UNKNOWN_INTERNAL(`IndexedDB entry at "${resource.path}" in unexpected format`));
+					}
+				}
+			};
+		});
+
+		(await this.getFiletree()).add(resource.path, { type: 'file', size: buffer.byteLength });
+		return buffer;
 	}
 
 	async writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Promise<void> {
-		const hasKey = await this.hasKey(resource.path);
-		if (!hasKey) {
-			const files = await this.readdir(resource);
-			if (files.length) {
-				throw createFileSystemProviderError(localize('fileIsDirectory', "File is Directory"), FileSystemProviderErrorCode.FileIsADirectory);
-			}
+		const existing = await this.stat(resource).catch(() => undefined);
+		if (existing?.type === FileType.Directory) {
+			throw ERR_FILE_IS_DIR;
 		}
-		await this.setValue(resource.path, content);
+
+		this.fileWriteBatch.push({ content, resource });
+		await this.writeManyThrottler.queue(() => this.writeMany());
+		(await this.getFiletree()).add(resource.path, { type: 'file', size: content.byteLength });
 		this.versions.set(resource.toString(), (this.versions.get(resource.toString()) || 0) + 1);
 		this._onDidChangeFile.fire([{ resource, type: FileChangeType.UPDATED }]);
 	}
 
 	async delete(resource: URI, opts: FileDeleteOptions): Promise<void> {
-		const hasKey = await this.hasKey(resource.path);
-		if (hasKey) {
-			await this.deleteKey(resource.path);
-			this.versions.delete(resource.path);
-			this._onDidChangeFile.fire([{ resource, type: FileChangeType.DELETED }]);
-			return;
+		let stat: IStat;
+		try {
+			stat = await this.stat(resource);
+		} catch (e) {
+			if (e.code === FileSystemProviderErrorCode.FileNotFound) {
+				return;
+			}
+			throw e;
 		}
 
+		let toDelete: string[];
 		if (opts.recursive) {
-			const files = await this.readdir(resource);
-			await Promise.all(files.map(([key]) => this.delete(joinPath(resource, key), opts)));
+			const tree = (await this.tree(resource));
+			toDelete = tree.map(([path]) => path);
+		} else {
+			if (stat.type === FileType.Directory && (await this.readdir(resource)).length) {
+				throw ERR_DIR_NOT_EMPTY;
+			}
+			toDelete = [resource.path];
+		}
+		await this.deleteKeys(toDelete);
+		(await this.getFiletree()).delete(resource.path);
+		toDelete.forEach(key => this.versions.delete(key));
+		this._onDidChangeFile.fire(toDelete.map(path => ({ resource: resource.with({ path }), type: FileChangeType.DELETED })));
+	}
+
+	private async tree(resource: URI): Promise<DirEntry[]> {
+		if ((await this.stat(resource)).type === FileType.Directory) {
+			const topLevelEntries = (await this.readdir(resource)).map(([key, type]) => {
+				return [joinPath(resource, key).path, type] as [string, FileType];
+			});
+			let allEntries = topLevelEntries;
+			await Promise.all(topLevelEntries.map(
+				async ([key, type]) => {
+					if (type === FileType.Directory) {
+						const childEntries = (await this.tree(resource.with({ path: key })));
+						allEntries = allEntries.concat(childEntries);
+					}
+				}));
+			return allEntries;
+		} else {
+			const entries: DirEntry[] = [[resource.path, FileType.File]];
+			return entries;
 		}
 	}
 
@@ -204,58 +374,57 @@ class IndexedDBFileSystemProvider extends Disposable implements IIndexedDBFileSy
 		return Promise.reject(new Error('Not Supported'));
 	}
 
-	private toResource(key: string): URI {
-		return URI.file(key).with({ scheme: this.scheme });
+	private getFiletree(): Promise<IndexedDBFileSystemNode> {
+		if (!this.cachedFiletree) {
+			this.cachedFiletree = new Promise((c, e) => {
+				const transaction = this.database.transaction([this.store]);
+				const objectStore = transaction.objectStore(this.store);
+				const request = objectStore.getAllKeys();
+				request.onerror = () => e(request.error);
+				request.onsuccess = () => {
+					const rootNode = new IndexedDBFileSystemNode({
+						children: new Map(),
+						path: '',
+						type: FileType.Directory
+					});
+					const keys = request.result.map(key => key.toString());
+					keys.forEach(key => rootNode.add(key, { type: 'file' }));
+					c(rootNode);
+				};
+			});
+		}
+		return this.cachedFiletree;
 	}
 
-	async getAllKeys(): Promise<string[]> {
-		return new Promise(async (c, e) => {
-			const transaction = this.database.transaction([this.store]);
-			const objectStore = transaction.objectStore(this.store);
-			const request = objectStore.getAllKeys();
-			request.onerror = () => e(request.error);
-			request.onsuccess = () => c(<string[]>request.result);
-		});
-	}
+	private fileWriteBatch: { resource: URI, content: Uint8Array }[] = [];
+	private async writeMany() {
+		return new Promise<void>((c, e) => {
+			const fileBatch = this.fileWriteBatch;
+			this.fileWriteBatch = [];
+			if (fileBatch.length === 0) { return c(); }
 
-	hasKey(key: string): Promise<boolean> {
-		return new Promise<boolean>(async (c, e) => {
-			const transaction = this.database.transaction([this.store]);
-			const objectStore = transaction.objectStore(this.store);
-			const request = objectStore.getKey(key);
-			request.onerror = () => e(request.error);
-			request.onsuccess = () => {
-				c(!!request.result);
-			};
-		});
-	}
-
-	getValue(key: string): Promise<Uint8Array | string> {
-		return new Promise(async (c, e) => {
-			const transaction = this.database.transaction([this.store]);
-			const objectStore = transaction.objectStore(this.store);
-			const request = objectStore.get(key);
-			request.onerror = () => e(request.error);
-			request.onsuccess = () => c(request.result || '');
-		});
-	}
-
-	setValue(key: string, value: Uint8Array): Promise<void> {
-		return new Promise(async (c, e) => {
 			const transaction = this.database.transaction([this.store], 'readwrite');
+			transaction.onerror = () => e(transaction.error);
 			const objectStore = transaction.objectStore(this.store);
-			const request = objectStore.put(value, key);
-			request.onerror = () => e(request.error);
+			let request: IDBRequest = undefined!;
+			for (const entry of fileBatch) {
+				request = objectStore.put(entry.content, entry.resource.path);
+			}
 			request.onsuccess = () => c();
 		});
 	}
 
-	deleteKey(key: string): Promise<void> {
+	private deleteKeys(keys: string[]): Promise<void> {
 		return new Promise(async (c, e) => {
+			if (keys.length === 0) { return c(); }
 			const transaction = this.database.transaction([this.store], 'readwrite');
+			transaction.onerror = () => e(transaction.error);
 			const objectStore = transaction.objectStore(this.store);
-			const request = objectStore.delete(key);
-			request.onerror = () => e(request.error);
+			let request: IDBRequest = undefined!;
+			for (const key of keys) {
+				request = objectStore.delete(key);
+			}
+
 			request.onsuccess = () => c();
 		});
 	}
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index 23001b2a2..dbc98c13b 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from 'vs/nls';
+import { mark } from 'vs/base/common/performance';
 import { Disposable, IDisposable, toDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { IFileService, IResolveFileOptions, FileChangesEvent, FileOperationEvent, IFileSystemProviderRegistrationEvent, IFileSystemProvider, IFileStat, IResolveFileResult, ICreateFileOptions, IFileSystemProviderActivationEvent, FileOperationError, FileOperationResult, FileOperation, FileSystemProviderCapabilities, FileType, toFileSystemProviderErrorCode, FileSystemProviderErrorCode, IStat, IFileStatWithMetadata, IResolveMetadataFileOptions, etag, hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, toFileOperationResult, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadWriteCapability, IResolveFileResultWithMetadata, IWatchOptions, IWriteFileOptions, IReadFileOptions, IFileStreamContent, IFileContent, ETAG_DISABLED, hasFileReadStreamCapability, IFileSystemProviderWithFileReadStreamCapability, ensureFileSystemProviderError, IFileSystemProviderCapabilitiesChangeEvent } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
-import { isAbsolutePath, dirname, basename, joinPath, IExtUri, extUri, extUriIgnorePathCase } from 'vs/base/common/resources';
-import { localize } from 'vs/nls';
+import { IExtUri, extUri, extUriIgnorePathCase, isAbsolutePath } from 'vs/base/common/resources';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { isNonEmptyArray, coalesce } from 'vs/base/common/arrays';
-import { getBaseLabel } from 'vs/base/common/labels';
 import { ILogService } from 'vs/platform/log/common/log';
-import { VSBuffer, VSBufferReadable, readableToBuffer, bufferToReadable, streamToBuffer, bufferToStream, VSBufferReadableStream, VSBufferReadableBufferedStream, bufferedStreamToBuffer, newWriteableBufferStream } from 'vs/base/common/buffer';
-import { isReadableStream, transform, peekReadable, peekStream, isReadableBufferedStream } from 'vs/base/common/stream';
+import { VSBuffer, VSBufferReadable, readableToBuffer, bufferToReadable, streamToBuffer, VSBufferReadableStream, VSBufferReadableBufferedStream, bufferedStreamToBuffer, newWriteableBufferStream } from 'vs/base/common/buffer';
+import { isReadableStream, transform, peekReadable, peekStream, isReadableBufferedStream, newWriteableStream, IReadableStreamObservable, observe } from 'vs/base/common/stream';
 import { Queue } from 'vs/base/common/async';
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 import { Schemas } from 'vs/base/common/network';
@@ -49,6 +49,8 @@ export class FileService extends Disposable implements IFileService {
 			throw new Error(`A filesystem provider for the scheme '${scheme}' is already registered.`);
 		}
 
+		mark(`code/registerFilesystem/${scheme}`);
+
 		// Add provider with event
 		this.provider.set(scheme, provider);
 		this._onDidChangeFileSystemProviderRegistrations.fire({ added: true, scheme, provider });
@@ -102,7 +104,7 @@ export class FileService extends Disposable implements IFileService {
 		return !!(provider && (provider.capabilities & capability));
 	}
 
-	listCapabilities(): Iterable<{ scheme: string, capabilities: FileSystemProviderCapabilities }> {
+	listCapabilities(): Iterable<{ scheme: string, capabilities: FileSystemProviderCapabilities; }> {
 		return Iterable.map(this.provider, ([scheme, provider]) => ({ scheme, capabilities: provider.capabilities }));
 	}
 
@@ -215,14 +217,15 @@ export class FileService extends Disposable implements IFileService {
 		});
 	}
 
-	private async toFileStat(provider: IFileSystemProvider, resource: URI, stat: IStat | { type: FileType } & Partial<IStat>, siblings: number | undefined, resolveMetadata: boolean, recurse: (stat: IFileStat, siblings?: number) => boolean): Promise<IFileStat>;
+	private async toFileStat(provider: IFileSystemProvider, resource: URI, stat: IStat | { type: FileType; } & Partial<IStat>, siblings: number | undefined, resolveMetadata: boolean, recurse: (stat: IFileStat, siblings?: number) => boolean): Promise<IFileStat>;
 	private async toFileStat(provider: IFileSystemProvider, resource: URI, stat: IStat, siblings: number | undefined, resolveMetadata: true, recurse: (stat: IFileStat, siblings?: number) => boolean): Promise<IFileStatWithMetadata>;
-	private async toFileStat(provider: IFileSystemProvider, resource: URI, stat: IStat | { type: FileType } & Partial<IStat>, siblings: number | undefined, resolveMetadata: boolean, recurse: (stat: IFileStat, siblings?: number) => boolean): Promise<IFileStat> {
+	private async toFileStat(provider: IFileSystemProvider, resource: URI, stat: IStat | { type: FileType; } & Partial<IStat>, siblings: number | undefined, resolveMetadata: boolean, recurse: (stat: IFileStat, siblings?: number) => boolean): Promise<IFileStat> {
+		const { providerExtUri } = this.getExtUri(provider);
 
 		// convert to file stat
 		const fileStat: IFileStat = {
 			resource,
-			name: getBaseLabel(resource),
+			name: providerExtUri.basename(resource),
 			isFile: (stat.type & FileType.File) !== 0,
 			isDirectory: (stat.type & FileType.Directory) !== 0,
 			isSymbolicLink: (stat.type & FileType.SymbolicLink) !== 0,
@@ -238,7 +241,7 @@ export class FileService extends Disposable implements IFileService {
 				const entries = await provider.readdir(resource);
 				const resolvedEntries = await Promise.all(entries.map(async ([name, type]) => {
 					try {
-						const childResource = joinPath(resource, name);
+						const childResource = providerExtUri.joinPath(resource, name);
 						const childStat = resolveMetadata ? await provider.stat(childResource) : { type };
 
 						return await this.toFileStat(provider, childResource, childStat, entries.length, resolveMetadata, recurse);
@@ -263,8 +266,8 @@ export class FileService extends Disposable implements IFileService {
 		return fileStat;
 	}
 
-	async resolveAll(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Promise<IResolveFileResult[]>;
-	async resolveAll(toResolve: { resource: URI, options: IResolveMetadataFileOptions }[]): Promise<IResolveFileResultWithMetadata[]>;
+	async resolveAll(toResolve: { resource: URI, options?: IResolveFileOptions; }[]): Promise<IResolveFileResult[]>;
+	async resolveAll(toResolve: { resource: URI, options: IResolveMetadataFileOptions; }[]): Promise<IResolveFileResultWithMetadata[]>;
 	async resolveAll(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): Promise<IResolveFileResult[]> {
 		return Promise.all(toResolve.map(async entry => {
 			try {
@@ -327,6 +330,7 @@ export class FileService extends Disposable implements IFileService {
 
 	async writeFile(resource: URI, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: IWriteFileOptions): Promise<IFileStatWithMetadata> {
 		const provider = this.throwIfFileSystemIsReadonly(await this.withWriteProvider(resource), resource);
+		const { providerExtUri } = this.getExtUri(provider);
 
 		try {
 
@@ -335,7 +339,7 @@ export class FileService extends Disposable implements IFileService {
 
 			// mkdir recursively as needed
 			if (!stat) {
-				await this.mkdirp(provider, dirname(resource));
+				await this.mkdirp(provider, providerExtUri.dirname(resource));
 			}
 
 			// optimization: if the provider has unbuffered write capability and the data
@@ -435,7 +439,7 @@ export class FileService extends Disposable implements IFileService {
 		return this.doReadAsFileStream(provider, resource, options);
 	}
 
-	private async doReadAsFileStream(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileOptions & { preferUnbuffered?: boolean }): Promise<IFileStreamContent> {
+	private async doReadAsFileStream(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability | IFileSystemProviderWithFileReadStreamCapability, resource: URI, options?: IReadFileOptions & { preferUnbuffered?: boolean; }): Promise<IFileStreamContent> {
 
 		// install a cancellation token that gets cancelled
 		// when any error occurs. this allows us to resolve
@@ -450,6 +454,8 @@ export class FileService extends Disposable implements IFileService {
 			throw error;
 		});
 
+		let fileStreamObserver: IReadableStreamObservable | undefined = undefined;
+
 		try {
 
 			// if the etag is provided, we await the result of the validation
@@ -460,30 +466,41 @@ export class FileService extends Disposable implements IFileService {
 				await statPromise;
 			}
 
-			let fileStreamPromise: Promise<VSBufferReadableStream>;
+			let fileStream: VSBufferReadableStream | undefined = undefined;
 
 			// read unbuffered (only if either preferred, or the provider has no buffered read capability)
 			if (!(hasOpenReadWriteCloseCapability(provider) || hasFileReadStreamCapability(provider)) || (hasReadWriteCapability(provider) && options?.preferUnbuffered)) {
-				fileStreamPromise = this.readFileUnbuffered(provider, resource, options);
+				fileStream = this.readFileUnbuffered(provider, resource, options);
 			}
 
 			// read streamed (always prefer over primitive buffered read)
 			else if (hasFileReadStreamCapability(provider)) {
-				fileStreamPromise = Promise.resolve(this.readFileStreamed(provider, resource, cancellableSource.token, options));
+				fileStream = this.readFileStreamed(provider, resource, cancellableSource.token, options);
 			}
 
 			// read buffered
 			else {
-				fileStreamPromise = Promise.resolve(this.readFileBuffered(provider, resource, cancellableSource.token, options));
+				fileStream = this.readFileBuffered(provider, resource, cancellableSource.token, options);
 			}
 
-			const [fileStat, fileStream] = await Promise.all([statPromise, fileStreamPromise]);
+			// observe the stream for the error case below
+			fileStreamObserver = observe(fileStream);
+
+			const fileStat = await statPromise;
 
 			return {
 				...fileStat,
 				value: fileStream
 			};
 		} catch (error) {
+
+			// Await the stream to finish so that we exit this method
+			// in a consistent state with file handles closed
+			// (https://github.com/microsoft/vscode/issues/114024)
+			if (fileStreamObserver) {
+				await fileStreamObserver.errorOrEnd();
+			}
+
 			throw new FileOperationError(localize('err.read', "Unable to read file '{0}' ({1})", this.resourceForError(resource), ensureFileSystemProviderError(error).toString()), toFileOperationResult(error), options);
 		}
 	}
@@ -509,23 +526,36 @@ export class FileService extends Disposable implements IFileService {
 		return stream;
 	}
 
-	private async readFileUnbuffered(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, options?: IReadFileOptions): Promise<VSBufferReadableStream> {
-		let buffer = await provider.readFile(resource);
+	private readFileUnbuffered(provider: IFileSystemProviderWithFileReadWriteCapability, resource: URI, options?: IReadFileOptions): VSBufferReadableStream {
+		const stream = newWriteableStream<VSBuffer>(data => VSBuffer.concat(data));
 
-		// respect position option
-		if (options && typeof options.position === 'number') {
-			buffer = buffer.slice(options.position);
-		}
+		// Read the file into the stream async but do not wait for
+		// this to complete because streams work via events
+		(async () => {
+			try {
+				let buffer = await provider.readFile(resource);
 
-		// respect length option
-		if (options && typeof options.length === 'number') {
-			buffer = buffer.slice(0, options.length);
-		}
+				// respect position option
+				if (options && typeof options.position === 'number') {
+					buffer = buffer.slice(options.position);
+				}
 
-		// Throw if file is too large to load
-		this.validateReadFileLimits(resource, buffer.byteLength, options);
+				// respect length option
+				if (options && typeof options.length === 'number') {
+					buffer = buffer.slice(0, options.length);
+				}
 
-		return bufferToStream(VSBuffer.wrap(buffer));
+				// Throw if file is too large to load
+				this.validateReadFileLimits(resource, buffer.byteLength, options);
+
+				// End stream with data
+				stream.end(VSBuffer.wrap(buffer));
+			} catch (err) {
+				stream.error(err);
+			}
+		})();
+
+		return stream;
 	}
 
 	private async validateReadFile(resource: URI, options?: IReadFileOptions): Promise<IFileStatWithMetadata> {
@@ -634,7 +664,7 @@ export class FileService extends Disposable implements IFileService {
 		}
 
 		// create parent folders
-		await this.mkdirp(targetProvider, dirname(target));
+		await this.mkdirp(targetProvider, this.getExtUri(targetProvider).providerExtUri.dirname(target));
 
 		// copy source => target
 		if (mode === 'copy') {
@@ -671,7 +701,6 @@ export class FileService extends Disposable implements IFileService {
 			// across providers: copy to target & delete at source
 			else {
 				await this.doMoveCopy(sourceProvider, source, targetProvider, target, 'copy', overwrite);
-
 				await this.del(source, { recursive: true });
 
 				return 'copy';
@@ -710,7 +739,7 @@ export class FileService extends Disposable implements IFileService {
 		// create children in target
 		if (Array.isArray(sourceFolder.children)) {
 			await Promise.all(sourceFolder.children.map(async sourceChild => {
-				const targetChild = joinPath(targetFolder, sourceChild.name);
+				const targetChild = this.getExtUri(targetProvider).providerExtUri.joinPath(targetFolder, sourceChild.name);
 				if (sourceChild.isDirectory) {
 					return this.doCopyFolder(sourceProvider, await this.resolve(sourceChild.resource), targetProvider, targetChild);
 				} else {
@@ -720,21 +749,21 @@ export class FileService extends Disposable implements IFileService {
 		}
 	}
 
-	private async doValidateMoveCopy(sourceProvider: IFileSystemProvider, source: URI, targetProvider: IFileSystemProvider, target: URI, mode: 'move' | 'copy', overwrite?: boolean): Promise<{ exists: boolean, isSameResourceWithDifferentPathCase: boolean }> {
+	private async doValidateMoveCopy(sourceProvider: IFileSystemProvider, source: URI, targetProvider: IFileSystemProvider, target: URI, mode: 'move' | 'copy', overwrite?: boolean): Promise<{ exists: boolean, isSameResourceWithDifferentPathCase: boolean; }> {
 		let isSameResourceWithDifferentPathCase = false;
 
 		// Check if source is equal or parent to target (requires providers to be the same)
 		if (sourceProvider === targetProvider) {
-			const { extUri, isPathCaseSensitive } = this.getExtUri(sourceProvider);
+			const { providerExtUri, isPathCaseSensitive } = this.getExtUri(sourceProvider);
 			if (!isPathCaseSensitive) {
-				isSameResourceWithDifferentPathCase = extUri.isEqual(source, target);
+				isSameResourceWithDifferentPathCase = providerExtUri.isEqual(source, target);
 			}
 
 			if (isSameResourceWithDifferentPathCase && mode === 'copy') {
 				throw new Error(localize('unableToMoveCopyError1', "Unable to copy when source '{0}' is same as target '{1}' with different path case on a case insensitive file system", this.resourceForError(source), this.resourceForError(target)));
 			}
 
-			if (!isSameResourceWithDifferentPathCase && extUri.isEqualOrParent(target, source)) {
+			if (!isSameResourceWithDifferentPathCase && providerExtUri.isEqualOrParent(target, source)) {
 				throw new Error(localize('unableToMoveCopyError2', "Unable to move/copy when source '{0}' is parent of target '{1}'.", this.resourceForError(source), this.resourceForError(target)));
 			}
 		}
@@ -751,8 +780,8 @@ export class FileService extends Disposable implements IFileService {
 			// Special case: if the target is a parent of the source, we cannot delete
 			// it as it would delete the source as well. In this case we have to throw
 			if (sourceProvider === targetProvider) {
-				const { extUri } = this.getExtUri(sourceProvider);
-				if (extUri.isEqualOrParent(source, target)) {
+				const { providerExtUri } = this.getExtUri(sourceProvider);
+				if (providerExtUri.isEqualOrParent(source, target)) {
 					throw new Error(localize('unableToMoveCopyError4', "Unable to move/copy '{0}' into '{1}' since a file would replace the folder it is contained in.", this.resourceForError(source), this.resourceForError(target)));
 				}
 			}
@@ -761,11 +790,11 @@ export class FileService extends Disposable implements IFileService {
 		return { exists, isSameResourceWithDifferentPathCase };
 	}
 
-	private getExtUri(provider: IFileSystemProvider): { extUri: IExtUri, isPathCaseSensitive: boolean } {
+	private getExtUri(provider: IFileSystemProvider): { providerExtUri: IExtUri, isPathCaseSensitive: boolean; } {
 		const isPathCaseSensitive = this.isPathCaseSensitive(provider);
 
 		return {
-			extUri: isPathCaseSensitive ? extUri : extUriIgnorePathCase,
+			providerExtUri: isPathCaseSensitive ? extUri : extUriIgnorePathCase,
 			isPathCaseSensitive
 		};
 	}
@@ -791,8 +820,8 @@ export class FileService extends Disposable implements IFileService {
 		const directoriesToCreate: string[] = [];
 
 		// mkdir until we reach root
-		const { extUri } = this.getExtUri(provider);
-		while (!extUri.isEqual(directory, dirname(directory))) {
+		const { providerExtUri } = this.getExtUri(provider);
+		while (!providerExtUri.isEqual(directory, providerExtUri.dirname(directory))) {
 			try {
 				const stat = await provider.stat(directory);
 				if ((stat.type & FileType.Directory) === 0) {
@@ -808,16 +837,16 @@ export class FileService extends Disposable implements IFileService {
 				}
 
 				// Upon error, remember directories that need to be created
-				directoriesToCreate.push(basename(directory));
+				directoriesToCreate.push(providerExtUri.basename(directory));
 
 				// Continue up
-				directory = dirname(directory);
+				directory = providerExtUri.dirname(directory);
 			}
 		}
 
 		// Create directories as needed
 		for (let i = directoriesToCreate.length - 1; i >= 0; i--) {
-			directory = joinPath(directory, directoriesToCreate[i]);
+			directory = providerExtUri.joinPath(directory, directoriesToCreate[i]);
 
 			try {
 				await provider.mkdir(directory);
@@ -894,11 +923,11 @@ export class FileService extends Disposable implements IFileService {
 	private readonly _onDidFilesChange = this._register(new Emitter<FileChangesEvent>());
 	readonly onDidFilesChange = this._onDidFilesChange.event;
 
-	private readonly activeWatchers = new Map<string, { disposable: IDisposable, count: number }>();
+	private readonly activeWatchers = new Map<string, { disposable: IDisposable, count: number; }>();
 
 	watch(resource: URI, options: IWatchOptions = { recursive: false, excludes: [] }): IDisposable {
 		let watchDisposed = false;
-		let watchDisposable = toDisposable(() => watchDisposed = true);
+		let disposeWatch = () => { watchDisposed = true; };
 
 		// Watch and wire in disposable which is async but
 		// check if we got disposed meanwhile and forward
@@ -906,11 +935,11 @@ export class FileService extends Disposable implements IFileService {
 			if (watchDisposed) {
 				dispose(disposable);
 			} else {
-				watchDisposable = disposable;
+				disposeWatch = () => dispose(disposable);
 			}
 		}, error => this.logService.error(error));
 
-		return toDisposable(() => dispose(watchDisposable));
+		return toDisposable(() => disposeWatch());
 	}
 
 	async doWatch(resource: URI, options: IWatchOptions): Promise<IDisposable> {
@@ -940,12 +969,12 @@ export class FileService extends Disposable implements IFileService {
 	}
 
 	private toWatchKey(provider: IFileSystemProvider, resource: URI, options: IWatchOptions): string {
-		const { extUri } = this.getExtUri(provider);
+		const { providerExtUri } = this.getExtUri(provider);
 
 		return [
-			extUri.getComparisonKey(resource), 	// lowercase path if the provider is case insensitive
-			String(options.recursive),			// use recursive: true | false as part of the key
-			options.excludes.join()				// use excludes as part of the key
+			providerExtUri.getComparisonKey(resource), 	// lowercase path if the provider is case insensitive
+			String(options.recursive),					// use recursive: true | false as part of the key
+			options.excludes.join()						// use excludes as part of the key
 		].join();
 	}
 
@@ -963,8 +992,8 @@ export class FileService extends Disposable implements IFileService {
 	private readonly writeQueues: Map<string, Queue<void>> = new Map();
 
 	private ensureWriteQueue(provider: IFileSystemProvider, resource: URI): Queue<void> {
-		const { extUri } = this.getExtUri(provider);
-		const queueKey = extUri.getComparisonKey(resource);
+		const { providerExtUri } = this.getExtUri(provider);
+		const queueKey = providerExtUri.getComparisonKey(resource);
 
 		// ensure to never write to the same resource without finishing
 		// the one write. this ensures a write finishes consistently
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 4ae154345..9b91c3dc1 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -278,7 +278,7 @@ export interface IFileSystemProvider {
 	readonly capabilities: FileSystemProviderCapabilities;
 	readonly onDidChangeCapabilities: Event<void>;
 
-	readonly onDidErrorOccur?: Event<string>; // TODO@ben remove once file watchers are solid
+	readonly onDidErrorOccur?: Event<string>; // TODO@bpasero remove once file watchers are solid
 
 	readonly onDidChangeFile: Event<readonly IFileChange[]>;
 	watch(resource: URI, opts: IWatchOptions): IDisposable;
@@ -947,9 +947,9 @@ export function etag(stat: { mtime: number | undefined, size: number | undefined
 	return stat.mtime.toString(29) + stat.size.toString(31);
 }
 
-export function whenProviderRegistered(file: URI, fileService: IFileService): Promise<void> {
+export async function whenProviderRegistered(file: URI, fileService: IFileService): Promise<void> {
 	if (fileService.canHandleResource(URI.from({ scheme: file.scheme }))) {
-		return Promise.resolve();
+		return;
 	}
 
 	return new Promise(resolve => {
diff --git a/src/vs/platform/files/common/io.ts b/src/vs/platform/files/common/io.ts
index 141241159..592b51168 100644
--- a/src/vs/platform/files/common/io.ts
+++ b/src/vs/platform/files/common/io.ts
@@ -58,10 +58,11 @@ async function doReadFileIntoStream<T>(provider: IFileSystemProviderWithOpenRead
 	// open handle through provider
 	const handle = await provider.open(resource, { create: false });
 
-	// Check for cancellation
-	throwIfCancelled(token);
-
 	try {
+
+		// Check for cancellation
+		throwIfCancelled(token);
+
 		let totalBytesRead = 0;
 		let bytesRead = 0;
 		let allowedRemainingBytes = (options && typeof options.length === 'number') ? options.length : undefined;
diff --git a/src/vs/platform/files/node/diskFileSystemProvider.ts b/src/vs/platform/files/node/diskFileSystemProvider.ts
index 89408a3f9..75811f569 100644
--- a/src/vs/platform/files/node/diskFileSystemProvider.ts
+++ b/src/vs/platform/files/node/diskFileSystemProvider.ts
@@ -522,7 +522,7 @@ export class DiskFileSystemProvider extends Disposable implements
 			return this.watchRecursive(resource, opts.excludes);
 		}
 
-		return this.watchNonRecursive(resource); // TODO@ben ideally the same watcher can be used in both cases
+		return this.watchNonRecursive(resource); // TODO@bpasero ideally the same watcher can be used in both cases
 	}
 
 	private watchRecursive(resource: URI, excludes: string[]): IDisposable {
diff --git a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
index 51a4b1a65..70c4cfd61 100644
--- a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as glob from 'vs/base/common/glob';
-import * as extpath from 'vs/base/common/extpath';
-import * as path from 'vs/base/common/path';
-import * as platform from 'vs/base/common/platform';
-import { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
 import * as nsfw from 'vscode-nsfw';
+import * as glob from 'vs/base/common/glob';
+import { join } from 'vs/base/common/path';
+import { isMacintosh } from 'vs/base/common/platform';
+import { isEqualOrParent } from 'vs/base/common/extpath';
+import { IDiskFileChange, normalizeFileChanges, ILogMessage } from 'vs/platform/files/node/watcher/watcher';
 import { IWatcherService, IWatcherRequest } from 'vs/platform/files/node/watcher/nsfw/watcher';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { FileChangeType } from 'vs/platform/files/common/files';
@@ -111,7 +111,7 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 		// We have to detect this case and massage the events to correct this.
 		let realBasePathDiffers = false;
 		let realBasePathLength = request.path.length;
-		if (platform.isMacintosh) {
+		if (isMacintosh) {
 			try {
 
 				// First check for symbolic link
@@ -141,7 +141,7 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 			for (const e of events) {
 				// Logging
 				if (this.verboseLogging) {
-					const logPath = e.action === nsfw.actions.RENAMED ? path.join(e.directory, e.oldFile || '') + ' -> ' + e.newFile : path.join(e.directory, e.file || '');
+					const logPath = e.action === nsfw.actions.RENAMED ? join(e.directory, e.oldFile || '') + ' -> ' + e.newFile : join(e.directory, e.file || '');
 					this.log(`${e.action === nsfw.actions.CREATED ? '[CREATED]' : e.action === nsfw.actions.DELETED ? '[DELETED]' : e.action === nsfw.actions.MODIFIED ? '[CHANGED]' : '[RENAMED]'} ${logPath}`);
 				}
 
@@ -149,20 +149,20 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 				let absolutePath: string;
 				if (e.action === nsfw.actions.RENAMED) {
 					// Rename fires when a file's name changes within a single directory
-					absolutePath = path.join(e.directory, e.oldFile || '');
+					absolutePath = join(e.directory, e.oldFile || '');
 					if (!this.isPathIgnored(absolutePath, this.pathWatchers[request.path].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.DELETED, path: absolutePath });
 					} else if (this.verboseLogging) {
 						this.log(` >> ignored ${absolutePath}`);
 					}
-					absolutePath = path.join(e.newDirectory || e.directory, e.newFile || '');
+					absolutePath = join(e.newDirectory || e.directory, e.newFile || '');
 					if (!this.isPathIgnored(absolutePath, this.pathWatchers[request.path].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.ADDED, path: absolutePath });
 					} else if (this.verboseLogging) {
 						this.log(` >> ignored ${absolutePath}`);
 					}
 				} else {
-					absolutePath = path.join(e.directory, e.file || '');
+					absolutePath = join(e.directory, e.file || '');
 					if (!this.isPathIgnored(absolutePath, this.pathWatchers[request.path].ignored)) {
 						undeliveredFileEvents.push({
 							type: nsfwActionToRawChangeType[e.action],
@@ -179,7 +179,7 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 				const events = undeliveredFileEvents;
 				undeliveredFileEvents = [];
 
-				if (platform.isMacintosh) {
+				if (isMacintosh) {
 					events.forEach(e => {
 
 						// Mac uses NFD unicode form on disk, but we want NFC
@@ -230,7 +230,7 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 		// Normalizes a set of root paths by removing any root paths that are
 		// sub-paths of other roots.
 		return roots.filter(r => roots.every(other => {
-			return !(r.path.length > other.path.length && extpath.isEqualOrParent(r.path, other.path));
+			return !(r.path.length > other.path.length && isEqualOrParent(r.path, other.path));
 		}));
 	}
 
diff --git a/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts b/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
index 9ad083fc9..0469c3f63 100644
--- a/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/test/nsfwWatcherService.test.ts
@@ -30,28 +30,28 @@ suite('NSFW Watcher Service', async () => {
 		test('should not impacts roots that don\'t overlap', () => {
 			const service = new TestNsfwWatcherService();
 			if (platform.isWindows) {
-				assert.deepEqual(service.normalizeRoots(['C:\\a']), ['C:\\a']);
-				assert.deepEqual(service.normalizeRoots(['C:\\a', 'C:\\b']), ['C:\\a', 'C:\\b']);
-				assert.deepEqual(service.normalizeRoots(['C:\\a', 'C:\\b', 'C:\\c\\d\\e']), ['C:\\a', 'C:\\b', 'C:\\c\\d\\e']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a']), ['C:\\a']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a', 'C:\\b']), ['C:\\a', 'C:\\b']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a', 'C:\\b', 'C:\\c\\d\\e']), ['C:\\a', 'C:\\b', 'C:\\c\\d\\e']);
 			} else {
-				assert.deepEqual(service.normalizeRoots(['/a']), ['/a']);
-				assert.deepEqual(service.normalizeRoots(['/a', '/b']), ['/a', '/b']);
-				assert.deepEqual(service.normalizeRoots(['/a', '/b', '/c/d/e']), ['/a', '/b', '/c/d/e']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a']), ['/a']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a', '/b']), ['/a', '/b']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a', '/b', '/c/d/e']), ['/a', '/b', '/c/d/e']);
 			}
 		});
 
 		test('should remove sub-folders of other roots', () => {
 			const service = new TestNsfwWatcherService();
 			if (platform.isWindows) {
-				assert.deepEqual(service.normalizeRoots(['C:\\a', 'C:\\a\\b']), ['C:\\a']);
-				assert.deepEqual(service.normalizeRoots(['C:\\a', 'C:\\b', 'C:\\a\\b']), ['C:\\a', 'C:\\b']);
-				assert.deepEqual(service.normalizeRoots(['C:\\b\\a', 'C:\\a', 'C:\\b', 'C:\\a\\b']), ['C:\\a', 'C:\\b']);
-				assert.deepEqual(service.normalizeRoots(['C:\\a', 'C:\\a\\b', 'C:\\a\\c\\d']), ['C:\\a']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a', 'C:\\a\\b']), ['C:\\a']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a', 'C:\\b', 'C:\\a\\b']), ['C:\\a', 'C:\\b']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\b\\a', 'C:\\a', 'C:\\b', 'C:\\a\\b']), ['C:\\a', 'C:\\b']);
+				assert.deepStrictEqual(service.normalizeRoots(['C:\\a', 'C:\\a\\b', 'C:\\a\\c\\d']), ['C:\\a']);
 			} else {
-				assert.deepEqual(service.normalizeRoots(['/a', '/a/b']), ['/a']);
-				assert.deepEqual(service.normalizeRoots(['/a', '/b', '/a/b']), ['/a', '/b']);
-				assert.deepEqual(service.normalizeRoots(['/b/a', '/a', '/b', '/a/b']), ['/a', '/b']);
-				assert.deepEqual(service.normalizeRoots(['/a', '/a/b', '/a/c/d']), ['/a']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a', '/a/b']), ['/a']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a', '/b', '/a/b']), ['/a', '/b']);
+				assert.deepStrictEqual(service.normalizeRoots(['/b/a', '/a', '/b', '/a/b']), ['/a', '/b']);
+				assert.deepStrictEqual(service.normalizeRoots(['/a', '/a/b', '/a/c/d']), ['/a']);
 			}
 		});
 	});
diff --git a/src/vs/platform/files/node/watcher/nsfw/watcherService.ts b/src/vs/platform/files/node/watcher/nsfw/watcherService.ts
index 79fa3ba25..3b0cd433f 100644
--- a/src/vs/platform/files/node/watcher/nsfw/watcherService.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/watcherService.ts
@@ -39,9 +39,9 @@ export class FileWatcher extends Disposable {
 				serverName: 'File Watcher (nsfw)',
 				args: ['--type=watcherService'],
 				env: {
-					AMD_ENTRYPOINT: 'vs/platform/files/node/watcher/nsfw/watcherApp',
-					PIPE_LOGGING: 'true',
-					VERBOSE_LOGGING: 'true' // transmit console logs from server to client
+					VSCODE_AMD_ENTRYPOINT: 'vs/platform/files/node/watcher/nsfw/watcherApp',
+					VSCODE_PIPE_LOGGING: 'true',
+					VSCODE_VERBOSE_LOGGING: 'true' // transmit console logs from server to client
 				}
 			}
 		));
diff --git a/src/vs/platform/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/platform/files/node/watcher/unix/chokidarWatcherService.ts
index 895e5dfa9..25276aa2a 100644
--- a/src/vs/platform/files/node/watcher/unix/chokidarWatcherService.ts
+++ b/src/vs/platform/files/node/watcher/unix/chokidarWatcherService.ts
@@ -6,9 +6,8 @@
 import * as chokidar from 'chokidar';
 import * as fs from 'fs';
 import * as gracefulFs from 'graceful-fs';
-gracefulFs.gracefulify(fs);
-import * as extpath from 'vs/base/common/extpath';
 import * as glob from 'vs/base/common/glob';
+import { isEqualOrParent } from 'vs/base/common/extpath';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { normalizeNFC } from 'vs/base/common/normalization';
@@ -20,6 +19,8 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { equals } from 'vs/base/common/arrays';
 import { Disposable } from 'vs/base/common/lifecycle';
 
+gracefulFs.gracefulify(fs); // enable gracefulFs
+
 process.noAsar = true; // disable ASAR support in watcher process
 
 interface IWatcher {
@@ -311,7 +312,7 @@ function isIgnored(path: string, requests: ExtendedWatcherRequest[]): boolean {
 			return false;
 		}
 
-		if (extpath.isEqualOrParent(path, request.path)) {
+		if (isEqualOrParent(path, request.path)) {
 			if (!request.parsedPattern) {
 				if (request.excludes && request.excludes.length > 0) {
 					const pattern = `{${request.excludes.join(',')}}`;
@@ -343,7 +344,7 @@ export function normalizeRoots(requests: IWatcherRequest[]): { [basePath: string
 	for (const request of requests) {
 		const basePath = request.path;
 		const ignored = (request.excludes || []).sort();
-		if (prevRequest && (extpath.isEqualOrParent(basePath, prevRequest.path))) {
+		if (prevRequest && (isEqualOrParent(basePath, prevRequest.path))) {
 			if (!isEqualIgnore(ignored, prevRequest.excludes)) {
 				result[prevRequest.path].push({ path: basePath, excludes: ignored });
 			}
diff --git a/src/vs/platform/files/node/watcher/unix/test/chockidarWatcherService.test.ts b/src/vs/platform/files/node/watcher/unix/test/chockidarWatcherService.test.ts
index 4c780ec6b..8b475de9a 100644
--- a/src/vs/platform/files/node/watcher/unix/test/chockidarWatcherService.test.ts
+++ b/src/vs/platform/files/node/watcher/unix/test/chockidarWatcherService.test.ts
@@ -20,18 +20,18 @@ suite('Chokidar normalizeRoots', async () => {
 	function assertNormalizedRootPath(inputPaths: string[], expectedPaths: string[]) {
 		const requests = inputPaths.map(path => newRequest(path));
 		const actual = normalizeRoots(requests);
-		assert.deepEqual(Object.keys(actual).sort(), expectedPaths);
+		assert.deepStrictEqual(Object.keys(actual).sort(), expectedPaths);
 	}
 
 	function assertNormalizedRequests(inputRequests: IWatcherRequest[], expectedRequests: { [path: string]: IWatcherRequest[] }) {
 		const actual = normalizeRoots(inputRequests);
 		const actualPath = Object.keys(actual).sort();
 		const expectedPaths = Object.keys(expectedRequests).sort();
-		assert.deepEqual(actualPath, expectedPaths);
+		assert.deepStrictEqual(actualPath, expectedPaths);
 		for (let path of actualPath) {
 			let a = expectedRequests[path].sort((r1, r2) => r1.path.localeCompare(r2.path));
 			let e = expectedRequests[path].sort((r1, r2) => r1.path.localeCompare(r2.path));
-			assert.deepEqual(a, e);
+			assert.deepStrictEqual(a, e);
 		}
 	}
 
diff --git a/src/vs/platform/files/node/watcher/unix/watcherService.ts b/src/vs/platform/files/node/watcher/unix/watcherService.ts
index e561cc8e5..75f1bcf90 100644
--- a/src/vs/platform/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/platform/files/node/watcher/unix/watcherService.ts
@@ -40,9 +40,9 @@ export class FileWatcher extends Disposable {
 				serverName: 'File Watcher (chokidar)',
 				args: ['--type=watcherService'],
 				env: {
-					AMD_ENTRYPOINT: 'vs/platform/files/node/watcher/unix/watcherApp',
-					PIPE_LOGGING: 'true',
-					VERBOSE_LOGGING: 'true' // transmit console logs from server to client
+					VSCODE_AMD_ENTRYPOINT: 'vs/platform/files/node/watcher/unix/watcherApp',
+					VSCODE_PIPE_LOGGING: 'true',
+					VSCODE_VERBOSE_LOGGING: 'true' // transmit console logs from server to client
 				}
 			}
 		));
diff --git a/src/vs/platform/files/test/browser/fileService.test.ts b/src/vs/platform/files/test/browser/fileService.test.ts
index edc32f0a3..e8d53c1cf 100644
--- a/src/vs/platform/files/test/browser/fileService.test.ts
+++ b/src/vs/platform/files/test/browser/fileService.test.ts
@@ -19,7 +19,7 @@ suite('File Service', () => {
 		const resource = URI.parse('test://foo/bar');
 		const provider = new NullFileSystemProvider();
 
-		assert.equal(service.canHandleResource(resource), false);
+		assert.strictEqual(service.canHandleResource(resource), false);
 
 		const registrations: IFileSystemProviderRegistrationEvent[] = [];
 		service.onDidChangeFileSystemProviderRegistrations(e => {
@@ -47,33 +47,33 @@ suite('File Service', () => {
 
 		await service.activateProvider('test');
 
-		assert.equal(service.canHandleResource(resource), true);
+		assert.strictEqual(service.canHandleResource(resource), true);
 
-		assert.equal(registrations.length, 1);
-		assert.equal(registrations[0].scheme, 'test');
-		assert.equal(registrations[0].added, true);
+		assert.strictEqual(registrations.length, 1);
+		assert.strictEqual(registrations[0].scheme, 'test');
+		assert.strictEqual(registrations[0].added, true);
 		assert.ok(registrationDisposable);
 
-		assert.equal(capabilityChanges.length, 0);
+		assert.strictEqual(capabilityChanges.length, 0);
 
 		provider.setCapabilities(FileSystemProviderCapabilities.FileFolderCopy);
-		assert.equal(capabilityChanges.length, 1);
+		assert.strictEqual(capabilityChanges.length, 1);
 		provider.setCapabilities(FileSystemProviderCapabilities.Readonly);
-		assert.equal(capabilityChanges.length, 2);
+		assert.strictEqual(capabilityChanges.length, 2);
 
 		await service.activateProvider('test');
-		assert.equal(callCount, 2); // activation is called again
+		assert.strictEqual(callCount, 2); // activation is called again
 
-		assert.equal(service.hasCapability(resource, FileSystemProviderCapabilities.Readonly), true);
-		assert.equal(service.hasCapability(resource, FileSystemProviderCapabilities.FileOpenReadWriteClose), false);
+		assert.strictEqual(service.hasCapability(resource, FileSystemProviderCapabilities.Readonly), true);
+		assert.strictEqual(service.hasCapability(resource, FileSystemProviderCapabilities.FileOpenReadWriteClose), false);
 
 		registrationDisposable!.dispose();
 
-		assert.equal(service.canHandleResource(resource), false);
+		assert.strictEqual(service.canHandleResource(resource), false);
 
-		assert.equal(registrations.length, 2);
-		assert.equal(registrations[1].scheme, 'test');
-		assert.equal(registrations[1].added, false);
+		assert.strictEqual(registrations.length, 2);
+		assert.strictEqual(registrations[1].scheme, 'test');
+		assert.strictEqual(registrations[1].added, false);
 	});
 
 	test('watch', async () => {
@@ -91,9 +91,9 @@ suite('File Service', () => {
 		const watcher1Disposable = service.watch(resource1);
 
 		await timeout(0); // service.watch() is async
-		assert.equal(disposeCounter, 0);
+		assert.strictEqual(disposeCounter, 0);
 		watcher1Disposable.dispose();
-		assert.equal(disposeCounter, 1);
+		assert.strictEqual(disposeCounter, 1);
 
 		disposeCounter = 0;
 		const resource2 = URI.parse('test://foo/bar2');
@@ -102,13 +102,13 @@ suite('File Service', () => {
 		const watcher2Disposable3 = service.watch(resource2);
 
 		await timeout(0); // service.watch() is async
-		assert.equal(disposeCounter, 0);
+		assert.strictEqual(disposeCounter, 0);
 		watcher2Disposable1.dispose();
-		assert.equal(disposeCounter, 0);
+		assert.strictEqual(disposeCounter, 0);
 		watcher2Disposable2.dispose();
-		assert.equal(disposeCounter, 0);
+		assert.strictEqual(disposeCounter, 0);
 		watcher2Disposable3.dispose();
-		assert.equal(disposeCounter, 1);
+		assert.strictEqual(disposeCounter, 1);
 
 		disposeCounter = 0;
 		const resource3 = URI.parse('test://foo/bar3');
@@ -116,10 +116,10 @@ suite('File Service', () => {
 		const watcher3Disposable2 = service.watch(resource3, { recursive: true, excludes: [] });
 
 		await timeout(0); // service.watch() is async
-		assert.equal(disposeCounter, 0);
+		assert.strictEqual(disposeCounter, 0);
 		watcher3Disposable1.dispose();
-		assert.equal(disposeCounter, 1);
+		assert.strictEqual(disposeCounter, 1);
 		watcher3Disposable2.dispose();
-		assert.equal(disposeCounter, 2);
+		assert.strictEqual(disposeCounter, 2);
 	});
 });
diff --git a/src/vs/platform/files/test/browser/indexedDBFileService.test.ts b/src/vs/platform/files/test/browser/indexedDBFileService.test.ts
index abb3034a3..67ccfd9a6 100644
--- a/src/vs/platform/files/test/browser/indexedDBFileService.test.ts
+++ b/src/vs/platform/files/test/browser/indexedDBFileService.test.ts
@@ -6,20 +6,20 @@
 import * as assert from 'assert';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { Schemas } from 'vs/base/common/network';
-import { posix } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
-import { FileOperation, FileOperationEvent } from 'vs/platform/files/common/files';
+import { FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FileSystemProviderErrorCode, FileType, IFileStatWithMetadata } from 'vs/platform/files/common/files';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IIndexedDBFileSystemProvider, IndexedDB, INDEXEDDB_LOGS_OBJECT_STORE, INDEXEDDB_USERDATA_OBJECT_STORE } from 'vs/platform/files/browser/indexedDBFileSystemProvider';
 import { assertIsDefined } from 'vs/base/common/types';
-
-// FileService doesn't work with \ leading a path. Windows join swaps /'s for \'s,
-// making /-style absolute paths fail isAbsolute checks.
-const join = posix.join;
+import { basename, joinPath } from 'vs/base/common/resources';
+import { bufferToReadable, bufferToStream, VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
 
 suite('IndexedDB File Service', function () {
 
+	// IDB sometimes under pressure in build machines.
+	this.retries(3);
+
 	const logSchema = 'logs';
 
 	let service: FileService;
@@ -27,12 +27,43 @@ suite('IndexedDB File Service', function () {
 	let userdataFileProvider: IIndexedDBFileSystemProvider;
 	const testDir = '/';
 
-	const makeLogfileURI = (path: string) => URI.from({ scheme: logSchema, path });
-	const makeUserdataURI = (path: string) => URI.from({ scheme: Schemas.userData, path });
+	const logfileURIFromPaths = (paths: string[]) => joinPath(URI.from({ scheme: logSchema, path: testDir }), ...paths);
+	const userdataURIFromPaths = (paths: readonly string[]) => joinPath(URI.from({ scheme: Schemas.userData, path: testDir }), ...paths);
 
 	const disposables = new DisposableStore();
 
-	setup(async () => {
+	const initFixtures = async () => {
+		await Promise.all(
+			[['fixtures', 'resolver', 'examples'],
+			['fixtures', 'resolver', 'other', 'deep'],
+			['fixtures', 'service', 'deep'],
+			['batched']]
+				.map(path => userdataURIFromPaths(path))
+				.map(uri => service.createFolder(uri)));
+		await Promise.all(
+			([
+				[['fixtures', 'resolver', 'examples', 'company.js'], 'class company {}'],
+				[['fixtures', 'resolver', 'examples', 'conway.js'], 'export function conway() {}'],
+				[['fixtures', 'resolver', 'examples', 'employee.js'], 'export const employee = "jax"'],
+				[['fixtures', 'resolver', 'examples', 'small.js'], ''],
+				[['fixtures', 'resolver', 'other', 'deep', 'company.js'], 'class company {}'],
+				[['fixtures', 'resolver', 'other', 'deep', 'conway.js'], 'export function conway() {}'],
+				[['fixtures', 'resolver', 'other', 'deep', 'employee.js'], 'export const employee = "jax"'],
+				[['fixtures', 'resolver', 'other', 'deep', 'small.js'], ''],
+				[['fixtures', 'resolver', 'index.html'], '<p>p</p>'],
+				[['fixtures', 'resolver', 'site.css'], '.p {color: red;}'],
+				[['fixtures', 'service', 'deep', 'company.js'], 'class company {}'],
+				[['fixtures', 'service', 'deep', 'conway.js'], 'export function conway() {}'],
+				[['fixtures', 'service', 'deep', 'employee.js'], 'export const employee = "jax"'],
+				[['fixtures', 'service', 'deep', 'small.js'], ''],
+				[['fixtures', 'service', 'binary.txt'], '<p>p</p>'],
+			] as const)
+				.map(([path, contents]) => [userdataURIFromPaths(path), contents] as const)
+				.map(([uri, contents]) => service.createFile(uri, VSBuffer.fromString(contents)))
+		);
+	};
+
+	const reload = async () => {
 		const logService = new NullLogService();
 
 		service = new FileService(logService);
@@ -45,33 +76,302 @@ suite('IndexedDB File Service', function () {
 		userdataFileProvider = assertIsDefined(await new IndexedDB().createFileSystemProvider(logSchema, INDEXEDDB_USERDATA_OBJECT_STORE));
 		disposables.add(service.registerProvider(Schemas.userData, userdataFileProvider));
 		disposables.add(userdataFileProvider);
+	};
+
+	setup(async () => {
+		await reload();
 	});
 
 	teardown(async () => {
 		disposables.clear();
+		await logFileProvider.delete(logfileURIFromPaths([]), { recursive: true, useTrash: false });
+		await userdataFileProvider.delete(userdataURIFromPaths([]), { recursive: true, useTrash: false });
+	});
 
-		await logFileProvider.delete(makeLogfileURI(testDir), { recursive: true, useTrash: false });
-		await userdataFileProvider.delete(makeUserdataURI(testDir), { recursive: true, useTrash: false });
+	test('root is always present', async () => {
+		assert.strictEqual((await userdataFileProvider.stat(userdataURIFromPaths([]))).type, FileType.Directory);
+		await userdataFileProvider.delete(userdataURIFromPaths([]), { recursive: true, useTrash: false });
+		assert.strictEqual((await userdataFileProvider.stat(userdataURIFromPaths([]))).type, FileType.Directory);
 	});
 
 	test('createFolder', async () => {
 		let event: FileOperationEvent | undefined;
 		disposables.add(service.onDidRunOperation(e => event = e));
 
-		const parent = await service.resolve(makeUserdataURI(testDir));
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const newFolderResource = joinPath(parent.resource, 'newFolder');
 
-		const newFolderResource = makeUserdataURI(join(parent.resource.path, 'newFolder'));
-
-		assert.equal((await userdataFileProvider.readdir(parent.resource)).length, 0);
+		assert.strictEqual((await userdataFileProvider.readdir(parent.resource)).length, 0);
 		const newFolder = await service.createFolder(newFolderResource);
-		assert.equal(newFolder.name, 'newFolder');
-		// Invalid.. dirs dont exist in our IDBFSB.
-		// assert.equal((await userdataFileProvider.readdir(parent.resource)).length, 1);
+		assert.strictEqual(newFolder.name, 'newFolder');
+		assert.strictEqual((await userdataFileProvider.readdir(parent.resource)).length, 1);
+		assert.strictEqual((await userdataFileProvider.stat(newFolderResource)).type, FileType.Directory);
 
 		assert.ok(event);
-		assert.equal(event!.resource.path, newFolderResource.path);
-		assert.equal(event!.operation, FileOperation.CREATE);
-		assert.equal(event!.target!.resource.path, newFolderResource.path);
-		assert.equal(event!.target!.isDirectory, true);
+		assert.strictEqual(event!.resource.path, newFolderResource.path);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.path, newFolderResource.path);
+		assert.strictEqual(event!.target!.isDirectory, true);
+	});
+
+	test('createFolder: creating multiple folders at once', async () => {
+		let event: FileOperationEvent;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const newFolderResource = joinPath(parent.resource, ...multiFolderPaths);
+
+		const newFolder = await service.createFolder(newFolderResource);
+
+		const lastFolderName = multiFolderPaths[multiFolderPaths.length - 1];
+		assert.strictEqual(newFolder.name, lastFolderName);
+		assert.strictEqual((await userdataFileProvider.stat(newFolderResource)).type, FileType.Directory);
+
+		assert.ok(event!);
+		assert.strictEqual(event!.resource.path, newFolderResource.path);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.path, newFolderResource.path);
+		assert.strictEqual(event!.target!.isDirectory, true);
+	});
+
+	test('exists', async () => {
+		let exists = await service.exists(userdataURIFromPaths([]));
+		assert.strictEqual(exists, true);
+
+		exists = await service.exists(userdataURIFromPaths(['hello']));
+		assert.strictEqual(exists, false);
+	});
+
+	test('resolve - file', async () => {
+		await initFixtures();
+
+		const resource = userdataURIFromPaths(['fixtures', 'resolver', 'index.html']);
+		const resolved = await service.resolve(resource);
+
+		assert.strictEqual(resolved.name, 'index.html');
+		assert.strictEqual(resolved.isFile, true);
+		assert.strictEqual(resolved.isDirectory, false);
+		assert.strictEqual(resolved.isSymbolicLink, false);
+		assert.strictEqual(resolved.resource.toString(), resource.toString());
+		assert.strictEqual(resolved.children, undefined);
+		assert.ok(resolved.size! > 0);
+	});
+
+	test('resolve - directory', async () => {
+		await initFixtures();
+
+		const testsElements = ['examples', 'other', 'index.html', 'site.css'];
+
+		const resource = userdataURIFromPaths(['fixtures', 'resolver']);
+		const result = await service.resolve(resource);
+
+		assert.ok(result);
+		assert.strictEqual(result.resource.toString(), resource.toString());
+		assert.strictEqual(result.name, 'resolver');
+		assert.ok(result.children);
+		assert.ok(result.children!.length > 0);
+		assert.ok(result!.isDirectory);
+		assert.strictEqual(result.children!.length, testsElements.length);
+
+		assert.ok(result.children!.every(entry => {
+			return testsElements.some(name => {
+				return basename(entry.resource) === name;
+			});
+		}));
+
+		result.children!.forEach(value => {
+			assert.ok(basename(value.resource));
+			if (['examples', 'other'].indexOf(basename(value.resource)) >= 0) {
+				assert.ok(value.isDirectory);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
+			} else if (basename(value.resource) === 'index.html') {
+				assert.ok(!value.isDirectory);
+				assert.ok(!value.children);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
+			} else if (basename(value.resource) === 'site.css') {
+				assert.ok(!value.isDirectory);
+				assert.ok(!value.children);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
+			} else {
+				assert.ok(!'Unexpected value ' + basename(value.resource));
+			}
+		});
+	});
+
+	test('createFile', async () => {
+		return assertCreateFile(contents => VSBuffer.fromString(contents));
+	});
+
+	test('createFile (readable)', async () => {
+		return assertCreateFile(contents => bufferToReadable(VSBuffer.fromString(contents)));
+	});
+
+	test('createFile (stream)', async () => {
+		return assertCreateFile(contents => bufferToStream(VSBuffer.fromString(contents)));
+	});
+
+	async function assertCreateFile(converter: (content: string) => VSBuffer | VSBufferReadable | VSBufferReadableStream): Promise<void> {
+		let event: FileOperationEvent;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const contents = 'Hello World';
+		const resource = userdataURIFromPaths(['test.txt']);
+
+		assert.strictEqual(await service.canCreateFile(resource), true);
+		const fileStat = await service.createFile(resource, converter(contents));
+		assert.strictEqual(fileStat.name, 'test.txt');
+		assert.strictEqual((await userdataFileProvider.stat(fileStat.resource)).type, FileType.File);
+		assert.strictEqual(new TextDecoder().decode(await userdataFileProvider.readFile(fileStat.resource)), contents);
+
+		assert.ok(event!);
+		assert.strictEqual(event!.resource.path, resource.path);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.path, resource.path);
+	}
+
+	const makeBatchTester = (size: number, name: string) => {
+		const batch = Array.from({ length: 50 }).map((_, i) => ({ contents: `Hello${i}`, resource: userdataURIFromPaths(['batched', name, `Hello${i}.txt`]) }));
+		let stats: Promise<IFileStatWithMetadata[]> | undefined = undefined;
+		return {
+			async create() {
+				return stats = Promise.all(batch.map(entry => service.createFile(entry.resource, VSBuffer.fromString(entry.contents))));
+			},
+			async assertContentsCorrect() {
+				await Promise.all(batch.map(async (entry, i) => {
+					if (!stats) { throw Error('read called before create'); }
+					const stat = (await stats!)[i];
+					assert.strictEqual(stat.name, `Hello${i}.txt`);
+					assert.strictEqual((await userdataFileProvider.stat(stat.resource)).type, FileType.File);
+					assert.strictEqual(new TextDecoder().decode(await userdataFileProvider.readFile(stat.resource)), entry.contents);
+				}));
+			},
+			async delete() {
+				await service.del(userdataURIFromPaths(['batched', name]), { recursive: true, useTrash: false });
+			},
+			async assertContentsEmpty() {
+				if (!stats) { throw Error('assertContentsEmpty called before create'); }
+				await Promise.all((await stats).map(async stat => {
+					const newStat = await userdataFileProvider.stat(stat.resource).catch(e => e.code);
+					assert.strictEqual(newStat, FileSystemProviderErrorCode.FileNotFound);
+				}));
+			}
+		};
+	};
+
+	test('createFile (small batch)', async () => {
+		const tester = makeBatchTester(50, 'smallBatch');
+		await tester.create();
+		await tester.assertContentsCorrect();
+		await tester.delete();
+		await tester.assertContentsEmpty();
+	});
+
+	test('createFile (mixed parallel/sequential)', async () => {
+		const single1 = makeBatchTester(1, 'single1');
+		const single2 = makeBatchTester(1, 'single2');
+
+		const batch1 = makeBatchTester(20, 'batch1');
+		const batch2 = makeBatchTester(20, 'batch2');
+
+		single1.create();
+		batch1.create();
+		await Promise.all([single1.assertContentsCorrect(), batch1.assertContentsCorrect()]);
+		single2.create();
+		batch2.create();
+		await Promise.all([single2.assertContentsCorrect(), batch2.assertContentsCorrect()]);
+		await Promise.all([single1.assertContentsCorrect(), batch1.assertContentsCorrect()]);
+
+		await (Promise.all([single1.delete(), single2.delete(), batch1.delete(), batch2.delete()]));
+		await (Promise.all([single1.assertContentsEmpty(), single2.assertContentsEmpty(), batch1.assertContentsEmpty(), batch2.assertContentsEmpty()]));
+	});
+
+	test('deleteFile', async () => {
+		await initFixtures();
+
+		let event: FileOperationEvent;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const anotherResource = userdataURIFromPaths(['fixtures', 'service', 'deep', 'company.js']);
+		const resource = userdataURIFromPaths(['fixtures', 'service', 'deep', 'conway.js']);
+		const source = await service.resolve(resource);
+
+		assert.strictEqual(await service.canDelete(source.resource, { useTrash: false }), true);
+		await service.del(source.resource, { useTrash: false });
+
+		assert.strictEqual(await service.exists(source.resource), false);
+		assert.strictEqual(await service.exists(anotherResource), true);
+
+		assert.ok(event!);
+		assert.strictEqual(event!.resource.path, resource.path);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
+
+		{
+			let error: Error | undefined = undefined;
+			try {
+				await service.del(source.resource, { useTrash: false });
+			} catch (e) {
+				error = e;
+			}
+
+			assert.ok(error);
+			assert.strictEqual((<FileOperationError>error).fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
+		}
+		await reload();
+		{
+			let error: Error | undefined = undefined;
+			try {
+				await service.del(source.resource, { useTrash: false });
+			} catch (e) {
+				error = e;
+			}
+
+			assert.ok(error);
+			assert.strictEqual((<FileOperationError>error).fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
+		}
+	});
+
+	test('deleteFolder (recursive)', async () => {
+		await initFixtures();
+		let event: FileOperationEvent;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const resource = userdataURIFromPaths(['fixtures', 'service', 'deep']);
+		const subResource1 = userdataURIFromPaths(['fixtures', 'service', 'deep', 'company.js']);
+		const subResource2 = userdataURIFromPaths(['fixtures', 'service', 'deep', 'conway.js']);
+		assert.strictEqual(await service.exists(subResource1), true);
+		assert.strictEqual(await service.exists(subResource2), true);
+
+		const source = await service.resolve(resource);
+
+		assert.strictEqual(await service.canDelete(source.resource, { recursive: true, useTrash: false }), true);
+		await service.del(source.resource, { recursive: true, useTrash: false });
+
+		assert.strictEqual(await service.exists(source.resource), false);
+		assert.strictEqual(await service.exists(subResource1), false);
+		assert.strictEqual(await service.exists(subResource2), false);
+		assert.ok(event!);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
+	});
+
+
+	test('deleteFolder (non recursive)', async () => {
+		await initFixtures();
+		const resource = userdataURIFromPaths(['fixtures', 'service', 'deep']);
+		const source = await service.resolve(resource);
+
+		assert.ok((await service.canDelete(source.resource)) instanceof Error);
+
+		let error;
+		try {
+			await service.del(source.resource);
+		} catch (e) {
+			error = e;
+		}
+		assert.ok(error);
 	});
 });
diff --git a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
index 4f7a0b94c..4c8f13fc8 100644
--- a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
+++ b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts
@@ -8,11 +8,10 @@ import { tmpdir } from 'os';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { Schemas } from 'vs/base/common/network';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
-import { generateUuid } from 'vs/base/common/uuid';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { join, basename, dirname, posix } from 'vs/base/common/path';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { copy, rimraf, symlink, RimRafMode, rimrafSync } from 'vs/base/node/pfs';
+import { copy, rimraf, symlink, rimrafSync } from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { existsSync, statSync, readdirSync, readFileSync, writeFileSync, renameSync, unlinkSync, mkdirSync, createReadStream } from 'fs';
 import { FileOperation, FileOperationEvent, IFileStat, FileOperationResult, FileSystemProviderCapabilities, FileChangeType, IFileChange, FileChangesEvent, FileOperationError, etag, IStat, IFileStatWithMetadata } from 'vs/platform/files/common/files';
@@ -118,26 +117,18 @@ export class TestDiskFileSystemProvider extends DiskFileSystemProvider {
 	}
 }
 
-suite('Disk File Service', function () {
+flakySuite('Disk File Service', function () {
 
-	const parentDir = getRandomTestPath(tmpdir(), 'vsctests', 'diskfileservice');
 	const testSchema = 'test';
 
 	let service: FileService;
 	let fileProvider: TestDiskFileSystemProvider;
 	let testProvider: TestDiskFileSystemProvider;
+
 	let testDir: string;
 
 	const disposables = new DisposableStore();
 
-	// Given issues such as https://github.com/microsoft/vscode/issues/78602
-	// and https://github.com/microsoft/vscode/issues/92334 we see random test
-	// failures when accessing the native file system. To diagnose further, we
-	// retry node.js file access tests up to 3 times to rule out any random disk
-	// issue and increase the timeout.
-	this.retries(3);
-	this.timeout(1000 * 10);
-
 	setup(async () => {
 		const logService = new NullLogService();
 
@@ -152,17 +143,17 @@ suite('Disk File Service', function () {
 		disposables.add(service.registerProvider(testSchema, testProvider));
 		disposables.add(testProvider);
 
-		const id = generateUuid();
-		testDir = join(parentDir, id);
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'diskfileservice');
+
 		const sourceDir = getPathFromAmdModule(require, './fixtures/service');
 
 		await copy(sourceDir, testDir);
 	});
 
-	teardown(async () => {
+	teardown(() => {
 		disposables.clear();
 
-		await rimraf(parentDir, RimRafMode.MOVE);
+		return rimraf(testDir);
 	});
 
 	test('createFolder', async () => {
@@ -175,14 +166,14 @@ suite('Disk File Service', function () {
 
 		const newFolder = await service.createFolder(newFolderResource);
 
-		assert.equal(newFolder.name, 'newFolder');
-		assert.equal(existsSync(newFolder.resource.fsPath), true);
+		assert.strictEqual(newFolder.name, 'newFolder');
+		assert.strictEqual(existsSync(newFolder.resource.fsPath), true);
 
 		assert.ok(event);
-		assert.equal(event!.resource.fsPath, newFolderResource.fsPath);
-		assert.equal(event!.operation, FileOperation.CREATE);
-		assert.equal(event!.target!.resource.fsPath, newFolderResource.fsPath);
-		assert.equal(event!.target!.isDirectory, true);
+		assert.strictEqual(event!.resource.fsPath, newFolderResource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.fsPath, newFolderResource.fsPath);
+		assert.strictEqual(event!.target!.isDirectory, true);
 	});
 
 	test('createFolder: creating multiple folders at once', async () => {
@@ -197,34 +188,34 @@ suite('Disk File Service', function () {
 		const newFolder = await service.createFolder(newFolderResource);
 
 		const lastFolderName = multiFolderPaths[multiFolderPaths.length - 1];
-		assert.equal(newFolder.name, lastFolderName);
-		assert.equal(existsSync(newFolder.resource.fsPath), true);
+		assert.strictEqual(newFolder.name, lastFolderName);
+		assert.strictEqual(existsSync(newFolder.resource.fsPath), true);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, newFolderResource.fsPath);
-		assert.equal(event!.operation, FileOperation.CREATE);
-		assert.equal(event!.target!.resource.fsPath, newFolderResource.fsPath);
-		assert.equal(event!.target!.isDirectory, true);
+		assert.strictEqual(event!.resource.fsPath, newFolderResource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.fsPath, newFolderResource.fsPath);
+		assert.strictEqual(event!.target!.isDirectory, true);
 	});
 
 	test('exists', async () => {
 		let exists = await service.exists(URI.file(testDir));
-		assert.equal(exists, true);
+		assert.strictEqual(exists, true);
 
 		exists = await service.exists(URI.file(testDir + 'something'));
-		assert.equal(exists, false);
+		assert.strictEqual(exists, false);
 	});
 
 	test('resolve - file', async () => {
 		const resource = URI.file(getPathFromAmdModule(require, './fixtures/resolver/index.html'));
 		const resolved = await service.resolve(resource);
 
-		assert.equal(resolved.name, 'index.html');
-		assert.equal(resolved.isFile, true);
-		assert.equal(resolved.isDirectory, false);
-		assert.equal(resolved.isSymbolicLink, false);
-		assert.equal(resolved.resource.toString(), resource.toString());
-		assert.equal(resolved.children, undefined);
+		assert.strictEqual(resolved.name, 'index.html');
+		assert.strictEqual(resolved.isFile, true);
+		assert.strictEqual(resolved.isDirectory, false);
+		assert.strictEqual(resolved.isSymbolicLink, false);
+		assert.strictEqual(resolved.resource.toString(), resource.toString());
+		assert.strictEqual(resolved.children, undefined);
 		assert.ok(resolved.mtime! > 0);
 		assert.ok(resolved.ctime! > 0);
 		assert.ok(resolved.size! > 0);
@@ -237,14 +228,14 @@ suite('Disk File Service', function () {
 		const result = await service.resolve(resource);
 
 		assert.ok(result);
-		assert.equal(result.resource.toString(), resource.toString());
-		assert.equal(result.name, 'resolver');
+		assert.strictEqual(result.resource.toString(), resource.toString());
+		assert.strictEqual(result.name, 'resolver');
 		assert.ok(result.children);
 		assert.ok(result.children!.length > 0);
 		assert.ok(result!.isDirectory);
 		assert.ok(result.mtime! > 0);
 		assert.ok(result.ctime! > 0);
-		assert.equal(result.children!.length, testsElements.length);
+		assert.strictEqual(result.children!.length, testsElements.length);
 
 		assert.ok(result.children!.every(entry => {
 			return testsElements.some(name => {
@@ -256,18 +247,18 @@ suite('Disk File Service', function () {
 			assert.ok(basename(value.resource.fsPath));
 			if (['examples', 'other'].indexOf(basename(value.resource.fsPath)) >= 0) {
 				assert.ok(value.isDirectory);
-				assert.equal(value.mtime, undefined);
-				assert.equal(value.ctime, undefined);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
 			} else if (basename(value.resource.fsPath) === 'index.html') {
 				assert.ok(!value.isDirectory);
 				assert.ok(!value.children);
-				assert.equal(value.mtime, undefined);
-				assert.equal(value.ctime, undefined);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
 			} else if (basename(value.resource.fsPath) === 'site.css') {
 				assert.ok(!value.isDirectory);
 				assert.ok(!value.children);
-				assert.equal(value.mtime, undefined);
-				assert.equal(value.ctime, undefined);
+				assert.strictEqual(value.mtime, undefined);
+				assert.strictEqual(value.ctime, undefined);
 			} else {
 				assert.ok(!'Unexpected value ' + basename(value.resource.fsPath));
 			}
@@ -280,13 +271,13 @@ suite('Disk File Service', function () {
 		const result = await service.resolve(URI.file(getPathFromAmdModule(require, './fixtures/resolver')), { resolveMetadata: true });
 
 		assert.ok(result);
-		assert.equal(result.name, 'resolver');
+		assert.strictEqual(result.name, 'resolver');
 		assert.ok(result.children);
 		assert.ok(result.children!.length > 0);
 		assert.ok(result!.isDirectory);
 		assert.ok(result.mtime! > 0);
 		assert.ok(result.ctime! > 0);
-		assert.equal(result.children!.length, testsElements.length);
+		assert.strictEqual(result.children!.length, testsElements.length);
 
 		assert.ok(result.children!.every(entry => {
 			return testsElements.some(name => {
@@ -320,10 +311,10 @@ suite('Disk File Service', function () {
 
 	test('resolve - directory with resolveTo', async () => {
 		const resolved = await service.resolve(URI.file(testDir), { resolveTo: [URI.file(join(testDir, 'deep'))] });
-		assert.equal(resolved.children!.length, 8);
+		assert.strictEqual(resolved.children!.length, 8);
 
 		const deep = (getByName(resolved, 'deep')!);
-		assert.equal(deep.children!.length, 4);
+		assert.strictEqual(deep.children!.length, 4);
 	});
 
 	test('resolve - directory - resolveTo single directory', async () => {
@@ -336,7 +327,7 @@ suite('Disk File Service', function () {
 		assert.ok(result.isDirectory);
 
 		const children = result.children!;
-		assert.equal(children.length, 4);
+		assert.strictEqual(children.length, 4);
 
 		const other = getByName(result, 'other');
 		assert.ok(other);
@@ -345,7 +336,7 @@ suite('Disk File Service', function () {
 		const deep = getByName(other!, 'deep');
 		assert.ok(deep);
 		assert.ok(deep!.children!.length > 0);
-		assert.equal(deep!.children!.length, 4);
+		assert.strictEqual(deep!.children!.length, 4);
 	});
 
 	test('resolve directory - resolveTo multiple directories', async () => {
@@ -363,7 +354,7 @@ suite('Disk File Service', function () {
 		assert.ok(result.isDirectory);
 
 		const children = result.children!;
-		assert.equal(children.length, 4);
+		assert.strictEqual(children.length, 4);
 
 		const other = getByName(result, 'other');
 		assert.ok(other);
@@ -372,12 +363,12 @@ suite('Disk File Service', function () {
 		const deep = getByName(other!, 'deep');
 		assert.ok(deep);
 		assert.ok(deep!.children!.length > 0);
-		assert.equal(deep!.children!.length, 4);
+		assert.strictEqual(deep!.children!.length, 4);
 
 		const examples = getByName(result, 'examples');
 		assert.ok(examples);
 		assert.ok(examples!.children!.length > 0);
-		assert.equal(examples!.children!.length, 4);
+		assert.strictEqual(examples!.children!.length, 4);
 	});
 
 	test('resolve directory - resolveSingleChildFolders', async () => {
@@ -390,12 +381,12 @@ suite('Disk File Service', function () {
 		assert.ok(result.isDirectory);
 
 		const children = result.children!;
-		assert.equal(children.length, 1);
+		assert.strictEqual(children.length, 1);
 
 		let deep = getByName(result, 'deep');
 		assert.ok(deep);
 		assert.ok(deep!.children!.length > 0);
-		assert.equal(deep!.children!.length, 4);
+		assert.strictEqual(deep!.children!.length, 4);
 	});
 
 	test('resolves', async () => {
@@ -405,41 +396,41 @@ suite('Disk File Service', function () {
 		]);
 
 		const r1 = (res[0].stat!);
-		assert.equal(r1.children!.length, 8);
+		assert.strictEqual(r1.children!.length, 8);
 
 		const deep = (getByName(r1, 'deep')!);
-		assert.equal(deep.children!.length, 4);
+		assert.strictEqual(deep.children!.length, 4);
 
 		const r2 = (res[1].stat!);
-		assert.equal(r2.children!.length, 4);
-		assert.equal(r2.name, 'deep');
+		assert.strictEqual(r2.children!.length, 4);
+		assert.strictEqual(r2.name, 'deep');
 	});
 
-	(isWindows /* not reliable on windows */ ? test.skip : test)('resolve - folder symbolic link', async () => {
+	test('resolve - folder symbolic link', async () => {
 		const link = URI.file(join(testDir, 'deep-link'));
-		await symlink(join(testDir, 'deep'), link.fsPath);
+		await symlink(join(testDir, 'deep'), link.fsPath, 'junction');
 
 		const resolved = await service.resolve(link);
-		assert.equal(resolved.children!.length, 4);
-		assert.equal(resolved.isDirectory, true);
-		assert.equal(resolved.isSymbolicLink, true);
+		assert.strictEqual(resolved.children!.length, 4);
+		assert.strictEqual(resolved.isDirectory, true);
+		assert.strictEqual(resolved.isSymbolicLink, true);
 	});
 
-	(isWindows /* not reliable on windows */ ? test.skip : test)('resolve - file symbolic link', async () => {
+	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('resolve - file symbolic link', async () => {
 		const link = URI.file(join(testDir, 'lorem.txt-linked'));
 		await symlink(join(testDir, 'lorem.txt'), link.fsPath);
 
 		const resolved = await service.resolve(link);
-		assert.equal(resolved.isDirectory, false);
-		assert.equal(resolved.isSymbolicLink, true);
+		assert.strictEqual(resolved.isDirectory, false);
+		assert.strictEqual(resolved.isSymbolicLink, true);
 	});
 
-	(isWindows /* not reliable on windows */ ? test.skip : test)('resolve - symbolic link pointing to non-existing file does not break', async () => {
-		await symlink(join(testDir, 'foo'), join(testDir, 'bar'));
+	test('resolve - symbolic link pointing to non-existing file does not break', async () => {
+		await symlink(join(testDir, 'foo'), join(testDir, 'bar'), 'junction');
 
 		const resolved = await service.resolve(URI.file(testDir));
-		assert.equal(resolved.isDirectory, true);
-		assert.equal(resolved.children!.length, 9);
+		assert.strictEqual(resolved.isDirectory, true);
+		assert.strictEqual(resolved.children!.length, 9);
 
 		const resolvedLink = resolved.children?.find(child => child.name === 'bar' && child.isSymbolicLink);
 		assert.ok(resolvedLink);
@@ -463,14 +454,14 @@ suite('Disk File Service', function () {
 		const resource = URI.file(join(testDir, 'deep', 'conway.js'));
 		const source = await service.resolve(resource);
 
-		assert.equal(await service.canDelete(source.resource, { useTrash }), true);
+		assert.strictEqual(await service.canDelete(source.resource, { useTrash }), true);
 		await service.del(source.resource, { useTrash });
 
-		assert.equal(existsSync(source.resource.fsPath), false);
+		assert.strictEqual(existsSync(source.resource.fsPath), false);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, resource.fsPath);
-		assert.equal(event!.operation, FileOperation.DELETE);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
 
 		let error: Error | undefined = undefined;
 		try {
@@ -480,10 +471,10 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal((<FileOperationError>error).fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
+		assert.strictEqual((<FileOperationError>error).fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
 	}
 
-	(isWindows /* not reliable on windows */ ? test.skip : test)('deleteFile - symbolic link (exists)', async () => {
+	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('deleteFile - symbolic link (exists)', async () => {
 		const target = URI.file(join(testDir, 'lorem.txt'));
 		const link = URI.file(join(testDir, 'lorem.txt-linked'));
 		await symlink(target.fsPath, link.fsPath);
@@ -493,19 +484,19 @@ suite('Disk File Service', function () {
 		let event: FileOperationEvent;
 		disposables.add(service.onDidRunOperation(e => event = e));
 
-		assert.equal(await service.canDelete(source.resource), true);
+		assert.strictEqual(await service.canDelete(source.resource), true);
 		await service.del(source.resource);
 
-		assert.equal(existsSync(source.resource.fsPath), false);
+		assert.strictEqual(existsSync(source.resource.fsPath), false);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, link.fsPath);
-		assert.equal(event!.operation, FileOperation.DELETE);
+		assert.strictEqual(event!.resource.fsPath, link.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
 
-		assert.equal(existsSync(target.fsPath), true); // target the link pointed to is never deleted
+		assert.strictEqual(existsSync(target.fsPath), true); // target the link pointed to is never deleted
 	});
 
-	(isWindows /* not reliable on windows */ ? test.skip : test)('deleteFile - symbolic link (pointing to non-existing file)', async () => {
+	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('deleteFile - symbolic link (pointing to non-existing file)', async () => {
 		const target = URI.file(join(testDir, 'foo'));
 		const link = URI.file(join(testDir, 'bar'));
 		await symlink(target.fsPath, link.fsPath);
@@ -513,14 +504,14 @@ suite('Disk File Service', function () {
 		let event: FileOperationEvent;
 		disposables.add(service.onDidRunOperation(e => event = e));
 
-		assert.equal(await service.canDelete(link), true);
+		assert.strictEqual(await service.canDelete(link), true);
 		await service.del(link);
 
-		assert.equal(existsSync(link.fsPath), false);
+		assert.strictEqual(existsSync(link.fsPath), false);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, link.fsPath);
-		assert.equal(event!.operation, FileOperation.DELETE);
+		assert.strictEqual(event!.resource.fsPath, link.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
 	});
 
 	test('deleteFolder (recursive)', async () => {
@@ -538,13 +529,13 @@ suite('Disk File Service', function () {
 		const resource = URI.file(join(testDir, 'deep'));
 		const source = await service.resolve(resource);
 
-		assert.equal(await service.canDelete(source.resource, { recursive: true, useTrash }), true);
+		assert.strictEqual(await service.canDelete(source.resource, { recursive: true, useTrash }), true);
 		await service.del(source.resource, { recursive: true, useTrash });
 
-		assert.equal(existsSync(source.resource.fsPath), false);
+		assert.strictEqual(existsSync(source.resource.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, resource.fsPath);
-		assert.equal(event!.operation, FileOperation.DELETE);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.DELETE);
 	}
 
 	test('deleteFolder (non recursive)', async () => {
@@ -572,20 +563,20 @@ suite('Disk File Service', function () {
 
 		const target = URI.file(join(dirname(source.fsPath), 'other.html'));
 
-		assert.equal(await service.canMove(source, target), true);
+		assert.strictEqual(await service.canMove(source, target), true);
 		const renamed = await service.move(source, target);
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(existsSync(source.fsPath), false);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 
 		const targetContents = readFileSync(target.fsPath);
 
-		assert.equal(sourceContents.byteLength, targetContents.byteLength);
-		assert.equal(sourceContents.toString(), targetContents.toString());
+		assert.strictEqual(sourceContents.byteLength, targetContents.byteLength);
+		assert.strictEqual(sourceContents.toString(), targetContents.toString());
 	});
 
 	test('move - across providers (buffered => buffered)', async () => {
@@ -653,20 +644,20 @@ suite('Disk File Service', function () {
 
 		const target = URI.file(join(dirname(source.fsPath), 'other.html')).with({ scheme: testSchema });
 
-		assert.equal(await service.canMove(source, target), true);
+		assert.strictEqual(await service.canMove(source, target), true);
 		const renamed = await service.move(source, target);
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(existsSync(source.fsPath), false);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.fsPath);
-		assert.equal(event!.operation, FileOperation.COPY);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.COPY);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 
 		const targetContents = readFileSync(target.fsPath);
 
-		assert.equal(sourceContents.byteLength, targetContents.byteLength);
-		assert.equal(sourceContents.toString(), targetContents.toString());
+		assert.strictEqual(sourceContents.byteLength, targetContents.byteLength);
+		assert.strictEqual(sourceContents.toString(), targetContents.toString());
 	}
 
 	test('move - multi folder', async () => {
@@ -678,15 +669,15 @@ suite('Disk File Service', function () {
 
 		const source = URI.file(join(testDir, 'index.html'));
 
-		assert.equal(await service.canMove(source, URI.file(join(dirname(source.fsPath), renameToPath))), true);
+		assert.strictEqual(await service.canMove(source, URI.file(join(dirname(source.fsPath), renameToPath))), true);
 		const renamed = await service.move(source, URI.file(join(dirname(source.fsPath), renameToPath)));
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(existsSync(source.fsPath), false);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 	});
 
 	test('move - directory', async () => {
@@ -695,15 +686,15 @@ suite('Disk File Service', function () {
 
 		const source = URI.file(join(testDir, 'deep'));
 
-		assert.equal(await service.canMove(source, URI.file(join(dirname(source.fsPath), 'deeper'))), true);
+		assert.strictEqual(await service.canMove(source, URI.file(join(dirname(source.fsPath), 'deeper'))), true);
 		const renamed = await service.move(source, URI.file(join(dirname(source.fsPath), 'deeper')));
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(existsSync(source.fsPath), false);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 	});
 
 	test('move - directory - across providers (buffered => buffered)', async () => {
@@ -743,20 +734,20 @@ suite('Disk File Service', function () {
 
 		const target = URI.file(join(dirname(source.fsPath), 'deeper')).with({ scheme: testSchema });
 
-		assert.equal(await service.canMove(source, target), true);
+		assert.strictEqual(await service.canMove(source, target), true);
 		const renamed = await service.move(source, target);
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(existsSync(source.fsPath), false);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.fsPath), false);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.fsPath);
-		assert.equal(event!.operation, FileOperation.COPY);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.COPY);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 
 		const targetChildren = readdirSync(target.fsPath);
-		assert.equal(sourceChildren.length, targetChildren.length);
+		assert.strictEqual(sourceChildren.length, targetChildren.length);
 		for (let i = 0; i < sourceChildren.length; i++) {
-			assert.equal(sourceChildren[i], targetChildren[i]);
+			assert.strictEqual(sourceChildren[i], targetChildren[i]);
 		}
 	}
 
@@ -768,18 +759,18 @@ suite('Disk File Service', function () {
 		assert.ok(source.size > 0);
 
 		const renamedResource = URI.file(join(dirname(source.resource.fsPath), 'INDEX.html'));
-		assert.equal(await service.canMove(source.resource, renamedResource), true);
+		assert.strictEqual(await service.canMove(source.resource, renamedResource), true);
 		let renamed = await service.move(source.resource, renamedResource);
 
-		assert.equal(existsSync(renamedResource.fsPath), true);
-		assert.equal(basename(renamedResource.fsPath), 'INDEX.html');
+		assert.strictEqual(existsSync(renamedResource.fsPath), true);
+		assert.strictEqual(basename(renamedResource.fsPath), 'INDEX.html');
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamedResource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamedResource.fsPath);
 
 		renamed = await service.resolve(renamedResource, { resolveMetadata: true });
-		assert.equal(source.size, renamed.size);
+		assert.strictEqual(source.size, renamed.size);
 	});
 
 	test('move - same file', async () => {
@@ -789,18 +780,18 @@ suite('Disk File Service', function () {
 		const source = await service.resolve(URI.file(join(testDir, 'index.html')), { resolveMetadata: true });
 		assert.ok(source.size > 0);
 
-		assert.equal(await service.canMove(source.resource, URI.file(source.resource.fsPath)), true);
+		assert.strictEqual(await service.canMove(source.resource, URI.file(source.resource.fsPath)), true);
 		let renamed = await service.move(source.resource, URI.file(source.resource.fsPath));
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(basename(renamed.resource.fsPath), 'index.html');
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(basename(renamed.resource.fsPath), 'index.html');
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 
 		renamed = await service.resolve(renamed.resource, { resolveMetadata: true });
-		assert.equal(source.size, renamed.size);
+		assert.strictEqual(source.size, renamed.size);
 	});
 
 	test('move - same file #2', async () => {
@@ -813,18 +804,18 @@ suite('Disk File Service', function () {
 		const targetParent = URI.file(testDir);
 		const target = targetParent.with({ path: posix.join(targetParent.path, posix.basename(source.resource.path)) });
 
-		assert.equal(await service.canMove(source.resource, target), true);
+		assert.strictEqual(await service.canMove(source.resource, target), true);
 		let renamed = await service.move(source.resource, target);
 
-		assert.equal(existsSync(renamed.resource.fsPath), true);
-		assert.equal(basename(renamed.resource.fsPath), 'index.html');
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(basename(renamed.resource.fsPath), 'index.html');
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.MOVE);
-		assert.equal(event!.target!.resource.fsPath, renamed.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.MOVE);
+		assert.strictEqual(event!.target!.resource.fsPath, renamed.resource.fsPath);
 
 		renamed = await service.resolve(renamed.resource, { resolveMetadata: true });
-		assert.equal(source.size, renamed.size);
+		assert.strictEqual(source.size, renamed.size);
 	});
 
 	test('move - source parent of target', async () => {
@@ -848,7 +839,7 @@ suite('Disk File Service', function () {
 		assert.ok(!event!);
 
 		source = await service.resolve(source.resource, { resolveMetadata: true });
-		assert.equal(originalSize, source.size);
+		assert.strictEqual(originalSize, source.size);
 	});
 
 	test('move - FILE_MOVE_CONFLICT', async () => {
@@ -868,11 +859,11 @@ suite('Disk File Service', function () {
 			error = e;
 		}
 
-		assert.equal(error.fileOperationResult, FileOperationResult.FILE_MOVE_CONFLICT);
+		assert.strictEqual(error.fileOperationResult, FileOperationResult.FILE_MOVE_CONFLICT);
 		assert.ok(!event!);
 
 		source = await service.resolve(source.resource, { resolveMetadata: true });
-		assert.equal(originalSize, source.size);
+		assert.strictEqual(originalSize, source.size);
 	});
 
 	test('move - overwrite folder with file', async () => {
@@ -894,17 +885,17 @@ suite('Disk File Service', function () {
 		const f = await service.createFolder(folderResource);
 		const source = URI.file(join(testDir, 'deep', 'conway.js'));
 
-		assert.equal(await service.canMove(source, f.resource, true), true);
+		assert.strictEqual(await service.canMove(source, f.resource, true), true);
 		const moved = await service.move(source, f.resource, true);
 
-		assert.equal(existsSync(moved.resource.fsPath), true);
+		assert.strictEqual(existsSync(moved.resource.fsPath), true);
 		assert.ok(statSync(moved.resource.fsPath).isFile);
 		assert.ok(createEvent!);
 		assert.ok(deleteEvent!);
 		assert.ok(moveEvent!);
-		assert.equal(moveEvent!.resource.fsPath, source.fsPath);
-		assert.equal(moveEvent!.target!.resource.fsPath, moved.resource.fsPath);
-		assert.equal(deleteEvent!.resource.fsPath, folderResource.fsPath);
+		assert.strictEqual(moveEvent!.resource.fsPath, source.fsPath);
+		assert.strictEqual(moveEvent!.target!.resource.fsPath, moved.resource.fsPath);
+		assert.strictEqual(deleteEvent!.resource.fsPath, folderResource.fsPath);
 	});
 
 	test('copy', async () => {
@@ -949,21 +940,21 @@ suite('Disk File Service', function () {
 		const source = await service.resolve(URI.file(join(testDir, sourceName)));
 		const target = URI.file(join(testDir, 'other.html'));
 
-		assert.equal(await service.canCopy(source.resource, target), true);
+		assert.strictEqual(await service.canCopy(source.resource, target), true);
 		const copied = await service.copy(source.resource, target);
 
-		assert.equal(existsSync(copied.resource.fsPath), true);
-		assert.equal(existsSync(source.resource.fsPath), true);
+		assert.strictEqual(existsSync(copied.resource.fsPath), true);
+		assert.strictEqual(existsSync(source.resource.fsPath), true);
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.COPY);
-		assert.equal(event!.target!.resource.fsPath, copied.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.COPY);
+		assert.strictEqual(event!.target!.resource.fsPath, copied.resource.fsPath);
 
 		const sourceContents = readFileSync(source.resource.fsPath);
 		const targetContents = readFileSync(target.fsPath);
 
-		assert.equal(sourceContents.byteLength, targetContents.byteLength);
-		assert.equal(sourceContents.toString(), targetContents.toString());
+		assert.strictEqual(sourceContents.byteLength, targetContents.byteLength);
+		assert.strictEqual(sourceContents.toString(), targetContents.toString());
 	}
 
 	test('copy - overwrite folder with file', async () => {
@@ -985,17 +976,17 @@ suite('Disk File Service', function () {
 		const f = await service.createFolder(folderResource);
 		const source = URI.file(join(testDir, 'deep', 'conway.js'));
 
-		assert.equal(await service.canCopy(source, f.resource, true), true);
+		assert.strictEqual(await service.canCopy(source, f.resource, true), true);
 		const copied = await service.copy(source, f.resource, true);
 
-		assert.equal(existsSync(copied.resource.fsPath), true);
+		assert.strictEqual(existsSync(copied.resource.fsPath), true);
 		assert.ok(statSync(copied.resource.fsPath).isFile);
 		assert.ok(createEvent!);
 		assert.ok(deleteEvent!);
 		assert.ok(copyEvent!);
-		assert.equal(copyEvent!.resource.fsPath, source.fsPath);
-		assert.equal(copyEvent!.target!.resource.fsPath, copied.resource.fsPath);
-		assert.equal(deleteEvent!.resource.fsPath, folderResource.fsPath);
+		assert.strictEqual(copyEvent!.resource.fsPath, source.fsPath);
+		assert.strictEqual(copyEvent!.target!.resource.fsPath, copied.resource.fsPath);
+		assert.strictEqual(deleteEvent!.resource.fsPath, folderResource.fsPath);
 	});
 
 	test('copy - MIX CASE same target - no overwrite', async () => {
@@ -1017,17 +1008,17 @@ suite('Disk File Service', function () {
 
 		if (isLinux) {
 			assert.ok(!error);
-			assert.equal(canCopy, true);
+			assert.strictEqual(canCopy, true);
 
-			assert.equal(existsSync(copied!.resource.fsPath), true);
+			assert.strictEqual(existsSync(copied!.resource.fsPath), true);
 			assert.ok(readdirSync(testDir).some(f => f === 'INDEX.html'));
-			assert.equal(source.size, copied!.size);
+			assert.strictEqual(source.size, copied!.size);
 		} else {
 			assert.ok(error);
 			assert.ok(canCopy instanceof Error);
 
 			source = await service.resolve(source.resource, { resolveMetadata: true });
-			assert.equal(originalSize, source.size);
+			assert.strictEqual(originalSize, source.size);
 		}
 	});
 
@@ -1050,17 +1041,17 @@ suite('Disk File Service', function () {
 
 		if (isLinux) {
 			assert.ok(!error);
-			assert.equal(canCopy, true);
+			assert.strictEqual(canCopy, true);
 
-			assert.equal(existsSync(copied!.resource.fsPath), true);
+			assert.strictEqual(existsSync(copied!.resource.fsPath), true);
 			assert.ok(readdirSync(testDir).some(f => f === 'INDEX.html'));
-			assert.equal(source.size, copied!.size);
+			assert.strictEqual(source.size, copied!.size);
 		} else {
 			assert.ok(error);
 			assert.ok(canCopy instanceof Error);
 
 			source = await service.resolve(source.resource, { resolveMetadata: true });
-			assert.equal(originalSize, source.size);
+			assert.strictEqual(originalSize, source.size);
 		}
 	});
 
@@ -1069,18 +1060,18 @@ suite('Disk File Service', function () {
 		assert.ok(source1.size > 0);
 
 		const renamed = await service.move(source1.resource, URI.file(join(dirname(source1.resource.fsPath), 'CONWAY.js')));
-		assert.equal(existsSync(renamed.resource.fsPath), true);
+		assert.strictEqual(existsSync(renamed.resource.fsPath), true);
 		assert.ok(readdirSync(testDir).some(f => f === 'CONWAY.js'));
-		assert.equal(source1.size, renamed.size);
+		assert.strictEqual(source1.size, renamed.size);
 
 		const source2 = await service.resolve(URI.file(join(testDir, 'deep', 'conway.js')), { resolveMetadata: true });
 		const target = URI.file(join(testDir, basename(source2.resource.path)));
 
-		assert.equal(await service.canCopy(source2.resource, target, true), true);
+		assert.strictEqual(await service.canCopy(source2.resource, target, true), true);
 		const res = await service.copy(source2.resource, target, true);
-		assert.equal(existsSync(res.resource.fsPath), true);
+		assert.strictEqual(existsSync(res.resource.fsPath), true);
 		assert.ok(readdirSync(testDir).some(f => f === 'conway.js'));
-		assert.equal(source2.size, res.size);
+		assert.strictEqual(source2.size, res.size);
 	});
 
 	test('copy - same file', async () => {
@@ -1090,18 +1081,18 @@ suite('Disk File Service', function () {
 		const source = await service.resolve(URI.file(join(testDir, 'index.html')), { resolveMetadata: true });
 		assert.ok(source.size > 0);
 
-		assert.equal(await service.canCopy(source.resource, URI.file(source.resource.fsPath)), true);
+		assert.strictEqual(await service.canCopy(source.resource, URI.file(source.resource.fsPath)), true);
 		let copied = await service.copy(source.resource, URI.file(source.resource.fsPath));
 
-		assert.equal(existsSync(copied.resource.fsPath), true);
-		assert.equal(basename(copied.resource.fsPath), 'index.html');
+		assert.strictEqual(existsSync(copied.resource.fsPath), true);
+		assert.strictEqual(basename(copied.resource.fsPath), 'index.html');
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.COPY);
-		assert.equal(event!.target!.resource.fsPath, copied.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.COPY);
+		assert.strictEqual(event!.target!.resource.fsPath, copied.resource.fsPath);
 
 		copied = await service.resolve(source.resource, { resolveMetadata: true });
-		assert.equal(source.size, copied.size);
+		assert.strictEqual(source.size, copied.size);
 	});
 
 	test('copy - same file #2', async () => {
@@ -1114,18 +1105,18 @@ suite('Disk File Service', function () {
 		const targetParent = URI.file(testDir);
 		const target = targetParent.with({ path: posix.join(targetParent.path, posix.basename(source.resource.path)) });
 
-		assert.equal(await service.canCopy(source.resource, URI.file(target.fsPath)), true);
+		assert.strictEqual(await service.canCopy(source.resource, URI.file(target.fsPath)), true);
 		let copied = await service.copy(source.resource, URI.file(target.fsPath));
 
-		assert.equal(existsSync(copied.resource.fsPath), true);
-		assert.equal(basename(copied.resource.fsPath), 'index.html');
+		assert.strictEqual(existsSync(copied.resource.fsPath), true);
+		assert.strictEqual(basename(copied.resource.fsPath), 'index.html');
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, source.resource.fsPath);
-		assert.equal(event!.operation, FileOperation.COPY);
-		assert.equal(event!.target!.resource.fsPath, copied.resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, source.resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.COPY);
+		assert.strictEqual(event!.target!.resource.fsPath, copied.resource.fsPath);
 
 		copied = await service.resolve(source.resource, { resolveMetadata: true });
-		assert.equal(source.size, copied.size);
+		assert.strictEqual(source.size, copied.size);
 	});
 
 	test('readFile - small file - default', () => {
@@ -1193,7 +1184,7 @@ suite('Disk File Service', function () {
 	async function testReadFile(resource: URI): Promise<void> {
 		const content = await service.readFile(resource);
 
-		assert.equal(content.value.toString(), readFileSync(resource.fsPath));
+		assert.strictEqual(content.value.toString(), readFileSync(resource.fsPath).toString());
 	}
 
 	test('readFileStream - small file - default', () => {
@@ -1221,7 +1212,7 @@ suite('Disk File Service', function () {
 	async function testReadFileStream(resource: URI): Promise<void> {
 		const content = await service.readFileStream(resource);
 
-		assert.equal((await streamToBuffer(content.value)).toString(), readFileSync(resource.fsPath));
+		assert.strictEqual((await streamToBuffer(content.value)).toString(), readFileSync(resource.fsPath).toString());
 	}
 
 	test('readFile - Files are intermingled #38331 - default', async () => {
@@ -1260,8 +1251,8 @@ suite('Disk File Service', function () {
 			service.readFile(resource2)
 		]);
 
-		assert.equal(result[0].value.toString(), value1.value.toString());
-		assert.equal(result[1].value.toString(), value2.value.toString());
+		assert.strictEqual(result[0].value.toString(), value1.value.toString());
+		assert.strictEqual(result[1].value.toString(), value2.value.toString());
 	}
 
 	test('readFile - from position (ASCII) - default', async () => {
@@ -1291,7 +1282,7 @@ suite('Disk File Service', function () {
 
 		const contents = await service.readFile(resource, { position: 6 });
 
-		assert.equal(contents.value.toString(), 'File');
+		assert.strictEqual(contents.value.toString(), 'File');
 	}
 
 	test('readFile - from position (with umlaut) - default', async () => {
@@ -1321,7 +1312,7 @@ suite('Disk File Service', function () {
 
 		const contents = await service.readFile(resource, { position: Buffer.from('Small File with Ü').length });
 
-		assert.equal(contents.value.toString(), 'mlaut');
+		assert.strictEqual(contents.value.toString(), 'mlaut');
 	}
 
 	test('readFile - 3 bytes (ASCII) - default', async () => {
@@ -1351,7 +1342,7 @@ suite('Disk File Service', function () {
 
 		const contents = await service.readFile(resource, { length: 3 });
 
-		assert.equal(contents.value.toString(), 'Sma');
+		assert.strictEqual(contents.value.toString(), 'Sma');
 	}
 
 	test('readFile - 20000 bytes (large) - default', async () => {
@@ -1403,7 +1394,7 @@ suite('Disk File Service', function () {
 
 		const contents = await service.readFile(resource, { length });
 
-		assert.equal(contents.value.byteLength, length);
+		assert.strictEqual(contents.value.byteLength, length);
 	}
 
 	test('readFile - FILE_IS_DIRECTORY', async () => {
@@ -1417,7 +1408,7 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_IS_DIRECTORY);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_IS_DIRECTORY);
 	});
 
 	(isWindows /* error code does not seem to be supported on windows */ ? test.skip : test)('readFile - FILE_NOT_DIRECTORY', async () => {
@@ -1431,7 +1422,7 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_NOT_DIRECTORY);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_NOT_DIRECTORY);
 	});
 
 	test('readFile - FILE_NOT_FOUND', async () => {
@@ -1445,7 +1436,7 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_NOT_FOUND);
 	});
 
 	test('readFile - FILE_NOT_MODIFIED_SINCE - default', async () => {
@@ -1484,8 +1475,8 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_NOT_MODIFIED_SINCE);
-		assert.equal(fileProvider.totalBytesRead, 0);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_NOT_MODIFIED_SINCE);
+		assert.strictEqual(fileProvider.totalBytesRead, 0);
 	}
 
 	test('readFile - FILE_NOT_MODIFIED_SINCE does not fire wrongly - https://github.com/microsoft/vscode/issues/72909', async () => {
@@ -1546,26 +1537,26 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_EXCEEDS_MEMORY_LIMIT);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_EXCEEDS_MEMORY_LIMIT);
 	}
 
-	(isWindows ? test.skip /* flaky test */ : test)('readFile - FILE_TOO_LARGE - default', async () => {
+	test('readFile - FILE_TOO_LARGE - default', async () => {
 		return testFileTooLarge();
 	});
 
-	(isWindows ? test.skip /* flaky test */ : test)('readFile - FILE_TOO_LARGE - buffered', async () => {
+	test('readFile - FILE_TOO_LARGE - buffered', async () => {
 		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose);
 
 		return testFileTooLarge();
 	});
 
-	(isWindows ? test.skip /* flaky test */ : test)('readFile - FILE_TOO_LARGE - unbuffered', async () => {
+	test('readFile - FILE_TOO_LARGE - unbuffered', async () => {
 		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite);
 
 		return testFileTooLarge();
 	});
 
-	(isWindows ? test.skip /* flaky test */ : test)('readFile - FILE_TOO_LARGE - streamed', async () => {
+	test('readFile - FILE_TOO_LARGE - streamed', async () => {
 		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadStream);
 
 		return testFileTooLarge();
@@ -1590,9 +1581,23 @@ suite('Disk File Service', function () {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_TOO_LARGE);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_TOO_LARGE);
 	}
 
+	(isWindows ? test.skip /* windows: cannot create file symbolic link without elevated context */ : test)('readFile - dangling symbolic link - https://github.com/microsoft/vscode/issues/116049', async () => {
+		const link = URI.file(join(testDir, 'small.js-link'));
+		await symlink(join(testDir, 'small.js'), link.fsPath);
+
+		let error: FileOperationError | undefined = undefined;
+		try {
+			await service.readFile(link);
+		} catch (err) {
+			error = err;
+		}
+
+		assert.ok(error);
+	});
+
 	test('createFile', async () => {
 		return assertCreateFile(contents => VSBuffer.fromString(contents));
 	});
@@ -1612,16 +1617,16 @@ suite('Disk File Service', function () {
 		const contents = 'Hello World';
 		const resource = URI.file(join(testDir, 'test.txt'));
 
-		assert.equal(await service.canCreateFile(resource), true);
+		assert.strictEqual(await service.canCreateFile(resource), true);
 		const fileStat = await service.createFile(resource, converter(contents));
-		assert.equal(fileStat.name, 'test.txt');
-		assert.equal(existsSync(fileStat.resource.fsPath), true);
-		assert.equal(readFileSync(fileStat.resource.fsPath), contents);
+		assert.strictEqual(fileStat.name, 'test.txt');
+		assert.strictEqual(existsSync(fileStat.resource.fsPath), true);
+		assert.strictEqual(readFileSync(fileStat.resource.fsPath).toString(), contents);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, resource.fsPath);
-		assert.equal(event!.operation, FileOperation.CREATE);
-		assert.equal(event!.target!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.fsPath, resource.fsPath);
 	}
 
 	test('createFile (does not overwrite by default)', async () => {
@@ -1651,16 +1656,16 @@ suite('Disk File Service', function () {
 
 		writeFileSync(resource.fsPath, ''); // create file
 
-		assert.equal(await service.canCreateFile(resource, { overwrite: true }), true);
+		assert.strictEqual(await service.canCreateFile(resource, { overwrite: true }), true);
 		const fileStat = await service.createFile(resource, VSBuffer.fromString(contents), { overwrite: true });
-		assert.equal(fileStat.name, 'test.txt');
-		assert.equal(existsSync(fileStat.resource.fsPath), true);
-		assert.equal(readFileSync(fileStat.resource.fsPath), contents);
+		assert.strictEqual(fileStat.name, 'test.txt');
+		assert.strictEqual(existsSync(fileStat.resource.fsPath), true);
+		assert.strictEqual(readFileSync(fileStat.resource.fsPath).toString(), contents);
 
 		assert.ok(event!);
-		assert.equal(event!.resource.fsPath, resource.fsPath);
-		assert.equal(event!.operation, FileOperation.CREATE);
-		assert.equal(event!.target!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.CREATE);
+		assert.strictEqual(event!.target!.resource.fsPath, resource.fsPath);
 	});
 
 	test('writeFile - default', async () => {
@@ -1682,13 +1687,13 @@ suite('Disk File Service', function () {
 	async function testWriteFile() {
 		const resource = URI.file(join(testDir, 'small.txt'));
 
-		const content = readFileSync(resource.fsPath);
-		assert.equal(content, 'Small File');
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = 'Updates to the small file';
 		await service.writeFile(resource, VSBuffer.fromString(newContent));
 
-		assert.equal(readFileSync(resource.fsPath), newContent);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), newContent);
 	}
 
 	test('writeFile (large file) - default', async () => {
@@ -1714,9 +1719,9 @@ suite('Disk File Service', function () {
 		const newContent = content.toString() + content.toString();
 
 		const fileStat = await service.writeFile(resource, VSBuffer.fromString(newContent));
-		assert.equal(fileStat.name, 'lorem.txt');
+		assert.strictEqual(fileStat.name, 'lorem.txt');
 
-		assert.equal(readFileSync(resource.fsPath), newContent);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), newContent);
 	}
 
 	test('writeFile - buffered - readonly throws', async () => {
@@ -1734,8 +1739,8 @@ suite('Disk File Service', function () {
 	async function testWriteFileReadonlyThrows() {
 		const resource = URI.file(join(testDir, 'small.txt'));
 
-		const content = readFileSync(resource.fsPath);
-		assert.equal(content, 'Small File');
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = 'Updates to the small file';
 
@@ -1757,7 +1762,7 @@ suite('Disk File Service', function () {
 
 		await Promise.all(['0', '00', '000', '0000', '00000'].map(async offset => {
 			const fileStat = await service.writeFile(resource, VSBuffer.fromString(offset + newContent));
-			assert.equal(fileStat.name, 'lorem.txt');
+			assert.strictEqual(fileStat.name, 'lorem.txt');
 		}));
 
 		const fileContent = readFileSync(resource.fsPath).toString();
@@ -1783,13 +1788,13 @@ suite('Disk File Service', function () {
 	async function testWriteFileReadable() {
 		const resource = URI.file(join(testDir, 'small.txt'));
 
-		const content = readFileSync(resource.fsPath);
-		assert.equal(content, 'Small File');
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = 'Updates to the small file';
 		await service.writeFile(resource, toLineByLineReadable(newContent));
 
-		assert.equal(readFileSync(resource.fsPath), newContent);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), newContent);
 	}
 
 	test('writeFile (large file - readable) - default', async () => {
@@ -1815,9 +1820,9 @@ suite('Disk File Service', function () {
 		const newContent = content.toString() + content.toString();
 
 		const fileStat = await service.writeFile(resource, toLineByLineReadable(newContent));
-		assert.equal(fileStat.name, 'lorem.txt');
+		assert.strictEqual(fileStat.name, 'lorem.txt');
 
-		assert.equal(readFileSync(resource.fsPath), newContent);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), newContent);
 	}
 
 	test('writeFile (stream) - default', async () => {
@@ -1841,10 +1846,10 @@ suite('Disk File Service', function () {
 		const target = URI.file(join(testDir, 'small-copy.txt'));
 
 		const fileStat = await service.writeFile(target, streamToBufferReadableStream(createReadStream(source.fsPath)));
-		assert.equal(fileStat.name, 'small-copy.txt');
+		assert.strictEqual(fileStat.name, 'small-copy.txt');
 
 		const targetContents = readFileSync(target.fsPath).toString();
-		assert.equal(readFileSync(source.fsPath).toString(), targetContents);
+		assert.strictEqual(readFileSync(source.fsPath).toString(), targetContents);
 	}
 
 	test('writeFile (large file - stream) - default', async () => {
@@ -1868,10 +1873,10 @@ suite('Disk File Service', function () {
 		const target = URI.file(join(testDir, 'lorem-copy.txt'));
 
 		const fileStat = await service.writeFile(target, streamToBufferReadableStream(createReadStream(source.fsPath)));
-		assert.equal(fileStat.name, 'lorem-copy.txt');
+		assert.strictEqual(fileStat.name, 'lorem-copy.txt');
 
 		const targetContents = readFileSync(target.fsPath).toString();
-		assert.equal(readFileSync(source.fsPath).toString(), targetContents);
+		assert.strictEqual(readFileSync(source.fsPath).toString(), targetContents);
 	}
 
 	test('writeFile (file is created including parents)', async () => {
@@ -1879,9 +1884,9 @@ suite('Disk File Service', function () {
 
 		const content = 'File is created including parent';
 		const fileStat = await service.writeFile(resource, VSBuffer.fromString(content));
-		assert.equal(fileStat.name, 'newfile.txt');
+		assert.strictEqual(fileStat.name, 'newfile.txt');
 
-		assert.equal(readFileSync(resource.fsPath), content);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), content);
 	});
 
 	test('writeFile (error when folder is encountered)', async () => {
@@ -1902,13 +1907,13 @@ suite('Disk File Service', function () {
 
 		const stat = await service.resolve(resource);
 
-		const content = readFileSync(resource.fsPath);
-		assert.equal(content, 'Small File');
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = 'Updates to the small file';
 		await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: stat.etag, mtime: stat.mtime });
 
-		assert.equal(readFileSync(resource.fsPath), newContent);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), newContent);
 	});
 
 	test('writeFile - error when writing to file that has been updated meanwhile', async () => {
@@ -1917,7 +1922,7 @@ suite('Disk File Service', function () {
 		const stat = await service.resolve(resource);
 
 		const content = readFileSync(resource.fsPath).toString();
-		assert.equal(content, 'Small File');
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = 'Updates to the small file';
 		await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: stat.etag, mtime: stat.mtime });
@@ -1936,7 +1941,7 @@ suite('Disk File Service', function () {
 
 		assert.ok(error);
 		assert.ok(error instanceof FileOperationError);
-		assert.equal(error!.fileOperationResult, FileOperationResult.FILE_MODIFIED_SINCE);
+		assert.strictEqual(error!.fileOperationResult, FileOperationResult.FILE_MODIFIED_SINCE);
 	});
 
 	test('writeFile - no error when writing to file where size is the same', async () => {
@@ -1945,7 +1950,7 @@ suite('Disk File Service', function () {
 		const stat = await service.resolve(resource);
 
 		const content = readFileSync(resource.fsPath).toString();
-		assert.equal(content, 'Small File');
+		assert.strictEqual(content, 'Small File');
 
 		const newContent = content; // same content
 		await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: stat.etag, mtime: stat.mtime });
@@ -2008,73 +2013,72 @@ suite('Disk File Service', function () {
 
 	const runWatchTests = isLinux;
 
-	(runWatchTests ? test : test.skip)('watch - file', done => {
+	(runWatchTests ? test : test.skip)('watch - file', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch1.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]], done);
-
+		const promise = assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]]);
 		setTimeout(() => writeFileSync(toWatch.fsPath, 'Changes'), 50);
+		await promise;
 	});
 
-	(runWatchTests && !isWindows /* symbolic links not reliable on windows */ ? test : test.skip)('watch - file symbolic link', async done => {
+	(runWatchTests && !isWindows /* windows: cannot create file symbolic link without elevated context */ ? test : test.skip)('watch - file symbolic link', async () => {
 		const toWatch = URI.file(join(testDir, 'lorem.txt-linked'));
 		await symlink(join(testDir, 'lorem.txt'), toWatch.fsPath);
 
-		assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]], done);
-
+		const promise = assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]]);
 		setTimeout(() => writeFileSync(toWatch.fsPath, 'Changes'), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - file - multiple writes', done => {
+	(runWatchTests ? test : test.skip)('watch - file - multiple writes', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch1.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]], done);
-
+		const promise = assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]]);
 		setTimeout(() => writeFileSync(toWatch.fsPath, 'Changes 1'), 0);
 		setTimeout(() => writeFileSync(toWatch.fsPath, 'Changes 2'), 10);
 		setTimeout(() => writeFileSync(toWatch.fsPath, 'Changes 3'), 20);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - file - delete file', done => {
+	(runWatchTests ? test : test.skip)('watch - file - delete file', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch1.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]], done);
-
+		const promise = assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]]);
 		setTimeout(() => unlinkSync(toWatch.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - file - rename file', done => {
+	(runWatchTests ? test : test.skip)('watch - file - rename file', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch1.html'));
 		const toWatchRenamed = URI.file(join(testDir, 'index-watch1-renamed.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]], done);
-
+		const promise = assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]]);
 		setTimeout(() => renameSync(toWatch.fsPath, toWatchRenamed.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - file - rename file (different case)', done => {
+	(runWatchTests ? test : test.skip)('watch - file - rename file (different case)', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch1.html'));
 		const toWatchRenamed = URI.file(join(testDir, 'INDEX-watch1.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		if (isLinux) {
-			assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]], done);
-		} else {
-			assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]], done); // case insensitive file system treat this as change
-		}
+		const promise = isLinux
+			? assertWatch(toWatch, [[FileChangeType.DELETED, toWatch]])
+			: assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]]);  // case insensitive file system treat this as change
 
 		setTimeout(() => renameSync(toWatch.fsPath, toWatchRenamed.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - file (atomic save)', function (done) {
+	(runWatchTests ? test : test.skip)('watch - file (atomic save)', async () => {
 		const toWatch = URI.file(join(testDir, 'index-watch2.html'));
 		writeFileSync(toWatch.fsPath, 'Init');
 
-		assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]], done);
+		const promise = assertWatch(toWatch, [[FileChangeType.UPDATED, toWatch]]);
 
 		setTimeout(() => {
 			// Simulate atomic save by deleting the file, creating it under different name
@@ -2084,79 +2088,81 @@ suite('Disk File Service', function () {
 			writeFileSync(renamed, 'Changes');
 			renameSync(renamed, toWatch.fsPath);
 		}, 50);
+
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - change file', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - change file', async () => {
 		const watchDir = URI.file(join(testDir, 'watch3'));
 		mkdirSync(watchDir.fsPath);
 
 		const file = URI.file(join(watchDir.fsPath, 'index.html'));
 		writeFileSync(file.fsPath, 'Init');
 
-		assertWatch(watchDir, [[FileChangeType.UPDATED, file]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.UPDATED, file]]);
 		setTimeout(() => writeFileSync(file.fsPath, 'Changes'), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - add file', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - add file', async () => {
 		const watchDir = URI.file(join(testDir, 'watch4'));
 		mkdirSync(watchDir.fsPath);
 
 		const file = URI.file(join(watchDir.fsPath, 'index.html'));
 
-		assertWatch(watchDir, [[FileChangeType.ADDED, file]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.ADDED, file]]);
 		setTimeout(() => writeFileSync(file.fsPath, 'Changes'), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - delete file', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - delete file', async () => {
 		const watchDir = URI.file(join(testDir, 'watch5'));
 		mkdirSync(watchDir.fsPath);
 
 		const file = URI.file(join(watchDir.fsPath, 'index.html'));
 		writeFileSync(file.fsPath, 'Init');
 
-		assertWatch(watchDir, [[FileChangeType.DELETED, file]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.DELETED, file]]);
 		setTimeout(() => unlinkSync(file.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - add folder', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - add folder', async () => {
 		const watchDir = URI.file(join(testDir, 'watch6'));
 		mkdirSync(watchDir.fsPath);
 
 		const folder = URI.file(join(watchDir.fsPath, 'folder'));
 
-		assertWatch(watchDir, [[FileChangeType.ADDED, folder]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.ADDED, folder]]);
 		setTimeout(() => mkdirSync(folder.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - delete folder', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - delete folder', async () => {
 		const watchDir = URI.file(join(testDir, 'watch7'));
 		mkdirSync(watchDir.fsPath);
 
 		const folder = URI.file(join(watchDir.fsPath, 'folder'));
 		mkdirSync(folder.fsPath);
 
-		assertWatch(watchDir, [[FileChangeType.DELETED, folder]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.DELETED, folder]]);
 		setTimeout(() => rimrafSync(folder.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests && !isWindows /* symbolic links not reliable on windows */ ? test : test.skip)('watch - folder (non recursive) - symbolic link - change file', async done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - symbolic link - change file', async () => {
 		const watchDir = URI.file(join(testDir, 'deep-link'));
-		await symlink(join(testDir, 'deep'), watchDir.fsPath);
+		await symlink(join(testDir, 'deep'), watchDir.fsPath, 'junction');
 
 		const file = URI.file(join(watchDir.fsPath, 'index.html'));
 		writeFileSync(file.fsPath, 'Init');
 
-		assertWatch(watchDir, [[FileChangeType.UPDATED, file]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.UPDATED, file]]);
 		setTimeout(() => writeFileSync(file.fsPath, 'Changes'), 50);
+		await promise;
 	});
 
-	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - rename file', done => {
+	(runWatchTests ? test : test.skip)('watch - folder (non recursive) - rename file', async () => {
 		const watchDir = URI.file(join(testDir, 'watch8'));
 		mkdirSync(watchDir.fsPath);
 
@@ -2165,12 +2171,12 @@ suite('Disk File Service', function () {
 
 		const fileRenamed = URI.file(join(watchDir.fsPath, 'index-renamed.html'));
 
-		assertWatch(watchDir, [[FileChangeType.DELETED, file], [FileChangeType.ADDED, fileRenamed]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.DELETED, file], [FileChangeType.ADDED, fileRenamed]]);
 		setTimeout(() => renameSync(file.fsPath, fileRenamed.fsPath), 50);
+		await promise;
 	});
 
-	(runWatchTests && isLinux /* this test requires a case sensitive file system */ ? test : test.skip)('watch - folder (non recursive) - rename file (different case)', done => {
+	(runWatchTests && isLinux /* this test requires a case sensitive file system */ ? test : test.skip)('watch - folder (non recursive) - rename file (different case)', async () => {
 		const watchDir = URI.file(join(testDir, 'watch8'));
 		mkdirSync(watchDir.fsPath);
 
@@ -2179,46 +2185,48 @@ suite('Disk File Service', function () {
 
 		const fileRenamed = URI.file(join(watchDir.fsPath, 'INDEX.html'));
 
-		assertWatch(watchDir, [[FileChangeType.DELETED, file], [FileChangeType.ADDED, fileRenamed]], done);
-
+		const promise = assertWatch(watchDir, [[FileChangeType.DELETED, file], [FileChangeType.ADDED, fileRenamed]]);
 		setTimeout(() => renameSync(file.fsPath, fileRenamed.fsPath), 50);
+		await promise;
 	});
 
-	function assertWatch(toWatch: URI, expected: [FileChangeType, URI][], done: MochaDone): void {
-		const watcherDisposable = service.watch(toWatch);
+	function assertWatch(toWatch: URI, expected: [FileChangeType, URI][]): Promise<void> {
+		return new Promise<void>((resolve, reject) => {
+			const watcherDisposable = service.watch(toWatch);
 
-		function toString(type: FileChangeType): string {
-			switch (type) {
-				case FileChangeType.ADDED: return 'added';
-				case FileChangeType.DELETED: return 'deleted';
-				case FileChangeType.UPDATED: return 'updated';
-			}
-		}
-
-		function printEvents(event: FileChangesEvent): string {
-			return event.changes.map(change => `Change: type ${toString(change.type)} path ${change.resource.toString()}`).join('\n');
-		}
-
-		const listenerDisposable = service.onDidFilesChange(event => {
-			watcherDisposable.dispose();
-			listenerDisposable.dispose();
-
-			try {
-				assert.equal(event.changes.length, expected.length, `Expected ${expected.length} events, but got ${event.changes.length}. Details (${printEvents(event)})`);
-
-				if (expected.length === 1) {
-					assert.equal(event.changes[0].type, expected[0][0], `Expected ${toString(expected[0][0])} but got ${toString(event.changes[0].type)}. Details (${printEvents(event)})`);
-					assert.equal(event.changes[0].resource.fsPath, expected[0][1].fsPath);
-				} else {
-					for (const expect of expected) {
-						assert.equal(hasChange(event.changes, expect[0], expect[1]), true, `Unable to find ${toString(expect[0])} for ${expect[1].fsPath}. Details (${printEvents(event)})`);
-					}
+			function toString(type: FileChangeType): string {
+				switch (type) {
+					case FileChangeType.ADDED: return 'added';
+					case FileChangeType.DELETED: return 'deleted';
+					case FileChangeType.UPDATED: return 'updated';
 				}
-
-				done();
-			} catch (error) {
-				done(error);
 			}
+
+			function printEvents(event: FileChangesEvent): string {
+				return event.changes.map(change => `Change: type ${toString(change.type)} path ${change.resource.toString()}`).join('\n');
+			}
+
+			const listenerDisposable = service.onDidFilesChange(event => {
+				watcherDisposable.dispose();
+				listenerDisposable.dispose();
+
+				try {
+					assert.strictEqual(event.changes.length, expected.length, `Expected ${expected.length} events, but got ${event.changes.length}. Details (${printEvents(event)})`);
+
+					if (expected.length === 1) {
+						assert.strictEqual(event.changes[0].type, expected[0][0], `Expected ${toString(expected[0][0])} but got ${toString(event.changes[0].type)}. Details (${printEvents(event)})`);
+						assert.strictEqual(event.changes[0].resource.fsPath, expected[0][1].fsPath);
+					} else {
+						for (const expect of expected) {
+							assert.strictEqual(hasChange(event.changes, expect[0], expect[1]), true, `Unable to find ${toString(expect[0])} for ${expect[1].fsPath}. Details (${printEvents(event)})`);
+						}
+					}
+
+					resolve();
+				} catch (error) {
+					reject(error);
+				}
+			});
 		});
 	}
 
@@ -2234,7 +2242,7 @@ suite('Disk File Service', function () {
 		let fd = await fileProvider.open(resource, { create: false });
 		for (let i = 0; i < 3; i++) {
 			await fileProvider.read(fd, 0, buffer.buffer, 0, 26);
-			assert.equal(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
+			assert.strictEqual(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
 		}
 		await fileProvider.close(fd);
 
@@ -2245,31 +2253,31 @@ suite('Disk File Service', function () {
 		let posInFile = 0;
 
 		await fileProvider.read(fd, posInFile, buffer.buffer, 0, 26);
-		assert.equal(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
+		assert.strictEqual(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
 		posInFile += 26;
 
 		await fileProvider.read(fd, posInFile, buffer.buffer, 0, 1);
-		assert.equal(buffer.slice(0, 1).toString(), ',');
+		assert.strictEqual(buffer.slice(0, 1).toString(), ',');
 		posInFile += 1;
 
 		await fileProvider.read(fd, posInFile, buffer.buffer, 0, 12);
-		assert.equal(buffer.slice(0, 12).toString(), ' consectetur');
+		assert.strictEqual(buffer.slice(0, 12).toString(), ' consectetur');
 		posInFile += 12;
 
 		await fileProvider.read(fd, 98 /* no longer in sequence of posInFile */, buffer.buffer, 0, 9);
-		assert.equal(buffer.slice(0, 9).toString(), 'fermentum');
+		assert.strictEqual(buffer.slice(0, 9).toString(), 'fermentum');
 
 		await fileProvider.read(fd, 27, buffer.buffer, 0, 12);
-		assert.equal(buffer.slice(0, 12).toString(), ' consectetur');
+		assert.strictEqual(buffer.slice(0, 12).toString(), ' consectetur');
 
 		await fileProvider.read(fd, 26, buffer.buffer, 0, 1);
-		assert.equal(buffer.slice(0, 1).toString(), ',');
+		assert.strictEqual(buffer.slice(0, 1).toString(), ',');
 
 		await fileProvider.read(fd, 0, buffer.buffer, 0, 26);
-		assert.equal(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
+		assert.strictEqual(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
 
 		await fileProvider.read(fd, posInFile /* back in sequence */, buffer.buffer, 0, 11);
-		assert.equal(buffer.slice(0, 11).toString(), ' adipiscing');
+		assert.strictEqual(buffer.slice(0, 11).toString(), ' adipiscing');
 
 		await fileProvider.close(fd);
 	});
@@ -2289,7 +2297,7 @@ suite('Disk File Service', function () {
 		posInFileWrite += initialContents.byteLength;
 
 		await fileProvider.read(fdRead, posInFileRead, buffer.buffer, 0, 26);
-		assert.equal(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
+		assert.strictEqual(buffer.slice(0, 26).toString(), 'Lorem ipsum dolor sit amet');
 		posInFileRead += 26;
 
 		const contents = VSBuffer.fromString('Hello World');
@@ -2298,19 +2306,19 @@ suite('Disk File Service', function () {
 		posInFileWrite += contents.byteLength;
 
 		await fileProvider.read(fdRead, posInFileRead, buffer.buffer, 0, contents.byteLength);
-		assert.equal(buffer.slice(0, contents.byteLength).toString(), 'Hello World');
+		assert.strictEqual(buffer.slice(0, contents.byteLength).toString(), 'Hello World');
 		posInFileRead += contents.byteLength;
 
 		await fileProvider.write(fdWrite, 6, contents.buffer, 0, contents.byteLength);
 
 		await fileProvider.read(fdRead, 0, buffer.buffer, 0, 11);
-		assert.equal(buffer.slice(0, 11).toString(), 'Lorem Hello');
+		assert.strictEqual(buffer.slice(0, 11).toString(), 'Lorem Hello');
 
 		await fileProvider.write(fdWrite, posInFileWrite, contents.buffer, 0, contents.byteLength);
 		posInFileWrite += contents.byteLength;
 
 		await fileProvider.read(fdRead, posInFileWrite - contents.byteLength, buffer.buffer, 0, contents.byteLength);
-		assert.equal(buffer.slice(0, contents.byteLength).toString(), 'Hello World');
+		assert.strictEqual(buffer.slice(0, contents.byteLength).toString(), 'Hello World');
 
 		await fileProvider.close(fdWrite);
 		await fileProvider.close(fdRead);
diff --git a/src/vs/platform/files/test/electron-browser/normalizer.test.ts b/src/vs/platform/files/test/electron-browser/normalizer.test.ts
index 98aa1162c..df672c5f0 100644
--- a/src/vs/platform/files/test/electron-browser/normalizer.test.ts
+++ b/src/vs/platform/files/test/electron-browser/normalizer.test.ts
@@ -64,7 +64,7 @@ suite('Normalizer', () => {
 
 		watch.onDidFilesChange(e => {
 			assert.ok(e);
-			assert.equal(e.changes.length, 3);
+			assert.strictEqual(e.changes.length, 3);
 			assert.ok(e.contains(added, FileChangeType.ADDED));
 			assert.ok(e.contains(updated, FileChangeType.UPDATED));
 			assert.ok(e.contains(deleted, FileChangeType.DELETED));
@@ -103,7 +103,7 @@ suite('Normalizer', () => {
 
 			watch.onDidFilesChange(e => {
 				assert.ok(e);
-				assert.equal(e.changes.length, 5);
+				assert.strictEqual(e.changes.length, 5);
 
 				assert.ok(e.contains(deletedFolderA, FileChangeType.DELETED));
 				assert.ok(e.contains(deletedFolderB, FileChangeType.DELETED));
@@ -133,7 +133,7 @@ suite('Normalizer', () => {
 
 		watch.onDidFilesChange(e => {
 			assert.ok(e);
-			assert.equal(e.changes.length, 1);
+			assert.strictEqual(e.changes.length, 1);
 
 			assert.ok(e.contains(unrelated, FileChangeType.UPDATED));
 
@@ -158,7 +158,7 @@ suite('Normalizer', () => {
 
 		watch.onDidFilesChange(e => {
 			assert.ok(e);
-			assert.equal(e.changes.length, 2);
+			assert.strictEqual(e.changes.length, 2);
 
 			assert.ok(e.contains(deleted, FileChangeType.UPDATED));
 			assert.ok(e.contains(unrelated, FileChangeType.UPDATED));
@@ -184,7 +184,7 @@ suite('Normalizer', () => {
 
 		watch.onDidFilesChange(e => {
 			assert.ok(e);
-			assert.equal(e.changes.length, 2);
+			assert.strictEqual(e.changes.length, 2);
 
 			assert.ok(e.contains(created, FileChangeType.ADDED));
 			assert.ok(!e.contains(created, FileChangeType.UPDATED));
@@ -213,7 +213,7 @@ suite('Normalizer', () => {
 
 		watch.onDidFilesChange(e => {
 			assert.ok(e);
-			assert.equal(e.changes.length, 2);
+			assert.strictEqual(e.changes.length, 2);
 
 			assert.ok(e.contains(deleted, FileChangeType.DELETED));
 			assert.ok(!e.contains(updated, FileChangeType.UPDATED));
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
index 0fd23fd50..00f0cb9d9 100644
--- a/src/vs/platform/instantiation/common/instantiationService.ts
+++ b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -132,15 +132,31 @@ export class InstantiationService implements IInstantiationService {
 	private _getOrCreateServiceInstance<T>(id: ServiceIdentifier<T>, _trace: Trace): T {
 		let thing = this._getServiceInstanceOrDescriptor(id);
 		if (thing instanceof SyncDescriptor) {
-			return this._createAndCacheServiceInstance(id, thing, _trace.branch(id, true));
+			return this._safeCreateAndCacheServiceInstance(id, thing, _trace.branch(id, true));
 		} else {
 			_trace.branch(id, false);
 			return thing;
 		}
 	}
 
+	private readonly _activeInstantiations = new Set<ServiceIdentifier<any>>();
+
+
+	private _safeCreateAndCacheServiceInstance<T>(id: ServiceIdentifier<T>, desc: SyncDescriptor<T>, _trace: Trace): T {
+		if (this._activeInstantiations.has(id)) {
+			throw new Error(`illegal state - RECURSIVELY instantiating service '${id}'`);
+		}
+		this._activeInstantiations.add(id);
+		try {
+			return this._createAndCacheServiceInstance(id, desc, _trace);
+		} finally {
+			this._activeInstantiations.delete(id);
+		}
+	}
+
 	private _createAndCacheServiceInstance<T>(id: ServiceIdentifier<T>, desc: SyncDescriptor<T>, _trace: Trace): T {
-		type Triple = { id: ServiceIdentifier<any>, desc: SyncDescriptor<any>, _trace: Trace };
+
+		type Triple = { id: ServiceIdentifier<any>, desc: SyncDescriptor<any>, _trace: Trace; };
 		const graph = new Graph<Triple>(data => data.id.toString());
 
 		let cycleCount = 0;
@@ -195,7 +211,6 @@ export class InstantiationService implements IInstantiationService {
 				graph.removeNode(data);
 			}
 		}
-
 		return <T>this._getServiceInstanceOrDescriptor(id);
 	}
 
diff --git a/src/vs/platform/ipc/electron-browser/sharedProcessService.ts b/src/vs/platform/ipc/electron-browser/sharedProcessService.ts
index 59fb5a6bd..60299f96e 100644
--- a/src/vs/platform/ipc/electron-browser/sharedProcessService.ts
+++ b/src/vs/platform/ipc/electron-browser/sharedProcessService.ts
@@ -4,7 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { Event } from 'vs/base/common/event';
+import { IpcRendererEvent } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
+import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const ISharedProcessService = createDecorator<ISharedProcessService>('sharedProcessService');
 
@@ -14,7 +22,47 @@ export interface ISharedProcessService {
 
 	getChannel(channelName: string): IChannel;
 	registerChannel(channelName: string, channel: IServerChannel<string>): void;
-
-	whenSharedProcessReady(): Promise<void>;
-	toggleSharedProcessWindow(): Promise<void>;
+}
+
+export class SharedProcessService extends Disposable implements ISharedProcessService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly withSharedProcessConnection: Promise<MessagePortClient>;
+
+	constructor(
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@ILogService private readonly logService: ILogService
+	) {
+		super();
+
+		this.withSharedProcessConnection = this.connect();
+	}
+
+	private async connect(): Promise<MessagePortClient> {
+		this.logService.trace('Renderer->SharedProcess#connect');
+
+		// Ask to create message channel inside the window
+		// and send over a UUID to correlate the response
+		const nonce = generateUuid();
+		ipcRenderer.send('vscode:createSharedProcessMessageChannel', nonce);
+
+		// Wait until the main side has returned the `MessagePort`
+		// We need to filter by the `nonce` to ensure we listen
+		// to the right response.
+		const onMessageChannelResult = Event.fromNodeEventEmitter<{ nonce: string, port: MessagePort }>(ipcRenderer, 'vscode:createSharedProcessMessageChannelResult', (e: IpcRendererEvent, nonce: string) => ({ nonce, port: e.ports[0] }));
+		const { port } = await Event.toPromise(Event.once(Event.filter(onMessageChannelResult, e => e.nonce === nonce)));
+
+		this.logService.trace('Renderer->SharedProcess#connect: connection established');
+
+		return this._register(new MessagePortClient(port, `window:${this.nativeHostService.windowId}`));
+	}
+
+	getChannel(channelName: string): IChannel {
+		return getDelayedChannel(this.withSharedProcessConnection.then(connection => connection.getChannel(channelName)));
+	}
+
+	registerChannel(channelName: string, channel: IServerChannel<string>): void {
+		this.withSharedProcessConnection.then(connection => connection.registerChannel(channelName, channel));
+	}
 }
diff --git a/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts b/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts
deleted file mode 100644
index 97decd56a..000000000
--- a/src/vs/platform/ipc/electron-main/sharedProcessMainService.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-
-export const ISharedProcessMainService = createDecorator<ISharedProcessMainService>('sharedProcessMainService');
-
-export interface ISharedProcessMainService {
-
-	readonly _serviceBrand: undefined;
-
-	whenSharedProcessReady(): Promise<void>;
-	toggleSharedProcessWindow(): Promise<void>;
-}
-
-export interface ISharedProcess {
-	whenReady(): Promise<void>;
-	toggle(): void;
-}
-
-export class SharedProcessMainService implements ISharedProcessMainService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(private sharedProcess: ISharedProcess) { }
-
-	whenSharedProcessReady(): Promise<void> {
-		return this.sharedProcess.whenReady();
-	}
-
-	async toggleSharedProcessWindow(): Promise<void> {
-		return this.sharedProcess.toggle();
-	}
-}
diff --git a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
index b2c78a332..2f326523c 100644
--- a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
+++ b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client } from 'vs/base/parts/ipc/electron-sandbox/ipc.electron-sandbox';
+import { IChannel, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
+import { Client as IPCElectronClient } from 'vs/base/parts/ipc/electron-sandbox/ipc.electron';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { Server as MessagePortServer } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
 
 export const IMainProcessService = createDecorator<IMainProcessService>('mainProcessService');
 
@@ -19,18 +20,21 @@ export interface IMainProcessService {
 	registerChannel(channelName: string, channel: IServerChannel<string>): void;
 }
 
-export class MainProcessService extends Disposable implements IMainProcessService {
+/**
+ * An implementation of `IMainProcessService` that leverages Electron's IPC.
+ */
+export class ElectronIPCMainProcessService extends Disposable implements IMainProcessService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private mainProcessConnection: Client;
+	private mainProcessConnection: IPCElectronClient;
 
 	constructor(
 		windowId: number
 	) {
 		super();
 
-		this.mainProcessConnection = this._register(new Client(`window:${windowId}`));
+		this.mainProcessConnection = this._register(new IPCElectronClient(`window:${windowId}`));
 	}
 
 	getChannel(channelName: string): IChannel {
@@ -41,3 +45,24 @@ export class MainProcessService extends Disposable implements IMainProcessServic
 		this.mainProcessConnection.registerChannel(channelName, channel);
 	}
 }
+
+/**
+ * An implementation of `IMainProcessService` that leverages MessagePorts.
+ */
+export class MessagePortMainProcessService implements IMainProcessService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		private server: MessagePortServer,
+		private router: StaticRouter
+	) { }
+
+	getChannel(channelName: string): IChannel {
+		return this.server.getChannel(channelName, this.router);
+	}
+
+	registerChannel(channelName: string, channel: IServerChannel<string>): void {
+		this.server.registerChannel(channelName, channel);
+	}
+}
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index e981a34d5..fc36369c6 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -56,6 +56,7 @@ export interface IssueReporterData extends WindowData {
 	issueType?: IssueType;
 	extensionId?: string;
 	experiments?: string;
+	githubAccessToken: string;
 	readonly issueTitle?: string;
 	readonly issueBody?: string;
 }
@@ -72,7 +73,6 @@ export interface IssueReporterFeatures {
 export interface ProcessExplorerStyles extends WindowStyles {
 	hoverBackground?: string;
 	hoverForeground?: string;
-	highlightForeground?: string;
 }
 
 export interface ProcessExplorerData extends WindowData {
diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts
index da98e2f94..994f4559d 100644
--- a/src/vs/platform/issue/electron-main/issueMainService.ts
+++ b/src/vs/platform/issue/electron-main/issueMainService.ts
@@ -17,7 +17,7 @@ import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWindowState } from 'vs/platform/windows/electron-main/windows';
 import { listProcesses } from 'vs/base/node/ps';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { zoomLevelToZoomFactor } from 'vs/platform/windows/common/windows';
 import { FileAccess } from 'vs/base/common/network';
@@ -185,120 +185,118 @@ export class IssueMainService implements ICommonIssueService {
 		}
 	}
 
-	openReporter(data: IssueReporterData): Promise<void> {
-		return new Promise(_ => {
-			if (!this._issueWindow) {
-				this._issueParentWindow = BrowserWindow.getFocusedWindow();
-				if (this._issueParentWindow) {
-					const position = this.getWindowPosition(this._issueParentWindow, 700, 800);
+	async openReporter(data: IssueReporterData): Promise<void> {
+		if (!this._issueWindow) {
+			this._issueParentWindow = BrowserWindow.getFocusedWindow();
+			if (this._issueParentWindow) {
+				const position = this.getWindowPosition(this._issueParentWindow, 700, 800);
 
-					this._issueWindow = new BrowserWindow({
-						fullscreen: false,
-						width: position.width,
-						height: position.height,
-						minWidth: 300,
-						minHeight: 200,
-						x: position.x,
-						y: position.y,
-						title: localize('issueReporter', "Issue Reporter"),
-						backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
-						webPreferences: {
-							preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
-							enableWebSQL: false,
-							enableRemoteModule: false,
-							spellcheck: false,
-							nativeWindowOpen: true,
-							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
-							sandbox: true,
-							contextIsolation: true
-						}
-					});
+				this._issueWindow = new BrowserWindow({
+					fullscreen: false,
+					width: position.width,
+					height: position.height,
+					minWidth: 300,
+					minHeight: 200,
+					x: position.x,
+					y: position.y,
+					title: localize('issueReporter', "Issue Reporter"),
+					backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
+					webPreferences: {
+						preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
+						v8CacheOptions: 'bypassHeatCheck',
+						enableWebSQL: false,
+						enableRemoteModule: false,
+						spellcheck: false,
+						nativeWindowOpen: true,
+						zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
+						sandbox: true,
+						contextIsolation: true
+					}
+				});
 
-					this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
+				this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
 
-					// Modified when testing UI
-					const features: IssueReporterFeatures = {};
+				// Modified when testing UI
+				const features: IssueReporterFeatures = {};
 
-					this.logService.trace('issueService#openReporter: opening issue reporter');
-					this._issueWindow.loadURL(this.getIssueReporterPath(data, features));
+				this.logService.trace('issueService#openReporter: opening issue reporter');
+				this._issueWindow.loadURL(this.getIssueReporterPath(data, features));
 
-					this._issueWindow.on('close', () => this._issueWindow = null);
+				this._issueWindow.on('close', () => this._issueWindow = null);
 
-					this._issueParentWindow.on('closed', () => {
-						if (this._issueWindow) {
-							this._issueWindow.close();
-							this._issueWindow = null;
-						}
-					});
-				}
+				this._issueParentWindow.on('closed', () => {
+					if (this._issueWindow) {
+						this._issueWindow.close();
+						this._issueWindow = null;
+					}
+				});
 			}
+		}
 
-			if (this._issueWindow) {
-				this._issueWindow.focus();
-			}
-		});
+		if (this._issueWindow) {
+			this._issueWindow.focus();
+		}
 	}
 
-	openProcessExplorer(data: ProcessExplorerData): Promise<void> {
-		return new Promise(_ => {
-			// Create as singleton
-			if (!this._processExplorerWindow) {
-				this._processExplorerParentWindow = BrowserWindow.getFocusedWindow();
-				if (this._processExplorerParentWindow) {
-					const position = this.getWindowPosition(this._processExplorerParentWindow, 800, 500);
-					this._processExplorerWindow = new BrowserWindow({
-						skipTaskbar: true,
-						resizable: true,
-						fullscreen: false,
-						width: position.width,
-						height: position.height,
-						minWidth: 300,
-						minHeight: 200,
-						x: position.x,
-						y: position.y,
-						backgroundColor: data.styles.backgroundColor,
-						title: localize('processExplorer', "Process Explorer"),
-						webPreferences: {
-							preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
-							enableWebSQL: false,
-							enableRemoteModule: false,
-							spellcheck: false,
-							nativeWindowOpen: true,
-							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
-							sandbox: true,
-							contextIsolation: true
-						}
-					});
+	async openProcessExplorer(data: ProcessExplorerData): Promise<void> {
+		// Create as singleton
+		if (!this._processExplorerWindow) {
+			this._processExplorerParentWindow = BrowserWindow.getFocusedWindow();
+			if (this._processExplorerParentWindow) {
+				const position = this.getWindowPosition(this._processExplorerParentWindow, 800, 500);
+				this._processExplorerWindow = new BrowserWindow({
+					skipTaskbar: true,
+					resizable: true,
+					fullscreen: false,
+					width: position.width,
+					height: position.height,
+					minWidth: 300,
+					minHeight: 200,
+					x: position.x,
+					y: position.y,
+					backgroundColor: data.styles.backgroundColor,
+					title: localize('processExplorer', "Process Explorer"),
+					webPreferences: {
+						preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js', require).fsPath,
+						v8CacheOptions: 'bypassHeatCheck',
+						enableWebSQL: false,
+						enableRemoteModule: false,
+						spellcheck: false,
+						nativeWindowOpen: true,
+						zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
+						sandbox: true,
+						contextIsolation: true
+					}
+				});
 
-					this._processExplorerWindow.setMenuBarVisibility(false);
+				this._processExplorerWindow.setMenuBarVisibility(false);
 
-					const windowConfiguration = {
-						appRoot: this.environmentService.appRoot,
-						windowId: this._processExplorerWindow.id,
-						userEnv: this.userEnv,
-						machineId: this.machineId,
-						data
-					};
+				const windowConfiguration = {
+					appRoot: this.environmentService.appRoot,
+					windowId: this._processExplorerWindow.id,
+					userEnv: this.userEnv,
+					machineId: this.machineId,
+					data
+				};
 
-					this._processExplorerWindow.loadURL(
-						toWindowUrl('vs/code/electron-sandbox/processExplorer/processExplorer.html', windowConfiguration));
+				this._processExplorerWindow.loadURL(
+					toWindowUrl('vs/code/electron-sandbox/processExplorer/processExplorer.html', windowConfiguration));
 
-					this._processExplorerWindow.on('close', () => this._processExplorerWindow = null);
+				this._processExplorerWindow.on('close', () => this._processExplorerWindow = null);
 
-					this._processExplorerParentWindow.on('close', () => {
-						if (this._processExplorerWindow) {
-							this._processExplorerWindow.close();
-							this._processExplorerWindow = null;
-						}
-					});
-				}
+				this._processExplorerParentWindow.on('close', () => {
+					if (this._processExplorerWindow) {
+						this._processExplorerWindow.close();
+						this._processExplorerWindow = null;
+					}
+				});
 			}
+		}
 
-			// Focus
-			if (this._processExplorerWindow) {
-				this._processExplorerWindow.focus();
-			}
-		});
+		// Focus
+		if (this._processExplorerWindow) {
+			this._processExplorerWindow.focus();
+		}
 	}
 
 	public async getSystemStatus(): Promise<string> {
@@ -414,7 +412,7 @@ export class IssueMainService implements ICommonIssueService {
 			},
 			product: {
 				nameShort: product.nameShort,
-				version: product.version,
+				version: !!product.darwinUniversalAssetId ? `${product.version} (Universal)` : product.version,
 				commit: product.commit,
 				date: product.date,
 				reportIssueUrl: product.reportIssueUrl
@@ -436,7 +434,7 @@ function toWindowUrl<T>(modulePathToHtml: string, windowConfiguration: T): strin
 	}
 
 	return FileAccess
-		._asCodeFileUri(modulePathToHtml, require)
+		.asBrowserUri(modulePathToHtml, require, true)
 		.with({ query: `config=${encodeURIComponent(JSON.stringify(config))}` })
 		.toString(true);
 }
diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts
index 3582ce6d6..ca31e62e5 100644
--- a/src/vs/platform/keybinding/common/keybindingResolver.ts
+++ b/src/vs/platform/keybinding/common/keybindingResolver.ts
@@ -3,9 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
-import { MenuRegistry } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { IContext, ContextKeyExpression, ContextKeyExprType } from 'vs/platform/contextkey/common/contextkey';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 
@@ -340,39 +337,6 @@ export class KeybindingResolver {
 		}
 		return rules.evaluate(context);
 	}
-
-	public static getAllUnboundCommands(boundCommands: Map<string, boolean>): string[] {
-		const unboundCommands: string[] = [];
-		const seenMap: Map<string, boolean> = new Map<string, boolean>();
-		const addCommand = (id: string, includeCommandWithArgs: boolean) => {
-			if (seenMap.has(id)) {
-				return;
-			}
-			seenMap.set(id, true);
-			if (id[0] === '_' || id.indexOf('vscode.') === 0) { // private command
-				return;
-			}
-			if (boundCommands.get(id) === true) {
-				return;
-			}
-			if (!includeCommandWithArgs) {
-				const command = CommandsRegistry.getCommand(id);
-				if (command && typeof command.description === 'object'
-					&& isNonEmptyArray((<ICommandHandlerDescription>command.description).args)) { // command with args
-					return;
-				}
-			}
-			unboundCommands.push(id);
-		};
-		for (const id of MenuRegistry.getCommands().keys()) {
-			addCommand(id, true);
-		}
-		for (const id of CommandsRegistry.getCommands().keys()) {
-			addCommand(id, false);
-		}
-
-		return unboundCommands;
-	}
 }
 
 function printWhenExplanation(when: ContextKeyExpression | undefined): string {
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index cbbb54344..d627e6626 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -211,13 +211,13 @@ suite('AbstractKeybindingService', () => {
 
 		// send Ctrl/Cmd + K
 		let shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, []);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, [
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, [
 			`(${toUsLabel(KeyMod.CtrlCmd | KeyCode.KEY_K)}) was pressed. Waiting for second key of chord...`
 		]);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -225,13 +225,13 @@ suite('AbstractKeybindingService', () => {
 
 		// send backspace
 		shouldPreventDefault = kbService.testDispatch(KeyCode.Backspace);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, []);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, [
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, [
 			`The key combination (${toUsLabel(KeyMod.CtrlCmd | KeyCode.KEY_K)}, ${toUsLabel(KeyCode.Backspace)}) is not a command.`
 		]);
-		assert.deepEqual(statusMessageCallsDisposed, [
+		assert.deepStrictEqual(statusMessageCallsDisposed, [
 			`(${toUsLabel(KeyMod.CtrlCmd | KeyCode.KEY_K)}) was pressed. Waiting for second key of chord...`
 		]);
 		executeCommandCalls = [];
@@ -241,14 +241,14 @@ suite('AbstractKeybindingService', () => {
 
 		// send backspace
 		shouldPreventDefault = kbService.testDispatch(KeyCode.Backspace);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'simpleCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -273,11 +273,11 @@ suite('AbstractKeybindingService', () => {
 
 		function assertIsIgnored(keybinding: number): void {
 			let shouldPreventDefault = kbService.testDispatch(keybinding);
-			assert.equal(shouldPreventDefault, false);
-			assert.deepEqual(executeCommandCalls, []);
-			assert.deepEqual(showMessageCalls, []);
-			assert.deepEqual(statusMessageCalls, []);
-			assert.deepEqual(statusMessageCallsDisposed, []);
+			assert.strictEqual(shouldPreventDefault, false);
+			assert.deepStrictEqual(executeCommandCalls, []);
+			assert.deepStrictEqual(showMessageCalls, []);
+			assert.deepStrictEqual(statusMessageCalls, []);
+			assert.deepStrictEqual(statusMessageCallsDisposed, []);
 			executeCommandCalls = [];
 			showMessageCalls = [];
 			statusMessageCalls = [];
@@ -310,14 +310,14 @@ suite('AbstractKeybindingService', () => {
 			key1: true
 		});
 		let shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'simpleCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -326,13 +326,13 @@ suite('AbstractKeybindingService', () => {
 		// send Ctrl/Cmd + K
 		currentContextValue = createContext({});
 		shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, []);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, [
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, [
 			`(${toUsLabel(KeyMod.CtrlCmd | KeyCode.KEY_K)}) was pressed. Waiting for second key of chord...`
 		]);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -341,14 +341,14 @@ suite('AbstractKeybindingService', () => {
 		// send Ctrl/Cmd + X
 		currentContextValue = createContext({});
 		shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_X);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'chordCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, [
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, [
 			`(${toUsLabel(KeyMod.CtrlCmd | KeyCode.KEY_K)}) was pressed. Waiting for second key of chord...`
 		]);
 		executeCommandCalls = [];
@@ -370,14 +370,14 @@ suite('AbstractKeybindingService', () => {
 		// send Ctrl/Cmd + K
 		currentContextValue = createContext({});
 		let shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'simpleCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -388,14 +388,14 @@ suite('AbstractKeybindingService', () => {
 			key1: true
 		});
 		shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, true);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, true);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'simpleCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -406,11 +406,11 @@ suite('AbstractKeybindingService', () => {
 			key1: true
 		});
 		shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_X);
-		assert.equal(shouldPreventDefault, false);
-		assert.deepEqual(executeCommandCalls, []);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.strictEqual(shouldPreventDefault, false);
+		assert.deepStrictEqual(executeCommandCalls, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
@@ -428,14 +428,14 @@ suite('AbstractKeybindingService', () => {
 		// send Ctrl/Cmd + K
 		currentContextValue = createContext({});
 		let shouldPreventDefault = kbService.testDispatch(KeyMod.CtrlCmd | KeyCode.KEY_K);
-		assert.equal(shouldPreventDefault, false);
-		assert.deepEqual(executeCommandCalls, [{
+		assert.strictEqual(shouldPreventDefault, false);
+		assert.deepStrictEqual(executeCommandCalls, [{
 			commandId: 'simpleCommand',
 			args: [null]
 		}]);
-		assert.deepEqual(showMessageCalls, []);
-		assert.deepEqual(statusMessageCalls, []);
-		assert.deepEqual(statusMessageCallsDisposed, []);
+		assert.deepStrictEqual(showMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCalls, []);
+		assert.deepStrictEqual(statusMessageCallsDisposed, []);
 		executeCommandCalls = [];
 		showMessageCalls = [];
 		statusMessageCalls = [];
diff --git a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
index a321d9b38..f1ef51b64 100644
--- a/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingLabels.test.ts
@@ -11,7 +11,7 @@ suite('KeybindingLabels', () => {
 
 	function assertUSLabel(OS: OperatingSystem, keybinding: number, expected: string): void {
 		const usResolvedKeybinding = new USLayoutResolvedKeybinding(createKeybinding(keybinding, OS)!, OS);
-		assert.equal(usResolvedKeybinding.getLabel(), expected);
+		assert.strictEqual(usResolvedKeybinding.getLabel(), expected);
 	}
 
 	test('Windows US label', () => {
@@ -116,7 +116,7 @@ suite('KeybindingLabels', () => {
 	test('Aria label', () => {
 		function assertAriaLabel(OS: OperatingSystem, keybinding: number, expected: string): void {
 			const usResolvedKeybinding = new USLayoutResolvedKeybinding(createKeybinding(keybinding, OS)!, OS);
-			assert.equal(usResolvedKeybinding.getAriaLabel(), expected);
+			assert.strictEqual(usResolvedKeybinding.getAriaLabel(), expected);
 		}
 
 		assertAriaLabel(OperatingSystem.Windows, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Control+Shift+Alt+Windows+A');
@@ -127,7 +127,7 @@ suite('KeybindingLabels', () => {
 	test('Electron Accelerator label', () => {
 		function assertElectronAcceleratorLabel(OS: OperatingSystem, keybinding: number, expected: string | null): void {
 			const usResolvedKeybinding = new USLayoutResolvedKeybinding(createKeybinding(keybinding, OS)!, OS);
-			assert.equal(usResolvedKeybinding.getElectronAccelerator(), expected);
+			assert.strictEqual(usResolvedKeybinding.getElectronAccelerator(), expected);
 		}
 
 		assertElectronAcceleratorLabel(OperatingSystem.Windows, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'Ctrl+Shift+Alt+Super+A');
@@ -154,7 +154,7 @@ suite('KeybindingLabels', () => {
 	test('User Settings label', () => {
 		function assertElectronAcceleratorLabel(OS: OperatingSystem, keybinding: number, expected: string): void {
 			const usResolvedKeybinding = new USLayoutResolvedKeybinding(createKeybinding(keybinding, OS)!, OS);
-			assert.equal(usResolvedKeybinding.getUserSettingsLabel(), expected);
+			assert.strictEqual(usResolvedKeybinding.getUserSettingsLabel(), expected);
 		}
 
 		assertElectronAcceleratorLabel(OperatingSystem.Windows, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyMod.WinCtrl | KeyCode.KEY_A, 'ctrl+shift+alt+win+a');
diff --git a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
index 2820e0ea4..33472df8a 100644
--- a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
+++ b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
@@ -43,12 +43,12 @@ suite('KeybindingResolver', () => {
 		let contextRules = ContextKeyExpr.equals('bar', 'baz');
 		let keybindingItem = kbItem(keybinding, 'yes', null, contextRules, true);
 
-		assert.equal(KeybindingResolver.contextMatchesRules(createContext({ bar: 'baz' }), contextRules), true);
-		assert.equal(KeybindingResolver.contextMatchesRules(createContext({ bar: 'bz' }), contextRules), false);
+		assert.strictEqual(KeybindingResolver.contextMatchesRules(createContext({ bar: 'baz' }), contextRules), true);
+		assert.strictEqual(KeybindingResolver.contextMatchesRules(createContext({ bar: 'bz' }), contextRules), false);
 
 		let resolver = new KeybindingResolver([keybindingItem], [], () => { });
-		assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(runtimeKeybinding))!.commandId, 'yes');
-		assert.equal(resolver.resolve(createContext({ bar: 'bz' }), null, getDispatchStr(runtimeKeybinding)), null);
+		assert.strictEqual(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(runtimeKeybinding))!.commandId, 'yes');
+		assert.strictEqual(resolver.resolve(createContext({ bar: 'bz' }), null, getDispatchStr(runtimeKeybinding)), null);
 	});
 
 	test('resolve key with arguments', function () {
@@ -59,7 +59,7 @@ suite('KeybindingResolver', () => {
 		let keybindingItem = kbItem(keybinding, 'yes', commandArgs, contextRules, true);
 
 		let resolver = new KeybindingResolver([keybindingItem], [], () => { });
-		assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(runtimeKeybinding))!.commandArgs, commandArgs);
+		assert.strictEqual(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(runtimeKeybinding))!.commandArgs, commandArgs);
 	});
 
 	test('KeybindingResolver.combine simple 1', function () {
@@ -70,7 +70,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_A, 'yes1', null, ContextKeyExpr.equals('1', 'a'), true),
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), false),
 		]);
@@ -85,7 +85,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_C, 'yes3', null, ContextKeyExpr.equals('3', 'c'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_A, 'yes1', null, ContextKeyExpr.equals('1', 'a'), true),
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true),
 			kbItem(KeyCode.KEY_C, 'yes3', null, ContextKeyExpr.equals('3', 'c'), false),
@@ -101,7 +101,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_A, '-yes1', null, ContextKeyExpr.equals('1', 'b'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_A, 'yes1', null, ContextKeyExpr.equals('1', 'a'), true),
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
@@ -116,7 +116,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_B, '-yes1', null, ContextKeyExpr.equals('1', 'a'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_A, 'yes1', null, ContextKeyExpr.equals('1', 'a'), true),
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
@@ -131,7 +131,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_A, '-yes1', null, ContextKeyExpr.equals('1', 'a'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
 	});
@@ -145,7 +145,7 @@ suite('KeybindingResolver', () => {
 			kbItem(0, '-yes1', null, ContextKeyExpr.equals('1', 'a'), false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
 	});
@@ -159,7 +159,7 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_A, '-yes1', null, null!, false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
 	});
@@ -173,7 +173,7 @@ suite('KeybindingResolver', () => {
 			kbItem(0, '-yes1', null, null!, false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
 	});
@@ -187,17 +187,17 @@ suite('KeybindingResolver', () => {
 			kbItem(KeyCode.KEY_A, '-yes1', null, null!, false)
 		];
 		let actual = KeybindingResolver.combine(defaults, overrides);
-		assert.deepEqual(actual, [
+		assert.deepStrictEqual(actual, [
 			kbItem(KeyCode.KEY_B, 'yes2', null, ContextKeyExpr.equals('2', 'b'), true)
 		]);
 	});
 
 	test('contextIsEntirelyIncluded', () => {
 		const assertIsIncluded = (a: string | null, b: string | null) => {
-			assert.equal(KeybindingResolver.whenIsEntirelyIncluded(ContextKeyExpr.deserialize(a), ContextKeyExpr.deserialize(b)), true);
+			assert.strictEqual(KeybindingResolver.whenIsEntirelyIncluded(ContextKeyExpr.deserialize(a), ContextKeyExpr.deserialize(b)), true);
 		};
 		const assertIsNotIncluded = (a: string | null, b: string | null) => {
-			assert.equal(KeybindingResolver.whenIsEntirelyIncluded(ContextKeyExpr.deserialize(a), ContextKeyExpr.deserialize(b)), false);
+			assert.strictEqual(KeybindingResolver.whenIsEntirelyIncluded(ContextKeyExpr.deserialize(a), ContextKeyExpr.deserialize(b)), false);
 		};
 
 		assertIsIncluded('key1', null);
@@ -314,11 +314,11 @@ suite('KeybindingResolver', () => {
 		let testKey = (commandId: string, expectedKeys: number[]) => {
 			// Test lookup
 			let lookupResult = resolver.lookupKeybindings(commandId);
-			assert.equal(lookupResult.length, expectedKeys.length, 'Length mismatch @ commandId ' + commandId + '; GOT: ' + JSON.stringify(lookupResult, null, '\t'));
+			assert.strictEqual(lookupResult.length, expectedKeys.length, 'Length mismatch @ commandId ' + commandId + '; GOT: ' + JSON.stringify(lookupResult, null, '\t'));
 			for (let i = 0, len = lookupResult.length; i < len; i++) {
 				const expected = new USLayoutResolvedKeybinding(createKeybinding(expectedKeys[i], OS)!, OS);
 
-				assert.equal(lookupResult[i].resolvedKeybinding!.getUserSettingsLabel(), expected.getUserSettingsLabel(), 'value mismatch @ commandId ' + commandId);
+				assert.strictEqual(lookupResult[i].resolvedKeybinding!.getUserSettingsLabel(), expected.getUserSettingsLabel(), 'value mismatch @ commandId ' + commandId);
 			}
 		};
 
@@ -333,14 +333,14 @@ suite('KeybindingResolver', () => {
 					// if it's the final part, then we should find a valid command,
 					// and there should not be a chord.
 					assert.ok(result !== null, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result!.commandId, commandId, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result!.enterChord, false, `Enters chord for ${commandId} at part ${i}`);
+					assert.strictEqual(result!.commandId, commandId, `Enters chord for ${commandId} at part ${i}`);
+					assert.strictEqual(result!.enterChord, false, `Enters chord for ${commandId} at part ${i}`);
 				} else {
 					// if it's not the final part, then we should not find a valid command,
 					// and there should be a chord.
 					assert.ok(result !== null, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result!.commandId, null, `Enters chord for ${commandId} at part ${i}`);
-					assert.equal(result!.enterChord, true, `Enters chord for ${commandId} at part ${i}`);
+					assert.strictEqual(result!.commandId, null, `Enters chord for ${commandId} at part ${i}`);
+					assert.strictEqual(result!.enterChord, true, `Enters chord for ${commandId} at part ${i}`);
 				}
 				previousPart = part;
 			}
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
index d1739d0a6..e9c0c56e7 100644
--- a/src/vs/platform/label/common/label.ts
+++ b/src/vs/platform/label/common/label.ts
@@ -8,7 +8,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 
 export const ILabelService = createDecorator<ILabelService>('labelService');
 
@@ -23,7 +23,7 @@ export interface ILabelService {
 	 */
 	getUriLabel(resource: URI, options?: { relative?: boolean, noPrefix?: boolean, endWithSeparator?: boolean }): string;
 	getUriBasenameLabel(resource: URI): string;
-	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string;
+	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace), options?: { verbose: boolean }): string;
 	getHostLabel(scheme: string, authority?: string): string;
 	getSeparator(scheme: string, authority?: string): '/' | '\\';
 
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts
index 9b3d65663..0ede527e5 100644
--- a/src/vs/platform/launch/electron-main/launchMainService.ts
+++ b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -9,10 +9,9 @@ import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IWindowSettings } from 'vs/platform/windows/common/windows';
-import { OpenContext } from 'vs/platform/windows/node/window';
-import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+import { IWindowsMainService, ICodeWindow, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { whenDeleted } from 'vs/base/node/pfs';
-import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { URI } from 'vs/base/common/uri';
 import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron';
@@ -21,6 +20,7 @@ import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo, IRemote
 import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/node/launch';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 
 export const ID = 'launchMainService';
 export const ILaunchMainService = createDecorator<ILaunchMainService>(ID);
@@ -35,23 +35,6 @@ export interface IRemoteDiagnosticOptions {
 	includeWorkspaceMetadata?: boolean;
 }
 
-function parseOpenUrl(args: NativeParsedArgs): { uri: URI, url: string }[] {
-	if (args['open-url'] && args._urls && args._urls.length > 0) {
-		// --open-url must contain -- followed by the url(s)
-		// process.argv is used over args._ as args._ are resolved to file paths at this point
-		return coalesce(args._urls
-			.map(url => {
-				try {
-					return { uri: URI.parse(url), url };
-				} catch (err) {
-					return null;
-				}
-			}));
-	}
-
-	return [];
-}
-
 export interface ILaunchMainService {
 	readonly _serviceBrand: undefined;
 	start(args: NativeParsedArgs, userEnv: IProcessEnvironment): Promise<void>;
@@ -68,7 +51,7 @@ export class LaunchMainService implements ILaunchMainService {
 		@ILogService private readonly logService: ILogService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@IURLService private readonly urlService: IURLService,
-		@IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService,
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }
 
@@ -89,7 +72,7 @@ export class LaunchMainService implements ILaunchMainService {
 		}
 
 		// Check early for open-url which is handled in URL service
-		const urlsToOpen = parseOpenUrl(args);
+		const urlsToOpen = this.parseOpenUrl(args);
 		if (urlsToOpen.length) {
 			let whenWindowReady: Promise<unknown> = Promise.resolve();
 
@@ -113,7 +96,24 @@ export class LaunchMainService implements ILaunchMainService {
 		}
 	}
 
-	private startOpenWindow(args: NativeParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
+	private parseOpenUrl(args: NativeParsedArgs): { uri: URI, url: string }[] {
+		if (args['open-url'] && args._urls && args._urls.length > 0) {
+			// --open-url must contain -- followed by the url(s)
+			// process.argv is used over args._ as args._ are resolved to file paths at this point
+			return coalesce(args._urls
+				.map(url => {
+					try {
+						return { uri: URI.parse(url), url };
+					} catch (err) {
+						return null;
+					}
+				}));
+		}
+
+		return [];
+	}
+
+	private async startOpenWindow(args: NativeParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
 		const context = isLaunchedFromCli(userEnv) ? OpenContext.CLI : OpenContext.DESKTOP;
 		let usedWindows: ICodeWindow[] = [];
 
@@ -205,17 +205,15 @@ export class LaunchMainService implements ILaunchMainService {
 				whenDeleted(waitMarkerFileURI.fsPath)
 			]).then(() => undefined, () => undefined);
 		}
-
-		return Promise.resolve(undefined);
 	}
 
-	getMainProcessId(): Promise<number> {
+	async getMainProcessId(): Promise<number> {
 		this.logService.trace('Received request for process ID from other instance.');
 
-		return Promise.resolve(process.pid);
+		return process.pid;
 	}
 
-	getMainProcessInfo(): Promise<IMainProcessInfo> {
+	async getMainProcessInfo(): Promise<IMainProcessInfo> {
 		this.logService.trace('Received request for main process info from other instance.');
 
 		const windows: IWindowInfo[] = [];
@@ -228,18 +226,18 @@ export class LaunchMainService implements ILaunchMainService {
 			}
 		});
 
-		return Promise.resolve({
+		return {
 			mainPID: process.pid,
 			mainArguments: process.argv.slice(1),
 			windows,
 			screenReader: !!app.accessibilitySupportEnabled,
 			gpuFeatureStatus: app.getGPUFeatureStatus()
-		});
+		};
 	}
 
-	getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<(IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]> {
+	async getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<(IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]> {
 		const windows = this.windowsMainService.getWindows();
-		const promises: Promise<IDiagnosticInfo | IRemoteDiagnosticError | undefined>[] = windows.map(window => {
+		const diagnostics: Array<IDiagnosticInfo | IRemoteDiagnosticError | undefined> = await Promise.all(windows.map(window => {
 			return new Promise<IDiagnosticInfo | IRemoteDiagnosticError | undefined>((resolve) => {
 				const remoteAuthority = window.remoteAuthority;
 				if (remoteAuthority) {
@@ -267,27 +265,26 @@ export class LaunchMainService implements ILaunchMainService {
 					resolve(undefined);
 				}
 			});
-		});
+		}));
 
-		return Promise.all(promises).then(diagnostics => diagnostics.filter((x): x is IRemoteDiagnosticInfo | IRemoteDiagnosticError => !!x));
+		return diagnostics.filter((x): x is IRemoteDiagnosticInfo | IRemoteDiagnosticError => !!x);
 	}
 
 	private getFolderURIs(window: ICodeWindow): URI[] {
 		const folderURIs: URI[] = [];
 
-		if (window.openedFolderUri) {
-			folderURIs.push(window.openedFolderUri);
-		} else if (window.openedWorkspace) {
-			// workspace folders can only be shown for local workspaces
-			const workspaceConfigPath = window.openedWorkspace.configPath;
-			const resolvedWorkspace = this.workspacesMainService.resolveLocalWorkspaceSync(workspaceConfigPath);
+		const workspace = window.openedWorkspace;
+		if (isSingleFolderWorkspaceIdentifier(workspace)) {
+			folderURIs.push(workspace.uri);
+		} else if (isWorkspaceIdentifier(workspace)) {
+			const resolvedWorkspace = this.workspacesManagementMainService.resolveLocalWorkspaceSync(workspace.configPath); // workspace folders can only be shown for local (resolved) workspaces
 			if (resolvedWorkspace) {
 				const rootFolders = resolvedWorkspace.folders;
 				rootFolders.forEach(root => {
 					folderURIs.push(root.uri);
 				});
 			} else {
-				//TODO: can we add the workspace file here?
+				//TODO@RMacfarlane: can we add the workspace file here?
 			}
 		}
 
@@ -296,13 +293,14 @@ export class LaunchMainService implements ILaunchMainService {
 
 	private codeWindowToInfo(window: ICodeWindow): IWindowInfo {
 		const folderURIs = this.getFolderURIs(window);
+
 		return this.browserWindowToInfo(window.win, folderURIs, window.remoteAuthority);
 	}
 
-	private browserWindowToInfo(win: BrowserWindow, folderURIs: URI[] = [], remoteAuthority?: string): IWindowInfo {
+	private browserWindowToInfo(window: BrowserWindow, folderURIs: URI[] = [], remoteAuthority?: string): IWindowInfo {
 		return {
-			pid: win.webContents.getOSProcessId(),
-			title: win.getTitle(),
+			pid: window.webContents.getOSProcessId(),
+			title: window.getTitle(),
 			folderURIs,
 			remoteAuthority
 		};
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
index 62db3f751..6d82c1224 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -576,7 +576,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 					if (window && !window.isDestroyed()) {
 						let whenWindowClosed: Promise<void>;
 						if (window.webContents && !window.webContents.isDestroyed()) {
-							whenWindowClosed = new Promise(c => window.once('closed', c));
+							whenWindowClosed = new Promise(resolve => window.once('closed', resolve));
 						} else {
 							whenWindowClosed = Promise.resolve();
 						}
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index b553a0581..1d515e5bf 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -429,12 +429,14 @@ export interface IResourceNavigatorOptions {
 
 export interface SelectionKeyboardEvent extends KeyboardEvent {
 	preserveFocus?: boolean;
+	pinned?: boolean;
 	__forceEvent?: boolean;
 }
 
-export function getSelectionKeyboardEvent(typeArg = 'keydown', preserveFocus?: boolean): SelectionKeyboardEvent {
+export function getSelectionKeyboardEvent(typeArg = 'keydown', preserveFocus?: boolean, pinned?: boolean): SelectionKeyboardEvent {
 	const e = new KeyboardEvent(typeArg);
 	(<SelectionKeyboardEvent>e).preserveFocus = preserveFocus;
+	(<SelectionKeyboardEvent>e).pinned = pinned;
 	(<SelectionKeyboardEvent>e).__forceEvent = true;
 
 	return e;
@@ -478,8 +480,9 @@ abstract class ResourceNavigator<T> extends Disposable {
 		const focus = this.widget.getFocus();
 		this.widget.setSelection(focus, event.browserEvent);
 
-		const preserveFocus = typeof (event.browserEvent as SelectionKeyboardEvent).preserveFocus === 'boolean' ? (event.browserEvent as SelectionKeyboardEvent).preserveFocus! : true;
-		const pinned = !preserveFocus;
+		const selectionKeyboardEvent = event.browserEvent as SelectionKeyboardEvent;
+		const preserveFocus = typeof selectionKeyboardEvent.preserveFocus === 'boolean' ? selectionKeyboardEvent.preserveFocus! : true;
+		const pinned = typeof selectionKeyboardEvent.pinned === 'boolean' ? selectionKeyboardEvent.pinned! : !preserveFocus;
 		const sideBySide = false;
 
 		this._open(this.getSelectedElement(), preserveFocus, pinned, sideBySide, event.browserEvent);
@@ -490,8 +493,9 @@ abstract class ResourceNavigator<T> extends Disposable {
 			return;
 		}
 
-		const preserveFocus = typeof (event.browserEvent as SelectionKeyboardEvent).preserveFocus === 'boolean' ? (event.browserEvent as SelectionKeyboardEvent).preserveFocus! : true;
-		const pinned = !preserveFocus;
+		const selectionKeyboardEvent = event.browserEvent as SelectionKeyboardEvent;
+		const preserveFocus = typeof selectionKeyboardEvent.preserveFocus === 'boolean' ? selectionKeyboardEvent.preserveFocus! : true;
+		const pinned = typeof selectionKeyboardEvent.pinned === 'boolean' ? selectionKeyboardEvent.pinned! : !preserveFocus;
 		const sideBySide = false;
 
 		this._open(this.getSelectedElement(), preserveFocus, pinned, sideBySide, event.browserEvent);
@@ -826,7 +830,7 @@ function workbenchTreeDataPreamble<T, TFilterData, TOptions extends IAbstractTre
 	};
 
 	const accessibilityOn = accessibilityService.isScreenReaderOptimized();
-	const keyboardNavigation = accessibilityOn ? 'simple' : configurationService.getValue<string>(keyboardNavigationSettingKey);
+	const keyboardNavigation = options.simpleKeyboardNavigation || accessibilityOn ? 'simple' : configurationService.getValue<string>(keyboardNavigationSettingKey);
 	const horizontalScrolling = options.horizontalScrolling !== undefined ? options.horizontalScrolling : configurationService.getValue<boolean>(horizontalScrollingKey);
 	const [workbenchListOptions, disposable] = toWorkbenchListOptions(options, configurationService, keybindingService);
 	const additionalScrollHeight = options.additionalScrollHeight;
diff --git a/src/vs/platform/localizations/common/localizations.ts b/src/vs/platform/localizations/common/localizations.ts
index 509c4ada8..27fa81bae 100644
--- a/src/vs/platform/localizations/common/localizations.ts
+++ b/src/vs/platform/localizations/common/localizations.ts
@@ -25,6 +25,8 @@ export interface ILocalizationsService {
 
 	readonly onDidLanguagesChange: Event<void>;
 	getLanguageIds(): Promise<string[]>;
+
+	update(): Promise<boolean>;
 }
 
 export function isValidLocalization(localization: ILocalization): boolean {
diff --git a/src/vs/platform/log/node/loggerService.ts b/src/vs/platform/log/node/loggerService.ts
index 7120d99d2..49fe8ad45 100644
--- a/src/vs/platform/log/node/loggerService.ts
+++ b/src/vs/platform/log/node/loggerService.ts
@@ -9,8 +9,8 @@ import { URI } from 'vs/base/common/uri';
 import { basename, extname, dirname } from 'vs/base/common/resources';
 import { Schemas } from 'vs/base/common/network';
 import { FileLogService } from 'vs/platform/log/common/fileLogService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
+import { IFileService } from 'vs/platform/files/common/files';
 
 export class LoggerService extends Disposable implements ILoggerService {
 
@@ -20,7 +20,7 @@ export class LoggerService extends Disposable implements ILoggerService {
 
 	constructor(
 		@ILogService private logService: ILogService,
-		@IInstantiationService private instantiationService: IInstantiationService,
+		@IFileService private fileService: IFileService
 	) {
 		super();
 		this._register(logService.onDidChangeLogLevel(level => this.loggers.forEach(logger => logger.setLevel(level))));
@@ -34,7 +34,7 @@ export class LoggerService extends Disposable implements ILoggerService {
 				const ext = extname(resource);
 				logger = new SpdLogService(baseName.substring(0, baseName.length - ext.length), dirname(resource).fsPath, this.logService.getLevel());
 			} else {
-				logger = this.instantiationService.createInstance(FileLogService, basename(resource), resource, this.logService.getLevel());
+				logger = new FileLogService(basename(resource), resource, this.logService.getLevel(), this.fileService);
 			}
 			this.loggers.set(resource.toString(), logger);
 		}
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 537ade060..1c0c67c25 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -145,14 +145,11 @@ export class MarkerService implements IMarkerService {
 	readonly onMarkerChanged: Event<readonly URI[]> = Event.debounce(this._onMarkerChanged.event, MarkerService._debouncer, 0);
 
 	private readonly _data = new DoubleResourceMap<IMarker[]>();
-	private readonly _stats: MarkerStats;
-
-	constructor() {
-		this._stats = new MarkerStats(this);
-	}
+	private readonly _stats = new MarkerStats(this);
 
 	dispose(): void {
 		this._stats.dispose();
+		this._onMarkerChanged.dispose();
 	}
 
 	getStatistics(): MarkerStatistics {
diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts
index 3039b01a1..32f6b799e 100644
--- a/src/vs/platform/menubar/electron-main/menubar.ts
+++ b/src/vs/platform/menubar/electron-main/menubar.ts
@@ -6,9 +6,8 @@
 import * as nls from 'vs/nls';
 import { isMacintosh, language } from 'vs/base/common/platform';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { app, Menu, MenuItem, BrowserWindow, MenuItemConstructorOptions, WebContents, Event, KeyboardEvent } from 'electron';
+import { app, Menu, MenuItem, BrowserWindow, MenuItemConstructorOptions, WebContents, KeyboardEvent } from 'electron';
 import { getTitleBarStyle, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, IWindowOpenable } from 'vs/platform/windows/common/windows';
-import { OpenContext } from 'vs/platform/windows/node/window';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IUpdateService, StateType } from 'vs/platform/update/common/update';
@@ -16,7 +15,7 @@ import product from 'vs/platform/product/common/product';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { mnemonicMenuLabel } from 'vs/base/common/labels';
-import { IWindowsMainService, IWindowsCountChangedEvent } from 'vs/platform/windows/electron-main/windows';
+import { IWindowsMainService, IWindowsCountChangedEvent, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
 import { IMenubarData, IMenubarKeybinding, MenubarMenuItem, isMenubarMenuItemSeparator, isMenubarMenuItemSubmenu, isMenubarMenuItemAction, IMenubarMenu, isMenubarMenuItemUriAction } from 'vs/platform/menubar/common/menubar';
 import { URI } from 'vs/base/common/uri';
@@ -62,7 +61,7 @@ export class Menubar {
 
 	private keybindings: { [commandId: string]: IMenubarKeybinding };
 
-	private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BrowserWindow | undefined, event: Event) => void } = Object.create(null);
+	private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BrowserWindow | undefined, event: KeyboardEvent) => void } = Object.create(null);
 
 	constructor(
 		@IUpdateService private readonly updateService: IUpdateService,
@@ -608,45 +607,18 @@ export class Menubar {
 		}
 	}
 
-	private static _menuItemIsTriggeredViaKeybinding(event: KeyboardEvent, userSettingsLabel: string): boolean {
-		// The event coming in from Electron will inform us only about the modifier keys pressed.
-		// The strategy here is to check if the modifier keys match those of the keybinding,
-		// since it is highly unlikely to use modifier keys when clicking with the mouse
-		if (!userSettingsLabel) {
-			// There is no keybinding
-			return false;
-		}
-
-		let ctrlRequired = /ctrl/.test(userSettingsLabel);
-		let shiftRequired = /shift/.test(userSettingsLabel);
-		let altRequired = /alt/.test(userSettingsLabel);
-		let metaRequired = /cmd/.test(userSettingsLabel) || /super/.test(userSettingsLabel);
-
-		if (!ctrlRequired && !shiftRequired && !altRequired && !metaRequired) {
-			// This keybinding does not use any modifier keys, so we cannot use this heuristic
-			return false;
-		}
-
-		return (
-			ctrlRequired === event.ctrlKey
-			&& shiftRequired === event.shiftKey
-			&& altRequired === event.altKey
-			&& metaRequired === event.metaKey
-		);
-	}
-
 	private createMenuItem(label: string, commandId: string | string[], enabled?: boolean, checked?: boolean): MenuItem;
 	private createMenuItem(label: string, click: () => void, enabled?: boolean, checked?: boolean): MenuItem;
 	private createMenuItem(arg1: string, arg2: any, arg3?: boolean, arg4?: boolean): MenuItem {
 		const label = this.mnemonicLabel(arg1);
-		const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem: MenuItem & IMenuItemWithKeybinding, win: BrowserWindow, event: Event) => {
+		const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem: MenuItem & IMenuItemWithKeybinding, win: BrowserWindow, event: KeyboardEvent) => {
 			const userSettingsLabel = menuItem ? menuItem.userSettingsLabel : null;
 			let commandId = arg2;
 			if (Array.isArray(arg2)) {
 				commandId = this.isOptionClick(event) ? arg2[1] : arg2[0]; // support alternative action if we got multiple action Ids and the option key was pressed while invoking
 			}
 
-			if (userSettingsLabel && Menubar._menuItemIsTriggeredViaKeybinding(event, userSettingsLabel)) {
+			if (userSettingsLabel && event.triggeredByAccelerator) {
 				this.runActionInRenderer({ type: 'keybinding', userSettingsLabel });
 			} else {
 				this.runActionInRenderer({ type: 'commandId', commandId });
@@ -706,8 +678,8 @@ export class Menubar {
 		return new MenuItem(this.withKeybinding(commandId, options));
 	}
 
-	private makeContextAwareClickHandler(click: () => void, contextSpecificHandlers: IMenuItemClickHandler): () => void {
-		return () => {
+	private makeContextAwareClickHandler(click: (menuItem: MenuItem, win: BrowserWindow, event: KeyboardEvent) => void, contextSpecificHandlers: IMenuItemClickHandler): (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => void {
+		return (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => {
 
 			// No Active Window
 			const activeWindow = BrowserWindow.getFocusedWindow();
@@ -722,7 +694,7 @@ export class Menubar {
 			}
 
 			// Finally execute command in Window
-			click();
+			click(menuItem, win || activeWindow, event);
 		};
 	}
 
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 60baf2da4..2c8414ba8 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -49,7 +49,7 @@ export interface ICommonNativeHostService {
 
 	readonly onDidChangeColorScheme: Event<IColorScheme>;
 
-	readonly onDidChangePassword: Event<void>;
+	readonly onDidChangePassword: Event<{ service: string, account: string }>;
 
 	// Window
 	getWindows(): Promise<IOpenedWindow[]>;
@@ -137,6 +137,7 @@ export interface ICommonNativeHostService {
 	// Development
 	openDevTools(options?: OpenDevToolsOptions): Promise<void>;
 	toggleDevTools(): Promise<void>;
+	toggleSharedProcessWindow(): Promise<void>;
 	sendInputEvent(event: MouseInputEvent): Promise<void>;
 
 	// Connectivity
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index e24efa83c..50c4460ad 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -4,18 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+import { IWindowsMainService, ICodeWindow, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, Menu, BrowserWindow, app, clipboard, powerMonitor, nativeTheme } from 'electron';
-import { OpenContext } from 'vs/platform/windows/node/window';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IOpenedWindow, IOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions, IColorScheme } from 'vs/platform/windows/common/windows';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { isMacintosh, isWindows, isLinux } from 'vs/base/common/platform';
+import { isMacintosh, isWindows, isLinux, isLinuxSnap } from 'vs/base/common/platform';
 import { ICommonNativeHostService, IOSProperties, IOSStatistics } from 'vs/platform/native/common/native';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { AddFirstParameterToFunctions } from 'vs/base/common/types';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { dirExists } from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -28,6 +27,7 @@ import { dirname, join } from 'vs/base/common/path';
 import product from 'vs/platform/product/common/product';
 import { memoize } from 'vs/base/common/decorators';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { ISharedProcess } from 'vs/platform/sharedProcess/node/sharedProcess';
 
 export interface INativeHostMainService extends AddFirstParameterToFunctions<ICommonNativeHostService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
 
@@ -43,6 +43,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	declare readonly _serviceBrand: undefined;
 
 	constructor(
+		private sharedProcess: ISharedProcess,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
@@ -91,7 +92,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	private readonly _onDidChangeColorScheme = this._register(new Emitter<IColorScheme>());
 	readonly onDidChangeColorScheme = this._onDidChangeColorScheme.event;
 
-	private readonly _onDidChangePassword = this._register(new Emitter<void>());
+	private readonly _onDidChangePassword = this._register(new Emitter<{ account: string, service: string }>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	//#endregion
@@ -104,7 +105,6 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return windows.map(window => ({
 			id: window.id,
 			workspace: window.openedWorkspace,
-			folderUri: window.openedFolderUri,
 			title: window.win.getTitle(),
 			filename: window.getRepresentedFilename(),
 			dirty: window.isDocumentEdited()
@@ -334,8 +334,8 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	}
 
 	async openExternal(windowId: number | undefined, url: string): Promise<boolean> {
-		if (isLinux && process.env.SNAP && process.env.SNAP_REVISION) {
-			NativeHostMainService._safeSnapOpenExternal(url);
+		if (isLinuxSnap) {
+			this.safeSnapOpenExternal(url);
 		} else {
 			shell.openExternal(url);
 		}
@@ -343,7 +343,9 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return true;
 	}
 
-	private static _safeSnapOpenExternal(url: string): void {
+	private safeSnapOpenExternal(url: string): void {
+
+		// Remove some environment variables before opening to avoid issues...
 		const gdkPixbufModuleFile = process.env['GDK_PIXBUF_MODULE_FILE'];
 		const gdkPixbufModuleDir = process.env['GDK_PIXBUF_MODULEDIR'];
 		delete process.env['GDK_PIXBUF_MODULE_FILE'];
@@ -351,6 +353,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		shell.openExternal(url);
 
+		// ...but restore them after
 		process.env['GDK_PIXBUF_MODULE_FILE'] = gdkPixbufModuleFile;
 		process.env['GDK_PIXBUF_MODULEDIR'] = gdkPixbufModuleDir;
 	}
@@ -626,6 +629,10 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		}
 	}
 
+	async toggleSharedProcessWindow(): Promise<void> {
+		return this.sharedProcess.toggle();
+	}
+
 	//#endregion
 
 	//#region Registry (windows)
@@ -703,7 +710,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 			await keytar.setPassword(service, account, password);
 		}
 
-		this._onDidChangePassword.fire();
+		this._onDidChangePassword.fire({ service, account });
 	}
 
 	async deletePassword(windowId: number | undefined, service: string, account: string): Promise<boolean> {
@@ -711,7 +718,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		const didDelete = await keytar.deletePassword(service, account);
 		if (didDelete) {
-			this._onDidChangePassword.fire();
+			this._onDidChangePassword.fire({ service, account });
 		}
 
 		return didDelete;
diff --git a/src/vs/platform/opener/browser/link.ts b/src/vs/platform/opener/browser/link.ts
index 7b6863cd0..ca887940f 100644
--- a/src/vs/platform/opener/browser/link.ts
+++ b/src/vs/platform/opener/browser/link.ts
@@ -20,11 +20,13 @@ export interface ILinkDescriptor {
 
 export interface ILinkStyles {
 	readonly textLinkForeground?: Color;
+	readonly disabled?: boolean;
 }
 
 export class Link extends Disposable {
 
 	readonly el: HTMLAnchorElement;
+	private disabled: boolean;
 	private styles: ILinkStyles = {
 		textLinkForeground: Color.fromHex('#006AB1')
 	};
@@ -50,9 +52,12 @@ export class Link extends Disposable {
 
 		this._register(onOpen(e => {
 			EventHelper.stop(e, true);
-			openerService.open(link.href);
+			if (!this.disabled) {
+				openerService.open(link.href);
+			}
 		}));
 
+		this.disabled = false;
 		this.applyStyles();
 	}
 
@@ -62,6 +67,26 @@ export class Link extends Disposable {
 	}
 
 	private applyStyles(): void {
-		this.el.style.color = this.styles.textLinkForeground?.toString() || '';
+		const color = this.styles.textLinkForeground?.toString();
+		if (color) {
+			this.el.style.color = color;
+		}
+		if (typeof this.styles.disabled === 'boolean' && this.styles.disabled !== this.disabled) {
+			if (this.styles.disabled) {
+				this.el.setAttribute('aria-disabled', 'true');
+				this.el.tabIndex = -1;
+				this.el.style.pointerEvents = 'none';
+				this.el.style.opacity = '0.4';
+				this.el.style.cursor = 'default';
+				this.disabled = true;
+			} else {
+				this.el.setAttribute('aria-disabled', 'false');
+				this.el.tabIndex = 0;
+				this.el.style.pointerEvents = 'auto';
+				this.el.style.opacity = '1';
+				this.el.style.cursor = 'pointer';
+				this.disabled = false;
+			}
+		}
 	}
 }
diff --git a/src/vs/platform/opener/common/opener.ts b/src/vs/platform/opener/common/opener.ts
index d82651f93..ff6740cf6 100644
--- a/src/vs/platform/opener/common/opener.ts
+++ b/src/vs/platform/opener/common/opener.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { equalsIgnoreCase, startsWithIgnoreCase } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 export const IOpenerService = createDecorator<IOpenerService>('openerService');
 
-type OpenInternalOptions = {
+export type OpenInternalOptions = {
 
 	/**
 	 * Signals that the intent is to open an editor to the side
@@ -31,7 +32,11 @@ type OpenInternalOptions = {
 	readonly fromUserGesture?: boolean;
 };
 
-type OpenExternalOptions = { readonly openExternal?: boolean; readonly allowTunneling?: boolean };
+export type OpenExternalOptions = {
+	readonly openExternal?: boolean;
+	readonly allowTunneling?: boolean;
+	readonly allowContributedOpeners?: boolean | string;
+};
 
 export type OpenOptions = OpenInternalOptions & OpenExternalOptions;
 
@@ -46,7 +51,8 @@ export interface IOpener {
 }
 
 export interface IExternalOpener {
-	openExternal(href: string): Promise<boolean>;
+	openExternal(href: string, ctx: { sourceUri: URI, preferredOpenerId?: string }, token: CancellationToken): Promise<boolean>;
+	dispose?(): void;
 }
 
 export interface IValidator {
@@ -81,7 +87,12 @@ export interface IOpenerService {
 	 * Sets the handler for opening externally. If not provided,
 	 * a default handler will be used.
 	 */
-	setExternalOpener(opener: IExternalOpener): void;
+	setDefaultExternalOpener(opener: IExternalOpener): void;
+
+	/**
+	 * Registers a new opener external resources openers.
+	 */
+	registerExternalOpener(opener: IExternalOpener): IDisposable;
 
 	/**
 	 * Opens a resource, like a webaddress, a document uri, or executes command.
@@ -97,15 +108,16 @@ export interface IOpenerService {
 	resolveExternalUri(resource: URI, options?: ResolveExternalUriOptions): Promise<IResolvedExternalUri>;
 }
 
-export const NullOpenerService: IOpenerService = Object.freeze({
+export const NullOpenerService = Object.freeze({
 	_serviceBrand: undefined,
 	registerOpener() { return Disposable.None; },
 	registerValidator() { return Disposable.None; },
 	registerExternalUriResolver() { return Disposable.None; },
-	setExternalOpener() { },
+	setDefaultExternalOpener() { },
+	registerExternalOpener() { return Disposable.None; },
 	async open() { return false; },
 	async resolveExternalUri(uri: URI) { return { resolved: uri, dispose() { } }; },
-});
+} as IOpenerService);
 
 export function matchesScheme(target: URI | string, scheme: string) {
 	if (URI.isUri(target)) {
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 56fbc68ad..537db557d 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -20,7 +20,7 @@ if (isWeb || typeof require === 'undefined' || typeof require.__$__nodeRequire !
 	// Running out of sources
 	if (Object.keys(product).length === 0) {
 		Object.assign(product, {
-			version: '1.52.0-dev',
+			version: '1.53.0-dev',
 			nameShort: isWeb ? 'Code Web - OSS Dev' : 'Code - OSS Dev',
 			nameLong: isWeb ? 'Code Web - OSS Dev' : 'Code - OSS Dev',
 			applicationName: 'code-oss',
diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
index 74a8c744a..92b8c1a6d 100644
--- a/src/vs/platform/product/common/productService.ts
+++ b/src/vs/platform/product/common/productService.ts
@@ -129,6 +129,8 @@ export interface IProductConfiguration {
 	readonly linkProtectionTrustedDomains?: readonly string[];
 
 	readonly 'configurationSync.store'?: ConfigurationSyncStore;
+
+	readonly darwinUniversalAssetId?: string;
 }
 
 export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
index 3715cbb8e..2f343e841 100644
--- a/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -208,7 +208,7 @@ export class BrowserSocketFactory implements ISocketFactory {
 	}
 
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
-		const socket = this._webSocketFactory.create(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
+		const socket = this._webSocketFactory.create(`ws://${/:/.test(host) ? `[${host}]` : host}:${port}/?${query}&skipWebSocketFrames=false`);
 		const errorListener = socket.onError((err) => callback(err, undefined));
 		socket.onOpen(() => {
 			errorListener.dispose();
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index fdd5890c6..82791249f 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -8,7 +8,7 @@ import { generateUuid } from 'vs/base/common/uuid';
 import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
 import { ISignService } from 'vs/platform/sign/common/sign';
@@ -86,96 +86,124 @@ export interface ISocketFactory {
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void;
 }
 
-async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptions, connectionType: ConnectionType, args: any | undefined): Promise<{ protocol: PersistentProtocol; ownsProtocol: boolean; }> {
-	const logPrefix = connectLogPrefix(options, connectionType);
-	const { protocol, ownsProtocol } = await new Promise<{ protocol: PersistentProtocol; ownsProtocol: boolean; }>((c, e) => {
-		options.logService.trace(`${logPrefix} 1/6. invoking socketFactory.connect().`);
-		options.socketFactory.connect(
-			options.host,
-			options.port,
-			`reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
-			(err: any, socket: ISocket | undefined) => {
-				if (err || !socket) {
-					options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`);
-					options.logService.error(err);
-					e(err);
-					return;
-				}
+async function readOneControlMessage<T>(protocol: PersistentProtocol): Promise<T> {
+	const raw = await Event.toPromise(protocol.onControlMessage);
+	const msg = JSON.parse(raw.toString());
+	const error = getErrorFromMessage(msg);
+	if (error) {
+		throw error;
+	}
+	return msg;
+}
 
-				options.logService.trace(`${logPrefix} 2/6. socketFactory.connect() was successful.`);
-				if (options.reconnectionProtocol) {
-					options.reconnectionProtocol.beginAcceptReconnection(socket, null);
-					c({ protocol: options.reconnectionProtocol, ownsProtocol: false });
-				} else {
-					c({ protocol: new PersistentProtocol(socket, null), ownsProtocol: true });
-				}
+function waitWithTimeout<T>(promise: Promise<T>, timeout: number): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		const timeoutToken = setTimeout(() => {
+			const error: any = new Error('Timeout');
+			error.code = 'ETIMEDOUT';
+			error.syscall = 'connect';
+			reject(error);
+		}, timeout);
+
+		promise.then(
+			(result) => {
+				clearTimeout(timeoutToken);
+				resolve(result);
+			},
+			(error) => {
+				clearTimeout(timeoutToken);
+				reject(error);
 			}
 		);
 	});
+}
 
-	return new Promise<{ protocol: PersistentProtocol; ownsProtocol: boolean; }>((c, e) => {
+function createSocket(socketFactory: ISocketFactory, host: string, port: number, query: string): Promise<ISocket> {
+	return new Promise<ISocket>((resolve, reject) => {
+		socketFactory.connect(host, port, query, (err: any, socket: ISocket | undefined) => {
+			if (err || !socket) {
+				return reject(err);
+			}
+			resolve(socket);
+		});
+	});
+}
 
-		const errorTimeoutToken = setTimeout(() => {
-			const error: any = new Error('handshake timeout');
-			error.code = 'ETIMEDOUT';
-			error.syscall = 'connect';
+async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptions, connectionType: ConnectionType, args: any | undefined): Promise<{ protocol: PersistentProtocol; ownsProtocol: boolean; }> {
+	const logPrefix = connectLogPrefix(options, connectionType);
+
+	options.logService.trace(`${logPrefix} 1/6. invoking socketFactory.connect().`);
+
+	let socket: ISocket;
+	try {
+		socket = await createSocket(options.socketFactory, options.host, options.port, `reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`);
+	} catch (error) {
+		options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`);
+		options.logService.error(error);
+		throw error;
+	}
+
+	options.logService.trace(`${logPrefix} 2/6. socketFactory.connect() was successful.`);
+
+	let protocol: PersistentProtocol;
+	let ownsProtocol: boolean;
+	if (options.reconnectionProtocol) {
+		options.reconnectionProtocol.beginAcceptReconnection(socket, null);
+		protocol = options.reconnectionProtocol;
+		ownsProtocol = false;
+	} else {
+		protocol = new PersistentProtocol(socket, null);
+		ownsProtocol = true;
+	}
+
+	options.logService.trace(`${logPrefix} 3/6. sending AuthRequest control message.`);
+	const authRequest: AuthRequest = {
+		type: 'auth',
+		auth: options.connectionToken || '00000000000000000000'
+	};
+	protocol.sendControl(VSBuffer.fromString(JSON.stringify(authRequest)));
+
+	try {
+		const msg = await waitWithTimeout(readOneControlMessage<HandshakeMessage>(protocol), 10000);
+
+		if (msg.type !== 'sign' || typeof msg.data !== 'string') {
+			const error: any = new Error('Unexpected handshake message');
+			error.code = 'VSCODE_CONNECTION_ERROR';
+			throw error;
+		}
+
+		options.logService.trace(`${logPrefix} 4/6. received SignRequest control message.`);
+
+		const signed = await options.signService.sign(msg.data);
+		const connTypeRequest: ConnectionTypeRequest = {
+			type: 'connectionType',
+			commit: options.commit,
+			signedData: signed,
+			desiredConnectionType: connectionType
+		};
+		if (args) {
+			connTypeRequest.args = args;
+		}
+
+		options.logService.trace(`${logPrefix} 5/6. sending ConnectionTypeRequest control message.`);
+		protocol.sendControl(VSBuffer.fromString(JSON.stringify(connTypeRequest)));
+
+		return { protocol, ownsProtocol };
+
+	} catch (error) {
+		if (error && error.code === 'ETIMEDOUT') {
 			options.logService.error(`${logPrefix} the handshake took longer than 10 seconds. Error:`);
 			options.logService.error(error);
-			if (ownsProtocol) {
-				safeDisposeProtocolAndSocket(protocol);
-			}
-			e(error);
-		}, 10000);
-
-		const messageRegistration = protocol.onControlMessage(async raw => {
-			const msg = <HandshakeMessage>JSON.parse(raw.toString());
-			// Stop listening for further events
-			messageRegistration.dispose();
-
-			const error = getErrorFromMessage(msg);
-			if (error) {
-				options.logService.error(`${logPrefix} received error control message when negotiating connection. Error:`);
-				options.logService.error(error);
-				if (ownsProtocol) {
-					safeDisposeProtocolAndSocket(protocol);
-				}
-				return e(error);
-			}
-
-			if (msg.type === 'sign') {
-				options.logService.trace(`${logPrefix} 4/6. received SignRequest control message.`);
-				const signed = await options.signService.sign(msg.data);
-				const connTypeRequest: ConnectionTypeRequest = {
-					type: 'connectionType',
-					commit: options.commit,
-					signedData: signed,
-					desiredConnectionType: connectionType
-				};
-				if (args) {
-					connTypeRequest.args = args;
-				}
-				options.logService.trace(`${logPrefix} 5/6. sending ConnectionTypeRequest control message.`);
-				protocol.sendControl(VSBuffer.fromString(JSON.stringify(connTypeRequest)));
-				clearTimeout(errorTimeoutToken);
-				c({ protocol, ownsProtocol });
-			} else {
-				const error = new Error('handshake error');
-				options.logService.error(`${logPrefix} received unexpected control message. Error:`);
-				options.logService.error(error);
-				if (ownsProtocol) {
-					safeDisposeProtocolAndSocket(protocol);
-				}
-				e(error);
-			}
-		});
-
-		options.logService.trace(`${logPrefix} 3/6. sending AuthRequest control message.`);
-		const authRequest: AuthRequest = {
-			type: 'auth',
-			auth: options.connectionToken || '00000000000000000000'
-		};
-		protocol.sendControl(VSBuffer.fromString(JSON.stringify(authRequest)));
-	});
+		}
+		if (error && error.code === 'VSCODE_CONNECTION_ERROR') {
+			options.logService.error(`${logPrefix} received error control message when negotiating connection. Error:`);
+			options.logService.error(error);
+		}
+		if (ownsProtocol) {
+			safeDisposeProtocolAndSocket(protocol);
+		}
+		throw error;
+	}
 }
 
 interface IManagementConnectionResult {
@@ -287,7 +315,7 @@ export async function connectRemoteAgentManagement(options: IConnectionOptions,
 	} catch (err) {
 		options.logService.error(`[remote-connection] An error occurred in the very first connect attempt, it will be treated as a permanent error! Error:`);
 		options.logService.error(err);
-		PersistentConnection.triggerPermanentFailure();
+		PersistentConnection.triggerPermanentFailure(0, 0, RemoteAuthorityResolverError.isHandled(err));
 		throw err;
 	}
 }
@@ -301,7 +329,7 @@ export async function connectRemoteAgentExtensionHost(options: IConnectionOption
 	} catch (err) {
 		options.logService.error(`[remote-connection] An error occurred in the very first connect attempt, it will be treated as a permanent error! Error:`);
 		options.logService.error(err);
-		PersistentConnection.triggerPermanentFailure();
+		PersistentConnection.triggerPermanentFailure(0, 0, RemoteAuthorityResolverError.isHandled(err));
 		throw err;
 	}
 }
@@ -333,10 +361,16 @@ export const enum PersistentConnectionEventType {
 }
 export class ConnectionLostEvent {
 	public readonly type = PersistentConnectionEventType.ConnectionLost;
+	constructor(
+		public readonly reconnectionToken: string,
+		public readonly millisSinceLastIncomingData: number
+	) { }
 }
 export class ReconnectionWaitEvent {
 	public readonly type = PersistentConnectionEventType.ReconnectionWait;
 	constructor(
+		public readonly reconnectionToken: string,
+		public readonly millisSinceLastIncomingData: number,
 		public readonly durationSeconds: number,
 		private readonly cancellableTimer: CancelablePromise<void>
 	) { }
@@ -347,22 +381,44 @@ export class ReconnectionWaitEvent {
 }
 export class ReconnectionRunningEvent {
 	public readonly type = PersistentConnectionEventType.ReconnectionRunning;
+	constructor(
+		public readonly reconnectionToken: string,
+		public readonly millisSinceLastIncomingData: number,
+		public readonly attempt: number
+	) { }
 }
 export class ConnectionGainEvent {
 	public readonly type = PersistentConnectionEventType.ConnectionGain;
+	constructor(
+		public readonly reconnectionToken: string,
+		public readonly millisSinceLastIncomingData: number,
+		public readonly attempt: number
+	) { }
 }
 export class ReconnectionPermanentFailureEvent {
 	public readonly type = PersistentConnectionEventType.ReconnectionPermanentFailure;
+	constructor(
+		public readonly reconnectionToken: string,
+		public readonly millisSinceLastIncomingData: number,
+		public readonly attempt: number,
+		public readonly handled: boolean
+	) { }
 }
 export type PersistentConnectionEvent = ConnectionGainEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent;
 
 abstract class PersistentConnection extends Disposable {
 
-	public static triggerPermanentFailure(): void {
+	public static triggerPermanentFailure(millisSinceLastIncomingData: number, attempt: number, handled: boolean): void {
 		this._permanentFailure = true;
-		this._instances.forEach(instance => instance._gotoPermanentFailure());
+		this._permanentFailureMillisSinceLastIncomingData = millisSinceLastIncomingData;
+		this._permanentFailureAttempt = attempt;
+		this._permanentFailureHandled = handled;
+		this._instances.forEach(instance => instance._gotoPermanentFailure(this._permanentFailureMillisSinceLastIncomingData, this._permanentFailureAttempt, this._permanentFailureHandled));
 	}
 	private static _permanentFailure: boolean = false;
+	private static _permanentFailureMillisSinceLastIncomingData: number = 0;
+	private static _permanentFailureAttempt: number = 0;
+	private static _permanentFailureHandled: boolean = false;
 	private static _instances: PersistentConnection[] = [];
 
 	private readonly _onDidStateChange = this._register(new Emitter<PersistentConnectionEvent>());
@@ -381,7 +437,7 @@ abstract class PersistentConnection extends Disposable {
 		this.protocol = protocol;
 		this._isReconnecting = false;
 
-		this._onDidStateChange.fire(new ConnectionGainEvent());
+		this._onDidStateChange.fire(new ConnectionGainEvent(this.reconnectionToken, 0, 0));
 
 		this._register(protocol.onSocketClose(() => this._beginReconnecting()));
 		this._register(protocol.onSocketTimeout(() => this._beginReconnecting()));
@@ -389,7 +445,7 @@ abstract class PersistentConnection extends Disposable {
 		PersistentConnection._instances.push(this);
 
 		if (PersistentConnection._permanentFailure) {
-			this._gotoPermanentFailure();
+			this._gotoPermanentFailure(PersistentConnection._permanentFailureMillisSinceLastIncomingData, PersistentConnection._permanentFailureAttempt, PersistentConnection._permanentFailureHandled);
 		}
 	}
 
@@ -413,21 +469,23 @@ abstract class PersistentConnection extends Disposable {
 		}
 		const logPrefix = commonLogPrefix(this._connectionType, this.reconnectionToken, true);
 		this._options.logService.info(`${logPrefix} starting reconnecting loop. You can get more information with the trace log level.`);
-		this._onDidStateChange.fire(new ConnectionLostEvent());
-		const TIMES = [5, 5, 10, 10, 10, 10, 10, 30];
+		this._onDidStateChange.fire(new ConnectionLostEvent(this.reconnectionToken, this.protocol.getMillisSinceLastIncomingData()));
+		const TIMES = [0, 5, 5, 10, 10, 10, 10, 10, 30];
 		const disconnectStartTime = Date.now();
 		let attempt = -1;
 		do {
 			attempt++;
 			const waitTime = (attempt < TIMES.length ? TIMES[attempt] : TIMES[TIMES.length - 1]);
 			try {
-				const sleepPromise = sleep(waitTime);
-				this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise));
+				if (waitTime > 0) {
+					const sleepPromise = sleep(waitTime);
+					this._onDidStateChange.fire(new ReconnectionWaitEvent(this.reconnectionToken, this.protocol.getMillisSinceLastIncomingData(), waitTime, sleepPromise));
 
-				this._options.logService.info(`${logPrefix} waiting for ${waitTime} seconds before reconnecting...`);
-				try {
-					await sleepPromise;
-				} catch { } // User canceled timer
+					this._options.logService.info(`${logPrefix} waiting for ${waitTime} seconds before reconnecting...`);
+					try {
+						await sleepPromise;
+					} catch { } // User canceled timer
+				}
 
 				if (PersistentConnection._permanentFailure) {
 					this._options.logService.error(`${logPrefix} permanent failure occurred while running the reconnecting loop.`);
@@ -435,26 +493,26 @@ abstract class PersistentConnection extends Disposable {
 				}
 
 				// connection was lost, let's try to re-establish it
-				this._onDidStateChange.fire(new ReconnectionRunningEvent());
+				this._onDidStateChange.fire(new ReconnectionRunningEvent(this.reconnectionToken, this.protocol.getMillisSinceLastIncomingData(), attempt + 1));
 				this._options.logService.info(`${logPrefix} resolving connection...`);
 				const simpleOptions = await resolveConnectionOptions(this._options, this.reconnectionToken, this.protocol);
 				this._options.logService.info(`${logPrefix} connecting to ${simpleOptions.host}:${simpleOptions.port}...`);
 				await connectWithTimeLimit(simpleOptions.logService, this._reconnect(simpleOptions), RECONNECT_TIMEOUT);
 				this._options.logService.info(`${logPrefix} reconnected!`);
-				this._onDidStateChange.fire(new ConnectionGainEvent());
+				this._onDidStateChange.fire(new ConnectionGainEvent(this.reconnectionToken, this.protocol.getMillisSinceLastIncomingData(), attempt + 1));
 
 				break;
 			} catch (err) {
 				if (err.code === 'VSCODE_CONNECTION_ERROR') {
 					this._options.logService.error(`${logPrefix} A permanent error occurred in the reconnecting loop! Will give up now! Error:`);
 					this._options.logService.error(err);
-					PersistentConnection.triggerPermanentFailure();
+					PersistentConnection.triggerPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, false);
 					break;
 				}
 				if (Date.now() - disconnectStartTime > ProtocolConstants.ReconnectionGraceTime) {
 					this._options.logService.error(`${logPrefix} An error occurred while reconnecting, but it will be treated as a permanent error because the reconnection grace time has expired! Will give up now! Error:`);
 					this._options.logService.error(err);
-					PersistentConnection.triggerPermanentFailure();
+					PersistentConnection.triggerPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, false);
 					break;
 				}
 				if (RemoteAuthorityResolverError.isTemporarilyNotAvailable(err)) {
@@ -475,16 +533,22 @@ abstract class PersistentConnection extends Disposable {
 					// try again!
 					continue;
 				}
+				if (err instanceof RemoteAuthorityResolverError) {
+					this._options.logService.error(`${logPrefix} A RemoteAuthorityResolverError occurred while trying to reconnect. Will give up now! Error:`);
+					this._options.logService.error(err);
+					PersistentConnection.triggerPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, RemoteAuthorityResolverError.isHandled(err));
+					break;
+				}
 				this._options.logService.error(`${logPrefix} An unknown error occurred while trying to reconnect, since this is an unknown case, it will be treated as a permanent error! Will give up now! Error:`);
 				this._options.logService.error(err);
-				PersistentConnection.triggerPermanentFailure();
+				PersistentConnection.triggerPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, false);
 				break;
 			}
 		} while (!PersistentConnection._permanentFailure);
 	}
 
-	private _gotoPermanentFailure(): void {
-		this._onDidStateChange.fire(new ReconnectionPermanentFailureEvent());
+	private _gotoPermanentFailure(millisSinceLastIncomingData: number, attempt: number, handled: boolean): void {
+		this._onDidStateChange.fire(new ReconnectionPermanentFailureEvent(this.reconnectionToken, millisSinceLastIncomingData, attempt, handled));
 		safeDisposeProtocolAndSocket(this.protocol);
 	}
 
diff --git a/src/vs/platform/remote/common/remoteAgentEnvironment.ts b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
index 3052141ff..fd2752809 100644
--- a/src/vs/platform/remote/common/remoteAgentEnvironment.ts
+++ b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
@@ -5,6 +5,7 @@
 
 import { URI } from 'vs/base/common/uri';
 import { OperatingSystem } from 'vs/base/common/platform';
+import * as performance from 'vs/base/common/performance';
 
 export interface IRemoteAgentEnvironment {
 	pid: number;
@@ -18,6 +19,7 @@ export interface IRemoteAgentEnvironment {
 	workspaceStorageHome: URI;
 	userHome: URI;
 	os: OperatingSystem;
+	marks: performance.PerformanceMark[];
 }
 
 export interface RemoteAgentConnectionContext {
diff --git a/src/vs/platform/remote/common/remoteHosts.ts b/src/vs/platform/remote/common/remoteHosts.ts
index 1f3ab36f3..86f2c4f26 100644
--- a/src/vs/platform/remote/common/remoteHosts.ts
+++ b/src/vs/platform/remote/common/remoteHosts.ts
@@ -19,7 +19,7 @@ export function getRemoteName(authority: string | undefined): string | undefined
 	}
 	const pos = authority.indexOf('+');
 	if (pos < 0) {
-		// funky? bad authority?
+		// e.g. localhost:8000
 		return authority;
 	}
 	return authority.substr(0, pos);
diff --git a/src/vs/platform/remote/common/tunnel.ts b/src/vs/platform/remote/common/tunnel.ts
index 980c3203a..b4009323b 100644
--- a/src/vs/platform/remote/common/tunnel.ts
+++ b/src/vs/platform/remote/common/tunnel.ts
@@ -5,6 +5,7 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { isWindows, OperatingSystem } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -17,36 +18,64 @@ export interface RemoteTunnel {
 	readonly tunnelRemoteHost: string;
 	readonly tunnelLocalPort?: number;
 	readonly localAddress: string;
-	dispose(silent?: boolean): void;
+	readonly public: boolean;
+	dispose(silent?: boolean): Promise<void>;
 }
 
 export interface TunnelOptions {
-	remoteAddress: { port: number, host: string };
+	remoteAddress: { port: number, host: string; };
 	localAddressPort?: number;
 	label?: string;
+	public?: boolean;
 }
 
 export interface TunnelCreationOptions {
 	elevationRequired?: boolean;
 }
 
+export interface TunnelProviderFeatures {
+	elevation: boolean;
+	public: boolean;
+}
+
 export interface ITunnelProvider {
-	forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<RemoteTunnel> | undefined;
+	forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<RemoteTunnel | undefined> | undefined;
+}
+
+export interface ITunnel {
+	remoteAddress: { port: number, host: string };
+
+	/**
+	 * The complete local address(ex. localhost:1234)
+	 */
+	localAddress: string;
+
+	public?: boolean;
+
+	/**
+	 * Implementers of Tunnel should fire onDidDispose when dispose is called.
+	 */
+	onDidDispose: Event<void>;
+
+	dispose(): Promise<void> | void;
 }
 
 export interface ITunnelService {
 	readonly _serviceBrand: undefined;
 
 	readonly tunnels: Promise<readonly RemoteTunnel[]>;
+	readonly canMakePublic: boolean;
 	readonly onTunnelOpened: Event<RemoteTunnel>;
-	readonly onTunnelClosed: Event<{ host: string, port: number }>;
+	readonly onTunnelClosed: Event<{ host: string, port: number; }>;
+	readonly canElevate: boolean;
 
-	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort?: number): Promise<RemoteTunnel> | undefined;
+	canTunnel(uri: URI): boolean;
+	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort?: number, elevateIfNeeded?: boolean, isPublic?: boolean): Promise<RemoteTunnel | undefined> | undefined;
 	closeTunnel(remoteHost: string, remotePort: number): Promise<void>;
-	setTunnelProvider(provider: ITunnelProvider | undefined): IDisposable;
+	setTunnelProvider(provider: ITunnelProvider | undefined, features: TunnelProviderFeatures): IDisposable;
 }
 
-export function extractLocalHostUriMetaDataForPortMapping(uri: URI): { address: string, port: number } | undefined {
+export function extractLocalHostUriMetaDataForPortMapping(uri: URI): { address: string, port: number; } | undefined {
 	if (uri.scheme !== 'http' && uri.scheme !== 'https') {
 		return undefined;
 	}
@@ -74,51 +103,88 @@ function getOtherLocalhost(host: string): string | undefined {
 	return (host === 'localhost') ? '127.0.0.1' : ((host === '127.0.0.1') ? 'localhost' : undefined);
 }
 
+export function isPortPrivileged(port: number, os?: OperatingSystem): boolean {
+	if (os) {
+		return os !== OperatingSystem.Windows && (port < 1024);
+	} else {
+		return !isWindows && (port < 1024);
+	}
+}
+
 export abstract class AbstractTunnelService implements ITunnelService {
 	declare readonly _serviceBrand: undefined;
 
 	private _onTunnelOpened: Emitter<RemoteTunnel> = new Emitter();
 	public onTunnelOpened: Event<RemoteTunnel> = this._onTunnelOpened.event;
-	private _onTunnelClosed: Emitter<{ host: string, port: number }> = new Emitter();
-	public onTunnelClosed: Event<{ host: string, port: number }> = this._onTunnelClosed.event;
-	protected readonly _tunnels = new Map</*host*/ string, Map</* port */ number, { refcount: number, readonly value: Promise<RemoteTunnel> }>>();
+	private _onTunnelClosed: Emitter<{ host: string, port: number; }> = new Emitter();
+	public onTunnelClosed: Event<{ host: string, port: number; }> = this._onTunnelClosed.event;
+	protected readonly _tunnels = new Map</*host*/ string, Map</* port */ number, { refcount: number, readonly value: Promise<RemoteTunnel | undefined>; }>>();
 	protected _tunnelProvider: ITunnelProvider | undefined;
+	protected _canElevate: boolean = false;
+	private _canMakePublic: boolean = false;
 
 	public constructor(
 		@ILogService protected readonly logService: ILogService
 	) { }
 
-	setTunnelProvider(provider: ITunnelProvider | undefined): IDisposable {
+	setTunnelProvider(provider: ITunnelProvider | undefined, features: TunnelProviderFeatures): IDisposable {
+		this._tunnelProvider = provider;
 		if (!provider) {
+			// clear features
+			this._canElevate = false;
+			this._canMakePublic = false;
 			return {
 				dispose: () => { }
 			};
 		}
-		this._tunnelProvider = provider;
+		this._canElevate = features.elevation;
+		this._canMakePublic = features.public;
 		return {
 			dispose: () => {
 				this._tunnelProvider = undefined;
+				this._canElevate = false;
+				this._canMakePublic = false;
 			}
 		};
 	}
 
-	public get tunnels(): Promise<readonly RemoteTunnel[]> {
-		const promises: Promise<RemoteTunnel>[] = [];
-		Array.from(this._tunnels.values()).forEach(portMap => Array.from(portMap.values()).forEach(x => promises.push(x.value)));
-		return Promise.all(promises);
+	public get canElevate(): boolean {
+		return this._canElevate;
 	}
 
-	dispose(): void {
+	public get canMakePublic() {
+		return this._canMakePublic;
+	}
+
+	public get tunnels(): Promise<readonly RemoteTunnel[]> {
+		return new Promise(async (resolve) => {
+			const tunnels: RemoteTunnel[] = [];
+			const tunnelArray = Array.from(this._tunnels.values());
+			for (let portMap of tunnelArray) {
+				const portArray = Array.from(portMap.values());
+				for (let x of portArray) {
+					const tunnelValue = await x.value;
+					if (tunnelValue) {
+						tunnels.push(tunnelValue);
+					}
+				}
+			}
+			resolve(tunnels);
+		});
+	}
+
+	async dispose(): Promise<void> {
 		for (const portMap of this._tunnels.values()) {
 			for (const { value } of portMap.values()) {
-				value.then(tunnel => tunnel.dispose());
+				await value.then(tunnel => tunnel?.dispose());
 			}
 			portMap.clear();
 		}
 		this._tunnels.clear();
 	}
 
-	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort: number): Promise<RemoteTunnel> | undefined {
+	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort?: number, elevateIfNeeded: boolean = false, isPublic: boolean = false): Promise<RemoteTunnel | undefined> | undefined {
+		this.logService.trace(`openTunnel request for ${remoteHost}:${remotePort} on local port ${localPort}.`);
 		if (!addressProvider) {
 			return undefined;
 		}
@@ -127,12 +193,19 @@ export abstract class AbstractTunnelService implements ITunnelService {
 			remoteHost = 'localhost';
 		}
 
-		const resolvedTunnel = this.retainOrCreateTunnel(addressProvider, remoteHost, remotePort, localPort);
+		const resolvedTunnel = this.retainOrCreateTunnel(addressProvider, remoteHost, remotePort, localPort, elevateIfNeeded, isPublic);
 		if (!resolvedTunnel) {
+			this.logService.trace(`Tunnel was not created.`);
 			return resolvedTunnel;
 		}
 
 		return resolvedTunnel.then(tunnel => {
+			if (!tunnel) {
+				this.logService.trace('New tunnel is undefined.');
+				this.removeEmptyTunnelFromMap(remoteHost!, remotePort);
+				return undefined;
+			}
+			this.logService.trace('New tunnel established.');
 			const newTunnel = this.makeTunnel(tunnel);
 			if (tunnel.tunnelRemoteHost !== remoteHost || tunnel.tunnelRemotePort !== remotePort) {
 				this.logService.warn('Created tunnel does not match requirements of requested tunnel. Host or port mismatch.');
@@ -148,24 +221,28 @@ export abstract class AbstractTunnelService implements ITunnelService {
 			tunnelRemoteHost: tunnel.tunnelRemoteHost,
 			tunnelLocalPort: tunnel.tunnelLocalPort,
 			localAddress: tunnel.localAddress,
-			dispose: () => {
+			public: tunnel.public,
+			dispose: async () => {
 				const existingHost = this._tunnels.get(tunnel.tunnelRemoteHost);
 				if (existingHost) {
 					const existing = existingHost.get(tunnel.tunnelRemotePort);
 					if (existing) {
 						existing.refcount--;
-						this.tryDisposeTunnel(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort, existing);
+						await this.tryDisposeTunnel(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort, existing);
 					}
 				}
 			}
 		};
 	}
 
-	private async tryDisposeTunnel(remoteHost: string, remotePort: number, tunnel: { refcount: number, readonly value: Promise<RemoteTunnel> }): Promise<void> {
+	private async tryDisposeTunnel(remoteHost: string, remotePort: number, tunnel: { refcount: number, readonly value: Promise<RemoteTunnel | undefined> }): Promise<void> {
 		if (tunnel.refcount <= 0) {
-			const disposePromise: Promise<void> = tunnel.value.then(tunnel => {
-				tunnel.dispose(true);
-				this._onTunnelClosed.fire({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort });
+			this.logService.trace(`Tunnel is being disposed ${remoteHost}:${remotePort}.`);
+			const disposePromise: Promise<void> = tunnel.value.then(async (tunnel) => {
+				if (tunnel) {
+					await tunnel.dispose(true);
+					this._onTunnelClosed.fire({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort });
+				}
 			});
 			if (this._tunnels.has(remoteHost)) {
 				this._tunnels.get(remoteHost)!.delete(remotePort);
@@ -183,16 +260,30 @@ export abstract class AbstractTunnelService implements ITunnelService {
 		}
 	}
 
-	protected addTunnelToMap(remoteHost: string, remotePort: number, tunnel: Promise<RemoteTunnel>) {
+	protected addTunnelToMap(remoteHost: string, remotePort: number, tunnel: Promise<RemoteTunnel | undefined>) {
 		if (!this._tunnels.has(remoteHost)) {
 			this._tunnels.set(remoteHost, new Map());
 		}
 		this._tunnels.get(remoteHost)!.set(remotePort, { refcount: 1, value: tunnel });
 	}
 
-	protected getTunnelFromMap(remoteHost: string, remotePort: number): { refcount: number, readonly value: Promise<RemoteTunnel> } | undefined {
+	private async removeEmptyTunnelFromMap(remoteHost: string, remotePort: number) {
+		const hostMap = this._tunnels.get(remoteHost);
+		if (hostMap) {
+			const tunnel = hostMap.get(remotePort);
+			const tunnelResult = await tunnel;
+			if (!tunnelResult) {
+				hostMap.delete(remotePort);
+			}
+			if (hostMap.size === 0) {
+				this._tunnels.delete(remoteHost);
+			}
+		}
+	}
+
+	protected getTunnelFromMap(remoteHost: string, remotePort: number): { refcount: number, readonly value: Promise<RemoteTunnel | undefined> } | undefined {
 		const otherLocalhost = getOtherLocalhost(remoteHost);
-		let portMap: Map<number, { refcount: number, readonly value: Promise<RemoteTunnel> }> | undefined;
+		let portMap: Map<number, { refcount: number, readonly value: Promise<RemoteTunnel | undefined> }> | undefined;
 		if (otherLocalhost) {
 			const firstMap = this._tunnels.get(remoteHost);
 			const secondMap = this._tunnels.get(otherLocalhost);
@@ -207,31 +298,25 @@ export abstract class AbstractTunnelService implements ITunnelService {
 		return portMap ? portMap.get(remotePort) : undefined;
 	}
 
-	protected abstract retainOrCreateTunnel(addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort?: number): Promise<RemoteTunnel> | undefined;
+	canTunnel(uri: URI): boolean {
+		return !!extractLocalHostUriMetaDataForPortMapping(uri);
+	}
 
-	protected isPortPrivileged(port: number): boolean {
-		return port < 1024;
+	protected abstract retainOrCreateTunnel(addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined;
+
+	protected createWithProvider(tunnelProvider: ITunnelProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined {
+		this.logService.trace(`Creating tunnel with provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
+
+		const preferredLocalPort = localPort === undefined ? remotePort : localPort;
+		const creationInfo = { elevationRequired: elevateIfNeeded ? isPortPrivileged(preferredLocalPort) : false };
+		const tunnelOptions: TunnelOptions = { remoteAddress: { host: remoteHost, port: remotePort }, localAddressPort: localPort, public: isPublic };
+		const tunnel = tunnelProvider.forwardPort(tunnelOptions, creationInfo);
+		this.logService.trace('Tunnel created by provider.');
+		if (tunnel) {
+			this.addTunnelToMap(remoteHost, remotePort, tunnel);
+		}
+		return tunnel;
 	}
 }
 
-export class TunnelService extends AbstractTunnelService {
-	protected retainOrCreateTunnel(_addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort?: number | undefined): Promise<RemoteTunnel> | undefined {
-		const existing = this.getTunnelFromMap(remoteHost, remotePort);
-		if (existing) {
-			++existing.refcount;
-			return existing.value;
-		}
 
-		if (this._tunnelProvider) {
-			const preferredLocalPort = localPort === undefined ? remotePort : localPort;
-			const tunnelOptions = { remoteAddress: { host: remoteHost, port: remotePort }, localAddressPort: localPort };
-			const creationInfo = { elevationRequired: this.isPortPrivileged(preferredLocalPort) };
-			const tunnel = this._tunnelProvider.forwardPort(tunnelOptions, creationInfo);
-			if (tunnel) {
-				this.addTunnelToMap(remoteHost, remotePort, tunnel);
-			}
-			return tunnel;
-		}
-		return undefined;
-	}
-}
diff --git a/src/vs/platform/remote/node/nodeSocketFactory.ts b/src/vs/platform/remote/node/nodeSocketFactory.ts
index 44d689961..0a95e23eb 100644
--- a/src/vs/platform/remote/node/nodeSocketFactory.ts
+++ b/src/vs/platform/remote/node/nodeSocketFactory.ts
@@ -22,7 +22,7 @@ export const nodeSocketFactory = new class implements ISocketFactory {
 			const nonce = buffer.toString('base64');
 
 			let headers = [
-				`GET ws://${host}:${port}/?${query}&skipWebSocketFrames=true HTTP/1.1`,
+				`GET ws://${/:/.test(host) ? `[${host}]` : host}:${port}/?${query}&skipWebSocketFrames=true HTTP/1.1`,
 				`Connection: Upgrade`,
 				`Upgrade: websocket`,
 				`Sec-WebSocket-Key: ${nonce}`
diff --git a/src/vs/platform/remote/node/tunnelService.ts b/src/vs/platform/remote/node/tunnelService.ts
index 19ec1efd6..80ef45f22 100644
--- a/src/vs/platform/remote/node/tunnelService.ts
+++ b/src/vs/platform/remote/node/tunnelService.ts
@@ -10,7 +10,7 @@ import { findFreePortFaster } from 'vs/base/node/ports';
 import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { connectRemoteAgentTunnel, IConnectionOptions, IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
+import { connectRemoteAgentTunnel, IConnectionOptions, IAddressProvider, ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 import { AbstractTunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
 import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
@@ -26,6 +26,7 @@ class NodeRemoteTunnel extends Disposable implements RemoteTunnel {
 	public tunnelLocalPort!: number;
 	public tunnelRemoteHost: string;
 	public localAddress!: string;
+	public readonly public = false;
 
 	private readonly _options: IConnectionOptions;
 	private readonly _server: net.Server;
@@ -57,7 +58,7 @@ class NodeRemoteTunnel extends Disposable implements RemoteTunnel {
 		this.tunnelRemoteHost = tunnelRemoteHost;
 	}
 
-	public dispose(): void {
+	public async dispose(): Promise<void> {
 		super.dispose();
 		this._server.removeListener('listening', this._listeningListener);
 		this._server.removeListener('connection', this._connectionListener);
@@ -129,8 +130,9 @@ class NodeRemoteTunnel extends Disposable implements RemoteTunnel {
 	}
 }
 
-export class TunnelService extends AbstractTunnelService {
+export class BaseTunnelService extends AbstractTunnelService {
 	public constructor(
+		private readonly socketFactory: ISocketFactory,
 		@ILogService logService: ILogService,
 		@ISignService private readonly signService: ISignService,
 		@IProductService private readonly productService: IProductService
@@ -138,7 +140,7 @@ export class TunnelService extends AbstractTunnelService {
 		super(logService);
 	}
 
-	protected retainOrCreateTunnel(addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort?: number): Promise<RemoteTunnel> | undefined {
+	protected retainOrCreateTunnel(addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined {
 		const existing = this.getTunnelFromMap(remoteHost, remotePort);
 		if (existing) {
 			++existing.refcount;
@@ -146,18 +148,12 @@ export class TunnelService extends AbstractTunnelService {
 		}
 
 		if (this._tunnelProvider) {
-			const preferredLocalPort = localPort === undefined ? remotePort : localPort;
-			const creationInfo = { elevationRequired: this.isPortPrivileged(preferredLocalPort) };
-			const tunnelOptions = { remoteAddress: { host: remoteHost, port: remotePort }, localAddressPort: localPort };
-			const tunnel = this._tunnelProvider.forwardPort(tunnelOptions, creationInfo);
-			if (tunnel) {
-				this.addTunnelToMap(remoteHost, remotePort, tunnel);
-			}
-			return tunnel;
+			return this.createWithProvider(this._tunnelProvider, remoteHost, remotePort, localPort, elevateIfNeeded, isPublic);
 		} else {
+			this.logService.trace(`Creating tunnel without provider ${remoteHost}:${remotePort} on local port ${localPort}.`);
 			const options: IConnectionOptions = {
 				commit: this.productService.commit,
-				socketFactory: nodeSocketFactory,
+				socketFactory: this.socketFactory,
 				addressProvider,
 				signService: this.signService,
 				logService: this.logService,
@@ -165,8 +161,19 @@ export class TunnelService extends AbstractTunnelService {
 			};
 
 			const tunnel = createRemoteTunnel(options, remoteHost, remotePort, localPort);
+			this.logService.trace('Tunnel created without provider.');
 			this.addTunnelToMap(remoteHost, remotePort, tunnel);
 			return tunnel;
 		}
 	}
 }
+
+export class TunnelService extends BaseTunnelService {
+	public constructor(
+		@ILogService logService: ILogService,
+		@ISignService signService: ISignService,
+		@IProductService productService: IProductService
+	) {
+		super(nodeSocketFactory, logService, signService, productService);
+	}
+}
diff --git a/src/vs/platform/sharedProcess/node/sharedProcess.ts b/src/vs/platform/sharedProcess/node/sharedProcess.ts
new file mode 100644
index 000000000..8a0ea62d7
--- /dev/null
+++ b/src/vs/platform/sharedProcess/node/sharedProcess.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
+import { LogLevel } from 'vs/platform/log/common/log';
+
+export interface ISharedProcess {
+
+	/**
+	 * Toggles the visibility of the otherwise hidden
+	 * shared process window.
+	 */
+	toggle(): Promise<void>;
+}
+
+export interface ISharedProcessConfiguration {
+	readonly machineId: string;
+	readonly windowId: number;
+
+	readonly appRoot: string;
+
+	readonly userEnv: NodeJS.ProcessEnv;
+
+	readonly sharedIPCHandle: string;
+
+	readonly args: NativeParsedArgs;
+
+	readonly logLevel: LogLevel;
+
+	readonly nodeCachedDataDir?: string;
+	readonly backupWorkspacesPath: string;
+}
diff --git a/src/vs/platform/state/node/state.ts b/src/vs/platform/state/node/state.ts
index b07335f95..9fd896f91 100644
--- a/src/vs/platform/state/node/state.ts
+++ b/src/vs/platform/state/node/state.ts
@@ -12,6 +12,8 @@ export interface IStateService {
 
 	getItem<T>(key: string, defaultValue: T): T;
 	getItem<T>(key: string, defaultValue?: T): T | undefined;
+
 	setItem(key: string, data?: object | string | number | boolean | undefined | null): void;
+
 	removeItem(key: string): void;
 }
diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts
index 0def1cf9c..cb46b77fa 100644
--- a/src/vs/platform/state/node/stateService.ts
+++ b/src/vs/platform/state/node/stateService.ts
@@ -143,7 +143,7 @@ export class StateService implements IStateService {
 	}
 
 	getItem<T>(key: string, defaultValue: T): T;
-	getItem<T>(key: string, defaultValue: T | undefined): T | undefined;
+	getItem<T>(key: string, defaultValue?: T): T | undefined;
 	getItem<T>(key: string, defaultValue?: T): T | undefined {
 		return this.fileStorage.getItem(key, defaultValue);
 	}
diff --git a/src/vs/platform/state/test/node/state.test.ts b/src/vs/platform/state/test/node/state.test.ts
index 82166e204..dc4acc6ae 100644
--- a/src/vs/platform/state/test/node/state.test.ts
+++ b/src/vs/platform/state/test/node/state.test.ts
@@ -4,31 +4,37 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { tmpdir } from 'os';
+import { join } from 'vs/base/common/path';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { FileStorage } from 'vs/platform/state/node/stateService';
-import { mkdirp, rimraf, RimRafMode, writeFileSync } from 'vs/base/node/pfs';
+import { mkdirp, rimraf, writeFileSync } from 'vs/base/node/pfs';
 
-suite('StateService', () => {
-	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'stateservice');
-	const storageFile = path.join(parentDir, 'storage.json');
+flakySuite('StateService', () => {
 
-	teardown(async () => {
-		await rimraf(parentDir, RimRafMode.MOVE);
+	let testDir: string;
+
+	setup(() => {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'stateservice');
+
+		return mkdirp(testDir);
 	});
 
-	test('Basics', async () => {
-		await mkdirp(parentDir);
+	teardown(() => {
+		return rimraf(testDir);
+	});
+
+	test('Basics', async function () {
+		const storageFile = join(testDir, 'storage.json');
 		writeFileSync(storageFile, '');
 
 		let service = new FileStorage(storageFile, () => null);
 
 		service.setItem('some.key', 'some.value');
-		assert.equal(service.getItem('some.key'), 'some.value');
+		assert.strictEqual(service.getItem('some.key'), 'some.value');
 
 		service.removeItem('some.key');
-		assert.equal(service.getItem('some.key', 'some.default'), 'some.default');
+		assert.strictEqual(service.getItem('some.key', 'some.default'), 'some.default');
 
 		assert.ok(!service.getItem('some.unknonw.key'));
 
@@ -36,15 +42,15 @@ suite('StateService', () => {
 
 		service = new FileStorage(storageFile, () => null);
 
-		assert.equal(service.getItem('some.other.key'), 'some.other.value');
+		assert.strictEqual(service.getItem('some.other.key'), 'some.other.value');
 
 		service.setItem('some.other.key', 'some.other.value');
-		assert.equal(service.getItem('some.other.key'), 'some.other.value');
+		assert.strictEqual(service.getItem('some.other.key'), 'some.other.value');
 
 		service.setItem('some.undefined.key', undefined);
-		assert.equal(service.getItem('some.undefined.key', 'some.default'), 'some.default');
+		assert.strictEqual(service.getItem('some.undefined.key', 'some.default'), 'some.default');
 
 		service.setItem('some.null.key', null);
-		assert.equal(service.getItem('some.null.key', 'some.default'), 'some.default');
+		assert.strictEqual(service.getItem('some.null.key', 'some.default'), 'some.default');
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts
index 8645255d9..67195995c 100644
--- a/src/vs/platform/storage/node/storageIpc.ts
+++ b/src/vs/platform/storage/node/storageIpc.ts
@@ -200,12 +200,10 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
 		return this.channel.call('updateItems', serializableRequest);
 	}
 
-	close(): Promise<void> {
+	async close(): Promise<void> {
 
 		// when we are about to close, we start to ignore main-side changes since we close anyway
 		dispose(this.onDidChangeItemsOnMainListener);
-
-		return Promise.resolve(); // global storage is closed on the main side
 	}
 
 	dispose(): void {
diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts
index 97cb9b161..5be6557bd 100644
--- a/src/vs/platform/storage/node/storageService.ts
+++ b/src/vs/platform/storage/node/storageService.ts
@@ -12,7 +12,7 @@ import { mark } from 'vs/base/common/performance';
 import { join } from 'vs/base/common/path';
 import { copy, exists, mkdirp, writeFile } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceInitializationPayload, isWorkspaceIdentifier, isSingleFolderWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces';
 import { assertIsDefined } from 'vs/base/common/types';
 import { RunOnceScheduler, runWhenIdle } from 'vs/base/common/async';
 
@@ -83,7 +83,7 @@ export class NativeStorageService extends AbstractStorageService {
 			const useInMemoryStorage = !!this.environmentService.extensionTestsLocationURI; // no storage during extension tests!
 
 			// Create workspace storage and initialize
-			mark('willInitWorkspaceStorage');
+			mark('code/willInitWorkspaceStorage');
 			try {
 				const workspaceStorage = this.createWorkspaceStorage(
 					useInMemoryStorage ? SQLiteStorageDatabase.IN_MEMORY_PATH : join(result.path, NativeStorageService.WORKSPACE_STORAGE_NAME),
@@ -99,7 +99,7 @@ export class NativeStorageService extends AbstractStorageService {
 					workspaceStorage.set(IS_NEW_KEY, false);
 				}
 			} finally {
-				mark('didInitWorkspaceStorage');
+				mark('code/didInitWorkspaceStorage');
 			}
 		} catch (error) {
 			this.logService.error(`[storage] initializeWorkspaceStorage(): Unable to init workspace storage due to ${error}`);
@@ -148,23 +148,22 @@ export class NativeStorageService extends AbstractStorageService {
 
 	private ensureWorkspaceStorageFolderMeta(payload: IWorkspaceInitializationPayload): void {
 		let meta: object | undefined = undefined;
-		if (isSingleFolderWorkspaceInitializationPayload(payload)) {
-			meta = { folder: payload.folder.toString() };
+		if (isSingleFolderWorkspaceIdentifier(payload)) {
+			meta = { folder: payload.uri.toString() };
 		} else if (isWorkspaceIdentifier(payload)) {
-			meta = { configuration: payload.configPath };
+			meta = { workspace: payload.configPath.toString() };
 		}
 
 		if (meta) {
-			const logService = this.logService;
-			const workspaceStorageMetaPath = join(this.getWorkspaceStorageFolderPath(payload), NativeStorageService.WORKSPACE_META_NAME);
-			(async function () {
+			(async () => {
 				try {
+					const workspaceStorageMetaPath = join(this.getWorkspaceStorageFolderPath(payload), NativeStorageService.WORKSPACE_META_NAME);
 					const storageExists = await exists(workspaceStorageMetaPath);
 					if (!storageExists) {
 						await writeFile(workspaceStorageMetaPath, JSON.stringify(meta, undefined, 2));
 					}
 				} catch (error) {
-					logService.error(error);
+					this.logService.error(error);
 				}
 			})();
 		}
diff --git a/src/vs/platform/storage/test/common/storageService.test.ts b/src/vs/platform/storage/test/common/storageService.test.ts
index 886efb2f8..182ff12af 100644
--- a/src/vs/platform/storage/test/common/storageService.test.ts
+++ b/src/vs/platform/storage/test/common/storageService.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { strictEqual, ok, equal } from 'assert';
+import { strictEqual, ok } from 'assert';
 import { StorageScope, InMemoryStorageService, StorageTarget, IStorageValueChangeEvent, IStorageTargetChangeEvent } from 'vs/platform/storage/common/storage';
 
 suite('StorageService', function () {
@@ -32,15 +32,15 @@ suite('StorageService', function () {
 		storage.store('test.get', 'foobar', scope, StorageTarget.MACHINE);
 		strictEqual(storage.get('test.get', scope, (undefined)!), 'foobar');
 		let storageValueChangeEvent = storageValueChangeEvents.find(e => e.key === 'test.get');
-		equal(storageValueChangeEvent?.scope, scope);
-		equal(storageValueChangeEvent?.key, 'test.get');
+		strictEqual(storageValueChangeEvent?.scope, scope);
+		strictEqual(storageValueChangeEvent?.key, 'test.get');
 		storageValueChangeEvents = [];
 
 		storage.store('test.get', '', scope, StorageTarget.MACHINE);
 		strictEqual(storage.get('test.get', scope, (undefined)!), '');
 		storageValueChangeEvent = storageValueChangeEvents.find(e => e.key === 'test.get');
-		equal(storageValueChangeEvent!.scope, scope);
-		equal(storageValueChangeEvent!.key, 'test.get');
+		strictEqual(storageValueChangeEvent!.scope, scope);
+		strictEqual(storageValueChangeEvent!.key, 'test.get');
 
 		storage.store('test.getNumber', 5, scope, StorageTarget.MACHINE);
 		strictEqual(storage.getNumber('test.getNumber', scope, (undefined)!), 5);
@@ -79,8 +79,8 @@ suite('StorageService', function () {
 		storage.remove('test.remove', scope);
 		ok(!storage.get('test.remove', scope, (undefined)!));
 		let storageValueChangeEvent = storageValueChangeEvents.find(e => e.key === 'test.remove');
-		equal(storageValueChangeEvent?.scope, scope);
-		equal(storageValueChangeEvent?.key, 'test.remove');
+		strictEqual(storageValueChangeEvent?.scope, scope);
+		strictEqual(storageValueChangeEvent?.key, 'test.remove');
 	}
 
 	test('Keys (in-memory)', () => {
@@ -107,20 +107,20 @@ suite('StorageService', function () {
 
 				storage.store('test.target1', 'value1', scope, target);
 				strictEqual(storage.keys(scope, target).length, 1);
-				equal(storageTargetEvent?.scope, scope);
-				equal(storageValueChangeEvent?.key, 'test.target1');
-				equal(storageValueChangeEvent?.scope, scope);
-				equal(storageValueChangeEvent?.target, target);
+				strictEqual(storageTargetEvent?.scope, scope);
+				strictEqual(storageValueChangeEvent?.key, 'test.target1');
+				strictEqual(storageValueChangeEvent?.scope, scope);
+				strictEqual(storageValueChangeEvent?.target, target);
 
 				storageTargetEvent = undefined;
 				storageValueChangeEvent = Object.create(null);
 
 				storage.store('test.target1', 'otherValue1', scope, target);
 				strictEqual(storage.keys(scope, target).length, 1);
-				equal(storageTargetEvent, undefined);
-				equal(storageValueChangeEvent?.key, 'test.target1');
-				equal(storageValueChangeEvent?.scope, scope);
-				equal(storageValueChangeEvent?.target, target);
+				strictEqual(storageTargetEvent, undefined);
+				strictEqual(storageValueChangeEvent?.key, 'test.target1');
+				strictEqual(storageValueChangeEvent?.scope, scope);
+				strictEqual(storageValueChangeEvent?.target, target);
 
 				storage.store('test.target2', 'value2', scope, target);
 				storage.store('test.target3', 'value3', scope, target);
@@ -142,9 +142,9 @@ suite('StorageService', function () {
 
 				storage.remove('test.target4', scope);
 				strictEqual(storage.keys(scope, target).length, keysLength);
-				equal(storageTargetEvent?.scope, scope);
-				equal(storageValueChangeEvent?.key, 'test.target4');
-				equal(storageValueChangeEvent?.scope, scope);
+				strictEqual(storageTargetEvent?.scope, scope);
+				strictEqual(storageValueChangeEvent?.key, 'test.target4');
+				strictEqual(storageValueChangeEvent?.scope, scope);
 			}
 		}
 
@@ -171,7 +171,7 @@ suite('StorageService', function () {
 
 				storage.store('test.target1', undefined, scope, target);
 				strictEqual(storage.keys(scope, target).length, 0);
-				equal(storageTargetEvent?.scope, scope);
+				strictEqual(storageTargetEvent?.scope, scope);
 
 				storage.store('test.target1', '', scope, target);
 				strictEqual(storage.keys(scope, target).length, 1);
diff --git a/src/vs/platform/storage/test/electron-browser/storage.test.ts b/src/vs/platform/storage/test/electron-browser/storage.test.ts
index 4e5e10a4e..56f0a638d 100644
--- a/src/vs/platform/storage/test/electron-browser/storage.test.ts
+++ b/src/vs/platform/storage/test/electron-browser/storage.test.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equal } from 'assert';
+import { strictEqual } from 'assert';
 import { FileStorageDatabase } from 'vs/platform/storage/browser/storageService';
-import { generateUuid } from 'vs/base/common/uuid';
 import { join } from 'vs/base/common/path';
 import { tmpdir } from 'os';
-import { rimraf, RimRafMode } from 'vs/base/node/pfs';
+import { rimraf } from 'vs/base/node/pfs';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { Storage } from 'vs/base/parts/storage/common/storage';
 import { URI } from 'vs/base/common/uri';
@@ -20,11 +19,10 @@ import { Schemas } from 'vs/base/common/network';
 
 suite('Storage', () => {
 
-	const parentDir = getRandomTestPath(tmpdir(), 'vsctests', 'storageservice');
+	let testDir: string;
 
 	let fileService: FileService;
 	let fileProvider: DiskFileSystemProvider;
-	let testDir: string;
 
 	const disposables = new DisposableStore();
 
@@ -38,14 +36,13 @@ suite('Storage', () => {
 		disposables.add(fileService.registerProvider(Schemas.file, fileProvider));
 		disposables.add(fileProvider);
 
-		const id = generateUuid();
-		testDir = join(parentDir, id);
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'storageservice');
 	});
 
-	teardown(async () => {
+	teardown(() => {
 		disposables.clear();
 
-		await rimraf(parentDir, RimRafMode.MOVE);
+		return rimraf(testDir);
 	});
 
 	test('File Based Storage', async () => {
@@ -57,9 +54,9 @@ suite('Storage', () => {
 		storage.set('barNumber', 55);
 		storage.set('barBoolean', true);
 
-		equal(storage.get('bar'), 'foo');
-		equal(storage.get('barNumber'), '55');
-		equal(storage.get('barBoolean'), 'true');
+		strictEqual(storage.get('bar'), 'foo');
+		strictEqual(storage.get('barNumber'), '55');
+		strictEqual(storage.get('barBoolean'), 'true');
 
 		await storage.close();
 
@@ -67,17 +64,17 @@ suite('Storage', () => {
 
 		await storage.init();
 
-		equal(storage.get('bar'), 'foo');
-		equal(storage.get('barNumber'), '55');
-		equal(storage.get('barBoolean'), 'true');
+		strictEqual(storage.get('bar'), 'foo');
+		strictEqual(storage.get('barNumber'), '55');
+		strictEqual(storage.get('barBoolean'), 'true');
 
 		storage.delete('bar');
 		storage.delete('barNumber');
 		storage.delete('barBoolean');
 
-		equal(storage.get('bar', 'undefined'), 'undefined');
-		equal(storage.get('barNumber', 'undefinedNumber'), 'undefinedNumber');
-		equal(storage.get('barBoolean', 'undefinedBoolean'), 'undefinedBoolean');
+		strictEqual(storage.get('bar', 'undefined'), 'undefined');
+		strictEqual(storage.get('barNumber', 'undefinedNumber'), 'undefinedNumber');
+		strictEqual(storage.get('barBoolean', 'undefinedBoolean'), 'undefinedBoolean');
 
 		await storage.close();
 
@@ -85,8 +82,8 @@ suite('Storage', () => {
 
 		await storage.init();
 
-		equal(storage.get('bar', 'undefined'), 'undefined');
-		equal(storage.get('barNumber', 'undefinedNumber'), 'undefinedNumber');
-		equal(storage.get('barBoolean', 'undefinedBoolean'), 'undefinedBoolean');
+		strictEqual(storage.get('bar', 'undefined'), 'undefined');
+		strictEqual(storage.get('barNumber', 'undefinedNumber'), 'undefinedNumber');
+		strictEqual(storage.get('barBoolean', 'undefinedBoolean'), 'undefinedBoolean');
 	});
 });
diff --git a/src/vs/platform/storage/test/node/storageService.test.ts b/src/vs/platform/storage/test/node/storageService.test.ts
index e0a410ef6..6677ab24d 100644
--- a/src/vs/platform/storage/test/node/storageService.test.ts
+++ b/src/vs/platform/storage/test/node/storageService.test.ts
@@ -3,33 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equal } from 'assert';
+import { strictEqual } from 'assert';
 import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { NativeStorageService } from 'vs/platform/storage/node/storageService';
-import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'vs/base/common/path';
 import { tmpdir } from 'os';
-import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
+import { mkdirp, rimraf } from 'vs/base/node/pfs';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { InMemoryStorageDatabase } from 'vs/base/parts/storage/common/storage';
 import { URI } from 'vs/base/common/uri';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 
-suite('NativeStorageService', function () {
+flakySuite('NativeStorageService', function () {
 
-	function uniqueStorageDir(): string {
-		const id = generateUuid();
+	let testDir: string;
 
-		return join(tmpdir(), 'vsctests', id, 'storage2', id);
-	}
+	setup(() => {
+		testDir = getRandomTestPath(tmpdir(), 'vsctests', 'storageservice');
 
-	test('Migrate Data', async () => {
+		return mkdirp(testDir);
+	});
 
-		// Given issues such as https://github.com/microsoft/vscode/issues/108113
-		// we see random test failures when accessing the native file system.
-		this.retries(3);
-		this.timeout(1000 * 20);
+	teardown(() => {
+		return rimraf(testDir);
+	});
+
+	test('Migrate Data', async function () {
 
 		class StorageTestEnvironmentService extends NativeEnvironmentService {
 
@@ -46,27 +46,23 @@ suite('NativeStorageService', function () {
 			}
 		}
 
-		const storageDir = uniqueStorageDir();
-		await mkdirp(storageDir);
-
-		const storage = new NativeStorageService(new InMemoryStorageDatabase(), new NullLogService(), new StorageTestEnvironmentService(URI.file(storageDir), storageDir));
+		const storage = new NativeStorageService(new InMemoryStorageDatabase(), new NullLogService(), new StorageTestEnvironmentService(URI.file(testDir), testDir));
 		await storage.initialize({ id: String(Date.now()) });
 
 		storage.store('bar', 'foo', StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		storage.store('barNumber', 55, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		storage.store('barBoolean', true, StorageScope.GLOBAL, StorageTarget.MACHINE);
 
-		equal(storage.get('bar', StorageScope.WORKSPACE), 'foo');
-		equal(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
-		equal(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
+		strictEqual(storage.get('bar', StorageScope.WORKSPACE), 'foo');
+		strictEqual(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
+		strictEqual(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
 
 		await storage.migrate({ id: String(Date.now() + 100) });
 
-		equal(storage.get('bar', StorageScope.WORKSPACE), 'foo');
-		equal(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
-		equal(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
+		strictEqual(storage.get('bar', StorageScope.WORKSPACE), 'foo');
+		strictEqual(storage.getNumber('barNumber', StorageScope.WORKSPACE), 55);
+		strictEqual(storage.getBoolean('barBoolean', StorageScope.GLOBAL), true);
 
 		await storage.close();
-		await rimraf(storageDir, RimRafMode.MOVE);
 	});
 });
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/common/commonProperties.ts
similarity index 78%
rename from src/vs/platform/telemetry/node/commonProperties.ts
rename to src/vs/platform/telemetry/common/commonProperties.ts
index d681c0c77..46f08b5d3 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/common/commonProperties.ts
@@ -3,12 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as Platform from 'vs/base/common/platform';
-import * as os from 'os';
-import * as uuid from 'vs/base/common/uuid';
-import { readFile } from 'vs/base/node/pfs';
+import { IFileService } from 'vs/platform/files/common/files';
+import { isLinuxSnap, PlatformToString, platform } from 'vs/base/common/platform';
+import { platform as nodePlatform, env } from 'vs/base/common/process';
+import { generateUuid } from 'vs/base/common/uuid';
+import { URI } from 'vs/base/common/uri';
 
 export async function resolveCommonProperties(
+	fileService: IFileService,
+	release: string,
+	arch: string,
 	commit: string | undefined,
 	version: string | undefined,
 	machineId: string | undefined,
@@ -21,19 +25,19 @@ export async function resolveCommonProperties(
 	// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
 	result['common.machineId'] = machineId;
 	// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	result['sessionID'] = uuid.generateUuid() + Date.now();
+	result['sessionID'] = generateUuid() + Date.now();
 	// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 	result['commitHash'] = commit;
 	// __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['version'] = version;
 	// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
+	result['common.platformVersion'] = (release || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	result['common.platform'] = Platform.PlatformToString(Platform.platform);
+	result['common.platform'] = PlatformToString(platform);
 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-	result['common.nodePlatform'] = process.platform;
+	result['common.nodePlatform'] = nodePlatform;
 	// __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-	result['common.nodeArch'] = process.arch;
+	result['common.nodeArch'] = arch;
 	// __GDPR__COMMON__ "common.product" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 	result['common.product'] = product || 'desktop';
 
@@ -64,16 +68,16 @@ export async function resolveCommonProperties(
 		}
 	});
 
-	if (process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION) {
+	if (isLinuxSnap) {
 		// __GDPR__COMMON__ "common.snap" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		result['common.snap'] = 'true';
 	}
 
 	try {
-		const contents = await readFile(installSourcePath, 'utf8');
+		const contents = await fileService.readFile(URI.file(installSourcePath));
 
 		// __GDPR__COMMON__ "common.source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		result['common.source'] = contents.slice(0, 30);
+		result['common.source'] = contents.value.toString().slice(0, 30);
 	} catch (error) {
 		// ignore error
 	}
@@ -82,10 +86,11 @@ export async function resolveCommonProperties(
 }
 
 function verifyMicrosoftInternalDomain(domainList: readonly string[]): boolean {
-	if (!process || !process.env || !process.env['USERDNSDOMAIN']) {
+	const userDnsDomain = env['USERDNSDOMAIN'];
+	if (!userDnsDomain) {
 		return false;
 	}
 
-	const domain = process.env['USERDNSDOMAIN']!.toLowerCase();
+	const domain = userDnsDomain.toLowerCase();
 	return domainList.some(msftDomain => domain === msftDomain);
 }
diff --git a/src/vs/platform/telemetry/node/telemetryIpc.ts b/src/vs/platform/telemetry/common/telemetryIpc.ts
similarity index 100%
rename from src/vs/platform/telemetry/node/telemetryIpc.ts
rename to src/vs/platform/telemetry/common/telemetryIpc.ts
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index b5239353a..7bf7747c4 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -332,6 +332,12 @@ export const editorHoverStatusBarBackground = registerColor('editorHoverWidget.s
  */
 export const editorActiveLinkForeground = registerColor('editorLink.activeForeground', { dark: '#4E94CE', light: Color.blue, hc: Color.cyan }, nls.localize('activeLinkForeground', 'Color of active links.'));
 
+/**
+ * Inline hints
+ */
+export const editorInlineHintForeground = registerColor('editorInlineHint.foreground', { dark: editorWidgetBackground, light: editorWidgetForeground, hc: editorWidgetBackground }, nls.localize('editorInlineHintForeground', 'Foreground color of inline hints'));
+export const editorInlineHintBackground = registerColor('editorInlineHint.background', { dark: editorWidgetForeground, light: editorWidgetBackground, hc: editorWidgetForeground }, nls.localize('editorInlineHintBackground', 'Background color of inline hints'));
+
 /**
  * Editor lighbulb icon colors
  */
diff --git a/src/vs/platform/theme/common/iconRegistry.ts b/src/vs/platform/theme/common/iconRegistry.ts
index a19a41a84..4079cc4e2 100644
--- a/src/vs/platform/theme/common/iconRegistry.ts
+++ b/src/vs/platform/theme/common/iconRegistry.ts
@@ -12,7 +12,6 @@ import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/plat
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as Codicons from 'vs/base/common/codicons';
 
-
 //  ------ API types
 
 
@@ -190,11 +189,6 @@ class IconRegistry implements IIconRegistry {
 
 	public toString() {
 		const sorter = (i1: IconContribution, i2: IconContribution) => {
-			const isThemeIcon1 = ThemeIcon.isThemeIcon(i1.defaults);
-			const isThemeIcon2 = ThemeIcon.isThemeIcon(i2.defaults);
-			if (isThemeIcon1 !== isThemeIcon2) {
-				return isThemeIcon1 ? -1 : 1;
-			}
 			return i1.id.localeCompare(i2.id);
 		};
 		const classNames = (i: IconContribution) => {
@@ -205,18 +199,24 @@ class IconRegistry implements IIconRegistry {
 		};
 
 		let reference = [];
-		let docCss = [];
 
+		reference.push(`| preview     | identifier                        | default codicon id                | description`);
+		reference.push(`| ----------- | --------------------------------- | --------------------------------- | --------------------------------- |`);
 		const contributions = Object.keys(this.iconsById).map(key => this.iconsById[key]);
 
-		for (const i of contributions.sort(sorter)) {
-			reference.push(`|<i class="${classNames(i)}"></i>|${i.id}|${ThemeIcon.isThemeIcon(i.defaults) ? i.defaults.id : ''}|${i.description || ''}|`);
-
-			if (!ThemeIcon.isThemeIcon((i.defaults))) {
-				docCss.push(`.codicon-${i.id}:before { content: "${i.defaults.character}" }`);
-			}
+		for (const i of contributions.filter(i => !!i.description).sort(sorter)) {
+			reference.push(`|<i class="${classNames(i)}"></i>|${i.id}|${ThemeIcon.isThemeIcon(i.defaults) ? i.defaults.id : i.id}|${i.description || ''}|`);
 		}
-		return reference.join('\n') + '\n\n' + docCss.join('\n');
+
+		reference.push(`| preview     | identifier                        `);
+		reference.push(`| ----------- | --------------------------------- |`);
+
+		for (const i of contributions.filter(i => !ThemeIcon.isThemeIcon(i.defaults)).sort(sorter)) {
+			reference.push(`|<i class="${classNames(i)}"></i>|${i.id}|`);
+
+		}
+
+		return reference.join('\n');
 	}
 
 }
@@ -262,3 +262,5 @@ export const widgetClose = registerIcon('widget-close', Codicons.Codicon.close,
 
 export const gotoPreviousLocation = registerIcon('goto-previous-location', Codicons.Codicon.arrowUp, localize('previousChangeIcon', 'Icon for goto previous editor location.'));
 export const gotoNextLocation = registerIcon('goto-next-location', Codicons.Codicon.arrowDown, localize('nextChangeIcon', 'Icon for goto next editor location.'));
+
+export const syncing = ThemeIcon.modify(Codicons.Codicon.sync, 'spin');
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index f82c45767..1096c6be5 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -11,7 +11,7 @@ import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { CSSIcon } from 'vs/base/common/codicons';
+import { Codicon, CSSIcon } from 'vs/base/common/codicons';
 
 export const IThemeService = createDecorator<IThemeService>('themeService');
 
@@ -70,50 +70,13 @@ export namespace ThemeIcon {
 		return ti1.id === ti2.id && ti1.color?.id === ti2.color?.id;
 	}
 
-	const _regexAsClassName = /^(codicon\/)?([a-z-]+)(~[a-z]+)?$/i;
-
-	export function asClassNameArray(icon: ThemeIcon): string[] {
-		const match = _regexAsClassName.exec(icon.id);
-		if (!match) {
-			return ['codicon', 'codicon-error'];
-		}
-		let [, , name, modifier] = match;
-		let className = `codicon-${name}`;
-		if (modifier) {
-			return ['codicon', className, modifier.substr(1)];
-		}
-		return ['codicon', className];
-	}
-
-
-	export function asClassName(icon: ThemeIcon): string {
-		return asClassNameArray(icon).join(' ');
-	}
-
-	export function asCSSSelector(icon: ThemeIcon): string {
-		return '.' + asClassNameArray(icon).join('.');
-	}
-
-	export function asCSSIcon(icon: ThemeIcon): CSSIcon {
-		return {
-			classNames: asClassName(icon)
-		};
-	}
-
-	export function asCodiconLabel(icon: ThemeIcon): string {
-		return '$(' + icon.id + ')';
-	}
-
-	export function revive(icon: any): ThemeIcon | undefined {
-		if (ThemeIcon.isThemeIcon(icon)) {
-			return { id: icon.id, color: icon.color ? { id: icon.color.id } : undefined };
-		}
-		return undefined;
-	}
+	export const asClassNameArray: (icon: ThemeIcon) => string[] = CSSIcon.asClassNameArray;
+	export const asClassName: (icon: ThemeIcon) => string = CSSIcon.asClassName;
+	export const asCSSSelector: (icon: ThemeIcon) => string = CSSIcon.asCSSSelector;
 }
 
-export const FileThemeIcon = { id: 'file' };
-export const FolderThemeIcon = { id: 'folder' };
+export const FileThemeIcon = Codicon.file;
+export const FolderThemeIcon = Codicon.folder;
 
 export function getThemeTypeSelector(type: ColorScheme): string {
 	switch (type) {
diff --git a/src/vs/platform/theme/test/common/testThemeService.ts b/src/vs/platform/theme/test/common/testThemeService.ts
index 2bdd34d8e..e21487ef0 100644
--- a/src/vs/platform/theme/test/common/testThemeService.ts
+++ b/src/vs/platform/theme/test/common/testThemeService.ts
@@ -12,8 +12,11 @@ export class TestColorTheme implements IColorTheme {
 
 	public readonly label = 'test';
 
-	constructor(private colors: { [id: string]: string; } = {}, public type = ColorScheme.DARK) {
-	}
+	constructor(
+		private colors: { [id: string]: string; } = {},
+		public type = ColorScheme.DARK,
+		public readonly semanticHighlighting = false
+	) { }
 
 	getColor(color: string, useDefault?: boolean): Color | undefined {
 		let value = this.colors[color];
@@ -31,8 +34,6 @@ export class TestColorTheme implements IColorTheme {
 		return undefined;
 	}
 
-	readonly semanticHighlighting = false;
-
 	get tokenColorMap(): string[] {
 		return [];
 	}
diff --git a/src/vs/platform/undoRedo/common/undoRedo.ts b/src/vs/platform/undoRedo/common/undoRedo.ts
index 021003bab..80512775d 100644
--- a/src/vs/platform/undoRedo/common/undoRedo.ts
+++ b/src/vs/platform/undoRedo/common/undoRedo.ts
@@ -18,6 +18,10 @@ export interface IResourceUndoRedoElement {
 	readonly type: UndoRedoElementType.Resource;
 	readonly resource: URI;
 	readonly label: string;
+	/**
+	 * Show a message to the user confirming when trying to undo this element
+	 */
+	readonly confirmBeforeUndo?: boolean;
 	undo(): Promise<void> | void;
 	redo(): Promise<void> | void;
 }
@@ -26,6 +30,10 @@ export interface IWorkspaceUndoRedoElement {
 	readonly type: UndoRedoElementType.Workspace;
 	readonly resources: readonly URI[];
 	readonly label: string;
+	/**
+	 * Show a message to the user confirming when trying to undo this element
+	 */
+	readonly confirmBeforeUndo?: boolean;
 	undo(): Promise<void> | void;
 	redo(): Promise<void> | void;
 
diff --git a/src/vs/platform/undoRedo/common/undoRedoService.ts b/src/vs/platform/undoRedo/common/undoRedoService.ts
index 2fb802fbc..7e205e707 100644
--- a/src/vs/platform/undoRedo/common/undoRedoService.ts
+++ b/src/vs/platform/undoRedo/common/undoRedoService.ts
@@ -27,6 +27,7 @@ class ResourceStackElement {
 	public readonly type = UndoRedoElementType.Resource;
 	public readonly actual: IUndoRedoElement;
 	public readonly label: string;
+	public readonly confirmBeforeUndo: boolean;
 
 	public readonly resourceLabel: string;
 	public readonly strResource: string;
@@ -41,6 +42,7 @@ class ResourceStackElement {
 	constructor(actual: IUndoRedoElement, resourceLabel: string, strResource: string, groupId: number, groupOrder: number, sourceId: number, sourceOrder: number) {
 		this.actual = actual;
 		this.label = actual.label;
+		this.confirmBeforeUndo = actual.confirmBeforeUndo || false;
 		this.resourceLabel = resourceLabel;
 		this.strResource = strResource;
 		this.resourceLabels = [this.resourceLabel];
@@ -129,6 +131,7 @@ class WorkspaceStackElement {
 	public readonly type = UndoRedoElementType.Workspace;
 	public readonly actual: IWorkspaceUndoRedoElement;
 	public readonly label: string;
+	public readonly confirmBeforeUndo: boolean;
 
 	public readonly resourceLabels: string[];
 	public readonly strResources: string[];
@@ -142,6 +145,7 @@ class WorkspaceStackElement {
 	constructor(actual: IWorkspaceUndoRedoElement, resourceLabels: string[], strResources: string[], groupId: number, groupOrder: number, sourceId: number, sourceOrder: number) {
 		this.actual = actual;
 		this.label = actual.label;
+		this.confirmBeforeUndo = actual.confirmBeforeUndo || false;
 		this.resourceLabels = resourceLabels;
 		this.strResources = strResources;
 		this.groupId = groupId;
@@ -811,7 +815,7 @@ export class UndoRedoService implements IUndoRedoService {
 		if (element.canSplit()) {
 			this._splitPastWorkspaceElement(element, ignoreResources);
 			this._notificationService.info(message);
-			return new WorkspaceVerificationError(this._undo(strResource));
+			return new WorkspaceVerificationError(this._undo(strResource, 0, true));
 		} else {
 			// Cannot safely split this workspace element => flush all undo/redo stacks
 			for (const strResource of element.strResources) {
@@ -899,13 +903,13 @@ export class UndoRedoService implements IUndoRedoService {
 		return null;
 	}
 
-	private _workspaceUndo(strResource: string, element: WorkspaceStackElement): Promise<void> | void {
+	private _workspaceUndo(strResource: string, element: WorkspaceStackElement, undoConfirmed: boolean): Promise<void> | void {
 		const affectedEditStacks = this._getAffectedEditStacks(element);
 		const verificationError = this._checkWorkspaceUndo(strResource, element, affectedEditStacks, /*invalidated resources will be checked after the prepare call*/false);
 		if (verificationError) {
 			return verificationError.returnValue;
 		}
-		return this._confirmAndExecuteWorkspaceUndo(strResource, element, affectedEditStacks);
+		return this._confirmAndExecuteWorkspaceUndo(strResource, element, affectedEditStacks, undoConfirmed);
 	}
 
 	private _isPartOfUndoGroup(element: WorkspaceStackElement): boolean {
@@ -933,7 +937,7 @@ export class UndoRedoService implements IUndoRedoService {
 		return false;
 	}
 
-	private async _confirmAndExecuteWorkspaceUndo(strResource: string, element: WorkspaceStackElement, editStackSnapshot: EditStackSnapshot): Promise<void> {
+	private async _confirmAndExecuteWorkspaceUndo(strResource: string, element: WorkspaceStackElement, editStackSnapshot: EditStackSnapshot, undoConfirmed: boolean): Promise<void> {
 
 		if (element.canSplit() && !this._isPartOfUndoGroup(element)) {
 			// this element can be split
@@ -959,7 +963,7 @@ export class UndoRedoService implements IUndoRedoService {
 			if (result.choice === 1) {
 				// choice: undo this file
 				this._splitPastWorkspaceElement(element, null);
-				return this._undo(strResource);
+				return this._undo(strResource, 0, true);
 			}
 
 			// choice: undo in all files
@@ -969,6 +973,8 @@ export class UndoRedoService implements IUndoRedoService {
 			if (verificationError1) {
 				return verificationError1.returnValue;
 			}
+
+			undoConfirmed = true;
 		}
 
 		// prepare
@@ -989,10 +995,10 @@ export class UndoRedoService implements IUndoRedoService {
 		for (const editStack of editStackSnapshot.editStacks) {
 			editStack.moveBackward(element);
 		}
-		return this._safeInvokeWithLocks(element, () => element.actual.undo(), editStackSnapshot, cleanup, () => this._continueUndoInGroup(element.groupId));
+		return this._safeInvokeWithLocks(element, () => element.actual.undo(), editStackSnapshot, cleanup, () => this._continueUndoInGroup(element.groupId, undoConfirmed));
 	}
 
-	private _resourceUndo(editStack: ResourceEditStack, element: ResourceStackElement): Promise<void> | void {
+	private _resourceUndo(editStack: ResourceEditStack, element: ResourceStackElement, undoConfirmed: boolean): Promise<void> | void {
 		if (!element.isValid) {
 			// invalid element => immediately flush edit stack!
 			editStack.flushAllElements();
@@ -1008,7 +1014,7 @@ export class UndoRedoService implements IUndoRedoService {
 		}
 		return this._invokeResourcePrepare(element, (cleanup) => {
 			editStack.moveBackward(element);
-			return this._safeInvokeWithLocks(element, () => element.actual.undo(), new EditStackSnapshot([editStack]), cleanup, () => this._continueUndoInGroup(element.groupId));
+			return this._safeInvokeWithLocks(element, () => element.actual.undo(), new EditStackSnapshot([editStack]), cleanup, () => this._continueUndoInGroup(element.groupId, undoConfirmed));
 		});
 	}
 
@@ -1037,29 +1043,29 @@ export class UndoRedoService implements IUndoRedoService {
 		return [matchedElement, matchedStrResource];
 	}
 
-	private _continueUndoInGroup(groupId: number): Promise<void> | void {
+	private _continueUndoInGroup(groupId: number, undoConfirmed: boolean): Promise<void> | void {
 		if (!groupId) {
 			return;
 		}
 
 		const [, matchedStrResource] = this._findClosestUndoElementInGroup(groupId);
 		if (matchedStrResource) {
-			return this._undo(matchedStrResource);
+			return this._undo(matchedStrResource, 0, undoConfirmed);
 		}
 	}
 
 	public undo(resourceOrSource: URI | UndoRedoSource): Promise<void> | void {
 		if (resourceOrSource instanceof UndoRedoSource) {
 			const [, matchedStrResource] = this._findClosestUndoElementWithSource(resourceOrSource.id);
-			return matchedStrResource ? this._undo(matchedStrResource, resourceOrSource.id) : undefined;
+			return matchedStrResource ? this._undo(matchedStrResource, resourceOrSource.id, false) : undefined;
 		}
 		if (typeof resourceOrSource === 'string') {
-			return this._undo(resourceOrSource);
+			return this._undo(resourceOrSource, 0, false);
 		}
-		return this._undo(this.getUriComparisonKey(resourceOrSource));
+		return this._undo(this.getUriComparisonKey(resourceOrSource), 0, false);
 	}
 
-	private _undo(strResource: string, sourceId: number = 0): Promise<void> | void {
+	private _undo(strResource: string, sourceId: number = 0, undoConfirmed: boolean): Promise<void> | void {
 		if (!this._editStacks.has(strResource)) {
 			return;
 		}
@@ -1075,20 +1081,21 @@ export class UndoRedoService implements IUndoRedoService {
 			const [matchedElement, matchedStrResource] = this._findClosestUndoElementInGroup(element.groupId);
 			if (element !== matchedElement && matchedStrResource) {
 				// there is an element in the same group that should be undone before this one
-				return this._undo(matchedStrResource);
+				return this._undo(matchedStrResource, sourceId, undoConfirmed);
 			}
 		}
 
-		if (element.sourceId !== sourceId) {
-			// Hit a different source, prompt for confirmation
-			return this._confirmDifferentSourceAndContinueUndo(strResource, element);
+		const shouldPromptForConfirmation = (element.sourceId !== sourceId || element.confirmBeforeUndo);
+		if (shouldPromptForConfirmation && !undoConfirmed) {
+			// Hit a different source or the element asks for prompt before undo, prompt for confirmation
+			return this._confirmAndContinueUndo(strResource, sourceId, element);
 		}
 
 		try {
 			if (element.type === UndoRedoElementType.Workspace) {
-				return this._workspaceUndo(strResource, element);
+				return this._workspaceUndo(strResource, element, undoConfirmed);
 			} else {
-				return this._resourceUndo(editStack, element);
+				return this._resourceUndo(editStack, element, undoConfirmed);
 			}
 		} finally {
 			if (DEBUG) {
@@ -1097,7 +1104,7 @@ export class UndoRedoService implements IUndoRedoService {
 		}
 	}
 
-	private async _confirmDifferentSourceAndContinueUndo(strResource: string, element: StackElement): Promise<void> {
+	private async _confirmAndContinueUndo(strResource: string, sourceId: number, element: StackElement): Promise<void> {
 		const result = await this._dialogService.show(
 			Severity.Info,
 			nls.localize('confirmDifferentSource', "Would you like to undo '{0}'?", element.label),
@@ -1116,7 +1123,7 @@ export class UndoRedoService implements IUndoRedoService {
 		}
 
 		// choice: undo
-		return this._undo(strResource, element.sourceId);
+		return this._undo(strResource, sourceId, true);
 	}
 
 	private _findClosestRedoElementWithSource(sourceId: number): [StackElement | null, string | null] {
diff --git a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
index 4c0a48e58..49f494454 100644
--- a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
+++ b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
@@ -23,9 +23,9 @@ suite('UndoRedoService', () => {
 		const resource = URI.file('test.txt');
 		const service = createUndoRedoService();
 
-		assert.equal(service.canUndo(resource), false);
-		assert.equal(service.canRedo(resource), false);
-		assert.equal(service.hasElements(resource), false);
+		assert.strictEqual(service.canUndo(resource), false);
+		assert.strictEqual(service.canRedo(resource), false);
+		assert.strictEqual(service.hasElements(resource), false);
 		assert.ok(service.getLastElement(resource) === null);
 
 		let undoCall1 = 0;
@@ -39,27 +39,27 @@ suite('UndoRedoService', () => {
 		};
 		service.pushElement(element1);
 
-		assert.equal(undoCall1, 0);
-		assert.equal(redoCall1, 0);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), false);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 0);
+		assert.strictEqual(redoCall1, 0);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), false);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === element1);
 
 		service.undo(resource);
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 0);
-		assert.equal(service.canUndo(resource), false);
-		assert.equal(service.canRedo(resource), true);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 0);
+		assert.strictEqual(service.canUndo(resource), false);
+		assert.strictEqual(service.canRedo(resource), true);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === null);
 
 		service.redo(resource);
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), false);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), false);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === element1);
 
 		let undoCall2 = 0;
@@ -73,24 +73,24 @@ suite('UndoRedoService', () => {
 		};
 		service.pushElement(element2);
 
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(undoCall2, 0);
-		assert.equal(redoCall2, 0);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), false);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(undoCall2, 0);
+		assert.strictEqual(redoCall2, 0);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), false);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === element2);
 
 		service.undo(resource);
 
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(undoCall2, 1);
-		assert.equal(redoCall2, 0);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), true);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(undoCall2, 1);
+		assert.strictEqual(redoCall2, 0);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), true);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === null);
 
 		let undoCall3 = 0;
@@ -104,28 +104,28 @@ suite('UndoRedoService', () => {
 		};
 		service.pushElement(element3);
 
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(undoCall2, 1);
-		assert.equal(redoCall2, 0);
-		assert.equal(undoCall3, 0);
-		assert.equal(redoCall3, 0);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), false);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(undoCall2, 1);
+		assert.strictEqual(redoCall2, 0);
+		assert.strictEqual(undoCall3, 0);
+		assert.strictEqual(redoCall3, 0);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), false);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === element3);
 
 		service.undo(resource);
 
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(undoCall2, 1);
-		assert.equal(redoCall2, 0);
-		assert.equal(undoCall3, 1);
-		assert.equal(redoCall3, 0);
-		assert.equal(service.canUndo(resource), true);
-		assert.equal(service.canRedo(resource), true);
-		assert.equal(service.hasElements(resource), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(undoCall2, 1);
+		assert.strictEqual(redoCall2, 0);
+		assert.strictEqual(undoCall3, 1);
+		assert.strictEqual(redoCall3, 0);
+		assert.strictEqual(service.canUndo(resource), true);
+		assert.strictEqual(service.canRedo(resource), true);
+		assert.strictEqual(service.hasElements(resource), true);
 		assert.ok(service.getLastElement(resource) === null);
 	});
 
@@ -169,50 +169,50 @@ suite('UndoRedoService', () => {
 		};
 		service.pushElement(element1);
 
-		assert.equal(service.canUndo(resource1), true);
-		assert.equal(service.canRedo(resource1), false);
-		assert.equal(service.hasElements(resource1), true);
+		assert.strictEqual(service.canUndo(resource1), true);
+		assert.strictEqual(service.canRedo(resource1), false);
+		assert.strictEqual(service.hasElements(resource1), true);
 		assert.ok(service.getLastElement(resource1) === element1);
-		assert.equal(service.canUndo(resource2), true);
-		assert.equal(service.canRedo(resource2), false);
-		assert.equal(service.hasElements(resource2), true);
+		assert.strictEqual(service.canUndo(resource2), true);
+		assert.strictEqual(service.canRedo(resource2), false);
+		assert.strictEqual(service.hasElements(resource2), true);
 		assert.ok(service.getLastElement(resource2) === element1);
 
 		await service.undo(resource1);
 
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 0);
-		assert.equal(service.canUndo(resource1), false);
-		assert.equal(service.canRedo(resource1), true);
-		assert.equal(service.hasElements(resource1), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 0);
+		assert.strictEqual(service.canUndo(resource1), false);
+		assert.strictEqual(service.canRedo(resource1), true);
+		assert.strictEqual(service.hasElements(resource1), true);
 		assert.ok(service.getLastElement(resource1) === null);
-		assert.equal(service.canUndo(resource2), false);
-		assert.equal(service.canRedo(resource2), true);
-		assert.equal(service.hasElements(resource2), true);
+		assert.strictEqual(service.canUndo(resource2), false);
+		assert.strictEqual(service.canRedo(resource2), true);
+		assert.strictEqual(service.hasElements(resource2), true);
 		assert.ok(service.getLastElement(resource2) === null);
 
 		await service.redo(resource2);
-		assert.equal(undoCall1, 1);
-		assert.equal(redoCall1, 1);
-		assert.equal(undoCall11, 0);
-		assert.equal(redoCall11, 0);
-		assert.equal(undoCall12, 0);
-		assert.equal(redoCall12, 0);
-		assert.equal(service.canUndo(resource1), true);
-		assert.equal(service.canRedo(resource1), false);
-		assert.equal(service.hasElements(resource1), true);
+		assert.strictEqual(undoCall1, 1);
+		assert.strictEqual(redoCall1, 1);
+		assert.strictEqual(undoCall11, 0);
+		assert.strictEqual(redoCall11, 0);
+		assert.strictEqual(undoCall12, 0);
+		assert.strictEqual(redoCall12, 0);
+		assert.strictEqual(service.canUndo(resource1), true);
+		assert.strictEqual(service.canRedo(resource1), false);
+		assert.strictEqual(service.hasElements(resource1), true);
 		assert.ok(service.getLastElement(resource1) === element1);
-		assert.equal(service.canUndo(resource2), true);
-		assert.equal(service.canRedo(resource2), false);
-		assert.equal(service.hasElements(resource2), true);
+		assert.strictEqual(service.canUndo(resource2), true);
+		assert.strictEqual(service.canRedo(resource2), false);
+		assert.strictEqual(service.hasElements(resource2), true);
 		assert.ok(service.getLastElement(resource2) === element1);
 
 	});
 
 	test('UndoRedoGroup.None uses id 0', () => {
-		assert.equal(UndoRedoGroup.None.id, 0);
-		assert.equal(UndoRedoGroup.None.nextOrder(), 0);
-		assert.equal(UndoRedoGroup.None.nextOrder(), 0);
+		assert.strictEqual(UndoRedoGroup.None.id, 0);
+		assert.strictEqual(UndoRedoGroup.None.nextOrder(), 0);
+		assert.strictEqual(UndoRedoGroup.None.nextOrder(), 0);
 	});
 
 });
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index 2e18cc8cd..ddfa1ee4a 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -15,6 +15,7 @@ import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/e
 import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractUpdateService, createUpdateURL, UpdateNotAvailableClassification } from 'vs/platform/update/electron-main/abstractUpdateService';
 import { IRequestService } from 'vs/platform/request/common/request';
+import product from 'vs/platform/product/common/product';
 
 export class DarwinUpdateService extends AbstractUpdateService {
 
@@ -56,7 +57,12 @@ export class DarwinUpdateService extends AbstractUpdateService {
 	}
 
 	protected buildUpdateFeedUrl(quality: string): string | undefined {
-		const assetID = process.arch === 'x64' ? 'darwin' : 'darwin-arm64';
+		let assetID: string;
+		if (!product.darwinUniversalAssetId) {
+			assetID = process.arch === 'x64' ? 'darwin' : 'darwin-arm64';
+		} else {
+			assetID = product.darwinUniversalAssetId;
+		}
 		const url = createUpdateURL(assetID, quality);
 		try {
 			electron.autoUpdater.setFeedURL({ url });
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 3ffa7bf7b..d1c834165 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -56,7 +56,7 @@ export class Win32UpdateService extends AbstractUpdateService {
 	@memoize
 	get cachePath(): Promise<string> {
 		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
-		return pfs.mkdirp(result, undefined).then(() => result);
+		return pfs.mkdirp(result).then(() => result);
 	}
 
 	constructor(
diff --git a/src/vs/platform/userDataSync/common/extensionsStorageSync.ts b/src/vs/platform/userDataSync/common/extensionsStorageSync.ts
index 37846e053..3e8f5400e 100644
--- a/src/vs/platform/userDataSync/common/extensionsStorageSync.ts
+++ b/src/vs/platform/userDataSync/common/extensionsStorageSync.ts
@@ -5,6 +5,7 @@
 
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 
@@ -32,7 +33,7 @@ export class ExtensionsStorageSyncService extends Disposable implements IExtensi
 	declare readonly _serviceBrand: undefined;
 
 	private static toKey(extension: IExtensionIdWithVersion): string {
-		return `extensionKeys/${extension.id}@${extension.version}`;
+		return `extensionKeys/${adoptToGalleryExtensionId(extension.id)}@${extension.version}`;
 	}
 
 	private static fromKey(key: string): IExtensionIdWithVersion | undefined {
diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts
index e716e1355..74fe8d9c0 100644
--- a/src/vs/platform/userDataSync/common/extensionsSync.ts
+++ b/src/vs/platform/userDataSync/common/extensionsSync.ts
@@ -11,7 +11,7 @@ import { Event } from 'vs/base/common/event';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionManagementService, IExtensionGalleryService, IGlobalExtensionEnablementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionType, IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, getExtensionId, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { merge } from 'vs/platform/userDataSync/common/extensionsMerge';
@@ -25,7 +25,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
 import { getErrorMessage } from 'vs/base/common/errors';
-import { forEach, IStringDictionary } from 'vs/base/common/collections';
+import { IStringDictionary } from 'vs/base/common/collections';
 import { IExtensionsStorageSyncService } from 'vs/platform/userDataSync/common/extensionsStorageSync';
 
 interface IExtensionResourceMergeResult extends IAcceptResult {
@@ -73,6 +73,15 @@ async function parseAndMigrateExtensions(syncData: ISyncData, extensionManagemen
 	return extensions;
 }
 
+function getExtensionStorageState(publisher: string, name: string, storageService: IStorageService): IStringDictionary<any> {
+	const extensionStorageValue = storageService.get(getExtensionId(publisher, name) /* use the same id used in extension host */, StorageScope.GLOBAL) || '{}';
+	return JSON.parse(extensionStorageValue);
+}
+
+function storeExtensionStorageState(publisher: string, name: string, extensionState: IStringDictionary<any>, storageService: IStorageService): void {
+	storageService.store(getExtensionId(publisher, name) /* use the same id used in extension host */, JSON.stringify(extensionState), StorageScope.GLOBAL, StorageTarget.MACHINE);
+}
+
 export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUserDataSynchroniser {
 
 	private static readonly EXTENSIONS_DATA_URI = URI.from({ scheme: USER_DATA_SYNC_SCHEME, authority: 'extensions', path: `/extensions.json` });
@@ -99,7 +108,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 		@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IGlobalExtensionEnablementService private readonly extensionEnablementService: IGlobalExtensionEnablementService,
-		@IIgnoredExtensionsManagementService private readonly extensionSyncManagementService: IIgnoredExtensionsManagementService,
+		@IIgnoredExtensionsManagementService private readonly ignoredExtensionsManagementService: IIgnoredExtensionsManagementService,
 		@IUserDataSyncLogService logService: IUserDataSyncLogService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -125,7 +134,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 
 		const installedExtensions = await this.extensionManagementService.getInstalled();
 		const localExtensions = this.getLocalExtensions(installedExtensions);
-		const ignoredExtensions = this.extensionSyncManagementService.getIgnoredExtensions(installedExtensions);
+		const ignoredExtensions = this.ignoredExtensionsManagementService.getIgnoredExtensions(installedExtensions);
 
 		if (remoteExtensions) {
 			this.logService.trace(`${this.syncResourceLogLabel}: Merging remote extensions with local extensions...`);
@@ -209,7 +218,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 
 	private async acceptLocal(resourcePreview: IExtensionResourcePreview): Promise<IExtensionResourceMergeResult> {
 		const installedExtensions = await this.extensionManagementService.getInstalled();
-		const ignoredExtensions = this.extensionSyncManagementService.getIgnoredExtensions(installedExtensions);
+		const ignoredExtensions = this.ignoredExtensionsManagementService.getIgnoredExtensions(installedExtensions);
 		const mergeResult = merge(resourcePreview.localExtensions, null, null, resourcePreview.skippedExtensions, ignoredExtensions);
 		const { added, removed, updated, remote } = mergeResult;
 		return {
@@ -225,7 +234,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 
 	private async acceptRemote(resourcePreview: IExtensionResourcePreview): Promise<IExtensionResourceMergeResult> {
 		const installedExtensions = await this.extensionManagementService.getInstalled();
-		const ignoredExtensions = this.extensionSyncManagementService.getIgnoredExtensions(installedExtensions);
+		const ignoredExtensions = this.ignoredExtensionsManagementService.getIgnoredExtensions(installedExtensions);
 		const remoteExtensions = resourcePreview.remoteContent ? JSON.parse(resourcePreview.remoteContent) : null;
 		if (remoteExtensions !== null) {
 			const mergeResult = merge(resourcePreview.localExtensions, remoteExtensions, resourcePreview.localExtensions, [], ignoredExtensions);
@@ -285,7 +294,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 	async resolveContent(uri: URI): Promise<string | null> {
 		if (this.extUri.isEqual(uri, ExtensionsSynchroniser.EXTENSIONS_DATA_URI)) {
 			const installedExtensions = await this.extensionManagementService.getInstalled();
-			const ignoredExtensions = this.extensionSyncManagementService.getIgnoredExtensions(installedExtensions);
+			const ignoredExtensions = this.ignoredExtensionsManagementService.getIgnoredExtensions(installedExtensions);
 			const localExtensions = this.getLocalExtensions(installedExtensions).filter(e => !ignoredExtensions.some(id => areSameExtensions({ id }, e.identifier)));
 			return this.format(localExtensions);
 		}
@@ -363,7 +372,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 				// Builtin Extension Sync: Enablement & State
 				if (installedExtension && installedExtension.isBuiltin) {
 					if (e.state && installedExtension.manifest.version === e.version) {
-						this.updateExtensionState(e.state, e.identifier.id, installedExtension.manifest.version);
+						this.updateExtensionState(e.state, installedExtension.manifest.publisher, installedExtension.manifest.name, installedExtension.manifest.version);
 					}
 					if (e.disabled) {
 						this.logService.trace(`${this.syncResourceLogLabel}: Disabling extension...`, e.identifier.id);
@@ -382,14 +391,16 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 				const extension = await this.extensionGalleryService.getCompatibleExtension(e.identifier);
 
 				/* Update extension state only if
-				*		extension is installed and version is same as synced version or
-				 *		extension is not installed and installable
+				 *	extension is installed and version is same as synced version or
+				 *	extension is not installed and installable
 				 */
 				if (e.state &&
 					(installedExtension ? installedExtension.manifest.version === e.version /* Installed and has same version */
 						: !!extension /* Installable */)
 				) {
-					this.updateExtensionState(e.state, e.identifier.id, installedExtension?.manifest.version);
+					const publisher = installedExtension ? installedExtension.manifest.publisher : extension!.publisher;
+					const name = installedExtension ? installedExtension.manifest.name : extension!.name;
+					this.updateExtensionState(e.state, publisher, name, installedExtension?.manifest.version);
 				}
 
 				if (extension) {
@@ -436,15 +447,15 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 		return newSkippedExtensions;
 	}
 
-	private updateExtensionState(state: IStringDictionary<any>, id: string, version?: string): void {
-		const extensionState = JSON.parse(this.storageService.get(id, StorageScope.GLOBAL) || '{}');
-		const keys = version ? this.extensionsStorageSyncService.getKeysForSync({ id, version }) : undefined;
+	private updateExtensionState(state: IStringDictionary<any>, publisher: string, name: string, version: string | undefined): void {
+		const extensionState = getExtensionStorageState(publisher, name, this.storageService);
+		const keys = version ? this.extensionsStorageSyncService.getKeysForSync({ id: getGalleryExtensionId(publisher, name), version }) : undefined;
 		if (keys) {
-			keys.forEach(key => extensionState[key] = state[key]);
+			keys.forEach(key => { extensionState[key] = state[key]; });
 		} else {
-			forEach(state, ({ key, value }) => extensionState[key] = value);
+			Object.keys(state).forEach(key => extensionState[key] = state[key]);
 		}
-		this.storageService.store(id, JSON.stringify(extensionState), StorageScope.GLOBAL, StorageTarget.MACHINE);
+		storeExtensionStorageState(publisher, name, extensionState, this.storageService);
 	}
 
 	private parseExtensions(syncData: ISyncData): ISyncExtension[] {
@@ -465,8 +476,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 				try {
 					const keys = this.extensionsStorageSyncService.getKeysForSync({ id: identifier.id, version: manifest.version });
 					if (keys) {
-						const extensionStorageValue = this.storageService.get(identifier.id, StorageScope.GLOBAL) || '{}';
-						const extensionStorageState = JSON.parse(extensionStorageValue);
+						const extensionStorageState = getExtensionStorageState(manifest.publisher, manifest.name, this.storageService);
 						syncExntesion.state = Object.keys(extensionStorageState).reduce((state: IStringDictionary<any>, key) => {
 							if (keys.includes(key)) {
 								state[key] = extensionStorageState[key];
@@ -490,6 +500,7 @@ export class ExtensionsInitializer extends AbstractInitializer {
 		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
 		@IGlobalExtensionEnablementService private readonly extensionEnablementService: IGlobalExtensionEnablementService,
 		@IStorageService private readonly storageService: IStorageService,
+		@IIgnoredExtensionsManagementService private readonly ignoredExtensionsManagementService: IIgnoredExtensionsManagementService,
 		@IFileService fileService: IFileService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IUserDataSyncLogService logService: IUserDataSyncLogService,
@@ -511,12 +522,18 @@ export class ExtensionsInitializer extends AbstractInitializer {
 		const newlyEnabledExtensions: ILocalExtension[] = [];
 		const installedExtensions = await this.extensionManagementService.getInstalled();
 		const newExtensionsToSync = new Map<string, ISyncExtension>();
-		const installedExtensionsToSync: ISyncExtension[] = [];
+		const installedExtensionsToSync: { syncExtension: ISyncExtension, installedExtension: ILocalExtension }[] = [];
 		const toInstall: { names: string[], uuids: string[] } = { names: [], uuids: [] };
 		const toDisable: IExtensionIdentifier[] = [];
 		for (const extension of remoteExtensions) {
-			if (installedExtensions.some(i => areSameExtensions(i.identifier, extension.identifier))) {
-				installedExtensionsToSync.push(extension);
+			if (this.ignoredExtensionsManagementService.hasToNeverSyncExtension(extension.identifier.id)) {
+				// Skip extension ignored to sync
+				continue;
+			}
+
+			const installedExtension = installedExtensions.find(i => areSameExtensions(i.identifier, extension.identifier));
+			if (installedExtension) {
+				installedExtensionsToSync.push({ syncExtension: extension, installedExtension });
 				if (extension.disabled) {
 					toDisable.push(extension.identifier);
 				}
@@ -528,17 +545,39 @@ export class ExtensionsInitializer extends AbstractInitializer {
 					} else {
 						toInstall.names.push(extension.identifier.id);
 					}
+					if (extension.disabled) {
+						toDisable.push(extension.identifier);
+					}
 				}
 			}
 		}
 
+		// 1. Initialise already installed extensions state
+		for (const { syncExtension, installedExtension } of installedExtensionsToSync) {
+			if (syncExtension.state) {
+				const extensionState = getExtensionStorageState(installedExtension.manifest.publisher, installedExtension.manifest.name, this.storageService);
+				Object.keys(syncExtension.state).forEach(key => extensionState[key] = syncExtension.state![key]);
+				storeExtensionStorageState(installedExtension.manifest.publisher, installedExtension.manifest.name, extensionState, this.storageService);
+			}
+		}
+
+		// 2. Initialise extensions enablement
+		if (toDisable.length) {
+			for (const identifier of toDisable) {
+				this.logService.trace(`Disabling extension...`, identifier.id);
+				await this.extensionEnablementService.disableExtension(identifier);
+				this.logService.info(`Disabling extension`, identifier.id);
+			}
+		}
+
+		// 3. Install extensions
 		if (toInstall.names.length || toInstall.uuids.length) {
 			const galleryExtensions = (await this.galleryService.query({ ids: toInstall.uuids, names: toInstall.names, pageSize: toInstall.uuids.length + toInstall.names.length }, CancellationToken.None)).firstPage;
 			for (const galleryExtension of galleryExtensions) {
 				try {
 					const extensionToSync = newExtensionsToSync.get(galleryExtension.identifier.id.toLowerCase())!;
 					if (extensionToSync.state) {
-						this.storageService.store(extensionToSync.identifier.id, JSON.stringify(extensionToSync.state), StorageScope.GLOBAL, StorageTarget.MACHINE);
+						storeExtensionStorageState(galleryExtension.publisher, galleryExtension.name, extensionToSync.state, this.storageService);
 					}
 					this.logService.trace(`Installing extension...`, galleryExtension.identifier.id);
 					const local = await this.extensionManagementService.installFromGallery(galleryExtension, { isMachineScoped: false } /* pass options to prevent install and sync dialog in web */);
@@ -552,22 +591,6 @@ export class ExtensionsInitializer extends AbstractInitializer {
 			}
 		}
 
-		if (toDisable.length) {
-			for (const identifier of toDisable) {
-				this.logService.trace(`Enabling extension...`, identifier.id);
-				await this.extensionEnablementService.disableExtension(identifier);
-				this.logService.info(`Enabled extension`, identifier.id);
-			}
-		}
-
-		for (const extensionToSync of installedExtensionsToSync) {
-			if (extensionToSync.state) {
-				const extensionState = JSON.parse(this.storageService.get(extensionToSync.identifier.id, StorageScope.GLOBAL) || '{}');
-				forEach(extensionToSync.state, ({ key, value }) => extensionState[key] = value);
-				this.storageService.store(extensionToSync.identifier.id, JSON.stringify(extensionState), StorageScope.GLOBAL, StorageTarget.MACHINE);
-			}
-		}
-
 		return newlyEnabledExtensions;
 	}
 
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index 6d9d58d1b..310fea185 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -31,9 +31,10 @@ export function getDisallowedIgnoredSettings(): string[] {
 
 export function getDefaultIgnoredSettings(): string[] {
 	const allSettings = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
+	const ignoreSyncSettings = Object.keys(allSettings).filter(setting => !!allSettings[setting].ignoreSync);
 	const machineSettings = Object.keys(allSettings).filter(setting => allSettings[setting].scope === ConfigurationScope.MACHINE || allSettings[setting].scope === ConfigurationScope.MACHINE_OVERRIDABLE);
 	const disallowedSettings = getDisallowedIgnoredSettings();
-	return distinct([CONFIGURATION_SYNC_STORE_KEY, ...machineSettings, ...disallowedSettings]);
+	return distinct([CONFIGURATION_SYNC_STORE_KEY, ...ignoreSyncSettings, ...machineSettings, ...disallowedSettings]);
 }
 
 export function registerConfiguration(): IDisposable {
@@ -52,10 +53,6 @@ export function registerConfiguration(): IDisposable {
 				scope: ConfigurationScope.APPLICATION,
 				tags: ['sync', 'usesOnlineServices']
 			},
-			'sync.keybindingsPerPlatform': {
-				type: 'boolean',
-				deprecationMessage: localize('sync.keybindingsPerPlatform.deprecated', "Deprecated, use settingsSync.keybindingsPerPlatform instead"),
-			},
 			'settingsSync.ignoredExtensions': {
 				'type': 'array',
 				markdownDescription: localize('settingsSync.ignoredExtensions', "List of extensions to be ignored while synchronizing. The identifier of an extension is always `${publisher}.${name}`. For example: `vscode.csharp`."),
@@ -70,10 +67,6 @@ export function registerConfiguration(): IDisposable {
 				disallowSyncIgnore: true,
 				tags: ['sync', 'usesOnlineServices']
 			},
-			'sync.ignoredExtensions': {
-				'type': 'array',
-				deprecationMessage: localize('sync.ignoredExtensions.deprecated', "Deprecated, use settingsSync.ignoredExtensions instead"),
-			},
 			'settingsSync.ignoredSettings': {
 				'type': 'array',
 				description: localize('settingsSync.ignoredSettings', "Configure settings to be ignored while synchronizing."),
@@ -84,10 +77,6 @@ export function registerConfiguration(): IDisposable {
 				uniqueItems: true,
 				disallowSyncIgnore: true,
 				tags: ['sync', 'usesOnlineServices']
-			},
-			'sync.ignoredSettings': {
-				'type': 'array',
-				deprecationMessage: localize('sync.ignoredSettings.deprecated', "Deprecated, use settingsSync.ignoredSettings instead"),
 			}
 		}
 	});
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index 2cf4ac375..ad5494bc4 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -445,131 +445,171 @@ class ManualSyncTask extends Disposable implements IManualSyncTask {
 	}
 
 	async preview(): Promise<[SyncResource, ISyncResourcePreview][]> {
-		if (this.isDisposed) {
-			throw new Error('Disposed');
+		try {
+			if (this.isDisposed) {
+				throw new Error('Disposed');
+			}
+			if (!this.previewsPromise) {
+				this.previewsPromise = createCancelablePromise(token => this.getPreviews(token));
+			}
+			if (!this.previews) {
+				this.previews = await this.previewsPromise;
+			}
+			return this.previews;
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
-		if (!this.previewsPromise) {
-			this.previewsPromise = createCancelablePromise(token => this.getPreviews(token));
-		}
-		if (!this.previews) {
-			this.previews = await this.previewsPromise;
-		}
-		return this.previews;
 	}
 
 	async accept(resource: URI, content?: string | null): Promise<[SyncResource, ISyncResourcePreview][]> {
-		return this.performAction(resource, sychronizer => sychronizer.accept(resource, content));
+		try {
+			return await this.performAction(resource, sychronizer => sychronizer.accept(resource, content));
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
+		}
 	}
 
 	async merge(resource?: URI): Promise<[SyncResource, ISyncResourcePreview][]> {
-		if (resource) {
-			return this.performAction(resource, sychronizer => sychronizer.merge(resource));
-		} else {
-			return this.mergeAll();
+		try {
+			if (resource) {
+				return await this.performAction(resource, sychronizer => sychronizer.merge(resource));
+			} else {
+				return await this.mergeAll();
+			}
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
 	}
 
 	async discard(resource: URI): Promise<[SyncResource, ISyncResourcePreview][]> {
-		return this.performAction(resource, sychronizer => sychronizer.discard(resource));
+		try {
+			return await this.performAction(resource, sychronizer => sychronizer.discard(resource));
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
+		}
 	}
 
 	async discardConflicts(): Promise<[SyncResource, ISyncResourcePreview][]> {
-		if (!this.previews) {
-			throw new Error('Missing preview. Create preview and try again.');
-		}
-		if (this.synchronizingResources.length) {
-			throw new Error('Cannot discard while synchronizing resources');
-		}
+		try {
+			if (!this.previews) {
+				throw new Error('Missing preview. Create preview and try again.');
+			}
+			if (this.synchronizingResources.length) {
+				throw new Error('Cannot discard while synchronizing resources');
+			}
 
-		const conflictResources: URI[] = [];
-		for (const [, syncResourcePreview] of this.previews) {
-			for (const resourcePreview of syncResourcePreview.resourcePreviews) {
-				if (resourcePreview.mergeState === MergeState.Conflict) {
-					conflictResources.push(resourcePreview.previewResource);
+			const conflictResources: URI[] = [];
+			for (const [, syncResourcePreview] of this.previews) {
+				for (const resourcePreview of syncResourcePreview.resourcePreviews) {
+					if (resourcePreview.mergeState === MergeState.Conflict) {
+						conflictResources.push(resourcePreview.previewResource);
+					}
 				}
 			}
-		}
 
-		for (const resource of conflictResources) {
-			await this.discard(resource);
+			for (const resource of conflictResources) {
+				await this.discard(resource);
+			}
+			return this.previews;
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
-		return this.previews;
 	}
 
 	async apply(): Promise<[SyncResource, ISyncResourcePreview][]> {
-		if (!this.previews) {
-			throw new Error('You need to create preview before applying');
-		}
-		if (this.synchronizingResources.length) {
-			throw new Error('Cannot pull while synchronizing resources');
-		}
-		const previews: [SyncResource, ISyncResourcePreview][] = [];
-		for (const [syncResource, preview] of this.previews) {
-			this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
+		try {
+			if (!this.previews) {
+				throw new Error('You need to create preview before applying');
+			}
+			if (this.synchronizingResources.length) {
+				throw new Error('Cannot pull while synchronizing resources');
+			}
+			const previews: [SyncResource, ISyncResourcePreview][] = [];
+			for (const [syncResource, preview] of this.previews) {
+				this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
 
-			const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
+				const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
 
-			/* merge those which are not yet merged */
-			for (const resourcePreview of preview.resourcePreviews) {
-				if ((resourcePreview.localChange !== Change.None || resourcePreview.remoteChange !== Change.None) && resourcePreview.mergeState === MergeState.Preview) {
-					await synchroniser.merge(resourcePreview.previewResource);
+				/* merge those which are not yet merged */
+				for (const resourcePreview of preview.resourcePreviews) {
+					if ((resourcePreview.localChange !== Change.None || resourcePreview.remoteChange !== Change.None) && resourcePreview.mergeState === MergeState.Preview) {
+						await synchroniser.merge(resourcePreview.previewResource);
+					}
 				}
-			}
 
-			/* apply */
-			const newPreview = await synchroniser.apply(false, this.syncHeaders);
-			if (newPreview) {
-				previews.push(this.toSyncResourcePreview(synchroniser.resource, newPreview));
-			}
+				/* apply */
+				const newPreview = await synchroniser.apply(false, this.syncHeaders);
+				if (newPreview) {
+					previews.push(this.toSyncResourcePreview(synchroniser.resource, newPreview));
+				}
 
-			this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
+				this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
+			}
+			this.previews = previews;
+			return this.previews;
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
-		this.previews = previews;
-		return this.previews;
 	}
 
 	async pull(): Promise<void> {
-		if (!this.previews) {
-			throw new Error('You need to create preview before applying');
-		}
-		if (this.synchronizingResources.length) {
-			throw new Error('Cannot pull while synchronizing resources');
-		}
-		for (const [syncResource, preview] of this.previews) {
-			this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
-			const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
-			for (const resourcePreview of preview.resourcePreviews) {
-				await synchroniser.accept(resourcePreview.remoteResource);
+		try {
+			if (!this.previews) {
+				throw new Error('You need to create preview before applying');
 			}
-			await synchroniser.apply(true, this.syncHeaders);
-			this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
+			if (this.synchronizingResources.length) {
+				throw new Error('Cannot pull while synchronizing resources');
+			}
+			for (const [syncResource, preview] of this.previews) {
+				this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
+				const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
+				for (const resourcePreview of preview.resourcePreviews) {
+					await synchroniser.accept(resourcePreview.remoteResource);
+				}
+				await synchroniser.apply(true, this.syncHeaders);
+				this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
+			}
+			this.previews = [];
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
-		this.previews = [];
 	}
 
 	async push(): Promise<void> {
-		if (!this.previews) {
-			throw new Error('You need to create preview before applying');
-		}
-		if (this.synchronizingResources.length) {
-			throw new Error('Cannot pull while synchronizing resources');
-		}
-		for (const [syncResource, preview] of this.previews) {
-			this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
-			const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
-			for (const resourcePreview of preview.resourcePreviews) {
-				await synchroniser.accept(resourcePreview.localResource);
+		try {
+			if (!this.previews) {
+				throw new Error('You need to create preview before applying');
 			}
-			await synchroniser.apply(true, this.syncHeaders);
-			this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
-			this._onSynchronizeResources.fire(this.synchronizingResources);
+			if (this.synchronizingResources.length) {
+				throw new Error('Cannot pull while synchronizing resources');
+			}
+			for (const [syncResource, preview] of this.previews) {
+				this.synchronizingResources.push([syncResource, preview.resourcePreviews.map(r => r.localResource)]);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
+				const synchroniser = this.synchronisers.find(s => s.resource === syncResource)!;
+				for (const resourcePreview of preview.resourcePreviews) {
+					await synchroniser.accept(resourcePreview.localResource);
+				}
+				await synchroniser.apply(true, this.syncHeaders);
+				this.synchronizingResources.splice(this.synchronizingResources.findIndex(s => s[0] === syncResource), 1);
+				this._onSynchronizeResources.fire(this.synchronizingResources);
+			}
+			this.previews = [];
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
 		}
-		this.previews = [];
 	}
 
 	async stop(): Promise<void> {
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
index 409586895..a4bde40f3 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, } from 'vs/base/common/lifecycle';
+import { Disposable, toDisposable, } from 'vs/base/common/lifecycle';
 import { IUserData, IUserDataSyncStoreService, UserDataSyncErrorCode, IUserDataSyncStore, ServerResource, UserDataSyncStoreError, IUserDataSyncLogService, IUserDataManifest, IResourceRefHandle, HEADER_OPERATION_ID, HEADER_EXECUTION_ID, CONFIGURATION_SYNC_STORE_KEY, IAuthenticationProvider, IUserDataSyncStoreManagementService, UserDataSyncStoreType, IUserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSync';
 import { IRequestService, asText, isSuccess as isSuccessContext, asJson } from 'vs/platform/request/common/request';
 import { joinPath, relativePath } from 'vs/base/common/resources';
@@ -180,6 +180,12 @@ export class UserDataSyncStoreClient extends Disposable implements IUserDataSync
 		/* A requests session that limits requests per sessions */
 		this.session = new RequestsSession(REQUEST_SESSION_LIMIT, REQUEST_SESSION_INTERVAL, this.requestService, this.logService);
 		this.initDonotMakeRequestsUntil();
+		this._register(toDisposable(() => {
+			if (this.resetDonotMakeRequestsUntilPromise) {
+				this.resetDonotMakeRequestsUntilPromise.cancel();
+				this.resetDonotMakeRequestsUntilPromise = undefined;
+			}
+		}));
 	}
 
 	setAuthToken(token: string, type: string): void {
@@ -210,6 +216,7 @@ export class UserDataSyncStoreClient extends Disposable implements IUserDataSync
 			if (this._donotMakeRequestsUntil) {
 				this.storageService.store(DONOT_MAKE_REQUESTS_UNTIL_KEY, this._donotMakeRequestsUntil.getTime(), StorageScope.GLOBAL, StorageTarget.MACHINE);
 				this.resetDonotMakeRequestsUntilPromise = createCancelablePromise(token => timeout(this._donotMakeRequestsUntil!.getTime() - Date.now(), token).then(() => this.setDonotMakeRequestsUntil(undefined)));
+				this.resetDonotMakeRequestsUntilPromise.then(null, e => null /* ignore error */);
 			} else {
 				this.storageService.remove(DONOT_MAKE_REQUESTS_UNTIL_KEY, StorageScope.GLOBAL);
 			}
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
index 5d2731d5e..247391119 100644
--- a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
+++ b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -181,7 +181,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	teardown(() => disposableStore.clear());
 
 	test('status is syncing', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 
 		const actual: SyncStatus[] = [];
 		disposableStore.add(testObject.onDidChangeStatus(status => actual.push(status)));
@@ -198,7 +198,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('status is set correctly when sync is finished', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 
 		const actual: SyncStatus[] = [];
@@ -210,7 +210,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('status is set correctly when sync has errors', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasError: true, hasConflicts: false };
 		testObject.syncBarrier.open();
 
@@ -227,7 +227,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('status is set to hasConflicts when asked to sync if there are conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -238,7 +238,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('sync should not run if syncing already', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		const promise = Event.toPromise(testObject.onDoSyncCall.event);
 
 		testObject.sync(await client.manifest());
@@ -255,7 +255,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('sync should not run if disabled', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		client.instantiationService.get(IUserDataSyncResourceEnablementService).setResourceEnablement(testObject.resource, false);
 
 		const actual: SyncStatus[] = [];
@@ -268,7 +268,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('sync should not run if there are conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -282,7 +282,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept preview during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -300,7 +300,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept remote during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 		const fileService = client.instantiationService.get(IFileService);
@@ -323,7 +323,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept local during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 		const fileService = client.instantiationService.get(IFileService);
@@ -345,7 +345,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept new content during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 		const fileService = client.instantiationService.get(IFileService);
@@ -368,7 +368,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept delete during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 		const fileService = client.instantiationService.get(IFileService);
@@ -390,7 +390,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept deleted local during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 		const fileService = client.instantiationService.get(IFileService);
@@ -411,7 +411,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('accept deleted remote during conflicts', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		const fileService = client.instantiationService.get(IFileService);
 		await fileService.writeFile(testObject.localResource, VSBuffer.fromString('some content'));
@@ -431,7 +431,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('request latest data on precondition failure', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		// Sync once
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -458,7 +458,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('no requests are made to server when local change is triggered', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
 
@@ -471,7 +471,7 @@ suite('TestSynchronizer - Auto Sync', () => {
 	});
 
 	test('status is reset when getting latest remote data fails', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.failWhenGettingLatestRemoteUserData = true;
 
 		try {
@@ -502,7 +502,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	teardown(() => disposableStore.clear());
 
 	test('preview', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -514,7 +514,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> merge', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -528,7 +528,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -542,7 +542,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> merge -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -557,7 +557,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> merge -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -577,7 +577,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -597,7 +597,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> merge -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -617,7 +617,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -630,7 +630,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preview -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -650,7 +650,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> merge -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -665,7 +665,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> merge -> discard -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -681,7 +681,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> accept -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -696,7 +696,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> accept -> discard -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -712,7 +712,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> accept -> discard -> merge', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -728,7 +728,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> merge -> accept -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -744,7 +744,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> merge -> discard -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -764,7 +764,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> accept -> discard -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -785,7 +785,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('preivew -> accept -> discard -> merge -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -808,7 +808,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -820,7 +820,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> merge', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -834,7 +834,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> merge -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -849,7 +849,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -864,7 +864,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> merge -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -887,7 +887,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -901,7 +901,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preview -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -923,7 +923,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> merge -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -938,7 +938,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> merge -> discard -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -954,7 +954,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> accept -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -969,7 +969,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> accept -> discard -> accept', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -985,7 +985,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> accept -> discard -> merge', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -1001,7 +1001,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> merge -> discard -> merge', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: true, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -1017,7 +1017,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> merge -> accept -> discard', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 
@@ -1033,7 +1033,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> merge -> discard -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
@@ -1053,7 +1053,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 	});
 
 	test('conflicts: preivew -> accept -> discard -> accept -> apply', async () => {
-		const testObject: TestSynchroniser = client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings);
+		const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, SyncResource.Settings));
 		testObject.syncResult = { hasConflicts: false, hasError: false };
 		testObject.syncBarrier.open();
 		await testObject.sync(await client.manifest());
diff --git a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
index 49df9ea7e..a12085fe7 100644
--- a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
@@ -40,7 +40,7 @@ suite('UserDataAutoSyncService', () => {
 		await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
 		target.reset();
 
-		const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: UserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Trigger auto sync with settings change
 		await testObject.triggerSync([SyncResource.Settings], false, false);
@@ -62,7 +62,7 @@ suite('UserDataAutoSyncService', () => {
 		await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
 		target.reset();
 
-		const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: UserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Trigger auto sync with settings change multiple times
 		for (let counter = 0; counter < 2; counter++) {
@@ -88,7 +88,7 @@ suite('UserDataAutoSyncService', () => {
 		await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
 		target.reset();
 
-		const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: UserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Trigger auto sync with window focus once
 		await testObject.triggerSync(['windowFocus'], true, false);
@@ -110,7 +110,7 @@ suite('UserDataAutoSyncService', () => {
 		await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
 		target.reset();
 
-		const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: UserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Trigger auto sync with window focus multiple times
 		for (let counter = 0; counter < 2; counter++) {
@@ -129,7 +129,7 @@ suite('UserDataAutoSyncService', () => {
 		const target = new UserDataSyncTestServer();
 		const client = disposableStore.add(new UserDataSyncClient(target));
 		await client.setUp();
-		const testObject: TestUserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		await testObject.sync();
 
@@ -165,7 +165,7 @@ suite('UserDataAutoSyncService', () => {
 		const target = new UserDataSyncTestServer();
 		const client = disposableStore.add(new UserDataSyncClient(target));
 		await client.setUp();
-		const testObject: TestUserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Sync once and reset requests
 		await testObject.sync();
@@ -185,7 +185,7 @@ suite('UserDataAutoSyncService', () => {
 		const target = new UserDataSyncTestServer();
 		const client = disposableStore.add(new UserDataSyncClient(target));
 		await client.setUp();
-		const testObject: TestUserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Sync once and reset requests
 		await testObject.sync();
@@ -220,7 +220,7 @@ suite('UserDataAutoSyncService', () => {
 		const target = new UserDataSyncTestServer();
 		const client = disposableStore.add(new UserDataSyncClient(target));
 		await client.setUp();
-		const testObject: TestUserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(client.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		// Sync once and reset requests
 		await testObject.sync();
@@ -250,7 +250,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 		await testObject.sync();
 
 		// Reset from the first client
@@ -279,7 +279,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 		await testObject.sync();
 
 		// Disable current machine
@@ -311,7 +311,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 		await testObject.sync();
 
 		// Remove current machine
@@ -339,7 +339,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 		await testObject.sync();
 
 		// Reset from the first client
@@ -371,7 +371,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		const errorPromise = Event.toPromise(testObject.onError);
 		while (target.requests.length < 5) {
@@ -389,7 +389,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		while (target.requests.length < 5) {
 			await testObject.sync();
@@ -407,7 +407,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		await testObject.triggerSync(['some reason'], true, true);
 		assert.equal(target.requestsWithAllHeaders[0].headers!['Cache-Control'], 'no-cache');
@@ -419,7 +419,7 @@ suite('UserDataAutoSyncService', () => {
 		// Set up and sync from the test client
 		const testClient = disposableStore.add(new UserDataSyncClient(target));
 		await testClient.setUp();
-		const testObject: TestUserDataAutoSyncService = testClient.instantiationService.createInstance(TestUserDataAutoSyncService);
+		const testObject: TestUserDataAutoSyncService = disposableStore.add(testClient.instantiationService.createInstance(TestUserDataAutoSyncService));
 
 		await testObject.triggerSync(['some reason'], true, false);
 		assert.equal(target.requestsWithAllHeaders[0].headers!['Cache-Control'], undefined);
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
index 322046976..b9d4381d7 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -83,9 +83,9 @@ export class UserDataSyncClient extends Disposable {
 		fileService.registerProvider(Schemas.inMemory, new InMemoryFileSystemProvider());
 		this.instantiationService.stub(IFileService, fileService);
 
-		this.instantiationService.stub(IStorageService, new InMemoryStorageService());
+		this.instantiationService.stub(IStorageService, this._register(new InMemoryStorageService()));
 
-		const configurationService = new ConfigurationService(environmentService.settingsResource, fileService);
+		const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService));
 		await configurationService.initialize();
 		this.instantiationService.stub(IConfigurationService, configurationService);
 
@@ -93,20 +93,20 @@ export class UserDataSyncClient extends Disposable {
 
 		this.instantiationService.stub(IUserDataSyncLogService, logService);
 		this.instantiationService.stub(ITelemetryService, NullTelemetryService);
-		this.instantiationService.stub(IUserDataSyncStoreManagementService, this.instantiationService.createInstance(UserDataSyncStoreManagementService));
-		this.instantiationService.stub(IUserDataSyncStoreService, this.instantiationService.createInstance(UserDataSyncStoreService));
+		this.instantiationService.stub(IUserDataSyncStoreManagementService, this._register(this.instantiationService.createInstance(UserDataSyncStoreManagementService)));
+		this.instantiationService.stub(IUserDataSyncStoreService, this._register(this.instantiationService.createInstance(UserDataSyncStoreService)));
 
-		const userDataSyncAccountService: IUserDataSyncAccountService = this.instantiationService.createInstance(UserDataSyncAccountService);
+		const userDataSyncAccountService: IUserDataSyncAccountService = this._register(this.instantiationService.createInstance(UserDataSyncAccountService));
 		await userDataSyncAccountService.updateAccount({ authenticationProviderId: 'authenticationProviderId', token: 'token' });
 		this.instantiationService.stub(IUserDataSyncAccountService, userDataSyncAccountService);
 
-		this.instantiationService.stub(IUserDataSyncMachinesService, this.instantiationService.createInstance(UserDataSyncMachinesService));
-		this.instantiationService.stub(IUserDataSyncBackupStoreService, this.instantiationService.createInstance(UserDataSyncBackupStoreService));
+		this.instantiationService.stub(IUserDataSyncMachinesService, this._register(this.instantiationService.createInstance(UserDataSyncMachinesService)));
+		this.instantiationService.stub(IUserDataSyncBackupStoreService, this._register(this.instantiationService.createInstance(UserDataSyncBackupStoreService)));
 		this.instantiationService.stub(IUserDataSyncUtilService, new TestUserDataSyncUtilService());
-		this.instantiationService.stub(IUserDataSyncResourceEnablementService, this.instantiationService.createInstance(UserDataSyncResourceEnablementService));
+		this.instantiationService.stub(IUserDataSyncResourceEnablementService, this._register(this.instantiationService.createInstance(UserDataSyncResourceEnablementService)));
 
-		this.instantiationService.stub(IGlobalExtensionEnablementService, this.instantiationService.createInstance(GlobalExtensionEnablementService));
-		this.instantiationService.stub(IExtensionsStorageSyncService, this.instantiationService.createInstance(ExtensionsStorageSyncService));
+		this.instantiationService.stub(IGlobalExtensionEnablementService, this._register(this.instantiationService.createInstance(GlobalExtensionEnablementService)));
+		this.instantiationService.stub(IExtensionsStorageSyncService, this._register(this.instantiationService.createInstance(ExtensionsStorageSyncService)));
 		this.instantiationService.stub(IIgnoredExtensionsManagementService, this.instantiationService.createInstance(IgnoredExtensionsManagementService));
 		this.instantiationService.stub(IExtensionManagementService, <Partial<IExtensionManagementService>>{
 			async getInstalled() { return []; },
@@ -118,8 +118,8 @@ export class UserDataSyncClient extends Disposable {
 			async getCompatibleExtension() { return null; }
 		});
 
-		this.instantiationService.stub(IUserDataAutoSyncEnablementService, this.instantiationService.createInstance(UserDataAutoSyncEnablementService));
-		this.instantiationService.stub(IUserDataSyncService, this.instantiationService.createInstance(UserDataSyncService));
+		this.instantiationService.stub(IUserDataAutoSyncEnablementService, this._register(this.instantiationService.createInstance(UserDataAutoSyncEnablementService)));
+		this.instantiationService.stub(IUserDataSyncService, this._register(this.instantiationService.createInstance(UserDataSyncService)));
 
 		if (!empty) {
 			await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString(JSON.stringify({})));
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
index 2c7d1734d..4550c939b 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncStoreService.test.ts
@@ -58,7 +58,7 @@ suite('UserDataSyncStoreManagementService', () => {
 			authenticationProviders: [{ id: 'configuredAuthProvider', scopes: [] }]
 		};
 
-		const testObject: IUserDataSyncStoreManagementService = client.instantiationService.createInstance(UserDataSyncStoreManagementService);
+		const testObject: IUserDataSyncStoreManagementService = disposableStore.add(client.instantiationService.createInstance(UserDataSyncStoreManagementService));
 
 		assert.equal(testObject.userDataSyncStore?.url.toString(), expected.url.toString());
 		assert.equal(testObject.userDataSyncStore?.defaultUrl.toString(), expected.defaultUrl.toString());
@@ -419,7 +419,7 @@ suite('UserDataSyncStoreService', () => {
 			await testObject.manifest();
 		} catch (e) { }
 
-		const target = client.instantiationService.createInstance(UserDataSyncStoreService);
+		const target = disposableStore.add(client.instantiationService.createInstance(UserDataSyncStoreService));
 		assert.equal(target.donotMakeRequestsUntil?.getTime(), testObject.donotMakeRequestsUntil?.getTime());
 	});
 
@@ -434,7 +434,7 @@ suite('UserDataSyncStoreService', () => {
 		} catch (e) { }
 
 		await timeout(300);
-		const target = client.instantiationService.createInstance(UserDataSyncStoreService);
+		const target = disposableStore.add(client.instantiationService.createInstance(UserDataSyncStoreService));
 		assert.ok(!target.donotMakeRequestsUntil);
 	});
 
diff --git a/src/vs/platform/webview/common/resourceLoader.ts b/src/vs/platform/webview/common/resourceLoader.ts
index ee64c8ef4..46f0217fa 100644
--- a/src/vs/platform/webview/common/resourceLoader.ts
+++ b/src/vs/platform/webview/common/resourceLoader.ts
@@ -9,6 +9,7 @@ import { isUNC } from 'vs/base/common/extpath';
 import { Schemas } from 'vs/base/common/network';
 import { sep } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
+import { ILogService } from 'vs/platform/log/common/log';
 import { IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { getWebviewContentMimeType } from 'vs/platform/webview/common/mimeTypes';
@@ -24,7 +25,8 @@ export namespace WebviewResourceResponse {
 
 		constructor(
 			public readonly stream: VSBufferReadableStream,
-			public readonly mimeType: string
+			public readonly etag: string | undefined,
+			public readonly mimeType: string,
 		) { }
 	}
 
@@ -35,7 +37,7 @@ export namespace WebviewResourceResponse {
 }
 
 interface FileReader {
-	readFileStream(resource: URI): Promise<VSBufferReadableStream>;
+	readFileStream(resource: URI): Promise<{ stream: VSBufferReadableStream, etag?: string }>;
 }
 
 export async function loadLocalResource(
@@ -48,8 +50,14 @@ export async function loadLocalResource(
 	},
 	fileReader: FileReader,
 	requestService: IRequestService,
+	logService: ILogService,
 ): Promise<WebviewResourceResponse.StreamResponse> {
+	logService.debug(`loadLocalResource - being. requestUri=${requestUri}`);
+
 	let resourceToLoad = getResourceToLoad(requestUri, options.roots);
+
+	logService.debug(`loadLocalResource - found resource to load. requestUri=${requestUri}, resourceToLoad=${resourceToLoad}`);
+
 	if (!resourceToLoad) {
 		return WebviewResourceResponse.AccessDenied;
 	}
@@ -63,17 +71,23 @@ export async function loadLocalResource(
 
 	if (resourceToLoad.scheme === Schemas.http || resourceToLoad.scheme === Schemas.https) {
 		const response = await requestService.request({ url: resourceToLoad.toString(true) }, CancellationToken.None);
+		logService.debug(`loadLocalResource - Loaded over http(s). requestUri=${requestUri}, response=${response.res.statusCode}`);
+
 		if (response.res.statusCode === 200) {
-			return new WebviewResourceResponse.StreamSuccess(response.stream, mime);
+			return new WebviewResourceResponse.StreamSuccess(response.stream, undefined, mime);
 		}
 		return WebviewResourceResponse.Failed;
 	}
 
 	try {
 		const contents = await fileReader.readFileStream(resourceToLoad);
-		return new WebviewResourceResponse.StreamSuccess(contents, mime);
+		logService.debug(`loadLocalResource - Loaded using fileReader. requestUri=${requestUri}`);
+
+		return new WebviewResourceResponse.StreamSuccess(contents.stream, contents.etag, mime);
 	} catch (err) {
+		logService.debug(`loadLocalResource - Error using fileReader. requestUri=${requestUri}`);
 		console.log(err);
+
 		return WebviewResourceResponse.Failed;
 	}
 }
diff --git a/src/vs/platform/webview/common/webviewPortMapping.ts b/src/vs/platform/webview/common/webviewPortMapping.ts
index 581543130..4e9c22976 100644
--- a/src/vs/platform/webview/common/webviewPortMapping.ts
+++ b/src/vs/platform/webview/common/webviewPortMapping.ts
@@ -19,7 +19,7 @@ export interface IWebviewPortMapping {
  */
 export class WebviewPortMappingManager implements IDisposable {
 
-	private readonly _tunnels = new Map<number, Promise<RemoteTunnel>>();
+	private readonly _tunnels = new Map<number, RemoteTunnel>();
 
 	constructor(
 		private readonly _getExtensionLocation: () => URI | undefined,
@@ -60,19 +60,19 @@ export class WebviewPortMappingManager implements IDisposable {
 		return undefined;
 	}
 
-	dispose() {
+	async dispose() {
 		for (const tunnel of this._tunnels.values()) {
-			tunnel.then(tunnel => tunnel.dispose());
+			await tunnel.dispose();
 		}
 		this._tunnels.clear();
 	}
 
-	private getOrCreateTunnel(remoteAuthority: IAddress, remotePort: number): Promise<RemoteTunnel> | undefined {
+	private async getOrCreateTunnel(remoteAuthority: IAddress, remotePort: number): Promise<RemoteTunnel | undefined> {
 		const existing = this._tunnels.get(remotePort);
 		if (existing) {
 			return existing;
 		}
-		const tunnel = this.tunnelService.openTunnel({ getAddress: async () => remoteAuthority }, undefined, remotePort);
+		const tunnel = await this.tunnelService.openTunnel({ getAddress: async () => remoteAuthority }, undefined, remotePort);
 		if (tunnel) {
 			this._tunnels.set(remotePort, tunnel);
 		}
diff --git a/src/vs/platform/webview/electron-main/webviewMainService.ts b/src/vs/platform/webview/electron-main/webviewMainService.ts
index 03a6e306c..92bd47e2d 100644
--- a/src/vs/platform/webview/electron-main/webviewMainService.ts
+++ b/src/vs/platform/webview/electron-main/webviewMainService.ts
@@ -8,6 +8,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { IFileService } from 'vs/platform/files/common/files';
+import { ILogService } from 'vs/platform/log/common/log';
 import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { IWebviewManagerService, RegisterWebviewMetadata, WebviewWebContentsId, WebviewWindowId } from 'vs/platform/webview/common/webviewManagerService';
@@ -24,12 +25,13 @@ export class WebviewMainService extends Disposable implements IWebviewManagerSer
 
 	constructor(
 		@IFileService fileService: IFileService,
+		@ILogService logService: ILogService,
 		@IRequestService requestService: IRequestService,
 		@ITunnelService tunnelService: ITunnelService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 	) {
 		super();
-		this.protocolProvider = this._register(new WebviewProtocolProvider(fileService, requestService, windowsMainService));
+		this.protocolProvider = this._register(new WebviewProtocolProvider(fileService, logService, requestService, windowsMainService));
 		this.portMappingProvider = this._register(new WebviewPortMappingProvider(tunnelService));
 	}
 
diff --git a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
index a019d267e..a8c2e0fef 100644
--- a/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
+++ b/src/vs/platform/webview/electron-main/webviewProtocolProvider.ts
@@ -10,6 +10,7 @@ import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
+import { ILogService } from 'vs/platform/log/common/log';
 import { IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { loadLocalResource, webviewPartitionId, WebviewResourceResponse } from 'vs/platform/webview/common/resourceLoader';
@@ -38,8 +39,9 @@ export class WebviewProtocolProvider extends Disposable {
 
 	constructor(
 		@IFileService private readonly fileService: IFileService,
+		@ILogService private readonly logService: ILogService,
 		@IRequestService private readonly requestService: IRequestService,
-		@IWindowsMainService readonly windowsMainService: IWindowsMainService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 	) {
 		super();
 
@@ -125,7 +127,10 @@ export class WebviewProtocolProvider extends Disposable {
 		}
 	}
 
-	private async handleWebviewRequest(request: Electron.Request, callback: any) {
+	private async handleWebviewRequest(
+		request: Electron.ProtocolRequest,
+		callback: (response: string | Electron.ProtocolResponse) => void
+	) {
 		try {
 			const uri = URI.parse(request.url);
 			const entry = WebviewProtocolProvider.validWebviewFilePaths.get(uri.path);
@@ -144,8 +149,8 @@ export class WebviewProtocolProvider extends Disposable {
 	}
 
 	private async handleWebviewResourceRequest(
-		request: Electron.Request,
-		callback: (stream?: NodeJS.ReadableStream | Electron.StreamProtocolResponse | undefined) => void
+		request: Electron.ProtocolRequest,
+		callback: (stream: NodeJS.ReadableStream | Electron.ProtocolResponse) => void
 	) {
 		try {
 			const uri = URI.parse(request.url);
@@ -170,10 +175,14 @@ export class WebviewProtocolProvider extends Disposable {
 					};
 				}
 
-				const fileService = {
-					readFileStream: async (resource: URI): Promise<VSBufferReadableStream> => {
+				const fileReader = {
+					readFileStream: async (resource: URI): Promise<{ stream: VSBufferReadableStream, etag?: string }> => {
 						if (resource.scheme === Schemas.file) {
-							return (await this.fileService.readFileStream(resource)).value;
+							const result = (await this.fileService.readFileStream(resource));
+							return {
+								stream: result.value,
+								etag: result.etag
+							};
 						}
 
 						// Unknown uri scheme. Try delegating the file read back to the renderer
@@ -196,7 +205,7 @@ export class WebviewProtocolProvider extends Disposable {
 							throw new FileOperationError('Could not read file', FileOperationResult.FILE_NOT_FOUND);
 						}
 
-						return bufferToStream(result);
+						return { stream: bufferToStream(result), etag: undefined };
 					}
 				};
 
@@ -205,29 +214,55 @@ export class WebviewProtocolProvider extends Disposable {
 					roots: metadata.localResourceRoots,
 					remoteConnectionData: metadata.remoteConnectionData,
 					rewriteUri,
-				}, fileService, this.requestService);
+				}, fileReader, this.requestService, this.logService);
 
 				if (result.type === WebviewResourceResponse.Type.Success) {
+					const cacheHeaders: Record<string, string> = result.etag ? {
+						'ETag': result.etag,
+						'Cache-Control': 'no-cache'
+					} : {};
+
+					const ifNoneMatch = request.headers['If-None-Match'];
+					if (ifNoneMatch && result.etag === ifNoneMatch) {
+						/*
+						 * Note that the server generating a 304 response MUST
+						 * generate any of the following header fields that would
+						 * have been sent in a 200 (OK) response to the same request:
+						 * Cache-Control, Content-Location, Date, ETag, Expires, and Vary.
+						 * (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-None-Match)
+						 */
+						return callback({
+							statusCode: 304, // not modified
+							data: undefined, // The request fails if `data` is not set
+							headers: {
+								'Content-Type': result.mimeType,
+								'Access-Control-Allow-Origin': '*',
+								...cacheHeaders
+							}
+						});
+					}
+
 					return callback({
 						statusCode: 200,
 						data: this.streamToNodeReadable(result.stream),
 						headers: {
 							'Content-Type': result.mimeType,
 							'Access-Control-Allow-Origin': '*',
+							...cacheHeaders
 						}
 					});
 				}
 
 				if (result.type === WebviewResourceResponse.Type.AccessDenied) {
 					console.error('Webview: Cannot load resource outside of protocol root');
-					return callback({ data: null, statusCode: 401 });
+					return callback({ data: undefined, statusCode: 401 });
 				}
 			}
 		} catch {
 			// noop
 		}
 
-		return callback({ data: null, statusCode: 404 });
+		return callback({ data: undefined, statusCode: 404 });
 	}
 
 	public didLoadResource(requestId: number, content: VSBuffer | undefined) {
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 40c952136..f97741d19 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -9,7 +9,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { LogLevel } from 'vs/platform/log/common/log';
-import { ExportData } from 'vs/base/common/performance';
+import { PerformanceMark } from 'vs/base/common/performance';
 
 export const WindowMinimumSize = {
 	WIDTH: 400,
@@ -18,38 +18,37 @@ export const WindowMinimumSize = {
 };
 
 export interface IBaseOpenWindowsOptions {
-	forceReuseWindow?: boolean;
+	readonly forceReuseWindow?: boolean;
 }
 
 export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
-	forceNewWindow?: boolean;
-	preferNewWindow?: boolean;
+	readonly forceNewWindow?: boolean;
+	readonly preferNewWindow?: boolean;
 
-	noRecentEntry?: boolean;
+	readonly noRecentEntry?: boolean;
 
-	addMode?: boolean;
+	readonly addMode?: boolean;
 
-	diffMode?: boolean;
-	gotoLineMode?: boolean;
+	readonly diffMode?: boolean;
+	readonly gotoLineMode?: boolean;
 
-	waitMarkerFileURI?: URI;
+	readonly waitMarkerFileURI?: URI;
 }
 
 export interface IAddFoldersRequest {
-	foldersToAdd: UriComponents[];
+	readonly foldersToAdd: UriComponents[];
 }
 
 export interface IOpenedWindow {
-	id: number;
-	workspace?: IWorkspaceIdentifier;
-	folderUri?: ISingleFolderWorkspaceIdentifier;
-	title: string;
-	filename?: string;
-	dirty: boolean;
+	readonly id: number;
+	readonly workspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier;
+	readonly title: string;
+	readonly filename?: string;
+	readonly dirty: boolean;
 }
 
 export interface IOpenEmptyWindowOptions extends IBaseOpenWindowsOptions {
-	remoteAuthority?: string;
+	readonly remoteAuthority?: string;
 }
 
 export type IWindowOpenable = IWorkspaceToOpen | IFolderToOpen | IFileToOpen;
@@ -59,15 +58,15 @@ export interface IBaseWindowOpenable {
 }
 
 export interface IWorkspaceToOpen extends IBaseWindowOpenable {
-	workspaceUri: URI;
+	readonly workspaceUri: URI;
 }
 
 export interface IFolderToOpen extends IBaseWindowOpenable {
-	folderUri: URI;
+	readonly folderUri: URI;
 }
 
 export interface IFileToOpen extends IBaseWindowOpenable {
-	fileUri: URI;
+	readonly fileUri: URI;
 }
 
 export function isWorkspaceToOpen(uriToOpen: IWindowOpenable): uriToOpen is IWorkspaceToOpen {
@@ -96,26 +95,25 @@ export function getMenuBarVisibility(configurationService: IConfigurationService
 }
 
 export interface IWindowsConfiguration {
-	window: IWindowSettings;
+	readonly window: IWindowSettings;
 }
 
 export interface IWindowSettings {
-	openFilesInNewWindow: 'on' | 'off' | 'default';
-	openFoldersInNewWindow: 'on' | 'off' | 'default';
-	openWithoutArgumentsInNewWindow: 'on' | 'off';
-	restoreWindows: 'preserve' | 'all' | 'folders' | 'one' | 'none';
-	restoreFullscreen: boolean;
-	zoomLevel: number;
-	titleBarStyle: 'native' | 'custom';
-	autoDetectHighContrast: boolean;
-	menuBarVisibility: MenuBarVisibility;
-	newWindowDimensions: 'default' | 'inherit' | 'offset' | 'maximized' | 'fullscreen';
-	nativeTabs: boolean;
-	nativeFullScreen: boolean;
-	enableMenuBarMnemonics: boolean;
-	closeWhenEmpty: boolean;
-	clickThroughInactive: boolean;
-	enableExperimentalProxyLoginDialog: boolean;
+	readonly openFilesInNewWindow: 'on' | 'off' | 'default';
+	readonly openFoldersInNewWindow: 'on' | 'off' | 'default';
+	readonly openWithoutArgumentsInNewWindow: 'on' | 'off';
+	readonly restoreWindows: 'preserve' | 'all' | 'folders' | 'one' | 'none';
+	readonly restoreFullscreen: boolean;
+	readonly zoomLevel: number;
+	readonly titleBarStyle: 'native' | 'custom';
+	readonly autoDetectHighContrast: boolean;
+	readonly menuBarVisibility: MenuBarVisibility;
+	readonly newWindowDimensions: 'default' | 'inherit' | 'offset' | 'maximized' | 'fullscreen';
+	readonly nativeTabs: boolean;
+	readonly nativeFullScreen: boolean;
+	readonly enableMenuBarMnemonics: boolean;
+	readonly closeWhenEmpty: boolean;
+	readonly clickThroughInactive: boolean;
 }
 
 export function getTitleBarStyle(configurationService: IConfigurationService): 'native' | 'custom' {
@@ -154,24 +152,24 @@ export interface IPath extends IPathData {
 export interface IPathData {
 
 	// the file path to open within the instance
-	fileUri?: UriComponents;
+	readonly fileUri?: UriComponents;
 
 	// the line number in the file path to open
-	lineNumber?: number;
+	readonly lineNumber?: number;
 
 	// the column number in the file path to open
-	columnNumber?: number;
+	readonly columnNumber?: number;
 
 	// a hint that the file exists. if true, the
 	// file exists, if false it does not. with
 	// undefined the state is unknown.
-	exists?: boolean;
+	readonly exists?: boolean;
 
 	// Specifies if the file should be only be opened if it exists
-	openOnlyIfExists?: boolean;
+	readonly openOnlyIfExists?: boolean;
 
 	// Specifies an optional id to override the editor used to edit the resource, e.g. custom editor.
-	overrideId?: string;
+	readonly overrideId?: string;
 }
 
 export interface IPathsToWaitFor extends IPathsToWaitForData {
@@ -180,36 +178,36 @@ export interface IPathsToWaitFor extends IPathsToWaitForData {
 }
 
 interface IPathsToWaitForData {
-	paths: IPathData[];
-	waitMarkerFileUri: UriComponents;
+	readonly paths: IPathData[];
+	readonly waitMarkerFileUri: UriComponents;
 }
 
 export interface IOpenFileRequest {
-	filesToOpenOrCreate?: IPathData[];
-	filesToDiff?: IPathData[];
+	readonly filesToOpenOrCreate?: IPathData[];
+	readonly filesToDiff?: IPathData[];
 }
 
 /**
  * Additional context for the request on native only.
  */
 export interface INativeOpenFileRequest extends IOpenFileRequest {
-	termProgram?: string;
-	filesToWait?: IPathsToWaitForData;
+	readonly termProgram?: string;
+	readonly filesToWait?: IPathsToWaitForData;
 }
 
 export interface INativeRunActionInWindowRequest {
-	id: string;
-	from: 'menu' | 'touchbar' | 'mouse';
-	args?: any[];
+	readonly id: string;
+	readonly from: 'menu' | 'touchbar' | 'mouse';
+	readonly args?: any[];
 }
 
 export interface INativeRunKeybindingInWindowRequest {
-	userSettingsLabel: string;
+	readonly userSettingsLabel: string;
 }
 
 export interface IColorScheme {
-	dark: boolean;
-	highContrast: boolean;
+	readonly dark: boolean;
+	readonly highContrast: boolean;
 }
 
 export interface IWindowConfiguration {
@@ -225,7 +223,7 @@ export interface IWindowConfiguration {
 }
 
 export interface IOSConfiguration {
-	release: string;
+	readonly release: string;
 }
 
 export interface INativeWindowConfiguration extends IWindowConfiguration, NativeParsedArgs {
@@ -241,8 +239,7 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 	nodeCachedDataDir?: string;
 	partsSplashPath: string;
 
-	workspace?: IWorkspaceIdentifier;
-	folderUri?: ISingleFolderWorkspaceIdentifier;
+	workspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier;
 
 	isInitialStartup?: boolean;
 	logLevel: LogLevel;
@@ -250,7 +247,7 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 	fullscreen?: boolean;
 	maximized?: boolean;
 	accessibilitySupport?: boolean;
-	perfEntries: ExportData;
+	perfMarks: PerformanceMark[];
 
 	userEnv: IProcessEnvironment;
 	filesToWait?: IPathsToWaitFor;
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index 83eccca73..8bd104650 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -4,18 +4,38 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IWindowOpenable, IOpenEmptyWindowOptions, INativeWindowConfiguration } from 'vs/platform/windows/common/windows';
-import { OpenContext } from 'vs/platform/windows/node/window';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IProcessEnvironment } from 'vs/base/common/platform';
-import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { URI } from 'vs/base/common/uri';
 import { Rectangle, BrowserWindow, WebContents } from 'electron';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
+export const enum OpenContext {
+
+	// opening when running from the command line
+	CLI,
+
+	// macOS only: opening from the dock (also when opening files to a running instance from desktop)
+	DOCK,
+
+	// opening from the main application window
+	MENU,
+
+	// opening from a file or folder dialog
+	DIALOG,
+
+	// opening from the OS's UI
+	DESKTOP,
+
+	// opening through the API
+	API
+}
+
 export interface IWindowState {
 	width?: number;
 	height?: number;
@@ -45,8 +65,8 @@ export interface ICodeWindow extends IDisposable {
 	readonly win: BrowserWindow;
 	readonly config: INativeWindowConfiguration | undefined;
 
-	readonly openedFolderUri?: URI;
-	readonly openedWorkspace?: IWorkspaceIdentifier;
+	readonly openedWorkspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier;
+
 	readonly backupPath?: string;
 
 	readonly remoteAuthority?: string;
@@ -64,7 +84,7 @@ export interface ICodeWindow extends IDisposable {
 
 	addTabbedWindow(window: ICodeWindow): void;
 
-	load(config: INativeWindowConfiguration, isReload?: boolean): void;
+	load(config: INativeWindowConfiguration, options?: { isReload?: boolean }): void;
 	reload(cli?: NativeParsedArgs): void;
 
 	focus(options?: { force: boolean }): void;
@@ -104,9 +124,11 @@ export interface IWindowsMainService {
 
 	readonly _serviceBrand: undefined;
 
+	readonly onWindowsCountChanged: Event<IWindowsCountChangedEvent>;
+
 	readonly onWindowOpened: Event<ICodeWindow>;
 	readonly onWindowReady: Event<ICodeWindow>;
-	readonly onWindowsCountChanged: Event<IWindowsCountChangedEvent>;
+	readonly onWindowDestroyed: Event<ICodeWindow>;
 
 	open(openConfig: IOpenConfiguration): ICodeWindow[];
 	openEmptyWindow(openConfig: IOpenEmptyConfiguration, options?: IOpenEmptyWindowOptions): ICodeWindow[];
@@ -115,13 +137,14 @@ export interface IWindowsMainService {
 	sendToFocused(channel: string, ...args: any[]): void;
 	sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void;
 
+	getWindows(): ICodeWindow[];
+	getWindowCount(): number;
+
 	getFocusedWindow(): ICodeWindow | undefined;
 	getLastActiveWindow(): ICodeWindow | undefined;
 
 	getWindowById(windowId: number): ICodeWindow | undefined;
 	getWindowByWebContents(webContents: WebContents): ICodeWindow | undefined;
-	getWindows(): ICodeWindow[];
-	getWindowCount(): number;
 }
 
 export interface IBaseOpenConfiguration {
diff --git a/src/vs/platform/windows/electron-main/windowsFinder.ts b/src/vs/platform/windows/electron-main/windowsFinder.ts
new file mode 100644
index 000000000..30f760183
--- /dev/null
+++ b/src/vs/platform/windows/electron-main/windowsFinder.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { IWorkspaceIdentifier, IResolvedWorkspace, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+
+export function findWindowOnFile(windows: ICodeWindow[], fileUri: URI, localWorkspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace | null): ICodeWindow | undefined {
+
+	// First check for windows with workspaces that have a parent folder of the provided path opened
+	for (const window of windows) {
+		const workspace = window.openedWorkspace;
+		if (isWorkspaceIdentifier(workspace)) {
+			const resolvedWorkspace = localWorkspaceResolver(workspace);
+
+			// resolved workspace: folders are known and can be compared with
+			if (resolvedWorkspace) {
+				if (resolvedWorkspace.folders.some(folder => extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, folder.uri))) {
+					return window;
+				}
+			}
+
+			// unresolved: can only compare with workspace location
+			else {
+				if (extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, workspace.configPath)) {
+					return window;
+				}
+			}
+		}
+	}
+
+	// Then go with single folder windows that are parent of the provided file path
+	const singleFolderWindowsOnFilePath = windows.filter(window => isSingleFolderWorkspaceIdentifier(window.openedWorkspace) && extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, window.openedWorkspace.uri));
+	if (singleFolderWindowsOnFilePath.length) {
+		return singleFolderWindowsOnFilePath.sort((windowA, windowB) => -((windowA.openedWorkspace as ISingleFolderWorkspaceIdentifier).uri.path.length - (windowB.openedWorkspace as ISingleFolderWorkspaceIdentifier).uri.path.length))[0];
+	}
+
+	return undefined;
+}
+
+export function findWindowOnWorkspaceOrFolder(windows: ICodeWindow[], folderOrWorkspaceConfigUri: URI): ICodeWindow | undefined {
+
+	for (const window of windows) {
+
+		// check for workspace config path
+		if (isWorkspaceIdentifier(window.openedWorkspace) && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.configPath, folderOrWorkspaceConfigUri)) {
+			return window;
+		}
+
+		// check for folder path
+		if (isSingleFolderWorkspaceIdentifier(window.openedWorkspace) && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.uri, folderOrWorkspaceConfigUri)) {
+			return window;
+		}
+	}
+
+	return undefined;
+}
+
+
+export function findWindowOnExtensionDevelopmentPath(windows: ICodeWindow[], extensionDevelopmentPaths: string[]): ICodeWindow | undefined {
+
+	const matches = (uriString: string): boolean => {
+		return extensionDevelopmentPaths.some(path => extUriBiasedIgnorePathCase.isEqual(URI.file(path), URI.file(uriString)));
+	};
+
+	for (const window of windows) {
+
+		// match on extension development path. the path can be one or more paths
+		// so we check if any of the paths match on any of the provided ones
+		if (window.config?.extensionDevelopmentPath?.some(path => matches(path))) {
+			return window;
+		}
+	}
+
+	return undefined;
+}
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 6bcedb5c7..eebedf006 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { statSync, unlink } from 'fs';
+import { statSync } from 'fs';
 import { basename, normalize, join, posix } from 'vs/base/common/path';
 import { localize } from 'vs/nls';
 import { coalesce, distinct, firstOrDefault } from 'vs/base/common/arrays';
@@ -12,166 +12,126 @@ import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 import { IStateService } from 'vs/platform/state/node/state';
-import { CodeWindow, defaultWindowState } from 'vs/code/electron-main/window';
-import { screen, BrowserWindow, MessageBoxOptions, Display, app, WebContents } from 'electron';
+import { CodeWindow } from 'vs/code/electron-main/window';
+import { BrowserWindow, MessageBoxOptions, WebContents } from 'electron';
 import { ILifecycleMainService, UnloadReason, LifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IWindowSettings, IPath, isFileToOpen, isWorkspaceToOpen, isFolderToOpen, IWindowOpenable, IOpenEmptyWindowOptions, IAddFoldersRequest, IPathsToWaitFor, INativeWindowConfiguration } from 'vs/platform/windows/common/windows';
-import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace, findWindowOnExtensionDevelopmentPath, findWindowOnWorkspaceOrFolderUri, OpenContext } from 'vs/platform/windows/node/window';
+import { IWindowSettings, IPath, isFileToOpen, isWorkspaceToOpen, isFolderToOpen, IWindowOpenable, IOpenEmptyWindowOptions, IAddFoldersRequest, IPathsToWaitFor, INativeWindowConfiguration, INativeOpenFileRequest } from 'vs/platform/windows/common/windows';
+import { findWindowOnFile, findWindowOnWorkspaceOrFolder, findWindowOnExtensionDevelopmentPath } from 'vs/platform/windows/electron-main/windowsFinder';
 import { Emitter } from 'vs/base/common/event';
 import product from 'vs/platform/product/common/product';
-import { IWindowsMainService, IOpenConfiguration, IWindowsCountChangedEvent, ICodeWindow, IWindowState as ISingleWindowState, WindowMode, IOpenEmptyConfiguration } from 'vs/platform/windows/electron-main/windows';
+import { IWindowsMainService, IOpenConfiguration, IWindowsCountChangedEvent, ICodeWindow, IOpenEmptyConfiguration, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform';
-import { IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, hasWorkspaceFileExtension, IRecent } from 'vs/platform/workspaces/common/workspaces';
+import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
+import { IWorkspaceIdentifier, hasWorkspaceFileExtension, IRecent, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { normalizePath, originalFSPath, removeTrailingPathSeparator, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import { getRemoteAuthority } from 'vs/platform/remote/common/remoteHosts';
-import { restoreWindowsState, WindowsStateStorageData, getWindowsStateStoreData } from 'vs/platform/windows/electron-main/windowsStateStorage';
-import { getWorkspaceIdentifier, IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { IWindowState, WindowsStateHandler } from 'vs/platform/windows/electron-main/windowsStateHandler';
+import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier, IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { once } from 'vs/base/common/functional';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { withNullAsUndefined } from 'vs/base/common/types';
-import { isWindowsDriveLetter, toSlashes, parseLineAndColumnAware } from 'vs/base/common/extpath';
+import { isWindowsDriveLetter, toSlashes, parseLineAndColumnAware, sanitizeFilePath } from 'vs/base/common/extpath';
 import { CharCode } from 'vs/base/common/charCode';
 import { getPathLabel } from 'vs/base/common/labels';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { IFileService } from 'vs/platform/files/common/files';
 
-export interface IWindowState {
-	workspace?: IWorkspaceIdentifier;
-	folderUri?: URI;
-	backupPath?: string;
-	remoteAuthority?: string;
-	uiState: ISingleWindowState;
-}
-
-export interface IWindowsState {
-	lastActiveWindow?: IWindowState;
-	lastPluginDevelopmentHostWindow?: IWindowState;
-	openedWindows: IWindowState[];
-}
-
-interface INewWindowState extends ISingleWindowState {
-	hasDefaultState?: boolean;
-}
+//#region Helper Interfaces
 
 type RestoreWindowsSetting = 'preserve' | 'all' | 'folders' | 'one' | 'none';
 
 interface IOpenBrowserWindowOptions {
-	userEnv?: IProcessEnvironment;
-	cli?: NativeParsedArgs;
+	readonly userEnv?: IProcessEnvironment;
+	readonly cli?: NativeParsedArgs;
 
-	workspace?: IWorkspaceIdentifier;
-	folderUri?: URI;
+	readonly workspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier;
 
-	remoteAuthority?: string;
+	readonly remoteAuthority?: string;
 
-	initialStartup?: boolean;
+	readonly initialStartup?: boolean;
 
-	filesToOpen?: IFilesToOpen;
+	readonly filesToOpen?: IFilesToOpen;
 
-	forceNewWindow?: boolean;
-	forceNewTabbedWindow?: boolean;
-	windowToUse?: ICodeWindow;
+	readonly forceNewWindow?: boolean;
+	readonly forceNewTabbedWindow?: boolean;
+	readonly windowToUse?: ICodeWindow;
 
-	emptyWindowBackupInfo?: IEmptyWindowBackupInfo;
+	readonly emptyWindowBackupInfo?: IEmptyWindowBackupInfo;
 }
 
-interface IPathParseOptions {
-	ignoreFileNotFound?: boolean;
-	gotoLineMode?: boolean;
-	remoteAuthority?: string;
+interface IPathResolveOptions {
+	readonly ignoreFileNotFound?: boolean;
+	readonly gotoLineMode?: boolean;
+	readonly remoteAuthority?: string;
 }
 
 interface IFilesToOpen {
+	readonly remoteAuthority?: string;
+
 	filesToOpenOrCreate: IPath[];
 	filesToDiff: IPath[];
 	filesToWait?: IPathsToWaitFor;
-	remoteAuthority?: string;
 }
 
 interface IPathToOpen extends IPath {
 
-	// the workspace for a Code instance to open
-	workspace?: IWorkspaceIdentifier;
+	// the workspace to open
+	readonly workspace?: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier;
 
-	// the folder path for a Code instance to open
-	folderUri?: URI;
-
-	// the backup path for a Code instance to use
-	backupPath?: string;
+	// the backup path to use
+	readonly backupPath?: string;
 
 	// the remote authority for the Code instance to open. Undefined if not remote.
-	remoteAuthority?: string;
+	readonly remoteAuthority?: string;
 
 	// optional label for the recent history
 	label?: string;
 }
 
-function isFolderPathToOpen(path: IPathToOpen): path is IFolderPathToOpen {
-	return !!path.folderUri;
+interface IWorkspacePathToOpen extends IPathToOpen {
+	readonly workspace: IWorkspaceIdentifier;
 }
 
-interface IFolderPathToOpen {
-
-	// the folder path for a Code instance to open
-	folderUri: URI;
-
-	// the backup path for a Code instance to use
-	backupPath?: string;
-
-	// the remote authority for the Code instance to open. Undefined if not remote.
-	remoteAuthority?: string;
-
-	// optional label for the recent history
-	label?: string;
+interface ISingleFolderWorkspacePathToOpen extends IPathToOpen {
+	readonly workspace: ISingleFolderWorkspaceIdentifier;
 }
 
-function isWorkspacePathToOpen(path: IPathToOpen): path is IWorkspacePathToOpen {
-	return !!path.workspace;
+function isWorkspacePathToOpen(path: IPathToOpen | undefined): path is IWorkspacePathToOpen {
+	return isWorkspaceIdentifier(path?.workspace);
 }
 
-interface IWorkspacePathToOpen {
-
-	// the workspace for a Code instance to open
-	workspace: IWorkspaceIdentifier;
-
-	// the backup path for a Code instance to use
-	backupPath?: string;
-
-	// the remote authority for the Code instance to open. Undefined if not remote.
-	remoteAuthority?: string;
-
-	// optional label for the recent history
-	label?: string;
+function isSingleFolderWorkspacePathToOpen(path: IPathToOpen | undefined): path is ISingleFolderWorkspacePathToOpen {
+	return isSingleFolderWorkspaceIdentifier(path?.workspace);
 }
 
+//#endregion
+
 export class WindowsMainService extends Disposable implements IWindowsMainService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly windowsStateStorageKey = 'windowsState';
-
 	private static readonly WINDOWS: ICodeWindow[] = [];
 
-	private readonly windowsState: IWindowsState;
-	private lastClosedWindowState?: IWindowState;
-
-	private shuttingDown = false;
-
 	private readonly _onWindowOpened = this._register(new Emitter<ICodeWindow>());
 	readonly onWindowOpened = this._onWindowOpened.event;
 
 	private readonly _onWindowReady = this._register(new Emitter<ICodeWindow>());
 	readonly onWindowReady = this._onWindowReady.event;
 
+	private readonly _onWindowDestroyed = this._register(new Emitter<ICodeWindow>());
+	readonly onWindowDestroyed = this._onWindowDestroyed.event;
+
 	private readonly _onWindowsCountChanged = this._register(new Emitter<IWindowsCountChangedEvent>());
 	readonly onWindowsCountChanged = this._onWindowsCountChanged.event;
 
+	private readonly windowsStateHandler = this._register(new WindowsStateHandler(this, this.stateService, this.lifecycleMainService, this.logService, this.configurationService));
+
 	constructor(
 		private readonly machineId: string,
 		private readonly initialUserEnv: IProcessEnvironment,
@@ -182,190 +142,20 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		@IBackupMainService private readonly backupMainService: IBackupMainService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IWorkspacesHistoryMainService private readonly workspacesHistoryMainService: IWorkspacesHistoryMainService,
-		@IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService,
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IDialogMainService private readonly dialogMainService: IDialogMainService
+		@IDialogMainService private readonly dialogMainService: IDialogMainService,
+		@IFileService private readonly fileService: IFileService
 	) {
 		super();
 
-		this.windowsState = restoreWindowsState(this.stateService.getItem<WindowsStateStorageData>(WindowsMainService.windowsStateStorageKey));
-		if (!Array.isArray(this.windowsState.openedWindows)) {
-			this.windowsState.openedWindows = [];
-		}
-
 		this.lifecycleMainService.when(LifecycleMainPhase.Ready).then(() => this.registerListeners());
-		this.lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen).then(() => this.installWindowsMutex());
-	}
-
-	private installWindowsMutex(): void {
-		const win32MutexName = product.win32MutexName;
-		if (isWindows && win32MutexName) {
-			try {
-				const WindowsMutex = (require.__$__nodeRequire('windows-mutex') as typeof import('windows-mutex')).Mutex;
-				const mutex = new WindowsMutex(win32MutexName);
-				once(this.lifecycleMainService.onWillShutdown)(() => mutex.release());
-			} catch (e) {
-				this.logService.error(e);
-			}
-		}
 	}
 
 	private registerListeners(): void {
 
-		// When a window looses focus, save all windows state. This allows to
-		// prevent loss of window-state data when OS is restarted without properly
-		// shutting down the application (https://github.com/microsoft/vscode/issues/87171)
-		app.on('browser-window-blur', () => {
-			if (!this.shuttingDown) {
-				this.saveWindowsState();
-			}
-		});
-
-		// Handle various lifecycle events around windows
-		this.lifecycleMainService.onBeforeWindowClose(window => this.onBeforeWindowClose(window));
-		this.lifecycleMainService.onBeforeShutdown(() => this.onBeforeShutdown());
-		this.onWindowsCountChanged(e => {
-			if (e.newCount - e.oldCount > 0) {
-				// clear last closed window state when a new window opens. this helps on macOS where
-				// otherwise closing the last window, opening a new window and then quitting would
-				// use the state of the previously closed window when restarting.
-				this.lastClosedWindowState = undefined;
-			}
-		});
-
 		// Signal a window is ready after having entered a workspace
-		this._register(this.workspacesMainService.onWorkspaceEntered(event => {
-			this._onWindowReady.fire(event.window);
-		}));
-	}
-
-	// Note that onBeforeShutdown() and onBeforeWindowClose() are fired in different order depending on the OS:
-	// - macOS: since the app will not quit when closing the last window, you will always first get
-	//          the onBeforeShutdown() event followed by N onBeforeWindowClose() events for each window
-	// - other: on other OS, closing the last window will quit the app so the order depends on the
-	//          user interaction: closing the last window will first trigger onBeforeWindowClose()
-	//          and then onBeforeShutdown(). Using the quit action however will first issue onBeforeShutdown()
-	//          and then onBeforeWindowClose().
-	//
-	// Here is the behavior on different OS depending on action taken (Electron 1.7.x):
-	//
-	// Legend
-	// -  quit(N): quit application with N windows opened
-	// - close(1): close one window via the window close button
-	// - closeAll: close all windows via the taskbar command
-	// - onBeforeShutdown(N): number of windows reported in this event handler
-	// - onBeforeWindowClose(N, M): number of windows reported and quitRequested boolean in this event handler
-	//
-	// macOS
-	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
-	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
-	// 	-     quit(0): onBeforeShutdown(0)
-	// 	-    close(1): onBeforeWindowClose(1, false)
-	//
-	// Windows
-	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
-	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
-	// 	-    close(1): onBeforeWindowClose(2, false)[not last window]
-	// 	-    close(1): onBeforeWindowClose(1, false), onBeforeShutdown(0)[last window]
-	// 	- closeAll(2): onBeforeWindowClose(2, false), onBeforeWindowClose(2, false), onBeforeShutdown(0)
-	//
-	// Linux
-	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
-	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
-	// 	-    close(1): onBeforeWindowClose(2, false)[not last window]
-	// 	-    close(1): onBeforeWindowClose(1, false), onBeforeShutdown(0)[last window]
-	// 	- closeAll(2): onBeforeWindowClose(2, false), onBeforeWindowClose(2, false), onBeforeShutdown(0)
-	//
-	private onBeforeShutdown(): void {
-		this.shuttingDown = true;
-
-		this.saveWindowsState();
-	}
-
-	private saveWindowsState(): void {
-		const currentWindowsState: IWindowsState = {
-			openedWindows: [],
-			lastPluginDevelopmentHostWindow: this.windowsState.lastPluginDevelopmentHostWindow,
-			lastActiveWindow: this.lastClosedWindowState
-		};
-
-		// 1.) Find a last active window (pick any other first window otherwise)
-		if (!currentWindowsState.lastActiveWindow) {
-			let activeWindow = this.getLastActiveWindow();
-			if (!activeWindow || activeWindow.isExtensionDevelopmentHost) {
-				activeWindow = WindowsMainService.WINDOWS.find(window => !window.isExtensionDevelopmentHost);
-			}
-
-			if (activeWindow) {
-				currentWindowsState.lastActiveWindow = this.toWindowState(activeWindow);
-			}
-		}
-
-		// 2.) Find extension host window
-		const extensionHostWindow = WindowsMainService.WINDOWS.find(window => window.isExtensionDevelopmentHost && !window.isExtensionTestHost);
-		if (extensionHostWindow) {
-			currentWindowsState.lastPluginDevelopmentHostWindow = this.toWindowState(extensionHostWindow);
-		}
-
-		// 3.) All windows (except extension host) for N >= 2 to support `restoreWindows: all` or for auto update
-		//
-		// Careful here: asking a window for its window state after it has been closed returns bogus values (width: 0, height: 0)
-		// so if we ever want to persist the UI state of the last closed window (window count === 1), it has
-		// to come from the stored lastClosedWindowState on Win/Linux at least
-		if (this.getWindowCount() > 1) {
-			currentWindowsState.openedWindows = WindowsMainService.WINDOWS.filter(window => !window.isExtensionDevelopmentHost).map(window => this.toWindowState(window));
-		}
-
-		// Persist
-		const state = getWindowsStateStoreData(currentWindowsState);
-		this.stateService.setItem(WindowsMainService.windowsStateStorageKey, state);
-
-		if (this.shuttingDown) {
-			this.logService.trace('onBeforeShutdown', state);
-		}
-	}
-
-	// See note on #onBeforeShutdown() for details how these events are flowing
-	private onBeforeWindowClose(win: ICodeWindow): void {
-		if (this.lifecycleMainService.quitRequested) {
-			return; // during quit, many windows close in parallel so let it be handled in the before-quit handler
-		}
-
-		// On Window close, update our stored UI state of this window
-		const state: IWindowState = this.toWindowState(win);
-		if (win.isExtensionDevelopmentHost && !win.isExtensionTestHost) {
-			this.windowsState.lastPluginDevelopmentHostWindow = state; // do not let test run window state overwrite our extension development state
-		}
-
-		// Any non extension host window with same workspace or folder
-		else if (!win.isExtensionDevelopmentHost && (!!win.openedWorkspace || !!win.openedFolderUri)) {
-			this.windowsState.openedWindows.forEach(o => {
-				const sameWorkspace = win.openedWorkspace && o.workspace && o.workspace.id === win.openedWorkspace.id;
-				const sameFolder = win.openedFolderUri && o.folderUri && extUriBiasedIgnorePathCase.isEqual(o.folderUri, win.openedFolderUri);
-
-				if (sameWorkspace || sameFolder) {
-					o.uiState = state.uiState;
-				}
-			});
-		}
-
-		// On Windows and Linux closing the last window will trigger quit. Since we are storing all UI state
-		// before quitting, we need to remember the UI state of this window to be able to persist it.
-		// On macOS we keep the last closed window state ready in case the user wants to quit right after or
-		// wants to open another window, in which case we use this state over the persisted one.
-		if (this.getWindowCount() === 1) {
-			this.lastClosedWindowState = state;
-		}
-	}
-
-	private toWindowState(win: ICodeWindow): IWindowState {
-		return {
-			workspace: win.openedWorkspace,
-			folderUri: win.openedFolderUri,
-			backupPath: win.backupPath,
-			remoteAuthority: win.remoteAuthority,
-			uiState: win.serializeWindowState()
-		};
+		this._register(this.workspacesManagementMainService.onWorkspaceEntered(event => this._onWindowReady.fire(event.window)));
 	}
 
 	openEmptyWindow(openConfig: IOpenEmptyConfiguration, options?: IOpenEmptyWindowOptions): ICodeWindow[] {
@@ -375,18 +165,22 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			cli = { ...cli, remote };
 		}
 
+		const forceEmpty = true;
 		const forceReuseWindow = options?.forceReuseWindow;
 		const forceNewWindow = !forceReuseWindow;
 
-		return this.open({ ...openConfig, cli, forceEmpty: true, forceNewWindow, forceReuseWindow });
+		return this.open({ ...openConfig, cli, forceEmpty, forceNewWindow, forceReuseWindow });
 	}
 
 	open(openConfig: IOpenConfiguration): ICodeWindow[] {
 		this.logService.trace('windowsManager#open');
-		openConfig = this.validateOpenConfig(openConfig);
 
-		const foldersToAdd: IFolderPathToOpen[] = [];
-		const foldersToOpen: IFolderPathToOpen[] = [];
+		if (openConfig.addMode && (openConfig.initialStartup || !this.getLastActiveWindow())) {
+			openConfig.addMode = false; // Make sure addMode is only enabled if we have an active window
+		}
+
+		const foldersToAdd: ISingleFolderWorkspacePathToOpen[] = [];
+		const foldersToOpen: ISingleFolderWorkspacePathToOpen[] = [];
 		const workspacesToOpen: IWorkspacePathToOpen[] = [];
 		const workspacesToRestore: IWorkspacePathToOpen[] = [];
 		const emptyToRestore: IEmptyWindowBackupInfo[] = [];
@@ -397,7 +191,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		const pathsToOpen = this.getPathsToOpen(openConfig);
 		this.logService.trace('windowsManager#open pathsToOpen', pathsToOpen);
 		for (const path of pathsToOpen) {
-			if (isFolderPathToOpen(path)) {
+			if (isSingleFolderWorkspacePathToOpen(path)) {
 				if (openConfig.addMode) {
 					// When run with --add, take the folders that are to be opened as
 					// folders that should be added to the currently active window.
@@ -431,13 +225,11 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			filesToOpen.filesToWait = { paths: [...filesToOpen.filesToDiff, ...filesToOpen.filesToOpenOrCreate], waitMarkerFileUri: openConfig.waitMarkerFileURI };
 		}
 
-		//
 		// These are windows to restore because of hot-exit or from previous session (only performed once on startup!)
-		//
 		if (openConfig.initialStartup) {
 
 			// Untitled workspaces are always restored
-			workspacesToRestore.push(...this.workspacesMainService.getUntitledWorkspacesSync());
+			workspacesToRestore.push(...this.workspacesManagementMainService.getUntitledWorkspacesSync());
 			workspacesToOpen.push(...workspacesToRestore);
 
 			// Empty windows with backups are always restored
@@ -461,13 +253,13 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 			// Otherwise, find a good window based on open params
 			else {
-				const focusLastActive = this.windowsState.lastActiveWindow && !openConfig.forceEmpty && !openConfig.cli._.length && !openConfig.cli['file-uri'] && !openConfig.cli['folder-uri'] && !(openConfig.urisToOpen && openConfig.urisToOpen.length);
+				const focusLastActive = this.windowsStateHandler.state.lastActiveWindow && !openConfig.forceEmpty && !openConfig.cli._.length && !openConfig.cli['file-uri'] && !openConfig.cli['folder-uri'] && !(openConfig.urisToOpen && openConfig.urisToOpen.length);
 				let focusLastOpened = true;
 				let focusLastWindow = true;
 
 				// 2.) focus last active window if we are not instructed to open any paths
 				if (focusLastActive) {
-					const lastActiveWindow = usedWindows.filter(window => this.windowsState.lastActiveWindow && window.backupPath === this.windowsState.lastActiveWindow.backupPath);
+					const lastActiveWindow = usedWindows.filter(window => this.windowsStateHandler.state.lastActiveWindow && window.backupPath === this.windowsStateHandler.state.lastActiveWindow.backupPath);
 					if (lastActiveWindow.length) {
 						lastActiveWindow[0].focus();
 						focusLastOpened = false;
@@ -504,11 +296,11 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		const isDiff = filesToOpen && filesToOpen.filesToDiff.length > 0;
 		if (!usedWindows.some(window => window.isExtensionDevelopmentHost) && !isDiff && !openConfig.noRecentEntry) {
 			const recents: IRecent[] = [];
-			for (let pathToOpen of pathsToOpen) {
-				if (pathToOpen.workspace) {
+			for (const pathToOpen of pathsToOpen) {
+				if (isWorkspacePathToOpen(pathToOpen)) {
 					recents.push({ label: pathToOpen.label, workspace: pathToOpen.workspace });
-				} else if (pathToOpen.folderUri) {
-					recents.push({ label: pathToOpen.label, folderUri: pathToOpen.folderUri });
+				} else if (isSingleFolderWorkspacePathToOpen(pathToOpen)) {
+					recents.push({ label: pathToOpen.label, folderUri: pathToOpen.workspace.uri });
 				} else if (pathToOpen.fileUri) {
 					recents.push({ label: pathToOpen.label, fileUri: pathToOpen.fileUri });
 				}
@@ -522,33 +314,34 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// process can continue. We do this by deleting the waitMarkerFilePath.
 		const waitMarkerFileURI = openConfig.waitMarkerFileURI;
 		if (openConfig.context === OpenContext.CLI && waitMarkerFileURI && usedWindows.length === 1 && usedWindows[0]) {
-			usedWindows[0].whenClosedOrLoaded.then(() => unlink(waitMarkerFileURI.fsPath, () => undefined));
+			usedWindows[0].whenClosedOrLoaded.then(() => this.fileService.del(waitMarkerFileURI), () => undefined);
 		}
 
 		return usedWindows;
 	}
 
-	private validateOpenConfig(config: IOpenConfiguration): IOpenConfiguration {
-
-		// Make sure addMode is only enabled if we have an active window
-		if (config.addMode && (config.initialStartup || !this.getLastActiveWindow())) {
-			config.addMode = false;
-		}
-
-		return config;
-	}
-
 	private doOpen(
 		openConfig: IOpenConfiguration,
 		workspacesToOpen: IWorkspacePathToOpen[],
-		foldersToOpen: IFolderPathToOpen[],
+		foldersToOpen: ISingleFolderWorkspacePathToOpen[],
 		emptyToRestore: IEmptyWindowBackupInfo[],
 		emptyToOpen: number,
 		filesToOpen: IFilesToOpen | undefined,
-		foldersToAdd: IFolderPathToOpen[]
+		foldersToAdd: ISingleFolderWorkspacePathToOpen[]
 	): { windows: ICodeWindow[], filesOpenedInWindow: ICodeWindow | undefined } {
+
+		// Keep track of used windows and remember
+		// if files have been opened in one of them
 		const usedWindows: ICodeWindow[] = [];
 		let filesOpenedInWindow: ICodeWindow | undefined = undefined;
+		function addUsedWindow(window: ICodeWindow, openedFiles?: boolean): void {
+			usedWindows.push(window);
+
+			if (openedFiles) {
+				filesOpenedInWindow = window;
+				filesToOpen = undefined; // reset `filesToOpen` since files have been opened
+			}
+		}
 
 		// Settings can decide if files/folders open in new window or not
 		let { openFolderInNewWindow, openFilesInNewWindow } = this.shouldOpenNewWindow(openConfig);
@@ -558,57 +351,59 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			const authority = foldersToAdd[0].remoteAuthority;
 			const lastActiveWindow = this.getLastActiveWindowForAuthority(authority);
 			if (lastActiveWindow) {
-				usedWindows.push(this.doAddFoldersToExistingWindow(lastActiveWindow, foldersToAdd.map(f => f.folderUri)));
+				addUsedWindow(this.doAddFoldersToExistingWindow(lastActiveWindow, foldersToAdd.map(folderToAdd => folderToAdd.workspace.uri)));
 			}
 		}
 
-		// Handle files to open/diff or to create when we dont open a folder and we do not restore any folder/untitled from hot-exit
-		const potentialWindowsCount = foldersToOpen.length + workspacesToOpen.length + emptyToRestore.length;
-		if (potentialWindowsCount === 0 && filesToOpen) {
+		// Handle files to open/diff or to create when we dont open a folder and we do not restore any
+		// folder/untitled from hot-exit by trying to open them in the window that fits best
+		const potentialNewWindowsCount = foldersToOpen.length + workspacesToOpen.length + emptyToRestore.length;
+		if (filesToOpen && potentialNewWindowsCount === 0) {
 
 			// Find suitable window or folder path to open files in
 			const fileToCheck = filesToOpen.filesToOpenOrCreate[0] || filesToOpen.filesToDiff[0];
 
 			// only look at the windows with correct authority
-			const windows = WindowsMainService.WINDOWS.filter(window => filesToOpen && window.remoteAuthority === filesToOpen.remoteAuthority);
+			const windows = this.getWindows().filter(window => filesToOpen && window.remoteAuthority === filesToOpen.remoteAuthority);
 
-			const bestWindowOrFolder = findBestWindowOrFolderForFile({
-				windows,
-				newWindow: openFilesInNewWindow,
-				context: openConfig.context,
-				fileUri: fileToCheck?.fileUri,
-				localWorkspaceResolver: workspace => workspace.configPath.scheme === Schemas.file ? this.workspacesMainService.resolveLocalWorkspaceSync(workspace.configPath) : null
-			});
+			// figure out a good window to open the files in if any
+			// with a fallback to the last active window.
+			//
+			// in case `openFilesInNewWindow` is enforced, we skip
+			// this step.
+			let windowToUseForFiles: ICodeWindow | undefined = undefined;
+			if (fileToCheck?.fileUri && !openFilesInNewWindow) {
+				if (openConfig.context === OpenContext.DESKTOP || openConfig.context === OpenContext.CLI || openConfig.context === OpenContext.DOCK) {
+					windowToUseForFiles = findWindowOnFile(windows, fileToCheck.fileUri, workspace => workspace.configPath.scheme === Schemas.file ? this.workspacesManagementMainService.resolveLocalWorkspaceSync(workspace.configPath) : null);
+				}
+
+				if (!windowToUseForFiles) {
+					windowToUseForFiles = this.doGetLastActiveWindow(windows);
+				}
+			}
 
 			// We found a window to open the files in
-			if (bestWindowOrFolder instanceof CodeWindow) {
+			if (windowToUseForFiles) {
 
 				// Window is workspace
-				if (bestWindowOrFolder.openedWorkspace) {
-					workspacesToOpen.push({ workspace: bestWindowOrFolder.openedWorkspace, remoteAuthority: bestWindowOrFolder.remoteAuthority });
+				if (isWorkspaceIdentifier(windowToUseForFiles.openedWorkspace)) {
+					workspacesToOpen.push({ workspace: windowToUseForFiles.openedWorkspace, remoteAuthority: windowToUseForFiles.remoteAuthority });
 				}
 
 				// Window is single folder
-				else if (bestWindowOrFolder.openedFolderUri) {
-					foldersToOpen.push({ folderUri: bestWindowOrFolder.openedFolderUri, remoteAuthority: bestWindowOrFolder.remoteAuthority });
+				else if (isSingleFolderWorkspaceIdentifier(windowToUseForFiles.openedWorkspace)) {
+					foldersToOpen.push({ workspace: windowToUseForFiles.openedWorkspace, remoteAuthority: windowToUseForFiles.remoteAuthority });
 				}
 
 				// Window is empty
 				else {
-
-					// Do open files
-					const window = this.doOpenFilesInExistingWindow(openConfig, bestWindowOrFolder, filesToOpen);
-					usedWindows.push(window);
-
-					// Reset `filesToOpen` because we handled them and also remember window we used
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
+					addUsedWindow(this.doOpenFilesInExistingWindow(openConfig, windowToUseForFiles, filesToOpen), true);
 				}
 			}
 
 			// Finally, if no window or folder is found, just open the files in an empty window
 			else {
-				const window = this.openInBrowserWindow({
+				addUsedWindow(this.openInBrowserWindow({
 					userEnv: openConfig.userEnv,
 					cli: openConfig.cli,
 					initialStartup: openConfig.initialStartup,
@@ -616,12 +411,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 					forceNewWindow: true,
 					remoteAuthority: filesToOpen.remoteAuthority,
 					forceNewTabbedWindow: openConfig.forceNewTabbedWindow
-				});
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				filesToOpen = undefined;
-				filesOpenedInWindow = window;
+				}), true);
 			}
 		}
 
@@ -630,27 +420,20 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		if (allWorkspacesToOpen.length > 0) {
 
 			// Check for existing instances
-			const windowsOnWorkspace = coalesce(allWorkspacesToOpen.map(workspaceToOpen => findWindowOnWorkspace(WindowsMainService.WINDOWS, workspaceToOpen.workspace)));
+			const windowsOnWorkspace = coalesce(allWorkspacesToOpen.map(workspaceToOpen => findWindowOnWorkspaceOrFolder(this.getWindows(), workspaceToOpen.workspace.configPath)));
 			if (windowsOnWorkspace.length > 0) {
 				const windowOnWorkspace = windowsOnWorkspace[0];
 				const filesToOpenInWindow = (filesToOpen?.remoteAuthority === windowOnWorkspace.remoteAuthority) ? filesToOpen : undefined;
 
 				// Do open files
-				const window = this.doOpenFilesInExistingWindow(openConfig, windowOnWorkspace, filesToOpenInWindow);
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpenInWindow) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				addUsedWindow(this.doOpenFilesInExistingWindow(openConfig, windowOnWorkspace, filesToOpenInWindow), !!filesToOpenInWindow);
 
 				openFolderInNewWindow = true; // any other folders to open must open in new window then
 			}
 
 			// Open remaining ones
 			allWorkspacesToOpen.forEach(workspaceToOpen => {
-				if (windowsOnWorkspace.some(win => win.openedWorkspace && win.openedWorkspace.id === workspaceToOpen.workspace.id)) {
+				if (windowsOnWorkspace.some(window => window.openedWorkspace && window.openedWorkspace.id === workspaceToOpen.workspace.id)) {
 					return; // ignore folders that are already open
 				}
 
@@ -658,46 +441,31 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				const filesToOpenInWindow = (filesToOpen?.remoteAuthority === remoteAuthority) ? filesToOpen : undefined;
 
 				// Do open folder
-				const window = this.doOpenFolderOrWorkspace(openConfig, workspaceToOpen, openFolderInNewWindow, filesToOpenInWindow);
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpenInWindow) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				addUsedWindow(this.doOpenFolderOrWorkspace(openConfig, workspaceToOpen, openFolderInNewWindow, filesToOpenInWindow), !!filesToOpenInWindow);
 
 				openFolderInNewWindow = true; // any other folders to open must open in new window then
 			});
 		}
 
 		// Handle folders to open (instructed and to restore)
-		const allFoldersToOpen = distinct(foldersToOpen, folder => extUriBiasedIgnorePathCase.getComparisonKey(folder.folderUri)); // prevent duplicates
+		const allFoldersToOpen = distinct(foldersToOpen, folder => extUriBiasedIgnorePathCase.getComparisonKey(folder.workspace.uri)); // prevent duplicates
 		if (allFoldersToOpen.length > 0) {
 
 			// Check for existing instances
-			const windowsOnFolderPath = coalesce(allFoldersToOpen.map(folderToOpen => findWindowOnWorkspace(WindowsMainService.WINDOWS, folderToOpen.folderUri)));
+			const windowsOnFolderPath = coalesce(allFoldersToOpen.map(folderToOpen => findWindowOnWorkspaceOrFolder(this.getWindows(), folderToOpen.workspace.uri)));
 			if (windowsOnFolderPath.length > 0) {
 				const windowOnFolderPath = windowsOnFolderPath[0];
 				const filesToOpenInWindow = filesToOpen?.remoteAuthority === windowOnFolderPath.remoteAuthority ? filesToOpen : undefined;
 
 				// Do open files
-				const window = this.doOpenFilesInExistingWindow(openConfig, windowOnFolderPath, filesToOpenInWindow);
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpenInWindow) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				addUsedWindow(this.doOpenFilesInExistingWindow(openConfig, windowOnFolderPath, filesToOpenInWindow), !!filesToOpenInWindow);
 
 				openFolderInNewWindow = true; // any other folders to open must open in new window then
 			}
 
 			// Open remaining ones
 			allFoldersToOpen.forEach(folderToOpen => {
-
-				if (windowsOnFolderPath.some(win => extUriBiasedIgnorePathCase.isEqual(win.openedFolderUri, folderToOpen.folderUri))) {
+				if (windowsOnFolderPath.some(window => isSingleFolderWorkspaceIdentifier(window.openedWorkspace) && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.uri, folderToOpen.workspace.uri))) {
 					return; // ignore folders that are already open
 				}
 
@@ -705,14 +473,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				const filesToOpenInWindow = (filesToOpen?.remoteAuthority === remoteAuthority) ? filesToOpen : undefined;
 
 				// Do open folder
-				const window = this.doOpenFolderOrWorkspace(openConfig, folderToOpen, openFolderInNewWindow, filesToOpenInWindow);
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpenInWindow) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				addUsedWindow(this.doOpenFolderOrWorkspace(openConfig, folderToOpen, openFolderInNewWindow, filesToOpenInWindow), !!filesToOpenInWindow);
 
 				openFolderInNewWindow = true; // any other folders to open must open in new window then
 			});
@@ -725,7 +486,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				const remoteAuthority = emptyWindowBackupInfo.remoteAuthority;
 				const filesToOpenInWindow = (filesToOpen?.remoteAuthority === remoteAuthority) ? filesToOpen : undefined;
 
-				const window = this.openInBrowserWindow({
+				addUsedWindow(this.openInBrowserWindow({
 					userEnv: openConfig.userEnv,
 					cli: openConfig.cli,
 					initialStartup: openConfig.initialStartup,
@@ -734,14 +495,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 					forceNewWindow: true,
 					forceNewTabbedWindow: openConfig.forceNewTabbedWindow,
 					emptyWindowBackupInfo
-				});
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpenInWindow) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				}), !!filesToOpenInWindow);
 
 				openFolderInNewWindow = true; // any other folders to open must open in new window then
 			});
@@ -756,14 +510,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			const remoteAuthority = filesToOpen ? filesToOpen.remoteAuthority : (openConfig.cli && openConfig.cli.remote || undefined);
 
 			for (let i = 0; i < emptyToOpen; i++) {
-				const window = this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen);
-				usedWindows.push(window);
-
-				// Reset `filesToOpen` because we handled them and also remember window we used
-				if (filesToOpen) {
-					filesToOpen = undefined;
-					filesOpenedInWindow = window;
-				}
+				addUsedWindow(this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen), !!filesToOpen);
 
 				// any other window to open must open in new window then
 				openFolderInNewWindow = true;
@@ -778,23 +525,20 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		window.focus(); // make sure window has focus
 
-		const params: { filesToOpenOrCreate?: IPath[], filesToDiff?: IPath[], filesToWait?: IPathsToWaitFor, termProgram?: string } = {};
-		if (filesToOpen) {
-			params.filesToOpenOrCreate = filesToOpen.filesToOpenOrCreate;
-			params.filesToDiff = filesToOpen.filesToDiff;
-			params.filesToWait = filesToOpen.filesToWait;
-		}
-
-		if (configuration.userEnv) {
-			params.termProgram = configuration.userEnv['TERM_PROGRAM'];
-		}
-
+		const params: INativeOpenFileRequest = {
+			filesToOpenOrCreate: filesToOpen?.filesToOpenOrCreate,
+			filesToDiff: filesToOpen?.filesToDiff,
+			filesToWait: filesToOpen?.filesToWait,
+			termProgram: configuration?.userEnv?.['TERM_PROGRAM']
+		};
 		window.sendWhenReady('vscode:openFiles', CancellationToken.None, params);
 
 		return window;
 	}
 
 	private doAddFoldersToExistingWindow(window: ICodeWindow, foldersToAdd: URI[]): ICodeWindow {
+		this.logService.trace('windowsManager#doAddFoldersToExistingWindow');
+
 		window.focus(); // make sure window has focus
 
 		const request: IAddFoldersRequest = { foldersToAdd };
@@ -820,50 +564,57 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		});
 	}
 
-	private doOpenFolderOrWorkspace(openConfig: IOpenConfiguration, folderOrWorkspace: IPathToOpen, forceNewWindow: boolean, filesToOpen: IFilesToOpen | undefined, windowToUse?: ICodeWindow): ICodeWindow {
+	private doOpenFolderOrWorkspace(openConfig: IOpenConfiguration, folderOrWorkspace: IWorkspacePathToOpen | ISingleFolderWorkspacePathToOpen, forceNewWindow: boolean, filesToOpen: IFilesToOpen | undefined, windowToUse?: ICodeWindow): ICodeWindow {
 		if (!forceNewWindow && !windowToUse && typeof openConfig.contextWindowId === 'number') {
 			windowToUse = this.getWindowById(openConfig.contextWindowId); // fix for https://github.com/microsoft/vscode/issues/49587
 		}
 
 		return this.openInBrowserWindow({
+			workspace: folderOrWorkspace.workspace,
 			userEnv: openConfig.userEnv,
 			cli: openConfig.cli,
 			initialStartup: openConfig.initialStartup,
-			workspace: folderOrWorkspace.workspace,
-			folderUri: folderOrWorkspace.folderUri,
-			filesToOpen,
 			remoteAuthority: folderOrWorkspace.remoteAuthority,
 			forceNewWindow,
 			forceNewTabbedWindow: openConfig.forceNewTabbedWindow,
+			filesToOpen,
 			windowToUse
 		});
 	}
 
 	private getPathsToOpen(openConfig: IOpenConfiguration): IPathToOpen[] {
-		let windowsToOpen: IPathToOpen[];
+		let pathsToOpen: IPathToOpen[];
 		let isCommandLineOrAPICall = false;
 		let restoredWindows = false;
 
 		// Extract paths: from API
 		if (openConfig.urisToOpen && openConfig.urisToOpen.length > 0) {
-			windowsToOpen = this.doExtractPathsFromAPI(openConfig);
+			pathsToOpen = this.doExtractPathsFromAPI(openConfig);
 			isCommandLineOrAPICall = true;
 		}
 
 		// Check for force empty
 		else if (openConfig.forceEmpty) {
-			windowsToOpen = [Object.create(null)];
+			pathsToOpen = [Object.create(null)];
 		}
 
 		// Extract paths: from CLI
 		else if (openConfig.cli._.length || openConfig.cli['folder-uri'] || openConfig.cli['file-uri']) {
-			windowsToOpen = this.doExtractPathsFromCLI(openConfig.cli);
+			pathsToOpen = this.doExtractPathsFromCLI(openConfig.cli);
+			if (pathsToOpen.length === 0) {
+				pathsToOpen.push(Object.create(null)); // add an empty window if we did not have windows to open from command line
+			}
+
 			isCommandLineOrAPICall = true;
 		}
 
-		// Extract windows: from previous session
+		// Extract paths: from previous session
 		else {
-			windowsToOpen = this.doGetWindowsFromLastSession();
+			pathsToOpen = this.doGetPathsFromLastSession();
+			if (pathsToOpen.length === 0) {
+				pathsToOpen.push(Object.create(null)); // add an empty window if we did not have windows to restore
+			}
+
 			restoredWindows = true;
 		}
 
@@ -872,15 +623,15 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// If we are in `addMode`, we should not do this because in that case all
 		// folders should be added to the existing window.
 		if (!openConfig.addMode && isCommandLineOrAPICall) {
-			const foldersToOpen = windowsToOpen.filter(path => !!path.folderUri);
+			const foldersToOpen = pathsToOpen.filter(path => isSingleFolderWorkspacePathToOpen(path)) as ISingleFolderWorkspacePathToOpen[];
 			if (foldersToOpen.length > 1) {
 				const remoteAuthority = foldersToOpen[0].remoteAuthority;
-				if (foldersToOpen.every(f => f.remoteAuthority === remoteAuthority)) { // only if all folder have the same authority
-					const workspace = this.workspacesMainService.createUntitledWorkspaceSync(foldersToOpen.map(folder => ({ uri: folder.folderUri! })));
+				if (foldersToOpen.every(folderToOpen => folderToOpen.remoteAuthority === remoteAuthority)) { // only if all folder have the same authority
+					const workspace = this.workspacesManagementMainService.createUntitledWorkspaceSync(foldersToOpen.map(folder => ({ uri: folder.workspace.uri })));
 
 					// Add workspace and remove folders thereby
-					windowsToOpen.push({ workspace, remoteAuthority });
-					windowsToOpen = windowsToOpen.filter(path => !path.folderUri);
+					pathsToOpen.push({ workspace, remoteAuthority });
+					pathsToOpen = pathsToOpen.filter(path => !isSingleFolderWorkspacePathToOpen(path));
 				}
 			}
 		}
@@ -891,63 +642,57 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// Use `unshift` to ensure any new window to open comes last
 		// for proper focus treatment.
 		if (openConfig.initialStartup && !restoredWindows && this.configurationService.getValue<IWindowSettings | undefined>('window')?.restoreWindows === 'preserve') {
-			windowsToOpen.unshift(...this.doGetWindowsFromLastSession().filter(window => window.workspace || window.folderUri || window.backupPath));
+			pathsToOpen.unshift(...this.doGetPathsFromLastSession().filter(path => isWorkspacePathToOpen(path) || isSingleFolderWorkspacePathToOpen(path) || path.backupPath));
 		}
 
-		return windowsToOpen;
+		return pathsToOpen;
 	}
 
 	private doExtractPathsFromAPI(openConfig: IOpenConfiguration): IPathToOpen[] {
 		const pathsToOpen: IPathToOpen[] = [];
-		const parseOptions: IPathParseOptions = { gotoLineMode: openConfig.gotoLineMode };
-		for (const pathToOpen of openConfig.urisToOpen || []) {
-			if (!pathToOpen) {
-				continue;
-			}
+		const pathResolveOptions: IPathResolveOptions = { gotoLineMode: openConfig.gotoLineMode };
+		for (const pathToOpen of coalesce(openConfig.urisToOpen || [])) {
+			const path = this.resolveOpenable(pathToOpen, pathResolveOptions);
 
-			const path = this.parseUri(pathToOpen, parseOptions);
+			// Path exists
 			if (path) {
 				path.label = pathToOpen.label;
 				pathsToOpen.push(path);
-			} else {
-				const uri = this.resourceFromURIToOpen(pathToOpen);
+			}
 
-				// Warn about the invalid URI or path
-				let message, detail;
-				if (uri.scheme === Schemas.file) {
-					message = localize('pathNotExistTitle', "Path does not exist");
-					detail = localize('pathNotExistDetail', "The path '{0}' does not seem to exist anymore on disk.", getPathLabel(uri.fsPath, this.environmentService));
-				} else {
-					message = localize('uriInvalidTitle', "URI can not be opened");
-					detail = localize('uriInvalidDetail', "The URI '{0}' is not valid and can not be opened.", uri.toString());
-				}
+			// Path does not exist: show a warning box
+			else {
+				const uri = this.resourceFromOpenable(pathToOpen);
 
 				const options: MessageBoxOptions = {
 					title: product.nameLong,
 					type: 'info',
 					buttons: [localize('ok', "OK")],
-					message,
-					detail,
+					message: uri.scheme === Schemas.file ? localize('pathNotExistTitle', "Path does not exist") : localize('uriInvalidTitle', "URI can not be opened"),
+					detail: uri.scheme === Schemas.file ?
+						localize('pathNotExistDetail', "The path '{0}' does not seem to exist anymore on disk.", getPathLabel(uri.fsPath, this.environmentService)) :
+						localize('uriInvalidDetail', "The URI '{0}' is not valid and can not be opened.", uri.toString()),
 					noLink: true
 				};
 
 				this.dialogMainService.showMessageBox(options, withNullAsUndefined(BrowserWindow.getFocusedWindow()));
 			}
 		}
+
 		return pathsToOpen;
 	}
 
 	private doExtractPathsFromCLI(cli: NativeParsedArgs): IPath[] {
 		const pathsToOpen: IPathToOpen[] = [];
-		const parseOptions: IPathParseOptions = { ignoreFileNotFound: true, gotoLineMode: cli.goto, remoteAuthority: cli.remote || undefined };
+		const pathResolveOptions: IPathResolveOptions = { ignoreFileNotFound: true, gotoLineMode: cli.goto, remoteAuthority: cli.remote || undefined };
 
 		// folder uris
 		const folderUris = cli['folder-uri'];
 		if (folderUris) {
-			for (let f of folderUris) {
-				const folderUri = this.argToUri(f);
+			for (const rawFolderUri of folderUris) {
+				const folderUri = this.cliArgToUri(rawFolderUri);
 				if (folderUri) {
-					const path = this.parseUri({ folderUri }, parseOptions);
+					const path = this.resolveOpenable({ folderUri }, pathResolveOptions);
 					if (path) {
 						pathsToOpen.push(path);
 					}
@@ -958,10 +703,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// file uris
 		const fileUris = cli['file-uri'];
 		if (fileUris) {
-			for (let f of fileUris) {
-				const fileUri = this.argToUri(f);
+			for (const rawFileUri of fileUris) {
+				const fileUri = this.cliArgToUri(rawFileUri);
 				if (fileUri) {
-					const path = this.parseUri(hasWorkspaceFileExtension(f) ? { workspaceUri: fileUri } : { fileUri }, parseOptions);
+					const path = this.resolveOpenable(hasWorkspaceFileExtension(rawFileUri) ? { workspaceUri: fileUri } : { fileUri }, pathResolveOptions);
 					if (path) {
 						pathsToOpen.push(path);
 					}
@@ -970,30 +715,42 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		// folder or file paths
-		const cliArgs = cli._;
-		for (let cliArg of cliArgs) {
-			const path = this.parsePath(cliArg, parseOptions);
+		const cliPaths = cli._;
+		for (const cliPath of cliPaths) {
+			const path = this.doResolveFileOpenable(cliPath, pathResolveOptions);
 			if (path) {
 				pathsToOpen.push(path);
 			}
 		}
 
-		if (pathsToOpen.length) {
-			return pathsToOpen;
-		}
-
-		// No path provided, return empty to open empty
-		return [Object.create(null)];
+		return pathsToOpen;
 	}
 
-	private doGetWindowsFromLastSession(): IPathToOpen[] {
+	private cliArgToUri(arg: string): URI | undefined {
+		try {
+			const uri = URI.parse(arg);
+			if (!uri.scheme) {
+				this.logService.error(`Invalid URI input string, scheme missing: ${arg}`);
+
+				return undefined;
+			}
+
+			return uri;
+		} catch (e) {
+			this.logService.error(`Invalid URI input string: ${arg}, ${e.message}`);
+		}
+
+		return undefined;
+	}
+
+	private doGetPathsFromLastSession(): IPathToOpen[] {
 		const restoreWindowsSetting = this.getRestoreWindowsSetting();
 
 		switch (restoreWindowsSetting) {
 
-			// none: we always open an empty window
+			// none: no window to restore
 			case 'none':
-				return [Object.create(null)];
+				return [];
 
 			// one: restore last opened workspace/folder or empty window
 			// all: restore all windows
@@ -1004,48 +761,41 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			case 'folders':
 
 				// Collect previously opened windows
-				const openedWindows: IWindowState[] = [];
+				const lastSessionWindows: IWindowState[] = [];
 				if (restoreWindowsSetting !== 'one') {
-					openedWindows.push(...this.windowsState.openedWindows);
+					lastSessionWindows.push(...this.windowsStateHandler.state.openedWindows);
 				}
-				if (this.windowsState.lastActiveWindow) {
-					openedWindows.push(this.windowsState.lastActiveWindow);
+				if (this.windowsStateHandler.state.lastActiveWindow) {
+					lastSessionWindows.push(this.windowsStateHandler.state.lastActiveWindow);
 				}
 
-				const windowsToOpen: IPathToOpen[] = [];
-				for (const openedWindow of openedWindows) {
+				const pathsToOpen: IPathToOpen[] = [];
+				for (const lastSessionWindow of lastSessionWindows) {
 
 					// Workspaces
-					if (openedWindow.workspace) {
-						const pathToOpen = this.parseUri({ workspaceUri: openedWindow.workspace.configPath }, { remoteAuthority: openedWindow.remoteAuthority });
-						if (pathToOpen?.workspace) {
-							windowsToOpen.push(pathToOpen);
+					if (lastSessionWindow.workspace) {
+						const pathToOpen = this.resolveOpenable({ workspaceUri: lastSessionWindow.workspace.configPath }, { remoteAuthority: lastSessionWindow.remoteAuthority });
+						if (isWorkspacePathToOpen(pathToOpen)) {
+							pathsToOpen.push(pathToOpen);
 						}
 					}
 
 					// Folders
-					else if (openedWindow.folderUri) {
-						const pathToOpen = this.parseUri({ folderUri: openedWindow.folderUri }, { remoteAuthority: openedWindow.remoteAuthority });
-						if (pathToOpen?.folderUri) {
-							windowsToOpen.push(pathToOpen);
+					else if (lastSessionWindow.folderUri) {
+						const pathToOpen = this.resolveOpenable({ folderUri: lastSessionWindow.folderUri }, { remoteAuthority: lastSessionWindow.remoteAuthority });
+						if (isSingleFolderWorkspacePathToOpen(pathToOpen)) {
+							pathsToOpen.push(pathToOpen);
 						}
 					}
 
 					// Empty window, potentially editors open to be restored
-					else if (restoreWindowsSetting !== 'folders' && openedWindow.backupPath) {
-						windowsToOpen.push({ backupPath: openedWindow.backupPath, remoteAuthority: openedWindow.remoteAuthority });
+					else if (restoreWindowsSetting !== 'folders' && lastSessionWindow.backupPath) {
+						pathsToOpen.push({ backupPath: lastSessionWindow.backupPath, remoteAuthority: lastSessionWindow.remoteAuthority });
 					}
 				}
 
-				if (windowsToOpen.length > 0) {
-					return windowsToOpen;
-				}
-
-				break;
+				return pathsToOpen;
 		}
-
-		// Always fallback to empty window
-		return [Object.create(null)];
 	}
 
 	private getRestoreWindowsSetting(): RestoreWindowsSetting {
@@ -1064,75 +814,48 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		return restoreWindows;
 	}
 
-	private argToUri(arg: string): URI | undefined {
-		try {
-			const uri = URI.parse(arg);
-			if (!uri.scheme) {
-				this.logService.error(`Invalid URI input string, scheme missing: ${arg}`);
-				return undefined;
-			}
+	private resolveOpenable(openable: IWindowOpenable, options: IPathResolveOptions = {}): IPathToOpen | undefined {
 
-			return uri;
-		} catch (e) {
-			this.logService.error(`Invalid URI input string: ${arg}, ${e.message}`);
+		// handle file:// openables with some extra validation
+		let uri = this.resourceFromOpenable(openable);
+		if (uri.scheme === Schemas.file) {
+			return this.doResolveFileOpenable(openable, options);
 		}
 
-		return undefined;
+		// handle non file:// openables
+		return this.doResolveRemoteOpenable(openable, options);
 	}
 
-	private parseUri(toOpen: IWindowOpenable, options: IPathParseOptions = {}): IPathToOpen | undefined {
-		if (!toOpen) {
-			return undefined;
-		}
-
-		let uri = this.resourceFromURIToOpen(toOpen);
-		if (uri.scheme === Schemas.file) {
-			return this.parsePath(uri.fsPath, options, isFileToOpen(toOpen));
-		}
+	private doResolveRemoteOpenable(openable: IWindowOpenable, options: IPathResolveOptions): IPathToOpen | undefined {
+		let uri = this.resourceFromOpenable(openable);
 
 		// open remote if either specified in the cli or if it's a remotehost URI
 		const remoteAuthority = options.remoteAuthority || getRemoteAuthority(uri);
 
 		// normalize URI
-		uri = normalizePath(uri);
-
-		// remove trailing slash
-		uri = removeTrailingPathSeparator(uri);
+		uri = removeTrailingPathSeparator(normalizePath(uri));
 
 		// File
-		if (isFileToOpen(toOpen)) {
+		if (isFileToOpen(openable)) {
 			if (options.gotoLineMode) {
-				const parsedPath = parseLineAndColumnAware(uri.path);
-				return {
-					fileUri: uri.with({ path: parsedPath.path }),
-					lineNumber: parsedPath.line,
-					columnNumber: parsedPath.column,
-					remoteAuthority
-				};
+				const { path, line, column } = parseLineAndColumnAware(uri.path);
+
+				return { fileUri: uri.with({ path }), lineNumber: line, columnNumber: column, remoteAuthority };
 			}
 
-			return {
-				fileUri: uri,
-				remoteAuthority
-			};
+			return { fileUri: uri, remoteAuthority };
 		}
 
 		// Workspace
-		else if (isWorkspaceToOpen(toOpen)) {
-			return {
-				workspace: getWorkspaceIdentifier(uri),
-				remoteAuthority
-			};
+		else if (isWorkspaceToOpen(openable)) {
+			return { workspace: getWorkspaceIdentifier(uri), remoteAuthority };
 		}
 
 		// Folder
-		return {
-			folderUri: uri,
-			remoteAuthority
-		};
+		return { workspace: getSingleFolderWorkspaceIdentifier(uri), remoteAuthority };
 	}
 
-	private resourceFromURIToOpen(openable: IWindowOpenable): URI {
+	private resourceFromOpenable(openable: IWindowOpenable): URI {
 		if (isWorkspaceToOpen(openable)) {
 			return openable.workspaceUri;
 		}
@@ -1144,101 +867,113 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		return openable.fileUri;
 	}
 
-	private parsePath(anyPath: string, options: IPathParseOptions, forceOpenWorkspaceAsFile?: boolean): IPathToOpen | undefined {
-		if (!anyPath) {
-			return undefined;
+	private doResolveFileOpenable(path: string, options: IPathResolveOptions): IPathToOpen | undefined;
+	private doResolveFileOpenable(openable: IWindowOpenable, options: IPathResolveOptions): IPathToOpen | undefined;
+	private doResolveFileOpenable(pathOrOpenable: string | IWindowOpenable, options: IPathResolveOptions): IPathToOpen | undefined {
+		let path: string;
+		let forceOpenWorkspaceAsFile = false;
+		if (typeof pathOrOpenable === 'string') {
+			path = pathOrOpenable;
+		} else {
+			path = this.resourceFromOpenable(pathOrOpenable).fsPath;
+			forceOpenWorkspaceAsFile = isFileToOpen(pathOrOpenable);
 		}
 
+		// Extract line/col information from path
 		let lineNumber: number | undefined;
 		let columnNumber: number | undefined;
 
 		if (options.gotoLineMode) {
-			const parsedPath = parseLineAndColumnAware(anyPath);
+			const parsedPath = parseLineAndColumnAware(path);
 			lineNumber = parsedPath.line;
 			columnNumber = parsedPath.column;
 
-			anyPath = parsedPath.path;
+			path = parsedPath.path;
 		}
 
-		// open remote if either specified in the cli even if it is a local file.
+		// With remote: resolve path as remote URI
 		const remoteAuthority = options.remoteAuthority;
 		if (remoteAuthority) {
-			const first = anyPath.charCodeAt(0);
-
-			// make absolute
-			if (first !== CharCode.Slash) {
-				if (isWindowsDriveLetter(first) && anyPath.charCodeAt(anyPath.charCodeAt(1)) === CharCode.Colon) {
-					anyPath = toSlashes(anyPath);
-				}
-
-				anyPath = `/${anyPath}`;
-			}
-
-			const uri = URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: anyPath });
-
-			// guess the file type: If it ends with a slash it's a folder. If it has a file extension, it's a file or a workspace. By defaults it's a folder.
-			if (anyPath.charCodeAt(anyPath.length - 1) !== CharCode.Slash) {
-				if (hasWorkspaceFileExtension(anyPath)) {
-					if (forceOpenWorkspaceAsFile) {
-						return { fileUri: uri, remoteAuthority };
-					}
-				} else if (posix.basename(anyPath).indexOf('.') !== -1) { // file name starts with a dot or has an file extension
-					return { fileUri: uri, remoteAuthority };
-				}
-			}
-
-			return { folderUri: uri, remoteAuthority };
+			return this.doResolvePathRemote(path, remoteAuthority, forceOpenWorkspaceAsFile);
 		}
 
-		let candidate = normalize(anyPath);
+		// Without remote: resolve path as local URI
+		return this.doResolvePathLocal(path, options, lineNumber, columnNumber, forceOpenWorkspaceAsFile);
+	}
+
+	private doResolvePathRemote(path: string, remoteAuthority: string, forceOpenWorkspaceAsFile?: boolean): IPathToOpen | undefined {
+		const first = path.charCodeAt(0);
+
+		// make absolute
+		if (first !== CharCode.Slash) {
+			if (isWindowsDriveLetter(first) && path.charCodeAt(path.charCodeAt(1)) === CharCode.Colon) {
+				path = toSlashes(path);
+			}
+
+			path = `/${path}`;
+		}
+
+		const uri = URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: path });
+
+		// guess the file type:
+		// - if it ends with a slash it's a folder
+		// - if it has a file extension, it's a file or a workspace
+		// - by defaults it's a folder
+		if (path.charCodeAt(path.length - 1) !== CharCode.Slash) {
+
+			// file name ends with .code-workspace
+			if (hasWorkspaceFileExtension(path)) {
+				if (forceOpenWorkspaceAsFile) {
+					return { fileUri: uri, remoteAuthority };
+				}
+				return { workspace: getWorkspaceIdentifier(uri), remoteAuthority };
+			}
+
+			// file name starts with a dot or has an file extension
+			else if (posix.basename(path).indexOf('.') !== -1) {
+				return { fileUri: uri, remoteAuthority };
+			}
+		}
+
+		return { workspace: getSingleFolderWorkspaceIdentifier(uri), remoteAuthority };
+	}
+
+	private doResolvePathLocal(path: string, options: IPathResolveOptions, lineNumber: number | undefined, columnNumber: number | undefined, forceOpenWorkspaceAsFile?: boolean): IPathToOpen | undefined {
+
+		// Ensure the path is normalized and absolute
+		path = sanitizeFilePath(normalize(path), process.env['VSCODE_CWD'] || process.cwd());
 
 		try {
-			const candidateStat = statSync(candidate);
-			if (candidateStat.isFile()) {
+			const pathStat = statSync(path);
+			if (pathStat.isFile()) {
 
 				// Workspace (unless disabled via flag)
 				if (!forceOpenWorkspaceAsFile) {
-					const workspace = this.workspacesMainService.resolveLocalWorkspaceSync(URI.file(candidate));
+					const workspace = this.workspacesManagementMainService.resolveLocalWorkspaceSync(URI.file(path));
 					if (workspace) {
-						return {
-							workspace: { id: workspace.id, configPath: workspace.configPath },
-							remoteAuthority: workspace.remoteAuthority,
-							exists: true
-						};
+						return { workspace: { id: workspace.id, configPath: workspace.configPath }, remoteAuthority: workspace.remoteAuthority, exists: true };
 					}
 				}
 
 				// File
-				return {
-					fileUri: URI.file(candidate),
-					lineNumber,
-					columnNumber,
-					remoteAuthority,
-					exists: true
-				};
+				return { fileUri: URI.file(path), lineNumber, columnNumber, exists: true };
 			}
 
 			// Folder (we check for isDirectory() because e.g. paths like /dev/null
 			// are neither file nor folder but some external tools might pass them
 			// over to us)
-			else if (candidateStat.isDirectory()) {
-				return {
-					folderUri: URI.file(candidate),
-					remoteAuthority,
-					exists: true
-				};
+			else if (pathStat.isDirectory()) {
+				return { workspace: getSingleFolderWorkspaceIdentifier(URI.file(path), pathStat), exists: true };
 			}
 		} catch (error) {
-			const fileUri = URI.file(candidate);
-			this.workspacesHistoryMainService.removeRecentlyOpened([fileUri]); // since file does not seem to exist anymore, remove from recent
+			const fileUri = URI.file(path);
+
+			// since file does not seem to exist anymore, remove from recent
+			this.workspacesHistoryMainService.removeRecentlyOpened([fileUri]);
 
 			// assume this is a file that does not yet exist
 			if (options?.ignoreFileNotFound) {
-				return {
-					fileUri,
-					remoteAuthority,
-					exists: false
-				};
+				return { fileUri, exists: false };
 			}
 		}
 
@@ -1287,12 +1022,12 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		return { openFolderInNewWindow: !!openFolderInNewWindow, openFilesInNewWindow };
 	}
 
-	openExtensionDevelopmentHostWindow(extensionDevelopmentPath: string[], openConfig: IOpenConfiguration): ICodeWindow[] {
+	openExtensionDevelopmentHostWindow(extensionDevelopmentPaths: string[], openConfig: IOpenConfiguration): ICodeWindow[] {
 
 		// Reload an existing extension development host window on the same path
 		// We currently do not allow more than one extension development window
 		// on the same extension path.
-		const existingWindow = findWindowOnExtensionDevelopmentPath(WindowsMainService.WINDOWS, extensionDevelopmentPath);
+		const existingWindow = findWindowOnExtensionDevelopmentPath(this.getWindows(), extensionDevelopmentPaths);
 		if (existingWindow) {
 			this.lifecycleMainService.reload(existingWindow, openConfig.cli);
 			existingWindow.focus(); // make sure it gets focus and is restored
@@ -1306,10 +1041,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		// Fill in previously opened workspace unless an explicit path is provided and we are not unit testing
 		if (!cliArgs.length && !folderUris.length && !fileUris.length && !openConfig.cli.extensionTestsPath) {
-			const extensionDevelopmentWindowState = this.windowsState.lastPluginDevelopmentHostWindow;
+			const extensionDevelopmentWindowState = this.windowsStateHandler.state.lastPluginDevelopmentHostWindow;
 			const workspaceToOpen = extensionDevelopmentWindowState && (extensionDevelopmentWindowState.workspace || extensionDevelopmentWindowState.folderUri);
 			if (workspaceToOpen) {
-				if (isSingleFolderWorkspaceIdentifier(workspaceToOpen)) {
+				if (URI.isUri(workspaceToOpen)) {
 					if (workspaceToOpen.scheme === Schemas.file) {
 						cliArgs = [workspaceToOpen.fsPath];
 					} else {
@@ -1326,9 +1061,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		let authority = '';
-		for (let p of extensionDevelopmentPath) {
-			if (p.match(/^[a-zA-Z][a-zA-Z0-9\+\-\.]+:/)) {
-				const url = URI.parse(p);
+		for (const extensionDevelopmentPath of extensionDevelopmentPaths) {
+			if (extensionDevelopmentPath.match(/^[a-zA-Z][a-zA-Z0-9\+\-\.]+:/)) {
+				const url = URI.parse(extensionDevelopmentPath);
 				if (url.scheme === Schemas.vscodeRemote) {
 					if (authority) {
 						if (url.authority !== authority) {
@@ -1347,7 +1082,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		cliArgs = cliArgs.filter(path => {
 			const uri = URI.file(path);
-			if (!!findWindowOnWorkspaceOrFolderUri(WindowsMainService.WINDOWS, uri)) {
+			if (!!findWindowOnWorkspaceOrFolder(this.getWindows(), uri)) {
 				return false;
 			}
 
@@ -1355,8 +1090,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		});
 
 		folderUris = folderUris.filter(folderUriStr => {
-			const folderUri = this.argToUri(folderUriStr);
-			if (!!findWindowOnWorkspaceOrFolderUri(WindowsMainService.WINDOWS, folderUri)) {
+			const folderUri = this.cliArgToUri(folderUriStr);
+			if (folderUri && !!findWindowOnWorkspaceOrFolder(this.getWindows(), folderUri)) {
 				return false;
 			}
 
@@ -1364,8 +1099,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		});
 
 		fileUris = fileUris.filter(fileUriStr => {
-			const fileUri = this.argToUri(fileUriStr);
-			if (!!findWindowOnWorkspaceOrFolderUri(WindowsMainService.WINDOWS, fileUri)) {
+			const fileUri = this.cliArgToUri(fileUriStr);
+			if (fileUri && !!findWindowOnWorkspaceOrFolder(this.getWindows(), fileUri)) {
 				return false;
 			}
 
@@ -1398,7 +1133,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 	private openInBrowserWindow(options: IOpenBrowserWindowOptions): ICodeWindow {
 
-		// Build INativeWindowConfiguration from config and options
+		// Build `INativeWindowConfiguration` from config and options
 		const configuration = { ...options.cli } as INativeWindowConfiguration;
 		configuration.appRoot = this.environmentService.appRoot;
 		configuration.machineId = this.machineId;
@@ -1408,7 +1143,6 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		configuration.userEnv = { ...this.initialUserEnv, ...options.userEnv };
 		configuration.isInitialStartup = options.initialStartup;
 		configuration.workspace = options.workspace;
-		configuration.folderUri = options.folderUri;
 		configuration.remoteAuthority = options.remoteAuthority;
 
 		const filesToOpen = options.filesToOpen;
@@ -1436,32 +1170,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		// New window
 		if (!window) {
-			const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
-			const state = this.getNewWindowState(configuration);
-
-			// Window state is not from a previous session: only allow fullscreen if we inherit it or user wants fullscreen
-			let allowFullscreen: boolean;
-			if (state.hasDefaultState) {
-				allowFullscreen = !!(windowConfig?.newWindowDimensions && ['fullscreen', 'inherit', 'offset'].indexOf(windowConfig.newWindowDimensions) >= 0);
-			}
-
-			// Window state is from a previous session: only allow fullscreen when we got updated or user wants to restore
-			else {
-				allowFullscreen = !!(this.lifecycleMainService.wasRestarted || windowConfig?.restoreFullscreen);
-
-				if (allowFullscreen && isMacintosh && WindowsMainService.WINDOWS.some(win => win.isFullScreen)) {
-					// macOS: Electron does not allow to restore multiple windows in
-					// fullscreen. As such, if we already restored a window in that
-					// state, we cannot allow more fullscreen windows. See
-					// https://github.com/microsoft/vscode/issues/41691 and
-					// https://github.com/electron/electron/issues/13077
-					allowFullscreen = false;
-				}
-			}
-
-			if (state.mode === WindowMode.Fullscreen && !allowFullscreen) {
-				state.mode = WindowMode.Normal;
-			}
+			const state = this.windowsStateHandler.getNewWindowState(configuration);
 
 			// Create the window
 			const createdWindow = window = this.instantiationService.createInstance(CodeWindow, {
@@ -1485,12 +1194,12 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			this._onWindowOpened.fire(createdWindow);
 
 			// Indicate number change via event
-			this._onWindowsCountChanged.fire({ oldCount: WindowsMainService.WINDOWS.length - 1, newCount: WindowsMainService.WINDOWS.length });
+			this._onWindowsCountChanged.fire({ oldCount: this.getWindowCount() - 1, newCount: this.getWindowCount() });
 
 			// Window Events
 			once(createdWindow.onReady)(() => this._onWindowReady.fire(createdWindow));
 			once(createdWindow.onClose)(() => this.onWindowClosed(createdWindow));
-			once(createdWindow.onDestroy)(() => this.onBeforeWindowClose(createdWindow)); // try to save state before destroy because close will not fire
+			once(createdWindow.onDestroy)(() => this._onWindowDestroyed.fire(createdWindow));
 			createdWindow.win.webContents.removeAllListeners('devtools-reload-page'); // remove built in listener so we can handle this on our own
 			createdWindow.win.webContents.on('devtools-reload-page', () => this.lifecycleMainService.reload(createdWindow));
 
@@ -1534,10 +1243,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		// Register window for backups
 		if (!configuration.extensionDevelopmentPath) {
-			if (configuration.workspace) {
+			if (isWorkspaceIdentifier(configuration.workspace)) {
 				configuration.backupPath = this.backupMainService.registerWorkspaceBackupSync({ workspace: configuration.workspace, remoteAuthority: configuration.remoteAuthority });
-			} else if (configuration.folderUri) {
-				configuration.backupPath = this.backupMainService.registerFolderBackupSync(configuration.folderUri);
+			} else if (isSingleFolderWorkspaceIdentifier(configuration.workspace)) {
+				configuration.backupPath = this.backupMainService.registerFolderBackupSync(configuration.workspace.uri);
 			} else {
 				const backupFolder = options.emptyWindowBackupInfo && options.emptyWindowBackupInfo.backupFolder;
 				configuration.backupPath = this.backupMainService.registerEmptyWindowBackupSync(backupFolder, configuration.remoteAuthority);
@@ -1548,162 +1257,37 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		window.load(configuration);
 	}
 
-	private getNewWindowState(configuration: INativeWindowConfiguration): INewWindowState {
-		const lastActive = this.getLastActiveWindow();
-
-		// Restore state unless we are running extension tests
-		if (!configuration.extensionTestsPath) {
-
-			// extension development host Window - load from stored settings if any
-			if (!!configuration.extensionDevelopmentPath && this.windowsState.lastPluginDevelopmentHostWindow) {
-				return this.windowsState.lastPluginDevelopmentHostWindow.uiState;
-			}
-
-			// Known Workspace - load from stored settings
-			const workspace = configuration.workspace;
-			if (workspace) {
-				const stateForWorkspace = this.windowsState.openedWindows.filter(o => o.workspace && o.workspace.id === workspace.id).map(o => o.uiState);
-				if (stateForWorkspace.length) {
-					return stateForWorkspace[0];
-				}
-			}
-
-			// Known Folder - load from stored settings
-			if (configuration.folderUri) {
-				const stateForFolder = this.windowsState.openedWindows.filter(o => o.folderUri && extUriBiasedIgnorePathCase.isEqual(o.folderUri, configuration.folderUri)).map(o => o.uiState);
-				if (stateForFolder.length) {
-					return stateForFolder[0];
-				}
-			}
-
-			// Empty windows with backups
-			else if (configuration.backupPath) {
-				const stateForEmptyWindow = this.windowsState.openedWindows.filter(o => o.backupPath === configuration.backupPath).map(o => o.uiState);
-				if (stateForEmptyWindow.length) {
-					return stateForEmptyWindow[0];
-				}
-			}
-
-			// First Window
-			const lastActiveState = this.lastClosedWindowState || this.windowsState.lastActiveWindow;
-			if (!lastActive && lastActiveState) {
-				return lastActiveState.uiState;
-			}
-		}
-
-		//
-		// In any other case, we do not have any stored settings for the window state, so we come up with something smart
-		//
-
-		// We want the new window to open on the same display that the last active one is in
-		let displayToUse: Display | undefined;
-		const displays = screen.getAllDisplays();
-
-		// Single Display
-		if (displays.length === 1) {
-			displayToUse = displays[0];
-		}
-
-		// Multi Display
-		else {
-
-			// on mac there is 1 menu per window so we need to use the monitor where the cursor currently is
-			if (isMacintosh) {
-				const cursorPoint = screen.getCursorScreenPoint();
-				displayToUse = screen.getDisplayNearestPoint(cursorPoint);
-			}
-
-			// if we have a last active window, use that display for the new window
-			if (!displayToUse && lastActive) {
-				displayToUse = screen.getDisplayMatching(lastActive.getBounds());
-			}
-
-			// fallback to primary display or first display
-			if (!displayToUse) {
-				displayToUse = screen.getPrimaryDisplay() || displays[0];
-			}
-		}
-
-		// Compute x/y based on display bounds
-		// Note: important to use Math.round() because Electron does not seem to be too happy about
-		// display coordinates that are not absolute numbers.
-		let state = defaultWindowState();
-		state.x = Math.round(displayToUse.bounds.x + (displayToUse.bounds.width / 2) - (state.width! / 2));
-		state.y = Math.round(displayToUse.bounds.y + (displayToUse.bounds.height / 2) - (state.height! / 2));
-
-		// Check for newWindowDimensions setting and adjust accordingly
-		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
-		let ensureNoOverlap = true;
-		if (windowConfig?.newWindowDimensions) {
-			if (windowConfig.newWindowDimensions === 'maximized') {
-				state.mode = WindowMode.Maximized;
-				ensureNoOverlap = false;
-			} else if (windowConfig.newWindowDimensions === 'fullscreen') {
-				state.mode = WindowMode.Fullscreen;
-				ensureNoOverlap = false;
-			} else if ((windowConfig.newWindowDimensions === 'inherit' || windowConfig.newWindowDimensions === 'offset') && lastActive) {
-				const lastActiveState = lastActive.serializeWindowState();
-				if (lastActiveState.mode === WindowMode.Fullscreen) {
-					state.mode = WindowMode.Fullscreen; // only take mode (fixes https://github.com/microsoft/vscode/issues/19331)
-				} else {
-					state = lastActiveState;
-				}
-
-				ensureNoOverlap = state.mode !== WindowMode.Fullscreen && windowConfig.newWindowDimensions === 'offset';
-			}
-		}
-
-		if (ensureNoOverlap) {
-			state = this.ensureNoOverlap(state);
-		}
-
-		(state as INewWindowState).hasDefaultState = true; // flag as default state
-
-		return state;
-	}
-
-	private ensureNoOverlap(state: ISingleWindowState): ISingleWindowState {
-		if (WindowsMainService.WINDOWS.length === 0) {
-			return state;
-		}
-
-		state.x = typeof state.x === 'number' ? state.x : 0;
-		state.y = typeof state.y === 'number' ? state.y : 0;
-
-		const existingWindowBounds = WindowsMainService.WINDOWS.map(win => win.getBounds());
-		while (existingWindowBounds.some(b => b.x === state.x || b.y === state.y)) {
-			state.x += 30;
-			state.y += 30;
-		}
-
-		return state;
-	}
-
-	private onWindowClosed(win: ICodeWindow): void {
+	private onWindowClosed(window: ICodeWindow): void {
 
 		// Remove from our list so that Electron can clean it up
-		const index = WindowsMainService.WINDOWS.indexOf(win);
+		const index = WindowsMainService.WINDOWS.indexOf(window);
 		WindowsMainService.WINDOWS.splice(index, 1);
 
 		// Emit
-		this._onWindowsCountChanged.fire({ oldCount: WindowsMainService.WINDOWS.length + 1, newCount: WindowsMainService.WINDOWS.length });
+		this._onWindowsCountChanged.fire({ oldCount: this.getWindowCount() + 1, newCount: this.getWindowCount() });
 	}
 
 	getFocusedWindow(): ICodeWindow | undefined {
-		const win = BrowserWindow.getFocusedWindow();
-		if (win) {
-			return this.getWindowById(win.id);
+		const window = BrowserWindow.getFocusedWindow();
+		if (window) {
+			return this.getWindowById(window.id);
 		}
 
 		return undefined;
 	}
 
 	getLastActiveWindow(): ICodeWindow | undefined {
-		return getLastActiveWindow(WindowsMainService.WINDOWS);
+		return this.doGetLastActiveWindow(this.getWindows());
 	}
 
 	private getLastActiveWindowForAuthority(remoteAuthority: string | undefined): ICodeWindow | undefined {
-		return getLastActiveWindow(WindowsMainService.WINDOWS.filter(window => window.remoteAuthority === remoteAuthority));
+		return this.doGetLastActiveWindow(this.getWindows().filter(window => window.remoteAuthority === remoteAuthority));
+	}
+
+	private doGetLastActiveWindow(windows: ICodeWindow[]): ICodeWindow | undefined {
+		const lastFocusedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));
+
+		return windows.find(window => window.lastFocusTime === lastFocusedDate);
 	}
 
 	sendToFocused(channel: string, ...args: any[]): void {
@@ -1715,7 +1299,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 	}
 
 	sendToAll(channel: string, payload?: any, windowIdsToIgnore?: number[]): void {
-		for (const window of WindowsMainService.WINDOWS) {
+		for (const window of this.getWindows()) {
 			if (windowIdsToIgnore && windowIdsToIgnore.indexOf(window.id) >= 0) {
 				continue; // do not send if we are instructed to ignore it
 			}
@@ -1724,10 +1308,18 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 	}
 
-	getWindowById(windowId: number): ICodeWindow | undefined {
-		const res = WindowsMainService.WINDOWS.filter(window => window.id === windowId);
+	getWindows(): ICodeWindow[] {
+		return WindowsMainService.WINDOWS;
+	}
 
-		return firstOrDefault(res);
+	getWindowCount(): number {
+		return WindowsMainService.WINDOWS.length;
+	}
+
+	getWindowById(windowId: number): ICodeWindow | undefined {
+		const windows = this.getWindows().filter(window => window.id === windowId);
+
+		return firstOrDefault(windows);
 	}
 
 	getWindowByWebContents(webContents: WebContents): ICodeWindow | undefined {
@@ -1738,12 +1330,4 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		return this.getWindowById(browserWindow.id);
 	}
-
-	getWindows(): ICodeWindow[] {
-		return WindowsMainService.WINDOWS;
-	}
-
-	getWindowCount(): number {
-		return WindowsMainService.WINDOWS.length;
-	}
 }
diff --git a/src/vs/platform/windows/electron-main/windowsStateHandler.ts b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
new file mode 100644
index 000000000..9b9558fa9
--- /dev/null
+++ b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
@@ -0,0 +1,450 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { app, Display, screen } from 'electron';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { isMacintosh } from 'vs/base/common/platform';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { URI } from 'vs/base/common/uri';
+import { defaultWindowState } from 'vs/code/electron-main/window';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IStateService } from 'vs/platform/state/node/state';
+import { INativeWindowConfiguration, IWindowSettings } from 'vs/platform/windows/common/windows';
+import { ICodeWindow, IWindowsMainService, IWindowState as IWindowUIState, WindowMode } from 'vs/platform/windows/electron-main/windows';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+
+export interface IWindowState {
+	workspace?: IWorkspaceIdentifier;
+	folderUri?: URI;
+	backupPath?: string;
+	remoteAuthority?: string;
+	uiState: IWindowUIState;
+}
+
+export interface IWindowsState {
+	lastActiveWindow?: IWindowState;
+	lastPluginDevelopmentHostWindow?: IWindowState;
+	openedWindows: IWindowState[];
+}
+
+interface INewWindowState extends IWindowUIState {
+	hasDefaultState?: boolean;
+}
+
+interface ISerializedWindowsState {
+	readonly lastActiveWindow?: ISerializedWindowState;
+	readonly lastPluginDevelopmentHostWindow?: ISerializedWindowState;
+	readonly openedWindows: ISerializedWindowState[];
+}
+
+interface ISerializedWindowState {
+	readonly workspaceIdentifier?: { id: string; configURIPath: string };
+	readonly folder?: string;
+	readonly backupPath?: string;
+	readonly remoteAuthority?: string;
+	readonly uiState: IWindowUIState;
+}
+
+export class WindowsStateHandler extends Disposable {
+
+	private static readonly windowsStateStorageKey = 'windowsState';
+
+	get state() { return this._state; }
+	private readonly _state = restoreWindowsState(this.stateService.getItem<ISerializedWindowsState>(WindowsStateHandler.windowsStateStorageKey));
+
+	private lastClosedState: IWindowState | undefined = undefined;
+
+	private shuttingDown = false;
+
+	constructor(
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@IStateService private readonly stateService: IStateService,
+		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
+		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+
+		// When a window looses focus, save all windows state. This allows to
+		// prevent loss of window-state data when OS is restarted without properly
+		// shutting down the application (https://github.com/microsoft/vscode/issues/87171)
+		app.on('browser-window-blur', () => {
+			if (!this.shuttingDown) {
+				this.saveWindowsState();
+			}
+		});
+
+		// Handle various lifecycle events around windows
+		this.lifecycleMainService.onBeforeWindowClose(window => this.onBeforeWindowClose(window));
+		this.lifecycleMainService.onBeforeShutdown(() => this.onBeforeShutdown());
+		this.windowsMainService.onWindowsCountChanged(e => {
+			if (e.newCount - e.oldCount > 0) {
+				// clear last closed window state when a new window opens. this helps on macOS where
+				// otherwise closing the last window, opening a new window and then quitting would
+				// use the state of the previously closed window when restarting.
+				this.lastClosedState = undefined;
+			}
+		});
+
+		// try to save state before destroy because close will not fire
+		this.windowsMainService.onWindowDestroyed(window => this.onBeforeWindowClose(window));
+	}
+
+	// Note that onBeforeShutdown() and onBeforeWindowClose() are fired in different order depending on the OS:
+	// - macOS: since the app will not quit when closing the last window, you will always first get
+	//          the onBeforeShutdown() event followed by N onBeforeWindowClose() events for each window
+	// - other: on other OS, closing the last window will quit the app so the order depends on the
+	//          user interaction: closing the last window will first trigger onBeforeWindowClose()
+	//          and then onBeforeShutdown(). Using the quit action however will first issue onBeforeShutdown()
+	//          and then onBeforeWindowClose().
+	//
+	// Here is the behavior on different OS depending on action taken (Electron 1.7.x):
+	//
+	// Legend
+	// -  quit(N): quit application with N windows opened
+	// - close(1): close one window via the window close button
+	// - closeAll: close all windows via the taskbar command
+	// - onBeforeShutdown(N): number of windows reported in this event handler
+	// - onBeforeWindowClose(N, M): number of windows reported and quitRequested boolean in this event handler
+	//
+	// macOS
+	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
+	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
+	// 	-     quit(0): onBeforeShutdown(0)
+	// 	-    close(1): onBeforeWindowClose(1, false)
+	//
+	// Windows
+	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
+	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
+	// 	-    close(1): onBeforeWindowClose(2, false)[not last window]
+	// 	-    close(1): onBeforeWindowClose(1, false), onBeforeShutdown(0)[last window]
+	// 	- closeAll(2): onBeforeWindowClose(2, false), onBeforeWindowClose(2, false), onBeforeShutdown(0)
+	//
+	// Linux
+	// 	-     quit(1): onBeforeShutdown(1), onBeforeWindowClose(1, true)
+	// 	-     quit(2): onBeforeShutdown(2), onBeforeWindowClose(2, true), onBeforeWindowClose(2, true)
+	// 	-    close(1): onBeforeWindowClose(2, false)[not last window]
+	// 	-    close(1): onBeforeWindowClose(1, false), onBeforeShutdown(0)[last window]
+	// 	- closeAll(2): onBeforeWindowClose(2, false), onBeforeWindowClose(2, false), onBeforeShutdown(0)
+	//
+	private onBeforeShutdown(): void {
+		this.shuttingDown = true;
+
+		this.saveWindowsState();
+	}
+
+	private saveWindowsState(): void {
+		const currentWindowsState: IWindowsState = {
+			openedWindows: [],
+			lastPluginDevelopmentHostWindow: this._state.lastPluginDevelopmentHostWindow,
+			lastActiveWindow: this.lastClosedState
+		};
+
+		// 1.) Find a last active window (pick any other first window otherwise)
+		if (!currentWindowsState.lastActiveWindow) {
+			let activeWindow = this.windowsMainService.getLastActiveWindow();
+			if (!activeWindow || activeWindow.isExtensionDevelopmentHost) {
+				activeWindow = this.windowsMainService.getWindows().find(window => !window.isExtensionDevelopmentHost);
+			}
+
+			if (activeWindow) {
+				currentWindowsState.lastActiveWindow = this.toWindowState(activeWindow);
+			}
+		}
+
+		// 2.) Find extension host window
+		const extensionHostWindow = this.windowsMainService.getWindows().find(window => window.isExtensionDevelopmentHost && !window.isExtensionTestHost);
+		if (extensionHostWindow) {
+			currentWindowsState.lastPluginDevelopmentHostWindow = this.toWindowState(extensionHostWindow);
+		}
+
+		// 3.) All windows (except extension host) for N >= 2 to support `restoreWindows: all` or for auto update
+		//
+		// Careful here: asking a window for its window state after it has been closed returns bogus values (width: 0, height: 0)
+		// so if we ever want to persist the UI state of the last closed window (window count === 1), it has
+		// to come from the stored lastClosedWindowState on Win/Linux at least
+		if (this.windowsMainService.getWindowCount() > 1) {
+			currentWindowsState.openedWindows = this.windowsMainService.getWindows().filter(window => !window.isExtensionDevelopmentHost).map(window => this.toWindowState(window));
+		}
+
+		// Persist
+		const state = getWindowsStateStoreData(currentWindowsState);
+		this.stateService.setItem(WindowsStateHandler.windowsStateStorageKey, state);
+
+		if (this.shuttingDown) {
+			this.logService.trace('[WindowsStateHandler] onBeforeShutdown', state);
+		}
+	}
+
+	// See note on #onBeforeShutdown() for details how these events are flowing
+	private onBeforeWindowClose(window: ICodeWindow): void {
+		if (this.lifecycleMainService.quitRequested) {
+			return; // during quit, many windows close in parallel so let it be handled in the before-quit handler
+		}
+
+		// On Window close, update our stored UI state of this window
+		const state: IWindowState = this.toWindowState(window);
+		if (window.isExtensionDevelopmentHost && !window.isExtensionTestHost) {
+			this._state.lastPluginDevelopmentHostWindow = state; // do not let test run window state overwrite our extension development state
+		}
+
+		// Any non extension host window with same workspace or folder
+		else if (!window.isExtensionDevelopmentHost && window.openedWorkspace) {
+			this._state.openedWindows.forEach(openedWindow => {
+				const sameWorkspace = isWorkspaceIdentifier(window.openedWorkspace) && openedWindow.workspace?.id === window.openedWorkspace.id;
+				const sameFolder = isSingleFolderWorkspaceIdentifier(window.openedWorkspace) && openedWindow.folderUri && extUriBiasedIgnorePathCase.isEqual(openedWindow.folderUri, window.openedWorkspace.uri);
+
+				if (sameWorkspace || sameFolder) {
+					openedWindow.uiState = state.uiState;
+				}
+			});
+		}
+
+		// On Windows and Linux closing the last window will trigger quit. Since we are storing all UI state
+		// before quitting, we need to remember the UI state of this window to be able to persist it.
+		// On macOS we keep the last closed window state ready in case the user wants to quit right after or
+		// wants to open another window, in which case we use this state over the persisted one.
+		if (this.windowsMainService.getWindowCount() === 1) {
+			this.lastClosedState = state;
+		}
+	}
+
+	private toWindowState(window: ICodeWindow): IWindowState {
+		return {
+			workspace: isWorkspaceIdentifier(window.openedWorkspace) ? window.openedWorkspace : undefined,
+			folderUri: isSingleFolderWorkspaceIdentifier(window.openedWorkspace) ? window.openedWorkspace.uri : undefined,
+			backupPath: window.backupPath,
+			remoteAuthority: window.remoteAuthority,
+			uiState: window.serializeWindowState()
+		};
+	}
+
+	getNewWindowState(configuration: INativeWindowConfiguration): INewWindowState {
+		const state = this.doGetNewWindowState(configuration);
+		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
+
+		// Window state is not from a previous session: only allow fullscreen if we inherit it or user wants fullscreen
+		let allowFullscreen: boolean;
+		if (state.hasDefaultState) {
+			allowFullscreen = !!(windowConfig?.newWindowDimensions && ['fullscreen', 'inherit', 'offset'].indexOf(windowConfig.newWindowDimensions) >= 0);
+		}
+
+		// Window state is from a previous session: only allow fullscreen when we got updated or user wants to restore
+		else {
+			allowFullscreen = !!(this.lifecycleMainService.wasRestarted || windowConfig?.restoreFullscreen);
+
+			if (allowFullscreen && isMacintosh && this.windowsMainService.getWindows().some(window => window.isFullScreen)) {
+				// macOS: Electron does not allow to restore multiple windows in
+				// fullscreen. As such, if we already restored a window in that
+				// state, we cannot allow more fullscreen windows. See
+				// https://github.com/microsoft/vscode/issues/41691 and
+				// https://github.com/electron/electron/issues/13077
+				allowFullscreen = false;
+			}
+		}
+
+		if (state.mode === WindowMode.Fullscreen && !allowFullscreen) {
+			state.mode = WindowMode.Normal;
+		}
+
+		return state;
+	}
+
+	private doGetNewWindowState(configuration: INativeWindowConfiguration): INewWindowState {
+		const lastActive = this.windowsMainService.getLastActiveWindow();
+
+		// Restore state unless we are running extension tests
+		if (!configuration.extensionTestsPath) {
+
+			// extension development host Window - load from stored settings if any
+			if (!!configuration.extensionDevelopmentPath && this.state.lastPluginDevelopmentHostWindow) {
+				return this.state.lastPluginDevelopmentHostWindow.uiState;
+			}
+
+			// Known Workspace - load from stored settings
+			const workspace = configuration.workspace;
+			if (isWorkspaceIdentifier(workspace)) {
+				const stateForWorkspace = this.state.openedWindows.filter(openedWindow => openedWindow.workspace && openedWindow.workspace.id === workspace.id).map(openedWindow => openedWindow.uiState);
+				if (stateForWorkspace.length) {
+					return stateForWorkspace[0];
+				}
+			}
+
+			// Known Folder - load from stored settings
+			if (isSingleFolderWorkspaceIdentifier(workspace)) {
+				const stateForFolder = this.state.openedWindows.filter(openedWindow => openedWindow.folderUri && extUriBiasedIgnorePathCase.isEqual(openedWindow.folderUri, workspace.uri)).map(openedWindow => openedWindow.uiState);
+				if (stateForFolder.length) {
+					return stateForFolder[0];
+				}
+			}
+
+			// Empty windows with backups
+			else if (configuration.backupPath) {
+				const stateForEmptyWindow = this.state.openedWindows.filter(openedWindow => openedWindow.backupPath === configuration.backupPath).map(openedWindow => openedWindow.uiState);
+				if (stateForEmptyWindow.length) {
+					return stateForEmptyWindow[0];
+				}
+			}
+
+			// First Window
+			const lastActiveState = this.lastClosedState || this.state.lastActiveWindow;
+			if (!lastActive && lastActiveState) {
+				return lastActiveState.uiState;
+			}
+		}
+
+		//
+		// In any other case, we do not have any stored settings for the window state, so we come up with something smart
+		//
+
+		// We want the new window to open on the same display that the last active one is in
+		let displayToUse: Display | undefined;
+		const displays = screen.getAllDisplays();
+
+		// Single Display
+		if (displays.length === 1) {
+			displayToUse = displays[0];
+		}
+
+		// Multi Display
+		else {
+
+			// on mac there is 1 menu per window so we need to use the monitor where the cursor currently is
+			if (isMacintosh) {
+				const cursorPoint = screen.getCursorScreenPoint();
+				displayToUse = screen.getDisplayNearestPoint(cursorPoint);
+			}
+
+			// if we have a last active window, use that display for the new window
+			if (!displayToUse && lastActive) {
+				displayToUse = screen.getDisplayMatching(lastActive.getBounds());
+			}
+
+			// fallback to primary display or first display
+			if (!displayToUse) {
+				displayToUse = screen.getPrimaryDisplay() || displays[0];
+			}
+		}
+
+		// Compute x/y based on display bounds
+		// Note: important to use Math.round() because Electron does not seem to be too happy about
+		// display coordinates that are not absolute numbers.
+		let state = defaultWindowState();
+		state.x = Math.round(displayToUse.bounds.x + (displayToUse.bounds.width / 2) - (state.width! / 2));
+		state.y = Math.round(displayToUse.bounds.y + (displayToUse.bounds.height / 2) - (state.height! / 2));
+
+		// Check for newWindowDimensions setting and adjust accordingly
+		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
+		let ensureNoOverlap = true;
+		if (windowConfig?.newWindowDimensions) {
+			if (windowConfig.newWindowDimensions === 'maximized') {
+				state.mode = WindowMode.Maximized;
+				ensureNoOverlap = false;
+			} else if (windowConfig.newWindowDimensions === 'fullscreen') {
+				state.mode = WindowMode.Fullscreen;
+				ensureNoOverlap = false;
+			} else if ((windowConfig.newWindowDimensions === 'inherit' || windowConfig.newWindowDimensions === 'offset') && lastActive) {
+				const lastActiveState = lastActive.serializeWindowState();
+				if (lastActiveState.mode === WindowMode.Fullscreen) {
+					state.mode = WindowMode.Fullscreen; // only take mode (fixes https://github.com/microsoft/vscode/issues/19331)
+				} else {
+					state = lastActiveState;
+				}
+
+				ensureNoOverlap = state.mode !== WindowMode.Fullscreen && windowConfig.newWindowDimensions === 'offset';
+			}
+		}
+
+		if (ensureNoOverlap) {
+			state = this.ensureNoOverlap(state);
+		}
+
+		(state as INewWindowState).hasDefaultState = true; // flag as default state
+
+		return state;
+	}
+
+	private ensureNoOverlap(state: IWindowUIState): IWindowUIState {
+		if (this.windowsMainService.getWindows().length === 0) {
+			return state;
+		}
+
+		state.x = typeof state.x === 'number' ? state.x : 0;
+		state.y = typeof state.y === 'number' ? state.y : 0;
+
+		const existingWindowBounds = this.windowsMainService.getWindows().map(window => window.getBounds());
+		while (existingWindowBounds.some(bounds => bounds.x === state.x || bounds.y === state.y)) {
+			state.x += 30;
+			state.y += 30;
+		}
+
+		return state;
+	}
+}
+
+export function restoreWindowsState(data: ISerializedWindowsState | undefined): IWindowsState {
+	const result: IWindowsState = { openedWindows: [] };
+	const windowsState = data || { openedWindows: [] };
+
+	if (windowsState.lastActiveWindow) {
+		result.lastActiveWindow = restoreWindowState(windowsState.lastActiveWindow);
+	}
+
+	if (windowsState.lastPluginDevelopmentHostWindow) {
+		result.lastPluginDevelopmentHostWindow = restoreWindowState(windowsState.lastPluginDevelopmentHostWindow);
+	}
+
+	if (Array.isArray(windowsState.openedWindows)) {
+		result.openedWindows = windowsState.openedWindows.map(windowState => restoreWindowState(windowState));
+	}
+
+	return result;
+}
+
+function restoreWindowState(windowState: ISerializedWindowState): IWindowState {
+	const result: IWindowState = { uiState: windowState.uiState };
+	if (windowState.backupPath) {
+		result.backupPath = windowState.backupPath;
+	}
+
+	if (windowState.remoteAuthority) {
+		result.remoteAuthority = windowState.remoteAuthority;
+	}
+
+	if (windowState.folder) {
+		result.folderUri = URI.parse(windowState.folder);
+	}
+
+	if (windowState.workspaceIdentifier) {
+		result.workspace = { id: windowState.workspaceIdentifier.id, configPath: URI.parse(windowState.workspaceIdentifier.configURIPath) };
+	}
+
+	return result;
+}
+
+export function getWindowsStateStoreData(windowsState: IWindowsState): IWindowsState {
+	return {
+		lastActiveWindow: windowsState.lastActiveWindow && serializeWindowState(windowsState.lastActiveWindow),
+		lastPluginDevelopmentHostWindow: windowsState.lastPluginDevelopmentHostWindow && serializeWindowState(windowsState.lastPluginDevelopmentHostWindow),
+		openedWindows: windowsState.openedWindows.map(ws => serializeWindowState(ws))
+	};
+}
+
+function serializeWindowState(windowState: IWindowState): ISerializedWindowState {
+	return {
+		workspaceIdentifier: windowState.workspace && { id: windowState.workspace.id, configURIPath: windowState.workspace.configPath.toString() },
+		folder: windowState.folderUri && windowState.folderUri.toString(),
+		backupPath: windowState.backupPath,
+		remoteAuthority: windowState.remoteAuthority,
+		uiState: windowState.uiState
+	};
+}
diff --git a/src/vs/platform/windows/electron-main/windowsStateStorage.ts b/src/vs/platform/windows/electron-main/windowsStateStorage.ts
deleted file mode 100644
index 165333950..000000000
--- a/src/vs/platform/windows/electron-main/windowsStateStorage.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { URI, UriComponents } from 'vs/base/common/uri';
-import { IWindowState as IWindowUIState } from 'vs/platform/windows/electron-main/windows';
-import { IWindowState, IWindowsState } from 'vs/platform/windows/electron-main/windowsMainService';
-
-export type WindowsStateStorageData = object;
-
-interface ISerializedWindowsState {
-	lastActiveWindow?: ISerializedWindowState;
-	lastPluginDevelopmentHostWindow?: ISerializedWindowState;
-	openedWindows: ISerializedWindowState[];
-}
-
-interface ISerializedWindowState {
-	workspaceIdentifier?: { id: string; configURIPath: string };
-	folder?: string;
-	backupPath?: string;
-	remoteAuthority?: string;
-	uiState: IWindowUIState;
-
-	// deprecated
-	folderUri?: UriComponents;
-	folderPath?: string;
-	workspace?: { id: string; configPath: string };
-}
-
-export function restoreWindowsState(data: WindowsStateStorageData | undefined): IWindowsState {
-	const result: IWindowsState = { openedWindows: [] };
-	const windowsState = data as ISerializedWindowsState || { openedWindows: [] };
-
-	if (windowsState.lastActiveWindow) {
-		result.lastActiveWindow = restoreWindowState(windowsState.lastActiveWindow);
-	}
-
-	if (windowsState.lastPluginDevelopmentHostWindow) {
-		result.lastPluginDevelopmentHostWindow = restoreWindowState(windowsState.lastPluginDevelopmentHostWindow);
-	}
-
-	if (Array.isArray(windowsState.openedWindows)) {
-		result.openedWindows = windowsState.openedWindows.map(windowState => restoreWindowState(windowState));
-	}
-
-	return result;
-}
-
-function restoreWindowState(windowState: ISerializedWindowState): IWindowState {
-	const result: IWindowState = { uiState: windowState.uiState };
-	if (windowState.backupPath) {
-		result.backupPath = windowState.backupPath;
-	}
-
-	if (windowState.remoteAuthority) {
-		result.remoteAuthority = windowState.remoteAuthority;
-	}
-
-	if (windowState.folder) {
-		result.folderUri = URI.parse(windowState.folder);
-	} else if (windowState.folderUri) {
-		result.folderUri = URI.revive(windowState.folderUri);
-	} else if (windowState.folderPath) {
-		result.folderUri = URI.file(windowState.folderPath);
-	}
-
-	if (windowState.workspaceIdentifier) {
-		result.workspace = { id: windowState.workspaceIdentifier.id, configPath: URI.parse(windowState.workspaceIdentifier.configURIPath) };
-	} else if (windowState.workspace) {
-		result.workspace = { id: windowState.workspace.id, configPath: URI.file(windowState.workspace.configPath) };
-	}
-
-	return result;
-}
-
-export function getWindowsStateStoreData(windowsState: IWindowsState): WindowsStateStorageData {
-	return {
-		lastActiveWindow: windowsState.lastActiveWindow && serializeWindowState(windowsState.lastActiveWindow),
-		lastPluginDevelopmentHostWindow: windowsState.lastPluginDevelopmentHostWindow && serializeWindowState(windowsState.lastPluginDevelopmentHostWindow),
-		openedWindows: windowsState.openedWindows.map(ws => serializeWindowState(ws))
-	};
-}
-
-function serializeWindowState(windowState: IWindowState): ISerializedWindowState {
-	return {
-		workspaceIdentifier: windowState.workspace && { id: windowState.workspace.id, configURIPath: windowState.workspace.configPath.toString() },
-		folder: windowState.folderUri && windowState.folderUri.toString(),
-		backupPath: windowState.backupPath,
-		remoteAuthority: windowState.remoteAuthority,
-		uiState: windowState.uiState
-	};
-}
diff --git a/src/vs/platform/windows/node/window.ts b/src/vs/platform/windows/node/window.ts
deleted file mode 100644
index 6859b36ab..000000000
--- a/src/vs/platform/windows/node/window.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { URI } from 'vs/base/common/uri';
-import * as platform from 'vs/base/common/platform';
-import * as extpath from 'vs/base/common/extpath';
-import { IWorkspaceIdentifier, IResolvedWorkspace, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-
-export const enum OpenContext {
-
-	// opening when running from the command line
-	CLI,
-
-	// macOS only: opening from the dock (also when opening files to a running instance from desktop)
-	DOCK,
-
-	// opening from the main application window
-	MENU,
-
-	// opening from a file or folder dialog
-	DIALOG,
-
-	// opening from the OS's UI
-	DESKTOP,
-
-	// opening through the API
-	API
-}
-
-export interface IWindowContext {
-	openedWorkspace?: IWorkspaceIdentifier;
-	openedFolderUri?: URI;
-
-	extensionDevelopmentPath?: string[];
-	lastFocusTime: number;
-}
-
-export interface IBestWindowOrFolderOptions<W extends IWindowContext> {
-	windows: W[];
-	newWindow: boolean;
-	context: OpenContext;
-	fileUri?: URI;
-	codeSettingsFolder?: string;
-	localWorkspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace | null;
-}
-
-export function findBestWindowOrFolderForFile<W extends IWindowContext>({ windows, newWindow, context, fileUri, localWorkspaceResolver: workspaceResolver }: IBestWindowOrFolderOptions<W>): W | undefined {
-	if (!newWindow && fileUri && (context === OpenContext.DESKTOP || context === OpenContext.CLI || context === OpenContext.DOCK)) {
-		const windowOnFilePath = findWindowOnFilePath(windows, fileUri, workspaceResolver);
-		if (windowOnFilePath) {
-			return windowOnFilePath;
-		}
-	}
-	return !newWindow ? getLastActiveWindow(windows) : undefined;
-}
-
-function findWindowOnFilePath<W extends IWindowContext>(windows: W[], fileUri: URI, localWorkspaceResolver: (workspace: IWorkspaceIdentifier) => IResolvedWorkspace | null): W | null {
-
-	// First check for windows with workspaces that have a parent folder of the provided path opened
-	for (const window of windows) {
-		const workspace = window.openedWorkspace;
-		if (workspace) {
-			const resolvedWorkspace = localWorkspaceResolver(workspace);
-			if (resolvedWorkspace) {
-				// workspace could be resolved: It's in the local file system
-				if (resolvedWorkspace.folders.some(folder => extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, folder.uri))) {
-					return window;
-				}
-			} else {
-				// use the config path instead
-				if (extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, workspace.configPath)) {
-					return window;
-				}
-			}
-		}
-	}
-
-	// Then go with single folder windows that are parent of the provided file path
-	const singleFolderWindowsOnFilePath = windows.filter(window => window.openedFolderUri && extUriBiasedIgnorePathCase.isEqualOrParent(fileUri, window.openedFolderUri));
-	if (singleFolderWindowsOnFilePath.length) {
-		return singleFolderWindowsOnFilePath.sort((a, b) => -(a.openedFolderUri!.path.length - b.openedFolderUri!.path.length))[0];
-	}
-
-	return null;
-}
-
-export function getLastActiveWindow<W extends IWindowContext>(windows: W[]): W | undefined {
-	const lastFocusedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));
-
-	return windows.find(window => window.lastFocusTime === lastFocusedDate);
-}
-
-export function findWindowOnWorkspace<W extends IWindowContext>(windows: W[], workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)): W | null {
-	if (isSingleFolderWorkspaceIdentifier(workspace)) {
-		for (const window of windows) {
-			// match on folder
-			if (isSingleFolderWorkspaceIdentifier(workspace)) {
-				if (window.openedFolderUri && extUriBiasedIgnorePathCase.isEqual(window.openedFolderUri, workspace)) {
-					return window;
-				}
-			}
-		}
-	} else if (isWorkspaceIdentifier(workspace)) {
-		for (const window of windows) {
-			// match on workspace
-			if (window.openedWorkspace && window.openedWorkspace.id === workspace.id) {
-				return window;
-			}
-		}
-	}
-	return null;
-}
-
-export function findWindowOnExtensionDevelopmentPath<W extends IWindowContext>(windows: W[], extensionDevelopmentPaths: string[]): W | null {
-
-	const matches = (uriString: string): boolean => {
-		return extensionDevelopmentPaths.some(p => extpath.isEqual(p, uriString, !platform.isLinux /* ignorecase */));
-	};
-
-	for (const window of windows) {
-		// match on extension development path. The path can be one or more paths or uri strings, using paths.isEqual is not 100% correct but good enough
-		const currPaths = window.extensionDevelopmentPath;
-		if (currPaths?.some(p => matches(p))) {
-			return window;
-		}
-	}
-
-	return null;
-}
-
-export function findWindowOnWorkspaceOrFolderUri<W extends IWindowContext>(windows: W[], uri: URI | undefined): W | null {
-	if (!uri) {
-		return null;
-	}
-	for (const window of windows) {
-		// check for workspace config path
-		if (window.openedWorkspace && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.configPath, uri)) {
-			return window;
-		}
-
-		// check for folder path
-		if (window.openedFolderUri && extUriBiasedIgnorePathCase.isEqual(window.openedFolderUri, uri)) {
-			return window;
-		}
-	}
-	return null;
-}
diff --git a/src/vs/platform/windows/common/windowTracker.ts b/src/vs/platform/windows/node/windowTracker.ts
similarity index 100%
rename from src/vs/platform/windows/common/windowTracker.ts
rename to src/vs/platform/windows/node/windowTracker.ts
diff --git a/src/vs/platform/windows/test/electron-main/window.test.ts b/src/vs/platform/windows/test/electron-main/window.test.ts
new file mode 100644
index 000000000..42f458f97
--- /dev/null
+++ b/src/vs/platform/windows/test/electron-main/window.test.ts
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as path from 'vs/base/common/path';
+import { findWindowOnFile } from 'vs/platform/windows/electron-main/windowsFinder';
+import { ICodeWindow, IWindowState } from 'vs/platform/windows/electron-main/windows';
+import { IWorkspaceIdentifier, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
+import { URI } from 'vs/base/common/uri';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Event } from 'vs/base/common/event';
+import { UriDto } from 'vs/base/common/types';
+import { ICommandAction } from 'vs/platform/actions/common/actions';
+import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
+import { INativeWindowConfiguration } from 'vs/platform/windows/common/windows';
+
+const fixturesFolder = getPathFromAmdModule(require, './fixtures');
+
+const testWorkspace: IWorkspaceIdentifier = {
+	id: Date.now().toString(),
+	configPath: URI.file(path.join(fixturesFolder, 'workspaces.json'))
+};
+
+const testWorkspaceFolders = toWorkspaceFolders([{ path: path.join(fixturesFolder, 'vscode_workspace_1_folder') }, { path: path.join(fixturesFolder, 'vscode_workspace_2_folder') }], testWorkspace.configPath, extUriBiasedIgnorePathCase);
+const localWorkspaceResolver = (workspace: any) => { return workspace === testWorkspace ? { id: testWorkspace.id, configPath: workspace.configPath, folders: testWorkspaceFolders } : null; };
+
+function createTestCodeWindow(options: { lastFocusTime: number, openedFolderUri?: URI, openedWorkspace?: IWorkspaceIdentifier }): ICodeWindow {
+	return new class implements ICodeWindow {
+		onLoad: Event<void> = Event.None;
+		onReady: Event<void> = Event.None;
+		onClose: Event<void> = Event.None;
+		onDestroy: Event<void> = Event.None;
+		whenClosedOrLoaded: Promise<void> = Promise.resolve();
+		id: number = -1;
+		win: Electron.BrowserWindow = undefined!;
+		config: INativeWindowConfiguration | undefined;
+		openedWorkspace = options.openedFolderUri ? { id: '', uri: options.openedFolderUri } : options.openedWorkspace;
+		backupPath?: string | undefined;
+		remoteAuthority?: string | undefined;
+		isExtensionDevelopmentHost = false;
+		isExtensionTestHost = false;
+		lastFocusTime = options.lastFocusTime;
+		isFullScreen = false;
+		isReady = true;
+		hasHiddenTitleBarStyle = false;
+
+		ready(): Promise<ICodeWindow> { throw new Error('Method not implemented.'); }
+		setReady(): void { throw new Error('Method not implemented.'); }
+		addTabbedWindow(window: ICodeWindow): void { throw new Error('Method not implemented.'); }
+		load(config: INativeWindowConfiguration, options: { isReload?: boolean }): void { throw new Error('Method not implemented.'); }
+		reload(cli?: NativeParsedArgs): void { throw new Error('Method not implemented.'); }
+		focus(options?: { force: boolean; }): void { throw new Error('Method not implemented.'); }
+		close(): void { throw new Error('Method not implemented.'); }
+		getBounds(): Electron.Rectangle { throw new Error('Method not implemented.'); }
+		send(channel: string, ...args: any[]): void { throw new Error('Method not implemented.'); }
+		sendWhenReady(channel: string, token: CancellationToken, ...args: any[]): void { throw new Error('Method not implemented.'); }
+		toggleFullScreen(): void { throw new Error('Method not implemented.'); }
+		isMinimized(): boolean { throw new Error('Method not implemented.'); }
+		setRepresentedFilename(name: string): void { throw new Error('Method not implemented.'); }
+		getRepresentedFilename(): string | undefined { throw new Error('Method not implemented.'); }
+		setDocumentEdited(edited: boolean): void { throw new Error('Method not implemented.'); }
+		isDocumentEdited(): boolean { throw new Error('Method not implemented.'); }
+		handleTitleDoubleClick(): void { throw new Error('Method not implemented.'); }
+		updateTouchBar(items: UriDto<ICommandAction>[][]): void { throw new Error('Method not implemented.'); }
+		serializeWindowState(): IWindowState { throw new Error('Method not implemented'); }
+		dispose(): void { }
+	};
+}
+
+const vscodeFolderWindow: ICodeWindow = createTestCodeWindow({ lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder')) });
+const lastActiveWindow: ICodeWindow = createTestCodeWindow({ lastFocusTime: 3, openedFolderUri: undefined });
+const noVscodeFolderWindow: ICodeWindow = createTestCodeWindow({ lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) });
+const windows: ICodeWindow[] = [
+	vscodeFolderWindow,
+	lastActiveWindow,
+	noVscodeFolderWindow,
+];
+
+suite('WindowsFinder', () => {
+
+	test('New window without folder when no windows exist', () => {
+		assert.strictEqual(findWindowOnFile([], URI.file('nonexisting'), localWorkspaceResolver), undefined);
+		assert.strictEqual(findWindowOnFile([], URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')), localWorkspaceResolver), undefined);
+	});
+
+	test('Existing window with folder', () => {
+		assert.strictEqual(findWindowOnFile(windows, URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')), localWorkspaceResolver), noVscodeFolderWindow);
+
+		assert.strictEqual(findWindowOnFile(windows, URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')), localWorkspaceResolver), vscodeFolderWindow);
+
+		const window: ICodeWindow = createTestCodeWindow({ lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder')) });
+		assert.strictEqual(findWindowOnFile([window], URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder', 'subfolder', 'file.txt')), localWorkspaceResolver), window);
+	});
+
+	test('More specific existing window wins', () => {
+		const window: ICodeWindow = createTestCodeWindow({ lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) });
+		const nestedFolderWindow: ICodeWindow = createTestCodeWindow({ lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder')) });
+		assert.strictEqual(findWindowOnFile([window, nestedFolderWindow], URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder', 'subfolder', 'file.txt')), localWorkspaceResolver), nestedFolderWindow);
+	});
+
+	test('Workspace folder wins', () => {
+		const window: ICodeWindow = createTestCodeWindow({ lastFocusTime: 1, openedWorkspace: testWorkspace });
+		assert.strictEqual(findWindowOnFile([window], URI.file(path.join(fixturesFolder, 'vscode_workspace_2_folder', 'nested_vscode_folder', 'subfolder', 'file.txt')), localWorkspaceResolver), window);
+	});
+});
diff --git a/src/vs/platform/windows/test/electron-main/windowsStateStorage.test.ts b/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
similarity index 68%
rename from src/vs/platform/windows/test/electron-main/windowsStateStorage.test.ts
rename to src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
index 419caee0d..956ab942b 100644
--- a/src/vs/platform/windows/test/electron-main/windowsStateStorage.test.ts
+++ b/src/vs/platform/windows/test/electron-main/windowsStateHandler.test.ts
@@ -6,12 +6,10 @@
 import * as assert from 'assert';
 import * as os from 'os';
 import * as path from 'vs/base/common/path';
-
-import { restoreWindowsState, getWindowsStateStoreData } from 'vs/platform/windows/electron-main/windowsStateStorage';
+import { restoreWindowsState, getWindowsStateStoreData, IWindowsState, IWindowState } from 'vs/platform/windows/electron-main/windowsStateHandler';
 import { IWindowState as IWindowUIState, WindowMode } from 'vs/platform/windows/electron-main/windows';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { URI } from 'vs/base/common/uri';
-import { IWindowsState, IWindowState } from 'vs/platform/windows/electron-main/windowsMainService';
 
 function getUIState(): IWindowUIState {
 	return {
@@ -30,15 +28,15 @@ function toWorkspace(uri: URI): IWorkspaceIdentifier {
 	};
 }
 function assertEqualURI(u1: URI | undefined, u2: URI | undefined, message?: string): void {
-	assert.equal(u1 && u1.toString(), u2 && u2.toString(), message);
+	assert.strictEqual(u1 && u1.toString(), u2 && u2.toString(), message);
 }
 
 function assertEqualWorkspace(w1: IWorkspaceIdentifier | undefined, w2: IWorkspaceIdentifier | undefined, message?: string): void {
 	if (!w1 || !w2) {
-		assert.equal(w1, w2, message);
+		assert.strictEqual(w1, w2, message);
 		return;
 	}
-	assert.equal(w1.id, w2.id, message);
+	assert.strictEqual(w1.id, w2.id, message);
 	assertEqualURI(w1.configPath, w2.configPath, message);
 }
 
@@ -47,9 +45,9 @@ function assertEqualWindowState(expected: IWindowState | undefined, actual: IWin
 		assert.deepEqual(expected, actual, message);
 		return;
 	}
-	assert.equal(expected.backupPath, actual.backupPath, message);
+	assert.strictEqual(expected.backupPath, actual.backupPath, message);
 	assertEqualURI(expected.folderUri, actual.folderUri, message);
-	assert.equal(expected.remoteAuthority, actual.remoteAuthority, message);
+	assert.strictEqual(expected.remoteAuthority, actual.remoteAuthority, message);
 	assertEqualWorkspace(expected.workspace, actual.workspace, message);
 	assert.deepEqual(expected.uiState, actual.uiState, message);
 }
@@ -57,7 +55,7 @@ function assertEqualWindowState(expected: IWindowState | undefined, actual: IWin
 function assertEqualWindowsState(expected: IWindowsState, actual: IWindowsState, message?: string) {
 	assertEqualWindowState(expected.lastPluginDevelopmentHostWindow, actual.lastPluginDevelopmentHostWindow, message);
 	assertEqualWindowState(expected.lastActiveWindow, actual.lastActiveWindow, message);
-	assert.equal(expected.openedWindows.length, actual.openedWindows.length, message);
+	assert.strictEqual(expected.openedWindows.length, actual.openedWindows.length, message);
 	for (let i = 0; i < expected.openedWindows.length; i++) {
 		assertEqualWindowState(expected.openedWindows[i], actual.openedWindows[i], message);
 	}
@@ -117,94 +115,6 @@ suite('Windows State Storing', () => {
 		assertRestoring(windowState, 'lastPluginDevelopmentHostWindow');
 	});
 
-	test('open 1_31', () => {
-		const v1_31_workspace = `{
-			"openedWindows": [],
-			"lastActiveWindow": {
-				"workspace": {
-					"id": "a41787288b5e9cc1a61ba2dd84cd0d80",
-					"configPath": "/home/user/workspaces/code-and-docs.code-workspace"
-				},
-				"backupPath": "/home/user/.config/Code - Insiders/Backups/a41787288b5e9cc1a61ba2dd84cd0d80",
-				"uiState": {
-					"mode": 0,
-					"x": 0,
-					"y": 27,
-					"width": 2560,
-					"height": 1364
-				}
-			}
-		}`;
-
-		let windowsState = restoreWindowsState(JSON.parse(v1_31_workspace));
-		let expected: IWindowsState = {
-			openedWindows: [],
-			lastActiveWindow: {
-				backupPath: '/home/user/.config/Code - Insiders/Backups/a41787288b5e9cc1a61ba2dd84cd0d80',
-				uiState: { mode: WindowMode.Maximized, x: 0, y: 27, width: 2560, height: 1364 },
-				workspace: { id: 'a41787288b5e9cc1a61ba2dd84cd0d80', configPath: URI.file('/home/user/workspaces/code-and-docs.code-workspace') }
-			}
-		};
-
-		assertEqualWindowsState(expected, windowsState, 'v1_31_workspace');
-
-		const v1_31_folder = `{
-			"openedWindows": [],
-			"lastPluginDevelopmentHostWindow": {
-				"folderUri": {
-					"$mid": 1,
-					"fsPath": "/home/user/workspaces/testing/customdata",
-					"external": "file:///home/user/workspaces/testing/customdata",
-					"path": "/home/user/workspaces/testing/customdata",
-					"scheme": "file"
-				},
-				"uiState": {
-					"mode": 1,
-					"x": 593,
-					"y": 617,
-					"width": 1625,
-					"height": 595
-				}
-			}
-		}`;
-
-		windowsState = restoreWindowsState(JSON.parse(v1_31_folder));
-		expected = {
-			openedWindows: [],
-			lastPluginDevelopmentHostWindow: {
-				uiState: { mode: WindowMode.Normal, x: 593, y: 617, width: 1625, height: 595 },
-				folderUri: URI.parse('file:///home/user/workspaces/testing/customdata')
-			}
-		};
-		assertEqualWindowsState(expected, windowsState, 'v1_31_folder');
-
-		const v1_31_empty_window = ` {
-			"openedWindows": [
-			],
-			"lastActiveWindow": {
-				"backupPath": "C:\\\\Users\\\\Mike\\\\AppData\\\\Roaming\\\\Code\\\\Backups\\\\1549538599815",
-				"uiState": {
-					"mode": 0,
-					"x": -8,
-					"y": -8,
-					"width": 2576,
-					"height": 1344
-				}
-			}
-		}`;
-
-		windowsState = restoreWindowsState(JSON.parse(v1_31_empty_window));
-		expected = {
-			openedWindows: [],
-			lastActiveWindow: {
-				backupPath: 'C:\\Users\\Mike\\AppData\\Roaming\\Code\\Backups\\1549538599815',
-				uiState: { mode: WindowMode.Maximized, x: -8, y: -8, width: 2576, height: 1344 }
-			}
-		};
-		assertEqualWindowsState(expected, windowsState, 'v1_31_empty_window');
-
-	});
-
 	test('open 1_32', () => {
 		const v1_32_workspace = `{
 			"openedWindows": [],
@@ -286,7 +196,5 @@ suite('Windows State Storing', () => {
 			}
 		};
 		assertEqualWindowsState(expected, windowsState, 'v1_32_empty_window');
-
 	});
-
 });
diff --git a/src/vs/platform/windows/test/node/window.test.ts b/src/vs/platform/windows/test/node/window.test.ts
deleted file mode 100644
index 576d30d13..000000000
--- a/src/vs/platform/windows/test/node/window.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as assert from 'assert';
-import * as path from 'vs/base/common/path';
-import { IBestWindowOrFolderOptions, IWindowContext, findBestWindowOrFolderForFile, OpenContext } from 'vs/platform/windows/node/window';
-import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
-import { URI } from 'vs/base/common/uri';
-import { getPathFromAmdModule } from 'vs/base/common/amd';
-
-const fixturesFolder = getPathFromAmdModule(require, './fixtures');
-
-const testWorkspace: IWorkspaceIdentifier = {
-	id: Date.now().toString(),
-	configPath: URI.file(path.join(fixturesFolder, 'workspaces.json'))
-};
-
-const testWorkspaceFolders = toWorkspaceFolders([{ path: path.join(fixturesFolder, 'vscode_workspace_1_folder') }, { path: path.join(fixturesFolder, 'vscode_workspace_2_folder') }], testWorkspace.configPath);
-
-function options(custom?: Partial<IBestWindowOrFolderOptions<IWindowContext>>): IBestWindowOrFolderOptions<IWindowContext> {
-	return {
-		windows: [],
-		newWindow: false,
-		context: OpenContext.CLI,
-		codeSettingsFolder: '_vscode',
-		localWorkspaceResolver: workspace => { return workspace === testWorkspace ? { id: testWorkspace.id, configPath: workspace.configPath, folders: testWorkspaceFolders } : null; },
-		...custom
-	};
-}
-
-const vscodeFolderWindow: IWindowContext = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder')) };
-const lastActiveWindow: IWindowContext = { lastFocusTime: 3, openedFolderUri: undefined };
-const noVscodeFolderWindow: IWindowContext = { lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) };
-const windows: IWindowContext[] = [
-	vscodeFolderWindow,
-	lastActiveWindow,
-	noVscodeFolderWindow,
-];
-
-suite('WindowsFinder', () => {
-
-	test('New window without folder when no windows exist', () => {
-		assert.equal(findBestWindowOrFolderForFile(options()), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'))
-		})), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
-			newWindow: true
-		})), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
-		})), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
-			context: OpenContext.API
-		})), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt'))
-		})), null);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'new_folder', 'new_file.txt'))
-		})), null);
-	});
-
-	test('New window without folder when windows exist', () => {
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows,
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')),
-			newWindow: true
-		})), null);
-	});
-
-	test('Last active window', () => {
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows
-		})), lastActiveWindow);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows,
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder2', 'file.txt'))
-		})), lastActiveWindow);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows: [lastActiveWindow, noVscodeFolderWindow],
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt')),
-		})), lastActiveWindow);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows,
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt')),
-			context: OpenContext.API
-		})), lastActiveWindow);
-	});
-
-	test('Existing window with folder', () => {
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows,
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'file.txt'))
-		})), noVscodeFolderWindow);
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows,
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'file.txt'))
-		})), vscodeFolderWindow);
-		const window: IWindowContext = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder')) };
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows: [window],
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_folder', 'nested_folder', 'subfolder', 'file.txt'))
-		})), window);
-	});
-
-	test('More specific existing window wins', () => {
-		const window: IWindowContext = { lastFocusTime: 2, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder')) };
-		const nestedFolderWindow: IWindowContext = { lastFocusTime: 1, openedFolderUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder')) };
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows: [window, nestedFolderWindow],
-			fileUri: URI.file(path.join(fixturesFolder, 'no_vscode_folder', 'nested_folder', 'subfolder', 'file.txt'))
-		})), nestedFolderWindow);
-	});
-
-	test('Workspace folder wins', () => {
-		const window: IWindowContext = { lastFocusTime: 1, openedWorkspace: testWorkspace };
-		assert.equal(findBestWindowOrFolderForFile(options({
-			windows: [window],
-			fileUri: URI.file(path.join(fixturesFolder, 'vscode_workspace_2_folder', 'nested_vscode_folder', 'subfolder', 'file.txt'))
-		})), window);
-	});
-});
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 72ca615f9..38a11c92f 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
+import { joinPath, basenameOrAuthority } from 'vs/base/common/resources';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { Event } from 'vs/base/common/event';
-import { IWorkspaceIdentifier, IStoredWorkspaceFolder, isRawFileWorkspaceFolder, isRawUriWorkspaceFolder, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, IStoredWorkspaceFolder, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IWorkspaceFolderProvider } from 'vs/base/common/labels';
 
 export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
 
 export interface IWorkspaceContextService extends IWorkspaceFolderProvider {
+
 	readonly _serviceBrand: undefined;
 
 	/**
@@ -58,9 +59,9 @@ export interface IWorkspaceContextService extends IWorkspaceFolderProvider {
 	getWorkspaceFolder(resource: URI): IWorkspaceFolder | null;
 
 	/**
-	 * Return `true` if the current workspace has the given identifier otherwise `false`.
+	 * Return `true` if the current workspace has the given identifier or root URI otherwise `false`.
 	 */
-	isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean;
+	isCurrentWorkspace(workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean;
 
 	/**
 	 * Returns if the provided resource is inside the workspace or not.
@@ -80,14 +81,6 @@ export interface IWorkspaceFoldersChangeEvent {
 	changed: IWorkspaceFolder[];
 }
 
-export namespace IWorkspace {
-	export function isIWorkspace(thing: unknown): thing is IWorkspace {
-		return !!(thing && typeof thing === 'object'
-			&& typeof (thing as IWorkspace).id === 'string'
-			&& Array.isArray((thing as IWorkspace).folders));
-	}
-}
-
 export interface IWorkspace {
 
 	/**
@@ -106,6 +99,14 @@ export interface IWorkspace {
 	readonly configuration?: URI | null;
 }
 
+export function isWorkspace(thing: unknown): thing is IWorkspace {
+	const candidate = thing as IWorkspace | undefined;
+
+	return !!(candidate && typeof candidate === 'object'
+		&& typeof candidate.id === 'string'
+		&& Array.isArray(candidate.folders));
+}
+
 export interface IWorkspaceFolderData {
 
 	/**
@@ -125,15 +126,6 @@ export interface IWorkspaceFolderData {
 	readonly index: number;
 }
 
-export namespace IWorkspaceFolder {
-	export function isIWorkspaceFolder(thing: unknown): thing is IWorkspaceFolder {
-		return !!(thing && typeof thing === 'object'
-			&& URI.isUri((thing as IWorkspaceFolder).uri)
-			&& typeof (thing as IWorkspaceFolder).name === 'string'
-			&& typeof (thing as IWorkspaceFolder).toResource === 'function');
-	}
-}
-
 export interface IWorkspaceFolder extends IWorkspaceFolderData {
 
 	/**
@@ -142,6 +134,15 @@ export interface IWorkspaceFolder extends IWorkspaceFolderData {
 	toResource: (relativePath: string) => URI;
 }
 
+export function isWorkspaceFolder(thing: unknown): thing is IWorkspaceFolder {
+	const candidate = thing as IWorkspaceFolder;
+
+	return !!(candidate && typeof candidate === 'object'
+		&& URI.isUri(candidate.uri)
+		&& typeof candidate.name === 'string'
+		&& typeof candidate.toResource === 'function');
+}
+
 export class Workspace implements IWorkspace {
 
 	private _foldersMap: TernarySearchTree<URI, WorkspaceFolder> = TernarySearchTree.forUris<WorkspaceFolder>(this._ignorePathCasing);
@@ -222,7 +223,7 @@ export class WorkspaceFolder implements IWorkspaceFolder {
 	}
 
 	toResource(relativePath: string): URI {
-		return resources.joinPath(this.uri, relativePath);
+		return joinPath(this.uri, relativePath);
 	}
 
 	toJSON(): IWorkspaceFolderData {
@@ -231,43 +232,5 @@ export class WorkspaceFolder implements IWorkspaceFolder {
 }
 
 export function toWorkspaceFolder(resource: URI): WorkspaceFolder {
-	return new WorkspaceFolder({ uri: resource, index: 0, name: resources.basenameOrAuthority(resource) }, { uri: resource.toString() });
-}
-
-export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], workspaceConfigFile: URI): WorkspaceFolder[] {
-	let result: WorkspaceFolder[] = [];
-	let seen: Set<string> = new Set();
-
-	const relativeTo = resources.dirname(workspaceConfigFile);
-	for (let configuredFolder of configuredFolders) {
-		let uri: URI | null = null;
-		if (isRawFileWorkspaceFolder(configuredFolder)) {
-			if (configuredFolder.path) {
-				uri = resources.resolvePath(relativeTo, configuredFolder.path);
-			}
-		} else if (isRawUriWorkspaceFolder(configuredFolder)) {
-			try {
-				uri = URI.parse(configuredFolder.uri);
-				// this makes sure all workspace folder are absolute
-				if (uri.path[0] !== '/') {
-					uri = uri.with({ path: '/' + uri.path });
-				}
-			} catch (e) {
-				console.warn(e);
-				// ignore
-			}
-		}
-		if (uri) {
-			// remove duplicates
-			let comparisonKey = resources.getComparisonKey(uri);
-			if (!seen.has(comparisonKey)) {
-				seen.add(comparisonKey);
-
-				const name = configuredFolder.name || resources.basenameOrAuthority(uri);
-				result.push(new WorkspaceFolder({ uri, name, index: result.length }, configuredFolder));
-			}
-		}
-	}
-
-	return result;
+	return new WorkspaceFolder({ uri: resource, index: 0, name: basenameOrAuthority(resource) }, { uri: resource.toString() });
 }
diff --git a/src/vs/platform/workspace/test/common/workspace.test.ts b/src/vs/platform/workspace/test/common/workspace.test.ts
index 1d3f78f7b..9b26cb220 100644
--- a/src/vs/platform/workspace/test/common/workspace.test.ts
+++ b/src/vs/platform/workspace/test/common/workspace.test.ts
@@ -5,10 +5,11 @@
 
 import * as assert from 'assert';
 import * as path from 'vs/base/common/path';
-import { Workspace, toWorkspaceFolders, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { URI } from 'vs/base/common/uri';
-import { IRawFileWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
+import { IRawFileWorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
 import { isLinux, isWindows } from 'vs/base/common/platform';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 
 suite('Workspace', () => {
 
@@ -70,7 +71,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with single absolute folder', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 1);
 		assert.equal(actual[0].uri.fsPath, testFolderUri.fsPath);
@@ -80,7 +81,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with single relative folder', () => {
-		const actual = toWorkspaceFolders([{ path: './test' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: './test' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 1);
 		assert.equal(actual[0].uri.fsPath, testFolderUri.fsPath);
@@ -90,7 +91,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with single absolute folder with name', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test', name: 'hello' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test', name: 'hello' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 1);
 
@@ -101,7 +102,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple unique absolute folders', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3' }, { path: '/src/test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3' }, { path: '/src/test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 3);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
@@ -121,7 +122,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple unique absolute folders with names', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3', name: 'noName' }, { path: '/src/test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3', name: 'noName' }, { path: '/src/test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 3);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
@@ -141,7 +142,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple unique absolute and relative folders', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/abc/test3', name: 'noName' }, { path: './test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/abc/test3', name: 'noName' }, { path: './test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 3);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
@@ -161,7 +162,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple absolute folders with duplicates', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test2', name: 'noName' }, { path: '/src/test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test2', name: 'noName' }, { path: '/src/test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 2);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
@@ -176,7 +177,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple absolute and relative folders with duplicates', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3', name: 'noName' }, { path: './test3' }, { path: '/abc/test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '/src/test3', name: 'noName' }, { path: './test3' }, { path: '/abc/test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 3);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
@@ -196,7 +197,7 @@ suite('Workspace', () => {
 	});
 
 	test('toWorkspaceFolders with multiple absolute and relative folders with invalid paths', () => {
-		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '', name: 'noName' }, { path: './test3' }, { path: '/abc/test1' }], workspaceConfigUri);
+		const actual = toWorkspaceFolders([{ path: '/src/test2' }, { path: '', name: 'noName' }, { path: './test3' }, { path: '/abc/test1' }], workspaceConfigUri, extUriBiasedIgnorePathCase);
 
 		assert.equal(actual.length, 3);
 		assert.equal(actual[0].uri.fsPath, test2FolderUri.fsPath);
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
index d6643801a..66413f2e4 100644
--- a/src/vs/platform/workspaces/common/workspaces.ts
+++ b/src/vs/platform/workspaces/common/workspaces.ts
@@ -5,11 +5,11 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { localize } from 'vs/nls';
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceFolder, IWorkspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { extname, isAbsolute } from 'vs/base/common/path';
-import { dirname, resolvePath, isEqualAuthority, relativePath, extname as resourceExtname, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { extname as resourceExtname, extUriBiasedIgnorePathCase, IExtUri } from 'vs/base/common/resources';
 import * as jsonEdit from 'vs/base/common/jsonEdit';
 import * as json from 'vs/base/common/json';
 import { Schemas } from 'vs/base/common/network';
@@ -22,9 +22,16 @@ import { Event } from 'vs/base/common/event';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 export const WORKSPACE_EXTENSION = 'code-workspace';
+const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
 export const WORKSPACE_FILTER = [{ name: localize('codeWorkspace', "Code Workspace"), extensions: [WORKSPACE_EXTENSION] }];
 export const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 
+export function hasWorkspaceFileExtension(path: string | URI) {
+	const ext = (typeof path === 'string') ? extname(path) : resourceExtname(path);
+
+	return ext === WORKSPACE_SUFFIX;
+}
+
 export const IWorkspacesService = createDecorator<IWorkspacesService>('workspacesService');
 
 export interface IWorkspacesService {
@@ -48,6 +55,8 @@ export interface IWorkspacesService {
 	getDirtyWorkspaces(): Promise<Array<IWorkspaceIdentifier | URI>>;
 }
 
+//#region Workspaces Recently Opened
+
 export interface IRecentlyOpened {
 	workspaces: Array<IRecentWorkspace | IRecentFolder>;
 	files: IRecentFile[];
@@ -61,7 +70,7 @@ export interface IRecentWorkspace {
 }
 
 export interface IRecentFolder {
-	folderUri: ISingleFolderWorkspaceIdentifier;
+	folderUri: URI;
 	label?: string;
 }
 
@@ -82,36 +91,114 @@ export function isRecentFile(curr: IRecent): curr is IRecentFile {
 	return curr.hasOwnProperty('fileUri');
 }
 
-/**
- * A single folder workspace identifier is just the path to the folder.
- */
-export type ISingleFolderWorkspaceIdentifier = URI;
+//#endregion
 
-export interface IWorkspaceIdentifier {
+//#region Identifiers / Payload
+
+export interface IBaseWorkspaceIdentifier {
+
+	/**
+	 * Every workspace (multi-root, single folder or empty)
+	 * has a unique identifier. It is not possible to open
+	 * a workspace with the same `id` in multiple windows
+	 */
 	id: string;
+}
+
+/**
+ * A single folder workspace identifier is a path to a folder + id.
+ */
+export interface ISingleFolderWorkspaceIdentifier extends IBaseWorkspaceIdentifier {
+
+	/**
+	 * Folder path as `URI`.
+	 */
+	uri: URI;
+}
+
+export function isSingleFolderWorkspaceIdentifier(obj: unknown): obj is ISingleFolderWorkspaceIdentifier {
+	const singleFolderIdentifier = obj as ISingleFolderWorkspaceIdentifier | undefined;
+
+	return typeof singleFolderIdentifier?.id === 'string' && URI.isUri(singleFolderIdentifier.uri);
+}
+
+/**
+ * A multi-root workspace identifier is a path to a workspace file + id.
+ */
+export interface IWorkspaceIdentifier extends IBaseWorkspaceIdentifier {
+
+	/**
+	 * Workspace config file path as `URI`.
+	 */
 	configPath: URI;
 }
 
-export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: UriComponents; }): IWorkspaceIdentifier {
-	return { id: workspace.id, configPath: URI.revive(workspace.configPath) };
+export function toWorkspaceIdentifier(workspace: IWorkspace): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined {
+
+	// Multi root
+	if (workspace.configuration) {
+		return {
+			id: workspace.id,
+			configPath: workspace.configuration
+		};
+	}
+
+	// Single folder
+	if (workspace.folders.length === 1) {
+		return {
+			id: workspace.id,
+			uri: workspace.folders[0].uri
+		};
+	}
+
+	// Empty workspace
+	return undefined;
 }
 
-export function isStoredWorkspaceFolder(thing: unknown): thing is IStoredWorkspaceFolder {
-	return isRawFileWorkspaceFolder(thing) || isRawUriWorkspaceFolder(thing);
+export function isWorkspaceIdentifier(obj: unknown): obj is IWorkspaceIdentifier {
+	const workspaceIdentifier = obj as IWorkspaceIdentifier | undefined;
+
+	return typeof workspaceIdentifier?.id === 'string' && URI.isUri(workspaceIdentifier.configPath);
 }
 
-export function isRawFileWorkspaceFolder(thing: any): thing is IRawFileWorkspaceFolder {
-	return thing
-		&& typeof thing === 'object'
-		&& typeof thing.path === 'string'
-		&& (!thing.name || typeof thing.name === 'string');
+export function reviveIdentifier(identifier: { id: string, uri?: UriComponents, configPath?: UriComponents } | undefined): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined {
+	if (identifier?.uri) {
+		return { id: identifier.id, uri: URI.revive(identifier.uri) };
+	}
+
+	if (identifier?.configPath) {
+		return { id: identifier.id, configPath: URI.revive(identifier.configPath) };
+	}
+
+	return undefined;
 }
 
-export function isRawUriWorkspaceFolder(thing: any): thing is IRawUriWorkspaceFolder {
-	return thing
-		&& typeof thing === 'object'
-		&& typeof thing.uri === 'string'
-		&& (!thing.name || typeof thing.name === 'string');
+export function isUntitledWorkspace(path: URI, environmentService: IEnvironmentService): boolean {
+	return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);
+}
+
+export interface IEmptyWorkspaceInitializationPayload extends IBaseWorkspaceIdentifier { }
+
+export type IWorkspaceInitializationPayload = IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceInitializationPayload;
+
+//#endregion
+
+//#region Workspace File Utilities
+
+export function isStoredWorkspaceFolder(obj: unknown): obj is IStoredWorkspaceFolder {
+	return isRawFileWorkspaceFolder(obj) || isRawUriWorkspaceFolder(obj);
+}
+
+export function isRawFileWorkspaceFolder(obj: unknown): obj is IRawFileWorkspaceFolder {
+	const candidate = obj as IRawFileWorkspaceFolder | undefined;
+
+	return typeof candidate?.path === 'string' && (!candidate.name || typeof candidate.name === 'string');
+}
+
+export function isRawUriWorkspaceFolder(obj: unknown): obj is IRawUriWorkspaceFolder {
+	const candidate = obj as IRawUriWorkspaceFolder | undefined;
+
+	return typeof candidate?.uri === 'string' && (!candidate.name || typeof candidate.name === 'string');
 }
 
 export interface IRawFileWorkspaceFolder {
@@ -151,56 +238,6 @@ export interface IEnterWorkspaceResult {
 	backupPath?: string;
 }
 
-export function isSingleFolderWorkspaceIdentifier(obj: unknown): obj is ISingleFolderWorkspaceIdentifier {
-	return obj instanceof URI;
-}
-
-export function isWorkspaceIdentifier(obj: unknown): obj is IWorkspaceIdentifier {
-	const workspaceIdentifier = obj as IWorkspaceIdentifier;
-
-	return workspaceIdentifier && typeof workspaceIdentifier.id === 'string' && workspaceIdentifier.configPath instanceof URI;
-}
-
-export function toWorkspaceIdentifier(workspace: IWorkspace): IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | undefined {
-	if (workspace.configuration) {
-		return {
-			configPath: workspace.configuration,
-			id: workspace.id
-		};
-	}
-
-	if (workspace.folders.length === 1) {
-		return workspace.folders[0].uri;
-	}
-
-	// Empty workspace
-	return undefined;
-}
-
-export function isUntitledWorkspace(path: URI, environmentService: IEnvironmentService): boolean {
-	return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);
-}
-
-export type IMultiFolderWorkspaceInitializationPayload = IWorkspaceIdentifier;
-export interface ISingleFolderWorkspaceInitializationPayload { id: string; folder: ISingleFolderWorkspaceIdentifier; }
-export interface IEmptyWorkspaceInitializationPayload { id: string; }
-
-export type IWorkspaceInitializationPayload = IMultiFolderWorkspaceInitializationPayload | ISingleFolderWorkspaceInitializationPayload | IEmptyWorkspaceInitializationPayload;
-
-export function isSingleFolderWorkspaceInitializationPayload(obj: any): obj is ISingleFolderWorkspaceInitializationPayload {
-	return isSingleFolderWorkspaceIdentifier((obj.folder as ISingleFolderWorkspaceIdentifier));
-}
-
-const WORKSPACE_SUFFIX = '.' + WORKSPACE_EXTENSION;
-
-export function hasWorkspaceFileExtension(path: string | URI) {
-	const ext = (typeof path === 'string') ? extname(path) : resourceExtname(path);
-
-	return ext === WORKSPACE_SUFFIX;
-}
-
-const SLASH = '/';
-
 /**
  * Given a folder URI and the workspace config folder, computes the IStoredWorkspaceFolder using
 * a relative or absolute path or a uri.
@@ -212,12 +249,12 @@ const SLASH = '/';
  * @param targetConfigFolderURI the folder where the workspace is living in
  * @param useSlashForPath if set, use forward slashes for file paths on windows
  */
-export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean, folderName: string | undefined, targetConfigFolderURI: URI, useSlashForPath = !isWindows): IStoredWorkspaceFolder {
+export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean, folderName: string | undefined, targetConfigFolderURI: URI, useSlashForPath = !isWindows, extUri: IExtUri): IStoredWorkspaceFolder {
 	if (folderURI.scheme !== targetConfigFolderURI.scheme) {
 		return { name: folderName, uri: folderURI.toString(true) };
 	}
 
-	let folderPath = !forceAbsolute ? relativePath(targetConfigFolderURI, folderURI) : undefined;
+	let folderPath = !forceAbsolute ? extUri.relativePath(targetConfigFolderURI, folderURI) : undefined;
 	if (folderPath !== undefined) {
 		if (folderPath.length === 0) {
 			folderPath = '.';
@@ -241,7 +278,7 @@ export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean,
 				}
 			}
 		} else {
-			if (!isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {
+			if (!extUri.isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {
 				return { name: folderName, uri: folderURI.toString(true) };
 			}
 			folderPath = folderURI.path;
@@ -251,21 +288,59 @@ export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean,
 	return { name: folderName, path: folderPath };
 }
 
+export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], workspaceConfigFile: URI, extUri: IExtUri): WorkspaceFolder[] {
+	let result: WorkspaceFolder[] = [];
+	let seen: Set<string> = new Set();
+
+	const relativeTo = extUri.dirname(workspaceConfigFile);
+	for (let configuredFolder of configuredFolders) {
+		let uri: URI | null = null;
+		if (isRawFileWorkspaceFolder(configuredFolder)) {
+			if (configuredFolder.path) {
+				uri = extUri.resolvePath(relativeTo, configuredFolder.path);
+			}
+		} else if (isRawUriWorkspaceFolder(configuredFolder)) {
+			try {
+				uri = URI.parse(configuredFolder.uri);
+				// this makes sure all workspace folder are absolute
+				if (uri.path[0] !== '/') {
+					uri = uri.with({ path: '/' + uri.path });
+				}
+			} catch (e) {
+				console.warn(e);
+				// ignore
+			}
+		}
+		if (uri) {
+			// remove duplicates
+			let comparisonKey = extUri.getComparisonKey(uri);
+			if (!seen.has(comparisonKey)) {
+				seen.add(comparisonKey);
+
+				const name = configuredFolder.name || extUri.basenameOrAuthority(uri);
+				result.push(new WorkspaceFolder({ uri, name, index: result.length }, configuredFolder));
+			}
+		}
+	}
+
+	return result;
+}
+
 /**
  * Rewrites the content of a workspace file to be saved at a new location.
  * Throws an exception if file is not a valid workspace file
  */
-export function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents: string, configPathURI: URI, isFromUntitledWorkspace: boolean, targetConfigPathURI: URI) {
+export function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents: string, configPathURI: URI, isFromUntitledWorkspace: boolean, targetConfigPathURI: URI, extUri: IExtUri) {
 	let storedWorkspace = doParseStoredWorkspace(configPathURI, rawWorkspaceContents);
 
-	const sourceConfigFolder = dirname(configPathURI);
-	const targetConfigFolder = dirname(targetConfigPathURI);
+	const sourceConfigFolder = extUri.dirname(configPathURI);
+	const targetConfigFolder = extUri.dirname(targetConfigPathURI);
 
 	const rewrittenFolders: IStoredWorkspaceFolder[] = [];
 	const slashForPath = useSlashForPath(storedWorkspace.folders);
 
 	for (const folder of storedWorkspace.folders) {
-		const folderURI = isRawFileWorkspaceFolder(folder) ? resolvePath(sourceConfigFolder, folder.path) : URI.parse(folder.uri);
+		const folderURI = isRawFileWorkspaceFolder(folder) ? extUri.resolvePath(sourceConfigFolder, folder.path) : URI.parse(folder.uri);
 		let absolute;
 		if (isFromUntitledWorkspace) {
 			// if it was an untitled workspace, try to make paths relative
@@ -274,7 +349,7 @@ export function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents: string,
 			// for existing workspaces, preserve whether a path was absolute or relative
 			absolute = !isRawFileWorkspaceFolder(folder) || isAbsolute(folder.path);
 		}
-		rewrittenFolders.push(getStoredWorkspaceFolder(folderURI, absolute, folder.name, targetConfigFolder, slashForPath));
+		rewrittenFolders.push(getStoredWorkspaceFolder(folderURI, absolute, folder.name, targetConfigFolder, slashForPath, extUri));
 	}
 
 	// Preserve as much of the existing workspace as possible by using jsonEdit
@@ -308,12 +383,14 @@ function doParseStoredWorkspace(path: URI, contents: string): IStoredWorkspace {
 
 export function useSlashForPath(storedFolders: IStoredWorkspaceFolder[]): boolean {
 	if (isWindows) {
-		return storedFolders.some(folder => isRawFileWorkspaceFolder(folder) && folder.path.indexOf(SLASH) >= 0);
+		return storedFolders.some(folder => isRawFileWorkspaceFolder(folder) && folder.path.indexOf('/') >= 0);
 	}
 
 	return true;
 }
 
+//#endregion
+
 //#region Workspace Storage
 
 interface ISerializedRecentlyOpened {
diff --git a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
index 7a5baa225..adef3f004 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as arrays from 'vs/base/common/arrays';
+import { localize } from 'vs/nls';
+import { coalesce } from 'vs/base/common/arrays';
 import { IStateService } from 'vs/platform/state/node/state';
-import { app, JumpListCategory } from 'electron';
+import { app, JumpListCategory, JumpListItem } from 'electron';
 import { ILogService } from 'vs/platform/log/common/log';
 import { getBaseLabel, getPathLabel, splitName } from 'vs/base/common/labels';
 import { Event as CommonEvent, Emitter } from 'vs/base/common/event';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IRecentlyOpened, isRecentWorkspace, isRecentFolder, IRecent, isRecentFile, IRecentFolder, IRecentWorkspace, IRecentFile, toStoreData, restoreRecentlyOpened, RecentlyOpenedStorageData, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
-import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { IWorkspaceIdentifier, IRecentlyOpened, isRecentWorkspace, isRecentFolder, IRecent, isRecentFile, IRecentFolder, IRecentWorkspace, IRecentFile, toStoreData, restoreRecentlyOpened, RecentlyOpenedStorageData, WORKSPACE_EXTENSION, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { ThrottledDelayer } from 'vs/base/common/async';
-import { isEqual, dirname, originalFSPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { dirname, originalFSPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
@@ -57,15 +57,15 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onRecentlyOpenedChange = new Emitter<void>();
+	private readonly _onRecentlyOpenedChange = this._register(new Emitter<void>());
 	readonly onRecentlyOpenedChange: CommonEvent<void> = this._onRecentlyOpenedChange.event;
 
-	private macOSRecentDocumentsUpdater = this._register(new ThrottledDelayer<void>(800));
+	private readonly macOSRecentDocumentsUpdater = this._register(new ThrottledDelayer<void>(800));
 
 	constructor(
 		@IStateService private readonly stateService: IStateService,
 		@ILogService private readonly logService: ILogService,
-		@IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService,
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@IEnvironmentMainService private readonly environmentService: IEnvironmentMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService
 	) {
@@ -80,7 +80,7 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		this.lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen).then(() => this.handleWindowsJumpList());
 
 		// Add to history when entering workspace
-		this._register(this.workspacesMainService.onWorkspaceEntered(event => this.addRecentlyOpened([{ workspace: event.workspace }])));
+		this._register(this.workspacesManagementMainService.onWorkspaceEntered(event => this.addRecentlyOpened([{ workspace: event.workspace }])));
 	}
 
 	private handleWindowsJumpList(): void {
@@ -89,40 +89,40 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 
 		this.updateWindowsJumpList();
-		this.onRecentlyOpenedChange(() => this.updateWindowsJumpList());
+		this._register(this.onRecentlyOpenedChange(() => this.updateWindowsJumpList()));
 	}
 
-	addRecentlyOpened(newlyAdded: IRecent[]): void {
+	addRecentlyOpened(recentToAdd: IRecent[]): void {
 		const workspaces: Array<IRecentFolder | IRecentWorkspace> = [];
 		const files: IRecentFile[] = [];
 
-		for (let curr of newlyAdded) {
+		for (let recent of recentToAdd) {
 
 			// Workspace
-			if (isRecentWorkspace(curr)) {
-				if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(workspaces, curr.workspace) === -1) {
-					workspaces.push(curr);
+			if (isRecentWorkspace(recent)) {
+				if (!this.workspacesManagementMainService.isUntitledWorkspace(recent.workspace) && indexOfWorkspace(workspaces, recent.workspace) === -1) {
+					workspaces.push(recent);
 				}
 			}
 
 			// Folder
-			else if (isRecentFolder(curr)) {
-				if (indexOfFolder(workspaces, curr.folderUri) === -1) {
-					workspaces.push(curr);
+			else if (isRecentFolder(recent)) {
+				if (indexOfFolder(workspaces, recent.folderUri) === -1) {
+					workspaces.push(recent);
 				}
 			}
 
 			// File
 			else {
-				const alreadyExistsInHistory = indexOfFile(files, curr.fileUri) >= 0;
-				const shouldBeFiltered = curr.fileUri.scheme === Schemas.file && WorkspacesHistoryMainService.COMMON_FILES_FILTER.indexOf(basename(curr.fileUri)) >= 0;
+				const alreadyExistsInHistory = indexOfFile(files, recent.fileUri) >= 0;
+				const shouldBeFiltered = recent.fileUri.scheme === Schemas.file && WorkspacesHistoryMainService.COMMON_FILES_FILTER.indexOf(basename(recent.fileUri)) >= 0;
 
 				if (!alreadyExistsInHistory && !shouldBeFiltered) {
-					files.push(curr);
+					files.push(recent);
 
 					// Add to recent documents (Windows only, macOS later)
-					if (isWindows && curr.fileUri.scheme === Schemas.file) {
-						app.addRecentDocument(curr.fileUri.fsPath);
+					if (isWindows && recent.fileUri.scheme === Schemas.file) {
+						app.addRecentDocument(recent.fileUri.fsPath);
 					}
 				}
 			}
@@ -147,14 +147,15 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 	}
 
-	removeRecentlyOpened(toRemove: URI[]): void {
+	removeRecentlyOpened(recentToRemove: URI[]): void {
 		const keep = (recent: IRecent) => {
 			const uri = location(recent);
-			for (const resource of toRemove) {
-				if (isEqual(resource, uri)) {
+			for (const resourceToRemove of recentToRemove) {
+				if (extUriBiasedIgnorePathCase.isEqual(resourceToRemove, uri)) {
 					return false;
 				}
 			}
+
 			return true;
 		};
 
@@ -246,13 +247,10 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 
 		// Add current workspace to beginning if set
 		const currentWorkspace = include?.config?.workspace;
-		if (currentWorkspace && !this.workspacesMainService.isUntitledWorkspace(currentWorkspace)) {
+		if (isWorkspaceIdentifier(currentWorkspace) && !this.workspacesManagementMainService.isUntitledWorkspace(currentWorkspace)) {
 			workspaces.push({ workspace: currentWorkspace });
-		}
-
-		const currentFolder = include?.config?.folderUri;
-		if (currentFolder) {
-			workspaces.push({ folderUri: currentFolder });
+		} else if (isSingleFolderWorkspaceIdentifier(currentWorkspace)) {
+			workspaces.push({ folderUri: currentWorkspace.uri });
 		}
 
 		// Add currently files to open to the beginning if any
@@ -319,8 +317,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			items: [
 				{
 					type: 'task',
-					title: nls.localize('newWindow', "New Window"),
-					description: nls.localize('newWindowDesc', "Opens a new window"),
+					title: localize('newWindow', "New Window"),
+					description: localize('newWindowDesc', "Opens a new window"),
 					program: process.execPath,
 					args: '-n', // force new window
 					iconPath: process.execPath,
@@ -330,57 +328,59 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		});
 
 		// Recent Workspaces
-		try {
-			if (this.getRecentlyOpened().workspaces.length > 0) {
+		if (this.getRecentlyOpened().workspaces.length > 0) {
 
-				// The user might have meanwhile removed items from the jump list and we have to respect that
-				// so we need to update our list of recent paths with the choice of the user to not add them again
-				// Also: Windows will not show our custom category at all if there is any entry which was removed
-				// by the user! See https://github.com/microsoft/vscode/issues/15052
-				let toRemove: URI[] = [];
-				for (let item of app.getJumpListSettings().removedItems) {
-					const args = item.args;
-					if (args) {
-						const match = /^--(folder|file)-uri\s+"([^"]+)"$/.exec(args);
-						if (match) {
-							toRemove.push(URI.parse(match[2]));
-						}
+			// The user might have meanwhile removed items from the jump list and we have to respect that
+			// so we need to update our list of recent paths with the choice of the user to not add them again
+			// Also: Windows will not show our custom category at all if there is any entry which was removed
+			// by the user! See https://github.com/microsoft/vscode/issues/15052
+			let toRemove: URI[] = [];
+			for (let item of app.getJumpListSettings().removedItems) {
+				const args = item.args;
+				if (args) {
+					const match = /^--(folder|file)-uri\s+"([^"]+)"$/.exec(args);
+					if (match) {
+						toRemove.push(URI.parse(match[2]));
 					}
 				}
-				this.removeRecentlyOpened(toRemove);
+			}
+			this.removeRecentlyOpened(toRemove);
 
-				// Add entries
+			// Add entries
+			let hasWorkspaces = false;
+			const items: JumpListItem[] = coalesce(this.getRecentlyOpened().workspaces.slice(0, 7 /* limit number of entries here */).map(recent => {
+				const workspace = isRecentWorkspace(recent) ? recent.workspace : recent.folderUri;
+				const title = recent.label ? splitName(recent.label).name : this.getSimpleWorkspaceLabel(workspace, this.environmentService.untitledWorkspacesHome);
+
+				let description;
+				let args;
+				if (URI.isUri(workspace)) {
+					description = localize('folderDesc', "{0} {1}", getBaseLabel(workspace), getPathLabel(dirname(workspace), this.environmentService));
+					args = `--folder-uri "${workspace.toString()}"`;
+				} else {
+					hasWorkspaces = true;
+					description = localize('workspaceDesc', "{0} {1}", getBaseLabel(workspace.configPath), getPathLabel(dirname(workspace.configPath), this.environmentService));
+					args = `--file-uri "${workspace.configPath.toString()}"`;
+				}
+
+				return {
+					type: 'task',
+					title: title.substr(0, 255), 				// Windows seems to be picky around the length of entries
+					description: description.substr(0, 255),	// (see https://github.com/microsoft/vscode/issues/111177)
+					program: process.execPath,
+					args,
+					iconPath: 'explorer.exe', // simulate folder icon
+					iconIndex: 0
+				};
+			}));
+
+			if (items.length > 0) {
 				jumpList.push({
 					type: 'custom',
-					name: nls.localize('recentFolders', "Recent Workspaces"),
-					items: arrays.coalesce(this.getRecentlyOpened().workspaces.slice(0, 7 /* limit number of entries here */).map(recent => {
-						const workspace = isRecentWorkspace(recent) ? recent.workspace : recent.folderUri;
-						const title = recent.label ? splitName(recent.label).name : this.getSimpleWorkspaceLabel(workspace, this.environmentService.untitledWorkspacesHome);
-
-						let description;
-						let args;
-						if (isSingleFolderWorkspaceIdentifier(workspace)) {
-							description = nls.localize('folderDesc', "{0} {1}", getBaseLabel(workspace), getPathLabel(dirname(workspace), this.environmentService));
-							args = `--folder-uri "${workspace.toString()}"`;
-						} else {
-							description = nls.localize('workspaceDesc', "{0} {1}", getBaseLabel(workspace.configPath), getPathLabel(dirname(workspace.configPath), this.environmentService));
-							args = `--file-uri "${workspace.configPath.toString()}"`;
-						}
-
-						return {
-							type: 'task',
-							title,
-							description,
-							program: process.execPath,
-							args,
-							iconPath: 'explorer.exe', // simulate folder icon
-							iconIndex: 0
-						};
-					}))
+					name: hasWorkspaces ? localize('recentFoldersAndWorkspaces', "Recent Folders & Workspaces") : localize('recentFolders', "Recent Folders"),
+					items
 				});
 			}
-		} catch (error) {
-			this.logService.warn('updateWindowsJumpList#recentWorkspaces', error); // https://github.com/microsoft/vscode/issues/111177
 		}
 
 		// Recent
@@ -396,21 +396,24 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 	}
 
 	private getSimpleWorkspaceLabel(workspace: IWorkspaceIdentifier | URI, workspaceHome: URI): string {
-		if (isSingleFolderWorkspaceIdentifier(workspace)) {
+
+		// Single Folder
+		if (URI.isUri(workspace)) {
 			return basename(workspace);
 		}
 
 		// Workspace: Untitled
 		if (extUriBiasedIgnorePathCase.isEqualOrParent(workspace.configPath, workspaceHome)) {
-			return nls.localize('untitledWorkspace', "Untitled (Workspace)");
+			return localize('untitledWorkspace', "Untitled (Workspace)");
 		}
 
+		// Workspace: normal
 		let filename = basename(workspace.configPath);
 		if (filename.endsWith(WORKSPACE_EXTENSION)) {
 			filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
 		}
 
-		return nls.localize('workspaceName', "{0} (Workspace)", filename);
+		return localize('workspaceName', "{0} (Workspace)", filename);
 	}
 }
 
@@ -430,10 +433,10 @@ function indexOfWorkspace(arr: IRecent[], candidate: IWorkspaceIdentifier): numb
 	return arr.findIndex(workspace => isRecentWorkspace(workspace) && workspace.workspace.id === candidate.id);
 }
 
-function indexOfFolder(arr: IRecent[], candidate: ISingleFolderWorkspaceIdentifier): number {
-	return arr.findIndex(folder => isRecentFolder(folder) && isEqual(folder.folderUri, candidate));
+function indexOfFolder(arr: IRecent[], candidate: URI): number {
+	return arr.findIndex(folder => isRecentFolder(folder) && extUriBiasedIgnorePathCase.isEqual(folder.folderUri, candidate));
 }
 
 function indexOfFile(arr: IRecentFile[], candidate: URI): number {
-	return arr.findIndex(file => isEqual(file.fileUri, candidate));
+	return arr.findIndex(file => extUriBiasedIgnorePathCase.isEqual(file.fileUri, candidate));
 }
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index f4fa065fb..5328a07dd 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -3,337 +3,79 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkspaceIdentifier, hasWorkspaceFileExtension, UNTITLED_WORKSPACE_NAME, IResolvedWorkspace, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, IUntitledWorkspaceInfo, getStoredWorkspaceFolder, IEnterWorkspaceResult, isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
-import { join, dirname } from 'vs/base/common/path';
-import { mkdirp, writeFile, rimrafSync, readdirSync, writeFileSync } from 'vs/base/node/pfs';
-import { readFileSync, existsSync, mkdirSync } from 'fs';
-import { isLinux } from 'vs/base/common/platform';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ILogService } from 'vs/platform/log/common/log';
-import { createHash } from 'crypto';
-import * as json from 'vs/base/common/json';
-import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
+import { AddFirstParameterToFunctions } from 'vs/base/common/types';
+import { IWorkspacesService, IEnterWorkspaceResult, IWorkspaceFolderCreationData, IWorkspaceIdentifier, IRecentlyOpened, IRecent } from 'vs/platform/workspaces/common/workspaces';
 import { URI } from 'vs/base/common/uri';
-import { Schemas } from 'vs/base/common/network';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { originalFSPath, joinPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
-import { localize } from 'vs/nls';
-import product from 'vs/platform/product/common/product';
-import { MessageBoxOptions, BrowserWindow } from 'electron';
-import { withNullAsUndefined } from 'vs/base/common/types';
+import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
+import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
 import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
-import { findWindowOnWorkspace } from 'vs/platform/windows/node/window';
 
-export const IWorkspacesMainService = createDecorator<IWorkspacesMainService>('workspacesMainService');
-
-export interface IWorkspaceEnteredEvent {
-	window: ICodeWindow;
-	workspace: IWorkspaceIdentifier;
-}
-
-export interface IWorkspacesMainService {
-
-	readonly _serviceBrand: undefined;
-
-	readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier>;
-	readonly onWorkspaceEntered: Event<IWorkspaceEnteredEvent>;
-
-	enterWorkspace(intoWindow: ICodeWindow, openedWindows: ICodeWindow[], path: URI): Promise<IEnterWorkspaceResult | null>;
-
-	createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier>;
-	createUntitledWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier;
-
-	deleteUntitledWorkspace(workspace: IWorkspaceIdentifier): Promise<void>;
-	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void;
-
-	getUntitledWorkspacesSync(): IUntitledWorkspaceInfo[];
-	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean;
-
-	resolveLocalWorkspaceSync(path: URI): IResolvedWorkspace | null;
-	getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier>;
-}
-
-export interface IStoredWorkspace {
-	folders: IStoredWorkspaceFolder[];
-	remoteAuthority?: string;
-}
-
-export class WorkspacesMainService extends Disposable implements IWorkspacesMainService {
+export class WorkspacesMainService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<unknown> /* only methods, not events */, number /* window ID */> {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces
-
-	private readonly _onUntitledWorkspaceDeleted = this._register(new Emitter<IWorkspaceIdentifier>());
-	readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier> = this._onUntitledWorkspaceDeleted.event;
-
-	private readonly _onWorkspaceEntered = this._register(new Emitter<IWorkspaceEnteredEvent>());
-	readonly onWorkspaceEntered: Event<IWorkspaceEnteredEvent> = this._onWorkspaceEntered.event;
-
 	constructor(
-		@IEnvironmentMainService private readonly environmentService: IEnvironmentMainService,
-		@ILogService private readonly logService: ILogService,
-		@IBackupMainService private readonly backupMainService: IBackupMainService,
-		@IDialogMainService private readonly dialogMainService: IDialogMainService
+		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@IWorkspacesHistoryMainService private readonly workspacesHistoryMainService: IWorkspacesHistoryMainService,
+		@IBackupMainService private readonly backupMainService: IBackupMainService
 	) {
-		super();
-
-		this.untitledWorkspacesHome = environmentService.untitledWorkspacesHome;
 	}
 
-	resolveLocalWorkspaceSync(uri: URI): IResolvedWorkspace | null {
-		if (!this.isWorkspacePath(uri)) {
-			return null; // does not look like a valid workspace config file
-		}
-		if (uri.scheme !== Schemas.file) {
-			return null;
-		}
+	//#region Workspace Management
 
-		let contents: string;
-		try {
-			contents = readFileSync(uri.fsPath, 'utf8');
-		} catch (error) {
-			return null; // invalid workspace
-		}
-
-		return this.doResolveWorkspace(uri, contents);
-	}
-
-	private isWorkspacePath(uri: URI): boolean {
-		return isUntitledWorkspace(uri, this.environmentService) || hasWorkspaceFileExtension(uri);
-	}
-
-	private doResolveWorkspace(path: URI, contents: string): IResolvedWorkspace | null {
-		try {
-			const workspace = this.doParseStoredWorkspace(path, contents);
-			const workspaceIdentifier = getWorkspaceIdentifier(path);
-			return {
-				id: workspaceIdentifier.id,
-				configPath: workspaceIdentifier.configPath,
-				folders: toWorkspaceFolders(workspace.folders, workspaceIdentifier.configPath),
-				remoteAuthority: workspace.remoteAuthority
-			};
-		} catch (error) {
-			this.logService.warn(error.toString());
+	async enterWorkspace(windowId: number, path: URI): Promise<IEnterWorkspaceResult | null> {
+		const window = this.windowsMainService.getWindowById(windowId);
+		if (window) {
+			return this.workspacesManagementMainService.enterWorkspace(window, this.windowsMainService.getWindows(), path);
 		}
 
 		return null;
 	}
 
-	private doParseStoredWorkspace(path: URI, contents: string): IStoredWorkspace {
-
-		// Parse workspace file
-		let storedWorkspace: IStoredWorkspace = json.parse(contents); // use fault tolerant parser
-
-		// Filter out folders which do not have a path or uri set
-		if (storedWorkspace && Array.isArray(storedWorkspace.folders)) {
-			storedWorkspace.folders = storedWorkspace.folders.filter(folder => isStoredWorkspaceFolder(folder));
-		} else {
-			throw new Error(`${path.toString(true)} looks like an invalid workspace file.`);
-		}
-
-		return storedWorkspace;
+	createUntitledWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier> {
+		return this.workspacesManagementMainService.createUntitledWorkspace(folders, remoteAuthority);
 	}
 
-	async createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier> {
-		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
-		const configPath = workspace.configPath.fsPath;
-
-		await mkdirp(dirname(configPath));
-		await writeFile(configPath, JSON.stringify(storedWorkspace, null, '\t'));
-
-		return workspace;
+	deleteUntitledWorkspace(windowId: number, workspace: IWorkspaceIdentifier): Promise<void> {
+		return this.workspacesManagementMainService.deleteUntitledWorkspace(workspace);
 	}
 
-	createUntitledWorkspaceSync(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): IWorkspaceIdentifier {
-		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
-		const configPath = workspace.configPath.fsPath;
-
-		const configPathDir = dirname(configPath);
-		if (!existsSync(configPathDir)) {
-			const configPathDirDir = dirname(configPathDir);
-			if (!existsSync(configPathDirDir)) {
-				mkdirSync(configPathDirDir);
-			}
-			mkdirSync(configPathDir);
-		}
-
-		writeFileSync(configPath, JSON.stringify(storedWorkspace, null, '\t'));
-
-		return workspace;
+	getWorkspaceIdentifier(windowId: number, workspacePath: URI): Promise<IWorkspaceIdentifier> {
+		return this.workspacesManagementMainService.getWorkspaceIdentifier(workspacePath);
 	}
 
-	private newUntitledWorkspace(folders: IWorkspaceFolderCreationData[] = [], remoteAuthority?: string): { workspace: IWorkspaceIdentifier, storedWorkspace: IStoredWorkspace } {
-		const randomId = (Date.now() + Math.round(Math.random() * 1000)).toString();
-		const untitledWorkspaceConfigFolder = joinPath(this.untitledWorkspacesHome, randomId);
-		const untitledWorkspaceConfigPath = joinPath(untitledWorkspaceConfigFolder, UNTITLED_WORKSPACE_NAME);
+	//#endregion
 
-		const storedWorkspaceFolder: IStoredWorkspaceFolder[] = [];
+	//#region Workspaces History
 
-		for (const folder of folders) {
-			storedWorkspaceFolder.push(getStoredWorkspaceFolder(folder.uri, true, folder.name, untitledWorkspaceConfigFolder));
-		}
+	readonly onRecentlyOpenedChange = this.workspacesHistoryMainService.onRecentlyOpenedChange;
 
-		return {
-			workspace: getWorkspaceIdentifier(untitledWorkspaceConfigPath),
-			storedWorkspace: { folders: storedWorkspaceFolder, remoteAuthority }
-		};
+	async getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
+		return this.workspacesHistoryMainService.getRecentlyOpened(this.windowsMainService.getWindowById(windowId));
 	}
 
-	async getWorkspaceIdentifier(configPath: URI): Promise<IWorkspaceIdentifier> {
-		return getWorkspaceIdentifier(configPath);
+	async addRecentlyOpened(windowId: number, recents: IRecent[]): Promise<void> {
+		return this.workspacesHistoryMainService.addRecentlyOpened(recents);
 	}
 
-	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
-		return isUntitledWorkspace(workspace.configPath, this.environmentService);
+	async removeRecentlyOpened(windowId: number, paths: URI[]): Promise<void> {
+		return this.workspacesHistoryMainService.removeRecentlyOpened(paths);
 	}
 
-	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
-		if (!this.isUntitledWorkspace(workspace)) {
-			return; // only supported for untitled workspaces
-		}
-
-		// Delete from disk
-		this.doDeleteUntitledWorkspaceSync(workspace);
-
-		// Event
-		this._onUntitledWorkspaceDeleted.fire(workspace);
+	async clearRecentlyOpened(windowId: number): Promise<void> {
+		return this.workspacesHistoryMainService.clearRecentlyOpened();
 	}
 
-	async deleteUntitledWorkspace(workspace: IWorkspaceIdentifier): Promise<void> {
-		this.deleteUntitledWorkspaceSync(workspace);
+	//#endregion
+
+
+	//#region Dirty Workspaces
+
+	async getDirtyWorkspaces(): Promise<Array<IWorkspaceIdentifier | URI>> {
+		return this.backupMainService.getDirtyWorkspaces();
 	}
 
-	private doDeleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
-		const configPath = originalFSPath(workspace.configPath);
-		try {
-
-			// Delete Workspace
-			rimrafSync(dirname(configPath));
-
-			// Mark Workspace Storage to be deleted
-			const workspaceStoragePath = join(this.environmentService.workspaceStorageHome.fsPath, workspace.id);
-			if (existsSync(workspaceStoragePath)) {
-				writeFileSync(join(workspaceStoragePath, 'obsolete'), '');
-			}
-		} catch (error) {
-			this.logService.warn(`Unable to delete untitled workspace ${configPath} (${error}).`);
-		}
-	}
-
-	getUntitledWorkspacesSync(): IUntitledWorkspaceInfo[] {
-		let untitledWorkspaces: IUntitledWorkspaceInfo[] = [];
-		try {
-			const untitledWorkspacePaths = readdirSync(this.untitledWorkspacesHome.fsPath).map(folder => joinPath(this.untitledWorkspacesHome, folder, UNTITLED_WORKSPACE_NAME));
-			for (const untitledWorkspacePath of untitledWorkspacePaths) {
-				const workspace = getWorkspaceIdentifier(untitledWorkspacePath);
-				const resolvedWorkspace = this.resolveLocalWorkspaceSync(untitledWorkspacePath);
-				if (!resolvedWorkspace) {
-					this.doDeleteUntitledWorkspaceSync(workspace);
-				} else {
-					untitledWorkspaces.push({ workspace, remoteAuthority: resolvedWorkspace.remoteAuthority });
-				}
-			}
-		} catch (error) {
-			if (error.code !== 'ENOENT') {
-				this.logService.warn(`Unable to read folders in ${this.untitledWorkspacesHome} (${error}).`);
-			}
-		}
-		return untitledWorkspaces;
-	}
-
-	async enterWorkspace(window: ICodeWindow, windows: ICodeWindow[], path: URI): Promise<IEnterWorkspaceResult | null> {
-		if (!window || !window.win || !window.isReady) {
-			return null; // return early if the window is not ready or disposed
-		}
-
-		const isValid = await this.isValidTargetWorkspacePath(window, windows, path);
-		if (!isValid) {
-			return null; // return early if the workspace is not valid
-		}
-
-		const result = this.doEnterWorkspace(window, getWorkspaceIdentifier(path));
-		if (!result) {
-			return null;
-		}
-
-		// Emit as event
-		this._onWorkspaceEntered.fire({ window, workspace: result.workspace });
-
-		return result;
-	}
-
-	private async isValidTargetWorkspacePath(window: ICodeWindow, windows: ICodeWindow[], path?: URI): Promise<boolean> {
-		if (!path) {
-			return true;
-		}
-
-		if (window.openedWorkspace && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.configPath, path)) {
-			return false; // window is already opened on a workspace with that path
-		}
-
-		// Prevent overwriting a workspace that is currently opened in another window
-		if (findWindowOnWorkspace(windows, getWorkspaceIdentifier(path))) {
-			const options: MessageBoxOptions = {
-				title: product.nameLong,
-				type: 'info',
-				buttons: [localize('ok', "OK")],
-				message: localize('workspaceOpenedMessage', "Unable to save workspace '{0}'", basename(path)),
-				detail: localize('workspaceOpenedDetail', "The workspace is already opened in another window. Please close that window first and then try again."),
-				noLink: true
-			};
-
-			await this.dialogMainService.showMessageBox(options, withNullAsUndefined(BrowserWindow.getFocusedWindow()));
-
-			return false;
-		}
-
-		return true; // OK
-	}
-
-	private doEnterWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): IEnterWorkspaceResult | null {
-		if (!window.config) {
-			return null;
-		}
-
-		window.focus();
-
-		// Register window for backups and migrate current backups over
-		let backupPath: string | undefined;
-		if (!window.config.extensionDevelopmentPath) {
-			backupPath = this.backupMainService.registerWorkspaceBackupSync({ workspace, remoteAuthority: window.remoteAuthority }, window.config.backupPath);
-		}
-
-		// if the window was opened on an untitled workspace, delete it.
-		if (window.openedWorkspace && this.isUntitledWorkspace(window.openedWorkspace)) {
-			this.deleteUntitledWorkspaceSync(window.openedWorkspace);
-		}
-
-		// Update window configuration properly based on transition to workspace
-		window.config.folderUri = undefined;
-		window.config.workspace = workspace;
-		window.config.backupPath = backupPath;
-
-		return { workspace, backupPath };
-	}
-}
-
-function getWorkspaceId(configPath: URI): string {
-	let workspaceConfigPath = configPath.scheme === Schemas.file ? originalFSPath(configPath) : configPath.toString();
-	if (!isLinux) {
-		workspaceConfigPath = workspaceConfigPath.toLowerCase(); // sanitize for platform file system
-	}
-
-	return createHash('md5').update(workspaceConfigPath).digest('hex');
-}
-
-export function getWorkspaceIdentifier(configPath: URI): IWorkspaceIdentifier {
-	return {
-		configPath,
-		id: getWorkspaceId(configPath)
-	};
+	//#endregion
 }
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
new file mode 100644
index 000000000..306d1daa5
--- /dev/null
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -0,0 +1,394 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { toWorkspaceFolders, IWorkspaceIdentifier, hasWorkspaceFileExtension, UNTITLED_WORKSPACE_NAME, IResolvedWorkspace, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, IUntitledWorkspaceInfo, getStoredWorkspaceFolder, IEnterWorkspaceResult, isUntitledWorkspace, isWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
+import { join, dirname } from 'vs/base/common/path';
+import { mkdirp, writeFile, rimrafSync, readdirSync, writeFileSync } from 'vs/base/node/pfs';
+import { readFileSync, existsSync, mkdirSync, statSync, Stats } from 'fs';
+import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { Event, Emitter } from 'vs/base/common/event';
+import { ILogService } from 'vs/platform/log/common/log';
+import { createHash } from 'crypto';
+import { parse } from 'vs/base/common/json';
+import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { originalFSPath, joinPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
+import { localize } from 'vs/nls';
+import product from 'vs/platform/product/common/product';
+import { MessageBoxOptions, BrowserWindow } from 'electron';
+import { withNullAsUndefined } from 'vs/base/common/types';
+import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
+import { findWindowOnWorkspaceOrFolder } from 'vs/platform/windows/electron-main/windowsFinder';
+
+export const IWorkspacesManagementMainService = createDecorator<IWorkspacesManagementMainService>('workspacesManagementMainService');
+
+export interface IWorkspaceEnteredEvent {
+	window: ICodeWindow;
+	workspace: IWorkspaceIdentifier;
+}
+
+export interface IWorkspacesManagementMainService {
+
+	readonly _serviceBrand: undefined;
+
+	readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier>;
+	readonly onWorkspaceEntered: Event<IWorkspaceEnteredEvent>;
+
+	enterWorkspace(intoWindow: ICodeWindow, openedWindows: ICodeWindow[], path: URI): Promise<IEnterWorkspaceResult | null>;
+
+	createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier>;
+	createUntitledWorkspaceSync(folders?: IWorkspaceFolderCreationData[]): IWorkspaceIdentifier;
+
+	deleteUntitledWorkspace(workspace: IWorkspaceIdentifier): Promise<void>;
+	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void;
+
+	getUntitledWorkspacesSync(): IUntitledWorkspaceInfo[];
+	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean;
+
+	resolveLocalWorkspaceSync(path: URI): IResolvedWorkspace | null;
+	getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier>;
+}
+
+export interface IStoredWorkspace {
+	folders: IStoredWorkspaceFolder[];
+	remoteAuthority?: string;
+}
+
+export class WorkspacesManagementMainService extends Disposable implements IWorkspacesManagementMainService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly untitledWorkspacesHome = this.environmentService.untitledWorkspacesHome; // local URI that contains all untitled workspaces
+
+	private readonly _onUntitledWorkspaceDeleted = this._register(new Emitter<IWorkspaceIdentifier>());
+	readonly onUntitledWorkspaceDeleted: Event<IWorkspaceIdentifier> = this._onUntitledWorkspaceDeleted.event;
+
+	private readonly _onWorkspaceEntered = this._register(new Emitter<IWorkspaceEnteredEvent>());
+	readonly onWorkspaceEntered: Event<IWorkspaceEnteredEvent> = this._onWorkspaceEntered.event;
+
+	constructor(
+		@IEnvironmentMainService private readonly environmentService: IEnvironmentMainService,
+		@ILogService private readonly logService: ILogService,
+		@IBackupMainService private readonly backupMainService: IBackupMainService,
+		@IDialogMainService private readonly dialogMainService: IDialogMainService
+	) {
+		super();
+	}
+
+	resolveLocalWorkspaceSync(uri: URI): IResolvedWorkspace | null {
+		if (!this.isWorkspacePath(uri)) {
+			return null; // does not look like a valid workspace config file
+		}
+		if (uri.scheme !== Schemas.file) {
+			return null;
+		}
+
+		let contents: string;
+		try {
+			contents = readFileSync(uri.fsPath, 'utf8');
+		} catch (error) {
+			return null; // invalid workspace
+		}
+
+		return this.doResolveWorkspace(uri, contents);
+	}
+
+	private isWorkspacePath(uri: URI): boolean {
+		return isUntitledWorkspace(uri, this.environmentService) || hasWorkspaceFileExtension(uri);
+	}
+
+	private doResolveWorkspace(path: URI, contents: string): IResolvedWorkspace | null {
+		try {
+			const workspace = this.doParseStoredWorkspace(path, contents);
+			const workspaceIdentifier = getWorkspaceIdentifier(path);
+			return {
+				id: workspaceIdentifier.id,
+				configPath: workspaceIdentifier.configPath,
+				folders: toWorkspaceFolders(workspace.folders, workspaceIdentifier.configPath, extUriBiasedIgnorePathCase),
+				remoteAuthority: workspace.remoteAuthority
+			};
+		} catch (error) {
+			this.logService.warn(error.toString());
+		}
+
+		return null;
+	}
+
+	private doParseStoredWorkspace(path: URI, contents: string): IStoredWorkspace {
+
+		// Parse workspace file
+		const storedWorkspace: IStoredWorkspace = parse(contents); // use fault tolerant parser
+
+		// Filter out folders which do not have a path or uri set
+		if (storedWorkspace && Array.isArray(storedWorkspace.folders)) {
+			storedWorkspace.folders = storedWorkspace.folders.filter(folder => isStoredWorkspaceFolder(folder));
+		} else {
+			throw new Error(`${path.toString(true)} looks like an invalid workspace file.`);
+		}
+
+		return storedWorkspace;
+	}
+
+	async createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier> {
+		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
+		const configPath = workspace.configPath.fsPath;
+
+		await mkdirp(dirname(configPath));
+		await writeFile(configPath, JSON.stringify(storedWorkspace, null, '\t'));
+
+		return workspace;
+	}
+
+	createUntitledWorkspaceSync(folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): IWorkspaceIdentifier {
+		const { workspace, storedWorkspace } = this.newUntitledWorkspace(folders, remoteAuthority);
+		const configPath = workspace.configPath.fsPath;
+
+		const configPathDir = dirname(configPath);
+		if (!existsSync(configPathDir)) {
+			const configPathDirDir = dirname(configPathDir);
+			if (!existsSync(configPathDirDir)) {
+				mkdirSync(configPathDirDir);
+			}
+			mkdirSync(configPathDir);
+		}
+
+		writeFileSync(configPath, JSON.stringify(storedWorkspace, null, '\t'));
+
+		return workspace;
+	}
+
+	private newUntitledWorkspace(folders: IWorkspaceFolderCreationData[] = [], remoteAuthority?: string): { workspace: IWorkspaceIdentifier, storedWorkspace: IStoredWorkspace } {
+		const randomId = (Date.now() + Math.round(Math.random() * 1000)).toString();
+		const untitledWorkspaceConfigFolder = joinPath(this.untitledWorkspacesHome, randomId);
+		const untitledWorkspaceConfigPath = joinPath(untitledWorkspaceConfigFolder, UNTITLED_WORKSPACE_NAME);
+
+		const storedWorkspaceFolder: IStoredWorkspaceFolder[] = [];
+
+		for (const folder of folders) {
+			storedWorkspaceFolder.push(getStoredWorkspaceFolder(folder.uri, true, folder.name, untitledWorkspaceConfigFolder, !isWindows, extUriBiasedIgnorePathCase));
+		}
+
+		return {
+			workspace: getWorkspaceIdentifier(untitledWorkspaceConfigPath),
+			storedWorkspace: { folders: storedWorkspaceFolder, remoteAuthority }
+		};
+	}
+
+	async getWorkspaceIdentifier(configPath: URI): Promise<IWorkspaceIdentifier> {
+		return getWorkspaceIdentifier(configPath);
+	}
+
+	isUntitledWorkspace(workspace: IWorkspaceIdentifier): boolean {
+		return isUntitledWorkspace(workspace.configPath, this.environmentService);
+	}
+
+	deleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
+		if (!this.isUntitledWorkspace(workspace)) {
+			return; // only supported for untitled workspaces
+		}
+
+		// Delete from disk
+		this.doDeleteUntitledWorkspaceSync(workspace);
+
+		// Event
+		this._onUntitledWorkspaceDeleted.fire(workspace);
+	}
+
+	async deleteUntitledWorkspace(workspace: IWorkspaceIdentifier): Promise<void> {
+		this.deleteUntitledWorkspaceSync(workspace);
+	}
+
+	private doDeleteUntitledWorkspaceSync(workspace: IWorkspaceIdentifier): void {
+		const configPath = originalFSPath(workspace.configPath);
+		try {
+
+			// Delete Workspace
+			rimrafSync(dirname(configPath));
+
+			// Mark Workspace Storage to be deleted
+			const workspaceStoragePath = join(this.environmentService.workspaceStorageHome.fsPath, workspace.id);
+			if (existsSync(workspaceStoragePath)) {
+				writeFileSync(join(workspaceStoragePath, 'obsolete'), '');
+			}
+		} catch (error) {
+			this.logService.warn(`Unable to delete untitled workspace ${configPath} (${error}).`);
+		}
+	}
+
+	getUntitledWorkspacesSync(): IUntitledWorkspaceInfo[] {
+		const untitledWorkspaces: IUntitledWorkspaceInfo[] = [];
+		try {
+			const untitledWorkspacePaths = readdirSync(this.untitledWorkspacesHome.fsPath).map(folder => joinPath(this.untitledWorkspacesHome, folder, UNTITLED_WORKSPACE_NAME));
+			for (const untitledWorkspacePath of untitledWorkspacePaths) {
+				const workspace = getWorkspaceIdentifier(untitledWorkspacePath);
+				const resolvedWorkspace = this.resolveLocalWorkspaceSync(untitledWorkspacePath);
+				if (!resolvedWorkspace) {
+					this.doDeleteUntitledWorkspaceSync(workspace);
+				} else {
+					untitledWorkspaces.push({ workspace, remoteAuthority: resolvedWorkspace.remoteAuthority });
+				}
+			}
+		} catch (error) {
+			if (error.code !== 'ENOENT') {
+				this.logService.warn(`Unable to read folders in ${this.untitledWorkspacesHome} (${error}).`);
+			}
+		}
+
+		return untitledWorkspaces;
+	}
+
+	async enterWorkspace(window: ICodeWindow, windows: ICodeWindow[], path: URI): Promise<IEnterWorkspaceResult | null> {
+		if (!window || !window.win || !window.isReady) {
+			return null; // return early if the window is not ready or disposed
+		}
+
+		const isValid = await this.isValidTargetWorkspacePath(window, windows, path);
+		if (!isValid) {
+			return null; // return early if the workspace is not valid
+		}
+
+		const result = this.doEnterWorkspace(window, getWorkspaceIdentifier(path));
+		if (!result) {
+			return null;
+		}
+
+		// Emit as event
+		this._onWorkspaceEntered.fire({ window, workspace: result.workspace });
+
+		return result;
+	}
+
+	private async isValidTargetWorkspacePath(window: ICodeWindow, windows: ICodeWindow[], workspacePath?: URI): Promise<boolean> {
+		if (!workspacePath) {
+			return true;
+		}
+
+		if (isWorkspaceIdentifier(window.openedWorkspace) && extUriBiasedIgnorePathCase.isEqual(window.openedWorkspace.configPath, workspacePath)) {
+			return false; // window is already opened on a workspace with that path
+		}
+
+		// Prevent overwriting a workspace that is currently opened in another window
+		if (findWindowOnWorkspaceOrFolder(windows, workspacePath)) {
+			const options: MessageBoxOptions = {
+				title: product.nameLong,
+				type: 'info',
+				buttons: [localize('ok', "OK")],
+				message: localize('workspaceOpenedMessage', "Unable to save workspace '{0}'", basename(workspacePath)),
+				detail: localize('workspaceOpenedDetail', "The workspace is already opened in another window. Please close that window first and then try again."),
+				noLink: true
+			};
+
+			await this.dialogMainService.showMessageBox(options, withNullAsUndefined(BrowserWindow.getFocusedWindow()));
+
+			return false;
+		}
+
+		return true; // OK
+	}
+
+	private doEnterWorkspace(window: ICodeWindow, workspace: IWorkspaceIdentifier): IEnterWorkspaceResult | null {
+		if (!window.config) {
+			return null;
+		}
+
+		window.focus();
+
+		// Register window for backups and migrate current backups over
+		let backupPath: string | undefined;
+		if (!window.config.extensionDevelopmentPath) {
+			backupPath = this.backupMainService.registerWorkspaceBackupSync({ workspace, remoteAuthority: window.remoteAuthority }, window.config.backupPath);
+		}
+
+		// if the window was opened on an untitled workspace, delete it.
+		if (isWorkspaceIdentifier(window.openedWorkspace) && this.isUntitledWorkspace(window.openedWorkspace)) {
+			this.deleteUntitledWorkspaceSync(window.openedWorkspace);
+		}
+
+		// Update window configuration properly based on transition to workspace
+		window.config.workspace = workspace;
+		window.config.backupPath = backupPath;
+
+		return { workspace, backupPath };
+	}
+}
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// NOTE: DO NOT CHANGE. IDENTIFIERS HAVE TO REMAIN STABLE
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+export function getWorkspaceIdentifier(configPath: URI): IWorkspaceIdentifier {
+
+	function getWorkspaceId(): string {
+		let configPathStr = configPath.scheme === Schemas.file ? originalFSPath(configPath) : configPath.toString();
+		if (!isLinux) {
+			configPathStr = configPathStr.toLowerCase(); // sanitize for platform file system
+		}
+
+		return createHash('md5').update(configPathStr).digest('hex');
+	}
+
+	return {
+		id: getWorkspaceId(),
+		configPath
+	};
+}
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// NOTE: DO NOT CHANGE. IDENTIFIERS HAVE TO REMAIN STABLE
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+export function getSingleFolderWorkspaceIdentifier(folderUri: URI): ISingleFolderWorkspaceIdentifier | undefined;
+export function getSingleFolderWorkspaceIdentifier(folderUri: URI, folderStat: Stats): ISingleFolderWorkspaceIdentifier;
+export function getSingleFolderWorkspaceIdentifier(folderUri: URI, folderStat?: Stats): ISingleFolderWorkspaceIdentifier | undefined {
+
+	function getFolderId(): string | undefined {
+
+		// Remote: produce a hash from the entire URI
+		if (folderUri.scheme !== Schemas.file) {
+			return createHash('md5').update(folderUri.toString()).digest('hex');
+		}
+
+		// Local: produce a hash from the path and include creation time as salt
+		if (!folderStat) {
+			try {
+				folderStat = statSync(folderUri.fsPath);
+			} catch (error) {
+				return undefined; // folder does not exist
+			}
+		}
+
+		let ctime: number | undefined;
+		if (isLinux) {
+			ctime = folderStat.ino; // Linux: birthtime is ctime, so we cannot use it! We use the ino instead!
+		} else if (isMacintosh) {
+			ctime = folderStat.birthtime.getTime(); // macOS: birthtime is fine to use as is
+		} else if (isWindows) {
+			if (typeof folderStat.birthtimeMs === 'number') {
+				ctime = Math.floor(folderStat.birthtimeMs); // Windows: fix precision issue in node.js 8.x to get 7.x results (see https://github.com/nodejs/node/issues/19897)
+			} else {
+				ctime = folderStat.birthtime.getTime();
+			}
+		}
+
+		// we use the ctime as extra salt to the ID so that we catch the case of a folder getting
+		// deleted and recreated. in that case we do not want to carry over previous state
+		return createHash('md5').update(folderUri.fsPath).update(ctime ? String(ctime) : '').digest('hex');
+	}
+
+	const folderId = getFolderId();
+	if (typeof folderId === 'string') {
+		return {
+			id: folderId,
+			uri: folderUri
+		};
+	}
+
+	return undefined; // invalid folder
+}
diff --git a/src/vs/platform/workspaces/electron-main/workspacesService.ts b/src/vs/platform/workspaces/electron-main/workspacesService.ts
deleted file mode 100644
index 8d1d22d9e..000000000
--- a/src/vs/platform/workspaces/electron-main/workspacesService.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { AddFirstParameterToFunctions } from 'vs/base/common/types';
-import { IWorkspacesService, IEnterWorkspaceResult, IWorkspaceFolderCreationData, IWorkspaceIdentifier, IRecentlyOpened, IRecent } from 'vs/platform/workspaces/common/workspaces';
-import { URI } from 'vs/base/common/uri';
-import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
-import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
-import { IWorkspacesHistoryMainService } from 'vs/platform/workspaces/electron-main/workspacesHistoryMainService';
-import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
-
-export class WorkspacesService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<unknown> /* only methods, not events */, number /* window ID */> {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(
-		@IWorkspacesMainService private readonly workspacesMainService: IWorkspacesMainService,
-		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-		@IWorkspacesHistoryMainService private readonly workspacesHistoryMainService: IWorkspacesHistoryMainService,
-		@IBackupMainService private readonly backupMainService: IBackupMainService
-	) {
-	}
-
-	//#region Workspace Management
-
-	async enterWorkspace(windowId: number, path: URI): Promise<IEnterWorkspaceResult | null> {
-		const window = this.windowsMainService.getWindowById(windowId);
-		if (window) {
-			return this.workspacesMainService.enterWorkspace(window, this.windowsMainService.getWindows(), path);
-		}
-
-		return null;
-	}
-
-	createUntitledWorkspace(windowId: number, folders?: IWorkspaceFolderCreationData[], remoteAuthority?: string): Promise<IWorkspaceIdentifier> {
-		return this.workspacesMainService.createUntitledWorkspace(folders, remoteAuthority);
-	}
-
-	deleteUntitledWorkspace(windowId: number, workspace: IWorkspaceIdentifier): Promise<void> {
-		return this.workspacesMainService.deleteUntitledWorkspace(workspace);
-	}
-
-	getWorkspaceIdentifier(windowId: number, workspacePath: URI): Promise<IWorkspaceIdentifier> {
-		return this.workspacesMainService.getWorkspaceIdentifier(workspacePath);
-	}
-
-	//#endregion
-
-	//#region Workspaces History
-
-	readonly onRecentlyOpenedChange = this.workspacesHistoryMainService.onRecentlyOpenedChange;
-
-	async getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
-		return this.workspacesHistoryMainService.getRecentlyOpened(this.windowsMainService.getWindowById(windowId));
-	}
-
-	async addRecentlyOpened(windowId: number, recents: IRecent[]): Promise<void> {
-		return this.workspacesHistoryMainService.addRecentlyOpened(recents);
-	}
-
-	async removeRecentlyOpened(windowId: number, paths: URI[]): Promise<void> {
-		return this.workspacesHistoryMainService.removeRecentlyOpened(paths);
-	}
-
-	async clearRecentlyOpened(windowId: number): Promise<void> {
-		return this.workspacesHistoryMainService.clearRecentlyOpened();
-	}
-
-	//#endregion
-
-
-	//#region Dirty Workspaces
-
-	async getDirtyWorkspaces(): Promise<Array<IWorkspaceIdentifier | URI>> {
-		return this.backupMainService.getDirtyWorkspaces();
-	}
-
-	//#endregion
-}
diff --git a/src/vs/platform/workspaces/test/common/workspaces.test.ts b/src/vs/platform/workspaces/test/common/workspaces.test.ts
new file mode 100644
index 000000000..2c0a75656
--- /dev/null
+++ b/src/vs/platform/workspaces/test/common/workspaces.test.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { URI } from 'vs/base/common/uri';
+import { hasWorkspaceFileExtension, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+
+suite('Workspaces', () => {
+	test('hasWorkspaceFileExtension', () => {
+		assert.strictEqual(hasWorkspaceFileExtension('something'), false);
+		assert.strictEqual(hasWorkspaceFileExtension('something.code-workspace'), true);
+	});
+
+	test('toWorkspaceIdentifier', () => {
+		let identifier = toWorkspaceIdentifier({ id: 'id', folders: [] });
+		assert.ok(!identifier);
+		assert.ok(!isSingleFolderWorkspaceIdentifier(identifier));
+		assert.ok(!isWorkspaceIdentifier(identifier));
+
+		identifier = toWorkspaceIdentifier({ id: 'id', folders: [{ index: 0, name: 'test', toResource: () => URI.file('test'), uri: URI.file('test') }] });
+		assert.ok(identifier);
+		assert.ok(isSingleFolderWorkspaceIdentifier(identifier));
+		assert.ok(!isWorkspaceIdentifier(identifier));
+
+		identifier = toWorkspaceIdentifier({ id: 'id', configuration: URI.file('test.code-workspace'), folders: [] });
+		assert.ok(identifier);
+		assert.ok(!isSingleFolderWorkspaceIdentifier(identifier));
+		assert.ok(isWorkspaceIdentifier(identifier));
+	});
+});
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
index c16373206..6f5027448 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesHistoryStorage.test.ts
@@ -17,25 +17,25 @@ function toWorkspace(uri: URI): IWorkspaceIdentifier {
 	};
 }
 function assertEqualURI(u1: URI | undefined, u2: URI | undefined, message?: string): void {
-	assert.equal(u1 && u1.toString(), u2 && u2.toString(), message);
+	assert.strictEqual(u1 && u1.toString(), u2 && u2.toString(), message);
 }
 
 function assertEqualWorkspace(w1: IWorkspaceIdentifier | undefined, w2: IWorkspaceIdentifier | undefined, message?: string): void {
 	if (!w1 || !w2) {
-		assert.equal(w1, w2, message);
+		assert.strictEqual(w1, w2, message);
 		return;
 	}
-	assert.equal(w1.id, w2.id, message);
+	assert.strictEqual(w1.id, w2.id, message);
 	assertEqualURI(w1.configPath, w2.configPath, message);
 }
 
 function assertEqualRecentlyOpened(actual: IRecentlyOpened, expected: IRecentlyOpened, message?: string) {
-	assert.equal(actual.files.length, expected.files.length, message);
+	assert.strictEqual(actual.files.length, expected.files.length, message);
 	for (let i = 0; i < actual.files.length; i++) {
 		assertEqualURI(actual.files[i].fileUri, expected.files[i].fileUri, message);
-		assert.equal(actual.files[i].label, expected.files[i].label);
+		assert.strictEqual(actual.files[i].label, expected.files[i].label);
 	}
-	assert.equal(actual.workspaces.length, expected.workspaces.length, message);
+	assert.strictEqual(actual.workspaces.length, expected.workspaces.length, message);
 	for (let i = 0; i < actual.workspaces.length; i++) {
 		let expectedRecent = expected.workspaces[i];
 		let actualRecent = actual.workspaces[i];
@@ -44,7 +44,7 @@ function assertEqualRecentlyOpened(actual: IRecentlyOpened, expected: IRecentlyO
 		} else {
 			assertEqualWorkspace(actualRecent.workspace, (<IRecentWorkspace>expectedRecent).workspace, message);
 		}
-		assert.equal(actualRecent.label, expectedRecent.label);
+		assert.strictEqual(actualRecent.label, expectedRecent.label);
 	}
 }
 
@@ -129,8 +129,5 @@ suite('History Storage', () => {
 		};
 
 		assertEqualRecentlyOpened(windowsState, expected, 'v1_33');
-
 	});
-
-
 });
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
similarity index 77%
rename from src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
rename to src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
index 07304aa32..2cbc34f48 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesManagementMainService.test.ts
@@ -10,15 +10,15 @@ import * as path from 'vs/base/common/path';
 import * as pfs from 'vs/base/node/pfs';
 import { EnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
-import { WorkspacesMainService, IStoredWorkspace } from 'vs/platform/workspaces/electron-main/workspacesMainService';
+import { WorkspacesManagementMainService, IStoredWorkspace, getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { WORKSPACE_EXTENSION, IRawFileWorkspaceFolder, IWorkspaceFolderCreationData, IRawUriWorkspaceFolder, rewriteWorkspaceFileForNewLocation, IWorkspaceIdentifier, IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { URI } from 'vs/base/common/uri';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { isWindows } from 'vs/base/common/platform';
 import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { dirname, joinPath } from 'vs/base/common/resources';
-import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
+import { dirname, extUriBiasedIgnorePathCase, joinPath } from 'vs/base/common/resources';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { IBackupMainService, IWorkspaceBackupInfo } from 'vs/platform/backup/electron-main/backup';
 import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
@@ -104,15 +104,7 @@ export class TestBackupMainService implements IBackupMainService {
 	}
 }
 
-suite('WorkspacesMainService', () => {
-	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'workspacesservice');
-	const untitledWorkspacesHomePath = path.join(parentDir, 'Workspaces');
-
-	class TestEnvironmentService extends EnvironmentMainService {
-		get untitledWorkspacesHome(): URI {
-			return URI.file(untitledWorkspacesHomePath);
-		}
-	}
+suite('WorkspacesManagementMainService', () => {
 
 	function createUntitledWorkspace(folders: string[], names?: string[]) {
 		return service.createUntitledWorkspace(folders.map((folder, index) => ({ uri: URI.file(folder), name: names ? names[index] : undefined } as IWorkspaceFolderCreationData)));
@@ -138,22 +130,31 @@ suite('WorkspacesMainService', () => {
 		return service.createUntitledWorkspaceSync(folders.map((folder, index) => ({ uri: URI.file(folder), name: names ? names[index] : undefined } as IWorkspaceFolderCreationData)));
 	}
 
-	const environmentService = new TestEnvironmentService(parseArgs(process.argv, OPTIONS));
-	const logService = new NullLogService();
-
-	let service: WorkspacesMainService;
+	let testDir: string;
+	let untitledWorkspacesHomePath: string;
+	let environmentService: EnvironmentMainService;
+	let service: WorkspacesManagementMainService;
 
 	setup(async () => {
-		service = new WorkspacesMainService(environmentService, logService, new TestBackupMainService(), new TestDialogMainService());
+		testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'workspacesmanagementmainservice');
+		untitledWorkspacesHomePath = path.join(testDir, 'Workspaces');
 
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(untitledWorkspacesHomePath, pfs.RimRafMode.MOVE);
+		environmentService = new class TestEnvironmentService extends EnvironmentMainService {
+			constructor() {
+				super(parseArgs(process.argv, OPTIONS));
+			}
+			get untitledWorkspacesHome(): URI {
+				return URI.file(untitledWorkspacesHomePath);
+			}
+		};
+
+		service = new WorkspacesManagementMainService(environmentService, new NullLogService(), new TestBackupMainService(), new TestDialogMainService());
 
 		return pfs.mkdirp(untitledWorkspacesHomePath);
 	});
 
 	teardown(() => {
-		return pfs.rimraf(untitledWorkspacesHomePath, pfs.RimRafMode.MOVE);
+		return pfs.rimraf(testDir);
 	});
 
 	function assertPathEquals(p1: string, p2: string): void {
@@ -162,11 +163,11 @@ suite('WorkspacesMainService', () => {
 			p2 = normalizeDriveLetter(p2);
 		}
 
-		assert.equal(p1, p2);
+		assert.strictEqual(p1, p2);
 	}
 
 	function assertEqualURI(u1: URI, u2: URI): void {
-		assert.equal(u1.toString(), u2.toString());
+		assert.strictEqual(u1.toString(), u2.toString());
 	}
 
 	test('createWorkspace (folders)', async () => {
@@ -176,7 +177,7 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = (JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 2);
+		assert.strictEqual(ws.folders.length, 2);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[0]).name);
@@ -190,11 +191,11 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = (JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 2);
+		assert.strictEqual(ws.folders.length, 2);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
+		assert.strictEqual((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
+		assert.strictEqual((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
 	});
 
 	test('createUntitledWorkspace (folders as other resource URIs)', async () => {
@@ -207,12 +208,12 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = (JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 2);
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[0]).uri, folder1URI.toString(true));
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[1]).uri, folder2URI.toString(true));
+		assert.strictEqual(ws.folders.length, 2);
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[0]).uri, folder1URI.toString(true));
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[1]).uri, folder2URI.toString(true));
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[0]).name);
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[1]).name);
-		assert.equal(ws.remoteAuthority, 'server');
+		assert.strictEqual(ws.remoteAuthority, 'server');
 	});
 
 	test('createWorkspaceSync (folders)', () => {
@@ -222,7 +223,7 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace;
-		assert.equal(ws.folders.length, 2);
+		assert.strictEqual(ws.folders.length, 2);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
@@ -237,12 +238,12 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace;
-		assert.equal(ws.folders.length, 2);
+		assert.strictEqual(ws.folders.length, 2);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, process.cwd());
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, os.tmpdir());
 
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
-		assert.equal((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
+		assert.strictEqual((<IRawFileWorkspaceFolder>ws.folders[0]).name, 'currentworkingdirectory');
+		assert.strictEqual((<IRawFileWorkspaceFolder>ws.folders[1]).name, 'tempdir');
 	});
 
 	test('createUntitledWorkspaceSync (folders as other resource URIs)', () => {
@@ -255,9 +256,9 @@ suite('WorkspacesMainService', () => {
 		assert.ok(service.isUntitledWorkspace(workspace));
 
 		const ws = JSON.parse(fs.readFileSync(workspace.configPath.fsPath).toString()) as IStoredWorkspace;
-		assert.equal(ws.folders.length, 2);
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[0]).uri, folder1URI.toString(true));
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[1]).uri, folder2URI.toString(true));
+		assert.strictEqual(ws.folders.length, 2);
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[0]).uri, folder1URI.toString(true));
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[1]).uri, folder2URI.toString(true));
 
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[0]).name);
 		assert.ok(!(<IRawFileWorkspaceFolder>ws.folders[1]).name);
@@ -273,7 +274,7 @@ suite('WorkspacesMainService', () => {
 		workspace.configPath = URI.file(newPath);
 
 		const resolved = service.resolveLocalWorkspaceSync(workspace.configPath);
-		assert.equal(2, resolved!.folders.length);
+		assert.strictEqual(2, resolved!.folders.length);
 		assertEqualURI(resolved!.configPath, workspace.configPath);
 		assert.ok(resolved!.id);
 		fs.writeFileSync(workspace.configPath.fsPath, JSON.stringify({ something: 'something' })); // invalid workspace
@@ -325,39 +326,39 @@ suite('WorkspacesMainService', () => {
 
 		let origConfigPath = URI.file(firstConfigPath);
 		let workspaceConfigPath = URI.file(path.join(tmpDir, 'inside', 'myworkspace1.code-workspace'));
-		let newContent = rewriteWorkspaceFileForNewLocation(origContent, origConfigPath, false, workspaceConfigPath);
+		let newContent = rewriteWorkspaceFileForNewLocation(origContent, origConfigPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		let ws = (JSON.parse(newContent) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 3);
+		assert.strictEqual(ws.folders.length, 3);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, folder1); // absolute path because outside of tmpdir
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, '.');
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, 'somefolder');
 
 		origConfigPath = workspaceConfigPath;
 		workspaceConfigPath = URI.file(path.join(tmpDir, 'myworkspace2.code-workspace'));
-		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath);
+		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		ws = (JSON.parse(newContent) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 3);
+		assert.strictEqual(ws.folders.length, 3);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, folder1);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, 'inside');
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, isWindows ? 'inside\\somefolder' : 'inside/somefolder');
 
 		origConfigPath = workspaceConfigPath;
 		workspaceConfigPath = URI.file(path.join(tmpDir, 'other', 'myworkspace2.code-workspace'));
-		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath);
+		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		ws = (JSON.parse(newContent) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 3);
+		assert.strictEqual(ws.folders.length, 3);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, folder1);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, isWindows ? '..\\inside' : '../inside');
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, isWindows ? '..\\inside\\somefolder' : '../inside/somefolder');
 
 		origConfigPath = workspaceConfigPath;
 		workspaceConfigPath = URI.parse('foo://foo/bar/myworkspace2.code-workspace');
-		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath);
+		newContent = rewriteWorkspaceFileForNewLocation(newContent, origConfigPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		ws = (JSON.parse(newContent) as IStoredWorkspace);
-		assert.equal(ws.folders.length, 3);
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[0]).uri, URI.file(folder1).toString(true));
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[1]).uri, URI.file(tmpInsideDir).toString(true));
-		assert.equal((<IRawUriWorkspaceFolder>ws.folders[2]).uri, URI.file(path.join(tmpInsideDir, 'somefolder')).toString(true));
+		assert.strictEqual(ws.folders.length, 3);
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[0]).uri, URI.file(folder1).toString(true));
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[1]).uri, URI.file(tmpInsideDir).toString(true));
+		assert.strictEqual((<IRawUriWorkspaceFolder>ws.folders[2]).uri, URI.file(path.join(tmpInsideDir, 'somefolder')).toString(true));
 
 		fs.unlinkSync(firstConfigPath);
 	});
@@ -369,8 +370,8 @@ suite('WorkspacesMainService', () => {
 		let origContent = fs.readFileSync(workspace.configPath.fsPath).toString();
 		origContent = `// this is a comment\n${origContent}`;
 
-		let newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, false, workspaceConfigPath);
-		assert.equal(0, newContent.indexOf('// this is a comment'));
+		let newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
+		assert.strictEqual(0, newContent.indexOf('// this is a comment'));
 		service.deleteUntitledWorkspaceSync(workspace);
 	});
 
@@ -381,26 +382,22 @@ suite('WorkspacesMainService', () => {
 		let origContent = fs.readFileSync(workspace.configPath.fsPath).toString();
 		origContent = origContent.replace(/[\\]/g, '/'); // convert backslash to slash
 
-		const newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, false, workspaceConfigPath);
+		const newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, false, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		const ws = (JSON.parse(newContent) as IStoredWorkspace);
 		assert.ok(ws.folders.every(f => (<IRawFileWorkspaceFolder>f).path.indexOf('\\') < 0));
 		service.deleteUntitledWorkspaceSync(workspace);
 	});
 
-	test.skip('rewriteWorkspaceFileForNewLocation (unc paths)', async () => {
-		if (!isWindows) {
-			return Promise.resolve();
-		}
-
+	(!isWindows ? test.skip : test)('rewriteWorkspaceFileForNewLocation (unc paths)', async () => {
 		const workspaceLocation = path.join(os.tmpdir(), 'wsloc');
 		const folder1Location = 'x:\\foo';
 		const folder2Location = '\\\\server\\share2\\some\\path';
-		const folder3Location = path.join(os.tmpdir(), 'wsloc', 'inner', 'more');
+		const folder3Location = path.join(workspaceLocation, 'inner', 'more');
 
 		const workspace = await createUntitledWorkspace([folder1Location, folder2Location, folder3Location]);
 		const workspaceConfigPath = URI.file(path.join(workspaceLocation, `myworkspace.${Date.now()}.${WORKSPACE_EXTENSION}`));
 		let origContent = fs.readFileSync(workspace.configPath.fsPath).toString();
-		const newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, false, workspaceConfigPath);
+		const newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, true, workspaceConfigPath, extUriBiasedIgnorePathCase);
 		const ws = (JSON.parse(newContent) as IStoredWorkspace);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, folder1Location);
 		assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, folder2Location);
@@ -422,17 +419,15 @@ suite('WorkspacesMainService', () => {
 	});
 
 	test('getUntitledWorkspaceSync', async function () {
-		this.retries(3);
-
 		let untitled = service.getUntitledWorkspacesSync();
-		assert.equal(untitled.length, 0);
+		assert.strictEqual(untitled.length, 0);
 
 		const untitledOne = await createUntitledWorkspace([process.cwd(), os.tmpdir()]);
 		assert.ok(fs.existsSync(untitledOne.configPath.fsPath));
 
 		untitled = service.getUntitledWorkspacesSync();
-		assert.equal(1, untitled.length);
-		assert.equal(untitledOne.id, untitled[0].workspace.id);
+		assert.strictEqual(1, untitled.length);
+		assert.strictEqual(untitledOne.id, untitled[0].workspace.id);
 
 		const untitledTwo = await createUntitledWorkspace([os.tmpdir(), process.cwd()]);
 		assert.ok(fs.existsSync(untitledTwo.configPath.fsPath));
@@ -444,14 +439,50 @@ suite('WorkspacesMainService', () => {
 		if (untitled.length === 1) {
 			assert.fail(`Unexpected workspaces count of 1 (expected 2), all workspaces:\n ${fs.readdirSync(untitledHome.fsPath).map(name => fs.readFileSync(joinPath(untitledHome, name, 'workspace.json').fsPath, 'utf8'))}, before getUntitledWorkspacesSync: ${beforeGettingUntitledWorkspaces}`);
 		}
-		assert.equal(2, untitled.length);
+		assert.strictEqual(2, untitled.length);
 
 		service.deleteUntitledWorkspaceSync(untitledOne);
 		untitled = service.getUntitledWorkspacesSync();
-		assert.equal(1, untitled.length);
+		assert.strictEqual(1, untitled.length);
 
 		service.deleteUntitledWorkspaceSync(untitledTwo);
 		untitled = service.getUntitledWorkspacesSync();
-		assert.equal(0, untitled.length);
+		assert.strictEqual(0, untitled.length);
+	});
+
+	test('getSingleWorkspaceIdentifier', async function () {
+		const nonLocalUri = URI.parse('myscheme://server/work/p/f1');
+		const nonLocalUriId = getSingleFolderWorkspaceIdentifier(nonLocalUri);
+		assert.ok(nonLocalUriId?.id);
+
+		const localNonExistingUri = URI.file(path.join(testDir, 'f1'));
+		const localNonExistingUriId = getSingleFolderWorkspaceIdentifier(localNonExistingUri);
+		assert.ok(!localNonExistingUriId);
+
+		fs.mkdirSync(path.join(testDir, 'f1'));
+
+		const localExistingUri = URI.file(path.join(testDir, 'f1'));
+		const localExistingUriId = getSingleFolderWorkspaceIdentifier(localExistingUri);
+		assert.ok(localExistingUriId?.id);
+	});
+
+	test('workspace identifiers are stable', function () {
+
+		// workspace identifier (local)
+		assert.strictEqual(getWorkspaceIdentifier(URI.file('/hello/test')).id, isWindows  /* slash vs backslash */ ? '9f3efb614e2cd7924e4b8076e6c72233' : 'e36736311be12ff6d695feefe415b3e8');
+
+		// single folder identifier (local)
+		const fakeStat = {
+			ino: 1611312115129,
+			birthtimeMs: 1611312115129,
+			birthtime: new Date(1611312115129)
+		};
+		assert.strictEqual(getSingleFolderWorkspaceIdentifier(URI.file('/hello/test'), fakeStat as fs.Stats)?.id, isWindows /* slash vs backslash */ ? '9a8441e897e5174fa388bc7ef8f7a710' : '1d726b3d516dc2a6d343abf4797eaaef');
+
+		// workspace identifier (remote)
+		assert.strictEqual(getWorkspaceIdentifier(URI.parse('vscode-remote:/hello/test')).id, '786de4f224d57691f218dc7f31ee2ee3');
+
+		// single folder identifier (remote)
+		assert.strictEqual(getSingleFolderWorkspaceIdentifier(URI.parse('vscode-remote:/hello/test'))?.id, '786de4f224d57691f218dc7f31ee2ee3');
 	});
 });
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index e1c2dd30c..7c5c6828b 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1450,6 +1450,21 @@ declare module 'vscode' {
 		dispose(): void;
 	}
 
+	/**
+	 * An error type that should be used to signal cancellation of an operation.
+	 *
+	 * This type can be used in response to a [cancellation token](#CancellationToken)
+	 * being cancelled or when an operation is being cancelled by the
+	 * executor of that operation.
+	 */
+	export class CancellationError extends Error {
+
+		/**
+		 * Creates a new cancellation error.
+		 */
+		constructor();
+	}
+
 	/**
 	 * Represents a type which can release resources, such
 	 * as event listening or a timer.
@@ -1700,8 +1715,8 @@ declare module 'vscode' {
 	/**
 	 * Options to configure the behaviour of a file open dialog.
 	 *
-	 * * Note 1: A dialog can select files, folders, or both. This is not true for Windows
-	 * which enforces to open either files or folder, but *not both*.
+	 * * Note 1: On Windows and Linux, a file dialog cannot be both a file selector and a folder selector, so if you
+	 * set both `canSelectFiles` and `canSelectFolders` to `true` on these platforms, a folder selector will be shown.
 	 * * Note 2: Explicitly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
 	 * and the editor then silently adjusts the options to select files.
 	 */
@@ -3870,8 +3885,8 @@ declare module 'vscode' {
 		 *
 		 * Note that `sortText` is only used for the initial ordering of completion
 		 * items. When having a leading word (prefix) ordering is based on how
-		 * well completion match that prefix and the initial ordering is only used
-		 * when completions match equal. The prefix is defined by the
+		 * well completions match that prefix and the initial ordering is only used
+		 * when completions match equally well. The prefix is defined by the
 		 * [`range`](#CompletionItem.range)-property and can therefore be different
 		 * for each completion.
 		 */
@@ -3884,7 +3899,6 @@ declare module 'vscode' {
 		 *
 		 * Note that the filter text is matched against the leading word (prefix) which is defined
 		 * by the [`range`](#CompletionItem.range)-property.
-		 * prefix.
 		 */
 		filterText?: string;
 
@@ -4683,6 +4697,10 @@ declare module 'vscode' {
 		 * This rule will only execute if the text after the cursor matches this regular expression.
 		 */
 		afterText?: RegExp;
+		/**
+		 * This rule will only execute if the text above the current line matches this regular expression.
+		 */
+		previousLineText?: RegExp;
 		/**
 		 * The action to execute.
 		 */
@@ -5173,9 +5191,9 @@ declare module 'vscode' {
 		set(uri: Uri, diagnostics: ReadonlyArray<Diagnostic> | undefined): void;
 
 		/**
-		 * Replace all entries in this collection.
+		 * Replace diagnostics for multiple resources in this collection.
 		 *
-		 * Diagnostics of multiple tuples of the same uri will be merged, e.g
+		 *  _Note_ that multiple tuples of the same uri will be merged, e.g
 		 * `[[file1, [d1]], [file1, [d2]]]` is equivalent to `[[file1, [d1, d2]]]`.
 		 * If a diagnostics item is `undefined` as in `[file1, undefined]`
 		 * all previous but not subsequent diagnostics are removed.
@@ -5419,6 +5437,18 @@ declare module 'vscode' {
 		 */
 		color: string | ThemeColor | undefined;
 
+		/**
+		 * The background color for this entry.
+		 *
+		 * *Note*: only `new ThemeColor('statusBarItem.errorBackground')` is
+		 * supported for now. More background colors may be supported in the
+		 * future.
+		 *
+		 * *Note*: when a background color is set, the statusbar may override
+		 * the `color` choice to ensure the entry is readable in all themes.
+		 */
+		backgroundColor: ThemeColor | undefined;
+
 		/**
 		 * [`Command`](#Command) or identifier of a command to run on click.
 		 *
@@ -5795,6 +5825,11 @@ declare module 'vscode' {
 			setKeysForSync(keys: string[]): void;
 		};
 
+		/**
+		 * A storage utility for secrets.
+		 */
+		readonly secrets: SecretStorage;
+
 		/**
 		 * The uri of the directory containing the extension.
 		 */
@@ -5932,6 +5967,48 @@ declare module 'vscode' {
 		update(key: string, value: any): Thenable<void>;
 	}
 
+	/**
+	 * The event data that is fired when a secret is added or removed.
+	 */
+	export interface SecretStorageChangeEvent {
+		/**
+		 * The key of the secret that has changed.
+		 */
+		readonly key: string;
+	}
+
+	/**
+	 * Represents a storage utility for secrets, information that is
+	 * sensitive.
+	 */
+	export interface SecretStorage {
+		/**
+		 * Retrieve a secret that was stored with key. Returns undefined if there
+		 * is no password matching that key.
+		 * @param key The key the secret was stored under.
+		 * @returns The stored value or `undefined`.
+		 */
+		get(key: string): Thenable<string | undefined>;
+
+		/**
+		 * Store a secret under a given key.
+		 * @param key The key to store the secret under.
+		 * @param value The secret.
+		 */
+		store(key: string, value: string): Thenable<void>;
+
+		/**
+		 * Remove a secret from storage.
+		 * @param key The key the secret was stored under.
+		 */
+		delete(key: string): Thenable<void>;
+
+		/**
+		 * Fires when a secret is stored or deleted.
+		 */
+		onDidChange: Event<SecretStorageChangeEvent>;
+	}
+
 	/**
 	 * Represents a color theme kind.
 	 */
@@ -7732,7 +7809,7 @@ declare module 'vscode' {
 		 * your extension should first check to see if any backups exist for the resource. If there is a backup, your
 		 * extension should load the file contents from there instead of from the resource in the workspace.
 		 *
-		 * `backup` is triggered approximately one second after the the user stops editing the document. If the user
+		 * `backup` is triggered approximately one second after the user stops editing the document. If the user
 		 * rapidly edits the document, `backup` will not be invoked until the editing stops.
 		 *
 		 * `backup` is not invoked when `auto save` is enabled (since auto save already persists the resource).
@@ -8855,7 +8932,8 @@ declare module 'vscode' {
 		getParent?(element: T): ProviderResult<T>;
 
 		/**
-		 * Called only on hover to resolve the [TreeItem](#TreeItem.tooltip) property if it is undefined.
+		 * Called on hover to resolve the [TreeItem](#TreeItem.tooltip) property if it is undefined.
+		 * Called on tree item click/open to resolve the [TreeItem](#TreeItem.command) property if it is undefined.
 		 * Only properties that were undefined can be resolved in `resolveTreeItem`.
 		 * Functionality may be expanded later to include being called to resolve other missing
 		 * properties on selection and/or on open.
@@ -8865,15 +8943,16 @@ declare module 'vscode' {
 		 * onDidChangeTreeData should not be triggered from within resolveTreeItem.
 		 *
 		 * *Note* that this function is called when tree items are already showing in the UI.
-		 * Because of that, no property that changes the presentation (label, description, command, etc.)
+		 * Because of that, no property that changes the presentation (label, description, etc.)
 		 * can be changed.
 		 *
-		 * @param element The object associated with the TreeItem
 		 * @param item Undefined properties of `item` should be set then `item` should be returned.
+		 * @param element The object associated with the TreeItem.
+		 * @param token A cancellation token.
 		 * @return The resolved tree item or a thenable that resolves to such. It is OK to return the given
 		 * `item`. When no result is returned, the given `item` will be used.
 		 */
-		resolveTreeItem?(item: TreeItem, element: T): ProviderResult<TreeItem>;
+		resolveTreeItem?(item: TreeItem, element: T, token: CancellationToken): ProviderResult<TreeItem>;
 	}
 
 	export class TreeItem {
@@ -9194,7 +9273,7 @@ declare module 'vscode' {
 		 * Implement to handle when the number of rows and columns that fit into the terminal panel
 		 * changes, for example when font size changes or when the panel is resized. The initial
 		 * state of a terminal's dimensions should be treated as `undefined` until this is triggered
-		 * as the size of a terminal isn't know until it shows up in the user interface.
+		 * as the size of a terminal isn't known until it shows up in the user interface.
 		 *
 		 * When dimensions are overridden by
 		 * [onDidOverrideDimensions](#Pseudoterminal.onDidOverrideDimensions), `setDimensions` will
@@ -11865,8 +11944,6 @@ declare module 'vscode' {
 		export const onDidChange: Event<void>;
 	}
 
-	//#region Comments
-
 	/**
 	 * Collapsible state of a [comment thread](#CommentThread)
 	 */
@@ -12133,7 +12210,7 @@ declare module 'vscode' {
 		/**
 		 * Optional reaction handler for creating and deleting reactions on a [comment](#Comment).
 		 */
-		reactionHandler?: (comment: Comment, reaction: CommentReaction) => Promise<void>;
+		reactionHandler?: (comment: Comment, reaction: CommentReaction) => Thenable<void>;
 
 		/**
 		 * Dispose this comment controller.
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 19e8d8f10..0aa96cf73 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -16,7 +16,7 @@
 
 declare module 'vscode' {
 
-	// #region auth provider: https://github.com/microsoft/vscode/issues/88309
+	//#region auth provider: https://github.com/microsoft/vscode/issues/88309
 
 	/**
 	 * An [event](#Event) which fires when an [AuthenticationProvider](#AuthenticationProvider) is added or removed.
@@ -54,28 +54,9 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * **WARNING** When writing an AuthenticationProvider, `id` should be treated as part of your extension's
-	 * API, changing it is a breaking change for all extensions relying on the provider. The id is
-	 * treated case-sensitively.
+	 * A provider for performing authentication to a service.
 	 */
 	export interface AuthenticationProvider {
-		/**
-		 * Used as an identifier for extensions trying to work with a particular
-		 * provider: 'microsoft', 'github', etc. id must be unique, registering
-		 * another provider with the same id will fail.
-		 */
-		readonly id: string;
-
-		/**
-		 * The human-readable name of the provider.
-		 */
-		readonly label: string;
-
-		/**
-		 * Whether it is possible to be signed into multiple accounts at once with this provider
-		*/
-		readonly supportsMultipleAccounts: boolean;
-
 		/**
 		 * An [event](#Event) which fires when the array of sessions has changed, or data
 		 * within a session has changed.
@@ -85,31 +66,48 @@ declare module 'vscode' {
 		/**
 		 * Returns an array of current sessions.
 		 */
+		// eslint-disable-next-line vscode-dts-provider-naming
 		getSessions(): Thenable<ReadonlyArray<AuthenticationSession>>;
 
 		/**
 		 * Prompts a user to login.
 		 */
+		// eslint-disable-next-line vscode-dts-provider-naming
 		login(scopes: string[]): Thenable<AuthenticationSession>;
 
 		/**
 		 * Removes the session corresponding to session id.
 		 * @param sessionId The session id to log out of
 		 */
+		// eslint-disable-next-line vscode-dts-provider-naming
 		logout(sessionId: string): Thenable<void>;
 	}
 
+	/**
+	 * Options for creating an [AuthenticationProvider](#AuthentcationProvider).
+	 */
+	export interface AuthenticationProviderOptions {
+		/**
+		 * Whether it is possible to be signed into multiple accounts at once with this provider.
+		 * If not specified, will default to false.
+		*/
+		readonly supportsMultipleAccounts?: boolean;
+	}
+
 	export namespace authentication {
 		/**
 		 * Register an authentication provider.
 		 *
 		 * There can only be one provider per id and an error is being thrown when an id
-		 * has already been used by another provider.
+		 * has already been used by another provider. Ids are case-sensitive.
 		 *
+		 * @param id The unique identifier of the provider.
+		 * @param label The human-readable name of the provider.
 		 * @param provider The authentication provider provider.
+		 * @params options Additional options for the provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerAuthenticationProvider(provider: AuthenticationProvider): Disposable;
+		export function registerAuthenticationProvider(id: string, label: string, provider: AuthenticationProvider, options?: AuthenticationProviderOptions): Disposable;
 
 		/**
 		 * @deprecated - getSession should now trigger extension activation.
@@ -117,63 +115,32 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeAuthenticationProviders: Event<AuthenticationProvidersChangeEvent>;
 
-		/**
-		 * @deprecated
-		 * The ids of the currently registered authentication providers.
-		 * @returns An array of the ids of authentication providers that are currently registered.
-		 */
-		export function getProviderIds(): Thenable<ReadonlyArray<string>>;
-
-		/**
-		 * @deprecated
-		 * An array of the ids of authentication providers that are currently registered.
-		 */
-		export const providerIds: ReadonlyArray<string>;
-
 		/**
 		 * An array of the information of authentication providers that are currently registered.
 		 */
 		export const providers: ReadonlyArray<AuthenticationProviderInformation>;
 
 		/**
-		 * @deprecated
 		* Logout of a specific session.
 		* @param providerId The id of the provider to use
 		* @param sessionId The session id to remove
 		* provider
 		*/
 		export function logout(providerId: string, sessionId: string): Thenable<void>;
-
-		/**
-		 * Retrieve a password that was stored with key. Returns undefined if there
-		 * is no password matching that key.
-		 * @param key The key the password was stored under.
-		 */
-		export function getPassword(key: string): Thenable<string | undefined>;
-
-		/**
-		 * Store a password under a given key.
-		 * @param key The key to store the password under
-		 * @param value The password
-		 */
-		export function setPassword(key: string, value: string): Thenable<void>;
-
-		/**
-		 * Remove a password from storage.
-		 * @param key The key the password was stored under.
-		 */
-		export function deletePassword(key: string): Thenable<void>;
-
-		/**
-		 * Fires when a password is set or deleted.
-		 */
-		export const onDidChangePassword: Event<void>;
 	}
 
 	//#endregion
 
+	// eslint-disable-next-line vscode-dts-region-comments
 	//#region @alexdima - resolvers
 
+	export interface MessageOptions {
+		/**
+		 * Do not render a native message box.
+		 */
+		useCustom?: boolean;
+	}
+
 	export interface RemoteAuthorityResolverContext {
 		resolveAttempt: number;
 	}
@@ -195,18 +162,20 @@ declare module 'vscode' {
 		// The desired local port. If this port can't be used, then another will be chosen.
 		localAddressPort?: number;
 		label?: string;
+		public?: boolean;
 	}
 
 	export interface TunnelDescription {
 		remoteAddress: { port: number, host: string; };
 		//The complete local address(ex. localhost:1234)
 		localAddress: { port: number, host: string; } | string;
+		public?: boolean;
 	}
 
 	export interface Tunnel extends TunnelDescription {
 		// Implementers of Tunnel should fire onDidDispose when dispose is called.
 		onDidDispose: Event<void>;
-		dispose(): void;
+		dispose(): void | Thenable<void>;
 	}
 
 	/**
@@ -251,10 +220,19 @@ declare module 'vscode' {
 		 */
 		tunnelFactory?: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => Thenable<Tunnel> | undefined;
 
-		/**
+		/**p
 		 * Provides filtering for candidate ports.
 		 */
 		showCandidatePort?: (host: string, port: number, detail: string) => Thenable<boolean>;
+
+		/**
+		 * Lets the resolver declare which tunnel factory features it supports.
+		 * UNDER DISCUSSION! MAY CHANGE SOON.
+		 */
+		tunnelFeatures?: {
+			elevation: boolean;
+			public: boolean;
+		};
 	}
 
 	export namespace workspace {
@@ -751,6 +729,7 @@ declare module 'vscode' {
 
 	//#endregion
 
+	// eslint-disable-next-line vscode-dts-region-comments
 	//#region debug
 
 	/**
@@ -771,8 +750,7 @@ declare module 'vscode' {
 
 	//#endregion
 
-
-
+	// eslint-disable-next-line vscode-dts-region-comments
 	//#region @joaomoreno: SCM validation
 
 	/**
@@ -823,6 +801,7 @@ declare module 'vscode' {
 
 	//#endregion
 
+	// eslint-disable-next-line vscode-dts-region-comments
 	//#region @joaomoreno: SCM selected provider
 
 	export interface SourceControl {
@@ -898,6 +877,7 @@ declare module 'vscode' {
 
 	//#endregion
 
+	// eslint-disable-next-line vscode-dts-region-comments
 	//#region @jrieken -> exclusive document filters
 
 	export interface DocumentFilter {
@@ -906,18 +886,9 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region @alexdima - OnEnter enhancement
-	export interface OnEnterRule {
-		/**
-		 * This rule will only execute if the text above the this line matches this regular expression.
-		 */
-		oneLineAboveText?: RegExp;
-	}
-	//#endregion
-
-	//#region Tree View: https://github.com/microsoft/vscode/issues/61313
+	//#region Tree View: https://github.com/microsoft/vscode/issues/61313 @alexr00
 	export interface TreeView<T> extends Disposable {
-		reveal(element: T | undefined, options?: { select?: boolean, focus?: boolean, expand?: boolean | number }): Thenable<void>;
+		reveal(element: T | undefined, options?: { select?: boolean, focus?: boolean, expand?: boolean | number; }): Thenable<void>;
 	}
 	//#endregion
 
@@ -1001,6 +972,7 @@ declare module 'vscode' {
 		 *
 		 * @return Thenable indicating that the webview editor has been moved.
 		 */
+		// eslint-disable-next-line vscode-dts-provider-naming
 		moveCustomTextEditor?(newDocument: TextDocument, existingWebviewPanel: WebviewPanel, token: CancellationToken): Thenable<void>;
 	}
 
@@ -1017,7 +989,7 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region @rebornix: Notebook
+	//#region notebook https://github.com/microsoft/vscode/issues/106744
 
 	export enum CellKind {
 		Markdown = 1,
@@ -1055,7 +1027,7 @@ declare module 'vscode' {
 		/**
 		 * Additional attributes of a cell metadata.
 		 */
-		custom?: { [key: string]: any };
+		custom?: { [key: string]: any; };
 	}
 
 	export interface CellDisplayOutput {
@@ -1179,7 +1151,7 @@ declare module 'vscode' {
 		/**
 		 * Additional attributes of a cell metadata.
 		 */
-		custom?: { [key: string]: any };
+		custom?: { [key: string]: any; };
 	}
 
 	export interface NotebookCell {
@@ -1229,7 +1201,7 @@ declare module 'vscode' {
 		/**
 		 * Additional attributes of the document metadata.
 		 */
-		custom?: { [key: string]: any };
+		custom?: { [key: string]: any; };
 
 		/**
 		 * The document's current run state
@@ -1241,6 +1213,11 @@ declare module 'vscode' {
 		 * When false, insecure outputs like HTML, JavaScript, SVG will not be rendered.
 		 */
 		trusted?: boolean;
+
+		/**
+		 * Languages the document supports
+		 */
+		languages?: string[];
 	}
 
 	export interface NotebookDocumentContentOptions {
@@ -1286,7 +1263,7 @@ declare module 'vscode' {
 
 		locationAt(positionOrRange: Position | Range): Location;
 		positionAt(location: Location): Position;
-		contains(uri: Uri): boolean
+		contains(uri: Uri): boolean;
 	}
 
 	export interface WorkspaceEdit {
@@ -1320,11 +1297,17 @@ declare module 'vscode' {
 		 * The range will always be revealed in the center of the viewport.
 		 */
 		InCenter = 1,
+
 		/**
 		 * If the range is outside the viewport, it will be revealed in the center of the viewport.
 		 * Otherwise, it will be revealed with as little scrolling as possible.
 		 */
 		InCenterIfOutsideViewport = 2,
+
+		/**
+		 * The range will always be revealed at the top of the viewport.
+		 */
+		AtTop = 3
 	}
 
 	export interface NotebookEditor {
@@ -1589,11 +1572,17 @@ declare module 'vscode' {
 		 * Content providers should always use [file system providers](#FileSystemProvider) to
 		 * resolve the raw content for `uri` as the resouce is not necessarily a file on disk.
 		 */
-		openNotebook(uri: Uri, openContext: NotebookDocumentOpenContext): NotebookData | Promise<NotebookData>;
-		resolveNotebook(document: NotebookDocument, webview: NotebookCommunication): Promise<void>;
-		saveNotebook(document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
-		saveNotebookAs(targetResource: Uri, document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
-		backupNotebook(document: NotebookDocument, context: NotebookDocumentBackupContext, cancellation: CancellationToken): Promise<NotebookDocumentBackup>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		openNotebook(uri: Uri, openContext: NotebookDocumentOpenContext): NotebookData | Thenable<NotebookData>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		// eslint-disable-next-line vscode-dts-cancellation
+		resolveNotebook(document: NotebookDocument, webview: NotebookCommunication): Thenable<void>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		saveNotebook(document: NotebookDocument, cancellation: CancellationToken): Thenable<void>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		saveNotebookAs(targetResource: Uri, document: NotebookDocument, cancellation: CancellationToken): Thenable<void>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		backupNotebook(document: NotebookDocument, context: NotebookDocumentBackupContext, cancellation: CancellationToken): Thenable<NotebookDocumentBackup>;
 	}
 
 	export interface NotebookKernel {
@@ -1609,7 +1598,7 @@ declare module 'vscode' {
 		cancelAllCellsExecution(document: NotebookDocument): void;
 	}
 
-	export type NotebookFilenamePattern = GlobPattern | { include: GlobPattern; exclude: GlobPattern };
+	export type NotebookFilenamePattern = GlobPattern | { include: GlobPattern; exclude: GlobPattern; };
 
 	export interface NotebookDocumentFilter {
 		viewType?: string | string[];
@@ -1692,7 +1681,7 @@ declare module 'vscode' {
 		): Disposable;
 
 		export function createNotebookEditorDecorationType(options: NotebookDecorationRenderOptions): NotebookEditorDecorationType;
-		export function openNotebookDocument(uri: Uri, viewType?: string): Promise<NotebookDocument>;
+		export function openNotebookDocument(uri: Uri, viewType?: string): Thenable<NotebookDocument>;
 		export const onDidOpenNotebookDocument: Event<NotebookDocument>;
 		export const onDidCloseNotebookDocument: Event<NotebookDocument>;
 		export const onDidSaveNotebookDocument: Event<NotebookDocument>;
@@ -1715,7 +1704,7 @@ declare module 'vscode' {
 		 */
 		export function createConcatTextDocument(notebook: NotebookDocument, selector?: DocumentSelector): NotebookConcatTextDocument;
 
-		export const onDidChangeActiveNotebookKernel: Event<{ document: NotebookDocument, kernel: NotebookKernel | undefined }>;
+		export const onDidChangeActiveNotebookKernel: Event<{ document: NotebookDocument, kernel: NotebookKernel | undefined; }>;
 
 		/**
 		 * Creates a notebook cell status bar [item](#NotebookCellStatusBarItem).
@@ -1736,7 +1725,7 @@ declare module 'vscode' {
 		export const onDidChangeActiveNotebookEditor: Event<NotebookEditor | undefined>;
 		export const onDidChangeNotebookEditorSelection: Event<NotebookEditorSelectionChangeEvent>;
 		export const onDidChangeNotebookEditorVisibleRanges: Event<NotebookEditorVisibleRangesChangeEvent>;
-		export function showNotebookDocument(document: NotebookDocument, options?: NotebookDocumentShowOptions): Promise<NotebookEditor>;
+		export function showNotebookDocument(document: NotebookDocument, options?: NotebookDocumentShowOptions): Thenable<NotebookEditor>;
 	}
 
 	//#endregion
@@ -1947,11 +1936,88 @@ declare module 'vscode' {
 	}
 
 	export namespace languages {
-		export function getTokenInformationAtPosition(document: TextDocument, position: Position): Promise<TokenInformation>;
+		export function getTokenInformationAtPosition(document: TextDocument, position: Position): Thenable<TokenInformation>;
 	}
 
 	//#endregion
 
+	//#region https://github.com/microsoft/vscode/issues/16221
+
+	export namespace languages {
+		/**
+		 * Register a inline hints provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider An inline hints provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerInlineHintsProvider(selector: DocumentSelector, provider: InlineHintsProvider): Disposable;
+	}
+
+	/**
+	 * Inline hint information.
+	 */
+	export class InlineHint {
+		/**
+		 * The text of the hint.
+		 */
+		text: string;
+		/**
+		 * The range of the hint.
+		 */
+		range: Range;
+		/**
+		 * Tooltip when hover on the hint.
+		 */
+		description?: string | MarkdownString;
+		/**
+		 * Whitespace before the hint.
+		 */
+		whitespaceBefore?: boolean;
+		/**
+		 * Whitespace after the hint.
+		 */
+		whitespaceAfter?: boolean;
+
+		/**
+		 * Creates a new inline hint information object.
+		 *
+		 * @param text The text of the hint.
+		 * @param range The range of the hint.
+		 * @param hoverMessage Tooltip when hover on the hint.
+		 * @param whitespaceBefore Whitespace before the hint.
+		 * @param whitespaceAfter TWhitespace after the hint.
+		 */
+		constructor(text: string, range: Range, description?: string | MarkdownString, whitespaceBefore?: boolean, whitespaceAfter?: boolean);
+	}
+
+	/**
+	 * The inline hints provider interface defines the contract between extensions and
+	 * the inline hints feature.
+	 */
+	export interface InlineHintsProvider {
+
+		/**
+		 * An optional event to signal that inline hints have changed.
+		 * @see [EventEmitter](#EventEmitter)
+		 */
+		onDidChangeInlineHints?: Event<void>;
+
+		/**
+		 * @param model The document in which the command was invoked.
+		 * @param range The range for which line hints should be computed.
+		 * @param token A cancellation token.
+		 *
+		 * @return A list of arguments labels or a thenable that resolves to such.
+		 */
+		provideInlineHints(model: TextDocument, range: Range, token: CancellationToken): ProviderResult<InlineHint[]>;
+	}
+	//#endregion
+
 	//#region https://github.com/microsoft/vscode/issues/104436
 
 	export enum ExtensionRuntime {
@@ -1971,7 +2037,6 @@ declare module 'vscode' {
 
 	//#endregion
 
-
 	//#region https://github.com/microsoft/vscode/issues/102091
 
 	export interface TextDocument {
@@ -2004,7 +2069,7 @@ declare module 'vscode' {
 		 * Runs tests with the given options. If no options are given, then
 		 * all tests are run. Returns the resulting test run.
 		 */
-		export function runTests<T extends TestItem>(options: TestRunOptions<T>): Thenable<void>;
+		export function runTests<T extends TestItem>(options: TestRunOptions<T>, cancellationToken?: CancellationToken): Thenable<void>;
 
 		/**
 		 * Returns an observer that retrieves tests in the given workspace folder.
@@ -2015,13 +2080,31 @@ declare module 'vscode' {
 		 * Returns an observer that retrieves tests in the given text document.
 		 */
 		export function createDocumentTestObserver(document: TextDocument): TestObserver;
+
+		/**
+		 * The last or selected test run. Cleared when a new test run starts.
+		 */
+		export const testResults: TestResults | undefined;
+
+		/**
+		 * Event that fires when the testResults are updated.
+		 */
+		export const onDidChangeTestResults: Event<void>;
+	}
+
+	export interface TestResults {
+		/**
+		 * The results from the latest test run. The array contains a snapshot of
+		 * all tests involved in the run at the moment when it completed.
+		 */
+		readonly tests: ReadonlyArray<RequiredTestItem> | undefined;
 	}
 
 	export interface TestObserver {
 		/**
 		 * List of tests returned by test provider for files in the workspace.
 		 */
-		readonly tests: ReadonlyArray<TestItem>;
+		readonly tests: ReadonlyArray<RequiredTestItem>;
 
 		/**
 		 * An event that fires when an existing test in the collection changes, or
@@ -2051,23 +2134,23 @@ declare module 'vscode' {
 		/**
 		 * List of all tests that are newly added.
 		 */
-		readonly added: ReadonlyArray<TestItem>;
+		readonly added: ReadonlyArray<RequiredTestItem>;
 
 		/**
 		 * List of existing tests that have updated.
 		 */
-		readonly updated: ReadonlyArray<TestItem>;
+		readonly updated: ReadonlyArray<RequiredTestItem>;
 
 		/**
 		 * List of existing tests that have been removed.
 		 */
-		readonly removed: ReadonlyArray<TestItem>;
+		readonly removed: ReadonlyArray<RequiredTestItem>;
 
 		/**
 		 * Highest node in the test tree under which changes were made. This can
 		 * be easily plugged into events like the TreeDataProvider update event.
 		 */
-		readonly commonChangeAncestor: TestItem | null;
+		readonly commonChangeAncestor: RequiredTestItem | null;
 	}
 
 	/**
@@ -2094,13 +2177,11 @@ declare module 'vscode' {
 		readonly onDidChangeTest: Event<T>;
 
 		/**
-		 * An event that should be fired when all tests that are currently defined
-		 * have been discovered. The provider should continue to watch for changes
-		 * and fire `onDidChangeTest` until the hierarchy is disposed.
-		 *
-		 * @todo can this be covered by existing progress apis? Or return a promise
+		 * Promise that should be resolved when all tests that are initially
+		 * defined have been discovered. The provider should continue to watch for
+		 * changes and fire `onDidChangeTest` until the hierarchy is disposed.
 		 */
-		readonly onDidDiscoverInitialTests: Event<void>;
+		readonly discoveredInitialTests?: Thenable<unknown>;
 
 		/**
 		 * Dispose will be called when there are no longer observers interested
@@ -2129,20 +2210,23 @@ declare module 'vscode' {
 		 * It's guaranteed that this method will not be called again while
 		 * there is a previous undisposed watcher for the given workspace folder.
 		 */
-		createWorkspaceTestHierarchy?(workspace: WorkspaceFolder): TestHierarchy<T>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		createWorkspaceTestHierarchy?(workspace: WorkspaceFolder): TestHierarchy<T> | undefined;
 
 		/**
 		 * Requests that tests be provided for the given document. This will
 		 * be called when tests need to be enumerated for a single open file,
 		 * for instance by code lens UI.
 		 */
-		createDocumentTestHierarchy?(document: TextDocument): TestHierarchy<T>;
+		// eslint-disable-next-line vscode-dts-provider-naming
+		createDocumentTestHierarchy?(document: TextDocument): TestHierarchy<T> | undefined;
 
 		/**
 		 * Starts a test run. This should cause {@link onDidChangeTest} to
 		 * fire with update test states during the run.
 		 * @todo this will eventually need to be able to return a summary report, coverage for example.
 		 */
+		// eslint-disable-next-line vscode-dts-provider-naming
 		runTests?(options: TestRunOptions<T>, cancellationToken: CancellationToken): ProviderResult<void>;
 	}
 
@@ -2172,6 +2256,16 @@ declare module 'vscode' {
 		 */
 		label: string;
 
+		/**
+		 * Optional unique identifier for the TestItem. This is used to correlate
+		 * test results and tests in the document with those in the workspace
+		 * (test explorer). This must not change for the lifetime of a test item.
+		 *
+		 * If the ID is not provided, it defaults to the concatenation of the
+		 * item's label and its parent's ID, if any.
+		 */
+		readonly id?: string;
+
 		/**
 		 * Optional description that appears next to the label.
 		 */
@@ -2208,19 +2302,30 @@ declare module 'vscode' {
 		state: TestState;
 	}
 
+	/**
+	 * A {@link TestItem} with its defaults filled in.
+	 */
+	export type RequiredTestItem = {
+		[K in keyof Required<TestItem>]: K extends 'children'
+		? RequiredTestItem[]
+		: (K extends 'description' | 'location' ? TestItem[K] : Required<TestItem>[K])
+	};
+
 	export enum TestRunState {
 		// Initial state
 		Unset = 0,
+		// Test will be run, but is not currently running.
+		Queued = 1,
 		// Test is currently running
-		Running = 1,
+		Running = 2,
 		// Test run has passed
-		Passed = 2,
+		Passed = 3,
 		// Test run has failed (on an assertion)
-		Failed = 3,
+		Failed = 4,
 		// Test run has been skipped
-		Skipped = 4,
+		Skipped = 5,
 		// Test run failed for some other reason (compilation error, timeout, etc)
-		Errored = 5
+		Errored = 6
 	}
 
 	/**
@@ -2294,27 +2399,180 @@ declare module 'vscode' {
 		 */
 		location?: Location;
 	}
+
 	//#endregion
 
-	//#region Statusbar Item Background Color (https://github.com/microsoft/vscode/issues/110214)
+	//#region Opener service (https://github.com/microsoft/vscode/issues/109277)
 
 	/**
-	 * A status bar item is a status bar contribution that can
-	 * show text and icons and run a command on click.
+	 * Details if an `ExternalUriOpener` can open a uri.
+	 *
+	 * The priority is also used to rank multiple openers against each other and determine
+	 * if an opener should be selected automatically or if the user should be prompted to
+	 * select an opener.
+	 *
+	 * VS Code will try to use the best available opener, as sorted by `ExternalUriOpenerPriority`.
+	 * If there are multiple potential "best" openers for a URI, then the user will be prompted
+	 * to select an opener.
 	 */
-	export interface StatusBarItem {
+	export enum ExternalUriOpenerPriority {
+		/**
+		 * The opener is disabled and will never be shown to users.
+		 *
+		 * Note that the opener can still be used if the user specifically
+		 * configures it in their settings.
+		 */
+		None = 0,
 
 		/**
-		 * The background color for this entry.
-		 *
-		 * Note: only `new ThemeColor('statusBarItem.errorBackground')` is
-		 * supported for now. More background colors may be supported in the
-		 * future.
-		 *
-		 * Note: when a background color is set, the statusbar may override
-		 * the `color` choice to ensure the entry is readable in all themes.
+		 * The opener can open the uri but will not cause a prompt on its own
+		 * since VS Code always contributes a built-in `Default` opener.
 		 */
-		backgroundColor: ThemeColor | undefined;
+		Option = 1,
+
+		/**
+		 * The opener can open the uri.
+		 *
+		 * VS Code's built-in opener has `Default` priority. This means that any additional `Default`
+		 * openers will cause the user to be prompted to select from a list of all potential openers.
+		 */
+		Default = 2,
+
+		/**
+		 * The opener can open the uri and should be automatically selected over any
+		 * default openers, include the built-in one from VS Code.
+		 *
+		 * A preferred opener will be automatically selected if no other preferred openers
+		 * are available. If multiple preferred openers are available, then the user
+		 * is shown a prompt with all potential openers (not just preferred openers).
+		 */
+		Preferred = 3,
+	}
+
+	/**
+	 * Handles opening uris to external resources, such as http(s) links.
+	 *
+	 * Extensions can implement an `ExternalUriOpener` to open `http` links to a webserver
+	 * inside of VS Code instead of having the link be opened by the web browser.
+	 *
+	 * Currently openers may only be registered for `http` and `https` uris.
+	 */
+	export interface ExternalUriOpener {
+
+		/**
+		 * Check if the opener can open a uri.
+		 *
+		 * @param uri The uri being opened. This is the uri that the user clicked on. It has
+		 * not yet gone through port forwarding.
+		 * @param token Cancellation token indicating that the result is no longer needed.
+		 *
+		 * @return Priority indicating if the opener can open the external uri.
+		 */
+		canOpenExternalUri(uri: Uri, token: CancellationToken): ExternalUriOpenerPriority | Thenable<ExternalUriOpenerPriority>;
+
+		/**
+		 * Open a uri.
+		 *
+		 * This is invoked when:
+		 *
+		 * - The user clicks a link which does not have an assigned opener. In this case, first `canOpenExternalUri`
+		 *   is called and if the user selects this opener, then `openExternalUri` is called.
+		 * - The user sets the default opener for a link in their settings and then visits a link.
+		 *
+		 * @param resolvedUri The uri to open. This uri may have been transformed by port forwarding, so it
+		 * may not match the original uri passed to `canOpenExternalUri`. Use `ctx.originalUri` to check the
+		 * original uri.
+		 * @param ctx Additional information about the uri being opened.
+		 * @param token Cancellation token indicating that opening has been canceled.
+		 *
+		 * @return Thenable indicating that the opening has completed.
+		 */
+		openExternalUri(resolvedUri: Uri, ctx: OpenExternalUriContext, token: CancellationToken): Thenable<void> | void;
+	}
+
+	/**
+	 * Additional information about the uri being opened.
+	 */
+	interface OpenExternalUriContext {
+		/**
+		 * The uri that triggered the open.
+		 *
+		 * This is the original uri that the user clicked on or that was passed to `openExternal.`
+		 * Due to port forwarding, this may not match the `resolvedUri` passed to `openExternalUri`.
+		 */
+		readonly sourceUri: Uri;
+	}
+
+	/**
+	 * Additional metadata about a registered `ExternalUriOpener`.
+	 */
+	interface ExternalUriOpenerMetadata {
+
+		/**
+		 * List of uri schemes the opener is triggered for.
+		 *
+		 * Currently only `http` and `https` are supported.
+		 */
+		readonly schemes: readonly string[]
+
+		/**
+		 * Text displayed to the user that explains what the opener does.
+		 *
+		 * For example, 'Open in browser preview'
+		 */
+		readonly label: string;
+	}
+
+	namespace window {
+		/**
+		 * Register a new `ExternalUriOpener`.
+		 *
+		 * When a uri is about to be opened, an `onUriOpen:SCHEME` activation event is fired.
+		 *
+		 * @param id Unique id of the opener, such as `myExtension.browserPreview`. This is used in settings
+		 *   and commands to identify the opener.
+		 * @param opener Opener to register.
+		 * @param metadata Additional information about the opener.
+		 *
+		* @returns Disposable that unregisters the opener.
+		*/
+		export function registerExternalUriOpener(id: string, opener: ExternalUriOpener, metadata: ExternalUriOpenerMetadata): Disposable;
+	}
+
+	interface OpenExternalOptions {
+		/**
+		 * Allows using openers contributed by extensions through  `registerExternalUriOpener`
+		 * when opening the resource.
+		 *
+		 * If `true`, VS Code will check if any contributed openers can handle the
+		 * uri, and fallback to the default opener behavior.
+		 *
+		 * If it is string, this specifies the id of the `ExternalUriOpener`
+		 * that should be used if it is available. Use `'default'` to force VS Code's
+		 * standard external opener to be used.
+		 */
+		readonly allowContributedOpeners?: boolean | string;
+	}
+
+	namespace env {
+		export function openExternal(target: Uri, options?: OpenExternalOptions): Thenable<boolean>;
+	}
+
+	//endregionn
+
+	//#region https://github.com/Microsoft/vscode/issues/15178
+
+	// TODO@API must be a class
+	export interface OpenEditorInfo {
+		name: string;
+		resource: Uri;
+	}
+
+	export namespace window {
+		export const openEditors: ReadonlyArray<OpenEditorInfo>;
+
+		// todo@API proper event type
+		export const onDidChangeOpenEditors: Event<void>;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index 3b4c8a66c..1e3169fd5 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -17,6 +17,7 @@ import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEdito
 // --- mainThread participants
 import './mainThreadBulkEdits';
 import './mainThreadCodeInsets';
+import './mainThreadCLICommands';
 import './mainThreadClipboard';
 import './mainThreadCommands';
 import './mainThreadConfiguration';
@@ -30,6 +31,7 @@ import './mainThreadDocuments';
 import './mainThreadDocumentsAndEditors';
 import './mainThreadEditor';
 import './mainThreadEditors';
+import './mainThreadEditorTabs';
 import './mainThreadErrors';
 import './mainThreadExtensionService';
 import './mainThreadFileSystem';
@@ -54,6 +56,7 @@ import './mainThreadTheming';
 import './mainThreadTreeViews';
 import './mainThreadDownloadService';
 import './mainThreadUrls';
+import './mainThreadUriOpeners';
 import './mainThreadWindow';
 import './mainThreadWebviewManager';
 import './mainThreadWorkspace';
@@ -65,6 +68,7 @@ import './mainThreadTunnelService';
 import './mainThreadAuthentication';
 import './mainThreadTimeline';
 import './mainThreadTesting';
+import './mainThreadSecretState';
 import 'vs/workbench/api/common/apiCommands';
 
 export class ExtensionPoints implements IWorkbenchContribution {
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
index c39650404..98bb98d8c 100644
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -18,9 +18,6 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { fromNow } from 'vs/base/common/date';
 import { ActivationKind, IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { isWeb } from 'vs/base/common/platform';
-import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
 
 const VSO_ALLOWED_EXTENSIONS = ['github.vscode-pull-request-github', 'github.vscode-pull-request-github-insiders', 'vscode.git', 'ms-vsonline.vsonline', 'vscode.github-browser', 'ms-vscode.github-browser', 'github.codespaces'];
 
@@ -225,10 +222,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		@INotificationService private readonly notificationService: INotificationService,
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IExtensionService private readonly extensionService: IExtensionService,
-		@ICredentialsService private readonly credentialsService: ICredentialsService,
-		@IEncryptionService private readonly encryptionService: IEncryptionService,
-		@IProductService private readonly productService: IProductService
+		@IExtensionService private readonly extensionService: IExtensionService
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostAuthentication);
@@ -250,10 +244,6 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		this._register(this.authenticationService.onDidChangeDeclaredProviders(e => {
 			this._proxy.$setProviders(e);
 		}));
-
-		this._register(this.credentialsService.onDidChangePassword(_ => {
-			this._proxy.$onDidChangePassword();
-		}));
 	}
 
 	$getProviderIds(): Promise<string[]> {
@@ -416,7 +406,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 
 		const remoteConnection = this.remoteAgentService.getConnection();
 		const isVSO = remoteConnection !== null
-			? remoteConnection.remoteAuthority.startsWith('vsonline')
+			? remoteConnection.remoteAuthority.startsWith('vsonline') || remoteConnection.remoteAuthority.startsWith('codespaces')
 			: isWeb;
 
 		if (isVSO && VSO_ALLOWED_EXTENSIONS.includes(extensionId)) {
@@ -466,46 +456,4 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		this.storageService.store(`${extensionName}-${providerId}`, sessionId, StorageScope.GLOBAL, StorageTarget.MACHINE);
 		addAccountUsage(this.storageService, providerId, accountName, extensionId, extensionName);
 	}
-
-	private getFullKey(extensionId: string): string {
-		return `${this.productService.urlProtocol}${extensionId}`;
-	}
-
-	async $getPassword(extensionId: string, key: string): Promise<string | undefined> {
-		const fullKey = this.getFullKey(extensionId);
-		const password = await this.credentialsService.getPassword(fullKey, key);
-		const decrypted = password && await this.encryptionService.decrypt(password);
-
-		if (decrypted) {
-			try {
-				const value = JSON.parse(decrypted);
-				if (value.extensionId === extensionId) {
-					return value.content;
-				}
-			} catch (_) {
-				throw new Error('Cannot get password');
-			}
-		}
-
-		return undefined;
-	}
-
-	async $setPassword(extensionId: string, key: string, value: string): Promise<void> {
-		const fullKey = this.getFullKey(extensionId);
-		const toEncrypt = JSON.stringify({
-			extensionId,
-			content: value
-		});
-		const encrypted = await this.encryptionService.encrypt(toEncrypt);
-		return this.credentialsService.setPassword(fullKey, key, encrypted);
-	}
-
-	async $deletePassword(extensionId: string, key: string): Promise<void> {
-		try {
-			const fullKey = this.getFullKey(extensionId);
-			await this.credentialsService.deletePassword(fullKey, key);
-		} catch (_) {
-			throw new Error('Cannot delete password');
-		}
-	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadBulkEdits.ts b/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
index 70fb045d7..8583555b8 100644
--- a/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
+++ b/src/vs/workbench/api/browser/mainThreadBulkEdits.ts
@@ -3,29 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBulkEditService, ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
-import { IExtHostContext, IWorkspaceEditDto, WorkspaceEditType, MainThreadBulkEditsShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
-import { revive } from 'vs/base/common/marshalling';
-import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-
-function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceEdit[] {
-	if (!data?.edits) {
-		return [];
-	}
-
-	const result: ResourceEdit[] = [];
-	for (let edit of revive<IWorkspaceEditDto>(data).edits) {
-		if (edit._type === WorkspaceEditType.File) {
-			result.push(new ResourceFileEdit(edit.oldUri, edit.newUri, edit.options, edit.metadata));
-		} else if (edit._type === WorkspaceEditType.Text) {
-			result.push(new ResourceTextEdit(edit.resource, edit.edit, edit.modelVersionId, edit.metadata));
-		} else if (edit._type === WorkspaceEditType.Cell) {
-			result.push(new ResourceNotebookCellEdit(edit.resource, edit.edit, edit.notebookVersionId, edit.metadata));
-		}
-	}
-	return result;
-}
+import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
+import { IExtHostContext, IWorkspaceEditDto, MainThreadBulkEditsShape, MainContext } from 'vs/workbench/api/common/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { reviveWorkspaceEditDto2 } from 'vs/workbench/api/browser/mainThreadEditors';
 
 @extHostNamedCustomer(MainContext.MainThreadBulkEdits)
 export class MainThreadBulkEdits implements MainThreadBulkEditsShape {
@@ -39,12 +19,6 @@ export class MainThreadBulkEdits implements MainThreadBulkEditsShape {
 
 	$tryApplyWorkspaceEdit(dto: IWorkspaceEditDto, undoRedoGroupId?: number): Promise<boolean> {
 		const edits = reviveWorkspaceEditDto2(dto);
-		return this._bulkEditService.apply(edits, {
-			// having a undoRedoGroupId means that this is a nested workspace edit,
-			// e.g one from a onWill-handler and for now we need to forcefully suppress
-			// refactor previewing, see: https://github.com/microsoft/vscode/issues/111873#issuecomment-738739852
-			undoRedoGroupId,
-			suppressPreview: typeof undoRedoGroupId === 'number' ? true : undefined
-		}).then(() => true, _err => false);
+		return this._bulkEditService.apply(edits, { undoRedoGroupId }).then(() => true, _err => false);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadCLICommands.ts b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
new file mode 100644
index 000000000..a02cdf6ea
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Schemas } from 'vs/base/common/network';
+import { isString } from 'vs/base/common/types';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CLIOutput, IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService';
+import { getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { canExecuteOnWorkspace } from 'vs/workbench/services/extensions/common/extensionsUtil';
+import { IExtensionManifest } from 'vs/workbench/workbench.web.api';
+
+
+// this class contains the commands that the CLI server is reying on
+
+CommandsRegistry.registerCommand('_remoteCLI.openExternal', function (accessor: ServicesAccessor, uri: UriComponents, options: { allowTunneling?: boolean }) {
+	// TODO: discuss martin, ben where to put this
+	const openerService = accessor.get(IOpenerService);
+	openerService.open(URI.revive(uri), { openExternal: true, allowTunneling: options?.allowTunneling === true });
+});
+
+interface ManageExtensionsArgs {
+	list?: { showVersions?: boolean, category?: string; };
+	install?: (string | URI)[];
+	uninstall?: string[];
+	force?: boolean;
+}
+
+CommandsRegistry.registerCommand('_remoteCLI.manageExtensions', async function (accessor: ServicesAccessor, args: ManageExtensionsArgs) {
+
+	const instantiationService = accessor.get(IInstantiationService);
+	const extensionManagementServerService = accessor.get(IExtensionManagementServerService);
+	const remoteExtensionManagementService = extensionManagementServerService.remoteExtensionManagementServer?.extensionManagementService;
+	if (!remoteExtensionManagementService) {
+		return;
+	}
+
+	const cliService = instantiationService.createChild(new ServiceCollection([IExtensionManagementService, remoteExtensionManagementService])).createInstance(RemoteExtensionCLIManagementService);
+
+	const lines: string[] = [];
+	const output = { log: lines.push.bind(lines), error: lines.push.bind(lines) };
+
+	if (args.list) {
+		await cliService.listExtensions(!!args.list.showVersions, args.list.category, output);
+	} else {
+		const revive = (inputs: (string | UriComponents)[]) => inputs.map(input => isString(input) ? input : URI.revive(input));
+		if (Array.isArray(args.install) && args.install.length) {
+			try {
+				await cliService.installExtensions(revive(args.install), [], true, !!args.force, output);
+			} catch (e) {
+				lines.push(e.message);
+			}
+		}
+		if (Array.isArray(args.uninstall) && args.uninstall.length) {
+			try {
+				await cliService.uninstallExtensions(revive(args.uninstall), !!args.force, output);
+			} catch (e) {
+				lines.push(e.message);
+			}
+		}
+	}
+	return lines.join('\n');
+});
+
+class RemoteExtensionCLIManagementService extends ExtensionManagementCLIService {
+
+	private _location: string | undefined;
+
+	constructor(
+		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
+		@IProductService private readonly productService: IProductService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
+		@ILocalizationsService localizationsService: ILocalizationsService,
+		@ILabelService labelService: ILabelService,
+		@IWorkbenchEnvironmentService envService: IWorkbenchEnvironmentService
+	) {
+		super(extensionManagementService, extensionGalleryService, localizationsService);
+
+		const remoteAuthority = envService.remoteAuthority;
+		this._location = remoteAuthority ? labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority) : undefined;
+	}
+
+	protected get location(): string | undefined {
+		return this._location;
+	}
+
+	protected validateExtensionKind(manifest: IExtensionManifest, output: CLIOutput): boolean {
+		if (!canExecuteOnWorkspace(manifest, this.productService, this.configurationService)) {
+			output.log(localize('cannot be installed', "Cannot install '{0}' because this extension has defined that it cannot run on the remote server.", getExtensionId(manifest.publisher, manifest.name)));
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadConsole.ts b/src/vs/workbench/api/browser/mainThreadConsole.ts
index 4a244875f..d678f21bc 100644
--- a/src/vs/workbench/api/browser/mainThreadConsole.ts
+++ b/src/vs/workbench/api/browser/mainThreadConsole.ts
@@ -10,22 +10,18 @@ import { IRemoteConsoleLog, log } from 'vs/base/common/console';
 import { logRemoteEntry } from 'vs/workbench/services/extensions/common/remoteConsoleUtil';
 import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/common/extensionDevOptions';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug';
 
 @extHostNamedCustomer(MainContext.MainThreadConsole)
 export class MainThreadConsole implements MainThreadConsoleShape {
 
-	private readonly _isExtensionDevHost: boolean;
 	private readonly _isExtensionDevTestFromCli: boolean;
 
 	constructor(
-		extHostContext: IExtHostContext,
+		_extHostContext: IExtHostContext,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@ILogService private readonly _logService: ILogService,
-		@IExtensionHostDebugService private readonly _extensionHostDebugService: IExtensionHostDebugService,
 	) {
 		const devOpts = parseExtensionDevOptions(this._environmentService);
-		this._isExtensionDevHost = devOpts.isExtensionDevHost;
 		this._isExtensionDevTestFromCli = devOpts.isExtensionDevTestFromCli;
 	}
 
@@ -43,10 +39,5 @@ export class MainThreadConsole implements MainThreadConsoleShape {
 		if (this._isExtensionDevTestFromCli) {
 			logRemoteEntry(this._logService, entry);
 		}
-
-		// Broadcast to other windows if we are in development mode
-		else if (this._environmentService.debugExtensionHost.debugId && (!this._environmentService.isBuilt || this._isExtensionDevHost)) {
-			this._extensionHostDebugService.logToSession(this._environmentService.debugExtensionHost.debugId, entry);
-		}
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index bcf31a1a7..e5f1d3f57 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { multibyteAwareBtoa } from 'vs/base/browser/dom';
 import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableStore, IDisposable, IReference } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { basename } from 'vs/base/common/path';
 import { isEqual, isEqualOrParent, toLocalResource } from 'vs/base/common/resources';
-import { multibyteAwareBtoa } from 'vs/base/browser/dom';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import * as modes from 'vs/editor/common/modes';
 import { localize } from 'vs/nls';
@@ -95,10 +95,7 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 	dispose() {
 		super.dispose();
 
-		for (const disposable of this._editorProviders.values()) {
-			disposable.dispose();
-		}
-
+		dispose(this._editorProviders.values());
 		this._editorProviders.clear();
 	}
 
diff --git a/src/vs/workbench/api/browser/mainThreadDebugService.ts b/src/vs/workbench/api/browser/mainThreadDebugService.ts
index f1906f16a..cb4c39856 100644
--- a/src/vs/workbench/api/browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDebugService.ts
@@ -327,7 +327,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 				return {
 					id: sessionID,
 					type: session.configuration.type,
-					name: session.configuration.name,
+					name: session.name,
 					folderUri: session.root ? session.root.uri : undefined,
 					configuration: session.configuration
 				};
diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
new file mode 100644
index 000000000..2e6aaffa5
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { ExtHostContext, IExtHostEditorTabsShape, IExtHostContext, MainContext, IEditorTabDto } from 'vs/workbench/api/common/extHost.protocol';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { Verbosity } from 'vs/workbench/common/editor';
+import { GroupChangeKind, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+
+export interface ITabInfo {
+	name: string;
+	resource: URI;
+}
+
+@extHostNamedCustomer(MainContext.MainThreadEditorTabs)
+export class MainThreadEditorTabs {
+
+	private static _GroupEventFilter = new Set([GroupChangeKind.EDITOR_CLOSE, GroupChangeKind.EDITOR_OPEN]);
+
+	private readonly _dispoables = new DisposableStore();
+	private readonly _groups = new Map<IEditorGroup, IDisposable>();
+	private readonly _proxy: IExtHostEditorTabsShape;
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
+	) {
+
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditorTabs);
+
+		this._editorGroupsService.groups.forEach(this._subscribeToGroup, this);
+		this._dispoables.add(_editorGroupsService.onDidAddGroup(this._subscribeToGroup, this));
+		this._dispoables.add(_editorGroupsService.onDidRemoveGroup(e => {
+			const subscription = this._groups.get(e);
+			if (subscription) {
+				subscription.dispose();
+				this._groups.delete(e);
+				this._pushEditorTabs();
+			}
+		}));
+		this._pushEditorTabs();
+	}
+
+	dispose(): void {
+		dispose(this._groups.values());
+		this._dispoables.dispose();
+	}
+
+	private _subscribeToGroup(group: IEditorGroup) {
+		this._groups.get(group)?.dispose();
+		const listener = group.onDidGroupChange(e => {
+			if (MainThreadEditorTabs._GroupEventFilter.has(e.kind)) {
+				this._pushEditorTabs();
+			}
+		});
+		this._groups.set(group, listener);
+	}
+
+	private _pushEditorTabs(): void {
+		const tabs: IEditorTabDto[] = [];
+		for (const group of this._editorGroupsService.groups) {
+			for (const editor of group.editors) {
+				if (editor.isDisposed() || !editor.resource) {
+					continue;
+				}
+				tabs.push({
+					group: group.id,
+					name: editor.getTitle(Verbosity.SHORT) ?? '',
+					resource: editor.resource
+				});
+			}
+		}
+
+		this._proxy.$acceptEditorTabs(tabs);
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 1723f6328..0f52d9af1 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -27,7 +27,7 @@ import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/wo
 import { revive } from 'vs/base/common/marshalling';
 import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 
-function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceEdit[] {
+export function reviveWorkspaceEditDto2(data: IWorkspaceEditDto | undefined): ResourceEdit[] {
 	if (!data?.edits) {
 		return [];
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadExtensionService.ts b/src/vs/workbench/api/browser/mainThreadExtensionService.ts
index 5d0132e29..11cfcc3db 100644
--- a/src/vs/workbench/api/browser/mainThreadExtensionService.ts
+++ b/src/vs/workbench/api/browser/mainThreadExtensionService.ts
@@ -7,7 +7,7 @@ import { SerializedError } from 'vs/base/common/errors';
 import Severity from 'vs/base/common/severity';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext, MainContext, MainThreadExtensionServiceShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IExtensionService, ExtensionActivationError } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionService, ExtensionActivationError, ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { localize } from 'vs/nls';
@@ -19,29 +19,23 @@ import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/com
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionActivationReason } from 'vs/workbench/api/common/extHostExtensionActivator';
+import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
 
 @extHostNamedCustomer(MainContext.MainThreadExtensionService)
 export class MainThreadExtensionService implements MainThreadExtensionServiceShape {
 
-	private readonly _extensionService: IExtensionService;
-	private readonly _notificationService: INotificationService;
-	private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService;
-	private readonly _hostService: IHostService;
-	private readonly _extensionEnablementService: IWorkbenchExtensionEnablementService;
+	private readonly _extensionHostKind: ExtensionHostKind;
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IExtensionService extensionService: IExtensionService,
-		@INotificationService notificationService: INotificationService,
-		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IHostService hostService: IHostService,
-		@IWorkbenchExtensionEnablementService extensionEnablementService: IWorkbenchExtensionEnablementService
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IHostService private readonly _hostService: IHostService,
+		@IWorkbenchExtensionEnablementService private readonly _extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@ITimerService private readonly _timerService: ITimerService,
 	) {
-		this._extensionService = extensionService;
-		this._notificationService = notificationService;
-		this._extensionsWorkbenchService = extensionsWorkbenchService;
-		this._hostService = hostService;
-		this._extensionEnablementService = extensionEnablementService;
+		this._extensionHostKind = extHostContext.extensionHostKind;
 	}
 
 	public dispose(): void {
@@ -131,4 +125,14 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha
 	async $onExtensionHostExit(code: number): Promise<void> {
 		this._extensionService._onExtensionHostExit(code);
 	}
+
+	async $setPerformanceMarks(marks: PerformanceMark[]): Promise<void> {
+		if (this._extensionHostKind === ExtensionHostKind.LocalProcess) {
+			this._timerService.setPerformanceMarks('localExtHost', marks);
+		} else if (this._extensionHostKind === ExtensionHostKind.LocalWebWorker) {
+			this._timerService.setPerformanceMarks('workerExtHost', marks);
+		} else {
+			this._timerService.setPerformanceMarks('remoteExtHost', marks);
+		}
+	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
index 81905c6b1..c03943332 100644
--- a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
+++ b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
@@ -4,23 +4,43 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
+import { FileChangeType, FileOperation, IFileService } from 'vs/platform/files/common/files';
 import { extHostCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { ExtHostContext, FileSystemEvents, IExtHostContext } from '../common/extHost.protocol';
 import { localize } from 'vs/nls';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IWorkingCopyFileOperationParticipant, IWorkingCopyFileService, SourceTargetPair, IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { reviveWorkspaceEditDto2 } from 'vs/workbench/api/browser/mainThreadEditors';
+import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { raceCancellation } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 @extHostCustomer
 export class MainThreadFileSystemEventService {
 
+	static readonly MementoKeyAdditionalEdits = `file.particpants.additionalEdits`;
+
 	private readonly _listener = new DisposableStore();
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@IFileService fileService: IFileService,
-		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService
+		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
+		@IBulkEditService bulkEditService: IBulkEditService,
+		@IProgressService progressService: IProgressService,
+		@IDialogService dialogService: IDialogService,
+		@IStorageService storageService: IStorageService,
+		@ILogService logService: ILogService,
+		@IEnvironmentService envService: IEnvironmentService
 	) {
 
 		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostFileSystemEventService);
@@ -53,14 +73,124 @@ export class MainThreadFileSystemEventService {
 		}));
 
 
-		// BEFORE file operation
-		this._listener.add(workingCopyFileService.addFileOperationParticipant({
-			participate: async (files, operation, undoRedoGroupId, isUndoing, _progress, timeout, token) => {
-				if (!isUndoing) {
-					return proxy.$onWillRunFileOperation(operation, files, undoRedoGroupId, timeout, token);
+		const fileOperationParticipant = new class implements IWorkingCopyFileOperationParticipant {
+			async participate(files: SourceTargetPair[], operation: FileOperation, undoInfo: IFileOperationUndoRedoInfo | undefined, timeout: number, token: CancellationToken) {
+				if (undoInfo?.isUndoing) {
+					return;
+				}
+
+				const cts = new CancellationTokenSource(token);
+				const timer = setTimeout(() => cts.cancel(), timeout);
+
+				const data = await progressService.withProgress({
+					location: ProgressLocation.Notification,
+					title: this._progressLabel(operation),
+					cancellable: true,
+					delay: Math.min(timeout / 2, 3000)
+				}, () => {
+					// race extension host event delivery against timeout AND user-cancel
+					const onWillEvent = proxy.$onWillRunFileOperation(operation, files, timeout, token);
+					return raceCancellation(onWillEvent, cts.token);
+				}, () => {
+					// user-cancel
+					cts.cancel();
+
+				}).finally(() => {
+					cts.dispose();
+					clearTimeout(timer);
+				});
+
+				if (!data) {
+					// cancelled or no reply
+					return;
+				}
+
+				const needsConfirmation = data.edit.edits.some(edit => edit.metadata?.needsConfirmation);
+				let showPreview = storageService.getBoolean(MainThreadFileSystemEventService.MementoKeyAdditionalEdits, StorageScope.GLOBAL);
+
+				if (envService.extensionTestsLocationURI) {
+					// don't show dialog in tests
+					showPreview = false;
+				}
+
+				if (showPreview === undefined) {
+					// show a user facing message
+
+					let message: string;
+					if (data.extensionNames.length === 1) {
+						if (operation === FileOperation.CREATE) {
+							message = localize('ask.1.create', "Extension '{0}' wants to make refactoring changes with this file creation", data.extensionNames[0]);
+						} else if (operation === FileOperation.COPY) {
+							message = localize('ask.1.copy', "Extension '{0}' wants to make refactoring changes with this file copy", data.extensionNames[0]);
+						} else if (operation === FileOperation.MOVE) {
+							message = localize('ask.1.move', "Extension '{0}' wants to make refactoring changes with this file move", data.extensionNames[0]);
+						} else /* if (operation === FileOperation.DELETE) */ {
+							message = localize('ask.1.delete', "Extension '{0}' wants to make refactoring changes with this file deletion", data.extensionNames[0]);
+						}
+					} else {
+						if (operation === FileOperation.CREATE) {
+							message = localize('ask.N.create', "{0} extensions want to make refactoring changes with this file creation", data.extensionNames.length);
+						} else if (operation === FileOperation.COPY) {
+							message = localize('ask.N.copy', "{0} extensions want to make refactoring changes with this file copy", data.extensionNames.length);
+						} else if (operation === FileOperation.MOVE) {
+							message = localize('ask.N.move', "{0} extensions want to make refactoring changes with this file move", data.extensionNames.length);
+						} else /* if (operation === FileOperation.DELETE) */ {
+							message = localize('ask.N.delete', "{0} extensions want to make refactoring changes with this file deletion", data.extensionNames.length);
+						}
+					}
+
+					if (needsConfirmation) {
+						// edit which needs confirmation -> always show dialog
+						const answer = await dialogService.show(Severity.Info, message, [localize('preview', "Show Preview"), localize('cancel', "Skip Changes")], { cancelId: 1 });
+						showPreview = true;
+						if (answer.choice === 1) {
+							// no changes wanted
+							return;
+						}
+					} else {
+						// choice
+						const answer = await dialogService.show(Severity.Info, message,
+							[localize('ok', "OK"), localize('preview', "Show Preview"), localize('cancel', "Skip Changes")],
+							{
+								cancelId: 2,
+								checkbox: { label: localize('again', "Don't ask again") }
+							}
+						);
+						if (answer.choice === 2) {
+							// no changes wanted, don't persist cancel option
+							return;
+						}
+						showPreview = answer.choice === 1;
+						if (answer.checkboxChecked /* && answer.choice !== 2 */) {
+							storageService.store(MainThreadFileSystemEventService.MementoKeyAdditionalEdits, showPreview, StorageScope.GLOBAL, StorageTarget.USER);
+						}
+					}
+				}
+
+				logService.info('[onWill-handler] applying additional workspace edit from extensions', data.extensionNames);
+
+				await bulkEditService.apply(
+					reviveWorkspaceEditDto2(data.edit),
+					{ undoRedoGroupId: undoInfo?.undoRedoGroupId, showPreview }
+				);
+			}
+
+			private _progressLabel(operation: FileOperation): string {
+				switch (operation) {
+					case FileOperation.CREATE:
+						return localize('msg-create', "Running 'File Create' participants...");
+					case FileOperation.MOVE:
+						return localize('msg-rename', "Running 'File Rename' participants...");
+					case FileOperation.COPY:
+						return localize('msg-copy', "Running 'File Copy' participants...");
+					case FileOperation.DELETE:
+						return localize('msg-delete', "Running 'File Delete' participants...");
 				}
 			}
-		}));
+		};
+
+		// BEFORE file operation
+		this._listener.add(workingCopyFileService.addFileOperationParticipant(fileOperationParticipant));
 
 		// AFTER file operation
 		this._listener.add(workingCopyFileService.onDidRunWorkingCopyFileOperation(e => proxy.$onDidRunFileOperation(e.operation, e.files)));
@@ -71,6 +201,19 @@ export class MainThreadFileSystemEventService {
 	}
 }
 
+registerAction2(class ResetMemento extends Action2 {
+	constructor() {
+		super({
+			id: 'files.participants.resetChoice',
+			title: localize('label', "Reset choice for 'File operation needs preview'"),
+			f1: true
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		accessor.get(IStorageService).remove(MainThreadFileSystemEventService.MementoKeyAdditionalEdits, StorageScope.GLOBAL);
+	}
+});
+
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 	id: 'files',
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index ddea8e0e9..391cc7add 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -21,7 +21,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import * as callh from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { mixin } from 'vs/base/common/objects';
-import { decodeSemanticTokensDto } from 'vs/workbench/api/common/shared/semanticTokensDto';
+import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
 export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {
@@ -497,6 +497,32 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}));
 	}
 
+	// --- inline hints
+
+	$registerInlineHintsProvider(handle: number, selector: IDocumentFilterDto[], eventHandle: number | undefined): void {
+		const provider = <modes.InlineHintsProvider>{
+			provideInlineHints: async (model: ITextModel, range: EditorRange, token: CancellationToken): Promise<modes.InlineHint[] | undefined> => {
+				const result = await this._proxy.$provideInlineHints(handle, model.uri, range, token);
+				return result?.hints;
+			}
+		};
+
+		if (typeof eventHandle === 'number') {
+			const emitter = new Emitter<void>();
+			this._registrations.set(eventHandle, emitter);
+			provider.onDidChangeInlineHints = emitter.event;
+		}
+
+		this._registrations.set(handle, modes.InlineHintsProviderRegistry.register(selector, provider));
+	}
+
+	$emitInlineHintsEvent(eventHandle: number, event?: any): void {
+		const obj = this._registrations.get(eventHandle);
+		if (obj instanceof Emitter) {
+			obj.fire(event);
+		}
+	}
+
 	// --- links
 
 	$registerDocumentLinkProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean): void {
@@ -662,7 +688,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		return {
 			beforeText: MainThreadLanguageFeatures._reviveRegExp(onEnterRule.beforeText),
 			afterText: onEnterRule.afterText ? MainThreadLanguageFeatures._reviveRegExp(onEnterRule.afterText) : undefined,
-			oneLineAboveText: onEnterRule.oneLineAboveText ? MainThreadLanguageFeatures._reviveRegExp(onEnterRule.oneLineAboveText) : undefined,
+			previousLineText: onEnterRule.previousLineText ? MainThreadLanguageFeatures._reviveRegExp(onEnterRule.previousLineText) : undefined,
 			action: onEnterRule.action
 		};
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadMessageService.ts b/src/vs/workbench/api/browser/mainThreadMessageService.ts
index c956da47b..b7470ac8f 100644
--- a/src/vs/workbench/api/browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/browser/mainThreadMessageService.ts
@@ -33,7 +33,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number | undefined> {
 		if (options.modal) {
-			return this._showModalMessage(severity, message, commands);
+			return this._showModalMessage(severity, message, commands, options.useCustom);
 		} else {
 			return this._showMessage(severity, message, commands, options.extension);
 		}
@@ -97,7 +97,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 		});
 	}
 
-	private async _showModalMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number | undefined> {
+	private async _showModalMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[], useCustom?: boolean): Promise<number | undefined> {
 		let cancelId: number | undefined = undefined;
 
 		const buttons = commands.map((command, index) => {
@@ -118,7 +118,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 			cancelId = buttons.length - 1;
 		}
 
-		const { choice } = await this._dialogService.show(severity, message, buttons, { cancelId });
+		const { choice } = await this._dialogService.show(severity, message, buttons, { cancelId, useCustom });
 		return choice === commands.length ? undefined : commands[choice].handle;
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts
index cbf34422d..0b4b7f3f5 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebook.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts
@@ -16,8 +16,8 @@ import { URI, UriComponents } from 'vs/base/common/uri';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { EditorActivation, ITextEditorOptions } from 'vs/platform/editor/common/editor';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { viewColumnToEditorGroup } from 'vs/workbench/common/editor';
 import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -129,12 +129,12 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@ILogService private readonly logService: ILogService,
 		@INotebookCellStatusBarService private readonly cellStatusBarService: INotebookCellStatusBarService,
 		@IWorkingCopyService private readonly _workingCopyService: IWorkingCopyService,
 		@INotebookEditorModelResolverService private readonly _notebookModelResolverService: INotebookEditorModelResolverService,
 		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostNotebook);
@@ -646,14 +646,13 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 
 			switch (revealType) {
 				case NotebookEditorRevealType.Default:
-					notebookEditor.revealInView(cell);
-					break;
+					return notebookEditor.revealCellRangeInView(range);
 				case NotebookEditorRevealType.InCenter:
-					notebookEditor.revealInCenter(cell);
-					break;
+					return notebookEditor.revealInCenter(cell);
 				case NotebookEditorRevealType.InCenterIfOutsideViewport:
-					notebookEditor.revealInCenterIfOutsideViewport(cell);
-					break;
+					return notebookEditor.revealInCenterIfOutsideViewport(cell);
+				case NotebookEditorRevealType.AtTop:
+					return notebookEditor.revealInViewAtTop(cell);
 				default:
 					break;
 			}
@@ -733,7 +732,7 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 		const input = this.editorService.createEditorInput({ resource: URI.revive(resource), options: editorOptions });
 
 		// TODO: handle options.selection
-		const editorPane = await openEditorWith(input, viewType, options, group, this.editorService, this.configurationService, this.quickInputService);
+		const editorPane = await this._instantiationService.invokeFunction(openEditorWith, input, viewType, options, group);
 		const notebookEditor = (editorPane as unknown as { isNotebookEditor?: boolean })?.isNotebookEditor ? (editorPane!.getControl() as INotebookEditor) : undefined;
 
 		if (notebookEditor) {
diff --git a/src/vs/workbench/api/browser/mainThreadSecretState.ts b/src/vs/workbench/api/browser/mainThreadSecretState.ts
new file mode 100644
index 000000000..4067acedb
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadSecretState.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
+import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService';
+import { ExtHostContext, ExtHostSecretStateShape, IExtHostContext, MainContext, MainThreadSecretStateShape } from '../common/extHost.protocol';
+
+@extHostNamedCustomer(MainContext.MainThreadSecretState)
+export class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape {
+	private readonly _proxy: ExtHostSecretStateShape;
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@ICredentialsService private readonly credentialsService: ICredentialsService,
+		@IEncryptionService private readonly encryptionService: IEncryptionService,
+		@IProductService private readonly productService: IProductService
+	) {
+		super();
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSecretState);
+
+		this._register(this.credentialsService.onDidChangePassword(e => {
+			const extensionId = e.service.substring(this.productService.urlProtocol.length);
+			this._proxy.$onDidChangePassword({ extensionId, key: e.account });
+		}));
+	}
+
+	private getFullKey(extensionId: string): string {
+		return `${this.productService.urlProtocol}${extensionId}`;
+	}
+
+	async $getPassword(extensionId: string, key: string): Promise<string | undefined> {
+		const fullKey = this.getFullKey(extensionId);
+		const password = await this.credentialsService.getPassword(fullKey, key);
+		const decrypted = password && await this.encryptionService.decrypt(password);
+
+		if (decrypted) {
+			try {
+				const value = JSON.parse(decrypted);
+				if (value.extensionId === extensionId) {
+					return value.content;
+				}
+			} catch (_) {
+				throw new Error('Cannot get password');
+			}
+		}
+
+		return undefined;
+	}
+
+	async $setPassword(extensionId: string, key: string, value: string): Promise<void> {
+		const fullKey = this.getFullKey(extensionId);
+		const toEncrypt = JSON.stringify({
+			extensionId,
+			content: value
+		});
+		const encrypted = await this.encryptionService.encrypt(toEncrypt);
+		return this.credentialsService.setPassword(fullKey, key, encrypted);
+	}
+
+	async $deletePassword(extensionId: string, key: string): Promise<void> {
+		try {
+			const fullKey = this.getFullKey(extensionId);
+			await this.credentialsService.deletePassword(fullKey, key);
+		} catch (_) {
+			throw new Error('Cannot delete password');
+		}
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
index 2f4cb073c..3cc31f086 100644
--- a/src/vs/workbench/api/browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -567,13 +567,19 @@ export class MainThreadTask implements MainThreadTaskShape {
 						if (!task) {
 							reject(new Error('Task not found'));
 						} else {
-							this._taskService.run(task).then(undefined, reason => {
-								// eat the error, it has already been surfaced to the user and we don't care about it here
-							});
 							const result: TaskExecutionDTO = {
 								id: value.id,
 								task: TaskDTO.from(task)
 							};
+							this._taskService.run(task).then(summary => {
+								// Ensure that the task execution gets cleaned up if the exit code is undefined
+								// This can happen when the task has dependent tasks and one of them failed
+								if ((summary?.exitCode === undefined) || (summary.exitCode !== 0)) {
+									this._proxy.$OnDidEndTask(result);
+								}
+							}, reason => {
+								// eat the error, it has already been surfaced to the user and we don't care about it here
+							});
 							resolve(result);
 						}
 					}, (_error) => {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index 8e54cb8f4..8dad46c6a 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore, Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IShellLaunchConfig, ITerminalProcessExtHostProxy, ISpawnExtHostProcessRequest, ITerminalDimensions, EXT_HOST_CREATION_DELAY, IAvailableShellsRequest, IDefaultShellAndArgsRequest, IStartExtensionTerminalRequest } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, IShellLaunchConfigDto, TerminalLaunchConfig, ITerminalDimensionsDto } from 'vs/workbench/api/common/extHost.protocol';
+import { IShellLaunchConfig, ITerminalProcessExtHostProxy, ISpawnExtHostProcessRequest, ITerminalDimensions, IAvailableShellsRequest, IDefaultShellAndArgsRequest, IStartExtensionTerminalRequest, ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
+import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, IShellLaunchConfigDto, TerminalLaunchConfig, ITerminalDimensionsDto, TerminalIdentifier } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { URI } from 'vs/base/common/uri';
 import { StopWatch } from 'vs/base/common/stopwatch';
@@ -16,11 +16,18 @@ import { TerminalDataBufferer } from 'vs/workbench/contrib/terminal/common/termi
 import { IEnvironmentVariableService, ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { deserializeEnvironmentVariableCollection, serializeEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableShared';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
 
 	private _proxy: ExtHostTerminalServiceShape;
+	/**
+	 * Stores a map from a temporary terminal id (a UUID generated on the extension host side)
+	 * to a numeric terminal id (an id generated on the renderer side)
+	 * This comes in play only when dealing with terminals created on the extension host side
+	 */
+	private _extHostTerminalIds = new Map<string, number>();
 	private _remoteAuthority: string | null;
 	private readonly _toDispose = new DisposableStore();
 	private readonly _terminalProcessProxies = new Map<number, ITerminalProcessExtHostProxy>();
@@ -40,6 +47,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IEnvironmentVariableService private readonly _environmentVariableService: IEnvironmentVariableService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILogService private readonly _logService: ILogService,
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTerminalService);
@@ -47,13 +55,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 
 		// ITerminalService listeners
 		this._toDispose.add(_terminalService.onInstanceCreated((instance) => {
-			// Delay this message so the TerminalInstance constructor has a chance to finish and
-			// return the ID normally to the extension host. The ID that is passed here will be
-			// used to register non-extension API terminals in the extension host.
-			setTimeout(() => {
-				this._onTerminalOpened(instance);
-				this._onInstanceDimensionsChanged(instance);
-			}, EXT_HOST_CREATION_DELAY);
+			this._onTerminalOpened(instance);
+			this._onInstanceDimensionsChanged(instance);
 		}));
 
 		this._toDispose.add(_terminalService.onInstanceDisposed(instance => this._onTerminalDisposed(instance)));
@@ -100,7 +103,22 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		// when the extension host process goes down ?
 	}
 
-	public $createTerminal(launchConfig: TerminalLaunchConfig): Promise<{ id: number, name: string }> {
+	private _getTerminalId(id: TerminalIdentifier): number | undefined {
+		if (typeof id === 'number') {
+			return id;
+		}
+		return this._extHostTerminalIds.get(id);
+	}
+
+	private _getTerminalInstance(id: TerminalIdentifier): ITerminalInstance | undefined {
+		const rendererId = this._getTerminalId(id);
+		if (typeof rendererId === 'number') {
+			return this._terminalService.getInstanceFromId(rendererId);
+		}
+		return undefined;
+	}
+
+	public async $createTerminal(extHostTerminalId: string, launchConfig: TerminalLaunchConfig): Promise<void> {
 		const shellLaunchConfig: IShellLaunchConfig = {
 			name: launchConfig.name,
 			executable: launchConfig.shellPath,
@@ -112,39 +130,38 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			strictEnv: launchConfig.strictEnv,
 			hideFromUser: launchConfig.hideFromUser,
 			isExtensionTerminal: launchConfig.isExtensionTerminal,
+			extHostTerminalId: extHostTerminalId,
 			isFeatureTerminal: launchConfig.isFeatureTerminal
 		};
 		const terminal = this._terminalService.createTerminal(shellLaunchConfig);
-		return Promise.resolve({
-			id: terminal.id,
-			name: terminal.title
-		});
+		this._extHostTerminalIds.set(extHostTerminalId, terminal.id);
 	}
 
-	public $show(terminalId: number, preserveFocus: boolean): void {
-		const terminalInstance = this._terminalService.getInstanceFromId(terminalId);
+	public $show(id: TerminalIdentifier, preserveFocus: boolean): void {
+		const terminalInstance = this._getTerminalInstance(id);
 		if (terminalInstance) {
 			this._terminalService.setActiveInstance(terminalInstance);
 			this._terminalService.showPanel(!preserveFocus);
 		}
 	}
 
-	public $hide(terminalId: number): void {
+	public $hide(id: TerminalIdentifier): void {
+		const rendererId = this._getTerminalId(id);
 		const instance = this._terminalService.getActiveInstance();
-		if (instance && instance.id === terminalId) {
+		if (instance && instance.id === rendererId) {
 			this._terminalService.hidePanel();
 		}
 	}
 
-	public $dispose(terminalId: number): void {
-		const terminalInstance = this._terminalService.getInstanceFromId(terminalId);
+	public $dispose(id: TerminalIdentifier): void {
+		const terminalInstance = this._getTerminalInstance(id);
 		if (terminalInstance) {
 			terminalInstance.dispose();
 		}
 	}
 
-	public $sendText(terminalId: number, text: string, addNewLine: boolean): void {
-		const terminalInstance = this._terminalService.getInstanceFromId(terminalId);
+	public $sendText(id: TerminalIdentifier, text: string, addNewLine: boolean): void {
+		const terminalInstance = this._getTerminalInstance(id);
 		if (terminalInstance) {
 			terminalInstance.sendText(text, addNewLine);
 		}
@@ -204,6 +221,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	private _onTerminalOpened(terminalInstance: ITerminalInstance): void {
+		const extHostTerminalId = terminalInstance.shellLaunchConfig.extHostTerminalId;
 		const shellLaunchConfigDto: IShellLaunchConfigDto = {
 			name: terminalInstance.shellLaunchConfig.name,
 			executable: terminalInstance.shellLaunchConfig.executable,
@@ -212,13 +230,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			env: terminalInstance.shellLaunchConfig.env,
 			hideFromUser: terminalInstance.shellLaunchConfig.hideFromUser
 		};
-		if (terminalInstance.title) {
-			this._proxy.$acceptTerminalOpened(terminalInstance.id, terminalInstance.title, shellLaunchConfigDto);
-		} else {
-			terminalInstance.waitForTitle().then(title => {
-				this._proxy.$acceptTerminalOpened(terminalInstance.id, title, shellLaunchConfigDto);
-			});
-		}
+		this._proxy.$acceptTerminalOpened(terminalInstance.id, extHostTerminalId, terminalInstance.title, shellLaunchConfigDto);
 	}
 
 	private _onTerminalProcessIdReady(terminalInstance: ITerminalInstance): void {
@@ -249,7 +261,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			executable: request.shellLaunchConfig.executable,
 			args: request.shellLaunchConfig.args,
 			cwd: request.shellLaunchConfig.cwd,
-			env: request.shellLaunchConfig.env
+			env: request.shellLaunchConfig.env,
+			flowControl: this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION).flowControl
 		};
 
 		this._logService.trace('Spawning ext host process', { terminalId: proxy.terminalId, shellLaunchConfigDto, request });
@@ -260,8 +273,9 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			request.cols,
 			request.rows,
 			request.isWorkspaceShellAllowed
-		).then(request.callback);
+		).then(request.callback, request.callback);
 
+		proxy.onAcknowledgeDataEvent(charCount => this._proxy.$acceptProcessAckDataEvent(proxy.terminalId, charCount));
 		proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.terminalId, data));
 		proxy.onResize(dimensions => this._proxy.$acceptProcessResize(proxy.terminalId, dimensions.cols, dimensions.rows));
 		proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.terminalId, immediate));
@@ -294,38 +308,59 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public $sendProcessTitle(terminalId: number, title: string): void {
-		this._getTerminalProcess(terminalId).emitTitle(title);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitTitle(title);
+		}
 	}
 
 	public $sendProcessData(terminalId: number, data: string): void {
-		this._getTerminalProcess(terminalId).emitData(data);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitData(data);
+		}
 	}
 
 	public $sendProcessReady(terminalId: number, pid: number, cwd: string): void {
-		this._getTerminalProcess(terminalId).emitReady(pid, cwd);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitReady(pid, cwd);
+		}
 	}
 
 	public $sendProcessExit(terminalId: number, exitCode: number | undefined): void {
-		this._getTerminalProcess(terminalId).emitExit(exitCode);
-		this._terminalProcessProxies.delete(terminalId);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitExit(exitCode);
+			this._terminalProcessProxies.delete(terminalId);
+		}
 	}
 
 	public $sendOverrideDimensions(terminalId: number, dimensions: ITerminalDimensions | undefined): void {
-		this._getTerminalProcess(terminalId).emitOverrideDimensions(dimensions);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitOverrideDimensions(dimensions);
+		}
 	}
 
 	public $sendProcessInitialCwd(terminalId: number, initialCwd: string): void {
-		this._getTerminalProcess(terminalId).emitInitialCwd(initialCwd);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitInitialCwd(initialCwd);
+		}
 	}
 
 	public $sendProcessCwd(terminalId: number, cwd: string): void {
-		this._getTerminalProcess(terminalId).emitCwd(cwd);
+		const terminalProcess = this._terminalProcessProxies.get(terminalId);
+		if (terminalProcess) {
+			terminalProcess.emitCwd(cwd);
+		}
 	}
 
 	public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void {
 		const instance = this._terminalService.getInstanceFromId(terminalId);
 		if (instance) {
-			this._getTerminalProcess(terminalId).emitResolvedShellLaunchConfig(shellLaunchConfig);
+			this._getTerminalProcess(terminalId)?.emitResolvedShellLaunchConfig(shellLaunchConfig);
 		}
 	}
 
@@ -338,7 +373,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			sw.stop();
 			sum += sw.elapsed();
 		}
-		this._getTerminalProcess(terminalId).emitLatency(sum / COUNT);
+		this._getTerminalProcess(terminalId)?.emitLatency(sum / COUNT);
 	}
 
 	private _isPrimaryExtHost(): boolean {
@@ -363,10 +398,11 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		}
 	}
 
-	private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy {
+	private _getTerminalProcess(terminalId: number): ITerminalProcessExtHostProxy | undefined {
 		const terminal = this._terminalProcessProxies.get(terminalId);
 		if (!terminal) {
-			throw new Error(`Unknown terminal: ${terminalId}`);
+			this._logService.error(`Unknown terminal: ${terminalId}`);
+			return undefined;
 		}
 		return terminal;
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadTesting.ts b/src/vs/workbench/api/browser/mainThreadTesting.ts
index 52185f8dd..370f08df9 100644
--- a/src/vs/workbench/api/browser/mainThreadTesting.ts
+++ b/src/vs/workbench/api/browser/mainThreadTesting.ts
@@ -3,12 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { getTestSubscriptionKey, RunTestsRequest, RunTestsResult, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
-import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
-import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { ExtHostContext, ExtHostTestingResource, ExtHostTestingShape, IExtHostContext, MainContext, MainThreadTestingShape } from '../common/extHost.protocol';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Disposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
+import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { getTestSubscriptionKey, RunTestsRequest, RunTestsResult, TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
+import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
+import { ExtHostContext, ExtHostTestingResource, ExtHostTestingShape, IExtHostContext, MainContext, MainThreadTestingShape } from '../common/extHost.protocol';
+
+const reviveDiff = (diff: TestsDiff) => {
+	for (const entry of diff) {
+		if (entry[0] === TestDiffOpType.Add || entry[0] === TestDiffOpType.Update) {
+			const item = entry[1];
+			if (item.item.location) {
+				item.item.location.uri = URI.revive(item.item.location.uri);
+			}
+
+			for (const message of item.item.state.messages) {
+				if (message.location) {
+					message.location.uri = URI.revive(message.location.uri);
+				}
+			}
+		}
+	}
+};
 
 @extHostNamedCustomer(MainContext.MainThreadTesting)
 export class MainThreadTesting extends Disposable implements MainThreadTestingShape {
@@ -18,11 +37,28 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 	constructor(
 		extHostContext: IExtHostContext,
 		@ITestService private readonly testService: ITestService,
+		@ITestResultService resultService: ITestResultService,
 	) {
 		super();
 		this.proxy = extHostContext.getProxy(ExtHostContext.ExtHostTesting);
 		this._register(this.testService.onShouldSubscribe(args => this.proxy.$subscribeToTests(args.resource, args.uri)));
 		this._register(this.testService.onShouldUnsubscribe(args => this.proxy.$unsubscribeFromTests(args.resource, args.uri)));
+
+		const testCompleteListener = this._register(new MutableDisposable());
+		this._register(resultService.onNewTestResult(results => {
+			testCompleteListener.value = results.onComplete(() => this.proxy.$publishTestResults({ tests: results.tests }));
+		}));
+
+		testService.updateRootProviderCount(1);
+
+		const lastCompleted = resultService.results.find(r => !r.isComplete);
+		if (lastCompleted) {
+			this.proxy.$publishTestResults({ tests: lastCompleted.tests });
+		}
+
+		for (const { resource, uri } of this.testService.subscriptions) {
+			this.proxy.$subscribeToTests(resource, uri);
+		}
 	}
 
 	/**
@@ -30,7 +66,8 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 	 */
 	public $registerTestProvider(id: string) {
 		this.testService.registerTestController(id, {
-			runTests: req => this.proxy.$runTestsForProvider(req),
+			runTests: (req, token) => this.proxy.$runTestsForProvider(req, token),
+			lookupTest: test => this.proxy.$lookupTest(test),
 		});
 	}
 
@@ -64,14 +101,19 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 	 * @inheritdoc
 	 */
 	public $publishDiff(resource: ExtHostTestingResource, uri: UriComponents, diff: TestsDiff): void {
+		reviveDiff(diff);
 		this.testService.publishDiff(resource, URI.revive(uri), diff);
 	}
 
-	public $runTests(req: RunTestsRequest): Promise<RunTestsResult> {
-		return this.testService.runTests(req);
+	public $runTests(req: RunTestsRequest, token: CancellationToken): Promise<RunTestsResult> {
+		return this.testService.runTests(req, token);
 	}
 
 	public dispose() {
-		// no-op
+		this.testService.updateRootProviderCount(-1);
+		for (const subscription of this.testSubscriptions.values()) {
+			subscription.dispose();
+		}
+		this.testSubscriptions.clear();
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
index 8e32acd7f..cfe9d842e 100644
--- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -222,8 +222,8 @@ class TreeViewDataProvider implements ITreeViewDataProvider {
 		const hasResolve = await this.hasResolve;
 		if (elements) {
 			for (const element of elements) {
-				const resolvable = new ResolvableTreeItem(element, hasResolve ? () => {
-					return this._proxy.$resolve(this.treeViewId, element.handle);
+				const resolvable = new ResolvableTreeItem(element, hasResolve ? (token) => {
+					return this._proxy.$resolve(this.treeViewId, element.handle, token);
 				} : undefined);
 				this.itemsMap.set(element.handle, resolvable);
 				result.push(resolvable);
diff --git a/src/vs/workbench/api/browser/mainThreadTunnelService.ts b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
index ac9b83562..82425aadb 100644
--- a/src/vs/workbench/api/browser/mainThreadTunnelService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTunnelService.ts
@@ -3,22 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as nls from 'vs/nls';
 import { MainThreadTunnelServiceShape, IExtHostContext, MainContext, ExtHostContext, ExtHostTunnelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
 import { TunnelDto } from 'vs/workbench/api/common/extHostTunnelService';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { IRemoteExplorerService, makeAddress } from 'vs/workbench/services/remote/common/remoteExplorerService';
-import { ITunnelProvider, ITunnelService, TunnelCreationOptions, TunnelOptions } from 'vs/platform/remote/common/tunnel';
+import { CandidatePort, IRemoteExplorerService, makeAddress } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { ITunnelProvider, ITunnelService, TunnelCreationOptions, TunnelProviderFeatures, TunnelOptions, RemoteTunnel, isPortPrivileged } from 'vs/platform/remote/common/tunnel';
 import { Disposable } from 'vs/base/common/lifecycle';
 import type { TunnelDescription } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { PORT_AUTO_FORWARD_SETTING } from 'vs/workbench/contrib/remote/browser/tunnelView';
+import { ILogService } from 'vs/platform/log/common/log';
 
 @extHostNamedCustomer(MainContext.MainThreadTunnelService)
 export class MainThreadTunnelService extends Disposable implements MainThreadTunnelServiceShape {
 	private readonly _proxy: ExtHostTunnelServiceShape;
+	private elevateionRetry: boolean = false;
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
-		@ITunnelService private readonly tunnelService: ITunnelService
+		@ITunnelService private readonly tunnelService: ITunnelService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTunnelService);
@@ -26,14 +35,50 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		this._register(tunnelService.onTunnelClosed(() => this._proxy.$onDidTunnelsChange()));
 	}
 
+	async $setCandidateFinder(): Promise<void> {
+		if (this.remoteExplorerService.portsFeaturesEnabled) {
+			this._proxy.$registerCandidateFinder(this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING));
+		} else {
+			this._register(this.remoteExplorerService.onEnabledPortsFeatures(() => this._proxy.$registerCandidateFinder(this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING))));
+		}
+		this._register(this.configurationService.onDidChangeConfiguration(async (e) => {
+			if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING)) {
+				return this._proxy.$registerCandidateFinder((this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING)));
+			}
+		}));
+	}
+
 	async $openTunnel(tunnelOptions: TunnelOptions, source: string): Promise<TunnelDto | undefined> {
-		const tunnel = await this.remoteExplorerService.forward(tunnelOptions.remoteAddress, tunnelOptions.localAddressPort, tunnelOptions.label, source);
+		const tunnel = await this.remoteExplorerService.forward(tunnelOptions.remoteAddress, tunnelOptions.localAddressPort, tunnelOptions.label, source, false);
 		if (tunnel) {
+			if (!this.elevateionRetry
+				&& (tunnelOptions.localAddressPort !== undefined)
+				&& (tunnel.tunnelLocalPort !== undefined)
+				&& isPortPrivileged(tunnelOptions.localAddressPort)
+				&& (tunnel.tunnelLocalPort !== tunnelOptions.localAddressPort)
+				&& this.tunnelService.canElevate) {
+
+				this.elevationPrompt(tunnelOptions, tunnel, source);
+			}
 			return TunnelDto.fromServiceTunnel(tunnel);
 		}
 		return undefined;
 	}
 
+	private async elevationPrompt(tunnelOptions: TunnelOptions, tunnel: RemoteTunnel, source: string) {
+		return this.notificationService.prompt(Severity.Info,
+			nls.localize('remote.tunnel.openTunnel', "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.", source, tunnelOptions.remoteAddress.port, tunnelOptions.localAddressPort),
+			[{
+				label: nls.localize('remote.tunnelsView.elevationButton', "Use Port {0} as Sudo...", tunnel.tunnelRemotePort),
+				run: async () => {
+					this.elevateionRetry = true;
+					await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort });
+					await this.remoteExplorerService.forward(tunnelOptions.remoteAddress, tunnelOptions.localAddressPort, tunnelOptions.label, source, true);
+					this.elevateionRetry = false;
+				}
+			}]);
+	}
+
 	async $closeTunnel(remote: { host: string, port: number }): Promise<void> {
 		return this.remoteExplorerService.close(remote);
 	}
@@ -47,27 +92,29 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		});
 	}
 
-	async $onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): Promise<void> {
+	async $onFoundNewCandidates(candidates: CandidatePort[]): Promise<void> {
 		this.remoteExplorerService.onFoundNewCandidates(candidates);
 	}
 
-	async $tunnelServiceReady(): Promise<void> {
-		return this.remoteExplorerService.restore();
-	}
-
-	async $setTunnelProvider(): Promise<void> {
+	async $setTunnelProvider(features: TunnelProviderFeatures): Promise<void> {
 		const tunnelProvider: ITunnelProvider = {
 			forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => {
 				const forward = this._proxy.$forwardPort(tunnelOptions, tunnelCreationOptions);
 				if (forward) {
 					return forward.then(tunnel => {
+						this.logService.trace(`MainThreadTunnelService: New tunnel established by tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
+						if (!tunnel) {
+							return undefined;
+						}
 						return {
 							tunnelRemotePort: tunnel.remoteAddress.port,
 							tunnelRemoteHost: tunnel.remoteAddress.host,
 							localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port),
 							tunnelLocalPort: typeof tunnel.localAddress !== 'string' ? tunnel.localAddress.port : undefined,
-							dispose: (silent?: boolean) => {
-								this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent);
+							public: tunnel.public,
+							dispose: async (silent?: boolean) => {
+								this.logService.trace(`MainThreadTunnelService: Closing tunnel from tunnel provider: ${tunnel?.remoteAddress.host}:${tunnel?.remoteAddress.port}`);
+								return this._proxy.$closeTunnel({ host: tunnel.remoteAddress.host, port: tunnel.remoteAddress.port }, silent);
 							}
 						};
 					});
@@ -75,9 +122,16 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 				return undefined;
 			}
 		};
-		this.tunnelService.setTunnelProvider(tunnelProvider);
+		this.tunnelService.setTunnelProvider(tunnelProvider, features);
 	}
 
+	async $setCandidateFilter(): Promise<void> {
+		this.remoteExplorerService.setCandidateFilter((candidates: CandidatePort[]): Promise<CandidatePort[]> => {
+			return this._proxy.$applyCandidateFilter(candidates);
+		});
+	}
+
+
 	dispose(): void {
 
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadUriOpeners.ts b/src/vs/workbench/api/browser/mainThreadUriOpeners.ts
new file mode 100644
index 000000000..9ac5d76c1
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadUriOpeners.ts
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Action } from 'vs/base/common/actions';
+import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ExtHostContext, ExtHostUriOpenersShape, IExtHostContext, MainContext, MainThreadUriOpenersShape } from 'vs/workbench/api/common/extHost.protocol';
+import { defaultExternalUriOpenerId } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
+import { ContributedExternalUriOpenersStore } from 'vs/workbench/contrib/externalUriOpener/common/contributedOpeners';
+import { IExternalOpenerProvider, IExternalUriOpener, IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { extHostNamedCustomer } from '../common/extHostCustomers';
+
+interface RegisteredOpenerMetadata {
+	readonly schemes: ReadonlySet<string>;
+	readonly extensionId: ExtensionIdentifier;
+	readonly label: string;
+}
+
+@extHostNamedCustomer(MainContext.MainThreadUriOpeners)
+export class MainThreadUriOpeners extends Disposable implements MainThreadUriOpenersShape, IExternalOpenerProvider {
+
+	private readonly proxy: ExtHostUriOpenersShape;
+	private readonly _registeredOpeners = new Map<string, RegisteredOpenerMetadata>();
+	private readonly _contributedExternalUriOpenersStore: ContributedExternalUriOpenersStore;
+
+	constructor(
+		context: IExtHostContext,
+		@IStorageService storageService: IStorageService,
+		@IExternalUriOpenerService externalUriOpenerService: IExternalUriOpenerService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@INotificationService private readonly notificationService: INotificationService,
+	) {
+		super();
+		this.proxy = context.getProxy(ExtHostContext.ExtHostUriOpeners);
+
+		this._register(externalUriOpenerService.registerExternalOpenerProvider(this));
+
+		this._contributedExternalUriOpenersStore = this._register(new ContributedExternalUriOpenersStore(storageService, extensionService));
+	}
+
+	public async *getOpeners(targetUri: URI): AsyncIterable<IExternalUriOpener> {
+
+		// Currently we only allow openers for http and https urls
+		if (targetUri.scheme !== Schemas.http && targetUri.scheme !== Schemas.https) {
+			return;
+		}
+
+		await this.extensionService.activateByEvent(`onUriOpen:${targetUri.scheme}`);
+
+		for (const [id, openerMetadata] of this._registeredOpeners) {
+			if (openerMetadata.schemes.has(targetUri.scheme)) {
+				yield this.createOpener(id, openerMetadata);
+			}
+		}
+	}
+
+	private createOpener(id: string, metadata: RegisteredOpenerMetadata): IExternalUriOpener {
+		return {
+			id: id,
+			label: metadata.label,
+			canOpen: (uri, token) => {
+				return this.proxy.$canOpenUri(id, uri, token);
+			},
+			openExternalUri: async (uri, ctx, token) => {
+				try {
+					await this.proxy.$openUri(id, { resolvedUri: uri, sourceUri: ctx.sourceUri }, token);
+				} catch (e) {
+					if (!isPromiseCanceledError(e)) {
+						const openDefaultAction = new Action('default', localize('openerFailedUseDefault', "Open using default opener"), undefined, undefined, () => {
+							return this.openerService.open(uri, {
+								allowTunneling: false,
+								allowContributedOpeners: defaultExternalUriOpenerId,
+							});
+						});
+						openDefaultAction.tooltip = uri.toString();
+
+						this.notificationService.notify({
+							severity: Severity.Error,
+							message: localize('openerFailedMessage', 'Could not open uri with \'{0}\': {1}', id, e.toString()),
+							actions: {
+								primary: [
+									openDefaultAction
+								]
+							}
+						});
+					}
+				}
+				return true;
+			},
+		};
+	}
+
+	async $registerUriOpener(
+		id: string,
+		schemes: readonly string[],
+		extensionId: ExtensionIdentifier,
+		label: string,
+	): Promise<void> {
+		if (this._registeredOpeners.has(id)) {
+			throw new Error(`Opener with id '${id}' already registered`);
+		}
+
+		this._registeredOpeners.set(id, {
+			schemes: new Set(schemes),
+			label,
+			extensionId,
+		});
+
+		this._contributedExternalUriOpenersStore.add(id, extensionId.value);
+	}
+
+	async $unregisterUriOpener(id: string): Promise<void> {
+		this._registeredOpeners.delete(id);
+		this._contributedExternalUriOpenersStore.delete(id);
+	}
+
+	dispose(): void {
+		super.dispose();
+		this._registeredOpeners.clear();
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
index 6428e6f48..7aa690772 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -129,6 +129,9 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 
 		dispose(this._editorProviders.values());
 		this._editorProviders.clear();
+
+		dispose(this._revivers.values());
+		this._revivers.clear();
 	}
 
 	public get webviewInputs(): Iterable<WebviewInput> { return this._webviewInputs; }
@@ -181,7 +184,6 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 		webview.setName(value);
 	}
 
-
 	public $setIconPath(handle: extHostProtocol.WebviewHandle, value: { light: UriComponents, dark: UriComponents; } | undefined): void {
 		const webview = this.getWebviewInput(handle);
 		webview.iconPath = reviveWebviewIcon(value);
@@ -199,8 +201,7 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 		}
 	}
 
-	public $registerSerializer(viewType: string)
-		: void {
+	public $registerSerializer(viewType: string): void {
 		if (this._revivers.has(viewType)) {
 			throw new Error(`Reviver for ${viewType} already registered`);
 		}
@@ -216,7 +217,6 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 					return;
 				}
 
-
 				const handle = webviewInput.id;
 
 				this.addWebviewInput(handle, webviewInput);
diff --git a/src/vs/workbench/api/browser/mainThreadWebviews.ts b/src/vs/workbench/api/browser/mainThreadWebviews.ts
index cc5b05c29..684096227 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviews.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviews.ts
@@ -78,7 +78,7 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
 	private onDidClickLink(handle: extHostProtocol.WebviewHandle, link: string): void {
 		const webview = this.getWebview(handle);
 		if (this.isSupportedLink(webview, URI.parse(link))) {
-			this._openerService.open(link, { fromUserGesture: true });
+			this._openerService.open(link, { fromUserGesture: true, allowContributedOpeners: true });
 		}
 	}
 
diff --git a/src/vs/workbench/api/browser/mainThreadWindow.ts b/src/vs/workbench/api/browser/mainThreadWindow.ts
index 2a431111e..7f10aa334 100644
--- a/src/vs/workbench/api/browser/mainThreadWindow.ts
+++ b/src/vs/workbench/api/browser/mainThreadWindow.ts
@@ -52,7 +52,11 @@ export class MainThreadWindow implements MainThreadWindowShape {
 			// called with URI or transformed -> use uri
 			target = uri;
 		}
-		return this.openerService.open(target, { openExternal: true, allowTunneling: options.allowTunneling });
+		return this.openerService.open(target, {
+			openExternal: true,
+			allowTunneling: options.allowTunneling,
+			allowContributedOpeners: options.allowContributedOpeners,
+		});
 	}
 
 	async $asExternalUri(uriComponents: UriComponents, options: IOpenUriOptions): Promise<UriComponents> {
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 252fa8e42..946c7bd3d 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -6,25 +6,25 @@
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { isNative } from 'vs/base/common/platform';
+import { withNullAsUndefined } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
-import { isNative } from 'vs/base/common/platform';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { IFileMatch, IPatternInfo, ISearchProgressItem, ISearchService } from 'vs/workbench/services/search/common/search';
-import { IWorkspaceContextService, WorkbenchState, IWorkspace, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IRequestService } from 'vs/platform/request/common/request';
+import { IWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
+import { checkGlobFileExists } from 'vs/workbench/api/common/shared/workspaceContains';
 import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IFileMatch, IPatternInfo, ISearchProgressItem, ISearchService } from 'vs/workbench/services/search/common/search';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, MainContext, MainThreadWorkspaceShape, IWorkspaceData, ITextSearchComplete } from '../common/extHost.protocol';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { withNullAsUndefined } from 'vs/base/common/types';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IRequestService } from 'vs/platform/request/common/request';
-import { checkGlobFileExists } from 'vs/workbench/api/common/shared/workspaceContains';
+import { ExtHostContext, ExtHostWorkspaceShape, IExtHostContext, ITextSearchComplete, IWorkspaceData, MainContext, MainThreadWorkspaceShape } from '../common/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -139,7 +139,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		}
 
 		const query = this._queryBuilder.file(
-			includeFolder ? [toWorkspaceFolder(includeFolder)] : workspace.folders,
+			includeFolder ? [includeFolder] : workspace.folders,
 			{
 				maxResults: withNullAsUndefined(maxResults),
 				disregardExcludeSettings: (excludePatternOrDisregardExcludes === false) || undefined,
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index 6be78f4ec..84b95cfc7 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -3,35 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
+import { coalesce } from 'vs/base/common/arrays';
 import { forEach } from 'vs/base/common/collections';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as resources from 'vs/base/common/resources';
-import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { ViewContainer, IViewsRegistry, ITreeViewDescriptor, IViewContainersRegistry, Extensions as ViewContainerExtensions, TEST_VIEW_CONTAINER_ID, IViewDescriptor, ViewContainerLocation, testViewIcon } from 'vs/workbench/common/views';
-import { CustomTreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { coalesce, } from 'vs/base/common/arrays';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { VIEWLET_ID as EXPLORER } from 'vs/workbench/contrib/files/common/files';
-import { VIEWLET_ID as SCM } from 'vs/workbench/contrib/scm/common/scm';
-import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
-import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { URI } from 'vs/base/common/uri';
-import { ViewletRegistry, Extensions as ViewletExtensions, ShowViewletAction } from 'vs/workbench/browser/viewlet';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IWorkbenchActionRegistry, Extensions as ActionExtensions, CATEGORIES } from 'vs/workbench/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { localize } from 'vs/nls';
+import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { WebviewViewPane } from 'vs/workbench/contrib/webviewView/browser/webviewViewPane';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Registry } from 'vs/platform/registry/common/platform';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { CustomTreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { Extensions as ViewletExtensions, ShowViewletAction2, ViewletRegistry } from 'vs/workbench/browser/viewlet';
+import { CATEGORIES } from 'vs/workbench/common/actions';
+import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { Extensions as ViewContainerExtensions, ITreeViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
+import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
+import { VIEWLET_ID as EXPLORER } from 'vs/workbench/contrib/files/common/files';
+import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
+import { VIEWLET_ID as SCM } from 'vs/workbench/contrib/scm/common/scm';
+import { WebviewViewPane } from 'vs/workbench/contrib/webviewView/browser/webviewViewPane';
+import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
 export interface IUserFriendlyViewsContainerDescriptor {
 	id: string;
@@ -110,7 +107,7 @@ const viewDescriptor: IJSONSchema = {
 	defaultSnippets: [{ body: { id: '${1:id}', name: '${2:name}' } }],
 	properties: {
 		type: {
-			markdownDescription: localize('vscode.extension.contributes.view.type', "Type of the the view. This can either be `tree` for a tree view based view or `webview` for a webview based view. The default is `tree`."),
+			markdownDescription: localize('vscode.extension.contributes.view.type', "Type of the view. This can either be `tree` for a tree view based view or `webview` for a webview based view. The default is `tree`."),
 			type: 'string',
 			enum: [
 				'tree',
@@ -255,7 +252,8 @@ const viewsExtensionPoint: IExtensionPoint<ViewExtensionPointType> = ExtensionsR
 	jsonSchema: viewsContribution
 });
 
-const TEST_VIEW_CONTAINER_ORDER = 6;
+const CUSTOM_VIEWS_START_ORDER = 7;
+
 class ViewsExtensionHandler implements IWorkbenchContribution {
 
 	private viewContainersRegistry: IViewContainersRegistry;
@@ -271,7 +269,6 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 	}
 
 	private handleAndRegisterCustomViewContainers() {
-		this.registerTestViewContainer();
 		viewsContainersExtensionPoint.setHandler((extensions, { added, removed }) => {
 			if (removed.length) {
 				this.removeCustomViewContainers(removed);
@@ -284,7 +281,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 
 	private addCustomViewContainers(extensionPoints: readonly IExtensionPointUser<ViewContainerExtensionPointType>[], existingViewContainers: ViewContainer[]): void {
 		const viewContainersRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
-		let activityBarOrder = TEST_VIEW_CONTAINER_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Sidebar).length + 1;
+		let activityBarOrder = CUSTOM_VIEWS_START_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Sidebar).length;
 		let panelOrder = 5 + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Panel).length + 1;
 		for (let { value, collector, description } of extensionPoints) {
 			forEach(value, entry => {
@@ -318,13 +315,6 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 		}
 	}
 
-	private registerTestViewContainer(): void {
-		const title = localize('test', "Test");
-		const icon = testViewIcon;
-
-		this.registerCustomViewContainer(TEST_VIEW_CONTAINER_ID, title, icon, TEST_VIEW_CONTAINER_ORDER, undefined, ViewContainerLocation.Sidebar);
-	}
-
 	private isValidViewsContainer(viewsContainersDescriptors: IUserFriendlyViewsContainerDescriptor[], collector: ExtensionMessageCollector): boolean {
 		if (!Array.isArray(viewsContainersDescriptors)) {
 			collector.error(localize('viewcontainer requirearray', "views containers must be an array"));
@@ -395,22 +385,15 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 			}, location);
 
 			// Register Action to Open Viewlet
-			class OpenCustomViewletAction extends ShowViewletAction {
-				constructor(
-					id: string, label: string,
-					@IViewletService viewletService: IViewletService,
-					@IEditorGroupsService editorGroupService: IEditorGroupsService,
-					@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService
-				) {
-					super(id, label, id, viewletService, editorGroupService, layoutService);
+			registerAction2(class OpenCustomViewletAction extends ShowViewletAction2 {
+				constructor() {
+					super({ id, f1: true, title: localize('showViewlet', "Show {0}", title), category: CATEGORIES.View.value });
 				}
-			}
-			const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-			registry.registerWorkbenchAction(
-				SyncActionDescriptor.create(OpenCustomViewletAction, id, localize('showViewlet', "Show {0}", title)),
-				`View: Show ${title}`,
-				CATEGORIES.View.value
-			);
+
+				protected viewletId() {
+					return id;
+				}
+			});
 		}
 
 		return viewContainer;
@@ -501,7 +484,8 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 						originalContainerId: entry.key,
 						group: item.group,
 						remoteAuthority: item.remoteName || (<any>item).remoteAuthority, // TODO@roblou - delete after remote extensions are updated
-						hideByDefault: initialVisibility === InitialVisibility.Hidden
+						hideByDefault: initialVisibility === InitialVisibility.Hidden,
+						workspace: viewContainer?.id === REMOTE ? true : undefined
 					};
 
 
diff --git a/src/vs/workbench/api/common/apiCommands.ts b/src/vs/workbench/api/common/apiCommands.ts
index 7670549c6..d4a7ea407 100644
--- a/src/vs/workbench/api/common/apiCommands.ts
+++ b/src/vs/workbench/api/common/apiCommands.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI, UriComponents } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
 import { CommandsRegistry, ICommandService, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -12,7 +12,6 @@ import { IWorkspacesService, IRecent } from 'vs/platform/workspaces/common/works
 import { ILogService } from 'vs/platform/log/common/log';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IViewDescriptorService, IViewsService, ViewVisibilityState } from 'vs/workbench/common/views';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 // -----------------------------------------------------------------
 // The following commands are registered on both sides separately.
@@ -128,12 +127,6 @@ CommandsRegistry.registerCommand('_extensionTests.setLogLevel', function (access
 	}
 });
 
-CommandsRegistry.registerCommand('_workbench.openExternal', function (accessor: ServicesAccessor, uri: UriComponents, options: { allowTunneling?: boolean }) {
-	// TODO: discuss martin, ben where to put this
-	const openerService = accessor.get(IOpenerService);
-	openerService.open(URI.revive(uri), options);
-});
-
 
 CommandsRegistry.registerCommand('_extensionTests.getLogLevel', function (accessor: ServicesAccessor) {
 	const logService = accessor.get(ILogService);
diff --git a/src/vs/workbench/api/common/exHostSecretState.ts b/src/vs/workbench/api/common/exHostSecretState.ts
new file mode 100644
index 000000000..b06f12450
--- /dev/null
+++ b/src/vs/workbench/api/common/exHostSecretState.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from 'vs/workbench/api/common/extHost.protocol';
+import { Emitter } from 'vs/base/common/event';
+import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export class ExtHostSecretState implements ExtHostSecretStateShape {
+	private _proxy: MainThreadSecretStateShape;
+	private _onDidChangePassword = new Emitter<{ extensionId: string, key: string }>();
+	readonly onDidChangePassword = this._onDidChangePassword.event;
+
+	constructor(mainContext: IExtHostRpcService) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadSecretState);
+	}
+
+	async $onDidChangePassword(e: { extensionId: string, key: string }): Promise<void> {
+		this._onDidChangePassword.fire(e);
+	}
+
+	get(extensionId: string, key: string): Promise<string | undefined> {
+		return this._proxy.$getPassword(extensionId, key);
+	}
+
+	store(extensionId: string, key: string, value: string): Promise<void> {
+		return this._proxy.$setPassword(extensionId, key, value);
+	}
+
+	delete(extensionId: string, key: string): Promise<void> {
+		return this._proxy.$deletePassword(extensionId, key);
+	}
+}
+
+export interface IExtHostSecretState extends ExtHostSecretState { }
+export const IExtHostSecretState = createDecorator<IExtHostSecretState>('IExtHostSecretState');
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index fa880fcfc..2da02381a 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -82,6 +82,9 @@ import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPane
 import { ExtHostBulkEdits } from 'vs/workbench/api/common/extHostBulkEdits';
 import { IExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
 import { ExtHostTesting } from 'vs/workbench/api/common/extHostTesting';
+import { ExtHostUriOpeners } from 'vs/workbench/api/common/extHostUriOpener';
+import { IExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
+import { ExtHostEditorTabs } from 'vs/workbench/api/common/extHostEditorTabs';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;
@@ -107,6 +110,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostTunnelService = accessor.get(IExtHostTunnelService);
 	const extHostApiDeprecation = accessor.get(IExtHostApiDeprecationService);
 	const extHostWindow = accessor.get(IExtHostWindow);
+	const extHostSecretState = accessor.get(IExtHostSecretState);
 
 	// register addressable instances
 	rpcProtocol.set(ExtHostContext.ExtHostFileSystemInfo, extHostFileSystemInfo);
@@ -117,6 +121,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);
 	rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);
 	rpcProtocol.set(ExtHostContext.ExtHostWindow, extHostWindow);
+	rpcProtocol.set(ExtHostContext.ExtHostSecretState, extHostSecretState);
 
 	// automatically create and register addressable instances
 	const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, accessor.get(IExtHostDecorations));
@@ -129,6 +134,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostOutputService = rpcProtocol.set(ExtHostContext.ExtHostOutputService, accessor.get(IExtHostOutputService));
 
 	// manually create and register addressable instances
+	const extHostEditorTabs = rpcProtocol.set(ExtHostContext.ExtHostEditorTabs, new ExtHostEditorTabs());
 	const extHostUrls = rpcProtocol.set(ExtHostContext.ExtHostUrls, new ExtHostUrls(rpcProtocol));
 	const extHostDocuments = rpcProtocol.set(ExtHostContext.ExtHostDocuments, new ExtHostDocuments(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostDocumentContentProviders = rpcProtocol.set(ExtHostContext.ExtHostDocumentContentProviders, new ExtHostDocumentContentProvider(rpcProtocol, extHostDocumentsAndEditors, extHostLogService));
@@ -154,6 +160,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostCustomEditors = rpcProtocol.set(ExtHostContext.ExtHostCustomEditors, new ExtHostCustomEditors(rpcProtocol, extHostDocuments, extensionStoragePaths, extHostWebviews, extHostWebviewPanels));
 	const extHostWebviewViews = rpcProtocol.set(ExtHostContext.ExtHostWebviewViews, new ExtHostWebviewViews(rpcProtocol, extHostWebviews));
 	const extHostTesting = rpcProtocol.set(ExtHostContext.ExtHostTesting, new ExtHostTesting(rpcProtocol, extHostDocumentsAndEditors, extHostWorkspace));
+	const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
 
 	// Check that no named customers are missing
 	const expected: ProxyIdentifier<any>[] = values(ExtHostContext);
@@ -209,22 +216,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			get onDidChangeSessions(): Event<vscode.AuthenticationSessionsChangeEvent> {
 				return extHostAuthentication.onDidChangeSessions;
 			},
-			registerAuthenticationProvider(provider: vscode.AuthenticationProvider): vscode.Disposable {
+			registerAuthenticationProvider(id: string, label: string, provider: vscode.AuthenticationProvider, options?: vscode.AuthenticationProviderOptions): vscode.Disposable {
 				checkProposedApiEnabled(extension);
-				return extHostAuthentication.registerAuthenticationProvider(provider);
+				return extHostAuthentication.registerAuthenticationProvider(id, label, provider, options);
 			},
 			get onDidChangeAuthenticationProviders(): Event<vscode.AuthenticationProvidersChangeEvent> {
 				checkProposedApiEnabled(extension);
 				return extHostAuthentication.onDidChangeAuthenticationProviders;
 			},
-			getProviderIds(): Thenable<ReadonlyArray<string>> {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.getProviderIds();
-			},
-			get providerIds(): string[] {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.providerIds;
-			},
 			get providers(): ReadonlyArray<vscode.AuthenticationProviderInformation> {
 				checkProposedApiEnabled(extension);
 				return extHostAuthentication.providers;
@@ -232,22 +231,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			logout(providerId: string, sessionId: string): Thenable<void> {
 				checkProposedApiEnabled(extension);
 				return extHostAuthentication.logout(providerId, sessionId);
-			},
-			getPassword(key: string): Thenable<string | undefined> {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.getPassword(extension, key);
-			},
-			setPassword(key: string, value: string): Thenable<void> {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.setPassword(extension, key, value);
-			},
-			deletePassword(key: string): Thenable<void> {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.deletePassword(extension, key);
-			},
-			get onDidChangePassword(): Event<void> {
-				checkProposedApiEnabled(extension);
-				return extHostAuthentication.onDidChangePassword;
 			}
 		};
 
@@ -311,8 +294,11 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			get shell() {
 				return extHostTerminalService.getDefaultShell(false, configProvider);
 			},
-			openExternal(uri: URI) {
-				return extHostWindow.openUri(uri, { allowTunneling: !!initData.remote.authority });
+			openExternal(uri: URI, options?: { allowContributedOpeners?: boolean | string; }) {
+				return extHostWindow.openUri(uri, {
+					allowTunneling: !!initData.remote.authority,
+					allowContributedOpeners: options?.allowContributedOpeners,
+				});
 			},
 			asExternalUri(uri: URI) {
 				if (uri.scheme === initData.environment.appUriScheme) {
@@ -354,6 +340,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension);
 				return extHostTesting.runTests(provider);
 			},
+			get onDidChangeTestResults() {
+				checkProposedApiEnabled(extension);
+				return extHostTesting.onLastResultsChanged;
+			},
+			get testResults() {
+				checkProposedApiEnabled(extension);
+				return extHostTesting.lastResults;
+			},
 		};
 
 		// namespace: extensions
@@ -480,6 +474,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			getTokenInformationAtPosition(doc: vscode.TextDocument, pos: vscode.Position) {
 				checkProposedApiEnabled(extension);
 				return extHostLanguages.tokenAtPosition(doc, pos);
+			},
+			registerInlineHintsProvider(selector: vscode.DocumentSelector, provider: vscode.InlineHintsProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension);
+				return extHostLanguageFeatures.registerInlineHintsProvider(extension, selector, provider);
 			}
 		};
 
@@ -588,10 +586,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 					id = extension.identifier.value;
 					name = nls.localize('extensionLabel', "{0} (Extension)", extension.displayName || extension.name);
 					alignment = alignmentOrOptions;
-					priority = priority;
 				}
 
-				return extHostStatusBar.createStatusBarEntry(id, name, alignment, priority, accessibilityInformation, extension);
+				return extHostStatusBar.createStatusBarEntry(id, name, alignment, priority, accessibilityInformation);
 			},
 			setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): vscode.Disposable {
 				return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable);
@@ -691,6 +688,18 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			showNotebookDocument(document, options?) {
 				checkProposedApiEnabled(extension);
 				return extHostNotebook.showNotebookDocument(document, options);
+			},
+			registerExternalUriOpener(id: string, opener: vscode.ExternalUriOpener, metadata: vscode.ExternalUriOpenerMetadata) {
+				checkProposedApiEnabled(extension);
+				return extHostUriOpeners.registerExternalUriOpener(extension.identifier, id, opener, metadata);
+			},
+			get openEditors() {
+				checkProposedApiEnabled(extension);
+				return extHostEditorTabs.tabs;
+			},
+			get onDidChangeOpenEditors() {
+				checkProposedApiEnabled(extension);
+				return extHostEditorTabs.onDidChangeTabs;
 			}
 		};
 
@@ -1108,6 +1117,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			CallHierarchyIncomingCall: extHostTypes.CallHierarchyIncomingCall,
 			CallHierarchyItem: extHostTypes.CallHierarchyItem,
 			CallHierarchyOutgoingCall: extHostTypes.CallHierarchyOutgoingCall,
+			CancellationError: errors.CancellationError,
 			CancellationTokenSource: CancellationTokenSource,
 			CodeAction: extHostTypes.CodeAction,
 			CodeActionKind: extHostTypes.CodeActionKind,
@@ -1148,6 +1158,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			EventEmitter: Emitter,
 			ExtensionKind: extHostTypes.ExtensionKind,
 			ExtensionMode: extHostTypes.ExtensionMode,
+			ExternalUriOpenerPriority: extHostTypes.ExternalUriOpenerPriority,
 			FileChangeType: extHostTypes.FileChangeType,
 			FileDecoration: extHostTypes.FileDecoration,
 			FileSystemError: extHostTypes.FileSystemError,
@@ -1157,6 +1168,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			FunctionBreakpoint: extHostTypes.FunctionBreakpoint,
 			Hover: extHostTypes.Hover,
 			IndentAction: languageConfiguration.IndentAction,
+			InlineHint: extHostTypes.InlineHint,
 			Location: extHostTypes.Location,
 			MarkdownString: extHostTypes.MarkdownString,
 			OverviewRulerLane: OverviewRulerLane,
diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts
index 6c1a02f44..b1fe830b2 100644
--- a/src/vs/workbench/api/common/extHost.common.services.ts
+++ b/src/vs/workbench/api/common/extHost.common.services.ts
@@ -21,6 +21,7 @@ import { IExtHostApiDeprecationService, ExtHostApiDeprecationService, } from 'vs
 import { IExtHostWindow, ExtHostWindow } from 'vs/workbench/api/common/extHostWindow';
 import { IExtHostConsumerFileSystem, ExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer';
 import { IExtHostFileSystemInfo, ExtHostFileSystemInfo } from 'vs/workbench/api/common/extHostFileSystemInfo';
+import { IExtHostSecretState, ExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
 
 registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
 registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService);
@@ -39,3 +40,4 @@ registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);
 registerSingleton(IExtHostTunnelService, ExtHostTunnelService);
 registerSingleton(IExtHostWindow, ExtHostWindow);
 registerSingleton(IExtHostWorkspace, ExtHostWorkspace);
+registerSingleton(IExtHostSecretState, ExtHostSecretState);
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index b97a962f6..be7a14f88 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as performance from 'vs/base/common/performance';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IRemoteConsoleLog } from 'vs/base/common/console';
@@ -41,13 +42,13 @@ import { IRevealOptions, ITreeItem } from 'vs/workbench/common/views';
 import { IAdapterDescriptor, IConfig, IDebugSessionReplMode } from 'vs/workbench/contrib/debug/common/debug';
 import { ITextQueryBuilderOptions } from 'vs/workbench/contrib/search/common/queryBuilder';
 import { ITerminalDimensions, IShellLaunchConfig, ITerminalLaunchError } from 'vs/workbench/contrib/terminal/common/terminal';
-import { ActivationKind, ExtensionActivationError } from 'vs/workbench/services/extensions/common/extensions';
+import { ActivationKind, ExtensionActivationError, ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
 import { createExtHostContextProxyIdentifier as createExtId, createMainContextProxyIdentifier as createMainId, IRPCProtocol } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import * as search from 'vs/workbench/services/search/common/search';
 import { EditorGroupColumn, SaveReason } from 'vs/workbench/common/editor';
 import { ExtensionActivationReason } from 'vs/workbench/api/common/extHostExtensionActivator';
 import { TunnelDto } from 'vs/workbench/api/common/extHostTunnelService';
-import { TunnelCreationOptions, TunnelOptions } from 'vs/platform/remote/common/tunnel';
+import { TunnelCreationOptions, TunnelProviderFeatures, TunnelOptions } from 'vs/platform/remote/common/tunnel';
 import { Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor, InternalTimelineOptions } from 'vs/workbench/contrib/timeline/common/timeline';
 import { revive } from 'vs/base/common/marshalling';
 import { IProcessedOutput, INotebookDisplayOrder, NotebookCellMetadata, NotebookDocumentMetadata, ICellEditOperation, NotebookCellsChangedEventDto, NotebookDataDto, IMainCellDto, INotebookDocumentFilter, INotebookKernelInfoDto2, TransientMetadata, INotebookCellStatusBarEntry, ICellRange, INotebookDecorationRenderOptions, INotebookExclusiveDocumentFilter } from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -57,7 +58,8 @@ import { ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib
 import { DebugConfigurationProviderTriggerKind } from 'vs/workbench/api/common/extHostTypes';
 import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
 import { IExtensionIdWithVersion } from 'vs/platform/userDataSync/common/extensionsStorageSync';
-import { RunTestForProviderRequest, RunTestsRequest, RunTestsResult, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { InternalTestItem, InternalTestResults, RunTestForProviderRequest, RunTestsRequest, RunTestsResult, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
@@ -108,7 +110,8 @@ export interface IConfigurationInitData extends IConfigurationData {
 }
 
 export interface IExtHostContext extends IRPCProtocol {
-	remoteAuthority: string | null;
+	readonly remoteAuthority: string | null;
+	readonly extensionHostKind: ExtensionHostKind;
 }
 
 export interface IMainContext extends IRPCProtocol {
@@ -174,7 +177,9 @@ export interface MainThreadAuthenticationShape extends IDisposable {
 	$getSessions(providerId: string): Promise<ReadonlyArray<modes.AuthenticationSession>>;
 	$login(providerId: string, scopes: string[]): Promise<modes.AuthenticationSession>;
 	$logout(providerId: string, sessionId: string): Promise<void>;
+}
 
+export interface MainThreadSecretStateShape extends IDisposable {
 	$getPassword(extensionId: string, key: string): Promise<string | undefined>;
 	$setPassword(extensionId: string, key: string, value: string): Promise<void>;
 	$deletePassword(extensionId: string, key: string): Promise<void>;
@@ -330,7 +335,7 @@ export interface IIndentationRuleDto {
 export interface IOnEnterRuleDto {
 	beforeText: IRegExpDto;
 	afterText?: IRegExpDto;
-	oneLineAboveText?: IRegExpDto;
+	previousLineText?: IRegExpDto;
 	action: EnterAction;
 }
 export interface ILanguageConfigurationDto {
@@ -397,6 +402,8 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: modes.SemanticTokensLegend): void;
 	$registerSuggestSupport(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, displayName: string): void;
 	$registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
+	$registerInlineHintsProvider(handle: number, selector: IDocumentFilterDto[], eventHandle: number | undefined): void;
+	$emitInlineHintsEvent(eventHandle: number, event?: any): void;
 	$registerDocumentLinkProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean): void;
 	$registerDocumentColorProvider(handle: number, selector: IDocumentFilterDto[]): void;
 	$registerFoldingRangeProvider(handle: number, selector: IDocumentFilterDto[], eventHandle: number | undefined): void;
@@ -415,6 +422,7 @@ export interface MainThreadLanguagesShape extends IDisposable {
 export interface MainThreadMessageOptions {
 	extension?: IExtensionDescription;
 	modal?: boolean;
+	useCustom?: boolean;
 }
 
 export interface MainThreadMessageServiceShape extends IDisposable {
@@ -438,6 +446,16 @@ export interface MainThreadProgressShape extends IDisposable {
 	$progressEnd(handle: number): void;
 }
 
+/**
+ * A terminal that is created on the extension host side is temporarily assigned
+ * a UUID by the extension host that created it. Once the renderer side has assigned
+ * a real numeric id, the numeric id will be used.
+ *
+ * All other terminals (that are not created on the extension host side) always
+ * use the numeric id.
+ */
+export type TerminalIdentifier = number | string;
+
 export interface TerminalLaunchConfig {
 	name?: string;
 	shellPath?: string;
@@ -452,11 +470,11 @@ export interface TerminalLaunchConfig {
 }
 
 export interface MainThreadTerminalServiceShape extends IDisposable {
-	$createTerminal(config: TerminalLaunchConfig): Promise<{ id: number, name: string; }>;
-	$dispose(terminalId: number): void;
-	$hide(terminalId: number): void;
-	$sendText(terminalId: number, text: string, addNewLine: boolean): void;
-	$show(terminalId: number, preserveFocus: boolean): void;
+	$createTerminal(extHostTerminalId: string, config: TerminalLaunchConfig): Promise<void>;
+	$dispose(id: TerminalIdentifier): void;
+	$hide(id: TerminalIdentifier): void;
+	$sendText(id: TerminalIdentifier, text: string, addNewLine: boolean): void;
+	$show(id: TerminalIdentifier, preserveFocus: boolean): void;
 	$startSendingDataEvents(): void;
 	$stopSendingDataEvents(): void;
 	$startLinkProvider(): void;
@@ -594,6 +612,24 @@ export interface ExtHostEditorInsetsShape {
 	$onDidReceiveMessage(handle: number, message: any): void;
 }
 
+//#region --- open editors model
+
+export interface MainThreadEditorTabsShape extends IDisposable {
+	// manage tabs: move, close, rearrange etc
+}
+
+export interface IEditorTabDto {
+	group: number;
+	name: string;
+	resource: UriComponents
+}
+
+export interface IExtHostEditorTabsShape {
+	$acceptEditorTabs(tabs: IEditorTabDto[]): void;
+}
+
+//#endregion
+
 export type WebviewHandle = string;
 
 export interface WebviewPanelShowOptions {
@@ -739,6 +775,7 @@ export enum NotebookEditorRevealType {
 	Default = 0,
 	InCenter = 1,
 	InCenterIfOutsideViewport = 2,
+	AtTop = 3
 }
 
 export interface INotebookDocumentShowOptions {
@@ -786,6 +823,16 @@ export interface ExtHostUrlsShape {
 	$handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
 }
 
+export interface MainThreadUriOpenersShape extends IDisposable {
+	$registerUriOpener(id: string, schemes: readonly string[], extensionId: ExtensionIdentifier, label: string): Promise<void>;
+	$unregisterUriOpener(id: string): Promise<void>;
+}
+
+export interface ExtHostUriOpenersShape {
+	$canOpenUri(id: string, uri: UriComponents, token: CancellationToken): Promise<modes.ExternalUriOpenerPriority>;
+	$openUri(id: string, context: { resolvedUri: UriComponents, sourceUri: UriComponents }, token: CancellationToken): Promise<void>;
+}
+
 export interface ITextSearchComplete {
 	limitHit?: boolean;
 }
@@ -853,6 +900,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
 	$onExtensionActivationError(extensionId: ExtensionIdentifier, error: ExtensionActivationError): Promise<void>;
 	$onExtensionRuntimeError(extensionId: ExtensionIdentifier, error: SerializedError): void;
 	$onExtensionHostExit(code: number): Promise<void>;
+	$setPerformanceMarks(marks: performance.PerformanceMark[]): Promise<void>;
 }
 
 export interface SCMProviderFeatures {
@@ -946,6 +994,7 @@ export interface MainThreadDebugServiceShape extends IDisposable {
 
 export interface IOpenUriOptions {
 	readonly allowTunneling?: boolean;
+	readonly allowContributedOpeners?: boolean | string;
 }
 
 export interface MainThreadWindowShape extends IDisposable {
@@ -958,8 +1007,9 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
 	$openTunnel(tunnelOptions: TunnelOptions, source: string | undefined): Promise<TunnelDto | undefined>;
 	$closeTunnel(remote: { host: string, port: number }): Promise<void>;
 	$getTunnels(): Promise<TunnelDescription[]>;
-	$setTunnelProvider(): Promise<void>;
-	$tunnelServiceReady(): Promise<void>;
+	$setTunnelProvider(features: TunnelProviderFeatures): Promise<void>;
+	$setCandidateFinder(): Promise<void>;
+	$setCandidateFilter(): Promise<void>;
 	$onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): Promise<void>;
 }
 
@@ -1052,7 +1102,7 @@ export interface ExtHostTreeViewsShape {
 	$setSelection(treeViewId: string, treeItemHandles: string[]): void;
 	$setVisible(treeViewId: string, visible: boolean): void;
 	$hasResolve(treeViewId: string): Promise<boolean>;
-	$resolve(treeViewId: string, treeItemHandle: string): Promise<ITreeItem | undefined>;
+	$resolve(treeViewId: string, treeItemHandle: string, token: CancellationToken): Promise<ITreeItem | undefined>;
 }
 
 export interface ExtHostWorkspaceShape {
@@ -1094,7 +1144,10 @@ export interface ExtHostAuthenticationShape {
 	$onDidChangeAuthenticationSessions(id: string, label: string, event: modes.AuthenticationSessionsChangeEvent): Promise<void>;
 	$onDidChangeAuthenticationProviders(added: modes.AuthenticationProviderInformation[], removed: modes.AuthenticationProviderInformation[]): Promise<void>;
 	$setProviders(providers: modes.AuthenticationProviderInformation[]): Promise<void>;
-	$onDidChangePassword(): Promise<void>;
+}
+
+export interface ExtHostSecretStateShape {
+	$onDidChangePassword(e: { extensionId: string, key: string }): Promise<void>;
 }
 
 export interface ExtHostSearchShape {
@@ -1145,9 +1198,14 @@ export interface SourceTargetPair {
 	target: UriComponents;
 }
 
+export interface IWillRunFileOperationParticipation {
+	edit: IWorkspaceEditDto;
+	extensionNames: string[]
+}
+
 export interface ExtHostFileSystemEventServiceShape {
 	$onFileEvent(events: FileSystemEvents): void;
-	$onWillRunFileOperation(operation: files.FileOperation, files: SourceTargetPair[], undoRedoGroupId: number | undefined, timeout: number, token: CancellationToken): Promise<any>;
+	$onWillRunFileOperation(operation: files.FileOperation, files: SourceTargetPair[], timeout: number, token: CancellationToken): Promise<IWillRunFileOperationParticipation | undefined>;
 	$onDidRunFileOperation(operation: files.FileOperation, files: SourceTargetPair[]): void;
 }
 
@@ -1252,6 +1310,18 @@ export interface ISignatureHelpContextDto {
 	readonly activeSignatureHelp?: ISignatureHelpDto;
 }
 
+export interface IInlineHintDto {
+	text: string;
+	range: IRange;
+	hoverMessage?: string;
+	whitespaceBefore?: boolean;
+	whitespaceAfter?: boolean;
+}
+
+export interface IInlineHintsDto {
+	hints: IInlineHintDto[]
+}
+
 export interface ILocationDto {
 	uri: UriComponents;
 	range: IRange;
@@ -1441,6 +1511,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$releaseCompletionItems(handle: number, id: number): void;
 	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Promise<ISignatureHelpDto | undefined>;
 	$releaseSignatureHelp(handle: number, id: number): void;
+	$provideInlineHints(handle: number, resource: UriComponents, range: IRange, token: CancellationToken): Promise<IInlineHintsDto | undefined>
 	$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Promise<ILinksListDto | undefined>;
 	$resolveDocumentLink(handle: number, id: ChainedCacheId, token: CancellationToken): Promise<ILinkDto | undefined>;
 	$releaseDocumentLinks(handle: number, id: number): void;
@@ -1473,6 +1544,7 @@ export interface IShellLaunchConfigDto {
 	cwd?: string | UriComponents;
 	env?: { [key: string]: string | null; };
 	hideFromUser?: boolean;
+	flowControl?: boolean;
 }
 
 export interface IShellDefinitionDto {
@@ -1503,7 +1575,7 @@ export interface ITerminalDimensionsDto {
 
 export interface ExtHostTerminalServiceShape {
 	$acceptTerminalClosed(id: number, exitCode: number | undefined): void;
-	$acceptTerminalOpened(id: number, name: string, shellLaunchConfig: IShellLaunchConfigDto): void;
+	$acceptTerminalOpened(id: number, extHostTerminalId: string | undefined, name: string, shellLaunchConfig: IShellLaunchConfigDto): void;
 	$acceptActiveTerminalChanged(id: number | null): void;
 	$acceptTerminalProcessId(id: number, processId: number): void;
 	$acceptTerminalProcessData(id: number, data: string): void;
@@ -1512,6 +1584,7 @@ export interface ExtHostTerminalServiceShape {
 	$acceptTerminalMaximumDimensions(id: number, cols: number, rows: number): void;
 	$spawnExtHostProcess(id: number, shellLaunchConfig: IShellLaunchConfigDto, activeWorkspaceRootUri: UriComponents | undefined, cols: number, rows: number, isWorkspaceShellAllowed: boolean): Promise<ITerminalLaunchError | undefined>;
 	$startExtensionTerminal(id: number, initialDimensions: ITerminalDimensionsDto | undefined): Promise<ITerminalLaunchError | undefined>;
+	$acceptProcessAckDataEvent(id: number, charCount: number): void;
 	$acceptProcessInput(id: number, data: string): void;
 	$acceptProcessResize(id: number, cols: number, rows: number): void;
 	$acceptProcessShutdown(id: number, immediate: boolean): void;
@@ -1725,7 +1798,7 @@ export interface ExtHostNotebookShape {
 	$saveNotebookAs(viewType: string, uri: UriComponents, target: UriComponents, token: CancellationToken): Promise<boolean>;
 	$backup(viewType: string, uri: UriComponents, cancellation: CancellationToken): Promise<string | undefined>;
 	$acceptDisplayOrder(displayOrder: INotebookDisplayOrder): void;
-	$acceptNotebookActiveKernelChange(event: { uri: UriComponents, providerHandle: number | undefined, kernelId: string | undefined }): void;
+	$acceptNotebookActiveKernelChange(event: { uri: UriComponents, providerHandle: number | undefined, kernelFriendlyId: string | undefined }): void;
 	$onDidReceiveMessage(editorId: string, rendererId: string | undefined, message: unknown): void;
 	$acceptModelChanged(uriComponents: UriComponents, event: NotebookCellsChangedEventDto, isDirty: boolean): void;
 	$acceptModelSaved(uriComponents: UriComponents): void;
@@ -1749,9 +1822,11 @@ export interface MainThreadThemingShape extends IDisposable {
 }
 
 export interface ExtHostTunnelServiceShape {
-	$forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto> | undefined;
+	$forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto | undefined>;
 	$closeTunnel(remote: { host: string, port: number }, silent?: boolean): Promise<void>;
 	$onDidTunnelsChange(): Promise<void>;
+	$registerCandidateFinder(enable: boolean): Promise<void>;
+	$applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]>;
 }
 
 export interface ExtHostTimelineShape {
@@ -1764,11 +1839,12 @@ export const enum ExtHostTestingResource {
 }
 
 export interface ExtHostTestingShape {
-	$runTestsForProvider(req: RunTestForProviderRequest): Promise<RunTestsResult>;
+	$runTestsForProvider(req: RunTestForProviderRequest, token: CancellationToken): Promise<RunTestsResult>;
 	$subscribeToTests(resource: ExtHostTestingResource, uri: UriComponents): void;
 	$unsubscribeFromTests(resource: ExtHostTestingResource, uri: UriComponents): void;
-
+	$lookupTest(test: TestIdWithProvider): Promise<InternalTestItem | undefined>;
 	$acceptDiff(resource: ExtHostTestingResource, uri: UriComponents, diff: TestsDiff): void;
+	$publishTestResults(results: InternalTestResults): void;
 }
 
 export interface MainThreadTestingShape {
@@ -1777,7 +1853,7 @@ export interface MainThreadTestingShape {
 	$subscribeToDiffs(resource: ExtHostTestingResource, uri: UriComponents): void;
 	$unsubscribeFromDiffs(resource: ExtHostTestingResource, uri: UriComponents): void;
 	$publishDiff(resource: ExtHostTestingResource, uri: UriComponents, diff: TestsDiff): void;
-	$runTests(req: RunTestsRequest): Promise<RunTestsResult>;
+	$runTests(req: RunTestsRequest, token: CancellationToken): Promise<RunTestsResult>;
 }
 
 // --- proxy identifiers
@@ -1798,6 +1874,7 @@ export const MainContext = {
 	MainThreadDocumentContentProviders: createMainId<MainThreadDocumentContentProvidersShape>('MainThreadDocumentContentProviders'),
 	MainThreadTextEditors: createMainId<MainThreadTextEditorsShape>('MainThreadTextEditors'),
 	MainThreadEditorInsets: createMainId<MainThreadEditorInsetsShape>('MainThreadEditorInsets'),
+	MainThreadEditorTabs: createMainId<MainThreadEditorTabsShape>('MainThreadEditorTabs'),
 	MainThreadErrors: createMainId<MainThreadErrorsShape>('MainThreadErrors'),
 	MainThreadTreeViews: createMainId<MainThreadTreeViewsShape>('MainThreadTreeViews'),
 	MainThreadDownloadService: createMainId<MainThreadDownloadServiceShape>('MainThreadDownloadService'),
@@ -1810,6 +1887,7 @@ export const MainContext = {
 	MainThreadProgress: createMainId<MainThreadProgressShape>('MainThreadProgress'),
 	MainThreadQuickOpen: createMainId<MainThreadQuickOpenShape>('MainThreadQuickOpen'),
 	MainThreadStatusBar: createMainId<MainThreadStatusBarShape>('MainThreadStatusBar'),
+	MainThreadSecretState: createMainId<MainThreadSecretStateShape>('MainThreadSecretState'),
 	MainThreadStorage: createMainId<MainThreadStorageShape>('MainThreadStorage'),
 	MainThreadTelemetry: createMainId<MainThreadTelemetryShape>('MainThreadTelemetry'),
 	MainThreadTerminalService: createMainId<MainThreadTerminalServiceShape>('MainThreadTerminalService'),
@@ -1818,6 +1896,7 @@ export const MainContext = {
 	MainThreadWebviewViews: createMainId<MainThreadWebviewViewsShape>('MainThreadWebviewViews'),
 	MainThreadCustomEditors: createMainId<MainThreadCustomEditorsShape>('MainThreadCustomEditors'),
 	MainThreadUrls: createMainId<MainThreadUrlsShape>('MainThreadUrls'),
+	MainThreadUriOpeners: createMainId<MainThreadUriOpenersShape>('MainThreadUriOpeners'),
 	MainThreadWorkspace: createMainId<MainThreadWorkspaceShape>('MainThreadWorkspace'),
 	MainThreadFileSystem: createMainId<MainThreadFileSystemShape>('MainThreadFileSystem'),
 	MainThreadExtensionService: createMainId<MainThreadExtensionServiceShape>('MainThreadExtensionService'),
@@ -1863,10 +1942,13 @@ export const ExtHostContext = {
 	ExtHostCustomEditors: createExtId<ExtHostCustomEditorsShape>('ExtHostCustomEditors'),
 	ExtHostWebviewViews: createExtId<ExtHostWebviewViewsShape>('ExtHostWebviewViews'),
 	ExtHostEditorInsets: createExtId<ExtHostEditorInsetsShape>('ExtHostEditorInsets'),
+	ExtHostEditorTabs: createExtId<IExtHostEditorTabsShape>('ExtHostEditorTabs'),
 	ExtHostProgress: createMainId<ExtHostProgressShape>('ExtHostProgress'),
 	ExtHostComments: createMainId<ExtHostCommentsShape>('ExtHostComments'),
+	ExtHostSecretState: createMainId<ExtHostSecretStateShape>('ExtHostSecretState'),
 	ExtHostStorage: createMainId<ExtHostStorageShape>('ExtHostStorage'),
 	ExtHostUrls: createExtId<ExtHostUrlsShape>('ExtHostUrls'),
+	ExtHostUriOpeners: createExtId<ExtHostUriOpenersShape>('ExtHostUriOpeners'),
 	ExtHostOutputService: createMainId<ExtHostOutputServiceShape>('ExtHostOutputService'),
 	ExtHosLabelService: createMainId<ExtHostLabelServiceShape>('ExtHostLabelService'),
 	ExtHostNotebook: createMainId<ExtHostNotebookShape>('ExtHostNotebook'),
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
index 08b2543a4..93f77a957 100644
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -20,6 +20,8 @@ import { IRange } from 'vs/editor/common/core/range';
 import { IPosition } from 'vs/editor/common/core/position';
 import { TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { decodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
 
 //#region --- NEW world
 
@@ -176,6 +178,57 @@ const newCommands: ApiCommand[] = [
 		[ApiCommandArgument.Uri, ApiCommandArgument.Number.with('linkResolveCount', 'Number of links that should be resolved, only when links are unresolved.').optional()],
 		new ApiCommandResult<modes.ILink[], vscode.DocumentLink[]>('A promise that resolves to an array of DocumentLink-instances.', value => value.map(typeConverters.DocumentLink.to))
 	),
+	// --- semantic tokens
+	new ApiCommand(
+		'vscode.provideDocumentSemanticTokensLegend', '_provideDocumentSemanticTokensLegend', 'Provide semantic tokens legend for a document',
+		[ApiCommandArgument.Uri],
+		new ApiCommandResult<modes.SemanticTokensLegend, types.SemanticTokensLegend | undefined>('A promise that resolves to SemanticTokensLegend.', value => {
+			if (!value) {
+				return undefined;
+			}
+			return new types.SemanticTokensLegend(value.tokenTypes, value.tokenModifiers);
+		})
+	),
+	new ApiCommand(
+		'vscode.provideDocumentSemanticTokens', '_provideDocumentSemanticTokens', 'Provide semantic tokens for a document',
+		[ApiCommandArgument.Uri],
+		new ApiCommandResult<VSBuffer, types.SemanticTokens | undefined>('A promise that resolves to SemanticTokens.', value => {
+			if (!value) {
+				return undefined;
+			}
+			const semanticTokensDto = decodeSemanticTokensDto(value);
+			if (semanticTokensDto.type !== 'full') {
+				// only accepting full semantic tokens from provideDocumentSemanticTokens
+				return undefined;
+			}
+			return new types.SemanticTokens(semanticTokensDto.data, undefined);
+		})
+	),
+	new ApiCommand(
+		'vscode.provideDocumentRangeSemanticTokensLegend', '_provideDocumentRangeSemanticTokensLegend', 'Provide semantic tokens legend for a document range',
+		[ApiCommandArgument.Uri],
+		new ApiCommandResult<modes.SemanticTokensLegend, types.SemanticTokensLegend | undefined>('A promise that resolves to SemanticTokensLegend.', value => {
+			if (!value) {
+				return undefined;
+			}
+			return new types.SemanticTokensLegend(value.tokenTypes, value.tokenModifiers);
+		})
+	),
+	new ApiCommand(
+		'vscode.provideDocumentRangeSemanticTokens', '_provideDocumentRangeSemanticTokens', 'Provide semantic tokens for a document range',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Range],
+		new ApiCommandResult<VSBuffer, types.SemanticTokens | undefined>('A promise that resolves to SemanticTokens.', value => {
+			if (!value) {
+				return undefined;
+			}
+			const semanticTokensDto = decodeSemanticTokensDto(value);
+			if (semanticTokensDto.type !== 'full') {
+				// only accepting full semantic tokens from provideDocumentRangeSemanticTokens
+				return undefined;
+			}
+			return new types.SemanticTokens(semanticTokensDto.data, undefined);
+		})
+	),
 	// --- completions
 	new ApiCommand(
 		'vscode.executeCompletionItemProvider', '_executeCompletionItemProvider', 'Execute completion item provider.',
@@ -271,13 +324,21 @@ const newCommands: ApiCommand[] = [
 			return [];
 		})
 	),
+	// --- inline hints
+	new ApiCommand(
+		'vscode.executeInlineHintProvider', '_executeInlineHintProvider', 'Execute inline hints provider',
+		[ApiCommandArgument.Uri, ApiCommandArgument.Range],
+		new ApiCommandResult<modes.InlineHint[], vscode.InlineHint[]>('A promise that resolves to an array of InlineHint objects', result => {
+			return result.map(typeConverters.InlineHint.to);
+		})
+	),
 	// --- notebooks
 	new ApiCommand(
 		'vscode.resolveNotebookContentProviders', '_resolveNotebookContentProvider', 'Resolve Notebook Content Providers',
 		[
-			new ApiCommandArgument<string, string>('viewType', '', v => typeof v === 'string', v => v),
-			new ApiCommandArgument<string, string>('displayName', '', v => typeof v === 'string', v => v),
-			new ApiCommandArgument<object, object>('options', '', v => typeof v === 'object', v => v),
+			// new ApiCommandArgument<string, string>('viewType', '', v => typeof v === 'string', v => v),
+			// new ApiCommandArgument<string, string>('displayName', '', v => typeof v === 'string', v => v),
+			// new ApiCommandArgument<object, object>('options', '', v => typeof v === 'object', v => v),
 		],
 		new ApiCommandResult<{
 			viewType: string;
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
index 631999062..7376e9c66 100644
--- a/src/vs/workbench/api/common/extHostAuthentication.ts
+++ b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -15,11 +15,15 @@ interface GetSessionsRequest {
 	result: Promise<vscode.AuthenticationSession | undefined>;
 }
 
+interface ProviderWithMetadata {
+	label: string;
+	provider: vscode.AuthenticationProvider;
+	options: vscode.AuthenticationProviderOptions;
+}
+
 export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 	private _proxy: MainThreadAuthenticationShape;
-	private _authenticationProviders: Map<string, vscode.AuthenticationProvider> = new Map<string, vscode.AuthenticationProvider>();
-
-	private _providerIds: string[] = [];
+	private _authenticationProviders: Map<string, ProviderWithMetadata> = new Map<string, ProviderWithMetadata>();
 
 	private _providers: vscode.AuthenticationProviderInformation[] = [];
 
@@ -29,9 +33,6 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 	private _onDidChangeSessions = new Emitter<vscode.AuthenticationSessionsChangeEvent>();
 	readonly onDidChangeSessions: Event<vscode.AuthenticationSessionsChangeEvent> = this._onDidChangeSessions.event;
 
-	private _onDidChangePassword = new Emitter<void>();
-	readonly onDidChangePassword: Event<void> = this._onDidChangePassword.event;
-
 	private _inFlightRequests = new Map<string, GetSessionsRequest[]>();
 
 	constructor(mainContext: IMainContext) {
@@ -43,14 +44,6 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		return Promise.resolve();
 	}
 
-	getProviderIds(): Promise<ReadonlyArray<string>> {
-		return this._proxy.$getProviderIds();
-	}
-
-	get providerIds(): string[] {
-		return this._providerIds;
-	}
-
 	get providers(): ReadonlyArray<vscode.AuthenticationProviderInformation> {
 		return Object.freeze(this._providers.slice());
 	}
@@ -90,128 +83,120 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 
 	private async _getSession(requestingExtension: IExtensionDescription, extensionId: string, providerId: string, scopes: string[], options: vscode.AuthenticationGetSessionOptions = {}): Promise<vscode.AuthenticationSession | undefined> {
 		await this._proxy.$ensureProvider(providerId);
-		const provider = this._authenticationProviders.get(providerId);
+		const providerData = this._authenticationProviders.get(providerId);
 		const extensionName = requestingExtension.displayName || requestingExtension.name;
 
-		if (!provider) {
+		if (!providerData) {
 			return this._proxy.$getSession(providerId, scopes, extensionId, extensionName, options);
 		}
 
 		const orderedScopes = scopes.sort().join(' ');
-		const sessions = (await provider.getSessions()).filter(session => session.scopes.slice().sort().join(' ') === orderedScopes);
+		const sessions = (await providerData.provider.getSessions()).filter(session => session.scopes.slice().sort().join(' ') === orderedScopes);
 
 		let session: vscode.AuthenticationSession | undefined = undefined;
 		if (sessions.length) {
-			if (!provider.supportsMultipleAccounts) {
+			if (!providerData.options.supportsMultipleAccounts) {
 				session = sessions[0];
-				const allowed = await this._proxy.$getSessionsPrompt(providerId, session.account.label, provider.label, extensionId, extensionName);
+				const allowed = await this._proxy.$getSessionsPrompt(providerId, session.account.label, providerData.label, extensionId, extensionName);
 				if (!allowed) {
 					throw new Error('User did not consent to login.');
 				}
 			} else {
 				// On renderer side, confirm consent, ask user to choose between accounts if multiple sessions are valid
-				const selected = await this._proxy.$selectSession(providerId, provider.label, extensionId, extensionName, sessions, scopes, !!options.clearSessionPreference);
+				const selected = await this._proxy.$selectSession(providerId, providerData.label, extensionId, extensionName, sessions, scopes, !!options.clearSessionPreference);
 				session = sessions.find(session => session.id === selected.id);
 			}
 
 		} else {
 			if (options.createIfNone) {
-				const isAllowed = await this._proxy.$loginPrompt(provider.label, extensionName);
+				const isAllowed = await this._proxy.$loginPrompt(providerData.label, extensionName);
 				if (!isAllowed) {
 					throw new Error('User did not consent to login.');
 				}
 
-				session = await provider.login(scopes);
+				session = await providerData.provider.login(scopes);
 				await this._proxy.$setTrustedExtensionAndAccountPreference(providerId, session.account.label, extensionId, extensionName, session.id);
 			} else {
 				await this._proxy.$requestNewSession(providerId, scopes, extensionId, extensionName);
 			}
 		}
 
-
 		return session;
 	}
 
 	async logout(providerId: string, sessionId: string): Promise<void> {
-		const provider = this._authenticationProviders.get(providerId);
-		if (!provider) {
+		const providerData = this._authenticationProviders.get(providerId);
+		if (!providerData) {
 			return this._proxy.$logout(providerId, sessionId);
 		}
 
-		return provider.logout(sessionId);
+		return providerData.provider.logout(sessionId);
 	}
 
-	registerAuthenticationProvider(provider: vscode.AuthenticationProvider): vscode.Disposable {
-		if (this._authenticationProviders.get(provider.id)) {
-			throw new Error(`An authentication provider with id '${provider.id}' is already registered.`);
+	registerAuthenticationProvider(id: string, label: string, provider: vscode.AuthenticationProvider, options?: vscode.AuthenticationProviderOptions): vscode.Disposable {
+		if (this._authenticationProviders.get(id)) {
+			throw new Error(`An authentication provider with id '${id}' is already registered.`);
 		}
 
-		this._authenticationProviders.set(provider.id, provider);
-		if (!this._providerIds.includes(provider.id)) {
-			this._providerIds.push(provider.id);
-		}
+		this._authenticationProviders.set(id, { label, provider, options: options ?? { supportsMultipleAccounts: false } });
 
-		if (!this._providers.find(p => p.id === provider.id)) {
+		if (!this._providers.find(p => p.id === id)) {
 			this._providers.push({
-				id: provider.id,
-				label: provider.label
+				id: id,
+				label: label
 			});
 		}
 
 		const listener = provider.onDidChangeSessions(e => {
-			this._proxy.$sendDidChangeSessions(provider.id, e);
+			this._proxy.$sendDidChangeSessions(id, e);
 		});
 
-		this._proxy.$registerAuthenticationProvider(provider.id, provider.label, provider.supportsMultipleAccounts);
+		this._proxy.$registerAuthenticationProvider(id, label, options?.supportsMultipleAccounts ?? false);
 
 		return new Disposable(() => {
 			listener.dispose();
-			this._authenticationProviders.delete(provider.id);
-			const index = this._providerIds.findIndex(id => id === provider.id);
-			if (index > -1) {
-				this._providerIds.splice(index);
-			}
+			this._authenticationProviders.delete(id);
 
-			const i = this._providers.findIndex(p => p.id === provider.id);
+			const i = this._providers.findIndex(p => p.id === id);
 			if (i > -1) {
 				this._providers.splice(i);
 			}
 
-			this._proxy.$unregisterAuthenticationProvider(provider.id);
+			this._proxy.$unregisterAuthenticationProvider(id);
 		});
 	}
 
 	$login(providerId: string, scopes: string[]): Promise<modes.AuthenticationSession> {
-		const authProvider = this._authenticationProviders.get(providerId);
-		if (authProvider) {
-			return Promise.resolve(authProvider.login(scopes));
+		const providerData = this._authenticationProviders.get(providerId);
+		if (providerData) {
+			return Promise.resolve(providerData.provider.login(scopes));
 		}
 
 		throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
 	}
 
 	$logout(providerId: string, sessionId: string): Promise<void> {
-		const authProvider = this._authenticationProviders.get(providerId);
-		if (authProvider) {
-			return Promise.resolve(authProvider.logout(sessionId));
+		const providerData = this._authenticationProviders.get(providerId);
+		if (providerData) {
+			return Promise.resolve(providerData.provider.logout(sessionId));
 		}
 
 		throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
 	}
 
 	$getSessions(providerId: string): Promise<ReadonlyArray<modes.AuthenticationSession>> {
-		const authProvider = this._authenticationProviders.get(providerId);
-		if (authProvider) {
-			return Promise.resolve(authProvider.getSessions());
+		const providerData = this._authenticationProviders.get(providerId);
+		if (providerData) {
+			return Promise.resolve(providerData.provider.getSessions());
 		}
 
 		throw new Error(`Unable to find authentication provider with handle: ${providerId}`);
 	}
 
 	async $getSessionAccessToken(providerId: string, sessionId: string): Promise<string> {
-		const authProvider = this._authenticationProviders.get(providerId);
-		if (authProvider) {
-			const sessions = await authProvider.getSessions();
+		const providerData = this._authenticationProviders.get(providerId);
+		if (providerData) {
+			const sessions = await providerData.provider.getSessions();
 			const session = sessions.find(session => session.id === sessionId);
 			if (session) {
 				return session.accessToken;
@@ -245,23 +230,4 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 		this._onDidChangeAuthenticationProviders.fire({ added, removed });
 		return Promise.resolve();
 	}
-
-	async $onDidChangePassword(): Promise<void> {
-		this._onDidChangePassword.fire();
-	}
-
-	getPassword(requestingExtension: IExtensionDescription, key: string): Promise<string | undefined> {
-		const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
-		return this._proxy.$getPassword(extensionId, key);
-	}
-
-	setPassword(requestingExtension: IExtensionDescription, key: string, value: string): Promise<void> {
-		const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
-		return this._proxy.$setPassword(extensionId, key, value);
-	}
-
-	deletePassword(requestingExtension: IExtensionDescription, key: string): Promise<void> {
-		const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
-		return this._proxy.$deletePassword(extensionId, key);
-	}
 }
diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts
index 649612e38..c33737246 100644
--- a/src/vs/workbench/api/common/extHostCommands.ts
+++ b/src/vs/workbench/api/common/extHostCommands.ts
@@ -103,7 +103,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 
 			const internalArgs = apiCommand.args.map((arg, i) => {
 				if (!arg.validate(apiArgs[i])) {
-					throw new Error(`Invalid argument '${arg.name}' when running '${apiCommand.id}', receieved: ${apiArgs[i]}`);
+					throw new Error(`Invalid argument '${arg.name}' when running '${apiCommand.id}', received: ${apiArgs[i]}`);
 				}
 				return arg.convert(apiArgs[i]);
 			});
@@ -194,7 +194,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 		}
 	}
 
-	private _executeContributedCommand<T>(id: string, args: any[]): Promise<T> {
+	private async _executeContributedCommand<T>(id: string, args: any[]): Promise<T> {
 		const command = this._commands.get(id);
 		if (!command) {
 			throw new Error('Unknown command');
@@ -205,17 +205,16 @@ export class ExtHostCommands implements ExtHostCommandsShape {
 				try {
 					validateConstraint(args[i], description.args[i].constraint);
 				} catch (err) {
-					return Promise.reject(new Error(`Running the contributed command: '${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`));
+					throw new Error(`Running the contributed command: '${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`);
 				}
 			}
 		}
 
 		try {
-			const result = callback.apply(thisArg, args);
-			return Promise.resolve(result);
+			return await callback.apply(thisArg, args);
 		} catch (err) {
 			this._logService.error(err, id);
-			return Promise.reject(new Error(`Running the contributed command: '${id}' failed.`));
+			throw new Error(`Running the contributed command: '${id}' failed.`);
 		}
 	}
 
diff --git a/src/vs/workbench/api/common/extHostCustomEditors.ts b/src/vs/workbench/api/common/extHostCustomEditors.ts
index becd0887e..a4359d91a 100644
--- a/src/vs/workbench/api/common/extHostCustomEditors.ts
+++ b/src/vs/workbench/api/common/extHostCustomEditors.ts
@@ -13,6 +13,7 @@ import * as modes from 'vs/editor/common/modes';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
 import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
+import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
 import { ExtHostWebviews, toExtensionData } from 'vs/workbench/api/common/extHostWebview';
 import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
 import { EditorGroupColumn } from 'vs/workbench/common/editor';
@@ -178,7 +179,7 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 		options: { webviewOptions?: vscode.WebviewPanelOptions, supportsMultipleEditorsPerDocument?: boolean },
 	): vscode.Disposable {
 		const disposables = new DisposableStore();
-		if ('resolveCustomTextEditor' in provider) {
+		if (isCustomTextEditorProvider(provider)) {
 			disposables.add(this._editorProviders.addTextProvider(viewType, extension, provider));
 			this._proxy.$registerTextEditorProvider(toExtensionData(extension), viewType, options.webviewOptions || {}, {
 				supportsMove: !!provider.moveCustomTextEditor,
@@ -208,7 +209,6 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 			}));
 	}
 
-
 	async $createCustomDocument(resource: UriComponents, viewType: string, backupId: string | undefined, cancellation: CancellationToken) {
 		const entry = this._editorProviders.get(viewType);
 		if (!entry) {
@@ -261,8 +261,10 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 			throw new Error(`No provider found for '${viewType}'`);
 		}
 
+		const viewColumn = typeConverters.ViewColumn.to(position);
+
 		const webview = this._extHostWebview.createNewWebview(handle, options, entry.extension);
-		const panel = this._extHostWebviewPanels.createNewWebviewPanel(handle, viewType, title, position, options, webview);
+		const panel = this._extHostWebviewPanels.createNewWebviewPanel(handle, viewType, title, viewColumn, options, webview);
 
 		const revivedResource = URI.revive(resource);
 
@@ -350,7 +352,6 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 		return backup.id;
 	}
 
-
 	private getCustomDocumentEntry(viewType: string, resource: UriComponents): CustomDocumentStoreEntry {
 		const entry = this._documents.get(viewType, URI.revive(resource));
 		if (!entry) {
@@ -375,6 +376,9 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 	}
 }
 
+function isCustomTextEditorProvider(provider: vscode.CustomReadonlyEditorProvider<vscode.CustomDocument> | vscode.CustomTextEditorProvider): provider is vscode.CustomTextEditorProvider {
+	return typeof (provider as vscode.CustomTextEditorProvider).resolveCustomTextEditor === 'function';
+}
 
 function isEditEvent(e: vscode.CustomDocumentContentChangeEvent | vscode.CustomDocumentEditEvent): e is vscode.CustomDocumentEditEvent {
 	return typeof (e as vscode.CustomDocumentEditEvent).undo === 'function'
diff --git a/src/vs/workbench/api/common/extHostDebugService.ts b/src/vs/workbench/api/common/extHostDebugService.ts
index 4026a1d2b..d639431a1 100644
--- a/src/vs/workbench/api/common/extHostDebugService.ts
+++ b/src/vs/workbench/api/common/extHostDebugService.ts
@@ -152,7 +152,7 @@ export abstract class ExtHostDebugServiceBase implements IExtHostDebugService, E
 
 		const source = <any>src;
 
-		if (typeof source.sourceReference === 'number') {
+		if (typeof source.sourceReference === 'number' && source.sourceReference > 0) {
 			// src can be retrieved via DAP's "source" request
 
 			let debug = `debug:${encodeURIComponent(source.path || '')}`;
diff --git a/src/vs/workbench/api/common/extHostEditorTabs.ts b/src/vs/workbench/api/common/extHostEditorTabs.ts
new file mode 100644
index 000000000..2d0f7b4c6
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostEditorTabs.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as vscode from 'vscode';
+import { IEditorTabDto, IExtHostEditorTabsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { URI } from 'vs/base/common/uri';
+import { Emitter, Event } from 'vs/base/common/event';
+
+
+export interface IEditorTab {
+	name: string;
+	group: number;
+	resource: vscode.Uri
+}
+
+export class ExtHostEditorTabs implements IExtHostEditorTabsShape {
+
+	private readonly _onDidChangeTabs = new Emitter<void>();
+	readonly onDidChangeTabs: Event<void> = this._onDidChangeTabs.event;
+
+	private _tabs: IEditorTab[] = [];
+
+	get tabs(): readonly IEditorTab[] {
+		return this._tabs;
+	}
+
+	$acceptEditorTabs(tabs: IEditorTabDto[]): void {
+		this._tabs = tabs.map(dto => {
+			return {
+				name: dto.name,
+				group: dto.group,
+				resource: URI.revive(dto.resource)
+			};
+		});
+		this._onDidChangeTabs.fire();
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
index 328b93272..2274a4f12 100644
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -5,6 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as path from 'vs/base/common/path';
+import * as performance from 'vs/base/common/performance';
 import { originalFSPath, joinPath } from 'vs/base/common/resources';
 import { Barrier, timeout } from 'vs/base/common/async';
 import { dispose, toDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
@@ -35,6 +36,8 @@ import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelServ
 import { IExtHostTerminalService } from 'vs/workbench/api/common/extHostTerminalService';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IExtensionActivationHost, checkActivateWorkspaceContainsExtension } from 'vs/workbench/api/common/shared/workspaceContains';
+import { ExtHostSecretState, IExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
+import { ExtensionSecrets } from 'vs/workbench/api/common/extHostSecrets';
 
 interface ITestRunner {
 	/** Old test runner API, as exported from `vscode/lib/testrunner` */
@@ -50,7 +53,7 @@ export const IHostUtils = createDecorator<IHostUtils>('IHostUtils');
 
 export interface IHostUtils {
 	readonly _serviceBrand: undefined;
-	exit(code?: number): void;
+	exit(code: number): void;
 	exists(path: string): Promise<boolean>;
 	realpath(path: string): Promise<string>;
 }
@@ -94,6 +97,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 	private readonly _readyToRunExtensions: Barrier;
 	protected readonly _registry: ExtensionDescriptionRegistry;
 	private readonly _storage: ExtHostStorage;
+	private readonly _secretState: ExtHostSecretState;
 	private readonly _storagePath: IExtensionStoragePaths;
 	private readonly _activator: ExtensionsActivator;
 	private _extensionPathIndex: Promise<TernarySearchTree<string, IExtensionDescription>> | null;
@@ -115,7 +119,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		@IExtHostInitDataService initData: IExtHostInitDataService,
 		@IExtensionStoragePaths storagePath: IExtensionStoragePaths,
 		@IExtHostTunnelService extHostTunnelService: IExtHostTunnelService,
-		@IExtHostTerminalService extHostTerminalService: IExtHostTerminalService
+		@IExtHostTerminalService extHostTerminalService: IExtHostTerminalService,
 	) {
 		super();
 		this._hostUtils = hostUtils;
@@ -138,10 +142,12 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		this._readyToRunExtensions = new Barrier();
 		this._registry = new ExtensionDescriptionRegistry(this._initData.extensions);
 		this._storage = new ExtHostStorage(this._extHostContext);
+		this._secretState = new ExtHostSecretState(this._extHostContext);
 		this._storagePath = storagePath;
 
 		this._instaService = instaService.createChild(new ServiceCollection(
-			[IExtHostStorage, this._storage]
+			[IExtHostStorage, this._storage],
+			[IExtHostSecretState, this._secretState]
 		));
 
 		const hostExtensions = new Set<string>();
@@ -184,6 +190,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			this._almostReadyToRunExtensions.open();
 
 			await this._extHostWorkspace.waitForInitializeCall();
+			performance.mark('code/extHost/ready');
 			this._readyToStartExtensionHost.open();
 
 			if (this._initData.autoStart) {
@@ -362,10 +369,14 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 		const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
 		return Promise.all([
-			this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
+			this._loadCommonJSModule<IExtensionModule>(extensionDescription.identifier, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
 			this._loadExtensionContext(extensionDescription)
 		]).then(values => {
+			performance.mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
 			return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
+		}).then((activatedExtension) => {
+			performance.mark(`code/extHost/didActivateExtension/${extensionDescription.identifier.value}`);
+			return activatedExtension;
 		});
 	}
 
@@ -373,6 +384,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 		const globalState = new ExtensionGlobalMemento(extensionDescription, this._storage);
 		const workspaceState = new ExtensionMemento(extensionDescription.identifier.value, false, this._storage);
+		const secrets = new ExtensionSecrets(extensionDescription, this._secretState);
 		const extensionMode = extensionDescription.isUnderDevelopment
 			? (this._initData.environment.extensionTestsLocationURI ? ExtensionMode.Test : ExtensionMode.Development)
 			: ExtensionMode.Production;
@@ -388,6 +400,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 			return Object.freeze<vscode.ExtensionContext>({
 				globalState,
 				workspaceState,
+				secrets,
 				subscriptions: [],
 				get extensionUri() { return extensionDescription.extensionLocation; },
 				get extensionPath() { return extensionDescription.extensionLocation.fsPath; },
@@ -456,6 +469,9 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 	}
 
 	private _activateAllStartupFinished(): void {
+		// startup is considered finished
+		this._mainThreadExtensionsProxy.$setPerformanceMarks(performance.getMarks());
+
 		for (const desc of this._registry.getAllExtensionDescriptions()) {
 			if (desc.activationEvents) {
 				for (const activationEvent of desc.activationEvents) {
@@ -541,7 +557,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		let testRunner: ITestRunner | INewTestRunner | undefined;
 		let requireError: Error | undefined;
 		try {
-			testRunner = await this._loadCommonJSModule(URI.file(extensionTestsPath), new ExtensionActivationTimesBuilder(false));
+			testRunner = await this._loadCommonJSModule(null, URI.file(extensionTestsPath), new ExtensionActivationTimesBuilder(false));
 		} catch (error) {
 			requireError = error;
 		}
@@ -586,11 +602,17 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 	}
 
 	private _testRunnerExit(code: number): void {
+		this._logService.info(`extension host terminating: test runner requested exit with code ${code}`);
+		this._logService.flush();
+
 		// wait at most 5000ms for the renderer to confirm our exit request and for the renderer socket to drain
 		// (this is to ensure all outstanding messages reach the renderer)
 		const exitPromise = this._mainThreadExtensionsProxy.$onExtensionHostExit(code);
 		const drainPromise = this._extHostContext.drain();
 		Promise.race([Promise.all([exitPromise, drainPromise]), timeout(5000)]).then(() => {
+			this._logService.info(`exiting with code ${code}`);
+			this._logService.flush();
+
 			this._hostUtils.exit(code);
 		});
 	}
@@ -644,7 +666,9 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 		}
 
 		try {
+			performance.mark(`code/extHost/willResolveAuthority/${authorityPrefix}`);
 			const result = await resolver.resolve(remoteAuthority, { resolveAttempt });
+			performance.mark(`code/extHost/didResolveAuthorityOK/${authorityPrefix}`);
 			this._disposables.add(await this._extHostTunnelService.setTunnelExtensionFunctions(resolver));
 
 			// Split merged API result into separate authority/options
@@ -667,6 +691,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 				}
 			};
 		} catch (err) {
+			performance.mark(`code/extHost/didResolveAuthorityError/${authorityPrefix}`);
 			if (err instanceof RemoteAuthorityResolverError) {
 				return {
 					type: 'error',
@@ -754,7 +779,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 	protected abstract _beforeAlmostReadyToRunExtensions(): Promise<void>;
 	protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined;
-	protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
+	protected abstract _loadCommonJSModule<T>(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
 	public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise<void>;
 }
 
diff --git a/src/vs/workbench/api/common/extHostFileSystemEventService.ts b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
index 0503a131b..6801cf0b3 100644
--- a/src/vs/workbench/api/common/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
@@ -8,7 +8,7 @@ import { IRelativePattern, parse } from 'vs/base/common/glob';
 import { URI } from 'vs/base/common/uri';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
 import type * as vscode from 'vscode';
-import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, MainContext, SourceTargetPair, IWorkspaceEditDto, MainThreadBulkEditsShape } from './extHost.protocol';
+import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, SourceTargetPair, IWorkspaceEditDto, IWillRunFileOperationParticipation } from './extHost.protocol';
 import * as typeConverter from './extHostTypeConverters';
 import { Disposable, WorkspaceEdit } from './extHostTypes';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
@@ -122,8 +122,7 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 	constructor(
 		mainContext: IMainContext,
 		private readonly _logService: ILogService,
-		private readonly _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors,
-		private readonly _mainThreadBulkEdits: MainThreadBulkEditsShape = mainContext.getProxy(MainContext.MainThreadBulkEdits)
+		private readonly _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors
 	) {
 		//
 	}
@@ -178,24 +177,21 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 		};
 	}
 
-	async $onWillRunFileOperation(operation: FileOperation, files: SourceTargetPair[], undoRedoGroupId: number | undefined, timeout: number, token: CancellationToken): Promise<any> {
+	async $onWillRunFileOperation(operation: FileOperation, files: SourceTargetPair[], timeout: number, token: CancellationToken): Promise<IWillRunFileOperationParticipation | undefined> {
 		switch (operation) {
 			case FileOperation.MOVE:
-				await this._fireWillEvent(this._onWillRenameFile, { files: files.map(f => ({ oldUri: URI.revive(f.source!), newUri: URI.revive(f.target) })) }, undoRedoGroupId, timeout, token);
-				break;
+				return await this._fireWillEvent(this._onWillRenameFile, { files: files.map(f => ({ oldUri: URI.revive(f.source!), newUri: URI.revive(f.target) })) }, timeout, token);
 			case FileOperation.DELETE:
-				await this._fireWillEvent(this._onWillDeleteFile, { files: files.map(f => URI.revive(f.target)) }, undoRedoGroupId, timeout, token);
-				break;
+				return await this._fireWillEvent(this._onWillDeleteFile, { files: files.map(f => URI.revive(f.target)) }, timeout, token);
 			case FileOperation.CREATE:
-				await this._fireWillEvent(this._onWillCreateFile, { files: files.map(f => URI.revive(f.target)) }, undoRedoGroupId, timeout, token);
-				break;
-			default:
-			//ignore, dont send
+				return await this._fireWillEvent(this._onWillCreateFile, { files: files.map(f => URI.revive(f.target)) }, timeout, token);
 		}
+		return undefined;
 	}
 
-	private async _fireWillEvent<E extends IWaitUntil>(emitter: AsyncEmitter<E>, data: Omit<E, 'waitUntil'>, undoRedoGroupId: number | undefined, timeout: number, token: CancellationToken): Promise<any> {
+	private async _fireWillEvent<E extends IWaitUntil>(emitter: AsyncEmitter<E>, data: Omit<E, 'waitUntil'>, timeout: number, token: CancellationToken): Promise<IWillRunFileOperationParticipation | undefined> {
 
+		const extensionNames = new Set<string>();
 		const edits: WorkspaceEdit[] = [];
 
 		await emitter.fireAsync(data, token, async (thenable, listener) => {
@@ -204,25 +200,28 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 			const result = await Promise.resolve(thenable);
 			if (result instanceof WorkspaceEdit) {
 				edits.push(result);
+				extensionNames.add((<IExtensionListener<E>>listener).extension.displayName ?? (<IExtensionListener<E>>listener).extension.identifier.value);
 			}
 
 			if (Date.now() - now > timeout) {
-				this._logService.warn('SLOW file-participant', (<IExtensionListener<E>>listener).extension?.identifier);
+				this._logService.warn('SLOW file-participant', (<IExtensionListener<E>>listener).extension.identifier);
 			}
 		});
 
 		if (token.isCancellationRequested) {
-			return;
+			return undefined;
 		}
 
-		if (edits.length > 0) {
-			// concat all WorkspaceEdits collected via waitUntil-call and apply them in one go.
-			const dto: IWorkspaceEditDto = { edits: [] };
-			for (let edit of edits) {
-				let { edits } = typeConverter.WorkspaceEdit.from(edit, this._extHostDocumentsAndEditors);
-				dto.edits = dto.edits.concat(edits);
-			}
-			return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(dto, undoRedoGroupId);
+		if (edits.length === 0) {
+			return undefined;
 		}
+
+		// concat all WorkspaceEdits collected via waitUntil-call and send them over to the renderer
+		const dto: IWorkspaceEditDto = { edits: [] };
+		for (let edit of edits) {
+			let { edits } = typeConverter.WorkspaceEdit.from(edit, this._extHostDocumentsAndEditors);
+			dto.edits = dto.edits.concat(edits);
+		}
+		return { edit: dto, extensionNames: Array.from(extensionNames) };
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 49cde88e1..34ca10650 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -27,11 +27,12 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio
 import { IURITransformer } from 'vs/base/common/uriIpc';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { encodeSemanticTokensDto } from 'vs/workbench/api/common/shared/semanticTokensDto';
+import { encodeSemanticTokensDto } from 'vs/editor/common/services/semanticTokensDto';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
 import { Cache } from './cache';
 import { StopWatch } from 'vs/base/common/stopwatch';
+import { CancellationError } from 'vs/base/common/errors';
 
 // --- adapter
 
@@ -1062,6 +1063,20 @@ class SignatureHelpAdapter {
 	}
 }
 
+class InlineHintsAdapter {
+	constructor(
+		private readonly _documents: ExtHostDocuments,
+		private readonly _provider: vscode.InlineHintsProvider,
+	) { }
+
+	provideInlineHints(resource: URI, range: IRange, token: CancellationToken): Promise<extHostProtocol.IInlineHintsDto | undefined> {
+		const doc = this._documents.getDocument(resource);
+		return asPromise(() => this._provider.provideInlineHints(doc, typeConvert.Range.to(range), token)).then(value => {
+			return value ? { hints: value.map(typeConvert.InlineHint.from) } : undefined;
+		});
+	}
+}
+
 class LinkProviderAdapter {
 
 	private _cache = new Cache<vscode.DocumentLink>('DocumentLink');
@@ -1320,7 +1335,7 @@ type Adapter = DocumentSymbolAdapter | CodeLensAdapter | DefinitionAdapter | Hov
 	| SuggestAdapter | SignatureHelpAdapter | LinkProviderAdapter | ImplementationAdapter
 	| TypeDefinitionAdapter | ColorProviderAdapter | FoldingProviderAdapter | DeclarationAdapter
 	| SelectionRangeAdapter | CallHierarchyAdapter | DocumentSemanticTokensAdapter | DocumentRangeSemanticTokensAdapter | EvaluatableExpressionAdapter
-	| LinkedEditingRangeAdapter;
+	| LinkedEditingRangeAdapter | InlineHintsAdapter;
 
 class AdapterData {
 	constructor(
@@ -1403,7 +1418,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		return ExtHostLanguageFeatures._handlePool++;
 	}
 
-	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A; }, callback: (adapter: A, extension: IExtensionDescription | undefined) => Promise<R>, fallbackValue: R): Promise<R> {
+	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A; }, callback: (adapter: A, extension: IExtensionDescription | undefined) => Promise<R>, fallbackValue: R, allowCancellationError: boolean = false): Promise<R> {
 		const data = this._adapter.get(handle);
 		if (!data) {
 			return Promise.resolve(fallbackValue);
@@ -1421,8 +1436,11 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 				Promise.resolve(p).then(
 					() => this._logService.trace(`[${extension.identifier.value}] provider DONE after ${Date.now() - t1}ms`),
 					err => {
-						this._logService.error(`[${extension.identifier.value}] provider FAILED`);
-						this._logService.error(err);
+						const isExpectedError = allowCancellationError && (err instanceof CancellationError);
+						if (!isExpectedError) {
+							this._logService.error(`[${extension.identifier.value}] provider FAILED`);
+							this._logService.error(err);
+						}
 					}
 				);
 			}
@@ -1711,7 +1729,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 	}
 
 	$provideDocumentSemanticTokens(handle: number, resource: UriComponents, previousResultId: number, token: CancellationToken): Promise<VSBuffer | null> {
-		return this._withAdapter(handle, DocumentSemanticTokensAdapter, adapter => adapter.provideDocumentSemanticTokens(URI.revive(resource), previousResultId, token), null);
+		return this._withAdapter(handle, DocumentSemanticTokensAdapter, adapter => adapter.provideDocumentSemanticTokens(URI.revive(resource), previousResultId, token), null, true);
 	}
 
 	$releaseDocumentSemanticTokens(handle: number, semanticColoringResultId: number): void {
@@ -1725,7 +1743,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 	}
 
 	$provideDocumentRangeSemanticTokens(handle: number, resource: UriComponents, range: IRange, token: CancellationToken): Promise<VSBuffer | null> {
-		return this._withAdapter(handle, DocumentRangeSemanticTokensAdapter, adapter => adapter.provideDocumentRangeSemanticTokens(URI.revive(resource), range, token), null);
+		return this._withAdapter(handle, DocumentRangeSemanticTokensAdapter, adapter => adapter.provideDocumentRangeSemanticTokens(URI.revive(resource), range, token), null, true);
 	}
 
 	//#endregion
@@ -1770,6 +1788,27 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		this._withAdapter(handle, SignatureHelpAdapter, adapter => adapter.releaseSignatureHelp(id), undefined);
 	}
 
+	// --- inline hints
+
+	registerInlineHintsProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.InlineHintsProvider): vscode.Disposable {
+
+		const eventHandle = typeof provider.onDidChangeInlineHints === 'function' ? this._nextHandle() : undefined;
+		const handle = this._addNewAdapter(new InlineHintsAdapter(this._documents, provider), extension);
+
+		this._proxy.$registerInlineHintsProvider(handle, this._transformDocumentSelector(selector), eventHandle);
+		let result = this._createDisposable(handle);
+
+		if (eventHandle !== undefined) {
+			const subscription = provider.onDidChangeInlineHints!(_ => this._proxy.$emitInlineHintsEvent(eventHandle));
+			result = Disposable.from(result, subscription);
+		}
+		return result;
+	}
+
+	$provideInlineHints(handle: number, resource: UriComponents, range: IRange, token: CancellationToken): Promise<extHostProtocol.IInlineHintsDto | undefined> {
+		return this._withAdapter(handle, InlineHintsAdapter, adapter => adapter.provideInlineHints(URI.revive(resource), range, token), undefined);
+	}
+
 	// --- links
 
 	registerDocumentLinkProvider(extension: IExtensionDescription | undefined, selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable {
@@ -1882,7 +1921,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		return {
 			beforeText: ExtHostLanguageFeatures._serializeRegExp(onEnterRule.beforeText),
 			afterText: onEnterRule.afterText ? ExtHostLanguageFeatures._serializeRegExp(onEnterRule.afterText) : undefined,
-			oneLineAboveText: onEnterRule.oneLineAboveText ? ExtHostLanguageFeatures._serializeRegExp(onEnterRule.oneLineAboveText) : undefined,
+			previousLineText: onEnterRule.previousLineText ? ExtHostLanguageFeatures._serializeRegExp(onEnterRule.previousLineText) : undefined,
 			action: onEnterRule.action
 		};
 	}
diff --git a/src/vs/workbench/api/common/extHostMessageService.ts b/src/vs/workbench/api/common/extHostMessageService.ts
index ff75e2f33..847a27a2b 100644
--- a/src/vs/workbench/api/common/extHostMessageService.ts
+++ b/src/vs/workbench/api/common/extHostMessageService.ts
@@ -8,6 +8,7 @@ import type * as vscode from 'vscode';
 import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
+import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 
 function isMessageItem(item: any): item is vscode.MessageItem {
 	return item && item.title;
@@ -37,9 +38,14 @@ export class ExtHostMessageService {
 			items = [optionsOrFirstItem, ...rest];
 		} else {
 			options.modal = optionsOrFirstItem && optionsOrFirstItem.modal;
+			options.useCustom = optionsOrFirstItem && optionsOrFirstItem.useCustom;
 			items = rest;
 		}
 
+		if (options.useCustom) {
+			checkProposedApiEnabled(extension);
+		}
+
 		const commands: { title: string; isCloseAffordance: boolean; handle: number; }[] = [];
 
 		for (let handle = 0; handle < items.length; handle++) {
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index bb136d1c0..298548f29 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -78,8 +78,8 @@ export interface ExtHostNotebookOutputRenderingHandler {
 }
 
 export class ExtHostNotebookKernelProviderAdapter extends Disposable {
-	private _kernelToId = new Map<vscode.NotebookKernel, string>();
-	private _idToKernel = new Map<string, vscode.NotebookKernel>();
+	private _kernelToFriendlyId = new Map<vscode.NotebookKernel, string>();
+	private _friendlyIdToKernel = new Map<string, vscode.NotebookKernel>();
 	constructor(
 		private readonly _proxy: MainThreadNotebookShape,
 		private readonly _handle: number,
@@ -101,24 +101,25 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 
 		const newMap = new Map<vscode.NotebookKernel, string>();
 		let kernel_unique_pool = 0;
-		const kernelIdCache = new Set<string>();
+		const kernelFriendlyIdCache = new Set<string>();
 
 		const transformedData: INotebookKernelInfoDto2[] = data.map(kernel => {
-			let id = this._kernelToId.get(kernel);
-			if (id === undefined) {
-				if (kernel.id && kernelIdCache.has(kernel.id)) {
-					id = `${this._extension.identifier.value}_${kernel.id}_${kernel_unique_pool++}`;
+			let friendlyId = this._kernelToFriendlyId.get(kernel);
+			if (friendlyId === undefined) {
+				if (kernel.id && kernelFriendlyIdCache.has(kernel.id)) {
+					friendlyId = `${this._extension.identifier.value}_${kernel.id}_${kernel_unique_pool++}`;
 				} else {
-					id = `${this._extension.identifier.value}_${kernel.id || UUID.generateUuid()}`;
+					friendlyId = `${this._extension.identifier.value}_${kernel.id || UUID.generateUuid()}`;
 				}
 
-				this._kernelToId.set(kernel, id);
+				this._kernelToFriendlyId.set(kernel, friendlyId);
 			}
 
-			newMap.set(kernel, id);
+			newMap.set(kernel, friendlyId);
 
 			return {
-				id,
+				id: kernel.id,
+				friendlyId: friendlyId,
 				label: kernel.label,
 				extension: this._extension.identifier,
 				extensionLocation: this._extension.extensionLocation,
@@ -129,22 +130,22 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 			};
 		});
 
-		this._kernelToId = newMap;
+		this._kernelToFriendlyId = newMap;
 
-		this._idToKernel.clear();
-		this._kernelToId.forEach((value, key) => {
-			this._idToKernel.set(value, key);
+		this._friendlyIdToKernel.clear();
+		this._kernelToFriendlyId.forEach((value, key) => {
+			this._friendlyIdToKernel.set(value, key);
 		});
 
 		return transformedData;
 	}
 
-	getKernel(kernelId: string) {
-		return this._idToKernel.get(kernelId);
+	getKernelByFriendlyId(kernelId: string) {
+		return this._friendlyIdToKernel.get(kernelId);
 	}
 
 	async resolveNotebook(kernelId: string, document: ExtHostNotebookDocument, webview: vscode.NotebookCommunication, token: CancellationToken) {
-		const kernel = this._idToKernel.get(kernelId);
+		const kernel = this._friendlyIdToKernel.get(kernelId);
 
 		if (kernel && this._provider.resolveKernel) {
 			return this._provider.resolveKernel(kernel, document.notebookDocument, webview, token);
@@ -152,7 +153,7 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 	}
 
 	async executeNotebook(kernelId: string, document: ExtHostNotebookDocument, cell: ExtHostCell | undefined) {
-		const kernel = this._idToKernel.get(kernelId);
+		const kernel = this._friendlyIdToKernel.get(kernelId);
 
 		if (!kernel) {
 			return;
@@ -166,7 +167,7 @@ export class ExtHostNotebookKernelProviderAdapter extends Disposable {
 	}
 
 	async cancelNotebook(kernelId: string, document: ExtHostNotebookDocument, cell: ExtHostCell | undefined) {
-		const kernel = this._idToKernel.get(kernelId);
+		const kernel = this._friendlyIdToKernel.get(kernelId);
 
 		if (!kernel) {
 			return;
@@ -580,10 +581,10 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		this._outputDisplayOrder = displayOrder;
 	}
 
-	$acceptNotebookActiveKernelChange(event: { uri: UriComponents, providerHandle: number | undefined, kernelId: string | undefined; }) {
+	$acceptNotebookActiveKernelChange(event: { uri: UriComponents, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }) {
 		if (event.providerHandle !== undefined) {
 			this._withAdapter(event.providerHandle, event.uri, async (adapter, document) => {
-				const kernel = event.kernelId ? adapter.getKernel(event.kernelId) : undefined;
+				const kernel = event.kernelFriendlyId ? adapter.getKernelByFriendlyId(event.kernelFriendlyId) : undefined;
 				this._editors.forEach(editor => {
 					if (editor.editor.notebookData === document) {
 						editor.editor._acceptKernel(kernel);
diff --git a/src/vs/workbench/api/common/extHostNotebookDocument.ts b/src/vs/workbench/api/common/extHostNotebookDocument.ts
index e67332a40..85f9083ba 100644
--- a/src/vs/workbench/api/common/extHostNotebookDocument.ts
+++ b/src/vs/workbench/api/common/extHostNotebookDocument.ts
@@ -113,14 +113,17 @@ export class ExtHostCell extends Disposable {
 	get cell(): vscode.NotebookCell {
 		if (!this._cell) {
 			const that = this;
-			const document = this._extHostDocument.getDocument(this.uri)!.document;
+			const data = this._extHostDocument.getDocument(this.uri);
+			if (!data) {
+				throw new Error(`MISSING extHostDocument for notebook cell: ${this.uri}`);
+			}
 			this._cell = Object.freeze({
 				get index() { return that._notebook.getCellIndex(that); },
 				notebook: that._notebook.notebookDocument,
 				uri: that.uri,
 				cellKind: this._cellData.cellKind,
-				document,
-				get language() { return document.languageId; },
+				document: data.document,
+				get language() { return data!.document.languageId; },
 				get outputs() { return that._outputs; },
 				set outputs(value) { that._updateOutputs(value); },
 				get metadata() { return that._metadata; },
diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
index fd9ae5f2d..f59d41ce8 100644
--- a/src/vs/workbench/api/common/extHostRequireInterceptor.ts
+++ b/src/vs/workbench/api/common/extHostRequireInterceptor.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as performance from 'vs/base/common/performance';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { URI } from 'vs/base/common/uri';
 import { MainThreadTelemetryShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
@@ -52,7 +53,9 @@ export abstract class RequireInterceptor {
 
 		this._installInterceptor();
 
+		performance.mark('code/extHost/willWaitForConfig');
 		const configProvider = await this._extHostConfiguration.getConfigProvider();
+		performance.mark('code/extHost/didWaitForConfig');
 		const extensionPaths = await this._extHostExtensionService.getExtensionPathIndex();
 
 		this.register(new VSCodeNodeModuleFactory(this._apiFactory, extensionPaths, this._extensionRegistry, configProvider, this._logService));
diff --git a/src/vs/workbench/api/common/extHostSecrets.ts b/src/vs/workbench/api/common/extHostSecrets.ts
new file mode 100644
index 000000000..6d973d31e
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostSecrets.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as vscode from 'vscode';
+
+import { ExtHostSecretState } from 'vs/workbench/api/common/exHostSecretState';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { Emitter, Event } from 'vs/base/common/event';
+
+export class ExtensionSecrets implements vscode.SecretStorage {
+
+	protected readonly _id: string;
+	readonly #secretState: ExtHostSecretState;
+
+	private _onDidChange = new Emitter<vscode.SecretStorageChangeEvent>();
+	readonly onDidChange: Event<vscode.SecretStorageChangeEvent> = this._onDidChange.event;
+
+
+	constructor(extensionDescription: IExtensionDescription, secretState: ExtHostSecretState) {
+		this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
+		this.#secretState = secretState;
+
+		this.#secretState.onDidChangePassword(e => {
+			if (e.extensionId === this._id) {
+				this._onDidChange.fire({ key: e.key });
+			}
+		});
+	}
+
+	get(key: string): Promise<string | undefined> {
+		return this.#secretState.get(this._id, key);
+	}
+
+	store(key: string, value: string): Promise<void> {
+		return this.#secretState.store(this._id, key, value);
+	}
+
+	delete(key: string): Promise<void> {
+		return this.#secretState.delete(this._id, key);
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostStatusBar.ts b/src/vs/workbench/api/common/extHostStatusBar.ts
index a89e9fe30..877d56e79 100644
--- a/src/vs/workbench/api/common/extHostStatusBar.ts
+++ b/src/vs/workbench/api/common/extHostStatusBar.ts
@@ -10,8 +10,6 @@ import { MainContext, MainThreadStatusBarShape, IMainContext, ICommandDto } from
 import { localize } from 'vs/nls';
 import { CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 
 export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 	private static ID_GEN = 0;
@@ -48,9 +46,8 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 	private _proxy: MainThreadStatusBarShape;
 	private _commands: CommandsConverter;
 	private _accessibilityInformation?: vscode.AccessibilityInformation;
-	private _extension?: IExtensionDescription;
 
-	constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, id: string, name: string, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number, accessibilityInformation?: vscode.AccessibilityInformation, extension?: IExtensionDescription) {
+	constructor(proxy: MainThreadStatusBarShape, commands: CommandsConverter, id: string, name: string, alignment: ExtHostStatusBarAlignment = ExtHostStatusBarAlignment.Left, priority?: number, accessibilityInformation?: vscode.AccessibilityInformation) {
 		this._id = ExtHostStatusBarEntry.ID_GEN++;
 		this._proxy = proxy;
 		this._commands = commands;
@@ -59,7 +56,6 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 		this._alignment = alignment;
 		this._priority = priority;
 		this._accessibilityInformation = accessibilityInformation;
-		this._extension = extension;
 	}
 
 	public get id(): number {
@@ -87,10 +83,6 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 	}
 
 	public get backgroundColor(): ThemeColor | undefined {
-		if (this._extension) {
-			checkProposedApiEnabled(this._extension);
-		}
-
 		return this._backgroundColor;
 	}
 
@@ -118,10 +110,6 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem {
 	}
 
 	public set backgroundColor(color: ThemeColor | undefined) {
-		if (this._extension) {
-			checkProposedApiEnabled(this._extension);
-		}
-
 		if (color && !ExtHostStatusBarEntry.ALLOWED_BACKGROUND_COLORS.has(color.id)) {
 			color = undefined;
 		}
@@ -248,8 +236,8 @@ export class ExtHostStatusBar {
 		this._statusMessage = new StatusBarMessage(this);
 	}
 
-	createStatusBarEntry(id: string, name: string, alignment?: ExtHostStatusBarAlignment, priority?: number, accessibilityInformation?: vscode.AccessibilityInformation, extension?: IExtensionDescription): vscode.StatusBarItem {
-		return new ExtHostStatusBarEntry(this._proxy, this._commands, id, name, alignment, priority, accessibilityInformation, extension);
+	createStatusBarEntry(id: string, name: string, alignment?: ExtHostStatusBarAlignment, priority?: number, accessibilityInformation?: vscode.AccessibilityInformation): vscode.StatusBarItem {
+		return new ExtHostStatusBarEntry(this._proxy, this._commands, id, name, alignment, priority, accessibilityInformation);
 	}
 
 	setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable<any>): Disposable {
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index 1cccd958f..f684dbb85 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -5,12 +5,11 @@
 
 import type * as vscode from 'vscode';
 import { Event, Emitter } from 'vs/base/common/event';
-import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IShellLaunchConfigDto, IShellDefinitionDto, IShellAndArgsDto, ITerminalDimensionsDto, ITerminalLinkDto } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IShellLaunchConfigDto, IShellDefinitionDto, IShellAndArgsDto, ITerminalDimensionsDto, ITerminalLinkDto, TerminalIdentifier } from 'vs/workbench/api/common/extHost.protocol';
 import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { ITerminalChildProcess, EXT_HOST_CREATION_DELAY, ITerminalLaunchError, ITerminalDimensionsOverride } from 'vs/workbench/contrib/terminal/common/terminal';
-import { timeout } from 'vs/base/common/async';
+import { ITerminalChildProcess, ITerminalLaunchError, ITerminalDimensionsOverride } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { TerminalDataBufferer } from 'vs/workbench/contrib/terminal/common/terminalDataBuffering';
 import { IDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
@@ -21,6 +20,7 @@ import { localize } from 'vs/nls';
 import { NotSupportedError } from 'vs/base/common/errors';
 import { serializeEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableShared';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { generateUuid } from 'vs/base/common/uuid';
 
 export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, IDisposable {
 
@@ -47,63 +47,8 @@ export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, ID
 
 export const IExtHostTerminalService = createDecorator<IExtHostTerminalService>('IExtHostTerminalService');
 
-export class BaseExtHostTerminal {
-	public _id: number | undefined;
-	protected _idPromise: Promise<number>;
-	private _idPromiseComplete: ((value: number) => any) | undefined;
+export class ExtHostTerminal implements vscode.Terminal {
 	private _disposed: boolean = false;
-	private _queuedRequests: ApiRequest[] = [];
-
-	constructor(
-		protected _proxy: MainThreadTerminalServiceShape,
-		id?: number
-	) {
-		this._idPromise = new Promise<number>(c => {
-			if (id !== undefined) {
-				this._id = id;
-				c(id);
-			} else {
-				this._idPromiseComplete = c;
-			}
-		});
-	}
-
-	public dispose(): void {
-		if (!this._disposed) {
-			this._disposed = true;
-			this._queueApiRequest(this._proxy.$dispose, []);
-		}
-	}
-
-	protected _checkDisposed() {
-		if (this._disposed) {
-			throw new Error('Terminal has already been disposed');
-		}
-	}
-
-	protected _queueApiRequest(callback: (...args: any[]) => void, args: any[]): void {
-		const request: ApiRequest = new ApiRequest(callback, args);
-		if (!this._id) {
-			this._queuedRequests.push(request);
-			return;
-		}
-		request.run(this._proxy, this._id);
-	}
-
-	public _runQueuedRequests(id: number): void {
-		this._id = id;
-		if (this._idPromiseComplete) {
-			this._idPromiseComplete(id);
-			this._idPromiseComplete = undefined;
-		}
-		this._queuedRequests.forEach((r) => {
-			r.run(this._proxy, id);
-		});
-		this._queuedRequests.length = 0;
-	}
-}
-
-export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Terminal {
 	private _pidPromise: Promise<number | undefined>;
 	private _cols: number | undefined;
 	private _pidPromiseComplete: ((value: number | undefined) => any) | undefined;
@@ -113,12 +58,11 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 	public isOpen: boolean = false;
 
 	constructor(
-		proxy: MainThreadTerminalServiceShape,
+		private _proxy: MainThreadTerminalServiceShape,
+		public _id: TerminalIdentifier,
 		private readonly _creationOptions: vscode.TerminalOptions | vscode.ExtensionTerminalOptions,
 		private _name?: string,
-		id?: number
 	) {
-		super(proxy, id);
 		this._creationOptions = Object.freeze(this._creationOptions);
 		this._pidPromise = new Promise<number | undefined>(c => this._pidPromiseComplete = c);
 	}
@@ -133,16 +77,35 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 		hideFromUser?: boolean,
 		isFeatureTerminal?: boolean
 	): Promise<void> {
-		const result = await this._proxy.$createTerminal({ name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser, isFeatureTerminal });
-		this._name = result.name;
-		this._runQueuedRequests(result.id);
+		if (typeof this._id !== 'string') {
+			throw new Error('Terminal has already been created');
+		}
+		await this._proxy.$createTerminal(this._id, { name: this._name, shellPath, shellArgs, cwd, env, waitOnExit, strictEnv, hideFromUser, isFeatureTerminal });
 	}
 
 	public async createExtensionTerminal(): Promise<number> {
-		const result = await this._proxy.$createTerminal({ name: this._name, isExtensionTerminal: true });
-		this._name = result.name;
-		this._runQueuedRequests(result.id);
-		return result.id;
+		if (typeof this._id !== 'string') {
+			throw new Error('Terminal has already been created');
+		}
+		await this._proxy.$createTerminal(this._id, { name: this._name, isExtensionTerminal: true });
+		// At this point, the id has been set via `$acceptTerminalOpened`
+		if (typeof this._id === 'string') {
+			throw new Error('Terminal creation failed');
+		}
+		return this._id;
+	}
+
+	public dispose(): void {
+		if (!this._disposed) {
+			this._disposed = true;
+			this._proxy.$dispose(this._id);
+		}
+	}
+
+	private _checkDisposed() {
+		if (this._disposed) {
+			throw new Error('Terminal has already been disposed');
+		}
 	}
 
 	public get name(): string {
@@ -194,17 +157,17 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 
 	public sendText(text: string, addNewLine: boolean = true): void {
 		this._checkDisposed();
-		this._queueApiRequest(this._proxy.$sendText, [text, addNewLine]);
+		this._proxy.$sendText(this._id, text, addNewLine);
 	}
 
 	public show(preserveFocus: boolean): void {
 		this._checkDisposed();
-		this._queueApiRequest(this._proxy.$show, [preserveFocus]);
+		this._proxy.$show(this._id, preserveFocus);
 	}
 
 	public hide(): void {
 		this._checkDisposed();
-		this._queueApiRequest(this._proxy.$hide, []);
+		this._proxy.$hide(this._id);
 	}
 
 	public _setProcessId(processId: number | undefined): void {
@@ -223,20 +186,6 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
 	}
 }
 
-class ApiRequest {
-	private _callback: (...args: any[]) => void;
-	private _args: any[];
-
-	constructor(callback: (...args: any[]) => void, args: any[]) {
-		this._callback = callback;
-		this._args = args;
-	}
-
-	public run(proxy: MainThreadTerminalServiceShape, id: number) {
-		this._callback.apply(proxy, [id].concat(this._args));
-	}
-}
-
 export class ExtHostPseudoterminal implements ITerminalChildProcess {
 	private readonly _onProcessData = new Emitter<string>();
 	public readonly onProcessData: Event<string> = this._onProcessData.event;
@@ -271,6 +220,11 @@ export class ExtHostPseudoterminal implements ITerminalChildProcess {
 		}
 	}
 
+	acknowledgeDataEvent(charCount: number): void {
+		// No-op, flow control is not supported in extension owned terminals. If this is ever
+		// implemented it will need new pause and resume VS Code APIs.
+	}
+
 	getInitialCwd(): Promise<string> {
 		return Promise.resolve('');
 	}
@@ -296,6 +250,11 @@ export class ExtHostPseudoterminal implements ITerminalChildProcess {
 		}
 
 		this._pty.open(initialDimensions ? initialDimensions : undefined);
+
+		if (this._pty.setDimensions && initialDimensions) {
+			this._pty.setDimensions(initialDimensions);
+		}
+
 		this._onProcessReady.fire({ pid: -1, cwd: '' });
 	}
 }
@@ -370,7 +329,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	public abstract $acceptWorkspacePermissionsChanged(isAllowed: boolean): void;
 
 	public createExtensionTerminal(options: vscode.ExtensionTerminalOptions): vscode.Terminal {
-		const terminal = new ExtHostTerminal(this._proxy, options, options.name);
+		const terminal = new ExtHostTerminal(this._proxy, generateUuid(), options, options.name);
 		const p = new ExtHostPseudoterminal(options.pty);
 		terminal.createExtensionTerminal().then(id => {
 			const disposable = this._setupExtHostProcessListeners(id, p);
@@ -381,7 +340,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	}
 
 	public attachPtyToTerminal(id: number, pty: vscode.Pseudoterminal): void {
-		const terminal = this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (!terminal) {
 			throw new Error(`Cannot resolve terminal with id ${id} for virtual process`);
 		}
@@ -399,7 +358,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 			}
 			return;
 		}
-		const terminal = await this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (terminal) {
 			this._activeTerminal = terminal;
 			if (original !== this._activeTerminal) {
@@ -409,14 +368,14 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	}
 
 	public async $acceptTerminalProcessData(id: number, data: string): Promise<void> {
-		const terminal = await this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (terminal) {
 			this._onDidWriteTerminalData.fire({ terminal, data });
 		}
 	}
 
 	public async $acceptTerminalDimensions(id: number, cols: number, rows: number): Promise<void> {
-		const terminal = await this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (terminal) {
 			if (terminal.setDimensions(cols, rows)) {
 				this._onDidChangeTerminalDimensions.fire({
@@ -428,23 +387,19 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	}
 
 	public async $acceptTerminalMaximumDimensions(id: number, cols: number, rows: number): Promise<void> {
-		await this._getTerminalByIdEventually(id);
-
 		// Extension pty terminal only - when virtual process resize fires it means that the
 		// terminal's maximum dimensions changed
 		this._terminalProcesses.get(id)?.resize(cols, rows);
 	}
 
 	public async $acceptTerminalTitleChange(id: number, name: string): Promise<void> {
-		await this._getTerminalByIdEventually(id);
-		const extHostTerminal = this._getTerminalObjectById(this.terminals, id);
-		if (extHostTerminal) {
-			extHostTerminal.name = name;
+		const terminal = this._getTerminalById(id);
+		if (terminal) {
+			terminal.name = name;
 		}
 	}
 
 	public async $acceptTerminalClosed(id: number, exitCode: number | undefined): Promise<void> {
-		await this._getTerminalByIdEventually(id);
 		const index = this._getTerminalObjectIndexById(this.terminals, id);
 		if (index !== null) {
 			const terminal = this._terminals.splice(index, 1)[0];
@@ -453,13 +408,17 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		}
 	}
 
-	public $acceptTerminalOpened(id: number, name: string, shellLaunchConfigDto: IShellLaunchConfigDto): void {
-		const index = this._getTerminalObjectIndexById(this._terminals, id);
-		if (index !== null) {
-			// The terminal has already been created (via createTerminal*), only fire the event
-			this._onDidOpenTerminal.fire(this.terminals[index]);
-			this.terminals[index].isOpen = true;
-			return;
+	public $acceptTerminalOpened(id: number, extHostTerminalId: string | undefined, name: string, shellLaunchConfigDto: IShellLaunchConfigDto): void {
+		if (extHostTerminalId) {
+			// Resolve with the renderer generated id
+			const index = this._getTerminalObjectIndexById(this._terminals, extHostTerminalId);
+			if (index !== null) {
+				// The terminal has already been created (via createTerminal*), only fire the event
+				this.terminals[index]._id = id;
+				this._onDidOpenTerminal.fire(this.terminals[index]);
+				this.terminals[index].isOpen = true;
+				return;
+			}
 		}
 
 		const creationOptions: vscode.TerminalOptions = {
@@ -470,14 +429,14 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 			env: shellLaunchConfigDto.env,
 			hideFromUser: shellLaunchConfigDto.hideFromUser
 		};
-		const terminal = new ExtHostTerminal(this._proxy, creationOptions, name, id);
+		const terminal = new ExtHostTerminal(this._proxy, id, creationOptions, name);
 		this._terminals.push(terminal);
 		this._onDidOpenTerminal.fire(terminal);
 		terminal.isOpen = true;
 	}
 
 	public async $acceptTerminalProcessId(id: number, processId: number): Promise<void> {
-		const terminal = await this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (terminal) {
 			terminal._setProcessId(processId);
 		}
@@ -486,7 +445,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 	public async $startExtensionTerminal(id: number, initialDimensions: ITerminalDimensionsDto | undefined): Promise<ITerminalLaunchError | undefined> {
 		// Make sure the ExtHostTerminal exists so onDidOpenTerminal has fired before we call
 		// Pseudoterminal.start
-		const terminal = await this._getTerminalByIdEventually(id);
+		const terminal = this._getTerminalById(id);
 		if (!terminal) {
 			return { message: localize('launchFail.idMissingOnExtHost', "Could not find the terminal with id {0} on the extension host", id) };
 		}
@@ -539,6 +498,10 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		return disposables;
 	}
 
+	public $acceptProcessAckDataEvent(id: number, charCount: number): void {
+		this._terminalProcesses.get(id)?.acknowledgeDataEvent(charCount);
+	}
+
 	public $acceptProcessInput(id: number, data: string): void {
 		this._terminalProcesses.get(id)?.input(data);
 	}
@@ -670,32 +633,6 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		this._proxy.$sendProcessExit(id, exitCode);
 	}
 
-	// TODO: This could be improved by using a single promise and resolve it when the terminal is ready
-	private _getTerminalByIdEventually(id: number, retries: number = 5): Promise<ExtHostTerminal | undefined> {
-		if (!this._getTerminalPromises[id]) {
-			this._getTerminalPromises[id] = this._createGetTerminalPromise(id, retries);
-		}
-		return this._getTerminalPromises[id];
-	}
-
-	private _createGetTerminalPromise(id: number, retries: number = 5): Promise<ExtHostTerminal | undefined> {
-		return new Promise(c => {
-			if (retries === 0) {
-				c(undefined);
-				return;
-			}
-
-			const terminal = this._getTerminalById(id);
-			if (terminal) {
-				c(terminal);
-			} else {
-				// This should only be needed immediately after createTerminalRenderer is called as
-				// the ExtHostTerminal has not yet been iniitalized
-				timeout(EXT_HOST_CREATION_DELAY * 2).then(() => c(this._createGetTerminalPromise(id, retries - 1)));
-			}
-		});
-	}
-
 	private _getTerminalById(id: number): ExtHostTerminal | null {
 		return this._getTerminalObjectById(this._terminals, id);
 	}
@@ -705,7 +642,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		return index !== null ? array[index] : null;
 	}
 
-	private _getTerminalObjectIndexById<T extends ExtHostTerminal>(array: T[], id: number): number | null {
+	private _getTerminalObjectIndexById<T extends ExtHostTerminal>(array: T[], id: TerminalIdentifier): number | null {
 		let index: number | null = null;
 		array.some((item, i) => {
 			const thisId = item._id;
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 02fc32cbf..fb3084566 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -6,7 +6,6 @@
 import { mapFind } from 'vs/base/common/arrays';
 import { disposableTimeout } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { throttle } from 'vs/base/common/decorators';
 import { Emitter } from 'vs/base/common/event';
 import { once } from 'vs/base/common/functional';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
@@ -14,25 +13,35 @@ import { isDefined } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { ExtHostTestingResource, ExtHostTestingShape, MainContext, MainThreadTestingShape } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
 import { IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { TestItem } from 'vs/workbench/api/common/extHostTypeConverters';
-import { Disposable, RequiredTestItem } from 'vs/workbench/api/common/extHostTypes';
+import { Disposable } from 'vs/workbench/api/common/extHostTypes';
 import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
-import { AbstractIncrementalTestCollection, EMPTY_TEST_RESULT, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, RunTestForProviderRequest, RunTestsResult, TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { OwnedTestCollection, SingleUseTestCollection } from 'vs/workbench/contrib/testing/common/ownedTestCollection';
+import { AbstractIncrementalTestCollection, EMPTY_TEST_RESULT, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, InternalTestItemWithChildren, InternalTestResults, RunTestForProviderRequest, RunTestsResult, TestDiffOpType, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
 import type * as vscode from 'vscode';
 
 const getTestSubscriptionKey = (resource: ExtHostTestingResource, uri: URI) => `${resource}:${uri.toString()}`;
 
 export class ExtHostTesting implements ExtHostTestingShape {
+	private readonly resultsChangedEmitter = new Emitter<void>();
 	private readonly providers = new Map<string, vscode.TestProvider>();
 	private readonly proxy: MainThreadTestingShape;
 	private readonly ownedTests = new OwnedTestCollection();
-	private readonly testSubscriptions = new Map<string, { collection: SingleUseTestCollection, store: IDisposable }>();
+	private readonly testSubscriptions = new Map<string, {
+		collection: SingleUseTestCollection;
+		store: IDisposable;
+		subscribeFn: (id: string, provider: vscode.TestProvider) => void;
+	}>();
 
 	private workspaceObservers: WorkspaceFolderTestObserverFactory;
 	private textDocumentObservers: TextDocumentTestObserverFactory;
 
+	public onLastResultsChanged = this.resultsChangedEmitter.event;
+	public lastResults?: vscode.TestResults;
+
 	constructor(@IExtHostRpcService rpc: IExtHostRpcService, @IExtHostDocumentsAndEditors private readonly documents: IExtHostDocumentsAndEditors, @IExtHostWorkspace private readonly workspace: IExtHostWorkspace) {
 		this.proxy = rpc.getProxy(MainContext.MainThreadTesting);
 		this.workspaceObservers = new WorkspaceFolderTestObserverFactory(this.proxy);
@@ -47,6 +56,14 @@ export class ExtHostTesting implements ExtHostTestingShape {
 		this.providers.set(providerId, provider);
 		this.proxy.$registerTestProvider(providerId);
 
+		// give the ext a moment to register things rather than synchronously invoking within activate()
+		const toSubscribe = [...this.testSubscriptions.keys()];
+		setTimeout(() => {
+			for (const subscription of toSubscribe) {
+				this.testSubscriptions.get(subscription)?.subscribeFn(providerId, provider);
+			}
+		}, 0);
+
 		return new Disposable(() => {
 			this.providers.delete(providerId);
 			this.proxy.$unregisterTestProvider(providerId);
@@ -70,7 +87,7 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	/**
 	 * Implements vscode.test.runTests
 	 */
-	public async runTests(req: vscode.TestRunOptions<vscode.TestItem>) {
+	public async runTests(req: vscode.TestRunOptions<vscode.TestItem>, token = CancellationToken.None) {
 		await this.proxy.$runTests({
 			tests: req.tests
 				// Find workspace items first, then owned tests, then document tests.
@@ -82,14 +99,27 @@ export class ExtHostTesting implements ExtHostTestingShape {
 				.filter(isDefined)
 				.map(item => ({ providerId: item.providerId, testId: item.id })),
 			debug: req.debug
-		});
+		}, token);
+	}
+
+
+	/**
+	 * Updates test results shown to extensions.
+	 * @override
+	 */
+	public $publishTestResults(results: InternalTestResults): void {
+		const convert = (item: InternalTestItemWithChildren): vscode.RequiredTestItem =>
+			({ ...TestItem.toShallow(item.item), children: item.children.map(convert) });
+
+		this.lastResults = { tests: results.tests.map(convert) };
+		this.resultsChangedEmitter.fire();
 	}
 
 	/**
 	 * Handles a request to read tests for a file, or workspace.
 	 * @override
 	 */
-	public $subscribeToTests(resource: ExtHostTestingResource, uriComponents: UriComponents) {
+	public async $subscribeToTests(resource: ExtHostTestingResource, uriComponents: UriComponents) {
 		const uri = URI.revive(uriComponents);
 		const subscriptionKey = getTestSubscriptionKey(resource, uri);
 		if (this.testSubscriptions.has(subscriptionKey)) {
@@ -98,12 +128,29 @@ export class ExtHostTesting implements ExtHostTestingShape {
 
 		let method: undefined | ((p: vscode.TestProvider) => vscode.TestHierarchy<vscode.TestItem> | undefined);
 		if (resource === ExtHostTestingResource.TextDocument) {
-			const document = this.documents.getDocument(uri);
+			let document = this.documents.getDocument(uri);
+
+			// we can ask to subscribe to tests before the documents are populated in
+			// the extension host. Try to wait.
+			if (!document) {
+				const store = new DisposableStore();
+				document = await new Promise<ExtHostDocumentData | undefined>(resolve => {
+					store.add(disposableTimeout(() => resolve(undefined), 5000));
+					store.add(this.documents.onDidAddDocuments(e => {
+						const data = e.find(data => data.document.uri.toString() === uri.toString());
+						if (data) { resolve(data); }
+					}));
+				}).finally(() => store.dispose());
+			}
+
 			if (document) {
-				method = p => p.createDocumentTestHierarchy?.(document.document);
+				const folder = await this.workspace.getWorkspaceFolder2(uri, false);
+				method = p => p.createDocumentTestHierarchy
+					? p.createDocumentTestHierarchy(document!.document)
+					: this.createDefaultDocumentTestHierarchy(p, document!.document, folder);
 			}
 		} else {
-			const folder = this.workspace.getWorkspaceFolder(uri, false);
+			const folder = await this.workspace.getWorkspaceFolder2(uri, false);
 			if (folder) {
 				method = p => p.createWorkspaceTestHierarchy?.(folder);
 			}
@@ -113,24 +160,34 @@ export class ExtHostTesting implements ExtHostTestingShape {
 			return;
 		}
 
-		const disposable = new DisposableStore();
-		const collection = disposable.add(this.ownedTests.createForHierarchy(diff => this.proxy.$publishDiff(resource, uriComponents, diff)));
-		for (const [id, provider] of this.providers) {
+		const subscribeFn = (id: string, provider: vscode.TestProvider) => {
 			try {
-				const hierarchy = method(provider);
+				const hierarchy = method!(provider);
 				if (!hierarchy) {
-					continue;
+					return;
 				}
 
+				collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, 1]);
 				disposable.add(hierarchy);
 				collection.addRoot(hierarchy.root, id);
+				Promise.resolve(hierarchy.discoveredInitialTests).then(() => collection.pushDiff([TestDiffOpType.DeltaDiscoverComplete, -1]));
 				hierarchy.onDidChangeTest(e => collection.onItemChange(e, id));
 			} catch (e) {
 				console.error(e);
 			}
+		};
+
+		const disposable = new DisposableStore();
+		const collection = disposable.add(this.ownedTests.createForHierarchy(diff => this.proxy.$publishDiff(resource, uriComponents, diff)));
+		for (const [id, provider] of this.providers) {
+			subscribeFn(id, provider);
 		}
 
-		this.testSubscriptions.set(subscriptionKey, { store: disposable, collection });
+		// note: we don't increment the root count initially -- this is done by the
+		// main thread, incrementing once per extension host. We just push the
+		// diff to signal that roots have been discovered.
+		collection.pushDiff([TestDiffOpType.DeltaRootsComplete, -1]);
+		this.testSubscriptions.set(subscriptionKey, { store: disposable, collection, subscribeFn });
 	}
 
 	/**
@@ -162,217 +219,193 @@ export class ExtHostTesting implements ExtHostTestingShape {
 	 * providers to be run.
 	 * @override
 	 */
-	public async $runTestsForProvider(req: RunTestForProviderRequest): Promise<RunTestsResult> {
+	public async $runTestsForProvider(req: RunTestForProviderRequest, cancellation: CancellationToken): Promise<RunTestsResult> {
 		const provider = this.providers.get(req.providerId);
 		if (!provider || !provider.runTests) {
 			return EMPTY_TEST_RESULT;
 		}
 
-		const tests = req.ids.map(id => this.ownedTests.getTestById(id)?.actual).filter(isDefined);
+		const tests = req.ids.map(id => this.ownedTests.getTestById(id)?.actual)
+			.filter(isDefined)
+			// Only send the actual TestItem's to the user to run.
+			.map(t => t instanceof TestItemFilteredWrapper ? t.actual : t);
 		if (!tests.length) {
 			return EMPTY_TEST_RESULT;
 		}
 
-		await provider.runTests({ tests, debug: req.debug }, CancellationToken.None);
-		return EMPTY_TEST_RESULT;
-	}
-}
-
-const keyMap: { [K in keyof Omit<RequiredTestItem, 'children'>]: null } = {
-	label: null,
-	location: null,
-	state: null,
-	debuggable: null,
-	description: null,
-	runnable: null
-};
-
-const simpleProps = Object.keys(keyMap) as ReadonlyArray<keyof typeof keyMap>;
-
-const itemEqualityComparator = (a: vscode.TestItem) => {
-	const values: unknown[] = [];
-	for (const prop of simpleProps) {
-		values.push(a[prop]);
-	}
-
-	return (b: vscode.TestItem) => {
-		for (let i = 0; i < simpleProps.length; i++) {
-			if (values[i] !== b[simpleProps[i]]) {
-				return false;
+		try {
+			await provider.runTests({ tests, debug: req.debug }, cancellation);
+			for (const { collection } of this.testSubscriptions.values()) {
+				collection.flushDiff(); // ensure all states are updated
 			}
+
+			return EMPTY_TEST_RESULT;
+		} catch (e) {
+			console.error(e); // so it appears to attached debuggers
+			throw e;
+		}
+	}
+
+	public $lookupTest(req: TestIdWithProvider): Promise<InternalTestItem | undefined> {
+		const owned = this.ownedTests.getTestById(req.testId);
+		if (!owned) {
+			return Promise.resolve(undefined);
 		}
 
-		return true;
-	};
-};
-
-/**
- * @private
- */
-export interface OwnedCollectionTestItem extends InternalTestItem {
-	actual: vscode.TestItem;
-	previousChildren: Set<string>;
-	previousEquals: (v: vscode.TestItem) => boolean;
-}
-
-/**
- * @private
- */
-export class OwnedTestCollection {
-	protected readonly testIdToInternal = new Map<string, OwnedCollectionTestItem>();
-
-	/**
-	 * Gets test information by ID, if it was defined and still exists in this
-	 * extension host.
-	 */
-	public getTestById(id: string) {
-		return this.testIdToInternal.get(id);
+		const { actual, previousChildren, previousEquals, ...item } = owned;
+		return Promise.resolve(item);
 	}
 
-	/**
-	 * Creates a new test collection for a specific hierarchy for a workspace
-	 * or document observation.
-	 */
-	public createForHierarchy(publishDiff: (diff: TestsDiff) => void = () => undefined) {
-		return new SingleUseTestCollection(this.testIdToInternal, publishDiff);
-	}
-}
-
-/**
- * Maintains tests created and registered for a single set of hierarchies
- * for a workspace or document.
- * @private
- */
-export class SingleUseTestCollection implements IDisposable {
-	protected readonly testItemToInternal = new Map<vscode.TestItem, OwnedCollectionTestItem>();
-	protected diff: TestsDiff = [];
-	private disposed = false;
-
-	constructor(private readonly testIdToInternal: Map<string, OwnedCollectionTestItem>, private readonly publishDiff: (diff: TestsDiff) => void) { }
-
-	/**
-	 * Adds a new root node to the collection.
-	 */
-	public addRoot(item: vscode.TestItem, providerId: string) {
-		this.addItem(item, providerId, null);
-		this.throttleSendDiff();
-	}
-
-	/**
-	 * Gets test information by its reference, if it was defined and still exists
-	 * in this extension host.
-	 */
-	public getTestByReference(item: vscode.TestItem) {
-		return this.testItemToInternal.get(item);
-	}
-
-	/**
-	 * Should be called when an item change is fired on the test provider.
-	 */
-	public onItemChange(item: vscode.TestItem, providerId: string) {
-		const existing = this.testItemToInternal.get(item);
-		if (!existing) {
-			if (!this.disposed) {
-				console.warn(`Received a TestProvider.onDidChangeTest for a test that wasn't seen before as a child.`);
-			}
+	private createDefaultDocumentTestHierarchy(provider: vscode.TestProvider, document: vscode.TextDocument, folder: vscode.WorkspaceFolder | undefined): vscode.TestHierarchy<vscode.TestItem> | undefined {
+		if (!folder) {
 			return;
 		}
 
-		this.addItem(item, providerId, existing.parent);
-		this.throttleSendDiff();
-	}
-
-	/**
-	 * Gets a diff of all changes that have been made, and clears the diff queue.
-	 */
-	public collectDiff() {
-		const diff = this.diff;
-		this.diff = [];
-		return diff;
-	}
-
-	public dispose() {
-		for (const item of this.testItemToInternal.values()) {
-			this.testIdToInternal.delete(item.id);
+		const workspaceHierarchy = provider.createWorkspaceTestHierarchy?.(folder);
+		if (!workspaceHierarchy) {
+			return;
 		}
 
-		this.testIdToInternal.clear();
-		this.diff = [];
-		this.disposed = true;
-	}
+		const onDidChangeTest = new Emitter<vscode.TestItem>();
+		workspaceHierarchy.onDidChangeTest(node => {
+			const wrapper = TestItemFilteredWrapper.getWrapperForTestItem(node, document);
+			const previouslySeen = wrapper.hasNodeMatchingFilter;
 
-	protected getId(): string {
-		return generateUuid();
-	}
+			if (previouslySeen) {
+				// reset cache and get whether you can currently see the TestItem.
+				wrapper.reset();
+				const currentlySeen = wrapper.hasNodeMatchingFilter;
 
-	private addItem(actual: vscode.TestItem, providerId: string, parent: string | null) {
-		let internal = this.testItemToInternal.get(actual);
-		if (!internal) {
-			internal = {
-				actual,
-				id: this.getId(),
-				parent,
-				item: TestItem.from(actual),
-				providerId,
-				previousChildren: new Set(),
-				previousEquals: itemEqualityComparator(actual),
-			};
+				if (currentlySeen) {
+					onDidChangeTest.fire(wrapper);
+					return;
+				}
 
-			this.testItemToInternal.set(actual, internal);
-			this.testIdToInternal.set(internal.id, internal);
-			this.diff.push([TestDiffOpType.Add, { id: internal.id, parent, providerId, item: internal.item }]);
-		} else if (!internal.previousEquals(actual)) {
-			internal.item = TestItem.from(actual);
-			internal.previousEquals = itemEqualityComparator(actual);
-			this.diff.push([TestDiffOpType.Update, { id: internal.id, parent, providerId, item: internal.item }]);
-		}
-
-		// If there are children, track which ones are deleted
-		// and recursively and/update them.
-		if (actual.children) {
-			const deletedChildren = internal.previousChildren;
-			const currentChildren = new Set<string>();
-			for (const child of actual.children) {
-				const c = this.addItem(child, providerId, internal.id);
-				deletedChildren.delete(c.id);
-				currentChildren.add(c.id);
+				// Fire the event to say that the current visible parent has changed.
+				onDidChangeTest.fire(wrapper.visibleParent);
+				return;
 			}
 
-			for (const child of deletedChildren) {
-				this.removeItembyId(child);
+			const previousParent = wrapper.visibleParent;
+			wrapper.reset();
+			const currentlySeen = wrapper.hasNodeMatchingFilter;
+
+			// It wasn't previously seen and isn't currently seen so
+			// nothing has actually changed.
+			if (!currentlySeen) {
+				return;
 			}
 
-			internal.previousChildren = currentChildren;
-		}
+			// The test is now visible so we need to refresh the cache
+			// of the previous visible parent and fire that it has changed.
+			previousParent.reset();
+			onDidChangeTest.fire(previousParent);
+		});
 
+		return {
+			root: TestItemFilteredWrapper.getWrapperForTestItem(workspaceHierarchy.root, document),
+			dispose: () => {
+				onDidChangeTest.dispose();
+				TestItemFilteredWrapper.removeFilter(document);
+			},
+			onDidChangeTest: onDidChangeTest.event
+		};
+	}
+}
 
-		return internal;
+/*
+ * A class which wraps a vscode.TestItem that provides the ability to filter a TestItem's children
+ * to only the children that are located in a certain vscode.Uri.
+ */
+export class TestItemFilteredWrapper implements vscode.TestItem {
+	private static wrapperMap = new WeakMap<vscode.TextDocument, WeakMap<vscode.TestItem, TestItemFilteredWrapper>>();
+	public static removeFilter(document: vscode.TextDocument): void {
+		this.wrapperMap.delete(document);
 	}
 
-	private removeItembyId(id: string) {
-		this.diff.push([TestDiffOpType.Remove, id]);
-
-		const queue = [this.testIdToInternal.get(id)];
-		while (queue.length) {
-			const item = queue.pop();
-			if (!item) {
-				continue;
-			}
-
-			this.testIdToInternal.delete(item.id);
-			this.testItemToInternal.delete(item.actual);
-			for (const child of item.previousChildren) {
-				queue.push(this.testIdToInternal.get(child));
-			}
+	// Wraps the TestItem specified in a TestItemFilteredWrapper and pulls from a cache if it already exists.
+	public static getWrapperForTestItem(item: vscode.TestItem, filterDocument: vscode.TextDocument, parent?: TestItemFilteredWrapper): TestItemFilteredWrapper {
+		let innerMap = this.wrapperMap.get(filterDocument);
+		if (innerMap?.has(item)) {
+			return innerMap.get(item)!;
 		}
+
+		if (!innerMap) {
+			innerMap = new WeakMap<vscode.TestItem, TestItemFilteredWrapper>();
+			this.wrapperMap.set(filterDocument, innerMap);
+
+		}
+
+		const w = new TestItemFilteredWrapper(item, filterDocument, parent);
+		innerMap.set(item, w);
+		return w;
 	}
 
-	@throttle(200)
-	protected throttleSendDiff() {
-		const diff = this.collectDiff();
-		if (diff.length) {
-			this.publishDiff(diff);
+	public get label() {
+		return this.actual.label;
+	}
+
+	public get debuggable() {
+		return this.actual.debuggable;
+	}
+
+	public get description() {
+		return this.actual.description;
+	}
+
+	public get location() {
+		return this.actual.location;
+	}
+
+	public get runnable() {
+		return this.actual.runnable;
+	}
+
+	public get state() {
+		return this.actual.state;
+	}
+
+	public get children() {
+		// We only want children that match the filter.
+		return this.getWrappedChildren().filter(child => child.hasNodeMatchingFilter);
+	}
+
+	public get visibleParent(): TestItemFilteredWrapper {
+		return this.hasNodeMatchingFilter ? this : this.parent!.visibleParent;
+	}
+
+	private matchesFilter: boolean | undefined;
+
+	// Determines if the TestItem matches the filter. This would be true if:
+	// 1. We don't have a parent (because the root is the workspace root node)
+	// 2. The URI of the current node matches the filter URI
+	// 3. Some child of the current node matches the filter URI
+	public get hasNodeMatchingFilter(): boolean {
+		if (this.matchesFilter === undefined) {
+			this.matchesFilter = !this.parent
+				|| this.actual.location?.uri.toString() === this.filterDocument.uri.toString()
+				|| this.getWrappedChildren().some(child => child.hasNodeMatchingFilter);
 		}
+
+		return this.matchesFilter;
+	}
+
+	// Reset the cache of whether or not you can see a node from a particular node
+	// up to it's visible parent.
+	public reset(): void {
+		if (this !== this.visibleParent) {
+			this.parent?.reset();
+		}
+		this.matchesFilter = undefined;
+	}
+
+
+	private constructor(public readonly actual: vscode.TestItem, private filterDocument: vscode.TextDocument, private readonly parent?: TestItemFilteredWrapper) {
+		this.getWrappedChildren();
+	}
+
+	private getWrappedChildren() {
+		return this.actual.children?.map(t => TestItemFilteredWrapper.getWrapperForTestItem(t, this.filterDocument, this)) || [];
 	}
 }
 
@@ -382,7 +415,7 @@ export class SingleUseTestCollection implements IDisposable {
 interface MirroredCollectionTestItem extends IncrementalTestCollectionItem {
 	revived: vscode.TestItem;
 	depth: number;
-	wrapped?: vscode.TestItem;
+	wrapped?: vscode.RequiredTestItem;
 }
 
 class MirroredChangeCollector extends IncrementalChangeCollector<MirroredCollectionTestItem> {
@@ -411,7 +444,7 @@ class MirroredChangeCollector extends IncrementalChangeCollector<MirroredCollect
 	 * @override
 	 */
 	public update(node: MirroredCollectionTestItem): void {
-		Object.assign(node.revived, TestItem.to(node.item));
+		Object.assign(node.revived, TestItem.toShallow(node.item));
 		if (!this.added.has(node)) {
 			this.updated.add(node);
 		}
@@ -545,8 +578,8 @@ export class MirroredTestCollection extends AbstractIncrementalTestCollection<Mi
 	/**
 	 * Translates the item IDs to TestItems for exposure to extensions.
 	 */
-	public getAllAsTestItem(itemIds: Iterable<string>): vscode.TestItem[] {
-		let output: vscode.TestItem[] = [];
+	public getAllAsTestItem(itemIds: Iterable<string>): vscode.RequiredTestItem[] {
+		let output: vscode.RequiredTestItem[] = [];
 		for (const itemId of itemIds) {
 			const item = this.items.get(itemId);
 			if (item) {
@@ -577,7 +610,7 @@ export class MirroredTestCollection extends AbstractIncrementalTestCollection<Mi
 	 * @override
 	 */
 	protected createItem(item: InternalTestItem, parent?: MirroredCollectionTestItem): MirroredCollectionTestItem {
-		return { ...item, revived: TestItem.to(item.item), depth: parent ? parent.depth + 1 : 0, children: new Set() };
+		return { ...item, revived: TestItem.toShallow(item.item), depth: parent ? parent.depth + 1 : 0, children: new Set() };
 	}
 
 	/**
@@ -590,9 +623,9 @@ export class MirroredTestCollection extends AbstractIncrementalTestCollection<Mi
 	/**
 	 * Gets the public test item instance for the given mirrored record.
 	 */
-	public getPublicTestItem(item: MirroredCollectionTestItem): vscode.TestItem {
+	public getPublicTestItem(item: MirroredCollectionTestItem): vscode.RequiredTestItem {
 		if (!item.wrapped) {
-			item.wrapped = new ExtHostTestItem(item, this);
+			item.wrapped = new TestItemFromMirror(item, this);
 		}
 
 		return item.wrapped;
@@ -605,10 +638,11 @@ const getMirroredItemId = (item: vscode.TestItem) => {
 
 const MirroredItemId = Symbol('MirroredItemId');
 
-class ExtHostTestItem implements vscode.TestItem, RequiredTestItem {
+class TestItemFromMirror implements vscode.RequiredTestItem {
 	readonly #internal: MirroredCollectionTestItem;
 	readonly #collection: MirroredTestCollection;
 
+	public get id() { return this.#internal.revived.id!; }
 	public get label() { return this.#internal.revived.label; }
 	public get description() { return this.#internal.revived.description; }
 	public get state() { return this.#internal.revived.state; }
@@ -627,14 +661,18 @@ class ExtHostTestItem implements vscode.TestItem, RequiredTestItem {
 	}
 
 	public toJSON() {
-		const serialized: RequiredTestItem = {
+		const serialized: vscode.RequiredTestItem & TestIdWithProvider = {
+			id: this.id,
 			label: this.label,
 			description: this.description,
 			state: this.state,
 			location: this.location,
 			runnable: this.runnable,
 			debuggable: this.debuggable,
-			children: this.children.map(c => (c as ExtHostTestItem).toJSON()),
+			children: this.children.map(c => (c as TestItemFromMirror).toJSON()),
+
+			providerId: this.#internal.providerId,
+			testId: this.#internal.id,
 		};
 
 		return serialized;
@@ -655,6 +693,7 @@ abstract class AbstractTestObserverFactory {
 		const resourceKey = resourceUri.toString();
 		const resource = this.resources.get(resourceKey) ?? this.createObserverData(resourceUri);
 
+		resource.pendingDeletion?.dispose();
 		resource.observers++;
 
 		return {
@@ -778,16 +817,9 @@ class TextDocumentTestObserverFactory extends AbstractTestObserverFactory {
 		const uriString = resourceUri.toString();
 		this.diffListeners.set(uriString, onDiff);
 
-		const disposeListener = this.documents.onDidRemoveDocuments(evt => {
-			if (evt.some(delta => delta.document.uri.toString() === uriString)) {
-				this.unlisten(resourceUri);
-			}
-		});
-
 		this.proxy.$subscribeToDiffs(ExtHostTestingResource.TextDocument, resourceUri);
 		return new Disposable(() => {
 			this.proxy.$unsubscribeFromDiffs(ExtHostTestingResource.TextDocument, resourceUri);
-			disposeListener.dispose();
 			this.diffListeners.delete(uriString);
 		});
 	}
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
index 63d307018..ca1914d2e 100644
--- a/src/vs/workbench/api/common/extHostTreeViews.ts
+++ b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -21,6 +21,7 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Command } from 'vs/editor/common/modes';
 
 type TreeItemHandle = string;
 
@@ -132,12 +133,12 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
 		return treeView.hasResolve;
 	}
 
-	$resolve(treeViewId: string, treeItemHandle: string): Promise<ITreeItem | undefined> {
+	$resolve(treeViewId: string, treeItemHandle: string, token: vscode.CancellationToken): Promise<ITreeItem | undefined> {
 		const treeView = this.treeViews.get(treeViewId);
 		if (!treeView) {
 			throw new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId));
 		}
-		return treeView.resolveTreeItem(treeItemHandle);
+		return treeView.resolveTreeItem(treeItemHandle, token);
 	}
 
 	$setExpanded(treeViewId: string, treeItemHandle: string, expanded: boolean): void {
@@ -184,6 +185,7 @@ interface TreeNode extends IDisposable {
 	extensionItem: vscode.TreeItem;
 	parent: TreeNode | Root;
 	children?: TreeNode[];
+	disposableStore: DisposableStore;
 }
 
 class ExtHostTreeView<T> extends Disposable {
@@ -370,7 +372,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return !!this.dataProvider.resolveTreeItem;
 	}
 
-	async resolveTreeItem(treeItemHandle: string): Promise<ITreeItem | undefined> {
+	async resolveTreeItem(treeItemHandle: string, token: vscode.CancellationToken): Promise<ITreeItem | undefined> {
 		if (!this.dataProvider.resolveTreeItem) {
 			return;
 		}
@@ -378,9 +380,10 @@ class ExtHostTreeView<T> extends Disposable {
 		if (element) {
 			const node = this.nodes.get(element);
 			if (node) {
-				const resolve = await this.dataProvider.resolveTreeItem(node.extensionItem, element) ?? node.extensionItem;
-				// Resolvable elements. Currently only tooltip.
+				const resolve = await this.dataProvider.resolveTreeItem(node.extensionItem, element, token) ?? node.extensionItem;
+				// Resolvable elements. Currently only tooltip and command.
 				node.item.tooltip = this.getTooltip(resolve.tooltip);
+				node.item.command = this.getCommand(node.disposableStore, resolve.command);
 				return node.item;
 			}
 		}
@@ -573,8 +576,12 @@ class ExtHostTreeView<T> extends Disposable {
 		return tooltip;
 	}
 
+	private getCommand(disposable: DisposableStore, command?: vscode.Command): Command | undefined {
+		return command ? this.commands.toInternal(command, disposable) : undefined;
+	}
+
 	private createTreeNode(element: T, extensionTreeItem: vscode.TreeItem, parent: TreeNode | Root): TreeNode {
-		const disposable = new DisposableStore();
+		const disposableStore = new DisposableStore();
 		const handle = this.createHandle(element, extensionTreeItem, parent);
 		const icon = this.getLightIconPath(extensionTreeItem);
 		const item: ITreeItem = {
@@ -584,7 +591,7 @@ class ExtHostTreeView<T> extends Disposable {
 			description: extensionTreeItem.description,
 			resourceUri: extensionTreeItem.resourceUri,
 			tooltip: this.getTooltip(extensionTreeItem.tooltip),
-			command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command, disposable) : undefined,
+			command: this.getCommand(disposableStore, extensionTreeItem.command),
 			contextValue: extensionTreeItem.contextValue,
 			icon,
 			iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
@@ -598,7 +605,8 @@ class ExtHostTreeView<T> extends Disposable {
 			extensionItem: extensionTreeItem,
 			parent,
 			children: undefined,
-			dispose(): void { disposable.dispose(); }
+			disposableStore,
+			dispose(): void { disposableStore.dispose(); }
 		};
 	}
 
diff --git a/src/vs/workbench/api/common/extHostTunnelService.ts b/src/vs/workbench/api/common/extHostTunnelService.ts
index 29a50ae27..721cbaba4 100644
--- a/src/vs/workbench/api/common/extHostTunnelService.ts
+++ b/src/vs/workbench/api/common/extHostTunnelService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ExtHostTunnelServiceShape, MainContext, MainThreadTunnelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostTunnelServiceShape } from 'vs/workbench/api/common/extHost.protocol';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import * as vscode from 'vscode';
 import { RemoteTunnel, TunnelCreationOptions, TunnelOptions } from 'vs/platform/remote/common/tunnel';
@@ -11,18 +11,27 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
 
 export interface TunnelDto {
 	remoteAddress: { port: number, host: string };
 	localAddress: { port: number, host: string } | string;
+	public: boolean;
 }
 
 export namespace TunnelDto {
 	export function fromApiTunnel(tunnel: vscode.Tunnel): TunnelDto {
-		return { remoteAddress: tunnel.remoteAddress, localAddress: tunnel.localAddress };
+		return { remoteAddress: tunnel.remoteAddress, localAddress: tunnel.localAddress, public: !!tunnel.public };
 	}
 	export function fromServiceTunnel(tunnel: RemoteTunnel): TunnelDto {
-		return { remoteAddress: { host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, localAddress: tunnel.localAddress };
+		return {
+			remoteAddress: {
+				host: tunnel.tunnelRemoteHost,
+				port: tunnel.tunnelRemotePort
+			},
+			localAddress: tunnel.localAddress,
+			public: tunnel.public
+		};
 	}
 }
 
@@ -44,12 +53,13 @@ export const IExtHostTunnelService = createDecorator<IExtHostTunnelService>('IEx
 export class ExtHostTunnelService implements IExtHostTunnelService {
 	declare readonly _serviceBrand: undefined;
 	onDidChangeTunnels: vscode.Event<void> = (new Emitter<void>()).event;
-	private readonly _proxy: MainThreadTunnelServiceShape;
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 	) {
-		this._proxy = extHostRpc.getProxy(MainContext.MainThreadTunnelService);
+	}
+	async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
+		return candidates;
 	}
 
 	async openTunnel(extension: IExtensionDescription, forward: TunnelOptions): Promise<vscode.Tunnel | undefined> {
@@ -59,10 +69,10 @@ export class ExtHostTunnelService implements IExtHostTunnelService {
 		return [];
 	}
 	async setTunnelExtensionFunctions(provider: vscode.RemoteAuthorityResolver | undefined): Promise<IDisposable> {
-		await this._proxy.$tunnelServiceReady();
 		return { dispose: () => { } };
 	}
-	$forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto> | undefined { return undefined; }
+	async $forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto | undefined> { return undefined; }
 	async $closeTunnel(remote: { host: string, port: number }): Promise<void> { }
 	async $onDidTunnelsChange(): Promise<void> { }
+	async $registerCandidateFinder(): Promise<void> { }
 }
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index d80dfae4b..d1512e59b 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -1015,6 +1015,29 @@ export namespace SignatureHelp {
 	}
 }
 
+export namespace InlineHint {
+
+	export function from(hint: vscode.InlineHint): modes.InlineHint {
+		return {
+			text: hint.text,
+			range: Range.from(hint.range),
+			description: hint.description && MarkdownString.fromStrict(hint.description),
+			whitespaceBefore: hint.whitespaceBefore,
+			whitespaceAfter: hint.whitespaceAfter
+		};
+	}
+
+	export function to(hint: modes.InlineHint): vscode.InlineHint {
+		return new types.InlineHint(
+			hint.text,
+			Range.to(hint.range),
+			htmlContent.isMarkdownString(hint.description) ? MarkdownString.to(hint.description) : hint.description,
+			hint.whitespaceBefore,
+			hint.whitespaceAfter
+		);
+	}
+}
+
 export namespace DocumentLink {
 
 	export function from(link: vscode.DocumentLink): modes.ILink {
@@ -1389,19 +1412,21 @@ export namespace TestState {
 
 
 export namespace TestItem {
-	export function from(item: vscode.TestItem): ITestItem {
+	export function from(item: vscode.TestItem, parentExtId?: string): ITestItem {
 		return {
+			extId: item.id ?? (parentExtId ? `${parentExtId}\0${item.label}` : item.label),
 			label: item.label,
 			location: item.location ? location.from(item.location) : undefined,
-			debuggable: item.debuggable,
+			debuggable: item.debuggable ?? false,
 			description: item.description,
-			runnable: item.runnable,
+			runnable: item.runnable ?? true,
 			state: TestState.from(item.state),
 		};
 	}
 
-	export function to(item: ITestItem): vscode.TestItem {
+	export function toShallow(item: ITestItem): Omit<vscode.RequiredTestItem, 'children'> {
 		return {
+			id: item.extId,
 			label: item.label,
 			location: item.location && location.to({
 				range: item.location.range,
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 069c56583..5d1bb34cb 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -13,7 +13,7 @@ import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'vs/platform/files/common/files';
 import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { addIdToOutput, CellEditType, ICellEditOperation, IDisplayOutput } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { addIdToOutput, CellEditType, ICellEditOperation, IDisplayOutput, notebookDocumentMetadataDefaults } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import type * as vscode from 'vscode';
 
 function es5ClassCompat(target: Function): any {
@@ -638,7 +638,7 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	// --- notebook
 
 	replaceNotebookMetadata(uri: URI, value: vscode.NotebookDocumentMetadata, metadata?: vscode.WorkspaceEditEntryMetadata): void {
-		this._edits.push({ _type: FileEditType.Cell, metadata, uri, notebookMetadata: value });
+		this._edits.push({ _type: FileEditType.Cell, metadata, uri, edit: { editType: CellEditType.DocumentMetadata, metadata: { ...notebookDocumentMetadataDefaults, ...value } }, notebookMetadata: value });
 	}
 
 	replaceNotebookCells(uri: URI, start: number, end: number, cells: vscode.NotebookCellData[], metadata?: vscode.WorkspaceEditEntryMetadata): void {
@@ -1373,6 +1373,23 @@ export enum SignatureHelpTriggerKind {
 	ContentChange = 3,
 }
 
+@es5ClassCompat
+export class InlineHint {
+	text: string;
+	range: Range;
+	description?: string | vscode.MarkdownString;
+	whitespaceBefore?: boolean;
+	whitespaceAfter?: boolean;
+
+	constructor(text: string, range: Range, description?: string | vscode.MarkdownString, whitespaceBefore?: boolean, whitespaceAfter?: boolean) {
+		this.text = text;
+		this.range = range;
+		this.description = description;
+		this.whitespaceBefore = whitespaceBefore;
+		this.whitespaceAfter = whitespaceAfter;
+	}
+}
+
 export enum CompletionTriggerKind {
 	Invoke = 0,
 	TriggerCharacter = 1,
@@ -2298,9 +2315,6 @@ export class FunctionBreakpoint extends Breakpoint {
 
 	constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string) {
 		super(enabled, condition, hitCondition, logMessage);
-		if (!functionName) {
-			throw illegalArgument('functionName');
-		}
 		this.functionName = functionName;
 	}
 }
@@ -2858,7 +2872,8 @@ export enum NotebookCellStatusBarAlignment {
 export enum NotebookEditorRevealType {
 	Default = 0,
 	InCenter = 1,
-	InCenterIfOutsideViewport = 2
+	InCenterIfOutsideViewport = 2,
+	AtTop = 3
 }
 
 
@@ -2924,11 +2939,12 @@ export class LinkedEditingRanges {
 //#region Testing
 export enum TestRunState {
 	Unset = 0,
-	Running = 1,
-	Passed = 2,
-	Failed = 3,
-	Skipped = 4,
-	Errored = 5
+	Queued = 1,
+	Running = 2,
+	Passed = 3,
+	Failed = 4,
+	Skipped = 5,
+	Errored = 6
 }
 
 export enum TestMessageSeverity {
@@ -2963,15 +2979,15 @@ export class TestState {
 	}
 }
 
-type AllowedUndefined = 'description' | 'location';
-
-/**
- * Test item without any optional properties. Only some properties are
- * permitted to be undefined, but they must still exist.
- */
-export type RequiredTestItem = {
-	[K in keyof Required<vscode.TestItem>]: K extends AllowedUndefined ? vscode.TestItem[K] : Required<vscode.TestItem>[K]
-};
+export type RequiredTestItem = vscode.RequiredTestItem;
 
+export type TestItem = vscode.TestItem;
 
 //#endregion
+
+export enum ExternalUriOpenerPriority {
+	None = 0,
+	Option = 1,
+	Default = 2,
+	Preferred = 3,
+}
diff --git a/src/vs/workbench/api/common/extHostUriOpener.ts b/src/vs/workbench/api/common/extHostUriOpener.ts
new file mode 100644
index 000000000..81bbc6f4d
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostUriOpener.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { toDisposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { URI, UriComponents } from 'vs/base/common/uri';
+import * as modes from 'vs/editor/common/modes';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import type * as vscode from 'vscode';
+import { ExtHostUriOpenersShape, IMainContext, MainContext, MainThreadUriOpenersShape } from './extHost.protocol';
+
+
+export class ExtHostUriOpeners implements ExtHostUriOpenersShape {
+
+	private static readonly supportedSchemes = new Set<string>([Schemas.http, Schemas.https]);
+
+	private readonly _proxy: MainThreadUriOpenersShape;
+
+	private readonly _openers = new Map<string, vscode.ExternalUriOpener>();
+
+	constructor(
+		mainContext: IMainContext,
+	) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadUriOpeners);
+	}
+
+	registerExternalUriOpener(
+		extensionId: ExtensionIdentifier,
+		id: string,
+		opener: vscode.ExternalUriOpener,
+		metadata: vscode.ExternalUriOpenerMetadata,
+	): vscode.Disposable {
+		if (this._openers.has(id)) {
+			throw new Error(`Opener with id '${id}' already registered`);
+		}
+
+		const invalidScheme = metadata.schemes.find(scheme => !ExtHostUriOpeners.supportedSchemes.has(scheme));
+		if (invalidScheme) {
+			throw new Error(`Scheme '${invalidScheme}' is not supported. Only http and https are currently supported.`);
+		}
+
+		this._openers.set(id, opener);
+		this._proxy.$registerUriOpener(id, metadata.schemes, extensionId, metadata.label);
+
+		return toDisposable(() => {
+			this._openers.delete(id);
+			this._proxy.$unregisterUriOpener(id);
+		});
+	}
+
+	async $canOpenUri(id: string, uriComponents: UriComponents, token: CancellationToken): Promise<modes.ExternalUriOpenerPriority> {
+		const opener = this._openers.get(id);
+		if (!opener) {
+			throw new Error(`Unknown opener with id: ${id}`);
+		}
+
+		const uri = URI.revive(uriComponents);
+		return opener.canOpenExternalUri(uri, token);
+	}
+
+	async $openUri(id: string, context: { resolvedUri: UriComponents, sourceUri: UriComponents }, token: CancellationToken): Promise<void> {
+		const opener = this._openers.get(id);
+		if (!opener) {
+			throw new Error(`Unknown opener id: '${id}'`);
+		}
+
+		return opener.openExternalUri(URI.revive(context.resolvedUri), {
+			sourceUri: URI.revive(context.sourceUri)
+		}, token);
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostWebviewPanels.ts b/src/vs/workbench/api/common/extHostWebviewPanels.ts
index 797702b88..dfdd948be 100644
--- a/src/vs/workbench/api/common/extHostWebviewPanels.ts
+++ b/src/vs/workbench/api/common/extHostWebviewPanels.ts
@@ -287,8 +287,8 @@ export class ExtHostWebviewPanels implements extHostProtocol.ExtHostWebviewPanel
 		await serializer.deserializeWebviewPanel(revivedPanel, state);
 	}
 
-	public createNewWebviewPanel(webviewHandle: string, viewType: string, title: string, position: number, options: modes.IWebviewOptions & modes.IWebviewPanelOptions, webview: ExtHostWebview) {
-		const panel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' && position >= 0 ? typeConverters.ViewColumn.to(position) : undefined, options, webview);
+	public createNewWebviewPanel(webviewHandle: string, viewType: string, title: string, position: vscode.ViewColumn, options: modes.IWebviewOptions & modes.IWebviewPanelOptions, webview: ExtHostWebview) {
+		const panel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, position, options, webview);
 		this._webviewPanels.set(webviewHandle, panel);
 		return panel;
 	}
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index 3e0de07e3..c03c6be54 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -10,7 +10,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { Counter } from 'vs/base/common/numbers';
-import { basename, basenameOrAuthority, dirname, isEqual, relativePath } from 'vs/base/common/resources';
+import { basename, basenameOrAuthority, dirname, ExtUri, relativePath } from 'vs/base/common/resources';
 import { compare } from 'vs/base/common/strings';
 import { withUndefinedAsNull } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
@@ -37,27 +37,27 @@ export interface IExtHostWorkspaceProvider {
 	resolveProxy(url: string): Promise<string | undefined>;
 }
 
-function isFolderEqual(folderA: URI, folderB: URI): boolean {
-	return isEqual(folderA, folderB);
+function isFolderEqual(folderA: URI, folderB: URI, extHostFileSystemInfo: IExtHostFileSystemInfo): boolean {
+	return new ExtUri(uri => ignorePathCasing(uri, extHostFileSystemInfo)).isEqual(folderA, folderB);
 }
 
-function compareWorkspaceFolderByUri(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder): number {
-	return isFolderEqual(a.uri, b.uri) ? 0 : compare(a.uri.toString(), b.uri.toString());
+function compareWorkspaceFolderByUri(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder, extHostFileSystemInfo: IExtHostFileSystemInfo): number {
+	return isFolderEqual(a.uri, b.uri, extHostFileSystemInfo) ? 0 : compare(a.uri.toString(), b.uri.toString());
 }
 
-function compareWorkspaceFolderByUriAndNameAndIndex(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder): number {
+function compareWorkspaceFolderByUriAndNameAndIndex(a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder, extHostFileSystemInfo: IExtHostFileSystemInfo): number {
 	if (a.index !== b.index) {
 		return a.index < b.index ? -1 : 1;
 	}
 
-	return isFolderEqual(a.uri, b.uri) ? compare(a.name, b.name) : compare(a.uri.toString(), b.uri.toString());
+	return isFolderEqual(a.uri, b.uri, extHostFileSystemInfo) ? compare(a.name, b.name) : compare(a.uri.toString(), b.uri.toString());
 }
 
-function delta(oldFolders: vscode.WorkspaceFolder[], newFolders: vscode.WorkspaceFolder[], compare: (a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder) => number): { removed: vscode.WorkspaceFolder[], added: vscode.WorkspaceFolder[] } {
-	const oldSortedFolders = oldFolders.slice(0).sort(compare);
-	const newSortedFolders = newFolders.slice(0).sort(compare);
+function delta(oldFolders: vscode.WorkspaceFolder[], newFolders: vscode.WorkspaceFolder[], compare: (a: vscode.WorkspaceFolder, b: vscode.WorkspaceFolder, extHostFileSystemInfo: IExtHostFileSystemInfo) => number, extHostFileSystemInfo: IExtHostFileSystemInfo): { removed: vscode.WorkspaceFolder[], added: vscode.WorkspaceFolder[] } {
+	const oldSortedFolders = oldFolders.slice(0).sort((a, b) => compare(a, b, extHostFileSystemInfo));
+	const newSortedFolders = newFolders.slice(0).sort((a, b) => compare(a, b, extHostFileSystemInfo));
 
-	return arrayDelta(oldSortedFolders, newSortedFolders, compare);
+	return arrayDelta(oldSortedFolders, newSortedFolders, (a, b) => compare(a, b, extHostFileSystemInfo));
 }
 
 function ignorePathCasing(uri: URI, extHostFileSystemInfo: IExtHostFileSystemInfo): boolean {
@@ -87,7 +87,7 @@ class ExtHostWorkspaceImpl extends Workspace {
 		if (previousConfirmedWorkspace) {
 			folders.forEach((folderData, index) => {
 				const folderUri = URI.revive(folderData.uri);
-				const existingFolder = ExtHostWorkspaceImpl._findFolder(previousUnconfirmedWorkspace || previousConfirmedWorkspace, folderUri);
+				const existingFolder = ExtHostWorkspaceImpl._findFolder(previousUnconfirmedWorkspace || previousConfirmedWorkspace, folderUri, extHostFileSystemInfo);
 
 				if (existingFolder) {
 					existingFolder.name = folderData.name;
@@ -106,15 +106,15 @@ class ExtHostWorkspaceImpl extends Workspace {
 		newWorkspaceFolders.sort((f1, f2) => f1.index < f2.index ? -1 : 1);
 
 		const workspace = new ExtHostWorkspaceImpl(id, name, newWorkspaceFolders, configuration ? URI.revive(configuration) : null, !!isUntitled, uri => ignorePathCasing(uri, extHostFileSystemInfo));
-		const { added, removed } = delta(oldWorkspace ? oldWorkspace.workspaceFolders : [], workspace.workspaceFolders, compareWorkspaceFolderByUri);
+		const { added, removed } = delta(oldWorkspace ? oldWorkspace.workspaceFolders : [], workspace.workspaceFolders, compareWorkspaceFolderByUri, extHostFileSystemInfo);
 
 		return { workspace, added, removed };
 	}
 
-	private static _findFolder(workspace: ExtHostWorkspaceImpl, folderUriToFind: URI): MutableWorkspaceFolder | undefined {
+	private static _findFolder(workspace: ExtHostWorkspaceImpl, folderUriToFind: URI, extHostFileSystemInfo: IExtHostFileSystemInfo): MutableWorkspaceFolder | undefined {
 		for (let i = 0; i < workspace.folders.length; i++) {
 			const folder = workspace.workspaceFolders[i];
-			if (isFolderEqual(folder.uri, folderUriToFind)) {
+			if (isFolderEqual(folder.uri, folderUriToFind, extHostFileSystemInfo)) {
 				return folder;
 			}
 		}
@@ -254,7 +254,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		const validatedDistinctWorkspaceFoldersToAdd: { uri: vscode.Uri, name?: string }[] = [];
 		if (Array.isArray(workspaceFoldersToAdd)) {
 			workspaceFoldersToAdd.forEach(folderToAdd => {
-				if (URI.isUri(folderToAdd.uri) && !validatedDistinctWorkspaceFoldersToAdd.some(f => isFolderEqual(f.uri, folderToAdd.uri))) {
+				if (URI.isUri(folderToAdd.uri) && !validatedDistinctWorkspaceFoldersToAdd.some(f => isFolderEqual(f.uri, folderToAdd.uri, this._extHostFileSystemInfo))) {
 					validatedDistinctWorkspaceFoldersToAdd.push({ uri: folderToAdd.uri, name: folderToAdd.name || basenameOrAuthority(folderToAdd.uri) });
 				}
 			});
@@ -283,13 +283,13 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 
 		for (let i = 0; i < newWorkspaceFolders.length; i++) {
 			const folder = newWorkspaceFolders[i];
-			if (newWorkspaceFolders.some((otherFolder, index) => index !== i && isFolderEqual(folder.uri, otherFolder.uri))) {
+			if (newWorkspaceFolders.some((otherFolder, index) => index !== i && isFolderEqual(folder.uri, otherFolder.uri, this._extHostFileSystemInfo))) {
 				return false; // cannot add the same folder multiple times
 			}
 		}
 
 		newWorkspaceFolders.forEach((f, index) => f.index = index); // fix index
-		const { added, removed } = delta(currentWorkspaceFolders, newWorkspaceFolders, compareWorkspaceFolderByUriAndNameAndIndex);
+		const { added, removed } = delta(currentWorkspaceFolders, newWorkspaceFolders, compareWorkspaceFolderByUriAndNameAndIndex, this._extHostFileSystemInfo);
 		if (added.length === 0 && removed.length === 0) {
 			return false; // nothing actually changed
 		}
diff --git a/src/vs/workbench/api/common/shared/workspaceContains.ts b/src/vs/workbench/api/common/shared/workspaceContains.ts
index 629c9994a..74a283dce 100644
--- a/src/vs/workbench/api/common/shared/workspaceContains.ts
+++ b/src/vs/workbench/api/common/shared/workspaceContains.ts
@@ -119,8 +119,7 @@ export function checkGlobFileExists(
 	const queryBuilder = instantiationService.createInstance(QueryBuilder);
 	const query = queryBuilder.file(folders.map(folder => toWorkspaceFolder(URI.revive(folder))), {
 		_reason: 'checkExists',
-		includePattern: includes.join(', '),
-		expandPatterns: true,
+		includePattern: includes,
 		exists: true
 	});
 
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
index bb5ec1cd7..b3424a779 100644
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -39,7 +39,15 @@ export interface RunCommandPipeArgs {
 	args: any[];
 }
 
-export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | RunCommandPipeArgs | OpenExternalCommandPipeArgs;
+export interface ExtensionManagementPipeArgs {
+	type: 'extensionManagement';
+	list?: { showVersions?: boolean, category?: string; };
+	install?: string[];
+	uninstall?: string[];
+	force?: boolean;
+}
+
+export type PipeCommand = OpenCommandPipeArgs | StatusPipeArgs | RunCommandPipeArgs | OpenExternalCommandPipeArgs | ExtensionManagementPipeArgs;
 
 export interface ICommandsExecuter {
 	executeCommand<T>(id: string, ...args: any[]): Promise<T>;
@@ -95,6 +103,10 @@ export class CLIServerBase {
 					this.runCommand(data, res)
 						.catch(this.logService.error);
 					break;
+				case 'extensionManagement':
+					this.manageExtensions(data, res)
+						.catch(this.logService.error);
+					break;
 				default:
 					res.writeHead(404);
 					res.write(`Unknown message type: ${data.type}`, err => {
@@ -143,14 +155,34 @@ export class CLIServerBase {
 		res.end();
 	}
 
-	private openExternal(data: OpenExternalCommandPipeArgs, res: http.ServerResponse) {
+	private async openExternal(data: OpenExternalCommandPipeArgs, res: http.ServerResponse) {
 		for (const uri of data.uris) {
-			this._commands.executeCommand('_workbench.openExternal', URI.parse(uri), { allowTunneling: true });
+			await this._commands.executeCommand('_remoteCLI.openExternal', URI.parse(uri), { allowTunneling: true });
 		}
 		res.writeHead(200);
 		res.end();
 	}
 
+	private async manageExtensions(data: ExtensionManagementPipeArgs, res: http.ServerResponse) {
+		console.log('server: manageExtensions');
+		try {
+			const toExtOrVSIX = (inputs: string[] | undefined) => inputs?.map(input => /\.vsix$/i.test(input) ? URI.parse(input) : input);
+			const commandArgs = {
+				list: data.list,
+				install: toExtOrVSIX(data.install),
+				uninstall: toExtOrVSIX(data.uninstall),
+				force: data.force
+			};
+			const output = await this._commands.executeCommand('_remoteCLI.manageExtensions', commandArgs, { allowTunneling: true });
+			res.writeHead(200);
+			res.write(output);
+		} catch (e) {
+			res.writeHead(500);
+			res.write(String(e));
+		}
+		res.end();
+	}
+
 	private async getStatus(data: StatusPipeArgs, res: http.ServerResponse) {
 		try {
 			const status = await this._commands.executeCommand('_issues.getSystemStatus');
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index ff76f109b..992c63777 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -104,7 +104,7 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 				cwdForPrepareCommand = args.cwd;
 			}
 
-			terminal.show();
+			terminal.show(true);
 
 			const shellProcessId = await terminal.processId;
 
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 3d92a6991..d9377b68c 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as performance from 'vs/base/common/performance';
 import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl';
 import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
 import { MainContext } from 'vs/workbench/api/common/extHost.protocol';
@@ -13,7 +14,7 @@ import { ExtHostDownloadService } from 'vs/workbench/api/node/extHostDownloadSer
 import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes';
 
 class NodeModuleRequireInterceptor extends RequireInterceptor {
@@ -62,10 +63,12 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		// Module loading tricks
 		const interceptor = this._instaService.createInstance(NodeModuleRequireInterceptor, extensionApiFactory, this._registry);
 		await interceptor.install();
+		performance.mark('code/extHost/didInitAPI');
 
 		// Do this when extension service exists, but extensions are not being activated yet.
 		const configProvider = await this._extHostConfiguration.getConfigProvider();
 		await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._logService, this._mainThreadTelemetryProxy, this._initData);
+		performance.mark('code/extHost/didInitProxyResolver');
 
 		// Use IPC messages to forward console-calls, note that the console is
 		// already patched to use`process.send()`
@@ -84,7 +87,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		return extensionDescription.main;
 	}
 
-	protected _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
+	protected _loadCommonJSModule<T>(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
 		if (module.scheme !== Schemas.file) {
 			throw new Error(`Cannot load URI: '${module}', must be of file-scheme`);
 		}
@@ -93,10 +96,16 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		this._logService.info(`ExtensionService#loadCommonJSModule ${module.toString(true)}`);
 		this._logService.flush();
 		try {
+			if (extensionId) {
+				performance.mark(`code/extHost/willLoadExtensionCode/${extensionId.value}`);
+			}
 			r = require.__$__nodeRequire<T>(module.fsPath);
 		} catch (e) {
 			return Promise.reject(e);
 		} finally {
+			if (extensionId) {
+				performance.mark(`code/extHost/didLoadExtensionCode/${extensionId.value}`);
+			}
 			activationTimesBuilder.codeLoadingStop();
 		}
 		return Promise.resolve(r);
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 9d5951b84..260ace16b 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -50,11 +50,12 @@ export class ExtHostTask extends ExtHostTaskBase {
 	}
 
 	public async executeTask(extension: IExtensionDescription, task: vscode.Task): Promise<vscode.TaskExecution> {
-		if (!task.execution) {
+		const tTask = (task as types.Task);
+
+		if (!task.execution && (tTask._id === undefined)) {
 			throw new Error('Tasks to execute must include an execution');
 		}
 
-		const tTask = (task as types.Task);
 		// We have a preserved ID. So the task didn't change.
 		if (tTask._id !== undefined) {
 			// Always get the task execution first to prevent timing issues when retrieving it later
@@ -121,7 +122,7 @@ export class ExtHostTask extends ExtHostTaskBase {
 	private async getVariableResolver(workspaceFolders: vscode.WorkspaceFolder[]): Promise<ExtHostVariableResolverService> {
 		if (this._variableResolver === undefined) {
 			const configProvider = await this._configurationService.getConfigProvider();
-			this._variableResolver = new ExtHostVariableResolverService(workspaceFolders, this._editorService, configProvider, process.env as IProcessEnvironment);
+			this._variableResolver = new ExtHostVariableResolverService(workspaceFolders, this._editorService, configProvider, process.env as IProcessEnvironment, this.workspaceService);
 		}
 		return this._variableResolver;
 	}
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index 01a34ff3f..adad271b3 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -17,13 +17,15 @@ import { ExtHostWorkspace, IExtHostWorkspace } from 'vs/workbench/api/common/ext
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ExtHostVariableResolverService } from 'vs/workbench/api/common/extHostDebugService';
 import { ExtHostDocumentsAndEditors, IExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { getSystemShell, detectAvailableShells } from 'vs/workbench/contrib/terminal/node/terminal';
+import { detectAvailableShells } from 'vs/workbench/contrib/terminal/node/terminal';
 import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
 import { BaseExtHostTerminalService, ExtHostTerminal } from 'vs/workbench/api/common/extHostTerminalService';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { MergedEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableCollection';
 import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
 import { withNullAsUndefined } from 'vs/base/common/types';
+import { getSystemShell, getSystemShellSync } from 'vs/base/node/shell';
+import { generateUuid } from 'vs/base/common/uuid';
 
 export class ExtHostTerminalService extends BaseExtHostTerminalService {
 
@@ -32,6 +34,7 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
 
 	// TODO: Pull this from main side
 	private _isWorkspaceShellAllowed: boolean = false;
+	private _defaultShell: string | undefined;
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
@@ -42,20 +45,26 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
 		@IExtHostInitDataService private _extHostInitDataService: IExtHostInitDataService
 	) {
 		super(true, extHostRpc);
+
+		// Getting the SystemShell is an async operation, however, the ExtHost terminal service is mostly synchronous
+		// and the API `vscode.env.shell` is also synchronous. The default shell _should_ be set when extensions are
+		// starting up but if not, we run getSystemShellSync below which gets a sane default.
+		getSystemShell(platform.platform).then(s => this._defaultShell = s);
+
 		this._updateLastActiveWorkspace();
 		this._updateVariableResolver();
 		this._registerListeners();
 	}
 
 	public createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {
-		const terminal = new ExtHostTerminal(this._proxy, { name, shellPath, shellArgs }, name);
+		const terminal = new ExtHostTerminal(this._proxy, generateUuid(), { name, shellPath, shellArgs }, name);
 		this._terminals.push(terminal);
 		terminal.create(shellPath, shellArgs);
 		return terminal;
 	}
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions, isFeatureTerminal?: boolean): vscode.Terminal {
-		const terminal = new ExtHostTerminal(this._proxy, options, options.name);
+		const terminal = new ExtHostTerminal(this._proxy, generateUuid(), options, options.name);
 		this._terminals.push(terminal);
 		terminal.create(
 			withNullAsUndefined(options.shellPath),
@@ -76,10 +85,11 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
 				.inspect<string | string[]>(key.substr(key.lastIndexOf('.') + 1));
 			return this._apiInspectConfigToPlain<string | string[]>(setting);
 		};
+
 		return terminalEnvironment.getDefaultShell(
 			fetchSetting,
 			this._isWorkspaceShellAllowed,
-			getSystemShell(platform.platform),
+			this._defaultShell ?? getSystemShellSync(platform.platform),
 			process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432'),
 			process.env.windir,
 			terminalEnvironment.createVariableResolver(this._lastActiveWorkspace, this._variableResolver),
@@ -139,7 +149,8 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
 			executable: shellLaunchConfigDto.executable,
 			args: shellLaunchConfigDto.args,
 			cwd: typeof shellLaunchConfigDto.cwd === 'string' ? shellLaunchConfigDto.cwd : URI.revive(shellLaunchConfigDto.cwd),
-			env: shellLaunchConfigDto.env
+			env: shellLaunchConfigDto.env,
+			flowControl: shellLaunchConfigDto.flowControl
 		};
 
 		// Merge in shell and args from settings
diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts
index 922451d10..b7a058768 100644
--- a/src/vs/workbench/api/node/extHostTunnelService.ts
+++ b/src/vs/workbench/api/node/extHostTunnelService.ts
@@ -12,12 +12,16 @@ import { URI } from 'vs/base/common/uri';
 import { exec } from 'child_process';
 import * as resources from 'vs/base/common/resources';
 import * as fs from 'fs';
+import * as pfs from 'vs/base/node/pfs';
 import { isLinux } from 'vs/base/common/platform';
 import { IExtHostTunnelService, TunnelDto } from 'vs/workbench/api/common/extHostTunnelService';
-import { asPromise } from 'vs/base/common/async';
 import { Event, Emitter } from 'vs/base/common/event';
 import { TunnelOptions, TunnelCreationOptions } from 'vs/platform/remote/common/tunnel';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { promisify } from 'util';
+import { MovingAverage } from 'vs/base/common/numbers';
+import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 class ExtensionTunnel implements vscode.Tunnel {
 	private _onDispose: Emitter<void> = new Emitter();
@@ -26,14 +30,106 @@ class ExtensionTunnel implements vscode.Tunnel {
 	constructor(
 		public readonly remoteAddress: { port: number, host: string },
 		public readonly localAddress: { port: number, host: string } | string,
-		private readonly _dispose: () => void) { }
+		private readonly _dispose: () => Promise<void>) { }
 
-	dispose(): void {
+	dispose(): Promise<void> {
 		this._onDispose.fire();
-		this._dispose();
+		return this._dispose();
 	}
 }
 
+export function getSockets(stdout: string): { pid: number, socket: number }[] {
+	const lines = stdout.trim().split('\n');
+	const mapped: { pid: number, socket: number }[] = [];
+	lines.forEach(line => {
+		const match = /\/proc\/(\d+)\/fd\/\d+ -> socket:\[(\d+)\]/.exec(line)!;
+		if (match && match.length >= 3) {
+			mapped.push({
+				pid: parseInt(match[1], 10),
+				socket: parseInt(match[2], 10)
+			});
+		}
+	});
+	return mapped;
+}
+
+export function loadListeningPorts(...stdouts: string[]): { socket: number, ip: string, port: number }[] {
+	const table = ([] as Record<string, string>[]).concat(...stdouts.map(loadConnectionTable));
+	return [
+		...new Map(
+			table.filter(row => row.st === '0A')
+				.map(row => {
+					const address = row.local_address.split(':');
+					return {
+						socket: parseInt(row.inode, 10),
+						ip: parseIpAddress(address[0]),
+						port: parseInt(address[1], 16)
+					};
+				}).map(port => [port.ip + ':' + port.port, port])
+		).values()
+	];
+}
+
+export function parseIpAddress(hex: string): string {
+	let result = '';
+	if (hex.length === 8) {
+		for (let i = hex.length - 2; i >= 0; i -= 2) {
+			result += parseInt(hex.substr(i, 2), 16);
+			if (i !== 0) {
+				result += '.';
+			}
+		}
+	} else {
+		for (let i = hex.length - 4; i >= 0; i -= 4) {
+			result += parseInt(hex.substr(i, 4), 16).toString(16);
+			if (i !== 0) {
+				result += ':';
+			}
+		}
+	}
+	return result;
+}
+
+export function loadConnectionTable(stdout: string): Record<string, string>[] {
+	const lines = stdout.trim().split('\n');
+	const names = lines.shift()!.trim().split(/\s+/)
+		.filter(name => name !== 'rx_queue' && name !== 'tm->when');
+	const table = lines.map(line => line.trim().split(/\s+/).reduce((obj, value, i) => {
+		obj[names[i] || i] = value;
+		return obj;
+	}, {} as Record<string, string>));
+	return table;
+}
+
+function knownExcludeCmdline(command: string): boolean {
+	return !!command.match(/.*\.vscode-server-[a-zA-Z]+\/bin.*/)
+		|| (command.indexOf('out/vs/server/main.js') !== -1)
+		|| (command.indexOf('_productName=VSCode') !== -1);
+}
+
+export async function findPorts(tcp: string, tcp6: string, procSockets: string, processes: { pid: number, cwd: string, cmd: string }[]): Promise<CandidatePort[]> {
+	const connections: { socket: number, ip: string, port: number }[] = loadListeningPorts(tcp, tcp6);
+	const sockets = getSockets(procSockets);
+
+	const socketMap = sockets.reduce((m, socket) => {
+		m[socket.socket] = socket;
+		return m;
+	}, {} as Record<string, typeof sockets[0]>);
+	const processMap = processes.reduce((m, process) => {
+		m[process.pid] = process;
+		return m;
+	}, {} as Record<string, typeof processes[0]>);
+
+	const ports: CandidatePort[] = [];
+	connections.filter((connection => socketMap[connection.socket])).forEach(({ socket, ip, port }) => {
+		const command = processMap[socketMap[socket].pid].cmd;
+		if (!knownExcludeCmdline(command)) {
+			ports.push({ host: ip, port, detail: processMap[socketMap[socket].pid].cmd, pid: socketMap[socket].pid });
+		}
+	});
+	return ports;
+}
+
 export class ExtHostTunnelService extends Disposable implements IExtHostTunnelService {
 	readonly _serviceBrand: undefined;
 	private readonly _proxy: MainThreadTunnelServiceShape;
@@ -42,15 +138,17 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 	private _extensionTunnels: Map<string, Map<number, { tunnel: vscode.Tunnel, disposeListener: IDisposable }>> = new Map();
 	private _onDidChangeTunnels: Emitter<void> = new Emitter<void>();
 	onDidChangeTunnels: vscode.Event<void> = this._onDidChangeTunnels.event;
+	private _candidateFindingEnabled: boolean = false;
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
-		@IExtHostInitDataService initData: IExtHostInitDataService
+		@IExtHostInitDataService initData: IExtHostInitDataService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadTunnelService);
-		if (initData.remote.isRemote && initData.remote.authority) {
-			this.registerCandidateFinder();
+		if (isLinux && initData.remote.isRemote && initData.remote.authority) {
+			this._proxy.$setCandidateFinder();
 		}
 	}
 
@@ -70,18 +168,30 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		return this._proxy.$getTunnels();
 	}
 
-	registerCandidateFinder(): void {
-		// Every two seconds, scan to see if the candidate ports have changed;
-		if (isLinux) {
-			let oldPorts: { host: string, port: number, detail: string }[] | undefined = undefined;
-			setInterval(async () => {
-				const newPorts = await this.findCandidatePorts();
-				if (!oldPorts || (JSON.stringify(oldPorts) !== JSON.stringify(newPorts))) {
-					oldPorts = newPorts;
-					this._proxy.$onFoundNewCandidates(oldPorts.filter(async (candidate) => await this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
-					return;
-				}
-			}, 2000);
+	private calculateDelay(movingAverage: number) {
+		// Some local testing indicated that the moving average might be between 50-100 ms.
+		return Math.max(movingAverage * 20, 2000);
+	}
+
+	async $registerCandidateFinder(enable: boolean): Promise<void> {
+		if (enable && this._candidateFindingEnabled) {
+			// already enabled
+			return;
+		}
+		this._candidateFindingEnabled = enable;
+		// Regularly scan to see if the candidate ports have changed.
+		let movingAverage = new MovingAverage();
+		let oldPorts: { host: string, port: number, detail: string }[] | undefined = undefined;
+		while (this._candidateFindingEnabled) {
+			const startTime = new Date().getTime();
+			const newPorts = await this.findCandidatePorts();
+			const timeTaken = new Date().getTime() - startTime;
+			movingAverage.update(timeTaken);
+			if (!oldPorts || (JSON.stringify(oldPorts) !== JSON.stringify(newPorts))) {
+				oldPorts = newPorts;
+				await this._proxy.$onFoundNewCandidates(oldPorts);
+			}
+			await (new Promise<void>(resolve => setTimeout(() => resolve(), this.calculateDelay(movingAverage.value))));
 		}
 	}
 
@@ -89,15 +199,18 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		if (provider) {
 			if (provider.showCandidatePort) {
 				this._showCandidatePort = provider.showCandidatePort;
+				await this._proxy.$setCandidateFilter();
 			}
 			if (provider.tunnelFactory) {
 				this._forwardPortProvider = provider.tunnelFactory;
-				await this._proxy.$setTunnelProvider();
+				await this._proxy.$setTunnelProvider(provider.tunnelFeatures ?? {
+					elevation: false,
+					public: false
+				});
 			}
 		} else {
 			this._forwardPortProvider = undefined;
 		}
-		await this._proxy.$tunnelServiceReady();
 		return toDisposable(() => {
 			this._forwardPortProvider = undefined;
 		});
@@ -110,7 +223,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 				if (silent) {
 					hostMap.get(remote.port)!.disposeListener.dispose();
 				}
-				hostMap.get(remote.port)!.tunnel.dispose();
+				await hostMap.get(remote.port)!.tunnel.dispose();
 				hostMap.delete(remote.port);
 			}
 		}
@@ -120,31 +233,42 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		this._onDidChangeTunnels.fire();
 	}
 
-	$forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto> | undefined {
+	async $forwardPort(tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<TunnelDto | undefined> {
 		if (this._forwardPortProvider) {
-			const providedPort = this._forwardPortProvider(tunnelOptions, tunnelCreationOptions);
-			if (providedPort !== undefined) {
-				return asPromise(() => providedPort).then(tunnel => {
+			try {
+				this.logService.trace('$forwardPort: Getting tunnel from provider.');
+				const providedPort = this._forwardPortProvider(tunnelOptions, tunnelCreationOptions);
+				this.logService.trace('$forwardPort: Got tunnel promise from provider.');
+				if (providedPort !== undefined) {
+					const tunnel = await providedPort;
+					this.logService.trace('$forwardPort: Successfully awaited tunnel from provider.');
 					if (!this._extensionTunnels.has(tunnelOptions.remoteAddress.host)) {
 						this._extensionTunnels.set(tunnelOptions.remoteAddress.host, new Map());
 					}
 					const disposeListener = this._register(tunnel.onDidDispose(() => this._proxy.$closeTunnel(tunnel.remoteAddress)));
 					this._extensionTunnels.get(tunnelOptions.remoteAddress.host)!.set(tunnelOptions.remoteAddress.port, { tunnel, disposeListener });
-					return Promise.resolve(TunnelDto.fromApiTunnel(tunnel));
-				});
+					return TunnelDto.fromApiTunnel(tunnel);
+				} else {
+					this.logService.trace('$forwardPort: Tunnel is undefined');
+				}
+			} catch (e) {
+				this.logService.trace('$forwardPort: tunnel provider error');
 			}
 		}
 		return undefined;
 	}
 
+	async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
+		const filter = await Promise.all(candidates.map(candidate => this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
+		return candidates.filter((candidate, index) => filter[index]);
+	}
 
-	async findCandidatePorts(): Promise<{ host: string, port: number, detail: string }[]> {
-		const ports: { host: string, port: number, detail: string }[] = [];
+	async findCandidatePorts(): Promise<CandidatePort[]> {
 		let tcp: string = '';
 		let tcp6: string = '';
 		try {
-			tcp = fs.readFileSync('/proc/net/tcp', 'utf8');
-			tcp6 = fs.readFileSync('/proc/net/tcp6', 'utf8');
+			tcp = await pfs.readFile('/proc/net/tcp', 'utf8');
+			tcp6 = await pfs.readFile('/proc/net/tcp6', 'utf8');
 		} catch (e) {
 			// File reading error. No additional handling needed.
 		}
@@ -154,105 +278,24 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 			});
 		}));
 
-		const procChildren = fs.readdirSync('/proc');
-		const processes: { pid: number, cwd: string, cmd: string }[] = [];
+		const procChildren = await pfs.readdir('/proc');
+		const processes: {
+			pid: number, cwd: string, cmd: string
+		}[] = [];
 		for (let childName of procChildren) {
 			try {
 				const pid: number = Number(childName);
 				const childUri = resources.joinPath(URI.file('/proc'), childName);
-				const childStat = fs.statSync(childUri.fsPath);
+				const childStat = await pfs.stat(childUri.fsPath);
 				if (childStat.isDirectory() && !isNaN(pid)) {
-					const cwd = fs.readlinkSync(resources.joinPath(childUri, 'cwd').fsPath);
-					const cmd = fs.readFileSync(resources.joinPath(childUri, 'cmdline').fsPath, 'utf8');
+					const cwd = await promisify(fs.readlink)(resources.joinPath(childUri, 'cwd').fsPath);
+					const cmd = await pfs.readFile(resources.joinPath(childUri, 'cmdline').fsPath, 'utf8');
 					processes.push({ pid, cwd, cmd });
 				}
 			} catch (e) {
 				//
 			}
 		}
-
-		const connections: { socket: number, ip: string, port: number }[] = this.loadListeningPorts(tcp, tcp6);
-		const sockets = this.getSockets(procSockets);
-
-		const socketMap = sockets.reduce((m, socket) => {
-			m[socket.socket] = socket;
-			return m;
-		}, {} as Record<string, typeof sockets[0]>);
-		const processMap = processes.reduce((m, process) => {
-			m[process.pid] = process;
-			return m;
-		}, {} as Record<string, typeof processes[0]>);
-
-		connections.filter((connection => socketMap[connection.socket])).forEach(({ socket, ip, port }) => {
-			const command = processMap[socketMap[socket].pid].cmd;
-			if (!command.match(/.*\.vscode-server-[a-zA-Z]+\/bin.*/) && (command.indexOf('out/vs/server/main.js') === -1)) {
-				ports.push({ host: ip, port, detail: processMap[socketMap[socket].pid].cmd });
-			}
-		});
-
-		return ports;
-	}
-
-	private getSockets(stdout: string): { pid: number, socket: number }[] {
-		const lines = stdout.trim().split('\n');
-		const mapped: { pid: number, socket: number }[] = [];
-		lines.forEach(line => {
-			const match = /\/proc\/(\d+)\/fd\/\d+ -> socket:\[(\d+)\]/.exec(line)!;
-			if (match && match.length >= 3) {
-				mapped.push({
-					pid: parseInt(match[1], 10),
-					socket: parseInt(match[2], 10)
-				});
-			}
-		});
-		return mapped;
-	}
-
-	private loadListeningPorts(...stdouts: string[]): { socket: number, ip: string, port: number }[] {
-		const table = ([] as Record<string, string>[]).concat(...stdouts.map(this.loadConnectionTable));
-		return [
-			...new Map(
-				table.filter(row => row.st === '0A')
-					.map(row => {
-						const address = row.local_address.split(':');
-						return {
-							socket: parseInt(row.inode, 10),
-							ip: this.parseIpAddress(address[0]),
-							port: parseInt(address[1], 16)
-						};
-					}).map(port => [port.ip + ':' + port.port, port])
-			).values()
-		];
-	}
-
-	private parseIpAddress(hex: string): string {
-		let result = '';
-		if (hex.length === 8) {
-			for (let i = hex.length - 2; i >= 0; i -= 2) {
-				result += parseInt(hex.substr(i, 2), 16);
-				if (i !== 0) {
-					result += '.';
-				}
-			}
-		} else {
-			for (let i = hex.length - 4; i >= 0; i -= 4) {
-				result += parseInt(hex.substr(i, 4), 16).toString(16);
-				if (i !== 0) {
-					result += ':';
-				}
-			}
-		}
-		return result;
-	}
-
-	private loadConnectionTable(stdout: string): Record<string, string>[] {
-		const lines = stdout.trim().split('\n');
-		const names = lines.shift()!.trim().split(/\s+/)
-			.filter(name => name !== 'rx_queue' && name !== 'tm->when');
-		const table = lines.map(line => line.trim().split(/\s+/).reduce((obj, value, i) => {
-			obj[names[i] || i] = value;
-			return obj;
-		}, {} as Record<string, string>));
-		return table;
+		return findPorts(tcp, tcp6, procSockets, processes);
 	}
 }
diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts
index 021af6e0f..6ebbb92e4 100644
--- a/src/vs/workbench/api/worker/extHostExtensionService.ts
+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts
@@ -8,10 +8,38 @@ import { ExtensionActivationTimesBuilder } from 'vs/workbench/api/common/extHost
 import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';
 import { URI } from 'vs/base/common/uri';
 import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';
-import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes';
 import { timeout } from 'vs/base/common/async';
 
+namespace TrustedFunction {
+
+	// workaround a chrome issue not allowing to create new functions
+	// see https://github.com/w3c/webappsec-trusted-types/wiki/Trusted-Types-for-function-constructor
+	const ttpTrustedFunction = self.trustedTypes?.createPolicy('TrustedFunctionWorkaround', {
+		createScript: (_, ...args: string[]) => {
+			args.forEach((arg) => {
+				if (!self.trustedTypes?.isScript(arg)) {
+					throw new Error('TrustedScripts only, please');
+				}
+			});
+			// NOTE: This is insecure without parsing the arguments and body,
+			// Malicious inputs  can escape the function body and execute immediately!
+			const fnArgs = args.slice(0, -1).join(',');
+			const fnBody = args.pop()!.toString();
+			const body = `(function anonymous(${fnArgs}) {\n${fnBody}\n})`;
+			return body;
+		}
+	});
+
+	export function create(...args: string[]): Function {
+		if (!ttpTrustedFunction) {
+			return new Function(...args);
+		}
+		return self.eval(ttpTrustedFunction.createScript('', ...args) as unknown as string);
+	}
+}
+
 class WorkerRequireInterceptor extends RequireInterceptor {
 
 	_installInterceptor() { }
@@ -35,6 +63,8 @@ class WorkerRequireInterceptor extends RequireInterceptor {
 export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 	readonly extensionRuntime = ExtensionRuntime.Webworker;
 
+	private static _ttpExtensionScripts = self.trustedTypes?.createPolicy('ExtensionScripts', { createScript: source => source });
+
 	private _fakeModules?: WorkerRequireInterceptor;
 
 	protected async _beforeAlmostReadyToRunExtensions(): Promise<void> {
@@ -42,6 +72,8 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		const apiFactory = this._instaService.invokeFunction(createApiFactoryAndRegisterActors);
 		this._fakeModules = this._instaService.createInstance(WorkerRequireInterceptor, apiFactory, this._registry);
 		await this._fakeModules.install();
+		performance.mark('code/extHost/didInitAPI');
+
 		await this._waitForDebuggerAttachment();
 	}
 
@@ -49,10 +81,16 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		return extensionDescription.browser;
 	}
 
-	protected async _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
+	protected async _loadCommonJSModule<T>(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {
 
 		module = module.with({ path: ensureSuffix(module.path, '.js') });
+		if (extensionId) {
+			performance.mark(`code/extHost/willFetchExtensionCode/${extensionId.value}`);
+		}
 		const response = await fetch(module.toString(true));
+		if (extensionId) {
+			performance.mark(`code/extHost/didFetchExtensionCode/${extensionId.value}`);
+		}
 
 		if (response.status !== 200) {
 			throw new Error(response.statusText);
@@ -63,7 +101,25 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 		// Here we append #vscode-extension to serve as a marker, such that source maps
 		// can be adjusted for the extra wrapping function.
 		const sourceURL = `${module.toString(true)}#vscode-extension`;
-		const initFn = new Function('module', 'exports', 'require', `${source}\n//# sourceURL=${sourceURL}`);
+		const fullSource = `${source}\n//# sourceURL=${sourceURL}`;
+		let initFn: Function;
+		try {
+			initFn = TrustedFunction.create(
+				ExtHostExtensionService._ttpExtensionScripts?.createScript('module') as unknown as string ?? 'module',
+				ExtHostExtensionService._ttpExtensionScripts?.createScript('exports') as unknown as string ?? 'exports',
+				ExtHostExtensionService._ttpExtensionScripts?.createScript('require') as unknown as string ?? 'require',
+				ExtHostExtensionService._ttpExtensionScripts?.createScript(fullSource) as unknown as string ?? fullSource
+			);
+		} catch (err) {
+			if (extensionId) {
+				console.error(`Loading code for extension ${extensionId.value} failed: ${err.message}`);
+			} else {
+				console.error(`Loading code failed: ${err.message}`);
+			}
+			console.error(`${module.toString(true)}${typeof err.line === 'number' ? ` line ${err.line}` : ''}${typeof err.column === 'number' ? ` column ${err.column}` : ''}`);
+			console.error(err);
+			throw err;
+		}
 
 		// define commonjs globals: `module`, `exports`, and `require`
 		const _exports = {};
@@ -78,9 +134,15 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 
 		try {
 			activationTimesBuilder.codeLoadingStart();
+			if (extensionId) {
+				performance.mark(`code/extHost/willLoadExtensionCode/${extensionId.value}`);
+			}
 			initFn(_module, _exports, _require);
 			return <T>(_module.exports !== _exports ? _module.exports : _exports);
 		} finally {
+			if (extensionId) {
+				performance.mark(`code/extHost/didLoadExtensionCode/${extensionId.value}`);
+			}
 			activationTimesBuilder.codeLoadingStop();
 		}
 	}
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index cdd2cdfc3..3515af949 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -8,25 +8,21 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Action } from 'vs/base/common/actions';
 import { SyncActionDescriptor, MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchExtensions, CATEGORIES } from 'vs/workbench/common/actions';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IEditorGroupsService, GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { getMenuBarVisibility } from 'vs/platform/windows/common/windows';
 import { isWindows, isLinux, isWeb } from 'vs/base/common/platform';
 import { IsMacNativeContext } from 'vs/platform/contextkey/common/contextkeys';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { InEditorZenModeContext, IsCenteredLayoutContext, EditorAreaVisibleContext } from 'vs/workbench/common/editor';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { SideBarVisibleContext } from 'vs/workbench/common/viewlet';
-import { IViewDescriptorService, IViewsService, FocusedViewContext, ViewContainerLocation, IViewDescriptor } from 'vs/workbench/common/views';
+import { IViewDescriptorService, IViewsService, FocusedViewContext, ViewContainerLocation, IViewDescriptor, ViewContainerLocationToString } from 'vs/workbench/common/views';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { Codicon } from 'vs/base/common/codicons';
 
 const registry = Registry.as<IWorkbenchActionRegistry>(WorkbenchExtensions.WorkbenchActions);
 
@@ -125,54 +121,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	order: 3
 });
 
-// --- Toggle Editor Layout
-
-export class ToggleEditorLayoutAction extends Action {
-
-	static readonly ID = 'workbench.action.toggleEditorGroupLayout';
-	static readonly LABEL = nls.localize('flipLayout', "Toggle Vertical/Horizontal Editor Layout");
-
-	private readonly toDispose = this._register(new DisposableStore());
-
-	constructor(
-		id: string,
-		label: string,
-		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
-	) {
-		super(id, label);
-
-		this.class = Codicon.editorLayout.classNames;
-		this.updateEnablement();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this.toDispose.add(this.editorGroupService.onDidAddGroup(() => this.updateEnablement()));
-		this.toDispose.add(this.editorGroupService.onDidRemoveGroup(() => this.updateEnablement()));
-	}
-
-	private updateEnablement(): void {
-		this.enabled = this.editorGroupService.count > 1;
-	}
-
-	async run(): Promise<void> {
-		const newOrientation = (this.editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
-		this.editorGroupService.setGroupOrientation(newOrientation);
-	}
-}
-
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleEditorLayoutAction, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Toggle Vertical/Horizontal Editor Layout', CATEGORIES.View.value);
-
-MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-	group: 'z_flip',
-	command: {
-		id: ToggleEditorLayoutAction.ID,
-		title: nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout")
-	},
-	order: 1
-});
-
 // --- Toggle Sidebar Position
 
 export class ToggleSidebarPositionAction extends Action {
@@ -203,7 +151,64 @@ export class ToggleSidebarPositionAction extends Action {
 	}
 }
 
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleSidebarPositionAction), 'View: Toggle Side Bar Position', CATEGORIES.View.value);
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: ToggleSidebarPositionAction.ID,
+			title: { value: nls.localize('toggleSidebarPosition', "Toggle Side Bar Position"), original: 'Toggle Side Bar Position' },
+			category: CATEGORIES.View,
+			f1: true
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		accessor.get(IInstantiationService).createInstance(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.LABEL).run();
+	}
+});
+MenuRegistry.appendMenuItems([{
+	id: MenuId.ViewContainerTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: ToggleSidebarPositionAction.ID,
+			title: nls.localize('move sidebar right', "Move Side Bar Right")
+		},
+		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 1
+	}
+}, {
+	id: MenuId.ViewTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: ToggleSidebarPositionAction.ID,
+			title: nls.localize('move sidebar right', "Move Side Bar Right")
+		},
+		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 1
+	}
+}, {
+	id: MenuId.ViewContainerTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: ToggleSidebarPositionAction.ID,
+			title: nls.localize('move sidebar left', "Move Side Bar Left")
+		},
+		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 1
+	}
+}, {
+	id: MenuId.ViewTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: ToggleSidebarPositionAction.ID,
+			title: nls.localize('move sidebar left', "Move Side Bar Left")
+		},
+		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 1
+	}
+}]);
 
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '3_workbench_layout_move',
@@ -256,27 +261,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	order: 5
 });
 
-export class ToggleSidebarVisibilityAction extends Action {
-
-	static readonly ID = 'workbench.action.toggleSidebarVisibility';
-	static readonly LABEL = nls.localize('toggleSidebar', "Toggle Side Bar Visibility");
-
-	constructor(
-		id: string,
-		label: string,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
-	) {
-		super(id, label);
-	}
-
-	async run(): Promise<void> {
-		const hideSidebar = this.layoutService.isVisible(Parts.SIDEBAR_PART);
-		this.layoutService.setSideBarHidden(hideSidebar);
-	}
-}
-
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleSidebarVisibilityAction, { primary: KeyMod.CtrlCmd | KeyCode.KEY_B }), 'View: Toggle Side Bar Visibility', CATEGORIES.View.value);
-
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
 	group: '2_appearance',
 	title: nls.localize({ key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance"),
@@ -284,10 +268,53 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
 	order: 1
 });
 
+export const TOGGLE_SIDEBAR_VISIBILITY_ACTION_ID = 'workbench.action.toggleSidebarVisibility';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: TOGGLE_SIDEBAR_VISIBILITY_ACTION_ID,
+			title: { value: nls.localize('toggleSidebar', "Toggle Side Bar Visibility"), original: 'Toggle Side Bar Visibility' },
+			category: CATEGORIES.View,
+			f1: true,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KEY_B
+			}
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		const layoutService = accessor.get(IWorkbenchLayoutService);
+		layoutService.setSideBarHidden(layoutService.isVisible(Parts.SIDEBAR_PART));
+	}
+});
+MenuRegistry.appendMenuItems([{
+	id: MenuId.ViewContainerTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: TOGGLE_SIDEBAR_VISIBILITY_ACTION_ID,
+			title: nls.localize('compositePart.hideSideBarLabel', "Hide Side Bar"),
+		},
+		when: ContextKeyExpr.and(SideBarVisibleContext, ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 2
+	}
+}, {
+	id: MenuId.ViewTitleContext,
+	item: {
+		group: '3_workbench_layout_move',
+		command: {
+			id: TOGGLE_SIDEBAR_VISIBILITY_ACTION_ID,
+			title: nls.localize('compositePart.hideSideBarLabel', "Hide Side Bar"),
+		},
+		when: ContextKeyExpr.and(SideBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
+		order: 2
+	}
+}]);
+
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 	group: '2_workbench_layout',
 	command: {
-		id: ToggleSidebarVisibilityAction.ID,
+		id: TOGGLE_SIDEBAR_VISIBILITY_ACTION_ID,
 		title: nls.localize({ key: 'miShowSidebar', comment: ['&& denotes a mnemonic'] }, "Show &&Side Bar"),
 		toggled: SideBarVisibleContext
 	},
@@ -413,32 +440,16 @@ export class ToggleMenuBarAction extends Action {
 	static readonly ID = 'workbench.action.toggleMenuBar';
 	static readonly LABEL = nls.localize('toggleMenuBar', "Toggle Menu Bar");
 
-	private static readonly menuBarVisibilityKey = 'window.menuBarVisibility';
-
 	constructor(
 		id: string,
 		label: string,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
 	) {
 		super(id, label);
 	}
 
-	run(): Promise<void> {
-		let currentVisibilityValue = getMenuBarVisibility(this.configurationService);
-		if (typeof currentVisibilityValue !== 'string') {
-			currentVisibilityValue = 'default';
-		}
-
-		let newVisibilityValue: string;
-		if (currentVisibilityValue === 'visible' || currentVisibilityValue === 'default') {
-			newVisibilityValue = 'toggle';
-		} else if (currentVisibilityValue === 'compact') {
-			newVisibilityValue = 'hidden';
-		} else {
-			newVisibilityValue = (isWeb && currentVisibilityValue === 'hidden') ? 'compact' : 'default';
-		}
-
-		return this.configurationService.updateValue(ToggleMenuBarAction.menuBarVisibilityKey, newVisibilityValue, ConfigurationTarget.USER);
+	async run(): Promise<void> {
+		this.layoutService.toggleMenuBar();
 	}
 }
 
@@ -479,19 +490,18 @@ export class ResetViewLocationsAction extends Action {
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ResetViewLocationsAction), 'View: Reset View Locations', CATEGORIES.View.value);
 
 // --- Toggle View with Command
-export abstract class ToggleViewAction extends Action {
+export class ToggleViewAction extends Action {
 
 	constructor(
 		id: string,
 		label: string,
 		private readonly viewId: string,
-		protected viewsService: IViewsService,
-		protected viewDescriptorService: IViewDescriptorService,
-		protected contextKeyService: IContextKeyService,
-		private layoutService: IWorkbenchLayoutService,
-		cssClass?: string
+		@IViewsService protected viewsService: IViewsService,
+		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
+		@IContextKeyService protected contextKeyService: IContextKeyService,
+		@IWorkbenchLayoutService private layoutService: IWorkbenchLayoutService,
 	) {
-		super(id, label, cssClass);
+		super(id, label);
 	}
 
 	async run(): Promise<void> {
diff --git a/src/vs/workbench/browser/actions/navigationActions.ts b/src/vs/workbench/browser/actions/navigationActions.ts
index 5833c3291..20accba76 100644
--- a/src/vs/workbench/browser/actions/navigationActions.ts
+++ b/src/vs/workbench/browser/actions/navigationActions.ts
@@ -17,7 +17,6 @@ import { IWorkbenchActionRegistry, Extensions, CATEGORIES } from 'vs/workbench/c
 import { Direction } from 'vs/base/browser/ui/grid/grid';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { isAncestor } from 'vs/base/browser/dom';
 
 abstract class BaseNavigationAction extends Action {
 
@@ -215,7 +214,8 @@ function findVisibleNeighbour(layoutService: IWorkbenchLayoutService, part: Part
 }
 
 function focusNextOrPreviousPart(layoutService: IWorkbenchLayoutService, editorService: IEditorService, next: boolean): void {
-	const currentlyFocusedPart = isActiveElementInNotebookEditor(editorService) ? Parts.EDITOR_PART : layoutService.hasFocus(Parts.EDITOR_PART) ? Parts.EDITOR_PART : layoutService.hasFocus(Parts.ACTIVITYBAR_PART) ? Parts.ACTIVITYBAR_PART :
+	const editorFocused = editorService.activeEditorPane?.hasFocus();
+	const currentlyFocusedPart = editorFocused ? Parts.EDITOR_PART : layoutService.hasFocus(Parts.ACTIVITYBAR_PART) ? Parts.ACTIVITYBAR_PART :
 		layoutService.hasFocus(Parts.STATUSBAR_PART) ? Parts.STATUSBAR_PART : layoutService.hasFocus(Parts.SIDEBAR_PART) ? Parts.SIDEBAR_PART : layoutService.hasFocus(Parts.PANEL_PART) ? Parts.PANEL_PART : undefined;
 	let partToFocus = Parts.EDITOR_PART;
 	if (currentlyFocusedPart) {
@@ -225,17 +225,6 @@ function focusNextOrPreviousPart(layoutService: IWorkbenchLayoutService, editorS
 	layoutService.focusPart(partToFocus);
 }
 
-function isActiveElementInNotebookEditor(editorService: IEditorService): boolean {
-	const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
-	if (activeEditorPane?.isNotebookEditor) {
-		const control = editorService.activeEditorPane?.getControl() as { getDomNode(): HTMLElement; getOverflowContainerDomNode(): HTMLElement; };
-		const activeElement = document.activeElement;
-		return isAncestor(activeElement, control.getDomNode()) || isAncestor(activeElement, control.getOverflowContainerDomNode());
-	}
-
-	return false;
-}
-
 export class FocusNextPart extends Action {
 	static readonly ID = 'workbench.action.focusNextPart';
 	static readonly LABEL = nls.localize('focusNextPart', "Focus Next Part");
diff --git a/src/vs/workbench/browser/actions/textInputActions.ts b/src/vs/workbench/browser/actions/textInputActions.ts
index 8b63f052b..606099d23 100644
--- a/src/vs/workbench/browser/actions/textInputActions.ts
+++ b/src/vs/workbench/browser/actions/textInputActions.ts
@@ -76,23 +76,26 @@ export class TextInputActionsProvider extends Disposable implements IWorkbenchCo
 
 		// Context menu support in input/textarea
 		this.layoutService.container.addEventListener('contextmenu', e => this.onContextMenu(e));
-
 	}
 
 	private onContextMenu(e: MouseEvent): void {
-		if (e.target instanceof HTMLElement) {
-			const target = <HTMLElement>e.target;
-			if (target.nodeName && (target.nodeName.toLowerCase() === 'input' || target.nodeName.toLowerCase() === 'textarea')) {
-				EventHelper.stop(e, true);
-
-				this.contextMenuService.showContextMenu({
-					getAnchor: () => e,
-					getActions: () => this.textInputActions,
-					getActionsContext: () => target,
-					onHide: () => target.focus() // fixes https://github.com/microsoft/vscode/issues/52948
-				});
-			}
+		if (e.defaultPrevented) {
+			return; // make sure to not show these actions by accident if component indicated to prevent
 		}
+
+		const target = e.target;
+		if (!(target instanceof HTMLElement) || (target.nodeName.toLowerCase() !== 'input' && target.nodeName.toLowerCase() !== 'textarea')) {
+			return; // only for inputs or textareas
+		}
+
+		EventHelper.stop(e, true);
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => e,
+			getActions: () => this.textInputActions,
+			getActionsContext: () => target,
+			onHide: () => target.focus() // fixes https://github.com/microsoft/vscode/issues/52948
+		});
 	}
 }
 
diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts
index e5fdcdbca..926527871 100644
--- a/src/vs/workbench/browser/actions/windowActions.ts
+++ b/src/vs/workbench/browser/actions/windowActions.ts
@@ -33,7 +33,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { Codicon } from 'vs/base/common/codicons';
 import { isHTMLElement } from 'vs/base/browser/dom';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 export const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
 
@@ -49,12 +49,17 @@ abstract class BaseOpenRecentAction extends Action {
 		tooltip: nls.localize('remove', "Remove from Recently Opened")
 	};
 
-	private readonly dirtyRecentlyOpened: IQuickInputButton = {
+	private readonly dirtyRecentlyOpenedFolder: IQuickInputButton = {
 		iconClass: 'dirty-workspace ' + Codicon.closeDirty.classNames,
-		tooltip: nls.localize('dirtyRecentlyOpened', "Workspace With Dirty Files"),
+		tooltip: nls.localize('dirtyRecentlyOpenedFolder', "Folder With Unsaved Files"),
 		alwaysVisible: true
 	};
 
+	private readonly dirtyRecentlyOpenedWorkspace: IQuickInputButton = {
+		...this.dirtyRecentlyOpenedFolder,
+		tooltip: nls.localize('dirtyRecentlyOpenedWorkspace', "Workspace With Unsaved Files"),
+	};
+
 	constructor(
 		id: string,
 		label: string,
@@ -77,7 +82,9 @@ abstract class BaseOpenRecentAction extends Action {
 		const recentlyOpened = await this.workspacesService.getRecentlyOpened();
 		const dirtyWorkspacesAndFolders = await this.workspacesService.getDirtyWorkspaces();
 
-		// Identify all folders and workspaces with dirty files
+		let hasWorkspaces = false;
+
+		// Identify all folders and workspaces with unsaved files
 		const dirtyFolders = new ResourceMap<boolean>();
 		const dirtyWorkspaces = new ResourceMap<IWorkspaceIdentifier>();
 		for (const dirtyWorkspace of dirtyWorkspacesAndFolders) {
@@ -85,6 +92,7 @@ abstract class BaseOpenRecentAction extends Action {
 				dirtyFolders.set(dirtyWorkspace, true);
 			} else {
 				dirtyWorkspaces.set(dirtyWorkspace.configPath, dirtyWorkspace);
+				hasWorkspaces = true;
 			}
 		}
 
@@ -96,6 +104,7 @@ abstract class BaseOpenRecentAction extends Action {
 				recentFolders.set(recent.folderUri, true);
 			} else {
 				recentWorkspaces.set(recent.workspace.configPath, recent.workspace);
+				hasWorkspaces = true;
 			}
 		}
 
@@ -124,7 +133,7 @@ abstract class BaseOpenRecentAction extends Action {
 
 		let keyMods: IKeyMods | undefined;
 
-		const workspaceSeparator: IQuickPickSeparator = { type: 'separator', label: nls.localize('workspaces', "workspaces") };
+		const workspaceSeparator: IQuickPickSeparator = { type: 'separator', label: hasWorkspaces ? nls.localize('workspacesAndFolders', "folders & workspaces") : nls.localize('folders', "folders") };
 		const fileSeparator: IQuickPickSeparator = { type: 'separator', label: nls.localize('files', "files") };
 		const picks = [workspaceSeparator, ...workspacePicks, fileSeparator, ...filePicks];
 
@@ -143,13 +152,14 @@ abstract class BaseOpenRecentAction extends Action {
 					context.removeItem();
 				}
 
-				// Dirty Workspace
-				else if (context.button === this.dirtyRecentlyOpened) {
+				// Dirty Folder/Workspace
+				else if (context.button === this.dirtyRecentlyOpenedFolder || context.button === this.dirtyRecentlyOpenedWorkspace) {
+					const isDirtyWorkspace = context.button === this.dirtyRecentlyOpenedWorkspace;
 					const result = await this.dialogService.confirm({
 						type: 'question',
-						title: nls.localize('dirtyWorkspace', "Workspace with Dirty Files"),
-						message: nls.localize('dirtyWorkspaceConfirm', "Do you want to open the workspace to review the dirty files?"),
-						detail: nls.localize('dirtyWorkspaceConfirmDetail', "Workspaces with dirty files cannot be removed until all dirty files have been saved or reverted.")
+						title: isDirtyWorkspace ? nls.localize('dirtyWorkspace', "Workspace with Unsaved Files") : nls.localize('dirtyFolder', "Folder with Unsaved Files"),
+						message: isDirtyWorkspace ? nls.localize('dirtyWorkspaceConfirm', "Do you want to open the workspace to review the unsaved files?") : nls.localize('dirtyFolderConfirm', "Do you want to open the folder to review the unsaved files?"),
+						detail: isDirtyWorkspace ? nls.localize('dirtyWorkspaceConfirmDetail', "Workspaces with unsaved files cannot be removed until all unsaved files have been saved or reverted.") : nls.localize('dirtyFolderConfirmDetail', "Folders with unsaved files cannot be removed until all unsaved files have been saved or reverted.")
 					});
 
 					if (result.confirmed) {
@@ -170,6 +180,7 @@ abstract class BaseOpenRecentAction extends Action {
 		let iconClasses: string[];
 		let fullLabel: string | undefined;
 		let resource: URI | undefined;
+		let isWorkspace = false;
 
 		// Folder
 		if (isRecentFolder(recent)) {
@@ -185,6 +196,7 @@ abstract class BaseOpenRecentAction extends Action {
 			iconClasses = getIconClasses(this.modelService, this.modeService, resource, FileKind.ROOT_FOLDER);
 			openable = { workspaceUri: resource };
 			fullLabel = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: true });
+			isWorkspace = true;
 		}
 
 		// File
@@ -200,9 +212,9 @@ abstract class BaseOpenRecentAction extends Action {
 		return {
 			iconClasses,
 			label: name,
-			ariaLabel: isDirty ? nls.localize('recentDirtyAriaLabel', "{0}, dirty workspace", name) : name,
+			ariaLabel: isDirty ? isWorkspace ? nls.localize('recentDirtyWorkspaceAriaLabel', "{0}, workspace with unsaved changes", name) : nls.localize('recentDirtyFolderAriaLabel', "{0}, folder with unsaved changes", name) : name,
 			description: parentPath,
-			buttons: isDirty ? [this.dirtyRecentlyOpened] : [this.removeFromRecentlyOpened],
+			buttons: isDirty ? [isWorkspace ? this.dirtyRecentlyOpenedWorkspace : this.dirtyRecentlyOpenedFolder] : [this.removeFromRecentlyOpened],
 			openable,
 			resource
 		};
@@ -405,7 +417,7 @@ CommandsRegistry.registerCommand('workbench.action.toggleConfirmBeforeClose', ac
 	const configurationService = accessor.get(IConfigurationService);
 	const setting = configurationService.inspect<'always' | 'keyboardOnly' | 'never'>('window.confirmBeforeClose').userValue;
 
-	return configurationService.updateValue('window.confirmBeforeClose', setting === 'never' ? 'keyboardOnly' : 'never', ConfigurationTarget.USER);
+	return configurationService.updateValue('window.confirmBeforeClose', setting === 'never' ? 'keyboardOnly' : 'never');
 });
 
 // --- Menu Registration
diff --git a/src/vs/workbench/browser/actions/workspaceActions.ts b/src/vs/workbench/browser/actions/workspaceActions.ts
index b73573760..ea67ce4c5 100644
--- a/src/vs/workbench/browser/actions/workspaceActions.ts
+++ b/src/vs/workbench/browser/actions/workspaceActions.ts
@@ -114,7 +114,7 @@ export class CloseWorkspaceAction extends Action {
 
 	async run(): Promise<void> {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			this.notificationService.info(nls.localize('noWorkspaceOpened', "There is currently no workspace opened in this instance to close."));
+			this.notificationService.info(nls.localize('noWorkspaceOrFolderOpened', "There is currently no workspace or folder opened in this instance to close."));
 			return;
 		}
 
@@ -225,7 +225,7 @@ export class SaveWorkspaceAsAction extends Action {
 export class DuplicateWorkspaceInNewWindowAction extends Action {
 
 	static readonly ID = 'workbench.action.duplicateWorkspaceInNewWindow';
-	static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate Workspace in New Window");
+	static readonly LABEL = nls.localize('duplicateWorkspaceInNewWindow', "Duplicate As Workspace in New Window");
 
 	constructor(
 		id: string,
@@ -259,7 +259,7 @@ registry.registerWorkbenchAction(SyncActionDescriptor.from(AddRootFolderAction),
 registry.registerWorkbenchAction(SyncActionDescriptor.from(GlobalRemoveRootFolderAction), 'Workspaces: Remove Folder from Workspace...', workspacesCategory);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(CloseWorkspaceAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_F) }), 'Workspaces: Close Workspace', workspacesCategory, EmptyWorkspaceSupportContext);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(SaveWorkspaceAsAction), 'Workspaces: Save Workspace As...', workspacesCategory, EmptyWorkspaceSupportContext);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateWorkspaceInNewWindowAction), 'Workspaces: Duplicate Workspace in New Window', workspacesCategory);
+registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateWorkspaceInNewWindowAction), 'Workspaces: Duplicate As Workspace in New Window', workspacesCategory);
 
 // --- Menu Registration
 
diff --git a/src/vs/workbench/browser/parts/editor/editorWidgets.ts b/src/vs/workbench/browser/codeeditor.ts
similarity index 60%
rename from src/vs/workbench/browser/parts/editor/editorWidgets.ts
rename to src/vs/workbench/browser/codeeditor.ts
index 02601bc97..7bcac2ca0 100644
--- a/src/vs/workbench/browser/parts/editor/editorWidgets.ts
+++ b/src/vs/workbench/browser/codeeditor.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Widget } from 'vs/base/browser/ui/widget';
-import { IOverlayWidget, ICodeEditor, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
+import { IOverlayWidget, ICodeEditor, IOverlayWidgetPosition, OverlayWidgetPositionPreference, isCodeEditor, isCompositeEditor } from 'vs/editor/browser/editorBrowser';
 import { Emitter } from 'vs/base/common/event';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -15,11 +15,121 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
-import { Disposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { isEqual } from 'vs/base/common/resources';
 import { IFileService } from 'vs/platform/files/common/files';
+import { URI } from 'vs/base/common/uri';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IRange } from 'vs/editor/common/core/range';
+import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { TrackedRangeStickiness, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
+
+export interface IRangeHighlightDecoration {
+	resource: URI;
+	range: IRange;
+	isWholeLine?: boolean;
+}
+
+export class RangeHighlightDecorations extends Disposable {
+
+	private readonly _onHighlightRemoved = this._register(new Emitter<void>());
+	readonly onHighlightRemoved = this._onHighlightRemoved.event;
+
+	private rangeHighlightDecorationId: string | null = null;
+	private editor: ICodeEditor | null = null;
+	private readonly editorDisposables = this._register(new DisposableStore());
+
+	constructor(@IEditorService private readonly editorService: IEditorService) {
+		super();
+	}
+
+	removeHighlightRange() {
+		if (this.editor && this.editor.getModel() && this.rangeHighlightDecorationId) {
+			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
+			this._onHighlightRemoved.fire();
+		}
+
+		this.rangeHighlightDecorationId = null;
+	}
+
+	highlightRange(range: IRangeHighlightDecoration, editor?: any) {
+		editor = editor ?? this.getEditor(range);
+		if (isCodeEditor(editor)) {
+			this.doHighlightRange(editor, range);
+		} else if (isCompositeEditor(editor) && isCodeEditor(editor.activeCodeEditor)) {
+			this.doHighlightRange(editor.activeCodeEditor, range);
+		}
+	}
+
+	private doHighlightRange(editor: ICodeEditor, selectionRange: IRangeHighlightDecoration) {
+		this.removeHighlightRange();
+
+		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
+			this.rangeHighlightDecorationId = changeAccessor.addDecoration(selectionRange.range, this.createRangeHighlightDecoration(selectionRange.isWholeLine));
+		});
+
+		this.setEditor(editor);
+	}
+
+	private getEditor(resourceRange: IRangeHighlightDecoration): ICodeEditor | undefined {
+		const activeEditor = this.editorService.activeEditor;
+		const resource = activeEditor && activeEditor.resource;
+		if (resource && isEqual(resource, resourceRange.resource)) {
+			return this.editorService.activeTextEditorControl as ICodeEditor;
+		}
+
+		return undefined;
+	}
+
+	private setEditor(editor: ICodeEditor) {
+		if (this.editor !== editor) {
+			this.editorDisposables.clear();
+			this.editor = editor;
+			this.editorDisposables.add(this.editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
+				if (
+					e.reason === CursorChangeReason.NotSet
+					|| e.reason === CursorChangeReason.Explicit
+					|| e.reason === CursorChangeReason.Undo
+					|| e.reason === CursorChangeReason.Redo
+				) {
+					this.removeHighlightRange();
+				}
+			}));
+			this.editorDisposables.add(this.editor.onDidChangeModel(() => { this.removeHighlightRange(); }));
+			this.editorDisposables.add(this.editor.onDidDispose(() => {
+				this.removeHighlightRange();
+				this.editor = null;
+			}));
+		}
+	}
+
+	private static readonly _WHOLE_LINE_RANGE_HIGHLIGHT = ModelDecorationOptions.register({
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		className: 'rangeHighlight',
+		isWholeLine: true
+	});
+
+	private static readonly _RANGE_HIGHLIGHT = ModelDecorationOptions.register({
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		className: 'rangeHighlight'
+	});
+
+	private createRangeHighlightDecoration(isWholeLine: boolean = true): ModelDecorationOptions {
+		return (isWholeLine ? RangeHighlightDecorations._WHOLE_LINE_RANGE_HIGHLIGHT : RangeHighlightDecorations._RANGE_HIGHLIGHT);
+	}
+
+	dispose() {
+		super.dispose();
+
+		if (this.editor && this.editor.getModel()) {
+			this.removeHighlightRange();
+			this.editor = null;
+		}
+	}
+}
 
 export class FloatingClickWidget extends Widget implements IOverlayWidget {
 
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index 16f7cf463..c0087e858 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -56,15 +56,26 @@ export abstract class Composite extends Component implements IComposite {
 		return this._onDidBlur.event;
 	}
 
+	private _hasFocus = false;
+	hasFocus(): boolean {
+		return this._hasFocus;
+	}
+
 	private registerFocusTrackEvents(): { onDidFocus: Emitter<void>, onDidBlur: Emitter<void> } {
 		const container = assertIsDefined(this.getContainer());
 		const focusTracker = this._register(trackFocus(container));
 
 		const onDidFocus = this._onDidFocus = this._register(new Emitter<void>());
-		this._register(focusTracker.onDidFocus(() => onDidFocus.fire()));
+		this._register(focusTracker.onDidFocus(() => {
+			this._hasFocus = true;
+			onDidFocus.fire();
+		}));
 
 		const onDidBlur = this._onDidBlur = this._register(new Emitter<void>());
-		this._register(focusTracker.onDidBlur(() => onDidBlur.fire()));
+		this._register(focusTracker.onDidBlur(() => {
+			this._hasFocus = false;
+			onDidBlur.fire();
+		}));
 
 		return { onDidFocus, onDidBlur };
 	}
@@ -234,7 +245,6 @@ export abstract class CompositeDescriptor<T extends Composite> {
 		readonly cssClass?: string,
 		readonly order?: number,
 		readonly requestedIndex?: number,
-		readonly keybindingId?: string,
 	) { }
 
 	instantiate(instantiationService: IInstantiationService): T {
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
index 10e7b53ef..833ec2215 100644
--- a/src/vs/workbench/browser/contextkeys.ts
+++ b/src/vs/workbench/browser/contextkeys.ts
@@ -17,7 +17,7 @@ import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/
 import { SideBarVisibleContext } from 'vs/workbench/common/viewlet';
 import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { PanelPositionContext } from 'vs/workbench/common/panel';
+import { PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from 'vs/workbench/common/panel';
 import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { isNative } from 'vs/base/common/platform';
@@ -64,6 +64,8 @@ export class WorkbenchContextKeysHandler extends Disposable {
 	private sideBarVisibleContext: IContextKey<boolean>;
 	private editorAreaVisibleContext: IContextKey<boolean>;
 	private panelPositionContext: IContextKey<string>;
+	private panelVisibleContext: IContextKey<boolean>;
+	private panelMaximizedContext: IContextKey<boolean>;
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
@@ -146,9 +148,13 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		// Sidebar
 		this.sideBarVisibleContext = SideBarVisibleContext.bindTo(this.contextKeyService);
 
-		// Panel Position
+		// Panel
 		this.panelPositionContext = PanelPositionContext.bindTo(this.contextKeyService);
 		this.panelPositionContext.set(positionToString(this.layoutService.getPanelPosition()));
+		this.panelVisibleContext = PanelVisibleContext.bindTo(this.contextKeyService);
+		this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
+		this.panelMaximizedContext = PanelMaximizedContext.bindTo(this.contextKeyService);
+		this.panelMaximizedContext.set(this.layoutService.isPanelMaximized());
 
 		this.registerListeners();
 	}
@@ -182,7 +188,11 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		this._register(this.viewletService.onDidViewletClose(() => this.updateSideBarContextKeys()));
 		this._register(this.viewletService.onDidViewletOpen(() => this.updateSideBarContextKeys()));
 
-		this._register(this.layoutService.onPartVisibilityChange(() => this.editorAreaVisibleContext.set(this.layoutService.isVisible(Parts.EDITOR_PART))));
+		this._register(this.layoutService.onPartVisibilityChange(() => {
+			this.editorAreaVisibleContext.set(this.layoutService.isVisible(Parts.EDITOR_PART));
+			this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
+			this.panelMaximizedContext.set(this.layoutService.isPanelMaximized());
+		}));
 
 		this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.dirtyWorkingCopiesContext.set(workingCopy.isDirty() || this.workingCopyService.hasDirty)));
 	}
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index baab13434..962b92b73 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -737,7 +737,7 @@ export class CompositeDragAndDropObserver extends Disposable {
 		if (callbacks.onDragEnd) {
 			this._onDragEnd.event(e => {
 				callbacks.onDragEnd!(e);
-			});
+			}, this, disposableStore);
 		}
 		return this._register(disposableStore);
 	}
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
index 5df3e69fd..fd865714e 100644
--- a/src/vs/workbench/browser/editor.ts
+++ b/src/vs/workbench/browser/editor.ts
@@ -12,7 +12,6 @@ import { insert } from 'vs/base/common/arrays';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 
 export interface IEditorDescriptor {
-
 	getId(): string;
 	getName(): string;
 
diff --git a/src/vs/workbench/browser/labels.ts b/src/vs/workbench/browser/labels.ts
index 5984484d2..a4729a6bf 100644
--- a/src/vs/workbench/browser/labels.ts
+++ b/src/vs/workbench/browser/labels.ts
@@ -100,6 +100,10 @@ export const DEFAULT_LABELS_CONTAINER: IResourceLabelsContainer = {
 };
 
 export class ResourceLabels extends Disposable {
+
+	private _onDidChangeDecorations = this._register(new Emitter<void>());
+	readonly onDidChangeDecorations = this._onDidChangeDecorations.event;
+
 	private widgets: ResourceLabelWidget[] = [];
 	private labels: IResourceLabel[] = [];
 
@@ -148,7 +152,18 @@ export class ResourceLabels extends Disposable {
 		}));
 
 		// notify when file decoration changes
-		this._register(this.decorationsService.onDidChangeDecorations(e => this.widgets.forEach(widget => widget.notifyFileDecorationsChanges(e))));
+		this._register(this.decorationsService.onDidChangeDecorations(e => {
+			let notifyDidChangeDecorations = false;
+			this.widgets.forEach(widget => {
+				if (widget.notifyFileDecorationsChanges(e)) {
+					notifyDidChangeDecorations = true;
+				}
+			});
+
+			if (notifyDidChangeDecorations) {
+				this._onDidChangeDecorations.fire();
+			}
+		}));
 
 		// notify when theme changes
 		this._register(this.themeService.onDidColorThemeChange(() => this.widgets.forEach(widget => widget.notifyThemeChange())));
@@ -311,19 +326,21 @@ class ResourceLabelWidget extends IconLabel {
 		}
 	}
 
-	notifyFileDecorationsChanges(e: IResourceDecorationChangeEvent): void {
+	notifyFileDecorationsChanges(e: IResourceDecorationChangeEvent): boolean {
 		if (!this.options) {
-			return;
+			return false;
 		}
 
 		const resource = toResource(this.label);
 		if (!resource) {
-			return;
+			return false;
 		}
 
 		if (this.options.fileDecorations && e.affectsResource(resource)) {
-			this.render(false);
+			return this.render(false);
 		}
+
+		return false;
 	}
 
 	notifyExtensionsRegistered(): void {
@@ -465,7 +482,7 @@ class ResourceLabelWidget extends IconLabel {
 		this.setLabel('');
 	}
 
-	private render(clearIconCache: boolean): void {
+	private render(clearIconCache: boolean): boolean {
 		if (this.isHidden) {
 			if (!this.needsRedraw) {
 				this.needsRedraw = clearIconCache ? Redraw.Full : Redraw.Basic;
@@ -475,7 +492,7 @@ class ResourceLabelWidget extends IconLabel {
 				this.needsRedraw = Redraw.Full;
 			}
 
-			return;
+			return false;
 		}
 
 		if (this.label) {
@@ -492,7 +509,7 @@ class ResourceLabelWidget extends IconLabel {
 		}
 
 		if (!this.label) {
-			return;
+			return false;
 		}
 
 		this.renderDisposables.clear();
@@ -558,6 +575,8 @@ class ResourceLabelWidget extends IconLabel {
 		this.setLabel(label || '', this.label.description, iconLabelOptions);
 
 		this._onDidRender.fire();
+
+		return true;
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 460594ee0..1fe5aa621 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -78,7 +78,9 @@ enum Storage {
 
 	GRID_LAYOUT = 'workbench.grid.layout',
 	GRID_WIDTH = 'workbench.grid.width',
-	GRID_HEIGHT = 'workbench.grid.height'
+	GRID_HEIGHT = 'workbench.grid.height',
+
+	MENU_VISIBILITY = 'window.menuBarVisibility'
 }
 
 enum Classes {
@@ -321,9 +323,12 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			if (this.state.fullscreen && (this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default')) {
 				// Propagate to grid
 				this.workbenchGrid.setViewVisible(this.titleBarPartView, this.isVisible(Parts.TITLEBAR_PART));
-
-				this.layout();
 			}
+
+			// Move layout call to any time the menubar
+			// is toggled to update consumers of offset
+			// see issue #115267
+			this.layout();
 		}
 	}
 
@@ -622,7 +627,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		return this._openedDefaultEditors;
 	}
 
-	private getInitialFilesToOpen(): { filesToOpenOrCreate?: IPath[], filesToDiff?: IPath[] } | undefined {
+	private getInitialFilesToOpen(): { filesToOpenOrCreate?: IPath[], filesToDiff?: IPath[]; } | undefined {
 		const defaultLayout = this.environmentService.options?.defaultLayout;
 		if (defaultLayout?.editors?.length && this.storageService.isNew(StorageScope.WORKSPACE)) {
 			this._openedDefaultEditors = true;
@@ -652,7 +657,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Restore editors
 		restorePromises.push((async () => {
-			mark('willRestoreEditors');
+			mark('code/willRestoreEditors');
 
 			// first ensure the editor part is restored
 			await this.editorGroupService.whenRestored;
@@ -669,17 +674,17 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				await this.editorService.openEditors(editors);
 			}
 
-			mark('didRestoreEditors');
+			mark('code/didRestoreEditors');
 		})());
 
 		// Restore default views
 		const restoreDefaultViewsPromise = (async () => {
 			if (this.state.views.defaults?.length) {
-				mark('willOpenDefaultViews');
+				mark('code/willOpenDefaultViews');
 
-				let locationsRestored: { id: string; order: number }[] = [];
+				let locationsRestored: { id: string; order: number; }[] = [];
 
-				const tryOpenView = (view: { id: string; order: number }): boolean => {
+				const tryOpenView = (view: { id: string; order: number; }): boolean => {
 					const location = this.viewDescriptorService.getViewLocationById(view.id);
 					if (location !== null) {
 						const container = this.viewDescriptorService.getViewContainerByViewId(view.id);
@@ -733,7 +738,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 					this.state.panel.panelToRestore = locationsRestored[ViewContainerLocation.Panel].id;
 				}
 
-				mark('didOpenDefaultViews');
+				mark('code/didOpenDefaultViews');
 			}
 		})();
 		restorePromises.push(restoreDefaultViewsPromise);
@@ -748,14 +753,14 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				return;
 			}
 
-			mark('willRestoreViewlet');
+			mark('code/willRestoreViewlet');
 
 			const viewlet = await this.viewletService.openViewlet(this.state.sideBar.viewletToRestore);
 			if (!viewlet) {
 				await this.viewletService.openViewlet(this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id); // fallback to default viewlet as needed
 			}
 
-			mark('didRestoreViewlet');
+			mark('code/didRestoreViewlet');
 		})());
 
 		// Restore Panel
@@ -768,14 +773,14 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				return;
 			}
 
-			mark('willRestorePanel');
+			mark('code/willRestorePanel');
 
 			const panel = await this.panelService.openPanel(this.state.panel.panelToRestore!);
 			if (!panel) {
 				await this.panelService.openPanel(Registry.as<PanelRegistry>(PanelExtensions.Panels).getDefaultPanelId()); // fallback to default panel as needed
 			}
 
-			mark('didRestorePanel');
+			mark('code/didRestorePanel');
 		})());
 
 		// Restore Zen Mode
@@ -1128,7 +1133,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			[Parts.STATUSBAR_PART]: this.statusBarPartView
 		};
 
-		const fromJSON = ({ type }: { type: Parts }) => viewMap[type];
+		const fromJSON = ({ type }: { type: Parts; }) => viewMap[type];
 		const workbenchGrid = SerializableGrid.deserialize(
 			this.createGridDescriptor(),
 			{ fromJSON },
@@ -1410,7 +1415,29 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// If panel part becomes visible, show last active panel or default panel
 		else if (!hidden && !this.panelService.getActivePanel()) {
-			const panelToOpen = this.panelService.getLastActivePanelId();
+			let panelToOpen: string | undefined = this.panelService.getLastActivePanelId();
+			const hasViews = (id: string): boolean => {
+				const viewContainer = this.viewDescriptorService.getViewContainerById(id);
+				if (!viewContainer) {
+					return false;
+				}
+
+				const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
+				if (!viewContainerModel) {
+					return false;
+				}
+
+				return viewContainerModel.activeViewDescriptors.length >= 1;
+			};
+
+			// verify that the panel we try to open has views before we default to it
+			// otherwise fall back to any view that has views still refs #111463
+			if (!panelToOpen || !hasViews(panelToOpen)) {
+				panelToOpen = this.viewDescriptorService
+					.getViewContainersByLocation(ViewContainerLocation.Panel)
+					.find(viewContainer => hasViews(viewContainer.id))?.id;
+			}
+
 			if (panelToOpen) {
 				const focus = !skipLayout;
 				this.panelService.openPanel(panelToOpen, focus);
@@ -1529,6 +1556,24 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		return this.state.menuBar.visibility;
 	}
 
+	toggleMenuBar(): void {
+		let currentVisibilityValue = getMenuBarVisibility(this.configurationService);
+		if (typeof currentVisibilityValue !== 'string') {
+			currentVisibilityValue = 'default';
+		}
+
+		let newVisibilityValue: string;
+		if (currentVisibilityValue === 'visible' || currentVisibilityValue === 'default') {
+			newVisibilityValue = 'toggle';
+		} else if (currentVisibilityValue === 'compact') {
+			newVisibilityValue = 'hidden';
+		} else {
+			newVisibilityValue = (isWeb && currentVisibilityValue === 'hidden') ? 'compact' : 'default';
+		}
+
+		this.configurationService.updateValue(Storage.MENU_VISIBILITY, newVisibilityValue);
+	}
+
 	getPanelPosition(): Position {
 		return this.state.panel.position;
 	}
diff --git a/src/vs/workbench/browser/menuActions.ts b/src/vs/workbench/browser/menuActions.ts
new file mode 100644
index 000000000..7aecec66e
--- /dev/null
+++ b/src/vs/workbench/browser/menuActions.ts
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IAction } from 'vs/base/common/actions';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from 'vs/base/common/event';
+import { MenuId, IMenuService, IMenu, SubmenuItemAction, IMenuActionOptions } from 'vs/platform/actions/common/actions';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+
+class MenuActions extends Disposable {
+
+	private readonly menu: IMenu;
+
+	private _primaryActions: IAction[] = [];
+	get primaryActions() { return this._primaryActions; }
+
+	private _secondaryActions: IAction[] = [];
+	get secondaryActions() { return this._secondaryActions; }
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private disposables = this._register(new DisposableStore());
+
+	constructor(
+		menuId: MenuId,
+		private readonly options: IMenuActionOptions | undefined,
+		private readonly menuService: IMenuService,
+		private readonly contextKeyService: IContextKeyService
+	) {
+		super();
+		this.menu = this._register(menuService.createMenu(menuId, contextKeyService));
+		this._register(this.menu.onDidChange(() => this.updateActions()));
+		this.updateActions();
+	}
+
+	private updateActions(): void {
+		this.disposables.clear();
+		this._primaryActions = [];
+		this._secondaryActions = [];
+		this.disposables.add(createAndFillInActionBarActions(this.menu, this.options, { primary: this._primaryActions, secondary: this._secondaryActions }));
+		this.disposables.add(this.updateSubmenus([...this._primaryActions, ...this._secondaryActions], {}));
+		this._onDidChange.fire();
+	}
+
+	private updateSubmenus(actions: readonly IAction[], submenus: { [id: number]: IMenu }): IDisposable {
+		const disposables = new DisposableStore();
+		for (const action of actions) {
+			if (action instanceof SubmenuItemAction && !submenus[action.item.submenu.id]) {
+				const menu = submenus[action.item.submenu.id] = disposables.add(this.menuService.createMenu(action.item.submenu, this.contextKeyService));
+				disposables.add(menu.onDidChange(() => this.updateActions()));
+				disposables.add(this.updateSubmenus(action.actions, submenus));
+			}
+		}
+		return disposables;
+	}
+}
+
+export class CompositeMenuActions extends Disposable {
+
+	private readonly menuActions: MenuActions;
+	private readonly contextMenuActionsDisposable = this._register(new MutableDisposable());
+
+	private _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+
+	constructor(
+		menuId: MenuId,
+		private readonly contextMenuId: MenuId | undefined,
+		private readonly options: IMenuActionOptions | undefined,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IMenuService private readonly menuService: IMenuService,
+	) {
+		super();
+		this.menuActions = this._register(new MenuActions(menuId, this.options, menuService, contextKeyService));
+		this._register(this.menuActions.onDidChange(() => this._onDidChange.fire()));
+	}
+
+	getPrimaryActions(): IAction[] {
+		return this.menuActions.primaryActions;
+	}
+
+	getSecondaryActions(): IAction[] {
+		return this.menuActions.secondaryActions;
+	}
+
+	getContextMenuActions(): IAction[] {
+		const actions: IAction[] = [];
+		if (this.contextMenuId) {
+			const menu = this.menuService.createMenu(this.contextMenuId, this.contextKeyService);
+			this.contextMenuActionsDisposable.value = createAndFillInActionBarActions(menu, this.options, { primary: [], secondary: actions });
+			menu.dispose();
+		}
+		return actions;
+	}
+}
diff --git a/src/vs/workbench/browser/panecomposite.ts b/src/vs/workbench/browser/panecomposite.ts
index 5279b52e2..4a8a1144f 100644
--- a/src/vs/workbench/browser/panecomposite.ts
+++ b/src/vs/workbench/browser/panecomposite.ts
@@ -16,13 +16,9 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { ViewPaneContainer } from './parts/views/viewPaneContainer';
 import { IPaneComposite } from 'vs/workbench/common/panecomposite';
 import { IAction, IActionViewItem, Separator } from 'vs/base/common/actions';
-import { ViewContainerMenuActions } from 'vs/workbench/browser/parts/views/viewMenuActions';
-import { MenuId } from 'vs/platform/actions/common/actions';
 
 export class PaneComposite extends Composite implements IPaneComposite {
 
-	private menuActions: ViewContainerMenuActions;
-
 	constructor(
 		id: string,
 		protected readonly viewPaneContainer: ViewPaneContainer,
@@ -35,8 +31,6 @@ export class PaneComposite extends Composite implements IPaneComposite {
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService
 	) {
 		super(id, telemetryService, themeService, storageService);
-
-		this.menuActions = this._register(this.instantiationService.createInstance(ViewContainerMenuActions, this.getId(), MenuId.ViewContainerTitleContext));
 		this._register(this.viewPaneContainer.onTitleAreaUpdate(() => this.updateTitleArea()));
 	}
 
@@ -71,22 +65,36 @@ export class PaneComposite extends Composite implements IPaneComposite {
 
 	getContextMenuActions(): ReadonlyArray<IAction> {
 		const result = [];
-		result.push(...this.menuActions.getContextMenuActions());
+		result.push(...this.viewPaneContainer.getContextMenuActions2());
 
-		if (result.length) {
+		const otherActions = this.viewPaneContainer.getContextMenuActions();
+
+		if (otherActions.length) {
 			result.push(new Separator());
+			result.push(...otherActions);
 		}
 
-		result.push(...this.viewPaneContainer.getContextMenuActions());
 		return result;
 	}
 
 	getActions(): ReadonlyArray<IAction> {
-		return this.viewPaneContainer.getActions();
+		const result = [];
+		result.push(...this.viewPaneContainer.getActions2());
+		result.push(...this.viewPaneContainer.getActions());
+		return result;
 	}
 
 	getSecondaryActions(): ReadonlyArray<IAction> {
-		return this.viewPaneContainer.getSecondaryActions();
+		const menuActions = this.viewPaneContainer.getSecondaryActions2();
+		const viewPaneContainerActions = this.viewPaneContainer.getSecondaryActions();
+		if (menuActions.length && viewPaneContainerActions.length) {
+			return [
+				...menuActions,
+				new Separator(),
+				...viewPaneContainerActions
+			];
+		}
+		return menuActions.length ? menuActions : viewPaneContainerActions;
 	}
 
 	getActionViewItem(action: IAction): IActionViewItem | undefined {
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index b2b2a18b4..0d04a6a1c 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -6,23 +6,74 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IPanel } from 'vs/workbench/common/panel';
 import { CompositeDescriptor, CompositeRegistry } from 'vs/workbench/browser/composite';
-import { IConstructorSignature0, BrandedService } from 'vs/platform/instantiation/common/instantiation';
+import { IConstructorSignature0, BrandedService, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { assertIsDefined } from 'vs/base/common/types';
 import { PaneComposite } from 'vs/workbench/browser/panecomposite';
+import { IAction, Separator } from 'vs/base/common/actions';
+import { CompositeMenuActions } from 'vs/workbench/browser/menuActions';
+import { MenuId } from 'vs/platform/actions/common/actions';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
-export abstract class Panel extends PaneComposite implements IPanel { }
+export abstract class Panel extends PaneComposite implements IPanel {
+
+	private readonly panelActions: CompositeMenuActions;
+
+	constructor(id: string,
+		viewPaneContainer: ViewPaneContainer,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IExtensionService extensionService: IExtensionService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+	) {
+		super(id, viewPaneContainer, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
+		this.panelActions = this._register(this.instantiationService.createInstance(CompositeMenuActions, MenuId.PanelTitle, undefined, undefined));
+		this._register(this.panelActions.onDidChange(() => this.updateTitleArea()));
+	}
+
+	getActions(): ReadonlyArray<IAction> {
+		return [...super.getActions(), ...this.panelActions.getPrimaryActions()];
+	}
+
+	getSecondaryActions(): ReadonlyArray<IAction> {
+		return this.mergeSecondaryActions(super.getSecondaryActions(), this.panelActions.getSecondaryActions());
+	}
+
+	getContextMenuActions(): ReadonlyArray<IAction> {
+		return this.mergeSecondaryActions(super.getContextMenuActions(), this.panelActions.getContextMenuActions());
+	}
+
+	private mergeSecondaryActions(actions: ReadonlyArray<IAction>, panelActions: IAction[]): ReadonlyArray<IAction> {
+		if (panelActions.length && actions.length) {
+			return [
+				...actions,
+				new Separator(),
+				...panelActions,
+			];
+		}
+		return panelActions.length ? panelActions : actions;
+	}
+}
 
 /**
  * A panel descriptor is a leightweight descriptor of a panel in the workbench.
  */
 export class PanelDescriptor extends CompositeDescriptor<Panel> {
 
-	static create<Services extends BrandedService[]>(ctor: { new(...services: Services): Panel }, id: string, name: string, cssClass?: string, order?: number, requestedIndex?: number, _commandId?: string): PanelDescriptor {
-		return new PanelDescriptor(ctor as IConstructorSignature0<Panel>, id, name, cssClass, order, requestedIndex, _commandId);
+	static create<Services extends BrandedService[]>(ctor: { new(...services: Services): Panel }, id: string, name: string, cssClass?: string, order?: number, requestedIndex?: number): PanelDescriptor {
+		return new PanelDescriptor(ctor as IConstructorSignature0<Panel>, id, name, cssClass, order, requestedIndex);
 	}
 
-	private constructor(ctor: IConstructorSignature0<Panel>, id: string, name: string, cssClass?: string, order?: number, requestedIndex?: number, _commandId?: string) {
-		super(ctor, id, name, cssClass, order, requestedIndex, _commandId);
+	private constructor(ctor: IConstructorSignature0<Panel>, id: string, name: string, cssClass?: string, order?: number, requestedIndex?: number) {
+		super(ctor, id, name, cssClass, order, requestedIndex);
 	}
 }
 
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index dfab3bc5c..8e78cbccc 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -162,7 +162,7 @@ class PartLayout {
 		if (this.options && this.options.hasTitle) {
 			titleSize = new Dimension(width, Math.min(height, PartLayout.TITLE_HEIGHT));
 		} else {
-			titleSize = new Dimension(0, 0);
+			titleSize = Dimension.None;
 		}
 
 		let contentWidth = width;
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
index 49bbae451..485e48516 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/activityaction';
-import * as nls from 'vs/nls';
-import * as DOM from 'vs/base/browser/dom';
+import { localize } from 'vs/nls';
+import { EventType, addDisposableListener, EventHelper } from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
+import { Action, IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IMenuService, MenuId, IMenu, registerAction2, Action2, IAction2Options } from 'vs/platform/actions/common/actions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { activeContrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
-import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ActivityAction, ActivityActionViewItem, ICompositeBar, ICompositeBarColors, ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
 import { CATEGORIES } from 'vs/workbench/common/actions';
 import { IActivity } from 'vs/workbench/common/activity';
@@ -29,12 +29,12 @@ import { isMacintosh, isWeb } from 'vs/base/common/platform';
 import { getCurrentAuthenticationSessionInfo, IAuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService';
 import { AuthenticationSession } from 'vs/editor/common/modes';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { AnchorAlignment, AnchorAxisAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { getTitleBarStyle } from 'vs/platform/windows/common/windows';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 
 export class ViewContainerActivityAction extends ActivityAction {
 
@@ -97,10 +97,10 @@ export class ViewContainerActivityAction extends ActivityAction {
 
 	private logAction(action: string) {
 		type ActivityBarActionClassification = {
-			viewletId: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-			action: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+			viewletId: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
+			action: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
 		};
-		this.telemetryService.publicLog2<{ viewletId: String, action: String }, ActivityBarActionClassification>('activityBarAction', { viewletId: this.activity.id, action });
+		this.telemetryService.publicLog2<{ viewletId: String, action: String; }, ActivityBarActionClassification>('activityBarAction', { viewletId: this.activity.id, action });
 	}
 }
 
@@ -109,6 +109,7 @@ class MenuActivityActionViewItem extends ActivityActionViewItem {
 	constructor(
 		private readonly menuId: MenuId,
 		action: ActivityAction,
+		private contextMenuActionsProvider: () => IAction[],
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		@IThemeService themeService: IThemeService,
 		@IMenuService protected readonly menuService: IMenuService,
@@ -126,30 +127,35 @@ class MenuActivityActionViewItem extends ActivityActionViewItem {
 		// Context menus are triggered on mouse down so that an item can be picked
 		// and executed with releasing the mouse over it
 
-		this._register(DOM.addDisposableListener(this.container, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
-			DOM.EventHelper.stop(e, true);
+		this._register(addDisposableListener(this.container, EventType.MOUSE_DOWN, (e: MouseEvent) => {
+			EventHelper.stop(e, true);
 			this.showContextMenu(e);
 		}));
 
-		this._register(DOM.addDisposableListener(this.container, DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
+		this._register(addDisposableListener(this.container, EventType.KEY_UP, (e: KeyboardEvent) => {
 			let event = new StandardKeyboardEvent(e);
 			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-				DOM.EventHelper.stop(e, true);
+				EventHelper.stop(e, true);
 				this.showContextMenu();
 			}
 		}));
 
-		this._register(DOM.addDisposableListener(this.container, TouchEventType.Tap, (e: GestureEvent) => {
-			DOM.EventHelper.stop(e, true);
+		this._register(addDisposableListener(this.container, TouchEventType.Tap, (e: GestureEvent) => {
+			EventHelper.stop(e, true);
 			this.showContextMenu();
 		}));
 	}
 
-	protected async showContextMenu(e?: MouseEvent): Promise<void> {
+	private async showContextMenu(e?: MouseEvent): Promise<void> {
 		const disposables = new DisposableStore();
 
-		const menu = disposables.add(this.menuService.createMenu(this.menuId, this.contextKeyService));
-		const actions = await this.resolveActions(menu, disposables);
+		let actions: IAction[];
+		if (e?.button !== 2) {
+			const menu = disposables.add(this.menuService.createMenu(this.menuId, this.contextKeyService));
+			actions = await this.resolveMainMenuActions(menu, disposables);
+		} else {
+			actions = await this.resolveContextMenuActions(disposables);
+		}
 
 		const isUsingCustomMenu = isWeb || (getTitleBarStyle(this.configurationService) !== 'native' && !isMacintosh); // see #40262
 		const position = this.configurationService.getValue('workbench.sideBar.location');
@@ -163,13 +169,17 @@ class MenuActivityActionViewItem extends ActivityActionViewItem {
 		});
 	}
 
-	protected async resolveActions(menu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
+	protected async resolveMainMenuActions(menu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
 		const actions: IAction[] = [];
 
 		disposables.add(createAndFillInActionBarActions(menu, undefined, { primary: [], secondary: actions }));
 
 		return actions;
 	}
+
+	protected async resolveContextMenuActions(disposables: DisposableStore): Promise<IAction[]> {
+		return this.contextMenuActionsProvider();
+	}
 }
 
 export class HomeActivityActionViewItem extends MenuActivityActionViewItem {
@@ -179,6 +189,7 @@ export class HomeActivityActionViewItem extends MenuActivityActionViewItem {
 	constructor(
 		private readonly goHomeHref: string,
 		action: ActivityAction,
+		contextMenuActionsProvider: () => IAction[],
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		@IThemeService themeService: IThemeService,
 		@IMenuService menuService: IMenuService,
@@ -188,27 +199,32 @@ export class HomeActivityActionViewItem extends MenuActivityActionViewItem {
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IStorageService private readonly storageService: IStorageService
 	) {
-		super(MenuId.MenubarHomeMenu, action, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
+		super(MenuId.MenubarHomeMenu, action, contextMenuActionsProvider, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
 	}
 
-	protected async resolveActions(homeMenu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
+	protected async resolveMainMenuActions(homeMenu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
 		const actions = [];
 
 		// Go Home
-		actions.push(disposables.add(new Action('goHome', nls.localize('goHome', "Go Home"), undefined, true, async () => window.location.href = this.goHomeHref)));
-		actions.push(disposables.add(new Separator()));
+		actions.push(toAction({ id: 'goHome', label: localize('goHome', "Go Home"), run: () => window.location.href = this.goHomeHref }));
 
 		// Contributed
-		const contributedActions = await super.resolveActions(homeMenu, disposables);
-		actions.push(...contributedActions);
-
-		// Hide
-		if (contributedActions.length > 0) {
+		const contributedActions = await super.resolveMainMenuActions(homeMenu, disposables);
+		if (contributedActions.length) {
 			actions.push(disposables.add(new Separator()));
+			actions.push(...contributedActions);
 		}
-		actions.push(disposables.add(new Action('hide', nls.localize('hide', "Hide"), undefined, true, async () => {
-			this.storageService.store(HomeActivityActionViewItem.HOME_BAR_VISIBILITY_PREFERENCE, false, StorageScope.GLOBAL, StorageTarget.USER);
-		})));
+
+		return actions;
+	}
+
+	protected async resolveContextMenuActions(disposables: DisposableStore): Promise<IAction[]> {
+		const actions = await super.resolveContextMenuActions(disposables);
+
+		actions.unshift(...[
+			toAction({ id: 'hideHomeButton', label: localize('hideHomeButton', "Hide Home Button"), run: () => this.storageService.store(HomeActivityActionViewItem.HOME_BAR_VISIBILITY_PREFERENCE, false, StorageScope.GLOBAL, StorageTarget.USER) }),
+			new Separator()
+		]);
 
 		return actions;
 	}
@@ -220,6 +236,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 
 	constructor(
 		action: ActivityAction,
+		contextMenuActionsProvider: () => IAction[],
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		@IThemeService themeService: IThemeService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -227,15 +244,15 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@IStorageService private readonly storageService: IStorageService,
 		@IProductService private readonly productService: IProductService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@IStorageService private readonly storageService: IStorageService
 	) {
-		super(MenuId.AccountsContext, action, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
+		super(MenuId.AccountsContext, action, contextMenuActionsProvider, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
 	}
 
-	protected async resolveActions(accountsMenu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
-		await super.resolveActions(accountsMenu, disposables);
+	protected async resolveMainMenuActions(accountsMenu: IMenu, disposables: DisposableStore): Promise<IAction[]> {
+		await super.resolveMainMenuActions(accountsMenu, disposables);
 
 		const otherCommands = accountsMenu.getActions();
 		const providers = this.authenticationService.getProviderIds();
@@ -243,7 +260,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 			try {
 				const sessions = await this.authenticationService.getSessions(providerId);
 
-				const groupedSessions: { [label: string]: AuthenticationSession[] } = {};
+				const groupedSessions: { [label: string]: AuthenticationSession[]; } = {};
 				sessions.forEach(session => {
 					if (groupedSessions[session.account.label]) {
 						groupedSessions[session.account.label].push(session);
@@ -266,11 +283,11 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 
 			if (sessionInfo.sessions) {
 				Object.keys(sessionInfo.sessions).forEach(accountName => {
-					const manageExtensionsAction = disposables.add(new Action(`configureSessions${accountName}`, nls.localize('manageTrustedExtensions', "Manage Trusted Extensions"), '', true, () => {
+					const manageExtensionsAction = disposables.add(new Action(`configureSessions${accountName}`, localize('manageTrustedExtensions', "Manage Trusted Extensions"), '', true, () => {
 						return this.authenticationService.manageTrustedExtensionsForAccount(sessionInfo.providerId, accountName);
 					}));
 
-					const signOutAction = disposables.add(new Action('signOut', nls.localize('signOut', "Sign Out"), '', true, () => {
+					const signOutAction = disposables.add(new Action('signOut', localize('signOut', "Sign Out"), '', true, () => {
 						return this.authenticationService.signOutOfAccount(sessionInfo.providerId, accountName);
 					}));
 
@@ -285,7 +302,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 					menus.push(providerSubMenu);
 				});
 			} else {
-				const providerUnavailableAction = disposables.add(new Action('providerUnavailable', nls.localize('authProviderUnavailable', '{0} is currently unavailable', providerDisplayName)));
+				const providerUnavailableAction = disposables.add(new Action('providerUnavailable', localize('authProviderUnavailable', '{0} is currently unavailable', providerDisplayName)));
 				menus.push(providerUnavailableAction);
 			}
 		});
@@ -302,22 +319,26 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 			}
 		});
 
-		if (menus.length) {
-			menus.push(disposables.add(new Separator()));
-		}
-
-		menus.push(disposables.add(new Action('hide', nls.localize('hide', "Hide"), undefined, true, async () => {
-			this.storageService.store(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, false, StorageScope.GLOBAL, StorageTarget.USER);
-		})));
-
 		return menus;
 	}
+
+	protected async resolveContextMenuActions(disposables: DisposableStore): Promise<IAction[]> {
+		const actions = await super.resolveContextMenuActions(disposables);
+
+		actions.unshift(...[
+			toAction({ id: 'hideAccounts', label: localize('hideAccounts', "Hide Accounts"), run: () => this.storageService.store(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, false, StorageScope.GLOBAL, StorageTarget.USER) }),
+			new Separator()
+		]);
+
+		return actions;
+	}
 }
 
 export class GlobalActivityActionViewItem extends MenuActivityActionViewItem {
 
 	constructor(
 		action: ActivityAction,
+		contextMenuActionsProvider: () => IAction[],
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		@IThemeService themeService: IThemeService,
 		@IMenuService menuService: IMenuService,
@@ -326,7 +347,7 @@ export class GlobalActivityActionViewItem extends MenuActivityActionViewItem {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService
 	) {
-		super(MenuId.GlobalActivity, action, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
+		super(MenuId.GlobalActivity, action, contextMenuActionsProvider, colors, themeService, menuService, contextMenuService, contextKeyService, configurationService, environmentService);
 	}
 }
 
@@ -379,7 +400,7 @@ registerAction2(
 		constructor() {
 			super({
 				id: 'workbench.action.previousSideBarView',
-				title: { value: nls.localize('previousSideBarView', "Previous Side Bar View"), original: 'Previous Side Bar View' },
+				title: { value: localize('previousSideBarView', "Previous Side Bar View"), original: 'Previous Side Bar View' },
 				category: CATEGORIES.View,
 				f1: true
 			}, -1);
@@ -392,7 +413,7 @@ registerAction2(
 		constructor() {
 			super({
 				id: 'workbench.action.nextSideBarView',
-				title: { value: nls.localize('nextSideBarView', "Next Side Bar View"), original: 'Next Side Bar View' },
+				title: { value: localize('nextSideBarView', "Next Side Bar View"), original: 'Next Side Bar View' },
 				category: CATEGORIES.View,
 				f1: true
 			}, 1);
@@ -400,7 +421,7 @@ registerAction2(
 	}
 );
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 	const activityBarBackgroundColor = theme.getColor(ACTIVITY_BAR_BACKGROUND);
 	if (activityBarBackgroundColor) {
 		collector.addRule(`
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 39a3ca76e..4e78ba227 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/activitybarpart';
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { ActionsOrientation, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { GLOBAL_ACTIVITY_ID, IActivity, ACCOUNTS_ACTIVITY_ID } from 'vs/workbench/common/activity';
 import { Part } from 'vs/workbench/browser/part';
@@ -13,7 +13,7 @@ import { IBadge, NumberBadge } from 'vs/workbench/services/activity/common/activ
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, toDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
-import { ToggleActivityBarVisibilityAction, ToggleMenuBarAction, ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
+import { ToggleActivityBarVisibilityAction, ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
 import { IThemeService, IColorTheme, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
@@ -23,33 +23,34 @@ import { IStorageService, StorageScope, IStorageValueChangeEvent, StorageTarget
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { ToggleCompositePinnedAction, ICompositeBarColors, ActivityAction, ICompositeActivity } from 'vs/workbench/browser/parts/compositeBarActions';
-import { IViewDescriptorService, ViewContainer, TEST_VIEW_CONTAINER_ID, IViewContainerModel, ViewContainerLocation, IViewsService } from 'vs/workbench/common/views';
+import { IViewDescriptorService, ViewContainer, IViewContainerModel, ViewContainerLocation, IViewsService } from 'vs/workbench/common/views';
 import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { assertIsDefined } from 'vs/base/common/types';
+import { assertIsDefined, isString } from 'vs/base/common/types';
 import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { Schemas } from 'vs/base/common/network';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { getMenuBarVisibility } from 'vs/platform/windows/common/windows';
-import { isWeb } from 'vs/base/common/platform';
+import { isNative, isWeb } from 'vs/base/common/platform';
 import { Before2D } from 'vs/workbench/browser/dnd';
 import { Codicon, iconRegistry } from 'vs/base/common/codicons';
-import { Action, Separator } from 'vs/base/common/actions';
+import { IAction, Separator, toAction } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { CATEGORIES } from 'vs/workbench/common/actions';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { StringSHA1 } from 'vs/base/common/hash';
 
 interface IPlaceholderViewContainer {
 	readonly id: string;
 	readonly name?: string;
 	readonly iconUrl?: UriComponents;
 	readonly themeIcon?: ThemeIcon;
-	readonly views?: { when?: string }[];
+	readonly isBuiltin?: boolean;
+	readonly views?: { when?: string; }[];
 }
 
 interface IPinnedViewContainer {
@@ -66,12 +67,10 @@ interface ICachedViewContainer {
 	readonly pinned: boolean;
 	readonly order?: number;
 	visible: boolean;
-	views?: { when?: string }[];
+	isBuiltin?: boolean;
+	views?: { when?: string; }[];
 }
 
-const settingsViewBarIcon = registerIcon('settings-view-bar-icon', Codicon.settingsGear, nls.localize('settingsViewBarIcon', 'Settings icon in the view bar.'));
-const accountsViewBarIcon = registerIcon('accounts-view-bar-icon', Codicon.account, nls.localize('accountsViewBarIcon', 'Accounts icon in the view bar.'));
-
 export class ActivitybarPart extends Part implements IActivityBarService {
 
 	declare readonly _serviceBrand: undefined;
@@ -81,6 +80,9 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	private static readonly ACTION_HEIGHT = 48;
 	private static readonly ACCOUNTS_ACTION_INDEX = 0;
 
+	private static readonly GEAR_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, localize('settingsViewBarIcon', "Settings icon in the view bar."));
+	private static readonly ACCOUNTS_ICON = registerIcon('accounts-view-bar-icon', Codicon.account, localize('accountsViewBarIcon', "Accounts icon in the view bar."));
+
 	//#region IView
 
 	readonly minimumWidth: number = 48;
@@ -110,12 +112,13 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 	private readonly accountsActivity: ICompositeActivity[] = [];
 
-	private readonly compositeActions = new Map<string, { activityAction: ViewContainerActivityAction, pinnedAction: ToggleCompositePinnedAction }>();
+	private readonly compositeActions = new Map<string, { activityAction: ViewContainerActivityAction, pinnedAction: ToggleCompositePinnedAction; }>();
 	private readonly viewContainerDisposables = new Map<string, IDisposable>();
 
 	private readonly keyboardNavigationDisposables = this._register(new DisposableStore());
 
 	private readonly location = ViewContainerLocation.Sidebar;
+	private hasExtensionsRegistered: boolean = false;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -132,14 +135,8 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		super(Parts.ACTIVITYBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
 
 		for (const cachedViewContainer of this.cachedViewContainers) {
-			if (
-				environmentService.remoteAuthority || // In remote window, hide activity bar entries until registered
-				this.shouldBeHidden(cachedViewContainer.id, cachedViewContainer)
-			) {
-				cachedViewContainer.visible = false;
-			}
+			cachedViewContainer.visible = !this.shouldBeHidden(cachedViewContainer.id, cachedViewContainer);
 		}
-
 		this.compositeBar = this.createCompositeBar();
 
 		this.onDidRegisterViewContainers(this.getViewContainers());
@@ -161,53 +158,66 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			icon: true,
 			orientation: ActionsOrientation.VERTICAL,
 			preventLoopNavigation: true,
-			openComposite: (compositeId: string) => this.viewsService.openViewContainer(compositeId, true),
-			getActivityAction: (compositeId: string) => this.getCompositeActions(compositeId).activityAction,
-			getCompositePinnedAction: (compositeId: string) => this.getCompositeActions(compositeId).pinnedAction,
-			getOnCompositeClickAction: (compositeId: string) => new Action(compositeId, '', '', true, () => this.viewsService.isViewContainerVisible(compositeId) ? Promise.resolve(this.viewsService.closeViewContainer(compositeId)) : this.viewsService.openViewContainer(compositeId)),
-			getContextMenuActions: () => {
-				const actions = [];
+			openComposite: compositeId => this.viewsService.openViewContainer(compositeId, true),
+			getActivityAction: compositeId => this.getCompositeActions(compositeId).activityAction,
+			getCompositePinnedAction: compositeId => this.getCompositeActions(compositeId).pinnedAction,
+			getOnCompositeClickAction: compositeId => toAction({ id: compositeId, label: '', run: async () => this.viewsService.isViewContainerVisible(compositeId) ? this.viewsService.closeViewContainer(compositeId) : this.viewsService.openViewContainer(compositeId) }),
+			fillExtraContextMenuActions: actions => {
 
 				// Home
+				const topActions: IAction[] = [];
 				if (this.homeBarContainer) {
-					actions.push(new Action(
-						'toggleHomeBarAction',
-						this.homeBarVisibilityPreference ? nls.localize('hideHomeBar', "Hide Home Button") : nls.localize('showHomeBar', "Show Home Button"),
-						undefined,
-						true,
-						async () => { this.homeBarVisibilityPreference = !this.homeBarVisibilityPreference; }
-					));
+					topActions.push({
+						id: 'toggleHomeBarAction',
+						label: localize('homeButton', "Home Button"),
+						class: undefined,
+						tooltip: localize('homeButton', "Home Button"),
+						checked: this.homeBarVisibilityPreference,
+						enabled: true,
+						run: async () => this.homeBarVisibilityPreference = !this.homeBarVisibilityPreference,
+						dispose: () => { }
+					});
 				}
 
 				// Menu
 				const menuBarVisibility = getMenuBarVisibility(this.configurationService);
 				if (menuBarVisibility === 'compact' || (menuBarVisibility === 'hidden' && isWeb)) {
-					actions.push(this.instantiationService.createInstance(ToggleMenuBarAction, ToggleMenuBarAction.ID, menuBarVisibility === 'compact' ? nls.localize('hideMenu', "Hide Menu") : nls.localize('showMenu', "Show Menu")));
+					topActions.push({
+						id: 'toggleMenuVisibility',
+						label: localize('menu', "Menu"),
+						class: undefined,
+						tooltip: localize('menu', "Menu"),
+						checked: menuBarVisibility === 'compact',
+						enabled: true,
+						run: async () => this.layoutService.toggleMenuBar(),
+						dispose: () => { }
+					});
+				}
+
+				if (topActions.length) {
+					actions.unshift(...topActions, new Separator());
 				}
 
 				// Accounts
-				actions.push(new Action(
-					'toggleAccountsVisibility',
-					this.accountsVisibilityPreference ? nls.localize('hideAccounts', "Hide Accounts") : nls.localize('showAccounts', "Show Accounts"),
-					undefined,
-					true,
-					async () => { this.accountsVisibilityPreference = !this.accountsVisibilityPreference; }
-				));
+				actions.push(new Separator());
+				actions.push({
+					id: 'toggleAccountsVisibility',
+					label: localize('accounts', "Accounts"),
+					class: undefined,
+					tooltip: localize('accounts', "Accounts"),
+					checked: this.accountsVisibilityPreference,
+					enabled: true,
+					run: async () => this.accountsVisibilityPreference = !this.accountsVisibilityPreference,
+					dispose: () => { }
+				});
+
 				actions.push(new Separator());
 
 				// Toggle Sidebar
 				actions.push(this.instantiationService.createInstance(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.getLabel(this.layoutService)));
 
 				// Toggle Activity Bar
-				actions.push(new Action(
-					ToggleActivityBarVisibilityAction.ID,
-					nls.localize('hideActivitBar', "Hide Activity Bar"),
-					undefined,
-					true,
-					async () => { this.instantiationService.invokeFunction(accessor => new ToggleActivityBarVisibilityAction().run(accessor)); }
-				));
-
-				return actions;
+				actions.push(toAction({ id: ToggleActivityBarVisibilityAction.ID, label: localize('hideActivitBar', "Hide Activity Bar"), run: async () => this.instantiationService.invokeFunction(accessor => new ToggleActivityBarVisibilityAction().run(accessor)) }));
 			},
 			getContextMenuActionsForComposite: compositeId => this.getContextMenuActionsForComposite(compositeId),
 			getDefaultCompositeId: () => this.viewDescriptorService.getDefaultViewContainer(this.location)!.id,
@@ -223,24 +233,20 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		}));
 	}
 
-	private getContextMenuActionsForComposite(compositeId: string): Action[] {
-		const actions = [];
+	private getContextMenuActionsForComposite(compositeId: string): IAction[] {
+		const actions: IAction[] = [];
 
 		const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId)!;
 		const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer)!;
 		if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
-			actions.push(new Action('resetLocationAction', nls.localize('resetLocation', "Reset Location"), undefined, true, async () => {
-				this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation);
-			}));
+			actions.push(toAction({ id: 'resetLocationAction', label: localize('resetLocation', "Reset Location"), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation) }));
 		} else {
 			const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
 			if (viewContainerModel.allViewDescriptors.length === 1) {
 				const viewToReset = viewContainerModel.allViewDescriptors[0];
 				const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id)!;
 				if (defaultContainer !== viewContainer) {
-					actions.push(new Action('resetLocationAction', nls.localize('resetLocation', "Reset Location"), undefined, true, async () => {
-						this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer);
-					}));
+					actions.push(toAction({ id: 'resetLocationAction', label: localize('resetLocation', "Reset Location"), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer) }));
 				}
 			}
 		}
@@ -278,7 +284,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		}));
 	}
 
-	private onDidChangeViewContainers(added: ReadonlyArray<{ container: ViewContainer, location: ViewContainerLocation }>, removed: ReadonlyArray<{ container: ViewContainer, location: ViewContainerLocation }>) {
+	private onDidChangeViewContainers(added: ReadonlyArray<{ container: ViewContainer, location: ViewContainerLocation; }>, removed: ReadonlyArray<{ container: ViewContainer, location: ViewContainerLocation; }>) {
 		removed.filter(({ location }) => location === ViewContainerLocation.Sidebar).forEach(({ container }) => this.onDidDeregisterViewContainer(container));
 		this.onDidRegisterViewContainers(added.filter(({ location }) => location === ViewContainerLocation.Sidebar).map(({ container }) => container));
 	}
@@ -310,7 +316,22 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	}
 
 	private onDidRegisterExtensions(): void {
-		this.removeNotExistingComposites();
+		this.hasExtensionsRegistered = true;
+
+		// show/hide/remove composites
+		for (const { id } of this.cachedViewContainers) {
+			const viewContainer = this.getViewContainer(id);
+			if (viewContainer) {
+				this.showOrHideViewContainer(viewContainer);
+			} else {
+				if (this.viewDescriptorService.isViewContainerRemovedPermanently(id)) {
+					this.removeComposite(id);
+				} else {
+					this.hideComposite(id);
+				}
+			}
+		}
+
 		this.saveCachedViewContainers();
 	}
 
@@ -322,7 +343,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			this.compositeBar.addComposite(viewContainer);
 			this.compositeBar.activateComposite(viewContainer.id);
 
-			if (viewContainer.hideIfEmpty) {
+			if (this.shouldBeHidden(viewContainer)) {
 				const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
 				if (viewContainerModel.activeViewDescriptors.length === 0) {
 					// Update the composite bar by hiding
@@ -460,7 +481,8 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 		// Home action bar
 		const homeIndicator = this.environmentService.options?.homeIndicator;
-		if (homeIndicator) {
+		// TODO @sbatten remove the fake setting and associated code
+		if (homeIndicator && this.configurationService.getValue<boolean>('window.showHomeIndicator')) {
 			let codicon = iconRegistry.get(homeIndicator.icon);
 			if (!codicon) {
 				codicon = Codicon.code;
@@ -556,14 +578,14 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 	private createHomeBar(href: string, icon: Codicon): void {
 		this.homeBarContainer = document.createElement('div');
-		this.homeBarContainer.setAttribute('aria-label', nls.localize('homeIndicator', "Home"));
+		this.homeBarContainer.setAttribute('aria-label', localize('homeIndicator', "Home"));
 		this.homeBarContainer.setAttribute('role', 'toolbar');
 		this.homeBarContainer.classList.add('home-bar');
 
 		this.homeBar = this._register(new ActionBar(this.homeBarContainer, {
-			actionViewItemProvider: action => this.instantiationService.createInstance(HomeActivityActionViewItem, href, action as ActivityAction, (theme: IColorTheme) => this.getActivitybarItemColors(theme)),
+			actionViewItemProvider: action => this.instantiationService.createInstance(HomeActivityActionViewItem, href, action as ActivityAction, () => this.compositeBar.getContextMenuActions(), (theme: IColorTheme) => this.getActivitybarItemColors(theme)),
 			orientation: ActionsOrientation.VERTICAL,
-			ariaLabel: nls.localize('home', "Home"),
+			ariaLabel: localize('home', "Home"),
 			animated: false,
 			preventLoopNavigation: true,
 			ignoreOrientationForPreviousAndNextKey: true
@@ -575,7 +597,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 		this.homeBar.push(this._register(new ActivityAction({
 			id: 'workbench.actions.home',
-			name: nls.localize('home', "Home"),
+			name: localize('home', "Home"),
 			cssClass: icon.classNames
 		})));
 
@@ -587,17 +609,17 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.globalActivityActionBar = this._register(new ActionBar(container, {
 			actionViewItemProvider: action => {
 				if (action.id === 'workbench.actions.manage') {
-					return this.instantiationService.createInstance(GlobalActivityActionViewItem, action as ActivityAction, (theme: IColorTheme) => this.getActivitybarItemColors(theme));
+					return this.instantiationService.createInstance(GlobalActivityActionViewItem, action as ActivityAction, () => this.compositeBar.getContextMenuActions(), (theme: IColorTheme) => this.getActivitybarItemColors(theme));
 				}
 
 				if (action.id === 'workbench.actions.accounts') {
-					return this.instantiationService.createInstance(AccountsActivityActionViewItem, action as ActivityAction, (theme: IColorTheme) => this.getActivitybarItemColors(theme));
+					return this.instantiationService.createInstance(AccountsActivityActionViewItem, action as ActivityAction, () => this.compositeBar.getContextMenuActions(), (theme: IColorTheme) => this.getActivitybarItemColors(theme));
 				}
 
 				throw new Error(`No view item for action '${action.id}'`);
 			},
 			orientation: ActionsOrientation.VERTICAL,
-			ariaLabel: nls.localize('manage', "Manage"),
+			ariaLabel: localize('manage', "Manage"),
 			animated: false,
 			preventLoopNavigation: true,
 			ignoreOrientationForPreviousAndNextKey: true
@@ -605,15 +627,15 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 		this.globalActivityAction = this._register(new ActivityAction({
 			id: 'workbench.actions.manage',
-			name: nls.localize('manage', "Manage"),
-			cssClass: ThemeIcon.asClassName(settingsViewBarIcon)
+			name: localize('manage', "Manage"),
+			cssClass: ThemeIcon.asClassName(ActivitybarPart.GEAR_ICON)
 		}));
 
 		if (this.accountsVisibilityPreference) {
 			this.accountsActivityAction = this._register(new ActivityAction({
 				id: 'workbench.actions.accounts',
-				name: nls.localize('accounts', "Accounts"),
-				cssClass: ThemeIcon.asClassName(accountsViewBarIcon)
+				name: localize('accounts', "Accounts"),
+				cssClass: ThemeIcon.asClassName(ActivitybarPart.ACCOUNTS_ICON)
 			}));
 
 			this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart.ACCOUNTS_ACTION_INDEX });
@@ -630,7 +652,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			} else {
 				this.accountsActivityAction = this._register(new ActivityAction({
 					id: 'workbench.actions.accounts',
-					name: nls.localize('accounts', "Accounts"),
+					name: localize('accounts', "Accounts"),
 					cssClass: Codicon.account.classNames
 				}));
 				this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart.ACCOUNTS_ACTION_INDEX });
@@ -640,7 +662,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.updateGlobalActivity(ACCOUNTS_ACTIVITY_ID);
 	}
 
-	private getCompositeActions(compositeId: string): { activityAction: ViewContainerActivityAction, pinnedAction: ToggleCompositePinnedAction } {
+	private getCompositeActions(compositeId: string): { activityAction: ViewContainerActivityAction, pinnedAction: ToggleCompositePinnedAction; } {
 		let compositeActions = this.compositeActions.get(compositeId);
 		if (!compositeActions) {
 			const viewContainer = this.getViewContainer(compositeId);
@@ -666,32 +688,27 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 	private onDidRegisterViewContainers(viewContainers: ReadonlyArray<ViewContainer>): void {
 		for (const viewContainer of viewContainers) {
+			this.compositeBar.addComposite(viewContainer);
+
+			// Pin it by default if it is new
 			const cachedViewContainer = this.cachedViewContainers.filter(({ id }) => id === viewContainer.id)[0];
-			const visibleViewContainer = this.viewsService.getVisibleViewContainer(this.location);
-			const isActive = visibleViewContainer?.id === viewContainer.id;
-
-			if (isActive || !this.shouldBeHidden(viewContainer.id, cachedViewContainer)) {
-				this.compositeBar.addComposite(viewContainer);
-
-				// Pin it by default if it is new
-				if (!cachedViewContainer) {
-					this.compositeBar.pin(viewContainer.id);
-				}
-
-				if (isActive) {
-					this.compositeBar.activateComposite(viewContainer.id);
-				}
+			if (!cachedViewContainer) {
+				this.compositeBar.pin(viewContainer.id);
+			}
+
+			// Active
+			const visibleViewContainer = this.viewsService.getVisibleViewContainer(this.location);
+			if (visibleViewContainer?.id === viewContainer.id) {
+				this.compositeBar.activateComposite(viewContainer.id);
 			}
-		}
 
-		for (const viewContainer of viewContainers) {
 			const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
 			this.updateActivity(viewContainer, viewContainerModel);
-			this.onDidChangeActiveViews(viewContainer, viewContainerModel);
+			this.showOrHideViewContainer(viewContainer);
 
 			const disposables = new DisposableStore();
 			disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.updateActivity(viewContainer, viewContainerModel)));
-			disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.onDidChangeActiveViews(viewContainer, viewContainerModel)));
+			disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.showOrHideViewContainer(viewContainer)));
 
 			this.viewContainerDisposables.set(viewContainer.id, disposables);
 		}
@@ -728,12 +745,15 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		let iconUrl: URI | undefined = undefined;
 		if (URI.isUri(icon)) {
 			iconUrl = icon;
-			cssClass = `activity-${id.replace(/\./g, '-')}`;
+			const cssUrl = asCSSUrl(icon);
+			const hash = new StringSHA1();
+			hash.update(cssUrl);
+			cssClass = `activity-${id.replace(/\./g, '-')}-${hash.digest()}`;
 			const iconClass = `.monaco-workbench .activitybar .monaco-action-bar .action-label.${cssClass}`;
 			createCSSRule(iconClass, `
-				mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
+				mask: ${cssUrl} no-repeat 50% 50%;
 				mask-size: 24px;
-				-webkit-mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
+				-webkit-mask: ${cssUrl} no-repeat 50% 50%;
 				-webkit-mask-size: 24px;
 			`);
 		} else if (ThemeIcon.isThemeIcon(icon)) {
@@ -743,36 +763,43 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		return { id, name, cssClass, iconUrl, keybindingId };
 	}
 
-	private onDidChangeActiveViews(viewContainer: ViewContainer, viewContainerModel: IViewContainerModel): void {
-		if (viewContainerModel.activeViewDescriptors.length) {
-			this.compositeBar.addComposite(viewContainer);
-		} else if (viewContainer.hideIfEmpty) {
+	private showOrHideViewContainer(viewContainer: ViewContainer): void {
+		if (this.shouldBeHidden(viewContainer)) {
 			this.hideComposite(viewContainer.id);
+		} else {
+			this.compositeBar.addComposite(viewContainer);
 		}
 	}
 
-	private shouldBeHidden(viewContainerId: string, cachedViewContainer?: ICachedViewContainer): boolean {
-		const viewContainer = this.getViewContainer(viewContainerId);
-		if (!viewContainer || !viewContainer.hideIfEmpty) {
-			return false;
-		}
+	private shouldBeHidden(viewContainerOrId: string | ViewContainer, cachedViewContainer?: ICachedViewContainer): boolean {
+		const viewContainer = isString(viewContainerOrId) ? this.getViewContainer(viewContainerOrId) : viewContainerOrId;
+		const viewContainerId = isString(viewContainerOrId) ? viewContainerOrId : viewContainerOrId.id;
 
-		return cachedViewContainer?.views && cachedViewContainer.views.length
-			? cachedViewContainer.views.every(({ when }) => !!when && !this.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(when)))
-			: viewContainerId === TEST_VIEW_CONTAINER_ID /* Hide Test view container for the first time or it had no views registered before */;
-	}
-
-	private removeNotExistingComposites(): void {
-		const viewContainers = this.getViewContainers();
-		for (const { id } of this.cachedViewContainers) {
-			if (viewContainers.every(viewContainer => viewContainer.id !== id)) {
-				if (this.viewDescriptorService.isViewContainerRemovedPermanently(id)) {
-					this.removeComposite(id);
-				} else {
-					this.hideComposite(id);
+		if (viewContainer) {
+			if (viewContainer.hideIfEmpty) {
+				if (this.viewDescriptorService.getViewContainerModel(viewContainer).activeViewDescriptors.length > 0) {
+					return false;
 				}
+			} else {
+				return false;
 			}
 		}
+
+		// Check cache only if extensions are not yet registered and current window is not native (desktop) remote connection window
+		if (!this.hasExtensionsRegistered && !(this.environmentService.remoteAuthority && isNative)) {
+			cachedViewContainer = cachedViewContainer || this.cachedViewContainers.find(({ id }) => id === viewContainerId);
+
+			// Show builtin ViewContainer if not registered yet
+			if (!viewContainer && cachedViewContainer?.isBuiltin) {
+				return false;
+			}
+
+			if (cachedViewContainer?.views?.length) {
+				return cachedViewContainer.views.every(({ when }) => !!when && !this.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(when)));
+			}
+		}
+
+		return true;
 	}
 
 	private hideComposite(compositeId: string): void {
@@ -864,7 +891,6 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 
 	private getViewContainer(id: string): ViewContainer | undefined {
 		const viewContainer = this.viewDescriptorService.getViewContainerById(id);
-
 		return viewContainer && this.viewDescriptorService.getViewContainerLocation(viewContainer) === this.location ? viewContainer : undefined;
 	}
 
@@ -918,22 +944,22 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			const viewContainer = this.getViewContainer(compositeItem.id);
 			if (viewContainer) {
 				const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
-				const views: { when: string | undefined }[] = [];
+				const views: { when: string | undefined; }[] = [];
 				for (const { when } of viewContainerModel.allViewDescriptors) {
 					views.push({ when: when ? when.serialize() : undefined });
 				}
-				const cacheIcon = URI.isUri(viewContainerModel.icon) ? viewContainerModel.icon.scheme === Schemas.file : true;
 				state.push({
 					id: compositeItem.id,
 					name: viewContainerModel.title,
-					icon: cacheIcon ? viewContainerModel.icon : undefined,
+					icon: URI.isUri(viewContainerModel.icon) && this.environmentService.remoteAuthority && isNative ? undefined : viewContainerModel.icon, /* Donot cache uri icons in desktop with remote connection */
 					views,
 					pinned: compositeItem.pinned,
 					order: compositeItem.order,
-					visible: compositeItem.visible
+					visible: compositeItem.visible,
+					isBuiltin: !viewContainer.extensionId
 				});
 			} else {
-				state.push({ id: compositeItem.id, pinned: compositeItem.pinned, order: compositeItem.order, visible: false });
+				state.push({ id: compositeItem.id, pinned: compositeItem.pinned, order: compositeItem.order, visible: false, isBuiltin: false });
 			}
 		}
 
@@ -948,9 +974,10 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 				const cachedViewContainer = this._cachedViewContainers.filter(cached => cached.id === placeholderViewContainer.id)[0];
 				if (cachedViewContainer) {
 					cachedViewContainer.name = placeholderViewContainer.name;
-					cachedViewContainer.icon = placeholderViewContainer.themeIcon ? ThemeIcon.revive(placeholderViewContainer.themeIcon) :
+					cachedViewContainer.icon = placeholderViewContainer.themeIcon ? placeholderViewContainer.themeIcon :
 						placeholderViewContainer.iconUrl ? URI.revive(placeholderViewContainer.iconUrl) : undefined;
 					cachedViewContainer.views = placeholderViewContainer.views;
+					cachedViewContainer.isBuiltin = placeholderViewContainer.isBuiltin;
 				}
 			}
 		}
@@ -966,11 +993,12 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 			order
 		})));
 
-		this.setPlaceholderViewContainers(cachedViewContainers.map(({ id, icon, name, views }) => (<IPlaceholderViewContainer>{
+		this.setPlaceholderViewContainers(cachedViewContainers.map(({ id, icon, name, views, isBuiltin }) => (<IPlaceholderViewContainer>{
 			id,
 			iconUrl: URI.isUri(icon) ? icon : undefined,
 			themeIcon: ThemeIcon.isThemeIcon(icon) ? icon : undefined,
 			name,
+			isBuiltin,
 			views
 		})));
 	}
@@ -1067,7 +1095,7 @@ class FocusActivityBarAction extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.focusActivityBar',
-			title: { value: nls.localize('focusActivityBar', "Focus Activity Bar"), original: 'Focus Activity Bar' },
+			title: { value: localize('focusActivityBar', "Focus Activity Bar"), original: 'Focus Activity Bar' },
 			category: CATEGORIES.View,
 			f1: true
 		});
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index 06a031a56..70d629fb2 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { Action, IAction, Separator } from 'vs/base/common/actions';
+import { IAction, toAction } from 'vs/base/common/actions';
 import { illegalArgument } from 'vs/base/common/errors';
 import * as arrays from 'vs/base/common/arrays';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -149,10 +149,10 @@ export interface ICompositeBarOptions {
 	readonly preventLoopNavigation?: boolean;
 
 	getActivityAction: (compositeId: string) => ActivityAction;
-	getCompositePinnedAction: (compositeId: string) => Action;
-	getOnCompositeClickAction: (compositeId: string) => Action;
-	getContextMenuActions: () => Action[];
-	getContextMenuActionsForComposite: (compositeId: string) => Action[];
+	getCompositePinnedAction: (compositeId: string) => IAction;
+	getOnCompositeClickAction: (compositeId: string) => IAction;
+	fillExtraContextMenuActions: (actions: IAction[]) => void;
+	getContextMenuActionsForComposite: (compositeId: string) => IAction[];
 	openComposite: (compositeId: string) => Promise<IComposite | null>;
 	getDefaultCompositeId: () => string;
 	hidePart: () => void;
@@ -208,15 +208,15 @@ export class CompositeBar extends Widget implements ICompositeBar {
 	create(parent: HTMLElement): HTMLElement {
 		const actionBarDiv = parent.appendChild($('.composite-bar'));
 		this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
-			actionViewItemProvider: (action: IAction) => {
+			actionViewItemProvider: action => {
 				if (action instanceof CompositeOverflowActivityAction) {
 					return this.compositeOverflowActionViewItem;
 				}
 				const item = this.model.findItem(action.id);
 				return item && this.instantiationService.createInstance(
 					CompositeActionViewItem, action as ActivityAction, item.pinnedAction,
-					(compositeId: string) => this.options.getContextMenuActionsForComposite(compositeId),
-					() => this.getContextMenuActions() as Action[],
+					compositeId => this.options.getContextMenuActionsForComposite(compositeId),
+					() => this.getContextMenuActions(),
 					this.options.colors,
 					this.options.icon,
 					this.options.dndHandler,
@@ -319,7 +319,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this.updateCompositeSwitcher();
 	}
 
-	addComposite({ id, name, order, requestedIndex }: { id: string; name: string, order?: number, requestedIndex?: number }): void {
+	addComposite({ id, name, order, requestedIndex }: { id: string; name: string, order?: number, requestedIndex?: number; }): void {
 		// Add to the model
 		if (this.model.add(id, name, order, requestedIndex)) {
 			this.computeSizes([this.model.findItem(id)]);
@@ -596,7 +596,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 				this.compositeOverflowAction,
 				() => this.getOverflowingComposites(),
 				() => this.model.activeItem ? this.model.activeItem.id : undefined,
-				(compositeId: string) => {
+				compositeId => {
 					const item = this.model.findItem(compositeId);
 					return item?.activity[0]?.badge;
 				},
@@ -610,7 +610,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this._onDidChange.fire();
 	}
 
-	private getOverflowingComposites(): { id: string, name?: string }[] {
+	private getOverflowingComposites(): { id: string, name?: string; }[] {
 		let overflowingIds = this.model.visibleItems.filter(item => item.pinned).map(item => item.id);
 
 		// Show the active composite even if it is not pinned
@@ -631,9 +631,9 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		});
 	}
 
-	private getContextMenuActions(): IAction[] {
+	getContextMenuActions(): IAction[] {
 		const actions: IAction[] = this.model.visibleItems
-			.map(({ id, name, activityAction }) => (<IAction>{
+			.map(({ id, name, activityAction }) => (toAction({
 				id,
 				label: this.getAction(id).label || name || id,
 				checked: this.isPinned(id),
@@ -645,19 +645,17 @@ export class CompositeBar extends Widget implements ICompositeBar {
 						this.pin(id, true);
 					}
 				}
-			}));
-		const otherActions = this.options.getContextMenuActions();
-		if (otherActions.length) {
-			actions.push(new Separator());
-			actions.push(...otherActions);
-		}
+			})));
+
+		this.options.fillExtraContextMenuActions(actions);
+
 		return actions;
 	}
 }
 
 interface ICompositeBarModelItem extends ICompositeBarItem {
 	activityAction: ActivityAction;
-	pinnedAction: Action;
+	pinnedAction: IAction;
 	activity: ICompositeActivity[];
 }
 
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
index be07132e5..779b309c5 100644
--- a/src/vs/workbench/browser/parts/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { Action, Separator } from 'vs/base/common/actions';
+import { Action, IAction, Separator } from 'vs/base/common/actions';
 import * as dom from 'vs/base/browser/dom';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { dispose, toDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
@@ -374,14 +374,14 @@ export class CompositeOverflowActivityAction extends ActivityAction {
 }
 
 export class CompositeOverflowActivityActionViewItem extends ActivityActionViewItem {
-	private actions: Action[] = [];
+	private actions: IAction[] = [];
 
 	constructor(
 		action: ActivityAction,
 		private getOverflowingComposites: () => { id: string, name?: string }[],
 		private getActiveCompositeId: () => string | undefined,
 		private getBadge: (compositeId: string) => IBadge,
-		private getCompositeOpenAction: (compositeId: string) => Action,
+		private getCompositeOpenAction: (compositeId: string) => IAction,
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IThemeService themeService: IThemeService
@@ -404,7 +404,7 @@ export class CompositeOverflowActivityActionViewItem extends ActivityActionViewI
 		});
 	}
 
-	private getActions(): Action[] {
+	private getActions(): IAction[] {
 		return this.getOverflowingComposites().map(composite => {
 			const action = this.getCompositeOpenAction(composite.id);
 			action.checked = this.getActiveCompositeId() === action.id;
@@ -457,9 +457,9 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
 
 	constructor(
 		private compositeActivityAction: ActivityAction,
-		private toggleCompositePinnedAction: Action,
-		private compositeContextMenuActionsProvider: (compositeId: string) => ReadonlyArray<Action>,
-		private contextMenuActionsProvider: () => ReadonlyArray<Action>,
+		private toggleCompositePinnedAction: IAction,
+		private compositeContextMenuActionsProvider: (compositeId: string) => IAction[],
+		private contextMenuActionsProvider: () => IAction[],
 		colors: (theme: IColorTheme) => ICompositeBarColors,
 		icon: boolean,
 		private dndHandler: ICompositeDragAndDrop,
@@ -500,9 +500,14 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
 		return this.compositeActivity;
 	}
 
-	private getActivtyName(): string {
+	private getActivtyName(skipKeybinding = false): string {
+		let name = this.compositeActivityAction.activity.name;
+		if (skipKeybinding) {
+			return name;
+		}
+
 		const keybinding = this.compositeActivityAction.activity.keybindingId ? this.keybindingService.lookupKeybinding(this.compositeActivityAction.activity.keybindingId) : null;
-		return keybinding ? nls.localize('titleKeybinding', "{0} ({1})", this.compositeActivityAction.activity.name, keybinding.getLabel()) : this.compositeActivityAction.activity.name;
+		return keybinding ? nls.localize('titleKeybinding', "{0} ({1})", name, keybinding.getLabel()) : name;
 	}
 
 	render(container: HTMLElement): void {
@@ -601,7 +606,7 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
 	}
 
 	private showContextMenu(container: HTMLElement): void {
-		const actions: Action[] = [this.toggleCompositePinnedAction];
+		const actions: IAction[] = [this.toggleCompositePinnedAction];
 
 		const compositeContextMenuActions = this.compositeContextMenuActionsProvider(this.activity.id);
 		if (compositeContextMenuActions.length) {
@@ -615,10 +620,10 @@ export class CompositeActionViewItem extends ActivityActionViewItem {
 
 		const isPinned = this.compositeBar.isPinned(this.activity.id);
 		if (isPinned) {
-			this.toggleCompositePinnedAction.label = nls.localize('hide', "Hide");
+			this.toggleCompositePinnedAction.label = nls.localize('hide', "Hide '{0}'", this.getActivtyName(true));
 			this.toggleCompositePinnedAction.checked = false;
 		} else {
-			this.toggleCompositePinnedAction.label = nls.localize('keep', "Keep");
+			this.toggleCompositePinnedAction.label = nls.localize('keep', "Keep '{0}'", this.getActivtyName(true));
 		}
 
 		const otherActions = this.contextMenuActionsProvider();
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index 1350ddfe5..13fe045e5 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -327,10 +327,6 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		const primaryActions: IAction[] = composite?.getActions().slice(0) || [];
 		const secondaryActions: IAction[] = composite?.getSecondaryActions().slice(0) || [];
 
-		// From Part
-		primaryActions.push(...this.getActions());
-		secondaryActions.push(...this.getSecondaryActions());
-
 		// Update context
 		const toolBar = assertIsDefined(this.toolBar);
 		toolBar.context = this.actionsContextProvider();
@@ -471,14 +467,6 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return compositeItem ? compositeItem.progress : undefined;
 	}
 
-	protected getActions(): ReadonlyArray<IAction> {
-		return [];
-	}
-
-	protected getSecondaryActions(): ReadonlyArray<IAction> {
-		return [];
-	}
-
 	protected getTitleAreaDropDownAnchorAlignment(): AnchorAlignment {
 		return AnchorAlignment.RIGHT;
 	}
diff --git a/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts b/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
index b5fc1d1fa..836303dbf 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.ts
@@ -19,9 +19,9 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
 import { Disposable } from 'vs/base/common/lifecycle';
 
 export class DialogHandlerContribution extends Disposable implements IWorkbenchContribution {
-	private impl: IDialogHandler;
+	private readonly model: IDialogsModel;
+	private readonly impl: IDialogHandler;
 
-	private model: IDialogsModel;
 	private currentDialog: IDialogViewItem | undefined;
 
 	constructor(
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 541ea9b2c..026581b29 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -6,19 +6,13 @@
 import * as dom from 'vs/base/browser/dom';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent } from 'vs/base/browser/ui/breadcrumbs/breadcrumbsWidget';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { tail } from 'vs/base/common/arrays';
 import { timeout } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { extUri } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import 'vs/css!./media/breadcrumbscontrol';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
-import { SymbolKinds } from 'vs/editor/common/modes';
-import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { localize } from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -28,35 +22,92 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IListService, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
+import { IListService, WorkbenchDataTree, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { ColorIdentifier, ColorFunction } from 'vs/platform/theme/common/colorRegistry';
 import { attachBreadcrumbsStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ResourceLabel } from 'vs/workbench/browser/labels';
 import { BreadcrumbsConfig, IBreadcrumbsService } from 'vs/workbench/browser/parts/editor/breadcrumbs';
-import { BreadcrumbElement, EditorBreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
-import { BreadcrumbsPicker, createBreadcrumbsPicker } from 'vs/workbench/browser/parts/editor/breadcrumbsPicker';
+import { BreadcrumbsModel, FileElement, OutlineElement2 } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker, BreadcrumbsPicker } from 'vs/workbench/browser/parts/editor/breadcrumbsPicker';
 import { IEditorPartOptions, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
 import { onDidChangeZoomLevel } from 'vs/base/browser/browser';
-import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
 import { CATEGORIES } from 'vs/workbench/common/actions';
+import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
+import { IOutline } from 'vs/workbench/services/outline/browser/outline';
 
-class Item extends BreadcrumbsItem {
+class OutlineItem extends BreadcrumbsItem {
 
 	private readonly _disposables = new DisposableStore();
 
 	constructor(
-		readonly element: BreadcrumbElement,
+		readonly model: BreadcrumbsModel,
+		readonly element: OutlineElement2,
+		readonly options: IBreadcrumbsControlOptions
+	) {
+		super();
+	}
+
+	dispose(): void {
+		this._disposables.dispose();
+	}
+
+	equals(other: BreadcrumbsItem): boolean {
+		if (!(other instanceof OutlineItem)) {
+			return false;
+		}
+		return this.element === other.element &&
+			this.options.showFileIcons === other.options.showFileIcons &&
+			this.options.showSymbolIcons === other.options.showSymbolIcons;
+	}
+
+	render(container: HTMLElement): void {
+		const { element, outline } = this.element;
+
+		if (element === outline) {
+			const element = dom.$('span', undefined, '…');
+			container.appendChild(element);
+			return;
+		}
+
+		const templateId = outline.config.delegate.getTemplateId(element);
+		const renderer = outline.config.renderers.find(renderer => renderer.templateId === templateId);
+		if (!renderer) {
+			container.innerText = '<<NO RENDERER>>';
+			return;
+		}
+
+		const template = renderer.renderTemplate(container);
+		renderer.renderElement(<ITreeNode<any, any>>{
+			element,
+			children: [],
+			depth: 0,
+			visibleChildrenCount: 0,
+			visibleChildIndex: 0,
+			collapsible: false,
+			collapsed: false,
+			visible: true,
+			filterData: undefined
+		}, 0, template, undefined);
+
+		this._disposables.add(toDisposable(() => { renderer.disposeTemplate(template); }));
+	}
+
+}
+
+class FileItem extends BreadcrumbsItem {
+
+	private readonly _disposables = new DisposableStore();
+
+	constructor(
+		readonly model: BreadcrumbsModel,
+		readonly element: FileElement,
 		readonly options: IBreadcrumbsControlOptions,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
@@ -68,59 +119,26 @@ class Item extends BreadcrumbsItem {
 	}
 
 	equals(other: BreadcrumbsItem): boolean {
-		if (!(other instanceof Item)) {
+		if (!(other instanceof FileItem)) {
 			return false;
 		}
-		if (this.element instanceof FileElement && other.element instanceof FileElement) {
-			return (extUri.isEqual(this.element.uri, other.element.uri) &&
-				this.options.showFileIcons === other.options.showFileIcons &&
-				this.options.showSymbolIcons === other.options.showSymbolIcons);
-		}
-		if (this.element instanceof TreeElement && other.element instanceof TreeElement) {
-			return this.element.id === other.element.id;
-		}
-		return false;
+		return (extUri.isEqual(this.element.uri, other.element.uri) &&
+			this.options.showFileIcons === other.options.showFileIcons &&
+			this.options.showSymbolIcons === other.options.showSymbolIcons);
+
 	}
 
 	render(container: HTMLElement): void {
-		if (this.element instanceof FileElement) {
-			// file/folder
-			let label = this._instantiationService.createInstance(ResourceLabel, container, {});
-			label.element.setFile(this.element.uri, {
-				hidePath: true,
-				hideIcon: this.element.kind === FileKind.FOLDER || !this.options.showFileIcons,
-				fileKind: this.element.kind,
-				fileDecorations: { colors: this.options.showDecorationColors, badges: false },
-			});
-			container.classList.add(FileKind[this.element.kind].toLowerCase());
-			this._disposables.add(label);
-
-		} else if (this.element instanceof OutlineModel) {
-			// has outline element but not in one
-			let label = document.createElement('div');
-			label.innerText = '\u2026';
-			label.className = 'hint-more';
-			container.appendChild(label);
-
-		} else if (this.element instanceof OutlineGroup) {
-			// provider
-			let label = new IconLabel(container);
-			label.setLabel(this.element.label);
-			this._disposables.add(label);
-
-		} else if (this.element instanceof OutlineElement) {
-			// symbol
-			if (this.options.showSymbolIcons) {
-				let icon = document.createElement('div');
-				icon.className = SymbolKinds.toCssClassName(this.element.symbol.kind);
-				container.appendChild(icon);
-				container.classList.add('shows-symbol-icon');
-			}
-			let label = new IconLabel(container);
-			let title = this.element.symbol.name.replace(/\r|\n|\r\n/g, '\u23CE');
-			label.setLabel(title);
-			this._disposables.add(label);
-		}
+		// file/folder
+		let label = this._instantiationService.createInstance(ResourceLabel, container, {});
+		label.element.setFile(this.element.uri, {
+			hidePath: true,
+			hideIcon: this.element.kind === FileKind.FOLDER || !this.options.showFileIcons,
+			fileKind: this.element.kind,
+			fileDecorations: { colors: this.options.showDecorationColors, badges: false },
+		});
+		container.classList.add(FileKind[this.element.kind].toLowerCase());
+		this._disposables.add(label);
 	}
 }
 
@@ -170,26 +188,23 @@ export class BreadcrumbsControl {
 		private readonly _editorGroup: IEditorGroupView,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
-		@IEditorService private readonly _editorService: IEditorService,
-		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
-		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
 		@IFileService private readonly _fileService: IFileService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@IEditorService private readonly _editorService: IEditorService,
 		@ILabelService private readonly _labelService: ILabelService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IBreadcrumbsService breadcrumbsService: IBreadcrumbsService,
 	) {
 		this.domNode = document.createElement('div');
 		this.domNode.classList.add('breadcrumbs-control');
 		dom.append(container, this.domNode);
 
-		this._cfUseQuickPick = BreadcrumbsConfig.UseQuickPick.bindTo(_configurationService);
-		this._cfShowIcons = BreadcrumbsConfig.Icons.bindTo(_configurationService);
-		this._cfTitleScrollbarSizing = BreadcrumbsConfig.TitleScrollbarSizing.bindTo(_configurationService);
+		this._cfUseQuickPick = BreadcrumbsConfig.UseQuickPick.bindTo(configurationService);
+		this._cfShowIcons = BreadcrumbsConfig.Icons.bindTo(configurationService);
+		this._cfTitleScrollbarSizing = BreadcrumbsConfig.TitleScrollbarSizing.bindTo(configurationService);
 
 		const sizing = this._cfTitleScrollbarSizing.getValue() ?? 'default';
 		this._widget = new BreadcrumbsWidget(this.domNode, BreadcrumbsControl.SCROLLBAR_SIZES[sizing]);
@@ -256,14 +271,11 @@ export class BreadcrumbsControl {
 		this._ckBreadcrumbsVisible.set(true);
 		this._ckBreadcrumbsPossible.set(true);
 
-		const editor = this._getActiveCodeEditor();
-		const model = new EditorBreadcrumbsModel(
+		const model = this._instantiationService.createInstance(BreadcrumbsModel,
 			fileInfoUri ?? uri,
-			uri, editor,
-			this._configurationService,
-			this._textResourceConfigurationService,
-			this._workspaceService
+			this._editorGroup.activeEditorPane
 		);
+
 		this.domNode.classList.toggle('relative-path', model.isRelative());
 		this.domNode.classList.toggle('backslash-path', this._labelService.getSeparator(uri.scheme, uri.authority) === '\\');
 
@@ -274,7 +286,7 @@ export class BreadcrumbsControl {
 				showFileIcons: this._options.showFileIcons && showIcons,
 				showSymbolIcons: this._options.showSymbolIcons && showIcons
 			};
-			const items = model.getElements().map(element => new Item(element, options, this._instantiationService));
+			const items = model.getElements().map(element => element instanceof FileElement ? new FileItem(model, element, options, this._instantiationService) : new OutlineItem(model, element, options));
 			this._widget.setItems(items);
 			this._widget.reveal(items[items.length - 1]);
 		};
@@ -298,7 +310,7 @@ export class BreadcrumbsControl {
 		this._breadcrumbsDisposables.add({
 			dispose: () => {
 				if (this._breadcrumbsPickerShowing) {
-					this._contextViewService.hideContextView(this);
+					this._contextViewService.hideContextView({ source: this });
 				}
 			}
 		});
@@ -306,20 +318,6 @@ export class BreadcrumbsControl {
 		return true;
 	}
 
-	private _getActiveCodeEditor(): ICodeEditor | undefined {
-		if (!this._editorGroup.activeEditorPane) {
-			return undefined;
-		}
-		let control = this._editorGroup.activeEditorPane.getControl();
-		let editor: ICodeEditor | undefined;
-		if (isCodeEditor(control)) {
-			editor = control as ICodeEditor;
-		} else if (isDiffEditor(control)) {
-			editor = control.getModifiedEditor();
-		}
-		return editor;
-	}
-
 	private _onFocusEvent(event: IBreadcrumbsItemEvent): void {
 		if (event.item && this._breadcrumbsPickerShowing) {
 			this._breadcrumbsPickerIgnoreOnceItem = undefined;
@@ -339,13 +337,12 @@ export class BreadcrumbsControl {
 			return;
 		}
 
-		const { element } = event.item as Item;
+		const { element } = event.item as FileItem | OutlineItem;
 		this._editorGroup.focus();
 
-		type BreadcrumbSelectClassification = {
-			type: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-		};
-		this._telemetryService.publicLog2<{ type: string }, BreadcrumbSelectClassification>('breadcrumbs/select', { type: element instanceof TreeElement ? 'symbol' : 'file' });
+		type BreadcrumbSelect = { type: string };
+		type BreadcrumbSelectClassification = { type: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; };
+		this._telemetryService.publicLog2<BreadcrumbSelect, BreadcrumbSelectClassification>('breadcrumbs/select', { type: event.item instanceof OutlineItem ? 'symbol' : 'file' });
 
 		const group = this._getEditorGroup(event.payload);
 		if (group !== undefined) {
@@ -360,64 +357,31 @@ export class BreadcrumbsControl {
 			// using quick pick
 			this._widget.setFocused(undefined);
 			this._widget.setSelection(undefined);
-			this._quickInputService.quickAccess.show(element instanceof TreeElement ? '@' : '');
+			this._quickInputService.quickAccess.show(element instanceof OutlineElement2 ? '@' : '');
 			return;
 		}
 
 		// show picker
 		let picker: BreadcrumbsPicker;
 		let pickerAnchor: { x: number; y: number };
-		let editor = this._getActiveCodeEditor();
-		let editorDecorations: string[] = [];
-		let editorViewState: ICodeEditorViewState | undefined;
+
+		interface IHideData { didPick?: boolean, source?: BreadcrumbsControl }
 
 		this._contextViewService.showContextView({
 			render: (parent: HTMLElement) => {
-				picker = createBreadcrumbsPicker(this._instantiationService, parent, element);
-				let selectListener = picker.onDidPickElement(data => {
-					if (data.target) {
-						editorViewState = undefined;
-					}
-					this._contextViewService.hideContextView(this);
+				if (event.item instanceof FileItem) {
+					picker = this._instantiationService.createInstance(BreadcrumbsFilePicker, parent, event.item.model.resource);
+				} else if (event.item instanceof OutlineItem) {
+					picker = this._instantiationService.createInstance(BreadcrumbsOutlinePicker, parent, event.item.model.resource);
+				}
 
-					const group = (picker.useAltAsMultipleSelectionModifier && (data.browserEvent as MouseEvent).metaKey) || (!picker.useAltAsMultipleSelectionModifier && (data.browserEvent as MouseEvent).altKey)
-						? SIDE_GROUP
-						: ACTIVE_GROUP;
-
-					this._revealInEditor(event, data.target, group, (data.browserEvent as MouseEvent).button === 1);
-					/* __GDPR__
-						"breadcrumbs/open" : {
-							"type": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-						}
-					*/
-					this._telemetryService.publicLog('breadcrumbs/open', { type: !data ? 'nothing' : data.target instanceof TreeElement ? 'symbol' : 'file' });
-				});
-				let focusListener = picker.onDidFocusElement(data => {
-					if (!editor || !(data.target instanceof OutlineElement)) {
-						return;
-					}
-					if (!editorViewState) {
-						editorViewState = withNullAsUndefined(editor.saveViewState());
-					}
-					const { symbol } = data.target;
-					editor.revealRangeInCenterIfOutsideViewport(symbol.range, ScrollType.Smooth);
-					editorDecorations = editor.deltaDecorations(editorDecorations, [{
-						range: symbol.range,
-						options: {
-							className: 'rangeHighlight',
-							isWholeLine: true
-						}
-					}]);
-				});
-
-				let zoomListener = onDidChangeZoomLevel(() => {
-					this._contextViewService.hideContextView(this);
-				});
+				let selectListener = picker.onWillPickElement(() => this._contextViewService.hideContextView({ source: this, didPick: true }));
+				let zoomListener = onDidChangeZoomLevel(() => this._contextViewService.hideContextView({ source: this }));
 
 				let focusTracker = dom.trackFocus(parent);
 				let blurListener = focusTracker.onDidBlur(() => {
 					this._breadcrumbsPickerIgnoreOnceItem = this._widget.isDOMFocused() ? event.item : undefined;
-					this._contextViewService.hideContextView(this);
+					this._contextViewService.hideContextView({ source: this });
 				});
 
 				this._breadcrumbsPickerShowing = true;
@@ -426,7 +390,6 @@ export class BreadcrumbsControl {
 				return combinedDisposable(
 					picker,
 					selectListener,
-					focusListener,
 					zoomListener,
 					focusTracker,
 					blurListener
@@ -465,19 +428,17 @@ export class BreadcrumbsControl {
 				}
 				return pickerAnchor;
 			},
-			onHide: (data) => {
-				if (editor) {
-					editor.deltaDecorations(editorDecorations, []);
-					if (editorViewState) {
-						editor.restoreViewState(editorViewState);
-					}
+			onHide: (data?: IHideData) => {
+				if (!data?.didPick) {
+					picker.restoreViewState();
 				}
 				this._breadcrumbsPickerShowing = false;
 				this._updateCkBreadcrumbsActive();
-				if (data === this) {
+				if (data?.source === this) {
 					this._widget.setFocused(undefined);
 					this._widget.setSelection(undefined);
 				}
+				picker.dispose();
 			}
 		});
 	}
@@ -487,11 +448,11 @@ export class BreadcrumbsControl {
 		this._ckBreadcrumbsActive.set(value);
 	}
 
-	private _revealInEditor(event: IBreadcrumbsItemEvent, element: BreadcrumbElement, group: SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | undefined, pinned: boolean = false): void {
+	private async _revealInEditor(event: IBreadcrumbsItemEvent, element: FileElement | OutlineElement2, group: SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | undefined, pinned: boolean = false): Promise<void> {
+
 		if (element instanceof FileElement) {
 			if (element.kind === FileKind.FILE) {
-				// open file in any editor
-				this._editorService.openEditor({ resource: element.uri, options: { pinned } }, group);
+				await this._editorService.openEditor({ resource: element.uri, options: { pinned } }, group);
 			} else {
 				// show next picker
 				let items = this._widget.getItems();
@@ -499,20 +460,8 @@ export class BreadcrumbsControl {
 				this._widget.setFocused(items[idx + 1]);
 				this._widget.setSelection(items[idx + 1], BreadcrumbsControl.Payload_Pick);
 			}
-
-		} else if (element instanceof OutlineElement) {
-			// open symbol in code editor
-			const model = OutlineModel.get(element);
-			if (model) {
-				this._codeEditorService.openCodeEditor({
-					resource: model.uri,
-					options: {
-						selection: Range.collapseToStart(element.symbol.selectionRange),
-						selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
-						pinned
-					}
-				}, withUndefinedAsNull(this._getActiveCodeEditor()), group === SIDE_GROUP);
-			}
+		} else {
+			element.outline.reveal(element, { pinned }, group === SIDE_GROUP);
 		}
 	}
 
@@ -744,29 +693,29 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler(accessor) {
 		const editors = accessor.get(IEditorService);
 		const lists = accessor.get(IListService);
-		const element = lists.lastFocusedList ? <OutlineElement | IFileStat>lists.lastFocusedList.getFocus()[0] : undefined;
-		if (element instanceof OutlineElement) {
-			const outlineElement = OutlineModel.get(element);
-			if (!outlineElement) {
-				return undefined;
-			}
 
-			// open symbol in editor
-			return editors.openEditor({
-				resource: outlineElement.uri,
-				options: { selection: Range.collapseToStart(element.symbol.selectionRange), pinned: true }
-			}, SIDE_GROUP);
+		const tree = lists.lastFocusedList;
+		if (!(tree instanceof WorkbenchDataTree)) {
+			return;
+		}
 
-		} else if (element && URI.isUri(element.resource)) {
-			// open file in editor
+		const element = <IFileStat | unknown>tree.getFocus()[0];
+
+		if (URI.isUri((<IFileStat>element)?.resource)) {
+			// IFileStat: open file in editor
 			return editors.openEditor({
-				resource: element.resource,
+				resource: (<IFileStat>element).resource,
 				options: { pinned: true }
 			}, SIDE_GROUP);
+		}
 
-		} else {
-			// ignore
-			return undefined;
+		// IOutline: check if this the outline and iff so reveal element
+		const input = tree.getInput();
+		if (input && typeof (<IOutline<any>>input).outlineKind === 'string') {
+			return (<IOutline<any>>input).reveal(element, {
+				pinned: true,
+				preserveFocus: false
+			}, true);
 		}
 	}
 });
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
index 01ff3916e..4364969d2 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -3,27 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { TimeoutTimer } from 'vs/base/common/async';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { isEqual, dirname } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IPosition } from 'vs/editor/common/core/position';
-import { DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
-import { OutlineElement, OutlineGroup, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { Schemas } from 'vs/base/common/network';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
 import { FileKind } from 'vs/platform/files/common/files';
 import { withNullAsUndefined } from 'vs/base/common/types';
-import { OutlineFilter } from 'vs/editor/contrib/documentSymbols/outlineTree';
-import { ITextModel } from 'vs/editor/common/model';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { IOutline, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { IEditorPane } from 'vs/workbench/common/editor';
 
 export class FileElement {
 	constructor(
@@ -32,11 +25,16 @@ export class FileElement {
 	) { }
 }
 
-export type BreadcrumbElement = FileElement | OutlineModel | OutlineGroup | OutlineElement;
-
 type FileInfo = { path: FileElement[], folder?: IWorkspaceFolder };
 
-export class EditorBreadcrumbsModel {
+export class OutlineElement2 {
+	constructor(
+		readonly element: IOutline<any> | any,
+		readonly outline: IOutline<any>
+	) { }
+}
+
+export class BreadcrumbsModel {
 
 	private readonly _disposables = new DisposableStore();
 	private readonly _fileInfo: FileInfo;
@@ -45,28 +43,31 @@ export class EditorBreadcrumbsModel {
 	private readonly _cfgFilePath: BreadcrumbsConfig<'on' | 'off' | 'last'>;
 	private readonly _cfgSymbolPath: BreadcrumbsConfig<'on' | 'off' | 'last'>;
 
-	private _outlineElements: Array<OutlineModel | OutlineGroup | OutlineElement> = [];
-	private _outlineDisposables = new DisposableStore();
+	private readonly _currentOutline = new MutableDisposable<IOutline<any>>();
+	private readonly _outlineDisposables = new DisposableStore();
 
 	private readonly _onDidUpdate = new Emitter<this>();
 	readonly onDidUpdate: Event<this> = this._onDidUpdate.event;
 
 	constructor(
-		fileInfoUri: URI,
-		private readonly _uri: URI,
-		private readonly _editor: ICodeEditor | undefined,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
-		@IWorkspaceContextService workspaceService: IWorkspaceContextService,
+		readonly resource: URI,
+		editor: IEditorPane | undefined,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+		@IOutlineService private readonly _outlineService: IOutlineService,
 	) {
-		this._cfgEnabled = BreadcrumbsConfig.IsEnabled.bindTo(_configurationService);
-		this._cfgFilePath = BreadcrumbsConfig.FilePath.bindTo(_configurationService);
-		this._cfgSymbolPath = BreadcrumbsConfig.SymbolPath.bindTo(_configurationService);
+		this._cfgEnabled = BreadcrumbsConfig.IsEnabled.bindTo(configurationService);
+		this._cfgFilePath = BreadcrumbsConfig.FilePath.bindTo(configurationService);
+		this._cfgSymbolPath = BreadcrumbsConfig.SymbolPath.bindTo(configurationService);
 
 		this._disposables.add(this._cfgFilePath.onDidChange(_ => this._onDidUpdate.fire(this)));
 		this._disposables.add(this._cfgSymbolPath.onDidChange(_ => this._onDidUpdate.fire(this)));
-		this._fileInfo = EditorBreadcrumbsModel._initFilePathInfo(fileInfoUri, workspaceService);
-		this._bindToEditor();
+		this._fileInfo = this._initFilePathInfo(resource);
+
+		if (editor) {
+			this._bindToEditor(editor);
+			this._disposables.add(_outlineService.onDidChange(() => this._bindToEditor(editor)));
+		}
 		this._onDidUpdate.fire(this);
 	}
 
@@ -74,6 +75,7 @@ export class EditorBreadcrumbsModel {
 		this._cfgEnabled.dispose();
 		this._cfgFilePath.dispose();
 		this._cfgSymbolPath.dispose();
+		this._currentOutline.dispose();
 		this._outlineDisposables.dispose();
 		this._disposables.dispose();
 		this._onDidUpdate.dispose();
@@ -83,8 +85,8 @@ export class EditorBreadcrumbsModel {
 		return Boolean(this._fileInfo.folder);
 	}
 
-	getElements(): ReadonlyArray<BreadcrumbElement> {
-		let result: BreadcrumbElement[] = [];
+	getElements(): ReadonlyArray<FileElement | OutlineElement2> {
+		let result: (FileElement | OutlineElement2)[] = [];
 
 		// file path elements
 		if (this._cfgFilePath.getValue() === 'on') {
@@ -93,17 +95,27 @@ export class EditorBreadcrumbsModel {
 			result = result.concat(this._fileInfo.path.slice(-1));
 		}
 
-		// symbol path elements
-		if (this._cfgSymbolPath.getValue() === 'on') {
-			result = result.concat(this._outlineElements);
-		} else if (this._cfgSymbolPath.getValue() === 'last' && this._outlineElements.length > 0) {
-			result = result.concat(this._outlineElements.slice(-1));
+		if (this._cfgSymbolPath.getValue() === 'off') {
+			return result;
+		}
+
+		if (!this._currentOutline.value) {
+			return result;
+		}
+
+		const breadcrumbsElements = this._currentOutline.value.config.breadcrumbsDataSource.getBreadcrumbElements();
+		for (let i = this._cfgSymbolPath.getValue() === 'last' && breadcrumbsElements.length > 0 ? breadcrumbsElements.length - 1 : 0; i < breadcrumbsElements.length; i++) {
+			result.push(new OutlineElement2(breadcrumbsElements[i], this._currentOutline.value));
+		}
+
+		if (breadcrumbsElements.length === 0 && !this._currentOutline.value.isEmpty) {
+			result.push(new OutlineElement2(this._currentOutline.value, this._currentOutline.value));
 		}
 
 		return result;
 	}
 
-	private static _initFilePathInfo(uri: URI, workspaceService: IWorkspaceContextService): FileInfo {
+	private _initFilePathInfo(uri: URI): FileInfo {
 
 		if (uri.scheme === Schemas.untitled) {
 			return {
@@ -113,7 +125,7 @@ export class EditorBreadcrumbsModel {
 		}
 
 		let info: FileInfo = {
-			folder: withNullAsUndefined(workspaceService.getWorkspaceFolder(uri)),
+			folder: withNullAsUndefined(this._workspaceService.getWorkspaceFolder(uri)),
 			path: []
 		};
 
@@ -130,181 +142,33 @@ export class EditorBreadcrumbsModel {
 			}
 		}
 
-		if (info.folder && workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+		if (info.folder && this._workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
 			info.path.unshift(new FileElement(info.folder.uri, FileKind.ROOT_FOLDER));
 		}
 		return info;
 	}
 
-	private _bindToEditor(): void {
-		if (!this._editor) {
-			return;
-		}
-		// update as language, model, providers changes
-		this._disposables.add(DocumentSymbolProviderRegistry.onDidChange(_ => this._updateOutline()));
-		this._disposables.add(this._editor.onDidChangeModel(_ => this._updateOutline()));
-		this._disposables.add(this._editor.onDidChangeModelLanguage(_ => this._updateOutline()));
-
-		// update when config changes (re-render)
-		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (!this._cfgEnabled.getValue()) {
-				// breadcrumbs might be disabled (also via a setting/config) and that is
-				// something we must check before proceeding.
-				return;
-			}
-			if (e.affectsConfiguration('breadcrumbs')) {
-				this._updateOutline(true);
-				return;
-			}
-			if (this._editor && this._editor.getModel()) {
-				const editorModel = this._editor.getModel() as ITextModel;
-				const languageName = editorModel.getLanguageIdentifier().language;
-
-				// Checking for changes in the current language override config.
-				// We can't be more specific than this because the ConfigurationChangeEvent(e) only includes the first part of the root path
-				if (e.affectsConfiguration(`[${languageName}]`)) {
-					this._updateOutline(true);
-				}
-			}
-		}));
-
-
-		// update soon'ish as model content change
-		const updateSoon = new TimeoutTimer();
-		this._disposables.add(updateSoon);
-		this._disposables.add(this._editor.onDidChangeModelContent(_ => {
-			const timeout = OutlineModel.getRequestDelay(this._editor!.getModel());
-			updateSoon.cancelAndSet(() => this._updateOutline(true), timeout);
-		}));
-		this._updateOutline();
-
-		// stop when editor dies
-		this._disposables.add(this._editor.onDidDispose(() => this._outlineDisposables.clear()));
-	}
-
-	private _updateOutline(didChangeContent?: boolean): void {
-
+	private _bindToEditor(editor: IEditorPane): void {
+		const newCts = new CancellationTokenSource();
+		this._currentOutline.clear();
 		this._outlineDisposables.clear();
-		if (!didChangeContent) {
-			this._updateOutlineElements([]);
-		}
+		this._outlineDisposables.add(toDisposable(() => newCts.dispose(true)));
 
-		const editor = this._editor!;
-
-		const buffer = editor.getModel();
-		if (!buffer || !DocumentSymbolProviderRegistry.has(buffer) || !isEqual(buffer.uri, this._uri)) {
-			return;
-		}
-
-		const source = new CancellationTokenSource();
-		const versionIdThen = buffer.getVersionId();
-		const timeout = new TimeoutTimer();
-
-		this._outlineDisposables.add({
-			dispose: () => {
-				source.dispose(true);
-				timeout.dispose();
+		this._outlineService.createOutline(editor, OutlineTarget.Breadcrumbs, newCts.token).then(outline => {
+			if (newCts.token.isCancellationRequested) {
+				// cancelled: dispose new outline and reset
+				outline?.dispose();
+				outline = undefined;
 			}
-		});
-
-		OutlineModel.create(buffer, source.token).then(model => {
-			if (source.token.isCancellationRequested) {
-				// cancelled -> do nothing
-				return;
+			this._currentOutline.value = outline;
+			this._onDidUpdate.fire(this);
+			if (outline) {
+				this._outlineDisposables.add(outline.onDidChange(() => this._onDidUpdate.fire(this)));
 			}
-			if (TreeElement.empty(model)) {
-				// empty -> no outline elements
-				this._updateOutlineElements([]);
 
-			} else {
-				// copy the model
-				model = model.adopt();
-
-				this._updateOutlineElements(this._getOutlineElements(model, editor.getPosition()));
-				this._outlineDisposables.add(editor.onDidChangeCursorPosition(_ => {
-					timeout.cancelAndSet(() => {
-						if (!buffer.isDisposed() && versionIdThen === buffer.getVersionId() && editor.getModel()) {
-							this._updateOutlineElements(this._getOutlineElements(model, editor.getPosition()));
-						}
-					}, 150);
-				}));
-			}
 		}).catch(err => {
-			this._updateOutlineElements([]);
+			this._onDidUpdate.fire(this);
 			onUnexpectedError(err);
 		});
 	}
-
-	private _getOutlineElements(model: OutlineModel, position: IPosition | null): Array<OutlineModel | OutlineGroup | OutlineElement> {
-		if (!model || !position) {
-			return [];
-		}
-		let item: OutlineGroup | OutlineElement | undefined = model.getItemEnclosingPosition(position);
-		if (!item) {
-			return this._getOutlineElementsRoot(model);
-		}
-		let chain: Array<OutlineGroup | OutlineElement> = [];
-		while (item) {
-			chain.push(item);
-			let parent: any = item.parent;
-			if (parent instanceof OutlineModel) {
-				break;
-			}
-			if (parent instanceof OutlineGroup && parent.parent && parent.parent.children.size === 1) {
-				break;
-			}
-			item = parent;
-		}
-		let result: Array<OutlineGroup | OutlineElement> = [];
-		for (let i = chain.length - 1; i >= 0; i--) {
-			let element = chain[i];
-			if (this._isFiltered(element)) {
-				break;
-			}
-			result.push(element);
-		}
-		if (result.length === 0) {
-			return this._getOutlineElementsRoot(model);
-		}
-		return result;
-	}
-
-	private _getOutlineElementsRoot(model: OutlineModel): (OutlineModel | OutlineGroup | OutlineElement)[] {
-		for (const child of model.children.values()) {
-			if (!this._isFiltered(child)) {
-				return [model];
-			}
-		}
-		return [];
-	}
-
-	private _isFiltered(element: TreeElement): boolean {
-		if (element instanceof OutlineElement) {
-			const key = `breadcrumbs.${OutlineFilter.kindToConfigName[element.symbol.kind]}`;
-			let uri: URI | undefined;
-			if (this._editor && this._editor.getModel()) {
-				const model = this._editor.getModel() as ITextModel;
-				uri = model.uri;
-			}
-			return !this._textResourceConfigurationService.getValue<boolean>(uri, key);
-		}
-		return false;
-	}
-
-	private _updateOutlineElements(elements: Array<OutlineModel | OutlineGroup | OutlineElement>): void {
-		if (!equals(elements, this._outlineElements, EditorBreadcrumbsModel._outlineElementEquals)) {
-			this._outlineElements = elements;
-			this._onDidUpdate.fire(this);
-		}
-	}
-
-	private static _outlineElementEquals(a: OutlineModel | OutlineGroup | OutlineElement, b: OutlineModel | OutlineGroup | OutlineElement): boolean {
-		if (a === b) {
-			return true;
-		} else if (!a || !b) {
-			return false;
-		} else {
-			return a.id === b.id;
-		}
-	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 001398ec0..223380e6c 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -8,34 +8,30 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { createMatches, FuzzyScore } from 'vs/base/common/filters';
 import * as glob from 'vs/base/common/glob';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore, MutableDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { posix } from 'vs/base/common/path';
 import { basename, dirname, isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import 'vs/css!./media/breadcrumbscontrol';
-import { OutlineElement, OutlineModel, TreeElement } from 'vs/editor/contrib/documentSymbols/outlineModel';
-import { IConfigurationService, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { FileKind, IFileService, IFileStat } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WorkbenchDataTree, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
 import { breadcrumbsPickerBackground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { isWorkspace, isWorkspaceFolder, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
-import { BreadcrumbElement, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { OutlineElement2, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
 import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
-import { OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItemComparator, OutlineIdentityProvider, OutlineNavigationLabelProvider, OutlineDataSource, OutlineSortOrder, OutlineFilter, OutlineAccessibilityProvider } from 'vs/editor/contrib/documentSymbols/outlineTree';
 import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
 import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { IModeService } from 'vs/editor/common/services/modeService';
 import { localize } from 'vs/nls';
-
-export function createBreadcrumbsPicker(instantiationService: IInstantiationService, parent: HTMLElement, element: BreadcrumbElement): BreadcrumbsPicker {
-	return element instanceof FileElement
-		? instantiationService.createInstance(BreadcrumbsFilePicker, parent)
-		: instantiationService.createInstance(BreadcrumbsOutlinePicker, parent);
-}
+import { IOutline, IOutlineComparator } from 'vs/workbench/services/outline/browser/outline';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
 
 interface ILayoutInfo {
 	maxHeight: number;
@@ -62,17 +58,18 @@ export abstract class BreadcrumbsPicker {
 	protected _fakeEvent = new UIEvent('fakeEvent');
 	protected _layoutInfo!: ILayoutInfo;
 
-	private readonly _onDidPickElement = new Emitter<SelectEvent>();
-	readonly onDidPickElement: Event<SelectEvent> = this._onDidPickElement.event;
+	protected readonly _onWillPickElement = new Emitter<void>();
+	readonly onWillPickElement: Event<void> = this._onWillPickElement.event;
 
-	private readonly _onDidFocusElement = new Emitter<SelectEvent>();
-	readonly onDidFocusElement: Event<SelectEvent> = this._onDidFocusElement.event;
+	private readonly _previewDispoables = new MutableDisposable();
 
 	constructor(
 		parent: HTMLElement,
+		protected resource: URI,
 		@IInstantiationService protected readonly _instantiationService: IInstantiationService,
 		@IThemeService protected readonly _themeService: IThemeService,
 		@IConfigurationService protected readonly _configurationService: IConfigurationService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 	) {
 		this._domNode = document.createElement('div');
 		this._domNode.className = 'monaco-breadcrumbs-picker show-file-icons';
@@ -81,12 +78,13 @@ export abstract class BreadcrumbsPicker {
 
 	dispose(): void {
 		this._disposables.dispose();
-		this._onDidPickElement.dispose();
-		this._onDidFocusElement.dispose();
-		this._tree.dispose();
+		this._previewDispoables.dispose();
+		this._onWillPickElement.dispose();
+		this._domNode.remove();
+		setTimeout(() => this._tree.dispose(), 0); // tree cannot be disposed while being opened...
 	}
 
-	show(input: any, maxHeight: number, width: number, arrowSize: number, arrowOffset: number): void {
+	async show(input: any, maxHeight: number, width: number, arrowSize: number, arrowOffset: number): Promise<void> {
 
 		const theme = this._themeService.getColorTheme();
 		const color = theme.getColor(breadcrumbsPickerBackground);
@@ -103,33 +101,33 @@ export abstract class BreadcrumbsPicker {
 		this._domNode.appendChild(this._treeContainer);
 
 		this._layoutInfo = { maxHeight, width, arrowSize, arrowOffset, inputHeight: 0 };
-		this._tree = this._createTree(this._treeContainer);
+		this._tree = this._createTree(this._treeContainer, input);
 
-		this._disposables.add(this._tree.onDidChangeSelection(e => {
-			if (e.browserEvent !== this._fakeEvent) {
-				const target = this._getTargetFromEvent(e.elements[0]);
-				if (target) {
-					setTimeout(_ => {// need to debounce here because this disposes the tree and the tree doesn't like to be disposed on click
-						this._onDidPickElement.fire({ target, browserEvent: e.browserEvent || new UIEvent('fake') });
-					}, 0);
-				}
+		this._disposables.add(this._tree.onDidOpen(async e => {
+			const { element, editorOptions, sideBySide } = e;
+			const didReveal = await this._revealElement(element, { ...editorOptions, preserveFocus: false }, sideBySide);
+			if (!didReveal) {
+				return;
 			}
+			// send telemetry
+			interface OpenEvent { type: string }
+			interface OpenEventGDPR { type: { classification: 'SystemMetaData', purpose: 'FeatureInsight' } }
+			this._telemetryService.publicLog2<OpenEvent, OpenEventGDPR>('breadcrumbs/open', { type: element instanceof OutlineElement2 ? 'symbol' : 'file' });
 		}));
 		this._disposables.add(this._tree.onDidChangeFocus(e => {
-			const target = this._getTargetFromEvent(e.elements[0]);
-			if (target) {
-				this._onDidFocusElement.fire({ target, browserEvent: e.browserEvent || new UIEvent('fake') });
-			}
+			this._previewDispoables.value = this._previewElement(e.elements[0]);
 		}));
 		this._disposables.add(this._tree.onDidChangeContentHeight(() => {
 			this._layout();
 		}));
 
 		this._domNode.focus();
-
-		this._setInput(input).then(() => {
+		try {
+			await this._setInput(input);
 			this._layout();
-		}).catch(onUnexpectedError);
+		} catch (err) {
+			onUnexpectedError(err);
+		}
 	}
 
 	protected _layout(): void {
@@ -146,16 +144,15 @@ export abstract class BreadcrumbsPicker {
 		this._treeContainer.style.height = `${treeHeight}px`;
 		this._treeContainer.style.width = `${this._layoutInfo.width}px`;
 		this._tree.layout(treeHeight, this._layoutInfo.width);
-
 	}
 
-	get useAltAsMultipleSelectionModifier() {
-		return this._tree.useAltAsMultipleSelectionModifier;
-	}
+	restoreViewState(): void { }
+
+	protected abstract _setInput(element: FileElement | OutlineElement2): Promise<void>;
+	protected abstract _createTree(container: HTMLElement, input: any): Tree<any, any>;
+	protected abstract _previewElement(element: any): IDisposable;
+	protected abstract _revealElement(element: any, options: IEditorOptions, sideBySide: boolean): Promise<boolean>;
 
-	protected abstract _setInput(element: BreadcrumbElement): Promise<void>;
-	protected abstract _createTree(container: HTMLElement): Tree<any, any>;
-	protected abstract _getTargetFromEvent(element: any): any | undefined;
 }
 
 //#region - Files
@@ -173,9 +170,9 @@ class FileIdentityProvider implements IIdentityProvider<IWorkspace | IWorkspaceF
 	getId(element: IWorkspace | IWorkspaceFolder | IFileStat | URI): { toString(): string; } {
 		if (URI.isUri(element)) {
 			return element.toString();
-		} else if (IWorkspace.isIWorkspace(element)) {
+		} else if (isWorkspace(element)) {
 			return element.id;
-		} else if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+		} else if (isWorkspaceFolder(element)) {
 			return element.uri.toString();
 		} else {
 			return element.resource.toString();
@@ -186,43 +183,31 @@ class FileIdentityProvider implements IIdentityProvider<IWorkspace | IWorkspaceF
 
 class FileDataSource implements IAsyncDataSource<IWorkspace | URI, IWorkspaceFolder | IFileStat> {
 
-	private readonly _parents = new WeakMap<object, IWorkspaceFolder | IFileStat>();
-
 	constructor(
 		@IFileService private readonly _fileService: IFileService,
 	) { }
 
 	hasChildren(element: IWorkspace | URI | IWorkspaceFolder | IFileStat): boolean {
 		return URI.isUri(element)
-			|| IWorkspace.isIWorkspace(element)
-			|| IWorkspaceFolder.isIWorkspaceFolder(element)
+			|| isWorkspace(element)
+			|| isWorkspaceFolder(element)
 			|| element.isDirectory;
 	}
 
-	getChildren(element: IWorkspace | URI | IWorkspaceFolder | IFileStat): Promise<(IWorkspaceFolder | IFileStat)[]> {
-
-		if (IWorkspace.isIWorkspace(element)) {
-			return Promise.resolve(element.folders).then(folders => {
-				for (let child of folders) {
-					this._parents.set(element, child);
-				}
-				return folders;
-			});
+	async getChildren(element: IWorkspace | URI | IWorkspaceFolder | IFileStat): Promise<(IWorkspaceFolder | IFileStat)[]> {
+		if (isWorkspace(element)) {
+			return element.folders;
 		}
 		let uri: URI;
-		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+		if (isWorkspaceFolder(element)) {
 			uri = element.uri;
 		} else if (URI.isUri(element)) {
 			uri = element;
 		} else {
 			uri = element.resource;
 		}
-		return this._fileService.resolve(uri).then(stat => {
-			for (const child of stat.children || []) {
-				this._parents.set(stat, child);
-			}
-			return stat.children || [];
-		});
+		const stat = await this._fileService.resolve(uri);
+		return stat.children ?? [];
 	}
 }
 
@@ -245,7 +230,7 @@ class FileRenderer implements ITreeRenderer<IFileStat | IWorkspaceFolder, FuzzyS
 		const { element } = node;
 		let resource: URI;
 		let fileKind: FileKind;
-		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+		if (isWorkspaceFolder(element)) {
 			resource = element.uri;
 			fileKind = FileKind.ROOT_FOLDER;
 		} else {
@@ -327,7 +312,7 @@ class FileFilter implements ITreeFilter<IWorkspaceFolder | IFileStat> {
 	}
 
 	filter(element: IWorkspaceFolder | IFileStat, _parentVisibility: TreeVisibility): boolean {
-		if (IWorkspaceFolder.isIWorkspaceFolder(element)) {
+		if (isWorkspaceFolder(element)) {
 			// not a file
 			return true;
 		}
@@ -345,7 +330,7 @@ class FileFilter implements ITreeFilter<IWorkspaceFolder | IFileStat> {
 
 export class FileSorter implements ITreeSorter<IFileStat | IWorkspaceFolder> {
 	compare(a: IFileStat | IWorkspaceFolder, b: IFileStat | IWorkspaceFolder): number {
-		if (IWorkspaceFolder.isIWorkspaceFolder(a) && IWorkspaceFolder.isIWorkspaceFolder(b)) {
+		if (isWorkspaceFolder(a) && isWorkspaceFolder(b)) {
 			return a.index - b.index;
 		}
 		if ((a as IFileStat).isDirectory === (b as IFileStat).isDirectory) {
@@ -363,12 +348,15 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
 
 	constructor(
 		parent: HTMLElement,
+		protected resource: URI,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configService: IConfigurationService,
 		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@ITelemetryService telemetryService: ITelemetryService,
 	) {
-		super(parent, instantiationService, themeService, configService);
+		super(parent, resource, instantiationService, themeService, configService, telemetryService);
 	}
 
 	_createTree(container: HTMLElement) {
@@ -406,7 +394,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
 			});
 	}
 
-	_setInput(element: BreadcrumbElement): Promise<void> {
+	async _setInput(element: FileElement | OutlineElement2): Promise<void> {
 		const { uri, kind } = (element as FileElement);
 		let input: IWorkspace | URI;
 		if (kind === FileKind.ROOT_FOLDER) {
@@ -416,115 +404,120 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
 		}
 
 		const tree = this._tree as WorkbenchAsyncDataTree<IWorkspace | URI, IWorkspaceFolder | IFileStat, FuzzyScore>;
-		return tree.setInput(input).then(() => {
-			let focusElement: IWorkspaceFolder | IFileStat | undefined;
-			for (const { element } of tree.getNode().children) {
-				if (IWorkspaceFolder.isIWorkspaceFolder(element) && isEqual(element.uri, uri)) {
-					focusElement = element;
-					break;
-				} else if (isEqual((element as IFileStat).resource, uri)) {
-					focusElement = element as IFileStat;
-					break;
-				}
+		await tree.setInput(input);
+		let focusElement: IWorkspaceFolder | IFileStat | undefined;
+		for (const { element } of tree.getNode().children) {
+			if (isWorkspaceFolder(element) && isEqual(element.uri, uri)) {
+				focusElement = element;
+				break;
+			} else if (isEqual((element as IFileStat).resource, uri)) {
+				focusElement = element as IFileStat;
+				break;
 			}
-			if (focusElement) {
-				tree.reveal(focusElement, 0.5);
-				tree.setFocus([focusElement], this._fakeEvent);
-			}
-			tree.domFocus();
-		});
+		}
+		if (focusElement) {
+			tree.reveal(focusElement, 0.5);
+			tree.setFocus([focusElement], this._fakeEvent);
+		}
+		tree.domFocus();
 	}
 
-	protected _getTargetFromEvent(element: any): any | undefined {
-		if (element && !IWorkspaceFolder.isIWorkspaceFolder(element) && !(element as IFileStat).isDirectory) {
-			return new FileElement((element as IFileStat).resource, FileKind.FILE);
+	protected _previewElement(_element: any): IDisposable {
+		return Disposable.None;
+	}
+
+	async _revealElement(element: IFileStat | IWorkspaceFolder, options: IEditorOptions, sideBySide: boolean): Promise<boolean> {
+		let resource: URI | undefined;
+		if (isWorkspaceFolder(element)) {
+			resource = element.uri;
+		} else if (!element.isDirectory) {
+			resource = element.resource;
 		}
+		if (resource) {
+			this._onWillPickElement.fire();
+			await this._editorService.openEditor({ resource, options }, sideBySide ? SIDE_GROUP : undefined);
+			return true;
+		}
+		return false;
 	}
 }
 //#endregion
 
-//#region - Symbols
+//#region - Outline
+
+class OutlineTreeSorter<E> implements ITreeSorter<E> {
+
+	private _order: 'name' | 'type' | 'position';
+
+	constructor(
+		private comparator: IOutlineComparator<E>,
+		uri: URI | undefined,
+		@ITextResourceConfigurationService configService: ITextResourceConfigurationService,
+	) {
+		this._order = configService.getValue(uri, 'breadcrumbs.symbolSortOrder');
+	}
+
+	compare(a: E, b: E): number {
+		if (this._order === 'name') {
+			return this.comparator.compareByName(a, b);
+		} else if (this._order === 'type') {
+			return this.comparator.compareByType(a, b);
+		} else {
+			return this.comparator.compareByPosition(a, b);
+		}
+	}
+}
 
 export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
 
-	protected readonly _symbolSortOrder: BreadcrumbsConfig<'position' | 'name' | 'type'>;
-	protected _outlineComparator: OutlineItemComparator;
+	protected _createTree(container: HTMLElement, input: OutlineElement2) {
 
-	constructor(
-		parent: HTMLElement,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IThemeService themeService: IThemeService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IModeService private readonly _modeService: IModeService,
-	) {
-		super(parent, instantiationService, themeService, configurationService);
-		this._symbolSortOrder = BreadcrumbsConfig.SymbolSortOrder.bindTo(this._configurationService);
-		this._outlineComparator = new OutlineItemComparator();
-	}
+		const { config } = input.outline;
 
-	protected _createTree(container: HTMLElement) {
-		return <WorkbenchDataTree<OutlineModel, any, FuzzyScore>>this._instantiationService.createInstance(
+		return <WorkbenchDataTree<IOutline<any>, any, FuzzyScore>>this._instantiationService.createInstance(
 			WorkbenchDataTree,
 			'BreadcrumbsOutlinePicker',
 			container,
-			new OutlineVirtualDelegate(),
-			[new OutlineGroupRenderer(), this._instantiationService.createInstance(OutlineElementRenderer)],
-			new OutlineDataSource(),
+			config.delegate,
+			config.renderers,
+			config.treeDataSource,
 			{
+				...config.options,
+				sorter: this._instantiationService.createInstance(OutlineTreeSorter, config.comparator, undefined),
 				collapseByDefault: true,
 				expandOnlyOnTwistieClick: true,
 				multipleSelectionSupport: false,
-				sorter: this._outlineComparator,
-				identityProvider: new OutlineIdentityProvider(),
-				keyboardNavigationLabelProvider: new OutlineNavigationLabelProvider(),
-				accessibilityProvider: new OutlineAccessibilityProvider(localize('breadcrumbs', "Breadcrumbs")),
-				filter: this._instantiationService.createInstance(OutlineFilter, 'breadcrumbs')
 			}
 		);
 	}
 
-	dispose(): void {
-		this._symbolSortOrder.dispose();
-		super.dispose();
-	}
+	protected _setInput(input: OutlineElement2): Promise<void> {
 
-	protected _setInput(input: BreadcrumbElement): Promise<void> {
-		const element = input as TreeElement;
-		const model = OutlineModel.get(element)!;
-		const tree = this._tree as WorkbenchDataTree<OutlineModel, any, FuzzyScore>;
+		const viewState = input.outline.captureViewState();
+		this.restoreViewState = () => { viewState.dispose(); };
 
-		const overrideConfiguration = {
-			resource: model.uri,
-			overrideIdentifier: this._modeService.getModeIdByFilepathOrFirstLine(model.uri)
-		};
-		this._outlineComparator.type = this._getOutlineItemCompareType(overrideConfiguration);
+		const tree = this._tree as WorkbenchDataTree<IOutline<any>, any, FuzzyScore>;
 
-		tree.setInput(model);
-		if (element !== model) {
-			tree.reveal(element, 0.5);
-			tree.setFocus([element], this._fakeEvent);
+		tree.setInput(input.outline);
+		if (input.element !== input.outline) {
+			tree.reveal(input.element, 0.5);
+			tree.setFocus([input.element], this._fakeEvent);
 		}
 		tree.domFocus();
 
 		return Promise.resolve();
 	}
 
-	protected _getTargetFromEvent(element: any): any | undefined {
-		if (element instanceof OutlineElement) {
-			return element;
-		}
+	protected _previewElement(element: any): IDisposable {
+		const outline: IOutline<any> = this._tree.getInput();
+		return outline.preview(element);
 	}
 
-	private _getOutlineItemCompareType(overrideConfiguration?: IConfigurationOverrides): OutlineSortOrder {
-		switch (this._symbolSortOrder.getValue(overrideConfiguration)) {
-			case 'name':
-				return OutlineSortOrder.ByName;
-			case 'type':
-				return OutlineSortOrder.ByKind;
-			case 'position':
-			default:
-				return OutlineSortOrder.ByPosition;
-		}
+	async _revealElement(element: any, options: IEditorOptions, sideBySide: boolean): Promise<boolean> {
+		this._onWillPickElement.fire();
+		const outline: IOutline<any> = this._tree.getInput();
+		await outline.reveal(element, options, sideBySide);
+		return true;
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index fdb0a57ac..5fdcc208c 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -33,7 +33,7 @@ import {
 	JoinAllGroupsAction, FocusLeftGroup, FocusAboveGroup, FocusRightGroup, FocusBelowGroup, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoByTwoGridAction,
 	EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoColumnsBottomAction, EditorLayoutTwoRowsRightAction, NewEditorGroupLeftAction, NewEditorGroupRightAction,
 	NewEditorGroupAboveAction, NewEditorGroupBelowAction, SplitEditorOrthogonalAction, CloseEditorInAllGroupsAction, NavigateToLastEditLocationAction, ToggleGroupSizesAction, ShowAllEditorsByMostRecentlyUsedAction,
-	QuickAccessPreviousRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorInGroupAction, OpenNextRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, ReopenResourcesAction, ToggleEditorTypeAction
+	QuickAccessPreviousRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorInGroupAction, OpenNextRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, ReopenResourcesAction, ToggleEditorTypeAction, DuplicateGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction
 } from 'vs/workbench/browser/parts/editor/editorActions';
 import * as editorCommands from 'vs/workbench/browser/parts/editor/editorCommands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -42,7 +42,7 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co
 import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { isMacintosh } from 'vs/base/common/platform';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { OpenWorkspaceButtonContribution } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { OpenWorkspaceButtonContribution } from 'vs/workbench/browser/codeeditor';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { toLocalResource } from 'vs/base/common/resources';
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
@@ -351,6 +351,10 @@ registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveGroupLeftAction,
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveGroupRightAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.RightArrow) }), 'View: Move Editor Group Right', CATEGORIES.View.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveGroupUpAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.UpArrow) }), 'View: Move Editor Group Up', CATEGORIES.View.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveGroupDownAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.DownArrow) }), 'View: Move Editor Group Down', CATEGORIES.View.value);
+registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateGroupLeftAction), 'View: Duplicate Editor Group Left', CATEGORIES.View.value);
+registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateGroupRightAction), 'View: Duplicate Editor Group Right', CATEGORIES.View.value);
+registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateGroupUpAction), 'View: Duplicate Editor Group Up', CATEGORIES.View.value);
+registry.registerWorkbenchAction(SyncActionDescriptor.from(DuplicateGroupDownAction), 'View: Duplicate Editor Group Down', CATEGORIES.View.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveEditorToPreviousGroupAction, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.LeftArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow } }), 'View: Move Editor into Previous Group', CATEGORIES.View.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveEditorToNextGroupAction, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.RightArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow } }), 'View: Move Editor into Next Group', CATEGORIES.View.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(MoveEditorToFirstGroupAction, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_1, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_1 } }), 'View: Move Editor into First Group', CATEGORIES.View.value);
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 8b18d4e90..7e901d0ae 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -23,6 +23,7 @@ import { AllEditorsByMostRecentlyUsedQuickAccess, ActiveGroupEditorsByMostRecent
 import { Codicon } from 'vs/base/common/codicons';
 import { IFilesConfigurationService, AutoSaveMode } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { openEditorWith, getAllAvailableEditors } from 'vs/workbench/services/editor/common/editorOpenWith';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export class ExecuteCommandAction extends Action {
 
@@ -746,12 +747,13 @@ export class CloseEditorInAllGroupsAction extends Action {
 	}
 }
 
-export class BaseMoveGroupAction extends Action {
+class BaseMoveCopyGroupAction extends Action {
 
 	constructor(
 		id: string,
 		label: string,
 		private direction: GroupDirection,
+		private isMove: boolean,
 		private editorGroupService: IEditorGroupsService
 	) {
 		super(id, label);
@@ -766,9 +768,18 @@ export class BaseMoveGroupAction extends Action {
 		}
 
 		if (sourceGroup) {
-			const targetGroup = this.findTargetGroup(sourceGroup);
-			if (targetGroup) {
-				this.editorGroupService.moveGroup(sourceGroup, targetGroup, this.direction);
+			let resultGroup: IEditorGroup | undefined = undefined;
+			if (this.isMove) {
+				const targetGroup = this.findTargetGroup(sourceGroup);
+				if (targetGroup) {
+					resultGroup = this.editorGroupService.moveGroup(sourceGroup, targetGroup, this.direction);
+				}
+			} else {
+				resultGroup = this.editorGroupService.copyGroup(sourceGroup, sourceGroup, this.direction);
+			}
+
+			if (resultGroup) {
+				this.editorGroupService.activateGroup(resultGroup);
 			}
 		}
 	}
@@ -801,6 +812,18 @@ export class BaseMoveGroupAction extends Action {
 	}
 }
 
+class BaseMoveGroupAction extends BaseMoveCopyGroupAction {
+
+	constructor(
+		id: string,
+		label: string,
+		direction: GroupDirection,
+		editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, direction, true, editorGroupService);
+	}
+}
+
 export class MoveGroupLeftAction extends BaseMoveGroupAction {
 
 	static readonly ID = 'workbench.action.moveActiveEditorGroupLeft';
@@ -857,6 +880,74 @@ export class MoveGroupDownAction extends BaseMoveGroupAction {
 	}
 }
 
+class BaseDuplicateGroupAction extends BaseMoveCopyGroupAction {
+
+	constructor(
+		id: string,
+		label: string,
+		direction: GroupDirection,
+		editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, direction, false, editorGroupService);
+	}
+}
+
+export class DuplicateGroupLeftAction extends BaseDuplicateGroupAction {
+
+	static readonly ID = 'workbench.action.duplicateActiveEditorGroupLeft';
+	static readonly LABEL = nls.localize('duplicateActiveGroupLeft', "Duplicate Editor Group Left");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, GroupDirection.LEFT, editorGroupService);
+	}
+}
+
+export class DuplicateGroupRightAction extends BaseDuplicateGroupAction {
+
+	static readonly ID = 'workbench.action.duplicateActiveEditorGroupRight';
+	static readonly LABEL = nls.localize('duplicateActiveGroupRight', "Duplicate Editor Group Right");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, GroupDirection.RIGHT, editorGroupService);
+	}
+}
+
+export class DuplicateGroupUpAction extends BaseDuplicateGroupAction {
+
+	static readonly ID = 'workbench.action.duplicateActiveEditorGroupUp';
+	static readonly LABEL = nls.localize('duplicateActiveGroupUp', "Duplicate Editor Group Up");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, GroupDirection.UP, editorGroupService);
+	}
+}
+
+export class DuplicateGroupDownAction extends BaseDuplicateGroupAction {
+
+	static readonly ID = 'workbench.action.duplicateActiveEditorGroupDown';
+	static readonly LABEL = nls.localize('duplicateActiveGroupDown', "Duplicate Editor Group Down");
+
+	constructor(
+		id: string,
+		label: string,
+		@IEditorGroupsService editorGroupService: IEditorGroupsService
+	) {
+		super(id, label, GroupDirection.DOWN, editorGroupService);
+	}
+}
+
 export class MinimizeOtherGroupsAction extends Action {
 
 	static readonly ID = 'workbench.action.minimizeOtherEditors';
@@ -1803,9 +1894,8 @@ export class ReopenResourcesAction extends Action {
 	constructor(
 		id: string,
 		label: string,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super(id, label);
 	}
@@ -1823,7 +1913,7 @@ export class ReopenResourcesAction extends Action {
 
 		const options = activeEditorPane.options;
 		const group = activeEditorPane.group;
-		await openEditorWith(activeInput, undefined, options, group, this.editorService, this.configurationService, this.quickInputService);
+		await this.instantiationService.invokeFunction(openEditorWith, activeInput, undefined, options, group);
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index dcece5343..f9fd2d571 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -23,7 +23,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
-import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { openEditorWith } from 'vs/workbench/services/editor/common/editorOpenWith';
@@ -484,7 +483,6 @@ function registerOpenEditorAPICommands(): void {
 		const editorService = accessor.get(IEditorService);
 		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
-		const quickInputService = accessor.get(IQuickInputService);
 
 		const [columnArg, optionsArg] = columnAndOptions ?? [];
 		let group: IEditorGroup | undefined = undefined;
@@ -504,7 +502,7 @@ function registerOpenEditorAPICommands(): void {
 		const textOptions: ITextEditorOptions = optionsArg ? { ...optionsArg, override: false } : { override: false };
 
 		const input = editorService.createEditorInput({ resource: URI.revive(resource) });
-		return openEditorWith(input, id, textOptions, group, editorService, configurationService, quickInputService);
+		return openEditorWith(accessor, input, id, textOptions, group);
 	});
 }
 
@@ -902,24 +900,10 @@ function registerOtherEditorCommands(): void {
 		id: TOGGLE_KEEP_EDITORS_COMMAND_ID,
 		handler: accessor => {
 			const configurationService = accessor.get(IConfigurationService);
-			const notificationService = accessor.get(INotificationService);
-			const openerService = accessor.get(IOpenerService);
 
-			// Update setting
 			const currentSetting = configurationService.getValue<boolean>('workbench.editor.enablePreview');
 			const newSetting = currentSetting === true ? false : true;
 			configurationService.updateValue('workbench.editor.enablePreview', newSetting);
-
-			// Inform user
-			notificationService.prompt(
-				Severity.Info,
-				newSetting ?
-					nls.localize('enablePreview', "Preview editors have been enabled in settings.") :
-					nls.localize('disablePreview', "Preview editors have been disabled in settings."),
-				[{
-					label: nls.localize('learnMode', "Learn More"), run: () => openerService.open('https://go.microsoft.com/fwlink/?linkid=2147473')
-				}]
-			);
 		}
 	});
 
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index 50f571563..d3d2258f5 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -283,7 +283,8 @@ class DropOverlay extends Themable {
 					// Open in target group
 					const options = getActiveTextEditorOptions(sourceGroup, draggedEditor.editor, EditorOptions.create({
 						pinned: true,										// always pin dropped editor
-						sticky: sourceGroup.isSticky(draggedEditor.editor)	// preserve sticky state
+						sticky: sourceGroup.isSticky(draggedEditor.editor),	// preserve sticky state
+						override: false, // Use `draggedEditor.editor` as is. If it is already a custom editor, it will stay so.
 					}));
 					const copyEditor = this.isCopyOperation(event, draggedEditor);
 					targetGroup.openEditor(draggedEditor.editor, options, copyEditor ? OpenEditorContext.COPY_EDITOR : OpenEditorContext.MOVE_EDITOR);
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index a212456dd..277f029c3 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -322,8 +322,8 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	private createContainerContextMenu(): void {
 		const menu = this._register(this.menuService.createMenu(MenuId.EmptyEditorGroupContext, this.contextKeyService));
 
-		this._register(addDisposableListener(this.element, EventType.CONTEXT_MENU, event => this.onShowContainerContextMenu(menu, event)));
-		this._register(addDisposableListener(this.element, TouchEventType.Contextmenu, event => this.onShowContainerContextMenu(menu)));
+		this._register(addDisposableListener(this.element, EventType.CONTEXT_MENU, e => this.onShowContainerContextMenu(menu, e)));
+		this._register(addDisposableListener(this.element, TouchEventType.Contextmenu, () => this.onShowContainerContextMenu(menu)));
 	}
 
 	private onShowContainerContextMenu(menu: IMenu, e?: MouseEvent): void {
@@ -1704,13 +1704,15 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	layout(width: number, height: number): void {
 		this.dimension = new Dimension(width, height);
 
-		// Ensure editor container gets height as CSS depending on the preferred height of the title control
-		const titleHeight = this.titleDimensions.height;
-		const editorHeight = Math.max(0, height - titleHeight);
-		this.editorContainer.style.height = `${editorHeight}px`;
+		// Layout the title area first to receive the size it occupies
+		const titleAreaSize = this.titleAreaControl.layout({
+			container: this.dimension,
+			available: new Dimension(width, height - this.editorControl.minimumHeight)
+		});
 
-		// Forward to controls
-		this.titleAreaControl.layout(new Dimension(width, titleHeight));
+		// Pass the container width and remaining height to the editor layout
+		const editorHeight = Math.max(0, height - titleAreaSize.height);
+		this.editorContainer.style.height = `${editorHeight}px`;
 		this.editorControl.layout(new Dimension(width, editorHeight));
 	}
 
@@ -1769,7 +1771,7 @@ export interface EditorReplacement {
 	readonly options?: EditorOptions;
 }
 
-registerThemingParticipant((theme, collector, environment) => {
+registerThemingParticipant((theme, collector) => {
 
 	// Letterpress
 	const letterpress = `./media/letterpress${theme.type === 'dark' ? '-dark' : theme.type === 'hc' ? '-hc' : ''}.svg`;
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 1d85f0ad5..3d289709b 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/editorstatus';
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { runAtThisOrScheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
 import { format, compare, splitLines } from 'vs/base/common/strings';
 import { extname, basename, isEqual } from 'vs/base/common/resources';
@@ -283,14 +283,15 @@ class State {
 	}
 }
 
-const nlsSingleSelectionRange = nls.localize('singleSelectionRange', "Ln {0}, Col {1} ({2} selected)");
-const nlsSingleSelection = nls.localize('singleSelection', "Ln {0}, Col {1}");
-const nlsMultiSelectionRange = nls.localize('multiSelectionRange', "{0} selections ({1} characters selected)");
-const nlsMultiSelection = nls.localize('multiSelection', "{0} selections");
-const nlsEOLLF = nls.localize('endOfLineLineFeed', "LF");
-const nlsEOLCRLF = nls.localize('endOfLineCarriageReturnLineFeed', "CRLF");
+const nlsSingleSelectionRange = localize('singleSelectionRange', "Ln {0}, Col {1} ({2} selected)");
+const nlsSingleSelection = localize('singleSelection', "Ln {0}, Col {1}");
+const nlsMultiSelectionRange = localize('multiSelectionRange', "{0} selections ({1} characters selected)");
+const nlsMultiSelection = localize('multiSelection', "{0} selections");
+const nlsEOLLF = localize('endOfLineLineFeed', "LF");
+const nlsEOLCRLF = localize('endOfLineCarriageReturnLineFeed', "CRLF");
 
 export class EditorStatus extends Disposable implements IWorkbenchContribution {
+
 	private readonly tabFocusModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly columnSelectionModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly screenRedearModeElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
@@ -342,14 +343,14 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		if (!this.screenReaderNotification) {
 			this.screenReaderNotification = this.notificationService.prompt(
 				Severity.Info,
-				nls.localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code? (word wrap is disabled when using a screen reader)"),
+				localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code? (word wrap is disabled when using a screen reader)"),
 				[{
-					label: nls.localize('screenReaderDetectedExplanation.answerYes', "Yes"),
+					label: localize('screenReaderDetectedExplanation.answerYes', "Yes"),
 					run: () => {
 						this.configurationService.updateValue('editor.accessibilitySupport', 'on');
 					}
 				}, {
-					label: nls.localize('screenReaderDetectedExplanation.answerNo', "No"),
+					label: localize('screenReaderDetectedExplanation.answerNo', "No"),
 					run: () => {
 						this.configurationService.updateValue('editor.accessibilitySupport', 'off');
 					}
@@ -364,11 +365,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private async showIndentationPicker(): Promise<unknown> {
 		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
 		if (!activeTextEditorControl) {
-			return this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			return this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
 		}
 
 		if (this.editorService.activeEditor?.isReadonly()) {
-			return this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			return this.quickInputService.pick([{ label: localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 		}
 
 		const picks: QuickPickInput<IQuickPickItem & { run(): void; }>[] = [
@@ -390,25 +391,25 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 			};
 		});
 
-		picks.splice(3, 0, { type: 'separator', label: nls.localize('indentConvert', "convert file") });
-		picks.unshift({ type: 'separator', label: nls.localize('indentView', "change view") });
+		picks.splice(3, 0, { type: 'separator', label: localize('indentConvert', "convert file") });
+		picks.unshift({ type: 'separator', label: localize('indentView', "change view") });
 
-		const action = await this.quickInputService.pick(picks, { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
+		const action = await this.quickInputService.pick(picks, { placeHolder: localize('pickAction', "Select Action"), matchOnDetail: true });
 		return action?.run();
 	}
 
 	private updateTabFocusModeElement(visible: boolean): void {
 		if (visible) {
 			if (!this.tabFocusModeElement.value) {
-				const text = nls.localize('tabFocusModeEnabled', "Tab Moves Focus");
+				const text = localize('tabFocusModeEnabled', "Tab Moves Focus");
 				this.tabFocusModeElement.value = this.statusbarService.addEntry({
 					text,
 					ariaLabel: text,
-					tooltip: nls.localize('disableTabMode', "Disable Accessibility Mode"),
+					tooltip: localize('disableTabMode', "Disable Accessibility Mode"),
 					command: 'editor.action.toggleTabFocusMode',
 					backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
 					color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
-				}, 'status.editor.tabFocusMode', nls.localize('status.editor.tabFocusMode', "Accessibility Mode"), StatusbarAlignment.RIGHT, 100.7);
+				}, 'status.editor.tabFocusMode', localize('status.editor.tabFocusMode', "Accessibility Mode"), StatusbarAlignment.RIGHT, 100.7);
 			}
 		} else {
 			this.tabFocusModeElement.clear();
@@ -418,15 +419,15 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private updateColumnSelectionModeElement(visible: boolean): void {
 		if (visible) {
 			if (!this.columnSelectionModeElement.value) {
-				const text = nls.localize('columnSelectionModeEnabled', "Column Selection");
+				const text = localize('columnSelectionModeEnabled', "Column Selection");
 				this.columnSelectionModeElement.value = this.statusbarService.addEntry({
 					text,
 					ariaLabel: text,
-					tooltip: nls.localize('disableColumnSelectionMode', "Disable Column Selection Mode"),
+					tooltip: localize('disableColumnSelectionMode', "Disable Column Selection Mode"),
 					command: 'editor.action.toggleColumnSelection',
 					backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
 					color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
-				}, 'status.editor.columnSelectionMode', nls.localize('status.editor.columnSelectionMode', "Column Selection Mode"), StatusbarAlignment.RIGHT, 100.8);
+				}, 'status.editor.columnSelectionMode', localize('status.editor.columnSelectionMode', "Column Selection Mode"), StatusbarAlignment.RIGHT, 100.8);
 			}
 		} else {
 			this.columnSelectionModeElement.clear();
@@ -436,14 +437,14 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 	private updateScreenReaderModeElement(visible: boolean): void {
 		if (visible) {
 			if (!this.screenRedearModeElement.value) {
-				const text = nls.localize('screenReaderDetected', "Screen Reader Optimized");
+				const text = localize('screenReaderDetected', "Screen Reader Optimized");
 				this.screenRedearModeElement.value = this.statusbarService.addEntry({
 					text,
 					ariaLabel: text,
 					command: 'showEditorScreenReaderNotification',
 					backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
 					color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
-				}, 'status.editor.screenReaderMode', nls.localize('status.editor.screenReaderMode', "Screen Reader Mode"), StatusbarAlignment.RIGHT, 100.6);
+				}, 'status.editor.screenReaderMode', localize('status.editor.screenReaderMode', "Screen Reader Mode"), StatusbarAlignment.RIGHT, 100.6);
 			}
 		} else {
 			this.screenRedearModeElement.clear();
@@ -459,11 +460,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('gotoLine', "Go to Line/Column"),
+			tooltip: localize('gotoLine', "Go to Line/Column"),
 			command: 'workbench.action.gotoLine'
 		};
 
-		this.updateElement(this.selectionElement, props, 'status.editor.selection', nls.localize('status.editor.selection', "Editor Selection"), StatusbarAlignment.RIGHT, 100.5);
+		this.updateElement(this.selectionElement, props, 'status.editor.selection', localize('status.editor.selection', "Editor Selection"), StatusbarAlignment.RIGHT, 100.5);
 	}
 
 	private updateIndentationElement(text: string | undefined): void {
@@ -475,11 +476,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('selectIndentation', "Select Indentation"),
+			tooltip: localize('selectIndentation', "Select Indentation"),
 			command: 'changeEditorIndentation'
 		};
 
-		this.updateElement(this.indentationElement, props, 'status.editor.indentation', nls.localize('status.editor.indentation', "Editor Indentation"), StatusbarAlignment.RIGHT, 100.4);
+		this.updateElement(this.indentationElement, props, 'status.editor.indentation', localize('status.editor.indentation', "Editor Indentation"), StatusbarAlignment.RIGHT, 100.4);
 	}
 
 	private updateEncodingElement(text: string | undefined): void {
@@ -491,11 +492,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('selectEncoding', "Select Encoding"),
+			tooltip: localize('selectEncoding', "Select Encoding"),
 			command: 'workbench.action.editor.changeEncoding'
 		};
 
-		this.updateElement(this.encodingElement, props, 'status.editor.encoding', nls.localize('status.editor.encoding', "Editor Encoding"), StatusbarAlignment.RIGHT, 100.3);
+		this.updateElement(this.encodingElement, props, 'status.editor.encoding', localize('status.editor.encoding', "Editor Encoding"), StatusbarAlignment.RIGHT, 100.3);
 	}
 
 	private updateEOLElement(text: string | undefined): void {
@@ -507,11 +508,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('selectEOL', "Select End of Line Sequence"),
+			tooltip: localize('selectEOL', "Select End of Line Sequence"),
 			command: 'workbench.action.editor.changeEOL'
 		};
 
-		this.updateElement(this.eolElement, props, 'status.editor.eol', nls.localize('status.editor.eol', "Editor End of Line"), StatusbarAlignment.RIGHT, 100.2);
+		this.updateElement(this.eolElement, props, 'status.editor.eol', localize('status.editor.eol', "Editor End of Line"), StatusbarAlignment.RIGHT, 100.2);
 	}
 
 	private updateModeElement(text: string | undefined): void {
@@ -523,11 +524,11 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('selectLanguageMode', "Select Language Mode"),
+			tooltip: localize('selectLanguageMode', "Select Language Mode"),
 			command: 'workbench.action.editor.changeLanguageMode'
 		};
 
-		this.updateElement(this.modeElement, props, 'status.editor.mode', nls.localize('status.editor.mode', "Editor Language"), StatusbarAlignment.RIGHT, 100.1);
+		this.updateElement(this.modeElement, props, 'status.editor.mode', localize('status.editor.mode', "Editor Language"), StatusbarAlignment.RIGHT, 100.1);
 	}
 
 	private updateMetadataElement(text: string | undefined): void {
@@ -539,10 +540,10 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		const props: IStatusbarEntry = {
 			text,
 			ariaLabel: text,
-			tooltip: nls.localize('fileInfo', "File Information")
+			tooltip: localize('fileInfo', "File Information")
 		};
 
-		this.updateElement(this.metadataElement, props, 'status.editor.info', nls.localize('status.editor.info', "File Information"), StatusbarAlignment.RIGHT, 100);
+		this.updateElement(this.metadataElement, props, 'status.editor.info', localize('status.editor.info', "File Information"), StatusbarAlignment.RIGHT, 100);
 	}
 
 	private updateElement(element: MutableDisposable<IStatusbarEntryAccessor>, props: IStatusbarEntry, id: string, name: string, alignment: StatusbarAlignment, priority: number) {
@@ -730,8 +731,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 				const modelOpts = model.getOptions();
 				update.indentation = (
 					modelOpts.insertSpaces
-						? nls.localize('spacesSize', "Spaces: {0}", modelOpts.indentSize)
-						: nls.localize({ key: 'tabSize', comment: ['Tab corresponds to the tab key'] }, "Tab Size: {0}", modelOpts.tabSize)
+						? localize('spacesSize', "Spaces: {0}", modelOpts.indentSize)
+						: localize({ key: 'tabSize', comment: ['Tab corresponds to the tab key'] }, "Tab Size: {0}", modelOpts.tabSize)
 				);
 			}
 		}
@@ -766,7 +767,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
 		if (editorWidget) {
 			const screenReaderDetected = this.accessibilityService.isScreenReaderOptimized();
 			if (screenReaderDetected) {
-				const screenReaderConfiguration = this.configurationService.getValue<IEditorOptions>('editor').accessibilitySupport;
+				const screenReaderConfiguration = this.configurationService.getValue<IEditorOptions>('editor')?.accessibilitySupport;
 				if (screenReaderConfiguration === 'auto') {
 					if (!this.promptedScreenReader) {
 						this.promptedScreenReader = true;
@@ -921,7 +922,7 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 				const line = splitLines(this.currentMarker.message)[0];
 				const text = `${this.getType(this.currentMarker)} ${line}`;
 				if (!this.statusBarEntryAccessor.value) {
-					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ text: '', ariaLabel: '' }, 'statusbar.currentProblem', nls.localize('currentProblem', "Current Problem"), StatusbarAlignment.LEFT);
+					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ text: '', ariaLabel: '' }, 'statusbar.currentProblem', localize('currentProblem', "Current Problem"), StatusbarAlignment.LEFT);
 				}
 				this.statusBarEntryAccessor.value.update({ text, ariaLabel: text });
 			} else {
@@ -934,9 +935,11 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 		if (!currentMarker) {
 			return true;
 		}
+
 		if (!previousMarker) {
 			return true;
 		}
+
 		return IMarkerData.makeKey(previousMarker) !== IMarkerData.makeKey(currentMarker);
 	}
 
@@ -946,6 +949,7 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 			case MarkerSeverity.Warning: return '$(warning)';
 			case MarkerSeverity.Info: return '$(info)';
 		}
+
 		return '';
 	}
 
@@ -953,17 +957,21 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 		if (!this.configurationService.getValue<boolean>('problems.showCurrentInStatus')) {
 			return null;
 		}
+
 		if (!this.editor) {
 			return null;
 		}
+
 		const model = this.editor.getModel();
 		if (!model) {
 			return null;
 		}
+
 		const position = this.editor.getPosition();
 		if (!position) {
 			return null;
 		}
+
 		return this.markers.find(marker => Range.containsPosition(marker, position)) || null;
 	}
 
@@ -971,13 +979,16 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 		if (!this.editor) {
 			return;
 		}
+
 		const model = this.editor.getModel();
 		if (!model) {
 			return;
 		}
+
 		if (model && !changedResources.some(r => isEqual(model.uri, r))) {
 			return;
 		}
+
 		this.updateMarkers();
 	}
 
@@ -985,10 +996,12 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 		if (!this.editor) {
 			return;
 		}
+
 		const model = this.editor.getModel();
 		if (!model) {
 			return;
 		}
+
 		if (model) {
 			this.markers = this.markerService.read({
 				resource: model.uri,
@@ -998,6 +1011,7 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 		} else {
 			this.markers = [];
 		}
+
 		this.updateStatus();
 	}
 }
@@ -1007,9 +1021,11 @@ function compareMarker(a: IMarker, b: IMarker): number {
 	if (res === 0) {
 		res = MarkerSeverity.compare(a.severity, b.severity);
 	}
+
 	if (res === 0) {
 		res = Range.compareRangesUsingStarts(a, b);
 	}
+
 	return res;
 }
 
@@ -1022,7 +1038,7 @@ export class ShowLanguageExtensionsAction extends Action {
 		@ICommandService private readonly commandService: ICommandService,
 		@IExtensionGalleryService galleryService: IExtensionGalleryService
 	) {
-		super(ShowLanguageExtensionsAction.ID, nls.localize('showLanguageExtensions', "Search Marketplace Extensions for '{0}'...", fileExtension));
+		super(ShowLanguageExtensionsAction.ID, localize('showLanguageExtensions', "Search Marketplace Extensions for '{0}'...", fileExtension));
 
 		this.enabled = galleryService.isEnabled();
 	}
@@ -1035,7 +1051,7 @@ export class ShowLanguageExtensionsAction extends Action {
 export class ChangeModeAction extends Action {
 
 	static readonly ID = 'workbench.action.editor.changeLanguageMode';
-	static readonly LABEL = nls.localize('changeMode', "Change Language Mode");
+	static readonly LABEL = localize('changeMode', "Change Language Mode");
 
 	constructor(
 		actionId: string,
@@ -1054,14 +1070,14 @@ export class ChangeModeAction extends Action {
 
 	async run(): Promise<void> {
 		const activeEditorPane = this.editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
-		if (activeEditorPane?.isNotebookEditor) {
+		if (activeEditorPane?.isNotebookEditor) { // TODO@rebornix TODO@jrieken debt: https://github.com/microsoft/vscode/issues/114554
 			// it's inside notebook editor
 			return this.commandService.executeCommand('notebook.cell.changeLanguage');
 		}
 
 		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
 		if (!activeTextEditorControl) {
-			await this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			await this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
 			return;
 		}
 
@@ -1085,22 +1101,24 @@ export class ChangeModeAction extends Action {
 		const languages = this.modeService.getRegisteredLanguageNames();
 		const picks: QuickPickInput[] = languages.sort().map((lang, index) => {
 			const modeId = this.modeService.getModeIdForLanguageName(lang.toLowerCase()) || 'unknown';
+			const extensions = this.modeService.getExtensions(lang).join(' ');
 			let description: string;
 			if (currentLanguageId === lang) {
-				description = nls.localize('languageDescription', "({0}) - Configured Language", modeId);
+				description = localize('languageDescription', "({0}) - Configured Language", modeId);
 			} else {
-				description = nls.localize('languageDescriptionConfigured', "({0})", modeId);
+				description = localize('languageDescriptionConfigured', "({0})", modeId);
 			}
 
 			return {
 				label: lang,
+				meta: extensions,
 				iconClasses: getIconClassesForModeId(modeId),
 				description
 			};
 		});
 
 		if (hasLanguageSupport) {
-			picks.unshift({ type: 'separator', label: nls.localize('languagesPicks', "languages (identifier)") });
+			picks.unshift({ type: 'separator', label: localize('languagesPicks', "languages (identifier)") });
 		}
 
 		// Offer action to configure via settings
@@ -1115,22 +1133,22 @@ export class ChangeModeAction extends Action {
 				picks.unshift(galleryAction);
 			}
 
-			configureModeSettings = { label: nls.localize('configureModeSettings', "Configure '{0}' language based settings...", currentLanguageId) };
+			configureModeSettings = { label: localize('configureModeSettings', "Configure '{0}' language based settings...", currentLanguageId) };
 			picks.unshift(configureModeSettings);
-			configureModeAssociations = { label: nls.localize('configureAssociationsExt', "Configure File Association for '{0}'...", ext) };
+			configureModeAssociations = { label: localize('configureAssociationsExt', "Configure File Association for '{0}'...", ext) };
 			picks.unshift(configureModeAssociations);
 		}
 
 		// Offer to "Auto Detect"
 		const autoDetectMode: IQuickPickItem = {
-			label: nls.localize('autoDetect', "Auto Detect")
+			label: localize('autoDetect', "Auto Detect")
 		};
 
 		if (hasLanguageSupport) {
 			picks.unshift(autoDetectMode);
 		}
 
-		const pick = await this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language Mode"), matchOnDescription: true });
+		const pick = await this.quickInputService.pick(picks, { placeHolder: localize('pickLanguage', "Select Language Mode"), matchOnDescription: true });
 		if (!pick) {
 			return;
 		}
@@ -1178,6 +1196,8 @@ export class ChangeModeAction extends Action {
 					modeSupport.setMode(languageSelection.languageIdentifier.language);
 				}
 			}
+
+			activeTextEditorControl.focus();
 		}
 	}
 
@@ -1194,12 +1214,12 @@ export class ChangeModeAction extends Action {
 				id,
 				label: lang,
 				iconClasses: getIconClassesForModeId(id),
-				description: (id === currentAssociation) ? nls.localize('currentAssociation', "Current Association") : undefined
+				description: (id === currentAssociation) ? localize('currentAssociation', "Current Association") : undefined
 			};
 		});
 
 		setTimeout(async () => {
-			const language = await this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || base) });
+			const language = await this.quickInputService.pick(picks, { placeHolder: localize('pickLanguageToConfigure', "Select Language Mode to Associate with '{0}'", extension || base) });
 			if (language) {
 				const fileAssociationsConfig = this.configurationService.inspect<{}>(FILES_ASSOCIATIONS_CONFIG);
 
@@ -1233,7 +1253,7 @@ export interface IChangeEOLEntry extends IQuickPickItem {
 export class ChangeEOLAction extends Action {
 
 	static readonly ID = 'workbench.action.editor.changeEOL';
-	static readonly LABEL = nls.localize('changeEndOfLine', "Change End of Line Sequence");
+	static readonly LABEL = localize('changeEndOfLine', "Change End of Line Sequence");
 
 	constructor(
 		actionId: string,
@@ -1247,12 +1267,12 @@ export class ChangeEOLAction extends Action {
 	async run(): Promise<void> {
 		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
 		if (!activeTextEditorControl) {
-			await this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			await this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
 			return;
 		}
 
 		if (this.editorService.activeEditor?.isReadonly()) {
-			await this.quickInputService.pick([{ label: nls.localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
+			await this.quickInputService.pick([{ label: localize('noWritableCodeEditor', "The active code editor is read-only.") }]);
 			return;
 		}
 
@@ -1265,7 +1285,7 @@ export class ChangeEOLAction extends Action {
 
 		const selectedIndex = (textModel?.getEOL() === '\n') ? 0 : 1;
 
-		const eol = await this.quickInputService.pick(EOLOptions, { placeHolder: nls.localize('pickEndOfLine', "Select End of Line Sequence"), activeItem: EOLOptions[selectedIndex] });
+		const eol = await this.quickInputService.pick(EOLOptions, { placeHolder: localize('pickEndOfLine', "Select End of Line Sequence"), activeItem: EOLOptions[selectedIndex] });
 		if (eol) {
 			const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorControl);
 			if (activeCodeEditor?.hasModel() && !this.editorService.activeEditor?.isReadonly()) {
@@ -1275,13 +1295,15 @@ export class ChangeEOLAction extends Action {
 				textModel.pushStackElement();
 			}
 		}
+
+		activeTextEditorControl.focus();
 	}
 }
 
 export class ChangeEncodingAction extends Action {
 
 	static readonly ID = 'workbench.action.editor.changeEncoding';
-	static readonly LABEL = nls.localize('changeEncoding', "Change File Encoding");
+	static readonly LABEL = localize('changeEncoding', "Change File Encoding");
 
 	constructor(
 		actionId: string,
@@ -1296,25 +1318,26 @@ export class ChangeEncodingAction extends Action {
 	}
 
 	async run(): Promise<void> {
-		if (!getCodeEditor(this.editorService.activeTextEditorControl)) {
-			await this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+		const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
+		if (!activeTextEditorControl) {
+			await this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
 			return;
 		}
 
 		const activeEditorPane = this.editorService.activeEditorPane;
 		if (!activeEditorPane) {
-			await this.quickInputService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]);
+			await this.quickInputService.pick([{ label: localize('noEditor', "No text editor active at this time") }]);
 			return;
 		}
 
 		const encodingSupport: IEncodingSupport | null = toEditorWithEncodingSupport(activeEditorPane.input);
 		if (!encodingSupport) {
-			await this.quickInputService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]);
+			await this.quickInputService.pick([{ label: localize('noFileEditor', "No file active at this time") }]);
 			return;
 		}
 
-		const saveWithEncodingPick: IQuickPickItem = { label: nls.localize('saveWithEncoding', "Save with Encoding") };
-		const reopenWithEncodingPick: IQuickPickItem = { label: nls.localize('reopenWithEncoding', "Reopen with Encoding") };
+		const saveWithEncodingPick: IQuickPickItem = { label: localize('saveWithEncoding', "Save with Encoding") };
+		const reopenWithEncodingPick: IQuickPickItem = { label: localize('reopenWithEncoding', "Reopen with Encoding") };
 
 		if (!Language.isDefaultVariant()) {
 			const saveWithEncodingAlias = 'Save with Encoding';
@@ -1334,7 +1357,7 @@ export class ChangeEncodingAction extends Action {
 		} else if (activeEditorPane.input.isReadonly()) {
 			action = reopenWithEncodingPick;
 		} else {
-			action = await this.quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: nls.localize('pickAction', "Select Action"), matchOnDetail: true });
+			action = await this.quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: localize('pickAction', "Select Action"), matchOnDetail: true });
 		}
 
 		if (!action) {
@@ -1394,11 +1417,11 @@ export class ChangeEncodingAction extends Action {
 		// If we have a guessed encoding, show it first unless it matches the configured encoding
 		if (guessedEncoding && configuredEncoding !== guessedEncoding && SUPPORTED_ENCODINGS[guessedEncoding]) {
 			picks.unshift({ type: 'separator' });
-			picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: nls.localize('guessedEncoding', "Guessed from content") });
+			picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: localize('guessedEncoding', "Guessed from content") });
 		}
 
 		const encoding = await this.quickInputService.pick(picks, {
-			placeHolder: isReopenWithEncoding ? nls.localize('pickEncodingForReopen', "Select File Encoding to Reopen File") : nls.localize('pickEncodingForSave', "Select File Encoding to Save with"),
+			placeHolder: isReopenWithEncoding ? localize('pickEncodingForReopen', "Select File Encoding to Reopen File") : localize('pickEncodingForSave', "Select File Encoding to Save with"),
 			activeItem: items[typeof directMatchIndex === 'number' ? directMatchIndex : typeof aliasMatchIndex === 'number' ? aliasMatchIndex : -1]
 		});
 
@@ -1414,5 +1437,7 @@ export class ChangeEncodingAction extends Action {
 		if (typeof encoding.id !== 'undefined' && activeEncodingSupport && activeEncodingSupport.getEncoding() !== encoding.id) {
 			activeEncodingSupport.setEncoding(encoding.id, isReopenWithEncoding ? EncodingMode.Decode : EncodingMode.Encode); // Set new encoding
 		}
+
+		activeTextEditorControl.focus();
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
index 77a7fa03e..366f6dbe9 100644
--- a/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/notabstitlecontrol.css
@@ -14,7 +14,7 @@
 	flex: auto;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .title-label {
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .label-container > .title-label {
 	line-height: 35px;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -22,16 +22,16 @@
 	padding-left: 20px;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .no-tabs.title-label {
-	flex: none;
-}
-
-.monaco-workbench .part.editor > .content .editor-group-container > .title .monaco-icon-label::before {
-	height: 35px; /* tweak the icon size of the editor labels when icons are enabled */
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .label-container > .title-label > .monaco-icon-label-container {
+	flex: none; /* helps to show decorations right next to the label and not at the end */
 }
 
 /* Breadcrumbs */
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .no-tabs.title-label {
+	flex: none;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control {
 	flex: 1 50%;
 	overflow: hidden;
@@ -62,13 +62,11 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item.root_folder + .monaco-breadcrumb-item::before,
 .monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control.relative-path .monaco-breadcrumb-item:nth-child(2)::before,
 .monaco-workbench.windows .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:nth-child(2)::before {
-	/* workspace folder, item following workspace folder, or relative path -> hide first seperator */
-	display: none;
+	display: none; /* workspace folder, item following workspace folder, or relative path -> hide first seperator */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item.root_folder::after {
-	/* use dot separator for workspace folder */
-	content: '\00a0•\00a0';
+	content: '\00a0•\00a0'; /* use dot separator for workspace folder */
 	padding: 0;
 }
 
@@ -80,13 +78,18 @@
 	padding: 0 1px;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item .codicon:last-child,
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:last-child .codicon:last-child {
-	display: none; /* hides chevrons when no tabs visible and when last items */
+.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item .codicon:last-child {
+	display: none; /* hides chevrons when no tabs visible */
 }
 
-/* Title Actions */
-.monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions {
+.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .breadcrumbs-control .monaco-icon-label::before {
+	height: 18px;
+	padding-right: 2px;
+}
+
+/* Editor Actions Toolbar (via title actions) */
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .title-actions {
 	display: flex;
 	flex: initial;
 	opacity: 0.5;
@@ -94,6 +97,6 @@
 	height: 35px;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container.active > .title .title-actions {
+.monaco-workbench .part.editor > .content .editor-group-container.active > .title > .title-actions {
 	opacity: 1;
 }
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index a9158b796..4dd7e77d5 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -3,17 +3,45 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/*
+	################################### z-index explainer ###################################
+
+	Tabs have various levels of z-index depending on state, typically:
+	- scrollbar should be above all
+	- sticky (compact, shrink) tabs need to be above non-sticky tabs for scroll under effect
+	including non-sticky tabs-top borders, otherwise these borders would not scroll under
+	(https://github.com/microsoft/vscode/issues/111641)
+	- bottom-border needs to be above tabs bottom border to win but also support sticky tabs
+	(https://github.com/microsoft/vscode/issues/99084) <- this currently cannot be done and
+	is still broken. putting sticky-tabs above tabs bottom border would not render this
+	border at all for sticky tabs.
+
+	On top of that there is 2 borders with a z-index for a general border below tabs
+	- tabs bottom border
+	- editor title bottom border (when breadcrumbs are disabled, this border will appear
+	same as tabs bottom border)
+
+	The following tabls shows the current stacking order:
+
+	[z-index] 	[kind]
+			7 	scrollbar
+			6	active-tab border-bottom
+			5	tabs, title border bottom
+			4	sticky-tab
+			2  	active/dirty-tab border top
+			0   tab
+
+	##########################################################################################
+*/
+
 /* Title Container */
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container {
 	display: flex;
+	position: relative; /* position tabs border bottom or editor actions (when tabs wrap) relative to this container */
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container.tabs-border-bottom {
-	position: relative;
-}
-
-.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container.tabs-border-bottom::after {
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.tabs-border-bottom::after {
 	content: '';
 	position: absolute;
 	bottom: 0;
@@ -25,12 +53,12 @@
 	height: 1px;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container > .monaco-scrollable-element {
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container > .monaco-scrollable-element {
 	flex: 1;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container > .monaco-scrollable-element .scrollbar {
-	z-index: 3; /* on top of tabs */
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container > .monaco-scrollable-element .scrollbar {
+	z-index: 7;
 	cursor: default;
 }
 
@@ -46,6 +74,13 @@
 	overflow: scroll !important;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container {
+
+	/* Enable wrapping via flex layout and dynamic height */
+	height: auto;
+	flex-wrap: wrap;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container::-webkit-scrollbar {
 	display: none; /* Chrome + Safari: hide scrollbar */
 }
@@ -62,6 +97,10 @@
 	padding-left: 10px;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab:last-child {
+	margin-right: var(--last-tab-margin-right); /* when tabs wrap, we need a margin away from the absolute positioned editor actions */
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.has-icon.tab-actions-right,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.has-icon.tab-actions-off:not(.sticky-compact) {
 	padding-left: 5px; /* reduce padding when we show icons and are in shrinking mode and tab actions is not left (unless sticky-compact) */
@@ -74,6 +113,10 @@
 	flex-shrink: 0;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab.sizing-fit {
+	flex-grow: 1; /* grow the tabs to fill each row for a more homogeneous look when tabs wrap */
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink {
 	min-width: 80px;
 	flex-basis: 0; /* all tabs are even */
@@ -89,7 +132,7 @@
 
 	/** Sticky compact/shrink tabs do not scroll in case of overflow and are always above unsticky tabs which scroll under */
 	position: sticky;
-	z-index: 1;
+	z-index: 4;
 
 	/** Sticky compact/shrink tabs are even and never grow */
 	flex-basis: 0;
@@ -118,9 +161,7 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container.disable-sticky-tabs > .tab.sizing-shrink.sticky-compact,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container.disable-sticky-tabs > .tab.sizing-fit.sticky-shrink,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container.disable-sticky-tabs > .tab.sizing-shrink.sticky-shrink {
-
-	/** Disable sticky positions for sticky compact/shrink tabs if the available space is too little */
-	position: static;
+	position: static; /** disable sticky positions for sticky compact/shrink tabs if the available space is too little */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.tab-actions-left .action-label {
@@ -132,7 +173,7 @@
 	content: '';
 	display: flex;
 	flex: 0;
-	width: 5px; /* Reserve space to hide tab fade when close button is left or off (fixes https://github.com/microsoft/vscode/issues/45728) */
+	width: 5px; /* reserve space to hide tab fade when close button is left or off (fixes https://github.com/microsoft/vscode/issues/45728) */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink.tab-actions-left {
@@ -167,24 +208,26 @@
 	display: block;
 	position: absolute;
 	left: 0;
-	z-index: 6; /* over possible title border */
 	pointer-events: none;
 	width: 100%;
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-top > .tab-border-top-container {
+	z-index: 2;
 	top: 0;
 	height: 1px;
 	background-color: var(--tab-border-top-color);
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom > .tab-border-bottom-container {
+	z-index: 6;
 	bottom: 0;
 	height: 1px;
 	background-color: var(--tab-border-bottom-color);
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty-border-top > .tab-border-top-container {
+	z-index: 2;
 	top: 0;
 	height: 2px;
 	background-color: var(--tab-dirty-border-top-color);
@@ -203,13 +246,16 @@
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-shrink > .tab-label::after {
-	content: '';
+	content: ''; /* enables a linear gradient to overlay the end of the label when tabs overflow */
 	position: absolute;
 	right: 0;
-	height: 100%;
 	width: 5px;
 	opacity: 1;
 	padding: 0;
+	/* the rules below ensure that the gradient does not impact top/bottom borders (https://github.com/microsoft/vscode/issues/115129) */
+	top: 1px;
+	bottom: 1px;
+	height: calc(100% - 2px);
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-shrink:focus > .tab-label::after {
@@ -243,7 +289,7 @@
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.tab-actions-right.sizing-shrink > .tab-actions {
 	flex: 0;
-	overflow: hidden; /* let the tab actions be pushed out of view when sizing is set to shrink to make more room... */
+	overflow: hidden; /* let the tab actions be pushed out of view when sizing is set to shrink to make more room */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty.tab-actions-right.sizing-shrink > .tab-actions,
@@ -301,7 +347,7 @@
 	margin-right: 0.5em;
 }
 
-/* No Tab Actions */
+/* Tab Actions: Off */
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.tab-actions-off {
 	padding-right: 10px; /* give a little bit more room if tab actions is off */
@@ -324,15 +370,6 @@
 	pointer-events: none; /* don't allow tab actions to be clicked when running without tab actions */
 }
 
-/* Editor Actions */
-
-.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions {
-	cursor: default;
-	flex: initial;
-	padding: 0 8px 0 4px;
-	height: 35px;
-}
-
 /* Breadcrumbs */
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control {
@@ -350,11 +387,17 @@
 	height: 22px; /* tweak the icon size of the editor labels when icons are enabled */
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .outline-element-icon {
+	padding-right: 3px;
+	height: 22px; /* tweak the icon size of the editor labels when icons are enabled */
+	line-height: 22px;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item {
 	max-width: 80%;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item::before {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before {
 	width: 16px;
 	height: 22px;
 	display: flex;
@@ -362,6 +405,27 @@
 	justify-content: center;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs  .breadcrumbs-control .monaco-breadcrumb-item:last-child {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:last-child {
 	padding-right: 8px;
 }
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:last-child .codicon:last-child {
+	display: none; /* hides chevrons when last item */
+}
+
+/* Editor Actions Toolbar */
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions {
+	cursor: default;
+	flex: initial;
+	padding: 0 8px 0 4px;
+	height: 35px;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .editor-actions {
+
+	/* When tabs are wrapped, position the editor actions at the end of the very last row */
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
index 59ab0d4af..420f4031f 100644
--- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css
@@ -26,6 +26,15 @@
 	cursor: pointer;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title .monaco-icon-label::before {
+	height: 35px; /* tweak the icon size of the editor labels when icons are enabled */
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .title.breadcrumbs .monaco-icon-label::after,
+.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs .monaco-icon-label::after {
+	padding-right: 0; /* by default the icon label has a padding right and this isn't wanted when not showing tabs and not showing breadcrumbs */
+}
+
 /* Title Actions */
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions .action-label:not(span),
@@ -59,13 +68,12 @@
 	opacity: 0.4;
 }
 
-/* Drag Cursor */
+/* Drag and Drop */
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title {
 	cursor: grab;
 }
 
-/* Drag and Drop Feedback */
-
 .monaco-editor-group-drag-image {
 	display: inline-block;
 	padding: 1px 7px;
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index 66a7caec1..c779550c1 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/notabstitlecontrol';
 import { EditorResourceAccessor, Verbosity, IEditorInput, IEditorPartOptions, SideBySideEditor } from 'vs/workbench/common/editor';
-import { TitleControl, IToolbarActions } from 'vs/workbench/browser/parts/editor/titleControl';
+import { TitleControl, IToolbarActions, ITitleControlDimensions } from 'vs/workbench/browser/parts/editor/titleControl';
 import { ResourceLabel, IResourceLabel } from 'vs/workbench/browser/labels';
 import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
 import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
@@ -15,6 +15,7 @@ import { CLOSE_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/edito
 import { Color } from 'vs/base/common/color';
 import { withNullAsUndefined, assertIsDefined, assertAllDefined } from 'vs/base/common/types';
 import { IEditorGroupTitleDimensions } from 'vs/workbench/browser/parts/editor/editor';
+import { equals } from 'vs/base/common/objects';
 
 interface IRenderedEditorLabel {
 	editor?: IEditorInput;
@@ -50,7 +51,7 @@ export class NoTabsTitleControl extends TitleControl {
 		// Breadcrumbs
 		this.createBreadcrumbsControl(labelContainer, { showFileIcons: false, showSymbolIcons: true, showDecorationColors: false, breadcrumbsBackground: () => Color.transparent });
 		titleContainer.classList.toggle('breadcrumbs', Boolean(this.breadcrumbsControl));
-		this._register({ dispose: () => titleContainer.classList.remove('breadcrumbs') }); // import to remove because the container is a shared dom node
+		this._register({ dispose: () => titleContainer.classList.remove('breadcrumbs') }); // important to remove because the container is a shared dom node
 
 		// Right Actions Container
 		const actionsContainer = document.createElement('div');
@@ -67,16 +68,16 @@ export class NoTabsTitleControl extends TitleControl {
 		this.enableGroupDragging(titleContainer);
 
 		// Pin on double click
-		this._register(addDisposableListener(titleContainer, EventType.DBLCLICK, (e: MouseEvent) => this.onTitleDoubleClick(e)));
+		this._register(addDisposableListener(titleContainer, EventType.DBLCLICK, e => this.onTitleDoubleClick(e)));
 
 		// Detect mouse click
-		this._register(addDisposableListener(titleContainer, EventType.AUXCLICK, (e: MouseEvent) => this.onTitleAuxClick(e)));
+		this._register(addDisposableListener(titleContainer, EventType.AUXCLICK, e => this.onTitleAuxClick(e)));
 
 		// Detect touch
 		this._register(addDisposableListener(titleContainer, TouchEventType.Tap, (e: GestureEvent) => this.onTitleTap(e)));
 
 		// Context Menu
-		this._register(addDisposableListener(titleContainer, EventType.CONTEXT_MENU, (e: Event) => {
+		this._register(addDisposableListener(titleContainer, EventType.CONTEXT_MENU, e => {
 			if (this.group.activeEditor) {
 				this.onContextMenu(this.group.activeEditor, e, titleContainer);
 			}
@@ -188,7 +189,7 @@ export class NoTabsTitleControl extends TitleControl {
 	}
 
 	updateOptions(oldOptions: IEditorPartOptions, newOptions: IEditorPartOptions): void {
-		if (oldOptions.labelFormat !== newOptions.labelFormat) {
+		if (oldOptions.labelFormat !== newOptions.labelFormat || !equals(oldOptions.decorations, newOptions.decorations)) {
 			this.redraw();
 		}
 	}
@@ -236,6 +237,7 @@ export class NoTabsTitleControl extends TitleControl {
 
 	private redraw(): void {
 		const editor = withNullAsUndefined(this.group.activeEditor);
+		const options = this.accessor.partOptions;
 
 		const isEditorPinned = editor ? this.group.isPinned(editor) : false;
 		const isGroupActive = this.accessor.activeGroup === this.group;
@@ -291,14 +293,18 @@ export class NoTabsTitleControl extends TitleControl {
 				{
 					title,
 					italic: !isEditorPinned,
-					extraClasses: ['no-tabs', 'title-label']
+					extraClasses: ['no-tabs', 'title-label'],
+					fileDecorations: {
+						colors: Boolean(options.decorations?.colors),
+						badges: Boolean(options.decorations?.badges)
+					},
 				}
 			);
 
 			if (isGroupActive) {
-				editorLabel.element.style.color = this.getColor(TAB_ACTIVE_FOREGROUND) || '';
+				titleContainer.style.color = this.getColor(TAB_ACTIVE_FOREGROUND) || '';
 			} else {
-				editorLabel.element.style.color = this.getColor(TAB_UNFOCUSED_ACTIVE_FOREGROUND) || '';
+				titleContainer.style.color = this.getColor(TAB_UNFOCUSED_ACTIVE_FOREGROUND) || '';
 			}
 
 			// Update Editor Actions Toolbar
@@ -333,9 +339,11 @@ export class NoTabsTitleControl extends TitleControl {
 		};
 	}
 
-	layout(dimension: Dimension): void {
+	layout(dimensions: ITitleControlDimensions): Dimension {
 		if (this.breadcrumbsControl) {
 			this.breadcrumbsControl.layout(undefined);
 		}
+
+		return new Dimension(dimensions.container.width, this.getDimensions().height);
 	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts b/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
deleted file mode 100644
index 222d0fd5e..000000000
--- a/src/vs/workbench/browser/parts/editor/rangeDecorations.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { Emitter } from 'vs/base/common/event';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IRange } from 'vs/editor/common/core/range';
-import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { ICodeEditor, isCodeEditor, isCompositeEditor } from 'vs/editor/browser/editorBrowser';
-import { TrackedRangeStickiness, IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
-import { isEqual } from 'vs/base/common/resources';
-
-export interface IRangeHighlightDecoration {
-	resource: URI;
-	range: IRange;
-	isWholeLine?: boolean;
-}
-
-export class RangeHighlightDecorations extends Disposable {
-
-	private rangeHighlightDecorationId: string | null = null;
-	private editor: ICodeEditor | null = null;
-	private readonly editorDisposables = this._register(new DisposableStore());
-
-	private readonly _onHighlightRemoved: Emitter<void> = this._register(new Emitter<void>());
-	readonly onHighlightRemoved = this._onHighlightRemoved.event;
-
-	constructor(
-		@IEditorService private readonly editorService: IEditorService
-	) {
-		super();
-	}
-
-	removeHighlightRange() {
-		if (this.editor && this.editor.getModel() && this.rangeHighlightDecorationId) {
-			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
-			this._onHighlightRemoved.fire();
-		}
-
-		this.rangeHighlightDecorationId = null;
-	}
-
-	highlightRange(range: IRangeHighlightDecoration, editor?: any) {
-		editor = editor ?? this.getEditor(range);
-		if (isCodeEditor(editor)) {
-			this.doHighlightRange(editor, range);
-		} else if (isCompositeEditor(editor) && isCodeEditor(editor.activeCodeEditor)) {
-			this.doHighlightRange(editor.activeCodeEditor, range);
-		}
-	}
-
-	private doHighlightRange(editor: ICodeEditor, selectionRange: IRangeHighlightDecoration) {
-		this.removeHighlightRange();
-
-		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-			this.rangeHighlightDecorationId = changeAccessor.addDecoration(selectionRange.range, this.createRangeHighlightDecoration(selectionRange.isWholeLine));
-		});
-
-		this.setEditor(editor);
-	}
-
-	private getEditor(resourceRange: IRangeHighlightDecoration): ICodeEditor | undefined {
-		const activeEditor = this.editorService.activeEditor;
-		const resource = activeEditor && activeEditor.resource;
-		if (resource && isEqual(resource, resourceRange.resource)) {
-			return this.editorService.activeTextEditorControl as ICodeEditor;
-		}
-
-		return undefined;
-	}
-
-	private setEditor(editor: ICodeEditor) {
-		if (this.editor !== editor) {
-			this.editorDisposables.clear();
-			this.editor = editor;
-			this.editorDisposables.add(this.editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
-				if (
-					e.reason === CursorChangeReason.NotSet
-					|| e.reason === CursorChangeReason.Explicit
-					|| e.reason === CursorChangeReason.Undo
-					|| e.reason === CursorChangeReason.Redo
-				) {
-					this.removeHighlightRange();
-				}
-			}));
-			this.editorDisposables.add(this.editor.onDidChangeModel(() => { this.removeHighlightRange(); }));
-			this.editorDisposables.add(this.editor.onDidDispose(() => {
-				this.removeHighlightRange();
-				this.editor = null;
-			}));
-		}
-	}
-
-	private static readonly _WHOLE_LINE_RANGE_HIGHLIGHT = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'rangeHighlight',
-		isWholeLine: true
-	});
-
-	private static readonly _RANGE_HIGHLIGHT = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'rangeHighlight'
-	});
-
-	private createRangeHighlightDecoration(isWholeLine: boolean = true): ModelDecorationOptions {
-		return (isWholeLine ? RangeHighlightDecorations._WHOLE_LINE_RANGE_HIGHLIGHT : RangeHighlightDecorations._RANGE_HIGHLIGHT);
-	}
-
-	dispose() {
-		super.dispose();
-
-		if (this.editor && this.editor.getModel()) {
-			this.removeHighlightRange();
-			this.editor = null;
-		}
-	}
-}
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index bcd835f4c..e6adbec28 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -18,19 +18,18 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IMenuService } from 'vs/platform/actions/common/actions';
-import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
+import { ITitleControlDimensions, TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IDisposable, dispose, DisposableStore, combinedDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { getOrSet } from 'vs/base/common/map';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BORDER, TAB_LAST_PINNED_BORDER } from 'vs/workbench/common/theme';
 import { activeContrastBorder, contrastBorder, editorBackground, breadcrumbsBackground } from 'vs/platform/theme/common/colorRegistry';
 import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, DragAndDropObserver } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { MergeGroupMode, IMergeGroupOptions, GroupsArrangement, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode } from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
@@ -48,6 +47,7 @@ import { IPath, win32, posix } from 'vs/base/common/path';
 import { insert } from 'vs/base/common/arrays';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 import { isSafari } from 'vs/base/browser/browser';
+import { equals } from 'vs/base/common/objects';
 
 interface IEditorInputLabel {
 	name?: string;
@@ -73,6 +73,9 @@ export class TabsTitleControl extends TitleControl {
 
 	private static readonly TAB_HEIGHT = 35;
 
+	private static readonly MOUSE_WHEEL_EVENT_THRESHOLD = 150;
+	private static readonly MOUSE_WHEEL_DISTANCE_THRESHOLD = 1.5;
+
 	private titleContainer: HTMLElement | undefined;
 	private tabsAndActionsContainer: HTMLElement | undefined;
 	private tabsContainer: HTMLElement | undefined;
@@ -87,12 +90,18 @@ export class TabsTitleControl extends TitleControl {
 	private tabActionBars: ActionBar[] = [];
 	private tabDisposables: IDisposable[] = [];
 
-	private dimension: Dimension | undefined;
+	private dimensions: ITitleControlDimensions & { used?: Dimension } = {
+		container: Dimension.None,
+		available: Dimension.None
+	};
+
 	private readonly layoutScheduled = this._register(new MutableDisposable());
 	private blockRevealActiveTab: boolean | undefined;
 
 	private path: IPath = isWindows ? win32 : posix;
 
+	private lastMouseWheelEventTime = 0;
+
 	constructor(
 		parent: HTMLElement,
 		accessor: IEditorGroupsAccessor,
@@ -106,19 +115,21 @@ export class TabsTitleControl extends TitleControl {
 		@IMenuService menuService: IMenuService,
 		@IQuickInputService quickInputService: IQuickInputService,
 		@IThemeService themeService: IThemeService,
-		@IExtensionService extensionService: IExtensionService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IFileService fileService: IFileService,
 		@IEditorService private readonly editorService: EditorServiceImpl,
 		@IPathService private readonly pathService: IPathService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
 	) {
-		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickInputService, themeService, extensionService, configurationService, fileService);
+		super(parent, accessor, group, contextMenuService, instantiationService, contextKeyService, keybindingService, telemetryService, notificationService, menuService, quickInputService, themeService, configurationService, fileService);
 
 		// Resolve the correct path library for the OS we are on
 		// If we are connected to remote, this accounts for the
 		// remote OS.
 		(async () => this.path = await this.pathService.path)();
+
+		// React to decorations changing for our resource labels
+		this._register(this.tabResourceLabels.onDidChangeDecorations(() => this.doHandleDecorationsChange()));
 	}
 
 	protected create(parent: HTMLElement): void {
@@ -151,7 +162,7 @@ export class TabsTitleControl extends TitleControl {
 		// Editor Actions Toolbar
 		this.createEditorActionsToolBar(this.editorToolbarContainer);
 
-		// Breadcrumbs (are on a separate row below tabs and actions)
+		// Breadcrumbs
 		const breadcrumbsContainer = document.createElement('div');
 		breadcrumbsContainer.classList.add('tabs-breadcrumbs');
 		this.titleContainer.appendChild(breadcrumbsContainer);
@@ -242,7 +253,7 @@ export class TabsTitleControl extends TitleControl {
 		});
 
 		// Prevent auto-scrolling (https://github.com/microsoft/vscode/issues/16690)
-		this._register(addDisposableListener(tabsContainer, EventType.MOUSE_DOWN, (e: MouseEvent) => {
+		this._register(addDisposableListener(tabsContainer, EventType.MOUSE_DOWN, e => {
 			if (e.button === 1) {
 				e.preventDefault();
 			}
@@ -337,8 +348,27 @@ export class TabsTitleControl extends TitleControl {
 				}
 			}
 
-			// Figure out scrolling direction
-			const nextEditor = this.group.getEditorByIndex(this.group.getIndexOfEditor(activeEditor) + (e.deltaX < 0 || e.deltaY < 0 /* scrolling up */ ? -1 : 1));
+			// Ignore event if the last one happened too recently (https://github.com/microsoft/vscode/issues/96409)
+			// The restriction is relaxed according to the absolute value of `deltaX` and `deltaY`
+			// to support discrete (mouse wheel) and contiguous scrolling (touchpad) equally well
+			const now = Date.now();
+			if (now - this.lastMouseWheelEventTime < TabsTitleControl.MOUSE_WHEEL_EVENT_THRESHOLD - 2 * (Math.abs(e.deltaX) + Math.abs(e.deltaY))) {
+				return;
+			}
+
+			this.lastMouseWheelEventTime = now;
+
+			// Figure out scrolling direction but ignore it if too subtle
+			let tabSwitchDirection: number;
+			if (e.deltaX + e.deltaY < - TabsTitleControl.MOUSE_WHEEL_DISTANCE_THRESHOLD) {
+				tabSwitchDirection = -1;
+			} else if (e.deltaX + e.deltaY > TabsTitleControl.MOUSE_WHEEL_DISTANCE_THRESHOLD) {
+				tabSwitchDirection = 1;
+			} else {
+				return;
+			}
+
+			const nextEditor = this.group.getEditorByIndex(this.group.getIndexOfEditor(activeEditor) + tabSwitchDirection);
 			if (!nextEditor) {
 				return;
 			}
@@ -351,12 +381,19 @@ export class TabsTitleControl extends TitleControl {
 		}));
 	}
 
+	private doHandleDecorationsChange(): void {
+
+		// A change to decorations potentially has an impact on the size of tabs
+		// so we need to trigger a layout in that case to adjust things
+		this.layout(this.dimensions);
+	}
+
 	protected updateEditorActionsToolbar(): void {
 		super.updateEditorActionsToolbar();
 
 		// Changing the actions in the toolbar can have an impact on the size of the
 		// tab container, so we need to layout the tabs to make sure the active is visible
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	openEditor(editor: IEditorInput): void {
@@ -439,7 +476,7 @@ export class TabsTitleControl extends TitleControl {
 		});
 
 		// Moving an editor requires a layout to keep the active editor visible
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	pinEditor(editor: IEditorInput): void {
@@ -466,7 +503,7 @@ export class TabsTitleControl extends TitleControl {
 		});
 
 		// A change to the sticky state requires a layout to keep the active editor visible
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	setActive(isGroupActive: boolean): void {
@@ -478,7 +515,7 @@ export class TabsTitleControl extends TitleControl {
 
 		// Activity has an impact on the toolbar, so we need to update and layout
 		this.updateEditorActionsToolbar();
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	private updateEditorLabelAggregator = this._register(new RunOnceScheduler(() => this.updateEditorLabels(), 0));
@@ -504,7 +541,7 @@ export class TabsTitleControl extends TitleControl {
 		});
 
 		// A change to a label requires a layout to keep the active editor visible
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	updateEditorDirty(editor: IEditorInput): void {
@@ -531,7 +568,9 @@ export class TabsTitleControl extends TitleControl {
 			oldOptions.pinnedTabSizing !== newOptions.pinnedTabSizing ||
 			oldOptions.showIcons !== newOptions.showIcons ||
 			oldOptions.hasIcons !== newOptions.hasIcons ||
-			oldOptions.highlightModifiedTabs !== newOptions.highlightModifiedTabs
+			oldOptions.highlightModifiedTabs !== newOptions.highlightModifiedTabs ||
+			oldOptions.wrapTabs !== newOptions.wrapTabs ||
+			!equals(oldOptions.decorations, newOptions.decorations)
 		) {
 			this.redraw();
 		}
@@ -648,7 +687,7 @@ export class TabsTitleControl extends TitleControl {
 		};
 
 		// Open on Click / Touch
-		disposables.add(addDisposableListener(tab, EventType.MOUSE_DOWN, (e: MouseEvent) => handleClickOrTouch(e)));
+		disposables.add(addDisposableListener(tab, EventType.MOUSE_DOWN, e => handleClickOrTouch(e)));
 		disposables.add(addDisposableListener(tab, TouchEventType.Tap, (e: GestureEvent) => handleClickOrTouch(e)));
 
 		// Touch Scroll Support
@@ -657,14 +696,14 @@ export class TabsTitleControl extends TitleControl {
 		}));
 
 		// Prevent flicker of focus outline on tab until editor got focus
-		disposables.add(addDisposableListener(tab, EventType.MOUSE_UP, (e: MouseEvent) => {
+		disposables.add(addDisposableListener(tab, EventType.MOUSE_UP, e => {
 			EventHelper.stop(e);
 
 			tab.blur();
 		}));
 
 		// Close on mouse middle click
-		disposables.add(addDisposableListener(tab, EventType.AUXCLICK, (e: MouseEvent) => {
+		disposables.add(addDisposableListener(tab, EventType.AUXCLICK, e => {
 			if (e.button === 1 /* Middle Button*/) {
 				EventHelper.stop(e, true /* for https://github.com/microsoft/vscode/issues/56715 */);
 
@@ -674,7 +713,7 @@ export class TabsTitleControl extends TitleControl {
 		}));
 
 		// Context menu on Shift+F10
-		disposables.add(addDisposableListener(tab, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+		disposables.add(addDisposableListener(tab, EventType.KEY_DOWN, e => {
 			const event = new StandardKeyboardEvent(e);
 			if (event.shiftKey && event.keyCode === KeyCode.F10) {
 				showContextMenu(e);
@@ -687,7 +726,7 @@ export class TabsTitleControl extends TitleControl {
 		}));
 
 		// Keyboard accessibility
-		disposables.add(addDisposableListener(tab, EventType.KEY_UP, (e: KeyboardEvent) => {
+		disposables.add(addDisposableListener(tab, EventType.KEY_UP, e => {
 			const event = new StandardKeyboardEvent(e);
 			let handled = false;
 
@@ -750,7 +789,7 @@ export class TabsTitleControl extends TitleControl {
 		});
 
 		// Context menu
-		disposables.add(addDisposableListener(tab, EventType.CONTEXT_MENU, (e: Event) => {
+		disposables.add(addDisposableListener(tab, EventType.CONTEXT_MENU, e => {
 			EventHelper.stop(e, true);
 
 			const input = this.group.getEditorByIndex(index);
@@ -760,7 +799,7 @@ export class TabsTitleControl extends TitleControl {
 		}, true /* use capture to fix https://github.com/microsoft/vscode/issues/19145 */));
 
 		// Drag support
-		disposables.add(addDisposableListener(tab, EventType.DRAG_START, (e: DragEvent) => {
+		disposables.add(addDisposableListener(tab, EventType.DRAG_START, e => {
 			const editor = this.group.getEditorByIndex(index);
 			if (!editor) {
 				return;
@@ -1022,7 +1061,7 @@ export class TabsTitleControl extends TitleControl {
 		this.updateEditorActionsToolbar();
 
 		// Ensure the active tab is always revealed
-		this.layout(this.dimension);
+		this.layout(this.dimensions);
 	}
 
 	private redrawTab(editor: IEditorInput, index: number, tabContainer: HTMLElement, tabLabelWidget: IResourceLabel, tabLabel: IEditorInputLabel, tabActionBar: ActionBar): void {
@@ -1092,12 +1131,14 @@ export class TabsTitleControl extends TitleControl {
 		// or their first character of the name otherwise
 		let name: string | undefined;
 		let forceLabel = false;
+		let forceDisableBadgeDecorations = false;
 		let description: string;
 		if (options.pinnedTabSizing === 'compact' && this.group.isSticky(index)) {
 			const isShowingIcons = options.showIcons && options.hasIcons;
 			name = isShowingIcons ? '' : tabLabel.name?.charAt(0).toUpperCase();
 			description = '';
 			forceLabel = true;
+			forceDisableBadgeDecorations = true; // not enough space when sticky tabs are compact
 		} else {
 			name = tabLabel.name;
 			description = tabLabel.description || '';
@@ -1116,7 +1157,16 @@ export class TabsTitleControl extends TitleControl {
 		// Label
 		tabLabelWidget.setResource(
 			{ name, description, resource: EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH }) },
-			{ title, extraClasses: ['tab-label'], italic: !this.group.isPinned(editor), forceLabel }
+			{
+				title,
+				extraClasses: ['tab-label'],
+				italic: !this.group.isPinned(editor),
+				forceLabel,
+				fileDecorations: {
+					colors: Boolean(options.decorations?.colors),
+					badges: forceDisableBadgeDecorations ? false : Boolean(options.decorations?.badges)
+				}
+			}
 		);
 
 		// Tests helper
@@ -1234,62 +1284,179 @@ export class TabsTitleControl extends TitleControl {
 	}
 
 	getDimensions(): IEditorGroupTitleDimensions {
-		let height = TabsTitleControl.TAB_HEIGHT;
-		if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
-			height += BreadcrumbsControl.HEIGHT;
+		let height: number;
+
+		// Wrap: we need to ask `offsetHeight` to get
+		// the real height of the title area with wrapping.
+		if (this.accessor.partOptions.wrapTabs && this.tabsAndActionsContainer?.classList.contains('wrapping')) {
+			height = this.tabsAndActionsContainer.offsetHeight;
+		} else {
+			height = TabsTitleControl.TAB_HEIGHT;
 		}
 
-		return {
-			height,
-			offset: TabsTitleControl.TAB_HEIGHT
-		};
+		const offset = height;
+
+		// Account for breadcrumbs if visible
+		if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
+			height += BreadcrumbsControl.HEIGHT; // Account for breadcrumbs if visible
+		}
+
+		return { height, offset };
 	}
 
-	layout(dimension: Dimension | undefined): void {
-		this.dimension = dimension;
+	layout(dimensions: ITitleControlDimensions): Dimension {
 
-		const activeTabAndIndex = this.group.activeEditor ? this.getTabAndIndex(this.group.activeEditor) : undefined;
-		if (!activeTabAndIndex || !this.dimension) {
-			return;
-		}
+		// Remember dimensions that we get
+		Object.assign(this.dimensions, dimensions);
 
 		// The layout of tabs can be an expensive operation because we access DOM properties
 		// that can result in the browser doing a full page layout to validate them. To buffer
 		// this a little bit we try at least to schedule this work on the next animation frame.
 		if (!this.layoutScheduled.value) {
 			this.layoutScheduled.value = scheduleAtNextAnimationFrame(() => {
-				const dimension = assertIsDefined(this.dimension);
-				this.doLayout(dimension);
+				this.doLayout(this.dimensions);
 
 				this.layoutScheduled.clear();
 			});
 		}
+
+		// First time layout: compute the dimensions and store it
+		if (!this.dimensions.used) {
+			this.dimensions.used = new Dimension(dimensions.container.width, this.getDimensions().height);
+		}
+
+		return this.dimensions.used;
 	}
 
-	private doLayout(dimension: Dimension): void {
+	private doLayout(dimensions: ITitleControlDimensions): void {
+
+		// Only layout if we have valid tab index and dimensions
 		const activeTabAndIndex = this.group.activeEditor ? this.getTabAndIndex(this.group.activeEditor) : undefined;
-		if (!activeTabAndIndex) {
-			return; // nothing to do if not editor opened
+		if (activeTabAndIndex && dimensions.container !== Dimension.None && dimensions.available !== Dimension.None) {
+
+			// Breadcrumbs
+			this.doLayoutBreadcrumbs(dimensions);
+
+			// Tabs
+			const [activeTab, activeIndex] = activeTabAndIndex;
+			this.doLayoutTabs(activeTab, activeIndex, dimensions);
 		}
 
-		// Breadcrumbs
-		this.doLayoutBreadcrumbs(dimension);
+		// Remember the dimensions used in the control so that we can
+		// return it fast from the `layout` call without having to
+		// compute it over and over again
+		const oldDimension = this.dimensions.used;
+		const newDimension = this.dimensions.used = new Dimension(dimensions.container.width, this.getDimensions().height);
 
-		// Tabs
-		const [activeTab, activeIndex] = activeTabAndIndex;
-		this.doLayoutTabs(activeTab, activeIndex);
+		// In case the height of the title control changed from before
+		// (currently only possible if wrapping changed on/off), we need
+		// to signal this to the outside via a `relayout` call so that
+		// e.g. the editor control can be adjusted accordingly.
+		if (oldDimension && oldDimension.height !== newDimension.height) {
+			this.group.relayout();
+		}
 	}
 
-	private doLayoutBreadcrumbs(dimension: Dimension): void {
+	private doLayoutBreadcrumbs(dimensions: ITitleControlDimensions): void {
 		if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
-			const tabsScrollbar = assertIsDefined(this.tabsScrollbar);
-
-			this.breadcrumbsControl.layout(new Dimension(dimension.width, BreadcrumbsControl.HEIGHT));
-			tabsScrollbar.getDomNode().style.height = `${dimension.height - BreadcrumbsControl.HEIGHT}px`;
+			this.breadcrumbsControl.layout(new Dimension(dimensions.container.width, BreadcrumbsControl.HEIGHT));
 		}
 	}
 
-	private doLayoutTabs(activeTab: HTMLElement, activeIndex: number): void {
+	private doLayoutTabs(activeTab: HTMLElement, activeIndex: number, dimensions: ITitleControlDimensions): void {
+
+		// Always first layout tabs with wrapping support even if wrapping
+		// is disabled. The result indicates if tabs wrap and if not, we
+		// need to proceed with the layout without wrapping because even
+		// if wrapping is enabled in settings, there are cases where
+		// wrapping is disabled (e.g. due to space constraints)
+		const tabsWrapMultiLine = this.doLayoutTabsWrapping(dimensions);
+		if (!tabsWrapMultiLine) {
+			this.doLayoutTabsNonWrapping(activeTab, activeIndex);
+		}
+	}
+
+	private doLayoutTabsWrapping(dimensions: ITitleControlDimensions): boolean {
+		const [tabsAndActionsContainer, tabsContainer, editorToolbarContainer, tabsScrollbar] = assertAllDefined(this.tabsAndActionsContainer, this.tabsContainer, this.editorToolbarContainer, this.tabsScrollbar);
+
+		// Handle wrapping tabs according to setting:
+		// - enabled: only add class if tabs wrap and don't exceed available dimensions
+		// - disabled: remove class and margin-right variable
+
+		const didTabsWrapMultiLine = tabsAndActionsContainer.classList.contains('wrapping');
+		let tabsWrapMultiLine = didTabsWrapMultiLine;
+
+		function updateTabsWrapping(enabled: boolean): void {
+			tabsWrapMultiLine = enabled;
+
+			// Toggle the `wrapped` class to enable wrapping
+			tabsAndActionsContainer.classList.toggle('wrapping', tabsWrapMultiLine);
+
+			// Update `last-tab-margin-right` CSS variable to account for the absolute
+			// positioned editor actions container when tabs wrap. The margin needs to
+			// be the width of the editor actions container to avoid screen cheese.
+			tabsContainer.style.setProperty('--last-tab-margin-right', tabsWrapMultiLine ? `${editorToolbarContainer.offsetWidth}px` : '0');
+		}
+
+		// Setting enabled: selectively enable wrapping if possible
+		if (this.accessor.partOptions.wrapTabs) {
+			const visibleTabsWidth = tabsContainer.offsetWidth;
+			const allTabsWidth = tabsContainer.scrollWidth;
+			const lastTabFitsWrapped = () => {
+				const lastTab = this.getLastTab();
+				if (!lastTab) {
+					return true; // no tab always fits
+				}
+
+				return lastTab.offsetWidth <= (dimensions.available.width - editorToolbarContainer.offsetWidth);
+			};
+
+			// If tabs wrap or should start to wrap (when width exceeds visible width)
+			// we must trigger `updateWrapping` to set the `last-tab-margin-right`
+			// accordingly based on the number of actions. The margin is important to
+			// properly position the last tab apart from the actions
+			//
+			// We already check here if the last tab would fit when wrapped given the
+			// editor toolbar will also show right next to it. This ensures we are not
+			// enabling wrapping only to disable it again in the code below (this fixes
+			// flickering issue https://github.com/microsoft/vscode/issues/115050)
+			if (tabsWrapMultiLine || (allTabsWidth > visibleTabsWidth && lastTabFitsWrapped())) {
+				updateTabsWrapping(true);
+			}
+
+			// Tabs wrap multiline: remove wrapping under certain size constraint conditions
+			if (tabsWrapMultiLine) {
+				if (
+					(tabsContainer.offsetHeight > dimensions.available.height) ||											// if height exceeds available height
+					(allTabsWidth === visibleTabsWidth && tabsContainer.offsetHeight === TabsTitleControl.TAB_HEIGHT) ||	// if wrapping is not needed anymore
+					(!lastTabFitsWrapped())																					// if last tab does not fit anymore
+				) {
+					updateTabsWrapping(false);
+				}
+			}
+		}
+
+		// Setting disabled: remove CSS traces only if tabs did wrap
+		else if (didTabsWrapMultiLine) {
+			updateTabsWrapping(false);
+		}
+
+		// If we transitioned from non-wrapping to wrapping, we need
+		// to update the scrollbar to have an equal `width` and
+		// `scrollWidth`. Otherwise a scrollbar would appear which is
+		// never desired when wrapping.
+		if (tabsWrapMultiLine && !didTabsWrapMultiLine) {
+			const visibleTabsWidth = tabsContainer.offsetWidth;
+			tabsScrollbar.setScrollDimensions({
+				width: visibleTabsWidth,
+				scrollWidth: visibleTabsWidth
+			});
+		}
+
+		return tabsWrapMultiLine;
+	}
+
+	private doLayoutTabsNonWrapping(activeTab: HTMLElement, activeIndex: number): void {
 		const [tabsContainer, tabsScrollbar] = assertAllDefined(this.tabsContainer, this.tabsScrollbar);
 
 		//
@@ -1308,7 +1475,7 @@ export class TabsTitleControl extends TitleControl {
 		// [-- Sticky Tabs Width --]
 		//
 
-		const visibleTabsContainerWidth = tabsContainer.offsetWidth;
+		const visibleTabsWidth = tabsContainer.offsetWidth;
 		const allTabsWidth = tabsContainer.scrollWidth;
 
 		// Compute width of sticky tabs depending on pinned tab sizing
@@ -1331,17 +1498,17 @@ export class TabsTitleControl extends TitleControl {
 		}
 
 		// Figure out if active tab is positioned static which has an
-		// impact on wether to reveal the tab or not later
+		// impact on whether to reveal the tab or not later
 		let activeTabPositionStatic = this.accessor.partOptions.pinnedTabSizing !== 'normal' && this.group.isSticky(activeIndex);
 
 		// Special case: we have sticky tabs but the available space for showing tabs
 		// is little enough that we need to disable sticky tabs sticky positioning
 		// so that tabs can be scrolled at naturally.
-		let availableTabsContainerWidth = visibleTabsContainerWidth - stickyTabsWidth;
+		let availableTabsContainerWidth = visibleTabsWidth - stickyTabsWidth;
 		if (this.group.stickyCount > 0 && availableTabsContainerWidth < TabsTitleControl.TAB_WIDTH.fit) {
 			tabsContainer.classList.add('disable-sticky-tabs');
 
-			availableTabsContainerWidth = visibleTabsContainerWidth;
+			availableTabsContainerWidth = visibleTabsWidth;
 			stickyTabsWidth = 0;
 			activeTabPositionStatic = false;
 		} else {
@@ -1358,7 +1525,7 @@ export class TabsTitleControl extends TitleControl {
 
 		// Update scrollbar
 		tabsScrollbar.setScrollDimensions({
-			width: visibleTabsContainerWidth,
+			width: visibleTabsWidth,
 			scrollWidth: allTabsWidth
 		});
 
@@ -1426,15 +1593,28 @@ export class TabsTitleControl extends TitleControl {
 
 	private getTabAndIndex(editor: IEditorInput): [HTMLElement, number /* index */] | undefined {
 		const editorIndex = this.group.getIndexOfEditor(editor);
-		if (editorIndex >= 0) {
-			const tabsContainer = assertIsDefined(this.tabsContainer);
-
-			return [tabsContainer.children[editorIndex] as HTMLElement, editorIndex];
+		const tab = this.getTabAtIndex(editorIndex);
+		if (tab) {
+			return [tab, editorIndex];
 		}
 
 		return undefined;
 	}
 
+	private getTabAtIndex(editorIndex: number): HTMLElement | undefined {
+		if (editorIndex >= 0) {
+			const tabsContainer = assertIsDefined(this.tabsContainer);
+
+			return tabsContainer.children[editorIndex] as HTMLElement | undefined;
+		}
+
+		return undefined;
+	}
+
+	private getLastTab(): HTMLElement | undefined {
+		return this.getTabAtIndex(this.group.count - 1);
+	}
+
 	private blockRevealActiveTabOnce(): void {
 
 		// When closing tabs through the tab close button or gesture, the user
@@ -1527,16 +1707,28 @@ export class TabsTitleControl extends TitleControl {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 
 	// Add border between tabs and breadcrumbs in high contrast mode.
 	if (theme.type === ColorScheme.HIGH_CONTRAST) {
 		const borderColor = (theme.getColor(TAB_BORDER) || theme.getColor(contrastBorder));
+		if (borderColor) {
+			collector.addRule(`
+				.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container {
+					border-bottom: 1px solid ${borderColor};
+				}
+			`);
+		}
+	}
+
+	// Add bottom border to tabs when wrapping
+	const borderColor = theme.getColor(TAB_BORDER);
+	if (borderColor) {
 		collector.addRule(`
-			.monaco-workbench .part.editor > .content .editor-group-container > .title.tabs > .tabs-and-actions-container {
-				border-bottom: 1px solid ${borderColor};
-			}
-		`);
+				.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.wrapping .tabs-container > .tab {
+					border-bottom: 1px solid ${borderColor};
+				}
+			`);
 	}
 
 	// Styling with Outline color (e.g. high contrast theme)
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index 4557a2c48..7ae3677e1 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
-import { isFunction, isObject, isArray, assertIsDefined } from 'vs/base/common/types';
+import { isFunction, isObject, isArray, assertIsDefined, withUndefinedAsNull } from 'vs/base/common/types';
 import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IDiffEditorOptions, IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
@@ -103,7 +103,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
 	}
 
 	createEditorControl(parent: HTMLElement, configuration: ICodeEditorOptions): IDiffEditor {
-		return this.instantiationService.createInstance(DiffEditorWidget, parent, configuration);
+		return this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {});
 	}
 
 	async setInput(input: EditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
@@ -132,8 +132,8 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
 
 			// Set Editor Model
 			const diffEditor = assertIsDefined(this.getControl());
-			const resolvedDiffEditorModel = <TextDiffEditorModel>resolvedModel;
-			diffEditor.setModel(resolvedDiffEditorModel.textDiffEditorModel);
+			const resolvedDiffEditorModel = resolvedModel as TextDiffEditorModel;
+			diffEditor.setModel(withUndefinedAsNull(resolvedDiffEditorModel.textDiffEditorModel));
 
 			// Apply Options from TextOptions
 			let optionsGotApplied = false;
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 9cae4d214..7ec16141d 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -233,7 +233,6 @@ export abstract class BaseTextEditor extends EditorPane implements ITextEditorPa
 		return undefined;
 	}
 
-
 	protected saveTextEditorViewState(resource: URI, cleanUpOnDispose?: IEditorInput): void {
 		const editorViewState = this.retrieveTextEditorViewState(resource);
 		if (!editorViewState || !this.group) {
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 8358dfcba..6b7e1e5e9 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -9,14 +9,13 @@ import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ActionsOrientation, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, IActionViewItem } from 'vs/base/common/actions';
-import * as arrays from 'vs/base/common/arrays';
+import { IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, IActionViewItem } from 'vs/base/common/actions';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { localize } from 'vs/nls';
-import { createAndFillInActionBarActions, createAndFillInContextMenuActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { ExecuteCommandAction, IMenu, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -26,7 +25,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
 import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillResourceDataTransfers, LocalSelectionTransfer } from 'vs/workbench/browser/dnd';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
@@ -34,7 +33,6 @@ import { BreadcrumbsControl, IBreadcrumbsControlOptions } from 'vs/workbench/bro
 import { IEditorGroupsAccessor, IEditorGroupTitleDimensions, IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
 import { EditorCommandsContextActionRunner, IEditorCommandsContext, IEditorInput, EditorResourceAccessor, IEditorPartOptions, SideBySideEditor, ActiveEditorPinnedContext, ActiveEditorStickyContext } from 'vs/workbench/common/editor';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { IFileService } from 'vs/platform/files/common/files';
 import { withNullAsUndefined, withUndefinedAsNull, assertIsDefined } from 'vs/base/common/types';
@@ -46,6 +44,20 @@ export interface IToolbarActions {
 	secondary: IAction[];
 }
 
+export interface ITitleControlDimensions {
+
+	/**
+	 * The size of the parent container the title control is layed out in.
+	 */
+	container: Dimension;
+
+	/**
+	 * The maximum size the title control is allowed to consume based on
+	 * other controls that are positioned inside the container.
+	 */
+	available: Dimension;
+}
+
 export abstract class TitleControl extends Themable {
 
 	protected readonly groupTransfer = LocalSelectionTransfer.getInstance<DraggedEditorGroupIdentifier>();
@@ -53,9 +65,6 @@ export abstract class TitleControl extends Themable {
 
 	protected breadcrumbsControl: BreadcrumbsControl | undefined = undefined;
 
-	private currentPrimaryEditorActionIds: string[] = [];
-	private currentSecondaryEditorActionIds: string[] = [];
-
 	private editorActionsToolbar: ToolBar | undefined;
 
 	private resourceContext: ResourceContextKey;
@@ -79,7 +88,6 @@ export abstract class TitleControl extends Themable {
 		@IMenuService private readonly menuService: IMenuService,
 		@IQuickInputService protected quickInputService: IQuickInputService,
 		@IThemeService themeService: IThemeService,
-		@IExtensionService private readonly extensionService: IExtensionService,
 		@IConfigurationService protected configurationService: IConfigurationService,
 		@IFileService private readonly fileService: IFileService
 	) {
@@ -92,13 +100,6 @@ export abstract class TitleControl extends Themable {
 		this.contextMenu = this._register(this.menuService.createMenu(MenuId.EditorTitleContext, this.contextKeyService));
 
 		this.create(parent);
-		this.registerListeners();
-	}
-
-	protected registerListeners(): void {
-
-		// Update actions toolbar when extension register that may contribute them
-		this._register(this.extensionService.onDidRegisterExtensions(() => this.updateEditorActionsToolbar()));
 	}
 
 	protected abstract create(parent: HTMLElement): void;
@@ -147,7 +148,7 @@ export abstract class TitleControl extends Themable {
 		this.editorActionsToolbar.context = context;
 
 		// Action Run Handling
-		this._register(this.editorActionsToolbar.actionRunner.onDidRun((e: IRunEvent) => {
+		this._register(this.editorActionsToolbar.actionRunner.onDidRun(e => {
 
 			// Notify for Error
 			this.notificationService.error(e.error);
@@ -172,35 +173,14 @@ export abstract class TitleControl extends Themable {
 		}
 
 		// Check extensions
-		if (action instanceof MenuItemAction) {
-			return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-		} else if (action instanceof SubmenuItemAction) {
-			return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-		}
-
-		return undefined;
+		return createActionViewItem(this.instantiationService, action);
 	}
 
 	protected updateEditorActionsToolbar(): void {
-
-		// Update Editor Actions Toolbar
 		const { primaryEditorActions, secondaryEditorActions } = this.prepareEditorActions(this.getEditorActions());
 
-		// Only update if something actually has changed
-		const primaryEditorActionIds = primaryEditorActions.map(a => a.id);
-		const secondaryEditorActionIds = secondaryEditorActions.map(a => a.id);
-		if (
-			!arrays.equals(primaryEditorActionIds, this.currentPrimaryEditorActionIds) ||
-			!arrays.equals(secondaryEditorActionIds, this.currentSecondaryEditorActionIds) ||
-			primaryEditorActions.some(action => action instanceof ExecuteCommandAction) || // execute command actions can have the same ID but different arguments
-			secondaryEditorActions.some(action => action instanceof ExecuteCommandAction)  // see also https://github.com/microsoft/vscode/issues/16298
-		) {
-			const editorActionsToolbar = assertIsDefined(this.editorActionsToolbar);
-			editorActionsToolbar.setActions(primaryEditorActions, secondaryEditorActions);
-
-			this.currentPrimaryEditorActionIds = primaryEditorActionIds;
-			this.currentSecondaryEditorActionIds = secondaryEditorActionIds;
-		}
+		const editorActionsToolbar = assertIsDefined(this.editorActionsToolbar);
+		editorActionsToolbar.setActions(primaryEditorActions, secondaryEditorActions);
 	}
 
 	protected prepareEditorActions(editorActions: IToolbarActions): { primaryEditorActions: IAction[]; secondaryEditorActions: IAction[]; } {
@@ -251,18 +231,13 @@ export abstract class TitleControl extends Themable {
 	}
 
 	protected clearEditorActionsToolbar(): void {
-		if (this.editorActionsToolbar) {
-			this.editorActionsToolbar.setActions([], []);
-		}
-
-		this.currentPrimaryEditorActionIds = [];
-		this.currentSecondaryEditorActionIds = [];
+		this.editorActionsToolbar?.setActions([], []);
 	}
 
 	protected enableGroupDragging(element: HTMLElement): void {
 
 		// Drag start
-		this._register(addDisposableListener(element, EventType.DRAG_START, (e: DragEvent) => {
+		this._register(addDisposableListener(element, EventType.DRAG_START, e => {
 			if (e.target !== element) {
 				return; // only if originating from tabs container
 			}
@@ -354,7 +329,7 @@ export abstract class TitleControl extends Themable {
 			getAnchor: () => anchor,
 			getActions: () => actions,
 			getActionsContext: () => ({ groupId: this.group.id, editorIndex: this.group.getIndexOfEditor(editor) }),
-			getKeyBinding: (action) => this.getKeybinding(action),
+			getKeyBinding: action => this.getKeybinding(action),
 			onHide: () => {
 
 				// restore previous contexts
@@ -407,7 +382,7 @@ export abstract class TitleControl extends Themable {
 
 	abstract updateStyles(): void;
 
-	abstract layout(dimension: Dimension): void;
+	abstract layout(dimensions: ITitleControlDimensions): Dimension;
 
 	abstract getDimensions(): IEditorGroupTitleDimensions;
 
@@ -419,7 +394,7 @@ export abstract class TitleControl extends Themable {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 
 	// Drag Feedback
 	const dragImageBackground = theme.getColor(listActiveSelectionBackground);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index d4074bbeb..8113a026b 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/notificationsCenter';
 import 'vs/css!./media/notificationsActions';
 import { NOTIFICATIONS_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector, Themable } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType, NotificationViewItemContentChangeKind } from 'vs/workbench/common/notifications';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { Emitter } from 'vs/base/common/event';
@@ -313,7 +313,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 	const notificationBorderColor = theme.getColor(NOTIFICATIONS_BORDER);
 	if (notificationBorderColor) {
 		collector.addRule(`.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row[data-last-element="false"] > .notification-list-item { border-bottom: 1px solid ${notificationBorderColor}; }`);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index 7cbfb84f2..b1e8112ea 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -10,7 +10,7 @@ import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IListOptions } from 'vs/base/browser/ui/list/listWidget';
 import { NOTIFICATIONS_LINKS, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_FOREGROUND, NOTIFICATIONS_ERROR_ICON_FOREGROUND, NOTIFICATIONS_WARNING_ICON_FOREGROUND, NOTIFICATIONS_INFO_ICON_FOREGROUND } from 'vs/workbench/common/theme';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector, Themable } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, Themable } from 'vs/platform/theme/common/themeService';
 import { contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
 import { INotificationViewItem } from 'vs/workbench/common/notifications';
 import { NotificationsListDelegate, NotificationRenderer } from 'vs/workbench/browser/parts/notifications/notificationsViewer';
@@ -278,7 +278,7 @@ export class NotificationsList extends Themable {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 	const linkColor = theme.getColor(NOTIFICATIONS_LINKS);
 	if (linkColor) {
 		collector.addRule(`.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a { color: ${linkColor}; }`);
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 51272ab8a..2c8b0f465 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -470,7 +470,9 @@ export class NotificationTemplateRenderer extends Disposable {
 						: buttonToolbar.addButton(buttonOptions));
 				button.label = action.label;
 				this.inputDisposables.add(button.onDidClick(e => {
-					EventHelper.stop(e, true);
+					if (e) {
+						EventHelper.stop(e, true);
+					}
 					actionRunner.run(action);
 				}));
 
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index 74619ecec..372e78f8a 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -5,45 +5,26 @@
 
 import 'vs/css!./media/panelpart';
 import * as nls from 'vs/nls';
-import { DisposableStore } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { Action } from 'vs/base/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchExtensions, CATEGORIES } from 'vs/workbench/common/actions';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IWorkbenchLayoutService, Parts, Position, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
 import { ActivityAction, ToggleCompositePinnedAction, ICompositeBar } from 'vs/workbench/browser/parts/compositeBarActions';
 import { IActivity } from 'vs/workbench/common/activity';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ActivePanelContext, PanelPositionContext } from 'vs/workbench/common/panel';
-import { ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
+import { ActivePanelContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from 'vs/workbench/common/panel';
+import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { ViewContainerLocationToString, ViewContainerLocation } from 'vs/workbench/common/views';
 
 const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, nls.localize('maximizeIcon', 'Icon to maximize a panel.'));
 const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, nls.localize('restoreIcon', 'Icon to restore a panel.'));
 const closeIcon = registerIcon('panel-close', Codicon.close, nls.localize('closeIcon', 'Icon to close a panel.'));
 
-export class ClosePanelAction extends Action {
-
-	static readonly ID = 'workbench.action.closePanel';
-	static readonly LABEL = nls.localize('closePanel', "Close Panel");
-
-	constructor(
-		id: string,
-		name: string,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
-	) {
-		super(id, name, ThemeIcon.asClassName(closeIcon));
-	}
-
-	async run(): Promise<void> {
-		this.layoutService.setPanelHidden(true);
-	}
-}
-
 export class TogglePanelAction extends Action {
 
 	static readonly ID = 'workbench.action.togglePanel';
@@ -91,46 +72,6 @@ class FocusPanelAction extends Action {
 	}
 }
 
-
-export class ToggleMaximizedPanelAction extends Action {
-
-	static readonly ID = 'workbench.action.toggleMaximizedPanel';
-	static readonly LABEL = nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel");
-
-	private static readonly MAXIMIZE_LABEL = nls.localize('maximizePanel', "Maximize Panel Size");
-	private static readonly RESTORE_LABEL = nls.localize('minimizePanel', "Restore Panel Size");
-
-	private readonly toDispose = this._register(new DisposableStore());
-
-	constructor(
-		id: string,
-		label: string,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IEditorGroupsService editorGroupsService: IEditorGroupsService
-	) {
-		super(id, label, layoutService.isPanelMaximized() ? ThemeIcon.asClassName(restoreIcon) : ThemeIcon.asClassName(maximizeIcon));
-
-		this.toDispose.add(editorGroupsService.onDidLayout(() => {
-			const maximized = this.layoutService.isPanelMaximized();
-			this.class = maximized ? ThemeIcon.asClassName(restoreIcon) : ThemeIcon.asClassName(maximizeIcon);
-			this.label = maximized ? ToggleMaximizedPanelAction.RESTORE_LABEL : ToggleMaximizedPanelAction.MAXIMIZE_LABEL;
-		}));
-	}
-
-	async run(): Promise<void> {
-		if (!this.layoutService.isVisible(Parts.PANEL_PART)) {
-			this.layoutService.setPanelHidden(false);
-			// If the panel is not already maximized, maximize it
-			if (!this.layoutService.isPanelMaximized()) {
-				this.layoutService.toggleMaximizedPanel();
-			}
-		}
-		else {
-			this.layoutService.toggleMaximizedPanel();
-		}
-	}
-}
-
 const PositionPanelActionId = {
 	LEFT: 'workbench.action.positionPanelLeft',
 	RIGHT: 'workbench.action.positionPanelRight',
@@ -218,7 +159,6 @@ export class PlaceHolderToggleCompositePinnedAction extends ToggleCompositePinne
 	}
 }
 
-
 export class SwitchPanelViewAction extends Action {
 
 	constructor(
@@ -287,35 +227,117 @@ export class NextPanelViewAction extends SwitchPanelViewAction {
 const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchExtensions.WorkbenchActions);
 actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(TogglePanelAction, { primary: KeyMod.CtrlCmd | KeyCode.KEY_J }), 'View: Toggle Panel', CATEGORIES.View.value);
 actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(FocusPanelAction), 'View: Focus into Panel', CATEGORIES.View.value);
-actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleMaximizedPanelAction), 'View: Toggle Maximized Panel', CATEGORIES.View.value);
-actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(ClosePanelAction), 'View: Close Panel', CATEGORIES.View.value);
 actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(PreviousPanelViewAction), 'View: Previous Panel View', CATEGORIES.View.value);
 actionRegistry.registerWorkbenchAction(SyncActionDescriptor.from(NextPanelViewAction), 'View: Next Panel View', CATEGORIES.View.value);
 
-MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-	group: '2_workbench_layout',
-	command: {
-		id: TogglePanelAction.ID,
-		title: nls.localize({ key: 'miShowPanel', comment: ['&& denotes a mnemonic'] }, "Show &&Panel"),
-		toggled: ActivePanelContext
-	},
-	order: 5
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.toggleMaximizedPanel',
+			title: { value: nls.localize('toggleMaximizedPanel', "Toggle Maximized Panel"), original: 'Toggle Maximized Panel' },
+			tooltip: nls.localize('maximizePanel', "Maximize Panel Size"),
+			category: CATEGORIES.View,
+			f1: true,
+			icon: maximizeIcon,
+			toggled: { condition: PanelMaximizedContext, icon: restoreIcon, tooltip: nls.localize('minimizePanel', "Restore Panel Size") },
+			menu: [{
+				id: MenuId.PanelTitle,
+				group: 'navigation',
+				order: 1
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		const layoutService = accessor.get(IWorkbenchLayoutService);
+		if (!layoutService.isVisible(Parts.PANEL_PART)) {
+			layoutService.setPanelHidden(false);
+			// If the panel is not already maximized, maximize it
+			if (!layoutService.isPanelMaximized()) {
+				layoutService.toggleMaximizedPanel();
+			}
+		}
+		else {
+			layoutService.toggleMaximizedPanel();
+		}
+	}
 });
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.closePanel',
+			title: { value: nls.localize('closePanel', "Close Panel"), original: 'Close Panel' },
+			category: CATEGORIES.View,
+			icon: closeIcon,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: PanelVisibleContext,
+			}, {
+				id: MenuId.PanelTitle,
+				group: 'navigation',
+				order: 2
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		accessor.get(IWorkbenchLayoutService).setPanelHidden(true);
+	}
+});
+
+MenuRegistry.appendMenuItems([
+	{
+		id: MenuId.MenubarAppearanceMenu,
+		item: {
+			group: '2_workbench_layout',
+			command: {
+				id: TogglePanelAction.ID,
+				title: nls.localize({ key: 'miShowPanel', comment: ['&& denotes a mnemonic'] }, "Show &&Panel"),
+				toggled: ActivePanelContext
+			},
+			order: 5
+		}
+	}, {
+		id: MenuId.ViewTitleContext,
+		item: {
+			group: '3_workbench_layout_move',
+			command: {
+				id: TogglePanelAction.ID,
+				title: { value: nls.localize('hidePanel', "Hide Panel"), original: 'Hide Panel' },
+			},
+			when: ContextKeyExpr.and(PanelVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Panel))),
+			order: 2
+		}
+	}
+]);
+
 function registerPositionPanelActionById(config: PanelActionConfig<Position>) {
 	const { id, label, alias, when } = config;
 	// register the workbench action
 	actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(SetPanelPositionAction, id, label), alias, CATEGORIES.View.value, when);
 	// register as a menu item
-	MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
-		group: '3_workbench_layout_move',
-		command: {
-			id,
-			title: label
-		},
-		when,
-		order: 5
-	});
+	MenuRegistry.appendMenuItems([{
+		id: MenuId.MenubarAppearanceMenu,
+		item: {
+			group: '3_workbench_layout_move',
+			command: {
+				id,
+				title: label
+			},
+			when,
+			order: 5
+		}
+	}, {
+		id: MenuId.ViewTitleContext,
+		item: {
+			group: '3_workbench_layout_move',
+			command: {
+				id: id,
+				title: label,
+			},
+			when: ContextKeyExpr.and(when, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Panel))),
+			order: 1
+		}
+	}]);
 }
 
 // register each position panel action
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 332a9ab4c..b4727ebc0 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/panelpart';
-import { IAction, Action } from 'vs/base/common/actions';
+import { localize } from 'vs/nls';
+import { IAction, Separator, toAction } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -18,8 +19,8 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ClosePanelAction, PanelActivityAction, ToggleMaximizedPanelAction, TogglePanelAction, PlaceHolderPanelActivityAction, PlaceHolderToggleCompositePinnedAction, PositionPanelActionConfigs, SetPanelPositionAction } from 'vs/workbench/browser/parts/panel/panelActions';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { PanelActivityAction, TogglePanelAction, PlaceHolderPanelActivityAction, PlaceHolderToggleCompositePinnedAction, PositionPanelActionConfigs, SetPanelPositionAction } from 'vs/workbench/browser/parts/panel/panelActions';
+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_INPUT_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, PANEL_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
 import { activeContrastBorder, focusBorder, contrastBorder, editorBackground, badgeBackground, badgeForeground } from 'vs/platform/theme/common/colorRegistry';
 import { CompositeBar, ICompositeBarItem, CompositeDragAndDrop } from 'vs/workbench/browser/parts/compositeBar';
@@ -27,15 +28,12 @@ import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/composit
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Dimension, trackFocus, EventHelper } from 'vs/base/browser/dom';
-import { localize } from 'vs/nls';
 import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { isUndefinedOrNull, assertIsDefined } from 'vs/base/common/types';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ViewContainer, IViewDescriptorService, IViewContainerModel, ViewContainerLocation } from 'vs/workbench/common/views';
-import { MenuId } from 'vs/platform/actions/common/actions';
-import { ViewMenuActions, ViewContainerMenuActions } from 'vs/workbench/browser/parts/views/viewMenuActions';
 import { IPaneComposite } from 'vs/workbench/common/panecomposite';
 import { Before2D, CompositeDragAndDropObserver, ICompositeDragAndDrop, toggleDropEffect } from 'vs/workbench/browser/dnd';
 import { IActivity } from 'vs/workbench/common/activity';
@@ -46,7 +44,7 @@ interface ICachedPanel {
 	pinned: boolean;
 	order?: number;
 	visible: boolean;
-	views?: { when?: string }[];
+	views?: { when?: string; }[];
 }
 
 interface IPlaceholderViewContainer {
@@ -148,24 +146,27 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		this.compositeBar = this._register(this.instantiationService.createInstance(CompositeBar, this.getCachedPanels(), {
 			icon: false,
 			orientation: ActionsOrientation.HORIZONTAL,
-			openComposite: (compositeId: string) => this.openPanel(compositeId, true).then(panel => panel || null),
-			getActivityAction: (compositeId: string) => this.getCompositeActions(compositeId).activityAction,
-			getCompositePinnedAction: (compositeId: string) => this.getCompositeActions(compositeId).pinnedAction,
-			getOnCompositeClickAction: (compositeId: string) => this.instantiationService.createInstance(PanelActivityAction, assertIsDefined(this.getPanel(compositeId))),
-			getContextMenuActions: () => [
-				...PositionPanelActionConfigs
-					// show the contextual menu item if it is not in that position
-					.filter(({ when }) => contextKeyService.contextMatchesRules(when))
-					.map(({ id, label }) => this.instantiationService.createInstance(SetPanelPositionAction, id, label)),
-				this.instantiationService.createInstance(TogglePanelAction, TogglePanelAction.ID, localize('hidePanel', "Hide Panel"))
-			] as Action[],
-			getContextMenuActionsForComposite: (compositeId: string) => this.getContextMenuActionsForComposite(compositeId) as Action[],
+			openComposite: compositeId => this.openPanel(compositeId, true).then(panel => panel || null),
+			getActivityAction: compositeId => this.getCompositeActions(compositeId).activityAction,
+			getCompositePinnedAction: compositeId => this.getCompositeActions(compositeId).pinnedAction,
+			getOnCompositeClickAction: compositeId => this.instantiationService.createInstance(PanelActivityAction, assertIsDefined(this.getPanel(compositeId))),
+			fillExtraContextMenuActions: actions => {
+				actions.push(...[
+					new Separator(),
+					...PositionPanelActionConfigs
+						// show the contextual menu item if it is not in that position
+						.filter(({ when }) => contextKeyService.contextMatchesRules(when))
+						.map(({ id, label }) => this.instantiationService.createInstance(SetPanelPositionAction, id, label)),
+					this.instantiationService.createInstance(TogglePanelAction, TogglePanelAction.ID, localize('hidePanel', "Hide Panel"))
+				]);
+			},
+			getContextMenuActionsForComposite: compositeId => this.getContextMenuActionsForComposite(compositeId),
 			getDefaultCompositeId: () => this.panelRegistry.getDefaultPanelId(),
 			hidePart: () => this.layoutService.setPanelHidden(true),
 			dndHandler: this.dndHandler,
 			compositeSize: 0,
 			overflowActionSize: 44,
-			colors: (theme: IColorTheme) => ({
+			colors: theme => ({
 				activeBackgroundColor: theme.getColor(PANEL_BACKGROUND), // Background color for overflow action
 				inactiveBackgroundColor: theme.getColor(PANEL_BACKGROUND), // Background color for overflow action
 				activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
@@ -184,20 +185,21 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		this.onDidRegisterPanels([...this.getPanels()]);
 	}
 
-	private getContextMenuActionsForComposite(compositeId: string): readonly IAction[] {
+	private getContextMenuActionsForComposite(compositeId: string): IAction[] {
 		const result: IAction[] = [];
-		const container = this.getViewContainer(compositeId);
-		if (container) {
-			const viewContainerModel = this.viewDescriptorService.getViewContainerModel(container);
+		const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId)!;
+		const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer)!;
+		if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
+			result.push(toAction({ id: 'resetLocationAction', label: localize('resetLocation', "Reset Location"), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation) }));
+		} else {
+			const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
 			if (viewContainerModel.allViewDescriptors.length === 1) {
-				const viewMenuActions = this.instantiationService.createInstance(ViewMenuActions, viewContainerModel.allViewDescriptors[0].id, MenuId.ViewTitle, MenuId.ViewTitleContext);
-				result.push(...viewMenuActions.getContextMenuActions());
-				viewMenuActions.dispose();
+				const viewToReset = viewContainerModel.allViewDescriptors[0];
+				const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id)!;
+				if (defaultContainer !== viewContainer) {
+					result.push(toAction({ id: 'resetLocationAction', label: localize('resetLocation', "Reset Location"), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer) }));
+				}
 			}
-
-			const viewContainerMenuActions = this.instantiationService.createInstance(ViewContainerMenuActions, container.id, MenuId.ViewContainerTitleContext);
-			result.push(...viewContainerMenuActions.getContextMenuActions());
-			viewContainerMenuActions.dispose();
 		}
 		return result;
 	}
@@ -534,13 +536,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 			.sort((p1, p2) => pinnedCompositeIds.indexOf(p1.id) - pinnedCompositeIds.indexOf(p2.id));
 	}
 
-	protected getActions(): ReadonlyArray<IAction> {
-		return [
-			this.instantiationService.createInstance(ToggleMaximizedPanelAction, ToggleMaximizedPanelAction.ID, ToggleMaximizedPanelAction.LABEL),
-			this.instantiationService.createInstance(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL)
-		];
-	}
-
 	getActivePanel(): IPanel | undefined {
 		return this.getActiveComposite();
 	}
@@ -803,7 +798,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 
 	// Panel Background: since panels can host editors, we apply a background rule if the panel background
 	// color is different from the editor background color. This is a bit of a hack though. The better way
diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
index c5953e535..c581f528b 100644
--- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
+++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
@@ -3,11 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* Removed to allow progress bar positioning to escape */
-/* .monaco-workbench .sidebar > .content {
-	overflow: hidden;
-} */
-
 .monaco-workbench.nosidebar > .part.sidebar {
 	display: none !important;
 	visibility: hidden !important;
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index f6504de93..671a05822 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -6,7 +6,6 @@
 import 'vs/css!./media/sidebarpart';
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Action } from 'vs/base/common/actions';
 import { CompositePart } from 'vs/workbench/browser/parts/compositePart';
 import { Viewlet, ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
@@ -288,8 +287,8 @@ export class SidebarPart extends CompositePart<Viewlet> implements IViewletServi
 				const anchor: { x: number, y: number } = { x: event.posx, y: event.posy };
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => anchor,
-					getActions: () => contextMenuActions,
-					getActionViewItem: action => this.actionViewItemProvider(action as Action),
+					getActions: () => contextMenuActions.slice(),
+					getActionViewItem: action => this.actionViewItemProvider(action),
 					actionRunner: activeViewlet.getActionRunner()
 				});
 			}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 759039699..aa9d9f05f 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/statusbarpart';
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { dispose, IDisposable, Disposable, toDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel';
+import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { Part } from 'vs/workbench/browser/part';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -15,13 +15,12 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/common/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { Action, IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, Separator } from 'vs/base/common/actions';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector, ThemeColor } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant, ThemeColor } from 'vs/platform/theme/common/themeService';
 import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER } from 'vs/workbench/common/theme';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { isThemeColor } from 'vs/editor/common/editorCommon';
-import { Color } from 'vs/base/common/color';
-import { EventHelper, createStyleSheet, addDisposableListener, EventType, hide, show, isAncestor, appendChildren } from 'vs/base/browser/dom';
+import { EventHelper, createStyleSheet, addDisposableListener, EventType, hide, show, isAncestor, append } from 'vs/base/browser/dom';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope, IStorageValueChangeEvent, StorageTarget } from 'vs/platform/storage/common/storage';
 import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
@@ -38,7 +37,8 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { renderCodicon, renderCodicons } from 'vs/base/browser/codicons';
+import { renderIcon, renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import { syncing } from 'vs/platform/theme/common/iconRegistry';
 
 interface IPendingStatusbarEntry {
 	id: string;
@@ -610,7 +610,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	}
 
 	private getContextMenuActions(event: StandardMouseEvent): IAction[] {
-		const actions: Action[] = [];
+		const actions: IAction[] = [];
 
 		// Provide an action to hide the status bar at last
 		actions.push(this.instantiationService.createInstance(ToggleStatusbarVisibilityAction, ToggleStatusbarVisibilityAction.ID, nls.localize('hideStatusBar', "Hide Status Bar")));
@@ -704,9 +704,9 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	}
 }
 
-class StatusBarCodiconLabel extends CodiconLabel {
+class StatusBarCodiconLabel extends SimpleIconLabel {
 
-	private readonly progressCodicon = renderCodicon('sync', 'spin');
+	private readonly progressCodicon = renderIcon(syncing);
 
 	private currentText = '';
 	private currentShowProgress = false;
@@ -749,7 +749,7 @@ class StatusBarCodiconLabel extends CodiconLabel {
 			}
 
 			// Append new elements
-			appendChildren(this.container, ...renderCodicons(textContent));
+			append(this.container, ...renderLabelWithIcons(textContent));
 		}
 
 		// No Progress: no special handling
@@ -868,12 +868,8 @@ class StatusbarEntryItem extends Disposable {
 
 		// Update: Background
 		if (!this.entry || entry.backgroundColor !== this.entry.backgroundColor) {
-			if (entry.backgroundColor) {
-				this.applyColor(this.container, entry.backgroundColor, true);
-				this.container.classList.add('has-background-color');
-			} else {
-				this.container.classList.remove('has-background-color');
-			}
+			this.container.classList.toggle('has-background-color', !!entry.backgroundColor);
+			this.applyColor(this.container, entry.backgroundColor, true);
 		}
 
 		// Remember for next round
@@ -893,7 +889,7 @@ class StatusbarEntryItem extends Disposable {
 	}
 
 	private applyColor(container: HTMLElement, color: string | ThemeColor | undefined, isBackground?: boolean): void {
-		let colorResult: string | null = null;
+		let colorResult: string | undefined = undefined;
 
 		if (isBackground) {
 			this.backgroundListener.clear();
@@ -903,15 +899,15 @@ class StatusbarEntryItem extends Disposable {
 
 		if (color) {
 			if (isThemeColor(color)) {
-				colorResult = (this.themeService.getColorTheme().getColor(color.id) || Color.transparent).toString();
+				colorResult = this.themeService.getColorTheme().getColor(color.id)?.toString();
 
 				const listener = this.themeService.onDidColorThemeChange(theme => {
-					const colorValue = (theme.getColor(color.id) || Color.transparent).toString();
+					const colorValue = theme.getColor(color.id)?.toString();
 
 					if (isBackground) {
-						container.style.backgroundColor = colorValue;
+						container.style.backgroundColor = colorValue ?? '';
 					} else {
-						container.style.color = colorValue;
+						container.style.color = colorValue ?? '';
 					}
 				});
 
@@ -926,9 +922,9 @@ class StatusbarEntryItem extends Disposable {
 		}
 
 		if (isBackground) {
-			container.style.backgroundColor = colorResult || '';
+			container.style.backgroundColor = colorResult ?? '';
 		} else {
-			container.style.color = colorResult || '';
+			container.style.color = colorResult ?? '';
 		}
 	}
 
@@ -942,7 +938,7 @@ class StatusbarEntryItem extends Disposable {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 	if (theme.type !== ColorScheme.HIGH_CONTRAST) {
 		const statusBarItemHoverBackground = theme.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
 		if (statusBarItemHoverBackground) {
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index a4c34e450..7ac774cb7 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -85,11 +85,34 @@
 	height: 100%;
 	position: relative;
 	z-index: 3000;
+	flex-shrink: 0;
+}
+
+.monaco-workbench .part.titlebar > .window-appicon:not(.codicon) {
 	background-image: url('../../../media/code-icon.svg');
 	background-repeat: no-repeat;
 	background-position: center center;
 	background-size: 16px;
-	flex-shrink: 0;
+}
+
+.monaco-workbench .part.titlebar .window-appicon > .home-bar-icon-badge {
+	position: absolute;
+	right: 9px;
+	bottom: 6px;
+	width: 8px;
+	height: 8px;
+	z-index: 1; /* on top of home indicator */
+	background-image: url('../../../media/code-icon.svg');
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 8px;
+	pointer-events: none;
+	border-top: 1px solid transparent;
+	border-left: 1px solid transparent;
+}
+
+.monaco-workbench .part.titlebar > .window-appicon.codicon {
+	line-height: 30px;
 }
 
 .monaco-workbench.fullscreen .part.titlebar > .window-appicon {
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 99fcf2b6e..886c2ff68 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { IMenuService, MenuId, IMenu, SubmenuItemAction, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
-import { registerThemingParticipant, IColorTheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
+import { IMenuService, MenuId, IMenu, SubmenuItemAction, registerAction2, Action2, MenuRegistry, MenuItemAction } from 'vs/platform/actions/common/actions';
+import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 import { MenuBarVisibility, getTitleBarStyle, IWindowOpenable, getMenuBarVisibility } from 'vs/platform/windows/common/windows';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IAction, Action, SubmenuAction, Separator } from 'vs/base/common/actions';
 import * as DOM from 'vs/base/browser/dom';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -37,6 +37,7 @@ import { BrowserFeatures } from 'vs/base/browser/canIUse';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 
 export abstract class MenubarControl extends Disposable {
 
@@ -91,7 +92,8 @@ export abstract class MenubarControl extends Disposable {
 		protected readonly preferencesService: IPreferencesService,
 		protected readonly environmentService: IWorkbenchEnvironmentService,
 		protected readonly accessibilityService: IAccessibilityService,
-		protected readonly hostService: IHostService
+		protected readonly hostService: IHostService,
+		protected readonly commandService: ICommandService
 	) {
 
 		super();
@@ -308,23 +310,10 @@ export class CustomMenubarControl extends MenubarControl {
 		@IAccessibilityService accessibilityService: IAccessibilityService,
 		@IThemeService private readonly themeService: IThemeService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IHostService protected readonly hostService: IHostService
+		@IHostService protected readonly hostService: IHostService,
+		@ICommandService commandService: ICommandService
 	) {
-		super(
-			menuService,
-			workspacesService,
-			contextKeyService,
-			keybindingService,
-			configurationService,
-			labelService,
-			updateService,
-			storageService,
-			notificationService,
-			preferencesService,
-			environmentService,
-			accessibilityService,
-			hostService
-		);
+		super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);
 
 		this._onVisibilityChange = this._register(new Emitter<boolean>());
 		this._onFocusStateChange = this._register(new Emitter<boolean>());
@@ -337,7 +326,17 @@ export class CustomMenubarControl extends MenubarControl {
 
 		this.registerActions();
 
-		registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+		// Register web menu actions to the file menu when its in the title
+		this.getWebNavigationMenuItemActions().forEach(actionItem => {
+			this._register(MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+				command: actionItem.item,
+				title: actionItem.item.title,
+				group: 'z_Web',
+				when: ContextKeyExpr.and(IsWebContext, ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))
+			}));
+		});
+
+		registerThemingParticipant((theme, collector) => {
 			const menubarActiveWindowFgColor = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
 			if (menubarActiveWindowFgColor) {
 				collector.addRule(`
@@ -356,7 +355,6 @@ export class CustomMenubarControl extends MenubarControl {
 					color: ${activityBarInactiveFgColor};
 				}
 				`);
-
 			}
 
 			const activityBarFgColor = theme.getColor(ACTIVITY_BAR_FOREGROUND);
@@ -383,7 +381,6 @@ export class CustomMenubarControl extends MenubarControl {
 				`);
 			}
 
-
 			const menubarSelectedFgColor = theme.getColor(MENUBAR_SELECTION_FOREGROUND);
 			if (menubarSelectedFgColor) {
 				collector.addRule(`
@@ -608,6 +605,12 @@ export class CustomMenubarControl extends MenubarControl {
 
 				for (let action of actions) {
 					this.insertActionsBefore(action, target);
+
+					// use mnemonicTitle whenever possible
+					const title = typeof action.item.title === 'string'
+						? action.item.title
+						: action.item.title.mnemonicTitle ?? action.item.title.value;
+
 					if (action instanceof SubmenuItemAction) {
 						let submenu = this.menus[action.item.submenu.id];
 						if (!submenu) {
@@ -625,10 +628,12 @@ export class CustomMenubarControl extends MenubarControl {
 
 						const submenuActions: SubmenuAction[] = [];
 						updateActions(submenu, submenuActions, topLevelTitle);
-						target.push(new SubmenuAction(action.id, mnemonicMenuLabel(action.label), submenuActions));
+						target.push(new SubmenuAction(action.id, mnemonicMenuLabel(title), submenuActions));
 					} else {
-						action.label = mnemonicMenuLabel(this.calculateActionLabel(action));
-						target.push(action);
+						const newAction = new Action(action.id, mnemonicMenuLabel(title), action.class, action.enabled, () => this.commandService.executeCommand(action.id));
+						newAction.tooltip = action.tooltip;
+						newAction.checked = action.checked;
+						target.push(newAction);
 					}
 				}
 
@@ -667,6 +672,27 @@ export class CustomMenubarControl extends MenubarControl {
 		}
 	}
 
+	private getWebNavigationMenuItemActions(): MenuItemAction[] {
+		if (!isWeb) {
+			return []; // only for web
+		}
+
+		const webNavigationActions = [];
+		const webNavigationMenu = this.menuService.createMenu(MenuId.MenubarHomeMenu, this.contextKeyService);
+		for (const groups of webNavigationMenu.getActions()) {
+			const [, actions] = groups;
+			for (const action of actions) {
+				if (action instanceof MenuItemAction) {
+					webNavigationActions.push(action);
+				}
+			}
+		}
+
+		webNavigationMenu.dispose();
+
+		return webNavigationActions;
+	}
+
 	private getMenuBarOptions(): IMenuBarOptions {
 		return {
 			enableMnemonics: this.currentEnableMenuBarMnemonics,
@@ -674,7 +700,35 @@ export class CustomMenubarControl extends MenubarControl {
 			visibility: this.currentMenubarVisibility,
 			getKeybinding: (action) => this.keybindingService.lookupKeybinding(action.id),
 			alwaysOnMnemonics: this.alwaysOnMnemonics,
-			compactMode: this.currentCompactMenuMode
+			compactMode: this.currentCompactMenuMode,
+			getCompactMenuActions: () => {
+				if (!isWeb) {
+					return []; // only for web
+				}
+
+				const webNavigationActions: IAction[] = [];
+				const href = this.environmentService.options?.homeIndicator?.href;
+				if (href) {
+					webNavigationActions.push(new Action('goHome', nls.localize('goHome', "Go Home"), undefined, true,
+						async (event?: MouseEvent) => {
+							if ((!isMacintosh && event?.ctrlKey) || (isMacintosh && event?.metaKey)) {
+								window.open(href, '_blank');
+							} else {
+								window.location.href = href;
+							}
+						}));
+				}
+
+				const otherActions = this.getWebNavigationMenuItemActions().map(action => {
+					const title = typeof action.item.title === 'string'
+						? action.item.title
+						: action.item.title.mnemonicTitle ?? action.item.title.value;
+					return new Action(action.id, mnemonicMenuLabel(title), action.class, action.enabled, () => this.commandService.executeCommand(action.id));
+				});
+
+				webNavigationActions.push(...otherActions);
+				return webNavigationActions;
+			}
 		};
 	}
 
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 4783cb522..52a1f2f45 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/titlebarpart';
+import { localize } from 'vs/nls';
 import { dirname, basename } from 'vs/base/common/resources';
 import { Part } from 'vs/workbench/browser/part';
 import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService';
@@ -15,17 +16,16 @@ import { IAction } from 'vs/base/common/actions';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { DisposableStore, dispose } from 'vs/base/common/lifecycle';
-import * as nls from 'vs/nls';
 import { EditorResourceAccessor, Verbosity, SideBySideEditor } from 'vs/workbench/common/editor';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { isMacintosh, isWindows, isLinux, isWeb } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { Color } from 'vs/base/common/color';
 import { trim } from 'vs/base/common/strings';
-import { EventType, EventHelper, Dimension, isAncestor, append, $, addDisposableListener, runAtThisOrScheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { EventType, EventHelper, Dimension, isAncestor, append, $, addDisposableListener, runAtThisOrScheduleAtNextAnimationFrame, prepend } from 'vs/base/browser/dom';
 import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { template } from 'vs/base/common/labels';
@@ -41,12 +41,13 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { Schemas } from 'vs/base/common/network';
 import { withNullAsUndefined } from 'vs/base/common/types';
+import { Codicon, iconRegistry } from 'vs/base/common/codicons';
 
 export class TitlebarPart extends Part implements ITitleService {
 
-	private static readonly NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
-	private static readonly NLS_USER_IS_ADMIN = isWindows ? nls.localize('userIsAdmin', "[Administrator]") : nls.localize('userIsSudo', "[Superuser]");
-	private static readonly NLS_EXTENSION_HOST = nls.localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
+	private static readonly NLS_UNSUPPORTED = localize('patchedWindowTitle', "[Unsupported]");
+	private static readonly NLS_USER_IS_ADMIN = isWindows ? localize('userIsAdmin', "[Administrator]") : localize('userIsSudo', "[Superuser]");
+	private static readonly NLS_EXTENSION_HOST = localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
 	private static readonly TITLE_DIRTY = '\u25cf ';
 
 	//#region IView
@@ -65,6 +66,8 @@ export class TitlebarPart extends Part implements ITitleService {
 
 	protected title!: HTMLElement;
 	protected customMenubar: CustomMenubarControl | undefined;
+	protected appIcon: HTMLElement | undefined;
+	private appIconBadge: HTMLElement | undefined;
 	protected menubar?: HTMLElement;
 	protected lastLayoutDimensions: Dimension | undefined;
 	private titleBarStyle: 'native' | 'custom';
@@ -86,7 +89,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		@IEditorService private readonly editorService: IEditorService,
 		@IWorkbenchEnvironmentService protected readonly environmentService: IWorkbenchEnvironmentService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IStorageService storageService: IStorageService,
@@ -341,6 +344,28 @@ export class TitlebarPart extends Part implements ITitleService {
 	createContentArea(parent: HTMLElement): HTMLElement {
 		this.element = parent;
 
+		// App Icon (Native Windows/Linux and Web)
+		if (!isMacintosh || isWeb) {
+			this.appIcon = prepend(this.element, $('a.window-appicon'));
+
+			// Web-only home indicator and menu
+			if (isWeb) {
+				const homeIndicator = this.environmentService.options?.homeIndicator;
+				if (homeIndicator) {
+					let codicon = iconRegistry.get(homeIndicator.icon);
+					if (!codicon) {
+						codicon = Codicon.code;
+					}
+
+					this.appIcon.setAttribute('href', homeIndicator.href);
+					this.appIcon.classList.add(...codicon.classNamesArray);
+					this.appIconBadge = document.createElement('div');
+					this.appIconBadge.classList.add('home-bar-icon-badge');
+					this.appIcon.appendChild(this.appIconBadge);
+				}
+			}
+		}
+
 		// Menubar: install a custom menu bar depending on configuration
 		// and when not in activity bar
 		if (this.titleBarStyle !== 'native'
@@ -407,6 +432,11 @@ export class TitlebarPart extends Part implements ITitleService {
 				return color.isOpaque() ? color : color.makeOpaque(WORKBENCH_BACKGROUND(theme));
 			}) || '';
 			this.element.style.backgroundColor = titleBackground;
+
+			if (this.appIconBadge) {
+				this.appIconBadge.style.backgroundColor = titleBackground;
+			}
+
 			if (titleBackground && Color.fromHex(titleBackground).isLighter()) {
 				this.element.classList.add('light');
 			} else {
@@ -441,7 +471,7 @@ export class TitlebarPart extends Part implements ITitleService {
 
 	protected adjustTitleMarginToCenter(): void {
 		if (this.customMenubar && this.menubar) {
-			const leftMarker = this.menubar.clientWidth + 10;
+			const leftMarker = (this.appIcon ? this.appIcon.clientWidth : 0) + this.menubar.clientWidth + 10;
 			const rightMarker = this.element.clientWidth - 10;
 
 			// Not enough space to center the titlebar within window,
@@ -497,7 +527,7 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 }
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 	const titlebarActiveFg = theme.getColor(TITLE_BAR_ACTIVE_FOREGROUND);
 	if (titlebarActiveFg) {
 		collector.addRule(`
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index dbd8ffce1..73c7e5e45 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -8,19 +8,19 @@ import { toDisposable, IDisposable, Disposable, DisposableStore } from 'vs/base/
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { MenuId, IMenuService, MenuItemAction, registerAction2, Action2, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { MenuId, IMenuService, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { IContextKeyService, ContextKeyExpr, ContextKeyEqualsExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ITreeView, ITreeViewDescriptor, IViewsRegistry, Extensions, IViewDescriptorService, ITreeItem, TreeItemCollapsibleState, ITreeViewDataProvider, TreeViewItemHandleArg, ITreeItemLabel, ViewContainer, ViewContainerLocation, ResolvableTreeItem } from 'vs/workbench/common/views';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IThemeService, FileThemeIcon, FolderThemeIcon, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IAction, ActionRunner, IActionViewItemProvider } from 'vs/base/common/actions';
-import { MenuEntryActionViewItem, createAndFillInContextMenuActions, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { createAndFillInContextMenuActions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -52,6 +52,8 @@ import { IIconLabelMarkdownString } from 'vs/base/browser/ui/iconLabel/iconLabel
 import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { Codicon } from 'vs/base/common/codicons';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Command } from 'vs/editor/common/modes';
 
 export class TreeViewPane extends ViewPane {
 
@@ -453,15 +455,7 @@ export class TreeView extends Disposable implements ITreeView {
 	}
 
 	private createTree() {
-		const actionViewItemProvider = (action: IAction) => {
-			if (action instanceof MenuItemAction) {
-				return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-			} else if (action instanceof SubmenuItemAction) {
-				return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-			}
-
-			return undefined;
-		};
+		const actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
 		const treeMenus = this._register(this.instantiationService.createInstance(TreeMenus, this.id));
 		this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
 		const dataSource = this.instantiationService.createInstance(TreeDataSource, this, <T>(task: Promise<T>) => this.progressService.withProgress({ location: this.id }, () => task));
@@ -534,12 +528,13 @@ export class TreeView extends Disposable implements ITreeView {
 		}));
 		this.tree.setInput(this.root).then(() => this.updateContentAreas());
 
-		this._register(this.tree.onDidOpen(e => {
+		this._register(this.tree.onDidOpen(async (e) => {
 			if (!e.browserEvent) {
 				return;
 			}
 			const selection = this.tree!.getSelection();
-			const command = selection.length === 1 ? selection[0].command : undefined;
+			const command = await this.resolveCommand(selection.length === 1 ? selection[0] : undefined);
+
 			if (command) {
 				let args = command.arguments || [];
 				if (command.id === API_OPEN_EDITOR_COMMAND_ID || command.id === API_OPEN_DIFF_EDITOR_COMMAND_ID) {
@@ -554,6 +549,17 @@ export class TreeView extends Disposable implements ITreeView {
 
 	}
 
+	private async resolveCommand(element: ITreeItem | undefined): Promise<Command | undefined> {
+		let command = element?.command;
+		if (element && !command) {
+			if ((element instanceof ResolvableTreeItem) && element.hasResolve) {
+				await element.resolve(new CancellationTokenSource().token);
+				command = element.command;
+			}
+		}
+		return command;
+	}
+
 	private onContextMenu(treeMenus: TreeMenus, treeEvent: ITreeContextMenuEvent<ITreeItem>, actionRunner: MultipleSelectionActionRunner): void {
 		this.hoverService.hideHover();
 		const node: ITreeItem | null = treeEvent.element;
@@ -776,10 +782,17 @@ class TreeDataSource implements IAsyncDataSource<ITreeItem, ITreeItem> {
 	}
 
 	async getChildren(element: ITreeItem): Promise<ITreeItem[]> {
+		let result: ITreeItem[] = [];
 		if (this.treeView.dataProvider) {
-			return this.withProgress(this.treeView.dataProvider.getChildren(element));
+			try {
+				result = await this.withProgress(this.treeView.dataProvider.getChildren(element));
+			} catch (e) {
+				if (!(<string>e.message).startsWith('Bad progress location:')) {
+					throw e;
+				}
+			}
 		}
-		return [];
+		return result;
 	}
 }
 
@@ -840,6 +853,9 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		this._hoverDelegate = {
 			showHover: (options: IHoverDelegateOptions): IDisposable | undefined => {
 				return this.hoverService.showHover(options);
+			},
+			hideHover: () => {
+				return this.hoverService.hideHover();
 			}
 		};
 	}
@@ -868,7 +884,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 
 	private getHover(label: string | undefined, resource: URI | null, node: ITreeItem): string | IIconLabelMarkdownString | undefined {
 		if (!(node instanceof ResolvableTreeItem) || !node.hasResolve) {
-			if (resource) {
+			if (resource && !node.tooltip) {
 				return undefined;
 			} else if (!node.tooltip) {
 				return label;
@@ -880,13 +896,13 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		}
 
 		return {
-			markdown: (): Promise<IMarkdownString | string | undefined> => {
+			markdown: (token: CancellationToken): Promise<IMarkdownString | string | undefined> => {
 				return new Promise<IMarkdownString | string | undefined>(async (resolve) => {
-					await node.resolve();
+					await node.resolve(token);
 					resolve(node.tooltip);
 				});
 			},
-			markdownNotSupportedFallback: resource ? undefined : '' // Passing undefined as the fallback for a resource falls back to the old native hover
+			markdownNotSupportedFallback: resource ? undefined : label ?? '' // Passing undefined as the fallback for a resource falls back to the old native hover
 		};
 	}
 
@@ -928,7 +944,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 			templateData.resourceLabel.setResource({ name: label, description, resource: labelResource }, {
 				fileKind: this.getFileKind(node),
 				title,
-				hideIcon: !!iconUrl,
+				hideIcon: !!iconUrl || (!!node.themeIcon && !this.isFileKindThemeIcon(node.themeIcon)),
 				fileDecorations,
 				extraClasses: ['custom-view-tree-node-item-resourceLabel'],
 				matches: matches ? matches : createMatches(element.filterData),
@@ -1168,4 +1184,3 @@ export class CustomTreeView extends TreeView {
 		}
 	}
 }
-
diff --git a/src/vs/workbench/browser/parts/views/viewMenuActions.ts b/src/vs/workbench/browser/parts/views/viewMenuActions.ts
deleted file mode 100644
index 6d3f84da8..000000000
--- a/src/vs/workbench/browser/parts/views/viewMenuActions.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IAction } from 'vs/base/common/actions';
-import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Emitter, Event } from 'vs/base/common/event';
-import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-
-export class ViewMenuActions extends Disposable {
-
-	private primaryActions: IAction[] = [];
-	private readonly titleActionsDisposable = this._register(new MutableDisposable());
-	private secondaryActions: IAction[] = [];
-	private contextMenuActions: IAction[] = [];
-
-	private _onDidChangeTitle = this._register(new Emitter<void>());
-	readonly onDidChangeTitle: Event<void> = this._onDidChangeTitle.event;
-
-	constructor(
-		viewId: string,
-		menuId: MenuId,
-		contextMenuId: MenuId,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IMenuService private readonly menuService: IMenuService,
-	) {
-		super();
-
-		const scopedContextKeyService = this._register(this.contextKeyService.createScoped());
-		scopedContextKeyService.createKey('view', viewId);
-
-		const menu = this._register(this.menuService.createMenu(menuId, scopedContextKeyService));
-		const updateActions = () => {
-			this.primaryActions = [];
-			this.secondaryActions = [];
-			this.titleActionsDisposable.value = createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, { primary: this.primaryActions, secondary: this.secondaryActions });
-			this._onDidChangeTitle.fire();
-		};
-		this._register(menu.onDidChange(updateActions));
-		updateActions();
-
-		const contextMenu = this._register(this.menuService.createMenu(contextMenuId, scopedContextKeyService));
-		const updateContextMenuActions = () => {
-			this.contextMenuActions = [];
-			this.titleActionsDisposable.value = createAndFillInActionBarActions(contextMenu, { shouldForwardArgs: true }, { primary: [], secondary: this.contextMenuActions });
-		};
-		this._register(contextMenu.onDidChange(updateContextMenuActions));
-		updateContextMenuActions();
-
-		this._register(toDisposable(() => {
-			this.primaryActions = [];
-			this.secondaryActions = [];
-			this.contextMenuActions = [];
-		}));
-	}
-
-	getPrimaryActions(): IAction[] {
-		return this.primaryActions;
-	}
-
-	getSecondaryActions(): IAction[] {
-		return this.secondaryActions;
-	}
-
-	getContextMenuActions(): IAction[] {
-		return this.contextMenuActions;
-	}
-}
-
-export class ViewContainerMenuActions extends Disposable {
-
-	private readonly titleActionsDisposable = this._register(new MutableDisposable());
-	private contextMenuActions: IAction[] = [];
-
-	constructor(
-		containerId: string,
-		contextMenuId: MenuId,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IMenuService private readonly menuService: IMenuService,
-	) {
-		super();
-
-		const scopedContextKeyService = this._register(this.contextKeyService.createScoped());
-		scopedContextKeyService.createKey('container', containerId);
-
-		const contextMenu = this._register(this.menuService.createMenu(contextMenuId, scopedContextKeyService));
-		const updateContextMenuActions = () => {
-			this.contextMenuActions = [];
-			this.titleActionsDisposable.value = createAndFillInActionBarActions(contextMenu, { shouldForwardArgs: true }, { primary: [], secondary: this.contextMenuActions });
-		};
-		this._register(contextMenu.onDidChange(updateContextMenuActions));
-		updateContextMenuActions();
-
-		this._register(toDisposable(() => {
-			this.contextMenuActions = [];
-		}));
-	}
-
-	getContextMenuActions(): IAction[] {
-		return this.contextMenuActions;
-	}
-}
diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts
new file mode 100644
index 000000000..27f5af3cf
--- /dev/null
+++ b/src/vs/workbench/browser/parts/views/viewPane.ts
@@ -0,0 +1,642 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./media/paneviewlet';
+import * as nls from 'vs/nls';
+import { Event, Emitter } from 'vs/base/common/event';
+import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { attachButtonStyler, attachLinkStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
+import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
+import { after, append, $, trackFocus, EventType, addDisposableListener, createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
+import { IDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IAction, IActionViewItem } from 'vs/base/common/actions';
+import { ActionsOrientation, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IPaneOptions, Pane, IPaneStyles } from 'vs/base/browser/ui/splitview/paneview';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Extensions as ViewContainerExtensions, IView, FocusedViewContext, IViewDescriptorService, ViewContainerLocation, IViewsRegistry, IViewContentDescriptor, defaultViewIcon, IViewsService, ViewContainerLocationToString } from 'vs/workbench/common/views';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { assertIsDefined } from 'vs/base/common/types';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { MenuId, Action2, IAction2Options, IMenuService } from 'vs/platform/actions/common/actions';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { parseLinkedText } from 'vs/base/common/linkedText';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { Button } from 'vs/base/browser/ui/button/button';
+import { Link } from 'vs/platform/opener/browser/link';
+import { Orientation } from 'vs/base/browser/ui/sash/sash';
+import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
+import { CompositeProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
+import { IProgressIndicator } from 'vs/platform/progress/common/progress';
+import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import { ScrollbarVisibility } from 'vs/base/common/scrollable';
+import { URI } from 'vs/base/common/uri';
+import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { Codicon } from 'vs/base/common/codicons';
+import { CompositeMenuActions } from 'vs/workbench/browser/menuActions';
+
+export interface IViewPaneOptions extends IPaneOptions {
+	id: string;
+	showActionsAlways?: boolean;
+	titleMenuId?: MenuId;
+}
+
+type WelcomeActionClassification = {
+	viewId: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+	uri: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
+};
+
+const viewPaneContainerExpandedIcon = registerIcon('view-pane-container-expanded', Codicon.chevronDown, nls.localize('viewPaneContainerExpandedIcon', 'Icon for an expanded view pane container.'));
+const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collapsed', Codicon.chevronRight, nls.localize('viewPaneContainerCollapsedIcon', 'Icon for a collapsed view pane container.'));
+
+const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
+
+interface IItem {
+	readonly descriptor: IViewContentDescriptor;
+	visible: boolean;
+}
+
+class ViewWelcomeController {
+
+	private _onDidChange = new Emitter<void>();
+	readonly onDidChange = this._onDidChange.event;
+
+	private defaultItem: IItem | undefined;
+	private items: IItem[] = [];
+	get contents(): IViewContentDescriptor[] {
+		const visibleItems = this.items.filter(v => v.visible);
+
+		if (visibleItems.length === 0 && this.defaultItem) {
+			return [this.defaultItem.descriptor];
+		}
+
+		return visibleItems.map(v => v.descriptor);
+	}
+
+	private contextKeyService: IContextKeyService;
+	private disposables = new DisposableStore();
+
+	constructor(
+		private id: string,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		this.contextKeyService = contextKeyService.createScoped();
+		this.disposables.add(this.contextKeyService);
+
+		contextKeyService.onDidChangeContext(this.onDidChangeContext, this, this.disposables);
+		Event.filter(viewsRegistry.onDidChangeViewWelcomeContent, id => id === this.id)(this.onDidChangeViewWelcomeContent, this, this.disposables);
+		this.onDidChangeViewWelcomeContent();
+	}
+
+	private onDidChangeViewWelcomeContent(): void {
+		const descriptors = viewsRegistry.getViewWelcomeContent(this.id);
+
+		this.items = [];
+
+		for (const descriptor of descriptors) {
+			if (descriptor.when === 'default') {
+				this.defaultItem = { descriptor, visible: true };
+			} else {
+				const visible = descriptor.when ? this.contextKeyService.contextMatchesRules(descriptor.when) : true;
+				this.items.push({ descriptor, visible });
+			}
+		}
+
+		this._onDidChange.fire();
+	}
+
+	private onDidChangeContext(): void {
+		let didChange = false;
+
+		for (const item of this.items) {
+			if (!item.descriptor.when || item.descriptor.when === 'default') {
+				continue;
+			}
+
+			const visible = this.contextKeyService.contextMatchesRules(item.descriptor.when);
+
+			if (item.visible === visible) {
+				continue;
+			}
+
+			item.visible = visible;
+			didChange = true;
+		}
+
+		if (didChange) {
+			this._onDidChange.fire();
+		}
+	}
+
+	dispose(): void {
+		this.disposables.dispose();
+	}
+}
+
+class ViewMenuActions extends CompositeMenuActions {
+	constructor(
+		viewId: string,
+		menuId: MenuId,
+		contextMenuId: MenuId,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IMenuService menuService: IMenuService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+	) {
+		const scopedContextKeyService = contextKeyService.createScoped();
+		scopedContextKeyService.createKey('view', viewId);
+		const viewLocationKey = scopedContextKeyService.createKey('viewLocation', ViewContainerLocationToString(viewDescriptorService.getViewLocationById(viewId)!));
+		super(menuId, contextMenuId, { shouldForwardArgs: true }, scopedContextKeyService, menuService);
+		this._register(scopedContextKeyService);
+		this._register(Event.filter(viewDescriptorService.onDidChangeLocation, e => e.views.some(view => view.id === viewId))(() => viewLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewLocationById(viewId)!))));
+	}
+
+}
+
+export abstract class ViewPane extends Pane implements IView {
+
+	private static readonly AlwaysShowActionsConfig = 'workbench.view.alwaysShowHeaderActions';
+
+	private _onDidFocus = this._register(new Emitter<void>());
+	readonly onDidFocus: Event<void> = this._onDidFocus.event;
+
+	private _onDidBlur = this._register(new Emitter<void>());
+	readonly onDidBlur: Event<void> = this._onDidBlur.event;
+
+	private _onDidChangeBodyVisibility = this._register(new Emitter<boolean>());
+	readonly onDidChangeBodyVisibility: Event<boolean> = this._onDidChangeBodyVisibility.event;
+
+	protected _onDidChangeTitleArea = this._register(new Emitter<void>());
+	readonly onDidChangeTitleArea: Event<void> = this._onDidChangeTitleArea.event;
+
+	protected _onDidChangeViewWelcomeState = this._register(new Emitter<void>());
+	readonly onDidChangeViewWelcomeState: Event<void> = this._onDidChangeViewWelcomeState.event;
+
+	private focusedViewContextKey: IContextKey<string>;
+
+	private _isVisible: boolean = false;
+	readonly id: string;
+
+	private _title: string;
+	public get title(): string {
+		return this._title;
+	}
+
+	private _titleDescription: string | undefined;
+	public get titleDescription(): string | undefined {
+		return this._titleDescription;
+	}
+
+	private readonly menuActions: ViewMenuActions;
+	private progressBar!: ProgressBar;
+	private progressIndicator!: IProgressIndicator;
+
+	private toolbar?: ToolBar;
+	private readonly showActionsAlways: boolean = false;
+	private headerContainer?: HTMLElement;
+	private titleContainer?: HTMLElement;
+	private titleDescriptionContainer?: HTMLElement;
+	private iconContainer?: HTMLElement;
+	protected twistiesContainer?: HTMLElement;
+
+	private bodyContainer!: HTMLElement;
+	private viewWelcomeContainer!: HTMLElement;
+	private viewWelcomeDisposable: IDisposable = Disposable.None;
+	private viewWelcomeController: ViewWelcomeController;
+
+	constructor(
+		options: IViewPaneOptions,
+		@IKeybindingService protected keybindingService: IKeybindingService,
+		@IContextMenuService protected contextMenuService: IContextMenuService,
+		@IConfigurationService protected readonly configurationService: IConfigurationService,
+		@IContextKeyService protected contextKeyService: IContextKeyService,
+		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
+		@IInstantiationService protected instantiationService: IInstantiationService,
+		@IOpenerService protected openerService: IOpenerService,
+		@IThemeService protected themeService: IThemeService,
+		@ITelemetryService protected telemetryService: ITelemetryService,
+	) {
+		super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === ViewContainerLocation.Panel ? Orientation.HORIZONTAL : Orientation.VERTICAL } });
+
+		this.id = options.id;
+		this._title = options.title;
+		this._titleDescription = options.titleDescription;
+		this.showActionsAlways = !!options.showActionsAlways;
+		this.focusedViewContextKey = FocusedViewContext.bindTo(contextKeyService);
+
+		this.menuActions = this._register(instantiationService.createInstance(ViewMenuActions, this.id, options.titleMenuId || MenuId.ViewTitle, MenuId.ViewTitleContext));
+		this._register(this.menuActions.onDidChange(() => this.updateActions()));
+
+		this.viewWelcomeController = new ViewWelcomeController(this.id, contextKeyService);
+	}
+
+	get headerVisible(): boolean {
+		return super.headerVisible;
+	}
+
+	set headerVisible(visible: boolean) {
+		super.headerVisible = visible;
+		this.element.classList.toggle('merged-header', !visible);
+	}
+
+	setVisible(visible: boolean): void {
+		if (this._isVisible !== visible) {
+			this._isVisible = visible;
+
+			if (this.isExpanded()) {
+				this._onDidChangeBodyVisibility.fire(visible);
+			}
+		}
+	}
+
+	isVisible(): boolean {
+		return this._isVisible;
+	}
+
+	isBodyVisible(): boolean {
+		return this._isVisible && this.isExpanded();
+	}
+
+	setExpanded(expanded: boolean): boolean {
+		const changed = super.setExpanded(expanded);
+		if (changed) {
+			this._onDidChangeBodyVisibility.fire(expanded);
+		}
+		if (this.twistiesContainer) {
+			this.twistiesContainer.classList.remove(...ThemeIcon.asClassNameArray(this.getTwistyIcon(!expanded)));
+			this.twistiesContainer.classList.add(...ThemeIcon.asClassNameArray(this.getTwistyIcon(expanded)));
+		}
+		return changed;
+	}
+
+	render(): void {
+		super.render();
+
+		const focusTracker = trackFocus(this.element);
+		this._register(focusTracker);
+		this._register(focusTracker.onDidFocus(() => {
+			this.focusedViewContextKey.set(this.id);
+			this._onDidFocus.fire();
+		}));
+		this._register(focusTracker.onDidBlur(() => {
+			if (this.focusedViewContextKey.get() === this.id) {
+				this.focusedViewContextKey.reset();
+			}
+
+			this._onDidBlur.fire();
+		}));
+	}
+
+	protected renderHeader(container: HTMLElement): void {
+		this.headerContainer = container;
+
+		this.twistiesContainer = append(container, $(ThemeIcon.asCSSSelector(this.getTwistyIcon(this.isExpanded()))));
+
+		this.renderHeaderTitle(container, this.title);
+
+		const actions = append(container, $('.actions'));
+		actions.classList.toggle('show', this.showActionsAlways);
+		this.toolbar = new ToolBar(actions, this.contextMenuService, {
+			orientation: ActionsOrientation.HORIZONTAL,
+			actionViewItemProvider: action => this.getActionViewItem(action),
+			ariaLabel: nls.localize('viewToolbarAriaLabel', "{0} actions", this.title),
+			getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
+			renderDropdownAsChildElement: true
+		});
+
+		this._register(this.toolbar);
+		this.setActions();
+
+		this._register(addDisposableListener(actions, EventType.CLICK, e => e.preventDefault()));
+
+		this._register(this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id)!)!.onDidChangeContainerInfo(({ title }) => {
+			this.updateTitle(this.title);
+		}));
+
+		const onDidRelevantConfigurationChange = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ViewPane.AlwaysShowActionsConfig));
+		this._register(onDidRelevantConfigurationChange(this.updateActionsVisibility, this));
+		this.updateActionsVisibility();
+	}
+
+	protected getTwistyIcon(expanded: boolean): ThemeIcon {
+		return expanded ? viewPaneContainerExpandedIcon : viewPaneContainerCollapsedIcon;
+	}
+
+	style(styles: IPaneStyles): void {
+		super.style(styles);
+
+		const icon = this.getIcon();
+		if (this.iconContainer) {
+			const fgColor = styles.headerForeground || this.themeService.getColorTheme().getColor(foreground);
+			if (URI.isUri(icon)) {
+				// Apply background color to activity bar item provided with iconUrls
+				this.iconContainer.style.backgroundColor = fgColor ? fgColor.toString() : '';
+				this.iconContainer.style.color = '';
+			} else {
+				// Apply foreground color to activity bar items provided with codicons
+				this.iconContainer.style.color = fgColor ? fgColor.toString() : '';
+				this.iconContainer.style.backgroundColor = '';
+			}
+		}
+	}
+
+	private getIcon(): ThemeIcon | URI {
+		return this.viewDescriptorService.getViewDescriptorById(this.id)?.containerIcon || defaultViewIcon;
+	}
+
+	protected renderHeaderTitle(container: HTMLElement, title: string): void {
+		this.iconContainer = append(container, $('.icon', undefined));
+		const icon = this.getIcon();
+
+		let cssClass: string | undefined = undefined;
+		if (URI.isUri(icon)) {
+			cssClass = `view-${this.id.replace(/[\.\:]/g, '-')}`;
+			const iconClass = `.pane-header .icon.${cssClass}`;
+
+			createCSSRule(iconClass, `
+				mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
+				mask-size: 24px;
+				-webkit-mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
+				-webkit-mask-size: 16px;
+			`);
+		} else if (ThemeIcon.isThemeIcon(icon)) {
+			cssClass = ThemeIcon.asClassName(icon);
+		}
+
+		if (cssClass) {
+			this.iconContainer.classList.add(...cssClass.split(' '));
+		}
+
+		const calculatedTitle = this.calculateTitle(title);
+		this.titleContainer = append(container, $('h3.title', { title: calculatedTitle }, calculatedTitle));
+
+		if (this._titleDescription) {
+			this.setTitleDescription(this._titleDescription);
+		}
+
+		this.iconContainer.title = calculatedTitle;
+		this.iconContainer.setAttribute('aria-label', calculatedTitle);
+	}
+
+	protected updateTitle(title: string): void {
+		const calculatedTitle = this.calculateTitle(title);
+		if (this.titleContainer) {
+			this.titleContainer.textContent = calculatedTitle;
+			this.titleContainer.setAttribute('title', calculatedTitle);
+		}
+
+		if (this.iconContainer) {
+			this.iconContainer.title = calculatedTitle;
+			this.iconContainer.setAttribute('aria-label', calculatedTitle);
+		}
+
+		this._title = title;
+		this._onDidChangeTitleArea.fire();
+	}
+
+	private setTitleDescription(description: string | undefined) {
+		if (this.titleDescriptionContainer) {
+			this.titleDescriptionContainer.textContent = description ?? '';
+			this.titleDescriptionContainer.setAttribute('title', description ?? '');
+		}
+		else if (description && this.titleContainer) {
+			this.titleDescriptionContainer = after(this.titleContainer, $('span.description', { title: description }, description));
+		}
+	}
+
+	protected updateTitleDescription(description?: string | undefined): void {
+		this.setTitleDescription(description);
+
+		this._titleDescription = description;
+		this._onDidChangeTitleArea.fire();
+	}
+
+	private calculateTitle(title: string): string {
+		const viewContainer = this.viewDescriptorService.getViewContainerByViewId(this.id)!;
+		const model = this.viewDescriptorService.getViewContainerModel(viewContainer);
+		const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(this.id);
+		const isDefault = this.viewDescriptorService.getDefaultContainerById(this.id) === viewContainer;
+
+		if (!isDefault && viewDescriptor?.containerTitle && model.title !== viewDescriptor.containerTitle) {
+			return `${viewDescriptor.containerTitle}: ${title}`;
+		}
+
+		return title;
+	}
+
+	private scrollableElement!: DomScrollableElement;
+
+	protected renderBody(container: HTMLElement): void {
+		this.bodyContainer = container;
+
+		const viewWelcomeContainer = append(container, $('.welcome-view'));
+		this.viewWelcomeContainer = $('.welcome-view-content', { tabIndex: 0 });
+		this.scrollableElement = this._register(new DomScrollableElement(this.viewWelcomeContainer, {
+			alwaysConsumeMouseWheel: true,
+			horizontal: ScrollbarVisibility.Hidden,
+			vertical: ScrollbarVisibility.Visible,
+		}));
+
+		append(viewWelcomeContainer, this.scrollableElement.getDomNode());
+
+		const onViewWelcomeChange = Event.any(this.viewWelcomeController.onDidChange, this.onDidChangeViewWelcomeState);
+		this._register(onViewWelcomeChange(this.updateViewWelcome, this));
+		this.updateViewWelcome();
+	}
+
+	protected layoutBody(height: number, width: number): void {
+		this.viewWelcomeContainer.style.height = `${height}px`;
+		this.viewWelcomeContainer.style.width = `${width}px`;
+		this.scrollableElement.scanDomNode();
+	}
+
+	getProgressIndicator() {
+		if (this.progressBar === undefined) {
+			// Progress bar
+			this.progressBar = this._register(new ProgressBar(this.element));
+			this._register(attachProgressBarStyler(this.progressBar, this.themeService));
+			this.progressBar.hide();
+		}
+
+		if (this.progressIndicator === undefined) {
+			this.progressIndicator = this.instantiationService.createInstance(CompositeProgressIndicator, assertIsDefined(this.progressBar), this.id, this.isBodyVisible());
+		}
+		return this.progressIndicator;
+	}
+
+	protected getProgressLocation(): string {
+		return this.viewDescriptorService.getViewContainerByViewId(this.id)!.id;
+	}
+
+	protected getBackgroundColor(): string {
+		return this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND;
+	}
+
+	focus(): void {
+		if (this.shouldShowWelcome()) {
+			this.viewWelcomeContainer.focus();
+		} else if (this.element) {
+			this.element.focus();
+			this._onDidFocus.fire();
+		}
+	}
+
+	private setActions(): void {
+		if (this.toolbar) {
+			this.toolbar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()));
+			this.toolbar.context = this.getActionsContext();
+		}
+	}
+
+	private updateActionsVisibility(): void {
+		if (!this.headerContainer) {
+			return;
+		}
+		const shouldAlwaysShowActions = this.configurationService.getValue<boolean>('workbench.view.alwaysShowHeaderActions');
+		this.headerContainer.classList.toggle('actions-always-visible', shouldAlwaysShowActions);
+	}
+
+	protected updateActions(): void {
+		this.setActions();
+		this._onDidChangeTitleArea.fire();
+	}
+
+	getActions(): IAction[] {
+		return this.menuActions.getPrimaryActions();
+	}
+
+	getSecondaryActions(): IAction[] {
+		return this.menuActions.getSecondaryActions();
+	}
+
+	getContextMenuActions(): IAction[] {
+		return this.menuActions.getContextMenuActions();
+	}
+
+	getActionViewItem(action: IAction): IActionViewItem | undefined {
+		return createActionViewItem(this.instantiationService, action);
+	}
+
+	getActionsContext(): unknown {
+		return undefined;
+	}
+
+	getOptimalWidth(): number {
+		return 0;
+	}
+
+	saveState(): void {
+		// Subclasses to implement for saving state
+	}
+
+	private updateViewWelcome(): void {
+		this.viewWelcomeDisposable.dispose();
+
+		if (!this.shouldShowWelcome()) {
+			this.bodyContainer.classList.remove('welcome');
+			this.viewWelcomeContainer.innerText = '';
+			this.scrollableElement.scanDomNode();
+			return;
+		}
+
+		const contents = this.viewWelcomeController.contents;
+
+		if (contents.length === 0) {
+			this.bodyContainer.classList.remove('welcome');
+			this.viewWelcomeContainer.innerText = '';
+			this.scrollableElement.scanDomNode();
+			return;
+		}
+
+		const disposables = new DisposableStore();
+		this.bodyContainer.classList.add('welcome');
+		this.viewWelcomeContainer.innerText = '';
+
+		for (const { content, precondition } of contents) {
+			const lines = content.split('\n');
+
+			for (let line of lines) {
+				line = line.trim();
+
+				if (!line) {
+					continue;
+				}
+
+				const linkedText = parseLinkedText(line);
+
+				if (linkedText.nodes.length === 1 && typeof linkedText.nodes[0] !== 'string') {
+					const node = linkedText.nodes[0];
+					const button = new Button(this.viewWelcomeContainer, { title: node.title, supportIcons: true });
+					button.label = node.label;
+					button.onDidClick(_ => {
+						this.telemetryService.publicLog2<{ viewId: string, uri: string }, WelcomeActionClassification>('views.welcomeAction', { viewId: this.id, uri: node.href });
+						this.openerService.open(node.href);
+					}, null, disposables);
+					disposables.add(button);
+					disposables.add(attachButtonStyler(button, this.themeService));
+
+					if (precondition) {
+						const updateEnablement = () => button.enabled = this.contextKeyService.contextMatchesRules(precondition);
+						updateEnablement();
+
+						const keys = new Set();
+						precondition.keys().forEach(key => keys.add(key));
+						const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
+						onDidChangeContext(updateEnablement, null, disposables);
+					}
+				} else {
+					const p = append(this.viewWelcomeContainer, $('p'));
+
+					for (const node of linkedText.nodes) {
+						if (typeof node === 'string') {
+							append(p, document.createTextNode(node));
+						} else {
+							const link = this.instantiationService.createInstance(Link, node);
+							append(p, link.el);
+							disposables.add(link);
+							disposables.add(attachLinkStyler(link, this.themeService));
+
+							if (precondition && node.href.startsWith('command:')) {
+								const updateEnablement = () => link.style({ disabled: !this.contextKeyService.contextMatchesRules(precondition) });
+								updateEnablement();
+
+								const keys = new Set();
+								precondition.keys().forEach(key => keys.add(key));
+								const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
+								onDidChangeContext(updateEnablement, null, disposables);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		this.scrollableElement.scanDomNode();
+		this.viewWelcomeDisposable = disposables;
+	}
+
+	shouldShowWelcome(): boolean {
+		return false;
+	}
+}
+
+export abstract class ViewAction<T extends IView> extends Action2 {
+	constructor(readonly desc: Readonly<IAction2Options> & { viewId: string }) {
+		super(desc);
+	}
+
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		const view = accessor.get(IViewsService).getActiveViewWithId(this.desc.viewId);
+		if (view) {
+			return this.runInView(accessor, <T>view, ...args);
+		}
+	}
+
+	abstract runInView(accessor: ServicesAccessor, view: T, ...args: any[]): any;
+}
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index 410c67244..e71e07d07 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -6,52 +6,45 @@
 import 'vs/css!./media/paneviewlet';
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
-import { ColorIdentifier, activeContrastBorder, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { attachStyler, IColorMapping, attachButtonStyler, attachLinkStyler, attachProgressBarStyler } from 'vs/platform/theme/common/styler';
-import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BORDER, PANEL_BACKGROUND, SIDE_BAR_BACKGROUND, PANEL_SECTION_HEADER_FOREGROUND, PANEL_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_BORDER } from 'vs/workbench/common/theme';
-import { after, append, $, trackFocus, EventType, isAncestor, Dimension, addDisposableListener, createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
-import { IDisposable, combinedDisposable, dispose, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IAction, Separator, IActionViewItem } from 'vs/base/common/actions';
-import { ActionsOrientation, prepareActions } from 'vs/base/browser/ui/actionbar/actionbar';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ColorIdentifier, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { attachStyler, IColorMapping } from 'vs/platform/theme/common/styler';
+import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BORDER, PANEL_SECTION_HEADER_FOREGROUND, PANEL_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_BORDER } from 'vs/workbench/common/theme';
+import { EventType, Dimension, addDisposableListener, isAncestor } from 'vs/base/browser/dom';
+import { IDisposable, combinedDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
+import { IAction, IActionViewItem, Separator } from 'vs/base/common/actions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IThemeService, Themable, ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { PaneView, IPaneViewOptions, IPaneOptions, Pane, IPaneStyles } from 'vs/base/browser/ui/splitview/paneview';
+import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
+import { PaneView, IPaneViewOptions } from 'vs/base/browser/ui/splitview/paneview';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { Extensions as ViewContainerExtensions, IView, FocusedViewContext, IViewDescriptor, ViewContainer, IViewDescriptorService, ViewContainerLocation, IViewPaneContainer, IViewsRegistry, IViewContentDescriptor, IAddedViewDescriptorRef, IViewDescriptorRef, IViewContainerModel, defaultViewIcon } from 'vs/workbench/common/views';
+import { IView, FocusedViewContext, IViewDescriptor, ViewContainer, IViewDescriptorService, ViewContainerLocation, IViewPaneContainer, IAddedViewDescriptorRef, IViewDescriptorRef, IViewContainerModel, IViewsService, ViewContainerLocationToString } from 'vs/workbench/common/views';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { assertIsDefined } from 'vs/base/common/types';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { Component } from 'vs/workbench/common/component';
-import { MenuId, MenuItemAction, registerAction2, Action2, IAction2Options, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { ViewMenuActions } from 'vs/workbench/browser/parts/views/viewMenuActions';
-import { parseLinkedText } from 'vs/base/common/linkedText';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { Link } from 'vs/platform/opener/browser/link';
+import { registerAction2, Action2, IAction2Options, IMenuService, MenuId, MenuRegistry, ISubmenuItem, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 import { CompositeDragAndDropObserver, DragAndDropObserver, toggleDropEffect } from 'vs/workbench/browser/dnd';
 import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { CompositeProgressIndicator } from 'vs/workbench/services/progress/browser/progressIndicator';
-import { IProgressIndicator } from 'vs/platform/progress/common/progress';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { URI } from 'vs/base/common/uri';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-import { Codicon } from 'vs/base/common/codicons';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
+import { CompositeMenuActions } from 'vs/workbench/browser/menuActions';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+
+export const ViewsSubMenu = new MenuId('Views');
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, <ISubmenuItem>{
+	submenu: ViewsSubMenu,
+	title: nls.localize('views', "Views"),
+	order: 1,
+	when: ContextKeyEqualsExpr.create('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
+});
 
 export interface IPaneColors extends IColorMapping {
 	dropBackground?: ColorIdentifier;
@@ -61,566 +54,6 @@ export interface IPaneColors extends IColorMapping {
 	leftBorder?: ColorIdentifier;
 }
 
-export interface IViewPaneOptions extends IPaneOptions {
-	id: string;
-	showActionsAlways?: boolean;
-	titleMenuId?: MenuId;
-}
-
-type WelcomeActionClassification = {
-	viewId: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-	uri: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
-};
-
-const viewPaneContainerExpandedIcon = registerIcon('view-pane-container-expanded', Codicon.chevronDown, nls.localize('viewPaneContainerExpandedIcon', 'Icon for an expanded view pane container.'));
-const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collapsed', Codicon.chevronRight, nls.localize('viewPaneContainerCollapsedIcon', 'Icon for a collapsed view pane container.'));
-
-const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
-
-interface IItem {
-	readonly descriptor: IViewContentDescriptor;
-	visible: boolean;
-}
-
-class ViewWelcomeController {
-
-	private _onDidChange = new Emitter<void>();
-	readonly onDidChange = this._onDidChange.event;
-
-	private defaultItem: IItem | undefined;
-	private items: IItem[] = [];
-	get contents(): IViewContentDescriptor[] {
-		const visibleItems = this.items.filter(v => v.visible);
-
-		if (visibleItems.length === 0 && this.defaultItem) {
-			return [this.defaultItem.descriptor];
-		}
-
-		return visibleItems.map(v => v.descriptor);
-	}
-
-	private contextKeyService: IContextKeyService;
-	private disposables = new DisposableStore();
-
-	constructor(
-		private id: string,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		this.contextKeyService = contextKeyService.createScoped();
-		this.disposables.add(this.contextKeyService);
-
-		contextKeyService.onDidChangeContext(this.onDidChangeContext, this, this.disposables);
-		Event.filter(viewsRegistry.onDidChangeViewWelcomeContent, id => id === this.id)(this.onDidChangeViewWelcomeContent, this, this.disposables);
-		this.onDidChangeViewWelcomeContent();
-	}
-
-	private onDidChangeViewWelcomeContent(): void {
-		const descriptors = viewsRegistry.getViewWelcomeContent(this.id);
-
-		this.items = [];
-
-		for (const descriptor of descriptors) {
-			if (descriptor.when === 'default') {
-				this.defaultItem = { descriptor, visible: true };
-			} else {
-				const visible = descriptor.when ? this.contextKeyService.contextMatchesRules(descriptor.when) : true;
-				this.items.push({ descriptor, visible });
-			}
-		}
-
-		this._onDidChange.fire();
-	}
-
-	private onDidChangeContext(): void {
-		let didChange = false;
-
-		for (const item of this.items) {
-			if (!item.descriptor.when || item.descriptor.when === 'default') {
-				continue;
-			}
-
-			const visible = this.contextKeyService.contextMatchesRules(item.descriptor.when);
-
-			if (item.visible === visible) {
-				continue;
-			}
-
-			item.visible = visible;
-			didChange = true;
-		}
-
-		if (didChange) {
-			this._onDidChange.fire();
-		}
-	}
-
-	dispose(): void {
-		this.disposables.dispose();
-	}
-}
-
-export abstract class ViewPane extends Pane implements IView {
-
-	private static readonly AlwaysShowActionsConfig = 'workbench.view.alwaysShowHeaderActions';
-
-	private _onDidFocus = this._register(new Emitter<void>());
-	readonly onDidFocus: Event<void> = this._onDidFocus.event;
-
-	private _onDidBlur = this._register(new Emitter<void>());
-	readonly onDidBlur: Event<void> = this._onDidBlur.event;
-
-	private _onDidChangeBodyVisibility = this._register(new Emitter<boolean>());
-	readonly onDidChangeBodyVisibility: Event<boolean> = this._onDidChangeBodyVisibility.event;
-
-	protected _onDidChangeTitleArea = this._register(new Emitter<void>());
-	readonly onDidChangeTitleArea: Event<void> = this._onDidChangeTitleArea.event;
-
-	protected _onDidChangeViewWelcomeState = this._register(new Emitter<void>());
-	readonly onDidChangeViewWelcomeState: Event<void> = this._onDidChangeViewWelcomeState.event;
-
-	private focusedViewContextKey: IContextKey<string>;
-
-	private _isVisible: boolean = false;
-	readonly id: string;
-
-	private _title: string;
-	public get title(): string {
-		return this._title;
-	}
-
-	private _titleDescription: string | undefined;
-	public get titleDescription(): string | undefined {
-		return this._titleDescription;
-	}
-
-	private readonly menuActions: ViewMenuActions;
-	private progressBar!: ProgressBar;
-	private progressIndicator!: IProgressIndicator;
-
-	private toolbar?: ToolBar;
-	private readonly showActionsAlways: boolean = false;
-	private headerContainer?: HTMLElement;
-	private titleContainer?: HTMLElement;
-	private titleDescriptionContainer?: HTMLElement;
-	private iconContainer?: HTMLElement;
-	protected twistiesContainer?: HTMLElement;
-
-	private bodyContainer!: HTMLElement;
-	private viewWelcomeContainer!: HTMLElement;
-	private viewWelcomeDisposable: IDisposable = Disposable.None;
-	private viewWelcomeController: ViewWelcomeController;
-
-	constructor(
-		options: IViewPaneOptions,
-		@IKeybindingService protected keybindingService: IKeybindingService,
-		@IContextMenuService protected contextMenuService: IContextMenuService,
-		@IConfigurationService protected readonly configurationService: IConfigurationService,
-		@IContextKeyService protected contextKeyService: IContextKeyService,
-		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService protected instantiationService: IInstantiationService,
-		@IOpenerService protected openerService: IOpenerService,
-		@IThemeService protected themeService: IThemeService,
-		@ITelemetryService protected telemetryService: ITelemetryService,
-	) {
-		super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === ViewContainerLocation.Panel ? Orientation.HORIZONTAL : Orientation.VERTICAL } });
-
-		this.id = options.id;
-		this._title = options.title;
-		this._titleDescription = options.titleDescription;
-		this.showActionsAlways = !!options.showActionsAlways;
-		this.focusedViewContextKey = FocusedViewContext.bindTo(contextKeyService);
-
-		this.menuActions = this._register(instantiationService.createInstance(ViewMenuActions, this.id, options.titleMenuId || MenuId.ViewTitle, MenuId.ViewTitleContext));
-		this._register(this.menuActions.onDidChangeTitle(() => this.updateActions()));
-
-		this.viewWelcomeController = new ViewWelcomeController(this.id, contextKeyService);
-	}
-
-	get headerVisible(): boolean {
-		return super.headerVisible;
-	}
-
-	set headerVisible(visible: boolean) {
-		super.headerVisible = visible;
-		this.element.classList.toggle('merged-header', !visible);
-	}
-
-	setVisible(visible: boolean): void {
-		if (this._isVisible !== visible) {
-			this._isVisible = visible;
-
-			if (this.isExpanded()) {
-				this._onDidChangeBodyVisibility.fire(visible);
-			}
-		}
-	}
-
-	isVisible(): boolean {
-		return this._isVisible;
-	}
-
-	isBodyVisible(): boolean {
-		return this._isVisible && this.isExpanded();
-	}
-
-	setExpanded(expanded: boolean): boolean {
-		const changed = super.setExpanded(expanded);
-		if (changed) {
-			this._onDidChangeBodyVisibility.fire(expanded);
-		}
-		if (this.twistiesContainer) {
-			this.twistiesContainer.classList.remove(...ThemeIcon.asClassNameArray(this.getTwistyIcon(!expanded)));
-			this.twistiesContainer.classList.add(...ThemeIcon.asClassNameArray(this.getTwistyIcon(expanded)));
-		}
-		return changed;
-	}
-
-	render(): void {
-		super.render();
-
-		const focusTracker = trackFocus(this.element);
-		this._register(focusTracker);
-		this._register(focusTracker.onDidFocus(() => {
-			this.focusedViewContextKey.set(this.id);
-			this._onDidFocus.fire();
-		}));
-		this._register(focusTracker.onDidBlur(() => {
-			if (this.focusedViewContextKey.get() === this.id) {
-				this.focusedViewContextKey.reset();
-			}
-
-			this._onDidBlur.fire();
-		}));
-	}
-
-	protected renderHeader(container: HTMLElement): void {
-		this.headerContainer = container;
-
-		this.twistiesContainer = append(container, $(ThemeIcon.asCSSSelector(this.getTwistyIcon(this.isExpanded()))));
-
-		this.renderHeaderTitle(container, this.title);
-
-		const actions = append(container, $('.actions'));
-		actions.classList.toggle('show', this.showActionsAlways);
-		this.toolbar = new ToolBar(actions, this.contextMenuService, {
-			orientation: ActionsOrientation.HORIZONTAL,
-			actionViewItemProvider: action => this.getActionViewItem(action),
-			ariaLabel: nls.localize('viewToolbarAriaLabel', "{0} actions", this.title),
-			getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
-			renderDropdownAsChildElement: true
-		});
-
-		this._register(this.toolbar);
-		this.setActions();
-
-		this._register(addDisposableListener(actions, EventType.CLICK, e => e.preventDefault()));
-
-		this._register(this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id)!)!.onDidChangeContainerInfo(({ title }) => {
-			this.updateTitle(this.title);
-		}));
-
-		const onDidRelevantConfigurationChange = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ViewPane.AlwaysShowActionsConfig));
-		this._register(onDidRelevantConfigurationChange(this.updateActionsVisibility, this));
-		this.updateActionsVisibility();
-	}
-
-	protected getTwistyIcon(expanded: boolean): ThemeIcon {
-		return expanded ? viewPaneContainerExpandedIcon : viewPaneContainerCollapsedIcon;
-	}
-
-	style(styles: IPaneStyles): void {
-		super.style(styles);
-
-		const icon = this.getIcon();
-		if (this.iconContainer) {
-			const fgColor = styles.headerForeground || this.themeService.getColorTheme().getColor(foreground);
-			if (URI.isUri(icon)) {
-				// Apply background color to activity bar item provided with iconUrls
-				this.iconContainer.style.backgroundColor = fgColor ? fgColor.toString() : '';
-				this.iconContainer.style.color = '';
-			} else {
-				// Apply foreground color to activity bar items provided with codicons
-				this.iconContainer.style.color = fgColor ? fgColor.toString() : '';
-				this.iconContainer.style.backgroundColor = '';
-			}
-		}
-	}
-
-	private getIcon(): ThemeIcon | URI {
-		return this.viewDescriptorService.getViewDescriptorById(this.id)?.containerIcon || defaultViewIcon;
-	}
-
-	protected renderHeaderTitle(container: HTMLElement, title: string): void {
-		this.iconContainer = append(container, $('.icon', undefined));
-		const icon = this.getIcon();
-
-		let cssClass: string | undefined = undefined;
-		if (URI.isUri(icon)) {
-			cssClass = `view-${this.id.replace(/[\.\:]/g, '-')}`;
-			const iconClass = `.pane-header .icon.${cssClass}`;
-
-			createCSSRule(iconClass, `
-				mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
-				mask-size: 24px;
-				-webkit-mask: ${asCSSUrl(icon)} no-repeat 50% 50%;
-				-webkit-mask-size: 16px;
-			`);
-		} else if (ThemeIcon.isThemeIcon(icon)) {
-			cssClass = ThemeIcon.asClassName(icon);
-		}
-
-		if (cssClass) {
-			this.iconContainer.classList.add(...cssClass.split(' '));
-		}
-
-		const calculatedTitle = this.calculateTitle(title);
-		this.titleContainer = append(container, $('h3.title', { title: calculatedTitle }, calculatedTitle));
-
-		if (this._titleDescription) {
-			this.setTitleDescription(this._titleDescription);
-		}
-
-		this.iconContainer.title = calculatedTitle;
-		this.iconContainer.setAttribute('aria-label', calculatedTitle);
-	}
-
-	protected updateTitle(title: string): void {
-		const calculatedTitle = this.calculateTitle(title);
-		if (this.titleContainer) {
-			this.titleContainer.textContent = calculatedTitle;
-			this.titleContainer.setAttribute('title', calculatedTitle);
-		}
-
-		if (this.iconContainer) {
-			this.iconContainer.title = calculatedTitle;
-			this.iconContainer.setAttribute('aria-label', calculatedTitle);
-		}
-
-		this._title = title;
-		this._onDidChangeTitleArea.fire();
-	}
-
-	private setTitleDescription(description: string | undefined) {
-		if (this.titleDescriptionContainer) {
-			this.titleDescriptionContainer.textContent = description ?? '';
-			this.titleDescriptionContainer.setAttribute('title', description ?? '');
-		}
-		else if (description && this.titleContainer) {
-			this.titleDescriptionContainer = after(this.titleContainer, $('span.description', { title: description }, description));
-		}
-	}
-
-	protected updateTitleDescription(description?: string | undefined): void {
-		this.setTitleDescription(description);
-
-		this._titleDescription = description;
-		this._onDidChangeTitleArea.fire();
-	}
-
-	private calculateTitle(title: string): string {
-		const viewContainer = this.viewDescriptorService.getViewContainerByViewId(this.id)!;
-		const model = this.viewDescriptorService.getViewContainerModel(viewContainer);
-		const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(this.id);
-		const isDefault = this.viewDescriptorService.getDefaultContainerById(this.id) === viewContainer;
-
-		if (!isDefault && viewDescriptor?.containerTitle && model.title !== viewDescriptor.containerTitle) {
-			return `${viewDescriptor.containerTitle}: ${title}`;
-		}
-
-		return title;
-	}
-
-	private scrollableElement!: DomScrollableElement;
-
-	protected renderBody(container: HTMLElement): void {
-		this.bodyContainer = container;
-
-		const viewWelcomeContainer = append(container, $('.welcome-view'));
-		this.viewWelcomeContainer = $('.welcome-view-content', { tabIndex: 0 });
-		this.scrollableElement = this._register(new DomScrollableElement(this.viewWelcomeContainer, {
-			alwaysConsumeMouseWheel: true,
-			horizontal: ScrollbarVisibility.Hidden,
-			vertical: ScrollbarVisibility.Visible,
-		}));
-
-		append(viewWelcomeContainer, this.scrollableElement.getDomNode());
-
-		const onViewWelcomeChange = Event.any(this.viewWelcomeController.onDidChange, this.onDidChangeViewWelcomeState);
-		this._register(onViewWelcomeChange(this.updateViewWelcome, this));
-		this.updateViewWelcome();
-	}
-
-	protected layoutBody(height: number, width: number): void {
-		this.viewWelcomeContainer.style.height = `${height}px`;
-		this.viewWelcomeContainer.style.width = `${width}px`;
-		this.scrollableElement.scanDomNode();
-	}
-
-	getProgressIndicator() {
-		if (this.progressBar === undefined) {
-			// Progress bar
-			this.progressBar = this._register(new ProgressBar(this.element));
-			this._register(attachProgressBarStyler(this.progressBar, this.themeService));
-			this.progressBar.hide();
-		}
-
-		if (this.progressIndicator === undefined) {
-			this.progressIndicator = this.instantiationService.createInstance(CompositeProgressIndicator, assertIsDefined(this.progressBar), this.id, this.isBodyVisible());
-		}
-		return this.progressIndicator;
-	}
-
-	protected getProgressLocation(): string {
-		return this.viewDescriptorService.getViewContainerByViewId(this.id)!.id;
-	}
-
-	protected getBackgroundColor(): string {
-		return this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND;
-	}
-
-	focus(): void {
-		if (this.shouldShowWelcome()) {
-			this.viewWelcomeContainer.focus();
-		} else if (this.element) {
-			this.element.focus();
-			this._onDidFocus.fire();
-		}
-	}
-
-	private setActions(): void {
-		if (this.toolbar) {
-			this.toolbar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()));
-			this.toolbar.context = this.getActionsContext();
-		}
-	}
-
-	private updateActionsVisibility(): void {
-		if (!this.headerContainer) {
-			return;
-		}
-		const shouldAlwaysShowActions = this.configurationService.getValue<boolean>('workbench.view.alwaysShowHeaderActions');
-		this.headerContainer.classList.toggle('actions-always-visible', shouldAlwaysShowActions);
-	}
-
-	protected updateActions(): void {
-		this.setActions();
-		this._onDidChangeTitleArea.fire();
-	}
-
-	getActions(): IAction[] {
-		return this.menuActions.getPrimaryActions();
-	}
-
-	getSecondaryActions(): IAction[] {
-		return this.menuActions.getSecondaryActions();
-	}
-
-	getContextMenuActions(): IAction[] {
-		return this.menuActions.getContextMenuActions();
-	}
-
-	getActionViewItem(action: IAction): IActionViewItem | undefined {
-		if (action instanceof MenuItemAction) {
-			return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-		} else if (action instanceof SubmenuItemAction) {
-			return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-		}
-		return undefined;
-	}
-
-	getActionsContext(): unknown {
-		return undefined;
-	}
-
-	getOptimalWidth(): number {
-		return 0;
-	}
-
-	saveState(): void {
-		// Subclasses to implement for saving state
-	}
-
-	private updateViewWelcome(): void {
-		this.viewWelcomeDisposable.dispose();
-
-		if (!this.shouldShowWelcome()) {
-			this.bodyContainer.classList.remove('welcome');
-			this.viewWelcomeContainer.innerText = '';
-			this.scrollableElement.scanDomNode();
-			return;
-		}
-
-		const contents = this.viewWelcomeController.contents;
-
-		if (contents.length === 0) {
-			this.bodyContainer.classList.remove('welcome');
-			this.viewWelcomeContainer.innerText = '';
-			this.scrollableElement.scanDomNode();
-			return;
-		}
-
-		const disposables = new DisposableStore();
-		this.bodyContainer.classList.add('welcome');
-		this.viewWelcomeContainer.innerText = '';
-
-		for (const { content, precondition } of contents) {
-			const lines = content.split('\n');
-
-			for (let line of lines) {
-				line = line.trim();
-
-				if (!line) {
-					continue;
-				}
-
-				const linkedText = parseLinkedText(line);
-
-				if (linkedText.nodes.length === 1 && typeof linkedText.nodes[0] !== 'string') {
-					const node = linkedText.nodes[0];
-					const button = new Button(this.viewWelcomeContainer, { title: node.title, supportCodicons: true });
-					button.label = node.label;
-					button.onDidClick(_ => {
-						this.telemetryService.publicLog2<{ viewId: string, uri: string }, WelcomeActionClassification>('views.welcomeAction', { viewId: this.id, uri: node.href });
-						this.openerService.open(node.href);
-					}, null, disposables);
-					disposables.add(button);
-					disposables.add(attachButtonStyler(button, this.themeService));
-
-					if (precondition) {
-						const updateEnablement = () => button.enabled = this.contextKeyService.contextMatchesRules(precondition);
-						updateEnablement();
-
-						const keys = new Set();
-						precondition.keys().forEach(key => keys.add(key));
-						const onDidChangeContext = Event.filter(this.contextKeyService.onDidChangeContext, e => e.affectsSome(keys));
-						onDidChangeContext(updateEnablement, null, disposables);
-					}
-				} else {
-					const p = append(this.viewWelcomeContainer, $('p'));
-
-					for (const node of linkedText.nodes) {
-						if (typeof node === 'string') {
-							append(p, document.createTextNode(node));
-						} else {
-							const link = this.instantiationService.createInstance(Link, node);
-							append(p, link.el);
-							disposables.add(link);
-							disposables.add(attachLinkStyler(link, this.themeService));
-						}
-					}
-				}
-			}
-		}
-
-		this.scrollableElement.scanDomNode();
-		this.viewWelcomeDisposable = disposables;
-	}
-
-	shouldShowWelcome(): boolean {
-		return false;
-	}
-}
-
 export interface IViewPaneContainerOptions extends IPaneViewOptions {
 	mergeViewWithContainerWhenSingleView: boolean;
 }
@@ -860,6 +293,22 @@ class ViewPaneDropOverlay extends Themable {
 	}
 }
 
+class ViewContainerMenuActions extends CompositeMenuActions {
+	constructor(
+		viewContainer: ViewContainer,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IMenuService menuService: IMenuService,
+	) {
+		const scopedContextKeyService = contextKeyService.createScoped();
+		scopedContextKeyService.createKey('viewContainer', viewContainer.id);
+		const viewContainerLocationKey = scopedContextKeyService.createKey('viewContainerLocation', ViewContainerLocationToString(viewDescriptorService.getViewContainerLocation(viewContainer)!));
+		super(MenuId.ViewContainerTitle, MenuId.ViewContainerTitleContext, { shouldForwardArgs: true }, scopedContextKeyService, menuService);
+		this._register(scopedContextKeyService);
+		this._register(Event.filter(viewDescriptorService.onDidChangeContainerLocation, e => e.viewContainer === viewContainer)(() => viewContainerLocationKey.set(ViewContainerLocationToString(viewDescriptorService.getViewContainerLocation(viewContainer)!))));
+	}
+}
+
 export class ViewPaneContainer extends Component implements IViewPaneContainer {
 
 	readonly viewContainer: ViewContainer;
@@ -910,6 +359,8 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		return this.paneItems.length;
 	}
 
+	private readonly menuActions: ViewContainerMenuActions;
+
 	constructor(
 		id: string,
 		private options: IViewPaneContainerOptions,
@@ -922,7 +373,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		@IThemeService protected themeService: IThemeService,
 		@IStorageService protected storageService: IStorageService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
-		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
 	) {
 
 		super(id, themeService, storageService);
@@ -938,6 +389,9 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		this.visibleViewsCountFromCache = this.storageService.getNumber(this.visibleViewsStorageId, StorageScope.WORKSPACE, undefined);
 		this._register(toDisposable(() => this.viewDisposables = dispose(this.viewDisposables)));
 		this.viewContainerModel = this.viewDescriptorService.getViewContainerModel(container);
+
+		this.menuActions = this._register(instantiationService.createInstance(ViewContainerMenuActions, container));
+		this._register(this.menuActions.onDidChange(() => this.updateTitleArea()));
 	}
 
 	create(parent: HTMLElement): void {
@@ -1110,57 +564,62 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		let anchor: { x: number, y: number; } = { x: event.posx, y: event.posy };
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => anchor,
-			getActions: () => this.getContextMenuActions()
+			getActions: () => [...this.getContextMenuActions2()]
 		});
 	}
 
+	getContextMenuActions2(): ReadonlyArray<IAction> {
+		return this.menuActions.getContextMenuActions();
+	}
+
 	getContextMenuActions(viewDescriptor?: IViewDescriptor): IAction[] {
-		const result: IAction[] = [];
+		return [];
+	}
 
-		let showHide = true;
-		if (!viewDescriptor && this.isViewMergedWithContainer()) {
-			viewDescriptor = this.viewDescriptorService.getViewDescriptorById(this.panes[0].id) || undefined;
-			showHide = false;
+	getActions2(): IAction[] {
+		const result = [];
+		result.push(...this.menuActions.getPrimaryActions());
+		if (this.isViewMergedWithContainer()) {
+			result.push(...this.paneItems[0].pane.getActions());
 		}
-
-		if (viewDescriptor) {
-			if (showHide) {
-				result.push(<IAction>{
-					id: `${viewDescriptor.id}.removeView`,
-					label: nls.localize('hideView', "Hide"),
-					enabled: viewDescriptor.canToggleVisibility,
-					run: () => this.toggleViewVisibility(viewDescriptor!.id)
-				});
-			}
-			const view = this.getView(viewDescriptor.id);
-			if (view) {
-				result.push(...view.getContextMenuActions());
-			}
-		}
-
-		const viewToggleActions = this.getViewsVisibilityActions();
-		if (result.length && viewToggleActions.length) {
-			result.push(new Separator());
-		}
-
-		result.push(...viewToggleActions);
-
 		return result;
 	}
 
 	getActions(): IAction[] {
-		if (this.isViewMergedWithContainer()) {
-			return this.paneItems[0].pane.getActions();
-		}
-
 		return [];
 	}
 
-	getSecondaryActions(): IAction[] {
-		if (this.isViewMergedWithContainer()) {
-			return this.paneItems[0].pane.getSecondaryActions();
+	getSecondaryActions2(): IAction[] {
+		const viewPaneActions = this.isViewMergedWithContainer() ? this.paneItems[0].pane.getSecondaryActions() : [];
+		let menuActions = this.menuActions.getSecondaryActions();
+
+		const viewsSubmenuActionIndex = menuActions.findIndex(action => action instanceof SubmenuItemAction && action.item.submenu === ViewsSubMenu);
+		if (viewsSubmenuActionIndex !== -1) {
+			const viewsSubmenuAction = <SubmenuItemAction>menuActions[viewsSubmenuActionIndex];
+			if (viewsSubmenuAction.actions.some(({ enabled }) => enabled)) {
+				if (menuActions.length === 1 && viewPaneActions.length === 0) {
+					menuActions = viewsSubmenuAction.actions.slice();
+				} else if (viewsSubmenuActionIndex !== 0) {
+					menuActions = [viewsSubmenuAction, ...menuActions.slice(0, viewsSubmenuActionIndex), ...menuActions.slice(viewsSubmenuActionIndex + 1)];
+				}
+			} else {
+				// Remove views submenu if none of the actions are enabled
+				menuActions.splice(viewsSubmenuActionIndex, 1);
+			}
 		}
 
+		if (menuActions.length && viewPaneActions.length) {
+			return [
+				...menuActions,
+				new Separator(),
+				...viewPaneActions
+			];
+		}
+
+		return menuActions.length ? menuActions : viewPaneActions;
+	}
+
+	getSecondaryActions(): IAction[] {
 		return [];
 	}
 
@@ -1168,22 +627,11 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		return undefined;
 	}
 
-	getViewsVisibilityActions(): IAction[] {
-		return this.viewContainerModel.activeViewDescriptors.map(viewDescriptor => (<IAction>{
-			id: `${viewDescriptor.id}.toggleVisibility`,
-			label: viewDescriptor.name,
-			checked: this.viewContainerModel.isVisible(viewDescriptor.id),
-			enabled: viewDescriptor.canToggleVisibility && (!this.viewContainerModel.isVisible(viewDescriptor.id) || this.viewContainerModel.visibleViewDescriptors.length > 1),
-			run: () => this.toggleViewVisibility(viewDescriptor.id)
-		}));
-	}
-
 	getActionViewItem(action: IAction): IActionViewItem | undefined {
 		if (this.isViewMergedWithContainer()) {
 			return this.paneItems[0].pane.getActionViewItem(action);
 		}
-
-		return undefined;
+		return createActionViewItem(this.instantiationService, action);
 	}
 
 	focus(): void {
@@ -1321,11 +769,11 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		this.storageService.store(this.visibleViewsStorageId, this.length, StorageScope.WORKSPACE, StorageTarget.USER);
 	}
 
-	private onContextMenu(event: StandardMouseEvent, viewDescriptor: IViewDescriptor): void {
+	private onContextMenu(event: StandardMouseEvent, viewPane: ViewPane): void {
 		event.stopPropagation();
 		event.preventDefault();
 
-		const actions: IAction[] = this.getContextMenuActions(viewDescriptor);
+		const actions: IAction[] = viewPane.getContextMenuActions();
 
 		let anchor: { x: number, y: number } = { x: event.posx, y: event.posy };
 		this.contextMenuService.showContextMenu({
@@ -1364,7 +812,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 			const contextMenuDisposable = addDisposableListener(pane.draggableElement, 'contextmenu', e => {
 				e.stopPropagation();
 				e.preventDefault();
-				this.onContextMenu(new StandardMouseEvent(e), viewDescriptor);
+				this.onContextMenu(new StandardMouseEvent(e), pane);
 			});
 
 			const collapseDisposable = Event.latch(Event.map(pane.onDidChange, () => !pane.isExpanded()))(collapsed => {
@@ -1401,7 +849,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		}
 	}
 
-	protected toggleViewVisibility(viewId: string): void {
+	toggleViewVisibility(viewId: string): void {
 		// Check if view is active
 		if (this.viewContainerModel.activeViewDescriptors.some(viewDescriptor => viewDescriptor.id === viewId)) {
 			const visible = !this.viewContainerModel.isVisible(viewId);
@@ -1641,7 +1089,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		}
 	}
 
-	private isViewMergedWithContainer(): boolean {
+	isViewMergedWithContainer(): boolean {
 		if (!(this.options.mergeViewWithContainerWhenSingleView && this.paneItems.length === 1)) {
 			return false;
 		}
@@ -1665,6 +1113,21 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 	}
 }
 
+export abstract class ViewPaneContainerAction<T extends IViewPaneContainer> extends Action2 {
+	constructor(readonly desc: Readonly<IAction2Options> & { viewPaneContainerId: string }) {
+		super(desc);
+	}
+
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		const viewPaneContainer = accessor.get(IViewsService).getActiveViewPaneContainerWithId(this.desc.viewPaneContainerId);
+		if (viewPaneContainer) {
+			return this.runInViewPaneContainer(accessor, <T>viewPaneContainer, ...args);
+		}
+	}
+
+	abstract runInViewPaneContainer(accessor: ServicesAccessor, viewPaneContainer: T, ...args: any[]): any;
+}
+
 class MoveViewPosition extends Action2 {
 	constructor(desc: Readonly<IAction2Options>, private readonly offset: number) {
 		super(desc);
diff --git a/src/vs/workbench/browser/parts/views/viewsService.ts b/src/vs/workbench/browser/parts/views/viewsService.ts
index 687fbdb88..3f47ba106 100644
--- a/src/vs/workbench/browser/parts/views/viewsService.ts
+++ b/src/vs/workbench/browser/parts/views/viewsService.ts
@@ -196,7 +196,9 @@ export class ViewsService extends Disposable implements IViewsService {
 									ContextKeyExpr.equals('view', viewDescriptor.id),
 									ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)
 								)
-							)
+							),
+							group: '1_hide',
+							order: 2
 						}],
 					});
 				}
@@ -392,12 +394,29 @@ export class ViewsService extends Disposable implements IViewsService {
 
 	getViewProgressIndicator(viewId: string): IProgressIndicator | undefined {
 		const viewContainer = this.viewDescriptorService.getViewContainerByViewId(viewId);
-		if (viewContainer === null) {
+		if (!viewContainer) {
 			return undefined;
 		}
 
-		const view = this.viewPaneContainers.get(viewContainer.id)?.viewPaneContainer?.getView(viewId);
-		return view?.getProgressIndicator();
+		const viewPaneContainer = this.viewPaneContainers.get(viewContainer.id)?.viewPaneContainer;
+		if (!viewPaneContainer) {
+			return undefined;
+		}
+
+		const view = viewPaneContainer.getView(viewId);
+		if (!view) {
+			return undefined;
+		}
+
+		if (viewPaneContainer.isViewMergedWithContainer()) {
+			return this.getViewContainerProgressIndicator(viewContainer);
+		}
+
+		return view.getProgressIndicator();
+	}
+
+	private getViewContainerProgressIndicator(viewContainer: ViewContainer): IProgressIndicator | undefined {
+		return this.viewDescriptorService.getViewContainerLocation(viewContainer) === ViewContainerLocation.Sidebar ? this.viewletService.getProgressIndicator(viewContainer.id) : this.panelService.getProgressIndicator(viewContainer.id);
 	}
 
 	private registerViewletOrPanel(viewContainer: ViewContainer, viewContainerLocation: ViewContainerLocation): void {
@@ -451,7 +470,6 @@ export class ViewsService extends Disposable implements IViewsService {
 			undefined,
 			viewContainer.order,
 			viewContainer.requestedIndex,
-			viewContainer.focusCommand?.id,
 		));
 	}
 
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index 47b8f0515..d6a6f07e6 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction } from 'vs/base/common/actions';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IViewDescriptor, IViewDescriptorService, IAddedViewDescriptorRef } from 'vs/workbench/common/views';
@@ -12,7 +11,8 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ViewPaneContainer, ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { Event } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
@@ -81,18 +81,6 @@ export abstract class FilterViewPaneContainer extends ViewPaneContainer {
 		this.getViewsForTarget(newFilterValue).forEach(item => this.viewContainerModel.setVisible(item.id, true));
 	}
 
-	getContextMenuActions(): IAction[] {
-		const result: IAction[] = Array.from(this.constantViewDescriptors.values()).map(viewDescriptor => (<IAction>{
-			id: `${viewDescriptor.id}.toggleVisibility`,
-			label: viewDescriptor.name,
-			checked: this.viewContainerModel.isVisible(viewDescriptor.id),
-			enabled: viewDescriptor.canToggleVisibility,
-			run: () => this.toggleViewVisibility(viewDescriptor.id)
-		}));
-
-		return result;
-	}
-
 	private getViewsForTarget(target: string[]): IViewDescriptor[] {
 		const views: IViewDescriptor[] = [];
 		for (let i = 0; i < target.length; i++) {
@@ -140,7 +128,4 @@ export abstract class FilterViewPaneContainer extends ViewPaneContainer {
 
 	abstract getTitle(): string;
 
-	getViewsVisibilityActions(): IAction[] {
-		return [];
-	}
 }
diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts
index 0517f059b..4f1ecbcd0 100644
--- a/src/vs/workbench/browser/style.ts
+++ b/src/vs/workbench/browser/style.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/style';
 
-import { registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { iconForeground, foreground, selectionBackground, focusBorder, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listHighlightForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
 import { WORKBENCH_BACKGROUND, TITLE_BAR_ACTIVE_BACKGROUND } from 'vs/workbench/common/theme';
 import { isWeb, isIOS, isMacintosh, isWindows } from 'vs/base/common/platform';
@@ -13,7 +13,7 @@ import { createMetaElement } from 'vs/base/browser/dom';
 import { isSafari, isStandalone } from 'vs/base/browser/browser';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
+registerThemingParticipant((theme, collector) => {
 
 	// Foreground
 	const windowForeground = theme.getColor(foreground);
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index 01ef1665c..79ec52099 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -3,23 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import * as DOM from 'vs/base/browser/dom';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
+import { Action } from 'vs/base/common/actions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { CompositeDescriptor, CompositeRegistry } from 'vs/workbench/browser/composite';
-import { IConstructorSignature0, IInstantiationService, BrandedService } from 'vs/platform/instantiation/common/instantiation';
-import { ToggleSidebarVisibilityAction, ToggleSidebarPositionAction } from 'vs/workbench/browser/actions/layoutActions';
+import { IConstructorSignature0, IInstantiationService, BrandedService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { URI } from 'vs/base/common/uri';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree';
-import { AbstractTree } from 'vs/base/browser/ui/tree/abstractTree';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -28,6 +24,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { PaneComposite } from 'vs/workbench/browser/panecomposite';
 import { Event } from 'vs/base/common/event';
 import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { Action2 } from 'vs/platform/actions/common/actions';
 
 export abstract class Viewlet extends PaneComposite implements IViewlet {
 
@@ -52,40 +49,6 @@ export abstract class Viewlet extends PaneComposite implements IViewlet {
 			}));
 		}
 	}
-
-	getContextMenuActions(): IAction[] {
-		const parentActions = [...super.getContextMenuActions()];
-		if (parentActions.length) {
-			parentActions.push(new Separator());
-		}
-
-		const toggleSidebarPositionAction = new ToggleSidebarPositionAction(ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.getLabel(this.layoutService), this.layoutService, this.configurationService);
-		return [...parentActions, toggleSidebarPositionAction,
-		<IAction>{
-			id: ToggleSidebarVisibilityAction.ID,
-			label: nls.localize('compositePart.hideSideBarLabel', "Hide Side Bar"),
-			enabled: true,
-			run: () => this.layoutService.setSideBarHidden(true)
-		}];
-	}
-
-	getSecondaryActions(): IAction[] {
-		const viewVisibilityActions = this.viewPaneContainer.getViewsVisibilityActions();
-		const secondaryActions = this.viewPaneContainer.getSecondaryActions();
-		if (viewVisibilityActions.length <= 1 || viewVisibilityActions.every(({ enabled }) => !enabled)) {
-			return secondaryActions;
-		}
-
-		if (secondaryActions.length === 0) {
-			return viewVisibilityActions;
-		}
-
-		return [
-			new SubmenuAction('workbench.views', nls.localize('views', "Views"), viewVisibilityActions),
-			new Separator(),
-			...secondaryActions
-		];
-	}
 }
 
 /**
@@ -115,7 +78,7 @@ export class ViewletDescriptor extends CompositeDescriptor<Viewlet> {
 		requestedIndex?: number,
 		readonly iconUrl?: URI
 	) {
-		super(ctor, id, name, cssClass, order, requestedIndex, id);
+		super(ctor, id, name, cssClass, order, requestedIndex);
 	}
 }
 
@@ -152,7 +115,6 @@ export class ViewletRegistry extends CompositeRegistry<Viewlet> {
 	getViewlets(): ViewletDescriptor[] {
 		return this.getComposites() as ViewletDescriptor[];
 	}
-
 }
 
 Registry.add(Extensions.Viewlets, new ViewletRegistry());
@@ -176,7 +138,7 @@ export class ShowViewletAction extends Action {
 	async run(): Promise<void> {
 
 		// Pass focus to viewlet if not open or focused
-		if (this.otherViewletShowing() || !this.sidebarHasFocus()) {
+		if (otherViewletShowing(this.viewletService, this.viewletId) || !sidebarHasFocus(this.viewletService, this.layoutService)) {
 			await this.viewletService.openViewlet(this.viewletId, true);
 			return;
 		}
@@ -184,28 +146,42 @@ export class ShowViewletAction extends Action {
 		// Otherwise pass focus to editor group
 		this.editorGroupService.activeGroup.focus();
 	}
+}
 
-	private otherViewletShowing(): boolean {
-		const activeViewlet = this.viewletService.getActiveViewlet();
+/**
+ * A reusable action to show a viewlet with a specific id.
+ */
+export abstract class ShowViewletAction2 extends Action2 {
+	/**
+	 * Gets the viewlet ID to show.
+	 */
+	protected abstract viewletId(): string;
 
-		return !activeViewlet || activeViewlet.getId() !== this.viewletId;
-	}
+	public async run(accessor: ServicesAccessor): Promise<void> {
+		const viewletService = accessor.get(IViewletService);
+		const editorGroupService = accessor.get(IEditorGroupsService);
+		const layoutService = accessor.get(IWorkbenchLayoutService);
 
-	private sidebarHasFocus(): boolean {
-		const activeViewlet = this.viewletService.getActiveViewlet();
-		const activeElement = document.activeElement;
-		const sidebarPart = this.layoutService.getContainer(Parts.SIDEBAR_PART);
+		// Pass focus to viewlet if not open or focused
+		if (otherViewletShowing(viewletService, this.viewletId()) || !sidebarHasFocus(viewletService, layoutService)) {
+			await viewletService.openViewlet(this.viewletId(), true);
+			return;
+		}
 
-		return !!(activeViewlet && activeElement && sidebarPart && DOM.isAncestor(activeElement, sidebarPart));
+		// Otherwise pass focus to editor group
+		editorGroupService.activeGroup.focus();
 	}
 }
 
-export class CollapseAction extends Action {
-	// We need a tree getter because the action is sometimes instantiated too early
-	constructor(treeGetter: () => AsyncDataTree<any, any, any> | AbstractTree<any, any, any>, enabled: boolean, clazz?: string) {
-		super('workbench.action.collapse', nls.localize('collapse', "Collapse All"), clazz, enabled, async () => {
-			const tree = treeGetter();
-			tree.collapseAll();
-		});
-	}
-}
+const otherViewletShowing = (viewletService: IViewletService, viewletId: string): boolean => {
+	const activeViewlet = viewletService.getActiveViewlet();
+	return !activeViewlet || activeViewlet.getId() !== viewletId;
+};
+
+const sidebarHasFocus = (viewletService: IViewletService, layoutService: IWorkbenchLayoutService): boolean => {
+	const activeViewlet = viewletService.getActiveViewlet();
+	const activeElement = document.activeElement;
+	const sidebarPart = layoutService.getContainer(Parts.SIDEBAR_PART);
+
+	return !!(activeViewlet && activeElement && sidebarPart && DOM.isAncestor(activeElement, sidebarPart));
+};
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index e7d260b00..78bfe33cb 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mark } from 'vs/base/common/performance';
-import { hash } from 'vs/base/common/hash';
-import { domContentLoaded, addDisposableListener, EventType, EventHelper, detectFullscreen, addDisposableThrottledListener } from 'vs/base/browser/dom';
+import { domContentLoaded, detectFullscreen, getCookieValue } from 'vs/base/browser/dom';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILogService, ConsoleLogService, MultiplexLogService, getLogLevel } from 'vs/platform/log/common/log';
 import { ConsoleLogInAutomationService } from 'vs/platform/log/browser/log';
@@ -24,10 +23,9 @@ import { IFileService, IFileSystemProvider } from 'vs/platform/files/common/file
 import { FileService } from 'vs/platform/files/common/fileService';
 import { Schemas } from 'vs/base/common/network';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { setFullscreen } from 'vs/base/browser/browser';
-import { isIOS, isMacintosh } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { IWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces';
 import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
@@ -37,12 +35,11 @@ import { SignService } from 'vs/platform/sign/browser/signService';
 import type { IWorkbenchConstructionOptions, IWorkspace, IWorkbench } from 'vs/workbench/workbench.web.api';
 import { BrowserStorageService } from 'vs/platform/storage/browser/storageService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { registerWindowDriver } from 'vs/platform/driver/browser/driver';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { FileLogService } from 'vs/platform/log/common/fileLogService';
 import { toLocalISOString } from 'vs/base/common/date';
 import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';
-import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
+import { getSingleFolderWorkspaceIdentifier, getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
 import { coalesce } from 'vs/base/common/arrays';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -61,6 +58,8 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
+import { BrowserWindow } from 'vs/workbench/browser/window';
+import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
 
 class BrowserMain extends Disposable {
 
@@ -83,35 +82,40 @@ class BrowserMain extends Disposable {
 		const services = await this.initServices();
 
 		await domContentLoaded();
-		mark('willStartWorkbench');
+		mark('code/willStartWorkbench');
 
 		// Create Workbench
-		const workbench = new Workbench(
-			this.domElement,
-			services.serviceCollection,
-			services.logService
-		);
+		const workbench = new Workbench(this.domElement, services.serviceCollection, services.logService);
 
 		// Listeners
 		this.registerListeners(workbench, services.storageService, services.logService);
 
-		// Driver
-		if (this.configuration.driver) {
-			(async () => this._register(await registerWindowDriver()))();
-		}
-
 		// Startup
 		const instantiationService = workbench.startup();
 
+		// Window
+		this._register(instantiationService.createInstance(BrowserWindow));
+
+		// Logging
+		services.logService.trace('workbench configuration', JSON.stringify(this.configuration));
+
 		// Return API Facade
 		return instantiationService.invokeFunction(accessor => {
 			const commandService = accessor.get(ICommandService);
 			const lifecycleService = accessor.get(ILifecycleService);
+			const timerService = accessor.get(ITimerService);
 
 			return {
 				commands: {
 					executeCommand: (command, ...args) => commandService.executeCommand(command, ...args)
 				},
+				env: {
+					async retrievePerformanceMarks() {
+						await timerService.whenReady();
+
+						return timerService.getPerformanceMarks();
+					}
+				},
 				shutdown: () => lifecycleService.shutdown()
 			};
 		});
@@ -119,46 +123,17 @@ class BrowserMain extends Disposable {
 
 	private registerListeners(workbench: Workbench, storageService: BrowserStorageService, logService: ILogService): void {
 
-		// Layout
-		const viewport = isIOS && window.visualViewport ? window.visualViewport /** Visual viewport */ : window /** Layout viewport */;
-		this._register(addDisposableListener(viewport, EventType.RESIZE, () => {
-			logService.trace(`web.main#${isIOS && window.visualViewport ? 'visualViewport' : 'window'}Resize`);
-			workbench.layout();
-		}));
-
-		// Prevent the back/forward gestures in macOS
-		this._register(addDisposableListener(this.domElement, EventType.WHEEL, e => e.preventDefault(), { passive: false }));
-
-		// Prevent native context menus in web
-		this._register(addDisposableListener(this.domElement, EventType.CONTEXT_MENU, e => EventHelper.stop(e, true)));
-
-		// Prevent default navigation on drop
-		this._register(addDisposableListener(this.domElement, EventType.DROP, e => EventHelper.stop(e, true)));
-
 		// Workbench Lifecycle
 		this._register(workbench.onBeforeShutdown(event => {
 			if (storageService.hasPendingUpdate) {
-				logService.warn('Unload veto: pending storage update');
-				event.veto(true); // prevent data loss from pending storage update
+				event.veto(true, 'veto.pendingStorageUpdate'); // prevent data loss from pending storage update
 			}
 		}));
-		this._register(workbench.onWillShutdown(() => {
-			storageService.close();
-		}));
+		this._register(workbench.onWillShutdown(() => storageService.close()));
 		this._register(workbench.onShutdown(() => this.dispose()));
-
-		// Fullscreen (Browser)
-		[EventType.FULLSCREEN_CHANGE, EventType.WK_FULLSCREEN_CHANGE].forEach(event => {
-			this._register(addDisposableListener(document, event, () => setFullscreen(!!detectFullscreen())));
-		});
-
-		// Fullscreen (Native)
-		this._register(addDisposableThrottledListener(viewport, EventType.RESIZE, () => {
-			setFullscreen(!!detectFullscreen());
-		}, undefined, isMacintosh ? 2000 /* adjust for macOS animation */ : 800 /* can be throttled */));
 	}
 
-	private async initServices(): Promise<{ serviceCollection: ServiceCollection, configurationService: IConfigurationService, logService: ILogService, storageService: BrowserStorageService }> {
+	private async initServices(): Promise<{ serviceCollection: ServiceCollection, configurationService: IWorkbenchConfigurationService, logService: ILogService, storageService: BrowserStorageService }> {
 		const serviceCollection = new ServiceCollection();
 
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -166,7 +141,7 @@ class BrowserMain extends Disposable {
 		// CONTRIBUTE IT VIA WORKBENCH.WEB.MAIN.TS AND registerSingleton().
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-		const payload = await this.resolveWorkspaceInitializationPayload();
+		const payload = this.resolveWorkspaceInitializationPayload();
 
 		// Product
 		const productService: IProductService = { _serviceBrand: undefined, ...product, ...this.configuration.productConfiguration };
@@ -181,9 +156,8 @@ class BrowserMain extends Disposable {
 		const logService = new BufferLogService(getLogLevel(environmentService));
 		serviceCollection.set(ILogService, logService);
 
-		const connectionToken = environmentService.options.connectionToken || this.getCookieValue('vscode-tkn');
-
 		// Remote
+		const connectionToken = environmentService.options.connectionToken || getCookieValue('vscode-tkn');
 		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(connectionToken, this.configuration.resourceUriProvider);
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
@@ -212,7 +186,7 @@ class BrowserMain extends Disposable {
 				serviceCollection.set(IWorkspaceContextService, service);
 
 				// Configuration
-				serviceCollection.set(IConfigurationService, service);
+				serviceCollection.set(IWorkbenchConfigurationService, service);
 
 				return service;
 			}),
@@ -239,14 +213,16 @@ class BrowserMain extends Disposable {
 		serviceCollection.set(IUserDataInitializationService, userDataInitializationService);
 
 		if (await userDataInitializationService.requiresInitialization()) {
-			mark('willInitRequiredUserData');
+			mark('code/willInitRequiredUserData');
+
 			// Initialize required resources - settings & global state
 			await userDataInitializationService.initializeRequiredResources();
 
 			// Important: Reload only local user configuration after initializing
 			// Reloading complete configuraiton blocks workbench until remote configuration is loaded.
 			await configurationService.reloadLocalUserConfiguration();
-			mark('didInitRequiredUserData');
+
+			mark('code/didInitRequiredUserData');
 		}
 
 		return { serviceCollection, configurationService, logService, storageService };
@@ -261,8 +237,9 @@ class BrowserMain extends Disposable {
 			try {
 				indexedDBLogProvider = await indexedDB.createFileSystemProvider(logsPath.scheme, INDEXEDDB_LOGS_OBJECT_STORE);
 			} catch (error) {
-				console.error(error);
+				onUnexpectedError(error);
 			}
+
 			if (indexedDBLogProvider) {
 				fileService.registerProvider(logsPath.scheme, indexedDBLogProvider);
 			} else {
@@ -279,6 +256,7 @@ class BrowserMain extends Disposable {
 
 		const connection = remoteAgentService.getConnection();
 		if (connection) {
+
 			// Remote file system
 			const remoteFileSystemProvider = this._register(new RemoteFileSystemProvider(remoteAgentService));
 			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
@@ -289,8 +267,9 @@ class BrowserMain extends Disposable {
 		try {
 			indexedDBUserDataProvider = await indexedDB.createFileSystemProvider(Schemas.userData, INDEXEDDB_USERDATA_OBJECT_STORE);
 		} catch (error) {
-			console.error(error);
+			onUnexpectedError(error);
 		}
+		fileService.registerProvider(Schemas.userData, indexedDBUserDataProvider || new InMemoryFileSystemProvider());
 
 		if (indexedDBUserDataProvider) {
 			registerAction2(class ResetUserDataAction extends Action2 {
@@ -304,21 +283,22 @@ class BrowserMain extends Disposable {
 						}
 					});
 				}
+
 				async run(accessor: ServicesAccessor): Promise<void> {
 					const dialogService = accessor.get(IDialogService);
 					const hostService = accessor.get(IHostService);
 					const result = await dialogService.confirm({
 						message: localize('reset user data message', "Would you like to reset your data (settings, keybindings, extensions, snippets and UI State) and reload?")
 					});
+
 					if (result.confirmed) {
-						await indexedDBUserDataProvider!.reset();
+						await indexedDBUserDataProvider?.reset();
 					}
+
 					hostService.reload();
 				}
 			});
 		}
-
-		fileService.registerProvider(Schemas.userData, indexedDBUserDataProvider || new InMemoryFileSystemProvider());
 	}
 
 	private async createStorageService(payload: IWorkspaceInitializationPayload, environmentService: IWorkbenchEnvironmentService, fileService: IFileService, logService: ILogService): Promise<BrowserStorageService> {
@@ -351,7 +331,7 @@ class BrowserMain extends Disposable {
 		}
 	}
 
-	private async resolveWorkspaceInitializationPayload(): Promise<IWorkspaceInitializationPayload> {
+	private resolveWorkspaceInitializationPayload(): IWorkspaceInitializationPayload {
 		let workspace: IWorkspace | undefined = undefined;
 		if (this.configuration.workspaceProvider) {
 			workspace = this.configuration.workspaceProvider.workspace;
@@ -364,18 +344,11 @@ class BrowserMain extends Disposable {
 
 		// Single-folder workspace
 		if (workspace && isFolderToOpen(workspace)) {
-			const id = hash(workspace.folderUri.toString()).toString(16);
-			return { id, folder: workspace.folderUri };
+			return getSingleFolderWorkspaceIdentifier(workspace.folderUri);
 		}
 
 		return { id: 'empty-window' };
 	}
-
-	private getCookieValue(name: string): string | undefined {
-		const match = document.cookie.match('(^|[^;]+)\\s*' + name + '\\s*=\\s*([^;]+)'); // See https://stackoverflow.com/a/25490531
-
-		return match ? match.pop() : undefined;
-	}
 }
 
 export function main(domElement: HTMLElement, options: IWorkbenchConstructionOptions): Promise<IWorkbench> {
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
new file mode 100644
index 000000000..337771b2d
--- /dev/null
+++ b/src/vs/workbench/browser/window.ts
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { setFullscreen } from 'vs/base/browser/browser';
+import { addDisposableListener, addDisposableThrottledListener, detectFullscreen, EventHelper, EventType, windowOpenNoOpener } from 'vs/base/browser/dom';
+import { domEvent } from 'vs/base/browser/event';
+import { timeout } from 'vs/base/common/async';
+import { Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import { isIOS, isMacintosh } from 'vs/base/common/platform';
+import Severity from 'vs/base/common/severity';
+import { localize } from 'vs/nls';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { registerWindowDriver } from 'vs/platform/driver/browser/driver';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IOpenerService, matchesScheme } from 'vs/platform/opener/common/opener';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
+import { BrowserLifecycleService } from 'vs/workbench/services/lifecycle/browser/lifecycleService';
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+
+export class BrowserWindow extends Disposable {
+
+	constructor(
+		@IOpenerService private readonly openerService: IOpenerService,
+		@ILifecycleService private readonly lifecycleService: BrowserLifecycleService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IHostService private readonly hostService: IHostService,
+		@ILabelService private readonly labelService: ILabelService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@ILogService private readonly logService: ILogService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
+	) {
+		super();
+
+		this.registerListeners();
+		this.create();
+	}
+
+	private registerListeners(): void {
+
+		// Lifecycle
+		this._register(this.lifecycleService.onWillShutdown(() => this.onWillShutdown()));
+
+		// Layout
+		const viewport = isIOS && window.visualViewport ? window.visualViewport /** Visual viewport */ : window /** Layout viewport */;
+		this._register(addDisposableListener(viewport, EventType.RESIZE, () => this.onWindowResize()));
+
+		// Prevent the back/forward gestures in macOS
+		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.WHEEL, e => e.preventDefault(), { passive: false }));
+
+		// Prevent native context menus in web
+		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.CONTEXT_MENU, e => EventHelper.stop(e, true)));
+
+		// Prevent default navigation on drop
+		this._register(addDisposableListener(this.layoutService.getWorkbenchContainer(), EventType.DROP, e => EventHelper.stop(e, true)));
+
+		// Fullscreen (Browser)
+		[EventType.FULLSCREEN_CHANGE, EventType.WK_FULLSCREEN_CHANGE].forEach(event => {
+			this._register(addDisposableListener(document, event, () => setFullscreen(!!detectFullscreen())));
+		});
+
+		// Fullscreen (Native)
+		this._register(addDisposableThrottledListener(viewport, EventType.RESIZE, () => {
+			setFullscreen(!!detectFullscreen());
+		}, undefined, isMacintosh ? 2000 /* adjust for macOS animation */ : 800 /* can be throttled */));
+	}
+
+	private onWindowResize(): void {
+		this.logService.trace(`web.main#${isIOS && window.visualViewport ? 'visualViewport' : 'window'}Resize`);
+
+		this.layoutService.layout();
+	}
+
+	private onWillShutdown(): void {
+
+		// Try to detect some user interaction with the workbench
+		// when shutdown has happened to not show the dialog e.g.
+		// when navigation takes a longer time.
+		Event.toPromise(Event.any(
+			Event.once(domEvent(document.body, EventType.KEY_DOWN, true)),
+			Event.once(domEvent(document.body, EventType.MOUSE_DOWN, true))
+		)).then(async () => {
+
+			// Delay the dialog in case the user interacted
+			// with the page before it transitioned away
+			await timeout(3000);
+
+			// This should normally not happen, but if for some reason
+			// the workbench was shutdown while the page is still there,
+			// inform the user that only a reload can bring back a working
+			// state.
+			const res = await this.dialogService.show(
+				Severity.Error,
+				localize('shutdownError', "An unexpected error occurred that requires a reload of this page."),
+				[
+					localize('reload', "Reload")
+				],
+				{
+					detail: localize('shutdownErrorDetail', "The workbench was unexpectedly disposed while running.")
+				}
+			);
+
+			if (res.choice === 0) {
+				this.hostService.reload();
+			}
+		});
+	}
+
+	private create(): void {
+
+		// Driver
+		if (this.environmentService.options?.driver) {
+			(async () => this._register(await registerWindowDriver()))();
+		}
+
+		// Handle open calls
+		this.setupOpenHandlers();
+
+		// Label formatting
+		this.registerLabelFormatters();
+	}
+
+	private setupOpenHandlers(): void {
+
+		// We need to ignore the `beforeunload` event while
+		// we handle external links to open specifically for
+		// the case of application protocols that e.g. invoke
+		// vscode itself. We do not want to open these links
+		// in a new window because that would leave a blank
+		// window to the user, but using `window.location.href`
+		// will trigger the `beforeunload`.
+		this.openerService.setDefaultExternalOpener({
+			openExternal: async (href: string) => {
+				if (matchesScheme(href, Schemas.http) || matchesScheme(href, Schemas.https)) {
+					windowOpenNoOpener(href);
+				} else {
+					this.lifecycleService.withExpectedUnload(() => window.location.href = href);
+				}
+
+				return true;
+			}
+		});
+	}
+
+	private registerLabelFormatters() {
+		this.labelService.registerFormatter({
+			scheme: Schemas.userData,
+			priority: true,
+			formatting: {
+				label: '${scheme}:${path}',
+				separator: '/',
+			}
+		});
+	}
+}
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index fdc99470b..03297afe7 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -33,14 +33,29 @@ import { isStandalone } from 'vs/base/browser/browser';
 				'description': nls.localize('showEditorTabs', "Controls whether opened editors should show in tabs or not."),
 				'default': true
 			},
+			'workbench.editor.wrapTabs': {
+				'type': 'boolean',
+				'markdownDescription': nls.localize('wrapTabs', "Controls whether tabs should be wrapped over multiple lines when exceeding available space or whether a scrollbar should appear instead. This value is ignored when `#workbench.editor.showTabs#` is disabled."),
+				'default': false
+			},
 			'workbench.editor.scrollToSwitchTabs': {
 				'type': 'boolean',
-				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'scrollToSwitchTabs' }, "Controls whether scrolling over tabs will open them or not. By default tabs will only reveal upon scrolling, but not open. You can press and hold the Shift-key while scrolling to change this behaviour for that duration. This value is ignored when `#workbench.editor.showTabs#` is `false`."),
+				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'scrollToSwitchTabs' }, "Controls whether scrolling over tabs will open them or not. By default tabs will only reveal upon scrolling, but not open. You can press and hold the Shift-key while scrolling to change this behaviour for that duration. This value is ignored when `#workbench.editor.showTabs#` is disabled."),
 				'default': false
 			},
 			'workbench.editor.highlightModifiedTabs': {
 				'type': 'boolean',
-				'markdownDescription': nls.localize('highlightModifiedTabs', "Controls whether a top border is drawn on modified (dirty) editor tabs or not. This value is ignored when `#workbench.editor.showTabs#` is `false`."),
+				'markdownDescription': nls.localize('highlightModifiedTabs', "Controls whether a top border is drawn on modified (dirty) editor tabs or not. This value is ignored when `#workbench.editor.showTabs#` is disabled."),
+				'default': false
+			},
+			'workbench.editor.decorations.badges': {
+				'type': 'boolean',
+				'markdownDescription': nls.localize('decorations.badges', "Controls whether editor file decorations should use badges."),
+				'default': false
+			},
+			'workbench.editor.decorations.colors': {
+				'type': 'boolean',
+				'markdownDescription': nls.localize('decorations.colors', "Controls whether editor file decorations should use colors."),
 				'default': false
 			},
 			'workbench.editor.labelFormat': {
@@ -75,7 +90,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 				'type': 'string',
 				'enum': ['left', 'right', 'off'],
 				'default': 'right',
-				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' }, "Controls the position of the editor's tabs close buttons, or disables them when set to 'off'. This value is ignored when `#workbench.editor.showTabs#` is `false`.")
+				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' }, "Controls the position of the editor's tabs close buttons, or disables them when set to 'off'. This value is ignored when `#workbench.editor.showTabs#` is disabled.")
 			},
 			'workbench.editor.tabSizing': {
 				'type': 'string',
@@ -85,7 +100,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 					nls.localize('workbench.editor.tabSizing.fit', "Always keep tabs large enough to show the full editor label."),
 					nls.localize('workbench.editor.tabSizing.shrink', "Allow tabs to get smaller when the available space is not enough to show all tabs at once.")
 				],
-				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' }, "Controls the sizing of editor tabs. This value is ignored when `#workbench.editor.showTabs#` is `false`.")
+				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' }, "Controls the sizing of editor tabs. This value is ignored when `#workbench.editor.showTabs#` is disabled.")
 			},
 			'workbench.editor.pinnedTabSizing': {
 				'type': 'string',
@@ -96,7 +111,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 					nls.localize('workbench.editor.pinnedTabSizing.compact', "A pinned tab will show in a compact form with only icon or first letter of the editor name."),
 					nls.localize('workbench.editor.pinnedTabSizing.shrink', "A pinned tab shrinks to a compact fixed size showing parts of the editor name.")
 				],
-				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'pinnedTabSizing' }, "Controls the sizing of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is `false`.")
+				'markdownDescription': nls.localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'pinnedTabSizing' }, "Controls the sizing of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is disabled.")
 			},
 			'workbench.editor.splitSizing': {
 				'type': 'string',
@@ -130,7 +145,12 @@ import { isStandalone } from 'vs/base/browser/browser';
 			},
 			'workbench.editor.enablePreviewFromQuickOpen': {
 				'type': 'boolean',
-				'description': nls.localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview. Preview editors do not keep open and are reused until explicitly set to be kept open (e.g. via double click or editing)."),
+				'markdownDescription': nls.localize('enablePreviewFromQuickOpen', "Controls whether editors opened from Quick Open show as preview. Preview editors do not keep open and are reused until explicitly set to be kept open (e.g. via double click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
+				'default': false
+			},
+			'workbench.editor.enablePreviewFromCodeNavigation': {
+				'type': 'boolean',
+				'markdownDescription': nls.localize('enablePreviewFromCodeNavigation', "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not keep open and are reused until explicitly set to be kept open (e.g. via double click or editing). This value is ignored when `#workbench.editor.enablePreview#` is disabled."),
 				'default': false
 			},
 			'workbench.editor.closeOnFileDelete': {
@@ -315,8 +335,8 @@ import { isStandalone } from 'vs/base/browser/browser';
 		nls.localize('activeFolderLong', "`\${activeFolderLong}`: the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)."),
 		nls.localize('folderName', "`\${folderName}`: name of the workspace folder the file is contained in (e.g. myFolder)."),
 		nls.localize('folderPath', "`\${folderPath}`: file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)."),
-		nls.localize('rootName', "`\${rootName}`: name of the workspace (e.g. myFolder or myWorkspace)."),
-		nls.localize('rootPath', "`\${rootPath}`: file path of the workspace (e.g. /Users/Development/myWorkspace)."),
+		nls.localize('rootName', "`\${rootName}`: name of the opened workspace or folder (e.g. myFolder or myWorkspace)."),
+		nls.localize('rootPath', "`\${rootPath}`: file path of the opened workspace or folder (e.g. /Users/Development/myWorkspace)."),
 		nls.localize('appName', "`\${appName}`: e.g. VS Code."),
 		nls.localize('remoteName', "`\${remoteName}`: e.g. SSH"),
 		nls.localize('dirty', "`\${dirty}`: a dirty indicator if the active editor is dirty."),
@@ -353,7 +373,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 			'window.menuBarVisibility': {
 				'type': 'string',
 				'enum': ['default', 'visible', 'toggle', 'hidden', 'compact'],
-				'enumDescriptions': [
+				'markdownEnumDescriptions': [
 					nls.localize('window.menuBarVisibility.default', "Menu is only hidden in full screen mode."),
 					nls.localize('window.menuBarVisibility.visible', "Menu is always visible even in full screen mode."),
 					nls.localize('window.menuBarVisibility.toggle', "Menu is hidden but can be displayed via Alt key."),
@@ -463,7 +483,7 @@ import { isStandalone } from 'vs/base/browser/browser';
 			},
 			'zenMode.restore': {
 				'type': 'boolean',
-				'default': false,
+				'default': true,
 				'description': nls.localize('zenMode.restore', "Controls whether a window should restore to zen mode if it was exited in zen mode.")
 			},
 			'zenMode.silentNotifications': {
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index 2172c0944..aedb2a6f6 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -8,7 +8,7 @@ import 'vs/workbench/browser/style';
 import { localize } from 'vs/nls';
 import { Emitter, setGlobalLeakWarningThreshold } from 'vs/base/common/event';
 import { runWhenIdle } from 'vs/base/common/async';
-import { getZoomLevel, isFirefox, isSafari, isChrome } from 'vs/base/browser/browser';
+import { getZoomLevel, isFirefox, isSafari, isChrome, getPixelRatio } from 'vs/base/browser/browser';
 import { mark } from 'vs/base/common/performance';
 import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -177,10 +177,17 @@ export class Workbench extends Layout {
 		// Layout Service
 		serviceCollection.set(IWorkbenchLayoutService, this);
 
-		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		// NOTE: DO NOT ADD ANY OTHER SERVICE INTO THE COLLECTION HERE.
-		// CONTRIBUTE IT VIA WORKBENCH.DESKTOP.MAIN.TS AND registerSingleton().
-		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+		//
+		// NOTE: Please do NOT register services here. Use `registerSingleton()`
+		//       from `workbench.common.main.ts` if the service is shared between
+		//       native and web or `workbench.sandbox.main.ts` if the service
+		//       is native only.
+		//
+		//       DO NOT add services to `workbench.desktop.main.ts`, always add
+		//       to `workbench.sandbox.main.ts` to support our Electron sandbox
+		//
+		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 		// All Contributed Services
 		const contributedServices = getSingletonServiceDescriptors();
@@ -284,7 +291,7 @@ export class Workbench extends Layout {
 			}
 		}
 
-		readFontInfo(BareFontInfo.createFromRawSettings(configurationService.getValue('editor'), getZoomLevel()));
+		readFontInfo(BareFontInfo.createFromRawSettings(configurationService.getValue('editor'), getZoomLevel(), getPixelRatio()));
 	}
 
 	private storeFontInfo(storageService: IStorageService): void {
@@ -412,10 +419,10 @@ export class Workbench extends Layout {
 			}, 2500);
 
 			// Telemetry: startup metrics
-			mark('didStartWorkbench');
+			mark('code/didStartWorkbench');
 
 			// Perf reporting (devtools)
-			performance.measure('perf: workbench create & restore', 'didLoadWorkbenchMain', 'didStartWorkbench');
+			performance.measure('perf: workbench create & restore', 'code/didLoadWorkbenchMain', 'code/didStartWorkbench');
 		}
 	}
 }
diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
index de82ce88e..dfe61debb 100644
--- a/src/vs/workbench/common/actions.ts
+++ b/src/vs/workbench/common/actions.ts
@@ -128,5 +128,6 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 export const CATEGORIES = {
 	View: { value: localize('view', "View"), original: 'View' },
 	Help: { value: localize('help', "Help"), original: 'Help' },
+	Preferences: { value: localize('preferences', "Preferences"), original: 'Preferences' },
 	Developer: { value: localize({ key: 'developer', comment: ['A developer on Code itself or someone diagnosing issues in Code'] }, "Developer"), original: 'Developer' }
 };
diff --git a/src/vs/workbench/common/composite.ts b/src/vs/workbench/common/composite.ts
index 8b48a7f4d..d27f59b36 100644
--- a/src/vs/workbench/common/composite.ts
+++ b/src/vs/workbench/common/composite.ts
@@ -18,6 +18,11 @@ export interface IComposite {
 	 */
 	readonly onDidBlur: Event<void>;
 
+	/**
+	 * Returns true if the composite has focus.
+	 */
+	hasFocus(): boolean;
+
 	/**
 	 * Returns the unique identifier of this composite.
 	 */
diff --git a/src/vs/workbench/common/dialogs.ts b/src/vs/workbench/common/dialogs.ts
index 5de8eac68..5e0561583 100644
--- a/src/vs/workbench/common/dialogs.ts
+++ b/src/vs/workbench/common/dialogs.ts
@@ -18,6 +18,7 @@ export interface IDialogHandle {
 }
 
 export interface IDialogsModel {
+
 	readonly onDidShowDialog: Event<void>;
 
 	readonly dialogs: IDialogViewItem[];
@@ -26,6 +27,7 @@ export interface IDialogsModel {
 }
 
 export class DialogsModel extends Disposable implements IDialogsModel {
+
 	readonly dialogs: IDialogViewItem[] = [];
 
 	private readonly _onDidShowDialog = this._register(new Emitter<void>());
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index f104149d8..883328209 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -74,7 +74,7 @@ export interface IEditorPane extends IComposite {
 	/**
 	 * The assigned options of the editor.
 	 */
-	readonly options: EditorOptions | undefined;
+	readonly options: IEditorOptions | undefined;
 
 	/**
 	 * The assigned group this editor is showing in.
@@ -1215,7 +1215,7 @@ export interface IEditorOpenContext {
 	 * An editor is new for a group if it was not part of the group before and
 	 * otherwise was already opened in the group and just became the active editor.
 	 *
-	 * This hint can e.g. be used to decide wether to restore view state or not.
+	 * This hint can e.g. be used to decide whether to restore view state or not.
 	 */
 	newInGroup?: boolean;
 }
@@ -1257,14 +1257,15 @@ export interface IEditorCloseEvent extends IEditorIdentifier {
 export type GroupIdentifier = number;
 
 export interface IWorkbenchEditorConfiguration {
-	workbench: {
-		editor: IEditorPartConfiguration,
-		iconTheme: string;
+	workbench?: {
+		editor?: IEditorPartConfiguration,
+		iconTheme?: string;
 	};
 }
 
 interface IEditorPartConfiguration {
 	showTabs?: boolean;
+	wrapTabs?: boolean;
 	scrollToSwitchTabs?: boolean;
 	highlightModifiedTabs?: boolean;
 	tabCloseButton?: 'left' | 'right' | 'off';
@@ -1275,6 +1276,7 @@ interface IEditorPartConfiguration {
 	showIcons?: boolean;
 	enablePreview?: boolean;
 	enablePreviewFromQuickOpen?: boolean;
+	enablePreviewFromCodeNavigation?: boolean;
 	closeOnFileDelete?: boolean;
 	openPositioning?: 'left' | 'right' | 'first' | 'last';
 	openSideBySideDirection?: 'right' | 'down';
@@ -1290,6 +1292,10 @@ interface IEditorPartConfiguration {
 		value?: number;
 		perEditorGroup?: boolean;
 	};
+	decorations?: {
+		badges?: boolean;
+		colors?: boolean;
+	}
 }
 
 export interface IEditorPartOptions extends IEditorPartConfiguration {
@@ -1328,7 +1334,9 @@ class EditorResourceAccessorImpl {
 	/**
 	 * The original URI of an editor is the URI that was used originally to open
 	 * the editor and should be used whenever the URI is presented to the user,
-	 * e.g. as a label.
+	 * e.g. as a label together with utility methods such as `ResourceLabel` or
+	 * `ILabelService` that can turn this original URI into the best form for
+	 * presenting.
 	 *
 	 * In contrast, the canonical URI (#getCanonicalUri) may be different and should
 	 * be used whenever the URI is used to e.g. compare with other editors or when
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index 38051db4d..1b0eed959 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -13,6 +13,7 @@ import { dirname } from 'vs/base/common/resources';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 /**
  * The base editor input for the diff editor. It is made up of two editor inputs, the original version
@@ -110,21 +111,18 @@ export class DiffEditorInput extends SideBySideEditorInput {
 	private async createModel(): Promise<DiffEditorModel> {
 
 		// Join resolve call over two inputs and build diff editor model
-		const models = await Promise.all([
+		const [originalEditorModel, modifiedEditorModel] = await Promise.all([
 			this.originalInput.resolve(),
 			this.modifiedInput.resolve()
 		]);
 
-		const originalEditorModel = models[0];
-		const modifiedEditorModel = models[1];
-
 		// If both are text models, return textdiffeditor model
 		if (modifiedEditorModel instanceof BaseTextEditorModel && originalEditorModel instanceof BaseTextEditorModel) {
 			return new TextDiffEditorModel(originalEditorModel, modifiedEditorModel);
 		}
 
 		// Otherwise return normal diff model
-		return new DiffEditorModel(originalEditorModel, modifiedEditorModel);
+		return new DiffEditorModel(withNullAsUndefined(originalEditorModel), withNullAsUndefined(modifiedEditorModel));
 	}
 
 	matches(otherInput: unknown): boolean {
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index dfa51d62d..5550bf997 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -12,13 +12,13 @@ import { IEditorModel } from 'vs/platform/editor/common/editor';
  */
 export class DiffEditorModel extends EditorModel {
 
-	protected readonly _originalModel: IEditorModel | null;
-	get originalModel(): IEditorModel | null { return this._originalModel; }
+	protected readonly _originalModel: IEditorModel | undefined;
+	get originalModel(): IEditorModel | undefined { return this._originalModel; }
 
-	protected readonly _modifiedModel: IEditorModel | null;
-	get modifiedModel(): IEditorModel | null { return this._modifiedModel; }
+	protected readonly _modifiedModel: IEditorModel | undefined;
+	get modifiedModel(): IEditorModel | undefined { return this._modifiedModel; }
 
-	constructor(originalModel: IEditorModel | null, modifiedModel: IEditorModel | null) {
+	constructor(originalModel: IEditorModel | undefined, modifiedModel: IEditorModel | undefined) {
 		super();
 
 		this._originalModel = originalModel;
@@ -28,7 +28,7 @@ export class DiffEditorModel extends EditorModel {
 	async load(): Promise<EditorModel> {
 		await Promise.all([
 			this._originalModel?.load(),
-			this._modifiedModel?.load(),
+			this._modifiedModel?.load()
 		]);
 
 		return this;
diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts
index 8d7410ac5..d1580899a 100644
--- a/src/vs/workbench/common/editor/editorGroup.ts
+++ b/src/vs/workbench/common/editor/editorGroup.ts
@@ -724,12 +724,19 @@ export class EditorGroup extends Disposable {
 
 	clone(): EditorGroup {
 		const group = this.instantiationService.createInstance(EditorGroup, undefined);
+
+		// Copy over group properties
 		group.editors = this.editors.slice(0);
 		group.mru = this.mru.slice(0);
 		group.preview = this.preview;
 		group.active = this.active;
 		group.sticky = this.sticky;
 
+		// Ensure to register listeners for each editor
+		for (const editor of group.editors) {
+			group.registerEditorListeners(editor);
+		}
+
 		return group;
 	}
 
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index a72d26526..0167182c2 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -97,7 +97,7 @@ export class ResourceEditorInput extends AbstractTextResourceEditorInput impleme
 			ref.dispose();
 			this.modelReference = undefined;
 
-			throw new Error(`Unexpected model for ResourcEditorInput: ${this.resource}`);
+			throw new Error(`Unexpected model for ResourceEditorInput: ${this.resource}`);
 		}
 
 		this.cachedModel = model;
diff --git a/src/vs/workbench/common/editor/resourceEditorModel.ts b/src/vs/workbench/common/editor/resourceEditorModel.ts
index e8e58c3f9..56f7aefe2 100644
--- a/src/vs/workbench/common/editor/resourceEditorModel.ts
+++ b/src/vs/workbench/common/editor/resourceEditorModel.ts
@@ -23,7 +23,7 @@ export class ResourceEditorModel extends BaseTextEditorModel {
 
 	dispose(): void {
 
-		// TODO@Joao: force this class to dispose the underlying model
+		// force this class to dispose the underlying model
 		if (this.textEditorModelHandle) {
 			this.modelService.destroyModel(this.textEditorModelHandle);
 		}
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index fcb97b428..98528b2e5 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -14,14 +14,14 @@ import { DiffEditorModel } from 'vs/workbench/common/editor/diffEditorModel';
  */
 export class TextDiffEditorModel extends DiffEditorModel {
 
-	protected readonly _originalModel: BaseTextEditorModel | null;
-	get originalModel(): BaseTextEditorModel | null { return this._originalModel; }
+	protected readonly _originalModel: BaseTextEditorModel | undefined;
+	get originalModel(): BaseTextEditorModel | undefined { return this._originalModel; }
 
-	protected readonly _modifiedModel: BaseTextEditorModel | null;
-	get modifiedModel(): BaseTextEditorModel | null { return this._modifiedModel; }
+	protected readonly _modifiedModel: BaseTextEditorModel | undefined;
+	get modifiedModel(): BaseTextEditorModel | undefined { return this._modifiedModel; }
 
-	private _textDiffEditorModel: IDiffEditorModel | null = null;
-	get textDiffEditorModel(): IDiffEditorModel | null { return this._textDiffEditorModel; }
+	private _textDiffEditorModel: IDiffEditorModel | undefined = undefined;
+	get textDiffEditorModel(): IDiffEditorModel | undefined { return this._textDiffEditorModel; }
 
 	constructor(originalModel: BaseTextEditorModel, modifiedModel: BaseTextEditorModel) {
 		super(originalModel, modifiedModel);
@@ -73,7 +73,7 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		// inside. We never created the two models (original and modified) so we can not dispose
 		// them without sideeffects. Rather rely on the models getting disposed when their related
 		// inputs get disposed from the diffEditorInput.
-		this._textDiffEditorModel = null;
+		this._textDiffEditorModel = undefined;
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index f730d008e..3225ea5a9 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -18,7 +18,7 @@ import { withUndefinedAsNull } from 'vs/base/common/types';
  */
 export class BaseTextEditorModel extends EditorModel implements ITextEditorModel, IModeSupport {
 
-	protected textEditorModelHandle: URI | null = null;
+	protected textEditorModelHandle: URI | undefined = undefined;
 
 	private createdEditorModel: boolean | undefined;
 
@@ -52,7 +52,7 @@ export class BaseTextEditorModel extends EditorModel implements ITextEditorModel
 
 	private registerModelDisposeListener(model: ITextModel): void {
 		this.modelDisposeListener.value = model.onWillDispose(() => {
-			this.textEditorModelHandle = null; // make sure we do not dispose code editor model again
+			this.textEditorModelHandle = undefined; // make sure we do not dispose code editor model again
 			this.dispose();
 		});
 	}
@@ -178,7 +178,7 @@ export class BaseTextEditorModel extends EditorModel implements ITextEditorModel
 			this.modelService.destroyModel(this.textEditorModelHandle);
 		}
 
-		this.textEditorModelHandle = null;
+		this.textEditorModelHandle = undefined;
 		this.createdEditorModel = false;
 
 		super.dispose();
diff --git a/src/vs/workbench/common/editor/textResourceEditorInput.ts b/src/vs/workbench/common/editor/textResourceEditorInput.ts
index e55b55679..b738dca4c 100644
--- a/src/vs/workbench/common/editor/textResourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/textResourceEditorInput.ts
@@ -199,14 +199,14 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput implem
 		}
 
 		// Normal save
-		return this.doSave(group, options, false);
+		return this.doSave(options, false);
 	}
 
 	saveAs(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IEditorInput | undefined> {
-		return this.doSave(group, options, true);
+		return this.doSave(options, true);
 	}
 
-	private async doSave(group: GroupIdentifier, options: ISaveOptions | undefined, saveAs: boolean): Promise<IEditorInput | undefined> {
+	private async doSave(options: ISaveOptions | undefined, saveAs: boolean): Promise<IEditorInput | undefined> {
 
 		// Save / Save As
 		let target: URI | undefined;
@@ -220,8 +220,13 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput implem
 			return undefined; // save cancelled
 		}
 
-		// If the target is a different resource, return with a new editor input
-		if (!isEqual(target, this.preferredResource)) {
+		// If this save operation results in a new editor, either
+		// because it was saved to disk (e.g. from untitled) or
+		// through an explicit "Save As", make sure to replace it.
+		if (
+			target.scheme !== this.resource.scheme ||
+			(saveAs && !isEqual(target, this.preferredResource))
+		) {
 			return this.editorService.createEditorInput({ resource: target });
 		}
 
diff --git a/src/vs/workbench/common/panel.ts b/src/vs/workbench/common/panel.ts
index 7b836be95..555e85dcf 100644
--- a/src/vs/workbench/common/panel.ts
+++ b/src/vs/workbench/common/panel.ts
@@ -9,5 +9,7 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 export const ActivePanelContext = new RawContextKey<string>('activePanel', '');
 export const PanelFocusContext = new RawContextKey<boolean>('panelFocus', false);
 export const PanelPositionContext = new RawContextKey<string>('panelPosition', 'bottom');
+export const PanelVisibleContext = new RawContextKey<boolean>('panelVisible', false);
+export const PanelMaximizedContext = new RawContextKey<boolean>('panelMaximized', false);
 
 export interface IPanel extends IComposite { }
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 53f29efbd..317cfd2fc 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -339,7 +339,7 @@ export const STATUS_BAR_FOREGROUND = registerColor('statusBar.foreground', {
 	dark: '#FFFFFF',
 	light: '#FFFFFF',
 	hc: '#FFFFFF'
-}, nls.localize('statusBarForeground', "Status bar foreground color when a workspace is opened. The status bar is shown in the bottom of the window."));
+}, nls.localize('statusBarForeground', "Status bar foreground color when a workspace or folder is opened. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_NO_FOLDER_FOREGROUND = registerColor('statusBar.noFolderForeground', {
 	dark: STATUS_BAR_FOREGROUND,
@@ -351,7 +351,7 @@ export const STATUS_BAR_BACKGROUND = registerColor('statusBar.background', {
 	dark: '#007ACC',
 	light: '#007ACC',
 	hc: null
-}, nls.localize('statusBarBackground', "Status bar background color when a workspace is opened. The status bar is shown in the bottom of the window."));
+}, nls.localize('statusBarBackground', "Status bar background color when a workspace or folder is opened. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_NO_FOLDER_BACKGROUND = registerColor('statusBar.noFolderBackground', {
 	dark: '#68217A',
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 0744cecf6..7bbafb802 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -27,9 +27,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { mixin } from 'vs/base/common/objects';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-
-export const TEST_VIEW_CONTAINER_ID = 'workbench.view.extension.test';
-export const testViewIcon = registerIcon('test-view-icon', Codicon.beaker, localize('testViewIcon', 'View icon of the test view.'));
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export const defaultViewIcon = registerIcon('default-view-icon', Codicon.window, localize('defaultViewIcon', 'Default view icon.'));
 
@@ -38,11 +36,18 @@ export namespace Extensions {
 	export const ViewsRegistry = 'workbench.registry.view';
 }
 
-export enum ViewContainerLocation {
+export const enum ViewContainerLocation {
 	Sidebar,
 	Panel
 }
 
+export function ViewContainerLocationToString(viewContainerLocation: ViewContainerLocation) {
+	switch (viewContainerLocation) {
+		case ViewContainerLocation.Sidebar: return 'sidebar';
+		case ViewContainerLocation.Panel: return 'panel';
+	}
+}
+
 export interface IViewContainerDescriptor {
 
 	readonly id: string;
@@ -256,6 +261,8 @@ export interface IAddedViewDescriptorState {
 
 export interface IViewContainerModel {
 
+	readonly viewContainer: ViewContainer;
+
 	readonly title: string;
 	readonly icon: ThemeIcon | URI | undefined;
 	readonly onDidChangeContainerInfo: Event<{ title?: boolean, icon?: boolean }>;
@@ -505,7 +512,7 @@ export interface IViewsService {
  * View Contexts
  */
 export const FocusedViewContext = new RawContextKey<string>('focusedView', '');
-export function getVisbileViewContextKey(viewId: string): string { return `${viewId}.visible`; }
+export function getVisbileViewContextKey(viewId: string): string { return `view.${viewId}.visible`; }
 
 export const IViewDescriptorService = createDecorator<IViewDescriptorService>('viewDescriptorService');
 
@@ -684,21 +691,24 @@ export class ResolvableTreeItem implements ITreeItem {
 	command?: Command;
 	children?: ITreeItem[];
 	accessibilityInformation?: IAccessibilityInformation;
-	resolve: () => Promise<void>;
+	resolve: (token: CancellationToken) => Promise<void>;
 	private resolved: boolean = false;
 	private _hasResolve: boolean = false;
-	constructor(treeItem: ITreeItem, resolve?: (() => Promise<ITreeItem | undefined>)) {
+	constructor(treeItem: ITreeItem, resolve?: ((token: CancellationToken) => Promise<ITreeItem | undefined>)) {
 		mixin(this, treeItem);
 		this._hasResolve = !!resolve;
-		this.resolve = async () => {
+		this.resolve = async (token: CancellationToken) => {
 			if (resolve && !this.resolved) {
-				const resolvedItem = await resolve();
+				const resolvedItem = await resolve(token);
 				if (resolvedItem) {
-					// Resolvable elements. Currently only tooltip.
-					this.tooltip = resolvedItem.tooltip;
+					// Resolvable elements. Currently tooltip and command.
+					this.tooltip = this.tooltip ?? resolvedItem.tooltip;
+					this.command = this.command ?? resolvedItem.command;
 				}
 			}
-			this.resolved = true;
+			if (!token.isCancellationRequested) {
+				this.resolved = true;
+			}
 		};
 	}
 	get hasResolve(): boolean {
@@ -756,5 +766,6 @@ export interface IViewPaneContainer {
 	getActionViewItem(action: IAction): IActionViewItem | undefined;
 	getActionsContext(): unknown;
 	getView(viewId: string): IView | undefined;
+	toggleViewVisibility(viewId: string): void;
 	saveState(): void;
 }
diff --git a/src/vs/workbench/contrib/backup/common/backupTracker.ts b/src/vs/workbench/contrib/backup/common/backupTracker.ts
index d8f35fc9d..f9767e534 100644
--- a/src/vs/workbench/contrib/backup/common/backupTracker.ts
+++ b/src/vs/workbench/contrib/backup/common/backupTracker.ts
@@ -18,7 +18,7 @@ export abstract class BackupTracker extends Disposable {
 	private readonly mapWorkingCopyToContentVersion = new Map<IWorkingCopy, number>();
 
 	// A map of scheduled pending backups for working copies
-	private readonly pendingBackups = new Map<IWorkingCopy, IDisposable>();
+	protected readonly pendingBackups = new Map<IWorkingCopy, IDisposable>();
 
 	constructor(
 		protected readonly backupFileService: IBackupFileService,
@@ -43,7 +43,7 @@ export abstract class BackupTracker extends Disposable {
 		this._register(this.workingCopyService.onDidChangeContent(workingCopy => this.onDidChangeContent(workingCopy)));
 
 		// Lifecycle (handled in subclasses)
-		this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdown(event.reason)));
+		this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdown(event.reason), 'veto.backups'));
 	}
 
 	private onDidRegister(workingCopy: IWorkingCopy): void {
diff --git a/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts b/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
index d2c4f92fb..c4a4e33a5 100644
--- a/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
+++ b/src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts
@@ -9,7 +9,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IFilesConfigurationService, AutoSaveMode } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IWorkingCopyService, IWorkingCopy, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { ILifecycleService, LifecyclePhase, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ConfirmResult, IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { ConfirmResult, IFileDialogService, IDialogService, getFileNamesMessage } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -20,7 +20,9 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { SaveReason } from 'vs/workbench/common/editor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { raceCancellation } from 'vs/base/common/async';
 
 export class NativeBackupTracker extends BackupTracker implements IWorkbenchContribution {
 
@@ -47,7 +49,8 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@ILogService logService: ILogService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@IProgressService private readonly progressService: IProgressService
 	) {
 		super(backupFileService, workingCopyService, logService, lifecycleService);
 	}
@@ -121,7 +124,7 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 
 		// we ran a backup but received an error that we show to the user
 		if (backupError) {
-			this.showErrorDialog(localize('backupTrackerBackupFailed', "One or more dirty editors could not be saved to the back up location."), backupError);
+			this.showErrorDialog(localize('backupTrackerBackupFailed', "The following dirty editors could not be saved to the back up location."), workingCopies, backupError);
 
 			return true; // veto (the backup failed)
 		}
@@ -131,14 +134,21 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 		try {
 			return await this.confirmBeforeShutdown(workingCopies.filter(workingCopy => !backups.includes(workingCopy)));
 		} catch (error) {
-			this.showErrorDialog(localize('backupTrackerConfirmFailed', "One or more dirty editors could not be saved or reverted."), error);
+			this.showErrorDialog(localize('backupTrackerConfirmFailed', "The following dirty editors could not be saved or reverted."), workingCopies, error);
 
 			return true; // veto (save or revert failed)
 		}
 	}
 
-	private showErrorDialog(msg: string, error?: Error): void {
-		this.dialogService.show(Severity.Error, msg, [localize('ok', 'OK')], { detail: localize('backupErrorDetails', "Try saving or reverting the dirty editors first and then try again.") });
+	private showErrorDialog(msg: string, workingCopies: readonly IWorkingCopy[], error?: Error): void {
+		const dirtyEditors = workingCopies.filter(workingCopy => workingCopy.isDirty());
+
+		const advice = localize('backupErrorDetails', "Try saving or reverting the dirty editors first and then try again.");
+		const detail = dirtyEditors.length
+			? getFileNamesMessage(dirtyEditors.map(x => x.name)) + '\n' + advice
+			: advice;
+
+		this.dialogService.show(Severity.Error, msg, [localize('ok', 'OK')], { detail });
 
 		this.logService.error(error ? `[backup tracker] ${msg}: ${error}` : `[backup tracker] ${msg}`);
 	}
@@ -234,9 +244,9 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 		return true; // veto (user canceled)
 	}
 
-	private async doSaveAllBeforeShutdown(workingCopies: IWorkingCopy[], reason: SaveReason): Promise<void>;
-	private async doSaveAllBeforeShutdown(includeUntitled: boolean, reason: SaveReason): Promise<void>;
-	private async doSaveAllBeforeShutdown(arg1: IWorkingCopy[] | boolean, reason: SaveReason): Promise<void> {
+	private doSaveAllBeforeShutdown(workingCopies: IWorkingCopy[], reason: SaveReason): Promise<void>;
+	private doSaveAllBeforeShutdown(includeUntitled: boolean, reason: SaveReason): Promise<void>;
+	private doSaveAllBeforeShutdown(arg1: IWorkingCopy[] | boolean, reason: SaveReason): Promise<void> {
 		const workingCopies = Array.isArray(arg1) ? arg1 : this.workingCopyService.dirtyWorkingCopies.filter(workingCopy => {
 			if (arg1 === false && (workingCopy.capabilities & WorkingCopyCapabilities.Untitled)) {
 				return false; // skip untitled unless explicitly included
@@ -245,21 +255,34 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
 			return true;
 		});
 
-		// Skip save participants on shutdown for performance reasons
-		const saveOptions = { skipSaveParticipants: true, reason };
+		const cts = new CancellationTokenSource();
+		return this.progressService.withProgress({
+			location: ProgressLocation.Notification,
+			cancellable: true, // for https://github.com/microsoft/vscode/issues/112278
+			delay: 800, // delay notification so that it only appears when saving takes a long time
+			title: localize('saveBeforeShutdown', "Waiting for dirty editors to save...")
+		}, () => {
+			const saveAllPromise = (async () => {
 
-		// First save through the editor service if we save all to benefit
-		// from some extras like switching to untitled dirty editors before saving.
-		let result: boolean | undefined = undefined;
-		if (typeof arg1 === 'boolean' || workingCopies.length === this.workingCopyService.dirtyCount) {
-			result = await this.editorService.saveAll({ includeUntitled: typeof arg1 === 'boolean' ? arg1 : true, ...saveOptions });
-		}
+				// Skip save participants on shutdown for performance reasons
+				const saveOptions = { skipSaveParticipants: true, reason };
 
-		// If we still have dirty working copies, save those directly
-		// unless the save was not successful (e.g. cancelled)
-		if (result !== false) {
-			await Promise.all(workingCopies.map(workingCopy => workingCopy.isDirty() ? workingCopy.save(saveOptions) : true));
-		}
+				// First save through the editor service if we save all to benefit
+				// from some extras like switching to untitled dirty editors before saving.
+				let result: boolean | undefined = undefined;
+				if (typeof arg1 === 'boolean' || workingCopies.length === this.workingCopyService.dirtyCount) {
+					result = await this.editorService.saveAll({ includeUntitled: typeof arg1 === 'boolean' ? arg1 : true, ...saveOptions });
+				}
+
+				// If we still have dirty working copies, save those directly
+				// unless the save was not successful (e.g. cancelled)
+				if (result !== false) {
+					await Promise.all(workingCopies.map(workingCopy => workingCopy.isDirty() ? workingCopy.save(saveOptions) : true));
+				}
+			})();
+
+			return raceCancellation(saveAllPromise, cts.token);
+		}, () => cts.dispose(true));
 	}
 
 	private async doRevertAllBeforeShutdown(workingCopies: IWorkingCopy[]): Promise<void> {
diff --git a/src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts b/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
similarity index 56%
rename from src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts
rename to src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
index dfe8325aa..1835bff59 100644
--- a/src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts
+++ b/src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts
@@ -4,46 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as platform from 'vs/base/common/platform';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as pfs from 'vs/base/node/pfs';
+import { isWindows } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { hashPath } from 'vs/workbench/services/backup/electron-browser/backupFileService';
-import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
-import { workbenchInstantiationService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
-import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorInput } from 'vs/workbench/common/editor';
-import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
-import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { NodeTestBackupFileService } from 'vs/workbench/services/backup/test/electron-browser/backupFileService.test';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
-import { TestServiceAccessor } from 'vs/workbench/test/browser/workbenchTestServices';
+import { InMemoryTestBackupFileService, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { BackupRestorer } from 'vs/workbench/contrib/backup/common/backupRestorer';
-
-const userdataDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backuprestorer');
-const backupHome = path.join(userdataDir, 'Backups');
-const workspacesJsonPath = path.join(backupHome, 'workspaces.json');
-
-const workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/workspace');
-const workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
-const fooFile = URI.file(platform.isWindows ? 'c:\\Foo' : '/Foo');
-const barFile = URI.file(platform.isWindows ? 'c:\\Bar' : '/Bar');
-const untitledFile1 = URI.from({ scheme: Schemas.untitled, path: 'Untitled-1' });
-const untitledFile2 = URI.from({ scheme: Schemas.untitled, path: 'Untitled-2' });
+import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
 
 class TestBackupRestorer extends BackupRestorer {
 	async doRestoreBackups(): Promise<URI[] | undefined> {
@@ -54,38 +28,13 @@ class TestBackupRestorer extends BackupRestorer {
 suite('BackupRestorer', () => {
 	let accessor: TestServiceAccessor;
 
-	let disposables: IDisposable[] = [];
-
-	setup(async () => {
-		disposables.push(Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
-			EditorDescriptor.create(
-				TextFileEditor,
-				TextFileEditor.ID,
-				'Text File Editor'
-			),
-			[new SyncDescriptor<EditorInput>(FileEditorInput)]
-		));
-
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
-		await pfs.mkdirp(backupHome);
-
-		return pfs.writeFile(workspacesJsonPath, '');
-	});
-
-	teardown(async () => {
-		dispose(disposables);
-		disposables = [];
-
-		(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
-
-		return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
-	});
+	const fooFile = URI.file(isWindows ? 'c:\\Foo' : '/Foo');
+	const barFile = URI.file(isWindows ? 'c:\\Bar' : '/Bar');
+	const untitledFile1 = URI.from({ scheme: Schemas.untitled, path: 'Untitled-1' });
+	const untitledFile2 = URI.from({ scheme: Schemas.untitled, path: 'Untitled-2' });
 
 	test('Restore backups', async function () {
-		this.timeout(20000);
-
-		const backupFileService = new NodeTestBackupFileService(workspaceBackupPath);
+		const backupFileService = new InMemoryTestBackupFileService();
 		const instantiationService = workbenchInstantiationService();
 		instantiationService.stub(IBackupFileService, backupFileService);
 
@@ -102,18 +51,18 @@ suite('BackupRestorer', () => {
 
 		await part.whenRestored;
 
-		const tracker = instantiationService.createInstance(NativeBackupTracker);
+		const tracker = instantiationService.createInstance(BrowserBackupTracker);
 		const restorer = instantiationService.createInstance(TestBackupRestorer);
 
 		// Backup 2 normal files and 2 untitled file
-		await backupFileService.backup(untitledFile1, createTextBufferFactory('untitled-1').create(DefaultEndOfLine.LF).createSnapshot(false));
-		await backupFileService.backup(untitledFile2, createTextBufferFactory('untitled-2').create(DefaultEndOfLine.LF).createSnapshot(false));
-		await backupFileService.backup(fooFile, createTextBufferFactory('fooFile').create(DefaultEndOfLine.LF).createSnapshot(false));
-		await backupFileService.backup(barFile, createTextBufferFactory('barFile').create(DefaultEndOfLine.LF).createSnapshot(false));
+		await backupFileService.backup(untitledFile1, createTextBufferFactory('untitled-1').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+		await backupFileService.backup(untitledFile2, createTextBufferFactory('untitled-2').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+		await backupFileService.backup(fooFile, createTextBufferFactory('fooFile').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+		await backupFileService.backup(barFile, createTextBufferFactory('barFile').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 
 		// Verify backups restored and opened as dirty
 		await restorer.doRestoreBackups();
-		assert.equal(editorService.count, 4);
+		assert.strictEqual(editorService.count, 4);
 		assert.ok(editorService.editors.every(editor => editor.isDirty()));
 
 		let counter = 0;
@@ -152,7 +101,7 @@ suite('BackupRestorer', () => {
 			}
 		}
 
-		assert.equal(counter, 4);
+		assert.strictEqual(counter, 4);
 
 		part.dispose();
 		tracker.dispose();
diff --git a/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts b/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
new file mode 100644
index 000000000..a75a319c7
--- /dev/null
+++ b/src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { URI } from 'vs/base/common/uri';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
+import { IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
+import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
+import { toResource } from 'vs/base/test/common/utils';
+import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { IWorkingCopyBackup, IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { ILogService } from 'vs/platform/log/common/log';
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { InMemoryTestBackupFileService, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { timeout } from 'vs/base/common/async';
+import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
+
+class TestBackupTracker extends BrowserBackupTracker {
+
+	constructor(
+		@IBackupFileService backupFileService: IBackupFileService,
+		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
+		@IWorkingCopyService workingCopyService: IWorkingCopyService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@ILogService logService: ILogService,
+	) {
+		super(backupFileService, filesConfigurationService, workingCopyService, lifecycleService, logService);
+	}
+
+	protected getBackupScheduleDelay(): number {
+		return 10; // Reduce timeout for tests
+	}
+}
+
+suite('BackupTracker (browser)', function () {
+	let accessor: TestServiceAccessor;
+
+	async function createTracker(): Promise<{ accessor: TestServiceAccessor, part: EditorPart, tracker: BackupTracker, backupFileService: InMemoryTestBackupFileService, instantiationService: IInstantiationService, cleanup: () => void }> {
+		const backupFileService = new InMemoryTestBackupFileService();
+		const instantiationService = workbenchInstantiationService();
+		instantiationService.stub(IBackupFileService, backupFileService);
+
+		const part = instantiationService.createInstance(EditorPart);
+		part.create(document.createElement('div'));
+		part.layout(400, 300);
+
+		instantiationService.stub(IEditorGroupsService, part);
+
+		const editorService: EditorService = instantiationService.createInstance(EditorService);
+		instantiationService.stub(IEditorService, editorService);
+
+		accessor = instantiationService.createInstance(TestServiceAccessor);
+
+		await part.whenRestored;
+
+		const tracker = instantiationService.createInstance(TestBackupTracker);
+
+		const cleanup = () => {
+			part.dispose();
+			tracker.dispose();
+		};
+
+		return { accessor, part, tracker, backupFileService, instantiationService, cleanup };
+	}
+
+	async function untitledBackupTest(untitled: IUntitledTextResourceEditorInput = {}): Promise<void> {
+		const { accessor, cleanup, backupFileService } = await createTracker();
+
+		const untitledEditor = (await accessor.editorService.openEditor(untitled))?.input as UntitledTextEditorInput;
+
+		const untitledModel = await untitledEditor.resolve();
+
+		if (!untitled?.contents) {
+			untitledModel.textEditorModel.setValue('Super Good');
+		}
+
+		await backupFileService.joinBackupResource();
+
+		assert.strictEqual(backupFileService.hasBackupSync(untitledEditor.resource), true);
+
+		untitledModel.dispose();
+
+		await backupFileService.joinDiscardBackup();
+
+		assert.strictEqual(backupFileService.hasBackupSync(untitledEditor.resource), false);
+
+		cleanup();
+	}
+
+	test('Track backups (untitled)', function () {
+		return untitledBackupTest();
+	});
+
+	test('Track backups (untitled with initial contents)', function () {
+		return untitledBackupTest({ contents: 'Foo Bar' });
+	});
+
+	test('Track backups (custom)', async function () {
+		const { accessor, cleanup, backupFileService } = await createTracker();
+
+		class TestBackupWorkingCopy extends TestWorkingCopy {
+
+			backupDelay = 0;
+
+			constructor(resource: URI) {
+				super(resource);
+
+				accessor.workingCopyService.registerWorkingCopy(this);
+			}
+
+			async backup(token: CancellationToken): Promise<IWorkingCopyBackup> {
+				await timeout(this.backupDelay);
+
+				return {};
+			}
+		}
+
+		const resource = toResource.call(this, '/path/custom.txt');
+		const customWorkingCopy = new TestBackupWorkingCopy(resource);
+
+		// Normal
+		customWorkingCopy.setDirty(true);
+		await backupFileService.joinBackupResource();
+		assert.strictEqual(backupFileService.hasBackupSync(resource), true);
+
+		customWorkingCopy.setDirty(false);
+		customWorkingCopy.setDirty(true);
+		await backupFileService.joinBackupResource();
+		assert.strictEqual(backupFileService.hasBackupSync(resource), true);
+
+		customWorkingCopy.setDirty(false);
+		await backupFileService.joinDiscardBackup();
+		assert.strictEqual(backupFileService.hasBackupSync(resource), false);
+
+		// Cancellation
+		customWorkingCopy.setDirty(true);
+		await timeout(0);
+		customWorkingCopy.setDirty(false);
+		await backupFileService.joinDiscardBackup();
+		assert.strictEqual(backupFileService.hasBackupSync(resource), false);
+
+		customWorkingCopy.dispose();
+		await cleanup();
+	});
+});
diff --git a/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts b/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
index efb89fafb..010507834 100644
--- a/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
+++ b/src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts
@@ -9,7 +9,7 @@ import * as os from 'os';
 import * as path from 'vs/base/common/path';
 import * as pfs from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { hashPath } from 'vs/workbench/services/backup/electron-browser/backupFileService';
 import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
@@ -18,7 +18,7 @@ import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { EditorInput, IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
+import { EditorInput } from 'vs/workbench/common/editor';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -28,7 +28,7 @@ import { NodeTestBackupFileService } from 'vs/workbench/services/backup/test/ele
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { toResource } from 'vs/base/test/common/utils';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IWorkingCopyBackup, IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { HotExitConfiguration } from 'vs/platform/files/common/files';
 import { ShutdownReason, ILifecycleService, BeforeShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -38,24 +38,14 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
 import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/electron-browser/workbenchTestServices';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestFilesConfigurationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { timeout } from 'vs/base/common/async';
 import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-
-const userdataDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backuprestorer');
-const backupHome = path.join(userdataDir, 'Backups');
-const workspacesJsonPath = path.join(backupHome, 'workspaces.json');
-
-const workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/workspace');
-const workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
+import { IProgressService } from 'vs/platform/progress/common/progress';
 
 class TestBackupTracker extends NativeBackupTracker {
 
@@ -70,14 +60,22 @@ class TestBackupTracker extends NativeBackupTracker {
 		@INativeHostService nativeHostService: INativeHostService,
 		@ILogService logService: ILogService,
 		@IEditorService editorService: IEditorService,
-		@IEnvironmentService environmentService: IEnvironmentService
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IProgressService progressService: IProgressService
 	) {
-		super(backupFileService, filesConfigurationService, workingCopyService, lifecycleService, fileDialogService, dialogService, contextService, nativeHostService, logService, editorService, environmentService);
+		super(backupFileService, filesConfigurationService, workingCopyService, lifecycleService, fileDialogService, dialogService, contextService, nativeHostService, logService, editorService, environmentService, progressService);
 	}
 
 	protected getBackupScheduleDelay(): number {
 		return 10; // Reduce timeout for tests
 	}
+
+	dispose() {
+		super.dispose();
+		for (const [_, disposable] of this.pendingBackups) {
+			disposable.dispose();
+		}
+	}
 }
 
 class BeforeShutdownEventImpl implements BeforeShutdownEvent {
@@ -90,11 +88,22 @@ class BeforeShutdownEventImpl implements BeforeShutdownEvent {
 	}
 }
 
-suite('BackupTracker', () => {
+flakySuite('BackupTracker (native)', function () {
+	let testDir: string;
+	let backupHome: string;
+	let workspaceBackupPath: string;
+
 	let accessor: TestServiceAccessor;
 	let disposables: IDisposable[] = [];
 
 	setup(async () => {
+		testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backuprestorer');
+		backupHome = path.join(testDir, 'Backups');
+		const workspacesJsonPath = path.join(backupHome, 'workspaces.json');
+
+		const workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/workspace');
+		workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
+
 		const instantiationService = workbenchInstantiationService();
 		accessor = instantiationService.createInstance(TestServiceAccessor);
 
@@ -107,8 +116,6 @@ suite('BackupTracker', () => {
 			[new SyncDescriptor<EditorInput>(FileEditorInput)]
 		));
 
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
 		await pfs.mkdirp(backupHome);
 		await pfs.mkdirp(workspaceBackupPath);
 
@@ -121,11 +128,11 @@ suite('BackupTracker', () => {
 
 		(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
 
-		return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
+		return pfs.rimraf(testDir);
 	});
 
-	async function createTracker(autoSaveEnabled = false): Promise<[TestServiceAccessor, EditorPart, BackupTracker, IInstantiationService]> {
-		const backupFileService = new NodeTestBackupFileService(workspaceBackupPath);
+	async function createTracker(autoSaveEnabled = false): Promise<{ accessor: TestServiceAccessor, part: EditorPart, tracker: BackupTracker, instantiationService: IInstantiationService, cleanup: () => Promise<void> }> {
+		const backupFileService = new NodeTestBackupFileService(testDir, workspaceBackupPath);
 		const instantiationService = workbenchInstantiationService();
 		instantiationService.stub(IBackupFileService, backupFileService);
 
@@ -155,50 +162,19 @@ suite('BackupTracker', () => {
 
 		const tracker = instantiationService.createInstance(TestBackupTracker);
 
-		return [accessor, part, tracker, instantiationService];
+		const cleanup = async () => {
+			// File changes could also schedule some backup operations so we need to wait for them before finishing the test
+			await accessor.backupFileService.waitForAllBackups();
+
+			part.dispose();
+			tracker.dispose();
+		};
+
+		return { accessor, part, tracker, instantiationService, cleanup };
 	}
 
-	async function untitledBackupTest(untitled: IUntitledTextResourceEditorInput = {}): Promise<void> {
-		const [accessor, part, tracker] = await createTracker();
-
-		const untitledEditor = (await accessor.editorService.openEditor(untitled))?.input as UntitledTextEditorInput;
-
-		const untitledModel = await untitledEditor.resolve();
-
-		if (!untitled?.contents) {
-			untitledModel.textEditorModel.setValue('Super Good');
-		}
-
-		await accessor.backupFileService.joinBackupResource();
-
-		assert.equal(accessor.backupFileService.hasBackupSync(untitledEditor.resource), true);
-
-		untitledModel.dispose();
-
-		await accessor.backupFileService.joinDiscardBackup();
-
-		assert.equal(accessor.backupFileService.hasBackupSync(untitledEditor.resource), false);
-
-		part.dispose();
-		tracker.dispose();
-	}
-
-	test('Track backups (untitled)', function () {
-		this.timeout(20000);
-
-		return untitledBackupTest();
-	});
-
-	test('Track backups (untitled with initial contents)', function () {
-		this.timeout(20000);
-
-		return untitledBackupTest({ contents: 'Foo Bar' });
-	});
-
 	test('Track backups (file)', async function () {
-		this.timeout(20000);
-
-		const [accessor, part, tracker] = await createTracker();
+		const { accessor, cleanup } = await createTracker();
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -208,69 +184,19 @@ suite('BackupTracker', () => {
 
 		await accessor.backupFileService.joinBackupResource();
 
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), true);
+		assert.strictEqual(accessor.backupFileService.hasBackupSync(resource), true);
 
 		fileModel?.dispose();
 
 		await accessor.backupFileService.joinDiscardBackup();
 
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), false);
+		assert.strictEqual(accessor.backupFileService.hasBackupSync(resource), false);
 
-		part.dispose();
-		tracker.dispose();
-	});
-
-	test('Track backups (custom)', async function () {
-		const [accessor, part, tracker] = await createTracker();
-
-		class TestBackupWorkingCopy extends TestWorkingCopy {
-
-			backupDelay = 0;
-
-			constructor(resource: URI) {
-				super(resource);
-
-				accessor.workingCopyService.registerWorkingCopy(this);
-			}
-
-			async backup(token: CancellationToken): Promise<IWorkingCopyBackup> {
-				await timeout(this.backupDelay);
-
-				return {};
-			}
-		}
-
-		const resource = toResource.call(this, '/path/custom.txt');
-		const customWorkingCopy = new TestBackupWorkingCopy(resource);
-
-		// Normal
-		customWorkingCopy.setDirty(true);
-		await accessor.backupFileService.joinBackupResource();
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), true);
-
-		customWorkingCopy.setDirty(false);
-		customWorkingCopy.setDirty(true);
-		await accessor.backupFileService.joinBackupResource();
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), true);
-
-		customWorkingCopy.setDirty(false);
-		await accessor.backupFileService.joinDiscardBackup();
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), false);
-
-		// Cancellation
-		customWorkingCopy.setDirty(true);
-		await timeout(0);
-		customWorkingCopy.setDirty(false);
-		await accessor.backupFileService.joinDiscardBackup();
-		assert.equal(accessor.backupFileService.hasBackupSync(resource), false);
-
-		customWorkingCopy.dispose();
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	test('onWillShutdown - no veto if no dirty files', async function () {
-		const [accessor, part, tracker] = await createTracker();
+		const { accessor, cleanup } = await createTracker();
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -281,12 +207,11 @@ suite('BackupTracker', () => {
 		const veto = await event.value;
 		assert.ok(!veto);
 
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	test('onWillShutdown - veto if user cancels (hot.exit: off)', async function () {
-		const [accessor, part, tracker] = await createTracker();
+		const { accessor, cleanup } = await createTracker();
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -298,7 +223,7 @@ suite('BackupTracker', () => {
 
 		await model?.load();
 		model?.textEditorModel?.setValue('foo');
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
 
 		const event = new BeforeShutdownEventImpl();
 		accessor.lifecycleService.fireWillShutdown(event);
@@ -306,12 +231,11 @@ suite('BackupTracker', () => {
 		const veto = await event.value;
 		assert.ok(veto);
 
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	test('onWillShutdown - no veto if auto save is on', async function () {
-		const [accessor, part, tracker] = await createTracker(true /* auto save enabled */);
+		const { accessor, cleanup } = await createTracker(true /* auto save enabled */);
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -320,7 +244,7 @@ suite('BackupTracker', () => {
 
 		await model?.load();
 		model?.textEditorModel?.setValue('foo');
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
 
 		const event = new BeforeShutdownEventImpl();
 		accessor.lifecycleService.fireWillShutdown(event);
@@ -328,14 +252,13 @@ suite('BackupTracker', () => {
 		const veto = await event.value;
 		assert.ok(!veto);
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 0);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 0);
 
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	test('onWillShutdown - no veto and backups cleaned up if user does not want to save (hot.exit: off)', async function () {
-		const [accessor, part, tracker] = await createTracker();
+		const { accessor, cleanup } = await createTracker();
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -347,7 +270,7 @@ suite('BackupTracker', () => {
 
 		await model?.load();
 		model?.textEditorModel?.setValue('foo');
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
 		const event = new BeforeShutdownEventImpl();
 		accessor.lifecycleService.fireWillShutdown(event);
 
@@ -355,12 +278,11 @@ suite('BackupTracker', () => {
 		assert.ok(!veto);
 		assert.ok(accessor.backupFileService.discardedBackups.length > 0);
 
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	test('onWillShutdown - save (hot.exit: off)', async function () {
-		const [accessor, part, tracker] = await createTracker();
+		const { accessor, cleanup } = await createTracker();
 
 		const resource = toResource.call(this, '/path/index.txt');
 		await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -372,7 +294,7 @@ suite('BackupTracker', () => {
 
 		await model?.load();
 		model?.textEditorModel?.setValue('foo');
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
 		const event = new BeforeShutdownEventImpl();
 		accessor.lifecycleService.fireWillShutdown(event);
 
@@ -380,8 +302,7 @@ suite('BackupTracker', () => {
 		assert.ok(!veto);
 		assert.ok(!model?.isDirty());
 
-		part.dispose();
-		tracker.dispose();
+		await cleanup();
 	});
 
 	suite('Hot Exit', () => {
@@ -488,7 +409,7 @@ suite('BackupTracker', () => {
 		});
 
 		async function hotExitTest(this: any, setting: string, shutdownReason: ShutdownReason, multipleWindows: boolean, workspace: boolean, shouldVeto: boolean): Promise<void> {
-			const [accessor, part, tracker] = await createTracker();
+			const { accessor, cleanup } = await createTracker();
 
 			const resource = toResource.call(this, '/path/index.txt');
 			await accessor.editorService.openEditor({ resource, options: { pinned: true } });
@@ -513,18 +434,17 @@ suite('BackupTracker', () => {
 
 			await model?.load();
 			model?.textEditorModel?.setValue('foo');
-			assert.equal(accessor.workingCopyService.dirtyCount, 1);
+			assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
 
 			const event = new BeforeShutdownEventImpl();
 			event.reason = shutdownReason;
 			accessor.lifecycleService.fireWillShutdown(event);
 
 			const veto = await event.value;
-			assert.equal(accessor.backupFileService.discardedBackups.length, 0); // When hot exit is set, backups should never be cleaned since the confirm result is cancel
-			assert.equal(veto, shouldVeto);
+			assert.strictEqual(accessor.backupFileService.discardedBackups.length, 0); // When hot exit is set, backups should never be cleaned since the confirm result is cancel
+			assert.strictEqual(veto, shouldVeto);
 
-			part.dispose();
-			tracker.dispose();
+			await cleanup();
 		}
 	});
 });
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
index ffc54667e..889c25a91 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts
@@ -19,6 +19,8 @@ import { BulkCellEdits, ResourceNotebookCellEdit } from 'vs/workbench/contrib/bu
 import { UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 
 class BulkEdit {
 
@@ -30,6 +32,7 @@ class BulkEdit {
 		private readonly _edits: ResourceEdit[],
 		private readonly _undoRedoGroup: UndoRedoGroup,
 		private readonly _undoRedoSource: UndoRedoSource | undefined,
+		private readonly _confirmBeforeUndo: boolean,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@ILogService private readonly _logService: ILogService,
 	) {
@@ -76,7 +79,7 @@ class BulkEdit {
 			}
 			const group = this._edits.slice(index, index + range);
 			if (group[0] instanceof ResourceFileEdit) {
-				await this._performFileEdits(<ResourceFileEdit[]>group, this._undoRedoGroup, this._undoRedoSource, progress);
+				await this._performFileEdits(<ResourceFileEdit[]>group, this._undoRedoGroup, this._undoRedoSource, this._confirmBeforeUndo, progress);
 			} else if (group[0] instanceof ResourceTextEdit) {
 				await this._performTextEdits(<ResourceTextEdit[]>group, this._undoRedoGroup, this._undoRedoSource, progress);
 			} else if (group[0] instanceof ResourceNotebookCellEdit) {
@@ -88,9 +91,9 @@ class BulkEdit {
 		}
 	}
 
-	private async _performFileEdits(edits: ResourceFileEdit[], undoRedoGroup: UndoRedoGroup, undoRedoSource: UndoRedoSource | undefined, progress: IProgress<void>) {
+	private async _performFileEdits(edits: ResourceFileEdit[], undoRedoGroup: UndoRedoGroup, undoRedoSource: UndoRedoSource | undefined, confirmBeforeUndo: boolean, progress: IProgress<void>) {
 		this._logService.debug('_performFileEdits', JSON.stringify(edits));
-		const model = this._instaService.createInstance(BulkFileEdits, this._label || localize('workspaceEdit', "Workspace Edit"), undoRedoGroup, undoRedoSource, progress, this._token, edits);
+		const model = this._instaService.createInstance(BulkFileEdits, this._label || localize('workspaceEdit', "Workspace Edit"), undoRedoGroup, undoRedoSource, confirmBeforeUndo, progress, this._token, edits);
 		await model.apply();
 	}
 
@@ -118,6 +121,8 @@ export class BulkEditService implements IBulkEditService {
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@ILogService private readonly _logService: ILogService,
 		@IEditorService private readonly _editorService: IEditorService,
+		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
+		@IDialogService private readonly _dialogService: IDialogService
 	) { }
 
 	setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable {
@@ -139,7 +144,7 @@ export class BulkEditService implements IBulkEditService {
 			return { ariaSummary: localize('nothing', "Made no edits") };
 		}
 
-		if (this._previewHandler && !options?.suppressPreview && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
+		if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
 			edits = await this._previewHandler(edits, options);
 		}
 
@@ -175,18 +180,22 @@ export class BulkEditService implements IBulkEditService {
 			undoRedoGroupRemove = this._activeUndoRedoGroups.push(undoRedoGroup);
 		}
 
+		const label = options?.quotableLabel || options?.label;
 		const bulkEdit = this._instaService.createInstance(
 			BulkEdit,
-			options?.quotableLabel || options?.label,
+			label,
 			codeEditor,
 			options?.progress ?? Progress.None,
 			options?.token ?? CancellationToken.None,
 			edits,
 			undoRedoGroup,
-			options?.undoRedoSource
+			options?.undoRedoSource,
+			!!options?.confirmBeforeUndo
 		);
 
+		let listener: IDisposable | undefined;
 		try {
+			listener = this._lifecycleService.onBeforeShutdown(e => e.veto(this.shouldVeto(label), 'veto.blukEditService'));
 			await bulkEdit.perform();
 			return { ariaSummary: bulkEdit.ariaMessage() };
 		} catch (err) {
@@ -195,9 +204,20 @@ export class BulkEditService implements IBulkEditService {
 			this._logService.error(err);
 			throw err;
 		} finally {
+			listener?.dispose();
 			undoRedoGroupRemove();
 		}
 	}
+
+	private async shouldVeto(label: string | undefined): Promise<boolean> {
+		label = label || localize('fileOperation', "File operation");
+		const result = await this._dialogService.confirm({
+			message: localize('areYouSureQuiteBulkEdit', "Are you sure you want to quit? '{0}' is in progress.", label),
+			primaryButton: localize('quit', "Quit")
+		});
+
+		return !result.confirmed;
+	}
 }
 
 registerSingleton(IBulkEditService, BulkEditService, true);
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
index f4ac30ca0..e15f322a5 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
@@ -8,20 +8,16 @@ import { WorkspaceFileEditOptions } from 'vs/editor/common/modes';
 import { IFileService, FileSystemProviderCapabilities, IFileContent } from 'vs/platform/files/common/files';
 import { IProgress } from 'vs/platform/progress/common/progress';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, IMoveOperation, ICopyOperation, IDeleteOperation, ICreateOperation, ICreateFileOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { IWorkspaceUndoRedoElement, UndoRedoElementType, IUndoRedoService, UndoRedoGroup, UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
 import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import * as resources from 'vs/base/common/resources';
 import { CancellationToken } from 'vs/base/common/cancellation';
-
-interface IFileOperationUndoRedoInfo {
-	undoRedoGroupId?: number;
-	isUndoing?: boolean;
-}
+import { flatten, tail } from 'vs/base/common/arrays';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 interface IFileOperation {
 	uris: URI[];
@@ -36,115 +32,189 @@ class Noop implements IFileOperation {
 	}
 }
 
-class RenameOperation implements IFileOperation {
-
+class RenameEdit {
+	readonly type = 'rename';
 	constructor(
 		readonly newUri: URI,
 		readonly oldUri: URI,
-		readonly options: WorkspaceFileEditOptions,
-		readonly undoRedoInfo: IFileOperationUndoRedoInfo,
+		readonly options: WorkspaceFileEditOptions
+	) { }
+}
+
+class RenameOperation implements IFileOperation {
+
+	constructor(
+		private readonly _edits: RenameEdit[],
+		private readonly _undoRedoInfo: IFileOperationUndoRedoInfo,
 		@IWorkingCopyFileService private readonly _workingCopyFileService: IWorkingCopyFileService,
 		@IFileService private readonly _fileService: IFileService,
 	) { }
 
 	get uris() {
-		return [this.newUri, this.oldUri];
+		return flatten(this._edits.map(edit => [edit.newUri, edit.oldUri]));
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
-		// rename
-		if (this.options.overwrite === undefined && this.options.ignoreIfExists && await this._fileService.exists(this.newUri)) {
-			return new Noop(); // not overwriting, but ignoring, and the target file exists
+
+		const moves: IMoveOperation[] = [];
+		const undoes: RenameEdit[] = [];
+		for (const edit of this._edits) {
+			// check: not overwriting, but ignoring, and the target file exists
+			const skip = edit.options.overwrite === undefined && edit.options.ignoreIfExists && await this._fileService.exists(edit.newUri);
+			if (!skip) {
+				moves.push({
+					file: { source: edit.oldUri, target: edit.newUri },
+					overwrite: edit.options.overwrite
+				});
+
+				// reverse edit
+				undoes.push(new RenameEdit(edit.oldUri, edit.newUri, edit.options));
+			}
 		}
 
-		await this._workingCopyFileService.move([{ source: this.oldUri, target: this.newUri }], { overwrite: this.options.overwrite, ...this.undoRedoInfo }, token);
-		return new RenameOperation(this.oldUri, this.newUri, this.options, { isUndoing: true }, this._workingCopyFileService, this._fileService);
+		if (moves.length === 0) {
+			return new Noop();
+		}
+
+		await this._workingCopyFileService.move(moves, this._undoRedoInfo, token);
+		return new RenameOperation(undoes, { isUndoing: true }, this._workingCopyFileService, this._fileService);
 	}
 
 	toString(): string {
-		const oldBasename = resources.basename(this.oldUri);
-		const newBasename = resources.basename(this.newUri);
-		if (oldBasename !== newBasename) {
-			return `(rename ${oldBasename} to ${newBasename})`;
-		}
-		return `(rename ${this.oldUri} to ${this.newUri})`;
+		return `(rename ${this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`).join(', ')})`;
 	}
 }
 
+class CopyEdit {
+	readonly type = 'copy';
+	constructor(
+		readonly newUri: URI,
+		readonly oldUri: URI,
+		readonly options: WorkspaceFileEditOptions
+	) { }
+}
+
 class CopyOperation implements IFileOperation {
 
 	constructor(
-		readonly newUri: URI,
-		readonly oldUri: URI,
-		readonly options: WorkspaceFileEditOptions,
-		readonly undoRedoInfo: IFileOperationUndoRedoInfo,
+		private readonly _edits: CopyEdit[],
+		private readonly _undoRedoInfo: IFileOperationUndoRedoInfo,
 		@IWorkingCopyFileService private readonly _workingCopyFileService: IWorkingCopyFileService,
 		@IFileService private readonly _fileService: IFileService,
 		@IInstantiationService private readonly _instaService: IInstantiationService
 	) { }
 
 	get uris() {
-		return [this.newUri, this.oldUri];
+		return flatten(this._edits.map(edit => [edit.newUri, edit.oldUri]));
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
-		// copy
-		if (this.options.overwrite === undefined && this.options.ignoreIfExists && await this._fileService.exists(this.newUri)) {
-			return new Noop(); // not overwriting, but ignoring, and the target file exists
+
+		// (1) create copy operations, remove noops
+		const copies: ICopyOperation[] = [];
+		for (const edit of this._edits) {
+			//check: not overwriting, but ignoring, and the target file exists
+			const skip = edit.options.overwrite === undefined && edit.options.ignoreIfExists && await this._fileService.exists(edit.newUri);
+			if (!skip) {
+				copies.push({ file: { source: edit.oldUri, target: edit.newUri }, overwrite: edit.options.overwrite });
+			}
 		}
 
-		const stat = await this._workingCopyFileService.copy([{ source: this.oldUri, target: this.newUri }], { overwrite: this.options.overwrite, ...this.undoRedoInfo }, token);
-		const folder = this.options.folder || (stat.length === 1 && stat[0].isDirectory);
-		return this._instaService.createInstance(DeleteOperation, this.newUri, { recursive: true, folder, ...this.options }, { isUndoing: true }, false);
+		if (copies.length === 0) {
+			return new Noop();
+		}
+
+		// (2) perform the actual copy and use the return stats to build undo edits
+		const stats = await this._workingCopyFileService.copy(copies, this._undoRedoInfo, token);
+		const undoes: DeleteEdit[] = [];
+
+		for (let i = 0; i < stats.length; i++) {
+			const stat = stats[i];
+			const edit = this._edits[i];
+			undoes.push(new DeleteEdit(stat.resource, { recursive: true, folder: this._edits[i].options.folder || stat.isDirectory, ...edit.options }, false));
+		}
+
+		return this._instaService.createInstance(DeleteOperation, undoes, { isUndoing: true });
 	}
 
 	toString(): string {
-		return `(copy ${this.oldUri} to ${this.newUri})`;
+		return `(copy ${this._edits.map(edit => `${edit.oldUri} to ${edit.newUri}`).join(', ')})`;
 	}
 }
 
+class CreateEdit {
+	readonly type = 'create';
+	constructor(
+		readonly newUri: URI,
+		readonly options: WorkspaceFileEditOptions,
+		readonly contents: VSBuffer | undefined,
+	) { }
+}
+
 class CreateOperation implements IFileOperation {
 
 	constructor(
-		readonly newUri: URI,
-		readonly options: WorkspaceFileEditOptions,
-		readonly undoRedoInfo: IFileOperationUndoRedoInfo,
-		readonly contents: VSBuffer | undefined,
+		private readonly _edits: CreateEdit[],
+		private readonly _undoRedoInfo: IFileOperationUndoRedoInfo,
 		@IFileService private readonly _fileService: IFileService,
 		@IWorkingCopyFileService private readonly _workingCopyFileService: IWorkingCopyFileService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
+		@ITextFileService private readonly _textFileService: ITextFileService
 	) { }
 
 	get uris() {
-		return [this.newUri];
+		return this._edits.map(edit => edit.newUri);
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
-		// create file
-		if (this.options.overwrite === undefined && this.options.ignoreIfExists && await this._fileService.exists(this.newUri)) {
-			return new Noop(); // not overwriting, but ignoring, and the target file exists
+
+		const folderCreates: ICreateOperation[] = [];
+		const fileCreates: ICreateFileOperation[] = [];
+		const undoes: DeleteEdit[] = [];
+
+		for (const edit of this._edits) {
+			if (edit.options.overwrite === undefined && edit.options.ignoreIfExists && await this._fileService.exists(edit.newUri)) {
+				continue; // not overwriting, but ignoring, and the target file exists
+			}
+			if (edit.options.folder) {
+				folderCreates.push({ resource: edit.newUri });
+			} else {
+				// If the contents are part of the edit they include the encoding, thus use them. Otherwise get the encoding for a new empty file.
+				const encodedReadable = typeof edit.contents !== 'undefined' ? edit.contents : await this._textFileService.getEncodedReadable(edit.newUri);
+				fileCreates.push({ resource: edit.newUri, contents: encodedReadable, overwrite: edit.options.overwrite });
+			}
+			undoes.push(new DeleteEdit(edit.newUri, edit.options, !edit.options.folder && !edit.contents));
 		}
-		if (this.options.folder) {
-			await this._workingCopyFileService.createFolder(this.newUri, { ...this.undoRedoInfo }, token);
-		} else {
-			await this._workingCopyFileService.create(this.newUri, this.contents, { overwrite: this.options.overwrite, ...this.undoRedoInfo }, token);
+
+		if (folderCreates.length === 0 && fileCreates.length === 0) {
+			return new Noop();
 		}
-		return this._instaService.createInstance(DeleteOperation, this.newUri, this.options, { isUndoing: true }, !this.options.folder && !this.contents);
+
+		await this._workingCopyFileService.createFolder(folderCreates, this._undoRedoInfo, token);
+		await this._workingCopyFileService.create(fileCreates, this._undoRedoInfo, token);
+
+		return this._instaService.createInstance(DeleteOperation, undoes, { isUndoing: true });
 	}
 
 	toString(): string {
-		return this.options.folder ? `create ${resources.basename(this.newUri)} folder`
-			: `(create ${resources.basename(this.newUri)} with ${this.contents?.byteLength || 0} bytes)`;
+		return `(create ${this._edits.map(edit => edit.options.folder ? `folder ${edit.newUri}` : `file ${edit.newUri} with ${edit.contents?.byteLength || 0} bytes`).join(', ')})`;
 	}
 }
 
+class DeleteEdit {
+	readonly type = 'delete';
+	constructor(
+		readonly oldUri: URI,
+		readonly options: WorkspaceFileEditOptions,
+		readonly undoesCreate: boolean,
+	) { }
+}
+
 class DeleteOperation implements IFileOperation {
 
 	constructor(
-		readonly oldUri: URI,
-		readonly options: WorkspaceFileEditOptions,
-		readonly undoRedoInfo: IFileOperationUndoRedoInfo,
-		private readonly _undoesCreateOperation: boolean,
+		private _edits: DeleteEdit[],
+		private readonly _undoRedoInfo: IFileOperationUndoRedoInfo,
 		@IWorkingCopyFileService private readonly _workingCopyFileService: IWorkingCopyFileService,
 		@IFileService private readonly _fileService: IFileService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -153,38 +223,58 @@ class DeleteOperation implements IFileOperation {
 	) { }
 
 	get uris() {
-		return [this.oldUri];
+		return this._edits.map(edit => edit.oldUri);
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
 		// delete file
-		if (!await this._fileService.exists(this.oldUri)) {
-			if (!this.options.ignoreIfNotExists) {
-				throw new Error(`${this.oldUri} does not exist and can not be deleted`);
-			}
-			return new Noop();
-		}
 
-		let fileContent: IFileContent | undefined;
-		if (!this._undoesCreateOperation && !this.options.folder) {
-			try {
-				fileContent = await this._fileService.readFile(this.oldUri);
-			} catch (err) {
-				this._logService.critical(err);
+		const deletes: IDeleteOperation[] = [];
+		const undoes: CreateEdit[] = [];
+
+		for (const edit of this._edits) {
+			if (!await this._fileService.exists(edit.oldUri)) {
+				if (!edit.options.ignoreIfNotExists) {
+					throw new Error(`${edit.oldUri} does not exist and can not be deleted`);
+				}
+				continue;
+			}
+
+			deletes.push({
+				resource: edit.oldUri,
+				recursive: edit.options.recursive,
+				useTrash: !edit.options.skipTrashBin && this._fileService.hasCapability(edit.oldUri, FileSystemProviderCapabilities.Trash) && this._configurationService.getValue<boolean>('files.enableTrash')
+			});
+
+
+			// read file contents for undo operation. when a file is too large it won't be restored
+			let fileContent: IFileContent | undefined;
+			if (!edit.undoesCreate && !edit.options.folder) {
+				try {
+					fileContent = await this._fileService.readFile(edit.oldUri);
+				} catch (err) {
+					this._logService.critical(err);
+				}
+			}
+			if (!(typeof edit.options.maxSize === 'number' && fileContent && (fileContent?.size > edit.options.maxSize))) {
+				undoes.push(new CreateEdit(edit.oldUri, edit.options, fileContent?.value));
 			}
 		}
 
-		const useTrash = !this.options.skipTrashBin && this._fileService.hasCapability(this.oldUri, FileSystemProviderCapabilities.Trash) && this._configurationService.getValue<boolean>('files.enableTrash');
-		await this._workingCopyFileService.delete([this.oldUri], { useTrash, recursive: this.options.recursive, ...this.undoRedoInfo }, token);
-
-		if (typeof this.options.maxSize === 'number' && fileContent && (fileContent?.size > this.options.maxSize)) {
+		if (deletes.length === 0) {
 			return new Noop();
 		}
-		return this._instaService.createInstance(CreateOperation, this.oldUri, this.options, { isUndoing: true }, fileContent?.value);
+
+		await this._workingCopyFileService.delete(deletes, this._undoRedoInfo, token);
+
+		if (undoes.length === 0) {
+			return new Noop();
+		}
+		return this._instaService.createInstance(CreateOperation, undoes, { isUndoing: true });
 	}
 
 	toString(): string {
-		return `(delete ${resources.basename(this.oldUri)})`;
+		return `(delete ${this._edits.map(edit => edit.oldUri).join(', ')})`;
 	}
 }
 
@@ -196,7 +286,8 @@ class FileUndoRedoElement implements IWorkspaceUndoRedoElement {
 
 	constructor(
 		readonly label: string,
-		readonly operations: IFileOperation[]
+		readonly operations: IFileOperation[],
+		readonly confirmBeforeUndo: boolean
 	) {
 		this.resources = (<URI[]>[]).concat(...operations.map(op => op.uris));
 	}
@@ -217,7 +308,7 @@ class FileUndoRedoElement implements IWorkspaceUndoRedoElement {
 		}
 	}
 
-	public toString(): string {
+	toString(): string {
 		return this.operations.map(op => String(op)).join(', ');
 	}
 }
@@ -228,6 +319,7 @@ export class BulkFileEdits {
 		private readonly _label: string,
 		private readonly _undoRedoGroup: UndoRedoGroup,
 		private readonly _undoRedoSource: UndoRedoSource | undefined,
+		private readonly _confirmBeforeUndo: boolean,
 		private readonly _progress: IProgress<void>,
 		private readonly _token: CancellationToken,
 		private readonly _edits: ResourceFileEdit[],
@@ -238,34 +330,66 @@ export class BulkFileEdits {
 	async apply(): Promise<void> {
 		const undoOperations: IFileOperation[] = [];
 		const undoRedoInfo = { undoRedoGroupId: this._undoRedoGroup.id };
+
+		const edits: Array<RenameEdit | CopyEdit | DeleteEdit | CreateEdit> = [];
 		for (const edit of this._edits) {
+			if (edit.newResource && edit.oldResource && !edit.options?.copy) {
+				edits.push(new RenameEdit(edit.newResource, edit.oldResource, edit.options ?? {}));
+			} else if (edit.newResource && edit.oldResource && edit.options?.copy) {
+				edits.push(new CopyEdit(edit.newResource, edit.oldResource, edit.options ?? {}));
+			} else if (!edit.newResource && edit.oldResource) {
+				edits.push(new DeleteEdit(edit.oldResource, edit.options ?? {}, false));
+			} else if (edit.newResource && !edit.oldResource) {
+				edits.push(new CreateEdit(edit.newResource, edit.options ?? {}, undefined));
+			}
+		}
+
+		if (edits.length === 0) {
+			return;
+		}
+
+		const groups: Array<RenameEdit | CopyEdit | DeleteEdit | CreateEdit>[] = [];
+		groups[0] = [edits[0]];
+
+		for (let i = 1; i < edits.length; i++) {
+			const edit = edits[i];
+			const lastGroup = tail(groups);
+			if (lastGroup[0].type === edit.type) {
+				lastGroup.push(edit);
+			} else {
+				groups.push([edit]);
+			}
+		}
+
+		for (let group of groups) {
 
 			if (this._token.isCancellationRequested) {
 				break;
 			}
 
-			const options = edit.options || {};
 			let op: IFileOperation | undefined;
-			if (edit.newResource && edit.oldResource && !options.copy) {
-				// rename
-				op = this._instaService.createInstance(RenameOperation, edit.newResource, edit.oldResource, options, undoRedoInfo);
-			} else if (edit.newResource && edit.oldResource && options.copy) {
-				op = this._instaService.createInstance(CopyOperation, edit.newResource, edit.oldResource, options, undoRedoInfo);
-			} else if (!edit.newResource && edit.oldResource) {
-				// delete file
-				op = this._instaService.createInstance(DeleteOperation, edit.oldResource, options, undoRedoInfo, false);
-			} else if (edit.newResource && !edit.oldResource) {
-				// create file
-				op = this._instaService.createInstance(CreateOperation, edit.newResource, options, undoRedoInfo, undefined);
+			switch (group[0].type) {
+				case 'rename':
+					op = this._instaService.createInstance(RenameOperation, <RenameEdit[]>group, undoRedoInfo);
+					break;
+				case 'copy':
+					op = this._instaService.createInstance(CopyOperation, <CopyEdit[]>group, undoRedoInfo);
+					break;
+				case 'delete':
+					op = this._instaService.createInstance(DeleteOperation, <DeleteEdit[]>group, undoRedoInfo);
+					break;
+				case 'create':
+					op = this._instaService.createInstance(CreateOperation, <CreateEdit[]>group, undoRedoInfo);
+					break;
 			}
+
 			if (op) {
 				const undoOp = await op.perform(this._token);
 				undoOperations.push(undoOp);
 			}
-
 			this._progress.report(undefined);
 		}
 
-		this._undoRedoService.pushElement(new FileUndoRedoElement(this._label, undoOperations), this._undoRedoGroup, this._undoRedoSource);
+		this._undoRedoService.pushElement(new FileUndoRedoElement(this._label, undoOperations, this._confirmBeforeUndo), this._undoRedoGroup, this._undoRedoSource);
 	}
 }
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
index ab0172eec..3b35a67b7 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
@@ -17,7 +17,7 @@ import { BulkEditPreviewProvider, BulkFileOperations, BulkFileOperationType } fr
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { URI } from 'vs/base/common/uri';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
index e9dddb2a2..7d1348b25 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
@@ -409,14 +409,14 @@ export class CategoryElementRenderer implements ITreeRenderer<CategoryElement, F
 		} else if (URI.isUri(metadata.iconPath)) {
 			// background-image
 			template.icon.className = 'uri-icon';
-			template.icon.style.setProperty('--background-dark', `url("${metadata.iconPath.toString(true)}")`);
-			template.icon.style.setProperty('--background-light', `url("${metadata.iconPath.toString(true)}")`);
+			template.icon.style.setProperty('--background-dark', dom.asCSSUrl(metadata.iconPath));
+			template.icon.style.setProperty('--background-light', dom.asCSSUrl(metadata.iconPath));
 
 		} else if (metadata.iconPath) {
 			// background-image
 			template.icon.className = 'uri-icon';
-			template.icon.style.setProperty('--background-dark', `url("${metadata.iconPath.dark.toString(true)}")`);
-			template.icon.style.setProperty('--background-light', `url("${metadata.iconPath.light.toString(true)}")`);
+			template.icon.style.setProperty('--background-dark', dom.asCSSUrl(metadata.iconPath.dark));
+			template.icon.style.setProperty('--background-light', dom.asCSSUrl(metadata.iconPath.light));
 		}
 
 		template.label.setLabel(metadata.label, metadata.description, {
@@ -608,14 +608,14 @@ class TextEditElementTemplate {
 			} else if (URI.isUri(iconPath)) {
 				// background-image
 				this._icon.className = 'uri-icon';
-				this._icon.style.setProperty('--background-dark', `url("${iconPath.toString(true)}")`);
-				this._icon.style.setProperty('--background-light', `url("${iconPath.toString(true)}")`);
+				this._icon.style.setProperty('--background-dark', dom.asCSSUrl(iconPath));
+				this._icon.style.setProperty('--background-light', dom.asCSSUrl(iconPath));
 
 			} else {
 				// background-image
 				this._icon.className = 'uri-icon';
-				this._icon.style.setProperty('--background-dark', `url("${iconPath.dark.toString(true)}")`);
-				this._icon.style.setProperty('--background-light', `url("${iconPath.light.toString(true)}")`);
+				this._icon.style.setProperty('--background-dark', dom.asCSSUrl(iconPath.dark));
+				this._icon.style.setProperty('--background-light', dom.asCSSUrl(iconPath.light));
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
index 6fcd9f8ab..fbf12cd12 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
@@ -27,7 +27,6 @@ import { TrackedRangeStickiness, IModelDeltaDecoration, IModelDecorationOptions,
 import { registerThemingParticipant, themeColorFromId, IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IAction } from 'vs/base/common/actions';
-import { IActionBarOptions, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { Color } from 'vs/base/common/color';
 import { TreeMouseEventTarget, ITreeNode } from 'vs/base/browser/ui/tree/tree';
@@ -140,13 +139,6 @@ export class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
 		updateToolbar();
 	}
 
-	protected _getActionBarOptions(): IActionBarOptions {
-		return {
-			...super._getActionBarOptions(),
-			orientation: ActionsOrientation.HORIZONTAL
-		};
-	}
-
 	protected _fillBody(parent: HTMLElement): void {
 
 		this._layoutInfo = LayoutInfo.retrieve(this._storageService);
diff --git a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
index 87cbcc7d5..4f6b7ff0d 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
@@ -37,7 +37,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 
-class AccessibilityHelpController extends Disposable implements IEditorContribution {
+export class AccessibilityHelpController extends Disposable implements IEditorContribution {
 
 	public static readonly ID = 'editor.contrib.accessibilityHelpController';
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
index c3ede411a..0f7a8480b 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
@@ -8,10 +8,10 @@ import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { registerDiffEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IDiffEditorContribution } from 'vs/editor/common/editorCommon';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { FloatingClickWidget } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
 import { IDiffComputationResult } from 'vs/editor/common/services/editorWorkerService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 
 const enum WidgetState {
@@ -48,7 +48,7 @@ class DiffEditorHelperContribution extends Disposable implements IDiffEditorCont
 					Severity.Warning,
 					nls.localize('hintTimeout', "The diff algorithm was stopped early (after {0} ms.)", this._diffEditor.maxComputationTime),
 					[{
-						label: nls.localize('removeTimeout', "Remove limit"),
+						label: nls.localize('removeTimeout', "Remove Limit"),
 						run: () => {
 							this._configurationService.updateValue('diffEditor.maxComputationTime', 0);
 						}
@@ -94,7 +94,7 @@ class DiffEditorHelperContribution extends Disposable implements IDiffEditorCont
 
 	private _onDidClickHelperWidget(): void {
 		if (this._state === WidgetState.HintWhitespace) {
-			this._configurationService.updateValue('diffEditor.ignoreTrimWhitespace', false, ConfigurationTarget.USER);
+			this._configurationService.updateValue('diffEditor.ignoreTrimWhitespace', false);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts b/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts
index 69ee09504..657af6f1b 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.ts
@@ -9,7 +9,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as types from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
-import { CharacterPair, CommentRule, FoldingRules, IAutoClosingPair, IAutoClosingPairConditional, IndentationRule, LanguageConfiguration } from 'vs/editor/common/modes/languageConfiguration';
+import { CharacterPair, CommentRule, EnterAction, FoldingRules, IAutoClosingPair, IAutoClosingPairConditional, IndentAction, IndentationRule, LanguageConfiguration, OnEnterRule } from 'vs/editor/common/modes/languageConfiguration';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
@@ -31,6 +31,19 @@ interface IIndentationRules {
 	unIndentedLinePattern?: string | IRegExp;
 }
 
+interface IEnterAction {
+	indent: 'none' | 'indent' | 'indentOutdent' | 'outdent';
+	appendText?: string;
+	removeText?: number;
+}
+
+interface IOnEnterRule {
+	beforeText: string | IRegExp;
+	afterText?: string | IRegExp;
+	previousLineText?: string | IRegExp;
+	action: IEnterAction;
+}
+
 interface ILanguageConfiguration {
 	comments?: CommentRule;
 	brackets?: CharacterPair[];
@@ -40,6 +53,7 @@ interface ILanguageConfiguration {
 	indentationRules?: IIndentationRules;
 	folding?: FoldingRules;
 	autoCloseBefore?: string;
+	onEnterRules?: IOnEnterRule[];
 }
 
 function isStringArr(something: string[] | null): something is string[] {
@@ -93,7 +107,7 @@ export class LanguageConfigurationFileHandler {
 		}
 		this._done[languageIdentifier.id] = true;
 
-		let configurationFiles = this._modeService.getConfigurationFiles(languageIdentifier.language);
+		const configurationFiles = this._modeService.getConfigurationFiles(languageIdentifier.language);
 		configurationFiles.forEach((configFileLocation) => this._handleConfigFile(languageIdentifier, configFileLocation));
 	}
 
@@ -254,18 +268,82 @@ export class LanguageConfigurationFileHandler {
 		return result;
 	}
 
-	// private _mapCharacterPairs(pairs: Array<CharacterPair | IAutoClosingPairConditional>): IAutoClosingPairConditional[] {
-	// 	return pairs.map(pair => {
-	// 		if (Array.isArray(pair)) {
-	// 			return { open: pair[0], close: pair[1] };
-	// 		}
-	// 		return <IAutoClosingPairConditional>pair;
-	// 	});
-	// }
+	private _extractValidOnEnterRules(languageIdentifier: LanguageIdentifier, configuration: ILanguageConfiguration): OnEnterRule[] | null {
+		const source = configuration.onEnterRules;
+		if (typeof source === 'undefined') {
+			return null;
+		}
+		if (!Array.isArray(source)) {
+			console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules\` to be an array.`);
+			return null;
+		}
+
+		let result: OnEnterRule[] | null = null;
+		for (let i = 0, len = source.length; i < len; i++) {
+			const onEnterRule = source[i];
+			if (!types.isObject(onEnterRule)) {
+				console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules[${i}]\` to be an object.`);
+				continue;
+			}
+			if (!types.isObject(onEnterRule.action)) {
+				console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules[${i}].action\` to be an object.`);
+				continue;
+			}
+			let indentAction: IndentAction;
+			if (onEnterRule.action.indent === 'none') {
+				indentAction = IndentAction.None;
+			} else if (onEnterRule.action.indent === 'indent') {
+				indentAction = IndentAction.Indent;
+			} else if (onEnterRule.action.indent === 'indentOutdent') {
+				indentAction = IndentAction.IndentOutdent;
+			} else if (onEnterRule.action.indent === 'outdent') {
+				indentAction = IndentAction.Outdent;
+			} else {
+				console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules[${i}].action.indent\` to be 'none', 'indent', 'indentOutdent' or 'outdent'.`);
+				continue;
+			}
+			const action: EnterAction = { indentAction };
+			if (onEnterRule.action.appendText) {
+				if (typeof onEnterRule.action.appendText === 'string') {
+					action.appendText = onEnterRule.action.appendText;
+				} else {
+					console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules[${i}].action.appendText\` to be undefined or a string.`);
+				}
+			}
+			if (onEnterRule.action.removeText) {
+				if (typeof onEnterRule.action.removeText === 'number') {
+					action.removeText = onEnterRule.action.removeText;
+				} else {
+					console.warn(`[${languageIdentifier.language}]: language configuration: expected \`onEnterRules[${i}].action.removeText\` to be undefined or a number.`);
+				}
+			}
+			const beforeText = this._parseRegex(languageIdentifier, `onEnterRules[${i}].beforeText`, onEnterRule.beforeText);
+			if (!beforeText) {
+				continue;
+			}
+			const resultingOnEnterRule: OnEnterRule = { beforeText, action };
+			if (onEnterRule.afterText) {
+				const afterText = this._parseRegex(languageIdentifier, `onEnterRules[${i}].afterText`, onEnterRule.afterText);
+				if (afterText) {
+					resultingOnEnterRule.afterText = afterText;
+				}
+			}
+			if (onEnterRule.previousLineText) {
+				const previousLineText = this._parseRegex(languageIdentifier, `onEnterRules[${i}].previousLineText`, onEnterRule.previousLineText);
+				if (previousLineText) {
+					resultingOnEnterRule.previousLineText = previousLineText;
+				}
+			}
+			result = result || [];
+			result.push(resultingOnEnterRule);
+		}
+
+		return result;
+	}
 
 	private _handleConfig(languageIdentifier: LanguageIdentifier, configuration: ILanguageConfiguration): void {
 
-		let richEditConfig: LanguageConfiguration = {};
+		const richEditConfig: LanguageConfiguration = {};
 
 		const comments = this._extractValidCommentRule(languageIdentifier, configuration);
 		if (comments) {
@@ -293,25 +371,21 @@ export class LanguageConfigurationFileHandler {
 		}
 
 		if (configuration.wordPattern) {
-			try {
-				let wordPattern = this._parseRegex(configuration.wordPattern);
-				if (wordPattern) {
-					richEditConfig.wordPattern = wordPattern;
-				}
-			} catch (error) {
-				// Malformed regexes are ignored
+			const wordPattern = this._parseRegex(languageIdentifier, `wordPattern`, configuration.wordPattern);
+			if (wordPattern) {
+				richEditConfig.wordPattern = wordPattern;
 			}
 		}
 
 		if (configuration.indentationRules) {
-			let indentationRules = this._mapIndentationRules(configuration.indentationRules);
+			const indentationRules = this._mapIndentationRules(languageIdentifier, configuration.indentationRules);
 			if (indentationRules) {
 				richEditConfig.indentationRules = indentationRules;
 			}
 		}
 
 		if (configuration.folding) {
-			let markers = configuration.folding.markers;
+			const markers = configuration.folding.markers;
 
 			richEditConfig.folding = {
 				offSide: configuration.folding.offSide,
@@ -319,44 +393,66 @@ export class LanguageConfigurationFileHandler {
 			};
 		}
 
+		const onEnterRules = this._extractValidOnEnterRules(languageIdentifier, configuration);
+		if (onEnterRules) {
+			richEditConfig.onEnterRules = onEnterRules;
+		}
+
 		LanguageConfigurationRegistry.register(languageIdentifier, richEditConfig);
 	}
 
-	private _parseRegex(value: string | IRegExp) {
+	private _parseRegex(languageIdentifier: LanguageIdentifier, confPath: string, value: string | IRegExp) {
 		if (typeof value === 'string') {
-			return new RegExp(value, '');
-		} else if (typeof value === 'object') {
-			return new RegExp(value.pattern, value.flags);
+			try {
+				return new RegExp(value, '');
+			} catch (err) {
+				console.warn(`[${languageIdentifier.language}]: Invalid regular expression in \`${confPath}\`: `, err);
+				return null;
+			}
 		}
-
+		if (types.isObject(value)) {
+			if (typeof value.pattern !== 'string') {
+				console.warn(`[${languageIdentifier.language}]: language configuration: expected \`${confPath}.pattern\` to be a string.`);
+				return null;
+			}
+			if (typeof value.flags !== 'undefined' && typeof value.flags !== 'string') {
+				console.warn(`[${languageIdentifier.language}]: language configuration: expected \`${confPath}.flags\` to be a string.`);
+				return null;
+			}
+			try {
+				return new RegExp(value.pattern, value.flags);
+			} catch (err) {
+				console.warn(`[${languageIdentifier.language}]: Invalid regular expression in \`${confPath}\`: `, err);
+				return null;
+			}
+		}
+		console.warn(`[${languageIdentifier.language}]: language configuration: expected \`${confPath}\` to be a string or an object.`);
 		return null;
 	}
 
-	private _mapIndentationRules(indentationRules: IIndentationRules): IndentationRule | null {
-		try {
-			let increaseIndentPattern = this._parseRegex(indentationRules.increaseIndentPattern);
-			let decreaseIndentPattern = this._parseRegex(indentationRules.decreaseIndentPattern);
-
-			if (increaseIndentPattern && decreaseIndentPattern) {
-				let result: IndentationRule = {
-					increaseIndentPattern: increaseIndentPattern,
-					decreaseIndentPattern: decreaseIndentPattern
-				};
-
-				if (indentationRules.indentNextLinePattern) {
-					result.indentNextLinePattern = this._parseRegex(indentationRules.indentNextLinePattern);
-				}
-				if (indentationRules.unIndentedLinePattern) {
-					result.unIndentedLinePattern = this._parseRegex(indentationRules.unIndentedLinePattern);
-				}
-
-				return result;
-			}
-		} catch (error) {
-			// Malformed regexes are ignored
+	private _mapIndentationRules(languageIdentifier: LanguageIdentifier, indentationRules: IIndentationRules): IndentationRule | null {
+		const increaseIndentPattern = this._parseRegex(languageIdentifier, `indentationRules.increaseIndentPattern`, indentationRules.increaseIndentPattern);
+		if (!increaseIndentPattern) {
+			return null;
+		}
+		const decreaseIndentPattern = this._parseRegex(languageIdentifier, `indentationRules.decreaseIndentPattern`, indentationRules.decreaseIndentPattern);
+		if (!decreaseIndentPattern) {
+			return null;
 		}
 
-		return null;
+		const result: IndentationRule = {
+			increaseIndentPattern: increaseIndentPattern,
+			decreaseIndentPattern: decreaseIndentPattern
+		};
+
+		if (indentationRules.indentNextLinePattern) {
+			result.indentNextLinePattern = this._parseRegex(languageIdentifier, `indentationRules.indentNextLinePattern`, indentationRules.indentNextLinePattern);
+		}
+		if (indentationRules.unIndentedLinePattern) {
+			result.unIndentedLinePattern = this._parseRegex(languageIdentifier, `indentationRules.unIndentedLinePattern`, indentationRules.unIndentedLinePattern);
+		}
+
+		return result;
 	}
 }
 
@@ -601,6 +697,101 @@ const schema: IJSONSchema = {
 					}
 				}
 			}
+		},
+		onEnterRules: {
+			type: 'array',
+			description: nls.localize('schema.onEnterRules', 'The language\'s rules to be evaluated when pressing Enter.'),
+			items: {
+				type: 'object',
+				description: nls.localize('schema.onEnterRules', 'The language\'s rules to be evaluated when pressing Enter.'),
+				required: ['beforeText', 'action'],
+				properties: {
+					beforeText: {
+						type: ['string', 'object'],
+						description: nls.localize('schema.onEnterRules.beforeText', 'This rule will only execute if the text before the cursor matches this regular expression.'),
+						properties: {
+							pattern: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.beforeText.pattern', 'The RegExp pattern for beforeText.'),
+								default: '',
+							},
+							flags: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.beforeText.flags', 'The RegExp flags for beforeText.'),
+								default: '',
+								pattern: '^([gimuy]+)$',
+								patternErrorMessage: nls.localize('schema.onEnterRules.beforeText.errorMessage', 'Must match the pattern `/^([gimuy]+)$/`.')
+							}
+						}
+					},
+					afterText: {
+						type: ['string', 'object'],
+						description: nls.localize('schema.onEnterRules.afterText', 'This rule will only execute if the text after the cursor matches this regular expression.'),
+						properties: {
+							pattern: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.afterText.pattern', 'The RegExp pattern for afterText.'),
+								default: '',
+							},
+							flags: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.afterText.flags', 'The RegExp flags for afterText.'),
+								default: '',
+								pattern: '^([gimuy]+)$',
+								patternErrorMessage: nls.localize('schema.onEnterRules.afterText.errorMessage', 'Must match the pattern `/^([gimuy]+)$/`.')
+							}
+						}
+					},
+					previousLineText: {
+						type: ['string', 'object'],
+						description: nls.localize('schema.onEnterRules.previousLineText', 'This rule will only execute if the text above the line matches this regular expression.'),
+						properties: {
+							pattern: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.previousLineText.pattern', 'The RegExp pattern for previousLineText.'),
+								default: '',
+							},
+							flags: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.previousLineText.flags', 'The RegExp flags for previousLineText.'),
+								default: '',
+								pattern: '^([gimuy]+)$',
+								patternErrorMessage: nls.localize('schema.onEnterRules.previousLineText.errorMessage', 'Must match the pattern `/^([gimuy]+)$/`.')
+							}
+						}
+					},
+					action: {
+						type: ['string', 'object'],
+						description: nls.localize('schema.onEnterRules.action', 'The action to execute.'),
+						required: ['indent'],
+						default: { 'indent': 'indent' },
+						properties: {
+							indent: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.action.indent', "Describe what to do with the indentation"),
+								default: 'indent',
+								enum: ['none', 'indent', 'indentOutdent', 'outdent'],
+								markdownEnumDescriptions: [
+									nls.localize('schema.onEnterRules.action.indent.none', "Insert new line and copy the previous line's indentation."),
+									nls.localize('schema.onEnterRules.action.indent.indent', "Insert new line and indent once (relative to the previous line's indentation)."),
+									nls.localize('schema.onEnterRules.action.indent.indentOutdent', "Insert two new lines:\n - the first one indented which will hold the cursor\n - the second one at the same indentation level"),
+									nls.localize('schema.onEnterRules.action.indent.outdent', "Insert new line and outdent once (relative to the previous line's indentation).")
+								]
+							},
+							appendText: {
+								type: 'string',
+								description: nls.localize('schema.onEnterRules.action.appendText', 'Describes text to be appended after the new line and after the indentation.'),
+								default: '',
+							},
+							removeText: {
+								type: 'number',
+								description: nls.localize('schema.onEnterRules.action.removeText', 'Describes the number of characters to remove from the new line\'s indentation.'),
+								default: 0,
+							}
+						}
+					}
+				}
+			}
 		}
 
 	}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
index f7a7ea98d..0d8174166 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts
@@ -46,7 +46,7 @@ export class LargeFileOptimizationsWarner extends Disposable implements IEditorC
 
 				this._notificationService.prompt(Severity.Info, message, [
 					{
-						label: nls.localize('removeOptimizations', "Forcefully enable features"),
+						label: nls.localize('removeOptimizations', "Forcefully Enable Features"),
 						run: () => {
 							this._configurationService.updateValue(`editor.largeFileOptimizations`, false).then(() => {
 								this._notificationService.info(nls.localize('reopenFilePrompt', "Please reopen file in order for this setting to take effect."));
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
new file mode 100644
index 000000000..bdb42efac
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
@@ -0,0 +1,429 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IOutlineService, OutlineChangeEvent, OutlineConfigKeys, OutlineTarget, } from 'vs/workbench/services/outline/browser/outline';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IEditorPane } from 'vs/workbench/common/editor';
+import { DocumentSymbolComparator, DocumentSymbolAccessibilityProvider, DocumentSymbolRenderer, DocumentSymbolFilter, DocumentSymbolGroupRenderer, DocumentSymbolIdentityProvider, DocumentSymbolNavigationLabelProvider, DocumentSymbolVirtualDelegate } from 'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree';
+import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { OutlineGroup, OutlineElement, OutlineModel, TreeElement, IOutlineMarker } from 'vs/editor/contrib/documentSymbols/outlineModel';
+import { DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { raceCancellation, TimeoutTimer, timeout, Barrier } from 'vs/base/common/async';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { URI } from 'vs/base/common/uri';
+import { ITextModel } from 'vs/editor/common/model';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPosition } from 'vs/editor/common/core/position';
+import { ScrollType } from 'vs/editor/common/editorCommon';
+import { Range } from 'vs/editor/common/core/range';
+import { IEditorOptions, TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
+import { IDataSource } from 'vs/base/browser/ui/tree/tree';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { localize } from 'vs/nls';
+import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
+import { MarkerSeverity } from 'vs/platform/markers/common/markers';
+import { isEqual } from 'vs/base/common/resources';
+
+type DocumentSymbolItem = OutlineGroup | OutlineElement;
+
+class DocumentSymbolBreadcrumbsSource implements IBreadcrumbsDataSource<DocumentSymbolItem>{
+
+	private _breadcrumbs: (OutlineGroup | OutlineElement)[] = [];
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
+	) { }
+
+	getBreadcrumbElements(): readonly DocumentSymbolItem[] {
+		return this._breadcrumbs;
+	}
+
+	clear(): void {
+		this._breadcrumbs = [];
+	}
+
+	update(model: OutlineModel, position: IPosition): void {
+		const newElements = this._computeBreadcrumbs(model, position);
+		this._breadcrumbs = newElements;
+	}
+
+	private _computeBreadcrumbs(model: OutlineModel, position: IPosition): Array<OutlineGroup | OutlineElement> {
+		let item: OutlineGroup | OutlineElement | undefined = model.getItemEnclosingPosition(position);
+		if (!item) {
+			return [];
+		}
+		let chain: Array<OutlineGroup | OutlineElement> = [];
+		while (item) {
+			chain.push(item);
+			let parent: any = item.parent;
+			if (parent instanceof OutlineModel) {
+				break;
+			}
+			if (parent instanceof OutlineGroup && parent.parent && parent.parent.children.size === 1) {
+				break;
+			}
+			item = parent;
+		}
+		let result: Array<OutlineGroup | OutlineElement> = [];
+		for (let i = chain.length - 1; i >= 0; i--) {
+			let element = chain[i];
+			if (this._isFiltered(element)) {
+				break;
+			}
+			result.push(element);
+		}
+		if (result.length === 0) {
+			return [];
+		}
+		return result;
+	}
+
+	private _isFiltered(element: TreeElement): boolean {
+		if (!(element instanceof OutlineElement)) {
+			return false;
+		}
+		const key = `breadcrumbs.${DocumentSymbolFilter.kindToConfigName[element.symbol.kind]}`;
+		let uri: URI | undefined;
+		if (this._editor && this._editor.getModel()) {
+			const model = this._editor.getModel() as ITextModel;
+			uri = model.uri;
+		}
+		return !this._textResourceConfigurationService.getValue<boolean>(uri, key);
+	}
+}
+
+class DocumentSymbolsOutline implements IOutline<DocumentSymbolItem> {
+
+	private readonly _disposables = new DisposableStore();
+	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
+
+	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
+
+	private _outlineModel?: OutlineModel;
+	private _outlineDisposables = new DisposableStore();
+
+	private readonly _breadcrumbsDataSource: DocumentSymbolBreadcrumbsSource;
+
+	readonly config: IOutlineListConfig<DocumentSymbolItem>;
+
+	readonly outlineKind = 'documentSymbols';
+
+	get activeElement(): DocumentSymbolItem | undefined {
+		const posistion = this._editor.getPosition();
+		if (!posistion || !this._outlineModel) {
+			return undefined;
+		} else {
+			return this._outlineModel.getItemEnclosingPosition(posistion);
+		}
+	}
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		target: OutlineTarget,
+		firstLoadBarrier: Barrier,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
+		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+
+		this._breadcrumbsDataSource = new DocumentSymbolBreadcrumbsSource(_editor, textResourceConfigurationService);
+		const delegate = new DocumentSymbolVirtualDelegate();
+		const renderers = [new DocumentSymbolGroupRenderer(), instantiationService.createInstance(DocumentSymbolRenderer, true)];
+		const treeDataSource: IDataSource<this, DocumentSymbolItem> = {
+			getChildren: (parent) => {
+				if (parent instanceof OutlineElement || parent instanceof OutlineGroup) {
+					return parent.children.values();
+				}
+				if (parent === this && this._outlineModel) {
+					return this._outlineModel.children.values();
+				}
+				return [];
+			}
+		};
+		const comparator = new DocumentSymbolComparator();
+		const options = {
+			collapseByDefault: target === OutlineTarget.Breadcrumbs,
+			expandOnlyOnTwistieClick: true,
+			multipleSelectionSupport: false,
+			identityProvider: new DocumentSymbolIdentityProvider(),
+			keyboardNavigationLabelProvider: new DocumentSymbolNavigationLabelProvider(),
+			accessibilityProvider: new DocumentSymbolAccessibilityProvider(localize('document', "Document Symbols")),
+			filter: target === OutlineTarget.OutlinePane
+				? instantiationService.createInstance(DocumentSymbolFilter, 'outline')
+				: target === OutlineTarget.Breadcrumbs
+					? instantiationService.createInstance(DocumentSymbolFilter, 'breadcrumbs')
+					: undefined
+		};
+
+		this.config = {
+			breadcrumbsDataSource: this._breadcrumbsDataSource,
+			delegate,
+			renderers,
+			treeDataSource,
+			comparator,
+			options,
+			quickPickDataSource: { getQuickPickElements: () => { throw new Error('not implemented'); } }
+		};
+
+
+		// update as language, model, providers changes
+		this._disposables.add(DocumentSymbolProviderRegistry.onDidChange(_ => this._createOutline()));
+		this._disposables.add(this._editor.onDidChangeModel(_ => this._createOutline()));
+		this._disposables.add(this._editor.onDidChangeModelLanguage(_ => this._createOutline()));
+
+		// update soon'ish as model content change
+		const updateSoon = new TimeoutTimer();
+		this._disposables.add(updateSoon);
+		this._disposables.add(this._editor.onDidChangeModelContent(event => {
+			const timeout = OutlineModel.getRequestDelay(this._editor!.getModel());
+			updateSoon.cancelAndSet(() => this._createOutline(event), timeout);
+		}));
+
+		// stop when editor dies
+		this._disposables.add(this._editor.onDidDispose(() => this._outlineDisposables.clear()));
+
+		// initial load
+		this._createOutline().finally(() => firstLoadBarrier.open());
+	}
+
+	dispose(): void {
+		this._disposables.dispose();
+		this._outlineDisposables.dispose();
+	}
+
+	get isEmpty(): boolean {
+		return !this._outlineModel || TreeElement.empty(this._outlineModel);
+	}
+
+	async reveal(entry: DocumentSymbolItem, options: IEditorOptions, sideBySide: boolean): Promise<void> {
+		const model = OutlineModel.get(entry);
+		if (!model || !(entry instanceof OutlineElement)) {
+			return;
+		}
+		await this._codeEditorService.openCodeEditor({
+			resource: model.uri,
+			options: {
+				...options,
+				selection: Range.collapseToStart(entry.symbol.selectionRange),
+				selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport,
+			}
+		}, this._editor, sideBySide);
+	}
+
+	preview(entry: DocumentSymbolItem): IDisposable {
+		if (!(entry instanceof OutlineElement)) {
+			return Disposable.None;
+		}
+
+		const { symbol } = entry;
+		this._editor.revealRangeInCenterIfOutsideViewport(symbol.range, ScrollType.Smooth);
+		const ids = this._editor.deltaDecorations([], [{
+			range: symbol.range,
+			options: {
+				className: 'rangeHighlight',
+				isWholeLine: true
+			}
+		}]);
+		return toDisposable(() => this._editor.deltaDecorations(ids, []));
+	}
+
+	captureViewState(): IDisposable {
+		const viewState = this._editor.saveViewState();
+		return toDisposable(() => {
+			if (viewState) {
+				this._editor.restoreViewState(viewState);
+			}
+		});
+	}
+
+	private async _createOutline(contentChangeEvent?: IModelContentChangedEvent): Promise<void> {
+
+		this._outlineDisposables.clear();
+		if (!contentChangeEvent) {
+			this._setOutlineModel(undefined);
+		}
+
+		if (!this._editor.hasModel()) {
+			return;
+		}
+		const buffer = this._editor.getModel();
+		if (!DocumentSymbolProviderRegistry.has(buffer)) {
+			return;
+		}
+
+		const cts = new CancellationTokenSource();
+		const versionIdThen = buffer.getVersionId();
+		const timeoutTimer = new TimeoutTimer();
+
+		this._outlineDisposables.add(timeoutTimer);
+		this._outlineDisposables.add(toDisposable(() => cts.dispose(true)));
+
+		try {
+			let model = await OutlineModel.create(buffer, cts.token);
+			if (cts.token.isCancellationRequested) {
+				// cancelled -> do nothing
+				return;
+			}
+
+			if (TreeElement.empty(model) || !this._editor.hasModel()) {
+				// empty -> no outline elements
+				this._setOutlineModel(model);
+				return;
+			}
+
+			// heuristic: when the symbols-to-lines ratio changes by 50% between edits
+			// wait a little (and hope that the next change isn't as drastic).
+			if (contentChangeEvent && this._outlineModel && buffer.getLineCount() >= 25) {
+				const newSize = TreeElement.size(model);
+				const newLength = buffer.getValueLength();
+				const newRatio = newSize / newLength;
+				const oldSize = TreeElement.size(this._outlineModel);
+				const oldLength = newLength - contentChangeEvent.changes.reduce((prev, value) => prev + value.rangeLength, 0);
+				const oldRatio = oldSize / oldLength;
+				if (newRatio <= oldRatio * 0.5 || newRatio >= oldRatio * 1.5) {
+					// wait for a better state and ignore current model when more
+					// typing has happened
+					const value = await raceCancellation(timeout(2000).then(() => true), cts.token, false);
+					if (!value) {
+						return;
+					}
+				}
+			}
+
+			// copy the model
+			model = model.adopt();
+
+			// feature: show markers with outline element
+			this._applyMarkersToOutline(model);
+			this._outlineDisposables.add(this._markerDecorationsService.onDidChangeMarker(textModel => {
+				if (isEqual(model.uri, textModel.uri)) {
+					this._applyMarkersToOutline(model);
+					this._onDidChange.fire({});
+				}
+			}));
+			this._outlineDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
+				if (e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
+					if (this._configurationService.getValue(OutlineConfigKeys.problemsEnabled)) {
+						this._applyMarkersToOutline(model);
+					} else {
+						model.updateMarker([]);
+					}
+					this._onDidChange.fire({});
+				}
+				if (e.affectsConfiguration('outline')) {
+					// outline filtering, problems on/off
+					this._onDidChange.fire({});
+				}
+				if (e.affectsConfiguration('breadcrumbs') && this._editor.hasModel()) {
+					// breadcrumbs filtering
+					this._breadcrumbsDataSource.update(model, this._editor.getPosition());
+					this._onDidChange.fire({});
+				}
+			}));
+
+			// feature: toggle icons
+			this._outlineDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
+				if (e.affectsConfiguration(OutlineConfigKeys.icons)) {
+					this._onDidChange.fire({});
+				}
+				if (e.affectsConfiguration('outline')) {
+					this._onDidChange.fire({});
+				}
+			}));
+
+			// feature: update active when cursor changes
+			this._outlineDisposables.add(this._editor.onDidChangeCursorPosition(_ => {
+				timeoutTimer.cancelAndSet(() => {
+					if (!buffer.isDisposed() && versionIdThen === buffer.getVersionId() && this._editor.hasModel()) {
+						this._breadcrumbsDataSource.update(model, this._editor.getPosition());
+						this._onDidChange.fire({ affectOnlyActiveElement: true });
+					}
+				}, 150);
+			}));
+
+			// update properties, send event
+			this._setOutlineModel(model);
+
+		} catch (err) {
+			this._setOutlineModel(undefined);
+			onUnexpectedError(err);
+		}
+	}
+
+	private _applyMarkersToOutline(model: OutlineModel | undefined): void {
+		if (!model || !this._configurationService.getValue(OutlineConfigKeys.problemsEnabled)) {
+			return;
+		}
+		const markers: IOutlineMarker[] = [];
+		for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(model.uri)) {
+			if (marker.severity === MarkerSeverity.Error || marker.severity === MarkerSeverity.Warning) {
+				markers.push({ ...range, severity: marker.severity });
+			}
+		}
+		model.updateMarker(markers);
+	}
+
+	private _setOutlineModel(model: OutlineModel | undefined) {
+		const position = this._editor.getPosition();
+		if (!position || !model) {
+			this._outlineModel = undefined;
+			this._breadcrumbsDataSource.clear();
+		} else {
+			if (!this._outlineModel?.merge(model)) {
+				this._outlineModel = model;
+			}
+			this._breadcrumbsDataSource.update(model, position);
+		}
+		this._onDidChange.fire({});
+	}
+}
+
+class DocumentSymbolsOutlineCreator implements IOutlineCreator<IEditorPane, DocumentSymbolItem> {
+
+	readonly dispose: () => void;
+
+	constructor(
+		@IOutlineService outlineService: IOutlineService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		const reg = outlineService.registerOutlineCreator(this);
+		this.dispose = () => reg.dispose();
+	}
+
+	matches(candidate: IEditorPane): candidate is IEditorPane {
+		const ctrl = candidate.getControl();
+		return isCodeEditor(ctrl) || isDiffEditor(ctrl);
+	}
+
+	async createOutline(pane: IEditorPane, target: OutlineTarget, _token: CancellationToken): Promise<IOutline<DocumentSymbolItem> | undefined> {
+		const control = pane.getControl();
+		let editor: ICodeEditor | undefined;
+		if (isCodeEditor(control)) {
+			editor = control;
+		} else if (isDiffEditor(control)) {
+			editor = control.getModifiedEditor();
+		}
+		if (!editor) {
+			return undefined;
+		}
+		const firstLoadBarrier = new Barrier();
+		const result = this._instantiationService.createInstance(DocumentSymbolsOutline, editor, target, firstLoadBarrier);
+		await firstLoadBarrier.wait();
+		return result;
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DocumentSymbolsOutlineCreator, LifecyclePhase.Eventually);
diff --git a/src/vs/editor/contrib/documentSymbols/media/outlineTree.css b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
similarity index 77%
rename from src/vs/editor/contrib/documentSymbols/media/outlineTree.css
rename to src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
index ccdfe57a4..107c29992 100644
--- a/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
@@ -20,11 +20,7 @@
 	color: var(--outline-element-color);
 }
 
-.monaco-list .outline-element .monaco-icon-label-container .monaco-highlighted-label,
-.monaco-list .outline-element .monaco-icon-label-container .label-description {
-	white-space: nowrap;
-}
-
+.monaco-breadcrumbs .outline-element .outline-element-decoration,
 .monaco-list .outline-element .outline-element-decoration {
 	opacity: 0.75;
 	font-size: 90%;
@@ -35,10 +31,17 @@
 	color: var(--outline-element-color);
 }
 
+/* when showing in breadcrumbs than hide a few things, like markers or descriptions */
+.monaco-breadcrumbs .outline-element .monaco-icon-label-container .monaco-icon-description-container,
+.monaco-breadcrumbs .outline-element .outline-element-decoration {
+	display: none;
+}
+
 .monaco-list .outline-element .outline-element-decoration.bubble {
 	font-family: codicon;
 	font-size: 14px;
 	opacity: 0.4;
+	padding-right: 8px;
 }
 
 .monaco-list .outline-element .outline-element-icon {
diff --git a/src/vs/editor/contrib/documentSymbols/outlineTree.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
similarity index 82%
rename from src/vs/editor/contrib/documentSymbols/outlineTree.ts
rename to src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
index c0ef55263..64b463a09 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineTree.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
@@ -3,35 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import 'vs/css!./documentSymbolsTree';
 import * as dom from 'vs/base/browser/dom';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IDataSource, ITreeNode, ITreeRenderer, ITreeSorter, ITreeFilter } from 'vs/base/browser/ui/tree/tree';
+import { ITreeNode, ITreeRenderer, ITreeFilter } from 'vs/base/browser/ui/tree/tree';
 import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import 'vs/css!./media/outlineTree';
-import 'vs/css!./media/symbol-icons';
 import { Range } from 'vs/editor/common/core/range';
 import { SymbolKind, SymbolKinds, SymbolTag } from 'vs/editor/common/modes';
 import { OutlineElement, OutlineGroup, OutlineModel } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { localize } from 'vs/nls';
-import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { OutlineConfigKeys } from 'vs/editor/contrib/documentSymbols/outline';
 import { MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { registerColor, listErrorForeground, listWarningForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
 import { IdleValue } from 'vs/base/common/async';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { URI } from 'vs/base/common/uri';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
-import { Iterable } from 'vs/base/common/iterator';
 import { Codicon } from 'vs/base/common/codicons';
+import { IOutlineComparator, OutlineConfigKeys } from 'vs/workbench/services/outline/browser/outline';
 
-export type OutlineItem = OutlineGroup | OutlineElement;
+export type DocumentSymbolItem = OutlineGroup | OutlineElement;
 
-export class OutlineNavigationLabelProvider implements IKeyboardNavigationLabelProvider<OutlineItem> {
+export class DocumentSymbolNavigationLabelProvider implements IKeyboardNavigationLabelProvider<DocumentSymbolItem> {
 
-	getKeyboardNavigationLabel(element: OutlineItem): { toString(): string; } {
+	getKeyboardNavigationLabel(element: DocumentSymbolItem): { toString(): string; } {
 		if (element instanceof OutlineGroup) {
 			return element.label;
 		} else {
@@ -40,15 +37,14 @@ export class OutlineNavigationLabelProvider implements IKeyboardNavigationLabelP
 	}
 }
 
-export class OutlineAccessibilityProvider implements IListAccessibilityProvider<OutlineItem> {
+export class DocumentSymbolAccessibilityProvider implements IListAccessibilityProvider<DocumentSymbolItem> {
 
-	constructor(private readonly ariaLabel: string) { }
+	constructor(private readonly _ariaLabel: string) { }
 
 	getWidgetAriaLabel(): string {
-		return this.ariaLabel;
+		return this._ariaLabel;
 	}
-
-	getAriaLabel(element: OutlineItem): string | null {
+	getAriaLabel(element: DocumentSymbolItem): string | null {
 		if (element instanceof OutlineGroup) {
 			return element.label;
 		} else {
@@ -57,22 +53,22 @@ export class OutlineAccessibilityProvider implements IListAccessibilityProvider<
 	}
 }
 
-export class OutlineIdentityProvider implements IIdentityProvider<OutlineItem> {
-	getId(element: OutlineItem): { toString(): string; } {
+export class DocumentSymbolIdentityProvider implements IIdentityProvider<DocumentSymbolItem> {
+	getId(element: DocumentSymbolItem): { toString(): string; } {
 		return element.id;
 	}
 }
 
-export class OutlineGroupTemplate {
-	static readonly id = 'OutlineGroupTemplate';
+class DocumentSymbolGroupTemplate {
+	static readonly id = 'DocumentSymbolGroupTemplate';
 	constructor(
 		readonly labelContainer: HTMLElement,
 		readonly label: HighlightedLabel,
 	) { }
 }
 
-export class OutlineElementTemplate {
-	static readonly id = 'OutlineElementTemplate';
+class DocumentSymbolTemplate {
+	static readonly id = 'DocumentSymbolTemplate';
 	constructor(
 		readonly container: HTMLElement,
 		readonly iconLabel: IconLabel,
@@ -81,70 +77,66 @@ export class OutlineElementTemplate {
 	) { }
 }
 
-export class OutlineVirtualDelegate implements IListVirtualDelegate<OutlineItem> {
+export class DocumentSymbolVirtualDelegate implements IListVirtualDelegate<DocumentSymbolItem> {
 
-	getHeight(_element: OutlineItem): number {
+	getHeight(_element: DocumentSymbolItem): number {
 		return 22;
 	}
 
-	getTemplateId(element: OutlineItem): string {
-		if (element instanceof OutlineGroup) {
-			return OutlineGroupTemplate.id;
-		} else {
-			return OutlineElementTemplate.id;
-		}
+	getTemplateId(element: DocumentSymbolItem): string {
+		return element instanceof OutlineGroup
+			? DocumentSymbolGroupTemplate.id
+			: DocumentSymbolTemplate.id;
 	}
 }
 
-export class OutlineGroupRenderer implements ITreeRenderer<OutlineGroup, FuzzyScore, OutlineGroupTemplate> {
+export class DocumentSymbolGroupRenderer implements ITreeRenderer<OutlineGroup, FuzzyScore, DocumentSymbolGroupTemplate> {
 
-	readonly templateId: string = OutlineGroupTemplate.id;
+	readonly templateId: string = DocumentSymbolGroupTemplate.id;
 
-	renderTemplate(container: HTMLElement): OutlineGroupTemplate {
+	renderTemplate(container: HTMLElement): DocumentSymbolGroupTemplate {
 		const labelContainer = dom.$('.outline-element-label');
 		container.classList.add('outline-element');
 		dom.append(container, labelContainer);
-		return new OutlineGroupTemplate(labelContainer, new HighlightedLabel(labelContainer, true));
+		return new DocumentSymbolGroupTemplate(labelContainer, new HighlightedLabel(labelContainer, true));
 	}
 
-	renderElement(node: ITreeNode<OutlineGroup, FuzzyScore>, index: number, template: OutlineGroupTemplate): void {
-		template.label.set(
-			node.element.label,
-			createMatches(node.filterData)
-		);
+	renderElement(node: ITreeNode<OutlineGroup, FuzzyScore>, _index: number, template: DocumentSymbolGroupTemplate): void {
+		template.label.set(node.element.label, createMatches(node.filterData));
 	}
 
-	disposeTemplate(_template: OutlineGroupTemplate): void {
+	disposeTemplate(_template: DocumentSymbolGroupTemplate): void {
 		// nothing
 	}
 }
 
-export class OutlineElementRenderer implements ITreeRenderer<OutlineElement, FuzzyScore, OutlineElementTemplate> {
+export class DocumentSymbolRenderer implements ITreeRenderer<OutlineElement, FuzzyScore, DocumentSymbolTemplate> {
 
-	readonly templateId: string = OutlineElementTemplate.id;
+	readonly templateId: string = DocumentSymbolTemplate.id;
 
 	constructor(
+		private _renderMarker: boolean,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IThemeService private readonly _themeService: IThemeService,
 	) { }
 
-	renderTemplate(container: HTMLElement): OutlineElementTemplate {
+	renderTemplate(container: HTMLElement): DocumentSymbolTemplate {
 		container.classList.add('outline-element');
 		const iconLabel = new IconLabel(container, { supportHighlights: true });
 		const iconClass = dom.$('.outline-element-icon');
 		const decoration = dom.$('.outline-element-decoration');
 		container.prepend(iconClass);
 		container.appendChild(decoration);
-		return new OutlineElementTemplate(container, iconLabel, iconClass, decoration);
+		return new DocumentSymbolTemplate(container, iconLabel, iconClass, decoration);
 	}
 
-	renderElement(node: ITreeNode<OutlineElement, FuzzyScore>, index: number, template: OutlineElementTemplate): void {
+	renderElement(node: ITreeNode<OutlineElement, FuzzyScore>, _index: number, template: DocumentSymbolTemplate): void {
 		const { element } = node;
-		const options = {
+		const options: IIconLabelValueOptions = {
 			matches: createMatches(node.filterData),
 			labelEscapeNewLines: true,
-			extraClasses: <string[]>[],
-			title: localize('title.template', "{0} ({1})", element.symbol.name, OutlineElementRenderer._symbolKindNames[element.symbol.kind])
+			extraClasses: ['nowrap'],
+			title: localize('title.template', "{0} ({1})", element.symbol.name, DocumentSymbolRenderer._symbolKindNames[element.symbol.kind])
 		};
 		if (this._configurationService.getValue(OutlineConfigKeys.icons)) {
 			// add styles for the icons
@@ -152,14 +144,17 @@ export class OutlineElementRenderer implements ITreeRenderer<OutlineElement, Fuz
 			template.iconClass.classList.add(`outline-element-icon`, ...SymbolKinds.toCssClassName(element.symbol.kind, true).split(' '));
 		}
 		if (element.symbol.tags.indexOf(SymbolTag.Deprecated) >= 0) {
-			options.extraClasses.push(`deprecated`);
+			options.extraClasses!.push(`deprecated`);
 			options.matches = [];
 		}
 		template.iconLabel.setLabel(element.symbol.name, element.symbol.detail, options);
-		this._renderMarkerInfo(element, template);
+
+		if (this._renderMarker) {
+			this._renderMarkerInfo(element, template);
+		}
 	}
 
-	private _renderMarkerInfo(element: OutlineElement, template: OutlineElementTemplate): void {
+	private _renderMarkerInfo(element: OutlineElement, template: DocumentSymbolTemplate): void {
 
 		if (!element.marker) {
 			dom.hide(template.decoration);
@@ -227,47 +222,12 @@ export class OutlineElementRenderer implements ITreeRenderer<OutlineElement, Fuz
 		[SymbolKind.Variable]: localize('Variable', "variable"),
 	};
 
-	disposeTemplate(_template: OutlineElementTemplate): void {
+	disposeTemplate(_template: DocumentSymbolTemplate): void {
 		_template.iconLabel.dispose();
 	}
 }
 
-export const enum OutlineSortOrder {
-	ByPosition,
-	ByName,
-	ByKind
-}
-
-export class OutlineFilter implements ITreeFilter<OutlineItem> {
-
-	static readonly configNameToKind = Object.freeze({
-		['showFiles']: SymbolKind.File,
-		['showModules']: SymbolKind.Module,
-		['showNamespaces']: SymbolKind.Namespace,
-		['showPackages']: SymbolKind.Package,
-		['showClasses']: SymbolKind.Class,
-		['showMethods']: SymbolKind.Method,
-		['showProperties']: SymbolKind.Property,
-		['showFields']: SymbolKind.Field,
-		['showConstructors']: SymbolKind.Constructor,
-		['showEnums']: SymbolKind.Enum,
-		['showInterfaces']: SymbolKind.Interface,
-		['showFunctions']: SymbolKind.Function,
-		['showVariables']: SymbolKind.Variable,
-		['showConstants']: SymbolKind.Constant,
-		['showStrings']: SymbolKind.String,
-		['showNumbers']: SymbolKind.Number,
-		['showBooleans']: SymbolKind.Boolean,
-		['showArrays']: SymbolKind.Array,
-		['showObjects']: SymbolKind.Object,
-		['showKeys']: SymbolKind.Key,
-		['showNull']: SymbolKind.Null,
-		['showEnumMembers']: SymbolKind.EnumMember,
-		['showStructs']: SymbolKind.Struct,
-		['showEvents']: SymbolKind.Event,
-		['showOperators']: SymbolKind.Operator,
-		['showTypeParameters']: SymbolKind.TypeParameter,
-	});
+export class DocumentSymbolFilter implements ITreeFilter<DocumentSymbolItem> {
 
 	static readonly kindToConfigName = Object.freeze({
 		[SymbolKind.File]: 'showFiles',
@@ -299,60 +259,48 @@ export class OutlineFilter implements ITreeFilter<OutlineItem> {
 	});
 
 	constructor(
-		private readonly _prefix: string,
+		private readonly _prefix: 'breadcrumbs' | 'outline',
 		@ITextResourceConfigurationService private readonly _textResourceConfigService: ITextResourceConfigurationService,
 	) { }
 
-	filter(element: OutlineItem): boolean {
+	filter(element: DocumentSymbolItem): boolean {
 		const outline = OutlineModel.get(element);
-		let uri: URI | undefined;
-
-		if (outline) {
-			uri = outline.uri;
-		}
-
 		if (!(element instanceof OutlineElement)) {
 			return true;
 		}
-
-		const configName = OutlineFilter.kindToConfigName[element.symbol.kind];
+		const configName = DocumentSymbolFilter.kindToConfigName[element.symbol.kind];
 		const configKey = `${this._prefix}.${configName}`;
-		return this._textResourceConfigService.getValue(uri, configKey);
+		return this._textResourceConfigService.getValue(outline?.uri, configKey);
 	}
 }
 
-export class OutlineItemComparator implements ITreeSorter<OutlineItem> {
+export class DocumentSymbolComparator implements IOutlineComparator<DocumentSymbolItem> {
 
 	private readonly _collator = new IdleValue<Intl.Collator>(() => new Intl.Collator(undefined, { numeric: true }));
 
-	constructor(
-		public type: OutlineSortOrder = OutlineSortOrder.ByPosition
-	) { }
-
-	compare(a: OutlineItem, b: OutlineItem): number {
+	compareByPosition(a: DocumentSymbolItem, b: DocumentSymbolItem): number {
 		if (a instanceof OutlineGroup && b instanceof OutlineGroup) {
 			return a.order - b.order;
-
 		} else if (a instanceof OutlineElement && b instanceof OutlineElement) {
-			if (this.type === OutlineSortOrder.ByKind) {
-				return a.symbol.kind - b.symbol.kind || this._collator.value.compare(a.symbol.name, b.symbol.name);
-			} else if (this.type === OutlineSortOrder.ByName) {
-				return this._collator.value.compare(a.symbol.name, b.symbol.name) || Range.compareRangesUsingStarts(a.symbol.range, b.symbol.range);
-			} else if (this.type === OutlineSortOrder.ByPosition) {
-				return Range.compareRangesUsingStarts(a.symbol.range, b.symbol.range) || this._collator.value.compare(a.symbol.name, b.symbol.name);
-			}
+			return Range.compareRangesUsingStarts(a.symbol.range, b.symbol.range) || this._collator.value.compare(a.symbol.name, b.symbol.name);
 		}
 		return 0;
 	}
-}
-
-export class OutlineDataSource implements IDataSource<OutlineModel, OutlineItem> {
-
-	getChildren(element: undefined | OutlineModel | OutlineGroup | OutlineElement) {
-		if (!element) {
-			return Iterable.empty();
+	compareByType(a: DocumentSymbolItem, b: DocumentSymbolItem): number {
+		if (a instanceof OutlineGroup && b instanceof OutlineGroup) {
+			return a.order - b.order;
+		} else if (a instanceof OutlineElement && b instanceof OutlineElement) {
+			return a.symbol.kind - b.symbol.kind || this._collator.value.compare(a.symbol.name, b.symbol.name);
 		}
-		return element.children.values();
+		return 0;
+	}
+	compareByName(a: DocumentSymbolItem, b: DocumentSymbolItem): number {
+		if (a instanceof OutlineGroup && b instanceof OutlineGroup) {
+			return a.order - b.order;
+		} else if (a instanceof OutlineElement && b instanceof OutlineElement) {
+			return this._collator.value.compare(a.symbol.name, b.symbol.name) || Range.compareRangesUsingStarts(a.symbol.range, b.symbol.range);
+		}
+		return 0;
 	}
 }
 
@@ -721,5 +669,4 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 	if (symbolIconVariableColor) {
 		collector.addRule(`${Codicon.symbolVariable.cssSelector} { color: ${symbolIconVariableColor}; }`);
 	}
-
 });
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
index eb4566740..99417655a 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
@@ -30,10 +30,10 @@ export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProv
 	}
 
 	private get configuration() {
-		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor;
+		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench?.editor;
 
 		return {
-			openEditorPinned: !editorConfig.enablePreviewFromQuickOpen,
+			openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview
 		};
 	}
 
@@ -44,12 +44,12 @@ export class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProv
 	protected gotoLocation(context: IQuickAccessTextEditorContext, options: { range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean, preserveFocus?: boolean }): void {
 
 		// Check for sideBySide use
-		if ((options.keyMods.ctrlCmd || options.forceSideBySide) && this.editorService.activeEditor) {
+		if ((options.keyMods.alt || (this.configuration.openEditorPinned && options.keyMods.ctrlCmd) || options.forceSideBySide) && this.editorService.activeEditor) {
 			context.restoreViewState?.(); // since we open to the side, restore view state in this editor
 
 			this.editorService.openEditor(this.editorService.activeEditor, {
 				selection: options.range,
-				pinned: options.keyMods.alt || this.configuration.openEditorPinned,
+				pinned: options.keyMods.ctrlCmd || this.configuration.openEditorPinned,
 				preserveFocus: options.preserveFocus
 			}, SIDE_GROUP);
 		}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index bb7642fe7..4f76c5547 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -12,9 +12,9 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IQuickAccessRegistry, Extensions as QuickaccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
 import { AbstractGotoSymbolQuickAccessProvider, IGotoSymbolQuickPickItem } from 'vs/editor/contrib/quickAccess/gotoSymbolQuickAccess';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEditorConfiguration, IEditorPane } from 'vs/workbench/common/editor';
+import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
 import { ITextModel } from 'vs/editor/common/model';
-import { DisposableStore, IDisposable, toDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable, toDisposable, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import { timeout } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { registerAction2, Action2 } from 'vs/platform/actions/common/actions';
@@ -23,10 +23,11 @@ import { prepareQuery } from 'vs/base/common/fuzzyScorer';
 import { SymbolKind } from 'vs/editor/common/modes';
 import { fuzzyScore, createMatches } from 'vs/base/common/filters';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickAccessTextEditorContext } from 'vs/editor/contrib/quickAccess/editorNavigationQuickAccess';
+import { IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { isCompositeEditor } from 'vs/editor/browser/editorBrowser';
 
 export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccessProvider {
 
@@ -34,7 +35,8 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IOutlineService private readonly outlineService: IOutlineService,
 	) {
 		super({
 			openSideBySideDirection: () => this.configuration.openSideBySideDirection
@@ -43,36 +45,37 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 
 	//#region DocumentSymbols (text editor required)
 
-	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken): IDisposable {
-		if (this.canPickFromTableOfContents()) {
-			return this.doGetTableOfContentsPicks(picker);
-		}
-
-		return super.provideWithTextEditor(context, picker, token);
-	}
-
 	private get configuration() {
-		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor;
+		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench?.editor;
 
 		return {
-			openEditorPinned: !editorConfig.enablePreviewFromQuickOpen,
-			openSideBySideDirection: editorConfig.openSideBySideDirection
+			openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview,
+			openSideBySideDirection: editorConfig?.openSideBySideDirection
 		};
 	}
 
 	protected get activeTextEditorControl() {
+		// TODO@bpasero this distinction should go away by adopting `IOutlineService`
+		// for all editors (either text based ones or not). Currently text based
+		// editors are not yet using the new outline service infrastructure but the
+		// "classical" document symbols approach.
+
+		if (isCompositeEditor(this.editorService.activeEditorPane?.getControl())) {
+			return undefined;
+		}
+
 		return this.editorService.activeTextEditorControl;
 	}
 
 	protected gotoLocation(context: IQuickAccessTextEditorContext, options: { range: IRange, keyMods: IKeyMods, forceSideBySide?: boolean, preserveFocus?: boolean }): void {
 
 		// Check for sideBySide use
-		if ((options.keyMods.ctrlCmd || options.forceSideBySide) && this.editorService.activeEditor) {
+		if ((options.keyMods.alt || (this.configuration.openEditorPinned && options.keyMods.ctrlCmd) || options.forceSideBySide) && this.editorService.activeEditor) {
 			context.restoreViewState?.(); // since we open to the side, restore view state in this editor
 
 			this.editorService.openEditor(this.editorService.activeEditor, {
 				selection: options.range,
-				pinned: options.keyMods.alt || this.configuration.openEditorPinned,
+				pinned: options.keyMods.ctrlCmd || this.configuration.openEditorPinned,
 				preserveFocus: options.preserveFocus
 			}, SIDE_GROUP);
 		}
@@ -104,7 +107,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 			return [];
 		}
 
-		return this.doGetSymbolPicks(this.getDocumentSymbols(model, true, token), prepareQuery(filter), options, token);
+		return this.doGetSymbolPicks(this.getDocumentSymbols(model, token), prepareQuery(filter), options, token);
 	}
 
 	addDecorations(editor: IEditor, range: IRange): void {
@@ -118,22 +121,21 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 	//#endregion
 
 	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
-		if (this.canPickFromTableOfContents()) {
-			return this.doGetTableOfContentsPicks(picker);
+		if (this.canPickWithOutlineService()) {
+			return this.doGetOutlinePicks(picker);
 		}
 		return super.provideWithoutTextEditor(picker);
 	}
 
-	private canPickFromTableOfContents(): boolean {
-		return this.editorService.activeEditorPane ? TableOfContentsProviderRegistry.has(this.editorService.activeEditorPane.getId()) : false;
+	private canPickWithOutlineService(): boolean {
+		return this.editorService.activeEditorPane ? this.outlineService.canCreateOutline(this.editorService.activeEditorPane) : false;
 	}
 
-	private doGetTableOfContentsPicks(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	private doGetOutlinePicks(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
 		const pane = this.editorService.activeEditorPane;
 		if (!pane) {
 			return Disposable.None;
 		}
-		const provider = TableOfContentsProviderRegistry.get(pane.getId())!;
 		const cts = new CancellationTokenSource();
 
 		const disposables = new DisposableStore();
@@ -141,30 +143,45 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 
 		picker.busy = true;
 
-		provider.provideTableOfContents(pane, { disposables }, cts.token).then(entries => {
+		this.outlineService.createOutline(pane, OutlineTarget.QuickPick, cts.token).then(outline => {
 
-			picker.busy = false;
-
-			if (cts.token.isCancellationRequested || !entries || entries.length === 0) {
+			if (!outline) {
 				return;
 			}
+			if (cts.token.isCancellationRequested) {
+				outline.dispose();
+				return;
+			}
+
+			disposables.add(outline);
+
+			const viewState = outline.captureViewState();
+			disposables.add(toDisposable(() => {
+				if (picker.selectedItems.length === 0) {
+					viewState.dispose();
+				}
+			}));
+
+			const entries = Array.from(outline.config.quickPickDataSource.getQuickPickElements());
 
 			const items: IGotoSymbolQuickPickItem[] = entries.map((entry, idx) => {
 				return {
 					kind: SymbolKind.File,
 					index: idx,
 					score: 0,
-					label: entry.icon ? `$(${entry.icon.id}) ${entry.label}` : entry.label,
-					ariaLabel: entry.detail ? `${entry.label}, ${entry.detail}` : entry.label,
-					detail: entry.detail,
+					label: entry.label,
 					description: entry.description,
+					ariaLabel: entry.ariaLabel,
+					iconClasses: entry.iconClasses
 				};
 			});
 
 			disposables.add(picker.onDidAccept(() => {
 				picker.hide();
 				const [entry] = picker.selectedItems;
-				entries[entry.index]?.pick();
+				if (entry && entries[entry.index]) {
+					outline.reveal(entries[entry.index].element, {}, false);
+				}
 			}));
 
 			const updatePickerItems = () => {
@@ -194,16 +211,23 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 			updatePickerItems();
 			disposables.add(picker.onDidChangeValue(updatePickerItems));
 
+			const previewDisposable = new MutableDisposable();
+			disposables.add(previewDisposable);
+
 			disposables.add(picker.onDidChangeActive(() => {
 				const [entry] = picker.activeItems;
-				if (entry) {
-					entries[entry.index]?.preview();
+				if (entry && entries[entry.index]) {
+					previewDisposable.value = outline.preview(entries[entry.index].element);
+				} else {
+					previewDisposable.clear();
 				}
 			}));
 
 		}).catch(err => {
 			onUnexpectedError(err);
 			picker.hide();
+		}).finally(() => {
+			picker.busy = false;
 		});
 
 		return disposables;
@@ -243,45 +267,3 @@ registerAction2(class GotoSymbolAction extends Action2 {
 		accessor.get(IQuickInputService).quickAccess.show(GotoSymbolQuickAccessProvider.PREFIX);
 	}
 });
-
-//#region toc definition and logic
-
-export interface ITableOfContentsEntry {
-	icon?: ThemeIcon;
-	label: string;
-	detail?: string;
-	description?: string;
-	pick(): any;
-	preview(): any;
-}
-
-export interface ITableOfContentsProvider<T extends IEditorPane = IEditorPane> {
-
-	provideTableOfContents(editor: T, context: { disposables: DisposableStore }, token: CancellationToken): Promise<ITableOfContentsEntry[] | undefined | null>;
-}
-
-class ProviderRegistry {
-
-	private readonly _provider = new Map<string, ITableOfContentsProvider>();
-
-	register(type: string, provider: ITableOfContentsProvider): IDisposable {
-		this._provider.set(type, provider);
-		return toDisposable(() => {
-			if (this._provider.get(type) === provider) {
-				this._provider.delete(type);
-			}
-		});
-	}
-
-	get(type: string): ITableOfContentsProvider | undefined {
-		return this._provider.get(type);
-	}
-
-	has(type: string): boolean {
-		return this._provider.has(type);
-	}
-}
-
-export const TableOfContentsProviderRegistry = new ProviderRegistry();
-
-//#endregion
diff --git a/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts b/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
index f7e084d03..4e693565f 100644
--- a/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
+++ b/src/vs/workbench/contrib/codeEditor/test/browser/saveParticipant.test.ts
@@ -42,25 +42,25 @@ suite('Save Participants', function () {
 		let lineContent = '';
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), lineContent);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), lineContent);
 
 		// No new line if last line already empty
 		lineContent = `Hello New Line${model.textEditorModel.getEOL()}`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), lineContent);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), lineContent);
 
 		// New empty line added (single line)
 		lineContent = 'Hello New Line';
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), `${lineContent}${model.textEditorModel.getEOL()}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${lineContent}${model.textEditorModel.getEOL()}`);
 
 		// New empty line added (multi line)
 		lineContent = `Hello New Line${model.textEditorModel.getEOL()}Hello New Line${model.textEditorModel.getEOL()}Hello New Line`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), `${lineContent}${model.textEditorModel.getEOL()}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${lineContent}${model.textEditorModel.getEOL()}`);
 	});
 
 	test('trim final new lines', async function () {
@@ -77,25 +77,25 @@ suite('Save Participants', function () {
 		let lineContent = `${textContent}`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), lineContent);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), lineContent);
 
 		// No new line removal if last line is single new line
 		lineContent = `${textContent}${eol}`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), lineContent);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), lineContent);
 
 		// Remove new line (single line with two new lines)
 		lineContent = `${textContent}${eol}${eol}`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
 
 		// Remove new lines (multiple lines with multiple new lines)
 		lineContent = `${textContent}${eol}${textContent}${eol}${eol}${eol}`;
 		model.textEditorModel.setValue(lineContent);
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}${eol}${textContent}${eol}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}${eol}${textContent}${eol}`);
 	});
 
 	test('trim final new lines bug#39750', async function () {
@@ -117,12 +117,12 @@ suite('Save Participants', function () {
 
 		// undo
 		await model.textEditorModel.undo();
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}`);
 
 		// trim final new lines should not mess the undo stack
 		await participant.participate(model, { reason: SaveReason.EXPLICIT });
 		await model.textEditorModel.redo();
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}.`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}.`);
 	});
 
 	test('trim final new lines bug#46075', async function () {
@@ -143,13 +143,13 @@ suite('Save Participants', function () {
 		}
 
 		// confirm trimming
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
 
 		// undo should go back to previous content immediately
 		await model.textEditorModel.undo();
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}${eol}${eol}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}${eol}${eol}`);
 		await model.textEditorModel.redo();
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}${eol}`);
 	});
 
 	test('trim whitespace', async function () {
@@ -169,6 +169,6 @@ suite('Save Participants', function () {
 		}
 
 		// confirm trimming
-		assert.equal(snapshotToString(model.createSnapshot()!), `${textContent}`);
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), `${textContent}`);
 	});
 });
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index ffab7e07c..1d4e0e380 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -25,7 +25,7 @@ import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
 import { peekViewBorder } from 'vs/editor/contrib/peekView/peekView';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import * as nls from 'vs/nls';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IMenu, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -45,7 +45,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
-import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { Codicon } from 'vs/base/common/codicons';
@@ -239,15 +238,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 		const actionsContainer = dom.append(this._headElement, dom.$('.review-actions'));
 		this._actionbarWidget = new ActionBar(actionsContainer, {
-			actionViewItemProvider: (action: IAction) => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-				} else if (action instanceof SubmenuItemAction) {
-					return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-				} else {
-					return new ActionViewItem({}, action, { label: false, icon: true });
-				}
-			}
+			actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
 		});
 
 		this._disposables.add(this._actionbarWidget);
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index 9ddb42f76..0249effb3 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -142,6 +142,7 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 		}
 
 		templateData.commentText.appendChild(renderedComment);
+		templateData.commentText.title = renderedComment.textContent ?? '';
 	}
 
 	disposeTemplate(templateData: ICommentThreadTemplateData): void {
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
index 5ed011a2c..ec5544fd8 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -6,11 +6,9 @@
 import 'vs/css!./media/panel';
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { basename, isEqual } from 'vs/base/common/resources';
-import { IAction, Action } from 'vs/base/common/actions';
-import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
+import { basename } from 'vs/base/common/resources';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { CommentNode, CommentsModel, ResourceWithCommentThreads, ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel';
 import { CommentController } from 'vs/workbench/contrib/comments/browser/commentsEditorContribution';
@@ -20,14 +18,19 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { textLinkForeground, textLinkActiveForeground, focusBorder, textPreformatForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ResourceLabels } from 'vs/workbench/browser/labels';
 import { CommentsList, COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyAndExpr, ContextKeyEqualsExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
+import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { Codicon } from 'vs/base/common/codicons';
+
+const CONTEXT_KEY_HAS_COMMENTS = new RawContextKey<boolean>('commentsView.hasComments', false);
 
 export class CommentsPanel extends ViewPane {
 	private treeLabels!: ResourceLabels;
@@ -35,7 +38,7 @@ export class CommentsPanel extends ViewPane {
 	private treeContainer!: HTMLElement;
 	private messageBoxContainer!: HTMLElement;
 	private commentsModel!: CommentsModel;
-	private collapseAllAction?: IAction;
+	private readonly hasCommentsContextKey: IContextKey<boolean>;
 
 	readonly onDidChangeVisibility = this.onDidChangeBodyVisibility;
 
@@ -52,8 +55,10 @@ export class CommentsPanel extends ViewPane {
 		@IThemeService themeService: IThemeService,
 		@ICommentService private readonly commentService: ICommentService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+		this.hasCommentsContextKey = CONTEXT_KEY_HAS_COMMENTS.bindTo(contextKeyService);
 	}
 
 	public renderBody(container: HTMLElement): void {
@@ -129,13 +134,14 @@ export class CommentsPanel extends ViewPane {
 		await this.tree.setInput(this.commentsModel);
 	}
 
-	public getActions(): IAction[] {
-		if (!this.collapseAllAction) {
-			this.collapseAllAction = new Action('vs.tree.collapse', nls.localize('collapseAll', "Collapse All"), 'collapse-all', true, () => this.tree ? new CollapseAllAction<any, any>(this.tree, true).run() : Promise.resolve());
-			this._register(this.collapseAllAction);
+	public collapseAll() {
+		if (this.tree) {
+			this.tree.collapseAll();
+			this.tree.setSelection([]);
+			this.tree.setFocus([]);
+			this.tree.domFocus();
+			this.tree.focusFirst();
 		}
-
-		return [this.collapseAllAction];
 	}
 
 	public layoutBody(height: number, width: number): void {
@@ -206,7 +212,7 @@ export class CommentsPanel extends ViewPane {
 
 		const activeEditor = this.editorService.activeEditor;
 		let currentActiveResource = activeEditor ? activeEditor.resource : undefined;
-		if (currentActiveResource && isEqual(currentActiveResource, element.resource)) {
+		if (this.uriIdentityService.extUri.isEqual(element.resource, currentActiveResource)) {
 			const threadToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].threadId : element.threadId;
 			const commentToReveal = element instanceof ResourceWithCommentThreads ? element.commentThreads[0].comment.uniqueIdInThread : element.comment.uniqueIdInThread;
 			const control = this.editorService.activeTextEditorControl;
@@ -243,9 +249,7 @@ export class CommentsPanel extends ViewPane {
 
 	private async refresh(): Promise<void> {
 		if (this.isVisible()) {
-			if (this.collapseAllAction) {
-				this.collapseAllAction.enabled = this.commentsModel.hasCommentThreads();
-			}
+			this.hasCommentsContextKey.set(this.commentsModel.hasCommentThreads());
 
 			this.treeContainer.classList.toggle('hidden', !this.commentsModel.hasCommentThreads());
 			this.renderMessage();
@@ -281,3 +285,23 @@ CommandsRegistry.registerCommand({
 		viewsService.openView(COMMENTS_VIEW_ID, true);
 	}
 });
+
+registerAction2(class Collapse extends ViewAction<CommentsPanel> {
+	constructor() {
+		super({
+			viewId: COMMENTS_VIEW_ID,
+			id: 'comments.collapse',
+			title: nls.localize('collapseAll', "Collapse All"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyAndExpr.create([ContextKeyEqualsExpr.create('view', COMMENTS_VIEW_ID), CONTEXT_KEY_HAS_COMMENTS])
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: CommentsPanel) {
+		view.collapseAll();
+	}
+});
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
index c57aa6dd3..66de7e83c 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce, distinct } from 'vs/base/common/arrays';
+import { coalesce, distinct, firstOrDefault } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Lazy } from 'vs/base/common/lazy';
@@ -28,7 +28,7 @@ import { EditorInput, EditorOptions, Extensions as EditorInputExtensions, GroupI
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { CONTEXT_CUSTOM_EDITORS, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
 import { CustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditorModelManager';
-import { IWebviewService, webviewHasOwnEditFunctionsContext } from 'vs/workbench/contrib/webview/browser/webview';
+import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { CustomEditorAssociation, CustomEditorsAssociations, customEditorsAssociationsSettingId } from 'vs/workbench/services/editor/common/editorOpenWith';
 import { ICustomEditorInfo, ICustomEditorViewTypesHandler, IEditorService, IOpenEditorOverride, IOpenEditorOverrideEntry } from 'vs/workbench/services/editor/common/editorService';
@@ -45,7 +45,6 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 
 	private readonly _customEditorContextKey: IContextKey<string>;
 	private readonly _focusedCustomEditorIsEditable: IContextKey<boolean>;
-	private readonly _webviewHasOwnEditFunctions: IContextKey<boolean>;
 	private readonly _onDidChangeViewTypes = new Emitter<void>();
 	onDidChangeViewTypes: Event<void> = this._onDidChangeViewTypes.event;
 
@@ -66,7 +65,6 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 
 		this._customEditorContextKey = CONTEXT_CUSTOM_EDITORS.bindTo(contextKeyService);
 		this._focusedCustomEditorIsEditable = CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE.bindTo(contextKeyService);
-		this._webviewHasOwnEditFunctions = webviewHasOwnEditFunctionsContext.bindTo(contextKeyService);
 
 		this._contributedEditors = this._register(new ContributedCustomEditors(storageService));
 		this._register(this._contributedEditors.onChange(() => {
@@ -156,13 +154,8 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 			...this.getAllCustomEditors(resource).allEditors,
 		]);
 
-		let currentlyOpenedEditorType: undefined | string;
-		for (const editor of group ? group.editors : []) {
-			if (editor.resource && isEqual(editor.resource, resource)) {
-				currentlyOpenedEditorType = editor instanceof CustomEditorInput ? editor.viewType : defaultCustomEditor.id;
-				break;
-			}
-		}
+		const existingEditorForResource = group && firstOrDefault(this.editorService.findEditors(resource, group));
+		const currentlyOpenedEditorType: undefined | string = existingEditorForResource instanceof CustomEditorInput ? existingEditorForResource.viewType : defaultCustomEditor.id;
 
 		const resourceExt = extname(resource);
 
@@ -278,9 +271,8 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		}
 
 		// Try to replace existing editors for resource
-		const existingEditors = targetGroup.editors.filter(editor => editor.resource && isEqual(editor.resource, resource));
-		if (existingEditors.length) {
-			const existing = existingEditors[0];
+		const existing = firstOrDefault(this.editorService.findEditors(resource, targetGroup));
+		if (existing) {
 			if (!input.matches(existing)) {
 				await this.editorService.replaceEditors([{
 					editor: existing,
@@ -317,7 +309,6 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		if (!resource) {
 			this._customEditorContextKey.reset();
 			this._focusedCustomEditorIsEditable.reset();
-			this._webviewHasOwnEditFunctions.reset();
 			return;
 		}
 
@@ -325,7 +316,6 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 
 		this._customEditorContextKey.set(possibleEditors.map(x => x.id).join(','));
 		this._focusedCustomEditorIsEditable.set(activeEditorPane?.input instanceof CustomEditorInput);
-		this._webviewHasOwnEditFunctions.set(possibleEditors.length > 0);
 	}
 
 	private async handleMovedFileInOpenedFileEditors(oldResource: URI, newResource: URI): Promise<void> {
@@ -457,7 +447,7 @@ export class CustomEditorContribution extends Disposable implements IWorkbenchCo
 				return this.onEditorOpening(editor, options, group);
 			},
 			getEditorOverrides: (resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): IOpenEditorOverrideEntry[] => {
-				const currentEditor = group?.editors.find(editor => isEqual(editor.resource, resource));
+				const currentEditor = group && firstOrDefault(this.editorService.findEditors(resource, group));
 
 				const toOverride = (entry: CustomEditorInfo): IOpenEditorOverrideEntry => {
 					return {
@@ -546,7 +536,7 @@ export class CustomEditorContribution extends Disposable implements IWorkbenchCo
 			return;
 		}
 
-		const existingEditorForResource = group.editors.find(editor => isEqual(resource, editor.resource));
+		const existingEditorForResource = firstOrDefault(this.editorService.findEditors(resource, group));
 		if (existingEditorForResource) {
 			if (editor === existingEditorForResource) {
 				return;
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
index 966dc83e5..65d81d074 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
@@ -15,7 +15,6 @@ import { IModelDecorationOptions, IModelDeltaDecoration, TrackedRangeStickiness,
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { RemoveBreakpointAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { IDebugService, IBreakpoint, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, BreakpointWidgetContext, IBreakpointEditorContribution, IBreakpointUpdateData, IDebugConfiguration, State, IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
 import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
@@ -173,6 +172,24 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
 		this.setDecorationsScheduler.schedule();
 	}
 
+	/**
+	 * Returns context menu actions at the line number if breakpoints can be
+	 * set. This is used by the {@link TestingDecorations} to allow breakpoint
+	 * setting on lines where breakpoint "run" actions are present.
+	 */
+	public getContextMenuActionsAtPosition(lineNumber: number, model: ITextModel) {
+		if (!this.debugService.getAdapterManager().hasDebuggers()) {
+			return [];
+		}
+
+		if (!this.debugService.canSetBreakpointsIn(model)) {
+			return [];
+		}
+
+		const breakpoints = this.debugService.getModel().getBreakpoints({ lineNumber, uri: model.uri });
+		return this.getContextMenuActions(breakpoints, model.uri, lineNumber);
+	}
+
 	private registerListeners(): void {
 		this.toDispose.push(this.editor.onMouseDown(async (e: IEditorMouseEvent) => {
 			if (!this.debugService.getAdapterManager().hasDebuggers()) {
@@ -301,7 +318,9 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
 		const actions: IAction[] = [];
 		if (breakpoints.length === 1) {
 			const breakpointType = breakpoints[0].logMessage ? nls.localize('logPoint', "Logpoint") : nls.localize('breakpoint', "Breakpoint");
-			actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, nls.localize('removeBreakpoint', "Remove {0}", breakpointType), this.debugService));
+			actions.push(new Action('debug.removeBreakpoint', nls.localize('removeBreakpoint', "Remove {0}", breakpointType), undefined, true, async () => {
+				await this.debugService.removeBreakpoints(breakpoints[0].getId());
+			}));
 			actions.push(new Action(
 				'workbench.debug.action.editBreakpointAction',
 				nls.localize('editBreakpoint', "Edit {0}...", breakpointType),
@@ -375,7 +394,8 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
 		const decorations = this.editor.getLineDecorations(line);
 		if (decorations) {
 			for (const { options } of decorations) {
-				if (options.glyphMarginClassName && options.glyphMarginClassName.indexOf('codicon-') === -1) {
+				const clz = options.glyphMarginClassName;
+				if (clz && (!clz.includes('codicon-') || clz.includes('codicon-testing-'))) {
 					return false;
 				}
 			}
@@ -454,7 +474,7 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
 			// Candidate decoration has a breakpoint attached when a breakpoint is already at that location and we did not yet set a decoration there
 			// In practice this happens for the first breakpoint that was set on a line
 			// We could have also rendered this first decoration as part of desiredBreakpointDecorations however at that moment we have no location information
-			const icon = candidate.breakpoint ? getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), candidate.breakpoint, this.labelService).icon : icons.debugBreakpointDisabled;
+			const icon = candidate.breakpoint ? getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), candidate.breakpoint, this.labelService).icon : icons.breakpoint.disabled;
 			const contextMenuActions = () => this.getContextMenuActions(candidate.breakpoint ? [candidate.breakpoint] : [], activeCodeEditor.getModel().uri, candidate.range.startLineNumber, candidate.range.startColumn);
 			const inlineWidget = new InlineBreakpointWidget(activeCodeEditor, decorationId, ThemeIcon.asClassName(icon), candidate.breakpoint, this.debugService, this.contextMenuService, contextMenuActions);
 
@@ -645,15 +665,11 @@ registerThemingParticipant((theme, collector) => {
 	const debugIconBreakpointColor = theme.getColor(debugIconBreakpointForeground);
 	if (debugIconBreakpointColor) {
 		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpoint)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointConditional)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointLog)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointFunction)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointData)},
+		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.regular)}`).join(',\n		')},
 		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointUnsupported)},
 		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointHint)}:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']),
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpoint)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpoint)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
+		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
+		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
 			color: ${debugIconBreakpointColor} !important;
 		}
 		`);
@@ -662,7 +678,7 @@ registerThemingParticipant((theme, collector) => {
 	const debugIconBreakpointDisabledColor = theme.getColor(debugIconBreakpointDisabledForeground);
 	if (debugIconBreakpointDisabledColor) {
 		collector.addRule(`
-		.monaco-workbench .codicon[class*='-disabled'] {
+		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.disabled)}`).join(',\n		')} {
 			color: ${debugIconBreakpointDisabledColor} !important;
 		}
 		`);
@@ -671,7 +687,7 @@ registerThemingParticipant((theme, collector) => {
 	const debugIconBreakpointUnverifiedColor = theme.getColor(debugIconBreakpointUnverifiedForeground);
 	if (debugIconBreakpointUnverifiedColor) {
 		collector.addRule(`
-		.monaco-workbench .codicon[class*='-unverified'] {
+		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.unverified)}`).join(',\n		')} {
 			color: ${debugIconBreakpointUnverifiedColor};
 		}
 		`);
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
index 362d05447..cc8b39633 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
@@ -221,6 +221,9 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		this.input = <IActiveCodeEditor>scopedInstatiationService.createInstance(CodeEditorWidget, container, options, codeEditorWidgetOptions);
 		CONTEXT_IN_BREAKPOINT_WIDGET.bindTo(scopedContextKeyService).set(true);
 		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:${this.editor.getId()}:breakpointinput`), true);
+		if (this.editor.hasModel()) {
+			model.setMode(this.editor.getModel().getLanguageIdentifier());
+		}
 		this.input.setModel(model);
 		this.toDispose.push(model);
 		const setDecorations = () => {
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 7fa72c43f..4fb3fead1 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -3,13 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import * as resources from 'vs/base/common/resources';
 import * as dom from 'vs/base/browser/dom';
-import { IAction, Action, Separator } from 'vs/base/common/actions';
-import { IDebugService, IBreakpoint, CONTEXT_BREAKPOINTS_FOCUSED, State, DEBUG_SCHEME, IFunctionBreakpoint, IExceptionBreakpoint, IEnablement, BREAKPOINT_EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution, IDebugModel, IDataBreakpoint } from 'vs/workbench/contrib/debug/common/debug';
+import { IAction } from 'vs/base/common/actions';
+import { IDebugService, IBreakpoint, CONTEXT_BREAKPOINTS_FOCUSED, State, DEBUG_SCHEME, IFunctionBreakpoint, IExceptionBreakpoint, IEnablement, IDebugModel, IDataBreakpoint, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_IN_DEBUG_MODE, IBaseBreakpoint, IBreakpointEditorContribution, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_INPUT_FOCUSED } from 'vs/workbench/contrib/debug/common/debug';
 import { ExceptionBreakpoint, FunctionBreakpoint, Breakpoint, DataBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
-import { AddFunctionBreakpointAction, ToggleBreakpointsActivatedAction, RemoveAllBreakpointsAction, RemoveBreakpointAction, EnableAllBreakpointsAction, DisableAllBreakpointsAction, ReapplyBreakpointsAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -24,12 +22,11 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { WorkbenchList, ListResourceNavigator } from 'vs/platform/list/browser/listService';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
-import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyEqualsExpr, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Gesture } from 'vs/base/browser/touch';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
@@ -38,6 +35,13 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { registerAction2, Action2, MenuId, IMenu, IMenuService } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Codicon } from 'vs/base/common/codicons';
 
 const $ = dom.$;
 
@@ -57,11 +61,21 @@ export function getExpandedBodySize(model: IDebugModel, countLimit: number): num
 }
 type BreakpointItem = IBreakpoint | IFunctionBreakpoint | IDataBreakpoint | IExceptionBreakpoint;
 
+interface InputBoxData {
+	breakpoint: IFunctionBreakpoint | IExceptionBreakpoint;
+	type: 'condition' | 'hitCount' | 'name';
+}
+
 export class BreakpointsView extends ViewPane {
 
 	private list!: WorkbenchList<BreakpointItem>;
 	private needsRefresh = false;
 	private ignoreLayout = false;
+	private menu: IMenu;
+	private breakpointItemType: IContextKey<string | undefined>;
+	private breakpointSupportsCondition: IContextKey<boolean>;
+	private _inputBoxData: InputBoxData | undefined;
+	breakpointInputFocused: IContextKey<boolean>;
 
 	constructor(
 		options: IViewletViewOptions,
@@ -78,26 +92,32 @@ export class BreakpointsView extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@ILabelService private readonly labelService: ILabelService,
+		@IMenuService menuService: IMenuService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 
+		this.menu = menuService.createMenu(MenuId.DebugBreakpointsContext, contextKeyService);
+		this._register(this.menu);
+		this.breakpointItemType = CONTEXT_BREAKPOINT_ITEM_TYPE.bindTo(contextKeyService);
+		this.breakpointSupportsCondition = CONTEXT_BREAKPOINT_SUPPORTS_CONDITION.bindTo(contextKeyService);
+		this.breakpointInputFocused = CONTEXT_BREAKPOINT_INPUT_FOCUSED.bindTo(contextKeyService);
 		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.onBreakpointsChange()));
 	}
 
-	public renderBody(container: HTMLElement): void {
+	renderBody(container: HTMLElement): void {
 		super.renderBody(container);
 
 		this.element.classList.add('debug-pane');
 		container.classList.add('debug-breakpoints');
-		const delegate = new BreakpointsDelegate(this.debugService);
+		const delegate = new BreakpointsDelegate(this);
 
 		this.list = <WorkbenchList<BreakpointItem>>this.instantiationService.createInstance(WorkbenchList, 'Breakpoints', container, delegate, [
-			this.instantiationService.createInstance(BreakpointsRenderer),
-			new ExceptionBreakpointsRenderer(this.debugService),
-			new ExceptionBreakpointInputRenderer(this.debugService, this.contextViewService, this.themeService),
-			this.instantiationService.createInstance(FunctionBreakpointsRenderer),
+			this.instantiationService.createInstance(BreakpointsRenderer, this.menu, this.breakpointSupportsCondition),
+			new ExceptionBreakpointsRenderer(this.menu, this.breakpointSupportsCondition, this.debugService),
+			new ExceptionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.themeService),
+			this.instantiationService.createInstance(FunctionBreakpointsRenderer, this.menu, this.breakpointSupportsCondition),
 			this.instantiationService.createInstance(DataBreakpointsRenderer),
-			new FunctionBreakpointInputRenderer(this.debugService, this.contextViewService, this.themeService, this.labelService)
+			new FunctionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.themeService, this.labelService)
 		], {
 			identityProvider: { getId: (element: IEnablement) => element.getId() },
 			multipleSelectionSupport: false,
@@ -135,10 +155,9 @@ export class BreakpointsView extends ViewPane {
 			if (e.element instanceof Breakpoint) {
 				openBreakpointSource(e.element, e.sideBySide, e.editorOptions.preserveFocus || false, e.editorOptions.pinned || !e.editorOptions.preserveFocus, this.debugService, this.editorService);
 			}
-			if (e.browserEvent instanceof MouseEvent && e.browserEvent.detail === 2 && e.element instanceof FunctionBreakpoint && e.element !== this.debugService.getViewModel().getSelectedBreakpoint()) {
+			if (e.browserEvent instanceof MouseEvent && e.browserEvent.detail === 2 && e.element instanceof FunctionBreakpoint && e.element !== this.inputBoxData?.breakpoint) {
 				// double click
-				this.debugService.getViewModel().setSelectedBreakpoint(e.element);
-				this.onBreakpointsChange();
+				this.renderInputBox({ breakpoint: e.element, type: 'name' });
 			}
 		}));
 
@@ -156,13 +175,23 @@ export class BreakpointsView extends ViewPane {
 		}));
 	}
 
-	public focus(): void {
+	focus(): void {
 		super.focus();
 		if (this.list) {
 			this.list.domFocus();
 		}
 	}
 
+	renderInputBox(data: InputBoxData | undefined): void {
+		this._inputBoxData = data;
+		this.onBreakpointsChange();
+		this._inputBoxData = undefined;
+	}
+
+	get inputBoxData(): InputBoxData | undefined {
+		return this._inputBoxData;
+	}
+
 	protected layoutBody(height: number, width: number): void {
 		if (this.ignoreLayout) {
 			return;
@@ -181,71 +210,25 @@ export class BreakpointsView extends ViewPane {
 	}
 
 	private onListContextMenu(e: IListContextMenuEvent<IEnablement>): void {
-		if (!e.element) {
-			return;
-		}
-
-		const actions: IAction[] = [];
 		const element = e.element;
+		const type = element instanceof Breakpoint ? 'breakpoint' : element instanceof ExceptionBreakpoint ? 'exceptionBreakpoint' :
+			element instanceof FunctionBreakpoint ? 'functionBreakpoint' : element instanceof DataBreakpoint ? 'dataBreakpoint' : undefined;
+		this.breakpointItemType.set(type);
+		const session = this.debugService.getViewModel().focusedSession;
+		const conditionSupported = element instanceof ExceptionBreakpoint ? element.supportsCondition : (!session || !!session.capabilities.supportsConditionalBreakpoints);
+		this.breakpointSupportsCondition.set(conditionSupported);
 
-		if (element instanceof ExceptionBreakpoint) {
-			if (element.supportsCondition) {
-				actions.push(new Action('workbench.action.debug.editExceptionBreakpointCondition', nls.localize('editCondition', "Edit Condition"), '', true, async () => {
-					this.debugService.getViewModel().setSelectedBreakpoint(element);
-					this.onBreakpointsChange();
-				}));
-			}
-		} else {
-			const breakpointType = element instanceof Breakpoint && element.logMessage ? nls.localize('Logpoint', "Logpoint") : nls.localize('Breakpoint', "Breakpoint");
-			if (element instanceof Breakpoint || element instanceof FunctionBreakpoint) {
-				actions.push(new Action('workbench.action.debug.openEditorAndEditBreakpoint', nls.localize('editBreakpoint', "Edit {0}...", breakpointType), '', true, async () => {
-					if (element instanceof Breakpoint) {
-						const editor = await openBreakpointSource(element, false, false, true, this.debugService, this.editorService);
-						if (editor) {
-							const codeEditor = editor.getControl();
-							if (isCodeEditor(codeEditor)) {
-								codeEditor.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID).showBreakpointWidget(element.lineNumber, element.column);
-							}
-						}
-					} else {
-						this.debugService.getViewModel().setSelectedBreakpoint(element);
-						this.onBreakpointsChange();
-					}
-				}));
-				actions.push(new Separator());
-			}
-
-
-			actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, nls.localize('removeBreakpoint', "Remove {0}", breakpointType), this.debugService));
-
-			if (this.debugService.getModel().getBreakpoints().length + this.debugService.getModel().getFunctionBreakpoints().length >= 1) {
-				actions.push(new RemoveAllBreakpointsAction(RemoveAllBreakpointsAction.ID, RemoveAllBreakpointsAction.LABEL, this.debugService, this.keybindingService));
-				actions.push(new Separator());
-
-				actions.push(new EnableAllBreakpointsAction(EnableAllBreakpointsAction.ID, EnableAllBreakpointsAction.LABEL, this.debugService, this.keybindingService));
-				actions.push(new DisableAllBreakpointsAction(DisableAllBreakpointsAction.ID, DisableAllBreakpointsAction.LABEL, this.debugService, this.keybindingService));
-			}
-
-			actions.push(new Separator());
-			actions.push(new ReapplyBreakpointsAction(ReapplyBreakpointsAction.ID, ReapplyBreakpointsAction.LABEL, this.debugService, this.keybindingService));
-		}
+		const secondary: IAction[] = [];
+		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, { primary: [], secondary }, g => /^inline/.test(g));
 
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
-			getActions: () => actions,
+			getActions: () => secondary,
 			getActionsContext: () => element,
-			onHide: () => dispose(actions)
+			onHide: () => dispose(actionsDisposable)
 		});
 	}
 
-	public getActions(): IAction[] {
-		return [
-			new AddFunctionBreakpointAction(AddFunctionBreakpointAction.ID, AddFunctionBreakpointAction.LABEL, this.debugService, this.keybindingService),
-			new ToggleBreakpointsActivatedAction(ToggleBreakpointsActivatedAction.ID, ToggleBreakpointsActivatedAction.ACTIVATE_LABEL, this.debugService, this.keybindingService),
-			new RemoveAllBreakpointsAction(RemoveAllBreakpointsAction.ID, RemoveAllBreakpointsAction.LABEL, this.debugService, this.keybindingService)
-		];
-	}
-
 	private updateSize(): void {
 		const containerModel = this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id)!)!;
 
@@ -282,7 +265,7 @@ export class BreakpointsView extends ViewPane {
 
 class BreakpointsDelegate implements IListVirtualDelegate<BreakpointItem> {
 
-	constructor(private debugService: IDebugService) {
+	constructor(private view: BreakpointsView) {
 		// noop
 	}
 
@@ -295,16 +278,16 @@ class BreakpointsDelegate implements IListVirtualDelegate<BreakpointItem> {
 			return BreakpointsRenderer.ID;
 		}
 		if (element instanceof FunctionBreakpoint) {
-			const selected = this.debugService.getViewModel().getSelectedBreakpoint();
-			if (!element.name || (selected && selected.getId() === element.getId())) {
+			const inputBoxBreakpoint = this.view.inputBoxData?.breakpoint;
+			if (!element.name || (inputBoxBreakpoint && inputBoxBreakpoint.getId() === element.getId())) {
 				return FunctionBreakpointInputRenderer.ID;
 			}
 
 			return FunctionBreakpointsRenderer.ID;
 		}
 		if (element instanceof ExceptionBreakpoint) {
-			const selected = this.debugService.getViewModel().getSelectedBreakpoint();
-			if (selected && selected.getId() === element.getId()) {
+			const inputBoxBreakpoint = this.view.inputBoxData?.breakpoint;
+			if (inputBoxBreakpoint && inputBoxBreakpoint.getId() === element.getId()) {
 				return ExceptionBreakpointInputRenderer.ID;
 			}
 			return ExceptionBreakpointsRenderer.ID;
@@ -322,7 +305,9 @@ interface IBaseBreakpointTemplateData {
 	name: HTMLElement;
 	checkbox: HTMLInputElement;
 	context: BreakpointItem;
+	actionBar: ActionBar;
 	toDispose: IDisposable[];
+	elementDisposable: IDisposable[];
 }
 
 interface IBaseBreakpointWithIconTemplateData extends IBaseBreakpointTemplateData {
@@ -338,26 +323,31 @@ interface IExceptionBreakpointTemplateData extends IBaseBreakpointTemplateData {
 	condition: HTMLElement;
 }
 
+interface IFunctionBreakpointTemplateData extends IBaseBreakpointWithIconTemplateData {
+	condition: HTMLElement;
+}
+
 interface IFunctionBreakpointInputTemplateData {
 	inputBox: InputBox;
 	checkbox: HTMLInputElement;
 	icon: HTMLElement;
 	breakpoint: IFunctionBreakpoint;
-	reactedOnEvent: boolean;
 	toDispose: IDisposable[];
+	type: 'hitCount' | 'condition' | 'name';
 }
 
 interface IExceptionBreakpointInputTemplateData {
 	inputBox: InputBox;
 	checkbox: HTMLInputElement;
 	breakpoint: IExceptionBreakpoint;
-	reactedOnEvent: boolean;
 	toDispose: IDisposable[];
 }
 
 class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTemplateData> {
 
 	constructor(
+		private menu: IMenu,
+		private breakpointSupportsCondition: IContextKey<boolean>,
 		@IDebugService private readonly debugService: IDebugService,
 		@ILabelService private readonly labelService: ILabelService
 	) {
@@ -377,6 +367,7 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox();
 		data.toDispose = [];
+		data.elementDisposable = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
@@ -387,6 +378,8 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		data.name = dom.append(data.breakpoint, $('span.name'));
 
 		data.filePath = dom.append(data.breakpoint, $('span.file-path'));
+		data.actionBar = new ActionBar(data.breakpoint);
+		data.toDispose.push(data.actionBar);
 		const lineNumberContainer = dom.append(data.breakpoint, $('.line-number-container'));
 		data.lineNumber = dom.append(lineNumberContainer, $('span.line-number.monaco-count-badge'));
 
@@ -413,6 +406,17 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		if (debugActive && !breakpoint.verified) {
 			data.breakpoint.classList.add('disabled');
 		}
+
+		const primary: IAction[] = [];
+		const session = this.debugService.getViewModel().focusedSession;
+		this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: breakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.actionBar.clear();
+		data.actionBar.push(primary, { icon: true, label: false });
+	}
+
+	disposeElement(_element: IBreakpoint, _index: number, templateData: IBreakpointTemplateData): void {
+		dispose(templateData.elementDisposable);
 	}
 
 	disposeTemplate(templateData: IBreakpointTemplateData): void {
@@ -423,6 +427,8 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint, IExceptionBreakpointTemplateData> {
 
 	constructor(
+		private menu: IMenu,
+		private breakpointSupportsCondition: IContextKey<boolean>,
 		private debugService: IDebugService
 	) {
 		// noop
@@ -440,6 +446,7 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 
 		data.checkbox = createCheckbox();
 		data.toDispose = [];
+		data.elementDisposable = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
@@ -450,6 +457,8 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		data.condition = dom.append(data.breakpoint, $('span.condition'));
 		data.breakpoint.classList.add('exception');
 
+		data.actionBar = new ActionBar(data.breakpoint);
+		data.toDispose.push(data.actionBar);
 		return data;
 	}
 
@@ -459,7 +468,17 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		data.breakpoint.title = data.name.textContent;
 		data.checkbox.checked = exceptionBreakpoint.enabled;
 		data.condition.textContent = exceptionBreakpoint.condition || '';
-		data.condition.title = nls.localize('expressionCondition', "Expression condition: {0}", exceptionBreakpoint.condition);
+		data.condition.title = localize('expressionCondition', "Expression condition: {0}", exceptionBreakpoint.condition);
+
+		const primary: IAction[] = [];
+		this.breakpointSupportsCondition.set((exceptionBreakpoint as ExceptionBreakpoint).supportsCondition);
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: exceptionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.actionBar.clear();
+		data.actionBar.push(primary, { icon: true, label: false });
+	}
+
+	disposeElement(_element: IExceptionBreakpoint, _index: number, templateData: IExceptionBreakpointTemplateData): void {
+		dispose(templateData.elementDisposable);
 	}
 
 	disposeTemplate(templateData: IExceptionBreakpointTemplateData): void {
@@ -467,9 +486,11 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 	}
 }
 
-class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, IBaseBreakpointWithIconTemplateData> {
+class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, IFunctionBreakpointTemplateData> {
 
 	constructor(
+		private menu: IMenu,
+		private breakpointSupportsCondition: IContextKey<boolean>,
 		@IDebugService private readonly debugService: IDebugService,
 		@ILabelService private readonly labelService: ILabelService
 	) {
@@ -482,13 +503,14 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		return FunctionBreakpointsRenderer.ID;
 	}
 
-	renderTemplate(container: HTMLElement): IBaseBreakpointWithIconTemplateData {
-		const data: IBreakpointTemplateData = Object.create(null);
+	renderTemplate(container: HTMLElement): IFunctionBreakpointTemplateData {
+		const data: IFunctionBreakpointTemplateData = Object.create(null);
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox();
 		data.toDispose = [];
+		data.elementDisposable = [];
 		data.toDispose.push(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
@@ -497,11 +519,15 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		dom.append(data.breakpoint, data.checkbox);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
+		data.condition = dom.append(data.breakpoint, $('span.condition'));
+
+		data.actionBar = new ActionBar(data.breakpoint);
+		data.toDispose.push(data.actionBar);
 
 		return data;
 	}
 
-	renderElement(functionBreakpoint: FunctionBreakpoint, _index: number, data: IBaseBreakpointWithIconTemplateData): void {
+	renderElement(functionBreakpoint: FunctionBreakpoint, _index: number, data: IFunctionBreakpointTemplateData): void {
 		data.context = functionBreakpoint;
 		data.name.textContent = functionBreakpoint.name;
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService);
@@ -509,16 +535,31 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		data.icon.title = message ? message : '';
 		data.checkbox.checked = functionBreakpoint.enabled;
 		data.breakpoint.title = message ? message : '';
+		if (functionBreakpoint.condition && functionBreakpoint.hitCondition) {
+			data.condition.textContent = localize('expressionAndHitCount', "Expression: {0} | Hit Count: {1}", functionBreakpoint.condition, functionBreakpoint.hitCondition);
+		} else {
+			data.condition.textContent = functionBreakpoint.condition || functionBreakpoint.hitCondition || '';
+		}
 
 		// Mark function breakpoints as disabled if deactivated or if debug type does not support them #9099
 		const session = this.debugService.getViewModel().focusedSession;
 		data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
 		if (session && !session.capabilities.supportsFunctionBreakpoints) {
-			data.breakpoint.title = nls.localize('functionBreakpointsNotSupported', "Function breakpoints are not supported by this debug type");
+			data.breakpoint.title = localize('functionBreakpointsNotSupported', "Function breakpoints are not supported by this debug type");
 		}
+
+		const primary: IAction[] = [];
+		this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
+		data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: functionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, g => /^inline/.test(g)));
+		data.actionBar.clear();
+		data.actionBar.push(primary, { icon: true, label: false });
 	}
 
-	disposeTemplate(templateData: IBaseBreakpointWithIconTemplateData): void {
+	disposeElement(_element: IFunctionBreakpoint, _index: number, templateData: IFunctionBreakpointTemplateData): void {
+		dispose(templateData.elementDisposable);
+	}
+
+	disposeTemplate(templateData: IFunctionBreakpointTemplateData): void {
 		dispose(templateData.toDispose);
 	}
 }
@@ -570,7 +611,7 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IBaseBrea
 		const session = this.debugService.getViewModel().focusedSession;
 		data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsDataBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
 		if (session && !session.capabilities.supportsDataBreakpoints) {
-			data.breakpoint.title = nls.localize('dataBreakpointsNotSupported', "Data breakpoints are not supported by this debug type");
+			data.breakpoint.title = localize('dataBreakpointsNotSupported', "Data breakpoints are not supported by this debug type");
 		}
 	}
 
@@ -582,13 +623,12 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IBaseBrea
 class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoint, IFunctionBreakpointInputTemplateData> {
 
 	constructor(
+		private view: BreakpointsView,
 		private debugService: IDebugService,
 		private contextViewService: IContextViewService,
 		private themeService: IThemeService,
 		private labelService: ILabelService
-	) {
-		// noop
-	}
+	) { }
 
 	static readonly ID = 'functionbreakpointinput';
 
@@ -605,22 +645,33 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 
 		dom.append(breakpoint, template.icon);
 		dom.append(breakpoint, template.checkbox);
+		this.view.breakpointInputFocused.set(true);
 		const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
-		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, {
-			placeholder: nls.localize('functionBreakpointPlaceholder', "Function to break on"),
-			ariaLabel: nls.localize('functionBreakPointInputAriaLabel', "Type function breakpoint")
-		});
+
+
+		const inputBox = new InputBox(inputBoxContainer, this.contextViewService);
 		const styler = attachInputBoxStyler(inputBox, this.themeService);
 		const toDispose: IDisposable[] = [inputBox, styler];
 
-		const wrapUp = (renamed: boolean) => {
-			if (!template.reactedOnEvent) {
-				template.reactedOnEvent = true;
-				this.debugService.getViewModel().setSelectedBreakpoint(undefined);
-				if (inputBox.value && (renamed || template.breakpoint.name)) {
-					this.debugService.renameFunctionBreakpoint(template.breakpoint.getId(), renamed ? inputBox.value : template.breakpoint.name);
+		const wrapUp = (success: boolean) => {
+			this.view.breakpointInputFocused.set(false);
+			const id = template.breakpoint.getId();
+
+			if (success) {
+				if (template.type === 'name') {
+					this.debugService.updateFunctionBreakpoint(id, { name: inputBox.value });
+				}
+				if (template.type === 'condition') {
+					this.debugService.updateFunctionBreakpoint(id, { condition: inputBox.value });
+				}
+				if (template.type === 'hitCount') {
+					this.debugService.updateFunctionBreakpoint(id, { hitCondition: inputBox.value });
+				}
+			} else {
+				if (template.type === 'name' && !template.breakpoint.name) {
+					this.debugService.removeFunctionBreakpoints(id);
 				} else {
-					this.debugService.removeFunctionBreakpoints(template.breakpoint.getId());
+					this.view.renderInputBox(undefined);
 				}
 			}
 		};
@@ -650,7 +701,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 
 	renderElement(functionBreakpoint: FunctionBreakpoint, _index: number, data: IFunctionBreakpointInputTemplateData): void {
 		data.breakpoint = functionBreakpoint;
-		data.reactedOnEvent = false;
+		data.type = this.view.inputBoxData?.type || 'name'; // If there is no type set take the 'name' as the default
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService);
 
 		data.icon.className = ThemeIcon.asClassName(icon);
@@ -658,6 +709,21 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		data.checkbox.checked = functionBreakpoint.enabled;
 		data.checkbox.disabled = true;
 		data.inputBox.value = functionBreakpoint.name || '';
+
+		let placeholder = localize('functionBreakpointPlaceholder', "Function to break on");
+		let ariaLabel = localize('functionBreakPointInputAriaLabel', "Type function breakpoint.");
+		if (data.type === 'condition') {
+			data.inputBox.value = functionBreakpoint.condition || '';
+			placeholder = localize('functionBreakpointExpressionPlaceholder', "Break when expression evaluates to true");
+			ariaLabel = localize('functionBreakPointExpresionAriaLabel', "Type expression. Function breakpoint will break when expression evaluates to true");
+		} else if (data.type === 'hitCount') {
+			data.inputBox.value = functionBreakpoint.hitCondition || '';
+			placeholder = localize('functionBreakpointHitCountPlaceholder', "Break when hit count is met");
+			ariaLabel = localize('functionBreakPointHitCountAriaLabel', "Type hit count. Function breakpoint will break when hit count is met.");
+		}
+		data.inputBox.setAriaLabel(ariaLabel);
+		data.inputBox.setPlaceHolder(placeholder);
+
 		setTimeout(() => {
 			data.inputBox.focus();
 			data.inputBox.select();
@@ -672,6 +738,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakpoint, IExceptionBreakpointInputTemplateData> {
 
 	constructor(
+		private view: BreakpointsView,
 		private debugService: IDebugService,
 		private contextViewService: IContextViewService,
 		private themeService: IThemeService
@@ -693,24 +760,22 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		template.checkbox = createCheckbox();
 
 		dom.append(breakpoint, template.checkbox);
+		this.view.breakpointInputFocused.set(true);
 		const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, {
-			placeholder: nls.localize('exceptionBreakpointPlaceholder', "Break when expression evaluates to true"),
-			ariaLabel: nls.localize('exceptionBreakpointAriaLabel', "Type exception breakpoint condition")
+			placeholder: localize('exceptionBreakpointPlaceholder', "Break when expression evaluates to true"),
+			ariaLabel: localize('exceptionBreakpointAriaLabel', "Type exception breakpoint condition")
 		});
 		const styler = attachInputBoxStyler(inputBox, this.themeService);
 		const toDispose: IDisposable[] = [inputBox, styler];
 
 		const wrapUp = (success: boolean) => {
-			if (!template.reactedOnEvent) {
-				template.reactedOnEvent = true;
-				this.debugService.getViewModel().setSelectedBreakpoint(undefined);
-				let newCondition = template.breakpoint.condition;
-				if (success) {
-					newCondition = inputBox.value !== '' ? inputBox.value : undefined;
-				}
-				this.debugService.setExceptionBreakpointCondition(template.breakpoint, newCondition);
+			this.view.breakpointInputFocused.set(false);
+			let newCondition = template.breakpoint.condition;
+			if (success) {
+				newCondition = inputBox.value !== '' ? inputBox.value : undefined;
 			}
+			this.debugService.setExceptionBreakpointCondition(template.breakpoint, newCondition);
 		};
 
 		toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
@@ -736,7 +801,6 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 
 	renderElement(exceptionBreakpoint: ExceptionBreakpoint, _index: number, data: IExceptionBreakpointInputTemplateData): void {
 		data.breakpoint = exceptionBreakpoint;
-		data.reactedOnEvent = false;
 		data.checkbox.checked = exceptionBreakpoint.enabled;
 		data.checkbox.disabled = true;
 		data.inputBox.value = exceptionBreakpoint.condition || '';
@@ -759,7 +823,7 @@ class BreakpointsAccessibilityProvider implements IListAccessibilityProvider<Bre
 	) { }
 
 	getWidgetAriaLabel(): string {
-		return nls.localize('breakpoints', "Breakpoints");
+		return localize('breakpoints', "Breakpoints");
 	}
 
 	getRole() {
@@ -814,10 +878,12 @@ export function openBreakpointSource(breakpoint: IBreakpoint, sideBySide: boolea
 export function getBreakpointMessageAndIcon(state: State, breakpointsActivated: boolean, breakpoint: IBreakpoint | IFunctionBreakpoint | IDataBreakpoint, labelService?: ILabelService): { message?: string, icon: ThemeIcon } {
 	const debugActive = state === State.Running || state === State.Stopped;
 
+	const breakpointIcon = breakpoint instanceof DataBreakpoint ? icons.dataBreakpoint : breakpoint instanceof FunctionBreakpoint ? icons.functionBreakpoint : breakpoint.logMessage ? icons.logBreakpoint : icons.breakpoint;
+
 	if (!breakpoint.enabled || !breakpointsActivated) {
 		return {
-			icon: breakpoint instanceof DataBreakpoint ? icons.debugBreakpointDataDisabled : breakpoint instanceof FunctionBreakpoint ? icons.debugBreakpointFunctionDisabled : breakpoint.logMessage ? icons.debugBreakpointLogDisabled : icons.debugBreakpointDisabled,
-			message: breakpoint.logMessage ? nls.localize('disabledLogpoint', "Disabled Logpoint") : nls.localize('disabledBreakpoint', "Disabled Breakpoint"),
+			icon: breakpointIcon.disabled,
+			message: breakpoint.logMessage ? localize('disabledLogpoint', "Disabled Logpoint") : localize('disabledBreakpoint', "Disabled Breakpoint"),
 		};
 	}
 
@@ -826,36 +892,44 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
 	};
 	if (debugActive && !breakpoint.verified) {
 		return {
-			icon: breakpoint instanceof DataBreakpoint ? icons.debugBreakpointDataUnverified : breakpoint instanceof FunctionBreakpoint ? icons.debugBreakpointFunctionUnverified : breakpoint.logMessage ? icons.debugBreakpointLogUnverified : icons.debugBreakpointUnverified,
-			message: ('message' in breakpoint && breakpoint.message) ? breakpoint.message : (breakpoint.logMessage ? nls.localize('unverifiedLogpoint', "Unverified Logpoint") : nls.localize('unverifiedBreakopint', "Unverified Breakpoint")),
-		};
-	}
-
-	if (breakpoint instanceof FunctionBreakpoint) {
-		if (!breakpoint.supported) {
-			return {
-				icon: icons.debugBreakpointFunctionUnverified,
-				message: nls.localize('functionBreakpointUnsupported', "Function breakpoints not supported by this debug type"),
-			};
-		}
-
-		return {
-			icon: icons.debugBreakpointFunction,
-			message: breakpoint.message || nls.localize('functionBreakpoint', "Function Breakpoint")
+			icon: breakpointIcon.unverified,
+			message: ('message' in breakpoint && breakpoint.message) ? breakpoint.message : (breakpoint.logMessage ? localize('unverifiedLogpoint', "Unverified Logpoint") : localize('unverifiedBreakopint', "Unverified Breakpoint")),
 		};
 	}
 
 	if (breakpoint instanceof DataBreakpoint) {
 		if (!breakpoint.supported) {
 			return {
-				icon: icons.debugBreakpointDataUnverified,
-				message: nls.localize('dataBreakpointUnsupported', "Data breakpoints not supported by this debug type"),
+				icon: breakpointIcon.unverified,
+				message: localize('dataBreakpointUnsupported', "Data breakpoints not supported by this debug type"),
 			};
 		}
 
 		return {
-			icon: icons.debugBreakpointData,
-			message: breakpoint.message || nls.localize('dataBreakpoint', "Data Breakpoint")
+			icon: breakpointIcon.regular,
+			message: breakpoint.message || localize('dataBreakpoint', "Data Breakpoint")
+		};
+	}
+
+	if (breakpoint instanceof FunctionBreakpoint) {
+		if (!breakpoint.supported) {
+			return {
+				icon: breakpointIcon.unverified,
+				message: localize('functionBreakpointUnsupported', "Function breakpoints not supported by this debug type"),
+			};
+		}
+		const messages: string[] = [];
+		messages.push(breakpoint.message || localize('functionBreakpoint', "Function Breakpoint"));
+		if (breakpoint.condition) {
+			messages.push(localize('expression', "Expression condition: {0}", breakpoint.condition));
+		}
+		if (breakpoint.hitCondition) {
+			messages.push(localize('hitCount', "Hit Count: {0}", breakpoint.hitCondition));
+		}
+
+		return {
+			icon: breakpointIcon.regular,
+			message: appendMessage(messages.join('\n'))
 		};
 	}
 
@@ -865,29 +939,310 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
 		if (!breakpoint.supported) {
 			return {
 				icon: icons.debugBreakpointUnsupported,
-				message: nls.localize('breakpointUnsupported', "Breakpoints of this type are not supported by the debugger"),
+				message: localize('breakpointUnsupported', "Breakpoints of this type are not supported by the debugger"),
 			};
 		}
 
 		if (breakpoint.logMessage) {
-			messages.push(nls.localize('logMessage', "Log Message: {0}", breakpoint.logMessage));
+			messages.push(localize('logMessage', "Log Message: {0}", breakpoint.logMessage));
 		}
 		if (breakpoint.condition) {
-			messages.push(nls.localize('expression', "Expression condition: {0}", breakpoint.condition));
+			messages.push(localize('expression', "Expression condition: {0}", breakpoint.condition));
 		}
 		if (breakpoint.hitCondition) {
-			messages.push(nls.localize('hitCount', "Hit Count: {0}", breakpoint.hitCondition));
+			messages.push(localize('hitCount', "Hit Count: {0}", breakpoint.hitCondition));
 		}
 
 		return {
-			icon: breakpoint.logMessage ? icons.debugBreakpointLog : icons.debugBreakpointConditional,
+			icon: breakpoint.logMessage ? icons.logBreakpoint.regular : icons.conditionalBreakpoint.regular,
 			message: appendMessage(messages.join('\n'))
 		};
 	}
 
-	const message = ('message' in breakpoint && breakpoint.message) ? breakpoint.message : breakpoint instanceof Breakpoint && labelService ? labelService.getUriLabel(breakpoint.uri) : nls.localize('breakpoint', "Breakpoint");
+	const message = ('message' in breakpoint && breakpoint.message) ? breakpoint.message : breakpoint instanceof Breakpoint && labelService ? labelService.getUriLabel(breakpoint.uri) : localize('breakpoint', "Breakpoint");
 	return {
-		icon: icons.debugBreakpoint,
+		icon: breakpointIcon.regular,
 		message
 	};
 }
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.addFunctionBreakpointAction',
+			title: {
+				value: localize('addFunctionBreakpoint', "Add Function Breakpoint"),
+				original: 'Add Function Breakpoint',
+				mnemonicTitle: localize({ key: 'miFunctionBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Function Breakpoint...")
+			},
+			f1: true,
+			icon: icons.watchExpressionsAddFuncBreakpoint,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 10,
+				when: ContextKeyEqualsExpr.create('view', BREAKPOINTS_VIEW_ID)
+			}, {
+				id: MenuId.MenubarNewBreakpointMenu,
+				group: '1_breakpoints',
+				order: 3,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const debugService = accessor.get(IDebugService);
+		debugService.addFunctionBreakpoint();
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.toggleBreakpointsActivatedAction',
+			title: localize('activateBreakpoints', "Toggle Activate Breakpoints"),
+			f1: true,
+			icon: icons.breakpointsActivate,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 20,
+				when: ContextKeyEqualsExpr.create('view', BREAKPOINTS_VIEW_ID)
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const debugService = accessor.get(IDebugService);
+		debugService.setBreakpointsActivated(!debugService.getModel().areBreakpointsActivated());
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.removeBreakpoint',
+			title: localize('removeBreakpoint', "Remove Breakpoint"),
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: '3_modification',
+				order: 10,
+				when: CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('exceptionBreakpoint')
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, breakpoint: IBaseBreakpoint): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		if (breakpoint instanceof Breakpoint) {
+			await debugService.removeBreakpoints(breakpoint.getId());
+		} else if (breakpoint instanceof FunctionBreakpoint) {
+			await debugService.removeFunctionBreakpoints(breakpoint.getId());
+		} else if (breakpoint instanceof DataBreakpoint) {
+			await debugService.removeDataBreakpoints(breakpoint.getId());
+		}
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.removeAllBreakpoints',
+			title: {
+				original: 'Remove All Breakpoints',
+				value: localize('removeAllBreakpoints', "Remove All Breakpoints"),
+				mnemonicTitle: localize({ key: 'miRemoveAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Remove &&All Breakpoints")
+			},
+			f1: true,
+			icon: icons.breakpointsRemoveAll,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 30,
+				when: ContextKeyEqualsExpr.create('view', BREAKPOINTS_VIEW_ID)
+			}, {
+				id: MenuId.DebugBreakpointsContext,
+				group: '3_modification',
+				order: 20,
+				when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('exceptionBreakpoint'))
+			}, {
+				id: MenuId.MenubarDebugMenu,
+				group: '5_breakpoints',
+				order: 3,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const debugService = accessor.get(IDebugService);
+		debugService.removeBreakpoints();
+		debugService.removeFunctionBreakpoints();
+		debugService.removeDataBreakpoints();
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.enableAllBreakpoints',
+			title: {
+				original: '',
+				value: localize('enableAllBreakpoints', "Enable All Breakpoints"),
+				mnemonicTitle: localize({ key: 'miEnableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "&&Enable All Breakpoints"),
+			},
+			f1: true,
+			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: 'z_commands',
+				order: 10,
+				when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('exceptionBreakpoint'))
+			}, {
+				id: MenuId.MenubarDebugMenu,
+				group: '5_breakpoints',
+				order: 1,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		await debugService.enableOrDisableBreakpoints(true);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.disableAllBreakpoints',
+			title: {
+				original: 'Disable All Breakpoints',
+				value: localize('disableAllBreakpoints', "Disable All Breakpoints"),
+				mnemonicTitle: localize({ key: 'miDisableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Disable A&&ll Breakpoints")
+			},
+			f1: true,
+			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: 'z_commands',
+				order: 20,
+				when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('exceptionBreakpoint'))
+			}, {
+				id: MenuId.MenubarDebugMenu,
+				group: '5_breakpoints',
+				order: 2,
+
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		await debugService.enableOrDisableBreakpoints(false);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.reapplyBreakpointsAction',
+			title: localize('reapplyAllBreakpoints', "Reapply All Breakpoints"),
+			f1: true,
+			precondition: CONTEXT_IN_DEBUG_MODE,
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: 'z_commands',
+				order: 30,
+				when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('exceptionBreakpoint'))
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		await debugService.setBreakpointsActivated(true);
+	}
+});
+
+registerAction2(class extends ViewAction<BreakpointsView> {
+	constructor() {
+		super({
+			id: 'debug.editBreakpoint',
+			viewId: BREAKPOINTS_VIEW_ID,
+			title: localize('editCondition', "Edit Condition..."),
+			icon: Codicon.edit,
+			precondition: CONTEXT_BREAKPOINT_SUPPORTS_CONDITION,
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: 'navigation',
+				order: 10
+			}, {
+				id: MenuId.DebugBreakpointsContext,
+				group: 'inline',
+				order: 10
+			}]
+		});
+	}
+
+	async runInView(accessor: ServicesAccessor, view: BreakpointsView, breakpoint: ExceptionBreakpoint | Breakpoint | FunctionBreakpoint): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		const editorService = accessor.get(IEditorService);
+		if (breakpoint instanceof Breakpoint) {
+			const editor = await openBreakpointSource(breakpoint, false, false, true, debugService, editorService);
+			if (editor) {
+				const codeEditor = editor.getControl();
+				if (isCodeEditor(codeEditor)) {
+					codeEditor.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID).showBreakpointWidget(breakpoint.lineNumber, breakpoint.column);
+				}
+			}
+		} else {
+			view.renderInputBox({ breakpoint, type: 'condition' });
+		}
+	}
+});
+
+
+registerAction2(class extends ViewAction<BreakpointsView> {
+	constructor() {
+		super({
+			id: 'debug.editFunctionBreakpoint',
+			viewId: BREAKPOINTS_VIEW_ID,
+			title: localize('editBreakpoint', "Edit Function Breakpoint..."),
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: '1_breakpoints',
+				order: 10,
+				when: CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('functionBreakpoint')
+			}]
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: BreakpointsView, breakpoint: IFunctionBreakpoint) {
+		view.renderInputBox({ breakpoint, type: 'name' });
+	}
+});
+
+registerAction2(class extends ViewAction<BreakpointsView> {
+	constructor() {
+		super({
+			id: 'debug.editFunctionBreakpointHitCount',
+			viewId: BREAKPOINTS_VIEW_ID,
+			title: localize('editHitCount', "Edit Hit Count..."),
+			precondition: CONTEXT_BREAKPOINT_SUPPORTS_CONDITION,
+			menu: [{
+				id: MenuId.DebugBreakpointsContext,
+				group: 'navigation',
+				order: 20,
+				when: CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('functionBreakpoint')
+			}]
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: BreakpointsView, breakpoint: IFunctionBreakpoint) {
+		view.renderInputBox({ breakpoint, type: 'hitCount' });
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
index 9fd5d78b0..fa7901ea3 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
@@ -127,17 +127,21 @@ export class CallStackEditorContribution implements IEditorContribution {
 			const isSessionFocused = s === focusedStackFrame?.thread.session;
 			s.getAllThreads().forEach(t => {
 				if (t.stopped) {
-					let candidateStackFrame = t === focusedStackFrame?.thread ? focusedStackFrame : undefined;
-					if (!candidateStackFrame) {
-						const callStack = t.getCallStack();
-						if (callStack.length) {
-							candidateStackFrame = callStack[0];
+					const callStack = t.getCallStack();
+					const stackFrames: IStackFrame[] = [];
+					if (callStack.length > 0) {
+						// Always decorate top stack frame, and decorate focused stack frame if it is not the top stack frame
+						if (focusedStackFrame && !focusedStackFrame.equals(callStack[0])) {
+							stackFrames.push(focusedStackFrame);
 						}
+						stackFrames.push(callStack[0]);
 					}
 
-					if (candidateStackFrame && this.uriIdentityService.extUri.isEqual(candidateStackFrame.source.uri, this.editor.getModel()?.uri)) {
-						decorations.push(...createDecorationsForStackFrame(candidateStackFrame, this.topStackFrameRange, isSessionFocused));
-					}
+					stackFrames.forEach(candidateStackFrame => {
+						if (candidateStackFrame && this.uriIdentityService.extUri.isEqual(candidateStackFrame.source.uri, this.editor.getModel()?.uri)) {
+							decorations.push(...createDecorationsForStackFrame(candidateStackFrame, this.topStackFrameRange, isSessionFocused));
+						}
+					});
 				}
 			});
 		});
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 70851479d..1fc41463c 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -3,22 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE, IDebugModel } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, State, IStackFrame, IDebugSession, IThread, CONTEXT_CALLSTACK_ITEM_TYPE, IDebugModel, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel } from 'vs/workbench/contrib/debug/common/debug';
 import { Thread, StackFrame, ThreadAndSessionIds } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MenuId, IMenu, IMenuService, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { MenuId, IMenu, IMenuService, MenuItemAction, SubmenuItemAction, registerAction2 } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { IAction, Action } from 'vs/base/common/actions';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IContextKey, IContextKeyService, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { createAndFillInContextMenuActions, createAndFillInActionBarActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
@@ -33,7 +32,6 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
 import { STOP_ID, STOP_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_LABEL, STEP_INTO_ID, STEP_OUT_LABEL, STEP_OUT_ID, PAUSE_ID, PAUSE_LABEL, CONTINUE_ID, CONTINUE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
@@ -47,6 +45,8 @@ import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree'
 import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree';
 import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { localize } from 'vs/nls';
+import { Codicon } from 'vs/base/common/codicons';
 
 const $ = dom.$;
 
@@ -162,7 +162,7 @@ export class CallStackView extends ViewPane {
 				this.stateMessageLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
 				this.stateMessage.hidden = false;
 			} else if (sessions.length === 1 && sessions[0].state === State.Running) {
-				this.stateMessageLabel.textContent = nls.localize({ key: 'running', comment: ['indicates state'] }, "Running");
+				this.stateMessageLabel.textContent = localize({ key: 'running', comment: ['indicates state'] }, "Running");
 				this.stateMessageLabel.title = sessions[0].getLabel();
 				this.stateMessageLabel.classList.remove('exception');
 				this.stateMessage.hidden = false;
@@ -205,14 +205,6 @@ export class CallStackView extends ViewPane {
 		this.stateMessageLabel = dom.append(this.stateMessage, $('span.label'));
 	}
 
-	getActions(): IAction[] {
-		if (this.stateMessage.hidden) {
-			return [new CollapseAction(() => this.tree, true, 'explorer-action ' + ThemeIcon.asClassName(icons.debugCollapseAll))];
-		}
-
-		return [];
-	}
-
 	renderBody(container: HTMLElement): void {
 		super.renderBody(container);
 		this.element.classList.add('debug-pane');
@@ -220,11 +212,11 @@ export class CallStackView extends ViewPane {
 		const treeContainer = renderViewTree(container);
 
 		this.dataSource = new CallStackDataSource(this.debugService);
-		const sessionsRenderer = this.instantiationService.createInstance(SessionsRenderer, this.menu);
+		const sessionsRenderer = this.instantiationService.createInstance(SessionsRenderer, this.menu, this.callStackItemType);
 		this.tree = <WorkbenchCompressibleAsyncDataTree<IDebugModel, CallStackItem, FuzzyScore>>this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'CallStackView', treeContainer, new CallStackDelegate(), new CallStackCompressionDelegate(this.debugService), [
 			sessionsRenderer,
-			new ThreadsRenderer(this.instantiationService),
-			this.instantiationService.createInstance(StackFramesRenderer),
+			new ThreadsRenderer(this.callStackItemType, this.instantiationService),
+			this.instantiationService.createInstance(StackFramesRenderer, this.callStackItemType),
 			new ErrorsRenderer(),
 			new LoadAllRenderer(this.themeService),
 			new ShowMoreRenderer(this.themeService)
@@ -259,7 +251,7 @@ export class CallStackView extends ViewPane {
 						return LoadAllRenderer.LABEL;
 					}
 
-					return nls.localize('showMoreStackFrames2', "Show More Stack Frames");
+					return localize('showMoreStackFrames2', "Show More Stack Frames");
 				},
 				getCompressedNodeKeyboardNavigationLabel: (e: CallStackItem[]) => {
 					const firstItem = e[0];
@@ -378,6 +370,10 @@ export class CallStackView extends ViewPane {
 		this.tree.domFocus();
 	}
 
+	collapseAll(): void {
+		this.tree.collapseAll();
+	}
+
 	private async updateTreeSelection(): Promise<void> {
 		if (!this.tree || !this.tree.getInput()) {
 			// Tree not initialized yet
@@ -493,6 +489,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 
 	constructor(
 		private menu: IMenu,
+		private callStackItemType: IContextKey<string>,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
@@ -532,7 +529,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 	}
 
 	private doRenderElement(session: IDebugSession, matches: IMatch[], data: ISessionTemplateData): void {
-		data.session.title = nls.localize({ key: 'session', comment: ['Session is a noun'] }, "Session");
+		data.session.title = localize({ key: 'session', comment: ['Session is a noun'] }, "Session");
 		data.label.set(session.getLabel(), matches);
 		const thread = session.getAllThreads().find(t => t.stopped);
 
@@ -542,6 +539,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 			const primary: IAction[] = actions;
 			const secondary: IAction[] = [];
 			const result = { primary, secondary };
+			this.callStackItemType.set('session');
 			data.elementDisposable.push(createAndFillInActionBarActions(this.menu, { arg: getContextForContributedActions(session), shouldForwardArgs: true }, result, g => /^inline/.test(g)));
 
 			data.actionBar.clear();
@@ -557,7 +555,7 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 				data.session.title = thread.stoppedDetails.text;
 			}
 		} else {
-			data.stateLabel.textContent = nls.localize({ key: 'running', comment: ['indicates state'] }, "Running");
+			data.stateLabel.textContent = localize({ key: 'running', comment: ['indicates state'] }, "Running");
 		}
 	}
 
@@ -573,7 +571,10 @@ class SessionsRenderer implements ICompressibleTreeRenderer<IDebugSession, Fuzzy
 class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore, IThreadTemplateData> {
 	static readonly ID = 'thread';
 
-	constructor(private readonly instantiationService: IInstantiationService) { }
+	constructor(
+		private callStackItemType: IContextKey<string>,
+		private readonly instantiationService: IInstantiationService
+	) { }
 
 	get templateId(): string {
 		return ThreadsRenderer.ID;
@@ -591,11 +592,12 @@ class ThreadsRenderer implements ICompressibleTreeRenderer<IThread, FuzzyScore,
 
 	renderElement(element: ITreeNode<IThread, FuzzyScore>, index: number, data: IThreadTemplateData): void {
 		const thread = element.element;
-		data.thread.title = nls.localize('thread', "Thread");
+		data.thread.title = localize('thread', "Thread");
 		data.label.set(thread.name, createMatches(element.filterData));
 		data.stateLabel.textContent = thread.stateLabel;
 
 		data.actionBar.clear();
+		this.callStackItemType.set('thread');
 		const actions = getActions(this.instantiationService, thread);
 		data.actionBar.push(actions, { icon: true, label: false });
 	}
@@ -613,8 +615,9 @@ class StackFramesRenderer implements ICompressibleTreeRenderer<IStackFrame, Fuzz
 	static readonly ID = 'stackFrame';
 
 	constructor(
+		private callStackItemType: IContextKey<string>,
 		@ILabelService private readonly labelService: ILabelService,
-		@INotificationService private readonly notificationService: INotificationService
+		@INotificationService private readonly notificationService: INotificationService,
 	) { }
 
 	get templateId(): string {
@@ -659,8 +662,9 @@ class StackFramesRenderer implements ICompressibleTreeRenderer<IStackFrame, Fuzz
 		}
 
 		data.actionBar.clear();
+		this.callStackItemType.set('stackFrame');
 		if (hasActions) {
-			const action = new Action('debug.callStack.restartFrame', nls.localize('restartFrame', "Restart Frame"), ThemeIcon.asClassName(icons.debugRestartFrame), true, async () => {
+			const action = new Action('debug.callStack.restartFrame', localize('restartFrame', "Restart Frame"), ThemeIcon.asClassName(icons.debugRestartFrame), true, async () => {
 				try {
 					await stackFrame.restart();
 				} catch (e) {
@@ -710,7 +714,7 @@ class ErrorsRenderer implements ICompressibleTreeRenderer<string, FuzzyScore, IE
 
 class LoadAllRenderer implements ICompressibleTreeRenderer<ThreadAndSessionIds, FuzzyScore, ILabelTemplateData> {
 	static readonly ID = 'loadAll';
-	static readonly LABEL = nls.localize('loadAllStackFrames', "Load All Stack Frames");
+	static readonly LABEL = localize('loadAllStackFrames', "Load All Stack Frames");
 
 	constructor(private readonly themeService: IThemeService) { }
 
@@ -766,9 +770,9 @@ class ShowMoreRenderer implements ICompressibleTreeRenderer<IStackFrame[], Fuzzy
 	renderElement(element: ITreeNode<IStackFrame[], FuzzyScore>, index: number, data: ILabelTemplateData): void {
 		const stackFrames = element.element;
 		if (stackFrames.every(sf => !!(sf.source && sf.source.origin && sf.source.origin === stackFrames[0].source.origin))) {
-			data.label.textContent = nls.localize('showMoreAndOrigin', "Show {0} More: {1}", stackFrames.length, stackFrames[0].source.origin);
+			data.label.textContent = localize('showMoreAndOrigin', "Show {0} More: {1}", stackFrames.length, stackFrames[0].source.origin);
 		} else {
-			data.label.textContent = nls.localize('showMoreStackFrames', "Show {0} More Stack Frames", stackFrames.length);
+			data.label.textContent = localize('showMoreStackFrames', "Show {0} More Stack Frames", stackFrames.length);
 		}
 	}
 
@@ -930,26 +934,26 @@ class CallStackDataSource implements IAsyncDataSource<IDebugModel, CallStackItem
 class CallStackAccessibilityProvider implements IListAccessibilityProvider<CallStackItem> {
 
 	getWidgetAriaLabel(): string {
-		return nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'callStackAriaLabel' }, "Debug Call Stack");
+		return localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'callStackAriaLabel' }, "Debug Call Stack");
 	}
 
 	getAriaLabel(element: CallStackItem): string {
 		if (element instanceof Thread) {
-			return nls.localize({ key: 'threadAriaLabel', comment: ['Placeholders stand for the thread name and the thread state.For example "Thread 1" and "Stopped'] }, "Thread {0} {1}", element.name, element.stateLabel);
+			return localize({ key: 'threadAriaLabel', comment: ['Placeholders stand for the thread name and the thread state.For example "Thread 1" and "Stopped'] }, "Thread {0} {1}", element.name, element.stateLabel);
 		}
 		if (element instanceof StackFrame) {
-			return nls.localize('stackFrameAriaLabel', "Stack Frame {0}, line {1}, {2}", element.name, element.range.startLineNumber, getSpecificSourceName(element));
+			return localize('stackFrameAriaLabel', "Stack Frame {0}, line {1}, {2}", element.name, element.range.startLineNumber, getSpecificSourceName(element));
 		}
 		if (isDebugSession(element)) {
 			const thread = element.getAllThreads().find(t => t.stopped);
-			const state = thread ? thread.stateLabel : nls.localize({ key: 'running', comment: ['indicates state'] }, "Running");
-			return nls.localize({ key: 'sessionLabel', comment: ['Placeholders stand for the session name and the session state. For example "Launch Program" and "Running"'] }, "Session {0} {1}", element.getLabel(), state);
+			const state = thread ? thread.stateLabel : localize({ key: 'running', comment: ['indicates state'] }, "Running");
+			return localize({ key: 'sessionLabel', comment: ['Placeholders stand for the session name and the session state. For example "Launch Program" and "Running"'] }, "Session {0} {1}", element.getLabel(), state);
 		}
 		if (typeof element === 'string') {
 			return element;
 		}
 		if (element instanceof Array) {
-			return nls.localize('showMoreStackFrames', "Show {0} More Stack Frames", element.length);
+			return localize('showMoreStackFrames', "Show {0} More Stack Frames", element.length);
 		}
 
 		// element instanceof ThreadAndSessionIds
@@ -1121,3 +1125,26 @@ class CallStackCompressionDelegate implements ITreeCompressionDelegate<CallStack
 		return true;
 	}
 }
+
+registerAction2(class Collapse extends ViewAction<CallStackView> {
+	constructor() {
+		super({
+			id: 'callStack.collapse',
+			viewId: CALLSTACK_VIEW_ID,
+			title: localize('collapse', "Collapse All"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			precondition: CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped)),
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 10,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', CALLSTACK_VIEW_ID)
+			}
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: CallStackView) {
+		view.collapseAll();
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 9438ac11c..a2f0090e4 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -17,12 +17,11 @@ import { CallStackView } from 'vs/workbench/contrib/debug/browser/callStackView'
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
 import {
 	IDebugService, VIEWLET_ID, DEBUG_PANEL_ID, CONTEXT_IN_DEBUG_MODE, INTERNAL_CONSOLE_OPTIONS_SCHEMA,
-	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_DEBUG_UX, BREAKPOINT_EDITOR_CONTRIBUTION_ID, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT,
+	CONTEXT_DEBUG_STATE, VARIABLES_VIEW_ID, CALLSTACK_VIEW_ID, WATCH_VIEW_ID, BREAKPOINTS_VIEW_ID, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_DEBUG_UX, BREAKPOINT_EDITOR_CONTRIBUTION_ID, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, getStateLabel, State, CONTEXT_WATCH_ITEM_TYPE,
 } from 'vs/workbench/contrib/debug/common/debug';
-import { StartAction, AddFunctionBreakpointAction, ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { DebugToolBar } from 'vs/workbench/contrib/debug/browser/debugToolBar';
 import { DebugService } from 'vs/workbench/contrib/debug/browser/debugService';
-import { registerCommands, ADD_CONFIGURATION_ID, TOGGLE_INLINE_BREAKPOINT_ID, COPY_STACK_TRACE_ID, REVERSE_CONTINUE_ID, STEP_BACK_ID, RESTART_SESSION_ID, TERMINATE_THREAD_ID, STEP_OVER_ID, STEP_INTO_ID, STEP_OUT_ID, PAUSE_ID, DISCONNECT_ID, STOP_ID, RESTART_FRAME_ID, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, RESTART_LABEL, STEP_INTO_LABEL, STEP_OVER_LABEL, STEP_OUT_LABEL, PAUSE_LABEL, DISCONNECT_LABEL, STOP_LABEL, CONTINUE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
+import { registerCommands, ADD_CONFIGURATION_ID, TOGGLE_INLINE_BREAKPOINT_ID, COPY_STACK_TRACE_ID, RESTART_SESSION_ID, TERMINATE_THREAD_ID, STEP_OVER_ID, STEP_INTO_ID, STEP_OUT_ID, PAUSE_ID, DISCONNECT_ID, STOP_ID, RESTART_FRAME_ID, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, RESTART_LABEL, STEP_INTO_LABEL, STEP_OVER_LABEL, STEP_OUT_LABEL, PAUSE_LABEL, DISCONNECT_LABEL, STOP_LABEL, CONTINUE_LABEL, DEBUG_START_LABEL, DEBUG_START_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_RUN_COMMAND_ID, EDIT_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
 import { StatusBarColorProvider } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
 import { IViewsRegistry, Extensions as ViewExtensions, IViewContainersRegistry, ViewContainerLocation, ViewContainer } from 'vs/workbench/common/views';
 import { isMacintosh, isWeb } from 'vs/base/common/platform';
@@ -32,14 +31,13 @@ import { DebugStatusContribution } from 'vs/workbench/contrib/debug/browser/debu
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { LoadedScriptsView } from 'vs/workbench/contrib/debug/browser/loadedScriptsView';
-import { ADD_LOG_POINT_ID, TOGGLE_CONDITIONAL_BREAKPOINT_ID, TOGGLE_BREAKPOINT_ID, RunToCursorAction, registerEditorActions } from 'vs/workbench/contrib/debug/browser/debugEditorActions';
-import { WatchExpressionsView } from 'vs/workbench/contrib/debug/browser/watchExpressionsView';
+import { RunToCursorAction, registerEditorActions } from 'vs/workbench/contrib/debug/browser/debugEditorActions';
+import { WatchExpressionsView, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, ADD_WATCH_ID } from 'vs/workbench/contrib/debug/browser/watchExpressionsView';
 import { VariablesView, SET_VARIABLE_ID, COPY_VALUE_ID, BREAK_WHEN_VALUE_CHANGES_ID, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_ID } from 'vs/workbench/contrib/debug/browser/variablesView';
-import { ClearReplAction, Repl } from 'vs/workbench/contrib/debug/browser/repl';
+import { Repl } from 'vs/workbench/contrib/debug/browser/repl';
 import { DebugContentProvider } from 'vs/workbench/contrib/debug/common/debugContentProvider';
 import { WelcomeView } from 'vs/workbench/contrib/debug/browser/welcomeView';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { DebugViewPaneContainer, OpenDebugConsoleAction, OpenDebugViewletAction } from 'vs/workbench/contrib/debug/browser/debugViewlet';
+import { DebugViewPaneContainer, OpenDebugViewletAction, OPEN_REPL_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugViewlet';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { CallStackEditorContribution } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { BreakpointEditorContribution } from 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
@@ -56,7 +54,6 @@ import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
 
 const registry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionRegistryExtensions.WorkbenchActions);
 const debugCategory = nls.localize('debugCategory', "Debug");
-const runCategroy = nls.localize('runCategory', "Run");
 registerWorkbenchContributions();
 registerColors();
 registerCommandsAndActions();
@@ -64,8 +61,6 @@ registerDebugMenu();
 registerEditorActions();
 registerCommands();
 registerDebugPanel();
-registry.registerWorkbenchAction(SyncActionDescriptor.from(StartAction, { primary: KeyCode.F5 }, CONTEXT_IN_DEBUG_MODE.toNegated()), 'Debug: Start Debugging', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(RunAction, { primary: KeyMod.CtrlCmd | KeyCode.F5, mac: { primary: KeyMod.WinCtrl | KeyCode.F5 } }), 'Run: Start Without Debugging', runCategroy, CONTEXT_DEBUGGERS_AVAILABLE);
 
 registerSingleton(IDebugService, DebugService, true);
 registerDebugView();
@@ -102,18 +97,10 @@ function regsiterEditorContributions(): void {
 
 function registerCommandsAndActions(): void {
 
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(ConfigureAction), 'Debug: Open launch.json', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(AddFunctionBreakpointAction), 'Debug: Add Function Breakpoint', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(ReapplyBreakpointsAction), 'Debug: Reapply All Breakpoints', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(RemoveAllBreakpointsAction), 'Debug: Remove All Breakpoints', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(EnableAllBreakpointsAction), 'Debug: Enable All Breakpoints', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(DisableAllBreakpointsAction), 'Debug: Disable All Breakpoints', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(SelectAndStartAction), 'Debug: Select and Start Debugging', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(ClearReplAction), 'Debug: Clear Console', debugCategory, CONTEXT_DEBUGGERS_AVAILABLE);
-
 	const registerDebugCommandPaletteItem = (id: string, title: string, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
 		MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
 			when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when),
+			group: debugCategory,
 			command: {
 				id,
 				title: `Debug: ${title}`,
@@ -136,33 +123,8 @@ function registerCommandsAndActions(): void {
 	registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize('SetNextStatement', "Set Next Statement"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
 	registerDebugCommandPaletteItem(RunToCursorAction.ID, RunToCursorAction.LABEL, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 	registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, nls.localize('inlineBreakpoint', "Inline Breakpoint"));
-
-	// Debug toolbar
-
-	const registerDebugToolBarItem = (id: string, title: string, order: number, icon: { light?: URI, dark?: URI } | ThemeIcon, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
-		MenuRegistry.appendMenuItem(MenuId.DebugToolBar, {
-			group: 'navigation',
-			when,
-			order,
-			command: {
-				id,
-				title,
-				icon,
-				precondition
-			}
-		});
-	};
-
-	registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, icons.debugContinue, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, icons.debugPause, CONTEXT_DEBUG_STATE.notEqualsTo('stopped'), CONTEXT_DEBUG_STATE.isEqualTo('running'));
-	registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, icons.debugStop, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
-	registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, 70, icons.debugDisconnect, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
-	registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, icons.debugStepOver, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, icons.debugStepInto, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, icons.debugStepOut, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, icons.debugRestart);
-	registerDebugToolBarItem(STEP_BACK_ID, nls.localize('stepBackDebug', "Step Back"), 50, icons.debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-	registerDebugToolBarItem(REVERSE_CONTINUE_ID, nls.localize('reverseContinue', "Reverse"), 60, icons.debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+	registerDebugCommandPaletteItem(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
+	registerDebugCommandPaletteItem(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))));
 
 	// Debug callstack context menu
 	const registerDebugViewMenuItem = (menuId: MenuId, id: string, title: string, order: number, when?: ContextKeyExpression, precondition?: ContextKeyExpression, group = 'navigation') => {
@@ -194,6 +156,12 @@ function registerCommandsAndActions(): void {
 	registerDebugViewMenuItem(MenuId.DebugVariablesContext, ADD_TO_WATCH_ID, nls.localize('addToWatchExpressions', "Add to Watch"), 100, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, undefined, 'z_commands');
 	registerDebugViewMenuItem(MenuId.DebugVariablesContext, BREAK_WHEN_VALUE_CHANGES_ID, nls.localize('breakWhenValueChanges', "Break When Value Changes"), 200, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, undefined, 'z_commands');
 
+	registerDebugViewMenuItem(MenuId.DebugWatchContext, ADD_WATCH_ID, ADD_WATCH_LABEL, 10, undefined, undefined, '3_modification');
+	registerDebugViewMenuItem(MenuId.DebugWatchContext, EDIT_EXPRESSION_COMMAND_ID, nls.localize('editWatchExpression', "Edit Expression"), 20, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, '3_modification');
+	registerDebugViewMenuItem(MenuId.DebugWatchContext, COPY_VALUE_ID, nls.localize('copyValue', "Copy Value"), 30, ContextKeyExpr.or(CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), CONTEXT_WATCH_ITEM_TYPE.isEqualTo('variable')), CONTEXT_IN_DEBUG_MODE, '3_modification');
+	registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_EXPRESSION_COMMAND_ID, nls.localize('removeWatchExpression', "Remove Expression"), 10, CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression'), undefined, 'z_commands');
+	registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, 20, undefined, undefined, 'z_commands');
+
 	// Touch Bar
 	if (isMacintosh) {
 
@@ -210,8 +178,8 @@ function registerCommandsAndActions(): void {
 			});
 		};
 
-		registerTouchBarEntry(StartAction.ID, StartAction.LABEL, 0, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
-		registerTouchBarEntry(RunAction.ID, RunAction.LABEL, 1, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png', require));
+		registerTouchBarEntry(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, 0, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
+		registerTouchBarEntry(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, 1, CONTEXT_IN_DEBUG_MODE.toNegated(), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png', require));
 		registerTouchBarEntry(CONTINUE_ID, CONTINUE_LABEL, 0, CONTEXT_DEBUG_STATE.isEqualTo('stopped'), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png', require));
 		registerTouchBarEntry(PAUSE_ID, PAUSE_LABEL, 1, ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ContextKeyExpr.notEquals('debugState', 'stopped')), FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/pause-tb.png', require));
 		registerTouchBarEntry(STEP_OVER_ID, STEP_OVER_LABEL, 2, CONTEXT_IN_DEBUG_MODE, FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepover-tb.png', require));
@@ -234,21 +202,12 @@ function registerDebugMenu(): void {
 		order: 4
 	});
 
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '4_panels',
-		command: {
-			id: OpenDebugConsoleAction.ID,
-			title: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console")
-		},
-		order: 2
-	});
-
 	// Debug menu
 
 	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 		group: '1_debug',
 		command: {
-			id: StartAction.ID,
+			id: DEBUG_START_COMMAND_ID,
 			title: nls.localize({ key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] }, "&&Start Debugging")
 		},
 		order: 1,
@@ -258,7 +217,7 @@ function registerDebugMenu(): void {
 	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 		group: '1_debug',
 		command: {
-			id: RunAction.ID,
+			id: DEBUG_RUN_COMMAND_ID,
 			title: nls.localize({ key: 'miRun', comment: ['&& denotes a mnemonic'] }, "Run &&Without Debugging")
 		},
 		order: 2,
@@ -288,15 +247,6 @@ function registerDebugMenu(): void {
 	});
 
 	// Configuration
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '2_configuration',
-		command: {
-			id: ConfigureAction.ID,
-			title: nls.localize({ key: 'miOpenConfigurations', comment: ['&& denotes a mnemonic'] }, "Open &&Configurations")
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
 
 	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 		group: '2_configuration',
@@ -354,25 +304,6 @@ function registerDebugMenu(): void {
 	});
 
 	// New Breakpoints
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '4_new_breakpoint',
-		command: {
-			id: TOGGLE_BREAKPOINT_ID,
-			title: nls.localize({ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breakpoint")
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
-		group: '1_breakpoints',
-		command: {
-			id: TOGGLE_CONDITIONAL_BREAKPOINT_ID,
-			title: nls.localize({ key: 'miConditionalBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Conditional Breakpoint...")
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
 
 	MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
 		group: '1_breakpoints',
@@ -384,26 +315,6 @@ function registerDebugMenu(): void {
 		when: CONTEXT_DEBUGGERS_AVAILABLE
 	});
 
-	MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
-		group: '1_breakpoints',
-		command: {
-			id: AddFunctionBreakpointAction.ID,
-			title: nls.localize({ key: 'miFunctionBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Function Breakpoint...")
-		},
-		order: 3,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
-		group: '1_breakpoints',
-		command: {
-			id: ADD_LOG_POINT_ID,
-			title: nls.localize({ key: 'miLogPoint', comment: ['&& denotes a mnemonic'] }, "&&Logpoint...")
-		},
-		order: 4,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
 	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 		group: '4_new_breakpoint',
 		title: nls.localize({ key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&New Breakpoint"),
@@ -412,36 +323,7 @@ function registerDebugMenu(): void {
 		when: CONTEXT_DEBUGGERS_AVAILABLE
 	});
 
-	// Modify Breakpoints
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '5_breakpoints',
-		command: {
-			id: EnableAllBreakpointsAction.ID,
-			title: nls.localize({ key: 'miEnableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "&&Enable All Breakpoints")
-		},
-		order: 1,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '5_breakpoints',
-		command: {
-			id: DisableAllBreakpointsAction.ID,
-			title: nls.localize({ key: 'miDisableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Disable A&&ll Breakpoints")
-		},
-		order: 2,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
-		group: '5_breakpoints',
-		command: {
-			id: RemoveAllBreakpointsAction.ID,
-			title: nls.localize({ key: 'miRemoveAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Remove &&All Breakpoints")
-		},
-		order: 3,
-		when: CONTEXT_DEBUGGERS_AVAILABLE
-	});
+	// Breakpoint actions are registered from breakpointsView.ts
 
 	// Install Debuggers
 	MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
@@ -463,7 +345,7 @@ function registerDebugPanel(): void {
 		icon: icons.debugConsoleViewIcon,
 		ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [DEBUG_PANEL_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
 		storageId: DEBUG_PANEL_ID,
-		focusCommand: { id: OpenDebugConsoleAction.ID },
+		focusCommand: { id: OPEN_REPL_COMMAND_ID },
 		order: 2,
 		hideIfEmpty: true
 	}, ViewContainerLocation.Panel);
@@ -477,8 +359,6 @@ function registerDebugPanel(): void {
 		when: CONTEXT_DEBUGGERS_AVAILABLE,
 		ctorDescriptor: new SyncDescriptor(Repl),
 	}], VIEW_CONTAINER);
-
-	registry.registerWorkbenchAction(SyncActionDescriptor.from(OpenDebugConsoleAction, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Y }), 'View: Debug Console', CATEGORIES.View.value, CONTEXT_DEBUGGERS_AVAILABLE);
 }
 
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
index 3ab907976..b600fc994 100644
--- a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
@@ -11,7 +11,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { SelectBox, ISelectOptionItem } from 'vs/base/browser/ui/selectBox/selectBox';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IDebugService, IDebugSession, IDebugConfiguration, IConfig, ILaunch } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, IDebugSession, IDebugConfiguration, IConfig, ILaunch, State } from 'vs/workbench/contrib/debug/common/debug';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { attachSelectBoxStyler, attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { selectBorder, selectBackground } from 'vs/platform/theme/common/colorRegistry';
@@ -76,7 +76,9 @@ export class StartDebugActionViewItem implements IActionViewItem {
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.CLICK, () => {
 			this.start.blur();
-			this.actionRunner.run(this.action, this.context);
+			if (this.debugService.state !== State.Initializing) {
+				this.actionRunner.run(this.action, this.context);
+			}
 		}));
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => {
@@ -93,7 +95,7 @@ export class StartDebugActionViewItem implements IActionViewItem {
 
 		this.toDispose.push(dom.addDisposableListener(this.start, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter)) {
+			if (event.equals(KeyCode.Enter) && this.debugService.state !== State.Initializing) {
 				this.actionRunner.run(this.action, this.context);
 			}
 			if (event.equals(KeyCode.RightArrow)) {
diff --git a/src/vs/workbench/contrib/debug/browser/debugActions.ts b/src/vs/workbench/contrib/debug/browser/debugActions.ts
deleted file mode 100644
index 3c9472104..000000000
--- a/src/vs/workbench/contrib/debug/browser/debugActions.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import { Action } from 'vs/base/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDebugService, State, IEnablement, IBreakpoint, IDebugSession, ILaunch } from 'vs/workbench/contrib/debug/common/debug';
-import { Variable, Breakpoint, FunctionBreakpoint, Expression } from 'vs/workbench/contrib/debug/common/debugModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { deepClone } from 'vs/base/common/objects';
-import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
-
-export abstract class AbstractDebugAction extends Action {
-
-	constructor(
-		id: string, label: string, cssClass: string,
-		@IDebugService protected debugService: IDebugService,
-		@IKeybindingService protected keybindingService: IKeybindingService,
-	) {
-		super(id, label, cssClass, false);
-		this._register(this.debugService.onDidChangeState(state => this.updateEnablement(state)));
-
-		this.updateLabel(label);
-		this.updateEnablement();
-	}
-
-	run(_: any): Promise<any> {
-		throw new Error('implement me');
-	}
-
-	get tooltip(): string {
-		const keybinding = this.keybindingService.lookupKeybinding(this.id);
-		const keybindingLabel = keybinding && keybinding.getLabel();
-
-		return keybindingLabel ? `${this.label} (${keybindingLabel})` : this.label;
-	}
-
-	protected updateLabel(newLabel: string): void {
-		this.label = newLabel;
-	}
-
-	protected updateEnablement(state = this.debugService.state): void {
-		this.enabled = this.isEnabled(state);
-	}
-
-	protected isEnabled(_: State): boolean {
-		return true;
-	}
-}
-
-export class ConfigureAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.action.debug.configure';
-	static readonly LABEL = nls.localize('openLaunchJson', "Open {0}", 'launch.json');
-
-	constructor(id: string, label: string,
-		@IDebugService debugService: IDebugService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService
-	) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.debugConfigure), debugService, keybindingService);
-		this._register(debugService.getConfigurationManager().onDidSelectConfiguration(() => this.updateClass()));
-		this.updateClass();
-	}
-
-	get tooltip(): string {
-		if (this.debugService.getConfigurationManager().selectedConfiguration.name) {
-			return ConfigureAction.LABEL;
-		}
-
-		return nls.localize('launchJsonNeedsConfigurtion', "Configure or Fix 'launch.json'");
-	}
-
-	private updateClass(): void {
-		const configurationManager = this.debugService.getConfigurationManager();
-		this.class = configurationManager.selectedConfiguration.name ? 'debug-action' + ThemeIcon.asClassName(icons.debugConfigure) : 'debug-action ' + ThemeIcon.asClassName(icons.debugConfigure) + ' notification';
-	}
-
-	async run(): Promise<any> {
-		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY || this.contextService.getWorkspace().folders.length === 0) {
-			this.notificationService.info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
-			return;
-		}
-
-		const configurationManager = this.debugService.getConfigurationManager();
-		let launch: ILaunch | undefined;
-		if (configurationManager.selectedConfiguration.name) {
-			launch = configurationManager.selectedConfiguration.launch;
-		} else {
-			const launches = configurationManager.getLaunches().filter(l => !l.hidden);
-			if (launches.length === 1) {
-				launch = launches[0];
-			} else {
-				const picks = launches.map(l => ({ label: l.name, launch: l }));
-				const picked = await this.quickInputService.pick<{ label: string, launch: ILaunch }>(picks, {
-					activeItem: picks[0],
-					placeHolder: nls.localize({ key: 'selectWorkspaceFolder', comment: ['User picks a workspace folder or a workspace configuration file here. Workspace configuration files can contain settings and thus a launch.json configuration can be written into one.'] }, "Select a workspace folder to create a launch.json file in or add it to the workspace config file")
-				});
-				if (picked) {
-					launch = picked.launch;
-				}
-			}
-		}
-
-		if (launch) {
-			return launch.openConfigFile(false);
-		}
-	}
-}
-
-export class StartAction extends AbstractDebugAction {
-	static ID = 'workbench.action.debug.start';
-	static LABEL = nls.localize('startDebug', "Start Debugging");
-
-	constructor(id: string, label: string,
-		@IDebugService debugService: IDebugService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-	) {
-		super(id, label, 'debug-action start', debugService, keybindingService);
-
-		this._register(this.debugService.getConfigurationManager().onDidSelectConfiguration(() => this.updateEnablement()));
-		this._register(this.debugService.onDidNewSession(() => this.updateEnablement()));
-		this._register(this.debugService.onDidEndSession(() => this.updateEnablement()));
-		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateEnablement()));
-	}
-
-	async run(): Promise<boolean> {
-		let { launch, name, getConfig } = this.debugService.getConfigurationManager().selectedConfiguration;
-		const config = await getConfig();
-		const clonedConfig = deepClone(config);
-		return this.debugService.startDebugging(launch, clonedConfig || name, { noDebug: this.isNoDebug() });
-	}
-
-	protected isNoDebug(): boolean {
-		return false;
-	}
-
-	static isEnabled(debugService: IDebugService) {
-		const sessions = debugService.getModel().getSessions();
-
-		if (debugService.state === State.Initializing) {
-			return false;
-		}
-		let { name, launch } = debugService.getConfigurationManager().selectedConfiguration;
-		let nameToStart = name;
-
-		if (sessions.some(s => s.configuration.name === nameToStart && s.root === launch?.workspace)) {
-			// There is already a debug session running and we do not have any launch configuration selected
-			return false;
-		}
-
-		return true;
-	}
-
-	// Disabled if the launch drop down shows the launch config that is already running.
-	protected isEnabled(): boolean {
-		return StartAction.isEnabled(this.debugService);
-	}
-}
-
-export class RunAction extends StartAction {
-	static readonly ID = 'workbench.action.debug.run';
-	static LABEL = nls.localize('startWithoutDebugging', "Start Without Debugging");
-
-	protected isNoDebug(): boolean {
-		return true;
-	}
-}
-
-export class SelectAndStartAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.action.debug.selectandstart';
-	static readonly LABEL = nls.localize('selectAndStartDebugging', "Select and Start Debugging");
-
-	constructor(id: string, label: string,
-		@IDebugService debugService: IDebugService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService
-	) {
-		super(id, label, '', debugService, keybindingService);
-	}
-
-	async run(): Promise<any> {
-		this.quickInputService.quickAccess.show('debug ');
-	}
-}
-
-export class RemoveBreakpointAction extends Action {
-	static readonly ID = 'workbench.debug.viewlet.action.removeBreakpoint';
-	static readonly LABEL = nls.localize('removeBreakpoint', "Remove Breakpoint");
-
-	constructor(id: string, label: string, @IDebugService private readonly debugService: IDebugService) {
-		super(id, label, 'debug-action remove');
-	}
-
-	run(breakpoint: IBreakpoint): Promise<any> {
-		return breakpoint instanceof Breakpoint ? this.debugService.removeBreakpoints(breakpoint.getId())
-			: breakpoint instanceof FunctionBreakpoint ? this.debugService.removeFunctionBreakpoints(breakpoint.getId()) : this.debugService.removeDataBreakpoints(breakpoint.getId());
-	}
-}
-
-export class RemoveAllBreakpointsAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.removeAllBreakpoints';
-	static readonly LABEL = nls.localize('removeAllBreakpoints', "Remove All Breakpoints");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.breakpointsRemoveAll), debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
-	}
-
-	run(): Promise<any> {
-		return Promise.all([this.debugService.removeBreakpoints(), this.debugService.removeFunctionBreakpoints(), this.debugService.removeDataBreakpoints()]);
-	}
-
-	protected isEnabled(_: State): boolean {
-		const model = this.debugService.getModel();
-		return (model.getBreakpoints().length > 0 || model.getFunctionBreakpoints().length > 0 || model.getDataBreakpoints().length > 0);
-	}
-}
-
-export class EnableAllBreakpointsAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.enableAllBreakpoints';
-	static readonly LABEL = nls.localize('enableAllBreakpoints', "Enable All Breakpoints");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action enable-all-breakpoints', debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
-	}
-
-	run(): Promise<any> {
-		return this.debugService.enableOrDisableBreakpoints(true);
-	}
-
-	protected isEnabled(_: State): boolean {
-		const model = this.debugService.getModel();
-		return (<ReadonlyArray<IEnablement>>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => !bp.enabled);
-	}
-}
-
-export class DisableAllBreakpointsAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.disableAllBreakpoints';
-	static readonly LABEL = nls.localize('disableAllBreakpoints', "Disable All Breakpoints");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action disable-all-breakpoints', debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
-	}
-
-	run(): Promise<any> {
-		return this.debugService.enableOrDisableBreakpoints(false);
-	}
-
-	protected isEnabled(_: State): boolean {
-		const model = this.debugService.getModel();
-		return (<ReadonlyArray<IEnablement>>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => bp.enabled);
-	}
-}
-
-export class ToggleBreakpointsActivatedAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.toggleBreakpointsActivatedAction';
-	static readonly ACTIVATE_LABEL = nls.localize('activateBreakpoints', "Activate Breakpoints");
-	static readonly DEACTIVATE_LABEL = nls.localize('deactivateBreakpoints', "Deactivate Breakpoints");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.breakpointsActivate), debugService, keybindingService);
-		this.updateLabel(this.debugService.getModel().areBreakpointsActivated() ? ToggleBreakpointsActivatedAction.DEACTIVATE_LABEL : ToggleBreakpointsActivatedAction.ACTIVATE_LABEL);
-
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => {
-			this.updateLabel(this.debugService.getModel().areBreakpointsActivated() ? ToggleBreakpointsActivatedAction.DEACTIVATE_LABEL : ToggleBreakpointsActivatedAction.ACTIVATE_LABEL);
-			this.updateEnablement();
-		}));
-	}
-
-	run(): Promise<any> {
-		return this.debugService.setBreakpointsActivated(!this.debugService.getModel().areBreakpointsActivated());
-	}
-
-	protected isEnabled(_: State): boolean {
-		return !!(this.debugService.getModel().getFunctionBreakpoints().length || this.debugService.getModel().getBreakpoints().length || this.debugService.getModel().getDataBreakpoints().length);
-	}
-}
-
-export class ReapplyBreakpointsAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.reapplyBreakpointsAction';
-	static readonly LABEL = nls.localize('reapplyAllBreakpoints', "Reapply All Breakpoints");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, '', debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
-	}
-
-	run(): Promise<any> {
-		return this.debugService.setBreakpointsActivated(true);
-	}
-
-	protected isEnabled(state: State): boolean {
-		const model = this.debugService.getModel();
-		return (state === State.Running || state === State.Stopped) &&
-			((model.getFunctionBreakpoints().length + model.getBreakpoints().length + model.getExceptionBreakpoints().length + model.getDataBreakpoints().length) > 0);
-	}
-}
-
-export class AddFunctionBreakpointAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.addFunctionBreakpointAction';
-	static readonly LABEL = nls.localize('addFunctionBreakpoint', "Add Function Breakpoint");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsAddFuncBreakpoint), debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.updateEnablement()));
-	}
-
-	async run(): Promise<any> {
-		this.debugService.addFunctionBreakpoint();
-	}
-
-	protected isEnabled(_: State): boolean {
-		return !this.debugService.getViewModel().getSelectedBreakpoint()
-			&& this.debugService.getModel().getFunctionBreakpoints().every(fbp => !!fbp.name);
-	}
-}
-
-export class AddWatchExpressionAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.addWatchExpression';
-	static readonly LABEL = nls.localize('addWatchExpression', "Add Expression");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsAdd), debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeWatchExpressions(() => this.updateEnablement()));
-		this._register(this.debugService.getViewModel().onDidSelectExpression(() => this.updateEnablement()));
-	}
-
-	async run(): Promise<any> {
-		this.debugService.addWatchExpression();
-	}
-
-	protected isEnabled(_: State): boolean {
-		const focusedExpression = this.debugService.getViewModel().getSelectedExpression();
-		return this.debugService.getModel().getWatchExpressions().every(we => !!we.name && we !== focusedExpression);
-	}
-}
-
-export class RemoveAllWatchExpressionsAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
-	static readonly LABEL = nls.localize('removeAllWatchExpressions', "Remove All Expressions");
-
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(icons.watchExpressionsRemoveAll), debugService, keybindingService);
-		this._register(this.debugService.getModel().onDidChangeWatchExpressions(() => this.updateEnablement()));
-	}
-
-	async run(): Promise<any> {
-		this.debugService.removeWatchExpressions();
-	}
-
-	protected isEnabled(_: State): boolean {
-		return this.debugService.getModel().getWatchExpressions().length > 0;
-	}
-}
-
-export class FocusSessionAction extends AbstractDebugAction {
-	static readonly ID = 'workbench.action.debug.focusProcess';
-	static readonly LABEL = nls.localize('focusSession', "Focus Session");
-
-	constructor(id: string, label: string,
-		@IDebugService debugService: IDebugService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IEditorService private readonly editorService: IEditorService
-	) {
-		super(id, label, '', debugService, keybindingService);
-	}
-
-	async run(session: IDebugSession): Promise<any> {
-		await this.debugService.focusStackFrame(undefined, undefined, session, true);
-		const stackFrame = this.debugService.getViewModel().focusedStackFrame;
-		if (stackFrame) {
-			await stackFrame.openInEditor(this.editorService, true);
-		}
-	}
-}
-
-export class CopyValueAction extends Action {
-	static readonly ID = 'workbench.debug.viewlet.action.copyValue';
-	static readonly LABEL = nls.localize('copyValue', "Copy Value");
-
-	constructor(
-		id: string, label: string, private value: Variable | Expression, private context: string,
-		@IDebugService private readonly debugService: IDebugService,
-		@IClipboardService private readonly clipboardService: IClipboardService
-	) {
-		super(id, label);
-		this._enabled = (this.value instanceof Expression) || (this.value instanceof Variable && !!this.value.evaluateName);
-	}
-
-	async run(): Promise<any> {
-		const stackFrame = this.debugService.getViewModel().focusedStackFrame;
-		const session = this.debugService.getViewModel().focusedSession;
-		if (!stackFrame || !session) {
-			return;
-		}
-
-		const context = session.capabilities.supportsClipboardContext ? 'clipboard' : this.context;
-		const toEvaluate = this.value instanceof Variable ? (this.value.evaluateName || this.value.value) : this.value.name;
-
-		try {
-			const evaluation = await session.evaluate(toEvaluate, stackFrame.frameId, context);
-			if (evaluation) {
-				this.clipboardService.writeText(evaluation.body.result);
-			}
-		} catch (e) {
-			this.clipboardService.writeText(typeof this.value === 'string' ? this.value : this.value.value);
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
index 249f1e69d..bf1fc62fe 100644
--- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
@@ -54,11 +54,6 @@ export class AdapterManager implements IAdapterManager {
 					if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
 						added.collector.error(nls.localize('debugNoType', "Debugger 'type' can not be omitted and must be of type 'string'."));
 					}
-					if (rawAdapter.enableBreakpointsFor && rawAdapter.enableBreakpointsFor.languageIds) {
-						rawAdapter.enableBreakpointsFor.languageIds.forEach(modeId => {
-							this.breakpointModeIdsSet.add(modeId);
-						});
-					}
 
 					if (rawAdapter.type !== '*') {
 						const existing = this.getDebugger(rawAdapter.type);
diff --git a/src/vs/workbench/contrib/debug/browser/debugColors.ts b/src/vs/workbench/contrib/debug/browser/debugColors.ts
index df54038d0..476f8571e 100644
--- a/src/vs/workbench/contrib/debug/browser/debugColors.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugColors.ts
@@ -4,8 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { registerColor, foreground, editorInfoForeground, editorWarningForeground, errorForeground, badgeBackground, badgeForeground, listDeemphasizedForeground, contrastBorder, inputBorder } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
+import { localize } from 'vs/nls';
+import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
+
+export const debugToolBarBackground = registerColor('debugToolBar.background', {
+	dark: '#333333',
+	light: '#F3F3F3',
+	hc: '#000000'
+}, localize('debugToolBarBackground', "Debug toolbar background color."));
+
+export const debugToolBarBorder = registerColor('debugToolBar.border', {
+	dark: null,
+	light: null,
+	hc: null
+}, localize('debugToolBarBorder', "Debug toolbar border color."));
+
+export const debugIconStartForeground = registerColor('debugIcon.startForeground', {
+	dark: '#89D185',
+	light: '#388A34',
+	hc: '#89D185'
+}, localize('debugIcon.startForeground', "Debug toolbar icon for start debugging."));
 
 export function registerColors() {
 
@@ -28,6 +48,62 @@ export function registerColors() {
 	const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', { dark: foreground, light: foreground, hc: foreground }, 'Foreground color for source filenames in debug REPL console.');
 	const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', { dark: foreground, light: foreground, hc: foreground }, 'Foreground color for debug console input marker icon.');
 
+
+
+	const debugIconPauseForeground = registerColor('debugIcon.pauseForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.pauseForeground', "Debug toolbar icon for pause."));
+
+	const debugIconStopForeground = registerColor('debugIcon.stopForeground', {
+		dark: '#F48771',
+		light: '#A1260D',
+		hc: '#F48771'
+	}, localize('debugIcon.stopForeground', "Debug toolbar icon for stop."));
+
+	const debugIconDisconnectForeground = registerColor('debugIcon.disconnectForeground', {
+		dark: '#F48771',
+		light: '#A1260D',
+		hc: '#F48771'
+	}, localize('debugIcon.disconnectForeground', "Debug toolbar icon for disconnect."));
+
+	const debugIconRestartForeground = registerColor('debugIcon.restartForeground', {
+		dark: '#89D185',
+		light: '#388A34',
+		hc: '#89D185'
+	}, localize('debugIcon.restartForeground', "Debug toolbar icon for restart."));
+
+	const debugIconStepOverForeground = registerColor('debugIcon.stepOverForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.stepOverForeground', "Debug toolbar icon for step over."));
+
+	const debugIconStepIntoForeground = registerColor('debugIcon.stepIntoForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.stepIntoForeground', "Debug toolbar icon for step into."));
+
+	const debugIconStepOutForeground = registerColor('debugIcon.stepOutForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.stepOutForeground', "Debug toolbar icon for step over."));
+
+	const debugIconContinueForeground = registerColor('debugIcon.continueForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.continueForeground', "Debug toolbar icon for continue."));
+
+	const debugIconStepBackForeground = registerColor('debugIcon.stepBackForeground', {
+		dark: '#75BEFF',
+		light: '#007ACC',
+		hc: '#75BEFF'
+	}, localize('debugIcon.stepBackForeground', "Debug toolbar icon for step back."));
+
 	registerThemingParticipant((theme, collector) => {
 		// All these colours provide a default value so they will never be undefined, hence the `!`
 		const badgeBackgroundColor = theme.getColor(badgeBackground)!;
@@ -186,5 +262,55 @@ export function registerColors() {
 				}
 			`);
 		}
+
+		const debugIconStartColor = theme.getColor(debugIconStartForeground);
+		if (debugIconStartColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStart)} { color: ${debugIconStartColor} !important; }`);
+		}
+
+		const debugIconPauseColor = theme.getColor(debugIconPauseForeground);
+		if (debugIconPauseColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugPause)} { color: ${debugIconPauseColor} !important; }`);
+		}
+
+		const debugIconStopColor = theme.getColor(debugIconStopForeground);
+		if (debugIconStopColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStop)} { color: ${debugIconStopColor} !important; }`);
+		}
+
+		const debugIconDisconnectColor = theme.getColor(debugIconDisconnectForeground);
+		if (debugIconDisconnectColor) {
+			collector.addRule(`.monaco-workbench .debug-view-content ${ThemeIcon.asCSSSelector(icons.debugDisconnect)}, .monaco-workbench .debug-toolbar ${ThemeIcon.asCSSSelector(icons.debugDisconnect)} { color: ${debugIconDisconnectColor} !important; }`);
+		}
+
+		const debugIconRestartColor = theme.getColor(debugIconRestartForeground);
+		if (debugIconRestartColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugRestart)}, .monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugRestartFrame)} { color: ${debugIconRestartColor} !important; }`);
+		}
+
+		const debugIconStepOverColor = theme.getColor(debugIconStepOverForeground);
+		if (debugIconStepOverColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepOver)} { color: ${debugIconStepOverColor} !important; }`);
+		}
+
+		const debugIconStepIntoColor = theme.getColor(debugIconStepIntoForeground);
+		if (debugIconStepIntoColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepInto)} { color: ${debugIconStepIntoColor} !important; }`);
+		}
+
+		const debugIconStepOutColor = theme.getColor(debugIconStepOutForeground);
+		if (debugIconStepOutColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepOut)} { color: ${debugIconStepOutColor} !important; }`);
+		}
+
+		const debugIconContinueColor = theme.getColor(debugIconContinueForeground);
+		if (debugIconContinueColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugContinue)}, .monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugReverseContinue)} { color: ${debugIconContinueColor} !important; }`);
+		}
+
+		const debugIconStepBackColor = theme.getColor(debugIconStepBackForeground);
+		if (debugIconStepBackColor) {
+			collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepBack)} { color: ${debugIconStepBackColor} !important; }`);
+		}
 	});
 }
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index 47aaedfb9..3b353cd61 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -9,7 +9,7 @@ import { List } from 'vs/base/browser/ui/list/listWidget';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, IEnablement, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, EDITOR_CONTRIBUTION_ID, IDebugEditorContribution, CONTEXT_IN_DEBUG_MODE, CONTEXT_EXPRESSION_SELECTED, IConfig, IStackFrame, IThread, IDebugSession, CONTEXT_DEBUG_STATE, IDebugConfiguration, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, State, getStateLabel, CONTEXT_BREAKPOINT_INPUT_FOCUSED } from 'vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IExtensionsViewPaneContainer, VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -23,12 +23,13 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { InputFocusedContext } from 'vs/platform/contextkey/common/contextkeys';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { PanelFocusContext } from 'vs/workbench/common/panel';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IViewsService } from 'vs/workbench/common/views';
+import { deepClone } from 'vs/base/common/objects';
 
 export const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
 export const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
@@ -47,6 +48,13 @@ export const RESTART_FRAME_ID = 'workbench.action.debug.restartFrame';
 export const CONTINUE_ID = 'workbench.action.debug.continue';
 export const FOCUS_REPL_ID = 'workbench.debug.action.focusRepl';
 export const JUMP_TO_CURSOR_ID = 'debug.jumpToCursor';
+export const FOCUS_SESSION_ID = 'workbench.action.debug.focusProcess';
+export const SELECT_AND_START_ID = 'workbench.action.debug.selectandstart';
+export const DEBUG_CONFIGURE_COMMAND_ID = 'workbench.action.debug.configure';
+export const DEBUG_START_COMMAND_ID = 'workbench.action.debug.start';
+export const DEBUG_RUN_COMMAND_ID = 'workbench.action.debug.run';
+export const EDIT_EXPRESSION_COMMAND_ID = 'debug.renameWatchExpression';
+export const REMOVE_EXPRESSION_COMMAND_ID = 'debug.removeWatchExpression';
 
 export const RESTART_LABEL = nls.localize('restartDebug', "Restart");
 export const STEP_OVER_LABEL = nls.localize('stepOverDebug', "Step Over");
@@ -56,6 +64,11 @@ export const PAUSE_LABEL = nls.localize('pauseDebug', "Pause");
 export const DISCONNECT_LABEL = nls.localize('disconnect', "Disconnect");
 export const STOP_LABEL = nls.localize('stop', "Stop");
 export const CONTINUE_LABEL = nls.localize('continueDebug', "Continue");
+export const FOCUS_SESSION_LABEL = nls.localize('focusSession', "Focus Session");
+export const SELECT_AND_START_LABEL = nls.localize('selectAndStartDebugging', "Select and Start Debugging");
+export const DEBUG_CONFIGURE_LABEL = nls.localize('openLaunchJson', "Open {0}", 'launch.json');
+export const DEBUG_START_LABEL = nls.localize('startDebug', "Start Debugging");
+export const DEBUG_RUN_LABEL = nls.localize('startWithoutDebugging', "Start Without Debugging");
 
 interface CallStackContext {
 	sessionId: string;
@@ -322,7 +335,7 @@ export function registerCommands(): void {
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: CONTINUE_ID,
-		weight: KeybindingWeight.WorkbenchContrib,
+		weight: KeybindingWeight.WorkbenchContrib + 10, // Use a stronger weight to get priority over start debugging F5 shortcut
 		primary: KeyCode.F5,
 		when: CONTEXT_IN_DEBUG_MODE,
 		handler: (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {
@@ -346,6 +359,53 @@ export function registerCommands(): void {
 		}
 	});
 
+	CommandsRegistry.registerCommand({
+		id: FOCUS_SESSION_ID,
+		handler: async (accessor: ServicesAccessor, session: IDebugSession) => {
+			const debugService = accessor.get(IDebugService);
+			const editorService = accessor.get(IEditorService);
+			await debugService.focusStackFrame(undefined, undefined, session, true);
+			const stackFrame = debugService.getViewModel().focusedStackFrame;
+			if (stackFrame) {
+				await stackFrame.openInEditor(editorService, true);
+			}
+		}
+	});
+
+	CommandsRegistry.registerCommand({
+		id: SELECT_AND_START_ID,
+		handler: async (accessor: ServicesAccessor) => {
+			const quickInputService = accessor.get(IQuickInputService);
+			quickInputService.quickAccess.show('debug ');
+		}
+	});
+
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: DEBUG_START_COMMAND_ID,
+		weight: KeybindingWeight.WorkbenchContrib,
+		primary: KeyCode.F5,
+		when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
+		handler: async (accessor: ServicesAccessor, debugStartOptions?: { noDebug: boolean }) => {
+			const debugService = accessor.get(IDebugService);
+			let { launch, name, getConfig } = debugService.getConfigurationManager().selectedConfiguration;
+			const config = await getConfig();
+			const clonedConfig = deepClone(config);
+			await debugService.startDebugging(launch, clonedConfig || name, { noDebug: debugStartOptions && debugStartOptions.noDebug });
+		}
+	});
+
+	KeybindingsRegistry.registerCommandAndKeybindingRule({
+		id: DEBUG_RUN_COMMAND_ID,
+		weight: KeybindingWeight.WorkbenchContrib,
+		primary: KeyMod.CtrlCmd | KeyCode.F5,
+		mac: { primary: KeyMod.WinCtrl | KeyCode.F5 },
+		when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing))),
+		handler: async (accessor: ServicesAccessor) => {
+			const commandService = accessor.get(ICommandService);
+			await commandService.executeCommand(DEBUG_START_COMMAND_ID, { noDebug: true });
+		}
+	});
+
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.toggleBreakpoint',
 		weight: KeybindingWeight.WorkbenchContrib + 5,
@@ -389,22 +449,27 @@ export function registerCommands(): void {
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.renameWatchExpression',
+		id: EDIT_EXPRESSION_COMMAND_ID,
 		weight: KeybindingWeight.WorkbenchContrib + 5,
 		when: CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
 		primary: KeyCode.F2,
 		mac: { primary: KeyCode.Enter },
-		handler: (accessor) => {
-			const listService = accessor.get(IListService);
+		handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
 			const debugService = accessor.get(IDebugService);
-			const focused = listService.lastFocusedList;
-
-			if (focused) {
-				const elements = focused.getFocus();
-				if (Array.isArray(elements) && elements[0] instanceof Expression) {
-					debugService.getViewModel().setSelectedExpression(elements[0]);
+			if (!(expression instanceof Expression)) {
+				const listService = accessor.get(IListService);
+				const focused = listService.lastFocusedList;
+				if (focused) {
+					const elements = focused.getFocus();
+					if (Array.isArray(elements) && elements[0] instanceof Expression) {
+						expression = elements[0];
+					}
 				}
 			}
+
+			if (expression instanceof Expression) {
+				debugService.getViewModel().setSelectedExpression(expression);
+			}
 		}
 	});
 
@@ -429,16 +494,21 @@ export function registerCommands(): void {
 	});
 
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
-		id: 'debug.removeWatchExpression',
+		id: REMOVE_EXPRESSION_COMMAND_ID,
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: ContextKeyExpr.and(CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_EXPRESSION_SELECTED.toNegated()),
 		primary: KeyCode.Delete,
 		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
-		handler: (accessor) => {
-			const listService = accessor.get(IListService);
+		handler: (accessor: ServicesAccessor, expression: Expression | unknown) => {
 			const debugService = accessor.get(IDebugService);
-			const focused = listService.lastFocusedList;
 
+			if (expression instanceof Expression) {
+				debugService.removeWatchExpressions(expression.getId());
+				return;
+			}
+
+			const listService = accessor.get(IListService);
+			const focused = listService.lastFocusedList;
 			if (focused) {
 				let elements = focused.getFocus();
 				if (Array.isArray(elements) && elements[0] instanceof Expression) {
@@ -455,7 +525,7 @@ export function registerCommands(): void {
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.removeBreakpoint',
 		weight: KeybindingWeight.WorkbenchContrib,
-		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_SELECTED.toNegated()),
+		when: ContextKeyExpr.and(CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_INPUT_FOCUSED.toNegated()),
 		primary: KeyCode.Delete,
 		mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
 		handler: (accessor) => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
index d8ba1d554..bb92347d7 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ServicesAccessor, registerEditorAction, EditorAction, IActionOptions } from 'vs/editor/browser/editorExtensions';
+import { registerEditorAction, EditorAction, IActionOptions, EditorAction2 } from 'vs/editor/browser/editorExtensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, State, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, IBreakpoint, BREAKPOINT_EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution, REPL_VIEW_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, WATCH_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vs/workbench/contrib/debug/common/debug';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -24,24 +24,35 @@ import { Position } from 'vs/editor/common/core/position';
 import { URI } from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { raceTimeout } from 'vs/base/common/async';
+import { registerAction2, MenuId } from 'vs/platform/actions/common/actions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
-export const TOGGLE_BREAKPOINT_ID = 'editor.debug.action.toggleBreakpoint';
-class ToggleBreakpointAction extends EditorAction {
+class ToggleBreakpointAction extends EditorAction2 {
 	constructor() {
 		super({
-			id: TOGGLE_BREAKPOINT_ID,
-			label: nls.localize('toggleBreakpointAction', "Debug: Toggle Breakpoint"),
-			alias: 'Debug: Toggle Breakpoint',
+			id: 'editor.debug.action.toggleBreakpoint',
+			title: {
+				value: nls.localize('toggleBreakpointAction', "Debug: Toggle Breakpoint"),
+				original: 'Toggle Breakpoint',
+				mnemonicTitle: nls.localize({ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breakpoint")
+			},
+			f1: true,
 			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
-			kbOpts: {
-				kbExpr: EditorContextKeys.editorTextFocus,
+			keybinding: {
+				when: EditorContextKeys.editorTextFocus,
 				primary: KeyCode.F9,
 				weight: KeybindingWeight.EditorContrib
+			},
+			menu: {
+				when: CONTEXT_DEBUGGERS_AVAILABLE,
+				id: MenuId.MenubarDebugMenu,
+				group: '4_new_breakpoint',
+				order: 1
 			}
 		});
 	}
 
-	async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<any> {
+	async runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: any[]): Promise<void> {
 		if (editor.hasModel()) {
 			const debugService = accessor.get(IDebugService);
 			const modelUri = editor.getModel().uri;
@@ -49,33 +60,39 @@ class ToggleBreakpointAction extends EditorAction {
 			// Does not account for multi line selections, Set to remove multiple cursor on the same line
 			const lineNumbers = [...new Set(editor.getSelections().map(s => s.getPosition().lineNumber))];
 
-			return Promise.all(lineNumbers.map(line => {
+			await Promise.all(lineNumbers.map(async line => {
 				const bps = debugService.getModel().getBreakpoints({ lineNumber: line, uri: modelUri });
 				if (bps.length) {
-					return Promise.all(bps.map(bp => debugService.removeBreakpoints(bp.getId())));
+					await Promise.all(bps.map(bp => debugService.removeBreakpoints(bp.getId())));
 				} else if (canSet) {
-					return (debugService.addBreakpoints(modelUri, [{ lineNumber: line }]));
-				} else {
-					return [];
+					await debugService.addBreakpoints(modelUri, [{ lineNumber: line }]);
 				}
 			}));
 		}
 	}
 }
 
-export const TOGGLE_CONDITIONAL_BREAKPOINT_ID = 'editor.debug.action.conditionalBreakpoint';
-class ConditionalBreakpointAction extends EditorAction {
-
+class ConditionalBreakpointAction extends EditorAction2 {
 	constructor() {
 		super({
-			id: TOGGLE_CONDITIONAL_BREAKPOINT_ID,
-			label: nls.localize('conditionalBreakpointEditorAction', "Debug: Add Conditional Breakpoint..."),
-			alias: 'Debug: Add Conditional Breakpoint...',
-			precondition: CONTEXT_DEBUGGERS_AVAILABLE
+			id: 'editor.debug.action.conditionalBreakpoint',
+			title: {
+				value: nls.localize('conditionalBreakpointEditorAction', "Debug: Add Conditional Breakpoint..."),
+				original: 'Debug: Add Conditional Breakpoint...',
+				mnemonicTitle: nls.localize({ key: 'miConditionalBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Conditional Breakpoint...")
+			},
+			f1: true,
+			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
+			menu: {
+				id: MenuId.MenubarNewBreakpointMenu,
+				group: '1_breakpoints',
+				order: 1,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: any[]): void {
 		const debugService = accessor.get(IDebugService);
 
 		const position = editor.getPosition();
@@ -85,19 +102,28 @@ class ConditionalBreakpointAction extends EditorAction {
 	}
 }
 
-export const ADD_LOG_POINT_ID = 'editor.debug.action.addLogPoint';
-class LogPointAction extends EditorAction {
+class LogPointAction extends EditorAction2 {
 
 	constructor() {
 		super({
-			id: ADD_LOG_POINT_ID,
-			label: nls.localize('logPointEditorAction', "Debug: Add Logpoint..."),
-			alias: 'Debug: Add Logpoint...',
-			precondition: CONTEXT_DEBUGGERS_AVAILABLE
+			id: 'editor.debug.action.addLogPoint',
+			title: {
+				value: nls.localize('logPointEditorAction', "Debug: Add Logpoint..."),
+				original: 'Debug: Add Logpoint...',
+				mnemonicTitle: nls.localize({ key: 'miLogPoint', comment: ['&& denotes a mnemonic'] }, "&&Logpoint...")
+			},
+			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
+			f1: true,
+			menu: {
+				id: MenuId.MenubarNewBreakpointMenu,
+				group: '1_breakpoints',
+				order: 4,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+	runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: any[]): void {
 		const debugService = accessor.get(IDebugService);
 
 		const position = editor.getPosition();
@@ -476,9 +502,9 @@ class CloseExceptionWidgetAction extends EditorAction {
 }
 
 export function registerEditorActions(): void {
-	registerEditorAction(ToggleBreakpointAction);
-	registerEditorAction(ConditionalBreakpointAction);
-	registerEditorAction(LogPointAction);
+	registerAction2(ToggleBreakpointAction);
+	registerAction2(ConditionalBreakpointAction);
+	registerAction2(LogPointAction);
 	registerEditorAction(RunToCursorAction);
 	registerEditorAction(StepIntoTargetsAction);
 	registerEditorAction(SelectionToReplAction);
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index dbd53aa5b..f3fa36a2c 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IDebugEditorContribution, IDebugService, State, IStackFrame, IDebugConfiguration, IExpression, IExceptionInfo, IDebugSession, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vs/workbench/contrib/debug/common/debug';
 import { ExceptionWidget } from 'vs/workbench/contrib/debug/browser/exceptionWidget';
-import { FloatingClickWidget } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
 import { Position } from 'vs/editor/common/core/position';
 import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { memoize, createMemoizer } from 'vs/base/common/decorators';
@@ -339,7 +339,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			if (this.hoverRange) {
 				this.showHover(this.hoverRange, false);
 			}
-		}, hoverOption.delay);
+		}, hoverOption.delay * 2);
 		this.toDispose.push(scheduler);
 
 		return scheduler;
@@ -432,7 +432,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			this.closeExceptionWidget();
 		} else if (sameUri) {
 			const exceptionInfo = await focusedSf.thread.exceptionInfo;
-			if (exceptionInfo && exceptionSf.range.startLineNumber && exceptionSf.range.startColumn) {
+			if (exceptionInfo) {
 				this.showExceptionWidget(exceptionInfo, this.debugService.getViewModel().focusedSession, exceptionSf.range.startLineNumber, exceptionSf.range.startColumn);
 			}
 		}
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index d828f5bf4..3bbddfa95 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -105,7 +105,7 @@ export class DebugHoverWidget implements IContentWidget {
 		this.treeContainer = dom.append(this.complexValueContainer, $('.debug-hover-tree'));
 		this.treeContainer.setAttribute('role', 'tree');
 		const tip = dom.append(this.complexValueContainer, $('.tip'));
-		tip.textContent = nls.localize('quickTip', 'Hold {0} key to switch to editor language hover', isMacintosh ? 'Option' : 'Alt');
+		tip.textContent = nls.localize({ key: 'quickTip', comment: ['"switch to editor language hover" means to show the programming language hover widget instead of the debug hover'] }, 'Hold {0} key to switch to editor language hover', isMacintosh ? 'Option' : 'Alt');
 		const dataSource = new DebugHoverDataSource();
 
 		this.tree = <WorkbenchAsyncDataTree<IExpression, IExpression, any>>this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, new DebugHoverDelegate(), [this.instantiationService.createInstance(VariablesRenderer)],
diff --git a/src/vs/workbench/contrib/debug/browser/debugIcons.ts b/src/vs/workbench/contrib/debug/browser/debugIcons.ts
index b2203e381..b031cd582 100644
--- a/src/vs/workbench/contrib/debug/browser/debugIcons.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugIcons.ts
@@ -15,25 +15,37 @@ export const callStackViewIcon = registerIcon('callstack-view-icon', Codicon.deb
 export const breakpointsViewIcon = registerIcon('breakpoints-view-icon', Codicon.debugAlt, localize('breakpointsViewIcon', 'View icon of the breakpoints view.'));
 export const loadedScriptsViewIcon = registerIcon('loaded-scripts-view-icon', Codicon.debugAlt, localize('loadedScriptsViewIcon', 'View icon of the loaded scripts view.'));
 
-export const debugBreakpoint = registerIcon('debug-breakpoint', Codicon.debugBreakpoint, localize('debugBreakpoint', 'Icon for breakpoints.'));
-export const debugBreakpointDisabled = registerIcon('debug-breakpoint-disabled', Codicon.debugBreakpointDisabled, localize('debugBreakpointDisabled', 'Icon for disabled breakpoints.'));
-export const debugBreakpointUnverified = registerIcon('debug-breakpoint-unverified', Codicon.debugBreakpointUnverified, localize('debugBreakpointUnverified', 'Icon for unverified breakpoints.'));
-export const debugBreakpointHint = registerIcon('debug-hint', Codicon.debugHint, localize('debugBreakpointHint', 'Icon for breakpoint hints shown on hover in editor glyph margin.'));
-export const debugBreakpointFunction = registerIcon('debug-breakpoint-function', Codicon.debugBreakpointFunction, localize('debugBreakpointFunction', 'Icon for function breakpoints.'));
-export const debugBreakpointFunctionUnverified = registerIcon('debug-breakpoint-function-unverified', Codicon.debugBreakpointFunctionUnverified, localize('debugBreakpointFunctionUnverified', 'Icon for unverified function breakpoints.'));
-export const debugBreakpointFunctionDisabled = registerIcon('debug-breakpoint-function-disabled', Codicon.debugBreakpointFunctionDisabled, localize('debugBreakpointFunctionDisabled', 'Icon for disabled function breakpoints.'));
+export const breakpoint = {
+	regular: registerIcon('debug-breakpoint', Codicon.debugBreakpoint, localize('debugBreakpoint', 'Icon for breakpoints.')),
+	disabled: registerIcon('debug-breakpoint-disabled', Codicon.debugBreakpointDisabled, localize('debugBreakpointDisabled', 'Icon for disabled breakpoints.')),
+	unverified: registerIcon('debug-breakpoint-unverified', Codicon.debugBreakpointUnverified, localize('debugBreakpointUnverified', 'Icon for unverified breakpoints.'))
+};
+export const functionBreakpoint = {
+	regular: registerIcon('debug-breakpoint-function', Codicon.debugBreakpointFunction, localize('debugBreakpointFunction', 'Icon for function breakpoints.')),
+	disabled: registerIcon('debug-breakpoint-function-disabled', Codicon.debugBreakpointFunctionDisabled, localize('debugBreakpointFunctionDisabled', 'Icon for disabled function breakpoints.')),
+	unverified: registerIcon('debug-breakpoint-function-unverified', Codicon.debugBreakpointFunctionUnverified, localize('debugBreakpointFunctionUnverified', 'Icon for unverified function breakpoints.'))
+};
+export const conditionalBreakpoint = {
+	regular: registerIcon('debug-breakpoint-conditional', Codicon.debugBreakpointConditional, localize('debugBreakpointConditional', 'Icon for conditional breakpoints.')),
+	disabled: registerIcon('debug-breakpoint-conditional-disabled', Codicon.debugBreakpointConditionalDisabled, localize('debugBreakpointConditionalDisabled', 'Icon for disabled conditional breakpoints.')),
+	unverified: registerIcon('debug-breakpoint-conditional-unverified', Codicon.debugBreakpointConditionalUnverified, localize('debugBreakpointConditionalUnverified', 'Icon for unverified conditional breakpoints.'))
+};
+export const dataBreakpoint = {
+	regular: registerIcon('debug-breakpoint-data', Codicon.debugBreakpointData, localize('debugBreakpointData', 'Icon for data breakpoints.')),
+	disabled: registerIcon('debug-breakpoint-data-disabled', Codicon.debugBreakpointDataDisabled, localize('debugBreakpointDataDisabled', 'Icon for disabled data breakpoints.')),
+	unverified: registerIcon('debug-breakpoint-data-unverified', Codicon.debugBreakpointDataUnverified, localize('debugBreakpointDataUnverified', 'Icon for unverified data breakpoints.')),
+};
+export const logBreakpoint = {
+	regular: registerIcon('debug-breakpoint-log', Codicon.debugBreakpointLog, localize('debugBreakpointLog', 'Icon for log breakpoints.')),
+	disabled: registerIcon('debug-breakpoint-log-disabled', Codicon.debugBreakpointLogDisabled, localize('debugBreakpointLogDisabled', 'Icon for disabled log breakpoint.')),
+	unverified: registerIcon('debug-breakpoint-log-unverified', Codicon.debugBreakpointLogUnverified, localize('debugBreakpointLogUnverified', 'Icon for unverified log breakpoints.')),
+};
 
+export const debugBreakpointHint = registerIcon('debug-hint', Codicon.debugHint, localize('debugBreakpointHint', 'Icon for breakpoint hints shown on hover in editor glyph margin.'));
 export const debugBreakpointUnsupported = registerIcon('debug-breakpoint-unsupported', Codicon.debugBreakpointUnsupported, localize('debugBreakpointUnsupported', 'Icon for unsupported breakpoints.'));
 
-export const debugBreakpointConditionalUnverified = registerIcon('debug-breakpoint-conditional-unverified', Codicon.debugBreakpointConditionalUnverified, localize('debugBreakpointConditionalUnverified', 'Icon for unverified conditional breakpoints.'));
-export const debugBreakpointConditional = registerIcon('debug-breakpoint-conditional', Codicon.debugBreakpointConditional, localize('debugBreakpointConditional', 'Icon for conditional breakpoints.'));
-export const debugBreakpointConditionalDisabled = registerIcon('debug-breakpoint-conditional-disabled', Codicon.debugBreakpointConditionalDisabled, localize('debugBreakpointConditionalDisabled', 'Icon for disabled conditional breakpoints.'));
-export const debugBreakpointDataUnverified = registerIcon('debug-breakpoint-data-unverified', Codicon.debugBreakpointDataUnverified, localize('debugBreakpointDataUnverified', 'Icon for unverified data breakpoints.'));
-export const debugBreakpointData = registerIcon('debug-breakpoint-data', Codicon.debugBreakpointData, localize('debugBreakpointData', 'Icon for data breakpoints.'));
-export const debugBreakpointDataDisabled = registerIcon('debug-breakpoint-data-disabled', Codicon.debugBreakpointDataDisabled, localize('debugBreakpointDataDisabled', 'Icon for disabled data breakpoints.'));
-export const debugBreakpointLogUnverified = registerIcon('debug-breakpoint-log-unverified', Codicon.debugBreakpointLogUnverified, localize('debugBreakpointLogUnverified', 'Icon for unverified log breakpoints.'));
-export const debugBreakpointLog = registerIcon('debug-breakpoint-log', Codicon.debugBreakpointLog, localize('debugBreakpointLog', 'Icon for log breakpoints.'));
-export const debugBreakpointLogDisabled = registerIcon('debug-breakpoint-log-disabled', Codicon.debugBreakpointLogDisabled, localize('debugBreakpointLogDisabled', 'Icon for disabled log breakpoint.'));
+export const allBreakpoints = [breakpoint, functionBreakpoint, conditionalBreakpoint, dataBreakpoint, logBreakpoint];
+
 
 export const debugStackframe = registerIcon('debug-stackframe', Codicon.debugStackframe, localize('debugStackframe', 'Icon for a stackframe shown in the editor glyph margin.'));
 export const debugStackframeFocused = registerIcon('debug-stackframe-focused', Codicon.debugStackframeFocused, localize('debugStackframeFocused', 'Icon for a focused stackframe  shown in the editor glyph margin.'));
diff --git a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
index 2b6f530c4..3c920d136 100644
--- a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts
@@ -115,7 +115,8 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
 				accept: async () => {
 					const pick = await provider.pick();
 					if (pick) {
-						await configManager.selectConfiguration(pick.launch, pick.config.name, pick.config, { type: pick.config.type });
+						// Use the type of the provider, not of the config since config sometimes have subtypes (for example "node-terminal")
+						await configManager.selectConfiguration(pick.launch, pick.config.name, pick.config, { type: provider.type });
 						this.debugService.startDebugging(pick.launch, pick.config);
 					}
 				}
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index e05a471f5..7631d5406 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -17,7 +17,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { DebugModel, FunctionBreakpoint, Breakpoint, DataBreakpoint } from 'vs/workbench/contrib/debug/common/debugModel';
 import { ViewModel } from 'vs/workbench/contrib/debug/common/debugViewModel';
-import * as debugactions from 'vs/workbench/contrib/debug/browser/debugActions';
 import { ConfigurationManager } from 'vs/workbench/contrib/debug/browser/debugConfigurationManager';
 import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/contrib/files/common/files';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -25,7 +24,6 @@ import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/bro
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { parse, getFirstFrame } from 'vs/base/common/console';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IAction, Action } from 'vs/base/common/actions';
@@ -48,9 +46,9 @@ import { DebugTelemetry } from 'vs/workbench/contrib/debug/common/debugTelemetry
 import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { AdapterManager } from 'vs/workbench/contrib/debug/browser/debugAdapterManager';
 import { ITextModel } from 'vs/editor/common/model';
+import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
 
 export class DebugService implements IDebugService {
 	declare readonly _serviceBrand: undefined;
@@ -96,8 +94,7 @@ export class DebugService implements IDebugService {
 		@IExtensionHostDebugService private readonly extensionHostDebugService: IExtensionHostDebugService,
 		@IActivityService private readonly activityService: IActivityService,
 		@ICommandService private readonly commandService: ICommandService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
+		@IQuickInputService private readonly quickInputService: IQuickInputService
 	) {
 		this.toDispose = [];
 
@@ -149,16 +146,6 @@ export class DebugService implements IDebugService {
 				session.disconnect();
 			}
 		}));
-		this.toDispose.push(this.extensionHostDebugService.onLogToSession(event => {
-			const session = this.model.getSession(event.sessionId, true);
-			if (session) {
-				// extension logged output -> show it in REPL
-				const sev = event.log.severity === 'warn' ? severity.Warning : event.log.severity === 'error' ? severity.Error : severity.Info;
-				const { args, stack } = parse(event.log);
-				const frame = !!stack ? getFirstFrame(stack) : undefined;
-				session.logToRepl(sev, args, frame);
-			}
-		}));
 
 		this.toDispose.push(this.viewModel.onDidFocusStackFrame(() => {
 			this.onStateChange();
@@ -290,6 +277,11 @@ export class DebugService implements IDebugService {
 			await this.extensionService.activateByEvent('onDebug');
 			if (!options?.parentSession) {
 				await this.editorService.saveAll();
+				const activeEditor = this.editorService.activeEditorPane;
+				if (activeEditor) {
+					// Make sure to save the active editor in case it is in untitled file it wont be saved as part of saveAll #111850
+					await this.editorService.save({ editor: activeEditor.input, groupId: activeEditor.group.id });
+				}
 			}
 			await this.configurationService.reloadConfiguration(launch ? launch.workspace : undefined);
 			await this.extensionService.whenInstalledExtensionsRegistered();
@@ -302,15 +294,6 @@ export class DebugService implements IDebugService {
 			if (typeof configOrName === 'string' && launch) {
 				config = launch.getConfiguration(configOrName);
 				compound = launch.getCompound(configOrName);
-
-				const sessions = this.model.getSessions();
-				const alreadyRunningMessage = nls.localize('configurationAlreadyRunning', "There is already a debug configuration \"{0}\" running.", configOrName);
-				if (sessions.some(s => (s.configuration.name === configOrName && s.root === launch.workspace) && (!launch || !launch.workspace || !s.root || this.uriIdentityService.extUri.isEqual(s.root.uri, launch.workspace.uri)))) {
-					throw new Error(alreadyRunningMessage);
-				}
-				if (compound && compound.configurations && sessions.some(p => compound!.configurations.indexOf(p.configuration.name) !== -1)) {
-					throw new Error(alreadyRunningMessage);
-				}
 			} else if (typeof configOrName !== 'string') {
 				config = configOrName;
 			}
@@ -784,7 +767,7 @@ export class DebugService implements IDebugService {
 	}
 
 	private async showError(message: string, errorActions: ReadonlyArray<IAction> = []): Promise<void> {
-		const configureAction = this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL);
+		const configureAction = new Action(DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, undefined, true, () => this.commandService.executeCommand(DEBUG_CONFIGURE_COMMAND_ID));
 		const actions = [...errorActions, configureAction];
 		const { choice } = await this.dialogService.show(severity.Error, message, actions.map(a => a.label).concat(nls.localize('cancel', "Cancel")), { cancelId: actions.length });
 		if (choice < actions.length) {
@@ -917,12 +900,11 @@ export class DebugService implements IDebugService {
 	}
 
 	addFunctionBreakpoint(name?: string, id?: string): void {
-		const newFunctionBreakpoint = this.model.addFunctionBreakpoint(name || '', id);
-		this.viewModel.setSelectedBreakpoint(newFunctionBreakpoint);
+		this.model.addFunctionBreakpoint(name || '', id);
 	}
 
-	async renameFunctionBreakpoint(id: string, newFunctionName: string): Promise<void> {
-		this.model.renameFunctionBreakpoint(id, newFunctionName);
+	async updateFunctionBreakpoint(id: string, update: { name?: string, hitCondition?: string, condition?: string }): Promise<void> {
+		this.model.updateFunctionBreakpoint(id, update);
 		this.debugStorage.storeBreakpoints(this.model);
 		await this.sendFunctionBreakpoints();
 	}
@@ -946,6 +928,11 @@ export class DebugService implements IDebugService {
 		await this.sendDataBreakpoints();
 	}
 
+	setExceptionBreakpoints(data: DebugProtocol.ExceptionBreakpointsFilter[]): void {
+		this.model.setExceptionBreakpoints(data);
+		this.debugStorage.storeBreakpoints(this.model);
+	}
+
 	async setExceptionBreakpointCondition(exceptionBreakpoint: IExceptionBreakpoint, condition: string | undefined): Promise<void> {
 		this.model.setExceptionBreakpointCondition(exceptionBreakpoint, condition);
 		this.debugStorage.storeBreakpoints(this.model);
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index 9b8c75afa..ec549fd04 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -64,7 +64,7 @@ export class DebugSession implements IDebugSession {
 
 	private readonly _onDidChangeREPLElements = new Emitter<void>();
 
-	private name: string | undefined;
+	private _name: string | undefined;
 	private readonly _onDidChangeName = new Emitter<string>();
 
 	constructor(
@@ -146,15 +146,18 @@ export class DebugSession implements IDebugSession {
 
 	getLabel(): string {
 		const includeRoot = this.workspaceContextService.getWorkspace().folders.length > 1;
-		const name = this.name || this.configuration.name;
-		return includeRoot && this.root ? `${name} (${resources.basenameOrAuthority(this.root.uri)})` : name;
+		return includeRoot && this.root ? `${this.name} (${resources.basenameOrAuthority(this.root.uri)})` : this.name;
 	}
 
 	setName(name: string): void {
-		this.name = name;
+		this._name = name;
 		this._onDidChangeName.fire(name);
 	}
 
+	get name(): string {
+		return this._name || this.configuration.name;
+	}
+
 	get state(): State {
 		if (!this.initialized) {
 			return State.Initializing;
@@ -253,7 +256,7 @@ export class DebugSession implements IDebugSession {
 
 			this.initialized = true;
 			this._onDidChangeState.fire();
-			this.model.setExceptionBreakpoints((this.raw && this.raw.capabilities.exceptionBreakpointFilters) || []);
+			this.debugService.setExceptionBreakpoints((this.raw && this.raw.capabilities.exceptionBreakpointFilters) || []);
 		} catch (err) {
 			this.initialized = true;
 			this._onDidChangeState.fire();
@@ -1015,8 +1018,8 @@ export class DebugSession implements IDebugSession {
 			this._onDidProgressEnd.fire(event);
 		}));
 		this.rawListeners.push(this.raw.onDidInvalidated(async event => {
-			if (!(event.body.areas && event.body.areas.length === 1 && event.body.areas[0] === 'variables')) {
-				// If invalidated event only requires to update variables, do that, otherwise refatch threads https://github.com/microsoft/vscode/issues/106745
+			if (!(event.body.areas && event.body.areas.length === 1 && (event.body.areas[0] === 'variables' || event.body.areas[0] === 'watch'))) {
+				// If invalidated event only requires to update variables or watch, do that, otherwise refatch threads https://github.com/microsoft/vscode/issues/106745
 				this.cancelAllRequests();
 				this.model.clearThreads(this.getId(), true);
 				await this.fetchThreads(this.stoppedDetails);
diff --git a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
index 689328eb3..cac07a988 100644
--- a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
@@ -169,12 +169,18 @@ export class DebugTaskRunner {
 			return taskPromise.then(withUndefinedAsNull);
 		});
 
-		return new Promise((c, e) => {
+		return new Promise(async (c, e) => {
+			const waitForInput = new Promise<void>(resolve => once(e => (e.kind === TaskEventKind.AcquiredInput) && e.taskId === task._id, this.taskService.onDidStateChange)(() => {
+				resolve();
+			}));
+
 			promise.then(result => {
 				taskStarted = true;
 				c(result);
 			}, error => e(error));
 
+			await waitForInput;
+
 			setTimeout(() => {
 				if (!taskStarted) {
 					const errorMessage = typeof taskId === 'string'
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 8f62ac8d9..cfb91f7a3 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -8,28 +8,30 @@ import * as errors from 'vs/base/common/errors';
 import * as browser from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
+import { localize } from 'vs/nls';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
-import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, Separator } from 'vs/base/common/actions';
+import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
 import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IDebugConfiguration, IDebugService, State } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugConfiguration, IDebugService, State, CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, VIEWLET_ID } from 'vs/workbench/contrib/debug/common/debug';
 import { FocusSessionActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { registerThemingParticipant, IThemeService, Themable, ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { registerColor, contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
-import { localize } from 'vs/nls';
+import { IThemeService, Themable, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { createAndFillInActionBarActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { FocusSessionAction } from 'vs/workbench/contrib/debug/browser/debugActions';
+import { createActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IMenu, IMenuService, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
+import { IContextKeyService, ContextKeyExpression, ContextKeyExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { debugToolBarBackground, debugToolBarBorder } from 'vs/workbench/contrib/debug/browser/debugColors';
+import { URI } from 'vs/base/common/uri';
+import { CONTINUE_LABEL, CONTINUE_ID, PAUSE_ID, STOP_ID, DISCONNECT_ID, STEP_OVER_ID, STEP_INTO_ID, RESTART_SESSION_ID, STEP_OUT_ID, STEP_BACK_ID, REVERSE_CONTINUE_ID, RESTART_LABEL, STEP_OUT_LABEL, STEP_INTO_LABEL, STEP_OVER_LABEL, DISCONNECT_LABEL, STOP_LABEL, PAUSE_LABEL, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -75,15 +77,10 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 		this.actionBar = this._register(new ActionBar(actionBarContainer, {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionViewItemProvider: (action: IAction) => {
-				if (action.id === FocusSessionAction.ID) {
+				if (action.id === FOCUS_SESSION_ID) {
 					return this.instantiationService.createInstance(FocusSessionActionViewItem, action, undefined);
-				} else if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-				} else if (action instanceof SubmenuItemAction) {
-					return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
 				}
-
-				return undefined;
+				return createActionViewItem(this.instantiationService, action);
 			}
 		}));
 
@@ -94,7 +91,8 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 				return this.hide();
 			}
 
-			const { actions, disposable } = DebugToolBar.getActions(this.debugToolBarMenu, this.debugService, this.instantiationService);
+			const actions: IAction[] = [];
+			const disposable = createAndFillInActionBarActions(this.debugToolBarMenu, { shouldForwardArgs: true }, actions, () => false);
 			if (!arrays.equals(actions, this.activeActions, (first, second) => first.id === second.id && first.enabled === second.enabled)) {
 				this.actionBar.clear();
 				this.actionBar.push(actions, { icon: true, label: false });
@@ -115,9 +113,11 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 
 	private registerListeners(): void {
 		this._register(this.debugService.onDidChangeState(() => this.updateScheduler.schedule()));
-		this._register(this.debugService.getViewModel().onDidFocusSession(() => this.updateScheduler.schedule()));
-		this._register(this.debugService.onDidNewSession(() => this.updateScheduler.schedule()));
-		this._register(this.configurationService.onDidChangeConfiguration(e => this.onDidConfigurationChange(e)));
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('debug.toolBarLocation')) {
+				this.updateScheduler.schedule();
+			}
+		}));
 		this._register(this.debugToolBarMenu.onDidChange(() => this.updateScheduler.schedule()));
 		this._register(this.actionBar.actionRunner.onDidRun((e: IRunEvent) => {
 			// check for error
@@ -225,12 +225,6 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 		}
 	}
 
-	private onDidConfigurationChange(event: IConfigurationChangeEvent): void {
-		if (event.affectsConfiguration('debug.hideActionBar') || event.affectsConfiguration('debug.toolBarLocation')) {
-			this.updateScheduler.schedule();
-		}
-	}
-
 	private show(): void {
 		if (this.isVisible) {
 			this.setCoordinates();
@@ -251,19 +245,6 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 		dom.hide(this.$el);
 	}
 
-	static getActions(menu: IMenu, debugService: IDebugService, instantiationService: IInstantiationService): { actions: IAction[], disposable: IDisposable } {
-		const actions: IAction[] = [];
-		const disposable = createAndFillInActionBarActions(menu, undefined, actions, () => false);
-		if (debugService.getViewModel().isMultiSessionView()) {
-			actions.push(instantiationService.createInstance(FocusSessionAction, FocusSessionAction.ID, FocusSessionAction.LABEL));
-		}
-
-		return {
-			actions: actions.filter(a => !(a instanceof Separator)), // do not render separators for now
-			disposable
-		};
-	}
-
 	dispose(): void {
 		super.dispose();
 
@@ -276,127 +257,43 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 	}
 }
 
-export const debugToolBarBackground = registerColor('debugToolBar.background', {
-	dark: '#333333',
-	light: '#F3F3F3',
-	hc: '#000000'
-}, localize('debugToolBarBackground', "Debug toolbar background color."));
+// Debug toolbar
 
-export const debugToolBarBorder = registerColor('debugToolBar.border', {
-	dark: null,
-	light: null,
-	hc: null
-}, localize('debugToolBarBorder', "Debug toolbar border color."));
+const registerDebugToolBarItem = (id: string, title: string, order: number, icon?: { light?: URI, dark?: URI } | ThemeIcon, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
+	MenuRegistry.appendMenuItem(MenuId.DebugToolBar, {
+		group: 'navigation',
+		when,
+		order,
+		command: {
+			id,
+			title,
+			icon,
+			precondition
+		}
+	});
 
-export const debugIconStartForeground = registerColor('debugIcon.startForeground', {
-	dark: '#89D185',
-	light: '#388A34',
-	hc: '#89D185'
-}, localize('debugIcon.startForeground', "Debug toolbar icon for start debugging."));
+	// Register actions in debug viewlet when toolbar is docked
+	MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+		group: 'navigation',
+		when: ContextKeyExpr.and(when, ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_STATE.notEqualsTo('inactive'), ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')),
+		order,
+		command: {
+			id,
+			title,
+			icon,
+			precondition
+		}
+	});
+};
 
-export const debugIconPauseForeground = registerColor('debugIcon.pauseForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.pauseForeground', "Debug toolbar icon for pause."));
-
-export const debugIconStopForeground = registerColor('debugIcon.stopForeground', {
-	dark: '#F48771',
-	light: '#A1260D',
-	hc: '#F48771'
-}, localize('debugIcon.stopForeground', "Debug toolbar icon for stop."));
-
-export const debugIconDisconnectForeground = registerColor('debugIcon.disconnectForeground', {
-	dark: '#F48771',
-	light: '#A1260D',
-	hc: '#F48771'
-}, localize('debugIcon.disconnectForeground', "Debug toolbar icon for disconnect."));
-
-export const debugIconRestartForeground = registerColor('debugIcon.restartForeground', {
-	dark: '#89D185',
-	light: '#388A34',
-	hc: '#89D185'
-}, localize('debugIcon.restartForeground', "Debug toolbar icon for restart."));
-
-export const debugIconStepOverForeground = registerColor('debugIcon.stepOverForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.stepOverForeground', "Debug toolbar icon for step over."));
-
-export const debugIconStepIntoForeground = registerColor('debugIcon.stepIntoForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.stepIntoForeground', "Debug toolbar icon for step into."));
-
-export const debugIconStepOutForeground = registerColor('debugIcon.stepOutForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.stepOutForeground', "Debug toolbar icon for step over."));
-
-export const debugIconContinueForeground = registerColor('debugIcon.continueForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.continueForeground', "Debug toolbar icon for continue."));
-
-export const debugIconStepBackForeground = registerColor('debugIcon.stepBackForeground', {
-	dark: '#75BEFF',
-	light: '#007ACC',
-	hc: '#75BEFF'
-}, localize('debugIcon.stepBackForeground', "Debug toolbar icon for step back."));
-
-registerThemingParticipant((theme, collector) => {
-
-	const debugIconStartColor = theme.getColor(debugIconStartForeground);
-	if (debugIconStartColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStart)} { color: ${debugIconStartColor} !important; }`);
-	}
-
-	const debugIconPauseColor = theme.getColor(debugIconPauseForeground);
-	if (debugIconPauseColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugPause)} { color: ${debugIconPauseColor} !important; }`);
-	}
-
-	const debugIconStopColor = theme.getColor(debugIconStopForeground);
-	if (debugIconStopColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStop)} { color: ${debugIconStopColor} !important; }`);
-	}
-
-	const debugIconDisconnectColor = theme.getColor(debugIconDisconnectForeground);
-	if (debugIconDisconnectColor) {
-		collector.addRule(`.monaco-workbench .debug-view-content ${ThemeIcon.asCSSSelector(icons.debugDisconnect)}, .monaco-workbench .debug-toolbar ${ThemeIcon.asCSSSelector(icons.debugDisconnect)} { color: ${debugIconDisconnectColor} !important; }`);
-	}
-
-	const debugIconRestartColor = theme.getColor(debugIconRestartForeground);
-	if (debugIconRestartColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugRestart)}, .monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugRestartFrame)} { color: ${debugIconRestartColor} !important; }`);
-	}
-
-	const debugIconStepOverColor = theme.getColor(debugIconStepOverForeground);
-	if (debugIconStepOverColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepOver)} { color: ${debugIconStepOverColor} !important; }`);
-	}
-
-	const debugIconStepIntoColor = theme.getColor(debugIconStepIntoForeground);
-	if (debugIconStepIntoColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepInto)} { color: ${debugIconStepIntoColor} !important; }`);
-	}
-
-	const debugIconStepOutColor = theme.getColor(debugIconStepOutForeground);
-	if (debugIconStepOutColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepOut)} { color: ${debugIconStepOutColor} !important; }`);
-	}
-
-	const debugIconContinueColor = theme.getColor(debugIconContinueForeground);
-	if (debugIconContinueColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugContinue)}, .monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugReverseContinue)} { color: ${debugIconContinueColor} !important; }`);
-	}
-
-	const debugIconStepBackColor = theme.getColor(debugIconStepBackForeground);
-	if (debugIconStepBackColor) {
-		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStepBack)} { color: ${debugIconStepBackColor} !important; }`);
-	}
-});
+registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, icons.debugContinue, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, icons.debugPause, CONTEXT_DEBUG_STATE.notEqualsTo('stopped'), CONTEXT_DEBUG_STATE.isEqualTo('running'));
+registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, icons.debugStop, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
+registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, 70, icons.debugDisconnect, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
+registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, icons.debugStepOver, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, icons.debugStepInto, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, icons.debugStepOut, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, icons.debugRestart);
+registerDebugToolBarItem(STEP_BACK_ID, localize('stepBackDebug', "Step Back"), 50, icons.debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, localize('reverseContinue', "Reverse"), 60, icons.debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, 100, undefined, CONTEXT_MULTI_SESSION_DEBUG);
diff --git a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
index 91187dd3a..d0749ded5 100644
--- a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
@@ -6,34 +6,36 @@
 import 'vs/css!./media/debugViewlet';
 import * as nls from 'vs/nls';
 import { IAction, IActionViewItem } from 'vs/base/common/actions';
-import { IDebugService, VIEWLET_ID, State, BREAKPOINTS_VIEW_ID, IDebugConfiguration, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
-import { StartAction, ConfigureAction, SelectAndStartAction, FocusSessionAction } from 'vs/workbench/contrib/debug/browser/debugActions';
+import { IDebugService, VIEWLET_ID, State, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, REPL_VIEW_ID, CONTEXT_DEBUG_STATE, ILaunch, getStateLabel, CONTEXT_DEBUGGERS_AVAILABLE } from 'vs/workbench/contrib/debug/common/debug';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from 'vs/workbench/contrib/debug/browser/debugActionViewItems';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IProgressService } from 'vs/platform/progress/common/progress';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { memoize } from 'vs/base/common/decorators';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { DebugToolBar } from 'vs/workbench/contrib/debug/browser/debugToolBar';
-import { ViewPane, ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IMenu, MenuId, IMenuService, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { ViewPaneContainer, ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
+import { MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
+import { IContextKeyService, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyDefinedExpr } from 'vs/platform/contextkey/common/contextkey';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
 import { WelcomeView } from 'vs/workbench/contrib/debug/browser/welcomeView';
-import { ToggleViewAction } from 'vs/workbench/browser/actions/layoutActions';
-import { RunOnceScheduler } from 'vs/base/common/async';
 import { ShowViewletAction } from 'vs/workbench/browser/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { debugConsole } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { debugConfigure, debugConsole } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { WorkbenchStateContext } from 'vs/workbench/browser/contextkeys';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ToggleViewAction } from 'vs/workbench/browser/actions/layoutActions';
+import { FOCUS_SESSION_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_START_LABEL, DEBUG_START_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
 
 export class DebugViewPaneContainer extends ViewPaneContainer {
 
@@ -41,9 +43,6 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 	private progressResolve: (() => void) | undefined;
 	private breakpointView: ViewPane | undefined;
 	private paneListeners = new Map<string, IDisposable>();
-	private debugToolBarMenu: IMenu | undefined;
-	private disposeOnTitleUpdate: IDisposable | undefined;
-	private updateToolBarScheduler: RunOnceScheduler;
 
 	constructor(
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -58,22 +57,13 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 		@IExtensionService extensionService: IExtensionService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
-		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
 	) {
 		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
 
-		this.updateToolBarScheduler = this._register(new RunOnceScheduler(() => {
-			if (this.configurationService.getValue<IDebugConfiguration>('debug').toolBarLocation === 'docked') {
-				this.updateTitleArea();
-			}
-		}, 20));
-
 		// When there are potential updates to the docked debug toolbar we need to update it
 		this._register(this.debugService.onDidChangeState(state => this.onDebugServiceStateChange(state)));
-		this._register(this.debugService.onDidNewSession(() => this.updateToolBarScheduler.schedule()));
-		this._register(this.debugService.getViewModel().onDidFocusSession(() => this.updateToolBarScheduler.schedule()));
 
 		this._register(this.contextKeyService.onDidChangeContext(e => {
 			if (e.affectsSome(new Set([CONTEXT_DEBUG_UX_KEY]))) {
@@ -104,83 +94,15 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 		}
 	}
 
-	@memoize
-	private get startAction(): StartAction {
-		return this._register(this.instantiationService.createInstance(StartAction, StartAction.ID, StartAction.LABEL));
-	}
-
-	@memoize
-	private get configureAction(): ConfigureAction {
-		return this._register(this.instantiationService.createInstance(ConfigureAction, ConfigureAction.ID, ConfigureAction.LABEL));
-	}
-
-	@memoize
-	private get toggleReplAction(): OpenDebugConsoleAction {
-		return this._register(this.instantiationService.createInstance(OpenDebugConsoleAction, OpenDebugConsoleAction.ID, OpenDebugConsoleAction.LABEL));
-	}
-
-	@memoize
-	private get selectAndStartAction(): SelectAndStartAction {
-		return this._register(this.instantiationService.createInstance(SelectAndStartAction, SelectAndStartAction.ID, nls.localize('startAdditionalSession', "Start Additional Session")));
-	}
-
-	getActions(): IAction[] {
-		if (CONTEXT_DEBUG_UX.getValue(this.contextKeyService) === 'simple') {
-			return [];
-		}
-
-		if (!this.showInitialDebugActions) {
-
-			if (!this.debugToolBarMenu) {
-				this.debugToolBarMenu = this.menuService.createMenu(MenuId.DebugToolBar, this.contextKeyService);
-				this._register(this.debugToolBarMenu);
-				this._register(this.debugToolBarMenu.onDidChange(() => this.updateToolBarScheduler.schedule()));
-			}
-
-			const { actions, disposable } = DebugToolBar.getActions(this.debugToolBarMenu, this.debugService, this.instantiationService);
-			if (this.disposeOnTitleUpdate) {
-				dispose(this.disposeOnTitleUpdate);
-			}
-			this.disposeOnTitleUpdate = disposable;
-
-			return actions;
-		}
-
-		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-			return [this.toggleReplAction];
-		}
-
-		return [this.startAction, this.configureAction, this.toggleReplAction];
-	}
-
-	get showInitialDebugActions(): boolean {
-		const state = this.debugService.state;
-		return state === State.Inactive || this.configurationService.getValue<IDebugConfiguration>('debug').toolBarLocation !== 'docked';
-	}
-
-	getSecondaryActions(): IAction[] {
-		if (this.showInitialDebugActions) {
-			return [];
-		}
-
-		return [this.selectAndStartAction, this.configureAction, this.toggleReplAction];
-	}
-
 	getActionViewItem(action: IAction): IActionViewItem | undefined {
-		if (action.id === StartAction.ID) {
+		if (action.id === DEBUG_START_COMMAND_ID) {
 			this.startDebugActionViewItem = this.instantiationService.createInstance(StartDebugActionViewItem, null, action);
 			return this.startDebugActionViewItem;
 		}
-		if (action.id === FocusSessionAction.ID) {
+		if (action.id === FOCUS_SESSION_ID) {
 			return new FocusSessionActionViewItem(action, undefined, this.debugService, this.themeService, this.contextViewService, this.configurationService);
 		}
-		if (action instanceof MenuItemAction) {
-			return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-		} else if (action instanceof SubmenuItemAction) {
-			return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-		}
-
-		return undefined;
+		return createActionViewItem(this.instantiationService, action);
 	}
 
 	focusView(id: string): void {
@@ -201,8 +123,6 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 				return new Promise<void>(resolve => this.progressResolve = resolve);
 			});
 		}
-
-		this.updateToolBarScheduler.schedule();
 	}
 
 	addPanes(panes: { pane: ViewPane, size: number, index?: number }[]): void {
@@ -236,22 +156,6 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 	}
 }
 
-export class OpenDebugConsoleAction extends ToggleViewAction {
-	public static readonly ID = 'workbench.debug.action.toggleRepl';
-	public static readonly LABEL = nls.localize('toggleDebugPanel', "Debug Console");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewsService viewsService: IViewsService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService
-	) {
-		super(id, label, REPL_VIEW_ID, viewsService, viewDescriptorService, contextKeyService, layoutService, ThemeIcon.asClassName(debugConsole));
-	}
-}
-
 export class OpenDebugViewletAction extends ShowViewletAction {
 	public static readonly ID = VIEWLET_ID;
 	public static readonly LABEL = nls.localize('toggleDebugViewlet', "Show Run and Debug");
@@ -266,3 +170,139 @@ export class OpenDebugViewletAction extends ShowViewletAction {
 		super(id, label, VIEWLET_ID, viewletService, editorGroupService, layoutService);
 	}
 }
+
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+	when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_UX.notEqualsTo('simple'), WorkbenchStateContext.notEqualsTo('empty'),
+		ContextKeyExpr.or(CONTEXT_DEBUG_STATE.isEqualTo('inactive'), ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked'))),
+	order: 10,
+	group: 'navigation',
+	command: {
+		precondition: CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)),
+		id: DEBUG_START_COMMAND_ID,
+		title: DEBUG_START_LABEL
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: DEBUG_CONFIGURE_COMMAND_ID,
+			title: {
+				value: DEBUG_CONFIGURE_LABEL,
+				original: DEBUG_CONFIGURE_LABEL,
+				mnemonicTitle: nls.localize({ key: 'miOpenConfigurations', comment: ['&& denotes a mnemonic'] }, "Open &&Configurations")
+			},
+			f1: true,
+			icon: debugConfigure,
+			precondition: CONTEXT_DEBUG_UX.notEqualsTo('simple'),
+			menu: [{
+				id: MenuId.ViewContainerTitle,
+				group: 'navigation',
+				order: 20,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_UX.notEqualsTo('simple'), WorkbenchStateContext.notEqualsTo('empty'),
+					ContextKeyExpr.or(CONTEXT_DEBUG_STATE.isEqualTo('inactive'), ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked')))
+			}, {
+				id: MenuId.ViewContainerTitle,
+				order: 20,
+				// Show in debug viewlet secondary actions when debugging and debug toolbar is docked
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_STATE.notEqualsTo('inactive'), ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))
+			}, {
+				id: MenuId.MenubarDebugMenu,
+				group: '2_configuration',
+				order: 1,
+				when: CONTEXT_DEBUGGERS_AVAILABLE
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const debugService = accessor.get(IDebugService);
+		const quickInputService = accessor.get(IQuickInputService);
+		const configurationManager = debugService.getConfigurationManager();
+		let launch: ILaunch | undefined;
+		if (configurationManager.selectedConfiguration.name) {
+			launch = configurationManager.selectedConfiguration.launch;
+		} else {
+			const launches = configurationManager.getLaunches().filter(l => !l.hidden);
+			if (launches.length === 1) {
+				launch = launches[0];
+			} else {
+				const picks = launches.map(l => ({ label: l.name, launch: l }));
+				const picked = await quickInputService.pick<{ label: string, launch: ILaunch }>(picks, {
+					activeItem: picks[0],
+					placeHolder: nls.localize({ key: 'selectWorkspaceFolder', comment: ['User picks a workspace folder or a workspace configuration file here. Workspace configuration files can contain settings and thus a launch.json configuration can be written into one.'] }, "Select a workspace folder to create a launch.json file in or add it to the workspace config file")
+				});
+				if (picked) {
+					launch = picked.launch;
+				}
+			}
+		}
+
+		if (launch) {
+			await launch.openConfigFile(false);
+		}
+	}
+});
+
+export const OPEN_REPL_COMMAND_ID = 'workbench.debug.action.toggleRepl';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: OPEN_REPL_COMMAND_ID,
+			title: {
+				value: nls.localize('debugPanel', "Debug Console"),
+				original: 'Debug Console',
+				mnemonicTitle: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console")
+			},
+			f1: true,
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Y,
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			icon: debugConsole,
+			menu: [{
+				id: MenuId.MenubarViewMenu,
+				group: '4_panels',
+				order: 2
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		return accessor.get(IInstantiationService).createInstance(ToggleViewAction, OPEN_REPL_COMMAND_ID, 'Debug Console', REPL_VIEW_ID).run();
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'debug.toggleReplIgnoreFocus',
+			title: nls.localize('debugPanel', "Debug Console"),
+			toggled: ContextKeyDefinedExpr.create(`view.${REPL_VIEW_ID}.visible`),
+			menu: [{
+				id: ViewsSubMenu,
+				group: '3_toggleRepl',
+				order: 30,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID))
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const viewsService = accessor.get(IViewsService);
+		if (viewsService.isViewVisible(REPL_VIEW_ID)) {
+			viewsService.closeView(REPL_VIEW_ID);
+		} else {
+			await viewsService.openView(REPL_VIEW_ID);
+		}
+	}
+});
+
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+	when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), CONTEXT_DEBUG_STATE.notEqualsTo('inactive'), ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')),
+	order: 10,
+	command: {
+		id: SELECT_AND_START_ID,
+		title: nls.localize('startAdditionalSession', "Start Additional Session"),
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index e927b779b..14ea88967 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -3,16 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Schemas } from 'vs/base/common/network';
 import * as osPath from 'vs/base/common/path';
 import * as platform from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
 
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
 const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
@@ -97,8 +99,28 @@ export class LinkDetector {
 
 	private createWebLink(url: string): Node {
 		const link = this.createLink(url);
-		const uri = URI.parse(url);
-		this.decorateLink(link, () => this.openerService.open(uri, { allowTunneling: !!this.environmentService.remoteAuthority }));
+
+		this.decorateLink(link, async () => {
+			const uri = URI.parse(url);
+
+			if (uri.scheme === Schemas.file) {
+				// Just using fsPath here is unsafe: https://github.com/microsoft/vscode/issues/109076
+				const fsPath = uri.fsPath;
+				const path = await this.pathService.path;
+				const fileUrl = osPath.normalize(((path.sep === osPath.posix.sep) && platform.isWindows) ? fsPath.replace(/\\/g, osPath.posix.sep) : fsPath);
+
+				const resolvedLink = await this.fileService.resolve(URI.parse(fileUrl));
+				if (!resolvedLink) {
+					return;
+				}
+
+				await this.editorService.openEditor({ resource: resolvedLink.resource, options: { pinned: true } });
+				return;
+			}
+
+			this.openerService.open(url, { allowTunneling: !!this.environmentService.remoteAuthority });
+		});
+
 		return link;
 	}
 
@@ -108,14 +130,14 @@ export class LinkDetector {
 			return document.createTextNode(text);
 		}
 
+		const options = { selection: { startLineNumber: lineNumber, startColumn: columnNumber } };
 		if (path[0] === '.') {
 			if (!workspaceFolder) {
 				return document.createTextNode(text);
 			}
 			const uri = workspaceFolder.toResource(path);
-			const options = { selection: { startLineNumber: lineNumber, startColumn: columnNumber } };
 			const link = this.createLink(text);
-			this.decorateLink(link, () => this.editorService.openEditor({ resource: uri, options }));
+			this.decorateLink(link, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 			return link;
 		}
 
@@ -127,13 +149,13 @@ export class LinkDetector {
 		}
 
 		const link = this.createLink(text);
+		link.tabIndex = 0;
 		const uri = URI.file(osPath.normalize(path));
 		this.fileService.resolve(uri).then(stat => {
 			if (stat.isDirectory) {
 				return;
 			}
-			const options = { selection: { startLineNumber: lineNumber, startColumn: columnNumber } };
-			this.decorateLink(link, () => this.editorService.openEditor({ resource: uri, options }));
+			this.decorateLink(link, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 		}).catch(() => {
 			// If the uri can not be resolved we should not spam the console with error, remain quite #86587
 		});
@@ -146,9 +168,8 @@ export class LinkDetector {
 		return link;
 	}
 
-	private decorateLink(link: HTMLElement, onclick: () => void) {
+	private decorateLink(link: HTMLElement, onClick: (preserveFocus: boolean) => void) {
 		link.classList.add('link');
-		link.title = platform.isMacintosh ? nls.localize('fileLinkMac', "Cmd + click to follow link") : nls.localize('fileLink', "Ctrl + click to follow link");
 		link.onmousemove = (event) => { link.classList.toggle('pointer', platform.isMacintosh ? event.metaKey : event.ctrlKey); };
 		link.onmouseleave = () => link.classList.remove('pointer');
 		link.onclick = (event) => {
@@ -156,12 +177,17 @@ export class LinkDetector {
 			if (!selection || selection.type === 'Range') {
 				return; // do not navigate when user is selecting
 			}
-			if (!(platform.isMacintosh ? event.metaKey : event.ctrlKey)) {
-				return;
-			}
 			event.preventDefault();
 			event.stopImmediatePropagation();
-			onclick();
+			onClick(false);
+		};
+		link.onkeydown = e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.keyCode === KeyCode.Enter || event.keyCode === KeyCode.Space) {
+				event.preventDefault();
+				event.stopPropagation();
+				onClick(event.keyCode === KeyCode.Space);
+			}
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 198da9108..6ebf580c2 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { normalize, isAbsolute, posix } from 'vs/base/common/path';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index 47cafc6ae..5487c7f7e 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -144,22 +144,22 @@
 	display: none;
 }
 
-.debug-pane .debug-call-stack .monaco-list-row .monaco-action-bar {
+.debug-pane .monaco-list-row .monaco-action-bar {
 	display: none;
 	flex-shrink: 0;
 	margin-right: 1px;
 }
 
-.debug-pane .debug-call-stack .monaco-list-row:hover .monaco-action-bar {
+.debug-pane .monaco-list-row:hover .monaco-action-bar {
 	display: initial;
 }
 
-.debug-pane .debug-call-stack .session .codicon {
+.debug-pane .session .codicon {
 	line-height: 22px;
 	margin-right: 2px;
 }
 
-.monaco-workbench  .debug-pane .debug-call-stack .monaco-action-bar .action-item > .action-label {
+.monaco-workbench .debug-pane .monaco-action-bar .action-item > .action-label {
 	width: 16px;
 	height: 100%;
 	line-height: 22px;
@@ -259,11 +259,11 @@
 	font-family: var(--monaco-monospace-font);
 }
 
-.debug-pane .monaco-inputbox > .wrapper {
+.debug-pane .monaco-inputbox > .ibwrapper {
 	height: 19px;
 }
 
-.debug-pane .monaco-inputbox > .wrapper > .input {
+.debug-pane .monaco-inputbox > .ibwrapper > .input {
 	padding: 0px;
 	color: initial;
 }
@@ -319,7 +319,7 @@
 }
 
 .debug-pane .debug-breakpoints .breakpoint > .file-path,
-.debug-pane .debug-breakpoints .breakpoint.exception > .condition {
+.debug-pane .debug-breakpoints .breakpoint > .condition {
 	opacity: 0.7;
 	margin-left: 0.9em;
 	flex: 1;
diff --git a/src/vs/workbench/contrib/debug/browser/media/repl.css b/src/vs/workbench/contrib/debug/browser/media/repl.css
index 04de3a219..d48c7b775 100644
--- a/src/vs/workbench/contrib/debug/browser/media/repl.css
+++ b/src/vs/workbench/contrib/debug/browser/media/repl.css
@@ -17,6 +17,10 @@
 	white-space: pre;
 }
 
+.monaco-workbench .repl .repl-tree .monaco-tl-contents .expression {
+	font-family: var(--vscode-repl-font-family);
+}
+
 .monaco-workbench .repl .repl-tree.word-wrap .monaco-tl-contents {
 	/* Wrap words but also do not trim whitespace #6275 */
 	word-wrap: break-word;
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index a70036599..19e9bc3b6 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -154,6 +154,10 @@ export class RawDebugSession implements IDisposable {
 				case 'invalidated':
 					this._onDidInvalidated.fire(event as DebugProtocol.InvalidatedEvent);
 					break;
+				case 'process':
+					break;
+				case 'module':
+					break;
 				default:
 					this._onDidCustomEvent.fire(event);
 					break;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 74467fa80..1afbbaf12 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/repl';
 import { URI as uri } from 'vs/base/common/uri';
-import { IAction, IActionViewItem, Action, Separator } from 'vs/base/common/actions';
+import { IAction, IActionViewItem } from 'vs/base/common/actions';
 import * as dom from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -14,11 +14,11 @@ import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
 import { ITextModel } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
-import { registerEditorAction, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
+import { registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService, IContextKey, ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -26,7 +26,7 @@ import { memoize } from 'vs/base/common/decorators';
 import { dispose, IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { IDebugService, DEBUG_SCHEME, CONTEXT_IN_DEBUG_REPL, IDebugSession, State, IReplElement, IDebugConfiguration, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, DEBUG_SCHEME, CONTEXT_IN_DEBUG_REPL, IDebugSession, State, IReplElement, IDebugConfiguration, REPL_VIEW_ID, CONTEXT_MULTI_SESSION_REPL, CONTEXT_DEBUG_STATE, getStateLabel } from 'vs/workbench/contrib/debug/common/debug';
 import { HistoryNavigator } from 'vs/base/common/history';
 import { IHistoryNavigationWidget } from 'vs/base/browser/history';
 import { createAndBindHistoryNavigationWidgetScopedContextKeyService } from 'vs/platform/browser/contextScopedHistoryWidget';
@@ -50,7 +50,7 @@ import { FuzzyScore } from 'vs/base/common/filters';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ReplDelegate, ReplVariablesRenderer, ReplSimpleElementsRenderer, ReplEvaluationInputsRenderer, ReplEvaluationResultsRenderer, ReplRawObjectsRenderer, ReplDataSource, ReplAccessibilityProvider, ReplGroupRenderer } from 'vs/workbench/contrib/debug/browser/replViewer';
 import { localize } from 'vs/nls';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IViewsService, IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -60,6 +60,8 @@ import { EDITOR_FONT_DEFAULTS, EditorOption } from 'vs/editor/common/config/edit
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
 import { ReplFilter, ReplFilterState, ReplFilterActionViewItem } from 'vs/workbench/contrib/debug/browser/replFilter';
 import { debugConsoleClearAll, debugConsoleEvaluationPrompt } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { registerAction2, MenuId, Action2, IMenuService, IMenu } from 'vs/platform/actions/common/actions';
+import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 
 const $ = dom.$;
 
@@ -73,17 +75,19 @@ function revealLastElement(tree: WorkbenchAsyncDataTree<any, any, any>) {
 }
 
 const sessionsToIgnore = new Set<IDebugSession>();
+const identityProvider = { getId: (element: IReplElement) => element.getId() };
 
 export class Repl extends ViewPane implements IHistoryNavigationWidget {
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly REFRESH_DELAY = 100; // delay in ms to refresh the repl for new elements to show
+	private static readonly REFRESH_DELAY = 50; // delay in ms to refresh the repl for new elements to show
 	private static readonly URI = uri.parse(`${DEBUG_SCHEME}:replinput`);
 
 	private history: HistoryNavigator<string>;
 	private tree!: WorkbenchAsyncDataTree<IDebugSession, IReplElement, FuzzyScore>;
 	private replDelegate!: ReplDelegate;
 	private container!: HTMLElement;
+	private treeContainer!: HTMLElement;
 	private replInput!: CodeEditorWidget;
 	private replInputContainer!: HTMLElement;
 	private dimension!: dom.Dimension;
@@ -98,6 +102,8 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 	private filter: ReplFilter;
 	private filterState: ReplFilterState;
 	private filterActionViewItem: ReplFilterActionViewItem | undefined;
+	private multiSessionRepl: IContextKey<boolean>;
+	private menu: IMenu;
 
 	constructor(
 		options: IViewPaneOptions,
@@ -112,17 +118,21 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
-		@IClipboardService private readonly clipboardService: IClipboardService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@IMenuService menuService: IMenuService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 
+		this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
+		this._register(this.menu);
 		this.history = new HistoryNavigator(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')), 50);
 		this.filter = new ReplFilter();
 		this.filterState = new ReplFilterState(this);
+		this.multiSessionRepl = CONTEXT_MULTI_SESSION_REPL.bindTo(contextKeyService);
+		this.multiSessionRepl.set(this.isMultiSessionView);
 
 		codeEditorService.registerDecorationType(DECORATION_KEY, {});
 		this.registerListeners();
@@ -207,7 +217,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 			if (!input || input.state === State.Inactive) {
 				await this.selectSession(newSession);
 			}
-			this.updateActions();
+			this.multiSessionRepl.set(this.isMultiSessionView);
 		}));
 		this._register(this.themeService.onDidColorThemeChange(() => {
 			this.refreshReplElements(false);
@@ -224,10 +234,16 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 				this.replInput.setModel(this.model);
 				this.updateInputDecoration();
 				this.refreshReplElements(true);
+				this.layoutBody(this.dimension.height, this.dimension.width);
 			}
 		}));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('debug.console.lineHeight') || e.affectsConfiguration('debug.console.fontSize') || e.affectsConfiguration('debug.console.fontFamily')) {
+			if (e.affectsConfiguration('debug.console.wordWrap')) {
+				this.tree.dispose();
+				this.treeContainer.innerText = '';
+				dom.clearNode(this.treeContainer);
+				this.createReplTree();
+			} else if (e.affectsConfiguration('debug.console.lineHeight') || e.affectsConfiguration('debug.console.fontSize') || e.affectsConfiguration('debug.console.fontFamily')) {
 				this.onDidStyleChange();
 			}
 		}));
@@ -305,7 +321,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		if (this.styleElement) {
 			const debugConsole = this.configurationService.getValue<IDebugConfiguration>('debug').console;
 			const fontSize = debugConsole.fontSize;
-			const fontFamily = debugConsole.fontFamily === 'default' ? 'var(--monaco-monospace-font)' : `'${debugConsole.fontFamily}'`;
+			const fontFamily = debugConsole.fontFamily === 'default' ? 'var(--monaco-monospace-font)' : `${debugConsole.fontFamily}`;
 			const lineHeight = debugConsole.lineHeight ? `${debugConsole.lineHeight}px` : '1.4em';
 			const backgroundColor = this.themeService.getColorTheme().getColor(this.getBackgroundColor());
 
@@ -321,7 +337,6 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 			this.styleElement.textContent = `
 				.repl .repl-tree .expression {
 					font-size: ${fontSize}px;
-					font-family: ${fontFamily};
 				}
 
 				.repl .repl-tree .expression {
@@ -340,6 +355,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 					background-color: ${backgroundColor};
 				}
 			`;
+			this.container.style.setProperty(`--vscode-repl-font-family`, fontFamily);
 
 			this.tree.rerender();
 
@@ -397,7 +413,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 				// Ignore inactive sessions which got cleared - so they are not shown any more
 				sessionsToIgnore.add(session);
 				await this.selectSession();
-				this.updateActions();
+				this.multiSessionRepl.set(this.isMultiSessionView);
 			}
 		}
 		this.replInput.focus();
@@ -455,14 +471,22 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		this.replInput.layout({ width: width - 30, height: replInputHeight });
 	}
 
+	collapseAll(): void {
+		this.tree.collapseAll();
+	}
+
+	getReplInput(): CodeEditorWidget {
+		return this.replInput;
+	}
+
 	focus(): void {
 		setTimeout(() => this.replInput.focus(), 0);
 	}
 
 	getActionViewItem(action: IAction): IActionViewItem | undefined {
-		if (action.id === SelectReplAction.ID) {
+		if (action.id === selectReplCommandId) {
 			const session = (this.tree ? this.tree.getInput() : undefined) ?? this.debugService.getViewModel().focusedSession;
-			return this.instantiationService.createInstance(SelectReplActionViewItem, this.selectReplAction, session);
+			return this.instantiationService.createInstance(SelectReplActionViewItem, action, session);
 		} else if (action.id === FILTER_ACTION_ID) {
 			const filterHistory = JSON.parse(this.storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')) as string[];
 			this.filterActionViewItem = this.instantiationService.createInstance(ReplFilterActionViewItem, action,
@@ -473,29 +497,11 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		return super.getActionViewItem(action);
 	}
 
-	getActions(): IAction[] {
-		const result: IAction[] = [];
-		result.push(new Action(FILTER_ACTION_ID));
-		if (this.debugService.getModel().getSessions(true).filter(s => s.hasSeparateRepl() && !sessionsToIgnore.has(s)).length > 1) {
-			result.push(this.selectReplAction);
-		}
-		result.push(this.clearReplAction);
-
-		result.forEach(a => this._register(a));
-
-		return result;
+	private get isMultiSessionView(): boolean {
+		return this.debugService.getModel().getSessions(true).filter(s => s.hasSeparateRepl() && !sessionsToIgnore.has(s)).length > 1;
 	}
 
 	// --- Cached locals
-	@memoize
-	private get selectReplAction(): SelectReplAction {
-		return this.instantiationService.createInstance(SelectReplAction, SelectReplAction.ID, SelectReplAction.LABEL);
-	}
-
-	@memoize
-	private get clearReplAction(): ClearReplAction {
-		return this.instantiationService.createInstance(ClearReplAction, ClearReplAction.ID, ClearReplAction.LABEL);
-	}
 
 	@memoize
 	private get refreshScheduler(): RunOnceScheduler {
@@ -506,7 +512,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 			}
 
 			const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight;
-			await this.tree.updateChildren();
+			await this.tree.updateChildren(undefined, true, false, { diffIdentityProvider: identityProvider });
 
 			const session = this.tree.getInput();
 			if (session) {
@@ -541,25 +547,27 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 
 	protected renderBody(parent: HTMLElement): void {
 		super.renderBody(parent);
-
 		this.container = dom.append(parent, $('.repl'));
-		const treeContainer = dom.append(this.container, $(`.repl-tree.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
+		this.treeContainer = dom.append(this.container, $(`.repl-tree.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
 		this.createReplInput(this.container);
+		this.createReplTree();
+	}
 
+	private createReplTree(): void {
 		this.replDelegate = new ReplDelegate(this.configurationService);
 		const wordWrap = this.configurationService.getValue<IDebugConfiguration>('debug').console.wordWrap;
-		treeContainer.classList.toggle('word-wrap', wordWrap);
+		this.treeContainer.classList.toggle('word-wrap', wordWrap);
 		const linkDetector = this.instantiationService.createInstance(LinkDetector);
 		this.tree = <WorkbenchAsyncDataTree<IDebugSession, IReplElement, FuzzyScore>>this.instantiationService.createInstance(
 			WorkbenchAsyncDataTree,
 			'DebugRepl',
-			treeContainer,
+			this.treeContainer,
 			this.replDelegate,
 			[
 				this.instantiationService.createInstance(ReplVariablesRenderer, linkDetector),
 				this.instantiationService.createInstance(ReplSimpleElementsRenderer, linkDetector),
 				new ReplEvaluationInputsRenderer(),
-				new ReplGroupRenderer(),
+				this.instantiationService.createInstance(ReplGroupRenderer, linkDetector),
 				new ReplEvaluationResultsRenderer(linkDetector),
 				new ReplRawObjectsRenderer(linkDetector),
 			],
@@ -568,7 +576,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 			{
 				filter: this.filter,
 				accessibilityProvider: new ReplAccessibilityProvider(),
-				identityProvider: { getId: (element: IReplElement) => element.getId() },
+				identityProvider,
 				mouseSupport: false,
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IReplElement) => e },
 				horizontalScrolling: !wordWrap,
@@ -598,7 +606,7 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 		this.replInputContainer = dom.append(container, $('.repl-input-wrapper'));
 		dom.append(this.replInputContainer, $('.repl-input-chevron' + ThemeIcon.asCSSSelector(debugConsoleEvaluationPrompt)));
 
-		const { scopedContextKeyService, historyNavigationEnablement } = createAndBindHistoryNavigationWidgetScopedContextKeyService(this.contextKeyService, { target: this.replInputContainer, historyNavigator: this });
+		const { scopedContextKeyService, historyNavigationEnablement } = createAndBindHistoryNavigationWidgetScopedContextKeyService(this.contextKeyService, { target: container, historyNavigator: this });
 		this.historyNavigationEnablement = historyNavigationEnablement;
 		this._register(scopedContextKeyService);
 		CONTEXT_IN_DEBUG_REPL.bindTo(scopedContextKeyService).set(true);
@@ -629,44 +637,12 @@ export class Repl extends ViewPane implements IHistoryNavigationWidget {
 
 	private onContextMenu(e: ITreeContextMenuEvent<IReplElement>): void {
 		const actions: IAction[] = [];
-		actions.push(new Action('debug.replCopy', localize('copy', "Copy"), undefined, true, async () => {
-			const nativeSelection = window.getSelection();
-			if (nativeSelection) {
-				await this.clipboardService.writeText(nativeSelection.toString());
-			}
-			return Promise.resolve();
-		}));
-		actions.push(new Action('workbench.debug.action.copyAll', localize('copyAll', "Copy All"), undefined, true, async () => {
-			await this.clipboardService.writeText(this.getVisibleContent());
-			return Promise.resolve();
-		}));
-		actions.push(new Action('debug.replPaste', localize('paste', "Paste"), undefined, this.debugService.state !== State.Inactive, async () => {
-			const clipboardText = await this.clipboardService.readText();
-			if (clipboardText) {
-				this.replInput.setValue(this.replInput.getValue().concat(clipboardText));
-				this.replInput.focus();
-				const model = this.replInput.getModel();
-				const lineNumber = model ? model.getLineCount() : 0;
-				const column = model?.getLineMaxColumn(lineNumber);
-				if (typeof lineNumber === 'number' && typeof column === 'number') {
-					this.replInput.setPosition({ lineNumber, column });
-				}
-			}
-		}));
-		actions.push(new Separator());
-		actions.push(new Action('debug.collapseRepl', localize('collapse', "Collapse All"), undefined, true, () => {
-			this.tree.collapseAll();
-			this.replInput.focus();
-			return Promise.resolve();
-		}));
-		actions.push(new Separator());
-		actions.push(this.clearReplAction);
-
+		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, actions);
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => e.anchor,
 			getActions: () => actions,
 			getActionsContext: () => e.element,
-			onHide: () => dispose(actions)
+			onHide: () => dispose(actionsDisposable)
 		});
 	}
 
@@ -825,48 +801,183 @@ class SelectReplActionViewItem extends FocusSessionActionViewItem {
 	}
 }
 
-class SelectReplAction extends Action {
-
-	static readonly ID = 'workbench.action.debug.selectRepl';
-	static readonly LABEL = localize('selectRepl', "Select Debug Console");
-
-	constructor(id: string, label: string,
-		@IDebugService private readonly debugService: IDebugService,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label);
-	}
-
-	async run(session: IDebugSession): Promise<any> {
-		// If session is already the focused session we need to manualy update the tree since view model will not send a focused change event
-		if (session && session.state !== State.Inactive && session !== this.debugService.getViewModel().focusedSession) {
-			await this.debugService.focusStackFrame(undefined, undefined, session, true);
-		} else {
-			const repl = getReplView(this.viewsService);
-			if (repl) {
-				await repl.selectSession(session);
-			}
-		}
-	}
-}
-
-export class ClearReplAction extends Action {
-	static readonly ID = 'workbench.debug.panel.action.clearReplAction';
-	static readonly LABEL = localize('clearRepl', "Clear Console");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'debug-action ' + ThemeIcon.asClassName(debugConsoleClearAll));
-	}
-
-	async run(): Promise<any> {
-		const view = await this.viewsService.openView(REPL_VIEW_ID) as Repl;
-		await view.clearRepl();
-		aria.status(localize('debugConsoleCleared', "Debug console was cleared"));
-	}
-}
-
 function getReplView(viewsService: IViewsService): Repl | undefined {
 	return viewsService.getActiveViewWithId(REPL_VIEW_ID) as Repl ?? undefined;
 }
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: FILTER_ACTION_ID,
+			title: localize('filter', "Filter"),
+			f1: true,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', REPL_VIEW_ID),
+				order: 10
+			}
+		});
+	}
+
+	run(_accessor: ServicesAccessor) {
+		// noop this action is just a placeholder for the filter action view item
+	}
+});
+
+const selectReplCommandId = 'workbench.action.debug.selectRepl';
+registerAction2(class extends ViewAction<Repl> {
+	constructor() {
+		super({
+			id: selectReplCommandId,
+			viewId: REPL_VIEW_ID,
+			title: localize('selectRepl', "Select Debug Console"),
+			f1: true,
+			icon: debugConsoleClearAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', REPL_VIEW_ID), CONTEXT_MULTI_SESSION_REPL),
+				order: 20
+			}
+		});
+	}
+
+	async runInView(accessor: ServicesAccessor, view: Repl, session: IDebugSession | undefined) {
+		const debugService = accessor.get(IDebugService);
+		// If session is already the focused session we need to manualy update the tree since view model will not send a focused change event
+		if (session && session.state !== State.Inactive && session !== debugService.getViewModel().focusedSession) {
+			if (session.state !== State.Stopped) {
+				// Focus child session instead if it is stopped #112595
+				const stopppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session);
+				if (stopppedChildSession) {
+					session = stopppedChildSession;
+				}
+			}
+			await debugService.focusStackFrame(undefined, undefined, session, true);
+		} else {
+			await view.selectSession(session);
+		}
+	}
+});
+
+registerAction2(class extends ViewAction<Repl> {
+	constructor() {
+		super({
+			id: 'workbench.debug.panel.action.clearReplAction',
+			viewId: REPL_VIEW_ID,
+			title: localize('clearRepl', "Clear Console"),
+			f1: true,
+			icon: debugConsoleClearAll,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', REPL_VIEW_ID),
+				order: 30
+			}, {
+				id: MenuId.DebugConsoleContext,
+				group: 'z_commands',
+				order: 20
+			}]
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: Repl): void {
+		view.clearRepl();
+		aria.status(localize('debugConsoleCleared', "Debug console was cleared"));
+	}
+});
+
+registerAction2(class extends ViewAction<Repl> {
+	constructor() {
+		super({
+			id: 'debug.collapseRepl',
+			title: localize('collapse', "Collapse All"),
+			viewId: REPL_VIEW_ID,
+			menu: {
+				id: MenuId.DebugConsoleContext,
+				group: 'z_commands',
+				order: 10
+			}
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: Repl): void {
+		view.collapseAll();
+		view.focus();
+	}
+});
+
+registerAction2(class extends ViewAction<Repl> {
+	constructor() {
+		super({
+			id: 'debug.replPaste',
+			title: localize('paste', "Paste"),
+			viewId: REPL_VIEW_ID,
+			precondition: CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Inactive)),
+			menu: {
+				id: MenuId.DebugConsoleContext,
+				group: '2_cutcopypaste',
+				order: 30
+			}
+		});
+	}
+
+	async runInView(accessor: ServicesAccessor, view: Repl): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+		const clipboardText = await clipboardService.readText();
+		if (clipboardText) {
+			const replInput = view.getReplInput();
+			replInput.setValue(replInput.getValue().concat(clipboardText));
+			view.focus();
+			const model = replInput.getModel();
+			const lineNumber = model ? model.getLineCount() : 0;
+			const column = model?.getLineMaxColumn(lineNumber);
+			if (typeof lineNumber === 'number' && typeof column === 'number') {
+				replInput.setPosition({ lineNumber, column });
+			}
+		}
+	}
+});
+
+registerAction2(class extends ViewAction<Repl> {
+	constructor() {
+		super({
+			id: 'workbench.debug.action.copyAll',
+			title: localize('copyAll', "Copy All"),
+			viewId: REPL_VIEW_ID,
+			menu: {
+				id: MenuId.DebugConsoleContext,
+				group: '2_cutcopypaste',
+				order: 20
+			}
+		});
+	}
+
+	async runInView(accessor: ServicesAccessor, view: Repl): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+		await clipboardService.writeText(view.getVisibleContent());
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'debug.replCopy',
+			title: localize('copy', "Copy"),
+			menu: {
+				id: MenuId.DebugConsoleContext,
+				group: '2_cutcopypaste',
+				order: 10
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const clipboardService = accessor.get(IClipboardService);
+		const nativeSelection = window.getSelection();
+		if (nativeSelection) {
+			await clipboardService.writeText(nativeSelection.toString());
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/replViewer.ts b/src/vs/workbench/contrib/debug/browser/replViewer.ts
index 0d432417f..937976c63 100644
--- a/src/vs/workbench/contrib/debug/browser/replViewer.ts
+++ b/src/vs/workbench/contrib/debug/browser/replViewer.ts
@@ -34,7 +34,7 @@ interface IReplEvaluationInputTemplateData {
 }
 
 interface IReplGroupTemplateData {
-	label: HighlightedLabel;
+	label: HTMLElement;
 }
 
 interface IReplEvaluationResultTemplateData {
@@ -87,22 +87,28 @@ export class ReplEvaluationInputsRenderer implements ITreeRenderer<ReplEvaluatio
 export class ReplGroupRenderer implements ITreeRenderer<ReplGroup, FuzzyScore, IReplGroupTemplateData> {
 	static readonly ID = 'replGroup';
 
+	constructor(
+		private readonly linkDetector: LinkDetector,
+		@IThemeService private readonly themeService: IThemeService
+	) { }
+
 	get templateId(): string {
 		return ReplGroupRenderer.ID;
 	}
 
-	renderTemplate(container: HTMLElement): IReplEvaluationInputTemplateData {
-		const input = dom.append(container, $('.expression'));
-		const label = new HighlightedLabel(input, false);
+	renderTemplate(container: HTMLElement): IReplGroupTemplateData {
+		const label = dom.append(container, $('.expression'));
 		return { label };
 	}
 
 	renderElement(element: ITreeNode<ReplGroup, FuzzyScore>, _index: number, templateData: IReplGroupTemplateData): void {
 		const replGroup = element.element;
-		templateData.label.set(replGroup.name, createMatches(element.filterData));
+		dom.clearNode(templateData.label);
+		const result = handleANSIOutput(replGroup.name, this.linkDetector, this.themeService, undefined);
+		templateData.label.appendChild(result);
 	}
 
-	disposeTemplate(_templateData: IReplEvaluationInputTemplateData): void {
+	disposeTemplate(_templateData: IReplGroupTemplateData): void {
 		// noop
 	}
 }
@@ -300,15 +306,15 @@ export class ReplDelegate extends CachedListVirtualDelegate<IReplElement> {
 
 	protected estimateHeight(element: IReplElement, ignoreValueLength = false): number {
 		const config = this.configurationService.getValue<IDebugConfiguration>('debug');
-		const rowHeight = Math.ceil(1.4 * config.console.fontSize);
+		const rowHeight = Math.ceil(1.3 * config.console.fontSize);
 		const countNumberOfLines = (str: string) => Math.max(1, (str && str.match(/\r\n|\n/g) || []).length);
 		const hasValue = (e: any): e is { value: string } => typeof e.value === 'string';
 
 		// Calculate a rough overestimation for the height
-		// For every 30 characters increase the number of lines needed
-		if (hasValue(element)) {
+		// For every 70 characters increase the number of lines needed beyond the first
+		if (hasValue(element) && !(element instanceof Variable)) {
 			let value = element.value;
-			let valueRows = countNumberOfLines(value) + (ignoreValueLength ? 0 : Math.floor(value.length / 30));
+			let valueRows = countNumberOfLines(value) + (ignoreValueLength ? 0 : Math.floor(value.length / 70));
 
 			return valueRows * rowHeight;
 		}
@@ -338,6 +344,10 @@ export class ReplDelegate extends CachedListVirtualDelegate<IReplElement> {
 	}
 
 	hasDynamicHeight(element: IReplElement): boolean {
+		if (element instanceof Variable) {
+			// Variables should always be in one line #111843
+			return false;
+		}
 		// Empty elements should not have dynamic height since they will be invisible
 		return element.toString().length > 0;
 	}
@@ -383,7 +393,8 @@ export class ReplAccessibilityProvider implements IListAccessibilityProvider<IRe
 			return localize('replVariableAriaLabel', "Variable {0}, value {1}", element.name, element.value);
 		}
 		if (element instanceof SimpleReplElement || element instanceof ReplEvaluationInput || element instanceof ReplEvaluationResult) {
-			return element.value + (element instanceof SimpleReplElement && element.count > 1 ? localize('occurred', ", occured {0} times", element.count) : '');
+			return element.value + (element instanceof SimpleReplElement && element.count > 1 ? localize({ key: 'occurred', comment: ['Front will the value of the debug console element. Placeholder will be replaced by a number which represents occurrance count.'] },
+				", occured {0} times", element.count) : '');
 		}
 		if (element instanceof RawObjectReplElement) {
 			return localize('replRawObjectAriaLabel', "Debug console variable {0}, value {1}", element.name, element.value);
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 7c8acdc41..665894a0b 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -3,20 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
-import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDebugService, IExpression, IScope, CONTEXT_VARIABLES_FOCUSED, IStackFrame, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, IDataBreakpointInfoResponse, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT } from 'vs/workbench/contrib/debug/common/debug';
-import { Variable, Scope, ErrorScope, StackFrame } from 'vs/workbench/contrib/debug/common/debugModel';
+import { IDebugService, IExpression, IScope, CONTEXT_VARIABLES_FOCUSED, IStackFrame, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, IDataBreakpointInfoResponse, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, VARIABLES_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { Variable, Scope, ErrorScope, StackFrame, Expression } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { renderViewTree, renderVariable, IInputBoxOptions, AbstractExpressionsRenderer, IExpressionTemplateData } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { IAction } from 'vs/base/common/actions';
-import { CopyValueAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { ITreeRenderer, ITreeNode, ITreeMouseEvent, ITreeContextMenuEvent, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
@@ -26,17 +23,19 @@ import { IAsyncDataTreeViewState } from 'vs/base/browser/ui/tree/asyncDataTree';
 import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { HighlightedLabel, IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, IContextKey, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { dispose } from 'vs/base/common/lifecycle';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { withUndefinedAsNull } from 'vs/base/common/types';
-import { IMenuService, IMenu, MenuId } from 'vs/platform/actions/common/actions';
+import { IMenuService, IMenu, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { debugCollapseAll } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { localize } from 'vs/nls';
+import { Codicon } from 'vs/base/common/codicons';
+import { coalesce } from 'vs/base/common/arrays';
 
 const $ = dom.$;
 let forgetScopes = true;
@@ -179,10 +178,6 @@ export class VariablesView extends ViewPane {
 		}));
 	}
 
-	getActions(): IAction[] {
-		return [new CollapseAction(() => this.tree, true, 'explorer-action ' + ThemeIcon.asClassName(debugCollapseAll))];
-	}
-
 	layoutBody(width: number, height: number): void {
 		super.layoutBody(height, width);
 		this.tree.layout(width, height);
@@ -192,6 +187,10 @@ export class VariablesView extends ViewPane {
 		this.tree.domFocus();
 	}
 
+	collapseAll(): void {
+		this.tree.collapseAll();
+	}
+
 	private onMouseDblClick(e: ITreeMouseEvent<IExpression | IScope>): void {
 		const session = this.debugService.getViewModel().focusedSession;
 		if (session && e.element instanceof Variable && session.capabilities.supportsSetVariable) {
@@ -345,7 +344,7 @@ export class VariablesRenderer extends AbstractExpressionsRenderer {
 		const variable = <Variable>expression;
 		return {
 			initialValue: expression.value,
-			ariaLabel: nls.localize('variableValueAriaLabel', "Type new variable value"),
+			ariaLabel: localize('variableValueAriaLabel', "Type new variable value"),
 			validationOptions: {
 				validation: () => variable.errorMessage ? ({ content: variable.errorMessage }) : null
 			},
@@ -368,15 +367,15 @@ export class VariablesRenderer extends AbstractExpressionsRenderer {
 class VariablesAccessibilityProvider implements IListAccessibilityProvider<IExpression | IScope> {
 
 	getWidgetAriaLabel(): string {
-		return nls.localize('variablesAriaTreeLabel', "Debug Variables");
+		return localize('variablesAriaTreeLabel', "Debug Variables");
 	}
 
 	getAriaLabel(element: IExpression | IScope): string | null {
 		if (element instanceof Scope) {
-			return nls.localize('variableScopeAriaLabel', "Scope {0}", element.name);
+			return localize('variableScopeAriaLabel', "Scope {0}", element.name);
 		}
 		if (element instanceof Variable) {
-			return nls.localize({ key: 'variableAriaLabel', comment: ['Placeholders are variable name and variable value respectivly. They should not be translated.'] }, "{0}, value {1}", element.name, element.value);
+			return localize({ key: 'variableAriaLabel', comment: ['Placeholders are variable name and variable value respectivly. They should not be translated.'] }, "{0}, value {1}", element.name, element.value);
 		}
 
 		return null;
@@ -392,14 +391,40 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-export const COPY_VALUE_ID = 'debug.copyValue';
+export const COPY_VALUE_ID = 'workbench.debug.viewlet.action.copyValue';
 CommandsRegistry.registerCommand({
 	id: COPY_VALUE_ID,
-	handler: async (accessor: ServicesAccessor) => {
-		const instantiationService = accessor.get(IInstantiationService);
-		if (variableInternalContext) {
-			const action = instantiationService.createInstance(CopyValueAction, CopyValueAction.ID, CopyValueAction.LABEL, variableInternalContext, 'variables');
-			await action.run();
+	handler: async (accessor: ServicesAccessor, arg: Variable | Expression | unknown, ctx?: (Variable | Expression)[]) => {
+		const debugService = accessor.get(IDebugService);
+		const clipboardService = accessor.get(IClipboardService);
+		let elementContext = '';
+		let elements: (Variable | Expression)[];
+		if (arg instanceof Variable || arg instanceof Expression) {
+			elementContext = 'watch';
+			elements = ctx ? ctx : [];
+		} else {
+			elementContext = 'variables';
+			elements = variableInternalContext ? [variableInternalContext] : [];
+		}
+
+		const stackFrame = debugService.getViewModel().focusedStackFrame;
+		const session = debugService.getViewModel().focusedSession;
+		if (!stackFrame || !session || elements.length === 0) {
+			return;
+		}
+
+		const evalContext = session.capabilities.supportsClipboardContext ? 'clipboard' : elementContext;
+		const toEvaluate = elements.map(element => element instanceof Variable ? (element.evaluateName || element.value) : element.name);
+
+		try {
+			const evaluations = await Promise.all(toEvaluate.map(expr => session.evaluate(expr, stackFrame.frameId, evalContext)));
+			const result = coalesce(evaluations).map(evaluation => evaluation.body.result);
+			if (result.length) {
+				clipboardService.writeText(result.join('\n'));
+			}
+		} catch (e) {
+			const result = elements.map(element => element.value);
+			clipboardService.writeText(result.join('\n'));
 		}
 	}
 });
@@ -433,3 +458,23 @@ CommandsRegistry.registerCommand({
 	}
 });
 
+registerAction2(class extends ViewAction<VariablesView> {
+	constructor() {
+		super({
+			id: 'variables.collapse',
+			viewId: VARIABLES_VIEW_ID,
+			title: localize('collapse', "Collapse All"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', VARIABLES_VIEW_ID)
+			}
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: VariablesView) {
+		view.collapseAll();
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index 2e18414c9..23ee7babf 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -3,20 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IDebugService, IExpression, CONTEXT_WATCH_EXPRESSIONS_FOCUSED } from 'vs/workbench/contrib/debug/common/debug';
+import { IDebugService, IExpression, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, WATCH_VIEW_ID, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_ITEM_TYPE } from 'vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable } from 'vs/workbench/contrib/debug/common/debugModel';
-import { AddWatchExpressionAction, RemoveAllWatchExpressionsAction, CopyValueAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IAction, Action, Separator } from 'vs/base/common/actions';
+import { IAction } from 'vs/base/common/actions';
 import { renderExpressionValue, renderViewTree, IInputBoxOptions, AbstractExpressionsRenderer, IExpressionTemplateData } from 'vs/workbench/contrib/debug/browser/baseDebugView';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
@@ -26,13 +23,17 @@ import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
 import { FuzzyScore } from 'vs/base/common/filters';
 import { IHighlight } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { VariablesRenderer } from 'vs/workbench/contrib/debug/browser/variablesView';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyEqualsExpr, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { dispose } from 'vs/base/common/lifecycle';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { debugCollapseAll } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { watchExpressionsRemoveAll, watchExpressionsAdd } from 'vs/workbench/contrib/debug/browser/debugIcons';
+import { registerAction2, MenuId, Action2, IMenuService, IMenu } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+import { Codicon } from 'vs/base/common/codicons';
+import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 let ignoreViewUpdates = false;
@@ -43,6 +44,9 @@ export class WatchExpressionsView extends ViewPane {
 	private watchExpressionsUpdatedScheduler: RunOnceScheduler;
 	private needsRefresh = false;
 	private tree!: WorkbenchAsyncDataTree<IDebugService | IExpression, IExpression, FuzzyScore>;
+	private watchExpressionsExist: IContextKey<boolean>;
+	private watchItemType: IContextKey<string | undefined>;
+	private menu: IMenu;
 
 	constructor(
 		options: IViewletViewOptions,
@@ -56,13 +60,19 @@ export class WatchExpressionsView extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@IMenuService menuService: IMenuService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 
+		this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
+		this._register(this.menu);
 		this.watchExpressionsUpdatedScheduler = new RunOnceScheduler(() => {
 			this.needsRefresh = false;
 			this.tree.updateChildren();
 		}, 50);
+		this.watchExpressionsExist = CONTEXT_WATCH_EXPRESSIONS_EXIST.bindTo(contextKeyService);
+		this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
+		this.watchItemType = CONTEXT_WATCH_ITEM_TYPE.bindTo(contextKeyService);
 	}
 
 	renderBody(container: HTMLElement): void {
@@ -98,6 +108,7 @@ export class WatchExpressionsView extends ViewPane {
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 		this._register(this.tree.onMouseDblClick(e => this.onMouseDblClick(e)));
 		this._register(this.debugService.getModel().onDidChangeWatchExpressions(async we => {
+			this.watchExpressionsExist.set(this.debugService.getModel().getWatchExpressions().length > 0);
 			if (!this.isBodyVisible()) {
 				this.needsRefresh = true;
 			} else {
@@ -141,7 +152,10 @@ export class WatchExpressionsView extends ViewPane {
 					this.tree.updateOptions({ horizontalScrolling: false });
 				}
 
-				this.tree.rerender(e);
+				if (e.name) {
+					// Only rerender if the input is already done since otherwise the tree is not yet aware of the new element
+					this.tree.rerender(e);
+				}
 			} else if (!e && horizontalScrolling !== undefined) {
 				this.tree.updateOptions({ horizontalScrolling: horizontalScrolling });
 				horizontalScrolling = undefined;
@@ -158,12 +172,8 @@ export class WatchExpressionsView extends ViewPane {
 		this.tree.domFocus();
 	}
 
-	getActions(): IAction[] {
-		return [
-			new AddWatchExpressionAction(AddWatchExpressionAction.ID, AddWatchExpressionAction.LABEL, this.debugService, this.keybindingService),
-			new CollapseAction(() => this.tree, true, 'explorer-action ' + ThemeIcon.asClassName(debugCollapseAll)),
-			new RemoveAllWatchExpressionsAction(RemoveAllWatchExpressionsAction.ID, RemoveAllWatchExpressionsAction.LABEL, this.debugService, this.keybindingService)
-		];
+	collapseAll(): void {
+		this.tree.collapseAll();
 	}
 
 	private onMouseDblClick(e: ITreeMouseEvent<IExpression>): void {
@@ -184,42 +194,17 @@ export class WatchExpressionsView extends ViewPane {
 
 	private onContextMenu(e: ITreeContextMenuEvent<IExpression>): void {
 		const element = e.element;
-		const anchor = e.anchor;
-		if (!anchor) {
-			return;
-		}
+		const selection = this.tree.getSelection();
+
+		this.watchItemType.set(element instanceof Expression ? 'expression' : element instanceof Variable ? 'variable' : undefined);
 		const actions: IAction[] = [];
-
-		if (element instanceof Expression) {
-			const expression = <Expression>element;
-			actions.push(new AddWatchExpressionAction(AddWatchExpressionAction.ID, AddWatchExpressionAction.LABEL, this.debugService, this.keybindingService));
-			actions.push(new Action('debug.editWatchExpression', nls.localize('editWatchExpression', "Edit Expression"), undefined, true, () => {
-				this.debugService.getViewModel().setSelectedExpression(expression);
-				return Promise.resolve();
-			}));
-			actions.push(this.instantiationService.createInstance(CopyValueAction, CopyValueAction.ID, CopyValueAction.LABEL, expression, 'watch'));
-			actions.push(new Separator());
-
-			actions.push(new Action('debug.removeWatchExpression', nls.localize('removeWatchExpression', "Remove Expression"), undefined, true, () => {
-				this.debugService.removeWatchExpressions(expression.getId());
-				return Promise.resolve();
-			}));
-			actions.push(new RemoveAllWatchExpressionsAction(RemoveAllWatchExpressionsAction.ID, RemoveAllWatchExpressionsAction.LABEL, this.debugService, this.keybindingService));
-		} else {
-			actions.push(new AddWatchExpressionAction(AddWatchExpressionAction.ID, AddWatchExpressionAction.LABEL, this.debugService, this.keybindingService));
-			if (element instanceof Variable) {
-				const variable = element as Variable;
-				actions.push(this.instantiationService.createInstance(CopyValueAction, CopyValueAction.ID, CopyValueAction.LABEL, variable, 'watch'));
-				actions.push(new Separator());
-			}
-			actions.push(new RemoveAllWatchExpressionsAction(RemoveAllWatchExpressionsAction.ID, RemoveAllWatchExpressionsAction.LABEL, this.debugService, this.keybindingService));
-		}
+		const actionsDisposable = createAndFillInContextMenuActions(this.menu, { arg: element, shouldForwardArgs: true }, actions);
 
 		this.contextMenuService.showContextMenu({
-			getAnchor: () => anchor,
+			getAnchor: () => e.anchor,
 			getActions: () => actions,
-			getActionsContext: () => element,
-			onHide: () => dispose(actions)
+			getActionsContext: () => element && selection.includes(element) ? selection : element ? [element] : [],
+			onHide: () => dispose(actionsDisposable)
 		});
 	}
 }
@@ -287,8 +272,8 @@ export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 	protected getInputBoxOptions(expression: IExpression): IInputBoxOptions {
 		return {
 			initialValue: expression.name ? expression.name : '',
-			ariaLabel: nls.localize('watchExpressionInputAriaLabel', "Type watch expression"),
-			placeholder: nls.localize('watchExpressionPlaceholder', "Expression to watch"),
+			ariaLabel: localize('watchExpressionInputAriaLabel', "Type watch expression"),
+			placeholder: localize('watchExpressionPlaceholder', "Expression to watch"),
 			onFinish: (value: string, success: boolean) => {
 				if (success && value) {
 					this.debugService.renameWatchExpression(expression.getId(), value);
@@ -306,16 +291,16 @@ export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 class WatchExpressionsAccessibilityProvider implements IListAccessibilityProvider<IExpression> {
 
 	getWidgetAriaLabel(): string {
-		return nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' }, "Debug Watch Expressions");
+		return localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' }, "Debug Watch Expressions");
 	}
 
 	getAriaLabel(element: IExpression): string {
 		if (element instanceof Expression) {
-			return nls.localize('watchExpressionAriaLabel', "{0}, value {1}", (<Expression>element).name, (<Expression>element).value);
+			return localize('watchExpressionAriaLabel', "{0}, value {1}", (<Expression>element).name, (<Expression>element).value);
 		}
 
 		// Variable
-		return nls.localize('watchVariableAriaLabel', "{0}, value {1}", (<Variable>element).name, (<Variable>element).value);
+		return localize('watchVariableAriaLabel', "{0}, value {1}", (<Variable>element).name, (<Variable>element).value);
 	}
 }
 
@@ -359,3 +344,75 @@ class WatchExpressionsDragAndDrop implements ITreeDragAndDrop<IExpression> {
 		this.debugService.moveWatchExpression(draggedElement.getId(), position);
 	}
 }
+
+registerAction2(class Collapse extends ViewAction<WatchExpressionsView> {
+	constructor() {
+		super({
+			id: 'watch.collapse',
+			viewId: WATCH_VIEW_ID,
+			title: localize('collapse', "Collapse All"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 30,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', WATCH_VIEW_ID)
+			}
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: WatchExpressionsView) {
+		view.collapseAll();
+	}
+});
+
+export const ADD_WATCH_ID = 'workbench.debug.viewlet.action.addWatchExpression'; // Use old and long id for backwards compatibility
+export const ADD_WATCH_LABEL = localize('addWatchExpression', "Add Expression");
+
+registerAction2(class AddWatchExpressionAction extends Action2 {
+	constructor() {
+		super({
+			id: ADD_WATCH_ID,
+			title: ADD_WATCH_LABEL,
+			f1: false,
+			icon: watchExpressionsAdd,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', WATCH_VIEW_ID)
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const debugService = accessor.get(IDebugService);
+		debugService.addWatchExpression();
+	}
+});
+
+export const REMOVE_WATCH_EXPRESSIONS_COMMAND_ID = 'workbench.debug.viewlet.action.removeAllWatchExpressions';
+export const REMOVE_WATCH_EXPRESSIONS_LABEL = localize('removeAllWatchExpressions', "Remove All Expressions");
+registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
+	constructor() {
+		super({
+			id: REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, // Use old and long id for backwards compatibility
+			title: REMOVE_WATCH_EXPRESSIONS_LABEL,
+			f1: false,
+			icon: watchExpressionsRemoveAll,
+			precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 20,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', WATCH_VIEW_ID)
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const debugService = accessor.get(IDebugService);
+		debugService.removeWatchExpressions();
+	}
+});
diff --git a/src/vs/workbench/contrib/debug/browser/welcomeView.ts b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
index c88b28e8b..e33671e73 100644
--- a/src/vs/workbench/contrib/debug/browser/welcomeView.ts
+++ b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
@@ -10,10 +10,9 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { localize } from 'vs/nls';
-import { StartAction, ConfigureAction, SelectAndStartAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { IDebugService, CONTEXT_DEBUGGERS_AVAILABLE } from 'vs/workbench/contrib/debug/common/debug';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IViewDescriptorService, IViewsRegistry, Extensions, ViewContentGroups } from 'vs/workbench/common/views';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -25,6 +24,7 @@ import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_START_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
 
 const debugStartLanguageKey = 'debugStartLanguage';
 const CONTEXT_DEBUG_START_LANGUAGE = new RawContextKey<string>(debugStartLanguageKey, undefined);
@@ -96,7 +96,7 @@ export class WelcomeView extends ViewPane {
 		}));
 		setContextKey();
 
-		const debugKeybinding = this.keybindingService.lookupKeybinding(StartAction.ID);
+		const debugKeybinding = this.keybindingService.lookupKeybinding(DEBUG_START_COMMAND_ID);
 		debugKeybindingLabel = debugKeybinding ? ` (${debugKeybinding.getLabel()})` : '';
 	}
 
@@ -116,14 +116,14 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 let debugKeybindingLabel = '';
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 	content: localize({ key: 'runAndDebugAction', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
-		"[Run and Debug{0}](command:{1})", debugKeybindingLabel, StartAction.ID),
+		"[Run and Debug{0}](command:{1})", debugKeybindingLabel, DEBUG_START_COMMAND_ID),
 	when: CONTEXT_DEBUGGERS_AVAILABLE,
 	group: ViewContentGroups.Debug
 });
 
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 	content: localize({ key: 'detectThenRunAndDebug', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
-		"[Show](command:{0}) all automatic debug configurations.", SelectAndStartAction.ID),
+		"[Show](command:{0}) all automatic debug configurations.", SELECT_AND_START_ID),
 	when: CONTEXT_DEBUGGERS_AVAILABLE,
 	group: ViewContentGroups.Debug,
 	order: 10
@@ -131,7 +131,7 @@ viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
 	content: localize({ key: 'customizeRunAndDebug', comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'] },
-		"To customize Run and Debug [create a launch.json file](command:{0}).", ConfigureAction.ID),
+		"To customize Run and Debug [create a launch.json file](command:{0}).", DEBUG_CONFIGURE_COMMAND_ID),
 	when: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, WorkbenchStateContext.notEqualsTo('empty')),
 	group: ViewContentGroups.Debug
 });
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 8f1715543..c46778c61 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -25,6 +25,7 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { DebugConfigurationProviderTriggerKind } from 'vs/workbench/api/common/extHostTypes';
 import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
+import { IAction } from 'vs/base/common/actions';
 
 export const VIEWLET_ID = 'workbench.view.debug';
 
@@ -47,10 +48,14 @@ export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('bre
 export const CONTEXT_IN_BREAKPOINT_WIDGET = new RawContextKey<boolean>('inBreakpointWidget', false);
 export const CONTEXT_BREAKPOINTS_FOCUSED = new RawContextKey<boolean>('breakpointsFocused', true);
 export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('watchExpressionsFocused', true);
+export const CONTEXT_WATCH_EXPRESSIONS_EXIST = new RawContextKey<boolean>('watchExpressionsExist', false);
 export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true);
 export const CONTEXT_EXPRESSION_SELECTED = new RawContextKey<boolean>('expressionSelected', false);
-export const CONTEXT_BREAKPOINT_SELECTED = new RawContextKey<boolean>('breakpointSelected', false);
+export const CONTEXT_BREAKPOINT_INPUT_FOCUSED = new RawContextKey<boolean>('breakpointInputFocused', false);
 export const CONTEXT_CALLSTACK_ITEM_TYPE = new RawContextKey<string>('callStackItemType', undefined);
+export const CONTEXT_WATCH_ITEM_TYPE = new RawContextKey<string>('watchItemType', undefined);
+export const CONTEXT_BREAKPOINT_ITEM_TYPE = new RawContextKey<string>('breakpointItemType', undefined);
+export const CONTEXT_BREAKPOINT_SUPPORTS_CONDITION = new RawContextKey<boolean>('breakpointSupportsCondition', false);
 export const CONTEXT_LOADED_SCRIPTS_SUPPORTED = new RawContextKey<boolean>('loadedScriptsSupported', false);
 export const CONTEXT_LOADED_SCRIPTS_ITEM_TYPE = new RawContextKey<string>('loadedScriptsItemType', undefined);
 export const CONTEXT_FOCUSED_SESSION_IS_ATTACH = new RawContextKey<boolean>('focusedSessionIsAttach', false);
@@ -65,6 +70,8 @@ export const CONTEXT_SET_VARIABLE_SUPPORTED = new RawContextKey<boolean>('debugS
 export const CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED = new RawContextKey<boolean>('breakWhenValueChangesSupported', false);
 export const CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT = new RawContextKey<boolean>('variableEvaluateNamePresent', false);
 export const CONTEXT_EXCEPTION_WIDGET_VISIBLE = new RawContextKey<boolean>('exceptionWidgetVisible', false);
+export const CONTEXT_MULTI_SESSION_REPL = new RawContextKey<boolean>('multiSessionRepl', false);
+export const CONTEXT_MULTI_SESSION_DEBUG = new RawContextKey<boolean>('multiSessionDebug', false);
 
 export const EDITOR_CONTRIBUTION_ID = 'editor.contrib.debug';
 export const BREAKPOINT_EDITOR_CONTRIBUTION_ID = 'editor.contrib.breakpoint';
@@ -183,6 +190,7 @@ export interface IDebugSession extends ITreeElement {
 	readonly subId: string | undefined;
 	readonly compact: boolean;
 	readonly compoundRoot: DebugCompoundRoot | undefined;
+	readonly name: string;
 
 	setSubId(subId: string | undefined): void;
 
@@ -437,9 +445,7 @@ export interface IViewModel extends ITreeElement {
 	readonly focusedStackFrame: IStackFrame | undefined;
 
 	getSelectedExpression(): IExpression | undefined;
-	getSelectedBreakpoint(): IFunctionBreakpoint | IExceptionBreakpoint | undefined;
 	setSelectedExpression(expression: IExpression | undefined): void;
-	setSelectedBreakpoint(functionBreakpoint: IFunctionBreakpoint | IExceptionBreakpoint | undefined): void;
 	updateViews(): void;
 
 	isMultiSessionView(): boolean;
@@ -629,7 +635,6 @@ export interface IDebuggerContribution extends IPlatformSpecificAdapterContribut
 
 	// supported languages
 	languages?: string[];
-	enableBreakpointsFor?: { languageIds?: string[] };
 
 	// debug configuration support
 	configurationAttributes?: any;
@@ -845,10 +850,10 @@ export interface IDebugService {
 	addFunctionBreakpoint(name?: string, id?: string): void;
 
 	/**
-	 * Renames an already existing function breakpoint.
+	 * Updates an already existing function breakpoint.
 	 * Notifies debug adapter of breakpoint changes.
 	 */
-	renameFunctionBreakpoint(id: string, newFunctionName: string): Promise<void>;
+	updateFunctionBreakpoint(id: string, update: { name?: string, hitCondition?: string, condition?: string }): Promise<void>;
 
 	/**
 	 * Removes all function breakpoints. If id is passed only removes the function breakpoint with the passed id.
@@ -869,6 +874,8 @@ export interface IDebugService {
 
 	setExceptionBreakpointCondition(breakpoint: IExceptionBreakpoint, condition: string | undefined): Promise<void>;
 
+	setExceptionBreakpoints(data: DebugProtocol.ExceptionBreakpointsFilter[]): void;
+
 	/**
 	 * Sends all breakpoints to the passed session.
 	 * If session is not passed, sends all breakpoints to each session.
@@ -947,6 +954,7 @@ export interface IDebugEditorContribution extends editorCommon.IEditorContributi
 export interface IBreakpointEditorContribution extends editorCommon.IEditorContribution {
 	showBreakpointWidget(lineNumber: number, column: number | undefined, context?: BreakpointWidgetContext): void;
 	closeBreakpointWidget(): void;
+	getContextMenuActionsAtPosition(lineNumber: number, model: EditorIModel): IAction[];
 }
 
 // temporary debug helper service
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
index b98b3b897..68184d87c 100644
--- a/src/vs/workbench/contrib/debug/common/debugModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -423,7 +423,9 @@ export class Thread implements IThread {
 	}
 
 	getTopStackFrame(): IStackFrame | undefined {
-		return this.getCallStack().find(sf => !!(sf && sf.source && sf.source.available && sf.source.presentationHint !== 'deemphasize'));
+		const callStack = this.getCallStack();
+		const firstAvailableStackFrame = callStack.find(sf => !!(sf && sf.source && sf.source.available && sf.source.presentationHint !== 'deemphasize'));
+		return firstAvailableStackFrame || (callStack.length > 0 ? callStack[0] : undefined);
 	}
 
 	get stateLabel(): string {
@@ -452,6 +454,9 @@ export class Thread implements IThread {
 				this.callStack.splice(start, this.callStack.length - start);
 			}
 			this.callStack = this.callStack.concat(callStack || []);
+			if (typeof this.stoppedDetails?.totalFrames === 'number' && this.stoppedDetails.totalFrames === this.callStack.length) {
+				this.reachedEndOfCallStack = true;
+			}
 		}
 	}
 
@@ -946,6 +951,11 @@ export class DebugModel implements IDebugModel {
 			return true;
 		});
 
+		let i = 1;
+		while (this.sessions.some(s => s.getLabel() === session.getLabel())) {
+			session.setName(`${session.configuration.name} ${++i}`);
+		}
+
 		let index = -1;
 		if (session.parentSession) {
 			// Make sure that child sessions are placed after the parent session
@@ -1236,10 +1246,18 @@ export class DebugModel implements IDebugModel {
 		return newFunctionBreakpoint;
 	}
 
-	renameFunctionBreakpoint(id: string, name: string): void {
+	updateFunctionBreakpoint(id: string, update: { name?: string, hitCondition?: string, condition?: string }): void {
 		const functionBreakpoint = this.functionBreakpoints.find(fbp => fbp.getId() === id);
 		if (functionBreakpoint) {
-			functionBreakpoint.name = name;
+			if (typeof update.name === 'string') {
+				functionBreakpoint.name = update.name;
+			}
+			if (typeof update.condition === 'string') {
+				functionBreakpoint.condition = update.condition;
+			}
+			if (typeof update.hitCondition === 'string') {
+				functionBreakpoint.hitCondition = update.hitCondition;
+			}
 			this._onDidChangeBreakpoints.fire({ changed: [functionBreakpoint], sessionOnly: false });
 		}
 	}
diff --git a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
index f11bab4fb..dad39a583 100644
--- a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
+++ b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
@@ -740,7 +740,7 @@ declare module DebugProtocol {
 		/** Reference to the Variable container if the data breakpoint is requested for a child of the container. */
 		variablesReference?: number;
 		/** The name of the Variable's child to obtain data breakpoint information for.
-			If variableReference isn’t provided, this can be an expression.
+			If variablesReference isn’t provided, this can be an expression.
 		*/
 		name: string;
 	}
@@ -1012,7 +1012,7 @@ declare module DebugProtocol {
 
 	/** StackTrace request; value of command field is 'stackTrace'.
 		The request returns a stacktrace from the current execution state of a given thread.
-		A client can request all stack frames by omitting the startFrame and levels arguments. For performance conscious clients stack frames can be retrieved in a piecemeal way with the startFrame and levels arguments. The response of the stackTrace request may contain a totalFrames property that hints at the total number of frames in the stack. If a client needs this total number upfront, it can issue a request for a single (first) frame and depending on the value of totalFrames decide how to proceed. In any case a client should be prepared to receive less frames than requested, which is an indication that the end of the stack has been reached.
+		A client can request all stack frames by omitting the startFrame and levels arguments. For performance conscious clients and if the debug adapter's 'supportsDelayedStackTraceLoading' capability is true, stack frames can be retrieved in a piecemeal way with the startFrame and levels arguments. The response of the stackTrace request may contain a totalFrames property that hints at the total number of frames in the stack. If a client needs this total number upfront, it can issue a request for a single (first) frame and depending on the value of totalFrames decide how to proceed. In any case a client should be prepared to receive less frames than requested, which is an indication that the end of the stack has been reached.
 	*/
 	export interface StackTraceRequest extends Request {
 		// command: 'stackTrace';
@@ -1591,7 +1591,7 @@ declare module DebugProtocol {
 		supportsExceptionInfoRequest?: boolean;
 		/** The debug adapter supports the 'terminateDebuggee' attribute on the 'disconnect' request. */
 		supportTerminateDebuggee?: boolean;
-		/** The debug adapter supports the delayed loading of parts of the stack, which requires that both the 'startFrame' and 'levels' arguments and the 'totalFrames' result of the 'StackTrace' request are supported. */
+		/** The debug adapter supports the delayed loading of parts of the stack, which requires that both the 'startFrame' and 'levels' arguments and an optional 'totalFrames' result of the 'StackTrace' request are supported. */
 		supportsDelayedStackTraceLoading?: boolean;
 		/** The debug adapter supports the 'loadedSources' request. */
 		supportsLoadedSourcesRequest?: boolean;
@@ -1871,7 +1871,7 @@ declare module DebugProtocol {
 			'mostDerivedClass': Indicates that the object is the most derived class.
 			'virtual': Indicates that the object is virtual, that means it is a synthetic object introducedby the
 			adapter for rendering purposes, e.g. an index range for large arrays.
-			'dataBreakpoint': Indicates that a data breakpoint is registered for the object.
+			'dataBreakpoint': Deprecated: Indicates that a data breakpoint is registered for the object. The 'hasDataBreakpoint' attribute should generally be used instead.
 			etc.
 		*/
 		kind?: 'property' | 'method' | 'class' | 'data' | 'event' | 'baseClass' | 'innerClass' | 'interface' | 'mostDerivedClass' | 'virtual' | 'dataBreakpoint' | string;
@@ -1884,9 +1884,10 @@ declare module DebugProtocol {
 			'hasObjectId': Indicates that the object can have an Object ID created for it.
 			'canHaveObjectId': Indicates that the object has an Object ID associated with it.
 			'hasSideEffects': Indicates that the evaluation had side effects.
+			'hasDataBreakpoint': Indicates that the object has its value tracked by a data breakpoint.
 			etc.
 		*/
-		attributes?: ('static' | 'constant' | 'readOnly' | 'rawString' | 'hasObjectId' | 'canHaveObjectId' | 'hasSideEffects' | string)[];
+		attributes?: ('static' | 'constant' | 'readOnly' | 'rawString' | 'hasObjectId' | 'canHaveObjectId' | 'hasSideEffects' | 'hasDataBreakpoint' | string)[];
 		/** Visibility of variable. Before introducing additional values, try to use the listed values.
 			Values: 'public', 'private', 'protected', 'internal', 'final', etc.
 		*/
diff --git a/src/vs/workbench/contrib/debug/common/debugViewModel.ts b/src/vs/workbench/contrib/debug/common/debugViewModel.ts
index e7541cd89..a17e61185 100644
--- a/src/vs/workbench/contrib/debug/common/debugViewModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugViewModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event, Emitter } from 'vs/base/common/event';
-import { CONTEXT_EXPRESSION_SELECTED, IViewModel, IStackFrame, IDebugSession, IThread, IExpression, IFunctionBreakpoint, CONTEXT_BREAKPOINT_SELECTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, IExceptionBreakpoint } from 'vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_EXPRESSION_SELECTED, IViewModel, IStackFrame, IDebugSession, IThread, IExpression, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG } from 'vs/workbench/contrib/debug/common/debug';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { isSessionAttach } from 'vs/workbench/contrib/debug/common/debugUtils';
 
@@ -16,14 +16,11 @@ export class ViewModel implements IViewModel {
 	private _focusedSession: IDebugSession | undefined;
 	private _focusedThread: IThread | undefined;
 	private selectedExpression: IExpression | undefined;
-	private selectedBreakpoint: IFunctionBreakpoint | IExceptionBreakpoint | undefined;
 	private readonly _onDidFocusSession = new Emitter<IDebugSession | undefined>();
 	private readonly _onDidFocusStackFrame = new Emitter<{ stackFrame: IStackFrame | undefined, explicit: boolean }>();
 	private readonly _onDidSelectExpression = new Emitter<IExpression | undefined>();
 	private readonly _onWillUpdateViews = new Emitter<void>();
-	private multiSessionView: boolean;
 	private expressionSelectedContextKey!: IContextKey<boolean>;
-	private breakpointSelectedContextKey!: IContextKey<boolean>;
 	private loadedScriptsSupportedContextKey!: IContextKey<boolean>;
 	private stepBackSupportedContextKey!: IContextKey<boolean>;
 	private focusedSessionIsAttach!: IContextKey<boolean>;
@@ -31,12 +28,11 @@ export class ViewModel implements IViewModel {
 	private stepIntoTargetsSupported!: IContextKey<boolean>;
 	private jumpToCursorSupported!: IContextKey<boolean>;
 	private setVariableSupported!: IContextKey<boolean>;
+	private multiSessionDebug!: IContextKey<boolean>;
 
 	constructor(private contextKeyService: IContextKeyService) {
-		this.multiSessionView = false;
 		contextKeyService.bufferChangeEvents(() => {
 			this.expressionSelectedContextKey = CONTEXT_EXPRESSION_SELECTED.bindTo(contextKeyService);
-			this.breakpointSelectedContextKey = CONTEXT_BREAKPOINT_SELECTED.bindTo(contextKeyService);
 			this.loadedScriptsSupportedContextKey = CONTEXT_LOADED_SCRIPTS_SUPPORTED.bindTo(contextKeyService);
 			this.stepBackSupportedContextKey = CONTEXT_STEP_BACK_SUPPORTED.bindTo(contextKeyService);
 			this.focusedSessionIsAttach = CONTEXT_FOCUSED_SESSION_IS_ATTACH.bindTo(contextKeyService);
@@ -44,6 +40,7 @@ export class ViewModel implements IViewModel {
 			this.stepIntoTargetsSupported = CONTEXT_STEP_INTO_TARGETS_SUPPORTED.bindTo(contextKeyService);
 			this.jumpToCursorSupported = CONTEXT_JUMP_TO_CURSOR_SUPPORTED.bindTo(contextKeyService);
 			this.setVariableSupported = CONTEXT_SET_VARIABLE_SUPPORTED.bindTo(contextKeyService);
+			this.multiSessionDebug = CONTEXT_MULTI_SESSION_DEBUG.bindTo(contextKeyService);
 		});
 	}
 
@@ -112,10 +109,6 @@ export class ViewModel implements IViewModel {
 		return this._onDidSelectExpression.event;
 	}
 
-	getSelectedBreakpoint(): IFunctionBreakpoint | IExceptionBreakpoint | undefined {
-		return this.selectedBreakpoint;
-	}
-
 	updateViews(): void {
 		this._onWillUpdateViews.fire();
 	}
@@ -124,16 +117,11 @@ export class ViewModel implements IViewModel {
 		return this._onWillUpdateViews.event;
 	}
 
-	setSelectedBreakpoint(breakpoint: IFunctionBreakpoint | IExceptionBreakpoint | undefined): void {
-		this.selectedBreakpoint = breakpoint;
-		this.breakpointSelectedContextKey.set(!!breakpoint);
-	}
-
 	isMultiSessionView(): boolean {
-		return this.multiSessionView;
+		return !!this.multiSessionDebug.get();
 	}
 
 	setMultiSessionView(isMultiSessionView: boolean): void {
-		this.multiSessionView = isMultiSessionView;
+		this.multiSessionDebug.set(isMultiSessionView);
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/common/replModel.ts b/src/vs/workbench/contrib/debug/common/replModel.ts
index f10608a01..c46e6b9ca 100644
--- a/src/vs/workbench/contrib/debug/common/replModel.ts
+++ b/src/vs/workbench/contrib/debug/common/replModel.ts
@@ -15,6 +15,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 
 const MAX_REPL_LENGTH = 10000;
 let topReplElementCounter = 0;
+const getUniqueId = () => `topReplElement:${topReplElementCounter++}`;
 
 export class SimpleReplElement implements IReplElement {
 
@@ -30,8 +31,12 @@ export class SimpleReplElement implements IReplElement {
 	) { }
 
 	toString(): string {
+		let valueRespectCount = this.value;
+		for (let i = 1; i < this.count; i++) {
+			valueRespectCount += (valueRespectCount.endsWith('\n') ? '' : '\n') + this.value;
+		}
 		const sourceStr = this.sourceData ? ` ${this.sourceData.source.name}` : '';
-		return this.value + sourceStr;
+		return valueRespectCount + sourceStr;
 	}
 
 	getId(): string {
@@ -226,13 +231,14 @@ export class ReplModel {
 					return;
 				}
 				if (!previousElement.value.endsWith('\n') && !previousElement.value.endsWith('\r\n') && previousElement.count === 1) {
-					previousElement.value += data;
+					this.replElements[this.replElements.length - 1] = new SimpleReplElement(
+						session, getUniqueId(), previousElement.value + data, sev, source);
 					this._onDidChangeElements.fire();
 					return;
 				}
 			}
 
-			const element = new SimpleReplElement(session, `topReplElement:${topReplElementCounter++}`, data, sev, source);
+			const element = new SimpleReplElement(session, getUniqueId(), data, sev, source);
 			this.addReplElement(element);
 		} else {
 			// TODO@Isidor hack, we should introduce a new type which is an output that can fetch children like an expression
@@ -307,7 +313,7 @@ export class ReplModel {
 				}
 
 				// show object
-				this.appendToRepl(session, new RawObjectReplElement(`topReplElement:${topReplElementCounter++}`, (<any>a).prototype, a, undefined, nls.localize('snapshotObj', "Only primitive values are shown for this object.")), sev, source);
+				this.appendToRepl(session, new RawObjectReplElement(getUniqueId(), (<any>a).prototype, a, undefined, nls.localize('snapshotObj', "Only primitive values are shown for this object.")), sev, source);
 			}
 
 			// string: watch out for % replacement directive
diff --git a/src/vs/workbench/contrib/debug/node/debugHelperService.ts b/src/vs/workbench/contrib/debug/node/debugHelperService.ts
index a79291240..05be0f7d8 100644
--- a/src/vs/workbench/contrib/debug/node/debugHelperService.ts
+++ b/src/vs/workbench/contrib/debug/node/debugHelperService.ts
@@ -5,7 +5,7 @@
 
 import { IDebugHelperService } from 'vs/workbench/contrib/debug/common/debug';
 import { Client as TelemetryClient } from 'vs/base/parts/ipc/node/ipc.cp';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
+import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { FileAccess } from 'vs/base/common/network';
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -31,8 +31,8 @@ export class NodeDebugHelperService implements IDebugHelperService {
 				args: args,
 				env: {
 					ELECTRON_RUN_AS_NODE: 1,
-					PIPE_LOGGING: 'true',
-					AMD_ENTRYPOINT: 'vs/workbench/contrib/debug/node/telemetryApp'
+					VSCODE_PIPE_LOGGING: 'true',
+					VSCODE_AMD_ENTRYPOINT: 'vs/workbench/contrib/debug/node/telemetryApp'
 				}
 			}
 		);
diff --git a/src/vs/workbench/contrib/debug/node/telemetryApp.ts b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
index 52507e4fd..85597832c 100644
--- a/src/vs/workbench/contrib/debug/node/telemetryApp.ts
+++ b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
@@ -5,7 +5,7 @@
 
 import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
-import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
+import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
 
 const appender = new AppInsightsAppender(process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
 process.once('exit', () => appender.flush());
diff --git a/src/vs/workbench/contrib/debug/node/terminals.ts b/src/vs/workbench/contrib/debug/node/terminals.ts
index 45a8fc654..03c4fc8f6 100644
--- a/src/vs/workbench/contrib/debug/node/terminals.ts
+++ b/src/vs/workbench/contrib/debug/node/terminals.ts
@@ -9,7 +9,7 @@ import { WindowsExternalTerminalService, MacExternalTerminalService, LinuxExtern
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IExternalTerminalService } from 'vs/workbench/contrib/externalTerminal/common/externalTerminal';
 import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
-import { extractDriveLetter } from 'vs/base/common/labels';
+import { getDriveLetter } from 'vs/base/common/extpath';
 
 let externalTerminalService: IExternalTerminalService | undefined = undefined;
 
@@ -112,7 +112,7 @@ export function prepareCommand(shell: string, args: string[], cwd?: string, env?
 			};
 
 			if (cwd) {
-				const driveLetter = extractDriveLetter(cwd);
+				const driveLetter = getDriveLetter(cwd);
 				if (driveLetter) {
 					command += `${driveLetter}:; `;
 				}
@@ -145,7 +145,7 @@ export function prepareCommand(shell: string, args: string[], cwd?: string, env?
 			};
 
 			if (cwd) {
-				const driveLetter = extractDriveLetter(cwd);
+				const driveLetter = getDriveLetter(cwd);
 				if (driveLetter) {
 					command += `${driveLetter}: && `;
 				}
diff --git a/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts b/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
index 1a2bed974..fec15f39f 100644
--- a/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
@@ -153,8 +153,8 @@ suite('Debug - Breakpoints', () => {
 	test('function breakpoints', () => {
 		model.addFunctionBreakpoint('foo', '1');
 		model.addFunctionBreakpoint('bar', '2');
-		model.renameFunctionBreakpoint('1', 'fooUpdated');
-		model.renameFunctionBreakpoint('2', 'barUpdated');
+		model.updateFunctionBreakpoint('1', { name: 'fooUpdated' });
+		model.updateFunctionBreakpoint('2', { name: 'barUpdated' });
 
 		const functionBps = model.getFunctionBreakpoints();
 		assert.equal(functionBps[0].name, 'fooUpdated');
diff --git a/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts b/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
index ca7c0db50..dd6943746 100644
--- a/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
@@ -20,6 +20,14 @@ import { generateUuid } from 'vs/base/common/uuid';
 import { debugStackframe, debugStackframeFocused } from 'vs/workbench/contrib/debug/browser/debugIcons';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
+const mockWorkspaceContextService = {
+	getWorkspace: () => {
+		return {
+			folders: []
+		};
+	}
+} as any;
+
 export function createMockSession(model: DebugModel, name = 'mockSession', options?: IDebugSessionOptions): DebugSession {
 	return new DebugSession(generateUuid(), { resolved: { name, type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, options, {
 		getViewModel(): any {
@@ -29,7 +37,7 @@ export function createMockSession(model: DebugModel, name = 'mockSession', optio
 				}
 			};
 		}
-	} as IDebugService, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, NullOpenerService, undefined!, undefined!, mockUriIdentityService);
+	} as IDebugService, undefined!, undefined!, undefined!, undefined!, mockWorkspaceContextService, undefined!, undefined!, NullOpenerService, undefined!, undefined!, mockUriIdentityService);
 }
 
 function createTwoStackFrames(session: DebugSession): { firstStackFrame: StackFrame, secondStackFrame: StackFrame } {
@@ -91,7 +99,7 @@ suite('Debug - CallStack', () => {
 		assert.equal(model.getSessions(true).length, 1);
 	});
 
-	test('threads multiple wtih allThreadsStopped', () => {
+	test('threads multiple wtih allThreadsStopped', async () => {
 		const threadId1 = 1;
 		const threadName1 = 'firstThread';
 		const threadId2 = 2;
@@ -145,19 +153,16 @@ suite('Debug - CallStack', () => {
 
 		// after calling getCallStack, the callstack becomes available
 		// and results in a request for the callstack in the debug adapter
-		thread1.fetchCallStack().then(() => {
-			assert.notEqual(thread1.getCallStack().length, 0);
-		});
+		await thread1.fetchCallStack();
+		assert.notEqual(thread1.getCallStack().length, 0);
 
-		thread2.fetchCallStack().then(() => {
-			assert.notEqual(thread2.getCallStack().length, 0);
-		});
+		await thread2.fetchCallStack();
+		assert.notEqual(thread2.getCallStack().length, 0);
 
 		// calling multiple times getCallStack doesn't result in multiple calls
 		// to the debug adapter
-		thread1.fetchCallStack().then(() => {
-			return thread2.fetchCallStack();
-		});
+		await thread1.fetchCallStack();
+		await thread2.fetchCallStack();
 
 		// clearing the callstack results in the callstack not being available
 		thread1.clearCallStack();
@@ -174,7 +179,7 @@ suite('Debug - CallStack', () => {
 		assert.equal(session.getAllThreads().length, 0);
 	});
 
-	test('threads mutltiple without allThreadsStopped', () => {
+	test('threads mutltiple without allThreadsStopped', async () => {
 		const sessionStub = sinon.spy(rawSession, 'stackTrace');
 
 		const stoppedThreadId = 1;
@@ -230,19 +235,17 @@ suite('Debug - CallStack', () => {
 
 		// after calling getCallStack, the callstack becomes available
 		// and results in a request for the callstack in the debug adapter
-		stoppedThread.fetchCallStack().then(() => {
-			assert.notEqual(stoppedThread.getCallStack().length, 0);
-			assert.equal(runningThread.getCallStack().length, 0);
-			assert.equal(sessionStub.callCount, 1);
-		});
+		await stoppedThread.fetchCallStack();
+		assert.notEqual(stoppedThread.getCallStack().length, 0);
+		assert.equal(runningThread.getCallStack().length, 0);
+		assert.equal(sessionStub.callCount, 1);
 
 		// calling getCallStack on the running thread returns empty array
 		// and does not return in a request for the callstack in the debug
 		// adapter
-		runningThread.fetchCallStack().then(() => {
-			assert.equal(runningThread.getCallStack().length, 0);
-			assert.equal(sessionStub.callCount, 1);
-		});
+		await runningThread.fetchCallStack();
+		assert.equal(runningThread.getCallStack().length, 0);
+		assert.equal(sessionStub.callCount, 1);
 
 		// clearing the callstack results in the callstack not being available
 		stoppedThread.clearCallStack();
@@ -374,7 +377,7 @@ suite('Debug - CallStack', () => {
 			get state(): State {
 				return State.Stopped;
 			}
-		}(generateUuid(), { resolved: { name: 'stoppedSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!, NullOpenerService, undefined!, undefined!, mockUriIdentityService);
+		}(generateUuid(), { resolved: { name: 'stoppedSession', type: 'node', request: 'launch' }, unresolved: undefined }, undefined!, model, undefined, undefined!, undefined!, undefined!, undefined!, undefined!, mockWorkspaceContextService, undefined!, undefined!, NullOpenerService, undefined!, undefined!, mockUriIdentityService);
 
 		const runningSession = createMockSession(model);
 		model.addSession(runningSession);
diff --git a/src/vs/workbench/contrib/debug/test/electron-browser/debugANSIHandling.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
similarity index 100%
rename from src/vs/workbench/contrib/debug/test/electron-browser/debugANSIHandling.test.ts
rename to src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
diff --git a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
index b22d2044a..552642346 100644
--- a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
@@ -64,7 +64,7 @@ suite('Debug - Link Detector', () => {
 
 	test('singleLineLink', () => {
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
-		const expectedOutput = isWindows ? '<span><a>C:\\foo\\bar.js:12:34<\/a><\/span>' : '<span><a>/Users/foo/bar.js:12:34<\/a><\/span>';
+		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar.js:12:34<\/a><\/span>' : '<span><a tabindex="0">/Users/foo/bar.js:12:34<\/a><\/span>';
 		const output = linkDetector.linkify(input);
 
 		assert.equal(1, output.children.length);
@@ -87,7 +87,7 @@ suite('Debug - Link Detector', () => {
 
 	test('relativeLinkWithWorkspace', () => {
 		const input = '\./foo/bar.js';
-		const expectedOutput = /^<span><a class="link" title=".*">\.\/foo\/bar\.js<\/a><\/span>$/;
+		const expectedOutput = /^<span><a class="link">\.\/foo\/bar\.js<\/a><\/span>$/;
 		const output = linkDetector.linkify(input, false, new WorkspaceFolder({ uri: URI.file('/path/to/workspace'), name: 'ws', index: 0 }));
 
 		assert.equal('SPAN', output.tagName);
@@ -96,7 +96,7 @@ suite('Debug - Link Detector', () => {
 
 	test('singleLineLinkAndText', function () {
 		const input = isWindows ? 'The link: C:/foo/bar.js:12:34' : 'The link: /Users/foo/bar.js:12:34';
-		const expectedOutput = /^<span>The link: <a>.*\/foo\/bar.js:12:34<\/a><\/span>$/;
+		const expectedOutput = /^<span>The link: <a tabindex="0">.*\/foo\/bar.js:12:34<\/a><\/span>$/;
 		const output = linkDetector.linkify(input);
 
 		assert.equal(1, output.children.length);
@@ -110,7 +110,7 @@ suite('Debug - Link Detector', () => {
 	test('singleLineMultipleLinks', () => {
 		const input = isWindows ? 'Here is a link C:/foo/bar.js:12:34 and here is another D:/boo/far.js:56:78' :
 			'Here is a link /Users/foo/bar.js:12:34 and here is another /Users/boo/far.js:56:78';
-		const expectedOutput = /^<span>Here is a link <a>.*\/foo\/bar.js:12:34<\/a> and here is another <a>.*\/boo\/far.js:56:78<\/a><\/span>$/;
+		const expectedOutput = /^<span>Here is a link <a tabindex="0">.*\/foo\/bar.js:12:34<\/a> and here is another <a tabindex="0">.*\/boo\/far.js:56:78<\/a><\/span>$/;
 		const output = linkDetector.linkify(input);
 
 		assert.equal(2, output.children.length);
@@ -152,7 +152,7 @@ suite('Debug - Link Detector', () => {
 	test('multilineWithLinks', () => {
 		const input = isWindows ? 'I have a link for you\nHere it is: C:/foo/bar.js:12:34\nCool, huh?' :
 			'I have a link for you\nHere it is: /Users/foo/bar.js:12:34\nCool, huh?';
-		const expectedOutput = /^<span><span>I have a link for you\n<\/span><span>Here it is: <a>.*\/foo\/bar.js:12:34<\/a>\n<\/span><span>Cool, huh\?<\/span><\/span>$/;
+		const expectedOutput = /^<span><span>I have a link for you\n<\/span><span>Here it is: <a tabindex="0">.*\/foo\/bar.js:12:34<\/a>\n<\/span><span>Cool, huh\?<\/span><\/span>$/;
 		const output = linkDetector.linkify(input, true);
 
 		assert.equal(3, output.children.length);
diff --git a/src/vs/workbench/contrib/debug/test/browser/mockDebug.ts b/src/vs/workbench/contrib/debug/test/browser/mockDebug.ts
index 96a346ab9..8983f96e3 100644
--- a/src/vs/workbench/contrib/debug/test/browser/mockDebug.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/mockDebug.ts
@@ -24,29 +24,29 @@ export const mockUriIdentityService = new UriIdentityService(fileService);
 
 export class MockDebugService implements IDebugService {
 
-	public _serviceBrand: undefined;
+	_serviceBrand: undefined;
 
-	public get state(): State {
+	get state(): State {
 		throw new Error('not implemented');
 	}
 
-	public get onWillNewSession(): Event<IDebugSession> {
+	get onWillNewSession(): Event<IDebugSession> {
 		throw new Error('not implemented');
 	}
 
-	public get onDidNewSession(): Event<IDebugSession> {
+	get onDidNewSession(): Event<IDebugSession> {
 		throw new Error('not implemented');
 	}
 
-	public get onDidEndSession(): Event<IDebugSession> {
+	get onDidEndSession(): Event<IDebugSession> {
 		throw new Error('not implemented');
 	}
 
-	public get onDidChangeState(): Event<State> {
+	get onDidChangeState(): Event<State> {
 		throw new Error('not implemented');
 	}
 
-	public getConfigurationManager(): IConfigurationManager {
+	getConfigurationManager(): IConfigurationManager {
 		throw new Error('not implemented');
 	}
 
@@ -58,7 +58,7 @@ export class MockDebugService implements IDebugService {
 		throw new Error('Method not implemented.');
 	}
 
-	public focusStackFrame(focusedStackFrame: IStackFrame): Promise<void> {
+	focusStackFrame(focusedStackFrame: IStackFrame): Promise<void> {
 		throw new Error('not implemented');
 	}
 
@@ -66,23 +66,23 @@ export class MockDebugService implements IDebugService {
 		throw new Error('not implemented');
 	}
 
-	public addBreakpoints(uri: uri, rawBreakpoints: IBreakpointData[]): Promise<IBreakpoint[]> {
+	addBreakpoints(uri: uri, rawBreakpoints: IBreakpointData[]): Promise<IBreakpoint[]> {
 		throw new Error('not implemented');
 	}
 
-	public updateBreakpoints(uri: uri, data: Map<string, IBreakpointUpdateData>, sendOnResourceSaved: boolean): Promise<void> {
+	updateBreakpoints(uri: uri, data: Map<string, IBreakpointUpdateData>, sendOnResourceSaved: boolean): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public enableOrDisableBreakpoints(enabled: boolean): Promise<void> {
+	enableOrDisableBreakpoints(enabled: boolean): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public setBreakpointsActivated(): Promise<void> {
+	setBreakpointsActivated(): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public removeBreakpoints(): Promise<any> {
+	removeBreakpoints(): Promise<any> {
 		throw new Error('not implemented');
 	}
 
@@ -90,15 +90,19 @@ export class MockDebugService implements IDebugService {
 		throw new Error('Method not implemented.');
 	}
 
-	public addFunctionBreakpoint(): void { }
+	setExceptionBreakpoints(data: DebugProtocol.ExceptionBreakpointsFilter[]): void {
+		throw new Error('Method not implemented.');
+	}
 
-	public moveWatchExpression(id: string, position: number): void { }
+	addFunctionBreakpoint(): void { }
 
-	public renameFunctionBreakpoint(id: string, newFunctionName: string): Promise<void> {
+	moveWatchExpression(id: string, position: number): void { }
+
+	updateFunctionBreakpoint(id: string, update: { name?: string, hitCondition?: string, condition?: string }): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public removeFunctionBreakpoints(id?: string): Promise<void> {
+	removeFunctionBreakpoints(id?: string): Promise<void> {
 		throw new Error('not implemented');
 	}
 
@@ -109,47 +113,47 @@ export class MockDebugService implements IDebugService {
 		throw new Error('Method not implemented.');
 	}
 
-	public addReplExpression(name: string): Promise<void> {
+	addReplExpression(name: string): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public removeReplExpressions(): void { }
+	removeReplExpressions(): void { }
 
-	public addWatchExpression(name?: string): Promise<void> {
+	addWatchExpression(name?: string): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public renameWatchExpression(id: string, newName: string): Promise<void> {
+	renameWatchExpression(id: string, newName: string): Promise<void> {
 		throw new Error('not implemented');
 	}
 
-	public removeWatchExpressions(id?: string): void { }
+	removeWatchExpressions(id?: string): void { }
 
-	public startDebugging(launch: ILaunch, configOrName?: IConfig | string, options?: IDebugSessionOptions): Promise<boolean> {
+	startDebugging(launch: ILaunch, configOrName?: IConfig | string, options?: IDebugSessionOptions): Promise<boolean> {
 		return Promise.resolve(true);
 	}
 
-	public restartSession(): Promise<any> {
+	restartSession(): Promise<any> {
 		throw new Error('not implemented');
 	}
 
-	public stopSession(): Promise<any> {
+	stopSession(): Promise<any> {
 		throw new Error('not implemented');
 	}
 
-	public getModel(): IDebugModel {
+	getModel(): IDebugModel {
 		throw new Error('not implemented');
 	}
 
-	public getViewModel(): IViewModel {
+	getViewModel(): IViewModel {
 		throw new Error('not implemented');
 	}
 
-	public logToRepl(session: IDebugSession, value: string): void { }
+	logToRepl(session: IDebugSession, value: string): void { }
 
-	public sourceIsNotAvailable(uri: uri): void { }
+	sourceIsNotAvailable(uri: uri): void { }
 
-	public tryToAutoFocusStackFrame(thread: IThread): Promise<any> {
+	tryToAutoFocusStackFrame(thread: IThread): Promise<any> {
 		throw new Error('not implemented');
 	}
 }
@@ -227,6 +231,10 @@ export class MockSession implements IDebugSession {
 		return 'mockname';
 	}
 
+	get name(): string {
+		return 'mockname';
+	}
+
 	setName(name: string): void {
 		throw new Error('not implemented');
 	}
@@ -387,14 +395,14 @@ export class MockRawSession {
 	disconnected = false;
 	sessionLengthInSeconds: number = 0;
 
-	public readyForBreakpoints = true;
-	public emittedStopped = true;
+	readyForBreakpoints = true;
+	emittedStopped = true;
 
-	public getLengthInSeconds(): number {
+	getLengthInSeconds(): number {
 		return 100;
 	}
 
-	public stackTrace(args: DebugProtocol.StackTraceArguments): Promise<DebugProtocol.StackTraceResponse> {
+	stackTrace(args: DebugProtocol.StackTraceArguments): Promise<DebugProtocol.StackTraceResponse> {
 		return Promise.resolve({
 			seq: 1,
 			type: 'response',
@@ -412,19 +420,19 @@ export class MockRawSession {
 		});
 	}
 
-	public exceptionInfo(args: DebugProtocol.ExceptionInfoArguments): Promise<DebugProtocol.ExceptionInfoResponse> {
+	exceptionInfo(args: DebugProtocol.ExceptionInfoArguments): Promise<DebugProtocol.ExceptionInfoResponse> {
 		throw new Error('not implemented');
 	}
 
-	public launchOrAttach(args: IConfig): Promise<DebugProtocol.Response> {
+	launchOrAttach(args: IConfig): Promise<DebugProtocol.Response> {
 		throw new Error('not implemented');
 	}
 
-	public scopes(args: DebugProtocol.ScopesArguments): Promise<DebugProtocol.ScopesResponse> {
+	scopes(args: DebugProtocol.ScopesArguments): Promise<DebugProtocol.ScopesResponse> {
 		throw new Error('not implemented');
 	}
 
-	public variables(args: DebugProtocol.VariablesArguments): Promise<DebugProtocol.VariablesResponse> {
+	variables(args: DebugProtocol.VariablesArguments): Promise<DebugProtocol.VariablesResponse> {
 		throw new Error('not implemented');
 	}
 
@@ -432,87 +440,87 @@ export class MockRawSession {
 		return Promise.resolve(null!);
 	}
 
-	public custom(request: string, args: any): Promise<DebugProtocol.Response> {
+	custom(request: string, args: any): Promise<DebugProtocol.Response> {
 		throw new Error('not implemented');
 	}
 
-	public terminate(restart = false): Promise<DebugProtocol.TerminateResponse> {
+	terminate(restart = false): Promise<DebugProtocol.TerminateResponse> {
 		throw new Error('not implemented');
 	}
 
-	public disconnect(restart?: boolean): Promise<any> {
+	disconnect(restart?: boolean): Promise<any> {
 		throw new Error('not implemented');
 	}
 
-	public threads(): Promise<DebugProtocol.ThreadsResponse> {
+	threads(): Promise<DebugProtocol.ThreadsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public stepIn(args: DebugProtocol.StepInArguments): Promise<DebugProtocol.StepInResponse> {
+	stepIn(args: DebugProtocol.StepInArguments): Promise<DebugProtocol.StepInResponse> {
 		throw new Error('not implemented');
 	}
 
-	public stepOut(args: DebugProtocol.StepOutArguments): Promise<DebugProtocol.StepOutResponse> {
+	stepOut(args: DebugProtocol.StepOutArguments): Promise<DebugProtocol.StepOutResponse> {
 		throw new Error('not implemented');
 	}
 
-	public stepBack(args: DebugProtocol.StepBackArguments): Promise<DebugProtocol.StepBackResponse> {
+	stepBack(args: DebugProtocol.StepBackArguments): Promise<DebugProtocol.StepBackResponse> {
 		throw new Error('not implemented');
 	}
 
-	public continue(args: DebugProtocol.ContinueArguments): Promise<DebugProtocol.ContinueResponse> {
+	continue(args: DebugProtocol.ContinueArguments): Promise<DebugProtocol.ContinueResponse> {
 		throw new Error('not implemented');
 	}
 
-	public reverseContinue(args: DebugProtocol.ReverseContinueArguments): Promise<DebugProtocol.ReverseContinueResponse> {
+	reverseContinue(args: DebugProtocol.ReverseContinueArguments): Promise<DebugProtocol.ReverseContinueResponse> {
 		throw new Error('not implemented');
 	}
 
-	public pause(args: DebugProtocol.PauseArguments): Promise<DebugProtocol.PauseResponse> {
+	pause(args: DebugProtocol.PauseArguments): Promise<DebugProtocol.PauseResponse> {
 		throw new Error('not implemented');
 	}
 
-	public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): Promise<DebugProtocol.TerminateThreadsResponse> {
+	terminateThreads(args: DebugProtocol.TerminateThreadsArguments): Promise<DebugProtocol.TerminateThreadsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public setVariable(args: DebugProtocol.SetVariableArguments): Promise<DebugProtocol.SetVariableResponse> {
+	setVariable(args: DebugProtocol.SetVariableArguments): Promise<DebugProtocol.SetVariableResponse> {
 		throw new Error('not implemented');
 	}
 
-	public restartFrame(args: DebugProtocol.RestartFrameArguments): Promise<DebugProtocol.RestartFrameResponse> {
+	restartFrame(args: DebugProtocol.RestartFrameArguments): Promise<DebugProtocol.RestartFrameResponse> {
 		throw new Error('not implemented');
 	}
 
-	public completions(args: DebugProtocol.CompletionsArguments): Promise<DebugProtocol.CompletionsResponse> {
+	completions(args: DebugProtocol.CompletionsArguments): Promise<DebugProtocol.CompletionsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public next(args: DebugProtocol.NextArguments): Promise<DebugProtocol.NextResponse> {
+	next(args: DebugProtocol.NextArguments): Promise<DebugProtocol.NextResponse> {
 		throw new Error('not implemented');
 	}
 
-	public source(args: DebugProtocol.SourceArguments): Promise<DebugProtocol.SourceResponse> {
+	source(args: DebugProtocol.SourceArguments): Promise<DebugProtocol.SourceResponse> {
 		throw new Error('not implemented');
 	}
 
-	public loadedSources(args: DebugProtocol.LoadedSourcesArguments): Promise<DebugProtocol.LoadedSourcesResponse> {
+	loadedSources(args: DebugProtocol.LoadedSourcesArguments): Promise<DebugProtocol.LoadedSourcesResponse> {
 		throw new Error('not implemented');
 	}
 
-	public setBreakpoints(args: DebugProtocol.SetBreakpointsArguments): Promise<DebugProtocol.SetBreakpointsResponse> {
+	setBreakpoints(args: DebugProtocol.SetBreakpointsArguments): Promise<DebugProtocol.SetBreakpointsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public setFunctionBreakpoints(args: DebugProtocol.SetFunctionBreakpointsArguments): Promise<DebugProtocol.SetFunctionBreakpointsResponse> {
+	setFunctionBreakpoints(args: DebugProtocol.SetFunctionBreakpointsArguments): Promise<DebugProtocol.SetFunctionBreakpointsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public setExceptionBreakpoints(args: DebugProtocol.SetExceptionBreakpointsArguments): Promise<DebugProtocol.SetExceptionBreakpointsResponse> {
+	setExceptionBreakpoints(args: DebugProtocol.SetExceptionBreakpointsArguments): Promise<DebugProtocol.SetExceptionBreakpointsResponse> {
 		throw new Error('not implemented');
 	}
 
-	public readonly onDidStop: Event<DebugProtocol.StoppedEvent> = null!;
+	readonly onDidStop: Event<DebugProtocol.StoppedEvent> = null!;
 }
 
 export class MockDebugAdapter extends AbstractDebugAdapter {
diff --git a/src/vs/workbench/contrib/debug/test/browser/repl.test.ts b/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
index 288fa962a..e8826837f 100644
--- a/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/repl.test.ts
@@ -74,11 +74,11 @@ suite('Debug - REPL', () => {
 		repl.appendToRepl(session, 'third line', severity.Info);
 		elements = <SimpleReplElement[]>repl.getReplElements();
 		assert.equal(elements.length, 3);
-		assert.equal(elements[0], 'first line\n');
+		assert.equal(elements[0].value, 'first line\n');
 		assert.equal(elements[0].count, 3);
-		assert.equal(elements[1], 'second line');
+		assert.equal(elements[1].value, 'second line');
 		assert.equal(elements[1].count, 2);
-		assert.equal(elements[2], 'third line');
+		assert.equal(elements[2].value, 'third line');
 		assert.equal(elements[2].count, 1);
 	});
 
@@ -93,11 +93,13 @@ suite('Debug - REPL', () => {
 		repl.appendToRepl(session, 'third line', severity.Info);
 		const elements = <SimpleReplElement[]>repl.getReplElements();
 		assert.equal(elements.length, 3);
-		assert.equal(elements[0], 'first line\n');
+		assert.equal(elements[0].value, 'first line\n');
+		assert.equal(elements[0].toString(), 'first line\nfirst line\nfirst line\n');
 		assert.equal(elements[0].count, 3);
-		assert.equal(elements[1], 'second line');
+		assert.equal(elements[1].value, 'second line');
+		assert.equal(elements[1].toString(), 'second line\nsecond line');
 		assert.equal(elements[1].count, 2);
-		assert.equal(elements[2], 'third line');
+		assert.equal(elements[2].value, 'third line');
 		assert.equal(elements[2].count, 1);
 	});
 
diff --git a/src/vs/workbench/contrib/debug/test/node/debugger.test.ts b/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
index 68a34b4b1..fd61d857b 100644
--- a/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
+++ b/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
@@ -11,7 +11,7 @@ import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { URI } from 'vs/base/common/uri';
 import { ExecutableDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
-import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/modelService.test';
+import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 
 
diff --git a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
index 96c54f0a8..feae80004 100644
--- a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
@@ -27,7 +27,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { Schemas } from 'vs/base/common/network';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@@ -297,21 +297,28 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 				const activationId = activationTimes.activationReason.extensionId.value;
 				const activationEvent = activationTimes.activationReason.activationEvent;
 				if (activationEvent === '*') {
-					title = nls.localize('starActivation', "Activated by {0} on start-up", activationId);
+					title = nls.localize({
+						key: 'starActivation',
+						comment: [
+							'{0} will be an extension identifier'
+						]
+					}, "Activated by {0} on start-up", activationId);
 				} else if (/^workspaceContains:/.test(activationEvent)) {
 					let fileNameOrGlob = activationEvent.substr('workspaceContains:'.length);
 					if (fileNameOrGlob.indexOf('*') >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
 						title = nls.localize({
 							key: 'workspaceContainsGlobActivation',
 							comment: [
-								'{0} will be a glob pattern'
+								'{0} will be a glob pattern',
+								'{1} will be an extension identifier'
 							]
-						}, "Activated by {1} because a file matching {1} exists in your workspace", fileNameOrGlob, activationId);
+						}, "Activated by {1} because a file matching {0} exists in your workspace", fileNameOrGlob, activationId);
 					} else {
 						title = nls.localize({
 							key: 'workspaceContainsFileActivation',
 							comment: [
-								'{0} will be a file name'
+								'{0} will be a file name',
+								'{1} will be an extension identifier'
 							]
 						}, "Activated by {1} because file {0} exists in your workspace", fileNameOrGlob, activationId);
 					}
@@ -320,7 +327,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 					title = nls.localize({
 						key: 'workspaceContainsTimeout',
 						comment: [
-							'{0} will be a glob pattern'
+							'{0} will be a glob pattern',
+							'{1} will be an extension identifier'
 						]
 					}, "Activated by {1} because searching for {0} took too long", glob, activationId);
 				} else if (activationEvent === 'onStartupFinished') {
@@ -337,7 +345,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 					title = nls.localize({
 						key: 'workspaceGenericActivation',
 						comment: [
-							'The {0} placeholder will be an activation event, like e.g. \'language:typescript\', \'debug\', etc.'
+							'{0} will be an activation event, like e.g. \'language:typescript\', \'debug\', etc.',
+							'{1} will be an extension identifier'
 						]
 					}, "Activated by {1} on {0}", activationEvent, activationId);
 				}
@@ -346,28 +355,28 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 				clearNode(data.msgContainer);
 
 				if (this._getUnresponsiveProfile(element.description.identifier)) {
-					const el = $('span', undefined, ...renderCodicons(` $(alert) Unresponsive`));
+					const el = $('span', undefined, ...renderLabelWithIcons(` $(alert) Unresponsive`));
 					el.title = nls.localize('unresponsive.title', "Extension has caused the extension host to freeze.");
 					data.msgContainer.appendChild(el);
 				}
 
 				if (isNonEmptyArray(element.status.runtimeErrors)) {
-					const el = $('span', undefined, ...renderCodicons(`$(bug) ${nls.localize('errors', "{0} uncaught errors", element.status.runtimeErrors.length)}`));
+					const el = $('span', undefined, ...renderLabelWithIcons(`$(bug) ${nls.localize('errors', "{0} uncaught errors", element.status.runtimeErrors.length)}`));
 					data.msgContainer.appendChild(el);
 				}
 
 				if (element.status.messages && element.status.messages.length > 0) {
-					const el = $('span', undefined, ...renderCodicons(`$(alert) ${element.status.messages[0].message}`));
+					const el = $('span', undefined, ...renderLabelWithIcons(`$(alert) ${element.status.messages[0].message}`));
 					data.msgContainer.appendChild(el);
 				}
 
 				if (element.description.extensionLocation.scheme === Schemas.vscodeRemote) {
-					const el = $('span', undefined, ...renderCodicons(`$(remote) ${element.description.extensionLocation.authority}`));
+					const el = $('span', undefined, ...renderLabelWithIcons(`$(remote) ${element.description.extensionLocation.authority}`));
 					data.msgContainer.appendChild(el);
 
 					const hostLabel = this._labelService.getHostLabel(Schemas.vscodeRemote, this._environmentService.remoteAuthority);
 					if (hostLabel) {
-						reset(el, ...renderCodicons(`$(remote) ${hostLabel}`));
+						reset(el, ...renderLabelWithIcons(`$(remote) ${hostLabel}`));
 					}
 				}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 7a58b96da..e7f0a15b3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -65,22 +65,14 @@ import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/to
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { insane } from 'vs/base/common/insane/insane';
 
 function removeEmbeddedSVGs(documentContent: string): string {
-	const newDocument = new DOMParser().parseFromString(documentContent, 'text/html');
-
-	// remove all inline svgs
-	const allSVGs = newDocument.documentElement.querySelectorAll('svg');
-	if (allSVGs) {
-		for (let i = 0; i < allSVGs.length; i++) {
-			const svg = allSVGs[i];
-			if (svg.parentNode) {
-				svg.parentNode.removeChild(allSVGs[i]);
-			}
+	return insane(documentContent, {
+		filter(token: { tag: string, attrs: { readonly [key: string]: string } }): boolean {
+			return token.tag !== 'svg';
 		}
-	}
-
-	return newDocument.documentElement.outerHTML;
+	});
 }
 
 class NavBar extends Disposable {
@@ -169,6 +161,11 @@ interface IExtensionEditorTemplate {
 	header: HTMLElement;
 }
 
+const enum WebviewIndex {
+	Readme,
+	Changelog
+}
+
 export class ExtensionEditor extends EditorPane {
 
 	static readonly ID: string = 'workbench.editor.extension';
@@ -179,6 +176,12 @@ export class ExtensionEditor extends EditorPane {
 	private extensionChangelog: Cache<string> | null;
 	private extensionManifest: Cache<IExtensionManifest | null> | null;
 
+	// Some action bar items use a webview whose vertical scroll position we track in this map
+	private initialScrollProgress: Map<WebviewIndex, number> = new Map();
+
+	// Spot when an ExtensionEditor instance gets reused for a different extension, in which case the vertical scroll positions must be zeroed
+	private currentIdentifier: string = '';
+
 	private layoutParticipants: ILayoutParticipant[] = [];
 	private readonly contentDisposables = this._register(new DisposableStore());
 	private readonly transientDisposables = this._register(new DisposableStore());
@@ -336,6 +339,11 @@ export class ExtensionEditor extends EditorPane {
 		this.editorLoadComplete = false;
 		const extension = input.extension;
 
+		if (this.currentIdentifier !== extension.identifier.id) {
+			this.initialScrollProgress.clear();
+			this.currentIdentifier = extension.identifier.id;
+		}
+
 		this.transientDisposables.clear();
 
 		this.extensionReadme = new Cache(() => createCancelablePromise(token => extension.getReadme(token)));
@@ -563,7 +571,7 @@ export class ExtensionEditor extends EditorPane {
 		return Promise.resolve(null);
 	}
 
-	private async openMarkdown(cacheResult: CacheResult<string>, noContentCopy: string, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+	private async openMarkdown(cacheResult: CacheResult<string>, noContentCopy: string, template: IExtensionEditorTemplate, webviewIndex: WebviewIndex, token: CancellationToken): Promise<IActiveElement | null> {
 		try {
 			const body = await this.renderMarkdown(cacheResult, template);
 			if (token.isCancellationRequested) {
@@ -572,15 +580,22 @@ export class ExtensionEditor extends EditorPane {
 
 			const webview = this.contentDisposables.add(this.webviewService.createWebviewOverlay('extensionEditor', {
 				enableFindWidget: true,
+				tryRestoreScrollPosition: true,
 			}, {}, undefined));
 
+			webview.initialScrollProgress = this.initialScrollProgress.get(webviewIndex) || 0;
+
 			webview.claim(this, this.scopedContextKeyService);
 			setParentFlowTo(webview.container, template.content);
 			webview.layoutWebviewOverElement(template.content);
 
 			webview.html = body;
+			webview.claim(this, undefined);
 
 			this.contentDisposables.add(webview.onDidFocus(() => this.fireOnDidFocus()));
+
+			this.contentDisposables.add(webview.onDidScroll(() => this.initialScrollProgress.set(webviewIndex, webview.initialScrollProgress)));
+
 			const removeLayoutParticipant = arrays.insert(this.layoutParticipants, {
 				layout: () => {
 					webview.layoutWebviewOverElement(template.content);
@@ -622,8 +637,8 @@ export class ExtensionEditor extends EditorPane {
 	private async renderMarkdown(cacheResult: CacheResult<string>, template: IExtensionEditorTemplate) {
 		const contents = await this.loadContents(() => cacheResult, template);
 		const content = await renderMarkdownDocument(contents, this.extensionService, this.modeService);
-		const documentContent = await this.renderBody(content);
-		return removeEmbeddedSVGs(documentContent);
+		const sanitizedContent = removeEmbeddedSVGs(content);
+		return await this.renderBody(sanitizedContent);
 	}
 
 	private async renderBody(body: string): Promise<string> {
@@ -709,9 +724,16 @@ export class ExtensionEditor extends EditorPane {
 					}
 
 					code {
+						font-family: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
+						font-size: 14px;
+						line-height: 19px;
+					}
+
+					pre code {
 						font-family: var(--vscode-editor-font-family);
 						font-weight: var(--vscode-editor-font-weight);
 						font-size: var(--vscode-editor-font-size);
+						line-height: 1.5;
 					}
 
 					code > div {
@@ -823,7 +845,7 @@ export class ExtensionEditor extends EditorPane {
 		if (manifest && manifest.extensionPack && manifest.extensionPack.length) {
 			return this.openExtensionPackReadme(manifest, template, token);
 		}
-		return this.openMarkdown(this.extensionReadme!.get(), localize('noReadme', "No README available."), template, token);
+		return this.openMarkdown(this.extensionReadme!.get(), localize('noReadme', "No README available."), template, WebviewIndex.Readme, token);
 	}
 
 	private async openExtensionPackReadme(manifest: IExtensionManifest, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
@@ -855,14 +877,14 @@ export class ExtensionEditor extends EditorPane {
 
 		await Promise.all([
 			this.renderExtensionPack(manifest, extensionPackContent, token),
-			this.openMarkdown(this.extensionReadme!.get(), localize('noReadme', "No README available."), { ...template, ...{ content: readmeContent } }, token),
+			this.openMarkdown(this.extensionReadme!.get(), localize('noReadme', "No README available."), { ...template, ...{ content: readmeContent } }, WebviewIndex.Readme, token),
 		]);
 
 		return { focus: () => extensionPackContent.focus() };
 	}
 
 	private openChangelog(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, token);
+		return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, WebviewIndex.Changelog, token);
 	}
 
 	private openContributions(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
index ab902f413..d48a5cde2 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.ts
@@ -13,7 +13,7 @@ import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionRecommendationNotificationService, RecommendationsNotificationResult, RecommendationSource, RecommendationSourceToString } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationHandle, INotificationService, IPromptChoice, IPromptChoiceWithMenu, Severity } from 'vs/platform/notification/common/notification';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
@@ -21,6 +21,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
 import { SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { ITASExperimentService } from 'vs/workbench/services/experiment/common/experimentService';
 import { EnablementState, IWorkbenchExtensioManagementService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
@@ -28,6 +29,7 @@ import { IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/e
 type ExtensionRecommendationsNotificationClassification = {
 	userReaction: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
 	extensionId?: { classification: 'PublicNonPersonalData', purpose: 'FeatureInsight' };
+	source: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
 };
 
 type ExtensionWorkspaceRecommendationsNotificationClassification = {
@@ -135,6 +137,7 @@ export class ExtensionRecommendationNotificationService implements IExtensionRec
 		@IExtensionIgnoredRecommendationsService private readonly extensionIgnoredRecommendationsService: IExtensionIgnoredRecommendationsService,
 		@IUserDataAutoSyncEnablementService private readonly userDataAutoSyncEnablementService: IUserDataAutoSyncEnablementService,
 		@IUserDataSyncResourceEnablementService private readonly userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
+		@IWorkbenchEnvironmentService private readonly workbenchEnvironmentService: IWorkbenchEnvironmentService,
 		@optional(ITASExperimentService) tasExperimentService: ITASExperimentService,
 	) {
 		this.tasExperimentService = tasExperimentService;
@@ -153,13 +156,13 @@ export class ExtensionRecommendationNotificationService implements IExtensionRec
 		}
 
 		return this.promptRecommendationsNotification(extensionIds, message, searchValue, source, {
-			onDidInstallRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'install', extensionId: extension.identifier.id })),
-			onDidShowRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'show', extensionId: extension.identifier.id })),
-			onDidCancelRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: extension.identifier.id })),
+			onDidInstallRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string, source: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'install', extensionId: extension.identifier.id, source: RecommendationSourceToString(source) })),
+			onDidShowRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string, source: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'show', extensionId: extension.identifier.id, source: RecommendationSourceToString(source) })),
+			onDidCancelRecommendedExtensions: (extensions: IExtension[]) => extensions.forEach(extension => this.telemetryService.publicLog2<{ userReaction: string, extensionId: string, source: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: extension.identifier.id, source: RecommendationSourceToString(source) })),
 			onDidNeverShowRecommendedExtensionsAgain: (extensions: IExtension[]) => {
 				for (const extension of extensions) {
 					this.addToImportantRecommendationsIgnore(extension.identifier.id);
-					this.telemetryService.publicLog2<{ userReaction: string, extensionId: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: extension.identifier.id });
+					this.telemetryService.publicLog2<{ userReaction: string, extensionId: string, source: string }, ExtensionRecommendationsNotificationClassification>('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: extension.identifier.id, source: RecommendationSourceToString(source) });
 				}
 				this.notificationService.prompt(
 					Severity.Info,
@@ -207,6 +210,11 @@ export class ExtensionRecommendationNotificationService implements IExtensionRec
 			return RecommendationsNotificationResult.Ignored;
 		}
 
+		// Do not show exe based recommendations in remote window
+		if (source === RecommendationSource.EXE && this.workbenchEnvironmentService.remoteAuthority) {
+			return RecommendationsNotificationResult.IncompatibleWindow;
+		}
+
 		// Ignore exe recommendation if the window
 		// 		=> has shown an exe based recommendation already
 		// 		=> or has shown any two recommendations already
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 839c3ffbe..4cb6024b2 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -6,20 +6,16 @@
 import { localize } from 'vs/nls';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { MenuRegistry, MenuId, registerAction2, Action2, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId, registerAction2, Action2, SyncActionDescriptor, ISubmenuItem, IMenuItem, IAction2Options } from 'vs/platform/actions/common/actions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ExtensionsLabel, ExtensionsLocalizedLabel, ExtensionsChannelId, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
+import { ExtensionsLabel, ExtensionsLocalizedLabel, ExtensionsChannelId, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { EnablementState, IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IOutputChannelRegistry, Extensions as OutputExtensions } from 'vs/workbench/services/output/common/output';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import {
-	OpenExtensionsViewletAction, InstallExtensionsAction, ShowOutdatedExtensionsAction, ShowRecommendedExtensionsAction, ShowRecommendedKeymapExtensionsAction, ShowPopularExtensionsAction,
-	ShowEnabledExtensionsAction, ShowInstalledExtensionsAction, ShowDisabledExtensionsAction, ShowBuiltInExtensionsAction, UpdateAllAction,
-	EnableAllAction, EnableAllWorkspaceAction, DisableAllAction, DisableAllWorkspaceAction, CheckForUpdatesAction, ShowLanguageExtensionsAction, EnableAutoUpdateAction, DisableAutoUpdateAction, InstallVSIXAction, ReinstallAction, InstallSpecificVersionOfExtensionAction, ClearExtensionsSearchResultsAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, RefreshExtensionsAction
-} from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, DefaultViewsContext, ExtensionsSortByContext, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
+import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, PromptExtensionInstallFailureAction, SearchExtensionsAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
 import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensionEditor';
 import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer } from 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
@@ -37,11 +33,10 @@ import { ExtensionActivationProgress } from 'vs/workbench/contrib/extensions/bro
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ExtensionDependencyChecker } from 'vs/workbench/contrib/extensions/browser/extensionsDependencyChecker';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { RemoteExtensionsInstaller } from 'vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller';
-import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
+import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsService } from 'vs/workbench/common/views';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { ContextKeyAndExpr, ContextKeyExpr, ContextKeyOrExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyAndExpr, ContextKeyDefinedExpr, ContextKeyEqualsExpr, ContextKeyExpr, ContextKeyOrExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IQuickAccessRegistry, Extensions } from 'vs/platform/quickinput/common/quickAccess';
 import { InstallExtensionQuickAccessProvider, ManageExtensionsQuickAccessProvider } from 'vs/workbench/contrib/extensions/browser/extensionsQuickAccess';
@@ -65,7 +60,15 @@ import { IAction } from 'vs/base/common/actions';
 import { IWorkpsaceExtensionsConfigService } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
 import { Schemas } from 'vs/base/common/network';
 import { ShowRuntimeExtensionsAction } from 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor';
-import { extensionsViewIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { clearSearchResultsIcon, configureRecommendedIcon, extensionsViewIcon, filterIcon, installWorkspaceRecommendedIcon, refreshIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
+import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { isArray } from 'vs/base/common/types';
+import { ShowViewletAction } from 'vs/workbench/browser/viewlet';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { mnemonicButtonLabel } from 'vs/base/common/labels';
+import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
@@ -83,16 +86,6 @@ Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessPro
 	helpEntries: [{ description: localize('manageExtensionsHelp', "Manage Extensions"), needsEditor: false }]
 });
 
-// Explorer
-MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
-	group: 'extensions',
-	command: {
-		id: INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID,
-		title: localize('installVSIX', "Install Extension VSIX"),
-	},
-	when: ResourceContextKey.Extension.isEqualTo('.vsix')
-});
-
 // Editor
 Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
 	EditorDescriptor.create(
@@ -226,36 +219,6 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-CommandsRegistry.registerCommand({
-	id: INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID,
-	handler: async (accessor: ServicesAccessor, resources: URI[] | URI) => {
-		const extensionService = accessor.get(IExtensionService);
-		const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
-		const hostService = accessor.get(IHostService);
-		const notificationService = accessor.get(INotificationService);
-
-		const extensions = Array.isArray(resources) ? resources : [resources];
-		await Promise.all(extensions.map(async (vsix) => await extensionsWorkbenchService.install(vsix)))
-			.then(async (extensions) => {
-				for (const extension of extensions) {
-					const requireReload = !(extension.local && extensionService.canAddExtension(toExtensionDescription(extension.local)));
-					const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload Visual Studio Code to enable it.", extension.displayName || extension.name)
-						: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
-					const actions = requireReload ? [{
-						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
-						run: () => hostService.reload()
-					}] : [];
-					notificationService.prompt(
-						Severity.Info,
-						message,
-						actions,
-						{ sticky: true }
-					);
-				}
-			});
-	}
-});
-
 CommandsRegistry.registerCommand({
 	id: 'workbench.extensions.uninstallExtension',
 	description: {
@@ -316,57 +279,6 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-// File menu registration
-
-MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-	group: '2_keybindings',
-	command: {
-		id: ShowRecommendedKeymapExtensionsAction.ID,
-		title: localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymaps")
-	},
-	order: 2
-});
-
-MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-	group: '2_keybindings',
-	command: {
-		id: ShowRecommendedKeymapExtensionsAction.ID,
-		title: localize('miOpenKeymapExtensions2', "Keymaps")
-	},
-	order: 2
-});
-
-MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-	group: '1_settings',
-	command: {
-		id: VIEWLET_ID,
-		title: localize({ key: 'miPreferencesExtensions', comment: ['&& denotes a mnemonic'] }, "&&Extensions")
-	},
-	order: 3
-});
-
-// View menu
-
-MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-	group: '3_views',
-	command: {
-		id: VIEWLET_ID,
-		title: localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions")
-	},
-	order: 5
-});
-
-// Global Activity Menu
-
-MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-	group: '2_configuration',
-	command: {
-		id: VIEWLET_ID,
-		title: localize('showExtensions', "Extensions")
-	},
-	order: 3
-});
-
 function overrideActionForActiveExtensionEditorWebview(command: MultiCommand | undefined, f: (webview: Webview) => void) {
 	command?.addImplementation(105, (accessor) => {
 		const editorService = accessor.get(IEditorService);
@@ -399,13 +311,25 @@ async function runAction(action: IAction): Promise<void> {
 	}
 }
 
-class ExtensionsContributions implements IWorkbenchContribution {
+interface IExtensionActionOptions extends IAction2Options {
+	menuTitles?: { [id: number]: string };
+	run(accessor: ServicesAccessor, ...args: any[]): Promise<any>;
+}
+
+class ExtensionsContributions extends Disposable implements IWorkbenchContribution {
 
 	constructor(
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IViewletService private readonly viewletService: IViewletService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@ICommandService private readonly commandService: ICommandService,
 	) {
+		super();
 		const hasGalleryContext = CONTEXT_HAS_GALLERY.bindTo(contextKeyService);
 		if (extensionGalleryService.isEnabled()) {
 			hasGalleryContext.set(true);
@@ -447,437 +371,667 @@ class ExtensionsContributions implements IWorkbenchContribution {
 
 	// Global actions
 	private registerGlobalActions(): void {
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: OpenExtensionsViewletAction.ID,
-					title: { value: OpenExtensionsViewletAction.LABEL, original: 'Show Extensions' },
-					category: CATEGORIES.View,
-					menu: {
-						id: MenuId.CommandPalette,
-					},
-					keybinding: {
-						primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_X,
-						weight: KeybindingWeight.WorkbenchContrib
+		this.registerExtensionAction({
+			id: VIEWLET_ID,
+			title: { value: localize('toggleExtensionsViewlet', "Show Extensions"), original: 'Show Extensions' },
+			category: CATEGORIES.View,
+			menu: [{
+				id: MenuId.CommandPalette,
+			}, {
+				id: MenuId.MenubarPreferencesMenu,
+				group: '1_settings',
+				order: 3
+			}, {
+				id: MenuId.MenubarViewMenu,
+				group: '3_views',
+				order: 5
+			}, {
+				id: MenuId.GlobalActivity,
+				group: '2_configuration',
+				order: 3
+			}],
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_X,
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			menuTitles: {
+				[MenuId.MenubarPreferencesMenu.id]: localize({ key: 'miPreferencesExtensions', comment: ['&& denotes a mnemonic'] }, "&&Extensions"),
+				[MenuId.MenubarViewMenu.id]: localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions"),
+				[MenuId.GlobalActivity.id]: localize('showExtensions', "Extensions"),
+			},
+			run: () => runAction(this.instantiationService.createInstance(ShowViewletAction, VIEWLET_ID, 'Show Extensions', VIEWLET_ID))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.installExtensions',
+			title: { value: localize('installExtensions', "Install Extensions"), original: 'Install Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			},
+			run: () => runAction(this.instantiationService.createInstance(ShowViewletAction, VIEWLET_ID, 'Install Extensions', VIEWLET_ID))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showRecommendedKeymapExtensions',
+			title: { value: localize('showRecommendedKeymapExtensionsShort', "Keymaps"), original: 'Keymaps' },
+			category: PreferencesLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			}, {
+				id: MenuId.MenubarPreferencesMenu,
+				group: '2_keybindings',
+				order: 2
+			}, {
+				id: MenuId.GlobalActivity,
+				group: '2_keybindings',
+				order: 2
+			}],
+			keybinding: {
+				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_M),
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			menuTitles: {
+				[MenuId.MenubarPreferencesMenu.id]: localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymaps"),
+				[MenuId.GlobalActivity.id]: localize('miOpenKeymapExtensions2', "Keymaps")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended:keymaps '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showLanguageExtensions',
+			title: { value: localize('showLanguageExtensionsShort', "Language Extensions"), original: 'Language Extensions' },
+			category: PreferencesLocalizedLabel,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@category:"programming languages" @sort:installs '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.checkForUpdates',
+			title: { value: localize('checkForUpdates', "Check for Extension Updates"), original: 'Check for Extension Updates' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: '1_updates',
+				order: 1
+			}],
+			run: async () => {
+				await this.extensionsWorkbenchService.checkForUpdates();
+				const outdated = this.extensionsWorkbenchService.outdated;
+				if (!outdated.length) {
+					this.notificationService.info(localize('noUpdatesAvailable', "All extensions are up to date."));
+					return;
+				}
+
+				let msgAvailableExtensions = outdated.length === 1 ? localize('singleUpdateAvailable', "An extension update is available.") : localize('updatesAvailable', "{0} extension updates are available.", outdated.length);
+
+				const disabledExtensionsCount = outdated.filter(ext => ext.local && !this.extensionEnablementService.isEnabled(ext.local)).length;
+				if (disabledExtensionsCount) {
+					if (outdated.length === 1) {
+						msgAvailableExtensions = localize('singleDisabledUpdateAvailable', "An update to an extension which is disabled is available.");
+					} else if (disabledExtensionsCount === 1) {
+						msgAvailableExtensions = localize('updatesAvailableOneDisabled', "{0} extension updates are available. One of them is for a disabled extension.", outdated.length);
+					} else if (disabledExtensionsCount === outdated.length) {
+						msgAvailableExtensions = localize('updatesAvailableAllDisabled', "{0} extension updates are available. All of them are for disabled extensions.", outdated.length);
+					} else {
+						msgAvailableExtensions = localize('updatesAvailableIncludingDisabled', "{0} extension updates are available. {1} of them are for disabled extensions.", outdated.length, disabledExtensionsCount);
 					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(OpenExtensionsViewletAction, OpenExtensionsViewletAction.ID, OpenExtensionsViewletAction.LABEL));
+				}
+
+				this.viewletService.openViewlet(VIEWLET_ID, true);
+				this.notificationService.info(msgAvailableExtensions);
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: InstallExtensionsAction.ID,
-					title: { value: InstallExtensionsAction.LABEL, original: 'Install Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.disableAutoUpdate',
+			title: { value: localize('disableAutoUpdate', "Disable Auto Updating Extensions"), original: 'Disable Auto Updating Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyAndExpr.create([ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), ContextKeyDefinedExpr.create(`config.${AutoUpdateConfigurationKey}`)]),
+				group: '1_updates',
+				order: 2
+			}],
+			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, false)
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.updateAllExtensions',
+			title: { value: localize('updateAll', "Update All Extensions"), original: 'Update All Extensions' },
+			category: ExtensionsLocalizedLabel,
+			precondition: HasOutdatedExtensionsContext,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyAndExpr.create([ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), ContextKeyDefinedExpr.create(`config.${AutoUpdateConfigurationKey}`).negate()]),
+				group: '1_updates',
+				order: 2
+			}],
+			run: () => {
+				return Promise.all(this.extensionsWorkbenchService.outdated.map(async extension => {
+					try {
+						await this.extensionsWorkbenchService.install(extension);
+					} catch (err) {
+						runAction(this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, err));
 					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(InstallExtensionsAction, InstallExtensionsAction.ID, InstallExtensionsAction.LABEL));
+				}));
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowOutdatedExtensionsAction.ID,
-					title: { value: ShowOutdatedExtensionsAction.LABEL, original: 'Show Outdated Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, ShowOutdatedExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.enableAutoUpdate',
+			title: { value: localize('enableAutoUpdate', "Enable Auto Updating Extensions"), original: 'Enable Auto Updating Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyAndExpr.create([ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), ContextKeyDefinedExpr.create(`config.${AutoUpdateConfigurationKey}`).negate()]),
+				group: '1_updates',
+				order: 3
+			}],
+			run: (accessor: ServicesAccessor) => accessor.get(IConfigurationService).updateValue(AutoUpdateConfigurationKey, true)
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.enableAll',
+			title: { value: localize('enableAll', "Enable All Extensions"), original: 'Enable All Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: '2_enablement',
+				order: 1
+			}],
+			run: async () => {
+				const extensionsToEnable = this.extensionsWorkbenchService.local.filter(e => !!e.local && this.extensionEnablementService.canChangeEnablement(e.local) && !this.extensionEnablementService.isEnabled(e.local));
+				if (extensionsToEnable.length) {
+					await this.extensionsWorkbenchService.setEnablement(extensionsToEnable, EnablementState.EnabledGlobally);
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowRecommendedExtensionsAction.ID,
-					title: { value: ShowRecommendedExtensionsAction.LABEL, original: 'Show Recommended Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: CONTEXT_HAS_GALLERY
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, ShowRecommendedExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.enableAllWorkspace',
+			title: { value: localize('enableAllWorkspace', "Enable All Extensions for this Workspace"), original: 'Enable All Extensions for this Workspace' },
+			category: ExtensionsLocalizedLabel,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([WorkbenchStateContext.notEqualsTo('empty'), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			},
+			run: async () => {
+				const extensionsToEnable = this.extensionsWorkbenchService.local.filter(e => !!e.local && this.extensionEnablementService.canChangeEnablement(e.local) && !this.extensionEnablementService.isEnabled(e.local));
+				if (extensionsToEnable.length) {
+					await this.extensionsWorkbenchService.setEnablement(extensionsToEnable, EnablementState.EnabledWorkspace);
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowRecommendedKeymapExtensionsAction.ID,
-					title: { value: ShowRecommendedKeymapExtensionsAction.LABEL, original: 'Keymaps' },
-					category: PreferencesLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: CONTEXT_HAS_GALLERY
-					},
-					keybinding: {
-						primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_M),
-						weight: KeybindingWeight.WorkbenchContrib
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowRecommendedKeymapExtensionsAction, ShowRecommendedKeymapExtensionsAction.ID, ShowRecommendedKeymapExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.disableAll',
+			title: { value: localize('disableAll', "Disable All Installed Extensions"), original: 'Disable All Installed Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: '2_enablement',
+				order: 2
+			}],
+			run: async () => {
+				const extensionsToDisable = this.extensionsWorkbenchService.local.filter(e => !e.isBuiltin && !!e.local && this.extensionEnablementService.isEnabled(e.local) && this.extensionEnablementService.canChangeEnablement(e.local));
+				if (extensionsToDisable.length) {
+					await this.extensionsWorkbenchService.setEnablement(extensionsToDisable, EnablementState.DisabledGlobally);
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowLanguageExtensionsAction.ID,
-					title: { value: ShowLanguageExtensionsAction.LABEL, original: 'Language Extensions' },
-					category: PreferencesLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: CONTEXT_HAS_GALLERY
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowLanguageExtensionsAction, ShowLanguageExtensionsAction.ID, ShowLanguageExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.disableAllWorkspace',
+			title: { value: localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace"), original: 'Disable All Installed Extensions for this Workspace' },
+			category: ExtensionsLocalizedLabel,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([WorkbenchStateContext.notEqualsTo('empty'), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			},
+			run: async () => {
+				const extensionsToDisable = this.extensionsWorkbenchService.local.filter(e => !e.isBuiltin && !!e.local && this.extensionEnablementService.isEnabled(e.local) && this.extensionEnablementService.canChangeEnablement(e.local));
+				if (extensionsToDisable.length) {
+					await this.extensionsWorkbenchService.setEnablement(extensionsToDisable, EnablementState.DisabledWorkspace);
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowPopularExtensionsAction.ID,
-					title: { value: ShowPopularExtensionsAction.LABEL, original: 'Show Popular Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: CONTEXT_HAS_GALLERY
-					}
+		this.registerExtensionAction({
+			id: SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID,
+			title: { value: localize('InstallFromVSIX', "Install from VSIX..."), original: 'Install from VSIX...' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])
+			}, {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyAndExpr.create([ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])]),
+				group: '3_install',
+				order: 1
+			}],
+			run: async (accessor: ServicesAccessor) => {
+				const fileDialogService = accessor.get(IFileDialogService);
+				const commandService = accessor.get(ICommandService);
+				const vsixPaths = await fileDialogService.showOpenDialog({
+					title: localize('installFromVSIX', "Install from VSIX"),
+					filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
+					canSelectFiles: true,
+					canSelectMany: true,
+					openLabel: mnemonicButtonLabel(localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"))
 				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowPopularExtensionsAction, ShowPopularExtensionsAction.ID, ShowPopularExtensionsAction.LABEL));
+				if (vsixPaths) {
+					await commandService.executeCommand(INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, vsixPaths);
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowEnabledExtensionsAction.ID,
-					title: { value: ShowEnabledExtensionsAction.LABEL, original: 'Show Enabled Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowEnabledExtensionsAction, ShowEnabledExtensionsAction.ID, ShowEnabledExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID,
+			title: localize('installVSIX', "Install Extension VSIX"),
+			menu: [{
+				id: MenuId.ExplorerContext,
+				group: 'extensions',
+				when: ContextKeyAndExpr.create([ResourceContextKey.Extension.isEqualTo('.vsix'), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])]),
+			}],
+			run: async (accessor: ServicesAccessor, resources: URI[] | URI) => {
+				const extensionService = accessor.get(IExtensionService);
+				const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+				const hostService = accessor.get(IHostService);
+				const notificationService = accessor.get(INotificationService);
+
+				const extensions = Array.isArray(resources) ? resources : [resources];
+				await Promise.all(extensions.map(async (vsix) => await extensionsWorkbenchService.install(vsix)))
+					.then(async (extensions) => {
+						for (const extension of extensions) {
+							const requireReload = !(extension.local && extensionService.canAddExtension(toExtensionDescription(extension.local)));
+							const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload Visual Studio Code to enable it.", extension.displayName || extension.name)
+								: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
+							const actions = requireReload ? [{
+								label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+								run: () => hostService.reload()
+							}] : [];
+							notificationService.prompt(
+								Severity.Info,
+								message,
+								actions,
+								{ sticky: true }
+							);
+						}
+					});
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowInstalledExtensionsAction.ID,
-					title: { value: ShowInstalledExtensionsAction.LABEL, original: 'Show Installed Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL));
+		const extensionsFilterSubMenu = new MenuId('extensionsFilterSubMenu');
+		MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, <ISubmenuItem>{
+			submenu: extensionsFilterSubMenu,
+			title: localize('filterExtensions', "Filter Extensions..."),
+			when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+			group: 'navigation',
+			order: 1,
+			icon: filterIcon,
+		});
+
+		const showFeaturedExtensionsId = 'extensions.filter.featured';
+		this.registerExtensionAction({
+			id: showFeaturedExtensionsId,
+			title: { value: localize('showFeaturedExtensions', "Show Featured Extensions"), original: 'Show Featured Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			}, {
+				id: extensionsFilterSubMenu,
+				when: CONTEXT_HAS_GALLERY,
+				group: '1_predefined',
+				order: 1,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('featured filter', "Featured")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@featured '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showPopularExtensions',
+			title: { value: localize('showPopularExtensions', "Show Popular Extensions"), original: 'Show Popular Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			}, {
+				id: extensionsFilterSubMenu,
+				when: CONTEXT_HAS_GALLERY,
+				group: '1_predefined',
+				order: 2,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('most popular filter', "Most Popular")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@popular '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showRecommendedExtensions',
+			title: { value: localize('showRecommendedExtensions', "Show Recommended Extensions"), original: 'Show Recommended Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			}, {
+				id: extensionsFilterSubMenu,
+				when: CONTEXT_HAS_GALLERY,
+				group: '1_predefined',
+				order: 2,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('most popular recommended', "Recommended")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@recommended '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.recentlyPublishedExtensions',
+			title: { value: localize('recentlyPublishedExtensions', "Show Recently Published Extensions"), original: 'Show Recently Published Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: CONTEXT_HAS_GALLERY
+			}, {
+				id: extensionsFilterSubMenu,
+				when: CONTEXT_HAS_GALLERY,
+				group: '1_predefined',
+				order: 2,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('recently published filter', "Recently Published")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@sort:publishedDate '))
+		});
+
+		const extensionsCategoryFilterSubMenu = new MenuId('extensionsCategoryFilterSubMenu');
+		MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{
+			submenu: extensionsCategoryFilterSubMenu,
+			title: localize('filter by category', "Category"),
+			when: CONTEXT_HAS_GALLERY,
+			group: '2_categories',
+			order: 1,
+		});
+
+		EXTENSION_CATEGORIES.map((category, index) => {
+			this.registerExtensionAction({
+				id: `extensions.actions.searchByCategory.${category}`,
+				title: category,
+				menu: [{
+					id: extensionsCategoryFilterSubMenu,
+					when: CONTEXT_HAS_GALLERY,
+					order: index,
+				}],
+				run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, `@category:"${category.toLowerCase()}"`))
+			});
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.listBuiltInExtensions',
+			title: { value: localize('showBuiltInExtensions', "Show Built-in Extensions"), original: 'Show Built-in Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: extensionsFilterSubMenu,
+				group: '3_installed',
+				order: 1,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('builtin filter', "Built-in")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@builtin '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showInstalledExtensions',
+			title: { value: localize('showInstalledExtensions', "Show Installed Extensions"), original: 'Show Installed Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: extensionsFilterSubMenu,
+				group: '3_installed',
+				order: 2,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('installed filter', "Installed")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@installed '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showEnabledExtensions',
+			title: { value: localize('showEnabledExtensions', "Show Enabled Extensions"), original: 'Show Enabled Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: extensionsFilterSubMenu,
+				group: '3_installed',
+				order: 3,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('enabled filter', "Enabled")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@enabled '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.showDisabledExtensions',
+			title: { value: localize('showDisabledExtensions', "Show Disabled Extensions"), original: 'Show Disabled Extensions' },
+			category: ExtensionsLocalizedLabel,
+
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
+			}, {
+				id: extensionsFilterSubMenu,
+				group: '3_installed',
+				order: 4,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('disabled filter', "Disabled")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@disabled '))
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.listOutdatedExtensions',
+			title: { value: localize('showOutdatedExtensions', "Show Outdated Extensions"), original: 'Show Outdated Extensions' },
+			category: ExtensionsLocalizedLabel,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			}, {
+				id: extensionsFilterSubMenu,
+				group: '3_installed',
+				order: 5,
+			}],
+			menuTitles: {
+				[extensionsFilterSubMenu.id]: localize('outdated filter', "Outdated")
+			},
+			run: () => runAction(this.instantiationService.createInstance(SearchExtensionsAction, '@outdated '))
+		});
+
+		const extensionsSortSubMenu = new MenuId('extensionsSortSubMenu');
+		MenuRegistry.appendMenuItem(extensionsFilterSubMenu, <ISubmenuItem>{
+			submenu: extensionsSortSubMenu,
+			title: localize('sorty by', "Sort By"),
+			when: CONTEXT_HAS_GALLERY,
+			group: '4_sort',
+			order: 1,
+		});
+
+		[
+			{ id: 'installs', title: localize('sort by installs', "Install Count") },
+			{ id: 'rating', title: localize('sort by rating', "Rating") },
+			{ id: 'name', title: localize('sort by name', "Name") },
+			{ id: 'publishedDate', title: localize('sort by date', "Published Date") },
+		].map(({ id, title }, index) => {
+			this.registerExtensionAction({
+				id: `extensions.sort.${id}`,
+				title,
+				precondition: DefaultViewsContext.toNegated(),
+				menu: [{
+					id: extensionsSortSubMenu,
+					when: CONTEXT_HAS_GALLERY,
+					order: index,
+				}],
+				toggled: ExtensionsSortByContext.isEqualTo(id),
+				run: async () => {
+					const viewlet = await this.viewletService.openViewlet(VIEWLET_ID, true);
+					const extensionsViewPaneContainer = viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer;
+					const currentQuery = Query.parse(extensionsViewPaneContainer.searchValue || '');
+					extensionsViewPaneContainer.search(new Query(currentQuery.value, id, currentQuery.groupBy).toString());
+					extensionsViewPaneContainer.focus();
+				}
+			});
+		});
+
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.clearExtensionsSearchResults',
+			title: { value: localize('clearExtensionsSearchResults', "Clear Extensions Search Results"), original: 'Clear Extensions Search Results' },
+			category: ExtensionsLocalizedLabel,
+			icon: clearSearchResultsIcon,
+			f1: true,
+			precondition: DefaultViewsContext.toNegated(),
+			menu: {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: 'navigation',
+				order: 3,
+			},
+			run: async (accessor: ServicesAccessor) => {
+				const viewPaneContainer = accessor.get(IViewsService).getActiveViewPaneContainerWithId(VIEWLET_ID);
+				if (viewPaneContainer) {
+					const extensionsViewPaneContainer = viewPaneContainer as IExtensionsViewPaneContainer;
+					extensionsViewPaneContainer.search('');
+					extensionsViewPaneContainer.focus();
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowDisabledExtensionsAction.ID,
-					title: { value: ShowDisabledExtensionsAction.LABEL, original: 'Show Disabled Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowDisabledExtensionsAction, ShowDisabledExtensionsAction.ID, ShowDisabledExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.refreshExtension',
+			title: { value: localize('refreshExtension', "Refresh"), original: 'Refresh' },
+			category: ExtensionsLocalizedLabel,
+			icon: refreshIcon,
+			f1: true,
+			menu: {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: 'navigation',
+				order: 2
+			},
+			run: async (accessor: ServicesAccessor) => {
+				const viewPaneContainer = accessor.get(IViewsService).getActiveViewPaneContainerWithId(VIEWLET_ID);
+				if (viewPaneContainer) {
+					await (viewPaneContainer as IExtensionsViewPaneContainer).refresh();
+				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ShowBuiltInExtensionsAction.ID,
-					title: { value: ShowBuiltInExtensionsAction.LABEL, original: 'Show Built-in Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ShowBuiltInExtensionsAction, ShowBuiltInExtensionsAction.ID, ShowBuiltInExtensionsAction.LABEL));
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.installWorkspaceRecommendedExtensions',
+			title: localize('installWorkspaceRecommendedExtensions', "Install Workspace Recommended Extensions"),
+			icon: installWorkspaceRecommendedIcon,
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyEqualsExpr.create('view', WORKSPACE_RECOMMENDATIONS_VIEW_ID),
+				group: 'navigation',
+				order: 1
+			},
+			run: async (accessor: ServicesAccessor) => {
+				const view = accessor.get(IViewsService).getActiveViewWithId(WORKSPACE_RECOMMENDATIONS_VIEW_ID) as IWorkspaceRecommendedExtensionsView;
+				return view.installWorkspaceRecommendations();
 			}
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: UpdateAllAction.ID,
-					title: { value: UpdateAllAction.LABEL, original: 'Update All Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL, false));
-			}
+		this.registerExtensionAction({
+			id: ConfigureWorkspaceFolderRecommendedExtensionsAction.ID,
+			title: ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL,
+			icon: configureRecommendedIcon,
+			menu: [{
+				id: MenuId.CommandPalette,
+				when: WorkbenchStateContext.notEqualsTo('empty'),
+			}, {
+				id: MenuId.ViewTitle,
+				when: ContextKeyEqualsExpr.create('view', WORKSPACE_RECOMMENDATIONS_VIEW_ID),
+				group: 'navigation',
+				order: 2
+			}],
+			run: () => runAction(this.instantiationService.createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL))
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: InstallVSIXAction.ID,
-					title: { value: InstallVSIXAction.LABEL, original: 'Install from VSIX...' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL));
-			}
+		this.registerExtensionAction({
+			id: InstallSpecificVersionOfExtensionAction.ID,
+			title: { value: InstallSpecificVersionOfExtensionAction.LABEL, original: 'Install Specific Version of Extension...' },
+			category: ExtensionsLocalizedLabel,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
+			},
+			run: () => runAction(this.instantiationService.createInstance(InstallSpecificVersionOfExtensionAction, InstallSpecificVersionOfExtensionAction.ID, InstallSpecificVersionOfExtensionAction.LABEL))
 		});
 
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: DisableAllAction.ID,
-					title: { value: DisableAllAction.LABEL, original: 'Disable All Installed Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(DisableAllAction, DisableAllAction.ID, DisableAllAction.LABEL, false));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: DisableAllWorkspaceAction.ID,
-					title: { value: DisableAllWorkspaceAction.LABEL, original: 'Disable All Installed Extensions for this Workspace' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([WorkbenchStateContext.notEqualsTo('empty'), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(DisableAllWorkspaceAction, DisableAllWorkspaceAction.ID, DisableAllWorkspaceAction.LABEL, false));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: EnableAllAction.ID,
-					title: { value: EnableAllAction.LABEL, original: 'Enable All Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(EnableAllAction, EnableAllAction.ID, EnableAllAction.LABEL, false));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: EnableAllWorkspaceAction.ID,
-					title: { value: EnableAllWorkspaceAction.LABEL, original: 'Enable All Extensions for this Workspace' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([WorkbenchStateContext.notEqualsTo('empty'), ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(EnableAllWorkspaceAction, EnableAllWorkspaceAction.ID, EnableAllWorkspaceAction.LABEL, false));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: CheckForUpdatesAction.ID,
-					title: { value: CheckForUpdatesAction.LABEL, original: 'Check for Extension Updates' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(CheckForUpdatesAction, CheckForUpdatesAction.ID, CheckForUpdatesAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ClearExtensionsSearchResultsAction.ID,
-					title: { value: ClearExtensionsSearchResultsAction.LABEL, original: 'Clear Extensions Search Results' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ClearExtensionsSearchResultsAction, ClearExtensionsSearchResultsAction.ID, ClearExtensionsSearchResultsAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: RefreshExtensionsAction.ID,
-					title: { value: RefreshExtensionsAction.LABEL, original: 'Refresh' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(RefreshExtensionsAction, RefreshExtensionsAction.ID, RefreshExtensionsAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: EnableAutoUpdateAction.ID,
-					title: { value: EnableAutoUpdateAction.LABEL, original: 'Enable Auto Updating Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: DisableAutoUpdateAction.ID,
-					title: { value: DisableAutoUpdateAction.LABEL, original: 'Disable Auto Updating Extensions' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: InstallSpecificVersionOfExtensionAction.ID,
-					title: { value: InstallSpecificVersionOfExtensionAction.LABEL, original: 'Install Specific Version of Extension...' },
-					category: ExtensionsLocalizedLabel,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER, CONTEXT_HAS_WEB_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(InstallSpecificVersionOfExtensionAction, InstallSpecificVersionOfExtensionAction.ID, InstallSpecificVersionOfExtensionAction.LABEL));
-			}
-		});
-
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: ReinstallAction.ID,
-					title: { value: ReinstallAction.LABEL, original: 'Reinstall Extension...' },
-					category: CATEGORIES.Developer,
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])])
-					}
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				return runAction(accessor.get(IInstantiationService).createInstance(ReinstallAction, ReinstallAction.ID, ReinstallAction.LABEL));
-			}
+		this.registerExtensionAction({
+			id: ReinstallAction.ID,
+			title: { value: ReinstallAction.LABEL, original: 'Reinstall Extension...' },
+			category: CATEGORIES.Developer,
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyAndExpr.create([CONTEXT_HAS_GALLERY, ContextKeyOrExpr.create([CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER])])
+			},
+			run: () => runAction(this.instantiationService.createInstance(ReinstallAction, ReinstallAction.ID, ReinstallAction.LABEL))
 		});
 	}
 
 	// Extension Context Menu
 	private registerContextMenuActions(): void {
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.copyExtension',
-					title: { value: localize('workbench.extensions.action.copyExtension', "Copy"), original: 'Copy' },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '1_copy'
-					}
-				});
-			}
-
-			async run(accessor: ServicesAccessor, extensionId: string) {
-				const extensionWorkbenchService = accessor.get(IExtensionsWorkbenchService);
-				let extension = extensionWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
-					|| (await extensionWorkbenchService.queryGallery({ names: [extensionId], pageSize: 1 }, CancellationToken.None)).firstPage[0];
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.copyExtension',
+			title: { value: localize('workbench.extensions.action.copyExtension', "Copy"), original: 'Copy' },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '1_copy'
+			},
+			run: async (accessor: ServicesAccessor, extensionId: string) => {
+				const clipboardService = accessor.get(IClipboardService);
+				let extension = this.extensionsWorkbenchService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }))[0]
+					|| (await this.extensionsWorkbenchService.queryGallery({ names: [extensionId], pageSize: 1 }, CancellationToken.None)).firstPage[0];
 				if (extension) {
 					const name = localize('extensionInfoName', 'Name: {0}', extension.displayName);
 					const id = localize('extensionInfoId', 'Id: {0}', extensionId);
@@ -886,165 +1040,104 @@ class ExtensionsContributions implements IWorkbenchContribution {
 					const publisher = localize('extensionInfoPublisher', 'Publisher: {0}', extension.publisherDisplayName);
 					const link = extension.url ? localize('extensionInfoVSMarketplaceLink', 'VS Marketplace Link: {0}', `${extension.url}`) : null;
 					const clipboardStr = `${name}\n${id}\n${description}\n${verision}\n${publisher}${link ? '\n' + link : ''}`;
-					await accessor.get(IClipboardService).writeText(clipboardStr);
+					await clipboardService.writeText(clipboardStr);
 				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.copyExtensionId',
-					title: { value: localize('workbench.extensions.action.copyExtensionId', "Copy Extension Id"), original: 'Copy Extension Id' },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '1_copy'
-					}
-				});
-			}
-
-			async run(accessor: ServicesAccessor, id: string) {
-				await accessor.get(IClipboardService).writeText(id);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.copyExtensionId',
+			title: { value: localize('workbench.extensions.action.copyExtensionId', "Copy Extension Id"), original: 'Copy Extension Id' },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '1_copy'
+			},
+			run: async (accessor: ServicesAccessor, id: string) => accessor.get(IClipboardService).writeText(id)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.configure',
-					title: { value: localize('workbench.extensions.action.configure', "Extension Settings"), original: 'Extension Settings' },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '2_configure',
-						when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.has('extensionHasConfiguration'))
-					}
-				});
-			}
-
-			async run(accessor: ServicesAccessor, id: string) {
-				await accessor.get(IPreferencesService).openSettings(false, `@ext:${id}`);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.configure',
+			title: { value: localize('workbench.extensions.action.configure', "Extension Settings"), original: 'Extension Settings' },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '2_configure',
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'installed'), ContextKeyExpr.has('extensionHasConfiguration'))
+			},
+			run: async (accessor: ServicesAccessor, id: string) => accessor.get(IPreferencesService).openSettings(false, `@ext:${id}`)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: TOGGLE_IGNORE_EXTENSION_ACTION_ID,
-					title: { value: localize('workbench.extensions.action.toggleIgnoreExtension', "Sync This Extension"), original: `Sync This Extension` },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '2_configure',
-						when: ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, ContextKeyExpr.has('inExtensionEditor').negate())
-					},
-				});
-			}
-
-			async run(accessor: ServicesAccessor, id: string) {
-				const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
-				const extension = extensionsWorkbenchService.local.find(e => areSameExtensions({ id }, e.identifier));
+		this.registerExtensionAction({
+			id: TOGGLE_IGNORE_EXTENSION_ACTION_ID,
+			title: { value: localize('workbench.extensions.action.toggleIgnoreExtension', "Sync This Extension"), original: `Sync This Extension` },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '2_configure',
+				when: ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, ContextKeyExpr.has('inExtensionEditor').negate())
+			},
+			run: async (accessor: ServicesAccessor, id: string) => {
+				const extension = this.extensionsWorkbenchService.local.find(e => areSameExtensions({ id }, e.identifier));
 				if (extension) {
-					return extensionsWorkbenchService.toggleExtensionIgnoredToSync(extension);
+					return this.extensionsWorkbenchService.toggleExtensionIgnoredToSync(extension);
 				}
 			}
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.ignoreRecommendation',
-					title: { value: localize('workbench.extensions.action.ignoreRecommendation', "Ignore Recommendation"), original: `Ignore Recommendation` },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '3_recommendations',
-						when: ContextKeyExpr.has('isExtensionRecommended'),
-						order: 1
-					},
-				});
-			}
-
-			async run(accessor: ServicesAccessor, id: string): Promise<any> {
-				accessor.get(IExtensionIgnoredRecommendationsService).toggleGlobalIgnoredRecommendation(id, true);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.ignoreRecommendation',
+			title: { value: localize('workbench.extensions.action.ignoreRecommendation', "Ignore Recommendation"), original: `Ignore Recommendation` },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '3_recommendations',
+				when: ContextKeyExpr.has('isExtensionRecommended'),
+				order: 1
+			},
+			run: async (accessor: ServicesAccessor, id: string) => accessor.get(IExtensionIgnoredRecommendationsService).toggleGlobalIgnoredRecommendation(id, true)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.undoIgnoredRecommendation',
-					title: { value: localize('workbench.extensions.action.undoIgnoredRecommendation', "Undo Ignored Recommendation"), original: `Undo Ignored Recommendation` },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '3_recommendations',
-						when: ContextKeyExpr.has('isUserIgnoredRecommendation'),
-						order: 1
-					},
-				});
-			}
-
-			async run(accessor: ServicesAccessor, id: string): Promise<any> {
-				accessor.get(IExtensionIgnoredRecommendationsService).toggleGlobalIgnoredRecommendation(id, false);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.undoIgnoredRecommendation',
+			title: { value: localize('workbench.extensions.action.undoIgnoredRecommendation', "Undo Ignored Recommendation"), original: `Undo Ignored Recommendation` },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '3_recommendations',
+				when: ContextKeyExpr.has('isUserIgnoredRecommendation'),
+				order: 1
+			},
+			run: async (accessor: ServicesAccessor, id: string) => accessor.get(IExtensionIgnoredRecommendationsService).toggleGlobalIgnoredRecommendation(id, false)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.addExtensionToWorkspaceRecommendations',
-					title: { value: localize('workbench.extensions.action.addExtensionToWorkspaceRecommendations', "Add to Workspace Recommendations"), original: `Add to Workspace Recommendations` },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '3_recommendations',
-						when: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), ContextKeyExpr.has('isBuiltinExtension').negate(), ContextKeyExpr.has('isExtensionWorkspaceRecommended').negate(), ContextKeyExpr.has('isUserIgnoredRecommendation').negate()),
-						order: 2
-					},
-				});
-			}
-
-			run(accessor: ServicesAccessor, id: string): Promise<any> {
-				return accessor.get(IWorkpsaceExtensionsConfigService).toggleRecommendation(id);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.addExtensionToWorkspaceRecommendations',
+			title: { value: localize('workbench.extensions.action.addExtensionToWorkspaceRecommendations', "Add to Workspace Recommendations"), original: `Add to Workspace Recommendations` },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '3_recommendations',
+				when: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), ContextKeyExpr.has('isBuiltinExtension').negate(), ContextKeyExpr.has('isExtensionWorkspaceRecommended').negate(), ContextKeyExpr.has('isUserIgnoredRecommendation').negate()),
+				order: 2
+			},
+			run: (accessor: ServicesAccessor, id: string) => accessor.get(IWorkpsaceExtensionsConfigService).toggleRecommendation(id)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.removeExtensionFromWorkspaceRecommendations',
-					title: { value: localize('workbench.extensions.action.removeExtensionFromWorkspaceRecommendations', "Remove from Workspace Recommendations"), original: `Remove from Workspace Recommendations` },
-					menu: {
-						id: MenuId.ExtensionContext,
-						group: '3_recommendations',
-						when: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), ContextKeyExpr.has('isBuiltinExtension').negate(), ContextKeyExpr.has('isExtensionWorkspaceRecommended')),
-						order: 2
-					},
-				});
-			}
-
-			run(accessor: ServicesAccessor, id: string): Promise<any> {
-				return accessor.get(IWorkpsaceExtensionsConfigService).toggleRecommendation(id);
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.removeExtensionFromWorkspaceRecommendations',
+			title: { value: localize('workbench.extensions.action.removeExtensionFromWorkspaceRecommendations', "Remove from Workspace Recommendations"), original: `Remove from Workspace Recommendations` },
+			menu: {
+				id: MenuId.ExtensionContext,
+				group: '3_recommendations',
+				when: ContextKeyExpr.and(WorkbenchStateContext.notEqualsTo('empty'), ContextKeyExpr.has('isBuiltinExtension').negate(), ContextKeyExpr.has('isExtensionWorkspaceRecommended')),
+				order: 2
+			},
+			run: (accessor: ServicesAccessor, id: string) => accessor.get(IWorkpsaceExtensionsConfigService).toggleRecommendation(id)
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.addToWorkspaceRecommendations',
-					title: { value: localize('workbench.extensions.action.addToWorkspaceRecommendations', "Add Extension to Workspace Recommendations"), original: `Add Extension to Workspace Recommendations` },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
-					},
-				});
-			}
-
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.addToWorkspaceRecommendations',
+			title: { value: localize('workbench.extensions.action.addToWorkspaceRecommendations', "Add Extension to Workspace Recommendations"), original: `Add Extension to Workspace Recommendations` },
+			category: localize('extensions', "Extensions"),
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
+			},
 			async run(accessor: ServicesAccessor): Promise<any> {
 				const editorService = accessor.get(IEditorService);
 				const workpsaceExtensionsConfigService = accessor.get(IWorkpsaceExtensionsConfigService);
@@ -1060,39 +1153,25 @@ class ExtensionsContributions implements IWorkbenchContribution {
 			}
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.addToWorkspaceFolderRecommendations',
-					title: { value: localize('workbench.extensions.action.addToWorkspaceFolderRecommendations', "Add Extension to Workspace Folder Recommendations"), original: `Add Extension to Workspace Folder Recommendations` },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
-					},
-				});
-			}
-
-			async run(accessor: ServicesAccessor): Promise<any> {
-				return accessor.get(ICommandService).executeCommand('workbench.extensions.action.addToWorkspaceRecommendations');
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.addToWorkspaceFolderRecommendations',
+			title: { value: localize('workbench.extensions.action.addToWorkspaceFolderRecommendations', "Add Extension to Workspace Folder Recommendations"), original: `Add Extension to Workspace Folder Recommendations` },
+			category: localize('extensions', "Extensions"),
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
+			},
+			run: () => this.commandService.executeCommand('workbench.extensions.action.addToWorkspaceRecommendations')
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.addToWorkspaceIgnoredRecommendations',
-					title: { value: localize('workbench.extensions.action.addToWorkspaceIgnoredRecommendations', "Add Extension to Workspace Ignored Recommendations"), original: `Add Extension to Workspace Ignored Recommendations` },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
-					},
-				});
-			}
-
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.addToWorkspaceIgnoredRecommendations',
+			title: { value: localize('workbench.extensions.action.addToWorkspaceIgnoredRecommendations', "Add Extension to Workspace Ignored Recommendations"), original: `Add Extension to Workspace Ignored Recommendations` },
+			category: localize('extensions', "Extensions"),
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
+			},
 			async run(accessor: ServicesAccessor): Promise<any> {
 				const editorService = accessor.get(IEditorService);
 				const workpsaceExtensionsConfigService = accessor.get(IWorkpsaceExtensionsConfigService);
@@ -1108,63 +1187,65 @@ class ExtensionsContributions implements IWorkbenchContribution {
 			}
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations',
-					title: { value: localize('workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations', "Add Extension to Workspace Folder Ignored Recommendations"), original: `Add Extension to Workspace Folder Ignored Recommendations` },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
-					},
-				});
-			}
-
-			run(accessor: ServicesAccessor): Promise<any> {
-				return accessor.get(ICommandService).executeCommand('workbench.extensions.action.addToWorkspaceIgnoredRecommendations');
-			}
+		this.registerExtensionAction({
+			id: 'workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations',
+			title: { value: localize('workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations', "Add Extension to Workspace Folder Ignored Recommendations"), original: `Add Extension to Workspace Folder Ignored Recommendations` },
+			category: localize('extensions', "Extensions"),
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
+			},
+			run: () => this.commandService.executeCommand('workbench.extensions.action.addToWorkspaceIgnoredRecommendations')
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: ConfigureWorkspaceRecommendedExtensionsAction.ID,
-					title: { value: ConfigureWorkspaceRecommendedExtensionsAction.LABEL, original: 'Configure Recommended Extensions (Workspace)' },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: WorkbenchStateContext.isEqualTo('workspace'),
-					},
-				});
-			}
-
-			run(accessor: ServicesAccessor): Promise<any> {
-				return accessor.get(IInstantiationService).createInstance(ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction.ID, ConfigureWorkspaceRecommendedExtensionsAction.LABEL).run();
-			}
+		this.registerExtensionAction({
+			id: ConfigureWorkspaceRecommendedExtensionsAction.ID,
+			title: { value: ConfigureWorkspaceRecommendedExtensionsAction.LABEL, original: 'Configure Recommended Extensions (Workspace)' },
+			category: localize('extensions', "Extensions"),
+			menu: {
+				id: MenuId.CommandPalette,
+				when: WorkbenchStateContext.isEqualTo('workspace'),
+			},
+			run: () => runAction(this.instantiationService.createInstance(ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction.ID, ConfigureWorkspaceRecommendedExtensionsAction.LABEL))
 		});
 
-		registerAction2(class extends Action2 {
-
-			constructor() {
-				super({
-					id: ConfigureWorkspaceFolderRecommendedExtensionsAction.ID,
-					title: { value: ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL, original: 'Configure Recommended Extensions (Workspace Folder)' },
-					category: localize('extensions', "Extensions"),
-					menu: {
-						id: MenuId.CommandPalette,
-						when: WorkbenchStateContext.notEqualsTo('empty'),
-					},
-				});
-			}
-
-			run(accessor: ServicesAccessor): Promise<any> {
-				return accessor.get(IInstantiationService).createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL).run();
-			}
-		});
 	}
+
+	private registerExtensionAction(extensionActionOptions: IExtensionActionOptions): IDisposable {
+		const menus = extensionActionOptions.menu ? isArray(extensionActionOptions.menu) ? extensionActionOptions.menu : [extensionActionOptions.menu] : [];
+		let menusWithOutTitles: ({ id: MenuId } & Omit<IMenuItem, 'command'>)[] = [];
+		const menusWithTitles: { id: MenuId, item: IMenuItem }[] = [];
+		if (extensionActionOptions.menuTitles) {
+			for (let index = 0; index < menus.length; index++) {
+				const menu = menus[index];
+				const menuTitle = extensionActionOptions.menuTitles[menu.id.id];
+				if (menuTitle) {
+					menusWithTitles.push({ id: menu.id, item: { ...menu, command: { id: extensionActionOptions.id, title: menuTitle } } });
+				} else {
+					menusWithOutTitles.push(menu);
+				}
+			}
+		} else {
+			menusWithOutTitles = menus;
+		}
+		const disposables = new DisposableStore();
+		disposables.add(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					...extensionActionOptions,
+					menu: menusWithOutTitles
+				});
+			}
+			run(accessor: ServicesAccessor, ...args: any[]): Promise<any> {
+				return extensionActionOptions.run(accessor, ...args);
+			}
+		}));
+		if (menusWithTitles.length) {
+			disposables.add(MenuRegistry.appendMenuItems(menusWithTitles));
+		}
+		return disposables;
+	}
+
 }
 
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
@@ -1175,7 +1256,6 @@ workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Starting);
 workbenchRegistry.registerWorkbenchContribution(ExtensionActivationProgress, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ExtensionDependencyChecker, LifecyclePhase.Eventually);
-workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInstaller, LifecyclePhase.Eventually);
 
 // Running Extensions
 const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExtensions.WorkbenchActions);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 36dbf7c75..f12e706e8 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -12,7 +12,7 @@ import { Event } from 'vs/base/common/event';
 import * as json from 'vs/base/common/json';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { dispose } from 'vs/base/common/lifecycle';
-import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewPaneContainer, AutoUpdateConfigurationKey, IExtensionContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
+import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewPaneContainer, IExtensionContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from 'vs/workbench/contrib/extensions/common/extensions';
 import { ExtensionsConfigurationInitialContent } from 'vs/workbench/contrib/extensions/common/extensionsFileTemplate';
 import { IGalleryExtension, IExtensionGalleryService, INSTALL_ERROR_MALICIOUS, INSTALL_ERROR_INCOMPATIBLE, IGalleryExtensionVersion, ILocalExtension, INSTALL_ERROR_NOT_SUPPORTED, InstallOptions, InstallOperation } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensioManagementService, IWebExtensionsScannerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
@@ -20,9 +20,7 @@ import { ExtensionRecommendationReason, IExtensionIgnoredRecommendationsService,
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, ExtensionIdentifier, IExtensionDescription, IExtensionManifest, isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ShowViewletAction } from 'vs/workbench/browser/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 import { IFileService, IFileContent } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
@@ -40,12 +38,9 @@ import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
 import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IQuickPickItem, IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { coalesce } from 'vs/base/common/arrays';
 import { IWorkbenchThemeService, IWorkbenchTheme, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
@@ -53,9 +48,8 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { prefersExecuteOnUI, prefersExecuteOnWorkspace, canExecuteOnUI, canExecuteOnWorkspace, prefersExecuteOnWeb } from 'vs/workbench/services/extensions/common/extensionsUtil';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
-import { IViewsService } from 'vs/workbench/common/views';
 import { IActionViewItemOptions, ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { EXTENSIONS_CONFIG, IExtensionsConfigContent } from 'vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
 import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
@@ -64,7 +58,7 @@ import { ActionWithDropdownActionViewItem, IActionWithDropdownActionViewItemOpti
 import { IContextMenuProvider } from 'vs/base/browser/contextmenu';
 import { ILogService } from 'vs/platform/log/common/log';
 import * as Constants from 'vs/workbench/contrib/logs/common/logConstants';
-import { clearSearchResultsIcon, infoIcon, manageExtensionIcon, refreshIcon, syncEnabledIcon, syncIgnoredIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { infoIcon, manageExtensionIcon, syncEnabledIcon, syncIgnoredIcon, warningIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
 
 function getRelativeDateLabel(date: Date): string {
 	const delta = new Date().getTime() - date.getTime();
@@ -100,17 +94,18 @@ function getRelativeDateLabel(date: Date): string {
 	return '';
 }
 
-class PromptExtensionInstallFailureAction extends Action {
+export class PromptExtensionInstallFailureAction extends Action {
 
 	constructor(
 		private readonly extension: IExtension,
+		private readonly version: string,
 		private readonly installOperation: InstallOperation,
 		private readonly error: Error,
 		@IProductService private readonly productService: IProductService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IDialogService private readonly dialogService: IDialogService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ICommandService private readonly commandService: ICommandService,
 		@ILogService private readonly logService: ILogService,
 	) {
 		super('extension.promptExtensionInstallFailure');
@@ -134,17 +129,13 @@ class PromptExtensionInstallFailureAction extends Action {
 		if (this.extension.gallery && this.productService.extensionsGallery) {
 			promptChoices.push({
 				label: localize('download', "Try Downloading Manually..."),
-				run: () => this.openerService.open(URI.parse(`${this.productService.extensionsGallery!.serviceUrl}/publishers/${this.extension.publisher}/vsextensions/${this.extension.name}/${this.extension.version}/vspackage`)).then(() => {
+				run: () => this.openerService.open(URI.parse(`${this.productService.extensionsGallery!.serviceUrl}/publishers/${this.extension.publisher}/vsextensions/${this.extension.name}/${this.version}/vspackage`)).then(() => {
 					this.notificationService.prompt(
 						Severity.Info,
 						localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', this.extension.identifier.id),
 						[{
-							label: InstallVSIXAction.LABEL,
-							run: () => {
-								const action = this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
-								action.run();
-								action.dispose();
-							}
+							label: localize('installVSIX', "Install from VSIX..."),
+							run: () => this.commandService.executeCommand(SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID)
 						}]
 					);
 				})
@@ -287,7 +278,7 @@ export abstract class AbstractInstallAction extends ExtensionAction {
 		try {
 			return await this.extensionsWorkbenchService.install(extension, this.getInstallOptions());
 		} catch (error) {
-			await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Install, error).run();
+			await this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, error).run();
 			return undefined;
 		}
 	}
@@ -487,7 +478,7 @@ export abstract class InstallInOtherServerAction extends ExtensionAction {
 			|| !this.extension.local
 			|| this.extension.state !== ExtensionState.Installed
 			|| this.extension.type !== ExtensionType.User
-			|| this.extension.enablementState === EnablementState.DisabledByEnvironemt
+			|| this.extension.enablementState === EnablementState.DisabledByEnvironment
 		) {
 			return false;
 		}
@@ -715,7 +706,7 @@ export class UpdateAction extends ExtensionAction {
 			await this.extensionsWorkbenchService.install(extension);
 			alert(localize('updateExtensionComplete', "Updating extension {0} to version {1} completed.", extension.displayName, extension.latestVersion));
 		} catch (err) {
-			this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Update, err).run();
+			this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Update, err).run();
 		}
 	}
 
@@ -775,7 +766,8 @@ export class ExtensionActionWithDropdownActionViewItem extends ActionWithDropdow
 
 	updateClass(): void {
 		super.updateClass();
-		if (this.dropdownMenuActionViewItem && this.dropdownMenuActionViewItem.element) {
+		if (this.element && this.dropdownMenuActionViewItem && this.dropdownMenuActionViewItem.element) {
+			this.element.classList.toggle('empty', (<ActionWithDropDownAction>this._action).menuActions.length === 0);
 			this.dropdownMenuActionViewItem.element.classList.toggle('hide', (<ActionWithDropDownAction>this._action).menuActions.length === 0);
 		}
 	}
@@ -1063,7 +1055,7 @@ export class InstallAnotherVersionAction extends ExtensionAction {
 							await this.extensionsWorkbenchService.installVersion(this.extension!, pick.id);
 						}
 					} catch (error) {
-						this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension!, InstallOperation.Install, error).run();
+						this.instantiationService.createInstance(PromptExtensionInstallFailureAction, this.extension!, pick.latest ? this.extension!.latestVersion : pick.id, InstallOperation.Install, error).run();
 					}
 				}
 				return null;
@@ -1246,140 +1238,6 @@ export class DisableDropDownAction extends ActionWithDropDownAction {
 
 }
 
-export class CheckForUpdatesAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.checkForUpdates';
-	static readonly LABEL = localize('checkForUpdates', "Check for Extension Updates");
-
-	constructor(
-		id = CheckForUpdatesAction.ID,
-		label = CheckForUpdatesAction.LABEL,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@IViewletService private readonly viewletService: IViewletService,
-		@INotificationService private readonly notificationService: INotificationService
-	) {
-		super(id, label, '', true);
-	}
-
-	private checkUpdatesAndNotify(): void {
-		const outdated = this.extensionsWorkbenchService.outdated;
-		if (!outdated.length) {
-			this.notificationService.info(localize('noUpdatesAvailable', "All extensions are up to date."));
-			return;
-		}
-
-		let msgAvailableExtensions = outdated.length === 1 ? localize('singleUpdateAvailable', "An extension update is available.") : localize('updatesAvailable', "{0} extension updates are available.", outdated.length);
-
-		const disabledExtensionsCount = outdated.filter(ext => ext.local && !this.extensionEnablementService.isEnabled(ext.local)).length;
-		if (disabledExtensionsCount) {
-			if (outdated.length === 1) {
-				msgAvailableExtensions = localize('singleDisabledUpdateAvailable', "An update to an extension which is disabled is available.");
-			} else if (disabledExtensionsCount === 1) {
-				msgAvailableExtensions = localize('updatesAvailableOneDisabled', "{0} extension updates are available. One of them is for a disabled extension.", outdated.length);
-			} else if (disabledExtensionsCount === outdated.length) {
-				msgAvailableExtensions = localize('updatesAvailableAllDisabled', "{0} extension updates are available. All of them are for disabled extensions.", outdated.length);
-			} else {
-				msgAvailableExtensions = localize('updatesAvailableIncludingDisabled', "{0} extension updates are available. {1} of them are for disabled extensions.", outdated.length, disabledExtensionsCount);
-			}
-		}
-
-		this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => viewlet.search(''));
-
-		this.notificationService.info(msgAvailableExtensions);
-	}
-
-	run(): Promise<any> {
-		return this.extensionsWorkbenchService.checkForUpdates().then(() => this.checkUpdatesAndNotify());
-	}
-}
-
-export class ToggleAutoUpdateAction extends Action {
-
-	constructor(
-		id: string,
-		label: string,
-		private autoUpdateValue: boolean,
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) {
-		super(id, label, '', true);
-		this.updateEnablement();
-		configurationService.onDidChangeConfiguration(() => this.updateEnablement());
-	}
-
-	private updateEnablement(): void {
-		this.enabled = this.configurationService.getValue(AutoUpdateConfigurationKey) !== this.autoUpdateValue;
-	}
-
-	run(): Promise<any> {
-		return this.configurationService.updateValue(AutoUpdateConfigurationKey, this.autoUpdateValue);
-	}
-}
-
-export class EnableAutoUpdateAction extends ToggleAutoUpdateAction {
-
-	static readonly ID = 'workbench.extensions.action.enableAutoUpdate';
-	static readonly LABEL = localize('enableAutoUpdate', "Enable Auto Updating Extensions");
-
-	constructor(
-		id = EnableAutoUpdateAction.ID,
-		label = EnableAutoUpdateAction.LABEL,
-		@IConfigurationService configurationService: IConfigurationService
-	) {
-		super(id, label, true, configurationService);
-	}
-}
-
-export class DisableAutoUpdateAction extends ToggleAutoUpdateAction {
-
-	static readonly ID = 'workbench.extensions.action.disableAutoUpdate';
-	static readonly LABEL = localize('disableAutoUpdate', "Disable Auto Updating Extensions");
-
-	constructor(
-		id = EnableAutoUpdateAction.ID,
-		label = EnableAutoUpdateAction.LABEL,
-		@IConfigurationService configurationService: IConfigurationService
-	) {
-		super(id, label, false, configurationService);
-	}
-}
-
-export class UpdateAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.updateAllExtensions';
-	static readonly LABEL = localize('updateAll', "Update All Extensions");
-
-	constructor(
-		id: string, label: string, isPrimary: boolean,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super(id, label, '', false);
-
-		if (isPrimary) {
-			this._register(this.extensionsWorkbenchService.onChange(() => this._onDidChange.fire({ enabled: this.enabled })));
-		}
-	}
-
-	get enabled(): boolean {
-		return this.extensionsWorkbenchService.outdated.length > 0;
-	}
-
-	run(): Promise<any> {
-		return Promise.all(this.extensionsWorkbenchService.outdated.map(e => this.install(e)));
-	}
-
-	private async install(extension: IExtension): Promise<void> {
-		try {
-			await this.extensionsWorkbenchService.install(extension);
-		} catch (err) {
-			this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Update, err).run();
-		}
-	}
-}
-
 export class ReloadAction extends ExtensionAction {
 
 	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} reload`;
@@ -1722,296 +1580,6 @@ export class SetProductIconThemeAction extends ExtensionAction {
 	}
 }
 
-export class OpenExtensionsViewletAction extends ShowViewletAction {
-
-	static ID = VIEWLET_ID;
-	static LABEL = localize('toggleExtensionsViewlet', "Show Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService viewletService: IViewletService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService
-	) {
-		super(id, label, VIEWLET_ID, viewletService, editorGroupService, layoutService);
-	}
-}
-
-export class InstallExtensionsAction extends OpenExtensionsViewletAction {
-	static ID = 'workbench.extensions.action.installExtensions';
-	static LABEL = localize('installExtensions', "Install Extensions");
-}
-
-export class ShowEnabledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showEnabledExtensions';
-	static readonly LABEL = localize('showEnabledExtensions', "Show Enabled Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@enabled ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowInstalledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showInstalledExtensions';
-	static readonly LABEL = localize('showInstalledExtensions', "Show Installed Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@installed ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowDisabledExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showDisabledExtensions';
-	static readonly LABEL = localize('showDisabledExtensions', "Show Disabled Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, 'null', true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@disabled ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ClearExtensionsSearchResultsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.clearExtensionsSearchResults';
-	static readonly LABEL = localize('clearExtensionsSearchResults', "Clear Extensions Search Results");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, ThemeIcon.asClassName(clearSearchResultsIcon), true);
-	}
-
-	async run(): Promise<void> {
-		const viewPaneContainer = this.viewsService.getActiveViewPaneContainerWithId(VIEWLET_ID);
-		if (viewPaneContainer) {
-			const extensionsViewPaneContainer = viewPaneContainer as IExtensionsViewPaneContainer;
-			extensionsViewPaneContainer.search('');
-			extensionsViewPaneContainer.focus();
-		}
-	}
-}
-
-export class ClearExtensionsInputAction extends ClearExtensionsSearchResultsAction {
-
-	constructor(
-		id: string,
-		label: string,
-		onSearchChange: Event<string>,
-		getValue: () => string,
-		@IViewsService viewsService: IViewsService
-	) {
-		super(id, label, viewsService);
-		this.onSearchChange(getValue());
-		this._register(onSearchChange(this.onSearchChange, this));
-	}
-
-	private onSearchChange(value: string): void {
-		this.enabled = !!value;
-	}
-}
-
-export class RefreshExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.refreshExtension';
-	static readonly LABEL = localize('refreshExtension', "Refresh");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, ThemeIcon.asClassName(refreshIcon), true);
-	}
-
-	async run(): Promise<void> {
-		const viewPaneContainer = this.viewsService.getActiveViewPaneContainerWithId(VIEWLET_ID);
-		if (viewPaneContainer) {
-			const extensionsViewPaneContainer = viewPaneContainer as IExtensionsViewPaneContainer;
-			return extensionsViewPaneContainer.refresh();
-		}
-	}
-}
-
-export class ShowBuiltInExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.listBuiltInExtensions';
-	static readonly LABEL = localize('showBuiltInExtensions', "Show Built-in Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@builtin ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowOutdatedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.listOutdatedExtensions';
-	static readonly LABEL = localize('showOutdatedExtensions', "Show Outdated Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@outdated ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowPopularExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showPopularExtensions';
-	static readonly LABEL = localize('showPopularExtensions', "Show Popular Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@popular ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class PredefinedExtensionFilterAction extends Action {
-
-	constructor(
-		id: string,
-		label: string,
-		private readonly filter: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search(`${this.filter} `);
-				viewlet.focus();
-			});
-	}
-}
-
-export class RecentlyPublishedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.recentlyPublishedExtensions';
-	static readonly LABEL = localize('recentlyPublishedExtensions', "Recently Published Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@sort:publishedDate ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowRecommendedExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showRecommendedExtensions';
-	static readonly LABEL = localize('showRecommendedExtensions', "Show Recommended Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@recommended ');
-				viewlet.focus();
-			});
-	}
-}
-
 export class ShowRecommendedExtensionAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.showRecommendedExtension';
@@ -2075,7 +1643,7 @@ export class InstallRecommendedExtensionAction extends Action {
 			try {
 				await this.extensionWorkbenchService.install(extension);
 			} catch (err) {
-				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, InstallOperation.Install, err).run();
+				this.instantiationService.createInstance(PromptExtensionInstallFailureAction, extension, extension.latestVersion, InstallOperation.Install, err).run();
 			}
 		}
 	}
@@ -2127,68 +1695,6 @@ export class UndoIgnoreExtensionRecommendationAction extends Action {
 	}
 }
 
-export class ShowRecommendedKeymapExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showRecommendedKeymapExtensions';
-	static readonly LABEL = localize('showRecommendedKeymapExtensionsShort', "Keymaps");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@recommended:keymaps ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class ShowLanguageExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.showLanguageExtensions';
-	static readonly LABEL = localize('showLanguageExtensionsShort', "Language Extensions");
-
-	constructor(
-		id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search('@category:"programming languages" @sort:installs ');
-				viewlet.focus();
-			});
-	}
-}
-
-export class SearchCategoryAction extends Action {
-
-	constructor(
-		id: string,
-		label: string,
-		private readonly category: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-	}
-
-	run(): Promise<void> {
-		return new SearchExtensionsAction(`@category:"${this.category.toLowerCase()}"`, this.viewletService).run();
-	}
-}
-
 export class SearchExtensionsAction extends Action {
 
 	constructor(
@@ -2205,46 +1711,6 @@ export class SearchExtensionsAction extends Action {
 	}
 }
 
-export class ChangeSortAction extends Action {
-
-	private query: Query;
-
-	constructor(
-		id: string,
-		label: string,
-		onSearchChange: Event<string>,
-		private sortBy: string,
-		@IViewletService private readonly viewletService: IViewletService
-	) {
-		super(id, label, undefined, true);
-
-		if (sortBy === undefined) {
-			throw new Error('bad arguments');
-		}
-
-		this.query = Query.parse('');
-		this.enabled = false;
-		this.checked = false;
-		this._register(onSearchChange(this.onSearchChange, this));
-	}
-
-	private onSearchChange(value: string): void {
-		const query = Query.parse(value);
-		this.query = new Query(query.value, this.sortBy || query.sortBy, query.groupBy);
-		this.enabled = !!value && this.query.isValid();
-		this.checked = this.enabled && this.query.equals(query);
-	}
-
-	run(): Promise<void> {
-		return this.viewletService.openViewlet(VIEWLET_ID, true)
-			.then(viewlet => viewlet?.getViewPaneContainer() as IExtensionsViewPaneContainer)
-			.then(viewlet => {
-				viewlet.search(this.query.toString());
-				viewlet.focus();
-			});
-	}
-}
-
 export abstract class AbstractConfigureRecommendedExtensionsAction extends Action {
 
 	constructor(
@@ -2383,12 +1849,6 @@ export class ConfigureWorkspaceFolderRecommendedExtensionsAction extends Abstrac
 		@ICommandService private readonly commandService: ICommandService
 	) {
 		super(id, label, contextService, fileService, textFileService, editorService, jsonEditingService, textModelResolverService);
-		this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.update(), this));
-		this.update();
-	}
-
-	private update(): void {
-		this.enabled = this.contextService.getWorkspace().folders.length > 0;
 	}
 
 	public run(): Promise<any> {
@@ -2735,156 +2195,6 @@ export class SystemDisabledWarningAction extends ExtensionAction {
 	}
 }
 
-export class DisableAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.disableAll';
-	static readonly LABEL = localize('disableAll', "Disable All Installed Extensions");
-
-	constructor(
-		id: string, label: string, isPrimary: boolean,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
-	) {
-		super(id, label);
-		if (isPrimary) {
-			this._register(this.extensionsWorkbenchService.onChange(() => this._onDidChange.fire({ enabled: this.enabled })));
-		}
-	}
-
-	private getExtensionsToDisable(): IExtension[] {
-		return this.extensionsWorkbenchService.local.filter(e => !e.isBuiltin && !!e.local && this.extensionEnablementService.isEnabled(e.local) && this.extensionEnablementService.canChangeEnablement(e.local));
-	}
-
-	get enabled(): boolean {
-		return this.getExtensionsToDisable().length > 0;
-	}
-
-	run(): Promise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.getExtensionsToDisable(), EnablementState.DisabledGlobally);
-	}
-}
-
-export class DisableAllWorkspaceAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.disableAllWorkspace';
-	static readonly LABEL = localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace");
-
-	constructor(
-		id: string, label: string, isPrimary: boolean,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
-	) {
-		super(id, label);
-		if (isPrimary) {
-			this._register(Event.any(this.workspaceContextService.onDidChangeWorkbenchState, this.extensionsWorkbenchService.onChange)(() => this._onDidChange.fire({ enabled: this.enabled })));
-		}
-	}
-
-	private getExtensionsToDisable(): IExtension[] {
-		return this.extensionsWorkbenchService.local.filter(e => !e.isBuiltin && !!e.local && this.extensionEnablementService.isEnabled(e.local) && this.extensionEnablementService.canChangeEnablement(e.local));
-	}
-
-	get enabled(): boolean {
-		return this.getExtensionsToDisable().length > 0;
-	}
-
-	run(): Promise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.getExtensionsToDisable(), EnablementState.DisabledWorkspace);
-	}
-}
-
-export class EnableAllAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.enableAll';
-	static readonly LABEL = localize('enableAll', "Enable All Extensions");
-
-	constructor(
-		id: string, label: string, isPrimary: boolean,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
-	) {
-		super(id, label);
-		if (isPrimary) {
-			this._register(this.extensionsWorkbenchService.onChange(() => this._onDidChange.fire({ enabled: this.enabled })));
-		}
-	}
-
-	private getExtensionsToEnable(): IExtension[] {
-		return this.extensionsWorkbenchService.local.filter(e => !!e.local && this.extensionEnablementService.canChangeEnablement(e.local) && !this.extensionEnablementService.isEnabled(e.local));
-	}
-
-	get enabled(): boolean {
-		return this.getExtensionsToEnable().length > 0;
-	}
-
-	run(): Promise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.getExtensionsToEnable(), EnablementState.EnabledGlobally);
-	}
-}
-
-export class EnableAllWorkspaceAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.enableAllWorkspace';
-	static readonly LABEL = localize('enableAllWorkspace', "Enable All Extensions for this Workspace");
-
-	constructor(
-		id: string, label: string, isPrimary: boolean,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
-	) {
-		super(id, label);
-		if (isPrimary) {
-			this._register(Event.any(this.workspaceContextService.onDidChangeWorkbenchState, this.extensionsWorkbenchService.onChange)(() => this._onDidChange.fire({ enabled: this.enabled })));
-		}
-	}
-
-	private getExtensionsToEnable(): IExtension[] {
-		return this.extensionsWorkbenchService.local.filter(e => !!e.local && this.extensionEnablementService.canChangeEnablement(e.local) && !this.extensionEnablementService.isEnabled(e.local));
-	}
-
-	get enabled(): boolean {
-		return this.getExtensionsToEnable().length > 0;
-	}
-
-	run(): Promise<any> {
-		return this.extensionsWorkbenchService.setEnablement(this.getExtensionsToEnable(), EnablementState.EnabledWorkspace);
-	}
-}
-
-export class InstallVSIXAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.installVSIX';
-	static readonly LABEL = localize('installVSIX', "Install from VSIX...");
-
-	constructor(
-		id = InstallVSIXAction.ID,
-		label = InstallVSIXAction.LABEL,
-		@IFileDialogService private readonly fileDialogService: IFileDialogService,
-		@ICommandService private readonly commandService: ICommandService
-	) {
-		super(id, label, 'extension-action install-vsix', true);
-	}
-
-	async run(): Promise<void> {
-		const vsixPaths = await this.fileDialogService.showOpenDialog({
-			title: localize('installFromVSIX', "Install from VSIX"),
-			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
-			canSelectFiles: true,
-			canSelectMany: true,
-			openLabel: mnemonicButtonLabel(localize({ key: 'installButton', comment: ['&& denotes a mnemonic'] }, "&&Install"))
-		});
-
-		if (!vsixPaths) {
-			return;
-		}
-
-		// Install extension(s), display notification(s), display @installed extensions
-		await this.commandService.executeCommand(INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, vsixPaths);
-	}
-}
-
 export class ReinstallAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.reinstall';
@@ -2929,7 +2239,7 @@ export class ReinstallAction extends Action {
 	}
 
 	private reinstallExtension(extension: IExtension): Promise<void> {
-		return this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL).run()
+		return this.instantiationService.createInstance(SearchExtensionsAction, '@installed ').run()
 			.then(() => {
 				return this.extensionsWorkbenchService.reinstall(extension)
 					.then(extension => {
@@ -3015,7 +2325,7 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
 	}
 
 	private install(extension: IExtension, version: string): Promise<void> {
-		return this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL).run()
+		return this.instantiationService.createInstance(SearchExtensionsAction, '@installed ').run()
 			.then(() => {
 				return this.extensionsWorkbenchService.installVersion(extension, version)
 					.then(extension => {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index afe9ebc8a..9858def3b 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -9,22 +9,17 @@ import { timeout, Delayer } from 'vs/base/common/async';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { IAction, Action, Separator, SubmenuAction } from 'vs/base/common/actions';
+import { Event } from 'vs/base/common/event';
+import { Action } from 'vs/base/common/actions';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { append, $, Dimension, hide, show } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, AutoUpdateConfigurationKey, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID } from '../common/extensions';
-import {
-	ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, CheckForUpdatesAction, DisableAllAction, EnableAllAction,
-	EnableAutoUpdateAction, DisableAutoUpdateAction, ShowBuiltInExtensionsAction, InstallVSIXAction, SearchCategoryAction,
-	RecentlyPublishedExtensionsAction, ShowInstalledExtensionsAction, ShowOutdatedExtensionsAction, ShowDisabledExtensionsAction,
-	ShowEnabledExtensionsAction, PredefinedExtensionFilterAction, RefreshExtensionsAction
-} from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, DefaultViewsContext, ExtensionsSortByContext, WORKSPACE_RECOMMENDATIONS_VIEW_ID } from '../common/extensions';
+import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, BuiltInFeatureExtensionsView, BuiltInThemesExtensionsView, BuiltInProgrammingLanguageExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView } from 'vs/workbench/contrib/extensions/browser/extensionsViews';
@@ -32,24 +27,25 @@ import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import Severity from 'vs/base/common/severity';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewDescriptorService, IAddedViewDescriptorRef } from 'vs/workbench/common/views';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ViewPane, ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 import { SuggestEnabledInput, attachSuggestEnabledInputBoxStyler } from 'vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { createErrorWithActions } from 'vs/base/common/errorsWithActions';
-import { ExtensionType, EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
+import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { MementoObject } from 'vs/workbench/common/memento';
@@ -62,10 +58,9 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { WorkbenchStateContext } from 'vs/workbench/browser/contextkeys';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { isWeb } from 'vs/base/common/platform';
-import { memoize } from 'vs/base/common/decorators';
-import { filterIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { installLocalInRemoteIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
 
-const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
 const SearchIntalledExtensionsContext = new RawContextKey<boolean>('searchInstalledExtensions', false);
 const SearchOutdatedExtensionsContext = new RawContextKey<boolean>('searchOutdatedExtensions', false);
@@ -155,7 +150,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 					get name() { return getInstalledViewName(); },
 					weight: 100,
 					order: 1,
-					when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.not('hasInstalledExtensions')),
+					when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.not('hasInstalledExtensions')),
 					/* Empty installed extensions view shall have fixed height */
 					ctorDescriptor: new SyncDescriptor(ServerInstalledExtensionsView, [{ server, fixedHeight: true, onDidChangeTitle }]),
 					/* Empty installed extensions views shall not be allowed to hidden */
@@ -168,11 +163,49 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 				get name() { return getInstalledViewName(); },
 				weight: 100,
 				order: 1,
-				when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), isWebServer ? ContextKeyExpr.has('hasInstalledWebExtensions') : ContextKeyExpr.has('hasInstalledExtensions')),
+				when: ContextKeyExpr.and(DefaultViewsContext, isWebServer ? ContextKeyExpr.has('hasInstalledWebExtensions') : ContextKeyExpr.has('hasInstalledExtensions')),
 				ctorDescriptor: new SyncDescriptor(ServerInstalledExtensionsView, [{ server, onDidChangeTitle }]),
 				/* Installed extensions views shall not be allowed to hidden when there are more than one server */
 				canToggleVisibility: servers.length === 1
 			});
+
+			if (server === this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManagementServerService.localExtensionManagementServer) {
+				registerAction2(class InstallLocalExtensionsInRemoteAction2 extends Action2 {
+					constructor() {
+						super({
+							id: 'workbench.extensions.installLocalExtensions',
+							get title() { return localize('select and install local extensions', "Install Local Extensions in '{0}'...", server.label); },
+							category: localize({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote"),
+							icon: installLocalInRemoteIcon,
+							f1: true,
+							menu: {
+								id: MenuId.ViewTitle,
+								when: ContextKeyEqualsExpr.create('view', id),
+								group: 'navigation',
+							}
+						});
+					}
+					run(accessor: ServicesAccessor): Promise<void> {
+						return accessor.get(IInstantiationService).createInstance(InstallLocalExtensionsInRemoteAction).run();
+					}
+				});
+			}
+		}
+
+		if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
+			registerAction2(class InstallRemoteExtensionsInLocalAction2 extends Action2 {
+				constructor() {
+					super({
+						id: 'workbench.extensions.actions.installLocalExtensionsInRemote',
+						title: { value: localize('install remote in local', "Install Remote Extensions Locally..."), original: 'Install Remote Extensions Locally...' },
+						category: localize({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote"),
+						f1: true
+					});
+				}
+				run(accessor: ServicesAccessor): Promise<void> {
+					return accessor.get(IInstantiationService).createInstance(InstallRemoteExtensionsInLocalAction, 'workbench.extensions.actions.installLocalExtensionsInRemote').run();
+				}
+			});
 		}
 
 		/*
@@ -184,7 +217,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			id: 'workbench.views.extensions.popular',
 			name: localize('popularExtensions', "Popular"),
 			ctorDescriptor: new SyncDescriptor(ExtensionsListView, [{}]),
-			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.not('hasInstalledExtensions')),
+			when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.not('hasInstalledExtensions')),
 			weight: 60,
 			order: 2,
 			canToggleVisibility: false
@@ -199,7 +232,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 			id: 'extensions.recommendedList',
 			name: localize('recommendedExtensions', "Recommended"),
 			ctorDescriptor: new SyncDescriptor(DefaultRecommendedExtensionsView, [{}]),
-			when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.not('config.extensions.showRecommendationsOnlyOnDemand')),
+			when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.not('config.extensions.showRecommendationsOnlyOnDemand')),
 			weight: 40,
 			order: 3,
 			canToggleVisibility: true
@@ -215,7 +248,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 				id: 'workbench.views.extensions.enabled',
 				name: localize('enabledExtensions', "Enabled"),
 				ctorDescriptor: new SyncDescriptor(EnabledExtensionsView, [{}]),
-				when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions')),
+				when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.has('hasInstalledExtensions')),
 				hideByDefault: true,
 				weight: 40,
 				order: 4,
@@ -230,7 +263,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 				id: 'workbench.views.extensions.disabled',
 				name: localize('disabledExtensions', "Disabled"),
 				ctorDescriptor: new SyncDescriptor(DisabledExtensionsView, [{}]),
-				when: ContextKeyExpr.and(ContextKeyExpr.has('defaultExtensionViews'), ContextKeyExpr.has('hasInstalledExtensions')),
+				when: ContextKeyExpr.and(DefaultViewsContext, ContextKeyExpr.has('hasInstalledExtensions')),
 				hideByDefault: true,
 				weight: 10,
 				order: 5,
@@ -312,7 +345,7 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 		const viewDescriptors: IViewDescriptor[] = [];
 
 		viewDescriptors.push({
-			id: 'workbench.views.extensions.workspaceRecommendations',
+			id: WORKSPACE_RECOMMENDATIONS_VIEW_ID,
 			name: localize('workspaceRecommendedExtensions', "Workspace Recommendations"),
 			ctorDescriptor: new SyncDescriptor(WorkspaceRecommendedExtensionsView, [{}]),
 			when: ContextKeyExpr.and(ContextKeyExpr.has('recommendedExtensions'), WorkbenchStateContext.notEqualsTo('empty')),
@@ -361,9 +394,8 @@ export class ExtensionsViewletViewsContribution implements IWorkbenchContributio
 
 export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IExtensionsViewPaneContainer {
 
-	private readonly _onSearchChange: Emitter<string> = this._register(new Emitter<string>());
-	private readonly onSearchChange: Event<string> = this._onSearchChange.event;
 	private defaultViewsContextKey: IContextKey<boolean>;
+	private sortByContextKey: IContextKey<string>;
 	private searchMarketplaceExtensionsContextKey: IContextKey<boolean>;
 	private searchInstalledExtensionsContextKey: IContextKey<boolean>;
 	private searchOutdatedExtensionsContextKey: IContextKey<boolean>;
@@ -379,8 +411,6 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 	private root: HTMLElement | undefined;
 	private searchBox: SuggestEnabledInput | undefined;
 	private readonly searchViewletState: MementoObject;
-	private readonly sortActions: ChangeSortAction[];
-	private secondaryActions: IAction[] | undefined = undefined;
 
 	constructor(
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -390,7 +420,6 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IViewletService private readonly viewletService: IViewletService,
 		@IThemeService themeService: IThemeService,
@@ -408,6 +437,7 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 
 		this.searchDelayer = new Delayer(500);
 		this.defaultViewsContextKey = DefaultViewsContext.bindTo(contextKeyService);
+		this.sortByContextKey = ExtensionsSortByContext.bindTo(contextKeyService);
 		this.searchMarketplaceExtensionsContextKey = SearchMarketplaceExtensionsContext.bindTo(contextKeyService);
 		this.searchInstalledExtensionsContextKey = SearchIntalledExtensionsContext.bindTo(contextKeyService);
 		this.searchOutdatedExtensionsContextKey = SearchOutdatedExtensionsContext.bindTo(contextKeyService);
@@ -421,13 +451,6 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		this._register(this.viewletService.onDidViewletOpen(this.onViewletOpen, this));
 		this.searchViewletState = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
 
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
-				this.secondaryActions = undefined;
-				this.updateTitleArea();
-			}
-		}, this));
-
 		if (extensionManagementServerService.webExtensionManagementServer) {
 			this._register(extensionsWorkbenchService.onChange(() => {
 				// show installed web extensions view only when it is not visible
@@ -437,13 +460,10 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 				}
 			}));
 		}
+	}
 
-		this.sortActions = [
-			this._register(this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.install', localize('sort by installs', "Install Count"), this.onSearchChange, 'installs')),
-			this._register(this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.rating', localize('sort by rating', "Rating"), this.onSearchChange, 'rating')),
-			this._register(this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.name', localize('sort by name', "Name"), this.onSearchChange, 'name')),
-			this._register(this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort.publishedDate', localize('sort by date', "Published Date"), this.onSearchChange, 'publishedDate')),
-		];
+	get searchValue(): string | undefined {
+		return this.searchBox?.getValue();
 	}
 
 	create(parent: HTMLElement): void {
@@ -478,8 +498,8 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		this._register(attachSuggestEnabledInputBoxStyler(this.searchBox, this.themeService));
 
 		this._register(this.searchBox.onInputDidChange(() => {
+			this.sortByContextKey.set(Query.parse(this.searchBox!.getValue() || '').sortBy);
 			this.triggerSearch();
-			this._onSearchChange.fire(this.searchBox!.getValue());
 		}, this));
 
 		this._register(this.searchBox.onShouldFocusResults(() => this.focusListView(), this));
@@ -556,59 +576,6 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		return 400;
 	}
 
-	@memoize
-	getActions(): IAction[] {
-		// Local extensions filters
-		let filterActions: IAction[] = [
-			this._register(this.instantiationService.createInstance(ShowBuiltInExtensionsAction, ShowBuiltInExtensionsAction.ID, localize('builtin filter', "Built-in"))),
-			this._register(this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, localize('installed filter', "Installed"))),
-			this._register(this.instantiationService.createInstance(ShowEnabledExtensionsAction, ShowEnabledExtensionsAction.ID, localize('enabled filter', "Enabled"))),
-			this._register(this.instantiationService.createInstance(ShowDisabledExtensionsAction, ShowDisabledExtensionsAction.ID, localize('disabled filter', "Disabled"))),
-			this._register(this.instantiationService.createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, localize('outdated filter', "Outdated"))),
-		];
-
-		if (this.extensionGalleryService.isEnabled()) {
-			filterActions = [
-				this._register(this.instantiationService.createInstance(PredefinedExtensionFilterAction, 'extensions.filter.featured', localize('featured filter', "Featured"), '@featured')),
-				this._register(this.instantiationService.createInstance(PredefinedExtensionFilterAction, 'extensions.filter.popular', localize('most popular filter', "Most Popular"), '@popular')),
-				this._register(this.instantiationService.createInstance(PredefinedExtensionFilterAction, 'extensions.filter.recommended', localize('most popular recommended', "Recommended"), '@recommended')),
-				this._register(this.instantiationService.createInstance(RecentlyPublishedExtensionsAction, RecentlyPublishedExtensionsAction.ID, localize('recently published filter', "Recently Published"))),
-				this._register(new Separator()),
-				this._register(new SubmenuAction('workbench.extensions.action.filterExtensionsByCategory', localize('filter by category', "Category"), EXTENSION_CATEGORIES.map(category => this.instantiationService.createInstance(SearchCategoryAction, `extensions.actions.searchByCategory.${category}`, category, category)))),
-				this._register(new Separator()),
-				...filterActions,
-				this._register(new Separator()),
-				this._register(new SubmenuAction('workbench.extensions.action.sortBy', localize('sorty by', "Sort By"), this.sortActions)),
-			];
-		}
-
-		return [
-			this._register(new SubmenuAction('workbench.extensions.action.filterExtensions', localize('filterExtensions', "Filter Extensions..."), filterActions, ThemeIcon.asClassName(filterIcon))),
-			this._register(this.instantiationService.createInstance(RefreshExtensionsAction, RefreshExtensionsAction.ID, RefreshExtensionsAction.LABEL)),
-			this._register(this.instantiationService.createInstance(ClearExtensionsInputAction, ClearExtensionsInputAction.ID, ClearExtensionsInputAction.LABEL, this.onSearchChange, () => this.searchBox!.getValue() || '')),
-		];
-	}
-
-	getSecondaryActions(): IAction[] {
-		if (!this.secondaryActions) {
-			this.secondaryActions = [];
-			this.secondaryActions.push(this.instantiationService.createInstance(CheckForUpdatesAction, CheckForUpdatesAction.ID, CheckForUpdatesAction.LABEL));
-			if (this.configurationService.getValue(AutoUpdateConfigurationKey)) {
-				this.secondaryActions.push(this.instantiationService.createInstance(DisableAutoUpdateAction, DisableAutoUpdateAction.ID, DisableAutoUpdateAction.LABEL));
-			} else {
-				this.secondaryActions.push(this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL, false), this.instantiationService.createInstance(EnableAutoUpdateAction, EnableAutoUpdateAction.ID, EnableAutoUpdateAction.LABEL));
-			}
-
-			this.secondaryActions.push(new Separator());
-			this.secondaryActions.push(this.instantiationService.createInstance(EnableAllAction, EnableAllAction.ID, EnableAllAction.LABEL, false));
-			this.secondaryActions.push(this.instantiationService.createInstance(DisableAllAction, DisableAllAction.ID, DisableAllAction.LABEL, false));
-
-			this.secondaryActions.push(new Separator());
-			this.secondaryActions.push(this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL));
-		}
-		return this.secondaryActions;
-	}
-
 	search(value: string): void {
 		if (this.searchBox && this.searchBox.getValue() !== value) {
 			this.searchBox.setValue(value);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 932a76b68..be8f1ac3c 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -17,19 +17,19 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { append, $ } from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Delegate, Renderer, IExtensionsViewState, EXTENSION_LIST_ELEMENT_HEIGHT } from 'vs/workbench/contrib/extensions/browser/extensionsList';
-import { ExtensionState, IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
+import { ExtensionState, IExtension, IExtensionsWorkbenchService, IWorkspaceRecommendedExtensionsView } from 'vs/workbench/contrib/extensions/common/extensions';
 import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 import { IExtensionService, toExtension } from 'vs/workbench/services/extensions/common/extensions';
-import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
-import { ConfigureWorkspaceFolderRecommendedExtensionsAction, ManageExtensionAction, InstallLocalExtensionsInRemoteAction, getContextMenuActions, ExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { ManageExtensionAction, getContextMenuActions, ExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
 import { WorkbenchPagedList, ListResourceNavigator } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { coalesce, distinct, flatten } from 'vs/base/common/arrays';
 import { IExperimentService, IExperiment, ExperimentActionType } from 'vs/workbench/contrib/experiments/common/experimentService';
@@ -49,7 +49,6 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { configureRecommendedIcon, installLocalInRemoteIcon, installWorkspaceRecommendedIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
 
 // Extensions that are automatically classified as Programming Language extensions, but should be Feature extensions
 const FORCE_FEATURE_EXTENSIONS = ['vscode.git', 'vscode.search-result'];
@@ -134,8 +133,12 @@ export class ExtensionsListView extends ViewPane {
 		if (this.options.onDidChangeTitle) {
 			this._register(this.options.onDidChangeTitle(title => this.updateTitle(title)));
 		}
+
+		this.registerActions();
 	}
 
+	protected registerActions(): void { }
+
 	protected renderHeader(container: HTMLElement): void {
 		container.classList.add('extension-view-header');
 		super.renderHeader(container);
@@ -263,32 +266,27 @@ export class ExtensionsListView extends ViewPane {
 			const runningExtensions = await this.extensionService.getExtensions();
 			const manageExtensionAction = this.instantiationService.createInstance(ManageExtensionAction);
 			manageExtensionAction.extension = e.element;
+			let groups: IAction[][] = [];
 			if (manageExtensionAction.enabled) {
-				const groups = await manageExtensionAction.getActionGroups(runningExtensions);
-				let actions: IAction[] = [];
-				for (const menuActions of groups) {
-					actions = [...actions, ...menuActions, new Separator()];
-				}
-				this.contextMenuService.showContextMenu({
-					getAnchor: () => e.anchor,
-					getActions: () => actions.slice(0, actions.length - 1)
-				});
+				groups = await manageExtensionAction.getActionGroups(runningExtensions);
+
 			} else if (e.element) {
-				const groups = getContextMenuActions(e.element, false, this.instantiationService);
+				groups = getContextMenuActions(e.element, false, this.instantiationService);
 				groups.forEach(group => group.forEach(extensionAction => {
 					if (extensionAction instanceof ExtensionAction) {
 						extensionAction.extension = e.element!;
 					}
 				}));
-				let actions: IAction[] = [];
-				for (const menuActions of groups) {
-					actions = [...actions, ...menuActions, new Separator()];
-				}
-				this.contextMenuService.showContextMenu({
-					getAnchor: () => e.anchor,
-					getActions: () => actions
-				});
 			}
+			let actions: IAction[] = [];
+			for (const menuActions of groups) {
+				actions = [...actions, ...menuActions, new Separator()];
+			}
+			actions.pop();
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => e.anchor,
+				getActions: () => actions
+			});
 		}
 	}
 
@@ -693,8 +691,14 @@ export class ExtensionsListView extends ViewPane {
 		}
 
 		// All recommendations
-		if (/@recommended:all/i.test(query.value) || ExtensionsListView.isSearchRecommendedExtensionsQuery(query.value)) {
-			return this.getAllRecommendationsModel(query, options, token);
+		if (/@recommended:all/i.test(query.value)) {
+			return this.getAllRecommendationsModel(options, token);
+		}
+
+		// Search recommendations
+		if (ExtensionsListView.isSearchRecommendedExtensionsQuery(query.value) ||
+			(ExtensionsListView.isRecommendedExtensionsQuery(query.value) && options.sortBy !== undefined)) {
+			return this.searchRecommendations(query, options, token);
 		}
 
 		// Other recommendations
@@ -730,10 +734,8 @@ export class ExtensionsListView extends ViewPane {
 	}
 
 	private async getWorkspaceRecommendationsModel(query: Query, options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
-		const value = query.value.replace(/@recommended:workspace/g, '').trim().toLowerCase();
 		const recommendations = await this.getWorkspaceRecommendations();
-		const installableRecommendations = (await this.getInstallableRecommendations(recommendations, { ...options, source: 'recommendations-workspace' }, token))
-			.filter(extension => extension.identifier.id.toLowerCase().indexOf(value) > -1);
+		const installableRecommendations = (await this.getInstallableRecommendations(recommendations, { ...options, source: 'recommendations-workspace' }, token));
 		this.telemetryService.publicLog2<{ count: number }, WorkspaceRecommendationsClassification>('extensionWorkspaceRecommendations:open', { count: installableRecommendations.length });
 		const result: IExtension[] = coalesce(recommendations.map(id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))));
 		return new PagedModel(result);
@@ -755,14 +757,19 @@ export class ExtensionsListView extends ViewPane {
 	}
 
 	private async getOtherRecommendationsModel(query: Query, options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
-		const value = query.value.replace(/@recommended/g, '').trim().toLowerCase();
+		const otherRecommendations = await this.getOtherRecommendations();
+		const installableRecommendations = await this.getInstallableRecommendations(otherRecommendations, { ...options, source: 'recommendations-other', sortBy: undefined }, token);
+		const result = coalesce(otherRecommendations.map(id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))));
+		return new PagedModel(result);
+	}
 
+	private async getOtherRecommendations(): Promise<string[]> {
 		const local = (await this.extensionsWorkbenchService.queryLocal(this.options.server))
 			.map(e => e.identifier.id.toLowerCase());
 		const workspaceRecommendations = (await this.getWorkspaceRecommendations())
 			.map(extensionId => extensionId.toLowerCase());
 
-		const otherRecommendations = distinct(
+		return distinct(
 			flatten(await Promise.all([
 				// Order is important
 				this.extensionRecommendationsService.getImportantRecommendations(),
@@ -770,16 +777,10 @@ export class ExtensionsListView extends ViewPane {
 				this.extensionRecommendationsService.getOtherRecommendations()
 			])).filter(extensionId => !local.includes(extensionId.toLowerCase()) && !workspaceRecommendations.includes(extensionId.toLowerCase())
 			), extensionId => extensionId.toLowerCase());
-
-		const installableRecommendations = (await this.getInstallableRecommendations(otherRecommendations, { ...options, source: 'recommendations-other', sortBy: undefined }, token))
-			.filter(extension => extension.identifier.id.toLowerCase().indexOf(value) > -1);
-
-		const result: IExtension[] = coalesce(otherRecommendations.map(id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))));
-		return new PagedModel(result);
 	}
 
 	// Get All types of recommendations, trimmed to show a max of 8 at any given time
-	private async getAllRecommendationsModel(query: Query, options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
+	private async getAllRecommendationsModel(options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
 		const local = (await this.extensionsWorkbenchService.queryLocal(this.options.server)).map(e => e.identifier.id.toLowerCase());
 
 		const allRecommendations = distinct(
@@ -797,6 +798,15 @@ export class ExtensionsListView extends ViewPane {
 		return new PagedModel(result.slice(0, 8));
 	}
 
+	private async searchRecommendations(query: Query, options: IQueryOptions, token: CancellationToken): Promise<IPagedModel<IExtension>> {
+		const value = query.value.replace(/@recommended/g, '').trim().toLowerCase();
+		const recommendations = distinct([...await this.getWorkspaceRecommendations(), ...await this.getOtherRecommendations()]);
+		const installableRecommendations = (await this.getInstallableRecommendations(recommendations, { ...options, source: 'recommendations', sortBy: undefined }, token))
+			.filter(extension => extension.identifier.id.toLowerCase().indexOf(value) > -1);
+		const result = coalesce(recommendations.map(id => installableRecommendations.find(i => areSameExtensions(i.identifier, { id }))));
+		return new PagedModel(this.sortExtensions(result, options));
+	}
+
 	// Sorts the firstPage of the pager in the same order as given array of extension ids
 	private sortFirstPage(pager: IPager<IExtension>, ids: string[]) {
 		ids = ids.map(x => x.toLowerCase());
@@ -951,7 +961,7 @@ export class ExtensionsListView extends ViewPane {
 	}
 
 	static isSearchRecommendedExtensionsQuery(query: string): boolean {
-		return /@recommended/i.test(query) && !ExtensionsListView.isRecommendedExtensionsQuery(query);
+		return /@recommended\s.+/i.test(query);
 	}
 
 	static isWorkspaceRecommendedExtensionsQuery(query: string): boolean {
@@ -989,14 +999,6 @@ export class ServerInstalledExtensionsView extends ExtensionsListView {
 		return super.show(query.trim());
 	}
 
-	getActions(): IAction[] {
-		if (this.extensionManagementServerService.remoteExtensionManagementServer && this.extensionManagementServerService.localExtensionManagementServer === this.options.server) {
-			const installLocalExtensionsInRemoteAction = this._register(this.instantiationService.createInstance(InstallLocalExtensionsInRemoteAction));
-			installLocalExtensionsInRemoteAction.class = ThemeIcon.asClassName(installLocalInRemoteIcon);
-			return [installLocalExtensionsInRemoteAction];
-		}
-		return [];
-	}
 }
 
 export class EnabledExtensionsView extends ExtensionsListView {
@@ -1074,9 +1076,8 @@ export class RecommendedExtensionsView extends ExtensionsListView {
 	}
 }
 
-export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
+export class WorkspaceRecommendedExtensionsView extends ExtensionsListView implements IWorkspaceRecommendedExtensionsView {
 	private readonly recommendedExtensionsQuery = '@recommended:workspace';
-	private installAllAction: Action | undefined;
 
 	renderBody(container: HTMLElement): void {
 		super.renderBody(container);
@@ -1085,31 +1086,13 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.show(this.recommendedExtensionsQuery)));
 	}
 
-	getActions(): IAction[] {
-		if (!this.installAllAction) {
-			this.installAllAction = this._register(new Action('workbench.extensions.action.installWorkspaceRecommendedExtensions', localize('installWorkspaceRecommendedExtensions', "Install Workspace Recommended Extensions"), ThemeIcon.asClassName(installWorkspaceRecommendedIcon), false, () => this.installWorkspaceRecommendations()));
-		}
-
-		const configureWorkspaceFolderAction = this._register(this.instantiationService.createInstance(ConfigureWorkspaceFolderRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction.ID, ConfigureWorkspaceFolderRecommendedExtensionsAction.LABEL));
-		configureWorkspaceFolderAction.class = ThemeIcon.asClassName(configureRecommendedIcon);
-		return [this.installAllAction, configureWorkspaceFolderAction];
-	}
-
 	async show(query: string): Promise<IPagedModel<IExtension>> {
 		let shouldShowEmptyView = query && query.trim() !== '@recommended' && query.trim() !== '@recommended:workspace';
 		let model = await (shouldShowEmptyView ? this.showEmptyModel() : super.show(this.recommendedExtensionsQuery));
 		this.setExpanded(model.length > 0);
-		await this.setRecommendationsToInstall();
 		return model;
 	}
 
-	private async setRecommendationsToInstall(): Promise<void> {
-		const installableRecommendations = await this.getInstallableWorkspaceRecommendations();
-		if (this.installAllAction) {
-			this.installAllAction.enabled = installableRecommendations.length > 0;
-		}
-	}
-
 	private async getInstallableWorkspaceRecommendations() {
 		const installed = (await this.extensionsWorkbenchService.queryLocal())
 			.filter(l => l.enablementState !== EnablementState.DisabledByExtensionKind); // Filter extensions disabled by kind
@@ -1118,9 +1101,16 @@ export class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
 		return this.getInstallableRecommendations(recommendations, { source: 'install-all-workspace-recommendations' }, CancellationToken.None);
 	}
 
-	private async installWorkspaceRecommendations(): Promise<void> {
+	async installWorkspaceRecommendations(): Promise<void> {
 		const installableRecommendations = await this.getInstallableWorkspaceRecommendations();
-		await this.extensionManagementService.installExtensions(installableRecommendations.map(i => i.gallery!));
+		if (installableRecommendations.length) {
+			await this.extensionManagementService.installExtensions(installableRecommendations.map(i => i.gallery!));
+		} else {
+			this.notificationService.notify({
+				severity: Severity.Info,
+				message: localize('no local extensions', "There are no extensions to install.")
+			});
+		}
 	}
 
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 3566ca415..2f8ac0a8f 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -22,7 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { URI } from 'vs/base/common/uri';
-import { IExtension, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey } from 'vs/workbench/contrib/extensions/common/extensions';
+import { IExtension, ExtensionState, IExtensionsWorkbenchService, AutoUpdateConfigurationKey, AutoCheckUpdatesConfigurationKey, HasOutdatedExtensionsContext } from 'vs/workbench/contrib/extensions/common/extensions';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IURLService, IURLHandler, IOpenURLOptions } from 'vs/platform/url/common/url';
 import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
@@ -40,6 +40,7 @@ import { getExtensionKind } from 'vs/workbench/services/extensions/common/extens
 import { FileAccess } from 'vs/base/common/network';
 import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
 import { IUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataSync';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
@@ -492,6 +493,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours
 	declare readonly _serviceBrand: undefined;
 
+	private hasOutdatedExtensionsContextKey: IContextKey<boolean>;
+
 	private readonly localExtensions: Extensions | null = null;
 	private readonly remoteExtensions: Extensions | null = null;
 	private readonly webExtensions: Extensions | null = null;
@@ -520,9 +523,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		@IModeService private readonly modeService: IModeService,
 		@IIgnoredExtensionsManagementService private readonly extensionsSyncManagementService: IIgnoredExtensionsManagementService,
 		@IUserDataAutoSyncService private readonly userDataAutoSyncService: IUserDataAutoSyncService,
-		@IProductService private readonly productService: IProductService
+		@IProductService private readonly productService: IProductService,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
+		this.hasOutdatedExtensionsContextKey = HasOutdatedExtensionsContext.bindTo(contextKeyService);
 		if (extensionManagementServerService.localExtensionManagementServer) {
 			this.localExtensions = this._register(instantiationService.createInstance(Extensions, extensionManagementServerService.localExtensionManagementServer, ext => this.getExtensionState(ext)));
 			this._register(this.localExtensions.onChange(e => this._onChange.fire(e ? e.extension : undefined)));
@@ -559,7 +564,10 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			this.eventuallySyncWithGallery(true);
 		});
 
-		this._register(this.onChange(() => this.updateActivity()));
+		this._register(this.onChange(() => {
+			this.updateContexts();
+			this.updateActivity();
+		}));
 	}
 
 	get local(): IExtension[] {
@@ -1189,13 +1197,21 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return changed;
 	}
 
+	private updateContexts(extension?: Extension): void {
+		if (extension && extension.outdated) {
+			this.hasOutdatedExtensionsContextKey.set(true);
+		} else {
+			this.hasOutdatedExtensionsContextKey.set(this.outdated.length > 0);
+		}
+	}
+
 	private _activityCallBack: ((value: void) => void) | null = null;
 	private updateActivity(): void {
 		if ((this.localExtensions && this.localExtensions.local.some(e => e.state === ExtensionState.Installing || e.state === ExtensionState.Uninstalling))
 			|| (this.remoteExtensions && this.remoteExtensions.local.some(e => e.state === ExtensionState.Installing || e.state === ExtensionState.Uninstalling))
 			|| (this.webExtensions && this.webExtensions.local.some(e => e.state === ExtensionState.Installing || e.state === ExtensionState.Uninstalling))) {
 			if (!this._activityCallBack) {
-				this.progressService.withProgress({ location: ProgressLocation.Extensions }, () => new Promise(c => this._activityCallBack = c));
+				this.progressService.withProgress({ location: ProgressLocation.Extensions }, () => new Promise(resolve => this._activityCallBack = resolve));
 			}
 		} else {
 			if (this._activityCallBack) {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 0502ce085..8749cbe23 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -179,3 +179,7 @@
 .extension-list-item > .details > .footer > .monaco-action-bar > .actions-container .extension-action.label {
 	max-width: 150px;
 }
+
+.extension-list-item .footer .monaco-action-bar .action-item.action-dropdown-item.empty > .action-label {
+	margin-right: 4px;
+}
diff --git a/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts b/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts
deleted file mode 100644
index 3a8caf10a..000000000
--- a/src/vs/workbench/contrib/extensions/browser/remoteExtensionsInstaller.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { MenuRegistry, MenuId, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { localize } from 'vs/nls';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
-import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-
-export class RemoteExtensionsInstaller extends Disposable implements IWorkbenchContribution {
-
-	constructor(
-		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@ILabelService labelService: ILabelService,
-		@IInstantiationService instantiationService: IInstantiationService
-	) {
-		super();
-		if (this.extensionManagementServerService.localExtensionManagementServer && this.extensionManagementServerService.remoteExtensionManagementServer) {
-			const installLocalExtensionsInRemoteAction = instantiationService.createInstance(InstallLocalExtensionsInRemoteAction);
-			CommandsRegistry.registerCommand('workbench.extensions.installLocalExtensions', () => installLocalExtensionsInRemoteAction.run());
-			let disposable = Disposable.None;
-			const appendMenuItem = () => {
-				disposable.dispose();
-				disposable = MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-					command: {
-						id: 'workbench.extensions.installLocalExtensions',
-						category: localize({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote"),
-						title: installLocalExtensionsInRemoteAction.label
-					}
-				});
-			};
-			appendMenuItem();
-			this._register(labelService.onDidChangeFormatters(e => appendMenuItem()));
-			this._register(toDisposable(() => disposable.dispose()));
-
-			this._register(registerAction2(class InstallRemoteExtensionsInLocalAction2 extends Action2 {
-				constructor() {
-					super({
-						id: 'workbench.extensions.actions.installLocalExtensionsInRemote',
-						title: { value: localize('install remote in local', "Install Remote Extensions Locally..."), original: 'Install Remote Extensions Locally...' },
-						category: localize({ key: 'remote', comment: ['Remote as in remote machine'] }, "Remote"),
-						f1: true
-					});
-				}
-				run(accessor: ServicesAccessor): Promise<void> {
-					return accessor.get(IInstantiationService).createInstance(InstallRemoteExtensionsInLocalAction, 'workbench.extensions.actions.installLocalExtensionsInRemote').run();
-				}
-			}));
-		}
-	}
-
-}
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 3cfe2796c..127ae556d 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -13,15 +13,21 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IExtensionManifest, ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { URI } from 'vs/base/common/uri';
-import { IViewPaneContainer } from 'vs/workbench/common/views';
+import { IView, IViewPaneContainer } from 'vs/workbench/common/views';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 
 export interface IExtensionsViewPaneContainer extends IViewPaneContainer {
+	readonly searchValue: string | undefined;
 	search(text: string): void;
 	refresh(): Promise<void>;
 }
 
+export interface IWorkspaceRecommendedExtensionsView extends IView {
+	installWorkspaceRecommendations(): Promise<void>;
+}
+
 export const enum ExtensionState {
 	Installing,
 	Installed,
@@ -145,5 +151,12 @@ export class ExtensionContainers extends Disposable {
 	}
 }
 
+export const WORKSPACE_RECOMMENDATIONS_VIEW_ID = 'workbench.views.extensions.workspaceRecommendations';
 export const TOGGLE_IGNORE_EXTENSION_ACTION_ID = 'workbench.extensions.action.toggleIgnoreExtension';
+export const SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID = 'workbench.extensions.action.installVSIX';
 export const INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID = 'workbench.extensions.command.installFromVSIX';
+
+// Context Keys
+export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
+export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
+export const HasOutdatedExtensionsContext = new RawContextKey<boolean>('hasOutdatedExtensions', false);
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
index a472654f0..edf6d1001 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
@@ -21,7 +21,6 @@ import { ExtensionHostProfileService } from 'vs/workbench/contrib/extensions/ele
 import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ExtensionsAutoProfiler } from 'vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsActions';
 import { ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
@@ -62,11 +61,10 @@ const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExte
 class ExtensionsContributions implements IWorkbenchContribution {
 
 	constructor(
-		@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService,
 		@IExtensionRecommendationNotificationService extensionRecommendationNotificationService: IExtensionRecommendationNotificationService,
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
 	) {
-		sharedProcessService.registerChannel('IExtensionRecommendationNotificationService', new ExtensionRecommendationNotificationServiceChannel(extensionRecommendationNotificationService));
+		sharedProcessService.registerChannel('extensionRecommendationNotification', new ExtensionRecommendationNotificationServiceChannel(extensionRecommendationNotificationService));
 		const openExtensionsFolderActionDescriptor = SyncActionDescriptor.from(OpenExtensionsFolderAction);
 		actionRegistry.registerWorkbenchAction(openExtensionsFolderActionDescriptor, 'Extensions: Open Extensions Folder', ExtensionsLabel);
 	}
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts b/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
index faf606a75..762b07c45 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/reportExtensionIssueAction.ts
@@ -14,6 +14,8 @@ import { ExtensionType, IExtensionDescription } from 'vs/platform/extensions/com
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { URI } from 'vs/base/common/uri';
 
+const builtinExtensionIssueUrl = 'https://github.com/microsoft/vscode';
+
 export class ReportExtensionIssueAction extends Action {
 
 	private static readonly _id = 'workbench.extensions.action.reportExtensionIssue';
@@ -34,7 +36,8 @@ export class ReportExtensionIssueAction extends Action {
 		@INativeHostService private readonly nativeHostService: INativeHostService
 	) {
 		super(ReportExtensionIssueAction._id, ReportExtensionIssueAction._label, 'extension-action report-issue');
-		this.enabled = !!extension.description.repository && !!extension.description.repository.url;
+
+		this.enabled = extension.description.isBuiltin || (!!extension.description.repository && !!extension.description.repository.url);
 	}
 
 	async run(): Promise<void> {
@@ -51,6 +54,9 @@ export class ReportExtensionIssueAction extends Action {
 		unresponsiveProfile?: IExtensionHostProfile
 	}): Promise<string> {
 		let baseUrl = extension.marketplaceInfo && extension.marketplaceInfo.type === ExtensionType.User && extension.description.repository ? extension.description.repository.url : undefined;
+		if (!baseUrl && extension.description.isBuiltin) {
+			baseUrl = builtinExtensionIssueUrl;
+		}
 		if (!!baseUrl) {
 			baseUrl = `${baseUrl.indexOf('.git') !== -1 ? baseUrl.substr(0, baseUrl.length - 4) : baseUrl}/issues/new/`;
 		} else {
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts
index ed8a92a98..c380c4c74 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts
@@ -5,11 +5,7 @@
 
 import * as sinon from 'sinon';
 import * as assert from 'assert';
-import * as path from 'vs/base/common/path';
-import * as fs from 'fs';
-import * as os from 'os';
 import * as uuid from 'vs/base/common/uuid';
-import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
 import {
 	IExtensionGalleryService, IGalleryExtensionAssets, IGalleryExtension, IExtensionManagementService,
 	DidInstallExtensionEvent, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, IExtensionTipsService
@@ -47,8 +43,6 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { NullLogService, ILogService } from 'vs/platform/log/common/log';
-import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { ExtensionTipsService } from 'vs/platform/extensionManagement/electron-sandbox/extensionTipsService';
@@ -62,6 +56,11 @@ import { IExtensionIgnoredRecommendationsService } from 'vs/workbench/services/e
 import { ExtensionIgnoredRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService';
 import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations';
 import { ExtensionRecommendationNotificationService } from 'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { joinPath } from 'vs/base/common/resources';
+import { VSBuffer } from 'vs/base/common/buffer';
 
 const mockExtensionGallery: IGalleryExtension[] = [
 	aGalleryExtension('MockExtension1', {
@@ -181,7 +180,6 @@ suite('ExtensionRecommendationsService Test', () => {
 	let instantiationService: TestInstantiationService;
 	let testConfigurationService: TestConfigurationService;
 	let testObject: ExtensionRecommendationsService;
-	let parentResource: string;
 	let installEvent: Emitter<InstallExtensionEvent>,
 		didInstallEvent: Emitter<DidInstallExtensionEvent>,
 		uninstallEvent: Emitter<IExtensionIdentifier>,
@@ -203,6 +201,7 @@ suite('ExtensionRecommendationsService Test', () => {
 		testConfigurationService = new TestConfigurationService();
 		instantiationService.stub(IConfigurationService, testConfigurationService);
 		instantiationService.stub(INotificationService, new TestNotificationService());
+		instantiationService.stub(IContextKeyService, new MockContextKeyService());
 		instantiationService.stub(IExtensionManagementService, <Partial<IExtensionManagementService>>{
 			onInstallExtension: installEvent.event,
 			onDidInstallExtension: didInstallEvent.event,
@@ -278,34 +277,30 @@ suite('ExtensionRecommendationsService Test', () => {
 		});
 	});
 
-	teardown(done => {
-		(<ExtensionRecommendationsService>testObject).dispose();
-		if (parentResource) {
-			rimraf(parentResource, RimRafMode.MOVE).then(done, done);
-		} else {
-			done();
-		}
-	});
+	teardown(() => (<ExtensionRecommendationsService>testObject).dispose());
 
 	function setUpFolderWorkspace(folderName: string, recommendedExtensions: string[], ignoredRecommendations: string[] = []): Promise<void> {
-		const id = uuid.generateUuid();
-		parentResource = path.join(os.tmpdir(), 'vsctests', id);
-		return setUpFolder(folderName, parentResource, recommendedExtensions, ignoredRecommendations);
+		return setUpFolder(folderName, recommendedExtensions, ignoredRecommendations);
 	}
 
-	async function setUpFolder(folderName: string, parentDir: string, recommendedExtensions: string[], ignoredRecommendations: string[] = []): Promise<void> {
-		const folderDir = path.join(parentDir, folderName);
-		const workspaceSettingsDir = path.join(folderDir, '.vscode');
-		await mkdirp(workspaceSettingsDir, 493);
-		const configPath = path.join(workspaceSettingsDir, 'extensions.json');
-		fs.writeFileSync(configPath, JSON.stringify({
+	async function setUpFolder(folderName: string, recommendedExtensions: string[], ignoredRecommendations: string[] = []): Promise<void> {
+		const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
+		const logService = new NullLogService();
+		const fileService = new FileService(logService);
+		const fileSystemProvider = new InMemoryFileSystemProvider();
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const folderDir = joinPath(ROOT, folderName);
+		const workspaceSettingsDir = joinPath(folderDir, '.vscode');
+		await fileService.createFolder(workspaceSettingsDir);
+		const configPath = joinPath(workspaceSettingsDir, 'extensions.json');
+		await fileService.writeFile(configPath, VSBuffer.fromString(JSON.stringify({
 			'recommendations': recommendedExtensions,
 			'unwantedRecommendations': ignoredRecommendations,
-		}, null, '\t'));
+		}, null, '\t')));
+
+		const myWorkspace = testWorkspace(folderDir);
 
-		const myWorkspace = testWorkspace(URI.from({ scheme: 'file', path: folderDir }));
-		const fileService = new FileService(new NullLogService());
-		fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(new NullLogService()));
 		instantiationService.stub(IFileService, fileService);
 		workspaceService = new TestContextService(myWorkspace);
 		instantiationService.stub(IWorkspaceContextService, workspaceService);
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
index 40cf65cc2..bcef66bbd 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts
@@ -33,7 +33,7 @@ import { NativeURLService } from 'vs/platform/url/common/urlService';
 import { URI } from 'vs/base/common/uri';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl';
 import { ExtensionIdentifier, IExtensionContributions, ExtensionType, IExtensionDescription, IExtension } from 'vs/platform/extensions/common/extensions';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -53,6 +53,8 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { UserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
 import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncResourceEnablementService } from 'vs/platform/userDataSync/common/userDataSyncResourceEnablementService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 let instantiationService: TestInstantiationService;
 let installEvent: Emitter<InstallExtensionEvent>,
@@ -77,6 +79,7 @@ async function setupTest() {
 	instantiationService.stub(IConfigurationService, new TestConfigurationService());
 	instantiationService.stub(IProgressService, ProgressService);
 	instantiationService.stub(IProductService, {});
+	instantiationService.stub(IContextKeyService, new MockContextKeyService());
 
 	instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 	instantiationService.stub(ISharedProcessService, TestSharedProcessService);
@@ -885,83 +888,6 @@ suite('ExtensionsActions', () => {
 			});
 	});
 
-	test('Test UpdateAllAction when no installed extensions', () => {
-		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label', true);
-
-		assert.ok(!testObject.enabled);
-	});
-
-	test('Test UpdateAllAction when installed extensions are not outdated', () => {
-		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label', true);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a'), aLocalExtension('b')]);
-		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
-			.then(extensions => assert.ok(!testObject.enabled));
-	});
-
-	test('Test UpdateAllAction when some installed extensions are outdated', () => {
-		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label', true);
-		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		return workbenchService.queryLocal()
-			.then(async () => {
-				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)));
-				assert.ok(!testObject.enabled);
-				return new Promise<void>(c => {
-					testObject.onDidChange(() => {
-						if (testObject.enabled) {
-							c();
-						}
-					});
-					workbenchService.queryGallery(CancellationToken.None);
-				});
-			});
-	});
-
-	test('Test UpdateAllAction when some installed extensions are outdated and some outdated are being installed', () => {
-		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label', true);
-		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
-		const gallery = [aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)];
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		return workbenchService.queryLocal()
-			.then(async () => {
-				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
-				assert.ok(!testObject.enabled);
-				return new Promise<void>(c => {
-					installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
-					testObject.onDidChange(() => {
-						if (testObject.enabled) {
-							c();
-						}
-					});
-					workbenchService.queryGallery(CancellationToken.None);
-				});
-			});
-	});
-
-	test('Test UpdateAllAction when some installed extensions are outdated and all outdated are being installed', () => {
-		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label', true);
-		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
-		const gallery = [aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)];
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		return workbenchService.queryLocal()
-			.then(() => {
-				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
-				return workbenchService.queryGallery(CancellationToken.None)
-					.then(() => {
-						installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
-						installEvent.fire({ identifier: local[1].identifier, gallery: gallery[1] });
-						assert.ok(!testObject.enabled);
-					});
-			});
-	});
-
-	test(`RecommendToFolderAction`, () => {
-		// TODO: Implement test
-	});
-
 });
 
 suite('ReloadAction', () => {
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
index cde013f45..b1e00bb80 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts
@@ -35,7 +35,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { SinonStub } from 'sinon';
 import { IExperimentService, ExperimentState, ExperimentActionType, ExperimentService } from 'vs/workbench/contrib/experiments/common/experimentService';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl';
 import { ExtensionType, IExtension, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -165,7 +165,8 @@ suite('ExtensionsListView Tests', () => {
 		instantiationService.stub(IViewDescriptorService, {
 			getViewLocationById(): ViewContainerLocation {
 				return ViewContainerLocation.Sidebar;
-			}
+			},
+			onDidChangeLocation: Event.None
 		});
 
 		instantiationService.stub(IExtensionService, <Partial<IExtensionService>>{
diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index f4f5d8ee5..76a502062 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -36,7 +36,7 @@ import { URI } from 'vs/base/common/uri';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtensionType, IExtension, ExtensionKind } from 'vs/platform/extensions/common/extensions';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -46,6 +46,8 @@ import { IExperimentService } from 'vs/workbench/contrib/experiments/common/expe
 import { TestExperimentService } from 'vs/workbench/contrib/experiments/test/electron-browser/experimentService.test';
 import { ExtensionTipsService } from 'vs/platform/extensionManagement/electron-sandbox/extensionTipsService';
 import { Schemas } from 'vs/base/common/network';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 suite('ExtensionsWorkbenchServiceTest', () => {
 
@@ -72,6 +74,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 		instantiationService.stub(IURLService, NativeURLService);
 		instantiationService.stub(ISharedProcessService, TestSharedProcessService);
+		instantiationService.stub(IContextKeyService, new MockContextKeyService());
 
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
 		instantiationService.stub(IConfigurationService, <Partial<IConfigurationService>>{
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
new file mode 100644
index 000000000..83bd5a398
--- /dev/null
+++ b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IConfigurationNode, IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
+import * as nls from 'vs/nls';
+import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { Registry } from 'vs/platform/registry/common/platform';
+
+export const defaultExternalUriOpenerId = 'default';
+
+export const externalUriOpenersSettingId = 'workbench.externalUriOpeners';
+
+export interface ExternalUriOpenersConfiguration {
+	readonly [uriGlob: string]: string;
+}
+
+const externalUriOpenerIdSchemaAddition: IJSONSchema = {
+	type: 'string',
+	enum: []
+};
+
+const exampleUriPatterns = `
+- \`https://microsoft.com\`: Matches this specific domain using https
+- \`https://microsoft.com:8080\`: Matches this specific domain on this port using https
+- \`https://microsoft.com:*\`: Matches this specific domain on any port using https
+- \`https://microsoft.com/foo\`: Matches \`https://microsoft.com/foo\` and \`https://microsoft.com/foo/bar\`, but not \`https://microsoft.com/foobar\` or \`https://microsoft.com/bar\`
+- \`https://*.microsoft.com\`: Match all domains ending in \`microsoft.com\` using https
+- \`microsoft.com\`: Match this specific domain using either http or https
+- \`*.microsoft.com\`: Match all domains ending in \`microsoft.com\` using either http or https
+- \`http://192.168.0.1\`: Matches this specific IP using http
+- \`http://192.168.0.*\`: Matches all IP's with this prefix using http
+- \`*\`: Match all domains using either http or https`;
+
+export const externalUriOpenersConfigurationNode: IConfigurationNode = {
+	...workbenchConfigurationNodeBase,
+	properties: {
+		[externalUriOpenersSettingId]: {
+			type: 'object',
+			markdownDescription: nls.localize('externalUriOpeners', "Configure the opener to use for external uris (i.e. http, https)."),
+			defaultSnippets: [{
+				body: {
+					'example.com': '$1'
+				}
+			}],
+			additionalProperties: {
+				anyOf: [
+					{
+						type: 'string',
+						markdownDescription: nls.localize('externalUriOpeners.uri', "Map uri pattern to an opener id.\nExample patterns: \n{0}", exampleUriPatterns),
+					},
+					{
+						type: 'string',
+						markdownDescription: nls.localize('externalUriOpeners.uri', "Map uri pattern to an opener id.\nExample patterns: \n{0}", exampleUriPatterns),
+						enum: [defaultExternalUriOpenerId],
+						enumDescriptions: [nls.localize('externalUriOpeners.defaultId', "Open using VS Code's standard opener.")],
+					},
+					externalUriOpenerIdSchemaAddition
+				]
+			}
+		}
+	}
+};
+
+export function updateContributedOpeners(enumValues: string[], enumDescriptions: string[]): void {
+	externalUriOpenerIdSchemaAddition.enum = enumValues;
+	externalUriOpenerIdSchemaAddition.enumDescriptions = enumDescriptions;
+
+	Registry.as<IConfigurationRegistry>(Extensions.Configuration)
+		.notifyConfigurationSchemaUpdated(externalUriOpenersConfigurationNode);
+}
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts b/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
new file mode 100644
index 000000000..457d5df30
--- /dev/null
+++ b/src/vs/workbench/contrib/externalUriOpener/common/contributedOpeners.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { Memento } from 'vs/workbench/common/memento';
+import { updateContributedOpeners } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+
+interface RegisteredExternalOpener {
+	readonly extensionId: string;
+}
+
+interface OpenersMemento {
+	[id: string]: RegisteredExternalOpener;
+}
+
+/**
+ */
+export class ContributedExternalUriOpenersStore extends Disposable {
+
+	private static readonly STORAGE_ID = 'externalUriOpeners';
+
+	private readonly _openers = new Map<string, RegisteredExternalOpener>();
+	private readonly _memento: Memento;
+	private _mementoObject: OpenersMemento;
+
+	constructor(
+		@IStorageService storageService: IStorageService,
+		@IExtensionService private readonly _extensionService: IExtensionService
+	) {
+		super();
+
+		this._memento = new Memento(ContributedExternalUriOpenersStore.STORAGE_ID, storageService);
+		this._mementoObject = this._memento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
+		for (const id of Object.keys(this._mementoObject || {})) {
+			this.add(id, this._mementoObject[id].extensionId);
+		}
+
+		this.invalidateOpenersForUninstalledExtension();
+
+		this._register(this._extensionService.onDidChangeExtensions(() => this.invalidateOpenersForUninstalledExtension()));
+	}
+
+	public add(id: string, extensionId: string): void {
+		this._openers.set(id, { extensionId });
+
+		this._mementoObject[id] = { extensionId };
+		this._memento.saveMemento();
+
+		this.updateSchema();
+	}
+
+	public delete(id: string): void {
+		this._openers.delete(id);
+
+		delete this._mementoObject[id];
+		this._memento.saveMemento();
+
+		this.updateSchema();
+	}
+
+	private async invalidateOpenersForUninstalledExtension() {
+		const registeredExtensions = await this._extensionService.getExtensions();
+		for (const [id, entry] of this._openers) {
+			const isExtensionRegistered = registeredExtensions.some(r => r.identifier.value === entry.extensionId);
+			if (!isExtensionRegistered) {
+				this.delete(id);
+			}
+		}
+	}
+
+	private updateSchema() {
+		const ids: string[] = [];
+		const descriptions: string[] = [];
+
+		for (const [id, entry] of this._openers) {
+			ids.push(id);
+			descriptions.push(entry.extensionId);
+		}
+
+		updateContributedOpeners(ids, descriptions);
+	}
+}
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
new file mode 100644
index 000000000..34f349d2a
--- /dev/null
+++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { externalUriOpenersConfigurationNode } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
+import { ExternalUriOpenerService, IExternalUriOpenerService } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+
+registerSingleton(IExternalUriOpenerService, ExternalUriOpenerService);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
+	.registerConfiguration(externalUriOpenersConfigurationNode);
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
new file mode 100644
index 000000000..069ad5e48
--- /dev/null
+++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { firstOrDefault } from 'vs/base/common/arrays';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Iterable } from 'vs/base/common/iterator';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { LinkedList } from 'vs/base/common/linkedList';
+import { isWeb } from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
+import * as modes from 'vs/editor/common/modes';
+import * as nls from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IExternalOpener, IOpenerService } from 'vs/platform/opener/common/opener';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { defaultExternalUriOpenerId, ExternalUriOpenersConfiguration, externalUriOpenersSettingId } from 'vs/workbench/contrib/externalUriOpener/common/configuration';
+import { testUrlMatchesGlob } from 'vs/workbench/contrib/url/common/urlGlob';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+
+
+export const IExternalUriOpenerService = createDecorator<IExternalUriOpenerService>('externalUriOpenerService');
+
+
+export interface IExternalOpenerProvider {
+	getOpeners(targetUri: URI): AsyncIterable<IExternalUriOpener>;
+}
+
+export interface IExternalUriOpener {
+	readonly id: string;
+	readonly label: string;
+
+	canOpen(uri: URI, token: CancellationToken): Promise<modes.ExternalUriOpenerPriority>;
+	openExternalUri(uri: URI, ctx: { sourceUri: URI }, token: CancellationToken): Promise<boolean>;
+}
+
+export interface IExternalUriOpenerService {
+	readonly _serviceBrand: undefined
+
+	/**
+	 * Registers a provider for external resources openers.
+	 */
+	registerExternalOpenerProvider(provider: IExternalOpenerProvider): IDisposable;
+}
+
+export class ExternalUriOpenerService extends Disposable implements IExternalUriOpenerService, IExternalOpener {
+
+	public readonly _serviceBrand: undefined;
+
+	private readonly _providers = new LinkedList<IExternalOpenerProvider>();
+
+	constructor(
+		@IOpenerService openerService: IOpenerService,
+		@IStorageService storageService: IStorageService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILogService private readonly logService: ILogService,
+		@IPreferencesService private readonly preferencesService: IPreferencesService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+	) {
+		super();
+		this._register(openerService.registerExternalOpener(this));
+	}
+
+	registerExternalOpenerProvider(provider: IExternalOpenerProvider): IDisposable {
+		const remove = this._providers.push(provider);
+		return { dispose: remove };
+	}
+
+	async openExternal(href: string, ctx: { sourceUri: URI, preferredOpenerId?: string }, token: CancellationToken): Promise<boolean> {
+
+		const targetUri = typeof href === 'string' ? URI.parse(href) : href;
+
+		const allOpeners = await this.getAllOpenersForUri(targetUri);
+
+		if (allOpeners.size === 0) {
+			return false;
+		}
+
+		// First see if we have a preferredOpener
+		if (ctx.preferredOpenerId) {
+			if (ctx.preferredOpenerId === defaultExternalUriOpenerId) {
+				return false;
+			}
+
+			const preferredOpener = allOpeners.get(ctx.preferredOpenerId);
+			if (preferredOpener) {
+				// Skip the `canOpen` check here since the opener was specifically requested.
+				return preferredOpener.openExternalUri(targetUri, ctx, token);
+			}
+		}
+
+		// Check to see if we have a configured opener
+		const configuredOpener = this.getConfiguredOpenerForUri(allOpeners, targetUri);
+		if (configuredOpener) {
+			// Skip the `canOpen` check here since the opener was specifically requested.
+			return configuredOpener === defaultExternalUriOpenerId ? false : configuredOpener.openExternalUri(targetUri, ctx, token);
+		}
+
+		// Then check to see if there is a valid opener
+		const validOpeners: Array<{ opener: IExternalUriOpener, priority: modes.ExternalUriOpenerPriority }> = [];
+		await Promise.all(Array.from(allOpeners.values()).map(async opener => {
+			let priority: modes.ExternalUriOpenerPriority;
+			try {
+				priority = await opener.canOpen(targetUri, token);
+			} catch (e) {
+				this.logService.error(e);
+				return;
+			}
+
+			switch (priority) {
+				case modes.ExternalUriOpenerPriority.Option:
+				case modes.ExternalUriOpenerPriority.Default:
+				case modes.ExternalUriOpenerPriority.Preferred:
+					validOpeners.push({ opener, priority });
+					break;
+			}
+		}));
+
+		if (validOpeners.length === 0) {
+			return false;
+		}
+
+		// See if we have a preferred opener first
+		const preferred = firstOrDefault(validOpeners.filter(x => x.priority === modes.ExternalUriOpenerPriority.Preferred));
+		if (preferred) {
+			return preferred.opener.openExternalUri(targetUri, ctx, token);
+		}
+
+		// See if we only have optional openers, use the default opener
+		if (validOpeners.every(x => x.priority === modes.ExternalUriOpenerPriority.Option)) {
+			return false;
+		}
+
+		// Otherwise prompt
+		return this.showOpenerPrompt(validOpeners.map(x => x.opener), targetUri, ctx, token);
+	}
+
+	private async getAllOpenersForUri(targetUri: URI): Promise<Map<string, IExternalUriOpener>> {
+		const allOpeners = new Map<string, IExternalUriOpener>();
+		await Promise.all(Iterable.map(this._providers, async (provider) => {
+			for await (const opener of provider.getOpeners(targetUri)) {
+				allOpeners.set(opener.id, opener);
+			}
+		}));
+		return allOpeners;
+	}
+
+	private getConfiguredOpenerForUri(openers: Map<string, IExternalUriOpener>, targetUri: URI): IExternalUriOpener | 'default' | undefined {
+		const config = this.configurationService.getValue<ExternalUriOpenersConfiguration>(externalUriOpenersSettingId) || {};
+		for (const [uriGlob, id] of Object.entries(config)) {
+			if (testUrlMatchesGlob(targetUri.toString(), uriGlob)) {
+				if (id === defaultExternalUriOpenerId) {
+					return 'default';
+				}
+
+				const entry = openers.get(id);
+				if (entry) {
+					return entry;
+				}
+			}
+		}
+		return undefined;
+	}
+
+	private async showOpenerPrompt(
+		openers: ReadonlyArray<IExternalUriOpener>,
+		targetUri: URI,
+		ctx: { sourceUri: URI },
+		token: CancellationToken
+	): Promise<boolean> {
+		type PickItem = IQuickPickItem & { opener?: IExternalUriOpener | 'configureDefault' };
+
+		const items: Array<PickItem | IQuickPickSeparator> = openers.map((opener): PickItem => {
+			return {
+				label: opener.label,
+				opener: opener
+			};
+		});
+		items.push(
+			{
+				label: isWeb
+					? nls.localize('selectOpenerDefaultLabel.web', 'Open in new browser window')
+					: nls.localize('selectOpenerDefaultLabel', 'Open in default browser'),
+				opener: undefined
+			},
+			{ type: 'separator' },
+			{
+				label: nls.localize('selectOpenerConfigureTitle', "Configure default opener..."),
+				opener: 'configureDefault'
+			});
+
+		const picked = await this.quickInputService.pick(items, {
+			placeHolder: nls.localize('selectOpenerPlaceHolder', "How would you like to open: {0}", targetUri.toString())
+		});
+
+		if (!picked) {
+			// Still cancel the default opener here since we prompted the user
+			return true;
+		}
+
+		if (typeof picked.opener === 'undefined') {
+			return false; // Fallback to default opener
+		} else if (picked.opener === 'configureDefault') {
+			await this.preferencesService.openGlobalSettings(true, {
+				revealSetting: { key: externalUriOpenersSettingId, edit: true }
+			});
+			return true;
+		} else {
+			return picked.opener.openExternalUri(targetUri, ctx, token);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts b/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
new file mode 100644
index 000000000..557424f74
--- /dev/null
+++ b/src/vs/workbench/contrib/externalUriOpener/test/common/externalUriOpenerService.test.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { ExternalUriOpenerPriority } from 'vs/editor/common/modes';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IPickOptions, IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { ExternalUriOpenerService, IExternalOpenerProvider, IExternalUriOpener } from 'vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+
+
+class MockQuickInputService implements Partial<IQuickInputService>{
+
+	constructor(
+		private readonly pickIndex: number
+	) { }
+
+	public pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
+	public pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
+	public async pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T | undefined> {
+		const resolvedPicks = await picks;
+		const item = resolvedPicks[this.pickIndex];
+		if (item.type === 'separator') {
+			return undefined;
+		}
+		return item;
+	}
+
+}
+
+suite('ExternalUriOpenerService', () => {
+
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		instantiationService = new TestInstantiationService();
+
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+		instantiationService.stub(IOpenerService, {
+			registerExternalOpener: () => { return Disposable.None; }
+		});
+	});
+
+	test('Should not open if there are no openers', async () => {
+		const externalUriOpenerService: ExternalUriOpenerService = instantiationService.createInstance(ExternalUriOpenerService);
+
+		externalUriOpenerService.registerExternalOpenerProvider(new class implements IExternalOpenerProvider {
+			async *getOpeners(_targetUri: URI): AsyncGenerator<IExternalUriOpener> {
+				// noop
+			}
+		});
+
+		const uri = URI.parse('http://contoso.com');
+		const didOpen = await externalUriOpenerService.openExternal(uri.toString(), { sourceUri: uri }, CancellationToken.None);
+		assert.strictEqual(didOpen, false);
+	});
+
+	test('Should prompt if there is at least one enabled opener', async () => {
+		instantiationService.stub(IQuickInputService, new MockQuickInputService(0));
+
+		const externalUriOpenerService: ExternalUriOpenerService = instantiationService.createInstance(ExternalUriOpenerService);
+
+		let openedWithEnabled = false;
+		externalUriOpenerService.registerExternalOpenerProvider(new class implements IExternalOpenerProvider {
+			async *getOpeners(_targetUri: URI): AsyncGenerator<IExternalUriOpener> {
+				yield {
+					id: 'disabled-id',
+					label: 'disabled',
+					canOpen: async () => ExternalUriOpenerPriority.None,
+					openExternalUri: async () => true,
+				};
+				yield {
+					id: 'enabled-id',
+					label: 'enabled',
+					canOpen: async () => ExternalUriOpenerPriority.Default,
+					openExternalUri: async () => {
+						openedWithEnabled = true;
+						return true;
+					}
+				};
+			}
+		});
+
+		const uri = URI.parse('http://contoso.com');
+		const didOpen = await externalUriOpenerService.openExternal(uri.toString(), { sourceUri: uri }, CancellationToken.None);
+		assert.strictEqual(didOpen, true);
+		assert.strictEqual(openedWithEnabled, true);
+	});
+
+	test('Should automatically pick single preferred opener without prompt', async () => {
+		const externalUriOpenerService: ExternalUriOpenerService = instantiationService.createInstance(ExternalUriOpenerService);
+
+		let openedWithPreferred = false;
+		externalUriOpenerService.registerExternalOpenerProvider(new class implements IExternalOpenerProvider {
+			async *getOpeners(_targetUri: URI): AsyncGenerator<IExternalUriOpener> {
+				yield {
+					id: 'other-id',
+					label: 'other',
+					canOpen: async () => ExternalUriOpenerPriority.Default,
+					openExternalUri: async () => {
+						return true;
+					}
+				};
+				yield {
+					id: 'preferred-id',
+					label: 'preferred',
+					canOpen: async () => ExternalUriOpenerPriority.Preferred,
+					openExternalUri: async () => {
+						openedWithPreferred = true;
+						return true;
+					}
+				};
+			}
+		});
+
+		const uri = URI.parse('http://contoso.com');
+		const didOpen = await externalUriOpenerService.openExternal(uri.toString(), { sourceUri: uri }, CancellationToken.None);
+		assert.strictEqual(didOpen, true);
+		assert.strictEqual(openedWithPreferred, true);
+	});
+});
diff --git a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
index 7b93fdb20..1cc203a01 100644
--- a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
@@ -10,13 +10,11 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { openEditorWith } from 'vs/workbench/services/editor/common/editorOpenWith';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 /**
  * An implementation of editor for binary files that cannot be displayed.
@@ -29,9 +27,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
 		@IOpenerService private readonly openerService: IOpenerService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IStorageService storageService: IStorageService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 	) {
@@ -55,7 +51,7 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 			input.setForceOpenAsText();
 
 			// If more editors are installed that can handle this input, show a picker
-			await openEditorWith(input, undefined, options, this.group, this.editorService, this.configurationService, this.quickInputService);
+			await this.instantiationService.invokeFunction(openEditorWith, input, undefined, options, this.group);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
index ec837dc48..cd7fb061e 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { isFunction, assertIsDefined } from 'vs/base/common/types';
 import { isValidBasename } from 'vs/base/common/extpath';
 import { basename } from 'vs/base/common/resources';
-import { Action } from 'vs/base/common/actions';
+import { toAction } from 'vs/base/common/actions';
 import { VIEWLET_ID, TEXT_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
 import { ITextFileService, TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
 import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
@@ -97,7 +97,7 @@ export class TextFileEditor extends BaseTextEditor {
 	}
 
 	getTitle(): string {
-		return this.input ? this.input.getName() : nls.localize('textFileEditor', "Text File Editor");
+		return this.input ? this.input.getName() : localize('textFileEditor', "Text File Editor");
 	}
 
 	get input(): FileEditorInput | undefined {
@@ -169,22 +169,24 @@ export class TextFileEditor extends BaseTextEditor {
 		if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_IS_DIRECTORY) {
 			this.openAsFolder(input);
 
-			throw new Error(nls.localize('openFolderError', "File is a directory"));
+			throw new Error(localize('openFolderError', "File is a directory"));
 		}
 
 		// Offer to create a file from the error if we have a file not found and the name is valid
 		if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_NOT_FOUND && isValidBasename(basename(input.preferredResource))) {
 			throw createErrorWithActions(toErrorMessage(error), {
 				actions: [
-					new Action('workbench.files.action.createMissingFile', nls.localize('createFile', "Create File"), undefined, true, async () => {
-						await this.textFileService.create(input.preferredResource);
+					toAction({
+						id: 'workbench.files.action.createMissingFile', label: localize('createFile', "Create File"), run: async () => {
+							await this.textFileService.create([{ resource: input.preferredResource }]);
 
-						return this.editorService.openEditor({
-							resource: input.preferredResource,
-							options: {
-								pinned: true // new file gets pinned by default
-							}
-						});
+							return this.editorService.openEditor({
+								resource: input.preferredResource,
+								options: {
+									pinned: true // new file gets pinned by default
+								}
+							});
+						}
 					})
 				]
 			});
diff --git a/src/vs/workbench/contrib/files/browser/explorerService.ts b/src/vs/workbench/contrib/files/browser/explorerService.ts
index a1a537578..fa078a16d 100644
--- a/src/vs/workbench/contrib/files/browser/explorerService.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerService.ts
@@ -10,7 +10,7 @@ import { IFilesConfiguration, SortOrder } from 'vs/workbench/contrib/files/commo
 import { ExplorerItem, ExplorerModel } from 'vs/workbench/contrib/files/common/explorerModel';
 import { URI } from 'vs/base/common/uri';
 import { FileOperationEvent, FileOperation, IFileService, FileChangesEvent, FileChangeType, IResolveFileOptions } from 'vs/platform/files/common/files';
-import { dirname } from 'vs/base/common/resources';
+import { dirname, basename } from 'vs/base/common/resources';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -19,7 +19,7 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur
 import { IBulkEditService, ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
 import { UndoRedoSource } from 'vs/platform/undoRedo/common/undoRedo';
 import { IExplorerView, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IProgressService, ProgressLocation, IProgressNotificationOptions, IProgressCompositeOptions } from 'vs/platform/progress/common/progress';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { RunOnceScheduler } from 'vs/base/common/async';
 
@@ -28,7 +28,7 @@ export const UNDO_REDO_SOURCE = new UndoRedoSource();
 export class ExplorerService implements IExplorerService {
 	declare readonly _serviceBrand: undefined;
 
-	private static readonly EXPLORER_FILE_CHANGES_REACT_DELAY = 1000; // delay in ms to react to file changes to give our internal events a chance to react first
+	private static readonly EXPLORER_FILE_CHANGES_REACT_DELAY = 500; // delay in ms to react to file changes to give our internal events a chance to react first
 
 	private readonly disposables = new DisposableStore();
 	private editable: { stat: ExplorerItem, data: IEditableData } | undefined;
@@ -60,17 +60,32 @@ export class ExplorerService implements IExplorerService {
 			this.fileChangeEvents = [];
 
 			// Filter to the ones we care
-			const types = [FileChangeType.ADDED, FileChangeType.DELETED];
+			const types = [FileChangeType.DELETED];
 			if (this._sortOrder === SortOrder.Modified) {
 				types.push(FileChangeType.UPDATED);
 			}
 
 			let shouldRefresh = false;
+			// For DELETED and UPDATED events go through the explorer model and check if any of the items got affected
 			this.roots.forEach(r => {
 				if (this.view && !shouldRefresh) {
 					shouldRefresh = doesFileEventAffect(r, this.view, events, types);
 				}
 			});
+			// For ADDED events we need to go through all the events and check if the explorer is already aware of some of them
+			// Or if they affect not yet resolved parts of the explorer. If that is the case we will not refresh.
+			events.forEach(e => {
+				if (!shouldRefresh) {
+					const added = e.getAdded();
+					if (added.some(a => {
+						const parent = this.model.findClosest(dirname(a.resource));
+						// Parent of the added resource is resolved and the explorer model is not aware of the added resource - we need to refresh
+						return parent && !parent.getChild(basename(a.resource));
+					})) {
+						shouldRefresh = true;
+					}
+				}
+			});
 
 			if (shouldRefresh) {
 				await this.refresh(false);
@@ -95,7 +110,7 @@ export class ExplorerService implements IExplorerService {
 			});
 			if (affected) {
 				if (this.view) {
-					await this.view.refresh(true);
+					await this.view.setTreeInput();
 				}
 			}
 		}));
@@ -125,19 +140,20 @@ export class ExplorerService implements IExplorerService {
 		return this.view.getContext(respectMultiSelection);
 	}
 
-	async applyBulkEdit(edit: ResourceFileEdit[], options: { undoLabel: string, progressLabel: string }): Promise<void> {
+	async applyBulkEdit(edit: ResourceFileEdit[], options: { undoLabel: string, progressLabel: string, confirmBeforeUndo?: boolean, progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window }): Promise<void> {
 		const cancellationTokenSource = new CancellationTokenSource();
-		const promise = this.progressService.withProgress({
-			location: ProgressLocation.Window,
-			delay: 500,
+		const promise = this.progressService.withProgress(<IProgressNotificationOptions | IProgressCompositeOptions>{
+			location: options.progressLocation || ProgressLocation.Window,
 			title: options.progressLabel,
-			cancellable: edit.length > 1 // Only allow cancellation when there is more than one edit. Since cancelling will not actually stop the current edit that is in progress.
+			cancellable: edit.length > 1, // Only allow cancellation when there is more than one edit. Since cancelling will not actually stop the current edit that is in progress.
+			delay: 500,
 		}, async progress => {
 			await this.bulkEditService.apply(edit, {
 				undoRedoSource: UNDO_REDO_SOURCE,
 				label: options.undoLabel,
 				progress,
-				token: cancellationTokenSource.token
+				token: cancellationTokenSource.token,
+				confirmBeforeUndo: options.confirmBeforeUndo
 			});
 		}, () => cancellationTokenSource.cancel());
 		await this.progressService.withProgress({ location: ProgressLocation.Explorer, delay: 500 }, () => promise);
@@ -345,11 +361,11 @@ export class ExplorerService implements IExplorerService {
 }
 
 function doesFileEventAffect(item: ExplorerItem, view: IExplorerView, events: FileChangesEvent[], types: FileChangeType[]): boolean {
-	if (events.some(e => e.affects(item.resource, ...types))) {
-		return true;
-	}
 	for (let [_name, child] of item.children) {
 		if (view.isItemVisible(child)) {
+			if (events.some(e => e.contains(child.resource, ...types))) {
+				return true;
+			}
 			if (child.isDirectory && child.isDirectoryResolved) {
 				if (doesFileEventAffect(child, view, events, types)) {
 					return true;
diff --git a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 9745ec52d..4753cc33d 100644
--- a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -28,7 +28,8 @@ import { DelegatingEditorService } from 'vs/workbench/services/editor/browser/ed
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorPane } from 'vs/workbench/common/editor';
-import { ViewPane, ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { KeyChord, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
@@ -41,6 +42,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 
 const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, localize('explorerViewIcon', 'View icon of the explorer view.'));
+const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, localize('openEditorsIcon', 'View icon of the open editors view.'));
 
 export class ExplorerViewletViewsContribution extends Disposable implements IWorkbenchContribution {
 
@@ -111,12 +113,13 @@ export class ExplorerViewletViewsContribution extends Disposable implements IWor
 			id: OpenEditorsView.ID,
 			name: OpenEditorsView.NAME,
 			ctorDescriptor: new SyncDescriptor(OpenEditorsView),
-			containerIcon: explorerViewIcon,
+			containerIcon: openEditorsViewIcon,
 			order: 0,
 			when: OpenEditorsVisibleContext,
 			canToggleVisibility: true,
 			canMoveView: true,
-			collapsed: true,
+			collapsed: false,
+			hideByDefault: true,
 			focusCommand: {
 				id: 'workbench.files.action.focusOpenEditorsView',
 				keybindings: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_E) }
@@ -207,7 +210,7 @@ export class ExplorerViewPaneContainer extends ViewPaneContainer {
 					let delay = 0;
 
 					const config = this.configurationService.getValue<IFilesConfiguration>();
-					const delayEditorOpeningInOpenedEditors = !!config.workbench.editor.enablePreview; // No need to delay if preview is disabled
+					const delayEditorOpeningInOpenedEditors = !!config.workbench?.editor?.enablePreview; // No need to delay if preview is disabled
 
 					const activeGroup = this.editorGroupService.activeGroup;
 					if (delayEditorOpeningInOpenedEditors && group === activeGroup && !activeGroup.previewEditor) {
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 80deb8269..c9b2dcd2a 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -5,12 +5,12 @@
 
 import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, ShowOpenedFileInNewWindow } from 'vs/workbench/contrib/files/browser/fileActions';
+import { ToggleAutoSaveAction, FocusFilesExplorer, GlobalCompareResourcesAction, ShowActiveFileInExplorer, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler, cutFileHandler, DOWNLOAD_COMMAND_ID, openFilePreserveFocusHandler, DOWNLOAD_LABEL, ShowOpenedFileInNewWindow } from 'vs/workbench/contrib/files/browser/fileActions';
 import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry, ILocalizedString } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { openWindowCommand, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, OpenEditorsDirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, newWindowCommand, OpenEditorsReadonlyEditorContext, OPEN_WITH_EXPLORER_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL } from 'vs/workbench/contrib/files/browser/fileCommands';
+import { openWindowCommand, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, OpenEditorsDirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, newWindowCommand, OpenEditorsReadonlyEditorContext, OPEN_WITH_EXPLORER_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, SAVE_ALL_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -36,12 +36,9 @@ import { Codicon } from 'vs/base/common/codicons';
 const category = { value: nls.localize('filesCategory', "File"), original: 'File' };
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(SaveAllAction, { primary: undefined, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_S }, win: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_S) } }), 'File: Save All', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(GlobalCompareResourcesAction), 'File: Compare Active File With...', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(FocusFilesExplorer), 'File: Focus on Files Explorer', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ShowActiveFileInExplorer), 'File: Reveal Active File in Side Bar', category.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(CollapseExplorerView), 'File: Collapse Folders in Explorer', category.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(RefreshExplorerView), 'File: Refresh Explorer', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(CompareWithClipboardAction, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_C) }), 'File: Compare Active File with Clipboard', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleAutoSaveAction), 'File: Toggle Auto Save', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ShowOpenedFileInNewWindow, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_O) }), 'File: Open Active File in New Window', category.value, EmptyWorkspaceSupportContext);
@@ -612,7 +609,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 	group: '4_save',
 	command: {
-		id: SaveAllAction.ID,
+		id: SAVE_ALL_COMMAND_ID,
 		title: nls.localize({ key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll"),
 		precondition: DirtyWorkingCopiesContext
 	},
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 46aacd31f..69d3c400c 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -15,13 +15,12 @@ import { DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/com
 import { VIEWLET_ID, IFilesConfiguration, VIEW_ID } from 'vs/workbench/contrib/files/common/files';
 import { ByteSize, IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { IQuickInputService, ItemActivation } from 'vs/platform/quickinput/common/quickInput';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
+import { REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -83,40 +82,6 @@ async function refreshIfSeparator(value: string, explorerService: IExplorerServi
 	}
 }
 
-/* New File */
-export class NewFileAction extends Action {
-	static readonly ID = 'workbench.files.action.createFileFromExplorer';
-	static readonly LABEL = nls.localize('createNewFile', "New File");
-
-	constructor(
-		@ICommandService private commandService: ICommandService
-	) {
-		super('explorer.newFile', NEW_FILE_LABEL);
-		this.class = 'explorer-action ' + Codicon.newFile.classNames;
-	}
-
-	run(): Promise<void> {
-		return this.commandService.executeCommand(NEW_FILE_COMMAND_ID);
-	}
-}
-
-/* New Folder */
-export class NewFolderAction extends Action {
-	static readonly ID = 'workbench.files.action.createFolderFromExplorer';
-	static readonly LABEL = nls.localize('createNewFolder', "New Folder");
-
-	constructor(
-		@ICommandService private commandService: ICommandService
-	) {
-		super('explorer.newFolder', NEW_FOLDER_LABEL);
-		this.class = 'explorer-action ' + Codicon.newFolder.classNames;
-	}
-
-	run(): Promise<void> {
-		return this.commandService.executeCommand(NEW_FOLDER_COMMAND_ID);
-	}
-}
-
 async function deleteFiles(explorerService: IExplorerService, workingCopyFileService: IWorkingCopyFileService, dialogService: IDialogService, configurationService: IConfigurationService, elements: ExplorerItem[], useTrash: boolean, skipConfirm = false): Promise<void> {
 	let primaryButton: string;
 	if (useTrash) {
@@ -168,6 +133,9 @@ async function deleteFiles(explorerService: IExplorerService, workingCopyFileSer
 	}
 
 	let confirmation: IConfirmationResult;
+	// We do not support undo of folders, so in that case the delete action is irreversible
+	const deleteDetail = distinctElements.some(e => e.isDirectory) ? nls.localize('irreversible', "This action is irreversible!") :
+		distinctElements.length > 1 ? nls.localize('restorePlural', "You can restore these files using the Undo command") : nls.localize('restore', "You can restore this file using the Undo command");
 
 	// Check if we need to ask for confirmation at all
 	if (skipConfirm || (useTrash && configurationService.getValue<boolean>(CONFIRM_DELETE_SETTING_KEY) === false)) {
@@ -199,7 +167,7 @@ async function deleteFiles(explorerService: IExplorerService, workingCopyFileSer
 	else {
 		let { message, detail } = getDeleteMessage(distinctElements);
 		detail += detail ? '\n' : '';
-		detail += nls.localize('irreversible', "This action is irreversible!");
+		detail += deleteDetail;
 		confirmation = await dialogService.confirm({
 			message,
 			detail,
@@ -222,8 +190,8 @@ async function deleteFiles(explorerService: IExplorerService, workingCopyFileSer
 	try {
 		const resourceFileEdits = distinctElements.map(e => new ResourceFileEdit(e.resource, undefined, { recursive: true, folder: e.isDirectory, skipTrashBin: !useTrash, maxSize: MAX_UNDO_FILE_SIZE }));
 		const options = {
-			undoLabel: distinctElements.length > 1 ? nls.localize('deleteBulkEdit', "Delete {0} files", distinctElements.length) : nls.localize('deleteFileBulkEdit', "Delete {0}", distinctElements[0].name),
-			progressLabel: distinctElements.length > 1 ? nls.localize('deletingBulkEdit', "Deleting {0} files", distinctElements.length) : nls.localize('deletingFileBulkEdit', "Deleting {0}", distinctElements[0].name),
+			undoLabel: distinctElements.length > 1 ? nls.localize({ key: 'deleteBulkEdit', comment: ['Placeholder will be replaced by the number of files deleted'] }, "Delete {0} files", distinctElements.length) : nls.localize({ key: 'deleteFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file deleted'] }, "Delete {0}", distinctElements[0].name),
+			progressLabel: distinctElements.length > 1 ? nls.localize({ key: 'deletingBulkEdit', comment: ['Placeholder will be replaced by the number of files deleted'] }, "Deleting {0} files", distinctElements.length) : nls.localize({ key: 'deletingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file deleted'] }, "Deleting {0}", distinctElements[0].name),
 		};
 		await explorerService.applyBulkEdit(resourceFileEdits, options);
 	} catch (error) {
@@ -234,7 +202,7 @@ async function deleteFiles(explorerService: IExplorerService, workingCopyFileSer
 		let primaryButton: string;
 		if (useTrash) {
 			errorMessage = isWindows ? nls.localize('binFailed', "Failed to delete using the Recycle Bin. Do you want to permanently delete instead?") : nls.localize('trashFailed', "Failed to delete using the Trash. Do you want to permanently delete instead?");
-			detailMessage = nls.localize('irreversible', "This action is irreversible!");
+			detailMessage = deleteDetail;
 			primaryButton = nls.localize({ key: 'deletePermanentlyButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Delete Permanently");
 		} else {
 			errorMessage = toErrorMessage(error, false);
@@ -411,6 +379,32 @@ export function incrementFileName(name: string, isFolder: boolean, incrementalNa
 		return `${name.substr(0, lastIndexOfDot)}.1${name.substr(lastIndexOfDot)}`;
 	}
 
+	// 123 => 124
+	let noNameNoExtensionRegex = RegExp('(\\d+)$');
+	if (!isFolder && lastIndexOfDot === -1 && name.match(noNameNoExtensionRegex)) {
+		return name.replace(noNameNoExtensionRegex, (match, g1?) => {
+			let number = parseInt(g1);
+			return number < maxNumber
+				? String(number + 1).padStart(g1.length, '0')
+				: `${g1}.1`;
+		});
+	}
+
+	// file => file1
+	// file1 => file2
+	let noExtensionRegex = RegExp('(.*)(\d*)$');
+	if (!isFolder && lastIndexOfDot === -1 && name.match(noExtensionRegex)) {
+		return name.replace(noExtensionRegex, (match, g1?, g2?) => {
+			let number = parseInt(g2);
+			if (isNaN(number)) {
+				number = 0;
+			}
+			return number < maxNumber
+				? g1 + String(number + 1).padStart(g2.length, '0')
+				: `${g1}${g2}.1`;
+		});
+	}
+
 	// folder.1=>folder.2
 	if (isFolder && name.match(/(\d+)$/)) {
 		return name.replace(/(\d+)$/, (match, ...groups) => {
@@ -560,20 +554,6 @@ export abstract class BaseSaveAllAction extends Action {
 	}
 }
 
-export class SaveAllAction extends BaseSaveAllAction {
-
-	static readonly ID = 'workbench.action.files.saveAll';
-	static readonly LABEL = SAVE_ALL_LABEL;
-
-	get class(): string {
-		return 'explorer-action ' + Codicon.saveAll.classNames;
-	}
-
-	protected doRun(): Promise<void> {
-		return this.commandService.executeCommand(SAVE_ALL_COMMAND_ID);
-	}
-}
-
 export class SaveAllInGroupAction extends BaseSaveAllAction {
 
 	static readonly ID = 'workbench.files.action.saveAllInGroup';
@@ -645,48 +625,6 @@ export class ShowActiveFileInExplorer extends Action {
 	}
 }
 
-export class CollapseExplorerView extends Action {
-
-	static readonly ID = 'workbench.files.action.collapseExplorerFolders';
-	static readonly LABEL = nls.localize('collapseExplorerFolders', "Collapse Folders in Explorer");
-
-	constructor(id: string,
-		label: string,
-		@IViewletService private readonly viewletService: IViewletService,
-		@IExplorerService readonly explorerService: IExplorerService
-	) {
-		super(id, label, 'explorer-action ' + Codicon.collapseAll.classNames);
-	}
-
-	async run(): Promise<void> {
-		const explorerViewlet = (await this.viewletService.openViewlet(VIEWLET_ID))?.getViewPaneContainer() as ExplorerViewPaneContainer;
-		const explorerView = explorerViewlet.getExplorerView();
-		if (explorerView) {
-			explorerView.collapseAll();
-		}
-	}
-}
-
-export class RefreshExplorerView extends Action {
-
-	static readonly ID = 'workbench.files.action.refreshFilesExplorer';
-	static readonly LABEL = nls.localize('refreshExplorer', "Refresh Explorer");
-
-
-	constructor(
-		id: string, label: string,
-		@IViewletService private readonly viewletService: IViewletService,
-		@IExplorerService private readonly explorerService: IExplorerService
-	) {
-		super(id, label, 'explorer-action ' + Codicon.refresh.classNames);
-	}
-
-	async run(): Promise<void> {
-		await this.viewletService.openViewlet(VIEWLET_ID);
-		await this.explorerService.refresh();
-	}
-}
-
 export class ShowOpenedFileInNewWindow extends Action {
 
 	static readonly ID = 'workbench.action.files.showOpenedFileInNewWindow';
@@ -915,7 +853,8 @@ async function openExplorerAndCreate(accessor: ServicesAccessor, isFolder: boole
 			const resourceToCreate = resources.joinPath(folder.resource, value);
 			await explorerService.applyBulkEdit([new ResourceFileEdit(undefined, resourceToCreate, { folder: isFolder })], {
 				undoLabel: nls.localize('createBulkEdit', "Create {0}", value),
-				progressLabel: nls.localize('creatingBulkEdit', "Creating {0}", value)
+				progressLabel: nls.localize('creatingBulkEdit', "Creating {0}", value),
+				confirmBeforeUndo: true
 			});
 			await refreshIfSeparator(value, explorerService);
 
@@ -1242,7 +1181,7 @@ const downloadFileHandler = async (accessor: ServicesAccessor) => {
 				const destination = await fileDialogService.showSaveDialog({
 					availableFileSystems: [Schemas.file],
 					saveLabel: mnemonicButtonLabel(nls.localize('downloadButton', "Download")),
-					title: explorerItem.isDirectory ? nls.localize('downloadFolder', "Download Folder") : nls.localize('downloadFile', "Download File"),
+					title: nls.localize('chooseWhereToDownload', "Choose Where to Download"),
 					defaultUri
 				});
 
@@ -1250,6 +1189,7 @@ const downloadFileHandler = async (accessor: ServicesAccessor) => {
 					await explorerService.applyBulkEdit([new ResourceFileEdit(explorerItem.resource, destination, { overwrite: true, copy: true })], {
 						undoLabel: nls.localize('downloadBulkEdit', "Download {0}", explorerItem.name),
 						progressLabel: nls.localize('downloadingBulkEdit', "Downloading {0}", explorerItem.name),
+						progressLocation: ProgressLocation.Explorer
 					});
 				} else {
 					cts.cancel(); // User canceled a download. In case there were multiple files selected we should cancel the remainder of the prompts #86100
@@ -1305,15 +1245,19 @@ export const pasteFileHandler = async (accessor: ServicesAccessor) => {
 			if (pasteShouldMove) {
 				const resourceFileEdits = sourceTargetPairs.map(pair => new ResourceFileEdit(pair.source, pair.target));
 				const options = {
-					progressLabel: sourceTargetPairs.length > 1 ? nls.localize('movingBulkEdit', "Moving {0} files", sourceTargetPairs.length) : nls.localize('movingFileBulkEdit', "Moving {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target)),
-					undoLabel: sourceTargetPairs.length > 1 ? nls.localize('moveBulkEdit', "Move {0} files", sourceTargetPairs.length) : nls.localize('moveFileBulkEdit', "Move {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target))
+					progressLabel: sourceTargetPairs.length > 1 ? nls.localize({ key: 'movingBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] }, "Moving {0} files", sourceTargetPairs.length)
+						: nls.localize({ key: 'movingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] }, "Moving {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target)),
+					undoLabel: sourceTargetPairs.length > 1 ? nls.localize({ key: 'moveBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] }, "Move {0} files", sourceTargetPairs.length)
+						: nls.localize({ key: 'moveFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] }, "Move {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target))
 				};
 				await explorerService.applyBulkEdit(resourceFileEdits, options);
 			} else {
 				const resourceFileEdits = sourceTargetPairs.map(pair => new ResourceFileEdit(pair.source, pair.target, { copy: true }));
 				const options = {
-					progressLabel: sourceTargetPairs.length > 1 ? nls.localize('copyingBulkEdit', "Copying {0} files", sourceTargetPairs.length) : nls.localize('copyingFileBulkEdit', "Copying {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target)),
-					undoLabel: sourceTargetPairs.length > 1 ? nls.localize('copyBulkEdit', "Copy {0} files", sourceTargetPairs.length) : nls.localize('copyFileBulkEdit', "Copy {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target))
+					progressLabel: sourceTargetPairs.length > 1 ? nls.localize({ key: 'copyingBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] }, "Copying {0} files", sourceTargetPairs.length)
+						: nls.localize({ key: 'copyingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] }, "Copying {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target)),
+					undoLabel: sourceTargetPairs.length > 1 ? nls.localize({ key: 'copyBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] }, "Copy {0} files", sourceTargetPairs.length)
+						: nls.localize({ key: 'copyFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] }, "Copy {0}", resources.basenameOrAuthority(sourceTargetPairs[0].target))
 				};
 				await explorerService.applyBulkEdit(resourceFileEdits, options);
 			}
diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
index 8e1badc5f..ef6eb4dd9 100644
--- a/src/vs/workbench/contrib/files/browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -40,8 +40,6 @@ import { coalesce } from 'vs/base/common/arrays';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { openEditorWith } from 'vs/workbench/services/editor/common/editorOpenWith';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
@@ -356,13 +354,11 @@ CommandsRegistry.registerCommand({
 	handler: async (accessor, resource: URI | object) => {
 		const editorService = accessor.get(IEditorService);
 		const editorGroupsService = accessor.get(IEditorGroupsService);
-		const configurationService = accessor.get(IConfigurationService);
-		const quickInputService = accessor.get(IQuickInputService);
 
 		const uri = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IEditorService));
 		if (uri) {
 			const input = editorService.createEditorInput({ resource: uri });
-			openEditorWith(input, undefined, undefined, editorGroupsService.activeGroup, editorService, configurationService, quickInputService);
+			openEditorWith(accessor, input, undefined, undefined, editorGroupsService.activeGroup);
 		}
 	}
 });
@@ -482,7 +478,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-CommandsRegistry.registerCommand({
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	when: undefined,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: undefined,
+	mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_S },
+	win: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_S) },
 	id: SAVE_ALL_COMMAND_ID,
 	handler: (accessor) => {
 		return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE), { reason: SaveReason.EXPLICIT });
@@ -664,12 +665,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 		if (typeof args?.viewType === 'string') {
 			const editorGroupsService = accessor.get(IEditorGroupsService);
-			const configurationService = accessor.get(IConfigurationService);
-			const quickInputService = accessor.get(IQuickInputService);
 
 			const textInput = editorService.createEditorInput({ options: { pinned: true } });
 			const group = editorGroupsService.activeGroup;
-			await openEditorWith(textInput, args.viewType, { pinned: true }, group, editorService, configurationService, quickInputService);
+			await openEditorWith(accessor, textInput, args.viewType, { pinned: true }, group);
 		} else {
 			await editorService.openEditor({ options: { pinned: true } }); // untitled are always pinned
 		}
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index 7ea77d336..f4b223bf4 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -198,8 +198,8 @@ const hotExitConfiguration: IConfigurationPropertySchema = platform.isNative ?
 		'default': HotExitConfiguration.ON_EXIT,
 		'markdownEnumDescriptions': [
 			nls.localize('hotExit.off', 'Disable hot exit. A prompt will show when attempting to close a window with dirty files.'),
-			nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu). All windows without folders opened will be restored upon next launch. A list of workspaces with unsaved files can be accessed via `File > Open Recent > More...`'),
-			nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. A list of workspaces with unsaved files can be accessed via `File > Open Recent > More...`')
+			nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu). All windows without folders opened will be restored upon next launch. A list of previously opened windows with unsaved files can be accessed via `File > Open Recent > More...`'),
+			nls.localize('hotExit.onExitAndWindowClose', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu), and also for any window with a folder opened regardless of whether it\'s the last window. All windows without folders opened will be restored upon next launch. A list of previously opened windows with unsaved files can be accessed via `File > Open Recent > More...`')
 		],
 		'description': nls.localize('hotExit', "Controls whether unsaved files are remembered between sessions, allowing the save prompt when exiting the editor to be skipped.", HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE)
 	} : {
@@ -386,7 +386,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize({ key: 'everything', comment: ['This is the description of an option'] }, "Format the whole file."),
 				nls.localize({ key: 'modification', comment: ['This is the description of an option'] }, "Format modifications (requires source control)."),
 			],
-			'markdownDescription': nls.localize('formatOnSaveMode', "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is `true`."),
+			'markdownDescription': nls.localize('formatOnSaveMode', "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled."),
 			'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
 		},
 	}
@@ -492,7 +492,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
 UndoCommand.addImplementation(110, (accessor: ServicesAccessor) => {
 	const undoRedoService = accessor.get(IUndoRedoService);
 	const explorerService = accessor.get(IExplorerService);
-	if (explorerService.hasViewFocus()) {
+	if (explorerService.hasViewFocus() && undoRedoService.canUndo(UNDO_REDO_SOURCE)) {
 		undoRedoService.undo(UNDO_REDO_SOURCE);
 		return true;
 	}
@@ -503,7 +503,7 @@ UndoCommand.addImplementation(110, (accessor: ServicesAccessor) => {
 RedoCommand.addImplementation(110, (accessor: ServicesAccessor) => {
 	const undoRedoService = accessor.get(IUndoRedoService);
 	const explorerService = accessor.get(IExplorerService);
-	if (explorerService.hasViewFocus()) {
+	if (explorerService.hasViewFocus() && undoRedoService.canRedo(UNDO_REDO_SOURCE)) {
 		undoRedoService.redo(UNDO_REDO_SOURCE);
 		return true;
 	}
diff --git a/src/vs/workbench/contrib/files/browser/files.ts b/src/vs/workbench/contrib/files/browser/files.ts
index 95e137cb3..bd0880343 100644
--- a/src/vs/workbench/contrib/files/browser/files.ts
+++ b/src/vs/workbench/contrib/files/browser/files.ts
@@ -16,6 +16,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { IEditableData } from 'vs/workbench/common/views';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
+import { ProgressLocation } from 'vs/platform/progress/common/progress';
 
 
 export interface IExplorerService {
@@ -34,7 +35,7 @@ export interface IExplorerService {
 	refresh(): Promise<void>;
 	setToCopy(stats: ExplorerItem[], cut: boolean): Promise<void>;
 	isCut(stat: ExplorerItem): boolean;
-	applyBulkEdit(edit: ResourceFileEdit[], options: { undoLabel: string, progressLabel: string }): Promise<void>;
+	applyBulkEdit(edit: ResourceFileEdit[], options: { undoLabel: string, progressLabel: string, confirmBeforeUndo?: boolean, progressLocation?: ProgressLocation.Explorer | ProgressLocation.Window }): Promise<void>;
 
 	/**
 	 * Selects and reveal the file element provided by the given resource if its found in the explorer.
diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
index 8d645ccaa..29bad5473 100644
--- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
@@ -89,7 +89,7 @@
 	height: 22px;
 }
 
-.monaco-workbench .explorer-viewlet .explorer-item .monaco-inputbox > .wrapper > .input {
+.monaco-workbench .explorer-viewlet .explorer-item .monaco-inputbox > .ibwrapper > .input {
 	padding: 0;
 	height: 20px;
 }
diff --git a/src/vs/workbench/contrib/files/browser/views/emptyView.ts b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
index d649859fc..7e70f008f 100644
--- a/src/vs/workbench/contrib/files/browser/views/emptyView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
@@ -11,7 +11,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { ResourcesDropHandler, DragAndDropObserver } from 'vs/workbench/browser/dnd';
 import { listDropBackground } from 'vs/platform/theme/common/colorRegistry';
 import { ILabelService } from 'vs/platform/label/common/label';
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index a9309b467..59ca8405e 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -8,30 +8,30 @@ import { URI } from 'vs/base/common/uri';
 import * as perf from 'vs/base/common/performance';
 import { IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
 import { memoize } from 'vs/base/common/decorators';
-import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ExplorerResourceAvailableEditorIdsContext } from 'vs/workbench/contrib/files/common/files';
-import { NewFolderAction, NewFileAction, FileCopiedContext, RefreshExplorerView, CollapseExplorerView } from 'vs/workbench/contrib/files/browser/fileActions';
+import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, ExplorerResourceCut, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ExplorerResourceAvailableEditorIdsContext, VIEW_ID, VIEWLET_ID } from 'vs/workbench/contrib/files/common/files';
+import { FileCopiedContext, NEW_FILE_COMMAND_ID, NEW_FOLDER_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileActions';
 import * as DOM from 'vs/base/browser/dom';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { ExplorerDecorationsProvider } from 'vs/workbench/contrib/files/browser/views/explorerDecorationsProvider';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, IContextKey, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { IDecorationsService } from 'vs/workbench/services/decorations/browser/decorations';
 import { WorkbenchCompressibleAsyncDataTree } from 'vs/platform/list/browser/listService';
 import { DelayedDragHandler } from 'vs/base/browser/dnd';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IViewPaneOptions, ViewPane, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ExplorerDelegate, ExplorerDataSource, FilesRenderer, ICompressedNavigationController, FilesFilter, FileSorter, FileDragAndDrop, ExplorerCompressionDelegate, isCompressedFolderName } from 'vs/workbench/contrib/files/browser/views/explorerViewer';
 import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITreeContextMenuEvent, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
+import { IMenuService, MenuId, IMenu, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
@@ -52,6 +52,9 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { IExplorerService } from 'vs/workbench/contrib/files/browser/files';
+import { Codicon } from 'vs/base/common/codicons';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 
 interface IExplorerViewColors extends IColorMapping {
 	listDropBackground?: ColorValue | undefined;
@@ -75,6 +78,16 @@ function hasExpandedRootChild(tree: WorkbenchCompressibleAsyncDataTree<ExplorerI
 	return false;
 }
 
+const identityProvider = {
+	getId: (stat: ExplorerItem) => {
+		if (stat instanceof NewExplorerItem) {
+			return `new:${stat.resource}`;
+		}
+
+		return stat.resource;
+	}
+};
+
 export function getContext(focus: ExplorerItem[], selection: ExplorerItem[], respectMultiSelection: boolean,
 	compressedNavigationControllerProvider: { getCompressedNavigationController(stat: ExplorerItem): ICompressedNavigationController | undefined }): ExplorerItem[] {
 
@@ -146,7 +159,6 @@ export class ExplorerView extends ViewPane {
 	private shouldRefresh = true;
 	private dragHandler!: DelayedDragHandler;
 	private autoReveal: boolean | 'focusNoScroll' = false;
-	private actions: IAction[] | undefined;
 	private decorationsProvider: ExplorerDecorationsProvider | undefined;
 
 	constructor(
@@ -284,19 +296,6 @@ export class ExplorerView extends ViewPane {
 		}));
 	}
 
-	getActions(): IAction[] {
-		if (!this.actions) {
-			this.actions = [
-				this.instantiationService.createInstance(NewFileAction),
-				this.instantiationService.createInstance(NewFolderAction),
-				this.instantiationService.createInstance(RefreshExplorerView, RefreshExplorerView.ID, RefreshExplorerView.LABEL),
-				this.instantiationService.createInstance(CollapseExplorerView, CollapseExplorerView.ID, CollapseExplorerView.LABEL)
-			];
-			this.actions.forEach(a => this._register(a));
-		}
-		return this.actions;
-	}
-
 	focus(): void {
 		this.tree.domFocus();
 
@@ -381,15 +380,7 @@ export class ExplorerView extends ViewPane {
 			this.instantiationService.createInstance(ExplorerDataSource), {
 			compressionEnabled: isCompressionEnabled(),
 			accessibilityProvider: this.renderer,
-			identityProvider: {
-				getId: (stat: ExplorerItem) => {
-					if (stat instanceof NewExplorerItem) {
-						return `new:${stat.resource}`;
-					}
-
-					return stat.resource;
-				}
-			},
+			identityProvider,
 			keyboardNavigationLabelProvider: {
 				getKeyboardNavigationLabel: (stat: ExplorerItem) => {
 					if (this.explorerService.isEditable(stat)) {
@@ -593,7 +584,9 @@ export class ExplorerView extends ViewPane {
 		}
 
 		const toRefresh = item || this.tree.getInput();
-		return this.tree.updateChildren(toRefresh, recursive);
+		return this.tree.updateChildren(toRefresh, recursive, false, {
+			diffIdentityProvider: identityProvider
+		});
 	}
 
 	focusNeighbourIfItemFocused(item: ExplorerItem): void {
@@ -635,7 +628,7 @@ export class ExplorerView extends ViewPane {
 
 		const initialInputSetup = !this.tree.getInput();
 		if (initialInputSetup) {
-			perf.mark('willResolveExplorer');
+			perf.mark('code/willResolveExplorer');
 		}
 		const roots = this.explorerService.roots;
 		let input: ExplorerItem | ExplorerItem[] = roots[0];
@@ -675,7 +668,7 @@ export class ExplorerView extends ViewPane {
 				}
 			}
 			if (initialInputSetup) {
-				perf.mark('didResolveExplorer');
+				perf.mark('code/didResolveExplorer');
 			}
 		});
 
@@ -856,3 +849,93 @@ function createFileIconThemableTreeContainerScope(container: HTMLElement, themeS
 	onDidChangeFileIconTheme(themeService.getFileIconTheme());
 	return themeService.onDidFileIconThemeChange(onDidChangeFileIconTheme);
 }
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.files.action.createFileFromExplorer',
+			title: nls.localize('createNewFile', "New File"),
+			f1: false,
+			icon: Codicon.newFile,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+				order: 10
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const commandService = accessor.get(ICommandService);
+		commandService.executeCommand(NEW_FILE_COMMAND_ID);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.files.action.createFolderFromExplorer',
+			title: nls.localize('createNewFolder', "New Folder"),
+			f1: false,
+			icon: Codicon.newFolder,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+				order: 20
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const commandService = accessor.get(ICommandService);
+		commandService.executeCommand(NEW_FOLDER_COMMAND_ID);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.files.action.refreshFilesExplorer',
+			title: nls.localize('refreshExplorer', "Refresh Explorer"),
+			f1: true,
+			icon: Codicon.refresh,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+				order: 30
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const viewletService = accessor.get(IViewletService);
+		const explorerService = accessor.get(IExplorerService);
+		await viewletService.openViewlet(VIEWLET_ID);
+		await explorerService.refresh();
+	}
+});
+
+registerAction2(class extends ViewAction<ExplorerView> {
+	constructor() {
+		super({
+			id: 'workbench.files.action.collapseExplorerFolders',
+			title: nls.localize('collapseExplorerFolders', "Collapse Folders in Explorer"),
+			viewId: VIEW_ID,
+			f1: true,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+				order: 40
+			}
+		});
+	}
+
+	runInView(_accessor: ServicesAccessor, view: ExplorerView): void {
+		view.collapseAll();
+	}
+});
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index 9e8330b3d..6bf781d2e 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -451,7 +451,7 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 			}),
 			DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
 				if (e.equals(KeyCode.Enter)) {
-					if (inputBox.validate()) {
+					if (!inputBox.validate()) {
 						done(true, true);
 					}
 				} else if (e.equals(KeyCode.Escape)) {
@@ -626,7 +626,7 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
 			stat.isExcluded = true;
 			return false;
 		}
-		if (this.explorerService.getEditableData(stat) || stat.isRoot) {
+		if (this.explorerService.getEditableData(stat)) {
 			return true; // always visible
 		}
 
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index 3535108c3..db0b429cf 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -9,16 +9,15 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { IAction, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
 import * as dom from 'vs/base/browser/dom';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IEditorGroupsService, IEditorGroup, GroupChangeKind, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IEditorGroupsService, IEditorGroup, GroupChangeKind, GroupsOrder, GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorInput, Verbosity, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
-import { SaveAllAction, SaveAllInGroupAction, CloseGroupAction } from 'vs/workbench/contrib/files/browser/fileActions';
+import { SaveAllInGroupAction, CloseGroupAction } from 'vs/workbench/contrib/files/browser/fileActions';
 import { OpenEditorsFocusedContext, ExplorerFocusedContext, IFilesConfiguration, OpenEditor } from 'vs/workbench/contrib/files/common/files';
 import { CloseAllEditorsAction, CloseEditorAction, UnpinEditorAction } from 'vs/workbench/browser/parts/editor/editorActions';
-import { ToggleEditorLayoutAction } from 'vs/workbench/browser/actions/layoutActions';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, IContextKey, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
@@ -30,11 +29,11 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
-import { OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext } from 'vs/workbench/contrib/files/browser/fileCommands';
+import { IMenuService, MenuId, IMenu, Action2, registerAction2, MenuRegistry } from 'vs/platform/actions/common/actions';
+import { OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { ResourcesDropHandler, fillResourceDataTransfers, CodeDataTransfers, containsDragType } from 'vs/workbench/browser/dnd';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IDragAndDropData, DataTransfers } from 'vs/base/browser/dnd';
 import { memoize } from 'vs/base/common/decorators';
@@ -49,6 +48,10 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { compareFileNamesDefault } from 'vs/base/common/comparers';
+import { Codicon } from 'vs/base/common/codicons';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 
 const $ = dom.$;
 
@@ -92,14 +95,26 @@ export class OpenEditorsView extends ViewPane {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 
 		this.structuralRefreshDelay = 0;
+		let labelChangeListeners: IDisposable[] = [];
 		this.listRefreshScheduler = new RunOnceScheduler(() => {
+			labelChangeListeners = dispose(labelChangeListeners);
 			const previousLength = this.list.length;
-			this.list.splice(0, this.list.length, this.getElements());
+			const elements = this.getElements();
+			this.list.splice(0, this.list.length, elements);
 			this.focusActiveEditor();
 			if (previousLength !== this.list.length) {
 				this.updateSize();
 			}
 			this.needsRefresh = false;
+
+			if (this.sortOrder === 'alphabetical') {
+				// We need to resort the list if the editor label changed
+				elements.forEach(e => {
+					if (e instanceof OpenEditor) {
+						labelChangeListeners.push(e.editor.onDidChangeLabel(() => this.listRefreshScheduler.schedule()));
+					}
+				});
+			}
 		}, this.structuralRefreshDelay);
 		this.sortOrder = configurationService.getValue('explorer.openEditors.sortOrder');
 
@@ -151,6 +166,7 @@ export class OpenEditorsView extends ViewPane {
 					case GroupChangeKind.EDITOR_STICKY:
 					case GroupChangeKind.EDITOR_PIN: {
 						this.list.splice(index, 1, [new OpenEditor(e.editor!, group)]);
+						this.focusActiveEditor();
 						break;
 					}
 					case GroupChangeKind.EDITOR_OPEN:
@@ -294,14 +310,6 @@ export class OpenEditorsView extends ViewPane {
 		}));
 	}
 
-	getActions(): IAction[] {
-		return [
-			this.instantiationService.createInstance(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL),
-			this.instantiationService.createInstance(SaveAllAction, SaveAllAction.ID, SaveAllAction.LABEL),
-			this.instantiationService.createInstance(CloseAllEditorsAction, CloseAllEditorsAction.ID, CloseAllEditorsAction.LABEL)
-		];
-	}
-
 	focus(): void {
 		super.focus();
 		this.list.domFocus();
@@ -705,3 +713,86 @@ class OpenEditorsAccessibilityProvider implements IListAccessibilityProvider<Ope
 		return element.ariaLabel;
 	}
 }
+
+const toggleEditorGroupLayoutId = 'workbench.action.toggleEditorGroupLayout';
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.toggleEditorGroupLayout',
+			title: nls.localize('flipLayout', "Toggle Vertical/Horizontal Editor Layout"),
+			f1: true,
+			keybinding: {
+				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 },
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			icon: Codicon.editorLayout,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', OpenEditorsView.ID),
+				order: 10
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorGroupService = accessor.get(IEditorGroupsService);
+		const newOrientation = (editorGroupService.orientation === GroupOrientation.VERTICAL) ? GroupOrientation.HORIZONTAL : GroupOrientation.VERTICAL;
+		editorGroupService.setGroupOrientation(newOrientation);
+	}
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+	group: 'z_flip',
+	command: {
+		id: toggleEditorGroupLayoutId,
+		title: nls.localize({ key: 'miToggleEditorLayout', comment: ['&& denotes a mnemonic'] }, "Flip &&Layout")
+	},
+	order: 1
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.files.saveAll',
+			title: SAVE_ALL_LABEL,
+			f1: true,
+			icon: Codicon.saveAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', OpenEditorsView.ID),
+				order: 20
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const commandService = accessor.get(ICommandService);
+		await commandService.executeCommand(SAVE_ALL_COMMAND_ID);
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'openEditors.closeAll',
+			title: CloseAllEditorsAction.LABEL,
+			f1: false,
+			icon: Codicon.closeAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', OpenEditorsView.ID),
+				order: 30
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+		const closeAll = instantiationService.createInstance(CloseAllEditorsAction, CloseAllEditorsAction.ID, CloseAllEditorsAction.LABEL);
+		await closeAll.run();
+	}
+});
diff --git a/src/vs/workbench/contrib/files/common/workspaceWatcher.ts b/src/vs/workbench/contrib/files/common/workspaceWatcher.ts
index 04bfd96da..1534bdc86 100644
--- a/src/vs/workbench/contrib/files/common/workspaceWatcher.ts
+++ b/src/vs/workbench/contrib/files/common/workspaceWatcher.ts
@@ -89,7 +89,7 @@ export class WorkspaceWatcher extends Disposable {
 		if (msg.indexOf('ENOSPC') >= 0) {
 			this.notificationService.prompt(
 				Severity.Warning,
-				localize('enospcError', "Unable to watch for file changes in this large workspace. Please follow the instructions link to resolve this issue."),
+				localize('enospcError', "Unable to watch for file changes in this large workspace folder. Please follow the instructions link to resolve this issue."),
 				[{
 					label: localize('learnMore', "Instructions"),
 					run: () => this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?linkid=867693'))
diff --git a/src/vs/workbench/contrib/files/electron-sandbox/textFileEditor.ts b/src/vs/workbench/contrib/files/electron-sandbox/textFileEditor.ts
index d310e9872..145efa742 100644
--- a/src/vs/workbench/contrib/files/electron-sandbox/textFileEditor.ts
+++ b/src/vs/workbench/contrib/files/electron-sandbox/textFileEditor.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { TextFileEditor } from 'vs/workbench/contrib/files/browser/editors/textFileEditor';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { FileOperationError, FileOperationResult, IFileService, MIN_MAX_MEMORY_SIZE_MB, FALLBACK_MAX_MEMORY_SIZE_MB } from 'vs/platform/files/common/files';
 import { createErrorWithActions } from 'vs/base/common/errorsWithActions';
-import { Action } from 'vs/base/common/actions';
+import { toAction } from 'vs/base/common/actions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -56,18 +56,22 @@ export class NativeTextFileEditor extends TextFileEditor {
 		if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_EXCEEDS_MEMORY_LIMIT) {
 			const memoryLimit = Math.max(MIN_MAX_MEMORY_SIZE_MB, +this.textResourceConfigurationService.getValue<number>(undefined, 'files.maxMemoryForLargeFilesMB') || FALLBACK_MAX_MEMORY_SIZE_MB);
 
-			throw createErrorWithActions(nls.localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart and allow it to use more memory"), {
+			throw createErrorWithActions(localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart and allow it to use more memory"), {
 				actions: [
-					new Action('workbench.window.action.relaunchWithIncreasedMemoryLimit', nls.localize('relaunchWithIncreasedMemoryLimit', "Restart with {0} MB", memoryLimit), undefined, true, () => {
-						return this.nativeHostService.relaunch({
-							addArgs: [
-								`--max-memory=${memoryLimit}`
-							]
-						});
+					toAction({
+						id: 'workbench.window.action.relaunchWithIncreasedMemoryLimit', label: localize('relaunchWithIncreasedMemoryLimit', "Restart with {0} MB", memoryLimit), run: () => {
+							return this.nativeHostService.relaunch({
+								addArgs: [
+									`--max-memory=${memoryLimit}`
+								]
+							});
+						}
+					}),
+					toAction({
+						id: 'workbench.window.action.configureMemoryLimit', label: localize('configureMemoryLimit', 'Configure Memory Limit'), run: () => {
+							return this.preferencesService.openGlobalSettings(undefined, { query: 'files.maxMemoryForLargeFilesMB' });
+						}
 					}),
-					new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure Memory Limit'), undefined, true, () => {
-						return this.preferencesService.openGlobalSettings(undefined, { query: 'files.maxMemoryForLargeFilesMB' });
-					})
 				]
 			});
 		}
diff --git a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
index 644cdf743..821be9888 100644
--- a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts
@@ -119,8 +119,6 @@ suite('EditorAutoSave', () => {
 	});
 
 	function awaitModelSaved(model: ITextFileEditorModel): Promise<void> {
-		return new Promise(c => {
-			Event.once(model.onDidChangeDirty)(c);
-		});
+		return Event.toPromise(Event.once(model.onDidChangeDirty));
 	}
 });
diff --git a/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts b/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
index bf0642cde..bfa18a3b7 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileActions.test.ts
@@ -258,7 +258,7 @@ suite('Files - Increment file name smart', () => {
 		assert.strictEqual(result, '2-test.js');
 	});
 
-	test('Increment file name with prefix version with `-` as separator', function () {
+	test('Increment file name with prefix version with `_` as separator', function () {
 		const name = '1_test.js';
 		const result = incrementFileName(name, false, 'smart');
 		assert.strictEqual(result, '2_test.js');
@@ -270,6 +270,36 @@ suite('Files - Increment file name smart', () => {
 		assert.strictEqual(result, '9007199254740992.test.1.js');
 	});
 
+	test('Increment file name with just version and no extension', function () {
+		const name = '001004';
+		const result = incrementFileName(name, false, 'smart');
+		assert.strictEqual(result, '001005');
+	});
+
+	test('Increment file name with just version and no extension, too big number', function () {
+		const name = '9007199254740992';
+		const result = incrementFileName(name, false, 'smart');
+		assert.strictEqual(result, '9007199254740992.1');
+	});
+
+	test('Increment file name with no extension and no version', function () {
+		const name = 'file';
+		const result = incrementFileName(name, false, 'smart');
+		assert.strictEqual(result, 'file1');
+	});
+
+	test('Increment file name with no extension', function () {
+		const name = 'file1';
+		const result = incrementFileName(name, false, 'smart');
+		assert.strictEqual(result, 'file2');
+	});
+
+	test('Increment file name with no extension, too big number', function () {
+		const name = 'file9007199254740992';
+		const result = incrementFileName(name, false, 'smart');
+		assert.strictEqual(result, 'file9007199254740992.1');
+	});
+
 	test('Increment folder name with prefix version', function () {
 		const name = '1.test';
 		const result = incrementFileName(name, true, 'smart');
diff --git a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
index 0df2ed5d5..bb2a00dda 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileEditorInput.test.ts
@@ -102,28 +102,28 @@ suite('Files - FileEditorInput', () => {
 		const preferredResource = toResource.call(this, '/foo/bar/UPDATEFILE.js');
 
 		const inputWithoutPreferredResource = createFileInput(resource);
-		assert.equal(inputWithoutPreferredResource.resource.toString(), resource.toString());
-		assert.equal(inputWithoutPreferredResource.preferredResource.toString(), resource.toString());
+		assert.strictEqual(inputWithoutPreferredResource.resource.toString(), resource.toString());
+		assert.strictEqual(inputWithoutPreferredResource.preferredResource.toString(), resource.toString());
 
 		const inputWithPreferredResource = createFileInput(resource, preferredResource);
 
-		assert.equal(inputWithPreferredResource.resource.toString(), resource.toString());
-		assert.equal(inputWithPreferredResource.preferredResource.toString(), preferredResource.toString());
+		assert.strictEqual(inputWithPreferredResource.resource.toString(), resource.toString());
+		assert.strictEqual(inputWithPreferredResource.preferredResource.toString(), preferredResource.toString());
 
 		let didChangeLabel = false;
 		const listener = inputWithPreferredResource.onDidChangeLabel(e => {
 			didChangeLabel = true;
 		});
 
-		assert.equal(inputWithPreferredResource.getName(), 'UPDATEFILE.js');
+		assert.strictEqual(inputWithPreferredResource.getName(), 'UPDATEFILE.js');
 
 		const otherPreferredResource = toResource.call(this, '/FOO/BAR/updateFILE.js');
 		inputWithPreferredResource.setPreferredResource(otherPreferredResource);
 
-		assert.equal(inputWithPreferredResource.resource.toString(), resource.toString());
-		assert.equal(inputWithPreferredResource.preferredResource.toString(), otherPreferredResource.toString());
-		assert.equal(inputWithPreferredResource.getName(), 'updateFILE.js');
-		assert.equal(didChangeLabel, true);
+		assert.strictEqual(inputWithPreferredResource.resource.toString(), resource.toString());
+		assert.strictEqual(inputWithPreferredResource.preferredResource.toString(), otherPreferredResource.toString());
+		assert.strictEqual(inputWithPreferredResource.getName(), 'updateFILE.js');
+		assert.strictEqual(didChangeLabel, true);
 
 		listener.dispose();
 	});
@@ -135,20 +135,20 @@ suite('Files - FileEditorInput', () => {
 		});
 
 		const input = createFileInput(toResource.call(this, '/foo/bar/file.js'), undefined, mode);
-		assert.equal(input.getPreferredMode(), mode);
+		assert.strictEqual(input.getPreferredMode(), mode);
 
 		const model = await input.resolve() as TextFileEditorModel;
-		assert.equal(model.textEditorModel!.getModeId(), mode);
+		assert.strictEqual(model.textEditorModel!.getModeId(), mode);
 
 		input.setMode('text');
-		assert.equal(input.getPreferredMode(), 'text');
-		assert.equal(model.textEditorModel!.getModeId(), PLAINTEXT_MODE_ID);
+		assert.strictEqual(input.getPreferredMode(), 'text');
+		assert.strictEqual(model.textEditorModel!.getModeId(), PLAINTEXT_MODE_ID);
 
 		const input2 = createFileInput(toResource.call(this, '/foo/bar/file.js'));
 		input2.setPreferredMode(mode);
 
 		const model2 = await input2.resolve() as TextFileEditorModel;
-		assert.equal(model2.textEditorModel!.getModeId(), mode);
+		assert.strictEqual(model2.textEditorModel!.getModeId(), mode);
 	});
 
 	test('matches', function () {
@@ -169,10 +169,10 @@ suite('Files - FileEditorInput', () => {
 		const input = createFileInput(toResource.call(this, '/foo/bar/updatefile.js'));
 
 		input.setEncoding('utf16', EncodingMode.Encode);
-		assert.equal(input.getEncoding(), 'utf16');
+		assert.strictEqual(input.getEncoding(), 'utf16');
 
 		const resolved = await input.resolve() as TextFileEditorModel;
-		assert.equal(input.getEncoding(), resolved.getEncoding());
+		assert.strictEqual(input.getEncoding(), resolved.getEncoding());
 		resolved.dispose();
 	});
 
@@ -237,7 +237,7 @@ suite('Files - FileEditorInput', () => {
 		const model = await accessor.textFileService.files.resolve(input.resource);
 		model.textEditorModel?.setValue('hello world');
 
-		assert.equal(listenerCount, 1);
+		assert.strictEqual(listenerCount, 1);
 		assert.ok(input.isDirty());
 
 		input.dispose();
@@ -269,7 +269,7 @@ suite('Files - FileEditorInput', () => {
 			assert.fail('File Editor Input Factory missing');
 		}
 
-		assert.equal(factory.canSerialize(input), true);
+		assert.strictEqual(factory.canSerialize(input), true);
 
 		const inputSerialized = factory.serialize(input);
 		if (!inputSerialized) {
@@ -277,7 +277,7 @@ suite('Files - FileEditorInput', () => {
 		}
 
 		const inputDeserialized = factory.deserialize(instantiationService, inputSerialized);
-		assert.equal(input.matches(inputDeserialized), true);
+		assert.strictEqual(input.matches(inputDeserialized), true);
 
 		const preferredResource = toResource.call(this, '/foo/bar/UPDATEfile.js');
 		const inputWithPreferredResource = createFileInput(toResource.call(this, '/foo/bar/updatefile.js'), preferredResource);
@@ -288,8 +288,8 @@ suite('Files - FileEditorInput', () => {
 		}
 
 		const inputWithPreferredResourceDeserialized = factory.deserialize(instantiationService, inputWithPreferredResourceSerialized) as FileEditorInput;
-		assert.equal(inputWithPreferredResource.resource.toString(), inputWithPreferredResourceDeserialized.resource.toString());
-		assert.equal(inputWithPreferredResource.preferredResource.toString(), inputWithPreferredResourceDeserialized.preferredResource.toString());
+		assert.strictEqual(inputWithPreferredResource.resource.toString(), inputWithPreferredResourceDeserialized.resource.toString());
+		assert.strictEqual(inputWithPreferredResource.preferredResource.toString(), inputWithPreferredResourceDeserialized.preferredResource.toString());
 	});
 
 	test('preferred name/description', async function () {
@@ -302,16 +302,16 @@ suite('Files - FileEditorInput', () => {
 			didChangeLabelCounter++;
 		});
 
-		assert.equal(customFileInput.getName(), 'My Name');
-		assert.equal(customFileInput.getDescription(), 'My Description');
+		assert.strictEqual(customFileInput.getName(), 'My Name');
+		assert.strictEqual(customFileInput.getDescription(), 'My Description');
 
 		customFileInput.setPreferredName('My Name 2');
 		customFileInput.setPreferredDescription('My Description 2');
 
-		assert.equal(customFileInput.getName(), 'My Name 2');
-		assert.equal(customFileInput.getDescription(), 'My Description 2');
+		assert.strictEqual(customFileInput.getName(), 'My Name 2');
+		assert.strictEqual(customFileInput.getDescription(), 'My Description 2');
 
-		assert.equal(didChangeLabelCounter, 2);
+		assert.strictEqual(didChangeLabelCounter, 2);
 
 		customFileInput.dispose();
 
@@ -332,7 +332,7 @@ suite('Files - FileEditorInput', () => {
 		assert.notEqual(fileInput.getName(), 'My Name 2');
 		assert.notEqual(fileInput.getDescription(), 'My Description 2');
 
-		assert.equal(didChangeLabelCounter, 0);
+		assert.strictEqual(didChangeLabelCounter, 0);
 
 		fileInput.dispose();
 	});
diff --git a/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts b/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
index 70c2fa9e2..00b36384a 100644
--- a/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/fileOnDiskProvider.test.ts
@@ -27,8 +27,8 @@ suite('Files - FileOnDiskContentProvider', () => {
 		const content = await provider.provideTextContent(uri.with({ scheme: 'conflictResolution', query: JSON.stringify({ scheme: uri.scheme }) }));
 
 		assert.ok(content);
-		assert.equal(snapshotToString(content!.createSnapshot()), 'Hello Html');
-		assert.equal(accessor.fileService.getLastReadFileUri().scheme, uri.scheme);
-		assert.equal(accessor.fileService.getLastReadFileUri().path, uri.path);
+		assert.strictEqual(snapshotToString(content!.createSnapshot()), 'Hello Html');
+		assert.strictEqual(accessor.fileService.getLastReadFileUri().scheme, uri.scheme);
+		assert.strictEqual(accessor.fileService.getLastReadFileUri().path, uri.path);
 	});
 });
diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditor.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditor.test.ts
index 9b346315b..33342c8fa 100644
--- a/src/vs/workbench/contrib/files/test/browser/textFileEditor.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/textFileEditor.test.ts
@@ -27,6 +27,7 @@ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfigura
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { raceTimeout } from 'vs/base/common/async';
 
 suite('Files - TextFileEditor', () => {
 
@@ -73,7 +74,7 @@ suite('Files - TextFileEditor', () => {
 
 		const accessor = instantiationService.createInstance(TestServiceAccessor);
 
-		await part.whenRestored;
+		await raceTimeout(part.whenRestored, 2000, () => assert.fail('textFileEditor.test.ts: Unexpected long time to wait for part to restore (#112649)'));
 
 		return [part, accessor, instantiationService, editorService];
 	}
@@ -86,7 +87,7 @@ suite('Files - TextFileEditor', () => {
 		return viewStateTest(this, false);
 	});
 
-	async function viewStateTest(context: Mocha.ITestCallbackContext, restoreViewState: boolean): Promise<void> {
+	async function viewStateTest(context: Mocha.Context, restoreViewState: boolean): Promise<void> {
 		const [part, accessor] = await createPart(restoreViewState);
 
 		let editor = await accessor.editorService.openEditor(accessor.editorService.createEditorInput({ resource: toResource.call(context, '/path/index.txt'), forceFile: true }));
diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
index a869de372..2ce57b49a 100644
--- a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
@@ -94,7 +94,7 @@ suite('Files - TextFileEditorTracker', () => {
 		const model = await accessor.textFileService.files.resolve(resource) as IResolvedTextFileEditorModel;
 
 		model.textEditorModel.setValue('Super Good');
-		assert.equal(snapshotToString(model.createSnapshot()!), 'Super Good');
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), 'Super Good');
 
 		await model.save();
 
@@ -103,7 +103,7 @@ suite('Files - TextFileEditorTracker', () => {
 
 		await timeout(0); // due to event updating model async
 
-		assert.equal(snapshotToString(model.createSnapshot()!), 'Hello Html');
+		assert.strictEqual(snapshotToString(model.createSnapshot()!), 'Hello Html');
 
 		tracker.dispose();
 		(<TextFileEditorModelManager>accessor.textFileService.files).dispose();
@@ -162,9 +162,7 @@ suite('Files - TextFileEditorTracker', () => {
 	});
 
 	function awaitEditorOpening(editorService: IEditorService): Promise<void> {
-		return new Promise(c => {
-			Event.once(editorService.onDidActiveEditorChange)(c);
-		});
+		return Event.toPromise(Event.once(editorService.onDidActiveEditorChange));
 	}
 
 	test('non-dirty files reload on window focus', async function () {
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
index 05c0d93f9..14a4c09a3 100644
--- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
+++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
@@ -30,6 +30,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { editorConfigurationBaseNode } from 'vs/editor/common/config/commonEditorConfig';
 import { mergeSort } from 'vs/base/common/arrays';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 
 type FormattingEditProvider = DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
 
@@ -45,6 +46,7 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 		@IWorkbenchExtensionEnablementService private readonly _extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IConfigurationService private readonly _configService: IConfigurationService,
 		@INotificationService private readonly _notificationService: INotificationService,
+		@IDialogService private readonly _dialogService: IDialogService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@IModeService private readonly _modeService: IModeService,
 		@ILabelService private readonly _labelService: ILabelService,
@@ -119,25 +121,32 @@ class DefaultFormatter extends Disposable implements IWorkbenchContribution {
 		}
 
 		const langName = this._modeService.getLanguageName(document.getModeId()) || document.getModeId();
-		const silent = mode === FormattingMode.Silent;
 		const message = !defaultFormatterId
 			? nls.localize('config.needed', "There are multiple formatters for '{0}' files. Select a default formatter to continue.", DefaultFormatter._maybeQuotes(langName))
 			: nls.localize('config.bad', "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.", defaultFormatterId);
 
-		return new Promise<T | undefined>((resolve, reject) => {
+		if (mode !== FormattingMode.Silent) {
+			// running from a user action -> show modal dialog so that users configure
+			// a default formatter
+			const result = await this._dialogService.confirm({
+				message,
+				primaryButton: nls.localize('do.config', "Configure..."),
+				secondaryButton: nls.localize('cancel', "Cancel")
+			});
+			if (result.confirmed) {
+				return this._pickAndPersistDefaultFormatter(formatter, document);
+			}
+
+		} else {
+			// no user action -> show a silent notification and proceed
 			this._notificationService.prompt(
 				Severity.Info,
 				message,
-				[{ label: nls.localize('do.config', "Configure..."), run: () => this._pickAndPersistDefaultFormatter(formatter, document).then(resolve, reject) }],
-				{ silent, onCancel: () => resolve(undefined) }
+				[{ label: nls.localize('do.config', "Configure..."), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }],
+				{ silent: true }
 			);
-
-			if (silent) {
-				// don't wait when formatting happens without interaction
-				// but pick some formatter...
-				resolve(undefined);
-			}
-		});
+		}
+		return undefined;
 	}
 
 	private async _pickAndPersistDefaultFormatter<T extends FormattingEditProvider>(formatter: T[], document: ITextModel): Promise<T | undefined> {
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
index f7beaf0f5..94beb1646 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts
@@ -6,7 +6,7 @@
 import { IssueReporterStyles, IssueReporterData, ProcessExplorerData, IssueReporterExtensionData } from 'vs/platform/issue/common/issue';
 import { IIssueService } from 'vs/platform/issue/electron-sandbox/issue';
 import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground, textLinkActiveForeground, inputValidationErrorBackground, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, textLinkActiveForeground, inputValidationErrorBackground, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
@@ -17,6 +17,7 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { ITASExperimentService } from 'vs/workbench/services/experiment/common/experimentService';
+import { IAuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService';
 
 export class WorkbenchIssueService implements IWorkbenchIssueService {
 	declare readonly _serviceBrand: undefined;
@@ -28,7 +29,8 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
 		@IProductService private readonly productService: IProductService,
-		@ITASExperimentService private readonly experimentService: ITASExperimentService
+		@ITASExperimentService private readonly experimentService: ITASExperimentService,
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService
 	) { }
 
 	async openReporter(dataOverrides: Partial<IssueReporterData> = {}): Promise<void> {
@@ -52,12 +54,15 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 			};
 		});
 		const experiments = await this.experimentService.getCurrentExperiments();
+		const githubSessions = await this.authenticationService.getSessions('github');
+		const potentialSessions = githubSessions.filter(session => session.scopes.includes('repo'));
 		const theme = this.themeService.getColorTheme();
 		const issueReporterData: IssueReporterData = Object.assign({
 			styles: getIssueReporterStyles(theme),
 			zoomLevel: getZoomLevel(),
 			enabledExtensions: extensionData,
-			experiments: experiments?.join('\n')
+			experiments: experiments?.join('\n'),
+			githubAccessToken: potentialSessions[0]?.accessToken
 		}, dataOverrides);
 		return this.issueService.openReporter(issueReporterData);
 	}
@@ -71,8 +76,7 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 				backgroundColor: getColor(theme, editorBackground),
 				color: getColor(theme, editorForeground),
 				hoverBackground: getColor(theme, listHoverBackground),
-				hoverForeground: getColor(theme, listHoverForeground),
-				highlightForeground: getColor(theme, listHighlightForeground),
+				hoverForeground: getColor(theme, listHoverForeground)
 			},
 			platform: process.platform,
 			applicationName: this.productService.applicationName
diff --git a/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts b/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts
index f8b4c1582..a2dd32715 100644
--- a/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts
+++ b/src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts
@@ -60,7 +60,7 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 					updateAndRestart ? localize('updateLocale', "Would you like to change VS Code's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId)
 						: localize('activateLanguagePack', "In order to use VS Code in {0}, VS Code needs to restart.", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId),
 					[{
-						label: updateAndRestart ? localize('yes', "Yes") : localize('restart now', "Restart Now"),
+						label: updateAndRestart ? localize('changeAndRestart', "Change Language and Restart") : localize('restart', "Restart"),
 						run: () => {
 							const updatePromise = updateAndRestart ? this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['locale'], value: locale }], true) : Promise.resolve(undefined);
 							updatePromise.then(() => this.hostService.restart(), e => this.notificationService.error(e));
diff --git a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
index 208fea76b..d65e91027 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
@@ -4,35 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/workbench/contrib/markers/browser/markersFileDecorations';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { IWorkbenchActionRegistry, Extensions as ActionExtensions, CATEGORIES } from 'vs/workbench/common/actions';
+import { CATEGORIES } from 'vs/workbench/common/actions';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
 import { Marker, RelatedInformation } from 'vs/workbench/contrib/markers/browser/markersModel';
 import { MarkersView } from 'vs/workbench/contrib/markers/browser/markersView';
-import { MenuId, MenuRegistry, SyncActionDescriptor, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ShowProblemsPanelAction } from 'vs/workbench/contrib/markers/browser/markersViewActions';
 import Constants from 'vs/workbench/contrib/markers/browser/constants';
 import Messages from 'vs/workbench/contrib/markers/browser/messages';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { ActivityUpdater } from 'vs/workbench/contrib/markers/browser/markers';
+import { ActivityUpdater, IMarkersView } from 'vs/workbench/contrib/markers/browser/markers';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from 'vs/workbench/services/statusbar/common/statusbar';
 import { IMarkerService, MarkerStatistics } from 'vs/platform/markers/common/markers';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ViewContainer, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry, IViewsService, getVisbileViewContextKey, FocusedViewContext, IViewDescriptorService } from 'vs/workbench/common/views';
+import { ViewContainer, IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry, IViewsService, getVisbileViewContextKey, FocusedViewContext } from 'vs/workbench/common/views';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import type { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ToggleViewAction } from 'vs/workbench/browser/actions/layoutActions';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.MARKER_OPEN_ACTION_ID,
@@ -107,24 +105,10 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 	}
 });
 
-class ToggleMarkersPanelAction extends ToggleViewAction {
-
-	public static readonly ID = 'workbench.actions.view.problems';
-	public static readonly LABEL = Messages.MARKERS_PANEL_TOGGLE_LABEL;
-
-	constructor(id: string, label: string,
-		@IViewsService viewsService: IViewsService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService
-	) {
-		super(id, label, Constants.MARKERS_VIEW_ID, viewsService, viewDescriptorService, contextKeyService, layoutService);
-	}
-}
-
 const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, localize('markersViewIcon', 'View icon of the markers view.'));
 
 // markers view container
+const TOGGLE_MARKERS_VIEW_ACTION_ID = 'workbench.actions.view.problems';
 const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
 	id: Constants.MARKERS_CONTAINER_ID,
 	name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
@@ -134,7 +118,8 @@ const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewC
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [Constants.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
 	storageId: Constants.MARKERS_VIEW_STORAGE_ID,
 	focusCommand: {
-		id: ToggleMarkersPanelAction.ID, keybindings: {
+		id: TOGGLE_MARKERS_VIEW_ACTION_ID,
+		keybindings: {
 			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M
 		}
 	}
@@ -154,12 +139,47 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, LifecyclePhase.Restored);
 
 // actions
-const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleMarkersPanelAction, {
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M
-}), 'View: Toggle Problems (Errors, Warnings, Infos)', CATEGORIES.View.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ShowProblemsPanelAction), 'View: Focus Problems (Errors, Warnings, Infos)', CATEGORIES.View.value);
 registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: TOGGLE_MARKERS_VIEW_ACTION_ID,
+			title: { value: Messages.MARKERS_PANEL_TOGGLE_LABEL, original: 'Toggle Problems (Errors, Warnings, Infos)' },
+			category: CATEGORIES.View.value,
+			f1: true,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M
+			}
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		return accessor.get(IInstantiationService).createInstance(ToggleViewAction, TOGGLE_MARKERS_VIEW_ACTION_ID, 'Toggle Problems (Errors, Warnings, Infos)', Constants.MARKERS_VIEW_ID).run();
+	}
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: TOGGLE_MARKERS_VIEW_ACTION_ID,
+		title: localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems")
+	},
+	order: 4
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.problems.focus',
+			title: { value: Messages.MARKERS_PANEL_SHOW_LABEL, original: 'Focus Problems (Errors, Warnings, Infos)' },
+			category: CATEGORIES.View.value,
+			f1: true,
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		accessor.get(IViewsService).openView(Constants.MARKERS_VIEW_ID, true);
+	}
+});
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKER_COPY_ACTION_ID,
@@ -174,13 +194,19 @@ registerAction2(class extends Action2 {
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
 				when: Constants.MarkerFocusContextKey
 			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	async run(accessor: ServicesAccessor) {
-		await copyMarker(accessor.get(IViewsService), accessor.get(IClipboardService));
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		const clipboardService = serviceAccessor.get(IClipboardService);
+		const element = markersView.getFocusElement();
+		if (element instanceof Marker) {
+			await clipboardService.writeText(`${element}`);
+		}
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKER_COPY_MESSAGE_ACTION_ID,
@@ -190,13 +216,19 @@ registerAction2(class extends Action2 {
 				when: Constants.MarkerFocusContextKey,
 				group: 'navigation'
 			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	async run(accessor: ServicesAccessor) {
-		await copyMessage(accessor.get(IViewsService), accessor.get(IClipboardService));
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		const clipboardService = serviceAccessor.get(IClipboardService);
+		const element = markersView.getFocusElement();
+		if (element instanceof Marker) {
+			await clipboardService.writeText(element.marker.message);
+		}
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
@@ -205,14 +237,20 @@ registerAction2(class extends Action2 {
 				id: MenuId.ProblemsPanelContext,
 				when: Constants.RelatedInformationFocusContextKey,
 				group: 'navigation'
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	async run(accessor: ServicesAccessor) {
-		await copyRelatedInformationMessage(accessor.get(IViewsService), accessor.get(IClipboardService));
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		const clipboardService = serviceAccessor.get(IClipboardService);
+		const element = markersView.getFocusElement();
+		if (element instanceof RelatedInformation) {
+			await clipboardService.writeText(element.raw.message);
+		}
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.FOCUS_PROBLEMS_FROM_FILTER,
@@ -221,14 +259,16 @@ registerAction2(class extends Action2 {
 				when: Constants.MarkerViewFilterFocusContextKey,
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.DownArrow
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	run(accessor: ServicesAccessor) {
-		focusProblemsView(accessor.get(IViewsService));
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		markersView.focus();
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKERS_VIEW_FOCUS_FILTER,
@@ -237,14 +277,16 @@ registerAction2(class extends Action2 {
 				when: FocusedViewContext.isEqualTo(Constants.MARKERS_VIEW_ID),
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_F
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	run(accessor: ServicesAccessor) {
-		focusProblemsFilter(accessor.get(IViewsService));
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		markersView.focusFilter();
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
@@ -253,17 +295,16 @@ registerAction2(class extends Action2 {
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.has(getVisbileViewContextKey(Constants.MARKERS_VIEW_ID))
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	run(accessor: ServicesAccessor) {
-		const markersView = accessor.get(IViewsService).getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID)!;
-		if (markersView) {
-			markersView.markersViewModel.multiline = true;
-		}
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		markersView.setMultiline(true);
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
@@ -272,17 +313,16 @@ registerAction2(class extends Action2 {
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.has(getVisbileViewContextKey(Constants.MARKERS_VIEW_ID))
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	run(accessor: ServicesAccessor) {
-		const markersView = accessor.get(IViewsService).getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-		if (markersView) {
-			markersView.markersViewModel.multiline = false;
-		}
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		markersView.setMultiline(false);
 	}
 });
-registerAction2(class extends Action2 {
+
+registerAction2(class extends ViewAction<IMarkersView> {
 	constructor() {
 		super({
 			id: Constants.MARKERS_VIEW_CLEAR_FILTER_TEXT,
@@ -291,76 +331,65 @@ registerAction2(class extends Action2 {
 			keybinding: {
 				when: Constants.MarkerViewFilterFocusContextKey,
 				weight: KeybindingWeight.WorkbenchContrib,
-			}
+			},
+			viewId: Constants.MARKERS_VIEW_ID
 		});
 	}
-	run(accessor: ServicesAccessor) {
-		const markersView = accessor.get(IViewsService).getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-		if (markersView) {
-			markersView.clearFilterText();
-		}
+	async runInView(serviceAccessor: ServicesAccessor, markersView: IMarkersView): Promise<void> {
+		markersView.clearFilterText();
 	}
 });
 
-async function copyMarker(viewsService: IViewsService, clipboardService: IClipboardService) {
-	const markersView = viewsService.getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-	if (markersView) {
-		const element = markersView.getFocusElement();
-		if (element instanceof Marker) {
-			await clipboardService.writeText(`${element}`);
-		}
+registerAction2(class extends ViewAction<IMarkersView> {
+	constructor() {
+		super({
+			id: `workbench.actions.treeView.${Constants.MARKERS_VIEW_ID}.collapseAll`,
+			title: localize('collapseAll', "Collapse All"),
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyEqualsExpr.create('view', Constants.MARKERS_VIEW_ID),
+				group: 'navigation',
+				order: 2,
+			},
+			icon: Codicon.collapseAll,
+			viewId: Constants.MARKERS_VIEW_ID
+		});
 	}
-}
-
-async function copyMessage(viewsService: IViewsService, clipboardService: IClipboardService) {
-	const markersView = viewsService.getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-	if (markersView) {
-		const element = markersView.getFocusElement();
-		if (element instanceof Marker) {
-			await clipboardService.writeText(element.marker.message);
-		}
+	async runInView(serviceAccessor: ServicesAccessor, view: IMarkersView): Promise<void> {
+		return view.collapseAll();
 	}
-}
-
-async function copyRelatedInformationMessage(viewsService: IViewsService, clipboardService: IClipboardService) {
-	const markersView = viewsService.getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-	if (markersView) {
-		const element = markersView.getFocusElement();
-		if (element instanceof RelatedInformation) {
-			await clipboardService.writeText(element.raw.message);
-		}
-	}
-}
-
-function focusProblemsView(viewsService: IViewsService) {
-	const markersView = viewsService.getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-	if (markersView) {
-		markersView.focus();
-	}
-}
-
-function focusProblemsFilter(viewsService: IViewsService): void {
-	const markersView = viewsService.getActiveViewWithId<MarkersView>(Constants.MARKERS_VIEW_ID);
-	if (markersView) {
-		markersView.focusFilter();
-	}
-}
-
-MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-	group: '4_panels',
-	command: {
-		id: ToggleMarkersPanelAction.ID,
-		title: localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems")
-	},
-	order: 4
 });
 
-CommandsRegistry.registerCommand(Constants.TOGGLE_MARKERS_VIEW_ACTION_ID, async (accessor) => {
-	const viewsService = accessor.get(IViewsService);
-	if (viewsService.isViewVisible(Constants.MARKERS_VIEW_ID)) {
-		viewsService.closeView(Constants.MARKERS_VIEW_ID);
-	} else {
-		viewsService.openView(Constants.MARKERS_VIEW_ID, true);
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: `workbench.actions.treeView.${Constants.MARKERS_VIEW_ID}.filter`,
+			title: localize('filter', "Filter"),
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', Constants.MARKERS_VIEW_ID), Constants.MarkersViewSmallLayoutContextKey.negate()),
+				group: 'navigation',
+				order: 1,
+			},
+		});
+	}
+	async run(): Promise<void> { }
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: Constants.TOGGLE_MARKERS_VIEW_ACTION_ID,
+			title: Messages.MARKERS_PANEL_TOGGLE_LABEL,
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const viewsService = accessor.get(IViewsService);
+		if (viewsService.isViewVisible(Constants.MARKERS_VIEW_ID)) {
+			viewsService.closeView(Constants.MARKERS_VIEW_ID);
+		} else {
+			viewsService.openView(Constants.MARKERS_VIEW_ID, true);
+		}
 	}
 });
 
diff --git a/src/vs/workbench/contrib/markers/browser/markers.ts b/src/vs/workbench/contrib/markers/browser/markers.ts
index 196235465..10592aba3 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.ts
@@ -9,6 +9,26 @@ import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/co
 import { localize } from 'vs/nls';
 import Constants from './constants';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { MarkersFilters } from 'vs/workbench/contrib/markers/browser/markersViewActions';
+import { Event } from 'vs/base/common/event';
+import { IView } from 'vs/workbench/common/views';
+import { MarkerElement } from 'vs/workbench/contrib/markers/browser/markersModel';
+
+export interface IMarkersView extends IView {
+
+	readonly onDidFocusFilter: Event<void>;
+	readonly onDidClearFilterText: Event<void>;
+	readonly filters: MarkersFilters;
+	readonly onDidChangeFilterStats: Event<{ total: number, filtered: number }>;
+	focusFilter(): void;
+	clearFilterText(): void;
+	getFilterStats(): { total: number, filtered: number };
+
+	getFocusElement(): MarkerElement | undefined;
+
+	collapseAll(): void;
+	setMultiline(multiline: boolean): void;
+}
 
 export class ActivityUpdater extends Disposable implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersModel.ts b/src/vs/workbench/contrib/markers/browser/markersModel.ts
index a12e1658e..794791b34 100644
--- a/src/vs/workbench/contrib/markers/browser/markersModel.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersModel.ts
@@ -14,6 +14,7 @@ import { Hasher } from 'vs/base/common/hash';
 import { withUndefinedAsNull } from 'vs/base/common/types';
 import { splitLines } from 'vs/base/common/strings';
 
+export type MarkerElement = ResourceMarkers | Marker | RelatedInformation;
 
 export function compareMarkersByUri(a: IMarker, b: IMarker) {
 	return extUri.compare(a.resource, b.resource);
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 6a344c8a0..653b012f4 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -10,7 +10,7 @@ import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { ResourceMarkers, Marker, RelatedInformation } from 'vs/workbench/contrib/markers/browser/markersModel';
+import { ResourceMarkers, Marker, RelatedInformation, MarkerElement } from 'vs/workbench/contrib/markers/browser/markersModel';
 import Messages from 'vs/workbench/contrib/markers/browser/messages';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
@@ -56,8 +56,6 @@ import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 
-export type TreeElement = ResourceMarkers | Marker | RelatedInformation;
-
 interface IResourceMarkersTemplateData {
 	resourceLabel: IResourceLabel;
 	count: CountBadge;
@@ -74,7 +72,7 @@ interface IRelatedInformationTemplateData {
 	description: HighlightedLabel;
 }
 
-export class MarkersTreeAccessibilityProvider implements IListAccessibilityProvider<TreeElement> {
+export class MarkersTreeAccessibilityProvider implements IListAccessibilityProvider<MarkerElement> {
 
 	constructor(@ILabelService private readonly labelService: ILabelService) { }
 
@@ -82,7 +80,7 @@ export class MarkersTreeAccessibilityProvider implements IListAccessibilityProvi
 		return localize('problemsView', "Problems View");
 	}
 
-	public getAriaLabel(element: TreeElement): string | null {
+	public getAriaLabel(element: MarkerElement): string | null {
 		if (element instanceof ResourceMarkers) {
 			const path = this.labelService.getUriLabel(element.resource, { relative: true }) || element.resource.fsPath;
 			return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.markers.length, element.name, paths.dirname(path));
@@ -103,13 +101,13 @@ const enum TemplateId {
 	RelatedInformation = 'ri'
 }
 
-export class VirtualDelegate implements IListVirtualDelegate<TreeElement> {
+export class VirtualDelegate implements IListVirtualDelegate<MarkerElement> {
 
 	static LINE_HEIGHT: number = 22;
 
 	constructor(private readonly markersViewState: MarkersViewModel) { }
 
-	getHeight(element: TreeElement): number {
+	getHeight(element: MarkerElement): number {
 		if (element instanceof Marker) {
 			const viewModel = this.markersViewState.getViewModel(element);
 			const noOfLines = !viewModel || viewModel.multiline ? element.lines.length : 1;
@@ -118,7 +116,7 @@ export class VirtualDelegate implements IListVirtualDelegate<TreeElement> {
 		return VirtualDelegate.LINE_HEIGHT;
 	}
 
-	getTemplateId(element: TreeElement): string {
+	getTemplateId(element: MarkerElement): string {
 		if (element instanceof ResourceMarkers) {
 			return TemplateId.ResourceMarkers;
 		} else if (element instanceof Marker) {
@@ -512,11 +510,11 @@ export class RelatedInformationRenderer implements ITreeRenderer<RelatedInformat
 	}
 }
 
-export class Filter implements ITreeFilter<TreeElement, FilterData> {
+export class Filter implements ITreeFilter<MarkerElement, FilterData> {
 
 	constructor(public options: FilterOptions) { }
 
-	filter(element: TreeElement, parentVisibility: TreeVisibility): TreeFilterResult<FilterData> {
+	filter(element: MarkerElement, parentVisibility: TreeVisibility): TreeFilterResult<FilterData> {
 		if (element instanceof ResourceMarkers) {
 			return this.filterResourceMarkers(element);
 		} else if (element instanceof Marker) {
@@ -852,23 +850,23 @@ export class MarkersViewModel extends Disposable {
 
 }
 
-export class ResourceDragAndDrop implements ITreeDragAndDrop<TreeElement> {
+export class ResourceDragAndDrop implements ITreeDragAndDrop<MarkerElement> {
 	constructor(
 		private instantiationService: IInstantiationService
 	) { }
 
-	onDragOver(data: IDragAndDropData, targetElement: TreeElement, targetIndex: number, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
+	onDragOver(data: IDragAndDropData, targetElement: MarkerElement, targetIndex: number, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
 		return false;
 	}
 
-	getDragURI(element: TreeElement): string | null {
+	getDragURI(element: MarkerElement): string | null {
 		if (element instanceof ResourceMarkers) {
 			return element.resource.toString();
 		}
 		return null;
 	}
 
-	getDragLabel?(elements: TreeElement[]): string | undefined {
+	getDragLabel?(elements: MarkerElement[]): string | undefined {
 		if (elements.length > 1) {
 			return String(elements.length);
 		}
@@ -877,7 +875,7 @@ export class ResourceDragAndDrop implements ITreeDragAndDrop<TreeElement> {
 	}
 
 	onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void {
-		const elements = (data as ElementsDragAndDropData<TreeElement>).elements;
+		const elements = (data as ElementsDragAndDropData<MarkerElement>).elements;
 		const resources: URI[] = elements
 			.filter(e => e instanceof ResourceMarkers)
 			.map(resourceMarker => (resourceMarker as ResourceMarkers).resource);
@@ -888,7 +886,7 @@ export class ResourceDragAndDrop implements ITreeDragAndDrop<TreeElement> {
 		}
 	}
 
-	drop(data: IDragAndDropData, targetElement: TreeElement, targetIndex: number, originalEvent: DragEvent): void {
+	drop(data: IDragAndDropData, targetElement: MarkerElement, targetIndex: number, originalEvent: DragEvent): void {
 	}
 }
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
index 8836c8371..b2a7ce0f6 100644
--- a/src/vs/workbench/contrib/markers/browser/markersView.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -11,17 +11,17 @@ import { IAction, IActionViewItem, Action, Separator } from 'vs/base/common/acti
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import Constants from 'vs/workbench/contrib/markers/browser/constants';
-import { Marker, ResourceMarkers, RelatedInformation, MarkerChangesEvent, MarkersModel, compareMarkersByUri } from 'vs/workbench/contrib/markers/browser/markersModel';
+import { Marker, ResourceMarkers, RelatedInformation, MarkerChangesEvent, MarkersModel, compareMarkersByUri, MarkerElement } from 'vs/workbench/contrib/markers/browser/markersModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MarkersFilterActionViewItem, MarkersFilters, IMarkersFiltersChangeEvent, IMarkerFilterController } from 'vs/workbench/contrib/markers/browser/markersViewActions';
+import { MarkersFilterActionViewItem, MarkersFilters, IMarkersFiltersChangeEvent } from 'vs/workbench/contrib/markers/browser/markersViewActions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import Messages from 'vs/workbench/contrib/markers/browser/messages';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
+import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
 import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { localize } from 'vs/nls';
-import { IContextKey, IContextKeyService, ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Iterable } from 'vs/base/common/iterator';
 import { ITreeElement, ITreeNode, ITreeContextMenuEvent, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
 import { Relay, Event, Emitter } from 'vs/base/common/event';
@@ -30,10 +30,10 @@ import { FilterOptions } from 'vs/workbench/contrib/markers/browser/markersFilte
 import { IExpression } from 'vs/base/common/glob';
 import { deepClone } from 'vs/base/common/objects';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, TreeElement, MarkersTreeAccessibilityProvider, MarkersViewModel, ResourceDragAndDrop } from 'vs/workbench/contrib/markers/browser/markersTreeViewer';
+import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, MarkersTreeAccessibilityProvider, MarkersViewModel, ResourceDragAndDrop } from 'vs/workbench/contrib/markers/browser/markersTreeViewer';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IMenuService, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
+import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { StandardKeyboardEvent, IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { domEvent } from 'vs/base/browser/event';
@@ -45,7 +45,7 @@ import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { editorLightBulbForeground, editorLightBulbAutoFixForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { Codicon } from 'vs/base/common/codicons';
@@ -55,8 +55,9 @@ import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifec
 import { groupBy } from 'vs/base/common/arrays';
 import { ResourceMap } from 'vs/base/common/map';
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
+import { IMarkersView } from 'vs/workbench/contrib/markers/browser/markers';
 
-function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterable<ITreeElement<TreeElement>> {
+function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterable<ITreeElement<MarkerElement>> {
 	return Iterable.map(resourceMarkers.markers, m => {
 		const relatedInformationIt = Iterable.from(m.relatedInformation);
 		const children = Iterable.map(relatedInformationIt, r => ({ element: r }));
@@ -65,7 +66,7 @@ function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterab
 	});
 }
 
-export class MarkersView extends ViewPane implements IMarkerFilterController {
+export class MarkersView extends ViewPane implements IMarkersView {
 
 	private lastSelectedRelativeTop: number = 0;
 	private currentActiveResource: URI | null = null;
@@ -88,7 +89,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 	private cachedFilterStats: { total: number; filtered: number; } | undefined = undefined;
 
 	private currentResourceGotAddedToMarkersData: boolean = false;
-	readonly markersViewModel: MarkersViewModel;
+	private readonly markersViewModel: MarkersViewModel;
 	private readonly smallLayoutContextKey: IContextKey<boolean>;
 	private get smallLayout(): boolean { return !!this.smallLayoutContextKey.get(); }
 	private set smallLayout(smallLayout: boolean) { this.smallLayoutContextKey.set(smallLayout); }
@@ -132,8 +133,6 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		this.filter = new Filter(FilterOptions.EMPTY(uriIdentityService));
 		this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
 
-		// actions
-		this.regiserActions();
 		this.filters = this._register(new MarkersFilters({
 			filterText: this.panelState['filter'] || '',
 			filterHistory: this.panelState['filterHistory'] || [],
@@ -208,43 +207,6 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		this._onDidClearFilterText.fire();
 	}
 
-	private regiserActions(): void {
-		const that = this;
-		this._register(registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: `workbench.actions.treeView.${that.id}.collapseAll`,
-					title: localize('collapseAll', "Collapse All"),
-					menu: {
-						id: MenuId.ViewTitle,
-						when: ContextKeyEqualsExpr.create('view', that.id),
-						group: 'navigation',
-						order: Number.MAX_SAFE_INTEGER,
-					},
-					icon: Codicon.collapseAll
-				});
-			}
-			async run(): Promise<void> {
-				return that.collapseAll();
-			}
-		}));
-		this._register(registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: `workbench.actions.treeView.${that.id}.filter`,
-					title: localize('filter', "Filter"),
-					menu: {
-						id: MenuId.ViewTitle,
-						when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', that.id), Constants.MarkersViewSmallLayoutContextKey.negate()),
-						group: 'navigation',
-						order: 1,
-					},
-				});
-			}
-			async run(): Promise<void> { }
-		}));
-	}
-
 	public showQuickFixes(marker: Marker): void {
 		const viewModel = this.markersViewModel.getViewModel(marker);
 		if (viewModel) {
@@ -423,7 +385,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		const accessibilityProvider = this.instantiationService.createInstance(MarkersTreeAccessibilityProvider);
 
 		const identityProvider = {
-			getId(element: TreeElement) {
+			getId(element: MarkerElement) {
 				return element.id;
 			}
 		};
@@ -438,7 +400,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 				accessibilityProvider,
 				identityProvider,
 				dnd: new ResourceDragAndDrop(this.instantiationService),
-				expandOnlyOnTwistieClick: (e: TreeElement) => e instanceof Marker && e.relatedInformation.length > 0,
+				expandOnlyOnTwistieClick: (e: MarkerElement) => e instanceof Marker && e.relatedInformation.length > 0,
 				overrideStyles: {
 					listBackground: this.getBackgroundColor()
 				},
@@ -501,7 +463,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		this._register(this.tree.onDidChangeSelection(() => this.onSelected()));
 	}
 
-	private collapseAll(): void {
+	collapseAll(): void {
 		if (this.tree) {
 			this.tree.collapseAll();
 			this.tree.setSelection([]);
@@ -511,6 +473,10 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		}
 	}
 
+	setMultiline(multiline: boolean): void {
+		this.markersViewModel.multiline = multiline;
+	}
+
 	private onDidChangeMarkersViewVisibility(visible: boolean): void {
 		this.onVisibleDisposables.clear();
 		if (visible) {
@@ -790,7 +756,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		this.rangeHighlightDecorations.highlightRange(selection);
 	}
 
-	private onContextMenu(e: ITreeContextMenuEvent<TreeElement | null>): void {
+	private onContextMenu(e: ITreeContextMenuEvent<MarkerElement | null>): void {
 		const element = e.element;
 		if (!element) {
 			return;
@@ -817,7 +783,7 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		});
 	}
 
-	private getMenuActions(element: TreeElement): IAction[] {
+	private getMenuActions(element: MarkerElement): IAction[] {
 		const result: IAction[] = [];
 
 		if (element instanceof Marker) {
@@ -845,8 +811,8 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 		return result;
 	}
 
-	public getFocusElement() {
-		return this.tree ? this.tree.getFocus()[0] : undefined;
+	public getFocusElement(): MarkerElement | undefined {
+		return this.tree?.getFocus()[0] || undefined;
 	}
 
 	public getActionViewItem(action: IAction): IActionViewItem | undefined {
@@ -924,14 +890,14 @@ export class MarkersView extends ViewPane implements IMarkerFilterController {
 
 }
 
-class MarkersTree extends WorkbenchObjectTree<TreeElement, FilterData> {
+class MarkersTree extends WorkbenchObjectTree<MarkerElement, FilterData> {
 
 	constructor(
 		user: string,
 		readonly container: HTMLElement,
-		delegate: IListVirtualDelegate<TreeElement>,
-		renderers: ITreeRenderer<TreeElement, FilterData, any>[],
-		options: IWorkbenchObjectTreeOptions<TreeElement, FilterData>,
+		delegate: IListVirtualDelegate<MarkerElement>,
+		renderers: ITreeRenderer<MarkerElement, FilterData, any>[],
+		options: IWorkbenchObjectTreeOptions<MarkerElement, FilterData>,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
diff --git a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
index 973e9e697..7dacfc301 100644
--- a/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersViewActions.ts
@@ -24,27 +24,11 @@ import { Marker } from 'vs/workbench/contrib/markers/browser/markersModel';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Event, Emitter } from 'vs/base/common/event';
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
-import { IViewsService } from 'vs/workbench/common/views';
 import { Codicon } from 'vs/base/common/codicons';
 import { BaseActionViewItem, ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
-
-export class ShowProblemsPanelAction extends Action {
-
-	public static readonly ID = 'workbench.action.problems.focus';
-	public static readonly LABEL = Messages.MARKERS_PANEL_SHOW_LABEL;
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label);
-	}
-
-	public run(): Promise<any> {
-		return this.viewsService.openView(Constants.MARKERS_VIEW_ID, true);
-	}
-}
+import { IMarkersView } from 'vs/workbench/contrib/markers/browser/markers';
 
 export interface IMarkersFiltersChangeEvent {
 	filterText?: boolean;
@@ -164,14 +148,6 @@ export class MarkersFilters extends Disposable {
 	}
 }
 
-export interface IMarkerFilterController {
-	readonly onDidFocusFilter: Event<void>;
-	readonly onDidClearFilterText: Event<void>;
-	readonly filters: MarkersFilters;
-	readonly onDidChangeFilterStats: Event<{ total: number, filtered: number }>;
-	getFilterStats(): { total: number, filtered: number };
-}
-
 class FiltersDropdownMenuActionViewItem extends DropdownMenuActionViewItem {
 
 	constructor(
@@ -271,7 +247,7 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 
 	constructor(
 		action: IAction,
-		private filterController: IMarkerFilterController,
+		private markersView: IMarkersView,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IThemeService private readonly themeService: IThemeService,
@@ -281,11 +257,11 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 		this.focusContextKey = Constants.MarkerViewFilterFocusContextKey.bindTo(contextKeyService);
 		this.delayedFilterUpdate = new Delayer<void>(400);
 		this._register(toDisposable(() => this.delayedFilterUpdate.cancel()));
-		this._register(filterController.onDidFocusFilter(() => this.focus()));
-		this._register(filterController.onDidClearFilterText(() => this.clearFilterText()));
+		this._register(markersView.onDidFocusFilter(() => this.focus()));
+		this._register(markersView.onDidClearFilterText(() => this.clearFilterText()));
 		this.filtersAction = new Action('markersFiltersAction', Messages.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS, 'markers-filters ' + ThemeIcon.asClassName(filterIcon));
 		this.filtersAction.checked = this.hasFiltersChanged();
-		this._register(filterController.filters.onDidChange(e => this.onDidFiltersChange(e)));
+		this._register(markersView.filters.onDidChange(e => this.onDidFiltersChange(e)));
 	}
 
 	render(container: HTMLElement): void {
@@ -321,21 +297,21 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 	}
 
 	private hasFiltersChanged(): boolean {
-		return !this.filterController.filters.showErrors || !this.filterController.filters.showWarnings || !this.filterController.filters.showInfos || this.filterController.filters.excludedFiles || this.filterController.filters.activeFile;
+		return !this.markersView.filters.showErrors || !this.markersView.filters.showWarnings || !this.markersView.filters.showInfos || this.markersView.filters.excludedFiles || this.markersView.filters.activeFile;
 	}
 
 	private createInput(container: HTMLElement): void {
 		this.filterInputBox = this._register(this.instantiationService.createInstance(ContextScopedHistoryInputBox, container, this.contextViewService, {
 			placeholder: Messages.MARKERS_PANEL_FILTER_PLACEHOLDER,
 			ariaLabel: Messages.MARKERS_PANEL_FILTER_ARIA_LABEL,
-			history: this.filterController.filters.filterHistory
+			history: this.markersView.filters.filterHistory
 		}));
 		this._register(attachInputBoxStyler(this.filterInputBox, this.themeService));
-		this.filterInputBox.value = this.filterController.filters.filterText;
+		this.filterInputBox.value = this.markersView.filters.filterText;
 		this._register(this.filterInputBox.onDidChange(filter => this.delayedFilterUpdate.trigger(() => this.onDidInputChange(this.filterInputBox!))));
-		this._register(this.filterController.filters.onDidChange((event: IMarkersFiltersChangeEvent) => {
+		this._register(this.markersView.filters.onDidChange((event: IMarkersFiltersChangeEvent) => {
 			if (event.filterText) {
-				this.filterInputBox!.value = this.filterController.filters.filterText;
+				this.filterInputBox!.value = this.markersView.filters.filterText;
 			}
 		}));
 		this._register(DOM.addStandardDisposableListener(this.filterInputBox.inputElement, DOM.EventType.KEY_DOWN, (e: any) => this.onInputKeyDown(e, this.filterInputBox!)));
@@ -373,14 +349,14 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 			filterBadge.style.color = foreground;
 		}));
 		this.updateBadge();
-		this._register(this.filterController.onDidChangeFilterStats(() => this.updateBadge()));
+		this._register(this.markersView.onDidChangeFilterStats(() => this.updateBadge()));
 	}
 
 	private createFilters(container: HTMLElement): void {
 		const actionbar = this._register(new ActionBar(container, {
 			actionViewItemProvider: action => {
 				if (action.id === this.filtersAction.id) {
-					return this.instantiationService.createInstance(FiltersDropdownMenuActionViewItem, action, this.filterController.filters, this.actionRunner);
+					return this.instantiationService.createInstance(FiltersDropdownMenuActionViewItem, action, this.markersView.filters, this.actionRunner);
 				}
 				return undefined;
 			}
@@ -390,13 +366,13 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 
 	private onDidInputChange(inputbox: HistoryInputBox) {
 		inputbox.addToHistory();
-		this.filterController.filters.filterText = inputbox.value;
-		this.filterController.filters.filterHistory = inputbox.getHistory();
+		this.markersView.filters.filterText = inputbox.value;
+		this.markersView.filters.filterHistory = inputbox.getHistory();
 	}
 
 	private updateBadge(): void {
 		if (this.filterBadge) {
-			const { total, filtered } = this.filterController.getFilterStats();
+			const { total, filtered } = this.markersView.getFilterStats();
 			this.filterBadge.classList.toggle('hidden', total === filtered || total === 0);
 			this.filterBadge.textContent = localize('showing filtered problems', "Showing {0} of {1}", filtered, total);
 			this.adjustInputBox();
@@ -441,9 +417,9 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 	}
 
 	protected get class(): string {
-		if (this.filterController.filters.layout.width > 600) {
+		if (this.markersView.filters.layout.width > 600) {
 			return 'markers-panel-action-filter grow';
-		} else if (this.filterController.filters.layout.width < 400) {
+		} else if (this.markersView.filters.layout.width < 400) {
 			return 'markers-panel-action-filter small';
 		} else {
 			return 'markers-panel-action-filter';
diff --git a/src/vs/workbench/contrib/markers/browser/messages.ts b/src/vs/workbench/contrib/markers/browser/messages.ts
index 5d7101256..d263f7e10 100644
--- a/src/vs/workbench/contrib/markers/browser/messages.ts
+++ b/src/vs/workbench/contrib/markers/browser/messages.ts
@@ -19,8 +19,8 @@ export default class Messages {
 
 	public static MARKERS_PANEL_TITLE_PROBLEMS: string = nls.localize('markers.panel.title.problems', "Problems");
 
-	public static MARKERS_PANEL_NO_PROBLEMS_BUILT: string = nls.localize('markers.panel.no.problems.build', "No problems have been detected in the workspace so far.");
-	public static MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT: string = nls.localize('markers.panel.no.problems.activeFile.build', "No problems have been detected in the current file so far.");
+	public static MARKERS_PANEL_NO_PROBLEMS_BUILT: string = nls.localize('markers.panel.no.problems.build', "No problems have been detected in the workspace.");
+	public static MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT: string = nls.localize('markers.panel.no.problems.activeFile.build', "No problems have been detected in the current file.");
 	public static MARKERS_PANEL_NO_PROBLEMS_FILTERS: string = nls.localize('markers.panel.no.problems.filters', "No results found with provided filter criteria.");
 
 	public static MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS: string = nls.localize('markers.panel.action.moreFilters', "More Filters...");
diff --git a/src/vs/workbench/contrib/notebook/browser/constants.ts b/src/vs/workbench/contrib/notebook/browser/constants.ts
index 3232b0474..ab61c29ec 100644
--- a/src/vs/workbench/contrib/notebook/browser/constants.ts
+++ b/src/vs/workbench/contrib/notebook/browser/constants.ts
@@ -13,8 +13,8 @@ export const CELL_RUN_GUTTER = 28;
 export const CODE_CELL_LEFT_MARGIN = 32;
 
 export const EDITOR_TOOLBAR_HEIGHT = 0;
-export const BOTTOM_CELL_TOOLBAR_GAP = 18;
-export const BOTTOM_CELL_TOOLBAR_HEIGHT = 50;
+export const BOTTOM_CELL_TOOLBAR_GAP = 16;
+export const BOTTOM_CELL_TOOLBAR_HEIGHT = 24;
 export const CELL_STATUSBAR_HEIGHT = 22;
 
 // Margin above editor
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
index acf32d1a9..9fb714811 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
@@ -23,11 +23,17 @@ import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/
 import { CATEGORIES } from 'vs/workbench/common/actions';
 import { BaseCellRenderTemplate, CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, EXPAND_CELL_CONTENT_COMMAND_ID, IActiveNotebookEditor, ICellViewModel, INotebookEditor, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
-import { CellEditType, CellKind, ICellEditOperation, ICellRange, isDocumentExcludePattern, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BEGIN_END, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellEditType, CellKind, ICellEditOperation, ICellRange, INotebookDocumentFilter, isDocumentExcludePattern, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BEGIN_END, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
+import { EditorsOrder } from 'vs/workbench/common/editor';
+import { INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
 
 // Notebook Commands
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
@@ -137,14 +143,17 @@ abstract class NotebookAction extends Action2 {
 		super(desc);
 	}
 
-	async run(accessor: ServicesAccessor, context?: INotebookActionContext): Promise<void> {
+	async run(accessor: ServicesAccessor, context?: any): Promise<void> {
 		if (!this.isNotebookActionContext(context)) {
-			context = this.getActiveEditorContext(accessor);
+			context = this.getEditorContextFromArgsOrActive(accessor, context);
 			if (!context) {
 				return;
 			}
 		}
 
+		const telemetryService = accessor.get(ITelemetryService);
+		telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: 'ui' });
+
 		this.runWithContext(accessor, context);
 	}
 
@@ -154,7 +163,7 @@ abstract class NotebookAction extends Action2 {
 		return !!context && !!(context as INotebookActionContext).notebookEditor;
 	}
 
-	protected getActiveEditorContext(accessor: ServicesAccessor): INotebookActionContext | undefined {
+	protected getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: any): INotebookActionContext | undefined {
 		const editorService = accessor.get(IEditorService);
 
 		const editor = getActiveNotebookEditor(editorService);
@@ -179,22 +188,22 @@ abstract class NotebookCellAction<T = INotebookCellActionContext> extends Notebo
 		return !!context && !!(context as INotebookCellActionContext).notebookEditor && !!(context as INotebookCellActionContext).cell;
 	}
 
-	protected getCellContextFromArgs(accessor: ServicesAccessor, context?: T): INotebookCellActionContext | undefined {
+	protected getCellContextFromArgs(accessor: ServicesAccessor, context?: T, ...additionalArgs: any[]): INotebookCellActionContext | undefined {
 		return undefined;
 	}
 
-	async run(accessor: ServicesAccessor, context?: INotebookCellActionContext): Promise<void> {
+	async run(accessor: ServicesAccessor, context?: INotebookCellActionContext, ...additionalArgs: any[]): Promise<void> {
 		if (this.isCellActionContext(context)) {
 			return this.runWithContext(accessor, context);
 		}
 
-		const contextFromArgs = this.getCellContextFromArgs(accessor, context);
+		const contextFromArgs = this.getCellContextFromArgs(accessor, context, ...additionalArgs);
 
 		if (contextFromArgs) {
 			return this.runWithContext(accessor, contextFromArgs);
 		}
 
-		const activeEditorContext = this.getActiveEditorContext(accessor);
+		const activeEditorContext = this.getEditorContextFromArgsOrActive(accessor);
 		if (this.isCellActionContext(activeEditorContext)) {
 			return this.runWithContext(accessor, activeEditorContext);
 		}
@@ -203,6 +212,22 @@ abstract class NotebookCellAction<T = INotebookCellActionContext> extends Notebo
 	abstract runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void>;
 }
 
+export function getWidgetFromUri(accessor: ServicesAccessor, uri: URI) {
+	const editorService = accessor.get(IEditorService);
+	const notebookWidgetService = accessor.get(INotebookEditorWidgetService);
+	const editorId = editorService.getEditors(EditorsOrder.SEQUENTIAL).find(editorId => editorId.editor instanceof NotebookEditorInput && editorId.editor.resource?.toString() === uri.toString());
+
+	if (editorId) {
+		const widget = notebookWidgetService.widgets.find(widget => widget.textModel?.viewType === (editorId.editor as NotebookEditorInput).viewType && widget.uri?.toString() === editorId.editor.resource!.toString());
+
+		if (widget && widget.hasModel()) {
+			return widget;
+		}
+	}
+
+	return undefined;
+}
+
 registerAction2(class extends NotebookCellAction<ICellRange> {
 	constructor() {
 		super({
@@ -234,6 +259,11 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
 								}
 							}
 						}
+					},
+					{
+						name: 'uri',
+						description: 'The document uri',
+						constraint: URI
 					}
 				]
 			},
@@ -241,12 +271,28 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
 		});
 	}
 
-	getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
+	getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange, ...additionalArgs: any[]): INotebookCellActionContext | undefined {
 		if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
 			return;
 		}
 
-		const activeEditorContext = this.getActiveEditorContext(accessor);
+		if (additionalArgs.length && additionalArgs[0]) {
+			const uri = URI.revive(additionalArgs[0]);
+
+			if (uri) {
+				const widget = getWidgetFromUri(accessor, uri);
+				if (widget) {
+					const cells = widget.viewModel.viewCells;
+
+					return {
+						notebookEditor: widget,
+						cell: cells[context.start]
+					};
+				}
+			}
+		}
+
+		const activeEditorContext = this.getEditorContextFromArgsOrActive(accessor);
 
 		if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
 			return;
@@ -273,7 +319,7 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
 			title: localize('notebookActions.cancel', "Stop Cell Execution"),
 			icon: icons.stopIcon,
 			description: {
-				description: localize('notebookActions.execute', "Execute Cell"),
+				description: localize('notebookActions.cancel', "Stop Cell Execution"),
 				args: [
 					{
 						name: 'range',
@@ -290,18 +336,39 @@ registerAction2(class extends NotebookCellAction<ICellRange> {
 								}
 							}
 						}
+					},
+					{
+						name: 'uri',
+						description: 'The document uri',
+						constraint: URI
 					}
 				]
 			},
 		});
 	}
 
-	getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
+	getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange, ...additionalArgs: any[]): INotebookCellActionContext | undefined {
 		if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
 			return;
 		}
 
-		const activeEditorContext = this.getActiveEditorContext(accessor);
+		if (additionalArgs.length && additionalArgs[0]) {
+			const uri = URI.revive(additionalArgs[0]);
+
+			if (uri) {
+				const widget = getWidgetFromUri(accessor, uri);
+				if (widget) {
+					const cells = widget.viewModel.viewCells;
+
+					return {
+						notebookEditor: widget,
+						cell: cells[context.start]
+					};
+				}
+			}
+		}
+
+		const activeEditorContext = this.getEditorContextFromArgsOrActive(accessor);
 
 		if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
 			return;
@@ -455,19 +522,62 @@ registerAction2(class extends NotebookAction {
 		super({
 			id: EXECUTE_NOTEBOOK_COMMAND_ID,
 			title: localize('notebookActions.executeNotebook', "Execute Notebook"),
+			description: {
+				description: localize('notebookActions.executeNotebook', "Execute Notebook"),
+				args: [
+					{
+						name: 'uri',
+						description: 'The document uri',
+						constraint: URI
+					}
+				]
+			},
 		});
 	}
 
+	getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: UriComponents): INotebookActionContext | undefined {
+		if (context) {
+			const uri = URI.revive(context);
+
+			if (uri) {
+				const widget = getWidgetFromUri(accessor, uri);
+
+				if (widget) {
+					return {
+						notebookEditor: widget,
+					};
+				}
+			}
+		}
+
+		const editorService = accessor.get(IEditorService);
+		const editor = getActiveNotebookEditor(editorService);
+		if (!editor) {
+			return;
+		}
+
+		if (!editor.hasModel()) {
+			return;
+		}
+
+		const activeCell = editor.getActiveCell();
+		return {
+			cell: activeCell,
+			notebookEditor: editor
+		};
+	}
+
 	async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
 		renderAllMarkdownCells(context);
 
+		const editorService = accessor.get(IEditorService);
+		const editor = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).find(
+			editor => editor.editor instanceof NotebookEditorInput && editor.editor.viewType === context.notebookEditor.viewModel.viewType && editor.editor.resource.toString() === context.notebookEditor.viewModel.uri.toString());
 		const editorGroupService = accessor.get(IEditorGroupsService);
-		const group = editorGroupService.activeGroup;
 
-		if (group) {
-			if (group.activeEditor) {
-				group.pinEditor(group.activeEditor);
-			}
+		if (editor) {
+			const group = editorGroupService.getGroup(editor.groupId);
+			group?.pinEditor(editor.editor);
 		}
 
 		return context.notebookEditor.executeNotebook();
@@ -487,9 +597,51 @@ registerAction2(class extends NotebookAction {
 		super({
 			id: CANCEL_NOTEBOOK_COMMAND_ID,
 			title: localize('notebookActions.cancelNotebook', "Cancel Notebook Execution"),
+			description: {
+				description: localize('notebookActions.cancelNotebook', "Cancel Notebook Execution"),
+				args: [
+					{
+						name: 'uri',
+						description: 'The document uri',
+						constraint: URI
+					}
+				]
+			},
 		});
 	}
 
+	getEditorContextFromArgsOrActive(accessor: ServicesAccessor, context?: UriComponents): INotebookActionContext | undefined {
+		if (context) {
+			const uri = URI.revive(context);
+
+			if (uri) {
+				const widget = getWidgetFromUri(accessor, uri);
+
+				if (widget) {
+					return {
+						notebookEditor: widget,
+					};
+				}
+			}
+		}
+
+		const editorService = accessor.get(IEditorService);
+		const editor = getActiveNotebookEditor(editorService);
+		if (!editor) {
+			return;
+		}
+
+		if (!editor.hasModel()) {
+			return;
+		}
+
+		const activeCell = editor.getActiveCell();
+		return {
+			cell: activeCell,
+			notebookEditor: editor
+		};
+	}
+
 	async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
 		return context.notebookEditor.cancelNotebookExecution();
 	}
@@ -580,7 +732,7 @@ registerAction2(class extends NotebookCellAction {
 
 export function getActiveNotebookEditor(editorService: IEditorService): INotebookEditor | undefined {
 	// TODO@roblourens can `isNotebookEditor` be on INotebookEditor to avoid a circular dependency?
-	const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean } | undefined;
+	const activeEditorPane = editorService.activeEditorPane as unknown as { isNotebookEditor?: boolean; } | undefined;
 	return activeEditorPane?.isNotebookEditor ? (editorService.activeEditorPane?.getControl() as INotebookEditor) : undefined;
 }
 
@@ -709,7 +861,7 @@ registerAction2(class extends NotebookAction {
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
-		const context = this.getActiveEditorContext(accessor);
+		const context = this.getEditorContextFromArgsOrActive(accessor);
 		if (context) {
 			this.runWithContext(accessor, context);
 		}
@@ -734,7 +886,7 @@ registerAction2(class extends NotebookAction {
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
-		const context = this.getActiveEditorContext(accessor);
+		const context = this.getEditorContextFromArgsOrActive(accessor);
 		if (context) {
 			this.runWithContext(accessor, context);
 		}
@@ -1891,8 +2043,8 @@ CommandsRegistry.registerCommand('notebook.trust', (accessor, args) => {
 CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor, args): {
 	viewType: string;
 	displayName: string;
-	options: { transientOutputs: boolean; transientMetadata: TransientMetadata };
-	filenamePattern: (string | glob.IRelativePattern | { include: string | glob.IRelativePattern, exclude: string | glob.IRelativePattern })[]
+	options: { transientOutputs: boolean; transientMetadata: TransientMetadata; };
+	filenamePattern: (string | glob.IRelativePattern | { include: string | glob.IRelativePattern, exclude: string | glob.IRelativePattern; })[];
 }[] => {
 	const notebookService = accessor.get<INotebookService>(INotebookService);
 	const contentProviders = notebookService.getContributedNotebookProviders();
@@ -1914,7 +2066,7 @@ CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor, a
 			}
 
 			return null;
-		}).filter(pattern => pattern !== null) as (string | glob.IRelativePattern | { include: string | glob.IRelativePattern, exclude: string | glob.IRelativePattern })[];
+		}).filter(pattern => pattern !== null) as (string | glob.IRelativePattern | { include: string | glob.IRelativePattern, exclude: string | glob.IRelativePattern; })[];
 
 		return {
 			viewType: provider.id,
@@ -1924,3 +2076,44 @@ CommandsRegistry.registerCommand('_resolveNotebookContentProvider', (accessor, a
 		};
 	});
 });
+
+CommandsRegistry.registerCommand('_resolveNotebookKernelProviders', async (accessor, args): Promise<{
+	extensionId: string;
+	description?: string;
+	selector: INotebookDocumentFilter;
+}[]> => {
+	const notebookService = accessor.get<INotebookService>(INotebookService);
+	const providers = await notebookService.getContributedNotebookKernelProviders();
+	return providers.map(provider => ({
+		extensionId: provider.providerExtensionId,
+		description: provider.providerDescription,
+		selector: provider.selector
+	}));
+});
+
+CommandsRegistry.registerCommand('_resolveNotebookKernels', async (accessor, args: {
+	viewType: string;
+	uri: UriComponents;
+}): Promise<{
+	id?: string;
+	label: string;
+	description?: string;
+	detail?: string;
+	isPreferred?: boolean;
+	preloads?: URI[];
+}[]> => {
+	const notebookService = accessor.get<INotebookService>(INotebookService);
+	const uri = URI.revive(args.uri as UriComponents);
+	const source = new CancellationTokenSource();
+	const kernels = await notebookService.getContributedNotebookKernels(args.viewType, uri, source.token);
+	source.dispose();
+
+	return kernels.map(provider => ({
+		id: provider.friendlyId,
+		label: provider.label,
+		description: provider.description,
+		detail: provider.detail,
+		isPreferred: provider.isPreferred,
+		preloads: provider.preloads?.map(preload => URI.revive(preload)) || []
+	}));
+});
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
index 2c2c46b89..c7f0f53cd 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findController.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/notebookFind';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, INotebookEditor, CellFindMatch, CellEditState, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, INotebookEditor, CellFindMatch, CellEditState, INotebookEditorContribution, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_OPEN } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { FindDecorations } from 'vs/editor/contrib/find/findDecorations';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IModelDeltaDecoration } from 'vs/editor/common/model';
@@ -385,7 +385,7 @@ registerAction2(class extends Action2 {
 			id: 'notebook.find',
 			title: { value: localize('notebookActions.findInNotebook', "Find in Notebook"), original: 'Find in Notebook' },
 			keybinding: {
-				when: NOTEBOOK_EDITOR_FOCUSED,
+				when: ContextKeyExpr.or(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_OPEN),
 				primary: KeyCode.KEY_F | KeyMod.CtrlCmd,
 				weight: KeybindingWeight.WorkbenchContrib
 			}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.css b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.css
new file mode 100644
index 000000000..6e71e660f
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.css
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-list .notebook-outline-element {
+	display: flex;
+	flex: 1;
+	flex-flow: row nowrap;
+	align-items: center;
+}
+
+.monaco-list .notebook-outline-element > .element-icon.file-icon {
+	height: 100%;
+}
+
+.monaco-breadcrumbs > .notebook-outline-element > .element-icon.file-icon {
+	height: 18px;
+}
+.monaco-list .notebook-outline-element .monaco-highlighted-label {
+	color: var(--outline-element-color);
+}
+
+.monaco-breadcrumbs .notebook-outline-element .element-decoration,
+.monaco-list .notebook-outline-element > .element-decoration {
+	opacity: 0.75;
+	font-size: 90%;
+	font-weight: 600;
+	padding: 0 12px 0 5px;
+	margin-left: auto;
+	text-align: center;
+	color: var(--outline-element-color);
+}
+
+.monaco-list .notebook-outline-element > .element-decoration.bubble {
+	font-family: codicon;
+	font-size: 14px;
+	opacity: 0.4;
+	padding-right: 8px;
+}
+
+.monaco-breadcrumbs .notebook-outline-element .element-decoration {
+	/* Don't show markers inline with breadcrumbs */
+	display: none;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
new file mode 100644
index 000000000..f6c2dd201
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -0,0 +1,607 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./notebookOutline';
+import { Codicon } from 'vs/base/common/codicons';
+import { Emitter, Event } from 'vs/base/common/event';
+import { combinedDisposable, IDisposable, Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ICellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
+import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IOutline, IOutlineComparator, IOutlineCreator, IOutlineListConfig, IOutlineService, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineConfigKeys, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IEditorPane } from 'vs/workbench/common/editor';
+import { IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
+import { createMatches, FuzzyScore } from 'vs/base/common/filters';
+import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { getIconClassesForModeId } from 'vs/editor/common/services/getIconClasses';
+import { IWorkbenchDataTreeOptions } from 'vs/platform/list/browser/listService';
+import { localize } from 'vs/nls';
+import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
+import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
+import { isEqual } from 'vs/base/common/resources';
+import { IdleValue } from 'vs/base/common/async';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import * as marked from 'vs/base/common/marked/marked';
+import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
+
+export interface IOutlineMarkerInfo {
+	readonly count: number;
+	readonly topSev: MarkerSeverity;
+}
+
+export class OutlineEntry {
+
+	private _children: OutlineEntry[] = [];
+	private _parent: OutlineEntry | undefined;
+	private _markerInfo: IOutlineMarkerInfo | undefined;
+
+	constructor(
+		readonly index: number,
+		readonly level: number,
+		readonly cell: ICellViewModel,
+		readonly label: string,
+		readonly icon: ThemeIcon
+	) { }
+
+	addChild(entry: OutlineEntry) {
+		this._children.push(entry);
+		entry._parent = this;
+	}
+
+	get parent(): OutlineEntry | undefined {
+		return this._parent;
+	}
+
+	get children(): Iterable<OutlineEntry> {
+		return this._children;
+	}
+
+	get markerInfo(): IOutlineMarkerInfo | undefined {
+		return this._markerInfo;
+	}
+
+	updateMarkers(markerService: IMarkerService): void {
+		if (this.cell.cellKind === CellKind.Code) {
+			// a code cell can have marker
+			const marker = markerService.read({ resource: this.cell.uri, severities: MarkerSeverity.Error | MarkerSeverity.Warning });
+			if (marker.length === 0) {
+				this._markerInfo = undefined;
+			} else {
+				const topSev = marker.find(a => a.severity === MarkerSeverity.Error)?.severity ?? MarkerSeverity.Warning;
+				this._markerInfo = { topSev, count: marker.length };
+			}
+		} else {
+			// a markdown cell can inherit markers from its children
+			let topChild: MarkerSeverity | undefined;
+			for (let child of this.children) {
+				child.updateMarkers(markerService);
+				if (child.markerInfo) {
+					topChild = !topChild ? child.markerInfo.topSev : Math.max(child.markerInfo.topSev, topChild);
+				}
+			}
+			this._markerInfo = topChild && { topSev: topChild, count: 0 };
+		}
+	}
+
+	clearMarkers(): void {
+		this._markerInfo = undefined;
+		for (let child of this.children) {
+			child.clearMarkers();
+		}
+	}
+
+	find(cell: ICellViewModel, parents: OutlineEntry[]): OutlineEntry | undefined {
+		if (cell.id === this.cell.id) {
+			return this;
+		}
+		parents.push(this);
+		for (let child of this.children) {
+			const result = child.find(cell, parents);
+			if (result) {
+				return result;
+			}
+		}
+		parents.pop();
+		return undefined;
+	}
+
+	asFlatList(bucket: OutlineEntry[]): void {
+		bucket.push(this);
+		for (let child of this.children) {
+			child.asFlatList(bucket);
+		}
+	}
+}
+
+class NotebookOutlineTemplate {
+
+	static readonly templateId = 'NotebookOutlineRenderer';
+
+	constructor(
+		readonly container: HTMLElement,
+		readonly iconClass: HTMLElement,
+		readonly iconLabel: IconLabel,
+		readonly decoration: HTMLElement
+	) { }
+}
+
+class NotebookOutlineRenderer implements ITreeRenderer<OutlineEntry, FuzzyScore, NotebookOutlineTemplate> {
+
+	templateId: string = NotebookOutlineTemplate.templateId;
+
+	constructor(
+		@IThemeService private readonly _themeService: IThemeService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) { }
+
+	renderTemplate(container: HTMLElement): NotebookOutlineTemplate {
+		container.classList.add('notebook-outline-element', 'show-file-icons');
+		const iconClass = document.createElement('div');
+		container.append(iconClass);
+		const iconLabel = new IconLabel(container, { supportHighlights: true });
+		const decoration = document.createElement('div');
+		decoration.className = 'element-decoration';
+		container.append(decoration);
+		return new NotebookOutlineTemplate(container, iconClass, iconLabel, decoration);
+	}
+
+	renderElement(node: ITreeNode<OutlineEntry, FuzzyScore>, _index: number, template: NotebookOutlineTemplate, _height: number | undefined): void {
+		const options: IIconLabelValueOptions = {
+			matches: createMatches(node.filterData),
+			extraClasses: []
+		};
+
+		if (node.element.cell.cellKind === CellKind.Code && this._themeService.getFileIconTheme().hasFileIcons) {
+			template.iconClass.className = '';
+			options.extraClasses?.push(...getIconClassesForModeId(node.element.cell.language ?? ''));
+		} else {
+			template.iconClass.className = 'element-icon ' + ThemeIcon.asClassNameArray(node.element.icon).join(' ');
+		}
+
+		template.iconLabel.setLabel(node.element.label, undefined, options);
+
+		const { markerInfo } = node.element;
+
+		template.container.style.removeProperty('--outline-element-color');
+		template.decoration.innerText = '';
+		if (markerInfo) {
+			const useBadges = this._configurationService.getValue<boolean>(OutlineConfigKeys.problemsBadges);
+			if (!useBadges) {
+				template.decoration.classList.remove('bubble');
+				template.decoration.innerText = '';
+			} else if (markerInfo.count === 0) {
+				template.decoration.classList.add('bubble');
+				template.decoration.innerText = '\uea71';
+			} else {
+				template.decoration.classList.remove('bubble');
+				template.decoration.innerText = markerInfo.count > 9 ? '9+' : String(markerInfo.count);
+			}
+			const color = this._themeService.getColorTheme().getColor(markerInfo.topSev === MarkerSeverity.Error ? listErrorForeground : listWarningForeground);
+			const useColors = this._configurationService.getValue<boolean>(OutlineConfigKeys.problemsColors);
+			if (!useColors) {
+				template.container.style.removeProperty('--outline-element-color');
+				template.decoration.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
+			} else {
+				template.container.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
+			}
+		}
+	}
+
+	disposeTemplate(templateData: NotebookOutlineTemplate): void {
+		templateData.iconLabel.dispose();
+	}
+}
+
+class NotebookOutlineAccessibility implements IListAccessibilityProvider<OutlineEntry> {
+	getAriaLabel(element: OutlineEntry): string | null {
+		return element.label;
+	}
+	getWidgetAriaLabel(): string {
+		return '';
+	}
+}
+
+class NotebookNavigationLabelProvider implements IKeyboardNavigationLabelProvider<OutlineEntry> {
+	getKeyboardNavigationLabel(element: OutlineEntry): { toString(): string | undefined; } | { toString(): string | undefined; }[] | undefined {
+		return element.label;
+	}
+}
+
+class NotebookOutlineVirtualDelegate implements IListVirtualDelegate<OutlineEntry> {
+
+	getHeight(_element: OutlineEntry): number {
+		return 22;
+	}
+
+	getTemplateId(_element: OutlineEntry): string {
+		return NotebookOutlineTemplate.templateId;
+	}
+}
+
+class NotebookQuickPickProvider implements IQuickPickDataSource<OutlineEntry> {
+
+	constructor(
+		private _getEntries: () => OutlineEntry[],
+		@IThemeService private readonly _themeService: IThemeService
+	) { }
+
+	getQuickPickElements(): Iterable<IQuickPickOutlineElement<OutlineEntry>> {
+		const bucket: OutlineEntry[] = [];
+		for (let entry of this._getEntries()) {
+			entry.asFlatList(bucket);
+		}
+		const result: IQuickPickOutlineElement<OutlineEntry>[] = [];
+		const { hasFileIcons } = this._themeService.getFileIconTheme();
+		for (let element of bucket) {
+			// todo@jrieken it is fishy that codicons cannot be used with iconClasses
+			// but file icons can...
+			result.push({
+				element,
+				label: hasFileIcons ? element.label : `$(${element.icon.id}) ${element.label}`,
+				ariaLabel: element.label,
+				iconClasses: hasFileIcons ? getIconClassesForModeId(element.cell.language ?? '') : undefined,
+			});
+		}
+		return result;
+	}
+}
+
+class NotebookComparator implements IOutlineComparator<OutlineEntry> {
+
+	private readonly _collator = new IdleValue<Intl.Collator>(() => new Intl.Collator(undefined, { numeric: true }));
+
+	compareByPosition(a: OutlineEntry, b: OutlineEntry): number {
+		return a.index - b.index;
+	}
+	compareByType(a: OutlineEntry, b: OutlineEntry): number {
+		return a.cell.cellKind - b.cell.cellKind || this._collator.value.compare(a.label, b.label);
+	}
+	compareByName(a: OutlineEntry, b: OutlineEntry): number {
+		return this._collator.value.compare(a.label, b.label);
+	}
+}
+
+class NotebookCellOutline implements IOutline<OutlineEntry> {
+
+	private readonly _dispoables = new DisposableStore();
+
+	private readonly _onDidChange = new Emitter<OutlineChangeEvent>();
+
+	readonly onDidChange: Event<OutlineChangeEvent> = this._onDidChange.event;
+
+	private _entries: OutlineEntry[] = [];
+	private _activeEntry?: OutlineEntry;
+	private readonly _entriesDisposables = new DisposableStore();
+
+	readonly config: IOutlineListConfig<OutlineEntry>;
+	readonly outlineKind = 'notebookCells';
+
+	get activeElement(): OutlineEntry | undefined {
+		return this._activeEntry;
+	}
+
+	constructor(
+		private readonly _editor: NotebookEditor,
+		private readonly _target: OutlineTarget,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IMarkerService private readonly _markerService: IMarkerService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		const selectionListener = new MutableDisposable();
+		this._dispoables.add(selectionListener);
+		const installSelectionListener = () => {
+			if (!_editor.viewModel) {
+				selectionListener.clear();
+			} else {
+				selectionListener.value = combinedDisposable(
+					_editor.viewModel.onDidChangeSelection(() => this._recomputeActive()),
+					_editor.viewModel.onDidChangeViewCells(() => this._recomputeState())
+				);
+			}
+		};
+
+		this._dispoables.add(_editor.onDidChangeModel(() => {
+			this._recomputeState();
+			installSelectionListener();
+		}));
+
+		this._dispoables.add(_configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('notebook.outline.showCodeCells')) {
+				this._recomputeState();
+			}
+		}));
+
+		this._dispoables.add(themeService.onDidFileIconThemeChange(() => {
+			this._onDidChange.fire({});
+		}));
+
+		this._recomputeState();
+		installSelectionListener();
+
+		const options: IWorkbenchDataTreeOptions<OutlineEntry, FuzzyScore> = {
+			collapseByDefault: _target === OutlineTarget.Breadcrumbs,
+			expandOnlyOnTwistieClick: true,
+			multipleSelectionSupport: false,
+			accessibilityProvider: new NotebookOutlineAccessibility(),
+			identityProvider: { getId: element => element.cell.id },
+			keyboardNavigationLabelProvider: new NotebookNavigationLabelProvider()
+		};
+
+		const treeDataSource: IDataSource<this, OutlineEntry> = { getChildren: parent => parent instanceof NotebookCellOutline ? this._entries : parent.children };
+		const delegate = new NotebookOutlineVirtualDelegate();
+		const renderers = [instantiationService.createInstance(NotebookOutlineRenderer)];
+		const comparator = new NotebookComparator();
+
+		this.config = {
+			breadcrumbsDataSource: {
+				getBreadcrumbElements: () => {
+					let result: OutlineEntry[] = [];
+					let candidate = this._activeEntry;
+					while (candidate) {
+						result.unshift(candidate);
+						candidate = candidate.parent;
+					}
+					return result;
+				}
+			},
+			quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => this._entries),
+			treeDataSource,
+			delegate,
+			renderers,
+			comparator,
+			options
+		};
+	}
+
+	dispose(): void {
+		this._dispoables.dispose();
+		this._entriesDisposables.dispose();
+	}
+
+	private _recomputeState(): void {
+		this._entriesDisposables.clear();
+		this._activeEntry = undefined;
+		this._entries.length = 0;
+
+		const { viewModel } = this._editor;
+		if (!viewModel) {
+			return;
+		}
+
+		let includeCodeCells = true;
+		if (this._target === OutlineTarget.OutlinePane) {
+			includeCodeCells = this._configurationService.getValue<boolean>('notebook.outline.showCodeCells');
+		} else if (this._target === OutlineTarget.Breadcrumbs) {
+			includeCodeCells = this._configurationService.getValue<boolean>('notebook.breadcrumbs.showCodeCells');
+		}
+
+		const [selected] = viewModel.selectionHandles;
+		const entries: OutlineEntry[] = [];
+
+		for (let i = 0; i < viewModel.viewCells.length; i++) {
+			const cell = viewModel.viewCells[i];
+			const isMarkdown = cell.cellKind === CellKind.Markdown;
+			if (!isMarkdown && !includeCodeCells) {
+				continue;
+			}
+
+			// anaslse cell text but cap it 10000 characters
+			let content = cell.getText().substr(0, 10_000);
+			let level = 7;
+
+			if (isMarkdown) {
+				// MD cell: "render" as plain text, find highest header
+				for (const token of marked.lexer(content, { gfm: true })) {
+					if (token.type === 'heading') {
+						level = Math.min(level, token.depth);
+					}
+				}
+				content = renderMarkdownAsPlaintext({ value: content });
+			}
+
+			// find first none empty line or use default text
+			const lineMatch = content.match(/^.*\w+.*\w*$/m);
+			let preview: string;
+			if (!lineMatch) {
+				preview = localize('empty', "empty cell");
+			} else {
+				preview = lineMatch[0].trim();
+				if (preview.length >= 64) {
+					preview = preview.slice(0, 64) + '…';
+				}
+			}
+
+			const entry = new OutlineEntry(i, level, cell, preview, isMarkdown ? Codicon.markdown : Codicon.code);
+			entries.push(entry);
+			if (cell.handle === selected) {
+				this._activeEntry = entry;
+			}
+
+			// send an event whenever any of the cells change
+			this._entriesDisposables.add(cell.model.onDidChangeContent(() => {
+				this._recomputeState();
+				this._onDidChange.fire({});
+			}));
+		}
+
+		// build a tree from the list of entries
+		if (entries.length > 0) {
+			let result: OutlineEntry[] = [entries[0]];
+			let parentStack: OutlineEntry[] = [entries[0]];
+
+			for (let i = 1; i < entries.length; i++) {
+				let entry = entries[i];
+
+				while (true) {
+					const len = parentStack.length;
+					if (len === 0) {
+						// root node
+						result.push(entry);
+						parentStack.push(entry);
+						break;
+
+					} else {
+						let parentCandidate = parentStack[len - 1];
+						if (parentCandidate.level < entry.level) {
+							parentCandidate.addChild(entry);
+							parentStack.push(entry);
+							break;
+						} else {
+							parentStack.pop();
+						}
+					}
+				}
+			}
+			this._entries = result;
+		}
+
+		// feature: show markers with each cell
+		const markerServiceListener = new MutableDisposable();
+		this._entriesDisposables.add(markerServiceListener);
+		const updateMarkerUpdater = () => {
+			const doUpdateMarker = (clear: boolean) => {
+				for (let entry of this._entries) {
+					if (clear) {
+						entry.clearMarkers();
+					} else {
+						entry.updateMarkers(this._markerService);
+					}
+				}
+			};
+			if (this._configurationService.getValue(OutlineConfigKeys.problemsEnabled)) {
+				markerServiceListener.value = this._markerService.onMarkerChanged(e => {
+					if (e.some(uri => viewModel.viewCells.some(cell => isEqual(cell.uri, uri)))) {
+						doUpdateMarker(false);
+						this._onDidChange.fire({});
+					}
+				});
+				doUpdateMarker(false);
+			} else {
+				markerServiceListener.clear();
+				doUpdateMarker(true);
+			}
+		};
+		updateMarkerUpdater();
+		this._entriesDisposables.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
+				updateMarkerUpdater();
+				this._onDidChange.fire({});
+			}
+		}));
+
+		this._onDidChange.fire({});
+	}
+
+	private _recomputeActive(): void {
+		let newActive: OutlineEntry | undefined;
+		const { viewModel } = this._editor;
+
+		if (viewModel) {
+			const [selected] = viewModel.selectionHandles;
+			const cell = viewModel.getCellByHandle(selected);
+			if (cell) {
+				for (let entry of this._entries) {
+					newActive = entry.find(cell, []);
+					if (newActive) {
+						break;
+					}
+				}
+			}
+		}
+		if (newActive !== this._activeEntry) {
+			this._activeEntry = newActive;
+			this._onDidChange.fire({ affectOnlyActiveElement: true });
+		}
+	}
+
+	get isEmpty(): boolean {
+		return this._entries.length === 0;
+	}
+
+	async reveal(entry: OutlineEntry, options: IEditorOptions, sideBySide: boolean): Promise<void> {
+		await this._editorService.openEditor({
+			resource: entry.cell.uri,
+			options,
+		}, sideBySide ? SIDE_GROUP : undefined);
+	}
+
+	preview(entry: OutlineEntry): IDisposable {
+		const widget = this._editor.getControl();
+		if (!widget) {
+			return Disposable.None;
+		}
+		widget.revealInCenterIfOutsideViewport(entry.cell);
+		const ids = widget.deltaCellDecorations([], [{
+			handle: entry.cell.handle,
+			options: { className: 'nb-symbolHighlight', outputClassName: 'nb-symbolHighlight' }
+		}]);
+		return toDisposable(() => { widget.deltaCellDecorations(ids, []); });
+
+	}
+
+	captureViewState(): IDisposable {
+		const widget = this._editor.getControl();
+		let viewState = widget?.getEditorViewState();
+		return toDisposable(() => {
+			if (viewState) {
+				widget?.restoreListViewState(viewState);
+			}
+		});
+	}
+}
+
+class NotebookOutlineCreator implements IOutlineCreator<NotebookEditor, OutlineEntry> {
+
+	readonly dispose: () => void;
+
+	constructor(
+		@IOutlineService outlineService: IOutlineService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		const reg = outlineService.registerOutlineCreator(this);
+		this.dispose = () => reg.dispose();
+	}
+
+	matches(candidate: IEditorPane): candidate is NotebookEditor {
+		return candidate.getId() === NotebookEditor.ID;
+	}
+
+	async createOutline(editor: NotebookEditor, target: OutlineTarget): Promise<IOutline<OutlineEntry> | undefined> {
+		return this._instantiationService.createInstance(NotebookCellOutline, editor, target);
+	}
+}
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NotebookOutlineCreator, LifecyclePhase.Eventually);
+
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	id: 'notebook',
+	order: 100,
+	type: 'object',
+	'properties': {
+		'notebook.outline.showCodeCells': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: localize('outline.showCodeCells', "When enabled notebook outline shows code cells.")
+		},
+		'notebook.breadcrumbs.showCodeCells': {
+			type: 'boolean',
+			default: true,
+			markdownDescription: localize('breadcrumbs.showCodeCells', "When enabled notebook breadcrumbs contain code cells.")
+		},
+	}
+});
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
index 2f32225cb..d3bc0b2ab 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/status/editorStatus.ts
@@ -8,7 +8,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
-import { INotebookActionContext, NOTEBOOK_ACTIONS_CATEGORY, getActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
+import { NOTEBOOK_ACTIONS_CATEGORY, getActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import { INotebookEditor, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
@@ -33,11 +33,33 @@ registerAction2(class extends Action2 {
 			title: { value: nls.localize('notebookActions.selectKernel', "Select Notebook Kernel"), original: 'Select Notebook Kernel' },
 			precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
 			icon: selectKernelIcon,
-			f1: true
+			f1: true,
+			description: {
+				description: nls.localize('notebookActions.selectKernel.args', "Notebook Kernel Args"),
+				args: [
+					{
+						name: 'kernelInfo',
+						description: 'The kernel info',
+						schema: {
+							'type': 'object',
+							'required': ['id', 'extension'],
+							'properties': {
+								'id': {
+									'type': 'string'
+								},
+								'extension': {
+									'type': 'string'
+								}
+							}
+						}
+					}
+				]
+			},
+
 		});
 	}
 
-	async run(accessor: ServicesAccessor, context?: INotebookActionContext): Promise<void> {
+	async run(accessor: ServicesAccessor, context?: { id: string, extension: string }): Promise<void> {
 		const editorService = accessor.get<IEditorService>(IEditorService);
 		const quickInputService = accessor.get<IQuickInputService>(IQuickInputService);
 		const configurationService = accessor.get<IConfigurationService>(IConfigurationService);
@@ -52,20 +74,38 @@ registerAction2(class extends Action2 {
 		const picker = quickInputService.createQuickPick<(IQuickPickItem & { run(): void; kernelProviderId?: string })>();
 		picker.placeholder = nls.localize('notebook.runCell.selectKernel', "Select a notebook kernel to run this notebook");
 		picker.matchOnDetail = true;
-		picker.show();
+
+
+		if (context && context.id) {
+		} else {
+			picker.show();
+		}
+
 		picker.busy = true;
 
 		const tokenSource = new CancellationTokenSource();
-		const availableKernels2 = await editor.beginComputeContributedKernels();
-		const picks: QuickPickInput<IQuickPickItem & { run(): void; kernelProviderId?: string; }>[] = [...availableKernels2].map((a) => {
+		const availableKernels = await editor.beginComputeContributedKernels();
+
+		const selectedKernel = availableKernels.length ? availableKernels.find(
+			kernel => kernel.id && context?.id && kernel.id === context?.id && kernel.extension.value === context?.extension
+		) : undefined;
+
+		if (selectedKernel) {
+			editor.activeKernel = selectedKernel!;
+			return selectedKernel!.resolve(editor.uri!, editor.getId(), tokenSource.token);
+		} else {
+			picker.show();
+		}
+
+		const picks: QuickPickInput<IQuickPickItem & { run(): void; kernelProviderId?: string; }>[] = [...availableKernels].map((a) => {
 			return {
-				id: a.id,
+				id: a.friendlyId,
 				label: a.label,
-				picked: a.id === activeKernel?.id,
+				picked: a.friendlyId === activeKernel?.friendlyId,
 				description:
 					a.description
 						? a.description
-						: a.extension.value + (a.id === activeKernel?.id
+						: a.extension.value + (a.friendlyId === activeKernel?.friendlyId
 							? nls.localize('currentActiveKernel', " (Currently Active)")
 							: ''),
 				detail: a.detail,
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/toc/tocProvider.ts b/src/vs/workbench/contrib/notebook/browser/contrib/toc/tocProvider.ts
deleted file mode 100644
index 48599557f..000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/toc/tocProvider.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { TableOfContentsProviderRegistry, ITableOfContentsProvider, ITableOfContentsEntry } from 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
-import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { Codicon } from 'vs/base/common/codicons';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
-
-TableOfContentsProviderRegistry.register(NotebookEditor.ID, new class implements ITableOfContentsProvider {
-	async provideTableOfContents(editor: NotebookEditor, context: { disposables: DisposableStore }) {
-		if (!editor.viewModel) {
-			return undefined;
-		}
-		// return an entry per markdown header
-		const notebookWidget = editor.getControl();
-		if (!notebookWidget) {
-			return undefined;
-		}
-
-		// restore initial view state when no item was picked
-		let didPickOne = false;
-		const viewState = notebookWidget.getEditorViewState();
-		context.disposables.add(toDisposable(() => {
-			if (!didPickOne) {
-				notebookWidget.restoreListViewState(viewState);
-			}
-		}));
-
-		let lastDecorationId: string[] = [];
-		const result: ITableOfContentsEntry[] = [];
-		for (const cell of editor.viewModel.viewCells) {
-			const content = cell.getText();
-			const regexp = cell.cellKind === CellKind.Markdown
-				? /^[ \t]*(\#+)(.+)$/gm // md: header
-				: /^.*\w+.*\w*$/m;		// code: none empty line
-
-			const matches = content.match(regexp);
-			if (matches && matches.length) {
-				for (let j = 0; j < matches.length; j++) {
-					result.push({
-						icon: cell.cellKind === CellKind.Markdown ? Codicon.markdown : Codicon.code,
-						label: matches[j].replace(/^[ \t]*(\#+)/, ''),
-						pick() {
-							didPickOne = true;
-							notebookWidget.revealInCenterIfOutsideViewport(cell);
-							notebookWidget.selectElement(cell);
-							notebookWidget.focusNotebookCell(cell, cell.cellKind === CellKind.Markdown ? 'container' : 'editor');
-							lastDecorationId = notebookWidget.deltaCellDecorations(lastDecorationId, []);
-						},
-						preview() {
-							notebookWidget.revealInCenterIfOutsideViewport(cell);
-							notebookWidget.selectElement(cell);
-							lastDecorationId = notebookWidget.deltaCellDecorations(lastDecorationId, [{
-								handle: cell.handle,
-								options: { className: 'nb-symbolHighlight', outputClassName: 'nb-symbolHighlight' }
-							}]);
-						}
-					});
-				}
-			}
-		}
-
-		context.disposables.add(toDisposable(() => {
-			notebookWidget.deltaCellDecorations(lastDecorationId, []);
-		}));
-
-		return result;
-	}
-});
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/cellComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/cellComponents.ts
deleted file mode 100644
index f526080b2..000000000
--- a/src/vs/workbench/contrib/notebook/browser/diff/cellComponents.ts
+++ /dev/null
@@ -1,1091 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as DOM from 'vs/base/browser/dom';
-import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CellDiffViewModel, PropertyFoldingState } from 'vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel';
-import { CellDiffRenderTemplate, CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/common';
-import { EDITOR_BOTTOM_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { format } from 'vs/base/common/jsonFormatter';
-import { applyEdits } from 'vs/base/common/jsonEdit';
-import { CellEditType, CellUri, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { hash } from 'vs/base/common/hash';
-import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IAction } from 'vs/base/common/actions';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellActionView';
-import { getEditorTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
-import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { renderCodicons } from 'vs/base/browser/codicons';
-
-const fixedEditorOptions: IEditorOptions = {
-	padding: {
-		top: 12,
-		bottom: 12
-	},
-	scrollBeyondLastLine: false,
-	scrollbar: {
-		verticalScrollbarSize: 14,
-		horizontal: 'auto',
-		useShadows: true,
-		verticalHasArrows: false,
-		horizontalHasArrows: false,
-		alwaysConsumeMouseWheel: false
-	},
-	renderLineHighlightOnlyWhenFocus: true,
-	overviewRulerLanes: 0,
-	selectOnLineNumbers: false,
-	wordWrap: 'off',
-	lineNumbers: 'off',
-	lineDecorationsWidth: 0,
-	glyphMargin: false,
-	fixedOverflowWidgets: true,
-	minimap: { enabled: false },
-	renderValidationDecorations: 'on',
-	renderLineHighlight: 'none',
-	readOnly: true
-};
-
-const fixedDiffEditorOptions: IDiffEditorOptions = {
-	...fixedEditorOptions,
-	glyphMargin: true,
-	enableSplitViewResizing: false,
-	renderIndicators: false,
-	readOnly: false,
-	isInEmbeddedEditor: true
-};
-
-
-
-class PropertyHeader extends Disposable {
-	protected _foldingIndicator!: HTMLElement;
-	protected _statusSpan!: HTMLElement;
-	protected _toolbar!: ToolBar;
-	protected _menu!: IMenu;
-
-	constructor(
-		readonly cell: CellDiffViewModel,
-		readonly metadataHeaderContainer: HTMLElement,
-		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly accessor: {
-			updateInfoRendering: () => void;
-			checkIfModified: (cell: CellDiffViewModel) => boolean;
-			getFoldingState: (cell: CellDiffViewModel) => PropertyFoldingState;
-			updateFoldingState: (cell: CellDiffViewModel, newState: PropertyFoldingState) => void;
-			unChangedLabel: string;
-			changedLabel: string;
-			prefix: string;
-			menuId: MenuId;
-		},
-		@IContextMenuService readonly contextMenuService: IContextMenuService,
-		@IKeybindingService readonly keybindingService: IKeybindingService,
-		@INotificationService readonly notificationService: INotificationService,
-		@IMenuService readonly menuService: IMenuService,
-		@IContextKeyService readonly contextKeyService: IContextKeyService
-	) {
-		super();
-	}
-
-	buildHeader(): void {
-		let metadataChanged = this.accessor.checkIfModified(this.cell);
-		this._foldingIndicator = DOM.append(this.metadataHeaderContainer, DOM.$('.property-folding-indicator'));
-		this._foldingIndicator.classList.add(this.accessor.prefix);
-		this._updateFoldingIcon();
-		const metadataStatus = DOM.append(this.metadataHeaderContainer, DOM.$('div.property-status'));
-		this._statusSpan = DOM.append(metadataStatus, DOM.$('span'));
-
-		if (metadataChanged) {
-			this._statusSpan.textContent = this.accessor.changedLabel;
-			this._statusSpan.style.fontWeight = 'bold';
-			this.metadataHeaderContainer.classList.add('modified');
-		} else {
-			this._statusSpan.textContent = this.accessor.unChangedLabel;
-		}
-
-		const cellToolbarContainer = DOM.append(this.metadataHeaderContainer, DOM.$('div.property-toolbar'));
-		this._toolbar = new ToolBar(cellToolbarContainer, this.contextMenuService, {
-			actionViewItemProvider: action => {
-				if (action instanceof MenuItemAction) {
-					const item = new CodiconActionViewItem(action, this.keybindingService, this.notificationService);
-					return item;
-				}
-
-				return undefined;
-			}
-		});
-		this._register(this._toolbar);
-		this._toolbar.context = {
-			cell: this.cell
-		};
-
-		this._menu = this.menuService.createMenu(this.accessor.menuId, this.contextKeyService);
-		this._register(this._menu);
-
-		if (metadataChanged) {
-			const actions: IAction[] = [];
-			createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
-			this._toolbar.setActions(actions);
-		}
-
-		this._register(this.notebookEditor.onMouseUp(e => {
-			if (!e.event.target) {
-				return;
-			}
-
-			const target = e.event.target as HTMLElement;
-
-			if (target.classList.contains('codicon-notebook-collapsed') || target.classList.contains('codicon-notebook-expanded')) {
-				const parent = target.parentElement as HTMLElement;
-
-				if (!parent) {
-					return;
-				}
-
-				if (!parent.classList.contains(this.accessor.prefix)) {
-					return;
-				}
-
-				if (!parent.classList.contains('property-folding-indicator')) {
-					return;
-				}
-
-				// folding icon
-
-				const cellViewModel = e.target;
-
-				if (cellViewModel === this.cell) {
-					const oldFoldingState = this.accessor.getFoldingState(this.cell);
-					this.accessor.updateFoldingState(this.cell, oldFoldingState === PropertyFoldingState.Expanded ? PropertyFoldingState.Collapsed : PropertyFoldingState.Expanded);
-					this._updateFoldingIcon();
-					this.accessor.updateInfoRendering();
-				}
-			}
-
-			return;
-		}));
-
-		this._updateFoldingIcon();
-		this.accessor.updateInfoRendering();
-	}
-
-	refresh() {
-		let metadataChanged = this.accessor.checkIfModified(this.cell);
-		if (metadataChanged) {
-			this._statusSpan.textContent = this.accessor.changedLabel;
-			this._statusSpan.style.fontWeight = 'bold';
-			this.metadataHeaderContainer.classList.add('modified');
-			const actions: IAction[] = [];
-			createAndFillInActionBarActions(this._menu, undefined, actions);
-			this._toolbar.setActions(actions);
-		} else {
-			this._statusSpan.textContent = this.accessor.unChangedLabel;
-			this._statusSpan.style.fontWeight = 'normal';
-			this._toolbar.setActions([]);
-		}
-	}
-
-	private _updateFoldingIcon() {
-		if (this.accessor.getFoldingState(this.cell) === PropertyFoldingState.Collapsed) {
-			DOM.reset(this._foldingIndicator, ...renderCodicons(ThemeIcon.asCodiconLabel(collapsedIcon)));
-		} else {
-			DOM.reset(this._foldingIndicator, ...renderCodicons(ThemeIcon.asCodiconLabel(expandedIcon)));
-		}
-	}
-}
-
-abstract class AbstractCellRenderer extends Disposable {
-	protected _metadataHeaderContainer!: HTMLElement;
-	protected _metadataHeader!: PropertyHeader;
-	protected _metadataInfoContainer!: HTMLElement;
-	protected _metadataEditorContainer?: HTMLElement;
-	protected _metadataEditorDisposeStore!: DisposableStore;
-	protected _metadataEditor?: CodeEditorWidget | DiffEditorWidget;
-
-	protected _outputHeaderContainer!: HTMLElement;
-	protected _outputHeader!: PropertyHeader;
-	protected _outputInfoContainer!: HTMLElement;
-	protected _outputEditorContainer?: HTMLElement;
-	protected _outputEditorDisposeStore!: DisposableStore;
-	protected _outputEditor?: CodeEditorWidget | DiffEditorWidget;
-
-
-	protected _diffEditorContainer!: HTMLElement;
-	protected _diagonalFill?: HTMLElement;
-	protected _layoutInfo!: {
-		editorHeight: number;
-		editorMargin: number;
-		metadataStatusHeight: number;
-		metadataHeight: number;
-		outputStatusHeight: number;
-		outputHeight: number;
-		bodyMargin: number;
-	};
-	protected _isDisposed: boolean;
-
-	constructor(
-		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: CellDiffViewModel,
-		readonly templateData: CellDiffRenderTemplate,
-		readonly style: 'left' | 'right' | 'full',
-		protected readonly instantiationService: IInstantiationService,
-		protected readonly modeService: IModeService,
-		protected readonly modelService: IModelService,
-		protected readonly contextMenuService: IContextMenuService,
-		protected readonly keybindingService: IKeybindingService,
-		protected readonly notificationService: INotificationService,
-		protected readonly menuService: IMenuService,
-		protected readonly contextKeyService: IContextKeyService
-
-
-	) {
-		super();
-		// init
-		this._isDisposed = false;
-		this._layoutInfo = {
-			editorHeight: 0,
-			editorMargin: 0,
-			metadataHeight: 0,
-			metadataStatusHeight: 25,
-			outputHeight: 0,
-			outputStatusHeight: 25,
-			bodyMargin: 32
-		};
-		this._metadataEditorDisposeStore = new DisposableStore();
-		this._outputEditorDisposeStore = new DisposableStore();
-		this._register(this._metadataEditorDisposeStore);
-		this.initData();
-		this.buildBody(templateData.container);
-		this._register(cell.onDidLayoutChange(e => this.onDidLayoutChange(e)));
-	}
-
-	buildBody(container: HTMLElement) {
-		const body = DOM.$('.cell-body');
-		DOM.append(container, body);
-		this._diffEditorContainer = DOM.$('.cell-diff-editor-container');
-		switch (this.style) {
-			case 'left':
-				body.classList.add('left');
-				break;
-			case 'right':
-				body.classList.add('right');
-				break;
-			default:
-				body.classList.add('full');
-				break;
-		}
-
-		DOM.append(body, this._diffEditorContainer);
-		this._diagonalFill = DOM.append(body, DOM.$('.diagonal-fill'));
-		this.styleContainer(this._diffEditorContainer);
-		const sourceContainer = DOM.append(this._diffEditorContainer, DOM.$('.source-container'));
-		this.buildSourceEditor(sourceContainer);
-
-		this._metadataHeaderContainer = DOM.append(this._diffEditorContainer, DOM.$('.metadata-header-container'));
-		this._metadataInfoContainer = DOM.append(this._diffEditorContainer, DOM.$('.metadata-info-container'));
-
-		const checkIfModified = (cell: CellDiffViewModel) => {
-			return cell.type !== 'delete' && cell.type !== 'insert' && hash(this._getFormatedMetadataJSON(cell.original?.metadata || {}, cell.original?.language)) !== hash(this._getFormatedMetadataJSON(cell.modified?.metadata ?? {}, cell.modified?.language));
-		};
-
-		if (checkIfModified(this.cell)) {
-			this.cell.metadataFoldingState = PropertyFoldingState.Expanded;
-		}
-
-		this._metadataHeader = this.instantiationService.createInstance(
-			PropertyHeader,
-			this.cell,
-			this._metadataHeaderContainer,
-			this.notebookEditor,
-			{
-				updateInfoRendering: this.updateMetadataRendering.bind(this),
-				checkIfModified: (cell) => {
-					return checkIfModified(cell);
-				},
-				getFoldingState: (cell) => {
-					return cell.metadataFoldingState;
-				},
-				updateFoldingState: (cell, state) => {
-					cell.metadataFoldingState = state;
-				},
-				unChangedLabel: 'Metadata',
-				changedLabel: 'Metadata changed',
-				prefix: 'metadata',
-				menuId: MenuId.NotebookDiffCellMetadataTitle
-			}
-		);
-		this._register(this._metadataHeader);
-		this._metadataHeader.buildHeader();
-
-		if (this.notebookEditor.textModel?.transientOptions.transientOutputs) {
-			this._layoutInfo.outputHeight = 0;
-			this._layoutInfo.outputStatusHeight = 0;
-			this.layout({});
-			return;
-		}
-
-		this._outputHeaderContainer = DOM.append(this._diffEditorContainer, DOM.$('.output-header-container'));
-		this._outputInfoContainer = DOM.append(this._diffEditorContainer, DOM.$('.output-info-container'));
-
-		const checkIfOutputsModified = (cell: CellDiffViewModel) => {
-			return cell.type !== 'delete' && cell.type !== 'insert' && !this.notebookEditor.textModel!.transientOptions.transientOutputs && cell.type === 'modified' && hash(cell.original?.outputs ?? []) !== hash(cell.modified?.outputs ?? []);
-		};
-
-		if (checkIfOutputsModified(this.cell)) {
-			this.cell.outputFoldingState = PropertyFoldingState.Expanded;
-		}
-
-		this._outputHeader = this.instantiationService.createInstance(
-			PropertyHeader,
-			this.cell,
-			this._outputHeaderContainer,
-			this.notebookEditor,
-			{
-				updateInfoRendering: this.updateOutputRendering.bind(this),
-				checkIfModified: (cell) => {
-					return checkIfOutputsModified(cell);
-				},
-				getFoldingState: (cell) => {
-					return cell.outputFoldingState;
-				},
-				updateFoldingState: (cell, state) => {
-					cell.outputFoldingState = state;
-				},
-				unChangedLabel: 'Outputs',
-				changedLabel: 'Outputs changed',
-				prefix: 'output',
-				menuId: MenuId.NotebookDiffCellOutputsTitle
-			}
-		);
-		this._register(this._outputHeader);
-		this._outputHeader.buildHeader();
-	}
-
-	updateMetadataRendering() {
-		if (this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
-			// we should expand the metadata editor
-			this._metadataInfoContainer.style.display = 'block';
-
-			if (!this._metadataEditorContainer || !this._metadataEditor) {
-				// create editor
-				this._metadataEditorContainer = DOM.append(this._metadataInfoContainer, DOM.$('.metadata-editor-container'));
-				this._buildMetadataEditor();
-			} else {
-				this._layoutInfo.metadataHeight = this._metadataEditor.getContentHeight();
-				this.layout({ metadataEditor: true });
-			}
-		} else {
-			// we should collapse the metadata editor
-			this._metadataInfoContainer.style.display = 'none';
-			this._metadataEditorDisposeStore.clear();
-			this._layoutInfo.metadataHeight = 0;
-			this.layout({});
-		}
-	}
-
-	updateOutputRendering() {
-		if (this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
-			this._outputInfoContainer.style.display = 'block';
-
-			if (!this._outputEditorContainer || !this._outputEditor) {
-				// create editor
-				this._outputEditorContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-editor-container'));
-				this._buildOutputEditor();
-			} else {
-				this._layoutInfo.outputHeight = this._outputEditor.getContentHeight();
-				this.layout({ outputEditor: true });
-			}
-		} else {
-			this._outputInfoContainer.style.display = 'none';
-			this._outputEditorDisposeStore.clear();
-			this._layoutInfo.outputHeight = 0;
-			this.layout({});
-		}
-	}
-
-	protected _getFormatedMetadataJSON(metadata: NotebookCellMetadata, language?: string) {
-		let filteredMetadata: { [key: string]: any } = {};
-
-		if (this.notebookEditor.textModel) {
-			const transientMetadata = this.notebookEditor.textModel!.transientOptions.transientMetadata;
-
-			const keys = new Set([...Object.keys(metadata)]);
-			for (let key of keys) {
-				if (!(transientMetadata[key as keyof NotebookCellMetadata])
-				) {
-					filteredMetadata[key] = metadata[key as keyof NotebookCellMetadata];
-				}
-			}
-		} else {
-			filteredMetadata = metadata;
-		}
-
-		const content = JSON.stringify({
-			language,
-			...filteredMetadata
-		});
-
-		const edits = format(content, undefined, {});
-		const metadataSource = applyEdits(content, edits);
-
-		return metadataSource;
-	}
-
-	private _applySanitizedMetadataChanges(currentMetadata: NotebookCellMetadata, newMetadata: any) {
-		let result: { [key: string]: any } = {};
-		let newLangauge: string | undefined = undefined;
-		try {
-			const newMetadataObj = JSON.parse(newMetadata);
-			const keys = new Set([...Object.keys(newMetadataObj)]);
-			for (let key of keys) {
-				switch (key as keyof NotebookCellMetadata) {
-					case 'breakpointMargin':
-					case 'editable':
-					case 'hasExecutionOrder':
-					case 'inputCollapsed':
-					case 'outputCollapsed':
-					case 'runnable':
-						// boolean
-						if (typeof newMetadataObj[key] === 'boolean') {
-							result[key] = newMetadataObj[key];
-						} else {
-							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
-						}
-						break;
-
-					case 'executionOrder':
-					case 'lastRunDuration':
-						// number
-						if (typeof newMetadataObj[key] === 'number') {
-							result[key] = newMetadataObj[key];
-						} else {
-							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
-						}
-						break;
-					case 'runState':
-						// enum
-						if (typeof newMetadataObj[key] === 'number' && [1, 2, 3, 4].indexOf(newMetadataObj[key]) >= 0) {
-							result[key] = newMetadataObj[key];
-						} else {
-							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
-						}
-						break;
-					case 'statusMessage':
-						// string
-						if (typeof newMetadataObj[key] === 'string') {
-							result[key] = newMetadataObj[key];
-						} else {
-							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
-						}
-						break;
-					default:
-						if (key === 'language') {
-							newLangauge = newMetadataObj[key];
-						}
-						result[key] = newMetadataObj[key];
-						break;
-				}
-			}
-
-			if (newLangauge !== undefined && newLangauge !== this.cell.modified!.language) {
-				const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!);
-				this.notebookEditor.textModel!.applyEdits(
-					this.notebookEditor.textModel!.versionId,
-					[{ editType: CellEditType.CellLanguage, index, language: newLangauge }],
-					true,
-					undefined,
-					() => undefined,
-					undefined
-				);
-			}
-
-			const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!);
-
-			if (index < 0) {
-				return;
-			}
-
-			this.notebookEditor.textModel!.applyEdits(this.notebookEditor.textModel!.versionId, [
-				{ editType: CellEditType.Metadata, index, metadata: result }
-			], true, undefined, () => undefined, undefined);
-		} catch {
-		}
-	}
-
-	private _buildMetadataEditor() {
-		if (this.cell.type === 'modified' || this.cell.type === 'unchanged') {
-			const originalMetadataSource = this._getFormatedMetadataJSON(this.cell.original?.metadata || {}, this.cell.original?.language);
-			const modifiedMetadataSource = this._getFormatedMetadataJSON(this.cell.modified?.metadata || {}, this.cell.modified?.language);
-			this._metadataEditor = this.instantiationService.createInstance(DiffEditorWidget, this._metadataEditorContainer!, {
-				...fixedDiffEditorOptions,
-				overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-				readOnly: false,
-				originalEditable: false,
-				ignoreTrimWhitespace: false
-			});
-			this._register(this._metadataEditor);
-
-			this._metadataEditorContainer?.classList.add('diff');
-
-			const mode = this.modeService.create('json');
-			const originalMetadataModel = this.modelService.createModel(originalMetadataSource, mode, CellUri.generateCellMetadataUri(this.cell.original!.uri, this.cell.original!.handle), false);
-			const modifiedMetadataModel = this.modelService.createModel(modifiedMetadataSource, mode, CellUri.generateCellMetadataUri(this.cell.modified!.uri, this.cell.modified!.handle), false);
-			this._metadataEditor.setModel({
-				original: originalMetadataModel,
-				modified: modifiedMetadataModel
-			});
-
-			this._register(originalMetadataModel);
-			this._register(modifiedMetadataModel);
-
-			this._layoutInfo.metadataHeight = this._metadataEditor.getContentHeight();
-			this.layout({ metadataEditor: true });
-
-			this._register(this._metadataEditor.onDidContentSizeChange((e) => {
-				if (e.contentHeightChanged && this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
-					this._layoutInfo.metadataHeight = e.contentHeight;
-					this.layout({ metadataEditor: true });
-				}
-			}));
-
-			let respondingToContentChange = false;
-
-			this._register(modifiedMetadataModel.onDidChangeContent(() => {
-				respondingToContentChange = true;
-				const value = modifiedMetadataModel.getValue();
-				this._applySanitizedMetadataChanges(this.cell.modified!.metadata, value);
-				this._metadataHeader.refresh();
-				respondingToContentChange = false;
-			}));
-
-			this._register(this.cell.modified!.onDidChangeMetadata(() => {
-				if (respondingToContentChange) {
-					return;
-				}
-
-				const modifiedMetadataSource = this._getFormatedMetadataJSON(this.cell.modified?.metadata || {}, this.cell.modified?.language);
-				modifiedMetadataModel.setValue(modifiedMetadataSource);
-			}));
-
-			return;
-		}
-
-		this._metadataEditor = this.instantiationService.createInstance(CodeEditorWidget, this._metadataEditorContainer!, {
-			...fixedEditorOptions,
-			dimension: {
-				width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
-				height: 0
-			},
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-			readOnly: false
-		}, {});
-		this._register(this._metadataEditor);
-
-		const mode = this.modeService.create('jsonc');
-		const originalMetadataSource = this._getFormatedMetadataJSON(
-			this.cell.type === 'insert'
-				? this.cell.modified!.metadata || {}
-				: this.cell.original!.metadata || {});
-		const uri = this.cell.type === 'insert'
-			? this.cell.modified!.uri
-			: this.cell.original!.uri;
-		const handle = this.cell.type === 'insert'
-			? this.cell.modified!.handle
-			: this.cell.original!.handle;
-
-		const modelUri = CellUri.generateCellMetadataUri(uri, handle);
-		const metadataModel = this.modelService.createModel(originalMetadataSource, mode, modelUri, false);
-		this._metadataEditor.setModel(metadataModel);
-		this._register(metadataModel);
-
-		this._layoutInfo.metadataHeight = this._metadataEditor.getContentHeight();
-		this.layout({ metadataEditor: true });
-
-		this._register(this._metadataEditor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
-				this._layoutInfo.metadataHeight = e.contentHeight;
-				this.layout({ metadataEditor: true });
-			}
-		}));
-	}
-
-	private _getFormatedOutputJSON(outputs: any[]) {
-		const content = JSON.stringify(outputs);
-
-		const edits = format(content, undefined, {});
-		const source = applyEdits(content, edits);
-
-		return source;
-	}
-
-	private _buildOutputEditor() {
-		if ((this.cell.type === 'modified' || this.cell.type === 'unchanged') && !this.notebookEditor.textModel!.transientOptions.transientOutputs) {
-			const originalOutputsSource = this._getFormatedOutputJSON(this.cell.original?.outputs || []);
-			const modifiedOutputsSource = this._getFormatedOutputJSON(this.cell.modified?.outputs || []);
-			if (originalOutputsSource !== modifiedOutputsSource) {
-				this._outputEditor = this.instantiationService.createInstance(DiffEditorWidget, this._outputEditorContainer!, {
-					...fixedDiffEditorOptions,
-					overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-					readOnly: true,
-					ignoreTrimWhitespace: false
-				});
-				this._register(this._outputEditor);
-
-				this._outputEditorContainer?.classList.add('diff');
-
-				const mode = this.modeService.create('json');
-				const originalModel = this.modelService.createModel(originalOutputsSource, mode, undefined, true);
-				const modifiedModel = this.modelService.createModel(modifiedOutputsSource, mode, undefined, true);
-				this._outputEditor.setModel({
-					original: originalModel,
-					modified: modifiedModel
-				});
-
-				this._layoutInfo.outputHeight = this._outputEditor.getContentHeight();
-				this.layout({ outputEditor: true });
-
-				this._register(this._outputEditor.onDidContentSizeChange((e) => {
-					if (e.contentHeightChanged && this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
-						this._layoutInfo.outputHeight = e.contentHeight;
-						this.layout({ outputEditor: true });
-					}
-				}));
-
-				this._register(this.cell.modified!.onDidChangeOutputs(() => {
-					const modifiedOutputsSource = this._getFormatedOutputJSON(this.cell.modified?.outputs || []);
-					modifiedModel.setValue(modifiedOutputsSource);
-					this._outputHeader.refresh();
-				}));
-
-				return;
-			}
-		}
-
-		this._outputEditor = this.instantiationService.createInstance(CodeEditorWidget, this._outputEditorContainer!, {
-			...fixedEditorOptions,
-			dimension: {
-				width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
-				height: 0
-			},
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
-		}, {});
-		this._register(this._outputEditor);
-
-		const mode = this.modeService.create('json');
-		const originaloutputSource = this._getFormatedOutputJSON(
-			this.notebookEditor.textModel!.transientOptions.transientOutputs
-				? []
-				: this.cell.type === 'insert'
-					? this.cell.modified!.outputs || []
-					: this.cell.original!.outputs || []);
-		const outputModel = this.modelService.createModel(originaloutputSource, mode, undefined, true);
-		this._outputEditor.setModel(outputModel);
-
-		this._layoutInfo.outputHeight = this._outputEditor.getContentHeight();
-		this.layout({ outputEditor: true });
-
-		this._register(this._outputEditor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
-				this._layoutInfo.outputHeight = e.contentHeight;
-				this.layout({ outputEditor: true });
-			}
-		}));
-	}
-
-	protected layoutNotebookCell() {
-		this.notebookEditor.layoutNotebookCell(
-			this.cell,
-			this._layoutInfo.editorHeight
-			+ this._layoutInfo.editorMargin
-			+ this._layoutInfo.metadataHeight
-			+ this._layoutInfo.metadataStatusHeight
-			+ this._layoutInfo.outputHeight
-			+ this._layoutInfo.outputStatusHeight
-			+ this._layoutInfo.bodyMargin
-		);
-	}
-
-	dispose() {
-		this._isDisposed = true;
-		super.dispose();
-	}
-
-	abstract initData(): void;
-	abstract styleContainer(container: HTMLElement): void;
-	abstract buildSourceEditor(sourceContainer: HTMLElement): void;
-	abstract onDidLayoutChange(event: CellDiffViewModelLayoutChangeEvent): void;
-	abstract layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataEditor?: boolean, outputEditor?: boolean }): void;
-}
-
-export class DeletedCell extends AbstractCellRenderer {
-	private _editor!: CodeEditorWidget;
-	constructor(
-		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: CellDiffViewModel,
-		readonly templateData: CellDiffRenderTemplate,
-		@IModeService readonly modeService: IModeService,
-		@IModelService readonly modelService: IModelService,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
-		@IKeybindingService protected readonly keybindingService: IKeybindingService,
-		@INotificationService protected readonly notificationService: INotificationService,
-		@IMenuService protected readonly menuService: IMenuService,
-		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
-
-
-	) {
-		super(notebookEditor, cell, templateData, 'left', instantiationService, modeService, modelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
-	}
-
-	initData(): void {
-	}
-
-	styleContainer(container: HTMLElement) {
-		container.classList.add('removed');
-	}
-
-	buildSourceEditor(sourceContainer: HTMLElement): void {
-		const originalCell = this.cell.original!;
-		const lineCount = originalCell.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
-
-		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
-
-		this._editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
-			...fixedEditorOptions,
-			dimension: {
-				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-				height: editorHeight
-			},
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
-		}, {});
-		this._register(this._editor);
-
-		this._layoutInfo.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this._layoutInfo.editorHeight !== e.contentHeight) {
-				this._layoutInfo.editorHeight = e.contentHeight;
-				this.layout({ editorHeight: true });
-			}
-		}));
-
-		originalCell.resolveTextModelRef().then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this._layoutInfo.editorHeight = this._editor.getContentHeight();
-			this.layout({ editorHeight: true });
-		});
-
-	}
-
-	onDidLayoutChange(e: CellDiffViewModelLayoutChangeEvent) {
-		if (e.outerWidth !== undefined) {
-			this.layout({ outerWidth: true });
-		}
-	}
-	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataEditor?: boolean, outputEditor?: boolean }) {
-		DOM.scheduleAtNextAnimationFrame(() => {
-			if (state.editorHeight || state.outerWidth) {
-				this._editor.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
-					height: this._layoutInfo.editorHeight
-				});
-			}
-
-			if (state.metadataEditor || state.outerWidth) {
-				this._metadataEditor?.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
-					height: this._layoutInfo.metadataHeight
-				});
-			}
-
-			if (state.outputEditor || state.outerWidth) {
-				this._outputEditor?.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
-					height: this._layoutInfo.outputHeight
-				});
-			}
-
-			this.layoutNotebookCell();
-		});
-	}
-}
-
-export class InsertCell extends AbstractCellRenderer {
-	private _editor!: CodeEditorWidget;
-	constructor(
-		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: CellDiffViewModel,
-		readonly templateData: CellDiffRenderTemplate,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IModeService readonly modeService: IModeService,
-		@IModelService readonly modelService: IModelService,
-		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
-		@IKeybindingService protected readonly keybindingService: IKeybindingService,
-		@INotificationService protected readonly notificationService: INotificationService,
-		@IMenuService protected readonly menuService: IMenuService,
-		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
-	) {
-		super(notebookEditor, cell, templateData, 'right', instantiationService, modeService, modelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
-	}
-
-	initData(): void {
-	}
-
-	styleContainer(container: HTMLElement): void {
-		container.classList.add('inserted');
-	}
-
-	buildSourceEditor(sourceContainer: HTMLElement): void {
-		const modifiedCell = this.cell.modified!;
-		const lineCount = modifiedCell.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
-		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
-
-		this._editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
-			...fixedEditorOptions,
-			dimension: {
-				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-				height: editorHeight
-			},
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-			readOnly: false
-		}, {});
-		this._register(this._editor);
-
-		this._layoutInfo.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this._layoutInfo.editorHeight !== e.contentHeight) {
-				this._layoutInfo.editorHeight = e.contentHeight;
-				this.layout({ editorHeight: true });
-			}
-		}));
-
-		modifiedCell.resolveTextModelRef().then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this._layoutInfo.editorHeight = this._editor.getContentHeight();
-			this.layout({ editorHeight: true });
-		});
-	}
-
-	onDidLayoutChange(e: CellDiffViewModelLayoutChangeEvent) {
-		if (e.outerWidth !== undefined) {
-			this.layout({ outerWidth: true });
-		}
-	}
-
-	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataEditor?: boolean, outputEditor?: boolean }) {
-		DOM.scheduleAtNextAnimationFrame(() => {
-			if (state.editorHeight || state.outerWidth) {
-				this._editor.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
-					height: this._layoutInfo.editorHeight
-				});
-			}
-
-			if (state.metadataEditor || state.outerWidth) {
-				this._metadataEditor?.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
-					height: this._layoutInfo.metadataHeight
-				});
-			}
-
-			if (state.outputEditor || state.outerWidth) {
-				this._outputEditor?.layout({
-					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
-					height: this._layoutInfo.outputHeight
-				});
-			}
-
-			this.layoutNotebookCell();
-		});
-	}
-}
-
-export class ModifiedCell extends AbstractCellRenderer {
-	private _editor?: DiffEditorWidget;
-	private _editorContainer!: HTMLElement;
-	private _inputToolbarContainer!: HTMLElement;
-	protected _toolbar!: ToolBar;
-	protected _menu!: IMenu;
-
-	constructor(
-		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: CellDiffViewModel,
-		readonly templateData: CellDiffRenderTemplate,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IModeService readonly modeService: IModeService,
-		@IModelService readonly modelService: IModelService,
-		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
-		@IKeybindingService protected readonly keybindingService: IKeybindingService,
-		@INotificationService protected readonly notificationService: INotificationService,
-		@IMenuService protected readonly menuService: IMenuService,
-		@IContextKeyService protected readonly contextKeyService: IContextKeyService
-	) {
-		super(notebookEditor, cell, templateData, 'full', instantiationService, modeService, modelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
-	}
-
-	initData(): void {
-	}
-
-	styleContainer(container: HTMLElement): void {
-	}
-
-	buildSourceEditor(sourceContainer: HTMLElement): void {
-		const modifiedCell = this.cell.modified!;
-		const lineCount = modifiedCell.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
-		this._editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
-
-		this._editor = this.instantiationService.createInstance(DiffEditorWidget, this._editorContainer, {
-			...fixedDiffEditorOptions,
-			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
-			originalEditable: false,
-			ignoreTrimWhitespace: false
-		});
-		this._register(this._editor);
-		this._editorContainer.classList.add('diff');
-
-		this._editor.layout({
-			width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
-			height: editorHeight
-		});
-
-		this._editorContainer.style.height = `${editorHeight}px`;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this._layoutInfo.editorHeight !== e.contentHeight) {
-				this._layoutInfo.editorHeight = e.contentHeight;
-				this.layout({ editorHeight: true });
-			}
-		}));
-
-		this._initializeSourceDiffEditor();
-
-		this._inputToolbarContainer = DOM.append(sourceContainer, DOM.$('.editor-input-toolbar-container'));
-		const cellToolbarContainer = DOM.append(this._inputToolbarContainer, DOM.$('div.property-toolbar'));
-		this._toolbar = new ToolBar(cellToolbarContainer, this.contextMenuService, {
-			actionViewItemProvider: action => {
-				if (action instanceof MenuItemAction) {
-					const item = new CodiconActionViewItem(action, this.keybindingService, this.notificationService);
-					return item;
-				}
-
-				return undefined;
-			}
-		});
-
-		this._toolbar.context = {
-			cell: this.cell
-		};
-
-		this._menu = this.menuService.createMenu(MenuId.NotebookDiffCellInputTitle, this.contextKeyService);
-		this._register(this._menu);
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
-		this._toolbar.setActions(actions);
-
-		if (this.cell.modified!.getValue() !== this.cell.original!.getValue()) {
-			this._inputToolbarContainer.style.display = 'block';
-		} else {
-			this._inputToolbarContainer.style.display = 'none';
-		}
-
-		this._register(this.cell.modified!.onDidChangeContent(() => {
-			if (this.cell.modified!.getValue() !== this.cell.original!.getValue()) {
-				this._inputToolbarContainer.style.display = 'block';
-			} else {
-				this._inputToolbarContainer.style.display = 'none';
-			}
-		}));
-	}
-
-	private async _initializeSourceDiffEditor() {
-		const originalCell = this.cell.original!;
-		const modifiedCell = this.cell.modified!;
-
-		const originalRef = await originalCell.resolveTextModelRef();
-		const modifiedRef = await modifiedCell.resolveTextModelRef();
-
-		if (this._isDisposed) {
-			return;
-		}
-
-		const textModel = originalRef.object.textEditorModel;
-		const modifiedTextModel = modifiedRef.object.textEditorModel;
-		this._register(originalRef);
-		this._register(modifiedRef);
-
-		this._editor!.setModel({
-			original: textModel,
-			modified: modifiedTextModel
-		});
-
-		const contentHeight = this._editor!.getContentHeight();
-		this._layoutInfo.editorHeight = contentHeight;
-		this.layout({ editorHeight: true });
-
-	}
-
-	onDidLayoutChange(e: CellDiffViewModelLayoutChangeEvent) {
-		if (e.outerWidth !== undefined) {
-			this.layout({ outerWidth: true });
-		}
-	}
-
-	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataEditor?: boolean, outputEditor?: boolean }) {
-		DOM.scheduleAtNextAnimationFrame(() => {
-			if (state.editorHeight || state.outerWidth) {
-				this._editorContainer.style.height = `${this._layoutInfo.editorHeight}px`;
-				this._editor!.layout();
-			}
-
-			if (state.metadataEditor || state.outerWidth) {
-				if (this._metadataEditorContainer) {
-					this._metadataEditorContainer.style.height = `${this._layoutInfo.metadataHeight}px`;
-					this._metadataEditor?.layout();
-				}
-			}
-
-			if (state.outputEditor || state.outerWidth) {
-				if (this._outputEditorContainer) {
-					this._outputEditorContainer.style.height = `${this._layoutInfo.outputHeight}px`;
-					this._outputEditor?.layout();
-				}
-			}
-
-			this.layoutNotebookCell();
-		});
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel.ts
deleted file mode 100644
index 55e25cee3..000000000
--- a/src/vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN } from 'vs/workbench/contrib/notebook/browser/diff/common';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
-
-export enum PropertyFoldingState {
-	Expanded,
-	Collapsed
-}
-
-export class CellDiffViewModel extends Disposable {
-	public metadataFoldingState: PropertyFoldingState;
-	public outputFoldingState: PropertyFoldingState;
-	private _layoutInfoEmitter = new Emitter<CellDiffViewModelLayoutChangeEvent>();
-
-	onDidLayoutChange = this._layoutInfoEmitter.event;
-
-	constructor(
-		readonly original: NotebookCellTextModel | undefined,
-		readonly modified: NotebookCellTextModel | undefined,
-		readonly type: 'unchanged' | 'insert' | 'delete' | 'modified',
-		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher
-	) {
-		super();
-		this.metadataFoldingState = PropertyFoldingState.Collapsed;
-		this.outputFoldingState = PropertyFoldingState.Collapsed;
-
-		this._register(this.editorEventDispatcher.onDidChangeLayout(e => {
-			this._layoutInfoEmitter.fire({ outerWidth: e.value.width });
-		}));
-	}
-
-	getComputedCellContainerWidth(layoutInfo: NotebookLayoutInfo, diffEditor: boolean, fullWidth: boolean) {
-		if (fullWidth) {
-			return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
-		}
-
-		return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/common.ts b/src/vs/workbench/contrib/notebook/browser/diff/common.ts
deleted file mode 100644
index 505718cea..000000000
--- a/src/vs/workbench/contrib/notebook/browser/diff/common.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CellDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel';
-import { Event } from 'vs/base/common/event';
-import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-
-export interface INotebookTextDiffEditor {
-	readonly textModel?: NotebookTextModel;
-	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: CellDiffViewModel; }>;
-	getOverflowContainerDomNode(): HTMLElement;
-	getLayoutInfo(): NotebookLayoutInfo;
-	layoutNotebookCell(cell: CellDiffViewModel, height: number): void;
-}
-
-export interface CellDiffRenderTemplate {
-	readonly container: HTMLElement;
-	readonly elementDisposables: DisposableStore;
-}
-
-export interface CellDiffViewModelLayoutChangeEvent {
-	font?: BareFontInfo;
-	outerWidth?: number;
-}
-
-export const DIFF_CELL_MARGIN = 16;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
new file mode 100644
index 000000000..e2f4b6cd8
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -0,0 +1,1463 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { DiffElementViewModelBase, getFormatedMetadataJSON, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { EDITOR_BOTTOM_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
+import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { CellEditType, CellUri, IProcessedOutput, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IMenu, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IAction } from 'vs/base/common/actions';
+import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { Delayer } from 'vs/base/common/async';
+import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellActionView';
+import { getEditorTopPadding } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { OutputContainer } from 'vs/workbench/contrib/notebook/browser/diff/diffElementOutputs';
+import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
+import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
+import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
+import { AccessibilityHelpController } from 'vs/workbench/contrib/codeEditor/browser/accessibility/accessibility';
+import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
+import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
+import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import * as editorCommon from 'vs/editor/common/editorCommon';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+
+export const fixedEditorOptions: IEditorOptions = {
+	padding: {
+		top: 12,
+		bottom: 12
+	},
+	scrollBeyondLastLine: false,
+	scrollbar: {
+		verticalScrollbarSize: 14,
+		horizontal: 'auto',
+		vertical: 'hidden',
+		useShadows: true,
+		verticalHasArrows: false,
+		horizontalHasArrows: false,
+		alwaysConsumeMouseWheel: false,
+	},
+	renderLineHighlightOnlyWhenFocus: true,
+	overviewRulerLanes: 0,
+	overviewRulerBorder: false,
+	selectOnLineNumbers: false,
+	wordWrap: 'off',
+	lineNumbers: 'off',
+	lineDecorationsWidth: 0,
+	glyphMargin: false,
+	fixedOverflowWidgets: true,
+	minimap: { enabled: false },
+	renderValidationDecorations: 'on',
+	renderLineHighlight: 'none',
+	readOnly: true
+};
+
+export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
+	return {
+		isSimpleWidget: false,
+		contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+			MenuPreventer.ID,
+			SelectionClipboardContributionID,
+			ContextMenuController.ID,
+			SuggestController.ID,
+			SnippetController2.ID,
+			TabCompletionController.ID,
+			AccessibilityHelpController.ID
+		])
+	};
+}
+
+export const fixedDiffEditorOptions: IDiffEditorOptions = {
+	...fixedEditorOptions,
+	glyphMargin: true,
+	enableSplitViewResizing: false,
+	renderIndicators: false,
+	readOnly: false,
+	isInEmbeddedEditor: true,
+	renderOverviewRuler: false
+};
+
+class PropertyHeader extends Disposable {
+	protected _foldingIndicator!: HTMLElement;
+	protected _statusSpan!: HTMLElement;
+	protected _toolbar!: ToolBar;
+	protected _menu!: IMenu;
+	protected _propertyExpanded?: IContextKey<boolean>;
+
+	constructor(
+		readonly cell: DiffElementViewModelBase,
+		readonly propertyHeaderContainer: HTMLElement,
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly accessor: {
+			updateInfoRendering: (renderOutput: boolean) => void;
+			checkIfModified: (cell: DiffElementViewModelBase) => boolean;
+			getFoldingState: (cell: DiffElementViewModelBase) => PropertyFoldingState;
+			updateFoldingState: (cell: DiffElementViewModelBase, newState: PropertyFoldingState) => void;
+			unChangedLabel: string;
+			changedLabel: string;
+			prefix: string;
+			menuId: MenuId;
+		},
+		@IContextMenuService readonly contextMenuService: IContextMenuService,
+		@IKeybindingService readonly keybindingService: IKeybindingService,
+		@INotificationService readonly notificationService: INotificationService,
+		@IMenuService readonly menuService: IMenuService,
+		@IContextKeyService readonly contextKeyService: IContextKeyService
+	) {
+		super();
+	}
+
+	buildHeader(): void {
+		let metadataChanged = this.accessor.checkIfModified(this.cell);
+		this._foldingIndicator = DOM.append(this.propertyHeaderContainer, DOM.$('.property-folding-indicator'));
+		this._foldingIndicator.classList.add(this.accessor.prefix);
+		this._updateFoldingIcon();
+		const metadataStatus = DOM.append(this.propertyHeaderContainer, DOM.$('div.property-status'));
+		this._statusSpan = DOM.append(metadataStatus, DOM.$('span'));
+
+		if (metadataChanged) {
+			this._statusSpan.textContent = this.accessor.changedLabel;
+			this._statusSpan.style.fontWeight = 'bold';
+			this.propertyHeaderContainer.classList.add('modified');
+		} else {
+			this._statusSpan.textContent = this.accessor.unChangedLabel;
+		}
+
+		const cellToolbarContainer = DOM.append(this.propertyHeaderContainer, DOM.$('div.property-toolbar'));
+		this._toolbar = new ToolBar(cellToolbarContainer, this.contextMenuService, {
+			actionViewItemProvider: action => {
+				if (action instanceof MenuItemAction) {
+					const item = new CodiconActionViewItem(action, this.keybindingService, this.notificationService);
+					return item;
+				}
+
+				return undefined;
+			}
+		});
+		this._register(this._toolbar);
+		this._toolbar.context = {
+			cell: this.cell
+		};
+
+		const scopedContextKeyService = this.contextKeyService.createScoped(cellToolbarContainer);
+		this._register(scopedContextKeyService);
+		const propertyChanged = NOTEBOOK_DIFF_CELL_PROPERTY.bindTo(scopedContextKeyService);
+		propertyChanged.set(metadataChanged);
+		this._propertyExpanded = NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED.bindTo(scopedContextKeyService);
+
+		this._menu = this.menuService.createMenu(this.accessor.menuId, scopedContextKeyService);
+		this._register(this._menu);
+
+		const actions: IAction[] = [];
+		createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
+		this._toolbar.setActions(actions);
+
+		this._register(this._menu.onDidChange(() => {
+			const actions: IAction[] = [];
+			createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
+			this._toolbar.setActions(actions);
+		}));
+
+		this._register(this.notebookEditor.onMouseUp(e => {
+			if (!e.event.target) {
+				return;
+			}
+
+			const target = e.event.target as HTMLElement;
+
+			if (target.classList.contains('codicon-notebook-collapsed') || target.classList.contains('codicon-notebook-expanded')) {
+				const parent = target.parentElement as HTMLElement;
+
+				if (!parent) {
+					return;
+				}
+
+				if (!parent.classList.contains(this.accessor.prefix)) {
+					return;
+				}
+
+				if (!parent.classList.contains('property-folding-indicator')) {
+					return;
+				}
+
+				// folding icon
+
+				const cellViewModel = e.target;
+
+				if (cellViewModel === this.cell) {
+					const oldFoldingState = this.accessor.getFoldingState(this.cell);
+					this.accessor.updateFoldingState(this.cell, oldFoldingState === PropertyFoldingState.Expanded ? PropertyFoldingState.Collapsed : PropertyFoldingState.Expanded);
+					this._updateFoldingIcon();
+					this.accessor.updateInfoRendering(this.cell.renderOutput);
+				}
+			}
+
+			return;
+		}));
+
+		this._updateFoldingIcon();
+		this.accessor.updateInfoRendering(this.cell.renderOutput);
+	}
+
+	refresh() {
+		let metadataChanged = this.accessor.checkIfModified(this.cell);
+		if (metadataChanged) {
+			this._statusSpan.textContent = this.accessor.changedLabel;
+			this._statusSpan.style.fontWeight = 'bold';
+			this.propertyHeaderContainer.classList.add('modified');
+			const actions: IAction[] = [];
+			createAndFillInActionBarActions(this._menu, undefined, actions);
+			this._toolbar.setActions(actions);
+		} else {
+			this._statusSpan.textContent = this.accessor.unChangedLabel;
+			this._statusSpan.style.fontWeight = 'normal';
+			this._toolbar.setActions([]);
+		}
+	}
+
+	private _updateFoldingIcon() {
+		if (this.accessor.getFoldingState(this.cell) === PropertyFoldingState.Collapsed) {
+			DOM.reset(this._foldingIndicator, renderIcon(collapsedIcon));
+			this._propertyExpanded?.set(false);
+		} else {
+			DOM.reset(this._foldingIndicator, renderIcon(expandedIcon));
+			this._propertyExpanded?.set(true);
+		}
+
+	}
+}
+
+abstract class AbstractElementRenderer extends Disposable {
+	protected _metadataHeaderContainer!: HTMLElement;
+	protected _metadataHeader!: PropertyHeader;
+	protected _metadataInfoContainer!: HTMLElement;
+	protected _metadataEditorContainer?: HTMLElement;
+	protected _metadataEditorDisposeStore!: DisposableStore;
+	protected _metadataEditor?: CodeEditorWidget | DiffEditorWidget;
+
+	protected _outputHeaderContainer!: HTMLElement;
+	protected _outputHeader!: PropertyHeader;
+	protected _outputInfoContainer!: HTMLElement;
+	protected _outputEditorContainer?: HTMLElement;
+	protected _outputViewContainer?: HTMLElement;
+	protected _outputLeftContainer?: HTMLElement;
+	protected _outputRightContainer?: HTMLElement;
+	protected _outputEmptyElement?: HTMLElement;
+	protected _outputLeftView?: OutputContainer;
+	protected _outputRightView?: OutputContainer;
+	protected _outputEditorDisposeStore!: DisposableStore;
+	protected _outputEditor?: CodeEditorWidget | DiffEditorWidget;
+
+
+	protected _diffEditorContainer!: HTMLElement;
+	protected _diagonalFill?: HTMLElement;
+	protected _isDisposed: boolean;
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly cell: DiffElementViewModelBase,
+		readonly templateData: CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate,
+		readonly style: 'left' | 'right' | 'full',
+		protected readonly instantiationService: IInstantiationService,
+		protected readonly modeService: IModeService,
+		protected readonly modelService: IModelService,
+		protected readonly textModelService: ITextModelService,
+		protected readonly contextMenuService: IContextMenuService,
+		protected readonly keybindingService: IKeybindingService,
+		protected readonly notificationService: INotificationService,
+		protected readonly menuService: IMenuService,
+		protected readonly contextKeyService: IContextKeyService
+
+
+	) {
+		super();
+		// init
+		this._isDisposed = false;
+		this._metadataEditorDisposeStore = new DisposableStore();
+		this._outputEditorDisposeStore = new DisposableStore();
+		this._register(this._metadataEditorDisposeStore);
+		this._register(this._outputEditorDisposeStore);
+		this._register(cell.onDidLayoutChange(e => this.layout(e)));
+		this._register(cell.onDidLayoutChange(e => this.updateBorders()));
+		this.buildBody();
+
+		this._register(cell.onDidStateChange(() => {
+			this.updateOutputRendering(this.cell.renderOutput);
+		}));
+	}
+
+	abstract buildBody(): void;
+
+	updateMetadataRendering() {
+		if (this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
+			// we should expand the metadata editor
+			this._metadataInfoContainer.style.display = 'block';
+
+			if (!this._metadataEditorContainer || !this._metadataEditor) {
+				// create editor
+				this._metadataEditorContainer = DOM.append(this._metadataInfoContainer, DOM.$('.metadata-editor-container'));
+				this._buildMetadataEditor();
+			} else {
+				this.cell.metadataHeight = this._metadataEditor.getContentHeight();
+			}
+		} else {
+			// we should collapse the metadata editor
+			this._metadataInfoContainer.style.display = 'none';
+			// this._metadataEditorDisposeStore.clear();
+			this.cell.metadataHeight = 0;
+		}
+	}
+
+	updateOutputRendering(renderRichOutput: boolean) {
+		if (this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
+			this._outputInfoContainer.style.display = 'block';
+			if (renderRichOutput) {
+				this._hideOutputsRaw();
+				this._buildOutputRendererContainer();
+				this._showOutputsRenderer();
+				this._showOutputsEmptyView();
+			} else {
+				this._hideOutputsRenderer();
+				this._buildOutputRawContainer();
+				this._showOutputsRaw();
+			}
+		} else {
+			this._outputInfoContainer.style.display = 'none';
+
+			this._hideOutputsRaw();
+			this._hideOutputsRenderer();
+			this._hideOutputsEmptyView();
+		}
+	}
+
+	private _buildOutputRawContainer() {
+		if (!this._outputEditorContainer) {
+			this._outputEditorContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-editor-container'));
+			this._buildOutputEditor();
+		}
+	}
+
+	private _showOutputsRaw() {
+		if (this._outputEditorContainer) {
+			this._outputEditorContainer.style.display = 'block';
+			this.cell.rawOutputHeight = this._outputEditor!.getContentHeight();
+		}
+	}
+
+	private _showOutputsEmptyView() {
+		this.cell.layoutChange();
+	}
+
+	private _hideOutputsRaw() {
+		if (this._outputEditorContainer) {
+			this._outputEditorContainer.style.display = 'none';
+			this.cell.rawOutputHeight = 0;
+		}
+	}
+
+	private _hideOutputsEmptyView() {
+		this.cell.layoutChange();
+	}
+
+	abstract _buildOutputRendererContainer(): void;
+	abstract _hideOutputsRenderer(): void;
+	abstract _showOutputsRenderer(): void;
+
+	private _applySanitizedMetadataChanges(currentMetadata: NotebookCellMetadata, newMetadata: any) {
+		let result: { [key: string]: any } = {};
+		let newLangauge: string | undefined = undefined;
+		try {
+			const newMetadataObj = JSON.parse(newMetadata);
+			const keys = new Set([...Object.keys(newMetadataObj)]);
+			for (let key of keys) {
+				switch (key as keyof NotebookCellMetadata) {
+					case 'breakpointMargin':
+					case 'editable':
+					case 'hasExecutionOrder':
+					case 'inputCollapsed':
+					case 'outputCollapsed':
+					case 'runnable':
+						// boolean
+						if (typeof newMetadataObj[key] === 'boolean') {
+							result[key] = newMetadataObj[key];
+						} else {
+							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
+						}
+						break;
+
+					case 'executionOrder':
+					case 'lastRunDuration':
+						// number
+						if (typeof newMetadataObj[key] === 'number') {
+							result[key] = newMetadataObj[key];
+						} else {
+							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
+						}
+						break;
+					case 'runState':
+						// enum
+						if (typeof newMetadataObj[key] === 'number' && [1, 2, 3, 4].indexOf(newMetadataObj[key]) >= 0) {
+							result[key] = newMetadataObj[key];
+						} else {
+							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
+						}
+						break;
+					case 'statusMessage':
+						// string
+						if (typeof newMetadataObj[key] === 'string') {
+							result[key] = newMetadataObj[key];
+						} else {
+							result[key] = currentMetadata[key as keyof NotebookCellMetadata];
+						}
+						break;
+					default:
+						if (key === 'language') {
+							newLangauge = newMetadataObj[key];
+						}
+						result[key] = newMetadataObj[key];
+						break;
+				}
+			}
+
+			if (newLangauge !== undefined && newLangauge !== this.cell.modified!.language) {
+				const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!.textModel);
+				this.notebookEditor.textModel!.applyEdits(
+					this.notebookEditor.textModel!.versionId,
+					[{ editType: CellEditType.CellLanguage, index, language: newLangauge }],
+					true,
+					undefined,
+					() => undefined,
+					undefined
+				);
+			}
+
+			const index = this.notebookEditor.textModel!.cells.indexOf(this.cell.modified!.textModel);
+
+			if (index < 0) {
+				return;
+			}
+
+			this.notebookEditor.textModel!.applyEdits(this.notebookEditor.textModel!.versionId, [
+				{ editType: CellEditType.Metadata, index, metadata: result }
+			], true, undefined, () => undefined, undefined);
+		} catch {
+		}
+	}
+
+	private async _buildMetadataEditor() {
+		this._metadataEditorDisposeStore.clear();
+
+		if (this.cell instanceof SideBySideDiffElementViewModel) {
+			this._metadataEditor = this.instantiationService.createInstance(DiffEditorWidget, this._metadataEditorContainer!, {
+				...fixedDiffEditorOptions,
+				overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
+				readOnly: false,
+				originalEditable: false,
+				ignoreTrimWhitespace: false,
+				automaticLayout: false,
+				dimension: {
+					height: this.cell.layoutInfo.metadataHeight,
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), true, true)
+				}
+			}, {
+				originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
+				modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
+			});
+			this.layout({ metadataHeight: true });
+			this._metadataEditorDisposeStore.add(this._metadataEditor);
+
+			this._metadataEditorContainer?.classList.add('diff');
+
+			const originalMetadataModel = await this.textModelService.createModelReference(CellUri.generateCellMetadataUri(this.cell.originalDocument.uri, this.cell.original!.handle));
+			const modifiedMetadataModel = await this.textModelService.createModelReference(CellUri.generateCellMetadataUri(this.cell.modifiedDocument.uri, this.cell.modified!.handle));
+			this._metadataEditor.setModel({
+				original: originalMetadataModel.object.textEditorModel,
+				modified: modifiedMetadataModel.object.textEditorModel
+			});
+
+			this._metadataEditorDisposeStore.add(originalMetadataModel);
+			this._metadataEditorDisposeStore.add(modifiedMetadataModel);
+
+			this.cell.metadataHeight = this._metadataEditor.getContentHeight();
+
+			this._metadataEditorDisposeStore.add(this._metadataEditor.onDidContentSizeChange((e) => {
+				if (e.contentHeightChanged && this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
+					this.cell.metadataHeight = e.contentHeight;
+				}
+			}));
+
+			let respondingToContentChange = false;
+
+			this._metadataEditorDisposeStore.add(modifiedMetadataModel.object.textEditorModel.onDidChangeContent(() => {
+				respondingToContentChange = true;
+				const value = modifiedMetadataModel.object.textEditorModel.getValue();
+				this._applySanitizedMetadataChanges(this.cell.modified!.metadata, value);
+				this._metadataHeader.refresh();
+				respondingToContentChange = false;
+			}));
+
+			this._metadataEditorDisposeStore.add(this.cell.modified!.textModel.onDidChangeMetadata(() => {
+				if (respondingToContentChange) {
+					return;
+				}
+
+				const modifiedMetadataSource = getFormatedMetadataJSON(this.notebookEditor.textModel!, this.cell.modified?.metadata || {}, this.cell.modified?.language);
+				modifiedMetadataModel.object.textEditorModel.setValue(modifiedMetadataSource);
+			}));
+
+			return;
+		} else {
+			this._metadataEditor = this.instantiationService.createInstance(CodeEditorWidget, this._metadataEditorContainer!, {
+				...fixedEditorOptions,
+				dimension: {
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+					height: this.cell.layoutInfo.metadataHeight
+				},
+				overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
+				readOnly: false
+			}, {});
+			this.layout({ metadataHeight: true });
+			this._metadataEditorDisposeStore.add(this._metadataEditor);
+
+			const mode = this.modeService.create('jsonc');
+			const originalMetadataSource = getFormatedMetadataJSON(this.notebookEditor.textModel!,
+				this.cell.type === 'insert'
+					? this.cell.modified!.metadata || {}
+					: this.cell.original!.metadata || {});
+			const uri = this.cell.type === 'insert'
+				? this.cell.modified!.uri
+				: this.cell.original!.uri;
+			const handle = this.cell.type === 'insert'
+				? this.cell.modified!.handle
+				: this.cell.original!.handle;
+
+			const modelUri = CellUri.generateCellMetadataUri(uri, handle);
+			const metadataModel = this.modelService.createModel(originalMetadataSource, mode, modelUri, false);
+			this._metadataEditor.setModel(metadataModel);
+			this._metadataEditorDisposeStore.add(metadataModel);
+
+			this.cell.metadataHeight = this._metadataEditor.getContentHeight();
+
+			this._metadataEditorDisposeStore.add(this._metadataEditor.onDidContentSizeChange((e) => {
+				if (e.contentHeightChanged && this.cell.metadataFoldingState === PropertyFoldingState.Expanded) {
+					this.cell.metadataHeight = e.contentHeight;
+				}
+			}));
+		}
+	}
+
+	private _getFormatedOutputJSON(outputs: IProcessedOutput[]) {
+		return JSON.stringify(outputs, undefined, '\t');
+	}
+
+	private _buildOutputEditor() {
+		this._outputEditorDisposeStore.clear();
+
+		if ((this.cell.type === 'modified' || this.cell.type === 'unchanged') && !this.notebookEditor.textModel!.transientOptions.transientOutputs) {
+			const originalOutputsSource = this._getFormatedOutputJSON(this.cell.original?.outputs || []);
+			const modifiedOutputsSource = this._getFormatedOutputJSON(this.cell.modified?.outputs || []);
+			if (originalOutputsSource !== modifiedOutputsSource) {
+				const mode = this.modeService.create('json');
+				const originalModel = this.modelService.createModel(originalOutputsSource, mode, undefined, true);
+				const modifiedModel = this.modelService.createModel(modifiedOutputsSource, mode, undefined, true);
+				this._outputEditorDisposeStore.add(originalModel);
+				this._outputEditorDisposeStore.add(modifiedModel);
+
+				const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+				const lineCount = Math.max(originalModel.getLineCount(), modifiedModel.getLineCount());
+				this._outputEditor = this.instantiationService.createInstance(DiffEditorWidget, this._outputEditorContainer!, {
+					...fixedDiffEditorOptions,
+					overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
+					readOnly: true,
+					ignoreTrimWhitespace: false,
+					automaticLayout: false,
+					dimension: {
+						height: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, this.cell.layoutInfo.rawOutputHeight || lineHeight * lineCount),
+						width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true)
+					}
+				}, {
+					originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
+					modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
+				});
+				this._outputEditorDisposeStore.add(this._outputEditor);
+
+				this._outputEditorContainer?.classList.add('diff');
+
+				this._outputEditor.setModel({
+					original: originalModel,
+					modified: modifiedModel
+				});
+				this._outputEditor.restoreViewState(this.cell.getOutputEditorViewState() as editorCommon.IDiffEditorViewState);
+
+				this.cell.rawOutputHeight = this._outputEditor.getContentHeight();
+
+				this._outputEditorDisposeStore.add(this._outputEditor.onDidContentSizeChange((e) => {
+					if (e.contentHeightChanged && this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
+						this.cell.rawOutputHeight = e.contentHeight;
+					}
+				}));
+
+				this._outputEditorDisposeStore.add(this.cell.modified!.textModel.onDidChangeOutputs(() => {
+					const modifiedOutputsSource = this._getFormatedOutputJSON(this.cell.modified?.outputs || []);
+					modifiedModel.setValue(modifiedOutputsSource);
+					this._outputHeader.refresh();
+				}));
+
+				return;
+			}
+		}
+
+		this._outputEditor = this.instantiationService.createInstance(CodeEditorWidget, this._outputEditorContainer!, {
+			...fixedEditorOptions,
+			dimension: {
+				width: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, this.cell.type === 'unchanged' || this.cell.type === 'modified') - 32),
+				height: this.cell.layoutInfo.rawOutputHeight
+			},
+			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
+		}, {});
+		this._outputEditorDisposeStore.add(this._outputEditor);
+
+		const mode = this.modeService.create('json');
+		const originaloutputSource = this._getFormatedOutputJSON(
+			this.notebookEditor.textModel!.transientOptions.transientOutputs
+				? []
+				: this.cell.type === 'insert'
+					? this.cell.modified!.outputs || []
+					: this.cell.original!.outputs || []);
+		const outputModel = this.modelService.createModel(originaloutputSource, mode, undefined, true);
+		this._outputEditorDisposeStore.add(outputModel);
+		this._outputEditor.setModel(outputModel);
+		this._outputEditor.restoreViewState(this.cell.getOutputEditorViewState());
+
+		this.cell.rawOutputHeight = this._outputEditor.getContentHeight();
+
+		this._outputEditorDisposeStore.add(this._outputEditor.onDidContentSizeChange((e) => {
+			if (e.contentHeightChanged && this.cell.outputFoldingState === PropertyFoldingState.Expanded) {
+				this.cell.rawOutputHeight = e.contentHeight;
+			}
+		}));
+	}
+
+	protected layoutNotebookCell() {
+		this.notebookEditor.layoutNotebookCell(
+			this.cell,
+			this.cell.layoutInfo.totalHeight
+		);
+	}
+
+	updateBorders() {
+		this.templateData.leftBorder.style.height = `${this.cell.layoutInfo.totalHeight - 32}px`;
+		this.templateData.rightBorder.style.height = `${this.cell.layoutInfo.totalHeight - 32}px`;
+		this.templateData.bottomBorder.style.top = `${this.cell.layoutInfo.totalHeight - 32}px`;
+	}
+
+	dispose() {
+		if (this._outputEditor) {
+			this.cell.saveOutputEditorViewState(this._outputEditor.saveViewState());
+		}
+
+		if (this._metadataEditor) {
+			this.cell.saveMetadataEditorViewState(this._metadataEditor.saveViewState());
+		}
+
+		this._metadataEditorDisposeStore.dispose();
+		this._outputEditorDisposeStore.dispose();
+
+		this._isDisposed = true;
+		super.dispose();
+	}
+
+	abstract styleContainer(container: HTMLElement): void;
+	abstract updateSourceEditor(): void;
+	abstract layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataEditor?: boolean, metadataHeight?: boolean, outputEditor?: boolean, outputView?: boolean }): void;
+}
+
+abstract class SingleSideDiffElement extends AbstractElementRenderer {
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly cell: SingleSideDiffElementViewModel,
+		readonly templateData: CellDiffSingleSideRenderTemplate,
+		readonly style: 'left' | 'right' | 'full',
+		protected readonly instantiationService: IInstantiationService,
+		protected readonly modeService: IModeService,
+		protected readonly modelService: IModelService,
+		protected readonly textModelService: ITextModelService,
+		protected readonly contextMenuService: IContextMenuService,
+		protected readonly keybindingService: IKeybindingService,
+		protected readonly notificationService: INotificationService,
+		protected readonly menuService: IMenuService,
+		protected readonly contextKeyService: IContextKeyService
+
+
+	) {
+		super(
+			notebookEditor,
+			cell,
+			templateData,
+			style,
+			instantiationService,
+			modeService,
+			modelService,
+			textModelService,
+			contextMenuService,
+			keybindingService,
+			notificationService,
+			menuService,
+			contextKeyService
+		);
+	}
+
+	buildBody() {
+		const body = this.templateData.body;
+		this._diffEditorContainer = this.templateData.diffEditorContainer;
+		switch (this.style) {
+			case 'left':
+				body.classList.add('left');
+				break;
+			case 'right':
+				body.classList.add('right');
+				break;
+			default:
+				body.classList.add('full');
+				break;
+		}
+
+		this._diagonalFill = this.templateData.diagonalFill;
+		this.styleContainer(this._diffEditorContainer);
+		this.updateSourceEditor();
+
+		this._metadataHeaderContainer = this.templateData.metadataHeaderContainer;
+		this._metadataInfoContainer = this.templateData.metadataInfoContainer;
+		this._metadataHeaderContainer.innerText = '';
+		this._metadataInfoContainer.innerText = '';
+
+		this._metadataHeader = this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._metadataHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: this.updateMetadataRendering.bind(this),
+				checkIfModified: (cell) => {
+					return cell.checkMetadataIfModified();
+				},
+				getFoldingState: (cell) => {
+					return cell.metadataFoldingState;
+				},
+				updateFoldingState: (cell, state) => {
+					cell.metadataFoldingState = state;
+				},
+				unChangedLabel: 'Metadata',
+				changedLabel: 'Metadata changed',
+				prefix: 'metadata',
+				menuId: MenuId.NotebookDiffCellMetadataTitle
+			}
+		);
+		this._register(this._metadataHeader);
+		this._metadataHeader.buildHeader();
+
+		if (this.notebookEditor.textModel?.transientOptions.transientOutputs) {
+			this.cell.rawOutputHeight = 0;
+			this.cell.outputStatusHeight = 0;
+			this.templateData.outputHeaderContainer.style.display = 'none';
+			this.templateData.outputInfoContainer.style.display = 'none';
+			return;
+		} else {
+			this.templateData.outputHeaderContainer.style.display = 'flex';
+			this.templateData.outputInfoContainer.style.display = 'block';
+
+		}
+
+		this._outputHeaderContainer = this.templateData.outputHeaderContainer;
+		this._outputInfoContainer = this.templateData.outputInfoContainer;
+
+		this._outputHeaderContainer.innerText = '';
+		this._outputInfoContainer.innerText = '';
+
+		this._outputHeader = this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._outputHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: this.updateOutputRendering.bind(this),
+				checkIfModified: (cell) => {
+					return cell.checkIfOutputsModified();
+				},
+				getFoldingState: (cell) => {
+					return cell.outputFoldingState;
+				},
+				updateFoldingState: (cell, state) => {
+					cell.outputFoldingState = state;
+				},
+				unChangedLabel: 'Outputs',
+				changedLabel: 'Outputs changed',
+				prefix: 'output',
+				menuId: MenuId.NotebookDiffCellOutputsTitle
+			}
+		);
+		this._register(this._outputHeader);
+		this._outputHeader.buildHeader();
+	}
+}
+export class DeletedElement extends SingleSideDiffElement {
+	private _editor!: CodeEditorWidget;
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly cell: SingleSideDiffElementViewModel,
+		readonly templateData: CellDiffSingleSideRenderTemplate,
+		@IModeService readonly modeService: IModeService,
+		@IModelService readonly modelService: IModelService,
+		@ITextModelService readonly textModelService: ITextModelService,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@INotificationService protected readonly notificationService: INotificationService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+
+
+	) {
+		super(notebookEditor, cell, templateData, 'left', instantiationService, modeService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
+	}
+
+	styleContainer(container: HTMLElement) {
+		container.classList.remove('inserted');
+		container.classList.add('removed');
+	}
+
+	updateSourceEditor(): void {
+		const originalCell = this.cell.original!;
+		const lineCount = originalCell.textModel.textBuffer.getLineCount();
+		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+		const editorHeight = lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
+
+		this._editor = this.templateData.sourceEditor;
+		this._editor.layout({
+			width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+			height: editorHeight
+		});
+
+		this.cell.editorHeight = editorHeight;
+
+		this._register(this._editor.onDidContentSizeChange((e) => {
+			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+				this.cell.editorHeight = e.contentHeight;
+			}
+		}));
+
+		originalCell.textModel.resolveTextModelRef().then(ref => {
+			if (this._isDisposed) {
+				return;
+			}
+
+			this._register(ref);
+
+			const textModel = ref.object.textEditorModel;
+			this._editor.setModel(textModel);
+			this.cell.editorHeight = this._editor.getContentHeight();
+		});
+	}
+
+	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataHeight?: boolean, outputTotalHeight?: boolean }) {
+		DOM.scheduleAtNextAnimationFrame(() => {
+			if (state.editorHeight || state.outerWidth) {
+				this._editor.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
+					height: this.cell.layoutInfo.editorHeight
+				});
+			}
+
+			if (state.metadataHeight || state.outerWidth) {
+				this._metadataEditor?.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
+					height: this.cell.layoutInfo.metadataHeight
+				});
+			}
+
+			if (state.outputTotalHeight || state.outerWidth) {
+				this._outputEditor?.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
+					height: this.cell.layoutInfo.outputTotalHeight
+				});
+			}
+
+			if (this._diagonalFill) {
+				this._diagonalFill.style.height = `${this.cell.layoutInfo.totalHeight - 32}px`;
+			}
+
+			this.layoutNotebookCell();
+		});
+	}
+
+	_buildOutputRendererContainer() {
+		if (!this._outputViewContainer) {
+			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
+			this._outputEmptyElement = DOM.append(this._outputViewContainer, DOM.$('.output-empty-view'));
+			const span = DOM.append(this._outputEmptyElement, DOM.$('span'));
+			span.innerText = 'No outputs to render';
+
+			if (this.cell.original!.outputs.length === 0) {
+				this._outputEmptyElement.style.display = 'block';
+			} else {
+				this._outputEmptyElement.style.display = 'none';
+			}
+
+			this.cell.layoutChange();
+
+			this._outputLeftView = this.instantiationService.createInstance(OutputContainer, this.notebookEditor, this.notebookEditor.textModel!, this.cell, this.cell.original!, DiffSide.Original, this._outputViewContainer!);
+			this._register(this._outputLeftView);
+			this._outputLeftView.render();
+
+			const removedOutputRenderListener = this.notebookEditor.onDidDynamicOutputRendered(e => {
+				if (e.cell.uri.toString() === this.cell.original!.uri.toString()) {
+					this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Original, this.cell.original!.id, ['nb-cellDeleted'], []);
+					removedOutputRenderListener.dispose();
+				}
+			});
+
+			this._register(removedOutputRenderListener);
+		}
+
+		this._outputViewContainer.style.display = 'block';
+	}
+
+	_decorate() {
+		this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Original, this.cell.original!.id, ['nb-cellDeleted'], []);
+	}
+
+	_showOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'block';
+
+			this._outputLeftView?.showOutputs();
+			this._decorate();
+		}
+	}
+
+	_hideOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'none';
+
+			this._outputLeftView?.hideOutputs();
+		}
+	}
+
+	dispose() {
+		if (this._editor) {
+			this.cell.saveSpirceEditorViewState(this._editor.saveViewState());
+		}
+
+		super.dispose();
+	}
+}
+
+export class InsertElement extends SingleSideDiffElement {
+	private _editor!: CodeEditorWidget;
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly cell: SingleSideDiffElementViewModel,
+		readonly templateData: CellDiffSingleSideRenderTemplate,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IModeService readonly modeService: IModeService,
+		@IModelService readonly modelService: IModelService,
+		@ITextModelService readonly textModelService: ITextModelService,
+		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@INotificationService protected readonly notificationService: INotificationService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+	) {
+		super(notebookEditor, cell, templateData, 'right', instantiationService, modeService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
+	}
+
+	styleContainer(container: HTMLElement): void {
+		container.classList.remove('removed');
+		container.classList.add('inserted');
+	}
+
+	updateSourceEditor(): void {
+		const modifiedCell = this.cell.modified!;
+		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
+		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+		const editorHeight = lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
+
+		this._editor = this.templateData.sourceEditor;
+		this._editor.layout(
+			{
+				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+				height: editorHeight
+			}
+		);
+		this._editor.updateOptions({ readOnly: false });
+		this.cell.editorHeight = editorHeight;
+
+		this._register(this._editor.onDidContentSizeChange((e) => {
+			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+				this.cell.editorHeight = e.contentHeight;
+			}
+		}));
+
+		modifiedCell.textModel.resolveTextModelRef().then(ref => {
+			if (this._isDisposed) {
+				return;
+			}
+
+			this._register(ref);
+
+			const textModel = ref.object.textEditorModel;
+			this._editor.setModel(textModel);
+			this._editor.restoreViewState(this.cell.getSourceEditorViewState() as editorCommon.ICodeEditorViewState);
+			this.cell.editorHeight = this._editor.getContentHeight();
+		});
+	}
+
+	_buildOutputRendererContainer() {
+		if (!this._outputViewContainer) {
+			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
+			this._outputEmptyElement = DOM.append(this._outputViewContainer, DOM.$('.output-empty-view'));
+			this._outputEmptyElement.innerText = 'No outputs to render';
+
+			if (this.cell.modified!.outputs.length === 0) {
+				this._outputEmptyElement.style.display = 'block';
+			} else {
+				this._outputEmptyElement.style.display = 'none';
+			}
+
+			this.cell.layoutChange();
+
+			this._outputRightView = this.instantiationService.createInstance(OutputContainer, this.notebookEditor, this.notebookEditor.textModel!, this.cell, this.cell.modified!, DiffSide.Modified, this._outputViewContainer!);
+			this._register(this._outputRightView);
+			this._outputRightView.render();
+
+			const insertOutputRenderListener = this.notebookEditor.onDidDynamicOutputRendered(e => {
+				if (e.cell.uri.toString() === this.cell.modified!.uri.toString()) {
+					this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Modified, this.cell.modified!.id, ['nb-cellAdded'], []);
+					insertOutputRenderListener.dispose();
+				}
+			});
+			this._register(insertOutputRenderListener);
+		}
+
+		this._outputViewContainer.style.display = 'block';
+	}
+
+	_decorate() {
+		this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Modified, this.cell.modified!.id, ['nb-cellAdded'], []);
+	}
+
+	_showOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'block';
+			this._outputRightView?.showOutputs();
+			this._decorate();
+		}
+	}
+
+	_hideOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'none';
+			this._outputRightView?.hideOutputs();
+		}
+	}
+
+	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataHeight?: boolean, outputTotalHeight?: boolean }) {
+		DOM.scheduleAtNextAnimationFrame(() => {
+			if (state.editorHeight || state.outerWidth) {
+				this._editor.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
+					height: this.cell.layoutInfo.editorHeight
+				});
+			}
+
+			if (state.metadataHeight || state.outerWidth) {
+				this._metadataEditor?.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+					height: this.cell.layoutInfo.metadataHeight
+				});
+			}
+
+			if (state.outputTotalHeight || state.outerWidth) {
+				this._outputEditor?.layout({
+					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
+					height: this.cell.layoutInfo.outputTotalHeight
+				});
+			}
+
+			this.layoutNotebookCell();
+
+			if (this._diagonalFill) {
+				this._diagonalFill.style.height = `${this.cell.layoutInfo.editorHeight + this.cell.layoutInfo.editorMargin + this.cell.layoutInfo.metadataStatusHeight + this.cell.layoutInfo.metadataHeight + this.cell.layoutInfo.outputTotalHeight + this.cell.layoutInfo.outputStatusHeight}px`;
+			}
+		});
+	}
+
+	dispose() {
+		if (this._editor) {
+			this.cell.saveSpirceEditorViewState(this._editor.saveViewState());
+		}
+
+		super.dispose();
+	}
+}
+
+export class ModifiedElement extends AbstractElementRenderer {
+	private _editor?: DiffEditorWidget;
+	private _editorContainer!: HTMLElement;
+	private _inputToolbarContainer!: HTMLElement;
+	protected _toolbar!: ToolBar;
+	protected _menu!: IMenu;
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		readonly cell: SideBySideDiffElementViewModel,
+		readonly templateData: CellDiffSideBySideRenderTemplate,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IModeService readonly modeService: IModeService,
+		@IModelService readonly modelService: IModelService,
+		@ITextModelService readonly textModelService: ITextModelService,
+		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@INotificationService protected readonly notificationService: INotificationService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService
+	) {
+		super(notebookEditor, cell, templateData, 'full', instantiationService, modeService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService);
+	}
+
+	styleContainer(container: HTMLElement): void {
+		container.classList.remove('inserted', 'removed');
+	}
+
+	buildBody() {
+		const body = this.templateData.body;
+		this._diffEditorContainer = this.templateData.diffEditorContainer;
+		body.classList.remove('left', 'right', 'full');
+		switch (this.style) {
+			case 'left':
+				body.classList.add('left');
+				break;
+			case 'right':
+				body.classList.add('right');
+				break;
+			default:
+				body.classList.add('full');
+				break;
+		}
+
+		this.styleContainer(this._diffEditorContainer);
+		this.updateSourceEditor();
+
+		this._metadataHeaderContainer = this.templateData.metadataHeaderContainer;
+		this._metadataInfoContainer = this.templateData.metadataInfoContainer;
+
+		this._metadataHeaderContainer.innerText = '';
+		this._metadataInfoContainer.innerText = '';
+
+		this._metadataHeader = this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._metadataHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: this.updateMetadataRendering.bind(this),
+				checkIfModified: (cell) => {
+					return cell.checkMetadataIfModified();
+				},
+				getFoldingState: (cell) => {
+					return cell.metadataFoldingState;
+				},
+				updateFoldingState: (cell, state) => {
+					cell.metadataFoldingState = state;
+				},
+				unChangedLabel: 'Metadata',
+				changedLabel: 'Metadata changed',
+				prefix: 'metadata',
+				menuId: MenuId.NotebookDiffCellMetadataTitle
+			}
+		);
+		this._register(this._metadataHeader);
+		this._metadataHeader.buildHeader();
+
+		if (this.notebookEditor.textModel?.transientOptions.transientOutputs) {
+			this.cell.rawOutputHeight = 0;
+			this.cell.outputStatusHeight = 0;
+			this.templateData.outputHeaderContainer.style.display = 'none';
+			this.templateData.outputInfoContainer.style.display = 'none';
+			return;
+		} else {
+			this.templateData.outputHeaderContainer.style.display = 'flex';
+			this.templateData.outputInfoContainer.style.display = 'block';
+		}
+
+		this._outputHeaderContainer = this.templateData.outputHeaderContainer;
+		this._outputInfoContainer = this.templateData.outputInfoContainer;
+		this._outputHeaderContainer.innerText = '';
+		this._outputInfoContainer.innerText = '';
+
+		if (this.cell.checkIfOutputsModified()) {
+			this._outputInfoContainer.classList.add('modified');
+		}
+
+		this._outputHeader = this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._outputHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: this.updateOutputRendering.bind(this),
+				checkIfModified: (cell) => {
+					return cell.checkIfOutputsModified();
+				},
+				getFoldingState: (cell) => {
+					return cell.outputFoldingState;
+				},
+				updateFoldingState: (cell, state) => {
+					cell.outputFoldingState = state;
+				},
+				unChangedLabel: 'Outputs',
+				changedLabel: 'Outputs changed',
+				prefix: 'output',
+				menuId: MenuId.NotebookDiffCellOutputsTitle
+			}
+		);
+		this._register(this._outputHeader);
+		this._outputHeader.buildHeader();
+	}
+
+	_buildOutputRendererContainer() {
+		if (!this._outputViewContainer) {
+			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
+			this._outputEmptyElement = DOM.append(this._outputViewContainer, DOM.$('.output-empty-view'));
+			this._outputEmptyElement.innerText = 'No outputs to render';
+
+			if (!this.cell.checkIfOutputsModified() && this.cell.modified.outputs.length === 0) {
+				this._outputEmptyElement.style.display = 'block';
+			} else {
+				this._outputEmptyElement.style.display = 'none';
+			}
+
+			this.cell.layoutChange();
+
+			this._register(this.cell.modified.textModel.onDidChangeOutputs(() => {
+				// currently we only allow outputs change to the modified cell
+				if (!this.cell.checkIfOutputsModified() && this.cell.modified.outputs.length === 0) {
+					this._outputEmptyElement!.style.display = 'block';
+				} else {
+					this._outputEmptyElement!.style.display = 'none';
+				}
+			}));
+
+			this._outputLeftContainer = DOM.append(this._outputViewContainer!, DOM.$('.output-view-container-left'));
+			this._outputRightContainer = DOM.append(this._outputViewContainer!, DOM.$('.output-view-container-right'));
+			// We should use the original text model here
+			this._outputLeftView = this.instantiationService.createInstance(OutputContainer, this.notebookEditor, this.notebookEditor.textModel!, this.cell, this.cell.original!, DiffSide.Original, this._outputLeftContainer!);
+			this._outputLeftView.render();
+			this._register(this._outputLeftView);
+			this._outputRightView = this.instantiationService.createInstance(OutputContainer, this.notebookEditor, this.notebookEditor.textModel!, this.cell, this.cell.modified!, DiffSide.Modified, this._outputRightContainer!);
+			this._outputRightView.render();
+			this._register(this._outputRightView);
+
+			const originalOutputRenderListener = this.notebookEditor.onDidDynamicOutputRendered(e => {
+				if (e.cell.uri.toString() === this.cell.original.uri.toString()) {
+					this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Original, this.cell.original.id, ['nb-cellDeleted'], []);
+					originalOutputRenderListener.dispose();
+				}
+			});
+
+			const modifiedOutputRenderListener = this.notebookEditor.onDidDynamicOutputRendered(e => {
+				if (e.cell.uri.toString() === this.cell.modified.uri.toString()) {
+					this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Modified, this.cell.modified.id, ['nb-cellAdded'], []);
+					modifiedOutputRenderListener.dispose();
+				}
+			});
+
+			this._register(originalOutputRenderListener);
+			this._register(modifiedOutputRenderListener);
+
+			this._decorate();
+		}
+
+		this._outputViewContainer.style.display = 'block';
+	}
+
+	_decorate() {
+		this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Original, this.cell.original.id, ['nb-cellDeleted'], []);
+		this.notebookEditor.deltaCellOutputContainerClassNames(DiffSide.Modified, this.cell.modified.id, ['nb-cellAdded'], []);
+	}
+
+	_showOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'block';
+
+			this._outputLeftView?.showOutputs();
+			this._outputRightView?.showOutputs();
+			this._decorate();
+		}
+	}
+
+	_hideOutputsRenderer() {
+		if (this._outputViewContainer) {
+			this._outputViewContainer.style.display = 'none';
+
+			this._outputLeftView?.hideOutputs();
+			this._outputRightView?.hideOutputs();
+		}
+	}
+
+	updateSourceEditor(): void {
+		const modifiedCell = this.cell.modified!;
+		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
+		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+		const editorHeight = this.cell.layoutInfo.editorHeight !== 0 ? this.cell.layoutInfo.editorHeight : lineCount * lineHeight + getEditorTopPadding() + EDITOR_BOTTOM_PADDING;
+		this._editorContainer = this.templateData.editorContainer;
+		this._editor = this.templateData.sourceEditor;
+
+		this._editorContainer.classList.add('diff');
+
+		this._editor.layout({
+			width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
+			height: editorHeight
+		});
+
+		this._editorContainer.style.height = `${editorHeight}px`;
+
+		this._register(this._editor.onDidContentSizeChange((e) => {
+			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+				this.cell.editorHeight = e.contentHeight;
+			}
+		}));
+
+		this._initializeSourceDiffEditor();
+
+		this._inputToolbarContainer = this.templateData.inputToolbarContainer;
+		this._toolbar = this.templateData.toolbar;
+
+		this._toolbar.context = {
+			cell: this.cell
+		};
+
+		this._menu = this.menuService.createMenu(MenuId.NotebookDiffCellInputTitle, this.contextKeyService);
+		this._register(this._menu);
+		const actions: IAction[] = [];
+		createAndFillInActionBarActions(this._menu, { shouldForwardArgs: true }, actions);
+		this._toolbar.setActions(actions);
+
+		if (this.cell.modified!.textModel.getValue() !== this.cell.original!.textModel.getValue()) {
+			this._inputToolbarContainer.style.display = 'block';
+		} else {
+			this._inputToolbarContainer.style.display = 'none';
+		}
+
+		this._register(this.cell.modified!.textModel.onDidChangeContent(() => {
+			if (this.cell.modified!.textModel.getValue() !== this.cell.original!.textModel.getValue()) {
+				this._inputToolbarContainer.style.display = 'block';
+			} else {
+				this._inputToolbarContainer.style.display = 'none';
+			}
+		}));
+	}
+
+	private async _initializeSourceDiffEditor() {
+		const originalCell = this.cell.original!;
+		const modifiedCell = this.cell.modified!;
+
+		const originalRef = await originalCell.textModel.resolveTextModelRef();
+		const modifiedRef = await modifiedCell.textModel.resolveTextModelRef();
+
+		if (this._isDisposed) {
+			return;
+		}
+
+		const textModel = originalRef.object.textEditorModel;
+		const modifiedTextModel = modifiedRef.object.textEditorModel;
+		this._register({
+			dispose: () => {
+				const delayer = new Delayer<void>(5000);
+				delayer.trigger(() => {
+					originalRef.dispose();
+					delayer.dispose();
+				});
+			}
+		});
+		this._register({
+			dispose: () => {
+				const delayer = new Delayer<void>(5000);
+				delayer.trigger(() => {
+					modifiedRef.dispose();
+					delayer.dispose();
+				});
+			}
+		});
+
+		this._editor!.setModel({
+			original: textModel,
+			modified: modifiedTextModel
+		});
+
+		this._editor!.restoreViewState(this.cell.getSourceEditorViewState() as editorCommon.IDiffEditorViewState);
+
+		const contentHeight = this._editor!.getContentHeight();
+		this.cell.editorHeight = contentHeight;
+	}
+
+	layout(state: { outerWidth?: boolean, editorHeight?: boolean, metadataHeight?: boolean, outputTotalHeight?: boolean }) {
+		DOM.scheduleAtNextAnimationFrame(() => {
+			if (state.editorHeight) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor!.layout({
+					width: this._editor!.getViewWidth(),
+					height: this.cell.layoutInfo.editorHeight
+				});
+			}
+
+			if (state.outerWidth) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor!.layout();
+			}
+
+			if (state.metadataHeight || state.outerWidth) {
+				if (this._metadataEditorContainer) {
+					this._metadataEditorContainer.style.height = `${this.cell.layoutInfo.metadataHeight}px`;
+					this._metadataEditor?.layout();
+				}
+			}
+
+			if (state.outputTotalHeight || state.outerWidth) {
+				if (this._outputEditorContainer) {
+					this._outputEditorContainer.style.height = `${this.cell.layoutInfo.outputTotalHeight}px`;
+					this._outputEditor?.layout();
+				}
+			}
+
+
+			this.layoutNotebookCell();
+		});
+	}
+
+	dispose() {
+		if (this._editor) {
+			this.cell.saveSpirceEditorViewState(this._editor.saveViewState());
+		}
+
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
new file mode 100644
index 000000000..74a0010fc
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
@@ -0,0 +1,361 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import * as nls from 'vs/nls';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { DiffSide, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { ICellOutputViewModel, IDisplayOutputViewModel, IRenderOutput, outputHasDynamicHeight, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { BUILTIN_RENDERER_ID, NotebookCellOutputsSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { mimetypeIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+
+interface IMimeTypeRenderer extends IQuickPickItem {
+	index: number;
+}
+
+export class OutputElement extends Disposable {
+	readonly resizeListener = new DisposableStore();
+	domNode!: HTMLElement;
+	renderResult?: IRenderOutput;
+
+	constructor(
+		private _notebookEditor: INotebookTextDiffEditor,
+		private _notebookTextModel: NotebookTextModel,
+		private _notebookService: INotebookService,
+		private _quickInputService: IQuickInputService,
+		private _diffElementViewModel: DiffElementViewModelBase,
+		private _diffSide: DiffSide,
+		private _nestedCell: DiffNestedCellViewModel,
+		private _outputContainer: HTMLElement,
+		readonly output: ICellOutputViewModel
+	) {
+		super();
+	}
+
+	render(index: number, beforeElement?: HTMLElement) {
+		const outputItemDiv = document.createElement('div');
+		let result: IRenderOutput | undefined = undefined;
+
+		if (this.output.isDisplayOutput()) {
+			const [mimeTypes, pick] = this.output.resolveMimeTypes(this._notebookTextModel);
+			const pickedMimeTypeRenderer = mimeTypes[pick];
+			if (mimeTypes.length > 1) {
+				outputItemDiv.style.position = 'relative';
+				const mimeTypePicker = DOM.$('.multi-mimetype-output');
+				mimeTypePicker.classList.add(...ThemeIcon.asClassNameArray(mimetypeIcon));
+				mimeTypePicker.tabIndex = 0;
+				mimeTypePicker.title = nls.localize('mimeTypePicker', "Choose a different output mimetype, available mimetypes: {0}", mimeTypes.map(mimeType => mimeType.mimeType).join(', '));
+				outputItemDiv.appendChild(mimeTypePicker);
+				this.resizeListener.add(DOM.addStandardDisposableListener(mimeTypePicker, 'mousedown', async e => {
+					if (e.leftButton) {
+						e.preventDefault();
+						e.stopPropagation();
+						await this.pickActiveMimeTypeRenderer(this._notebookTextModel, this.output as IDisplayOutputViewModel);
+					}
+				}));
+
+				this.resizeListener.add((DOM.addDisposableListener(mimeTypePicker, DOM.EventType.KEY_DOWN, async e => {
+					const event = new StandardKeyboardEvent(e);
+					if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
+						e.preventDefault();
+						e.stopPropagation();
+						await this.pickActiveMimeTypeRenderer(this._notebookTextModel, this.output as IDisplayOutputViewModel);
+					}
+				})));
+			}
+
+			const innerContainer = DOM.$('.output-inner-container');
+			DOM.append(outputItemDiv, innerContainer);
+
+
+			if (pickedMimeTypeRenderer.rendererId !== BUILTIN_RENDERER_ID) {
+				const renderer = this._notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
+				result = renderer
+					? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: pickedMimeTypeRenderer.mimeType }
+					: this._notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this._notebookTextModel.uri,);
+			} else {
+				result = this._notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this._notebookTextModel.uri);
+			}
+
+			this.output.pickedMimeType = pick;
+		} else {
+			// for text and error, there is no mimetype
+			const innerContainer = DOM.$('.output-inner-container');
+			DOM.append(outputItemDiv, innerContainer);
+
+			result = this._notebookEditor.getOutputRenderer().render(this.output, innerContainer, undefined, this._notebookTextModel.uri);
+		}
+
+		this.domNode = outputItemDiv;
+		this.renderResult = result;
+
+		if (!result) {
+			// this.viewCell.updateOutputHeight(index, 0);
+			return;
+		}
+
+		if (beforeElement) {
+			this._outputContainer.insertBefore(outputItemDiv, beforeElement);
+		} else {
+			this._outputContainer.appendChild(outputItemDiv);
+		}
+
+		if (result.type !== RenderOutputType.None) {
+			// this.viewCell.selfSizeMonitoring = true;
+			this._notebookEditor.createInset(
+				this._diffElementViewModel,
+				this._nestedCell,
+				result,
+				() => this.getOutputOffsetInCell(index),
+				this._diffElementViewModel instanceof SideBySideDiffElementViewModel
+					? this._diffSide
+					: this._diffElementViewModel.type === 'insert' ? DiffSide.Modified : DiffSide.Original
+			);
+		} else {
+			outputItemDiv.classList.add('foreground', 'output-element');
+			outputItemDiv.style.position = 'absolute';
+		}
+
+		if (outputHasDynamicHeight(result)) {
+			// this.viewCell.selfSizeMonitoring = true;
+			const clientHeight = outputItemDiv.clientHeight;
+			// TODO, set an inital dimension to avoid force reflow
+			// const dimension = {
+			// 	width: this.cellViewModel.,
+			// 	height: clientHeight
+			// };
+
+			const elementSizeObserver = getResizesObserver(outputItemDiv, undefined, () => {
+				if (this._outputContainer && document.body.contains(this._outputContainer)) {
+					const height = Math.ceil(elementSizeObserver.getHeight());
+
+					if (clientHeight === height) {
+						return;
+					}
+
+					const currIndex = this.getCellOutputCurrentIndex();
+					if (currIndex < 0) {
+						return;
+					}
+
+					this.updateHeight(currIndex, height);
+				}
+			});
+			elementSizeObserver.startObserving();
+			this.resizeListener.add(elementSizeObserver);
+			this.updateHeight(index, clientHeight);
+		} else if (result.type === RenderOutputType.None) { // no-op if it's a webview
+			const clientHeight = Math.ceil(outputItemDiv.clientHeight);
+			this.updateHeight(index, clientHeight);
+
+			const top = this.getOutputOffsetInContainer(index);
+			outputItemDiv.style.top = `${top}px`;
+		}
+	}
+
+	private async pickActiveMimeTypeRenderer(notebookTextModel: NotebookTextModel, viewModel: IDisplayOutputViewModel) {
+		const [mimeTypes, currIndex] = viewModel.resolveMimeTypes(notebookTextModel);
+
+		const items = mimeTypes.filter(mimeType => mimeType.isTrusted).map((mimeType, index): IMimeTypeRenderer => ({
+			label: mimeType.mimeType,
+			id: mimeType.mimeType,
+			index: index,
+			picked: index === currIndex,
+			detail: this.generateRendererInfo(mimeType.rendererId),
+			description: index === currIndex ? nls.localize('curruentActiveMimeType', "Currently Active") : undefined
+		}));
+
+		const picker = this._quickInputService.createQuickPick();
+		picker.items = items;
+		picker.activeItems = items.filter(item => !!item.picked);
+		picker.placeholder = items.length !== mimeTypes.length
+			? nls.localize('promptChooseMimeTypeInSecure.placeHolder', "Select mimetype to render for current output. Rich mimetypes are available only when the notebook is trusted")
+			: nls.localize('promptChooseMimeType.placeHolder', "Select mimetype to render for current output");
+
+		const pick = await new Promise<number | undefined>(resolve => {
+			picker.onDidAccept(() => {
+				resolve(picker.selectedItems.length === 1 ? (picker.selectedItems[0] as IMimeTypeRenderer).index : undefined);
+				picker.dispose();
+			});
+			picker.show();
+		});
+
+		if (pick === undefined) {
+			return;
+		}
+
+		if (pick !== currIndex) {
+			// user chooses another mimetype
+			const index = this._nestedCell.outputsViewModels.indexOf(viewModel);
+			const nextElement = this.domNode.nextElementSibling;
+			this.resizeListener.clear();
+			const element = this.domNode;
+			if (element) {
+				element.parentElement?.removeChild(element);
+				this._notebookEditor.removeInset(
+					this._diffElementViewModel,
+					this._nestedCell,
+					viewModel,
+					this._diffSide
+				);
+			}
+
+			viewModel.pickedMimeType = pick;
+			this.render(index, nextElement as HTMLElement);
+		}
+	}
+
+	private generateRendererInfo(renderId: string | undefined): string {
+		if (renderId === undefined || renderId === BUILTIN_RENDERER_ID) {
+			return nls.localize('builtinRenderInfo', "built-in");
+		}
+
+		const renderInfo = this._notebookService.getRendererInfo(renderId);
+
+		if (renderInfo) {
+			const displayName = renderInfo.displayName !== '' ? renderInfo.displayName : renderInfo.id;
+			return `${displayName} (${renderInfo.extensionId.value})`;
+		}
+
+		return nls.localize('builtinRenderInfo', "built-in");
+	}
+
+	getCellOutputCurrentIndex() {
+		return this._diffElementViewModel.getNestedCellViewModel(this._diffSide).outputs.indexOf(this.output.model);
+	}
+
+	updateHeight(index: number, height: number) {
+		this._diffElementViewModel.updateOutputHeight(this._diffSide, index, height);
+	}
+
+	getOutputOffsetInContainer(index: number) {
+		return this._diffElementViewModel.getOutputOffsetInContainer(this._diffSide, index);
+	}
+
+	getOutputOffsetInCell(index: number) {
+		return this._diffElementViewModel.getOutputOffsetInCell(this._diffSide, index);
+	}
+}
+
+export class OutputContainer extends Disposable {
+	private _outputEntries = new Map<ICellOutputViewModel, OutputElement>();
+	constructor(
+		private _editor: INotebookTextDiffEditor,
+		private _notebookTextModel: NotebookTextModel,
+		private _diffElementViewModel: DiffElementViewModelBase,
+		private _nestedCellViewModel: DiffNestedCellViewModel,
+		private _diffSide: DiffSide,
+		private _outputContainer: HTMLElement,
+		@INotebookService private _notebookService: INotebookService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IOpenerService readonly _openerService: IOpenerService,
+		@ITextFileService readonly _textFileService: ITextFileService,
+
+	) {
+		super();
+		this._register(this._diffElementViewModel.onDidLayoutChange(() => {
+			this._outputEntries.forEach((value, key) => {
+				const index = _nestedCellViewModel.outputs.indexOf(key.model);
+				if (index >= 0) {
+					const top = this._diffElementViewModel.getOutputOffsetInContainer(this._diffSide, index);
+					value.domNode.style.top = `${top}px`;
+				}
+			});
+		}));
+
+		this._register(this._nestedCellViewModel.textModel.onDidChangeOutputs(splices => {
+			this._updateOutputs(splices);
+		}));
+	}
+
+	private _updateOutputs(splices: NotebookCellOutputsSplice[]) {
+		if (!splices.length) {
+			return;
+		}
+
+		const removedKeys: ICellOutputViewModel[] = [];
+
+		this._outputEntries.forEach((value, key) => {
+			if (this._nestedCellViewModel.outputsViewModels.indexOf(key) < 0) {
+				// already removed
+				removedKeys.push(key);
+				// remove element from DOM
+				this._outputContainer.removeChild(value.domNode);
+				if (key.isDisplayOutput()) {
+					this._editor.removeInset(this._diffElementViewModel, this._nestedCellViewModel, key, this._diffSide);
+				}
+			}
+		});
+
+		removedKeys.forEach(key => {
+			this._outputEntries.get(key)?.dispose();
+			this._outputEntries.delete(key);
+		});
+
+		let prevElement: HTMLElement | undefined = undefined;
+		const outputsToRender = this._nestedCellViewModel.outputsViewModels;
+
+		outputsToRender.reverse().forEach(output => {
+			if (this._outputEntries.has(output)) {
+				// already exist
+				prevElement = this._outputEntries.get(output)!.domNode;
+				return;
+			}
+
+			// newly added element
+			const currIndex = this._nestedCellViewModel.outputsViewModels.indexOf(output);
+			this._renderOutput(output, currIndex, prevElement);
+			prevElement = this._outputEntries.get(output)?.domNode;
+		});
+	}
+	render() {
+		// TODO, outputs to render (should have a limit)
+		for (let index = 0; index < this._nestedCellViewModel.outputsViewModels.length; index++) {
+			const currOutput = this._nestedCellViewModel.outputsViewModels[index];
+
+			// always add to the end
+			this._renderOutput(currOutput, index, undefined);
+		}
+	}
+
+	showOutputs() {
+		for (let index = 0; index < this._nestedCellViewModel.outputsViewModels.length; index++) {
+			const currOutput = this._nestedCellViewModel.outputsViewModels[index];
+
+			if (currOutput.isDisplayOutput()) {
+				// always add to the end
+				this._editor.showInset(this._diffElementViewModel, currOutput.cellViewModel, currOutput, this._diffSide);
+			}
+		}
+	}
+
+	hideOutputs() {
+		this._outputEntries.forEach((outputElement, cellOutputViewModel) => {
+			if (cellOutputViewModel.isDisplayOutput()) {
+				this._editor.hideInset(this._diffElementViewModel, this._nestedCellViewModel, cellOutputViewModel);
+			}
+		});
+	}
+
+	private _renderOutput(currOutput: ICellOutputViewModel, index: number, beforeElement?: HTMLElement) {
+		if (!this._outputEntries.has(currOutput)) {
+			this._outputEntries.set(currOutput, new OutputElement(this._editor, this._notebookTextModel, this._notebookService, this._quickInputService, this._diffElementViewModel, this._diffSide, this._nestedCellViewModel, this._outputContainer, currOutput));
+		}
+
+		const renderElement = this._outputEntries.get(currOutput)!;
+		renderElement.render(index, beforeElement);
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
new file mode 100644
index 000000000..4d10ed220
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
@@ -0,0 +1,498 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { CellDiffViewModelLayoutChangeEvent, DiffSide, DIFF_CELL_MARGIN, IDiffElementLayoutInfo } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { IGenericCellViewModel, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { hash } from 'vs/base/common/hash';
+import { format } from 'vs/base/common/jsonFormatter';
+import { applyEdits } from 'vs/base/common/jsonEdit';
+import { NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
+import { URI } from 'vs/base/common/uri';
+import { NotebookDiffEditorEventDispatcher, NotebookDiffViewEventType } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
+import * as editorCommon from 'vs/editor/common/editorCommon';
+
+export enum PropertyFoldingState {
+	Expanded,
+	Collapsed
+}
+
+export const OUTPUT_EDITOR_HEIGHT_MAGIC = 1440;
+
+type ILayoutInfoDelta0 = { [K in keyof IDiffElementLayoutInfo]?: number; };
+interface ILayoutInfoDelta extends ILayoutInfoDelta0 {
+	rawOutputHeight?: number;
+	recomputeOutput?: boolean;
+}
+
+export abstract class DiffElementViewModelBase extends Disposable {
+	public metadataFoldingState: PropertyFoldingState;
+	public outputFoldingState: PropertyFoldingState;
+	protected _layoutInfoEmitter = new Emitter<CellDiffViewModelLayoutChangeEvent>();
+	onDidLayoutChange = this._layoutInfoEmitter.event;
+	protected _stateChangeEmitter = new Emitter<{ renderOutput: boolean; }>();
+	onDidStateChange = this._stateChangeEmitter.event;
+	protected _layoutInfo!: IDiffElementLayoutInfo;
+
+	set rawOutputHeight(height: number) {
+		this._layout({ rawOutputHeight: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, height) });
+	}
+
+	get rawOutputHeight() {
+		throw new Error('Use Cell.layoutInfo.rawOutputHeight');
+	}
+
+	set outputStatusHeight(height: number) {
+		this._layout({ outputStatusHeight: height });
+	}
+
+	get outputStatusHeight() {
+		throw new Error('Use Cell.layoutInfo.outputStatusHeight');
+	}
+
+	set editorHeight(height: number) {
+		this._layout({ editorHeight: height });
+	}
+
+	get editorHeight() {
+		throw new Error('Use Cell.layoutInfo.editorHeight');
+	}
+
+	set editorMargin(margin: number) {
+		this._layout({ editorMargin: margin });
+	}
+
+	get editorMargin() {
+		throw new Error('Use Cell.layoutInfo.editorMargin');
+	}
+
+	set metadataHeight(height: number) {
+		this._layout({ metadataHeight: height });
+	}
+
+	get metadataHeight() {
+		throw new Error('Use Cell.layoutInfo.metadataHeight');
+	}
+
+	private _renderOutput = true;
+
+	set renderOutput(value: boolean) {
+		this._renderOutput = value;
+		this._layout({ recomputeOutput: true });
+		this._stateChangeEmitter.fire({ renderOutput: this._renderOutput });
+	}
+
+	get renderOutput() {
+		return this._renderOutput;
+	}
+
+	get layoutInfo(): IDiffElementLayoutInfo {
+		return this._layoutInfo;
+	}
+
+	private _sourceEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+	private _outputEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+	private _metadataEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+
+	constructor(
+		readonly mainDocumentTextModel: NotebookTextModel,
+		readonly original: DiffNestedCellViewModel | undefined,
+		readonly modified: DiffNestedCellViewModel | undefined,
+		readonly type: 'unchanged' | 'insert' | 'delete' | 'modified',
+		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher
+	) {
+		super();
+		this._layoutInfo = {
+			width: 0,
+			editorHeight: 0,
+			editorMargin: 0,
+			metadataHeight: 0,
+			metadataStatusHeight: 25,
+			rawOutputHeight: 0,
+			outputTotalHeight: 0,
+			outputStatusHeight: 25,
+			bodyMargin: 32,
+			totalHeight: 82
+		};
+
+		this.metadataFoldingState = PropertyFoldingState.Collapsed;
+		this.outputFoldingState = PropertyFoldingState.Collapsed;
+
+		this._register(this.editorEventDispatcher.onDidChangeLayout(e => {
+			this._layoutInfoEmitter.fire({ outerWidth: true });
+		}));
+	}
+
+	layoutChange() {
+		this._layout({ recomputeOutput: true });
+	}
+
+	protected _layout(delta: ILayoutInfoDelta) {
+		const width = delta.width !== undefined ? delta.width : this._layoutInfo.width;
+		const editorHeight = delta.editorHeight !== undefined ? delta.editorHeight : this._layoutInfo.editorHeight;
+		const editorMargin = delta.editorMargin !== undefined ? delta.editorMargin : this._layoutInfo.editorMargin;
+		const metadataHeight = delta.metadataHeight !== undefined ? delta.metadataHeight : this._layoutInfo.metadataHeight;
+		const metadataStatusHeight = delta.metadataStatusHeight !== undefined ? delta.metadataStatusHeight : this._layoutInfo.metadataStatusHeight;
+		const rawOutputHeight = delta.rawOutputHeight !== undefined ? delta.rawOutputHeight : this._layoutInfo.rawOutputHeight;
+		const outputStatusHeight = delta.outputStatusHeight !== undefined ? delta.outputStatusHeight : this._layoutInfo.outputStatusHeight;
+		const bodyMargin = delta.bodyMargin !== undefined ? delta.bodyMargin : this._layoutInfo.bodyMargin;
+		const outputHeight = (delta.recomputeOutput || delta.rawOutputHeight !== undefined) ? this._getOutputTotalHeight(rawOutputHeight) : this._layoutInfo.outputTotalHeight;
+
+		const totalHeight = editorHeight
+			+ editorMargin
+			+ metadataHeight
+			+ metadataStatusHeight
+			+ outputHeight
+			+ outputStatusHeight
+			+ bodyMargin;
+
+		const newLayout: IDiffElementLayoutInfo = {
+			width: width,
+			editorHeight: editorHeight,
+			editorMargin: editorMargin,
+			metadataHeight: metadataHeight,
+			metadataStatusHeight: metadataStatusHeight,
+			outputTotalHeight: outputHeight,
+			outputStatusHeight: outputStatusHeight,
+			bodyMargin: bodyMargin,
+			rawOutputHeight: rawOutputHeight,
+			totalHeight: totalHeight
+		};
+
+		const changeEvent: CellDiffViewModelLayoutChangeEvent = {};
+
+		if (newLayout.width !== this._layoutInfo.width) {
+			changeEvent.width = true;
+		}
+
+		if (newLayout.editorHeight !== this._layoutInfo.editorHeight) {
+			changeEvent.editorHeight = true;
+		}
+
+		if (newLayout.editorMargin !== this._layoutInfo.editorMargin) {
+			changeEvent.editorMargin = true;
+		}
+
+		if (newLayout.metadataHeight !== this._layoutInfo.metadataHeight) {
+			changeEvent.metadataHeight = true;
+		}
+
+		if (newLayout.metadataStatusHeight !== this._layoutInfo.metadataStatusHeight) {
+			changeEvent.metadataStatusHeight = true;
+		}
+
+		if (newLayout.outputTotalHeight !== this._layoutInfo.outputTotalHeight) {
+			changeEvent.outputTotalHeight = true;
+		}
+
+		if (newLayout.outputStatusHeight !== this._layoutInfo.outputStatusHeight) {
+			changeEvent.outputStatusHeight = true;
+		}
+
+		if (newLayout.bodyMargin !== this._layoutInfo.bodyMargin) {
+			changeEvent.bodyMargin = true;
+		}
+
+		if (newLayout.totalHeight !== this._layoutInfo.totalHeight) {
+			changeEvent.totalHeight = true;
+		}
+
+		this._layoutInfo = newLayout;
+		this._fireLayoutChangeEvent(changeEvent);
+	}
+
+	private _getOutputTotalHeight(rawOutputHeight: number) {
+		if (this.outputFoldingState === PropertyFoldingState.Collapsed) {
+			return 0;
+		}
+
+		if (this.renderOutput) {
+			if (this.isOutputEmpty()) {
+				// single line;
+				return 24;
+			}
+			return this.getRichOutputTotalHeight();
+		} else {
+			return rawOutputHeight;
+		}
+	}
+
+	private _fireLayoutChangeEvent(state: CellDiffViewModelLayoutChangeEvent) {
+		this._layoutInfoEmitter.fire(state);
+		this.editorEventDispatcher.emit([{ type: NotebookDiffViewEventType.CellLayoutChanged, source: this._layoutInfo }]);
+	}
+
+	abstract checkIfOutputsModified(): boolean;
+	abstract checkMetadataIfModified(): boolean;
+	abstract isOutputEmpty(): boolean;
+	abstract getRichOutputTotalHeight(): number;
+	abstract getCellByUri(cellUri: URI): IGenericCellViewModel;
+	abstract getOutputOffsetInCell(diffSide: DiffSide, index: number): number;
+	abstract getOutputOffsetInContainer(diffSide: DiffSide, index: number): number;
+	abstract updateOutputHeight(diffSide: DiffSide, index: number, height: number): void;
+	abstract getNestedCellViewModel(diffSide: DiffSide): DiffNestedCellViewModel;
+
+	getComputedCellContainerWidth(layoutInfo: NotebookLayoutInfo, diffEditor: boolean, fullWidth: boolean) {
+		if (fullWidth) {
+			return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
+		}
+
+		return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
+	}
+
+	getOutputEditorViewState(): editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null {
+		return this._outputEditorViewState;
+	}
+
+	saveOutputEditorViewState(viewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null) {
+		this._outputEditorViewState = viewState;
+	}
+
+	getMetadataEditorViewState(): editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null {
+		return this._metadataEditorViewState;
+	}
+
+	saveMetadataEditorViewState(viewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null) {
+		this._metadataEditorViewState = viewState;
+	}
+
+	getSourceEditorViewState(): editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null {
+		return this._sourceEditorViewState;
+	}
+
+	saveSpirceEditorViewState(viewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null) {
+		this._sourceEditorViewState = viewState;
+	}
+}
+
+export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
+	get originalDocument() {
+		return this.otherDocumentTextModel;
+	}
+
+	get modifiedDocument() {
+		return this.mainDocumentTextModel;
+	}
+
+	constructor(
+		readonly mainDocumentTextModel: NotebookTextModel,
+		readonly otherDocumentTextModel: NotebookTextModel,
+		readonly original: DiffNestedCellViewModel,
+		readonly modified: DiffNestedCellViewModel,
+		readonly type: 'unchanged' | 'modified',
+		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher
+	) {
+		super(
+			mainDocumentTextModel,
+			original,
+			modified,
+			type,
+			editorEventDispatcher);
+
+		this.metadataFoldingState = PropertyFoldingState.Collapsed;
+		this.outputFoldingState = PropertyFoldingState.Collapsed;
+
+		if (this.checkMetadataIfModified()) {
+			this.metadataFoldingState = PropertyFoldingState.Expanded;
+		}
+
+		if (this.checkIfOutputsModified()) {
+			this.outputFoldingState = PropertyFoldingState.Expanded;
+		}
+
+		this._register(this.original.onDidChangeOutputLayout(() => {
+			this._layout({ recomputeOutput: true });
+		}));
+
+		this._register(this.modified.onDidChangeOutputLayout(() => {
+			this._layout({ recomputeOutput: true });
+		}));
+	}
+
+	checkIfOutputsModified() {
+		return !this.mainDocumentTextModel.transientOptions.transientOutputs && hash(this.original?.outputs ?? []) !== hash(this.modified?.outputs ?? []);
+	}
+
+	checkMetadataIfModified(): boolean {
+		return hash(getFormatedMetadataJSON(this.mainDocumentTextModel, this.original?.metadata || {}, this.original?.language)) !== hash(getFormatedMetadataJSON(this.mainDocumentTextModel, this.modified?.metadata ?? {}, this.modified?.language));
+	}
+
+	updateOutputHeight(diffSide: DiffSide, index: number, height: number) {
+		if (diffSide === DiffSide.Original) {
+			this.original.updateOutputHeight(index, height);
+		} else {
+			this.modified.updateOutputHeight(index, height);
+		}
+	}
+
+	getOutputOffsetInContainer(diffSide: DiffSide, index: number) {
+		if (diffSide === DiffSide.Original) {
+			return this.original.getOutputOffset(index);
+		} else {
+			return this.modified.getOutputOffset(index);
+		}
+	}
+
+	getOutputOffsetInCell(diffSide: DiffSide, index: number) {
+		const offsetInOutputsContainer = this.getOutputOffsetInContainer(diffSide, index);
+
+		return this._layoutInfo.editorHeight
+			+ this._layoutInfo.editorMargin
+			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.metadataStatusHeight
+			+ this._layoutInfo.outputStatusHeight
+			+ this._layoutInfo.bodyMargin / 2
+			+ offsetInOutputsContainer;
+	}
+
+	isOutputEmpty() {
+		if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
+			return true;
+		}
+
+		if (this.checkIfOutputsModified()) {
+			return false;
+		}
+
+		// outputs are not changed
+
+		return (this.original?.outputs || []).length === 0;
+	}
+
+	getRichOutputTotalHeight() {
+		return Math.max(this.original.getOutputTotalHeight(), this.modified.getOutputTotalHeight());
+	}
+
+	getNestedCellViewModel(diffSide: DiffSide): DiffNestedCellViewModel {
+		throw new Error('Method not implemented.');
+	}
+
+	getCellByUri(cellUri: URI): IGenericCellViewModel {
+		if (cellUri.toString() === this.original.uri.toString()) {
+			return this.original;
+		} else {
+			return this.modified;
+		}
+	}
+}
+
+export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
+	get cellViewModel() {
+		return this.type === 'insert' ? this.modified! : this.original!;
+	}
+
+	get originalDocument() {
+		if (this.type === 'insert') {
+			return this.otherDocumentTextModel;
+		} else {
+			return this.mainDocumentTextModel;
+		}
+	}
+
+	get modifiedDocument() {
+		if (this.type === 'insert') {
+			return this.mainDocumentTextModel;
+		} else {
+			return this.otherDocumentTextModel;
+		}
+	}
+
+	constructor(
+		readonly mainDocumentTextModel: NotebookTextModel,
+		readonly otherDocumentTextModel: NotebookTextModel,
+		readonly original: DiffNestedCellViewModel | undefined,
+		readonly modified: DiffNestedCellViewModel | undefined,
+		readonly type: 'insert' | 'delete',
+		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher
+	) {
+		super(mainDocumentTextModel, original, modified, type, editorEventDispatcher);
+		this._register(this.cellViewModel!.onDidChangeOutputLayout(() => {
+			this._layout({ recomputeOutput: true });
+		}));
+	}
+
+	getNestedCellViewModel(diffSide: DiffSide): DiffNestedCellViewModel {
+		return this.type === 'insert' ? this.modified! : this.original!;
+	}
+
+
+	checkIfOutputsModified(): boolean {
+		return false;
+	}
+
+	checkMetadataIfModified(): boolean {
+		return false;
+	}
+
+	updateOutputHeight(diffSide: DiffSide, index: number, height: number) {
+		this.cellViewModel?.updateOutputHeight(index, height);
+	}
+
+	getOutputOffsetInContainer(diffSide: DiffSide, index: number) {
+		return this.cellViewModel!.getOutputOffset(index);
+	}
+
+	getOutputOffsetInCell(diffSide: DiffSide, index: number) {
+		const offsetInOutputsContainer = this.cellViewModel!.getOutputOffset(index);
+
+		return this._layoutInfo.editorHeight
+			+ this._layoutInfo.editorMargin
+			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.metadataStatusHeight
+			+ this._layoutInfo.outputStatusHeight
+			+ this._layoutInfo.bodyMargin / 2
+			+ offsetInOutputsContainer;
+	}
+
+	isOutputEmpty() {
+		if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
+			return true;
+		}
+
+		// outputs are not changed
+
+		return (this.original?.outputs || this.modified?.outputs || []).length === 0;
+	}
+
+	getRichOutputTotalHeight() {
+		return this.cellViewModel?.getOutputTotalHeight() ?? 0;
+	}
+
+	getCellByUri(cellUri: URI): IGenericCellViewModel {
+		return this.cellViewModel!;
+	}
+}
+
+export function getFormatedMetadataJSON(documentTextModel: NotebookTextModel, metadata: NotebookCellMetadata, language?: string) {
+	let filteredMetadata: { [key: string]: any } = {};
+
+	if (documentTextModel) {
+		const transientMetadata = documentTextModel.transientOptions.transientMetadata;
+
+		const keys = new Set([...Object.keys(metadata)]);
+		for (let key of keys) {
+			if (!(transientMetadata[key as keyof NotebookCellMetadata])
+			) {
+				filteredMetadata[key] = metadata[key as keyof NotebookCellMetadata];
+			}
+		}
+	} else {
+		filteredMetadata = metadata;
+	}
+
+	const content = JSON.stringify({
+		language,
+		...filteredMetadata
+	});
+
+	const edits = format(content, undefined, {});
+	const metadataSource = applyEdits(content, edits);
+
+	return metadataSource;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
new file mode 100644
index 000000000..bd9f8d2ad
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { generateUuid } from 'vs/base/common/uuid';
+import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
+import { IDiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { CellViewModelStateChangeEvent, ICellOutputViewModel, IGenericCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel';
+import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+
+export class DiffNestedCellViewModel extends Disposable implements IDiffNestedCellViewModel, IGenericCellViewModel {
+	private _id: string;
+	get id() {
+		return this._id;
+	}
+
+	get outputs() {
+		return this.textModel.outputs;
+	}
+
+	get language() {
+		return this.textModel.language;
+	}
+
+	get metadata() {
+		return this.textModel.metadata;
+	}
+
+	get uri() {
+		return this.textModel.uri;
+	}
+
+	get handle() {
+		return this.textModel.handle;
+	}
+
+	protected readonly _onDidChangeState: Emitter<CellViewModelStateChangeEvent> = this._register(new Emitter<CellViewModelStateChangeEvent>());
+
+	private _hoveringOutput: boolean = false;
+	public get outputIsHovered(): boolean {
+		return this._hoveringOutput;
+	}
+
+	public set outputIsHovered(v: boolean) {
+		this._hoveringOutput = v;
+		this._onDidChangeState.fire({ outputIsHoveredChanged: true });
+	}
+	private _outputViewModels: ICellOutputViewModel[];
+
+	get outputsViewModels() {
+		return this._outputViewModels;
+	}
+
+	protected _outputCollection: number[] = [];
+	protected _outputsTop: PrefixSumComputer | null = null;
+	protected readonly _onDidChangeOutputLayout = new Emitter<void>();
+	readonly onDidChangeOutputLayout = this._onDidChangeOutputLayout.event;
+
+
+	constructor(
+		readonly textModel: NotebookCellTextModel,
+		@INotebookService private _notebookService: INotebookService
+	) {
+		super();
+		this._id = generateUuid();
+
+		this._outputViewModels = this.textModel.outputs.map(output => new CellOutputViewModel(this, output, this._notebookService));
+		this._register(this.textModel.onDidChangeOutputs((splices) => {
+			splices.reverse().forEach(splice => {
+				this._outputCollection.splice(splice[0], splice[1], ...splice[2].map(() => 0));
+				this._outputViewModels.splice(splice[0], splice[1], ...splice[2].map(output => new CellOutputViewModel(this, output, this._notebookService)));
+			});
+
+			this._outputsTop = null;
+			this._onDidChangeOutputLayout.fire();
+		}));
+		this._outputCollection = new Array(this.textModel.outputs.length);
+	}
+
+	private _ensureOutputsTop() {
+		if (!this._outputsTop) {
+			const values = new Uint32Array(this._outputCollection.length);
+			for (let i = 0; i < this._outputCollection.length; i++) {
+				values[i] = this._outputCollection[i];
+			}
+
+			this._outputsTop = new PrefixSumComputer(values);
+		}
+	}
+
+	getOutputOffset(index: number): number {
+		this._ensureOutputsTop();
+
+		if (index >= this._outputCollection.length) {
+			throw new Error('Output index out of range!');
+		}
+
+		return this._outputsTop!.getAccumulatedValue(index - 1);
+	}
+
+	updateOutputHeight(index: number, height: number): void {
+		if (index >= this._outputCollection.length) {
+			throw new Error('Output index out of range!');
+		}
+
+		this._ensureOutputsTop();
+		this._outputCollection[index] = height;
+		if (this._outputsTop!.changeValue(index, height)) {
+			this._onDidChangeOutputLayout.fire();
+		}
+	}
+
+	getOutputTotalHeight() {
+		this._ensureOutputsTop();
+
+		return this._outputsTop?.getTotalValue() ?? 0;
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts b/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
new file mode 100644
index 000000000..2e4cb22ee
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from 'vs/base/common/event';
+import { IDiffElementLayoutInfo } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookLayoutChangeEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+
+export enum NotebookDiffViewEventType {
+	LayoutChanged = 1,
+	CellLayoutChanged = 2
+	// MetadataChanged = 2,
+	// CellStateChanged = 3
+}
+
+export class NotebookDiffLayoutChangedEvent {
+	public readonly type = NotebookDiffViewEventType.LayoutChanged;
+
+	constructor(readonly source: NotebookLayoutChangeEvent, readonly value: NotebookLayoutInfo) {
+
+	}
+}
+
+export class NotebookCellLayoutChangedEvent {
+	public readonly type = NotebookDiffViewEventType.CellLayoutChanged;
+
+	constructor(readonly source: IDiffElementLayoutInfo) {
+
+	}
+}
+
+export type NotebookDiffViewEvent = NotebookDiffLayoutChangedEvent | NotebookCellLayoutChangedEvent;
+
+export class NotebookDiffEditorEventDispatcher {
+	protected readonly _onDidChangeLayout = new Emitter<NotebookDiffLayoutChangedEvent>();
+	readonly onDidChangeLayout = this._onDidChangeLayout.event;
+	protected readonly _onDidChangeCellLayout = new Emitter<NotebookCellLayoutChangedEvent>();
+	readonly onDidChangeCellLayout = this._onDidChangeCellLayout.event;
+
+	constructor() {
+	}
+
+	emit(events: NotebookDiffViewEvent[]) {
+		for (let i = 0, len = events.length; i < len; i++) {
+			const e = events[i];
+
+			switch (e.type) {
+				case NotebookDiffViewEventType.LayoutChanged:
+					this._onDidChangeLayout.fire(e);
+					break;
+				case NotebookDiffViewEventType.CellLayoutChanged:
+					this._onDidChangeCellLayout.fire(e);
+					break;
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
index 950cbce2f..407465444 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
@@ -21,6 +21,31 @@
 	flex-direction: row;
 }
 
+.notebook-text-diff-editor .webview-cover {
+	user-select: initial;
+	-webkit-user-select: initial;
+}
+
+.notebook-text-diff-editor .cell-body .border-container {
+	position: absolute;
+	width: calc(100% - 32px);
+}
+
+.notebook-text-diff-editor .cell-body .border-container .top-border,
+.notebook-text-diff-editor .cell-body .border-container .bottom-border {
+	position: absolute;
+	width: 100%;
+}
+
+.notebook-text-diff-editor .cell-body .border-container .left-border,
+.notebook-text-diff-editor .cell-body .border-container .right-border {
+	position: absolute;
+}
+
+.notebook-text-diff-editor .cell-body .border-container .right-border {
+	left: 100%;
+}
+
 .notebook-text-diff-editor .cell-body.right {
 	flex-direction: row-reverse;
 }
@@ -32,18 +57,20 @@
 
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container {
 	width: 100%;
-	overflow: hidden;
+	/* why we overflow hidden at the beginning?*/
+	/* overflow: hidden; */
 }
 
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .metadata-editor-container.diff,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .output-editor-container.diff,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .editor-container.diff {
 	/** 100% + diffOverviewWidth */
-	width: calc(100% + 30px);
+	width: calc(100%);
 }
 
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .metadata-editor-container .monaco-diff-editor .diffOverview,
-.notebook-text-diff-editor .cell-body .cell-diff-editor-container .editor-container.diff .monaco-diff-editor .diffOverview {
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container .editor-container.diff .monaco-diff-editor .diffOverview,
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container .output-editor-container.diff .monaco-diff-editor .diffOverview {
 	display: none;
 }
 
@@ -106,10 +133,15 @@
 	overflow: hidden;
 }
 
+.monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row {
+	overflow: visible !important;
+}
+
 .monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row,
 .monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row:hover,
 .monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.focused {
 	outline: none !important;
+	background-color: transparent !important;
 }
 
 .notebook-text-diff-editor .cell-diff-editor-container .editor-input-toolbar-container {
@@ -118,3 +150,120 @@
 	top: 16px;
 	margin: 4px 2px;
 }
+
+.monaco-workbench .notebook-text-diff-editor .cell-body {
+	height: 0;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body .output-view-container {
+	user-select: text;
+	-webkit-user-select: text;
+	-ms-user-select: text;
+	white-space: initial;
+	cursor: auto;
+	position: relative;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body .output-view-container .output-plaintext {
+	white-space: pre;
+	overflow-x: hidden;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-view-container .output-inner-container,
+.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-view-container .output-inner-container {
+	width: 100%;
+	padding: 0px 8px;
+	box-sizing: border-box;
+	overflow-x: hidden;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-view-container .output-inner-container {
+	padding: 0px 8px 0px 32px;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-view-container .output-inner-container {
+	padding: 0px 8px 0px 32px;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-view-container .output-inner-container {
+	width: 100%;
+	padding: 4px 8px 4px 32px;
+	box-sizing: border-box;
+	overflow-x: hidden;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left {
+	top: 0;
+	position: absolute;
+	left: 0;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right {
+	position: absolute;
+	top: 0;
+	left: 50%;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left,
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right {
+	width: 50%;
+	display: inline-block;
+}
+
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left div.foreground,
+.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right div.foreground {
+	width: 100%;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container > div.foreground {
+	width: 100%;
+	min-height: 24px;
+	box-sizing: border-box;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .error_message {
+	color: red;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .error > div {
+	white-space: normal;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .error pre.traceback {
+	box-sizing: border-box;
+	padding: 8px 0;
+	margin: 0px;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .error .traceback > span {
+	display: block;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .display img {
+	max-width: 100%;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .multi-mimetype-output {
+	position: absolute;
+	top: 4px;
+	left: 8px;
+	width: 16px;
+	height: 16px;
+	cursor: pointer;
+	padding: 2px 4px 4px 2px;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .output-empty-view span {
+	opacity: 0.7;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container .output-empty-view {
+	font-style: italic;
+	height: 24px;
+	margin: auto;
+	padding-left: 12px;
+}
+
+.monaco-workbench .notebook-text-diff-editor .output-view-container pre {
+	margin: 4px 0;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
index cb8709d16..0911630f6 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
@@ -8,10 +8,11 @@ import { localize } from 'vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ActiveEditorContext, viewColumnToEditorGroup } from 'vs/workbench/common/editor';
-import { CellDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel';
+import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor';
 import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookDiffEditorInput';
-import { openAsTextIcon, revertIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { openAsTextIcon, renderOutputIcon, revertIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
@@ -60,12 +61,14 @@ registerAction2(class extends Action2 {
 				icon: revertIcon,
 				f1: false,
 				menu: {
-					id: MenuId.NotebookDiffCellMetadataTitle
-				}
+					id: MenuId.NotebookDiffCellMetadataTitle,
+					when: NOTEBOOK_DIFF_CELL_PROPERTY
+				},
+				precondition: NOTEBOOK_DIFF_CELL_PROPERTY
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: CellDiffViewModel }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -77,7 +80,55 @@ registerAction2(class extends Action2 {
 			return;
 		}
 
-		modified.metadata = original.metadata;
+		modified.textModel.metadata = original.metadata;
+	}
+});
+
+// registerAction2(class extends Action2 {
+// 	constructor() {
+// 		super(
+// 			{
+// 				id: 'notebook.diff.cell.switchOutputRenderingStyle',
+// 				title: localize('notebook.diff.cell.switchOutputRenderingStyle', "Switch Outputs Rendering"),
+// 				icon: renderOutputIcon,
+// 				f1: false,
+// 				menu: {
+// 					id: MenuId.NotebookDiffCellOutputsTitle
+// 				}
+// 			}
+// 		);
+// 	}
+// 	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+// 		if (!context) {
+// 			return;
+// 		}
+
+// 		context.cell.renderOutput = true;
+// 	}
+// });
+
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
+				title: localize('notebook.diff.cell.switchOutputRenderingStyleToText', "Switch Output Rendering"),
+				icon: renderOutputIcon,
+				f1: false,
+				menu: {
+					id: MenuId.NotebookDiffCellOutputsTitle,
+					when: NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED
+				}
+			}
+		);
+	}
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+		if (!context) {
+			return;
+		}
+
+		context.cell.renderOutput = !context.cell.renderOutput;
 	}
 });
 
@@ -90,12 +141,14 @@ registerAction2(class extends Action2 {
 				icon: revertIcon,
 				f1: false,
 				menu: {
-					id: MenuId.NotebookDiffCellOutputsTitle
-				}
+					id: MenuId.NotebookDiffCellOutputsTitle,
+					when: NOTEBOOK_DIFF_CELL_PROPERTY
+				},
+				precondition: NOTEBOOK_DIFF_CELL_PROPERTY
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: CellDiffViewModel }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -107,10 +160,11 @@ registerAction2(class extends Action2 {
 			return;
 		}
 
-		modified.spliceNotebookCellOutputs([[0, modified.outputs.length, original.outputs]]);
+		modified.textModel.spliceNotebookCellOutputs([[0, modified.outputs.length, original.outputs]]);
 	}
 });
 
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super(
@@ -120,12 +174,15 @@ registerAction2(class extends Action2 {
 				icon: revertIcon,
 				f1: false,
 				menu: {
-					id: MenuId.NotebookDiffCellInputTitle
-				}
+					id: MenuId.NotebookDiffCellInputTitle,
+					when: NOTEBOOK_DIFF_CELL_PROPERTY
+				},
+				precondition: NOTEBOOK_DIFF_CELL_PROPERTY
+
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: CellDiffViewModel }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -139,7 +196,7 @@ registerAction2(class extends Action2 {
 
 		const bulkEditService = accessor.get(IBulkEditService);
 		return bulkEditService.apply([
-			new ResourceTextEdit(modified.uri, { range: modified.getFullModelRange(), text: original.getValue() }),
+			new ResourceTextEdit(modified.uri, { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }),
 		], { quotableLabel: 'Split Notebook Cell' });
 	}
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
new file mode 100644
index 000000000..611b0f264
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICommonCellInfo, ICommonNotebookEditor, IDisplayOutputViewModel, IGenericCellViewModel, IInsetRenderOutput, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { Event } from 'vs/base/common/event';
+import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+
+export enum DiffSide {
+	Original = 0,
+	Modified = 1
+}
+
+export interface IDiffCellInfo extends ICommonCellInfo {
+	diffElement: DiffElementViewModelBase;
+}
+
+export interface INotebookTextDiffEditor extends ICommonNotebookEditor {
+	readonly textModel?: NotebookTextModel;
+	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase; }>;
+	onDidDynamicOutputRendered: Event<{ cell: IGenericCellViewModel, output: IDisplayOutputViewModel }>;
+	getOverflowContainerDomNode(): HTMLElement;
+	getLayoutInfo(): NotebookLayoutInfo;
+	layoutNotebookCell(cell: DiffElementViewModelBase, height: number): void;
+	getOutputRenderer(): OutputRenderer;
+	createInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void;
+	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, displayOutput: IDisplayOutputViewModel, diffSide: DiffSide): void;
+	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IDisplayOutputViewModel, diffSide: DiffSide): void;
+	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IDisplayOutputViewModel): void;
+	/**
+	 * Trigger the editor to scroll from scroll event programmatically
+	 */
+	triggerScroll(event: IMouseWheelEvent): void;
+	getCellByInfo(cellInfo: ICommonCellInfo): IGenericCellViewModel;
+	focusNotebookCell(cell: IGenericCellViewModel, focus: 'editor' | 'container' | 'output'): void;
+	focusNextNotebookCell(cell: IGenericCellViewModel, focus: 'editor' | 'container' | 'output'): void;
+	updateOutputHeight(cellInfo: ICommonCellInfo, output: IDisplayOutputViewModel, height: number, isInit: boolean): void;
+	deltaCellOutputContainerClassNames(diffSide: DiffSide, cellId: string, added: string[], removed: string[]): void;
+}
+
+export interface IDiffNestedCellViewModel {
+
+}
+
+export interface CellDiffCommonRenderTemplate {
+	readonly leftBorder: HTMLElement;
+	readonly rightBorder: HTMLElement;
+	readonly topBorder: HTMLElement;
+	readonly bottomBorder: HTMLElement;
+}
+
+export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTemplate {
+	readonly container: HTMLElement;
+	readonly body: HTMLElement;
+	readonly diffEditorContainer: HTMLElement;
+	readonly diagonalFill: HTMLElement;
+	readonly elementDisposables: DisposableStore;
+	readonly sourceEditor: CodeEditorWidget;
+	readonly metadataHeaderContainer: HTMLElement;
+	readonly metadataInfoContainer: HTMLElement;
+	readonly outputHeaderContainer: HTMLElement;
+	readonly outputInfoContainer: HTMLElement;
+
+}
+
+
+export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTemplate {
+	readonly container: HTMLElement;
+	readonly body: HTMLElement;
+	readonly diffEditorContainer: HTMLElement;
+	readonly elementDisposables: DisposableStore;
+	readonly sourceEditor: DiffEditorWidget;
+	readonly editorContainer: HTMLElement;
+	readonly inputToolbarContainer: HTMLElement;
+	readonly toolbar: ToolBar;
+	readonly metadataHeaderContainer: HTMLElement;
+	readonly metadataInfoContainer: HTMLElement;
+	readonly outputHeaderContainer: HTMLElement;
+	readonly outputInfoContainer: HTMLElement;
+}
+
+export interface IDiffElementLayoutInfo {
+	totalHeight: number;
+	width: number;
+	editorHeight: number;
+	editorMargin: number;
+	metadataHeight: number;
+	metadataStatusHeight: number;
+	rawOutputHeight: number;
+	outputTotalHeight: number;
+	outputStatusHeight: number;
+	bodyMargin: number
+}
+
+type IDiffElementSelfLayoutChangeEvent = { [K in keyof IDiffElementLayoutInfo]?: boolean };
+
+export interface CellDiffViewModelLayoutChangeEvent extends IDiffElementSelfLayoutChangeEvent {
+	font?: BareFontInfo;
+	outerWidth?: boolean;
+	metadataEditor?: boolean;
+	outputEditor?: boolean;
+	outputView?: boolean;
+}
+
+export const DIFF_CELL_MARGIN = 16;
+export const NOTEBOOK_DIFF_CELL_PROPERTY = new RawContextKey<boolean>('notebookDiffCellPropertyChanged', false);
+export const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = new RawContextKey<boolean>('notebookDiffCellPropertyExpanded', false);
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
index 13f6973c0..19d4f07ef 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffEditor.ts
@@ -13,32 +13,38 @@ import { notebookCellBorder, NotebookEditorWidget } from 'vs/workbench/contrib/n
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { NotebookDiffEditorInput } from '../notebookDiffEditorInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { CellDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel';
+import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CellDiffRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { diffDiagonalFill, diffInserted, diffRemoved, editorBackground, focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry';
 import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { getZoomLevel } from 'vs/base/browser/browser';
-import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/common';
+import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
+import { IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IGenericCellViewModel, IInsetRenderOutput, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { Emitter } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { NotebookDiffEditorEventDispatcher, NotebookLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { INotebookDiffEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, INotebookDiffEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import { IDiffChange } from 'vs/base/common/diff/diff';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
+import { SequencerByKey } from 'vs/base/common/async';
+import { generateUuid } from 'vs/base/common/uuid';
+import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
+import { BackLayerWebView } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
+import { CELL_OUTPUT_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
+import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
 
-export const IN_NOTEBOOK_TEXT_DIFF_EDITOR = new RawContextKey<boolean>('isInNotebookTextDiffEditor', false);
+const $ = DOM.$;
 
 export class NotebookTextDiffEditor extends EditorPane implements INotebookTextDiffEditor {
 	static readonly ID: string = 'workbench.editor.notebookTextDiffEditor';
@@ -46,21 +52,38 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	private _rootElement!: HTMLElement;
 	private _overflowContainer!: HTMLElement;
 	private _dimension: DOM.Dimension | null = null;
-	private _list!: WorkbenchList<CellDiffViewModel>;
+	private _diffElementViewModels: DiffElementViewModelBase[] = [];
+	private _list!: NotebookTextDiffList;
+	private _modifiedWebview: BackLayerWebView<IDiffCellInfo> | null = null;
+	private _originalWebview: BackLayerWebView<IDiffCellInfo> | null = null;
+	private _webviewTransparentCover: HTMLElement | null = null;
 	private _fontInfo: BareFontInfo | undefined;
 
-	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: CellDiffViewModel; }>());
+	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase; }>());
 	public readonly onMouseUp = this._onMouseUp.event;
 	private _eventDispatcher: NotebookDiffEditorEventDispatcher | undefined;
 	protected _scopeContextKeyService!: IContextKeyService;
 	private _model: INotebookDiffEditorModel | null = null;
 	private _modifiedResourceDisposableStore = new DisposableStore();
+	private _outputRenderer: OutputRenderer;
 
 	get textModel() {
 		return this._model?.modified.notebook;
 	}
 
 	private _revealFirst: boolean;
+	private readonly _insetModifyQueueByOutputId = new SequencerByKey<string>();
+
+	protected _onDidDynamicOutputRendered = new Emitter<{ cell: IGenericCellViewModel, output: IDisplayOutputViewModel }>();
+	onDidDynamicOutputRendered = this._onDidDynamicOutputRendered.event;
+
+	private _localStore: DisposableStore = this._register(new DisposableStore());
+
+	private _isDisposed: boolean = false;
+
+	get isDisposed() {
+		return this._isDisposed;
+	}
 
 	constructor(
 		@IInstantiationService readonly instantiationService: IInstantiationService,
@@ -75,10 +98,40 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	) {
 		super(NotebookTextDiffEditor.ID, telemetryService, themeService, storageService);
 		const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
-		this._fontInfo = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel());
+		this._fontInfo = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel(), getPixelRatio());
 		this._revealFirst = true;
 
 		this._register(this._modifiedResourceDisposableStore);
+		this._outputRenderer = new OutputRenderer(this, this.instantiationService);
+	}
+
+	focusNotebookCell(cell: IGenericCellViewModel, focus: 'output' | 'editor' | 'container'): void {
+		// throw new Error('Method not implemented.');
+	}
+
+	focusNextNotebookCell(cell: IGenericCellViewModel, focus: 'output' | 'editor' | 'container'): void {
+		// throw new Error('Method not implemented.');
+	}
+
+	updateOutputHeight(cellInfo: IDiffCellInfo, output: IDisplayOutputViewModel, outputHeight: number, isInit: boolean): void {
+		const diffElement = cellInfo.diffElement;
+		const cell = this.getCellByInfo(cellInfo);
+		const outputIndex = cell.outputsViewModels.indexOf(output);
+
+		if (diffElement instanceof SideBySideDiffElementViewModel) {
+			const info = CellUri.parse(cellInfo.cellUri);
+			if (!info) {
+				return;
+			}
+
+			diffElement.updateOutputHeight(info.notebook.toString() === this._model?.original.resource.toString() ? DiffSide.Original : DiffSide.Modified, outputIndex, outputHeight);
+		} else {
+			diffElement.updateOutputHeight(diffElement.type === 'insert' ? DiffSide.Modified : DiffSide.Original, outputIndex, outputHeight);
+		}
+
+		if (isInit) {
+			this._onDidDynamicOutputRendered.fire({ cell, output });
+		}
 	}
 
 	protected createEditor(parent: HTMLElement): void {
@@ -87,16 +140,17 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
 		DOM.append(parent, this._overflowContainer);
 
-		const renderer = this.instantiationService.createInstance(CellDiffRenderer, this);
+		const renderers = [
+			this.instantiationService.createInstance(CellDiffSingleSideRenderer, this),
+			this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
+		];
 
 		this._list = this.instantiationService.createInstance(
 			NotebookTextDiffList,
 			'NotebookTextDiff',
 			this._rootElement,
 			this.instantiationService.createInstance(NotebookCellTextDiffListDelegate),
-			[
-				renderer
-			],
+			renderers,
 			this.contextKeyService,
 			{
 				setRowLineHeight: false,
@@ -140,17 +194,94 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			}
 		);
 
+		this._register(this._list);
+
 		this._register(this._list.onMouseUp(e => {
 			if (e.element) {
 				this._onMouseUp.fire({ event: e.browserEvent, target: e.element });
 			}
 		}));
+
+		// transparent cover
+		this._webviewTransparentCover = DOM.append(this._list.rowsContainer, $('.webview-cover'));
+		this._webviewTransparentCover.style.display = 'none';
+
+		this._register(DOM.addStandardDisposableGenericMouseDownListner(this._overflowContainer, (e: StandardMouseEvent) => {
+			if (e.target.classList.contains('slider') && this._webviewTransparentCover) {
+				this._webviewTransparentCover.style.display = 'block';
+			}
+		}));
+
+		this._register(DOM.addStandardDisposableGenericMouseUpListner(this._overflowContainer, () => {
+			if (this._webviewTransparentCover) {
+				// no matter when
+				this._webviewTransparentCover.style.display = 'none';
+			}
+		}));
+
+		this._register(this._list.onDidScroll(e => {
+			this._webviewTransparentCover!.style.top = `${e.scrollTop}px`;
+		}));
+
+
+	}
+
+	private _updateOutputsOffsetsInWebview(scrollTop: number, scrollHeight: number, activeWebview: BackLayerWebView<IDiffCellInfo>, getActiveNestedCell: (diffElement: DiffElementViewModelBase) => DiffNestedCellViewModel | undefined, diffSide: DiffSide) {
+		activeWebview.element.style.height = `${scrollHeight}px`;
+
+		if (activeWebview.insetMapping) {
+			const updateItems: IDisplayOutputLayoutUpdateRequest[] = [];
+			const removedItems: IDisplayOutputViewModel[] = [];
+			activeWebview.insetMapping.forEach((value, key) => {
+				const cell = getActiveNestedCell(value.cellInfo.diffElement);
+				if (!cell) {
+					return;
+				}
+
+				const viewIndex = this._list.indexOf(value.cellInfo.diffElement);
+
+				if (viewIndex === undefined) {
+					return;
+				}
+
+				if (cell.outputsViewModels.indexOf(key) < 0) {
+					// output is already gone
+					removedItems.push(key);
+				} else {
+					const cellTop = this._list.getAbsoluteTopOfElement(value.cellInfo.diffElement);
+					if (activeWebview.shouldUpdateInset(cell, key, cellTop)) {
+						const outputIndex = cell.outputsViewModels.indexOf(key);
+						const outputOffset = cellTop + value.cellInfo.diffElement.getOutputOffsetInCell(diffSide, outputIndex);
+
+						updateItems.push({
+							output: key,
+							cellTop: cellTop,
+							outputOffset: outputOffset
+						});
+					}
+				}
+
+			});
+
+			removedItems.forEach(output => activeWebview.removeInset(output));
+
+			if (updateItems.length) {
+				activeWebview.updateViewScrollTop(-scrollTop, false, updateItems);
+			}
+		}
 	}
 
 	async setInput(input: NotebookDiffEditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 
-		this._model = await input.resolve();
+		const model = await input.resolve();
+		if (this._model !== model) {
+			this._detachModel();
+			this._model = model;
+			this._attachModel();
+		}
+
+		this._model = model;
 		if (this._model === null) {
 			return;
 		}
@@ -196,11 +327,73 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			}
 		}));
 
-
-		this._eventDispatcher = new NotebookDiffEditorEventDispatcher();
+		await this._createOriginalWebview(generateUuid(), this._model.original.resource);
+		await this._createModifiedWebview(generateUuid(), this._model.modified.resource);
 		await this.updateLayout();
 	}
 
+	private _detachModel() {
+		this._localStore.clear();
+		this._originalWebview?.dispose();
+		this._originalWebview?.element.remove();
+		this._originalWebview = null;
+		this._modifiedWebview?.dispose();
+		this._modifiedWebview?.element.remove();
+		this._modifiedWebview = null;
+
+		this._modifiedResourceDisposableStore.clear();
+		this._list.clear();
+
+	}
+	private _attachModel() {
+		this._eventDispatcher = new NotebookDiffEditorEventDispatcher();
+		const updateInsets = () => {
+			DOM.scheduleAtNextAnimationFrame(() => {
+				if (this._isDisposed) {
+					return;
+				}
+
+				if (this._modifiedWebview) {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement: DiffElementViewModelBase) => {
+						return diffElement.modified;
+					}, DiffSide.Modified);
+				}
+
+				if (this._originalWebview) {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement: DiffElementViewModelBase) => {
+						return diffElement.original;
+					}, DiffSide.Original);
+				}
+			});
+		};
+
+		this._localStore.add(this._list.onDidChangeContentHeight(() => {
+			updateInsets();
+		}));
+
+		this._localStore.add(this._eventDispatcher.onDidChangeCellLayout(() => {
+			updateInsets();
+		}));
+	}
+
+	private async _createModifiedWebview(id: string, resource: URI): Promise<void> {
+		this._modifiedWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: 32 }) as BackLayerWebView<IDiffCellInfo>;
+		// attach the webview container to the DOM tree first
+		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._modifiedWebview.element);
+		await this._modifiedWebview.createWebview();
+		this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
+		this._modifiedWebview.element.style.left = `calc(50%)`;
+	}
+
+	private async _createOriginalWebview(id: string, resource: URI): Promise<void> {
+		this._originalWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: 32 }) as BackLayerWebView<IDiffCellInfo>;
+		// attach the webview container to the DOM tree first
+		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._originalWebview.element);
+		await this._originalWebview.createWebview();
+		this._originalWebview.element.style.width = `calc(50% - 16px)`;
+		this._originalWebview.element.style.left = `16px`;
+	}
+
 	private async _resolveStats(resource: URI) {
 		if (resource.scheme === Schemas.untitled) {
 			return undefined;
@@ -222,7 +415,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const diffResult = await this.notebookEditorWorkerService.computeDiff(this._model.original.resource, this._model.modified.resource);
 		const cellChanges = diffResult.cellsDiff.changes;
 
-		const cellDiffViewModels: CellDiffViewModel[] = [];
+		const diffElementViewModels: DiffElementViewModelBase[] = [];
 		const originalModel = this._model.original.notebook;
 		const modifiedModel = this._model.modified.notebook;
 		let originalCellIndex = 0;
@@ -238,20 +431,24 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 				const originalCell = originalModel.cells[originalCellIndex + j];
 				const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
 				if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
-					cellDiffViewModels.push(new CellDiffViewModel(
-						originalCell,
-						modifiedCell,
+					diffElementViewModels.push(new SideBySideDiffElementViewModel(
+						this._model.modified.notebook,
+						this._model.original.notebook,
+						this.instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
+						this.instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
 						'unchanged',
 						this._eventDispatcher!
 					));
 				} else {
 					if (firstChangeIndex === -1) {
-						firstChangeIndex = cellDiffViewModels.length;
+						firstChangeIndex = diffElementViewModels.length;
 					}
 
-					cellDiffViewModels.push(new CellDiffViewModel(
-						originalCell,
-						modifiedCell,
+					diffElementViewModels.push(new SideBySideDiffElementViewModel(
+						this._model.modified.notebook,
+						this._model.original.notebook,
+						this.instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
+						this.instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
 						'modified',
 						this._eventDispatcher!
 					));
@@ -260,24 +457,35 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 			const modifiedLCS = this._computeModifiedLCS(change, originalModel, modifiedModel);
 			if (modifiedLCS.length && firstChangeIndex === -1) {
-				firstChangeIndex = cellDiffViewModels.length;
+				firstChangeIndex = diffElementViewModels.length;
 			}
 
-			cellDiffViewModels.push(...modifiedLCS);
+			diffElementViewModels.push(...modifiedLCS);
 			originalCellIndex = change.originalStart + change.originalLength;
 			modifiedCellIndex = change.modifiedStart + change.modifiedLength;
 		}
 
 		for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
-			cellDiffViewModels.push(new CellDiffViewModel(
-				originalModel.cells[i],
-				modifiedModel.cells[i - originalCellIndex + modifiedCellIndex],
+			diffElementViewModels.push(new SideBySideDiffElementViewModel(
+				this._model.modified.notebook,
+				this._model.original.notebook,
+				this.instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[i]),
+				this.instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[i - originalCellIndex + modifiedCellIndex]),
 				'unchanged',
 				this._eventDispatcher!
 			));
 		}
 
-		this._list.splice(0, this._list.length, cellDiffViewModels);
+		this._originalWebview?.insetMapping.forEach((value, key) => {
+			this._originalWebview?.removeInset(key);
+		});
+
+		this._modifiedWebview?.insetMapping.forEach((value, key) => {
+			this._modifiedWebview?.removeInset(key);
+		});
+
+		this._diffElementViewModels = diffElementViewModels;
+		this._list.splice(0, this._list.length, diffElementViewModels);
 
 		if (this._revealFirst && firstChangeIndex !== -1) {
 			this._revealFirst = false;
@@ -287,14 +495,16 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	private _computeModifiedLCS(change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel) {
-		const result: CellDiffViewModel[] = [];
+		const result: DiffElementViewModelBase[] = [];
 		// modified cells
 		const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
 
 		for (let j = 0; j < modifiedLen; j++) {
-			result.push(new CellDiffViewModel(
-				originalModel.cells[change.originalStart + j],
-				modifiedModel.cells[change.modifiedStart + j],
+			result.push(new SideBySideDiffElementViewModel(
+				modifiedModel,
+				originalModel,
+				this.instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
+				this.instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
 				'modified',
 				this._eventDispatcher!
 			));
@@ -302,8 +512,10 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		for (let j = modifiedLen; j < change.originalLength; j++) {
 			// deletion
-			result.push(new CellDiffViewModel(
-				originalModel.cells[change.originalStart + j],
+			result.push(new SingleSideDiffElementViewModel(
+				originalModel,
+				modifiedModel,
+				this.instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
 				undefined,
 				'delete',
 				this._eventDispatcher!
@@ -312,9 +524,11 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		for (let j = modifiedLen; j < change.modifiedLength; j++) {
 			// insertion
-			result.push(new CellDiffViewModel(
+			result.push(new SingleSideDiffElementViewModel(
+				modifiedModel,
+				originalModel,
 				undefined,
-				modifiedModel.cells[change.modifiedStart + j],
+				this.instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
 				'insert',
 				this._eventDispatcher!
 			));
@@ -323,14 +537,12 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		return result;
 	}
 
-	private pendingLayouts = new WeakMap<CellDiffViewModel, IDisposable>();
+	private pendingLayouts = new WeakMap<DiffElementViewModelBase, IDisposable>();
 
 
-	layoutNotebookCell(cell: CellDiffViewModel, height: number) {
-		const relayout = (cell: CellDiffViewModel, height: number) => {
-			const viewIndex = this._list.indexOf(cell);
-
-			this._list?.updateElementHeight(viewIndex, height);
+	layoutNotebookCell(cell: DiffElementViewModelBase, height: number) {
+		const relayout = (cell: DiffElementViewModelBase, height: number) => {
+			this._list.updateElementHeight2(cell, height);
 		};
 
 		if (this.pendingLayouts.has(cell)) {
@@ -353,6 +565,79 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		return new Promise<void>(resolve => { r = resolve; });
 	}
 
+	triggerScroll(event: IMouseWheelEvent) {
+		this._list.triggerScrollFromMouseWheelEvent(event);
+	}
+
+	createInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void {
+		this._insetModifyQueueByOutputId.queue(output.source.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
+			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
+			if (!activeWebview) {
+				return;
+			}
+
+			if (!activeWebview.insetMapping.has(output.source)) {
+				const cellTop = this._list.getAbsoluteTopOfElement(cellDiffViewModel);
+				await activeWebview.createInset({ diffElement: cellDiffViewModel, cellHandle: cellViewModel.handle, cellId: cellViewModel.id, cellUri: cellViewModel.uri }, output, cellTop, getOffset());
+			} else {
+				const cellTop = this._list.getAbsoluteTopOfElement(cellDiffViewModel);
+				const scrollTop = this._list.scrollTop;
+				const outputIndex = cellViewModel.outputsViewModels.indexOf(output.source);
+				const outputOffset = cellTop + cellDiffViewModel.getOutputOffsetInCell(diffSide, outputIndex);
+				activeWebview.updateViewScrollTop(-scrollTop, true, [{ output: output.source, cellTop, outputOffset }]);
+			}
+		});
+	}
+
+	getCellByInfo(cellInfo: IDiffCellInfo): IGenericCellViewModel {
+		return cellInfo.diffElement.getCellByUri(cellInfo.cellUri);
+	}
+
+	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: IDisplayOutputViewModel, diffSide: DiffSide) {
+		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
+			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
+			if (!activeWebview) {
+				return;
+			}
+
+			if (!activeWebview.insetMapping.has(displayOutput)) {
+				return;
+			}
+
+			activeWebview.removeInset(displayOutput);
+		});
+	}
+
+	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: IDisplayOutputViewModel, diffSide: DiffSide) {
+		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
+			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
+			if (!activeWebview) {
+				return;
+			}
+
+			if (!activeWebview.insetMapping.has(displayOutput)) {
+				return;
+			}
+
+			const cellTop = this._list.getAbsoluteTopOfElement(cellDiffViewModel);
+			const scrollTop = this._list.scrollTop;
+			const outputIndex = cellViewModel.outputsViewModels.indexOf(displayOutput);
+			const outputOffset = cellTop + cellDiffViewModel.getOutputOffsetInCell(diffSide, outputIndex);
+			activeWebview.updateViewScrollTop(-scrollTop, true, [{ output: displayOutput, cellTop, outputOffset }]);
+		});
+	}
+
+	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IDisplayOutputViewModel) {
+		this._modifiedWebview?.hideInset(output);
+		this._originalWebview?.hideInset(output);
+	}
+
+	// private async _resolveWebview(rightEditor: boolean): Promise<BackLayerWebView | null> {
+	// 	if (rightEditor) {
+
+	// 	}
+	// }
+
 	getDomNode() {
 		return this._rootElement;
 	}
@@ -380,6 +665,18 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._list?.splice(0, this._list?.length || 0);
 	}
 
+	getOutputRenderer(): OutputRenderer {
+		return this._outputRenderer;
+	}
+
+	deltaCellOutputContainerClassNames(diffSide: DiffSide, cellId: string, added: string[], removed: string[]) {
+		if (diffSide === DiffSide.Original) {
+			this._originalWebview?.deltaCellOutputContainerClassNames(cellId, added, removed);
+		} else {
+			this._modifiedWebview?.deltaCellOutputContainerClassNames(cellId, added, removed);
+		}
+	}
+
 	getLayoutInfo(): NotebookLayoutInfo {
 		if (!this._list) {
 			throw new Error('Editor is not initalized successfully');
@@ -392,6 +689,56 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		};
 	}
 
+	getCellOutputLayoutInfo(nestedCell: DiffNestedCellViewModel) {
+		if (!this._model) {
+			throw new Error('Editor is not attached to model yet');
+		}
+		const documentModel = CellUri.parse(nestedCell.uri);
+		if (!documentModel) {
+			throw new Error('Nested cell in the diff editor has wrong Uri');
+		}
+
+		const belongToOriginalDocument = this._model.original.notebook.uri.toString() === documentModel.notebook.toString();
+		const viewModel = this._diffElementViewModels.find(element => {
+			const textModel = belongToOriginalDocument ? element.original : element.modified;
+			if (!textModel) {
+				return false;
+			}
+
+			if (textModel.uri.toString() === nestedCell.uri.toString()) {
+				return true;
+			}
+
+			return false;
+		});
+
+		if (!viewModel) {
+			throw new Error('Nested cell in the diff editor does not match any diff element');
+		}
+
+		if (viewModel.type === 'unchanged') {
+			return this.getLayoutInfo();
+		}
+
+		if (viewModel.type === 'insert' || viewModel.type === 'delete') {
+			return {
+				width: this._dimension!.width / 2,
+				height: this._dimension!.height / 2,
+				fontInfo: this._fontInfo!
+			};
+		}
+
+		if (viewModel.checkIfOutputsModified()) {
+			return {
+				width: this._dimension!.width / 2,
+				height: this._dimension!.height / 2,
+				fontInfo: this._fontInfo!
+			};
+		} else {
+			return this.getLayoutInfo();
+		}
+	}
+
 	layout(dimension: DOM.Dimension): void {
 		this._rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
 		this._rootElement.classList.toggle('narrow-width', dimension.width < 600);
@@ -399,14 +746,39 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._rootElement.style.height = `${dimension.height}px`;
 
 		this._list?.layout(this._dimension.height, this._dimension.width);
-		this._eventDispatcher?.emit([new NotebookLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())]);
+
+
+		if (this._modifiedWebview) {
+			this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
+			this._modifiedWebview.element.style.left = `calc(50%)`;
+		}
+
+		if (this._originalWebview) {
+			this._originalWebview.element.style.width = `calc(50% - 16px)`;
+			this._originalWebview.element.style.left = `16px`;
+		}
+
+		if (this._webviewTransparentCover) {
+			this._webviewTransparentCover.style.height = `${dimension.height}px`;
+			this._webviewTransparentCover.style.width = `${dimension.width}px`;
+		}
+
+		this._eventDispatcher?.emit([new NotebookDiffLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())]);
+	}
+
+	dispose() {
+		this._isDisposed = true;
+		super.dispose();
 	}
 }
 
 registerThemingParticipant((theme, collector) => {
 	const cellBorderColor = theme.getColor(notebookCellBorder);
 	if (cellBorderColor) {
-		collector.addRule(`.notebook-text-diff-editor .cell-body { border: 1px solid ${cellBorderColor};}`);
+		collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .top-border { border-top: 1px solid ${cellBorderColor};}`);
+		collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .bottom-border { border-top: 1px solid ${cellBorderColor};}`);
+		collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .left-border { border-left: 1px solid ${cellBorderColor};}`);
+		collector.addRule(`.notebook-text-diff-editor .cell-body .border-container .right-border { border-right: 1px solid ${cellBorderColor};}`);
 		collector.addRule(`.notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
 		.notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
 			border-top: 1px solid ${cellBorderColor};
@@ -429,6 +801,13 @@ registerThemingParticipant((theme, collector) => {
 
 	const added = theme.getColor(diffInserted);
 	if (added) {
+		collector.addRule(
+			`
+			.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-right div.foreground { background-color: ${added}; }
+			.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.foreground { background-color: ${added}; }
+			.monaco-workbench .notebook-text-diff-editor .cell-body.right .output-info-container .output-view-container div.output-empty-view { background-color: ${added}; }
+			`
+		);
 		collector.addRule(`
 			.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container { background-color: ${added}; }
 			.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .margin,
@@ -460,7 +839,15 @@ registerThemingParticipant((theme, collector) => {
 		);
 	}
 	const removed = theme.getColor(diffRemoved);
-	if (added) {
+	if (removed) {
+		collector.addRule(
+			`
+			.monaco-workbench .notebook-text-diff-editor .cell-body.full .output-info-container.modified .output-view-container .output-view-container-left div.foreground { background-color: ${removed}; }
+			.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.foreground { background-color: ${removed}; }
+			.monaco-workbench .notebook-text-diff-editor .cell-body.left .output-info-container .output-view-container div.output-empty-view { background-color: ${removed}; }
+
+			`
+		);
 		collector.addRule(`
 			.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container { background-color: ${removed}; }
 			.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .margin,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts
index 6e664d46a..ce2bc9c6e 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookTextDiffList.ts
@@ -14,12 +14,20 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IListService, IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CellDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/celllDiffViewModel';
-import { CellDiffRenderTemplate, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/common';
+import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { isMacintosh } from 'vs/base/common/platform';
-import { DeletedCell, InsertCell, ModifiedCell } from 'vs/workbench/contrib/notebook/browser/diff/cellComponents';
+import { DeletedElement, fixedDiffEditorOptions, fixedEditorOptions, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement } from 'vs/workbench/contrib/notebook/browser/diff/diffComponents';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
+import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { CodiconActionViewItem } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellActionView';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 
-export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<CellDiffViewModel> {
+export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<DiffElementViewModelBase> {
 	// private readonly lineHeight: number;
 
 	constructor(
@@ -29,20 +37,28 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Ce
 		// this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel()).lineHeight;
 	}
 
-	getHeight(element: CellDiffViewModel): number {
+	getHeight(element: DiffElementViewModelBase): number {
 		return 100;
 	}
 
-	hasDynamicHeight(element: CellDiffViewModel): boolean {
+	hasDynamicHeight(element: DiffElementViewModelBase): boolean {
 		return false;
 	}
 
-	getTemplateId(element: CellDiffViewModel): string {
-		return CellDiffRenderer.TEMPLATE_ID;
+	getTemplateId(element: DiffElementViewModelBase): string {
+		switch (element.type) {
+			case 'delete':
+			case 'insert':
+				return CellDiffSingleSideRenderer.TEMPLATE_ID;
+			case 'modified':
+			case 'unchanged':
+				return CellDiffSideBySideRenderer.TEMPLATE_ID;
+		}
+
 	}
 }
-export class CellDiffRenderer implements IListRenderer<CellDiffViewModel, CellDiffRenderTemplate> {
-	static readonly TEMPLATE_ID = 'cell_diff';
+export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffElementViewModel, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate> {
+	static readonly TEMPLATE_ID = 'cell_diff_single';
 
 	constructor(
 		readonly notebookEditor: INotebookTextDiffEditor,
@@ -50,56 +66,228 @@ export class CellDiffRenderer implements IListRenderer<CellDiffViewModel, CellDi
 	) { }
 
 	get templateId() {
-		return CellDiffRenderer.TEMPLATE_ID;
+		return CellDiffSingleSideRenderer.TEMPLATE_ID;
 	}
 
-	renderTemplate(container: HTMLElement): CellDiffRenderTemplate {
+	renderTemplate(container: HTMLElement): CellDiffSingleSideRenderTemplate {
+		const body = DOM.$('.cell-body');
+		DOM.append(container, body);
+		const diffEditorContainer = DOM.$('.cell-diff-editor-container');
+		DOM.append(body, diffEditorContainer);
+
+		const diagonalFill = DOM.append(body, DOM.$('.diagonal-fill'));
+
+		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
+		const editor = this._buildSourceEditor(sourceContainer);
+
+		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
+		const metadataInfoContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-info-container'));
+
+		const outputHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.output-header-container'));
+		const outputInfoContainer = DOM.append(diffEditorContainer, DOM.$('.output-info-container'));
+
+		const borderContainer = DOM.append(body, DOM.$('.border-container'));
+		const leftBorder = DOM.append(borderContainer, DOM.$('.left-border'));
+		const rightBorder = DOM.append(borderContainer, DOM.$('.right-border'));
+		const topBorder = DOM.append(borderContainer, DOM.$('.top-border'));
+		const bottomBorder = DOM.append(borderContainer, DOM.$('.bottom-border'));
+
 		return {
+			body,
 			container,
+			diffEditorContainer,
+			diagonalFill,
+			sourceEditor: editor,
+			metadataHeaderContainer,
+			metadataInfoContainer,
+			outputHeaderContainer,
+			outputInfoContainer,
+			leftBorder,
+			rightBorder,
+			topBorder,
+			bottomBorder,
 			elementDisposables: new DisposableStore()
 		};
 	}
 
-	renderElement(element: CellDiffViewModel, index: number, templateData: CellDiffRenderTemplate, height: number | undefined): void {
-		templateData.container.innerText = '';
+	private _buildSourceEditor(sourceContainer: HTMLElement) {
+		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
+
+		const editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
+			...fixedEditorOptions,
+			dimension: {
+				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+				height: 0
+			},
+			automaticLayout: false,
+			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
+		}, {});
+
+		return editor;
+	}
+
+	renderElement(element: SingleSideDiffElementViewModel, index: number, templateData: CellDiffSingleSideRenderTemplate, height: number | undefined): void {
+		templateData.body.classList.remove('left', 'right', 'full');
+
 		switch (element.type) {
-			case 'unchanged':
-				templateData.elementDisposables.add(this.instantiationService.createInstance(ModifiedCell, this.notebookEditor, element, templateData));
-				return;
 			case 'delete':
-				templateData.elementDisposables.add(this.instantiationService.createInstance(DeletedCell, this.notebookEditor, element, templateData));
+				templateData.elementDisposables.add(this.instantiationService.createInstance(DeletedElement, this.notebookEditor, element, templateData));
 				return;
 			case 'insert':
-				templateData.elementDisposables.add(this.instantiationService.createInstance(InsertCell, this.notebookEditor, element, templateData));
-				return;
-			case 'modified':
-				templateData.elementDisposables.add(this.instantiationService.createInstance(ModifiedCell, this.notebookEditor, element, templateData));
+				templateData.elementDisposables.add(this.instantiationService.createInstance(InsertElement, this.notebookEditor, element, templateData));
 				return;
 			default:
 				break;
 		}
 	}
 
-	disposeTemplate(templateData: CellDiffRenderTemplate): void {
+	disposeTemplate(templateData: CellDiffSingleSideRenderTemplate): void {
 		templateData.container.innerText = '';
+		templateData.sourceEditor.dispose();
 	}
 
-	disposeElement(element: CellDiffViewModel, index: number, templateData: CellDiffRenderTemplate): void {
+	disposeElement(element: SingleSideDiffElementViewModel, index: number, templateData: CellDiffSingleSideRenderTemplate): void {
 		templateData.elementDisposables.clear();
 	}
 }
 
 
-export class NotebookTextDiffList extends WorkbenchList<CellDiffViewModel> implements IDisposable, IStyleController {
+export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffElementViewModel, CellDiffSideBySideRenderTemplate> {
+	static readonly TEMPLATE_ID = 'cell_diff_side_by_side';
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IContextMenuService protected readonly contextMenuService: IContextMenuService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+		@INotificationService protected readonly notificationService: INotificationService,
+	) { }
+
+	get templateId() {
+		return CellDiffSideBySideRenderer.TEMPLATE_ID;
+	}
+
+	renderTemplate(container: HTMLElement): CellDiffSideBySideRenderTemplate {
+		const body = DOM.$('.cell-body');
+		DOM.append(container, body);
+		const diffEditorContainer = DOM.$('.cell-diff-editor-container');
+		DOM.append(body, diffEditorContainer);
+
+		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
+		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
+
+		const inputToolbarContainer = DOM.append(sourceContainer, DOM.$('.editor-input-toolbar-container'));
+		const cellToolbarContainer = DOM.append(inputToolbarContainer, DOM.$('div.property-toolbar'));
+		const toolbar = new ToolBar(cellToolbarContainer, this.contextMenuService, {
+			actionViewItemProvider: action => {
+				if (action instanceof MenuItemAction) {
+					const item = new CodiconActionViewItem(action, this.keybindingService, this.notificationService);
+					return item;
+				}
+
+				return undefined;
+			}
+		});
+
+		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
+		const metadataInfoContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-info-container'));
+
+		const outputHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.output-header-container'));
+		const outputInfoContainer = DOM.append(diffEditorContainer, DOM.$('.output-info-container'));
+
+		const borderContainer = DOM.append(body, DOM.$('.border-container'));
+		const leftBorder = DOM.append(borderContainer, DOM.$('.left-border'));
+		const rightBorder = DOM.append(borderContainer, DOM.$('.right-border'));
+		const topBorder = DOM.append(borderContainer, DOM.$('.top-border'));
+		const bottomBorder = DOM.append(borderContainer, DOM.$('.bottom-border'));
+
+
+		return {
+			body,
+			container,
+			diffEditorContainer,
+			sourceEditor: editor,
+			editorContainer,
+			inputToolbarContainer,
+			toolbar,
+			metadataHeaderContainer,
+			metadataInfoContainer,
+			outputHeaderContainer,
+			outputInfoContainer,
+			leftBorder,
+			rightBorder,
+			topBorder,
+			bottomBorder,
+			elementDisposables: new DisposableStore()
+		};
+	}
+
+	private _buildSourceEditor(sourceContainer: HTMLElement) {
+		const editorContainer = DOM.append(sourceContainer, DOM.$('.editor-container'));
+
+		const editor = this.instantiationService.createInstance(DiffEditorWidget, editorContainer, {
+			...fixedDiffEditorOptions,
+			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
+			originalEditable: false,
+			ignoreTrimWhitespace: false,
+			automaticLayout: false,
+			dimension: {
+				height: 0,
+				width: 0
+			}
+		}, {
+			originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
+			modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
+		});
+
+		return {
+			editor,
+			editorContainer
+		};
+	}
+
+	renderElement(element: SideBySideDiffElementViewModel, index: number, templateData: CellDiffSideBySideRenderTemplate, height: number | undefined): void {
+		templateData.body.classList.remove('left', 'right', 'full');
+
+		switch (element.type) {
+			case 'unchanged':
+				templateData.elementDisposables.add(this.instantiationService.createInstance(ModifiedElement, this.notebookEditor, element, templateData));
+				return;
+			case 'modified':
+				templateData.elementDisposables.add(this.instantiationService.createInstance(ModifiedElement, this.notebookEditor, element, templateData));
+				return;
+			default:
+				break;
+		}
+	}
+
+	disposeTemplate(templateData: CellDiffSideBySideRenderTemplate): void {
+		templateData.container.innerText = '';
+		templateData.sourceEditor.dispose();
+		templateData.toolbar?.dispose();
+	}
+
+	disposeElement(element: SideBySideDiffElementViewModel, index: number, templateData: CellDiffSideBySideRenderTemplate): void {
+		templateData.elementDisposables.clear();
+	}
+}
+
+export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase> implements IDisposable, IStyleController {
 	private styleElement?: HTMLStyleElement;
 
+	get rowsContainer(): HTMLElement {
+		return this.view.containerDomNode;
+	}
+
 	constructor(
 		listUser: string,
 		container: HTMLElement,
-		delegate: IListVirtualDelegate<CellDiffViewModel>,
-		renderers: IListRenderer<CellDiffViewModel, CellDiffRenderTemplate>[],
+		delegate: IListVirtualDelegate<DiffElementViewModelBase>,
+		renderers: IListRenderer<DiffElementViewModelBase, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate>[],
 		contextKeyService: IContextKeyService,
-		options: IWorkbenchListOptions<CellDiffViewModel>,
+		options: IWorkbenchListOptions<DiffElementViewModelBase>,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -107,6 +295,32 @@ export class NotebookTextDiffList extends WorkbenchList<CellDiffViewModel> imple
 		super(listUser, container, delegate, renderers, options, contextKeyService, listService, themeService, configurationService, keybindingService);
 	}
 
+	getAbsoluteTopOfElement(element: DiffElementViewModelBase): number {
+		const index = this.indexOf(element);
+		// if (index === undefined || index < 0 || index >= this.length) {
+		// 	this._getViewIndexUpperBound(element);
+		// 	throw new ListError(this.listUser, `Invalid index ${index}`);
+		// }
+
+		return this.view.elementTop(index);
+	}
+
+	triggerScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) {
+		this.view.triggerScrollFromMouseWheelEvent(browserEvent);
+	}
+
+	clear() {
+		super.splice(0, this.length);
+	}
+
+
+	updateElementHeight2(element: DiffElementViewModelBase, size: number) {
+		const viewIndex = this.indexOf(element);
+		const focused = this.getFocus();
+
+		this.view.updateElementHeight(viewIndex, size, focused.length ? focused[0] : null);
+	}
+
 	style(styles: IListStyles) {
 		const selectorSuffix = this.view.domId;
 		if (!this.styleElement) {
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
index c2b2830c4..09cb20b09 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
@@ -184,11 +184,15 @@
 .monaco-workbench .notebookOverlay .output .multi-mimetype-output {
 	position: absolute;
 	top: 4px;
-	left: -26px;
+	left: -30px;
 	width: 16px;
 	height: 16px;
 	cursor: pointer;
-	padding: 4px;
+	padding: 6px;
+}
+
+.monaco-workbench .notebookOverlay .output pre {
+	margin: 4px 0;
 }
 
 .monaco-workbench .notebookOverlay .output .error_message {
@@ -248,15 +252,17 @@
 }
 
 .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-collapsed-part {
+	position: relative;
 	box-sizing: border-box;
 }
 
 .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-collapsed-part .codicon {
-	margin-top: 4px;
-	position: relative;
-	left: -23px;
+	position: absolute;
+	padding: 2px 6px;
+	left: -30px;
+	bottom: 0;
 	cursor: pointer;
-	z-index: 27; /* Over drag handle */
+	z-index: 29; /* Over drag handle and bottom cell toolbar */
 }
 
 .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.collapsed .notebook-folding-indicator,
@@ -475,6 +481,10 @@
 	text-align: center;
 }
 
+.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .output-collapsed .execution-count-label {
+	bottom: 24px;
+}
+
 .monaco-workbench .notebookOverlay .cell .cell-editor-part {
 	position: relative;
 }
@@ -585,7 +595,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	z-index: 25; /* over the focus outline on the editor, below the title toolbar */
+	z-index: 28; /* over the focus outline on the editor, below the title toolbar */
 	width: 100%;
 	opacity: 0;
 	transition: opacity 0.2s ease-in-out;
@@ -598,8 +608,9 @@
 
 .monaco-workbench .notebookOverlay .cell-list-top-cell-toolbar-container:focus-within,
 .monaco-workbench .notebookOverlay .cell-list-top-cell-toolbar-container:hover,
-.monaco-workbench .notebookOverlay.notebook-editor-editable > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-bottom-toolbar-container:focus-within,
-.monaco-workbench .notebookOverlay.notebook-editor-editable > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-bottom-toolbar-container:hover {
+.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row:hover .cell-bottom-toolbar-container,
+.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list:focus-within > .monaco-scrollable-element > .monaco-list-rows:not(:hover) > .monaco-list-row.focused .cell-bottom-toolbar-container,
+.monaco-workbench .notebookOverlay.notebook-editor-editable > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-bottom-toolbar-container:focus-within {
 	opacity: 1;
 }
 
@@ -863,3 +874,18 @@
 .cell-contributed-items.cell-contributed-items-left {
 	margin-left: 4px;
 }
+
+.monaco-workbench .notebookOverlay .output-plaintext::-webkit-scrollbar {
+	width: 10px;               /* width of the entire scrollbar */
+	height: 10px;
+}
+
+.monaco-workbench .notebookOverlay .output-plaintext::-webkit-scrollbar-thumb {
+	height: 10px;
+	width: 10px;
+}
+
+.monaco-workbench .notebookOverlay .output .output-plaintext {
+	margin: 4px 0;
+	overflow-x: auto;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index b3e9c30f7..9289de4d4 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -31,12 +31,12 @@ import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/noteb
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { NotebookService } from 'vs/workbench/contrib/notebook/browser/notebookServiceImpl';
 import { CellKind, CellToolbarLocKey, CellUri, DisplayOrderKey, getCellUndoRedoComparisonKey, NotebookDocumentBackupData, NotebookEditorPriority, NotebookTextDiffEditorPreview, ShowCellStatusBarKey } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService, IOpenEditorOverride } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { CustomEditorsAssociations, customEditorsAssociationsSettingId } from 'vs/workbench/services/editor/common/editorOpenWith';
 import { CustomEditorInfo } from 'vs/workbench/contrib/customEditor/common/customEditor';
-import { INotebookEditor, NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { INotebookEditor, IN_NOTEBOOK_TEXT_DIFF_EDITOR, NotebookEditorOptions, NOTEBOOK_EDITOR_OPEN } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { INotebookEditorModelResolverService, NotebookModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
@@ -47,11 +47,15 @@ import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/comm
 import { NotebookEditorWorkerServiceImpl } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerServiceImpl';
 import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
 import { NotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/browser/notebookCellStatusBarServiceImpl';
+import { INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
+import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetServiceImpl';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { Event } from 'vs/base/common/event';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { getFormatedMetadataJSON } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 
 // Editor Contribution
 
@@ -59,7 +63,7 @@ import 'vs/workbench/contrib/notebook/browser/contrib/coreActions';
 import 'vs/workbench/contrib/notebook/browser/contrib/find/findController';
 import 'vs/workbench/contrib/notebook/browser/contrib/fold/folding';
 import 'vs/workbench/contrib/notebook/browser/contrib/format/formatting';
-import 'vs/workbench/contrib/notebook/browser/contrib/toc/tocProvider';
+import 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline';
 import 'vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider';
 import 'vs/workbench/contrib/notebook/browser/contrib/status/editorStatus';
 // import 'vs/workbench/contrib/notebook/browser/contrib/scm/scm';
@@ -204,17 +208,24 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 );
 
 export class NotebookContribution extends Disposable implements IWorkbenchContribution {
+	private _notebookEditorIsOpen: IContextKey<boolean>;
+	private _notebookDiffEditorIsOpen: IContextKey<boolean>;
 
 	constructor(
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService,
 		@INotebookService private readonly notebookService: INotebookService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IUndoRedoService undoRedoService: IUndoRedoService,
 	) {
 		super();
 
+		this._notebookEditorIsOpen = NOTEBOOK_EDITOR_OPEN.bindTo(this.contextKeyService);
+		this._notebookDiffEditorIsOpen = IN_NOTEBOOK_TEXT_DIFF_EDITOR.bindTo(this.contextKeyService);
+
 		this._register(undoRedoService.registerUriComparisonKeyComputer(CellUri.scheme, {
 			getComparisonKey: (uri: URI): string => {
 				return getCellUndoRedoComparisonKey(uri);
@@ -224,12 +235,28 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 		this._register(this.editorService.overrideOpenEditor({
 			getEditorOverrides: (resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined) => {
 
-				const currentEditorForResource = group?.editors.find(editor => isEqual(editor.resource, resource));
+				const currentEditorsForResource = group && this.editorService.findEditors(resource, group);
+				const currentEditorForResource = currentEditorsForResource && currentEditorsForResource.length ? currentEditorsForResource[0] : undefined;
 
 				const associatedEditors = distinct([
 					...this.getUserAssociatedNotebookEditors(resource),
 					...this.getContributedEditors(resource)
-				], editor => editor.id);
+				], editor => editor.id).sort((a, b) => {
+					// if a content provider is exclusive, it has higher order
+					if (a.exclusive && b.exclusive) {
+						return 0;
+					}
+
+					if (a.exclusive) {
+						return -1;
+					}
+
+					if (b.exclusive) {
+						return 1;
+					}
+
+					return 0;
+				});
 
 				return associatedEditors.map(info => {
 					return {
@@ -264,6 +291,19 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 				this.notebookService.updateActiveNotebookEditor(null);
 			}
 		}));
+
+		this.editorGroupService.whenRestored.then(() => this._updateContextKeys());
+		this._register(this.editorService.onDidActiveEditorChange(() => this._updateContextKeys()));
+		this._register(this.editorService.onDidVisibleEditorsChange(() => this._updateContextKeys()));
+
+		this._register(this.editorGroupService.onDidAddGroup(() => this._updateContextKeys()));
+		this._register(this.editorGroupService.onDidRemoveGroup(() => this._updateContextKeys()));
+	}
+
+	private _updateContextKeys() {
+		const activeEditorPane = this.editorService.activeEditorPane as { isNotebookEditor?: boolean } | undefined;
+		this._notebookEditorIsOpen.set(!!activeEditorPane?.isNotebookEditor);
+		this._notebookDiffEditorIsOpen.set(this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebookTextDiffEditor');
 	}
 
 	getUserAssociatedEditors(resource: URI) {
@@ -300,8 +340,70 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 			return undefined;
 		}
 
-		if (originalInput instanceof NotebookEditorInput) {
-			return undefined;
+		// Run reopen with ...
+		if (id) {
+			// from the editor tab context menu
+			if (originalInput instanceof NotebookEditorInput) {
+				if (originalInput.viewType === id) {
+					// reopen with the same type
+					return undefined;
+				} else {
+					return {
+						override: (async () => {
+							const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource, originalInput.getName(), id);
+							const originalEditorIndex = group.getIndexOfEditor(originalInput);
+
+							await group.closeEditor(originalInput);
+							originalInput.dispose();
+							const newEditor = await group.openEditor(notebookInput, { ...options, index: originalEditorIndex, override: false });
+							if (newEditor) {
+								return newEditor;
+							} else {
+								return undefined;
+							}
+						})()
+					};
+				}
+			} else {
+				// from the file explorer
+				const existingEditors = this.editorService.findEditors(originalInput.resource, group).filter(editor => editor instanceof NotebookEditorInput) as NotebookEditorInput[];
+
+				if (existingEditors.length) {
+					// there are notebook editors with the same resource
+
+					if (existingEditors.find(editor => editor.viewType === id)) {
+						return { override: this.editorService.openEditor(existingEditors.find(editor => editor.viewType === id)!, { ...options, override: false }, group) };
+					} else {
+						return {
+							override: (async () => {
+								const firstEditor = existingEditors[0]!;
+								const originalEditorIndex = group.getIndexOfEditor(firstEditor);
+
+								await group.closeEditor(firstEditor);
+								firstEditor.dispose();
+								const notebookInput = NotebookEditorInput.create(this.instantiationService, originalInput.resource!, originalInput.getName(), id);
+								const newEditor = await group.openEditor(notebookInput, { ...options, index: originalEditorIndex, override: false });
+
+								if (newEditor) {
+									return newEditor;
+								} else {
+									return undefined;
+								}
+							})()
+						};
+					}
+				}
+			}
+		}
+
+		// Click on the editor tab
+		if (id === undefined && originalInput instanceof NotebookEditorInput) {
+			const existingEditors = this.editorService.findEditors(originalInput.resource, group).filter(editor => editor instanceof NotebookEditorInput && editor === originalInput);
+
+			if (existingEditors.length) {
+				// same
+				return undefined;
+			}
 		}
 
 		if (originalInput instanceof NotebookDiffEditorInput) {
@@ -323,10 +425,8 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 		}
 
 		if (id === undefined) {
-			const existingEditors = group.editors.filter(editor =>
-				editor.resource
-				&& isEqual(editor.resource, notebookUri)
-				&& !(editor instanceof NotebookEditorInput)
+			const existingEditors = this.editorService.findEditors(notebookUri, group).filter(editor =>
+				!(editor instanceof NotebookEditorInput)
 				&& !(editor instanceof NotebookDiffEditorInput)
 			);
 
@@ -391,7 +491,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 			return undefined;
 		}
 
-		const existingEditors = group.editors.filter(editor => editor.resource && isEqual(editor.resource, notebookUri) && !(editor instanceof NotebookEditorInput));
+		const existingEditors = this.editorService.findEditors(notebookUri, group).filter(editor => !(editor instanceof NotebookEditorInput));
 
 		if (existingEditors.length) {
 			return undefined;
@@ -462,7 +562,7 @@ class CellContentProvider implements ITextModelContentProvider {
 					create: (defaultEOL) => {
 						const newEOL = (defaultEOL === DefaultEndOfLine.CRLF ? '\r\n' : '\n');
 						(cell.textBuffer as ITextBuffer).setEOL(newEOL);
-						return cell.textBuffer as ITextBuffer;
+						return { textBuffer: cell.textBuffer as ITextBuffer, disposable: Disposable.None };
 					},
 					getFirstLineText: (limit: number) => {
 						return cell.textBuffer.getLineContent(1).substr(0, limit);
@@ -489,6 +589,61 @@ class CellContentProvider implements ITextModelContentProvider {
 	}
 }
 
+class CellMetadataContentProvider implements ITextModelContentProvider {
+	private readonly _registration: IDisposable;
+
+	constructor(
+		@ITextModelService textModelService: ITextModelService,
+		@IModelService private readonly _modelService: IModelService,
+		@IModeService private readonly _modeService: IModeService,
+		@INotebookEditorModelResolverService private readonly _notebookModelResolverService: INotebookEditorModelResolverService,
+	) {
+		this._registration = textModelService.registerTextModelContentProvider(Schemas.vscodeNotebookCellMetadata, this);
+	}
+
+	dispose(): void {
+		this._registration.dispose();
+	}
+
+	async provideTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing) {
+			return existing;
+		}
+		const data = CellUri.parseCellMetadataUri(resource);
+		// const data = parseCellUri(resource);
+		if (!data) {
+			return null;
+		}
+
+		const ref = await this._notebookModelResolverService.resolve(data.notebook);
+		let result: ITextModel | null = null;
+
+		const mode = this._modeService.create('json');
+
+		for (const cell of ref.object.notebook.cells) {
+			if (cell.handle === data.handle) {
+				const metadataSource = getFormatedMetadataJSON(ref.object.notebook, cell.metadata || {}, cell.language);
+				result = this._modelService.createModel(
+					metadataSource,
+					mode,
+					resource
+				);
+				break;
+			}
+		}
+
+		if (result) {
+			const once = result.onWillDispose(() => {
+				once.dispose();
+				ref.dispose();
+			});
+		}
+
+		return result;
+	}
+}
+
 class RegisterSchemasContribution extends Disposable implements IWorkbenchContribution {
 	constructor() {
 		super();
@@ -596,6 +751,7 @@ class NotebookFileTracker implements IWorkbenchContribution {
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchContributionsRegistry.registerWorkbenchContribution(NotebookContribution, LifecyclePhase.Starting);
 workbenchContributionsRegistry.registerWorkbenchContribution(CellContentProvider, LifecyclePhase.Starting);
+workbenchContributionsRegistry.registerWorkbenchContribution(CellMetadataContentProvider, LifecyclePhase.Starting);
 workbenchContributionsRegistry.registerWorkbenchContribution(RegisterSchemasContribution, LifecyclePhase.Starting);
 workbenchContributionsRegistry.registerWorkbenchContribution(NotebookFileTracker, LifecyclePhase.Ready);
 
@@ -603,6 +759,7 @@ registerSingleton(INotebookService, NotebookService);
 registerSingleton(INotebookEditorWorkerService, NotebookEditorWorkerServiceImpl);
 registerSingleton(INotebookEditorModelResolverService, NotebookModelResolverService, true);
 registerSingleton(INotebookCellStatusBarService, NotebookCellStatusBarService, true);
+registerSingleton(INotebookEditorWidgetService, NotebookEditorWidgetService, true);
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 configurationRegistry.registerConfiguration({
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index 1633a9f7b..9f624090c 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -22,7 +22,7 @@ import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/outpu
 import { RunStateRenderer, TimerRenderer } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer';
 import { CellViewModel, IModelDecorationsChangeAccessor, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellKind, IProcessedOutput, IRenderOutput, NotebookCellMetadata, NotebookDocumentMetadata, IEditor, INotebookKernelInfo2, IInsetRenderOutput, ICellRange } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, IProcessedOutput, NotebookCellMetadata, NotebookDocumentMetadata, IEditor, INotebookKernelInfo2, ICellRange, IOrderedMimeType, ITransformedDisplayOutputDto, INotebookRendererInfo, IErrorOutput, IStreamOutput } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { IMenu } from 'vs/platform/actions/common/actions';
@@ -32,6 +32,7 @@ import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation';
 import { CellEditorStatusBar } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets';
 
+//#region Context Keys
 export const KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED = new RawContextKey<boolean>('notebookFindWidgetFocused', false);
 
 // Is Notebook
@@ -39,12 +40,16 @@ export const NOTEBOOK_IS_ACTIVE_EDITOR = ContextKeyExpr.equals('activeEditor', '
 
 // Editor keys
 export const NOTEBOOK_EDITOR_FOCUSED = new RawContextKey<boolean>('notebookEditorFocused', false);
+export const NOTEBOOK_EDITOR_OPEN = new RawContextKey<boolean>('notebookEditorOpen', false);
 export const NOTEBOOK_CELL_LIST_FOCUSED = new RawContextKey<boolean>('notebookCellListFocused', false);
 export const NOTEBOOK_OUTPUT_FOCUSED = new RawContextKey<boolean>('notebookOutputFocused', false);
 export const NOTEBOOK_EDITOR_EDITABLE = new RawContextKey<boolean>('notebookEditable', true);
 export const NOTEBOOK_EDITOR_RUNNABLE = new RawContextKey<boolean>('notebookRunnable', true);
 export const NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK = new RawContextKey<boolean>('notebookExecuting', false);
 
+// Diff Editor Keys
+export const IN_NOTEBOOK_TEXT_DIFF_EDITOR = new RawContextKey<boolean>('isInNotebookTextDiffEditor', false);
+
 // Cell keys
 export const NOTEBOOK_VIEW_TYPE = new RawContextKey<string>('notebookViewType', undefined);
 export const NOTEBOOK_CELL_TYPE = new RawContextKey<string>('notebookCellType', undefined); // code, markdown
@@ -57,14 +62,114 @@ export const NOTEBOOK_CELL_RUN_STATE = new RawContextKey<string>('notebookCellRu
 export const NOTEBOOK_CELL_HAS_OUTPUTS = new RawContextKey<boolean>('notebookCellHasOutputs', false); // bool
 export const NOTEBOOK_CELL_INPUT_COLLAPSED = new RawContextKey<boolean>('notebookCellInputIsCollapsed', false); // bool
 export const NOTEBOOK_CELL_OUTPUT_COLLAPSED = new RawContextKey<boolean>('notebookCellOutputIsCollapsed', false); // bool
+// Kernels
+export const NOTEBOOK_HAS_MULTIPLE_KERNELS = new RawContextKey<boolean>('notebookHasMultipleKernels', false);
 
-// Shared commands
+//#endregion
+
+//#region Shared commands
 export const EXPAND_CELL_CONTENT_COMMAND_ID = 'notebook.cell.expandCellContent';
 export const EXECUTE_CELL_COMMAND_ID = 'notebook.cell.execute';
 
-// Kernels
+//#endregion
 
-export const NOTEBOOK_HAS_MULTIPLE_KERNELS = new RawContextKey<boolean>('notebookHasMultipleKernels', false);
+//#region  Output related types
+export const enum RenderOutputType {
+	None,
+	Html,
+	Extension
+}
+
+export interface IRenderNoOutput {
+	type: RenderOutputType.None;
+	hasDynamicHeight: boolean;
+}
+
+export interface IRenderPlainHtmlOutput {
+	type: RenderOutputType.Html;
+	source: IDisplayOutputViewModel;
+	htmlContent: string;
+	hasDynamicHeight: boolean;
+}
+
+export interface IRenderOutputViaExtension {
+	type: RenderOutputType.Extension;
+	source: IDisplayOutputViewModel;
+	mimeType: string;
+	renderer: INotebookRendererInfo;
+}
+
+export type IInsetRenderOutput = IRenderPlainHtmlOutput | IRenderOutputViaExtension;
+export type IRenderOutput = IRenderNoOutput | IInsetRenderOutput;
+
+export const outputHasDynamicHeight = (o: IRenderOutput) => o.type !== RenderOutputType.Extension && o.hasDynamicHeight;
+
+
+export interface ICellOutputViewModel {
+	cellViewModel: IGenericCellViewModel;
+	model: IProcessedOutput;
+	isDisplayOutput(): this is IDisplayOutputViewModel;
+	isErrorOutput(): this is IErrorOutputViewModel;
+	isStreamOutput(): this is IStreamOutputViewModel;
+}
+
+export interface IDisplayOutputViewModel extends ICellOutputViewModel {
+	model: ITransformedDisplayOutputDto;
+	resolveMimeTypes(textModel: NotebookTextModel): [readonly IOrderedMimeType[], number];
+	pickedMimeType: number;
+}
+
+export interface IErrorOutputViewModel extends ICellOutputViewModel {
+	model: IErrorOutput;
+}
+
+export interface IStreamOutputViewModel extends ICellOutputViewModel {
+	model: IStreamOutput;
+}
+
+//#endregion
+
+//#region Shared types between the Notebook Editor and Notebook Diff Editor, they are mostly used for output rendering
+
+export interface IGenericCellViewModel {
+	id: string;
+	handle: number;
+	uri: URI;
+	metadata: NotebookCellMetadata | undefined;
+	outputIsHovered: boolean;
+	outputsViewModels: ICellOutputViewModel[];
+	getOutputOffset(index: number): number;
+	updateOutputHeight(index: number, height: number): void;
+}
+
+export interface IDisplayOutputLayoutUpdateRequest {
+	output: IDisplayOutputViewModel;
+	cellTop: number;
+	outputOffset: number;
+}
+
+export interface ICommonCellInfo {
+	cellId: string;
+	cellHandle: number;
+	cellUri: URI;
+}
+
+export interface INotebookCellOutputLayoutInfo {
+	width: number;
+	height: number;
+	fontInfo: BareFontInfo;
+}
+
+export interface ICommonNotebookEditor {
+	getCellOutputLayoutInfo(cell: IGenericCellViewModel): INotebookCellOutputLayoutInfo;
+	triggerScroll(event: IMouseWheelEvent): void;
+	getCellByInfo(cellInfo: ICommonCellInfo): IGenericCellViewModel;
+	focusNotebookCell(cell: IGenericCellViewModel, focus: 'editor' | 'container' | 'output'): void;
+	focusNextNotebookCell(cell: IGenericCellViewModel, focus: 'editor' | 'container' | 'output'): void;
+	updateOutputHeight(cellInfo: ICommonCellInfo, output: IDisplayOutputViewModel, height: number, isInit: boolean): void;
+}
+
+//#endregion
 
 export interface NotebookLayoutInfo {
 	width: number;
@@ -122,7 +227,7 @@ export interface MarkdownCellLayoutChangeEvent {
 	totalHeight?: number;
 }
 
-export interface ICellViewModel {
+export interface ICellViewModel extends IGenericCellViewModel {
 	readonly model: NotebookCellTextModel;
 	readonly id: string;
 	readonly textBuffer: IReadonlyTextBuffer;
@@ -133,6 +238,7 @@ export interface ICellViewModel {
 	cellKind: CellKind;
 	editState: CellEditState;
 	focusMode: CellFocusMode;
+	outputIsHovered: boolean;
 	getText(): string;
 	getTextLength(): number;
 	metadata: NotebookCellMetadata | undefined;
@@ -212,7 +318,7 @@ export interface IActiveNotebookEditor extends INotebookEditor {
 	uri: URI;
 }
 
-export interface INotebookEditor extends IEditor {
+export interface INotebookEditor extends IEditor, ICommonNotebookEditor {
 	isEmbedded: boolean;
 
 	cursorNavigationMode: boolean;
@@ -323,6 +429,8 @@ export interface INotebookEditor extends IEditor {
 	 */
 	focusNotebookCell(cell: ICellViewModel, focus: 'editor' | 'container' | 'output'): void;
 
+	focusNextNotebookCell(cell: ICellViewModel, focus: 'editor' | 'container' | 'output'): void;
+
 	/**
 	 * Execute the given notebook cell
 	 */
@@ -361,12 +469,12 @@ export interface INotebookEditor extends IEditor {
 	/**
 	 * Remove the output from the webview layer
 	 */
-	removeInset(output: IProcessedOutput): void;
+	removeInset(output: IDisplayOutputViewModel): void;
 
 	/**
 	 * Hide the inset in the webview layer without removing it
 	 */
-	hideInset(output: IProcessedOutput): void;
+	hideInset(output: IDisplayOutputViewModel): void;
 
 	/**
 	 * Send message to the webview for outputs.
@@ -395,11 +503,21 @@ export interface INotebookEditor extends IEditor {
 	 */
 	triggerScroll(event: IMouseWheelEvent): void;
 
+	/**
+	 * The range will be revealed with as little scrolling as possible.
+	 */
+	revealCellRangeInView(range: ICellRange): void;
+
 	/**
 	 * Reveal cell into viewport.
 	 */
 	revealInView(cell: ICellViewModel): void;
 
+	/**
+	 * Reveal cell into the top of viewport.
+	 */
+	revealInViewAtTop(cell: ICellViewModel): void;
+
 	/**
 	 * Reveal cell into viewport center.
 	 */
@@ -476,6 +594,9 @@ export interface INotebookEditor extends IEditor {
 	 * @return The contribution or null if contribution not found.
 	 */
 	getContribution<T extends INotebookEditorContribution>(id: string): T;
+
+	getCellByInfo(cellInfo: ICommonCellInfo): ICellViewModel;
+	updateOutputHeight(cellInfo: ICommonCellInfo, output: IDisplayOutputViewModel, height: number, isInit: boolean): void;
 }
 
 export interface INotebookCellList {
@@ -494,8 +615,8 @@ export interface INotebookCellList {
 	scrollLeft: number;
 	length: number;
 	rowsContainer: HTMLElement;
-	readonly onDidRemoveOutput: Event<IProcessedOutput>;
-	readonly onDidHideOutput: Event<IProcessedOutput>;
+	readonly onDidRemoveOutput: Event<ICellOutputViewModel>;
+	readonly onDidHideOutput: Event<ICellOutputViewModel>;
 	readonly onMouseUp: Event<IListMouseEvent<CellViewModel>>;
 	readonly onMouseDown: Event<IListMouseEvent<CellViewModel>>;
 	readonly onContextMenu: Event<IListContextMenuEvent<CellViewModel>>;
@@ -506,7 +627,9 @@ export interface INotebookCellList {
 	focusElement(element: ICellViewModel): void;
 	selectElement(element: ICellViewModel): void;
 	getFocusedElements(): ICellViewModel[];
+	revealElementsInView(range: ICellRange): void;
 	revealElementInView(element: ICellViewModel): void;
+	revealElementInViewAtTop(element: ICellViewModel): void;
 	revealElementInCenterIfOutsideViewport(element: ICellViewModel): void;
 	revealElementInCenter(element: ICellViewModel): void;
 	revealElementInCenterIfOutsideViewportAsync(element: ICellViewModel): Promise<void>;
@@ -594,7 +717,7 @@ export interface IOutputTransformContribution {
 	 * This call is allowed to have side effects, such as placing output
 	 * directly into the container element.
 	 */
-	render(output: IProcessedOutput, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI | undefined): IRenderOutput;
+	render(output: ICellOutputViewModel, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI | undefined): IRenderOutput;
 }
 
 export interface CellFindMatch {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index d0e140358..1025ccaf6 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -20,13 +20,13 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { EditorOptions, IEditorInput, IEditorMemento, IEditorOpenContext } from 'vs/workbench/common/editor';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
 import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { IBorrowValue, INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
 import { INotebookEditorViewState, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { IEditorDropService } from 'vs/workbench/services/editor/browser/editorDropService';
 import { IEditorGroup, IEditorGroupsService, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { IBorrowValue, INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
 
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
 
@@ -64,14 +64,7 @@ export class NotebookEditor extends EditorPane {
 		this._editorMemento = this.getEditorMemento<INotebookEditorViewState>(_editorGroupService, NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 	}
 
-	set viewModel(newModel: NotebookViewModel | undefined) {
-		if (this._widget.value) {
-			this._widget.value.viewModel = newModel;
-			this._onDidChangeModel.fire();
-		}
-	}
-
-	get viewModel() {
+	get viewModel(): NotebookViewModel | undefined {
 		return this._widget.value?.viewModel;
 	}
 
@@ -134,17 +127,18 @@ export class NotebookEditor extends EditorPane {
 		this._widget.value?.focus();
 	}
 
+	hasFocus(): boolean {
+		const activeElement = document.activeElement;
+		const value = this._widget.value;
+
+		return !!value && (DOM.isAncestor(activeElement, value.getDomNode() || DOM.isAncestor(activeElement, value.getOverflowContainerDomNode())));
+	}
+
 	async setInput(input: NotebookEditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 
 		const group = this.group!;
 
 		this._saveEditorViewState(this.input);
-		await super.setInput(input, options, context, token);
-
-		// Check for cancellation
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
 
 		this._widgetDisposableStore.clear();
 
@@ -155,11 +149,16 @@ export class NotebookEditor extends EditorPane {
 		}
 
 		this._widget = this.instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, group, input);
+		this._widgetDisposableStore.add(this._widget.value!.onDidChangeModel(() => this._onDidChangeModel.fire()));
 
 		if (this._dimension) {
 			this._widget.value!.layout(this._dimension, this._rootElement);
 		}
 
+		// only now `setInput` and yield/await. this is AFTER the actual widget is ready. This is very important
+		// so that others synchronously receive a notebook editor with the correct widget being set
+		await super.setInput(input, options, context, token);
+
 		const model = await input.resolve();
 		// Check for cancellation
 		if (token.isCancellationRequested) {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index b58b545fe..90204097c 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomLevel } from 'vs/base/browser/browser';
+import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
 import * as DOM from 'vs/base/browser/dom';
 import * as strings from 'vs/base/common/strings';
 import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -40,9 +40,8 @@ import { EditorMemento } from 'vs/workbench/browser/parts/editor/editorPane';
 import { IEditorMemento } from 'vs/workbench/common/editor';
 import { Memento, MementoObject } from 'vs/workbench/common/memento';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
-import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugToolBar';
-import { BOTTOM_CELL_TOOLBAR_GAP, BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_BOTTOM_MARGIN, CELL_MARGIN, CELL_RUN_GUTTER, CELL_TOP_MARGIN, CODE_CELL_LEFT_MARGIN, COLLAPSED_INDICATOR_HEIGHT, SCROLLABLE_ELEMENT_PADDING_TOP } from 'vs/workbench/contrib/notebook/browser/constants';
-import { CellEditState, CellFocusMode, IActiveNotebookEditor, ICellViewModel, INotebookCellList, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorMouseEvent, NotebookEditorOptions, NotebookLayoutInfo, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_HAS_MULTIPLE_KERNELS, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { BOTTOM_CELL_TOOLBAR_GAP, BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_BOTTOM_MARGIN, CELL_MARGIN, CELL_OUTPUT_PADDING, CELL_RUN_GUTTER, CELL_TOP_MARGIN, CODE_CELL_LEFT_MARGIN, COLLAPSED_INDICATOR_HEIGHT, SCROLLABLE_ELEMENT_PADDING_TOP } from 'vs/workbench/contrib/notebook/browser/constants';
+import { CellEditState, CellFocusMode, IActiveNotebookEditor, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IGenericCellViewModel, IInsetRenderOutput, INotebookCellList, INotebookCellOutputLayoutInfo, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, INotebookEditorContributionDescription, INotebookEditorCreationOptions, INotebookEditorMouseEvent, NotebookEditorOptions, NotebookLayoutInfo, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_HAS_MULTIPLE_KERNELS, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditorExtensionsRegistry } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { NotebookKernelProviderAssociation, NotebookKernelProviderAssociations, notebookKernelProviderAssociationsSettingId } from 'vs/workbench/contrib/notebook/browser/notebookKernelAssociation';
 import { NotebookCellList } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
@@ -55,13 +54,16 @@ import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewMod
 import { NotebookEventDispatcher, NotebookLayoutChangedEvent } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
 import { CellViewModel, IModelDecorationsChangeAccessor, INotebookEditorViewState, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, CellToolbarLocKey, ICellRange, IInsetRenderOutput, INotebookDecorationRenderOptions, INotebookKernelInfo2, IProcessedOutput, isTransformedDisplayOutput, NotebookCellRunState, NotebookRunState, ShowCellStatusBarKey } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellToolbarLocKey, ICellRange, INotebookDecorationRenderOptions, INotebookKernelInfo2, NotebookCellRunState, NotebookRunState, ShowCellStatusBarKey } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookProvider';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { editorGutterModifiedBackground } from 'vs/workbench/contrib/scm/browser/dirtydiffDecorator';
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { configureKernelIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { configureKernelIcon, errorStateIcon, successStateIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { debugIconStartForeground } from 'vs/workbench/contrib/debug/browser/debugColors';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { extname } from 'vs/base/common/resources';
 
 const $ = DOM.$;
 
@@ -73,9 +75,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	private _overlayContainer!: HTMLElement;
 	private _body!: HTMLElement;
 	private _overflowContainer!: HTMLElement;
-	private _webview: BackLayerWebView | null = null;
+	private _webview: BackLayerWebView<ICommonCellInfo> | null = null;
 	private _webviewResolved: boolean = false;
-	private _webviewResolvePromise: Promise<BackLayerWebView | null> | null = null;
+	private _webviewResolvePromise: Promise<BackLayerWebView<ICommonCellInfo> | null> | null = null;
 	private _webviewTransparentCover: HTMLElement | null = null;
 	private _list!: INotebookCellList;
 	private _dndController: CellDragAndDropController | null = null;
@@ -146,6 +148,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		return this._notebookViewModel?.notebookDocument;
 	}
 
+	private _activeKernelExecuted: boolean = false;
 	private _activeKernel: INotebookKernelInfo2 | undefined = undefined;
 	private readonly _onDidChangeKernel = this._register(new Emitter<void>());
 	readonly onDidChangeKernel: Event<void> = this._onDidChangeKernel.event;
@@ -153,6 +156,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	readonly onDidChangeAvailableKernels: Event<void> = this._onDidChangeAvailableKernels.event;
 
 	private _contributedKernelsComputePromise: CancelablePromise<INotebookKernelInfo2[]> | null = null;
+	private _initialKernelComputationDone: boolean = false;
 
 	get activeKernel() {
 		return this._activeKernel;
@@ -175,9 +179,12 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._activeKernelResolvePromise = undefined;
 
 		const memento = this._activeKernelMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		memento[this.viewModel.viewType] = this._activeKernel?.id;
+		memento[this.viewModel.viewType] = this._activeKernel?.friendlyId;
 		this._activeKernelMemento.saveMemento();
 		this._onDidChangeKernel.fire();
+		if (this._activeKernel) {
+			this._loadKernelPreloads(this._activeKernel.extensionLocation, this._activeKernel);
+		}
 	}
 
 	private _activeKernelResolvePromise: Promise<void> | undefined = undefined;
@@ -248,7 +255,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IMenuService private readonly menuService: IMenuService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IThemeService private readonly themeService: IThemeService
+		@IThemeService private readonly themeService: IThemeService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super();
 		this.isEmbedded = creationOptions.isEmbedded || false;
@@ -428,7 +436,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	private _generateFontInfo(): void {
 		const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
-		this._fontInfo = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel());
+		this._fontInfo = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel(), getPixelRatio());
 	}
 
 	private _createBody(parent: HTMLElement): void {
@@ -653,6 +661,24 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		if (this.viewModel === undefined || !this.viewModel.equal(textModel)) {
 			this._detachModel();
 			await this._attachModel(textModel, viewState);
+
+			type WorkbenchNotebookOpenClassification = {
+				scheme: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
+				ext: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
+				viewType: { classification: 'SystemMetaData', purpose: 'FeatureInsight'; };
+			};
+
+			type WorkbenchNotebookOpenEvent = {
+				scheme: string;
+				ext: string;
+				viewType: string;
+			};
+
+			this.telemetryService.publicLog2<WorkbenchNotebookOpenEvent, WorkbenchNotebookOpenClassification>('notebook/editorOpened', {
+				scheme: textModel.uri.scheme,
+				ext: extname(textModel.uri),
+				viewType: textModel.viewType
+			});
 		} else {
 			this.restoreListViewState(viewState);
 		}
@@ -730,6 +756,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._webview?.element.remove();
 		this._webview = null;
 		this._list.clear();
+		this._activeKernel = undefined;
+		this._activeKernelExecuted = false;
 	}
 
 	async beginComputeContributedKernels() {
@@ -742,6 +770,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		});
 
 		const result = await this._contributedKernelsComputePromise;
+		this._initialKernelComputationDone = true;
 		this._contributedKernelsComputePromise = null;
 
 		return result;
@@ -752,6 +781,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			return;
 		}
 
+		if (this._activeKernel !== undefined && this._activeKernelExecuted) {
+			// kernel already executed, we should not change it automatically
+			return;
+		}
+
 		const provider = this.notebookService.getContributedNotebookProvider(this.viewModel.viewType) || this.notebookService.getContributedNotebookProviders(this.viewModel.uri)[0];
 		const availableKernels = await this.beginComputeContributedKernels();
 
@@ -771,7 +805,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			this.multipleKernelsAvailable = false;
 		}
 
-		const activeKernelStillExist = [...availableKernels].find(kernel => kernel.id === this.activeKernel?.id && this.activeKernel?.id !== undefined);
+		const activeKernelStillExist = [...availableKernels].find(kernel => kernel.friendlyId === this.activeKernel?.friendlyId && this.activeKernel?.friendlyId !== undefined);
 
 		if (activeKernelStillExist) {
 			// the kernel still exist, we don't want to modify the selection otherwise user's temporary preference is lost
@@ -782,6 +816,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			return this._setKernelsFromProviders(provider, availableKernels, tokenSource);
 		}
 
+		this._initialKernelComputationDone = true;
+
 		tokenSource.dispose();
 	}
 
@@ -797,7 +833,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				const cachedKernelId = memento[provider.id];
 				this.activeKernel =
 					filteredKernels.find(kernel => kernel.isPreferred)
-					|| filteredKernels.find(kernel => kernel.id === cachedKernelId)
+					|| filteredKernels.find(kernel => kernel.friendlyId === cachedKernelId)
 					|| filteredKernels[0];
 			} else {
 				this.activeKernel = undefined;
@@ -818,7 +854,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				}
 			}
 
-			memento[provider.id] = this._activeKernel?.id;
+			memento[provider.id] = this._activeKernel?.friendlyId;
 			this._activeKernelMemento.saveMemento();
 
 			tokenSource.dispose();
@@ -831,7 +867,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 			const cachedKernelId = memento[provider.id];
 
 			const preferedKernel = kernelsFromSameExtension.find(kernel => kernel.isPreferred)
-				|| kernelsFromSameExtension.find(kernel => kernel.id === cachedKernelId)
+				|| kernelsFromSameExtension.find(kernel => kernel.friendlyId === cachedKernelId)
 				|| kernelsFromSameExtension[0];
 			this.activeKernel = preferedKernel;
 			if (this.activeKernel) {
@@ -848,7 +884,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				return;
 			}
 
-			memento[provider.id] = this._activeKernel?.id;
+			memento[provider.id] = this._activeKernel?.friendlyId;
 			this._activeKernelMemento.saveMemento();
 			tokenSource.dispose();
 			return;
@@ -892,7 +928,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._notebookExecuting?.set(notebookMetadata.runState === NotebookRunState.Running);
 	}
 
-	private async _resolveWebview(): Promise<BackLayerWebView | null> {
+	private async _resolveWebview(): Promise<BackLayerWebView<ICommonCellInfo> | null> {
 		if (!this.textModel) {
 			return null;
 		}
@@ -902,7 +938,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}
 
 		if (!this._webview) {
-			this._webview = this.instantiationService.createInstance(BackLayerWebView, this, this.getId(), this.textModel!.uri);
+			this._webview = this.instantiationService.createInstance(BackLayerWebView, this, this.getId(), this.textModel!.uri, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: CELL_OUTPUT_PADDING });
+			this._webview.element.style.width = `calc(100% - ${CODE_CELL_LEFT_MARGIN + (CELL_MARGIN * 2) + CELL_RUN_GUTTER}px)`;
+			this._webview.element.style.margin = `0px 0 0px ${CODE_CELL_LEFT_MARGIN + CELL_RUN_GUTTER}px`;
+
 			// attach the webview container to the DOM tree first
 			this._list.rowsContainer.insertAdjacentElement('afterbegin', this._webview.element);
 		}
@@ -950,7 +989,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	}
 
 	private async _createWebview(id: string, resource: URI): Promise<void> {
-		this._webview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource);
+		this._webview = this.instantiationService.createInstance(BackLayerWebView, this, id, resource, { outputNodePadding: CELL_OUTPUT_PADDING, outputNodeLeftPadding: CELL_OUTPUT_PADDING });
+		this._webview.element.style.width = `calc(100% - ${CODE_CELL_LEFT_MARGIN + (CELL_MARGIN * 2) + CELL_RUN_GUTTER}px)`;
+		this._webview.element.style.margin = `0px 0 0px ${CODE_CELL_LEFT_MARGIN + CELL_RUN_GUTTER}px`;
 		// attach the webview container to the DOM tree first
 		this._list.rowsContainer.insertAdjacentElement('afterbegin', this._webview.element);
 	}
@@ -1016,27 +1057,36 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 				this._webview!.element.style.height = `${scrollHeight}px`;
 
 				if (this._webview?.insetMapping) {
-					const updateItems: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[] = [];
-					const removedItems: IProcessedOutput[] = [];
+					const updateItems: IDisplayOutputLayoutUpdateRequest[] = [];
+					const removedItems: IDisplayOutputViewModel[] = [];
 					this._webview?.insetMapping.forEach((value, key) => {
-						const cell = value.cell;
+						const cell = this.viewModel?.getCellByHandle(value.cellInfo.cellHandle);
+						if (!cell || !(cell instanceof CodeCellViewModel)) {
+							return;
+						}
+
+						this.viewModel?.viewCells.find(cell => cell.handle === value.cellInfo.cellHandle);
 						const viewIndex = this._list.getViewIndex(cell);
 
 						if (viewIndex === undefined) {
 							return;
 						}
 
-						if (cell.outputs.indexOf(key) < 0) {
+						if (cell.outputsViewModels.indexOf(key) < 0) {
 							// output is already gone
 							removedItems.push(key);
 						}
 
 						const cellTop = this._list.getAbsoluteTopOfElement(cell);
 						if (this._webview!.shouldUpdateInset(cell, key, cellTop)) {
+							const outputIndex = cell.outputsViewModels.indexOf(key);
+
+							const outputOffset = cellTop + cell.getOutputOffset(outputIndex);
+
 							updateItems.push({
-								cell: cell,
 								output: key,
-								cellTop: cellTop
+								cellTop: cellTop,
+								outputOffset
 							});
 						}
 					});
@@ -1212,10 +1262,18 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		// this.viewModel!.selectionHandles = [cell.handle];
 	}
 
+	revealCellRangeInView(range: ICellRange) {
+		return this._list.revealElementsInView(range);
+	}
+
 	revealInView(cell: ICellViewModel) {
 		this._list.revealElementInView(cell);
 	}
 
+	revealInViewAtTop(cell: ICellViewModel) {
+		this._list.revealElementInViewAtTop(cell);
+	}
+
 	revealInCenterIfOutsideViewport(cell: ICellViewModel) {
 		this._list.revealElementInCenterIfOutsideViewport(cell);
 	}
@@ -1421,6 +1479,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 					language = this.viewModel.resolvedLanguages[0] || 'plaintext';
 				}
 			}
+
+			if (this.viewModel.resolvedLanguages.indexOf(language) < 0) {
+				// the language no longer exists
+				language = this.viewModel.resolvedLanguages[0] || 'plaintext';
+			}
 		} else {
 			language = 'markdown';
 		}
@@ -1627,26 +1690,37 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	private async _ensureActiveKernel() {
 		if (this._activeKernel) {
-			if (this._activeKernelResolvePromise) {
-				await this._activeKernelResolvePromise;
-			}
-
 			return;
 		}
 
+		if (this._activeKernelResolvePromise) {
+			await this._activeKernelResolvePromise;
+
+			if (this._activeKernel) {
+				return;
+			}
+		}
+
+
+		if (!this._initialKernelComputationDone) {
+			await this._setKernels(new CancellationTokenSource());
+
+			if (this._activeKernel) {
+				return;
+			}
+		}
+
 		// pick active kernel
 
 		const picker = this.quickInputService.createQuickPick<(IQuickPickItem & { run(): void; kernelProviderId?: string })>();
 		picker.placeholder = nls.localize('notebook.runCell.selectKernel', "Select a notebook kernel to run this notebook");
 		picker.matchOnDetail = true;
-		picker.busy = true;
-		picker.show();
 
 		const tokenSource = new CancellationTokenSource();
 		const availableKernels = await this.beginComputeContributedKernels();
 		const picks: QuickPickInput<IQuickPickItem & { run(): void; kernelProviderId?: string; }>[] = availableKernels.map((a) => {
 			return {
-				id: a.id,
+				id: a.friendlyId,
 				label: a.label,
 				picked: false,
 				description:
@@ -1736,6 +1810,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}
 
 		await this._ensureActiveKernel();
+		this._activeKernelExecuted = true;
 		await this._activeKernel?.executeNotebookCell!(this.viewModel.uri, undefined);
 	}
 
@@ -1776,6 +1851,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}
 
 		await this._ensureActiveKernel();
+		this._activeKernelExecuted = true;
 		await this._activeKernel?.executeNotebookCell!(this.viewModel.uri, cell.handle);
 	}
 
@@ -1818,6 +1894,20 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		}
 	}
 
+	focusNextNotebookCell(cell: ICellViewModel, focusItem: 'editor' | 'container' | 'output') {
+		const idx = this.viewModel?.getCellIndex(cell);
+		if (typeof idx !== 'number') {
+			return;
+		}
+
+		const newCell = this.viewModel?.viewCells[idx + 1];
+		if (!newCell) {
+			return;
+		}
+
+		this.focusNotebookCell(newCell, focusItem);
+	}
+
 	//#endregion
 
 	//#region MISC
@@ -1842,12 +1932,24 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		};
 	}
 
+	getCellOutputLayoutInfo(cell: IGenericCellViewModel): INotebookCellOutputLayoutInfo {
+		if (!this._list) {
+			throw new Error('Editor is not initalized successfully');
+		}
+
+		return {
+			width: this._dimension!.width,
+			height: this._dimension!.height,
+			fontInfo: this._fontInfo!
+		};
+	}
+
 	triggerScroll(event: IMouseWheelEvent) {
 		this._list.triggerScrollFromMouseWheelEvent(event);
 	}
 
 	async createInset(cell: CodeCellViewModel, output: IInsetRenderOutput, offset: number): Promise<void> {
-		this._insetModifyQueueByOutputId.queue(output.source.outputId, async () => {
+		this._insetModifyQueueByOutputId.queue(output.source.model.outputId, async () => {
 			if (!this._webview) {
 				return;
 			}
@@ -1856,22 +1958,24 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 			if (!this._webview!.insetMapping.has(output.source)) {
 				const cellTop = this._list.getAbsoluteTopOfElement(cell);
-				await this._webview!.createInset(cell, output, cellTop, offset);
+				await this._webview!.createInset({ cellId: cell.id, cellHandle: cell.handle, cellUri: cell.uri }, output, cellTop, offset);
 			} else {
 				const cellTop = this._list.getAbsoluteTopOfElement(cell);
 				const scrollTop = this._list.scrollTop;
+				const outputIndex = cell.outputsViewModels.indexOf(output.source);
+				const outputOffset = cellTop + cell.getOutputOffset(outputIndex);
 
-				this._webview!.updateViewScrollTop(-scrollTop, true, [{ cell, output: output.source, cellTop }]);
+				this._webview!.updateViewScrollTop(-scrollTop, true, [{ output: output.source, cellTop, outputOffset }]);
 			}
 		});
 	}
 
-	removeInset(output: IProcessedOutput) {
-		if (!isTransformedDisplayOutput(output)) {
+	removeInset(output: ICellOutputViewModel) {
+		if (!output.isDisplayOutput()) {
 			return;
 		}
 
-		this._insetModifyQueueByOutputId.queue(output.outputId, async () => {
+		this._insetModifyQueueByOutputId.queue(output.model.outputId, async () => {
 			if (!this._webview || !this._webviewResolved) {
 				return;
 			}
@@ -1879,16 +1983,16 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		});
 	}
 
-	hideInset(output: IProcessedOutput) {
+	hideInset(output: ICellOutputViewModel) {
 		if (!this._webview || !this._webviewResolved) {
 			return;
 		}
 
-		if (!isTransformedDisplayOutput(output)) {
+		if (!output.isDisplayOutput()) {
 			return;
 		}
 
-		this._insetModifyQueueByOutputId.queue(output.outputId, async () => {
+		this._insetModifyQueueByOutputId.queue(output.model.outputId, async () => {
 			this._webview!.hideInset(output);
 		});
 	}
@@ -1921,6 +2025,20 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 		this._overlayContainer.classList.remove(className);
 	}
 
+	getCellByInfo(cellInfo: ICommonCellInfo): ICellViewModel {
+		const { cellHandle } = cellInfo;
+		return this.viewModel?.viewCells.find(vc => vc.handle === cellHandle) as CodeCellViewModel;
+	}
+
+	updateOutputHeight(cellInfo: ICommonCellInfo, output: IDisplayOutputViewModel, outputHeight: number, isInit: boolean): void {
+		const cell = this.viewModel?.viewCells.find(vc => vc.handle === cellInfo.cellHandle);
+		if (cell && cell instanceof CodeCellViewModel) {
+			const outputIndex = cell.outputsViewModels.indexOf(output);
+			cell.updateOutputHeight(outputIndex, outputHeight);
+			this.layoutNotebookCell(cell, cell.layoutInfo.totalHeight);
+		}
+	}
+
 
 	//#endregion
 
@@ -2022,7 +2140,7 @@ export const selectedCellBorder = registerColor('notebook.selectedCellBorder', {
 	dark: notebookCellBorder,
 	light: notebookCellBorder,
 	hc: contrastBorder
-}, nls.localize('notebook.selectedCellBorder', "The color of the cell's top and bottom border when the cell is selected but not focusd."));
+}, nls.localize('notebook.selectedCellBorder', "The color of the cell's top and bottom border when the cell is selected but not focused."));
 
 export const focusedCellBorder = registerColor('notebook.focusedCellBorder', {
 	dark: focusBorder,
@@ -2030,6 +2148,12 @@ export const focusedCellBorder = registerColor('notebook.focusedCellBorder', {
 	hc: focusBorder
 }, nls.localize('notebook.focusedCellBorder', "The color of the cell's top and bottom border when the cell is focused."));
 
+export const inactiveFocusedCellBorder = registerColor('notebook.inactiveFocusedCellBorder', {
+	dark: notebookCellBorder,
+	light: notebookCellBorder,
+	hc: notebookCellBorder
+}, nls.localize('notebook.inactiveFocusedCellBorder', "The color of the cell's top and bottom border when a cell is focused while the primary focus is outside of the editor."));
+
 export const cellStatusBarItemHover = registerColor('notebook.cellStatusBarItemHoverBackground', {
 	light: new Color(new RGBA(0, 0, 0, 0.08)),
 	dark: new Color(new RGBA(255, 255, 255, 0.15)),
@@ -2042,7 +2166,6 @@ export const cellInsertionIndicator = registerColor('notebook.cellInsertionIndic
 	hc: focusBorder
 }, nls.localize('notebook.cellInsertionIndicator', "The color of the notebook cell insertion indicator."));
 
-
 export const listScrollbarSliderBackground = registerColor('notebookScrollbarSlider.background', {
 	dark: scrollbarSliderBackground,
 	light: scrollbarSliderBackground,
@@ -2161,6 +2284,15 @@ registerThemingParticipant((theme, collector) => {
 				border-color: ${focusedCellBorderColor} !important;
 			}`);
 
+	const inactiveFocusedBorderColor = theme.getColor(inactiveFocusedCellBorder);
+	collector.addRule(`
+			.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-top:before,
+			.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before,
+			.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused .cell-inner-container:not(.cell-editor-focus):before,
+			.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused .cell-inner-container:not(.cell-editor-focus):after {
+				border-color: ${inactiveFocusedBorderColor} !important;
+			}`);
+
 	const selectedCellBorderColor = theme.getColor(selectedCellBorder);
 	collector.addRule(`
 			.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-editor-focus .cell-focus-indicator-top:before,
@@ -2191,12 +2323,12 @@ registerThemingParticipant((theme, collector) => {
 
 	const cellStatusSuccessIcon = theme.getColor(cellStatusIconSuccess);
 	if (cellStatusSuccessIcon) {
-		collector.addRule(`.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-run-status .codicon-notebook-state-success { color: ${cellStatusSuccessIcon} }`);
+		collector.addRule(`.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-run-status ${ThemeIcon.asCSSSelector(successStateIcon)} { color: ${cellStatusSuccessIcon} }`);
 	}
 
 	const cellStatusErrorIcon = theme.getColor(cellStatusIconError);
 	if (cellStatusErrorIcon) {
-		collector.addRule(`.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-run-status .codicon-notebook-state-error { color: ${cellStatusErrorIcon} }`);
+		collector.addRule(`.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-run-status ${ThemeIcon.asCSSSelector(errorStateIcon)} { color: ${cellStatusErrorIcon} }`);
 	}
 
 	const cellStatusRunningIcon = theme.getColor(cellStatusIconRunning);
@@ -2219,12 +2351,14 @@ registerThemingParticipant((theme, collector) => {
 	if (scrollbarSliderBackgroundColor) {
 		collector.addRule(` .notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider { background: ${editorBackgroundColor}; } `);
 		collector.addRule(` .notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider:before { content: ""; width: 100%; height: 100%; position: absolute; background: ${scrollbarSliderBackgroundColor}; } `); /* hack to not have cells see through scroller */
+		// collector.addRule(` .monaco-workbench .notebookOverlay .output-plaintext::-webkit-scrollbar-track { background: ${scrollbarSliderBackgroundColor}; } `);
 	}
 
 	const scrollbarSliderHoverBackgroundColor = theme.getColor(listScrollbarSliderHoverBackground);
 	if (scrollbarSliderHoverBackgroundColor) {
 		collector.addRule(` .notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider:hover { background: ${editorBackgroundColor}; } `);
 		collector.addRule(` .notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider:hover:before { content: ""; width: 100%; height: 100%; position: absolute; background: ${scrollbarSliderHoverBackgroundColor}; } `); /* hack to not have cells see through scroller */
+		collector.addRule(` .monaco-workbench .notebookOverlay .output-plaintext::-webkit-scrollbar-thumb { background: ${scrollbarSliderHoverBackgroundColor}; } `);
 	}
 
 	const scrollbarSliderActiveBackgroundColor = theme.getColor(listScrollbarSliderActiveBackground);
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts
index f9650ad09..ce817ad43 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetService.ts
@@ -3,14 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ResourceMap } from 'vs/base/common/map';
 import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IEditorGroupsService, IEditorGroup, GroupChangeKind, OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { IInstantiationService, createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 export const INotebookEditorWidgetService = createDecorator<INotebookEditorWidgetService>('INotebookEditorWidgetService');
 
@@ -20,139 +16,6 @@ export interface IBorrowValue<T> {
 
 export interface INotebookEditorWidgetService {
 	_serviceBrand: undefined;
+	widgets: NotebookEditorWidget[];
 	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput): IBorrowValue<NotebookEditorWidget>;
 }
-
-class NotebookEditorWidgetService implements INotebookEditorWidgetService {
-
-	readonly _serviceBrand: undefined;
-
-	private _tokenPool = 1;
-
-	private readonly _notebookWidgets = new Map<number, ResourceMap<{ widget: NotebookEditorWidget, token: number | undefined }>>();
-	private readonly _disposables = new DisposableStore();
-
-	constructor(
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService,
-	) {
-
-		const groupListener = new Map<number, IDisposable>();
-		const onNewGroup = (group: IEditorGroup) => {
-			const { id } = group;
-			const listener = group.onDidGroupChange(e => {
-				const widgets = this._notebookWidgets.get(group.id);
-				if (!widgets || e.kind !== GroupChangeKind.EDITOR_CLOSE || !(e.editor instanceof NotebookEditorInput)) {
-					return;
-				}
-				const value = widgets.get(e.editor.resource);
-				if (!value) {
-					return;
-				}
-				value.token = undefined;
-				this._disposeWidget(value.widget);
-				widgets.delete(e.editor.resource);
-			});
-			groupListener.set(id, listener);
-		};
-		this._disposables.add(editorGroupService.onDidAddGroup(onNewGroup));
-		editorGroupService.groups.forEach(onNewGroup);
-
-		// group removed -> clean up listeners, clean up widgets
-		this._disposables.add(editorGroupService.onDidRemoveGroup(group => {
-			const listener = groupListener.get(group.id);
-			if (listener) {
-				listener.dispose();
-				groupListener.delete(group.id);
-			}
-			const widgets = this._notebookWidgets.get(group.id);
-			this._notebookWidgets.delete(group.id);
-			if (widgets) {
-				for (const value of widgets.values()) {
-					value.token = undefined;
-					this._disposeWidget(value.widget);
-				}
-			}
-		}));
-
-		// HACK
-		// we use the open override to spy on tab movements because that's the only
-		// way to do that...
-		this._disposables.add(editorService.overrideOpenEditor({
-			open: (input, _options, group, context) => {
-				if (input instanceof NotebookEditorInput && context === OpenEditorContext.MOVE_EDITOR) {
-					// when moving a notebook editor we release it from its current tab and we
-					// "place" it into its future slot so that the editor can pick it up from there
-					this._freeWidget(input, editorGroupService.activeGroup, group);
-				}
-				return undefined;
-			}
-		}));
-	}
-
-	private _disposeWidget(widget: NotebookEditorWidget): void {
-		widget.onWillHide();
-		const domNode = widget.getDomNode();
-		widget.dispose();
-		domNode.remove();
-	}
-
-	private _freeWidget(input: NotebookEditorInput, source: IEditorGroup, target: IEditorGroup): void {
-		const targetWidget = this._notebookWidgets.get(target.id)?.get(input.resource);
-		if (targetWidget) {
-			// not needed
-			return;
-		}
-
-		const widget = this._notebookWidgets.get(source.id)?.get(input.resource);
-		if (!widget) {
-			throw new Error('no widget at source group');
-		}
-		this._notebookWidgets.get(source.id)?.delete(input.resource);
-		widget.token = undefined;
-
-		let targetMap = this._notebookWidgets.get(target.id);
-		if (!targetMap) {
-			targetMap = new ResourceMap();
-			this._notebookWidgets.set(target.id, targetMap);
-		}
-		targetMap.set(input.resource, widget);
-	}
-
-	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput): IBorrowValue<NotebookEditorWidget> {
-
-		let value = this._notebookWidgets.get(group.id)?.get(input.resource);
-
-		if (!value) {
-			// NEW widget
-			const instantiationService = accessor.get(IInstantiationService);
-			const widget = instantiationService.createInstance(NotebookEditorWidget, { isEmbedded: false });
-			const token = this._tokenPool++;
-			value = { widget, token };
-
-			let map = this._notebookWidgets.get(group.id);
-			if (!map) {
-				map = new ResourceMap();
-				this._notebookWidgets.set(group.id, map);
-			}
-			map.set(input.resource, value);
-
-		} else {
-			// reuse a widget which was either free'ed before or which
-			// is simply being reused...
-			value.token = this._tokenPool++;
-		}
-
-		return this._createBorrowValue(value.token!, value);
-	}
-
-	private _createBorrowValue(myToken: number, widget: { widget: NotebookEditorWidget, token: number | undefined }): IBorrowValue<NotebookEditorWidget> {
-		return {
-			get value() {
-				return widget.token === myToken ? widget.widget : undefined;
-			}
-		};
-	}
-}
-
-registerSingleton(INotebookEditorWidgetService, NotebookEditorWidgetService, true);
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetServiceImpl.ts
new file mode 100644
index 000000000..f365cdfdf
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidgetServiceImpl.ts
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ResourceMap } from 'vs/base/common/map';
+import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { IEditorGroupsService, IEditorGroup, GroupChangeKind, OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/browser/notebookEditorInput';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IBorrowValue, INotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidgetService';
+
+export class NotebookEditorWidgetService implements INotebookEditorWidgetService {
+
+	readonly _serviceBrand: undefined;
+
+	private _tokenPool = 1;
+
+	private readonly _notebookWidgets = new Map<number, ResourceMap<{ widget: NotebookEditorWidget, token: number | undefined }>>();
+	private readonly _disposables = new DisposableStore();
+
+	get widgets() {
+		return [...this._notebookWidgets.values()].map(val => [...val.values()].map(widget => widget.widget)).reduce((prev, curr) => { return [...prev, ...curr]; }, []);
+	}
+
+	constructor(
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IEditorService editorService: IEditorService,
+	) {
+
+		const groupListener = new Map<number, IDisposable>();
+		const onNewGroup = (group: IEditorGroup) => {
+			const { id } = group;
+			const listener = group.onDidGroupChange(e => {
+				const widgets = this._notebookWidgets.get(group.id);
+				if (!widgets || e.kind !== GroupChangeKind.EDITOR_CLOSE || !(e.editor instanceof NotebookEditorInput)) {
+					return;
+				}
+				const value = widgets.get(e.editor.resource);
+				if (!value) {
+					return;
+				}
+				value.token = undefined;
+				this._disposeWidget(value.widget);
+				widgets.delete(e.editor.resource);
+			});
+			groupListener.set(id, listener);
+		};
+		this._disposables.add(editorGroupService.onDidAddGroup(onNewGroup));
+		editorGroupService.groups.forEach(onNewGroup);
+
+		// group removed -> clean up listeners, clean up widgets
+		this._disposables.add(editorGroupService.onDidRemoveGroup(group => {
+			const listener = groupListener.get(group.id);
+			if (listener) {
+				listener.dispose();
+				groupListener.delete(group.id);
+			}
+			const widgets = this._notebookWidgets.get(group.id);
+			this._notebookWidgets.delete(group.id);
+			if (widgets) {
+				for (const value of widgets.values()) {
+					value.token = undefined;
+					this._disposeWidget(value.widget);
+				}
+			}
+		}));
+
+		// HACK
+		// we use the open override to spy on tab movements because that's the only
+		// way to do that...
+		this._disposables.add(editorService.overrideOpenEditor({
+			open: (input, _options, group, context) => {
+				if (input instanceof NotebookEditorInput && context === OpenEditorContext.MOVE_EDITOR) {
+					// when moving a notebook editor we release it from its current tab and we
+					// "place" it into its future slot so that the editor can pick it up from there
+					this._freeWidget(input, editorGroupService.activeGroup, group);
+				}
+				return undefined;
+			}
+		}));
+	}
+
+	private _disposeWidget(widget: NotebookEditorWidget): void {
+		widget.onWillHide();
+		const domNode = widget.getDomNode();
+		widget.dispose();
+		domNode.remove();
+	}
+
+	private _freeWidget(input: NotebookEditorInput, source: IEditorGroup, target: IEditorGroup): void {
+		const targetWidget = this._notebookWidgets.get(target.id)?.get(input.resource);
+		if (targetWidget) {
+			// not needed
+			return;
+		}
+
+		const widget = this._notebookWidgets.get(source.id)?.get(input.resource);
+		if (!widget) {
+			throw new Error('no widget at source group');
+		}
+		this._notebookWidgets.get(source.id)?.delete(input.resource);
+		widget.token = undefined;
+
+		let targetMap = this._notebookWidgets.get(target.id);
+		if (!targetMap) {
+			targetMap = new ResourceMap();
+			this._notebookWidgets.set(target.id, targetMap);
+		}
+		targetMap.set(input.resource, widget);
+	}
+
+	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput): IBorrowValue<NotebookEditorWidget> {
+
+		let value = this._notebookWidgets.get(group.id)?.get(input.resource);
+
+		if (!value) {
+			// NEW widget
+			const instantiationService = accessor.get(IInstantiationService);
+			const widget = instantiationService.createInstance(NotebookEditorWidget, { isEmbedded: false });
+			const token = this._tokenPool++;
+			value = { widget, token };
+
+			let map = this._notebookWidgets.get(group.id);
+			if (!map) {
+				map = new ResourceMap();
+				this._notebookWidgets.set(group.id, map);
+			}
+			map.set(input.resource, value);
+
+		} else {
+			// reuse a widget which was either free'ed before or which
+			// is simply being reused...
+			value.token = this._tokenPool++;
+		}
+
+		return this._createBorrowValue(value.token!, value);
+	}
+
+	private _createBorrowValue(myToken: number, widget: { widget: NotebookEditorWidget, token: number | undefined }): IBorrowValue<NotebookEditorWidget> {
+		return {
+			get value() {
+				return widget.token === myToken ? widget.widget : undefined;
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
index 6780f1fa9..0ff8cae8f 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
@@ -29,4 +29,5 @@ export const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronR
 export const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, localize('expandedIcon', 'Icon to annotated a expanded section in notebook editors.'));
 export const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, localize('openAsTextIcon', 'Icon to open the notebook in a text editor.'));
 export const revertIcon = registerIcon('notebook-revert', Codicon.discard, localize('revertIcon', 'Icon to revert in notebook editors.'));
+export const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, localize('renderOutputIcon', 'Icon to render output in diff editor.'));
 export const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, localize('mimetypeIcon', 'Icon for a mime type in notebook editors.'));
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
index abf2220cc..e97746c12 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
@@ -5,9 +5,9 @@
 
 import { CellOutputKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { BrandedService, IConstructorSignature1 } from 'vs/platform/instantiation/common/instantiation';
-import { INotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICommonNotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
-export type IOutputTransformCtor = IConstructorSignature1<INotebookEditor, IOutputTransformContribution>;
+export type IOutputTransformCtor = IConstructorSignature1<ICommonNotebookEditor, IOutputTransformContribution>;
 
 export interface IOutputTransformDescription {
 	id: string;
@@ -20,7 +20,7 @@ export const NotebookRegistry = new class NotebookRegistryImpl {
 
 	readonly outputTransforms: IOutputTransformDescription[] = [];
 
-	registerOutputTransform<Services extends BrandedService[]>(id: string, kind: CellOutputKind, ctor: { new(editor: INotebookEditor, ...services: Services): IOutputTransformContribution }): void {
+	registerOutputTransform<Services extends BrandedService[]>(id: string, kind: CellOutputKind, ctor: { new(editor: ICommonNotebookEditor, ...services: Services): IOutputTransformContribution }): void {
 		this.outputTransforms.push({ id: id, kind: kind, ctor: ctor as IOutputTransformCtor });
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
index ec00de561..6209a04e5 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomLevel } from 'vs/base/browser/browser';
+import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
 import { flatten } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -65,6 +65,10 @@ export class NotebookKernelProviderInfoStore extends Disposable {
 		return this._notebookKernelProviders.filter(provider => notebookDocumentFilterMatch(provider.selector, viewType, resource));
 	}
 
+	getContributedKernelProviders() {
+		return [...this._notebookKernelProviders.values()];
+	}
+
 	private _updateProviderExtensionsInfo() {
 		NotebookKernelProviderAssociationRegistry.extensionIds.length = 0;
 		NotebookKernelProviderAssociationRegistry.extensionDescriptions.length = 0;
@@ -237,7 +241,7 @@ class ModelData implements IDisposable {
 }
 export class NotebookService extends Disposable implements INotebookService, ICustomEditorViewTypesHandler {
 	declare readonly _serviceBrand: undefined;
-	private readonly _notebookProviders = new Map<string, { controller: IMainNotebookController, extensionData: NotebookExtensionDescription }>();
+	private readonly _notebookProviders = new Map<string, { controller: IMainNotebookController, extensionData: NotebookExtensionDescription; }>();
 	notebookProviderInfoStore: NotebookProviderInfoStore;
 	notebookRenderersInfoStore: NotebookOutputRendererInfoStore = new NotebookOutputRendererInfoStore();
 	notebookKernelProviderInfoStore: NotebookKernelProviderInfoStore = new NotebookKernelProviderInfoStore();
@@ -266,12 +270,12 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 
 	private readonly _onDidChangeKernels = new Emitter<URI | undefined>();
 	onDidChangeKernels: Event<URI | undefined> = this._onDidChangeKernels.event;
-	private readonly _onDidChangeNotebookActiveKernel = new Emitter<{ uri: URI, providerHandle: number | undefined, kernelId: string | undefined }>();
-	onDidChangeNotebookActiveKernel: Event<{ uri: URI, providerHandle: number | undefined, kernelId: string | undefined }> = this._onDidChangeNotebookActiveKernel.event;
+	private readonly _onDidChangeNotebookActiveKernel = new Emitter<{ uri: URI, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }>();
+	onDidChangeNotebookActiveKernel: Event<{ uri: URI, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }> = this._onDidChangeNotebookActiveKernel.event;
 	private cutItems: NotebookCellTextModel[] | undefined;
 	private _lastClipboardIsCopy: boolean = true;
 
-	private _displayOrder: { userOrder: string[], defaultOrder: string[] } = Object.create(null);
+	private _displayOrder: { userOrder: string[], defaultOrder: string[]; } = Object.create(null);
 	private readonly _decorationOptionProviders = new Map<string, INotebookDecorationRenderOptions>();
 
 	constructor(
@@ -366,7 +370,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 							// there is a `::before` or `::after` text decoration whose position is above or below current line
 							// we at least make sure that the editor top padding is at least one line
 							const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
-							updateEditorTopPadding(BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel()).lineHeight + 2);
+							updateEditorTopPadding(BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel(), getPixelRatio()).lineHeight + 2);
 							decorationTriggeredAdjustment = true;
 							break;
 						}
@@ -387,7 +391,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 			};
 		};
 
-		const PRIORITY = 50;
+		const PRIORITY = 105;
 		this._register(UndoCommand.addImplementation(PRIORITY, () => {
 			const { editor } = getContext();
 			if (editor?.viewModel) {
@@ -623,6 +627,8 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 	}
 
 	async canResolve(viewType: string): Promise<boolean> {
+		await this._extensionService.activateByEvent(`onNotebook:*`);
+
 		if (!this._notebookProviders.has(viewType)) {
 			await this._extensionService.whenInstalledExtensionsRegistered();
 			// this awaits full activation of all matching extensions
@@ -691,9 +697,10 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 			const data = await provider.provideKernels(resource, token);
 			result[index] = data.map(dto => {
 				return {
+					id: dto.id,
 					extension: dto.extension,
 					extensionLocation: URI.revive(dto.extensionLocation),
-					id: dto.id,
+					friendlyId: dto.friendlyId,
 					label: dto.label,
 					description: dto.description,
 					detail: dto.detail,
@@ -701,13 +708,13 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 					preloads: dto.preloads,
 					providerHandle: dto.providerHandle,
 					resolve: async (uri: URI, editorId: string, token: CancellationToken) => {
-						return provider.resolveKernel(editorId, uri, dto.id, token);
+						return provider.resolveKernel(editorId, uri, dto.friendlyId, token);
 					},
 					executeNotebookCell: async (uri: URI, handle: number | undefined) => {
-						return provider.executeNotebook(uri, dto.id, handle);
+						return provider.executeNotebook(uri, dto.friendlyId, handle);
 					},
 					cancelNotebookCell: (uri: URI, handle: number | undefined): Promise<void> => {
-						return provider.cancelNotebook(uri, dto.id, handle);
+						return provider.cancelNotebook(uri, dto.friendlyId, handle);
 					}
 				};
 			});
@@ -718,6 +725,11 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 		return flatten(result);
 	}
 
+	async getContributedNotebookKernelProviders(): Promise<INotebookKernelProvider[]> {
+		const kernelProviders = this.notebookKernelProviderInfoStore.getContributedKernelProviders();
+		return kernelProviders;
+	}
+
 	getRendererInfo(id: string): INotebookRendererInfo | undefined {
 		return this.notebookRenderersInfoStore.get(id);
 	}
@@ -890,7 +902,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 
 	listVisibleNotebookEditors(): INotebookEditor[] {
 		return this._editorService.visibleEditorPanes
-			.filter(pane => (pane as unknown as { isNotebookEditor?: boolean }).isNotebookEditor)
+			.filter(pane => (pane as unknown as { isNotebookEditor?: boolean; }).isNotebookEditor)
 			.map(pane => pane.getControl() as INotebookEditor)
 			.filter(editor => !!editor)
 			.filter(editor => this._notebookEditors.has(editor.getId()));
@@ -912,7 +924,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 				this._onDidChangeNotebookActiveKernel.fire({
 					uri: editor.uri!,
 					providerHandle: editor.activeKernel?.providerHandle,
-					kernelId: editor.activeKernel?.id
+					kernelFriendlyId: editor.activeKernel?.friendlyId
 				});
 			}));
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index d6d8ed7c0..8d0c6a542 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -19,9 +19,9 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IListService, IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { CellRevealPosition, CellRevealType, CursorAtBoundary, getVisibleCells, ICellViewModel, INotebookCellList, reduceCellRanges, CellEditState, CellFocusMode, BaseCellRenderTemplate, NOTEBOOK_CELL_LIST_FOCUSED, cellRangesEqual } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellRevealPosition, CellRevealType, CursorAtBoundary, getVisibleCells, ICellViewModel, INotebookCellList, reduceCellRanges, CellEditState, CellFocusMode, BaseCellRenderTemplate, NOTEBOOK_CELL_LIST_FOCUSED, cellRangesEqual, ICellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
-import { diff, IProcessedOutput, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind, ICellRange, NOTEBOOK_EDITOR_CURSOR_BEGIN_END } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { diff, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind, ICellRange, NOTEBOOK_EDITOR_CURSOR_BEGIN_END } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { clamp } from 'vs/base/common/numbers';
 import { SCROLLABLE_ELEMENT_PADDING_TOP } from 'vs/workbench/contrib/notebook/browser/constants';
 
@@ -45,10 +45,10 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 	private _viewModelStore = new DisposableStore();
 	private styleElement?: HTMLStyleElement;
 
-	private readonly _onDidRemoveOutput = new Emitter<IProcessedOutput>();
-	readonly onDidRemoveOutput: Event<IProcessedOutput> = this._onDidRemoveOutput.event;
-	private readonly _onDidHideOutput = new Emitter<IProcessedOutput>();
-	readonly onDidHideOutput: Event<IProcessedOutput> = this._onDidHideOutput.event;
+	private readonly _onDidRemoveOutput = new Emitter<ICellOutputViewModel>();
+	readonly onDidRemoveOutput: Event<ICellOutputViewModel> = this._onDidRemoveOutput.event;
+	private readonly _onDidHideOutput = new Emitter<ICellOutputViewModel>();
+	readonly onDidHideOutput: Event<ICellOutputViewModel> = this._onDidHideOutput.event;
 
 	private _viewModel: NotebookViewModel | null = null;
 	private _hiddenRangeIds: string[] = [];
@@ -314,15 +314,17 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			if (e.synchronous) {
 				viewDiffs.reverse().forEach((diff) => {
 					// remove output in the webview
-					const hideOutputs: IProcessedOutput[] = [];
-					const deletedOutputs: IProcessedOutput[] = [];
+					const hideOutputs: ICellOutputViewModel[] = [];
+					const deletedOutputs: ICellOutputViewModel[] = [];
 
 					for (let i = diff.start; i < diff.start + diff.deleteCount; i++) {
 						const cell = this.element(i);
-						if (this._viewModel!.hasCell(cell.handle)) {
-							hideOutputs.push(...cell?.model.outputs);
-						} else {
-							deletedOutputs.push(...cell?.model.outputs);
+						if (cell.cellKind === CellKind.Code) {
+							if (this._viewModel!.hasCell(cell.handle)) {
+								hideOutputs.push(...cell?.outputsViewModels);
+							} else {
+								deletedOutputs.push(...cell?.outputsViewModels);
+							}
 						}
 					}
 
@@ -338,15 +340,17 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 					}
 
 					viewDiffs.reverse().forEach((diff) => {
-						const hideOutputs: IProcessedOutput[] = [];
-						const deletedOutputs: IProcessedOutput[] = [];
+						const hideOutputs: ICellOutputViewModel[] = [];
+						const deletedOutputs: ICellOutputViewModel[] = [];
 
 						for (let i = diff.start; i < diff.start + diff.deleteCount; i++) {
 							const cell = this.element(i);
-							if (this._viewModel!.hasCell(cell.handle)) {
-								hideOutputs.push(...cell?.model.outputs);
-							} else {
-								deletedOutputs.push(...cell?.model.outputs);
+							if (cell.cellKind === CellKind.Code) {
+								if (this._viewModel!.hasCell(cell.handle)) {
+									hideOutputs.push(...cell?.outputsViewModels);
+								} else {
+									deletedOutputs.push(...cell?.outputsViewModels);
+								}
 							}
 						}
 
@@ -460,15 +464,17 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		viewDiffs.reverse().forEach((diff) => {
 			// remove output in the webview
-			const hideOutputs: IProcessedOutput[] = [];
-			const deletedOutputs: IProcessedOutput[] = [];
+			const hideOutputs: ICellOutputViewModel[] = [];
+			const deletedOutputs: ICellOutputViewModel[] = [];
 
 			for (let i = diff.start; i < diff.start + diff.deleteCount; i++) {
 				const cell = this.element(i);
-				if (this._viewModel!.hasCell(cell.handle)) {
-					hideOutputs.push(...cell?.model.outputs);
-				} else {
-					deletedOutputs.push(...cell?.model.outputs);
+				if (cell.cellKind === CellKind.Code) {
+					if (this._viewModel!.hasCell(cell.handle)) {
+						hideOutputs.push(...cell?.outputsViewModels);
+					} else {
+						deletedOutputs.push(...cell?.outputsViewModels);
+					}
 				}
 			}
 
@@ -541,6 +547,22 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		return viewIndexInfo.index;
 	}
 
+	private _getViewIndexUpperBound2(modelIndex: number) {
+		if (!this.hiddenRangesPrefixSum) {
+			return modelIndex;
+		}
+
+		const viewIndexInfo = this.hiddenRangesPrefixSum.getIndexOf(modelIndex);
+
+		if (viewIndexInfo.remainder !== 0) {
+			if (modelIndex >= this.hiddenRangesPrefixSum.getTotalValue()) {
+				return modelIndex - (this.hiddenRangesPrefixSum.getTotalValue() - this.hiddenRangesPrefixSum.getCount());
+			}
+		}
+
+		return viewIndexInfo.index;
+	}
+
 	focusElement(cell: ICellViewModel) {
 		const index = this._getViewIndexUpperBound(cell);
 
@@ -581,6 +603,46 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		super.setFocus(indexes, browserEvent);
 	}
 
+	revealElementsInView(range: ICellRange) {
+		const startIndex = this._getViewIndexUpperBound2(range.start);
+
+		if (startIndex < 0) {
+			return;
+		}
+
+		const endIndex = this._getViewIndexUpperBound2(range.end);
+
+		const scrollTop = this.getViewScrollTop();
+		const wrapperBottom = this.getViewScrollBottom();
+		const elementTop = this.view.elementTop(startIndex);
+		if (elementTop >= scrollTop
+			&& elementTop < wrapperBottom) {
+			// start element is visible
+			// check end
+
+			const endElementTop = this.view.elementTop(endIndex);
+			const endElementHeight = this.view.elementHeight(endIndex);
+
+			if (endElementTop >= wrapperBottom) {
+				return this._revealInternal(startIndex, false, CellRevealPosition.Top);
+			}
+
+			if (endElementTop < wrapperBottom) {
+				// end element partially visible
+				if (endElementTop + endElementHeight - wrapperBottom < elementTop - scrollTop) {
+					// there is enough space to just scroll up a little bit to make the end element visible
+					return this.view.setScrollTop(scrollTop + endElementTop + endElementHeight - wrapperBottom);
+				} else {
+					// don't even try it
+					return this._revealInternal(startIndex, false, CellRevealPosition.Top);
+				}
+			}
+		}
+
+
+		this._revealInView(startIndex);
+	}
+
 	revealElementInView(cell: ICellViewModel) {
 		const index = this._getViewIndexUpperBound(cell);
 
@@ -589,6 +651,14 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		}
 	}
 
+	revealElementInViewAtTop(cell: ICellViewModel) {
+		const index = this._getViewIndexUpperBound(cell);
+
+		if (index >= 0) {
+			this._revealInternal(index, false, CellRevealPosition.Top);
+		}
+	}
+
 	revealElementInCenterIfOutsideViewport(cell: ICellViewModel) {
 		const index = this._getViewIndexUpperBound(cell);
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts
index 41a457e3d..39da33ff4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/output/outputRenderer.ts
@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IProcessedOutput, IRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookRegistry } from 'vs/workbench/contrib/notebook/browser/notebookRegistry';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { INotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICellOutputViewModel, ICommonNotebookEditor, IOutputTransformContribution, IRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { URI } from 'vs/base/common/uri';
 
 export class OutputRenderer {
@@ -15,7 +14,7 @@ export class OutputRenderer {
 	protected readonly _mimeTypeMapping: { [key: number]: IOutputTransformContribution; };
 
 	constructor(
-		notebookEditor: INotebookEditor,
+		notebookEditor: ICommonNotebookEditor,
 		private readonly instantiationService: IInstantiationService
 	) {
 		this._contributions = {};
@@ -34,7 +33,8 @@ export class OutputRenderer {
 		}
 	}
 
-	renderNoop(output: IProcessedOutput, container: HTMLElement): IRenderOutput {
+	renderNoop(viewModel: ICellOutputViewModel, container: HTMLElement): IRenderOutput {
+		const output = viewModel.model;
 		const contentNode = document.createElement('p');
 
 		contentNode.innerText = `No renderer could be found for output. It has the following output type: ${output.outputKind}`;
@@ -42,13 +42,14 @@ export class OutputRenderer {
 		return { type: RenderOutputType.None, hasDynamicHeight: false };
 	}
 
-	render(output: IProcessedOutput, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI | undefined): IRenderOutput {
+	render(viewModel: ICellOutputViewModel, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI | undefined): IRenderOutput {
+		const output = viewModel.model;
 		const transform = this._mimeTypeMapping[output.outputKind];
 
 		if (transform) {
-			return transform.render(output, container, preferredMimeType, notebookUri);
+			return transform.render(viewModel, container, preferredMimeType, notebookUri);
 		} else {
-			return this.renderNoop(output, container);
+			return this.renderNoop(viewModel, container);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts
index 10a4839b4..8a0e7216d 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/errorTransform.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRenderOutput, CellOutputKind, IErrorOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellOutputKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookRegistry } from 'vs/workbench/contrib/notebook/browser/notebookRegistry';
 import { RGBA, Color } from 'vs/base/common/color';
 import { ansiColorIdentifiers } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { INotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICommonNotebookEditor, IErrorOutputViewModel, IOutputTransformContribution, IRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
 class ErrorTransform implements IOutputTransformContribution {
 	constructor(
-		public editor: INotebookEditor,
+		public editor: ICommonNotebookEditor,
 		@IThemeService private readonly themeService: IThemeService
 	) {
 	}
 
-	render(output: IErrorOutput, container: HTMLElement): IRenderOutput {
+	render(viewModel: IErrorOutputViewModel, container: HTMLElement): IRenderOutput {
+		const output = viewModel.model;
 		const header = document.createElement('div');
 		const headerMessage = output.ename && output.evalue
 			? `${output.ename}: ${output.evalue}`
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts
index b2cec3995..420f309b4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/richTransform.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRenderOutput, CellOutputKind, ITransformedDisplayOutputDto, RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellOutputKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookRegistry } from 'vs/workbench/contrib/notebook/browser/notebookRegistry';
 import * as DOM from 'vs/base/browser/dom';
-import { INotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICommonNotebookEditor, IDisplayOutputViewModel, IOutputTransformContribution, IRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { isArray } from 'vs/base/common/types';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -22,10 +22,10 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 class RichRenderer implements IOutputTransformContribution {
-	private _richMimeTypeRenderers = new Map<string, (output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement) => IRenderOutput>();
+	private _richMimeTypeRenderers = new Map<string, (output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement) => IRenderOutput>();
 
 	constructor(
-		public notebookEditor: INotebookEditor,
+		public notebookEditor: ICommonNotebookEditor,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IModelService private readonly modelService: IModelService,
 		@IModeService private readonly modeService: IModeService,
@@ -44,8 +44,8 @@ class RichRenderer implements IOutputTransformContribution {
 		this._richMimeTypeRenderers.set('text/x-javascript', this.renderCode.bind(this));
 	}
 
-	render(output: ITransformedDisplayOutputDto, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI): IRenderOutput {
-		if (!output.data) {
+	render(output: IDisplayOutputViewModel, container: HTMLElement, preferredMimeType: string | undefined, notebookUri: URI): IRenderOutput {
+		if (!output.model.data) {
 			const contentNode = document.createElement('p');
 			contentNode.innerText = `No data could be found for output.`;
 			container.appendChild(contentNode);
@@ -55,7 +55,7 @@ class RichRenderer implements IOutputTransformContribution {
 		if (!preferredMimeType || !this._richMimeTypeRenderers.has(preferredMimeType)) {
 			const contentNode = document.createElement('p');
 			const mimeTypes = [];
-			for (const property in output.data) {
+			for (const property in output.model.data) {
 				mimeTypes.push(property);
 			}
 
@@ -75,8 +75,8 @@ class RichRenderer implements IOutputTransformContribution {
 		return renderer!(output, notebookUri, container);
 	}
 
-	renderJSON(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['application/json'];
+	renderJSON(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['application/json'];
 		const str = JSON.stringify(data, null, '\t');
 
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, container, {
@@ -94,8 +94,8 @@ class RichRenderer implements IOutputTransformContribution {
 		const textModel = this.modelService.createModel(str, mode, resource, false);
 		editor.setModel(textModel);
 
-		const width = this.notebookEditor.getLayoutInfo().width;
-		const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
+		const width = this.notebookEditor.getCellOutputLayoutInfo(output.cellViewModel).width;
+		const fontInfo = this.notebookEditor.getCellOutputLayoutInfo(output.cellViewModel).fontInfo;
 		const height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18);
 
 		editor.layout({
@@ -108,8 +108,8 @@ class RichRenderer implements IOutputTransformContribution {
 		return { type: RenderOutputType.None, hasDynamicHeight: true };
 	}
 
-	renderCode(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['text/x-javascript'];
+	renderCode(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['text/x-javascript'];
 		const str = (isArray(data) ? data.join('') : data) as string;
 
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, container, {
@@ -127,8 +127,8 @@ class RichRenderer implements IOutputTransformContribution {
 		const textModel = this.modelService.createModel(str, mode, resource, false);
 		editor.setModel(textModel);
 
-		const width = this.notebookEditor.getLayoutInfo().width;
-		const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
+		const width = this.notebookEditor.getCellOutputLayoutInfo(output.cellViewModel).width;
+		const fontInfo = this.notebookEditor.getCellOutputLayoutInfo(output.cellViewModel).fontInfo;
 		const height = Math.min(textModel.getLineCount(), 16) * (fontInfo.lineHeight || 18);
 
 		editor.layout({
@@ -141,8 +141,8 @@ class RichRenderer implements IOutputTransformContribution {
 		return { type: RenderOutputType.None, hasDynamicHeight: true };
 	}
 
-	renderJavaScript(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['application/javascript'];
+	renderJavaScript(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['application/javascript'];
 		const str = isArray(data) ? data.join('') : data;
 		const scriptVal = `<script type="application/javascript">${str}</script>`;
 		return {
@@ -153,8 +153,8 @@ class RichRenderer implements IOutputTransformContribution {
 		};
 	}
 
-	renderHTML(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['text/html'];
+	renderHTML(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['text/html'];
 		const str = (isArray(data) ? data.join('') : data) as string;
 		return {
 			type: RenderOutputType.Html,
@@ -164,8 +164,8 @@ class RichRenderer implements IOutputTransformContribution {
 		};
 	}
 
-	renderSVG(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['image/svg+xml'];
+	renderSVG(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['image/svg+xml'];
 		const str = (isArray(data) ? data.join('') : data) as string;
 		return {
 			type: RenderOutputType.Html,
@@ -175,8 +175,8 @@ class RichRenderer implements IOutputTransformContribution {
 		};
 	}
 
-	renderMarkdown(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['text/markdown'];
+	renderMarkdown(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['text/markdown'];
 		const str = (isArray(data) ? data.join('') : data) as string;
 		const mdOutput = document.createElement('div');
 		const mdRenderer = this.instantiationService.createInstance(MarkdownRenderer, { baseUrl: dirname(notebookUri) });
@@ -186,9 +186,9 @@ class RichRenderer implements IOutputTransformContribution {
 		return { type: RenderOutputType.None, hasDynamicHeight: true };
 	}
 
-	renderPNG(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
+	renderPNG(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
 		const image = document.createElement('img');
-		image.src = `data:image/png;base64,${output.data['image/png']}`;
+		image.src = `data:image/png;base64,${output.model.data['image/png']}`;
 		const display = document.createElement('div');
 		display.classList.add('display');
 		display.appendChild(image);
@@ -196,9 +196,9 @@ class RichRenderer implements IOutputTransformContribution {
 		return { type: RenderOutputType.None, hasDynamicHeight: true };
 	}
 
-	renderJPEG(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
+	renderJPEG(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
 		const image = document.createElement('img');
-		image.src = `data:image/jpeg;base64,${output.data['image/jpeg']}`;
+		image.src = `data:image/jpeg;base64,${output.model.data['image/jpeg']}`;
 		const display = document.createElement('div');
 		display.classList.add('display');
 		display.appendChild(image);
@@ -206,8 +206,8 @@ class RichRenderer implements IOutputTransformContribution {
 		return { type: RenderOutputType.None, hasDynamicHeight: true };
 	}
 
-	renderPlainText(output: ITransformedDisplayOutputDto, notebookUri: URI, container: HTMLElement): IRenderOutput {
-		const data = output.data['text/plain'];
+	renderPlainText(output: IDisplayOutputViewModel, notebookUri: URI, container: HTMLElement): IRenderOutput {
+		const data = output.model.data['text/plain'];
 		const contentNode = DOM.$('.output-plaintext');
 		truncatedArrayOfString(contentNode, isArray(data) ? data : [data], this.openerService, this.textFileService, this.themeService, true);
 		container.appendChild(contentNode);
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/streamTransform.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/streamTransform.ts
index b05a25d3b..5f6f9b773 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/streamTransform.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/streamTransform.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
-import { IRenderOutput, CellOutputKind, IStreamOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellOutputKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookRegistry } from 'vs/workbench/contrib/notebook/browser/notebookRegistry';
-import { INotebookEditor, IOutputTransformContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICommonNotebookEditor, IOutputTransformContribution, IRenderOutput, IStreamOutputViewModel, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { truncatedArrayOfString } from 'vs/workbench/contrib/notebook/browser/view/output/transforms/textHelper';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -14,14 +14,15 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 class StreamRenderer implements IOutputTransformContribution {
 	constructor(
-		editor: INotebookEditor,
+		editor: ICommonNotebookEditor,
 		@IOpenerService readonly openerService: IOpenerService,
 		@ITextFileService readonly textFileService: ITextFileService,
 		@IThemeService readonly themeService: IThemeService
 	) {
 	}
 
-	render(output: IStreamOutput, container: HTMLElement): IRenderOutput {
+	render(viewModel: IStreamOutputViewModel, container: HTMLElement): IRenderOutput {
+		const output = viewModel.model;
 		const contentNode = DOM.$('.output-stream');
 		truncatedArrayOfString(contentNode, [output.text], this.openerService, this.textFileService, this.themeService, false);
 		container.appendChild(contentNode);
diff --git a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/textHelper.ts b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/textHelper.ts
index 8ef36f850..c8dc77318 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/output/transforms/textHelper.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/output/transforms/textHelper.ts
@@ -61,14 +61,14 @@ export function truncatedArrayOfString(container: HTMLElement, outputs: string[]
 		const bufferBuilder = new PieceTreeTextBufferBuilder();
 		outputs.forEach(output => bufferBuilder.acceptChunk(output));
 		const factory = bufferBuilder.finish();
-		buffer = factory.create(DefaultEndOfLine.LF);
+		buffer = factory.create(DefaultEndOfLine.LF).textBuffer;
 		const sizeBufferLimitPosition = buffer.getPositionAt(SIZE_LIMIT);
 		if (sizeBufferLimitPosition.lineNumber < LINES_LIMIT) {
 			const truncatedText = buffer.getValueInRange(new Range(1, 1, sizeBufferLimitPosition.lineNumber, sizeBufferLimitPosition.column), EndOfLinePreference.TextDefined);
 			if (renderANSI) {
 				container.appendChild(handleANSIOutput(truncatedText, themeService));
 			} else {
-				const pre = DOM.$('div');
+				const pre = DOM.$('pre');
 				pre.innerText = truncatedText;
 				container.appendChild(pre);
 			}
@@ -83,21 +83,32 @@ export function truncatedArrayOfString(container: HTMLElement, outputs: string[]
 		const bufferBuilder = new PieceTreeTextBufferBuilder();
 		outputs.forEach(output => bufferBuilder.acceptChunk(output));
 		const factory = bufferBuilder.finish();
-		buffer = factory.create(DefaultEndOfLine.LF);
+		buffer = factory.create(DefaultEndOfLine.LF).textBuffer;
 	}
 
 	if (buffer.getLineCount() < LINES_LIMIT) {
 		const lineCount = buffer.getLineCount();
-		const fullRange = new Range(1, 1, lineCount, buffer.getLineLastNonWhitespaceColumn(lineCount));
+		const fullRange = new Range(1, 1, lineCount, Math.max(1, buffer.getLineLastNonWhitespaceColumn(lineCount)));
 
-		container.innerText = buffer.getValueInRange(fullRange, EndOfLinePreference.TextDefined);
+		if (renderANSI) {
+			const pre = DOM.$('pre');
+			container.appendChild(pre);
+
+			pre.appendChild(handleANSIOutput(buffer.getValueInRange(fullRange, EndOfLinePreference.TextDefined), themeService));
+		} else {
+			const pre = DOM.$('pre');
+			container.appendChild(pre);
+			pre.innerText = buffer.getValueInRange(fullRange, EndOfLinePreference.TextDefined);
+		}
 		return;
 	}
 
 	if (renderANSI) {
-		container.appendChild(handleANSIOutput(buffer.getValueInRange(new Range(1, 1, LINES_LIMIT - 5, buffer.getLineLastNonWhitespaceColumn(LINES_LIMIT - 5)), EndOfLinePreference.TextDefined), themeService));
+		const pre = DOM.$('pre');
+		container.appendChild(pre);
+		pre.appendChild(handleANSIOutput(buffer.getValueInRange(new Range(1, 1, LINES_LIMIT - 5, buffer.getLineLastNonWhitespaceColumn(LINES_LIMIT - 5)), EndOfLinePreference.TextDefined), themeService));
 	} else {
-		const pre = DOM.$('div');
+		const pre = DOM.$('pre');
 		pre.innerText = buffer.getValueInRange(new Range(1, 1, LINES_LIMIT - 5, buffer.getLineLastNonWhitespaceColumn(LINES_LIMIT - 5)), EndOfLinePreference.TextDefined);
 		container.appendChild(pre);
 	}
@@ -108,7 +119,9 @@ export function truncatedArrayOfString(container: HTMLElement, outputs: string[]
 
 	const lineCount = buffer.getLineCount();
 	if (renderANSI) {
-		container.appendChild(handleANSIOutput(buffer.getValueInRange(new Range(lineCount - 5, 1, lineCount, buffer.getLineLastNonWhitespaceColumn(lineCount)), EndOfLinePreference.TextDefined), themeService));
+		const pre = DOM.$('div');
+		container.appendChild(pre);
+		pre.appendChild(handleANSIOutput(buffer.getValueInRange(new Range(lineCount - 5, 1, lineCount, buffer.getLineLastNonWhitespaceColumn(lineCount)), EndOfLinePreference.TextDefined), themeService));
 	} else {
 		const post = DOM.$('div');
 		post.innerText = buffer.getValueInRange(new Range(lineCount - 5, 1, lineCount, buffer.getLineLastNonWhitespaceColumn(lineCount)), EndOfLinePreference.TextDefined);
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 31fc6590e..ce56dffa3 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -10,14 +10,11 @@ import { isWeb } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import * as UUID from 'vs/base/common/uuid';
 import { IOpenerService, matchesScheme } from 'vs/platform/opener/common/opener';
-import { CELL_MARGIN, CELL_RUN_GUTTER, CODE_CELL_LEFT_MARGIN, CELL_OUTPUT_PADDING } from 'vs/workbench/contrib/notebook/browser/constants';
-import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellOutputKind, IDisplayOutput, IInsetRenderOutput, INotebookRendererInfo, IProcessedOutput, ITransformedDisplayOutputDto, RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ICommonCellInfo, ICommonNotebookEditor, IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IGenericCellViewModel, IInsetRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellOutputKind, IDisplayOutput, INotebookRendererInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IWebviewService, WebviewElement, WebviewContentPurpose } from 'vs/workbench/contrib/webview/browser/webview';
 import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webviewUri';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { dirname, joinPath } from 'vs/base/common/resources';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { preloadsScriptStr } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads';
@@ -26,6 +23,7 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IFileService } from 'vs/platform/files/common/files';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { getExtensionForMimeType } from 'vs/base/common/mime';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export interface WebviewIntialized {
 	__vscode_notebook_message: boolean;
@@ -36,6 +34,7 @@ export interface IDimensionMessage {
 	__vscode_notebook_message: boolean;
 	type: 'dimension';
 	id: string;
+	init: boolean;
 	data: DOM.Dimension;
 }
 
@@ -196,9 +195,9 @@ export type ToWebviewMessage =
 
 export type AnyMessage = FromWebviewMessage | ToWebviewMessage;
 
-interface ICachedInset {
+export interface ICachedInset<K extends ICommonCellInfo> {
 	outputId: string;
-	cell: CodeCellViewModel;
+	cellInfo: K;
 	renderer?: INotebookRendererInfo;
 	cachedCreation: ICreationRequestMessage;
 }
@@ -217,12 +216,12 @@ export interface INotebookWebviewMessage {
 }
 
 let version = 0;
-export class BackLayerWebView extends Disposable {
+export class BackLayerWebView<T extends ICommonCellInfo> extends Disposable {
 	element: HTMLElement;
 	webview: WebviewElement | undefined = undefined;
-	insetMapping: Map<IProcessedOutput, ICachedInset> = new Map();
-	hiddenInsetMapping: Set<IProcessedOutput> = new Set();
-	reversedInsetMapping: Map<string, IProcessedOutput> = new Map();
+	insetMapping: Map<IDisplayOutputViewModel, ICachedInset<T>> = new Map();
+	hiddenInsetMapping: Set<IDisplayOutputViewModel> = new Set();
+	reversedInsetMapping: Map<string, IDisplayOutputViewModel> = new Map();
 	localResourceRootsCache: URI[] | undefined = undefined;
 	rendererRootsCache: URI[] = [];
 	kernelRootsCache: URI[] = [];
@@ -234,9 +233,13 @@ export class BackLayerWebView extends Disposable {
 	private _disposed = false;
 
 	constructor(
-		public notebookEditor: INotebookEditor,
+		public notebookEditor: ICommonNotebookEditor,
 		public id: string,
 		public documentUri: URI,
+		public options: {
+			outputNodePadding: number,
+			outputNodeLeftPadding: number
+		},
 		@IWebviewService readonly webviewService: IWebviewService,
 		@IOpenerService readonly openerService: IOpenerService,
 		@INotebookService private readonly notebookService: INotebookService,
@@ -249,12 +252,10 @@ export class BackLayerWebView extends Disposable {
 
 		this.element = document.createElement('div');
 
-		this.element.style.width = `calc(100% - ${CODE_CELL_LEFT_MARGIN + (CELL_MARGIN * 2) + CELL_RUN_GUTTER}px)`;
 		this.element.style.height = '1400px';
 		this.element.style.position = 'absolute';
-		this.element.style.margin = `0px 0 0px ${CODE_CELL_LEFT_MARGIN + CELL_RUN_GUTTER}px`;
 	}
-	generateContent(outputNodePadding: number, coreDependencies: string, baseUrl: string) {
+	generateContent(coreDependencies: string, baseUrl: string) {
 		return html`
 		<html lang="en">
 			<head>
@@ -263,7 +264,7 @@ export class BackLayerWebView extends Disposable {
 				<style>
 					#container > div > div {
 						width: 100%;
-						padding: ${outputNodePadding}px;
+						padding: ${this.options.outputNodePadding}px ${this.options.outputNodePadding}px ${this.options.outputNodePadding}px ${this.options.outputNodeLeftPadding}px;
 						box-sizing: border-box;
 						background-color: var(--vscode-notebook-outputContainerBackgroundColor);
 					}
@@ -272,6 +273,14 @@ export class BackLayerWebView extends Disposable {
 						background-color: var(--vscode-notebook-symbolHighlightBackground);
 					}
 
+					#container > div.nb-cellDeleted > div {
+						background-color: var(--vscode-diffEditor-removedTextBackground);
+					}
+
+					#container > div.nb-cellAdded > div {
+						background-color: var(--vscode-diffEditor-insertedTextBackground);
+					}
+
 					#container > div > div > div {
 						overflow-x: scroll;
 					}
@@ -322,7 +331,7 @@ export class BackLayerWebView extends Disposable {
 				</script>
 				${coreDependencies}
 				<div id='container' class="widgetarea" style="position: absolute;width:100%;top: 0px"></div>
-				<script>${preloadsScriptStr(outputNodePadding)}</script>
+				<script>${preloadsScriptStr(this.options.outputNodePadding, this.options.outputNodeLeftPadding)}</script>
 			</body>
 		</html>`;
 	}
@@ -336,20 +345,14 @@ export class BackLayerWebView extends Disposable {
 		});
 	}
 
-	private resolveOutputId(id: string): { cell: CodeCellViewModel, output: IProcessedOutput } | undefined {
+	private resolveOutputId(id: string): { cellInfo: T, output: IDisplayOutputViewModel } | undefined {
 		const output = this.reversedInsetMapping.get(id);
 		if (!output) {
 			return;
 		}
 
-		const cell = this.insetMapping.get(output)!.cell;
-
-		const currCell = this.notebookEditor.viewModel?.viewCells.find(vc => vc.handle === cell.handle);
-		if (currCell !== cell && currCell !== undefined) {
-			this.insetMapping.get(output)!.cell = currCell as CodeCellViewModel;
-		}
-
-		return { cell: this.insetMapping.get(output)!.cell, output };
+		const cellInfo = this.insetMapping.get(output)!.cellInfo;
+		return { cellInfo, output };
 	}
 
 	async createWebview(): Promise<void> {
@@ -371,7 +374,7 @@ export class BackLayerWebView extends Disposable {
 				return require;
 			}());
 			</script>`;
-			const htmlContent = this.generateContent(CELL_OUTPUT_PADDING, coreDependencies, baseUrl.toString());
+			const htmlContent = this.generateContent(coreDependencies, baseUrl.toString());
 			this._initialize(htmlContent);
 			resolveFunc!();
 		} else {
@@ -395,7 +398,7 @@ var requirejs = (function() {
 </script>
 `;
 
-				const htmlContent = this.generateContent(CELL_OUTPUT_PADDING, coreDependencies, baseUrl.toString());
+				const htmlContent = this.generateContent(coreDependencies, baseUrl.toString());
 				this._initialize(htmlContent);
 				resolveFunc!();
 			});
@@ -424,7 +427,7 @@ var requirejs = (function() {
 
 			if (matchesScheme(link, Schemas.http) || matchesScheme(link, Schemas.https) || matchesScheme(link, Schemas.mailto)
 				|| matchesScheme(link, Schemas.command)) {
-				this.openerService.open(link, { fromUserGesture: true });
+				this.openerService.open(link, { fromUserGesture: true, allowContributedOpeners: true });
 			}
 		}));
 
@@ -458,24 +461,26 @@ var requirejs = (function() {
 					const height = data.data.height;
 					const outputHeight = height;
 
-					const info = this.resolveOutputId(data.id);
-					if (info) {
-						const { cell, output } = info;
-						const outputIndex = cell.outputs.indexOf(output);
-						cell.updateOutputHeight(outputIndex, outputHeight);
-						this.notebookEditor.layoutNotebookCell(cell, cell.layoutInfo.totalHeight);
+					const resolvedResult = this.resolveOutputId(data.id);
+					if (resolvedResult) {
+						const { cellInfo, output } = resolvedResult;
+						this.notebookEditor.updateOutputHeight(cellInfo, output, outputHeight, !!data.init);
 					}
 				} else if (data.type === 'mouseenter') {
-					const info = this.resolveOutputId(data.id);
-					if (info) {
-						const { cell } = info;
-						cell.outputIsHovered = true;
+					const resolvedResult = this.resolveOutputId(data.id);
+					if (resolvedResult) {
+						const latestCell = this.notebookEditor.getCellByInfo(resolvedResult.cellInfo);
+						if (latestCell) {
+							latestCell.outputIsHovered = true;
+						}
 					}
 				} else if (data.type === 'mouseleave') {
-					const info = this.resolveOutputId(data.id);
-					if (info) {
-						const { cell } = info;
-						cell.outputIsHovered = false;
+					const resolvedResult = this.resolveOutputId(data.id);
+					if (resolvedResult) {
+						const latestCell = this.notebookEditor.getCellByInfo(resolvedResult.cellInfo);
+						if (latestCell) {
+							latestCell.outputIsHovered = false;
+						}
 					}
 				} else if (data.type === 'scroll-ack') {
 					// const date = new Date();
@@ -488,22 +493,17 @@ var requirejs = (function() {
 						stopPropagation: () => { }
 					});
 				} else if (data.type === 'focus-editor') {
-					const info = this.resolveOutputId(data.id);
-					if (info) {
+					const resolvedResult = this.resolveOutputId(data.id);
+					if (resolvedResult) {
+						const latestCell = this.notebookEditor.getCellByInfo(resolvedResult.cellInfo);
+						if (!latestCell) {
+							return;
+						}
+
 						if (data.focusNext) {
-							const idx = this.notebookEditor.viewModel?.getCellIndex(info.cell);
-							if (typeof idx !== 'number') {
-								return;
-							}
-
-							const newCell = this.notebookEditor.viewModel?.viewCells[idx + 1];
-							if (!newCell) {
-								return;
-							}
-
-							this.notebookEditor.focusNotebookCell(newCell, 'editor');
+							this.notebookEditor.focusNextNotebookCell(latestCell, 'editor');
 						} else {
-							this.notebookEditor.focusNotebookCell(info.cell, 'editor');
+							this.notebookEditor.focusNotebookCell(latestCell, 'editor');
 						}
 					}
 				} else if (data.type === 'clicked-data-url') {
@@ -585,7 +585,7 @@ var requirejs = (function() {
 		return webview;
 	}
 
-	shouldUpdateInset(cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number) {
+	shouldUpdateInset(cell: IGenericCellViewModel, output: IDisplayOutputViewModel, cellTop: number) {
 		if (this._disposed) {
 			return;
 		}
@@ -595,7 +595,7 @@ var requirejs = (function() {
 		}
 
 		const outputCache = this.insetMapping.get(output)!;
-		const outputIndex = cell.outputs.indexOf(output);
+		const outputIndex = cell.outputsViewModels.indexOf(output);
 		const outputOffset = cellTop + cell.getOutputOffset(outputIndex);
 
 		if (this.hiddenInsetMapping.has(output)) {
@@ -609,7 +609,7 @@ var requirejs = (function() {
 		return true;
 	}
 
-	updateViewScrollTop(top: number, forceDisplay: boolean, items: { cell: CodeCellViewModel, output: IProcessedOutput, cellTop: number }[]) {
+	updateViewScrollTop(top: number, forceDisplay: boolean, items: IDisplayOutputLayoutUpdateRequest[]) {
 		if (this._disposed) {
 			return;
 		}
@@ -617,9 +617,7 @@ var requirejs = (function() {
 		const widgets: IContentWidgetTopRequest[] = items.map(item => {
 			const outputCache = this.insetMapping.get(item.output)!;
 			const id = outputCache.outputId;
-			const outputIndex = item.cell.outputs.indexOf(item.output);
-
-			const outputOffset = item.cellTop + item.cell.getOutputOffset(outputIndex);
+			const outputOffset = item.outputOffset;
 			outputCache.cachedCreation.top = outputOffset;
 			this.hiddenInsetMapping.delete(item.output);
 
@@ -639,7 +637,7 @@ var requirejs = (function() {
 		});
 	}
 
-	async createInset(cell: CodeCellViewModel, content: IInsetRenderOutput, cellTop: number, offset: number) {
+	async createInset(cellInfo: T, content: IInsetRenderOutput, cellTop: number, offset: number) {
 		if (this._disposed) {
 			return;
 		}
@@ -653,7 +651,7 @@ var requirejs = (function() {
 				this.hiddenInsetMapping.delete(content.source);
 				this._sendMessageToWebview({
 					type: 'showOutput',
-					cellId: outputCache.cell.id,
+					cellId: outputCache.cellInfo.cellId,
 					outputId: outputCache.outputId,
 					top: initialTop
 				});
@@ -663,7 +661,7 @@ var requirejs = (function() {
 
 		const messageBase = {
 			type: 'html',
-			cellId: cell.id,
+			cellId: cellInfo.cellId,
 			top: initialTop,
 			left: 0,
 			requiredPreloads: [],
@@ -672,7 +670,7 @@ var requirejs = (function() {
 		let message: ICreationRequestMessage;
 		let renderer: INotebookRendererInfo | undefined;
 		if (content.type === RenderOutputType.Extension) {
-			const output = content.source as ITransformedDisplayOutputDto;
+			const output = content.source.model;
 			renderer = content.renderer;
 			message = {
 				...messageBase,
@@ -701,12 +699,12 @@ var requirejs = (function() {
 		}
 
 		this._sendMessageToWebview(message);
-		this.insetMapping.set(content.source, { outputId: message.outputId, cell, renderer, cachedCreation: message });
+		this.insetMapping.set(content.source, { outputId: message.outputId, cellInfo: cellInfo, renderer, cachedCreation: message });
 		this.hiddenInsetMapping.delete(content.source);
 		this.reversedInsetMapping.set(message.outputId, content.source);
 	}
 
-	removeInset(output: IProcessedOutput) {
+	removeInset(output: IDisplayOutputViewModel) {
 		if (this._disposed) {
 			return;
 		}
@@ -721,15 +719,15 @@ var requirejs = (function() {
 		this._sendMessageToWebview({
 			type: 'clearOutput',
 			apiNamespace: outputCache.cachedCreation.apiNamespace,
-			cellUri: outputCache.cell.uri.toString(),
+			cellUri: outputCache.cellInfo.cellUri.toString(),
 			outputId: id,
-			cellId: outputCache.cell.id
+			cellId: outputCache.cellInfo.cellId
 		});
 		this.insetMapping.delete(output);
 		this.reversedInsetMapping.delete(id);
 	}
 
-	hideInset(output: IProcessedOutput) {
+	hideInset(output: IDisplayOutputViewModel) {
 		if (this._disposed) {
 			return;
 		}
@@ -744,7 +742,7 @@ var requirejs = (function() {
 		this._sendMessageToWebview({
 			type: 'hideOutput',
 			outputId: outputCache.outputId,
-			cellId: outputCache.cell.id,
+			cellId: outputCache.cellInfo.cellId,
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts
index 3ded6bb42..886a0e942 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import * as DOM from 'vs/base/browser/dom';
 import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { Action, IAction, Separator } from 'vs/base/common/actions';
@@ -91,7 +91,7 @@ export class CodiconActionViewItem extends MenuEntryActionViewItem {
 	}
 	updateLabel(): void {
 		if (this.options.label && this.label) {
-			DOM.reset(this.label, ...renderCodicons(this._commandAction.label ?? ''));
+			DOM.reset(this.label, ...renderLabelWithIcons(this._commandAction.label ?? ''));
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
index a9bd2c284..bd6cacbae 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellContextKeys.ts
@@ -5,7 +5,6 @@
 
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { INotebookTextModel, NotebookCellRunState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { BaseCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel';
 import { NOTEBOOK_CELL_TYPE, NOTEBOOK_VIEW_TYPE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_RUNNABLE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_RUN_STATE, NOTEBOOK_CELL_HAS_OUTPUTS, CellViewModelStateChangeEvent, CellEditState, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_FOCUSED, INotebookEditor, NOTEBOOK_CELL_EDITOR_FOCUSED, CellFocusMode } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { MarkdownCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel';
@@ -32,7 +31,7 @@ export class CellContextKeyManager extends Disposable {
 		private readonly contextKeyService: IContextKeyService,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookTextModel: INotebookTextModel,
-		private element: BaseCellViewModel
+		private element: CodeCellViewModel | MarkdownCellViewModel
 	) {
 		super();
 
@@ -53,7 +52,7 @@ export class CellContextKeyManager extends Disposable {
 		});
 	}
 
-	public updateForElement(element: BaseCellViewModel) {
+	public updateForElement(element: MarkdownCellViewModel | CodeCellViewModel) {
 		this.elementDisposables.clear();
 		this.elementDisposables.add(element.onDidChangeState(e => this.onDidChangeState(e)));
 
@@ -138,7 +137,7 @@ export class CellContextKeyManager extends Disposable {
 
 	private updateForOutputs() {
 		if (this.element instanceof CodeCellViewModel) {
-			this.cellHasOutputs.set(this.element.outputs.length > 0);
+			this.cellHasOutputs.set(this.element.outputsViewModels.length > 0);
 		} else {
 			this.cellHasOutputs.set(false);
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellOutput.ts
index a9ba33bf5..bca1187cd 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellOutput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellOutput.ts
@@ -10,10 +10,10 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { IQuickPickItem, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { CodeCellRenderTemplate, INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CodeCellRenderTemplate, ICellOutputViewModel, IDisplayOutputViewModel, IInsetRenderOutput, INotebookEditor, IRenderOutput, outputHasDynamicHeight, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets';
 import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { ITransformedDisplayOutputDto, IRenderOutput, IProcessedOutput, RENDERER_NOT_AVAILABLE, BUILTIN_RENDERER_ID, RenderOutputType, outputHasDynamicHeight, CellUri, CellOutputKind, NotebookCellOutputsSplice, IInsetRenderOutput } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { BUILTIN_RENDERER_ID, CellUri, CellOutputKind, NotebookCellOutputsSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
@@ -23,6 +23,7 @@ import { format } from 'vs/base/common/jsonFormatter';
 import { applyEdits } from 'vs/base/common/jsonEdit';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { mimetypeIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 
 const OUTPUT_COUNT_LIMIT = 500;
 
@@ -31,12 +32,6 @@ interface IMimeTypeRenderer extends IQuickPickItem {
 }
 
 export class OutputElement extends Disposable {
-
-	// this isn't super proper but I couldn't find a view-model equivalent for output
-	// and it seems as of today we use the domain model - and pragamtically enrich it
-	// with UX properties
-	private pickedMimeTypes = new WeakMap<ITransformedDisplayOutputDto, number>();
-
 	readonly resizeListener = new DisposableStore();
 	domNode!: HTMLElement;
 	renderResult?: IRenderOutput;
@@ -47,7 +42,7 @@ export class OutputElement extends Disposable {
 		private quickInputService: IQuickInputService,
 		private viewCell: CodeCellViewModel,
 		private outputContainer: HTMLElement,
-		readonly output: IProcessedOutput
+		readonly output: ICellOutputViewModel
 	) {
 		super();
 	}
@@ -57,17 +52,17 @@ export class OutputElement extends Disposable {
 			return;
 		}
 
+		if (!this.notebookEditor.hasModel()) {
+			return;
+		}
+
+		const notebookTextModel = this.notebookEditor.viewModel.notebookDocument;
+
 		const outputItemDiv = document.createElement('div');
 		let result: IRenderOutput | undefined = undefined;
 
-		if (this.output.outputKind === CellOutputKind.Rich) {
-			const transformedDisplayOutput = this.output as ITransformedDisplayOutputDto;
-
-			const mimeTypes = this.notebookService.getMimeTypeInfo(this.notebookEditor.textModel!, this.output);
-
-			// there is at least one mimetype which is safe and can be rendered by the core
-			const pick = this.pickedMimeTypes.get(this.output) ?? Math.max(mimeTypes.findIndex(mimeType => mimeType.rendererId !== RENDERER_NOT_AVAILABLE && mimeType.isTrusted), 0);
-
+		if (this.output.isDisplayOutput()) {
+			const [mimeTypes, pick] = this.output.resolveMimeTypes(notebookTextModel);
 			if (mimeTypes.length > 1) {
 				outputItemDiv.style.position = 'relative';
 				const mimeTypePicker = DOM.$('.multi-mimetype-output');
@@ -79,7 +74,7 @@ export class OutputElement extends Disposable {
 					if (e.leftButton) {
 						e.preventDefault();
 						e.stopPropagation();
-						await this.pickActiveMimeTypeRenderer(transformedDisplayOutput);
+						await this.pickActiveMimeTypeRenderer(notebookTextModel, this.output as IDisplayOutputViewModel);
 					}
 				}));
 
@@ -88,27 +83,29 @@ export class OutputElement extends Disposable {
 					if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
 						e.preventDefault();
 						e.stopPropagation();
-						await this.pickActiveMimeTypeRenderer(transformedDisplayOutput);
+						await this.pickActiveMimeTypeRenderer(notebookTextModel, this.output as IDisplayOutputViewModel);
 					}
 				})));
-
-			}
-			const pickedMimeTypeRenderer = mimeTypes[pick];
-
-			const innerContainer = DOM.$('.output-inner-container');
-			DOM.append(outputItemDiv, innerContainer);
-
-
-			if (pickedMimeTypeRenderer.rendererId !== BUILTIN_RENDERER_ID) {
-				const renderer = this.notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
-				result = renderer
-					? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: pickedMimeTypeRenderer.mimeType }
-					: this.notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this.getNotebookUri(),);
-			} else {
-				result = this.notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this.getNotebookUri(),);
 			}
 
-			this.pickedMimeTypes.set(this.output, pick);
+			if (mimeTypes.length !== 0) {
+				const pickedMimeTypeRenderer = mimeTypes[pick];
+
+				const innerContainer = DOM.$('.output-inner-container');
+				DOM.append(outputItemDiv, innerContainer);
+
+
+				if (pickedMimeTypeRenderer.rendererId !== BUILTIN_RENDERER_ID) {
+					const renderer = this.notebookService.getRendererInfo(pickedMimeTypeRenderer.rendererId);
+					result = renderer
+						? { type: RenderOutputType.Extension, renderer, source: this.output, mimeType: pickedMimeTypeRenderer.mimeType }
+						: this.notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this.getNotebookUri(),);
+				} else {
+					result = this.notebookEditor.getOutputRenderer().render(this.output, innerContainer, pickedMimeTypeRenderer.mimeType, this.getNotebookUri(),);
+				}
+
+				this.output.pickedMimeType = pick;
+			}
 		} else {
 			// for text and error, there is no mimetype
 			const innerContainer = DOM.$('.output-inner-container');
@@ -133,7 +130,7 @@ export class OutputElement extends Disposable {
 
 		if (result.type !== RenderOutputType.None) {
 			this.viewCell.selfSizeMonitoring = true;
-			this.notebookEditor.createInset(this.viewCell, result as any, this.viewCell.getOutputOffset(index));
+			this.notebookEditor.createInset(this.viewCell, result, this.viewCell.getOutputOffset(index));
 		} else {
 			outputItemDiv.classList.add('foreground', 'output-element');
 			outputItemDiv.style.position = 'absolute';
@@ -148,14 +145,14 @@ export class OutputElement extends Disposable {
 				height: clientHeight
 			};
 			const elementSizeObserver = getResizesObserver(outputItemDiv, dimension, () => {
-				if (this.outputContainer && document.body.contains(this.outputContainer!)) {
+				if (this.outputContainer && document.body.contains(this.outputContainer)) {
 					const height = Math.ceil(elementSizeObserver.getHeight());
 
 					if (clientHeight === height) {
 						return;
 					}
 
-					const currIndex = this.viewCell.outputs.indexOf(this.output);
+					const currIndex = this.viewCell.outputsViewModels.indexOf(this.output);
 					if (currIndex < 0) {
 						return;
 					}
@@ -176,12 +173,9 @@ export class OutputElement extends Disposable {
 		}
 	}
 
-	async pickActiveMimeTypeRenderer(output: ITransformedDisplayOutputDto) {
+	private async pickActiveMimeTypeRenderer(notebookTextModel: NotebookTextModel, viewModel: IDisplayOutputViewModel) {
+		const [mimeTypes, currIndex] = viewModel.resolveMimeTypes(notebookTextModel);
 
-		const mimeTypes = this.notebookService.getMimeTypeInfo(this.notebookEditor.textModel!, output);
-		const currIndex = this.pickedMimeTypes.get(output);
-
-		// const currIndex = output.pickedMimeTypeIndex;
 		const items = mimeTypes.filter(mimeType => mimeType.isTrusted).map((mimeType, index): IMimeTypeRenderer => ({
 			label: mimeType.mimeType,
 			id: mimeType.mimeType,
@@ -212,16 +206,16 @@ export class OutputElement extends Disposable {
 
 		if (pick !== currIndex) {
 			// user chooses another mimetype
-			const index = this.viewCell.outputs.indexOf(output);
+			const index = this.viewCell.outputsViewModels.indexOf(viewModel);
 			const nextElement = this.domNode.nextElementSibling;
 			this.resizeListener.clear();
 			const element = this.domNode;
 			if (element) {
 				element.parentElement?.removeChild(element);
-				this.notebookEditor.removeInset(output);
+				this.notebookEditor.removeInset(viewModel);
 			}
 
-			this.pickedMimeTypes.set(output, pick);
+			viewModel.pickedMimeType = pick;
 			this.render(index, nextElement as HTMLElement);
 			this.relayoutCell();
 		}
@@ -231,7 +225,7 @@ export class OutputElement extends Disposable {
 		return CellUri.parse(this.viewCell.uri)?.notebook;
 	}
 
-	generateRendererInfo(renderId: string | undefined): string {
+	private generateRendererInfo(renderId: string | undefined): string {
 		if (renderId === undefined || renderId === BUILTIN_RENDERER_ID) {
 			return nls.localize('builtinRenderInfo', "built-in");
 		}
@@ -246,13 +240,13 @@ export class OutputElement extends Disposable {
 		return nls.localize('builtinRenderInfo', "built-in");
 	}
 
-	relayoutCell() {
+	private relayoutCell() {
 		this.notebookEditor.layoutNotebookCell(this.viewCell, this.viewCell.layoutInfo.totalHeight);
 	}
 }
 
 export class OutputContainer extends Disposable {
-	private outputEntries = new Map<IProcessedOutput, OutputElement>();
+	private outputEntries = new Map<ICellOutputViewModel, OutputElement>();
 
 	constructor(
 		private notebookEditor: INotebookEditor,
@@ -271,7 +265,7 @@ export class OutputContainer extends Disposable {
 
 		this._register(viewCell.onDidChangeLayout(() => {
 			this.outputEntries.forEach((value, key) => {
-				const index = viewCell.outputs.indexOf(key);
+				const index = viewCell.outputsViewModels.indexOf(key);
 				if (index >= 0) {
 					const top = this.viewCell.getOutputOffsetInContainer(index);
 					value.domNode.style.top = `${top}px`;
@@ -281,7 +275,7 @@ export class OutputContainer extends Disposable {
 	}
 
 	render(editorHeight: number) {
-		if (this.viewCell.outputs.length > 0) {
+		if (this.viewCell.outputsViewModels.length > 0) {
 			let layoutCache = false;
 			if (this.viewCell.layoutInfo.totalHeight !== 0 && this.viewCell.layoutInfo.editorHeight > editorHeight) {
 				layoutCache = true;
@@ -293,14 +287,14 @@ export class OutputContainer extends Disposable {
 			// @TODO@rebornix, if there is no resizable output, we should not check their height individually, which hurts the performance
 			const outputsToRender = this._calcuateOutputsToRender();
 			for (let index = 0; index < outputsToRender.length; index++) {
-				const currOutput = this.viewCell.outputs[index];
+				const currOutput = this.viewCell.outputsViewModels[index];
 
 				// always add to the end
 				this._renderOutput(currOutput, index, undefined);
 			}
 
 			this.viewCell.editorHeight = editorHeight;
-			if (this.viewCell.outputs.length > OUTPUT_COUNT_LIMIT) {
+			if (this.viewCell.outputsViewModels.length > OUTPUT_COUNT_LIMIT) {
 				this.templateData.outputShowMoreContainer.style.display = 'block';
 				this.viewCell.updateOutputShowMoreContainerHeight(46);
 			}
@@ -321,15 +315,15 @@ export class OutputContainer extends Disposable {
 		this.templateData.outputShowMoreContainer.appendChild(this._generateShowMoreElement());
 		// this.templateData.outputShowMoreContainer.style.top = `${this.viewCell.layoutInfo.outputShowMoreContainerOffset}px`;
 
-		if (this.viewCell.outputs.length < OUTPUT_COUNT_LIMIT) {
+		if (this.viewCell.outputsViewModels.length < OUTPUT_COUNT_LIMIT) {
 			this.templateData.outputShowMoreContainer.style.display = 'none';
 			this.viewCell.updateOutputShowMoreContainerHeight(0);
 		}
 	}
 
 	viewUpdateShowOutputs(): void {
-		for (let index = 0; index < this.viewCell.outputs.length; index++) {
-			const currOutput = this.viewCell.outputs[index];
+		for (let index = 0; index < this.viewCell.outputsViewModels.length; index++) {
+			const currOutput = this.viewCell.outputsViewModels[index];
 
 			const renderedOutput = this.outputEntries.get(currOutput);
 			if (renderedOutput && renderedOutput.renderResult) {
@@ -350,12 +344,12 @@ export class OutputContainer extends Disposable {
 
 	viewUpdateHideOuputs(): void {
 		for (const e of this.outputEntries.keys()) {
-			this.notebookEditor.hideInset(e);
+			this.notebookEditor.hideInset(e as IDisplayOutputViewModel);
 		}
 	}
 
 	onCellWidthChange(): void {
-		this.viewCell.outputs.forEach((o, i) => {
+		this.viewCell.outputsViewModels.forEach((o, i) => {
 			const renderedOutput = this.outputEntries.get(o);
 			if (renderedOutput && renderedOutput.renderResult && renderedOutput.renderResult.type === RenderOutputType.None && !renderedOutput.renderResult.hasDynamicHeight) {
 				this.viewCell.updateOutputHeight(i, renderedOutput.domNode.clientHeight);
@@ -363,12 +357,12 @@ export class OutputContainer extends Disposable {
 		});
 	}
 
-	private _calcuateOutputsToRender() {
-		const outputs = this.viewCell.outputs.slice(0, Math.min(OUTPUT_COUNT_LIMIT, this.viewCell.outputs.length));
+	private _calcuateOutputsToRender(): ICellOutputViewModel[] {
+		const outputs = this.viewCell.outputsViewModels.slice(0, Math.min(OUTPUT_COUNT_LIMIT, this.viewCell.outputsViewModels.length));
 		if (!this.notebookEditor.viewModel!.metadata.trusted) {
 			// not trusted
 			const secureOutput = outputs.filter(output => {
-				switch (output.outputKind) {
+				switch (output.model.outputKind) {
 					case CellOutputKind.Text:
 						return true;
 					case CellOutputKind.Error:
@@ -376,7 +370,7 @@ export class OutputContainer extends Disposable {
 					case CellOutputKind.Rich:
 						{
 							const mimeTypes = [];
-							for (const property in output.data) {
+							for (const property in output.model.data) {
 								mimeTypes.push(property);
 							}
 
@@ -407,7 +401,7 @@ export class OutputContainer extends Disposable {
 
 		const previousOutputHeight = this.viewCell.layoutInfo.outputTotalHeight;
 
-		if (this.viewCell.outputs.length) {
+		if (this.viewCell.outputsViewModels.length) {
 			this.templateData.outputContainer.style.display = 'block';
 		} else {
 			this.templateData.outputContainer.style.display = 'none';
@@ -419,15 +413,17 @@ export class OutputContainer extends Disposable {
 			this.viewCell.spliceOutputHeights(splice[0], splice[1], splice[2].map(_ => 0));
 		});
 
-		const removedKeys: IProcessedOutput[] = [];
+		const removedKeys: ICellOutputViewModel[] = [];
 
 		this.outputEntries.forEach((value, key) => {
-			if (this.viewCell.outputs.indexOf(key) < 0) {
+			if (this.viewCell.outputsViewModels.indexOf(key) < 0) {
 				// already removed
 				removedKeys.push(key);
 				// remove element from DOM
 				this.templateData?.outputContainer?.removeChild(value.domNode);
-				this.notebookEditor.removeInset(key);
+				if (key.isDisplayOutput()) {
+					this.notebookEditor.removeInset(key);
+				}
 			}
 		});
 
@@ -447,12 +443,12 @@ export class OutputContainer extends Disposable {
 			}
 
 			// newly added element
-			const currIndex = this.viewCell.outputs.indexOf(output);
+			const currIndex = this.viewCell.outputsViewModels.indexOf(output);
 			this._renderOutput(output, currIndex, prevElement);
 			prevElement = this.outputEntries.get(output)?.domNode;
 		});
 
-		if (this.viewCell.outputs.length > OUTPUT_COUNT_LIMIT) {
+		if (this.viewCell.outputsViewModels.length > OUTPUT_COUNT_LIMIT) {
 			this.templateData.outputShowMoreContainer.style.display = 'block';
 			this.viewCell.updateOutputShowMoreContainerHeight(46);
 		} else {
@@ -462,7 +458,7 @@ export class OutputContainer extends Disposable {
 		const editorHeight = this.templateData.editor.getContentHeight();
 		this.viewCell.editorHeight = editorHeight;
 
-		if (previousOutputHeight === 0 || this.viewCell.outputs.length === 0) {
+		if (previousOutputHeight === 0 || this.viewCell.outputsViewModels.length === 0) {
 			// first execution or removing all outputs
 			this._relayoutCell();
 		} else {
@@ -470,7 +466,7 @@ export class OutputContainer extends Disposable {
 		}
 	}
 
-	private _renderOutput(currOutput: IProcessedOutput, index: number, beforeElement?: HTMLElement) {
+	private _renderOutput(currOutput: ICellOutputViewModel, index: number, beforeElement?: HTMLElement) {
 		if (!this.outputEntries.has(currOutput)) {
 			this.outputEntries.set(currOutput, new OutputElement(this.notebookEditor, this.notebookService, this.quickInputService, this.viewCell, this.templateData.outputContainer, currOutput));
 		}
@@ -489,24 +485,24 @@ export class OutputContainer extends Disposable {
 			actionHandler: {
 				callback: (content) => {
 					if (content === 'command:workbench.action.openLargeOutput') {
-						const content = JSON.stringify(this.viewCell.outputs.map(output => {
-							switch (output.outputKind) {
+						const content = JSON.stringify(this.viewCell.outputsViewModels.map(output => {
+							switch (output.model.outputKind) {
 								case CellOutputKind.Text:
 									return {
 										outputKind: 'text',
-										text: output.text
+										text: output.model.text
 									};
 								case CellOutputKind.Error:
 									return {
 										outputKind: 'error',
-										ename: output.ename,
-										evalue: output.evalue,
-										traceback: output.traceback
+										ename: output.model.ename,
+										evalue: output.model.evalue,
+										traceback: output.model.traceback
 									};
 								case CellOutputKind.Rich:
 									return {
-										data: output.data,
-										metadata: output.metadata
+										data: output.model.data,
+										metadata: output.model.metadata
 									};
 							}
 						}));
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 2fccd56c7..ad254bc8f 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getZoomLevel } from 'vs/base/browser/browser';
+import { getPixelRatio, getZoomLevel } from 'vs/base/browser/browser';
 import * as DOM from 'vs/base/browser/dom';
 import { domEvent } from 'vs/base/browser/event';
 import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IAction } from 'vs/base/common/actions';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -26,8 +26,8 @@ import { ITextModel } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { tokenizeLineToHTML } from 'vs/editor/common/modes/textToHtmlTokenizer';
 import { localize } from 'vs/nls';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenu, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IMenu, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -51,6 +51,7 @@ import { CellEditType, CellKind, NotebookCellMetadata, NotebookCellRunState, Not
 import { CodiconActionViewItem, createAndFillInActionBarActionsWithVerticalSeparators, VerticalSeparator, VerticalSeparatorViewItem } from './cellActionView';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { errorStateIcon, successStateIcon, unfoldIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { syncing } from 'vs/platform/theme/common/iconRegistry';
 
 const $ = DOM.$;
 
@@ -61,7 +62,7 @@ export class NotebookCellListDelegate implements IListVirtualDelegate<CellViewMo
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		const editorOptions = this.configurationService.getValue<IEditorOptions>('editor');
-		this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel()).lineHeight;
+		this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, getZoomLevel(), getPixelRatio()).lineHeight;
 	}
 
 	getHeight(element: CellViewModel): number {
@@ -227,17 +228,10 @@ abstract class AbstractCellRenderer {
 		const toolbar = new ToolBar(container, this.contextMenuService, {
 			getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
 			actionViewItemProvider: action => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-				} else if (action instanceof SubmenuItemAction) {
-					return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-				}
-
 				if (action.id === VerticalSeparator.ID) {
 					return new VerticalSeparatorViewItem(undefined, action);
 				}
-
-				return undefined;
+				return createActionViewItem(this.instantiationService, action);
 			},
 			renderDropdownAsChildElement: true
 		});
@@ -567,7 +561,7 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
 
 class EditorTextRenderer {
 
-	private _ttPolicy = window.trustedTypes?.createPolicy('cellRendererEditorText', {
+	private static _ttPolicy = window.trustedTypes?.createPolicy('cellRendererEditorText', {
 		createHTML(input) { return input; }
 	});
 
@@ -594,7 +588,7 @@ class EditorTextRenderer {
 		const element = DOM.$('div', { style });
 
 		const linesHtml = this.getRichTextLinesAsHtml(model, modelRange, colorMap);
-		element.innerHTML = linesHtml as unknown as string;
+		element.innerHTML = linesHtml as string;
 		return element;
 	}
 
@@ -621,9 +615,7 @@ class EditorTextRenderer {
 			}
 		}
 
-		return this._ttPolicy
-			? this._ttPolicy.createHTML(result)
-			: result;
+		return EditorTextRenderer._ttPolicy?.createHTML(result) ?? result;
 	}
 
 	private getDefaultColorMap(): string[] {
@@ -712,13 +704,14 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 
 		const executionOrderLabel = DOM.append(cellContainer, $('div.execution-count-label'));
 
+		const editorPart = DOM.append(cellContainer, $('.cell-editor-part'));
+		const editorContainer = DOM.append(editorPart, $('.cell-editor-container'));
+
 		// create a special context key service that set the inCompositeEditor-contextkey
-		const editorContextKeyService = disposables.add(this.contextKeyServiceProvider(container));
+		const editorContextKeyService = disposables.add(this.contextKeyServiceProvider(editorPart));
 		const editorInstaService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, editorContextKeyService]));
 		EditorContextKeys.inCompositeEditor.bindTo(editorContextKeyService).set(true);
 
-		const editorPart = DOM.append(cellContainer, $('.cell-editor-part'));
-		const editorContainer = DOM.append(editorPart, $('.cell-editor-container'));
 		const editor = editorInstaService.createInstance(CodeEditorWidget, editorContainer, {
 			...this.editorOptions.value,
 			dimension: {
@@ -789,7 +782,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 		this.dndController.registerDragHandle(templateData, rootContainer, dragHandle, () => new CodeCellDragImageRenderer().getDragImage(templateData, templateData.editor, 'code'));
 
 		disposables.add(DOM.addDisposableListener(focusSinkElement, DOM.EventType.FOCUS, () => {
-			if (templateData.currentRenderedCell && (templateData.currentRenderedCell as CodeCellViewModel).outputs.length) {
+			if (templateData.currentRenderedCell && (templateData.currentRenderedCell as CodeCellViewModel).outputsViewModels.length) {
 				this.notebookEditor.focusNotebookCell(templateData.currentRenderedCell, 'output');
 			}
 		}));
@@ -800,7 +793,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	}
 
 	private updateForOutputs(element: CodeCellViewModel, templateData: CodeCellRenderTemplate): void {
-		if (element.outputs.length) {
+		if (element.outputsViewModels.length) {
 			DOM.show(templateData.focusSinkElement);
 		} else {
 			DOM.hide(templateData.focusSinkElement);
@@ -1051,11 +1044,11 @@ export class RunStateRenderer {
 		}
 
 		if (runState === NotebookCellRunState.Success) {
-			DOM.reset(this.element, ...renderCodicons(ThemeIcon.asCodiconLabel(successStateIcon)));
+			DOM.reset(this.element, renderIcon(successStateIcon));
 		} else if (runState === NotebookCellRunState.Error) {
-			DOM.reset(this.element, ...renderCodicons(ThemeIcon.asCodiconLabel(errorStateIcon)));
+			DOM.reset(this.element, renderIcon(errorStateIcon));
 		} else if (runState === NotebookCellRunState.Running) {
-			DOM.reset(this.element, ...renderCodicons('$(sync~spin)'));
+			DOM.reset(this.element, renderIcon(syncing));
 
 			this.spinnerTimer = setTimeout(() => {
 				this.spinnerTimer = undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets.ts
index 6be1604ee..6ac79f0ad 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets.ts
@@ -5,9 +5,9 @@
 
 import * as DOM from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel';
+import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
 import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
-import { stripCodicons } from 'vs/base/common/codicons';
+import { stripIcons } from 'vs/base/common/iconLabels';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Emitter, Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -160,7 +160,7 @@ class CellStatusBarItem extends Disposable {
 		@INotificationService private readonly notificationService: INotificationService
 	) {
 		super();
-		new CodiconLabel(this.container).text = this._itemModel.text;
+		new SimpleIconLabel(this.container).text = this._itemModel.text;
 
 		if (this._itemModel.opacity) {
 			this.container.style.opacity = this._itemModel.opacity;
@@ -172,7 +172,7 @@ class CellStatusBarItem extends Disposable {
 			ariaLabel = this._itemModel.accessibilityInformation.label;
 			role = this._itemModel.accessibilityInformation.role;
 		} else {
-			ariaLabel = this._itemModel.text ? stripCodicons(this._itemModel.text).trim() : '';
+			ariaLabel = this._itemModel.text ? stripIcons(this._itemModel.text).trim() : '';
 		}
 
 		if (ariaLabel) {
@@ -353,8 +353,8 @@ export function getExecuteCellPlaceholder(viewCell: BaseCellViewModel) {
 		command: undefined,
 		// text: `${keybinding?.getLabel() || 'Ctrl + Enter'} to run`,
 		// tooltip: `${keybinding?.getLabel() || 'Ctrl + Enter'} to run`,
-		text: isWindows ? 'Ctrl + Alt + Enter' : 'Ctrl + Enter to run',
-		tooltip: isWindows ? 'Ctrl + Alt + Enter' : 'Ctrl + Enter to run',
+		text: isWindows ? 'Ctrl + Alt + Enter to run' : 'Ctrl + Enter to run',
+		tooltip: isWindows ? 'Ctrl + Alt + Enter to run' : 'Ctrl + Enter to run',
 		visible: true,
 		opacity: '0.7'
 	};
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
index 56869eb83..f22e6fea2 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
@@ -231,6 +231,7 @@ export class CodeCell extends Disposable {
 				if (this._activeCellRunPlaceholder === null) {
 					// const keybinding = this._keybindingService.lookupKeybinding(EXECUTE_CELL_COMMAND_ID);
 					this._activeCellRunPlaceholder = this.notebookCellStatusBarService.addEntry(getExecuteCellPlaceholder(this.viewCell));
+					this._register(this._activeCellRunPlaceholder);
 				}
 
 				return;
@@ -284,7 +285,7 @@ export class CodeCell extends Disposable {
 			this.viewUpdateAllCollapsed();
 		} else if (this.viewCell.metadata?.inputCollapsed) {
 			this.viewUpdateInputCollapsed();
-		} else if (this.viewCell.metadata?.outputCollapsed && this.viewCell.outputs.length) {
+		} else if (this.viewCell.metadata?.outputCollapsed && this.viewCell.outputsViewModels.length) {
 			this.viewUpdateOutputCollapsed();
 		} else {
 			this.viewUpdateExpanded();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
index da2e04bc6..ae7a1fe9b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
@@ -21,9 +21,8 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { getExecuteCellPlaceholder, getResizesObserver } from 'vs/workbench/contrib/notebook/browser/view/renderers/cellWidgets';
 import { INotebookCellStatusBarService } from 'vs/workbench/contrib/notebook/common/notebookCellStatusBarService';
 import { NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { collapsedIcon, expandedIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 
 export class StatefulMarkdownCell extends Disposable {
 
@@ -144,7 +143,11 @@ export class StatefulMarkdownCell extends Disposable {
 				// active cell and no run status
 				if (this._activeCellRunPlaceholder === null) {
 					// const keybinding = this._keybindingService.lookupKeybinding(EXECUTE_CELL_COMMAND_ID);
-					this._activeCellRunPlaceholder = this.notebookCellStatusBarService.addEntry(getExecuteCellPlaceholder(this.viewCell));
+					const placeholder = getExecuteCellPlaceholder(this.viewCell);
+					if (!this.notebookCellStatusBarService.getEntries(this.viewCell.uri).find(entry => entry.text === placeholder.text && entry.command === placeholder.command)) {
+						this._activeCellRunPlaceholder = this.notebookCellStatusBarService.addEntry(placeholder);
+						this._register(this._activeCellRunPlaceholder);
+					}
 				}
 
 				return;
@@ -334,8 +337,9 @@ export class StatefulMarkdownCell extends Disposable {
 			}
 		);
 
-		this.viewCell.editorHeight = realContentHeight;
-		this.relayoutCell();
+		// LET the content size observer to handle it
+		// this.viewCell.editorHeight = realContentHeight;
+		// this.relayoutCell();
 	}
 
 	private relayoutCell(): void {
@@ -355,10 +359,10 @@ export class StatefulMarkdownCell extends Disposable {
 				this.templateData.foldingIndicator.innerText = '';
 				break;
 			case CellFoldingState.Collapsed:
-				DOM.reset(this.templateData.foldingIndicator, ...renderCodicons(ThemeIcon.asCodiconLabel(collapsedIcon)));
+				DOM.reset(this.templateData.foldingIndicator, renderIcon(collapsedIcon));
 				break;
 			case CellFoldingState.Expanded:
-				DOM.reset(this.templateData.foldingIndicator, ...renderCodicons(ThemeIcon.asCodiconLabel(expandedIcon)));
+				DOM.reset(this.templateData.foldingIndicator, renderIcon(expandedIcon));
 				break;
 
 			default:
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
index 936792e8a..5684d3539 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -6,7 +6,7 @@
 import type { Event } from 'vs/base/common/event';
 import type { IDisposable } from 'vs/base/common/lifecycle';
 import { ToWebviewMessage } from 'vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView';
-import { RenderOutputType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
 // !! IMPORTANT !! everything must be in-line within the webviewPreloads
 // function. Imports are not allowed. This is stringifies and injected into
@@ -27,6 +27,7 @@ declare class ResizeObserver {
 }
 
 declare const __outputNodePadding__: number;
+declare const __outputNodeLeftPadding__: number;
 
 type Listener<T> = { fn: (evt: T) => void; thisArg: unknown; };
 
@@ -49,6 +50,8 @@ function webviewPreloads() {
 			if (node instanceof HTMLAnchorElement && node.href) {
 				if (node.href.startsWith('blob:')) {
 					handleBlobUrlClick(node.href, node.download);
+				} else if (node.href.startsWith('data:')) {
+					handleDataUrl(node.href, node.download);
 				}
 				event.preventDefault();
 				break;
@@ -56,19 +59,22 @@ function webviewPreloads() {
 		}
 	};
 
+	const handleDataUrl = async (data: string | ArrayBuffer | null, downloadName: string) => {
+		vscode.postMessage({
+			__vscode_notebook_message: true,
+			type: 'clicked-data-url',
+			data,
+			downloadName
+		});
+	};
+
 	const handleBlobUrlClick = async (url: string, downloadName: string) => {
 		try {
 			const response = await fetch(url);
 			const blob = await response.blob();
 			const reader = new FileReader();
 			reader.addEventListener('load', () => {
-				const data = reader.result;
-				vscode.postMessage({
-					__vscode_notebook_message: true,
-					type: 'clicked-data-url',
-					data,
-					downloadName
-				});
+				handleDataUrl(reader.result, downloadName);
 			});
 			reader.readAsDataURL(blob);
 		} catch (e) {
@@ -88,7 +94,8 @@ function webviewPreloads() {
 		for (let n = 0; n < arr.length; n++) {
 			const node = arr[n];
 			const scriptTag = document.createElement('script');
-			scriptTag.text = node.innerText;
+			const trustedScript = ttPolicy?.createScript(node.innerText) ?? node.innerText;
+			scriptTag.text = trustedScript as string;
 			for (const key of preservedScriptAttributes) {
 				const val = node[key] || node.getAttribute && node.getAttribute(key);
 				if (val) {
@@ -138,7 +145,7 @@ function webviewPreloads() {
 
 				if (entry.target.id === id && entry.contentRect) {
 					if (entry.contentRect.height !== 0) {
-						entry.target.style.padding = `${__outputNodePadding__}px`;
+						entry.target.style.padding = `${__outputNodePadding__}px ${__outputNodePadding__}px ${__outputNodePadding__}px ${__outputNodeLeftPadding__}px`;
 						vscode.postMessage({
 							__vscode_notebook_message: true,
 							type: 'dimension',
@@ -387,6 +394,11 @@ function webviewPreloads() {
 		queuedOuputActions.set(event.outputId, promise);
 	};
 
+	const ttPolicy = window.trustedTypes?.createPolicy('notebookOutputRenderer', {
+		createHTML: value => value,
+		createScript: value => value,
+	});
+
 	window.addEventListener('wheel', handleWheel);
 
 	window.addEventListener('message', rawEvent => {
@@ -430,7 +442,8 @@ function webviewPreloads() {
 					addMouseoverListeners(outputNode, outputId);
 					const content = data.content;
 					if (content.type === RenderOutputType.Html) {
-						outputNode.innerHTML = content.htmlContent;
+						const trustedHtml = ttPolicy?.createHTML(content.htmlContent) ?? content.htmlContent;
+						outputNode.innerHTML = trustedHtml as string;
 						cellOutputContainer.appendChild(outputNode);
 						domEval(outputNode);
 					} else if (preloadResults.some(e => e?.state === PreloadState.Error)) {
@@ -461,6 +474,7 @@ function webviewPreloads() {
 						__vscode_notebook_message: true,
 						type: 'dimension',
 						id: outputId,
+						init: true,
 						data: {
 							height: outputNode.clientHeight
 						}
@@ -577,4 +591,4 @@ function webviewPreloads() {
 	});
 }
 
-export const preloadsScriptStr = (outputNodePadding: number) => `(${webviewPreloads})()`.replace(/__outputNodePadding__/g, `${outputNodePadding}`);
+export const preloadsScriptStr = (outputNodePadding: number, outputNodeLeftPadding: number) => `(${webviewPreloads})()`.replace(/__outputNodePadding__/g, `${outputNodePadding}`).replace(/__outputNodeLeftPadding__/g, `${outputNodeLeftPadding}`);
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
new file mode 100644
index 000000000..ece96c36c
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from 'vs/base/common/lifecycle';
+import { ICellOutputViewModel, IDisplayOutputViewModel, IErrorOutputViewModel, IGenericCellViewModel, IStreamOutputViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { CellOutputKind, IOrderedMimeType, IProcessedOutput, ITransformedDisplayOutputDto, RENDERER_NOT_AVAILABLE } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+
+let handle = 0;
+export class CellOutputViewModel extends Disposable implements ICellOutputViewModel {
+	outputHandle = handle++;
+	get model() {
+		return this._outputData;
+	}
+
+	private _pickedMimeType: number = -1;
+	get pickedMimeType() {
+		return this._pickedMimeType;
+	}
+
+	set pickedMimeType(value: number) {
+		this._pickedMimeType = value;
+	}
+
+	constructor(
+		readonly cellViewModel: IGenericCellViewModel,
+		private readonly _outputData: IProcessedOutput,
+		private readonly _notebookService: INotebookService
+	) {
+		super();
+	}
+
+	isStreamOutput(): this is IStreamOutputViewModel {
+		return this._outputData.outputKind === CellOutputKind.Text;
+	}
+
+	isErrorOutput(): this is IErrorOutputViewModel {
+		return this._outputData.outputKind === CellOutputKind.Error;
+	}
+
+	isDisplayOutput(): this is IDisplayOutputViewModel {
+		return this._outputData.outputKind === CellOutputKind.Rich;
+	}
+
+	resolveMimeTypes(textModel: NotebookTextModel): [readonly IOrderedMimeType[], number] {
+		const mimeTypes = this._notebookService.getMimeTypeInfo(textModel, this.model as ITransformedDisplayOutputDto);
+		if (this._pickedMimeType === -1) {
+			// there is at least one mimetype which is safe and can be rendered by the core
+			this._pickedMimeType = Math.max(mimeTypes.findIndex(mimeType => mimeType.rendererId !== RENDERER_NOT_AVAILABLE && mimeType.isTrusted), 0);
+		}
+
+		return [mimeTypes, this._pickedMimeType];
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
index bbc8ee237..1e8f4a83f 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
@@ -10,10 +10,12 @@ import * as model from 'vs/editor/common/model';
 import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { BOTTOM_CELL_TOOLBAR_GAP, BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_BOTTOM_MARGIN, CELL_MARGIN, CELL_RUN_GUTTER, CELL_TOP_MARGIN, CODE_CELL_LEFT_MARGIN, COLLAPSED_INDICATOR_HEIGHT, EDITOR_BOTTOM_PADDING, EDITOR_TOOLBAR_HEIGHT } from 'vs/workbench/contrib/notebook/browser/constants';
-import { CellEditState, CellFindMatch, CodeCellLayoutChangeEvent, CodeCellLayoutInfo, CodeCellLayoutState, getEditorTopPadding, ICellViewModel, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState, CellFindMatch, CodeCellLayoutChangeEvent, CodeCellLayoutInfo, CodeCellLayoutState, getEditorTopPadding, ICellOutputViewModel, ICellViewModel, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellOutputViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel';
 import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { CellKind, INotebookSearchOptions, NotebookCellOutputsSplice } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { BaseCellViewModel } from './baseCellViewModel';
 
 export class CodeCellViewModel extends BaseCellViewModel implements ICellViewModel {
@@ -31,9 +33,6 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 	}
 
 	private _outputsTop: PrefixSumComputer | null = null;
-	get outputs() {
-		return this.model.outputs;
-	}
 
 	protected readonly _onDidChangeLayout = new Emitter<CodeCellLayoutChangeEvent>();
 	readonly onDidChangeLayout = this._onDidChangeLayout.event;
@@ -65,18 +64,29 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 		return this._layoutInfo;
 	}
 
+	private _outputViewModels: ICellOutputViewModel[];
+
+	get outputsViewModels() {
+		return this._outputViewModels;
+	}
+
 	constructor(
 		readonly viewType: string,
 		readonly model: NotebookCellTextModel,
 		initialNotebookLayoutInfo: NotebookLayoutInfo | null,
 		readonly eventDispatcher: NotebookEventDispatcher,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@INotebookService private _notebookService: INotebookService
 	) {
 		super(viewType, model, UUID.generateUuid(), configurationService);
+		this._outputViewModels = this.model.outputs.map(output => new CellOutputViewModel(this, output, this._notebookService));
+
 		this._register(this.model.onDidChangeOutputs((splices) => {
 			splices.reverse().forEach(splice => {
 				this._outputCollection.splice(splice[0], splice[1], ...splice[2].map(() => 0));
+				this._outputViewModels.splice(splice[0], splice[1], ...splice[2].map(output => new CellOutputViewModel(this, output, this._notebookService)));
 			});
+
 			this._outputsTop = null;
 			this._onDidChangeOutputs.fire(splices);
 		}));
@@ -260,8 +270,8 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
 			throw new Error('Output index out of range!');
 		}
 
-		this._outputCollection[index] = height;
 		this._ensureOutputsTop();
+		this._outputCollection[index] = height;
 		if (this._outputsTop!.changeValue(index, height)) {
 			this.layoutChange({ outputHeight: true });
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
index bca810545..c20c60d81 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher.ts
@@ -71,23 +71,3 @@ export class NotebookEventDispatcher {
 	}
 }
 
-export class NotebookDiffEditorEventDispatcher {
-	protected readonly _onDidChangeLayout = new Emitter<NotebookLayoutChangedEvent>();
-	readonly onDidChangeLayout = this._onDidChangeLayout.event;
-
-	constructor() {
-	}
-
-	emit(events: NotebookViewEvent[]) {
-		for (let i = 0, len = events.length; i < len; i++) {
-			const e = events[i];
-
-			switch (e.type) {
-				case NotebookViewEventType.LayoutChanged:
-					this._onDidChangeLayout.fire(e);
-					break;
-			}
-		}
-	}
-
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts
index 75e027a9e..eae9ae007 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts
@@ -11,7 +11,7 @@ import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { BOTTOM_CELL_TOOLBAR_GAP, BOTTOM_CELL_TOOLBAR_HEIGHT, CELL_BOTTOM_MARGIN, CELL_MARGIN, CELL_TOP_MARGIN, CODE_CELL_LEFT_MARGIN, COLLAPSED_INDICATOR_HEIGHT } from 'vs/workbench/contrib/notebook/browser/constants';
 import { EditorFoldingStateDelegate } from 'vs/workbench/contrib/notebook/browser/contrib/fold/foldingModel';
-import { CellFindMatch, ICellViewModel, MarkdownCellLayoutChangeEvent, MarkdownCellLayoutInfo, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellFindMatch, ICellOutputViewModel, ICellViewModel, MarkdownCellLayoutChangeEvent, MarkdownCellLayoutInfo, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { MarkdownRenderer } from 'vs/editor/browser/core/markdownRenderer';
 import { BaseCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel';
 import { NotebookCellStateChangedEvent, NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
@@ -60,6 +60,15 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie
 		return this.foldingDelegate.getFoldingState(this.foldingDelegate.getCellIndex(this));
 	}
 
+	private _hoveringOutput: boolean = false;
+	public get outputIsHovered(): boolean {
+		return this._hoveringOutput;
+	}
+
+	public set outputIsHovered(v: boolean) {
+		this._hoveringOutput = v;
+	}
+
 	constructor(
 		readonly viewType: string,
 		readonly model: NotebookCellTextModel,
@@ -84,6 +93,18 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie
 		}));
 	}
 
+	/**
+	 * we put outputs stuff here to make compiler happy
+	 */
+	outputsViewModels: ICellOutputViewModel[] = [];
+	getOutputOffset(index: number): number {
+		// throw new Error('Method not implemented.');
+		return -1;
+	}
+	updateOutputHeight(index: number, height: number): void {
+		// throw new Error('Method not implemented.');
+	}
+
 	triggerfoldingStateChange() {
 		this._onDidChangeState.fire({ foldingStateChanged: true });
 	}
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index 709f0a4f7..061b50230 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -12,7 +12,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { hash } from 'vs/base/common/hash';
-import { createTextBuffer } from 'vs/editor/common/model/textModel';
+import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 export class NotebookCellTextModel extends Disposable implements ICell {
 	private _onDidChangeOutputs = new Emitter<NotebookCellOutputsSplice[]>();
@@ -65,7 +65,9 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 		const builder = new PieceTreeTextBufferBuilder();
 		builder.acceptChunk(this._source);
 		const bufferFactory = builder.finish(true);
-		this._textBuffer = bufferFactory.create(model.DefaultEndOfLine.LF);
+		const { textBuffer, disposable } = bufferFactory.create(model.DefaultEndOfLine.LF);
+		this._textBuffer = textBuffer;
+		this._register(disposable);
 
 		this._register(this._textBuffer.onDidChangeContent(() => {
 			this._hash = null;
@@ -174,7 +176,9 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 	dispose() {
 		// Manually release reference to previous text buffer to avoid large leaks
 		// in case someone leaks a CellTextModel reference
-		this._textBuffer = createTextBuffer('', model.DefaultEndOfLine.LF);
+		const emptyDisposedTextBuffer = new PieceTreeTextBuffer([], '', '\n', false, false, true, true);
+		emptyDisposedTextBuffer.dispose();
+		this._textBuffer = emptyDisposedTextBuffer;
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index f932f185e..b96bd8119 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -257,7 +257,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		super();
 		this.transientOptions = options;
 		this.metadata = metadata;
-		this.updateLanguages(languages);
+		this.updateLanguages(metadata.languages && metadata.languages.length ? metadata.languages : languages);
 		this._initialize(cells);
 
 		this._eventEmitter = new DelayedEmitter(
@@ -498,6 +498,10 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		const oldMetadata = this.metadata;
 		this.metadata = metadata;
 
+		if (this.metadata.languages && this.metadata.languages.length) {
+			this.updateLanguages(this.metadata.languages);
+		}
+
 		if (computeUndoRedo) {
 			const that = this;
 			this._operationManager.pushEditOperation(new class implements IResourceUndoRedoElement {
@@ -507,10 +511,16 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 				}
 				readonly label = 'Update Notebook Metadata';
 				undo() {
-					that._updateNotebookMetadata(oldMetadata, false);
+					that._updateNotebookMetadata({
+						...oldMetadata,
+						runState: that.metadata.runState
+					}, false);
 				}
 				redo() {
-					that._updateNotebookMetadata(metadata, false);
+					that._updateNotebookMetadata({
+						...metadata,
+						runState: that.metadata.runState
+					}, false);
 				}
 			}(), undefined, undefined);
 		}
@@ -620,7 +630,10 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 						if (!cell) {
 							return;
 						}
-						this._changeCellMetadata(cell.handle, newMetadata, false);
+						this._changeCellMetadata(cell.handle, {
+							...newMetadata,
+							runState: cell.metadata.runState
+						}, false);
 					}
 				}), undefined, undefined);
 			}
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index 941f4a479..c9d8c53ab 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -74,6 +74,7 @@ export const notebookDocumentMetadataDefaults: Required<NotebookDocumentMetadata
 	displayOrder: NOTEBOOK_DISPLAY_ORDER,
 	custom: {},
 	runState: NotebookRunState.Idle,
+	languages: [],
 	trusted: true
 };
 
@@ -86,6 +87,7 @@ export interface NotebookDocumentMetadata {
 	displayOrder?: (string | glob.IRelativePattern)[];
 	custom?: { [key: string]: unknown };
 	runState?: NotebookRunState;
+	languages: string[];
 	trusted: boolean;
 }
 
@@ -271,36 +273,6 @@ export interface INotebookTextModel {
 	onWillDispose(listener: () => void): IDisposable;
 }
 
-export const enum RenderOutputType {
-	None,
-	Html,
-	Extension
-}
-
-export interface IRenderNoOutput {
-	type: RenderOutputType.None;
-	hasDynamicHeight: boolean;
-}
-
-export interface IRenderPlainHtmlOutput {
-	type: RenderOutputType.Html;
-	source: ITransformedDisplayOutputDto;
-	htmlContent: string;
-	hasDynamicHeight: boolean;
-}
-
-export interface IRenderOutputViaExtension {
-	type: RenderOutputType.Extension;
-	source: ITransformedDisplayOutputDto;
-	mimeType: string;
-	renderer: INotebookRendererInfo;
-}
-
-export type IInsetRenderOutput = IRenderPlainHtmlOutput | IRenderOutputViaExtension;
-export type IRenderOutput = IRenderNoOutput | IInsetRenderOutput;
-
-export const outputHasDynamicHeight = (o: IRenderOutput) => o.type !== RenderOutputType.Extension && o.hasDynamicHeight;
-
 export type NotebookCellTextModelSplice<T> = [
 	number /* start */,
 	number,
@@ -503,20 +475,12 @@ export namespace CellUri {
 
 	export const scheme = Schemas.vscodeNotebookCell;
 
-	const _regex = /^\d{7,}/;
+	const _regex = /^ch(\d{7,})/;
 
 	export function generate(notebook: URI, handle: number): URI {
 		return notebook.with({
 			scheme,
-			fragment: `${handle.toString().padStart(7, '0')}${notebook.scheme !== Schemas.file ? notebook.scheme : ''}`
-		});
-	}
-
-	export function generateCellMetadataUri(notebook: URI, handle: number): URI {
-		return notebook.with({
-			scheme: Schemas.vscode,
-			authority: 'vscode-notebook-cell-metadata',
-			fragment: `${handle.toString().padStart(7, '0')}${notebook.scheme !== Schemas.file ? notebook.scheme : ''}`
+			fragment: `ch${handle.toString().padStart(7, '0')}${notebook.scheme !== Schemas.file ? notebook.scheme : ''}`
 		});
 	}
 
@@ -528,7 +492,7 @@ export namespace CellUri {
 		if (!match) {
 			return undefined;
 		}
-		const handle = Number(match[0]);
+		const handle = Number(match[1]);
 		return {
 			handle,
 			notebook: cell.with({
@@ -537,6 +501,31 @@ export namespace CellUri {
 			})
 		};
 	}
+
+	export function generateCellMetadataUri(notebook: URI, handle: number): URI {
+		return notebook.with({
+			scheme: Schemas.vscodeNotebookCellMetadata,
+			fragment: `ch${handle.toString().padStart(7, '0')}${notebook.scheme !== Schemas.file ? notebook.scheme : ''}`
+		});
+	}
+
+	export function parseCellMetadataUri(metadata: URI) {
+		if (metadata.scheme !== Schemas.vscodeNotebookCellMetadata) {
+			return undefined;
+		}
+		const match = _regex.exec(metadata.fragment);
+		if (!match) {
+			return undefined;
+		}
+		const handle = Number(match[1]);
+		return {
+			handle,
+			notebook: metadata.with({
+				scheme: metadata.fragment.substr(match[0].length) || Schemas.file,
+				fragment: null
+			})
+		};
+	}
 }
 
 export function mimeTypeIsAlwaysSecure(mimeType: string) {
@@ -812,7 +801,8 @@ export function notebookDocumentFilterMatch(filter: INotebookDocumentFilter, vie
 }
 
 export interface INotebookKernelInfoDto2 {
-	id: string;
+	id?: string;
+	friendlyId: string;
 	label: string;
 	extension: ExtensionIdentifier;
 	extensionLocation: URI;
@@ -887,4 +877,3 @@ export interface INotebookDecorationRenderOptions {
 	borderColor?: string | ThemeColor;
 	top?: editorCommon.IContentDecorationRenderOptions;
 }
-
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
index d68e4142f..ace31e6a1 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
@@ -5,9 +5,9 @@
 
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { URI } from 'vs/base/common/uri';
-import { INotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, INotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
-import { DisposableStore, IDisposable, IReference, ReferenceCollection } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore, IDisposable, IReference, ReferenceCollection } from 'vs/base/common/lifecycle';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Event } from 'vs/base/common/event';
@@ -61,6 +61,9 @@ export class NotebookModelResolverService implements INotebookEditorModelResolve
 	}
 
 	async resolve(resource: URI, viewType?: string): Promise<IReference<INotebookEditorModel>> {
+		if (resource.scheme === CellUri.scheme) {
+			throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${resource.toString()}`);
+		}
 
 		const existingViewType = this._notebookService.getNotebookTextModel(resource)?.viewType;
 		if (!viewType) {
@@ -83,14 +86,17 @@ export class NotebookModelResolverService implements INotebookEditorModelResolve
 
 		const reference = this._data.acquire(resource.toString(), viewType);
 		const model = await reference.object;
-		NotebookModelResolverService._autoReferenceDirtyModel(model, () => this._data.acquire(resource.toString(), viewType));
+		const autoRef = NotebookModelResolverService._autoReferenceDirtyModel(model, () => this._data.acquire(resource.toString(), viewType));
 		return {
 			object: model,
-			dispose() { reference.dispose(); }
+			dispose() {
+				reference.dispose();
+				autoRef.dispose();
+			}
 		};
 	}
 
-	private static _autoReferenceDirtyModel(model: INotebookEditorModel, ref: () => IDisposable) {
+	private static _autoReferenceDirtyModel(model: INotebookEditorModel, ref: () => IDisposable): IDisposable {
 
 		const references = new DisposableStore();
 		const listener = model.onDidChangeDirty(() => {
@@ -101,9 +107,11 @@ export class NotebookModelResolverService implements INotebookEditorModelResolve
 			}
 		});
 
-		Event.once(model.notebook.onWillDispose)(() => {
+		const onceListener = Event.once(model.notebook.onWillDispose)(() => {
 			listener.dispose();
 			references.dispose();
 		});
+
+		return combinedDisposable(references, listener, onceListener);
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts
index 06f770817..8028a5213 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts
@@ -26,7 +26,7 @@ export interface IMainNotebookController {
 	supportBackup: boolean;
 	viewOptions?: { displayName: string; filenamePattern: (string | IRelativePattern | INotebookExclusiveDocumentFilter)[]; exclusive: boolean; };
 	options: { transientOutputs: boolean; transientMetadata: TransientMetadata; };
-	resolveNotebookDocument(viewType: string, uri: URI, backupId?: string): Promise<{ data: NotebookDataDto, transientOptions: TransientOptions }>;
+	resolveNotebookDocument(viewType: string, uri: URI, backupId?: string): Promise<{ data: NotebookDataDto, transientOptions: TransientOptions; }>;
 	reloadNotebook(mainthreadTextModel: NotebookTextModel): Promise<void>;
 	resolveNotebookEditor(viewType: string, uri: URI, editorId: string): Promise<void>;
 	onDidReceiveMessage(editorId: string, rendererType: string | undefined, message: any): void;
@@ -46,13 +46,14 @@ export interface INotebookService {
 	onDidAddNotebookDocument: Event<NotebookTextModel>;
 	onNotebookDocumentSaved: Event<URI>;
 	onDidChangeKernels: Event<URI | undefined>;
-	onDidChangeNotebookActiveKernel: Event<{ uri: URI, providerHandle: number | undefined, kernelId: string | undefined }>;
+	onDidChangeNotebookActiveKernel: Event<{ uri: URI, providerHandle: number | undefined, kernelFriendlyId: string | undefined; }>;
 	registerNotebookController(viewType: string, extensionData: NotebookExtensionDescription, controller: IMainNotebookController): IDisposable;
 
 	getMimeTypeInfo(textModel: NotebookTextModel, output: ITransformedDisplayOutputDto): readonly IOrderedMimeType[];
 
 	registerNotebookKernelProvider(provider: INotebookKernelProvider): IDisposable;
 	getContributedNotebookKernels(viewType: string, resource: URI, token: CancellationToken): Promise<INotebookKernelInfo2[]>;
+	getContributedNotebookKernelProviders(): Promise<INotebookKernelProvider[]>;
 	getContributedNotebookOutputRenderers(id: string): NotebookOutputRendererInfo | undefined;
 	getRendererInfo(id: string): INotebookRendererInfo | undefined;
 
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index f0a0fd994..66d7be20d 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -24,7 +24,7 @@ class MirrorCell {
 		const builder = new PieceTreeTextBufferBuilder();
 		builder.acceptChunk(Array.isArray(this._source) ? this._source.join('\n') : this._source);
 		const bufferFactory = builder.finish(true);
-		this._textBuffer = bufferFactory.create(model.DefaultEndOfLine.LF);
+		this._textBuffer = bufferFactory.create(model.DefaultEndOfLine.LF).textBuffer;
 
 		return this._textBuffer;
 	}
diff --git a/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
index d6e000d64..7f8c507b3 100644
--- a/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/electron-browser/notebook.contribution.ts
@@ -37,7 +37,7 @@ function withWebview(accessor: ServicesAccessor, f: (webviewe: ElectronWebviewBa
 	return false;
 }
 
-const PRIORITY = 100;
+const PRIORITY = 105;
 
 UndoCommand.addImplementation(PRIORITY, accessor => {
 	return withWebview(accessor, webview => webview.undo());
diff --git a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
index 1ec883fe1..16b979526 100644
--- a/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/notebookViewModel.test.ts
@@ -156,7 +156,7 @@ suite('NotebookViewModel', () => {
 				['var e = 5;', 'javascript', CellKind.Code, [], { editable: false, runnable: false }],
 			],
 			(editor, viewModel) => {
-				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: true, cellEditable: true, cellHasExecutionOrder: true, trusted: true };
+				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: true, cellEditable: true, cellHasExecutionOrder: true, trusted: true, languages: [] };
 
 				const defaults = { hasExecutionOrder: true };
 
@@ -190,7 +190,7 @@ suite('NotebookViewModel', () => {
 					...defaults
 				});
 
-				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: false, cellEditable: true, cellHasExecutionOrder: true, trusted: true };
+				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: false, cellEditable: true, cellHasExecutionOrder: true, trusted: true, languages: [] };
 
 				assert.deepEqual(viewModel.viewCells[0].getEvaluatedMetadata(viewModel.metadata), <NotebookCellMetadata>{
 					editable: true,
@@ -222,7 +222,7 @@ suite('NotebookViewModel', () => {
 					...defaults
 				});
 
-				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: false, cellEditable: false, cellHasExecutionOrder: true, trusted: true };
+				viewModel.notebookDocument.metadata = { editable: true, runnable: true, cellRunnable: false, cellEditable: false, cellHasExecutionOrder: true, trusted: true, languages: [] };
 
 				assert.deepEqual(viewModel.viewCells[0].getEvaluatedMetadata(viewModel.metadata), <NotebookCellMetadata>{
 					editable: false,
diff --git a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
index 855ffe9fc..1878693e8 100644
--- a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
@@ -12,13 +12,13 @@ import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { Range } from 'vs/editor/common/core/range';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { EditorModel } from 'vs/workbench/common/editor';
-import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookEditorMouseEvent, NotebookLayoutInfo, INotebookDeltaDecoration, INotebookEditorCreationOptions, NotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { ICellViewModel, INotebookEditor, INotebookEditorContribution, INotebookEditorMouseEvent, NotebookLayoutInfo, INotebookDeltaDecoration, INotebookEditorCreationOptions, NotebookEditorOptions, ICellOutputViewModel, IInsetRenderOutput, IDisplayOutputViewModel, ICommonCellInfo, IGenericCellViewModel, INotebookCellOutputLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { OutputRenderer } from 'vs/workbench/contrib/notebook/browser/view/output/outputRenderer';
 import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
 import { CellViewModel, IModelDecorationsChangeAccessor, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, CellUri, INotebookEditorModel, IProcessedOutput, NotebookCellMetadata, IInsetRenderOutput, ICellRange, INotebookKernelInfo2, notebookDocumentMetadataDefaults } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellUri, INotebookEditorModel, IProcessedOutput, NotebookCellMetadata, ICellRange, INotebookKernelInfo2, notebookDocumentMetadataDefaults } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { ICompositeCodeEditor, IEditor } from 'vs/editor/common/editorCommon';
 import { NotImplementedError } from 'vs/base/common/errors';
@@ -66,6 +66,24 @@ export class TestNotebookEditor implements INotebookEditor {
 
 	constructor(
 	) { }
+	revealCellRangeInView(range: ICellRange): void {
+		throw new Error('Method not implemented.');
+	}
+	revealInViewAtTop(cell: ICellViewModel): void {
+		throw new Error('Method not implemented.');
+	}
+	getCellOutputLayoutInfo(cell: IGenericCellViewModel): INotebookCellOutputLayoutInfo {
+		throw new Error('Method not implemented.');
+	}
+	focusNextNotebookCell(cell: ICellViewModel, focus: 'editor' | 'container' | 'output'): void {
+		throw new Error('Method not implemented.');
+	}
+	getCellByInfo(cellInfo: ICommonCellInfo): ICellViewModel {
+		throw new Error('Method not implemented.');
+	}
+	updateOutputHeight(cellInfo: ICommonCellInfo, output: IDisplayOutputViewModel, height: number, isInit: boolean): void {
+		throw new Error('Method not implemented.');
+	}
 	async beginComputeContributedKernels(): Promise<INotebookKernelInfo2[]> {
 		return [];
 	}
@@ -84,7 +102,7 @@ export class TestNotebookEditor implements INotebookEditor {
 		throw new Error('Method not implemented.');
 	}
 
-	hideInset(output: IProcessedOutput): void {
+	hideInset(output: ICellOutputViewModel): void {
 		throw new Error('Method not implemented.');
 	}
 
@@ -282,7 +300,7 @@ export class TestNotebookEditor implements INotebookEditor {
 	createInset(cell: CellViewModel, output: IInsetRenderOutput, offset: number): Promise<void> {
 		return Promise.resolve();
 	}
-	removeInset(output: IProcessedOutput): void {
+	removeInset(output: ICellOutputViewModel): void {
 		// throw new Error('Method not implemented.');
 	}
 	triggerScroll(event: IMouseWheelEvent): void {
@@ -291,7 +309,7 @@ export class TestNotebookEditor implements INotebookEditor {
 	getFontInfo(): BareFontInfo | undefined {
 		return BareFontInfo.createFromRawSettings({
 			fontFamily: 'Monaco',
-		}, 1, true);
+		}, 1, 1, true);
 	}
 	getOutputRenderer(): OutputRenderer {
 		throw new Error('Method not implemented.');
diff --git a/src/vs/workbench/contrib/outline/browser/outline.contribution.ts b/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
index 01b5f2a9e..5b512f1e3 100644
--- a/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
+++ b/src/vs/workbench/contrib/outline/browser/outline.contribution.ts
@@ -8,18 +8,17 @@ import { IViewsRegistry, IViewDescriptor, Extensions as ViewExtensions } from 'v
 import { OutlinePane } from './outlinePane';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { OutlineConfigKeys, OutlineViewId } from 'vs/editor/contrib/documentSymbols/outline';
 import { VIEW_CONTAINER } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { OutlineConfigKeys } from 'vs/workbench/services/outline/browser/outline';
 
-export const PANEL_ID = 'panel.view.outline';
 
 const outlineViewIcon = registerIcon('outline-view-icon', Codicon.symbolClass, localize('outlineViewIcon', 'View icon of the outline view.'));
 
 const _outlineDesc = <IViewDescriptor>{
-	id: OutlineViewId,
+	id: OutlinePane.Id,
 	name: localize('name', "Outline"),
 	containerIcon: outlineViewIcon,
 	ctorDescriptor: new SyncDescriptor(OutlinePane),
@@ -171,41 +170,49 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		'outline.showObjects': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.object', "When enabled outline shows `object`-symbols.")
 		},
 		'outline.showKeys': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.key', "When enabled outline shows `key`-symbols.")
 		},
 		'outline.showNull': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.null', "When enabled outline shows `null`-symbols.")
 		},
 		'outline.showEnumMembers': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.enumMember', "When enabled outline shows `enumMember`-symbols.")
 		},
 		'outline.showStructs': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.struct', "When enabled outline shows `struct`-symbols.")
 		},
 		'outline.showEvents': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.event', "When enabled outline shows `event`-symbols.")
 		},
 		'outline.showOperators': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.operator', "When enabled outline shows `operator`-symbols.")
 		},
 		'outline.showTypeParameters': {
 			type: 'boolean',
 			default: true,
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 			markdownDescription: localize('filteredTypes.typeParameter', "When enabled outline shows `typeParameter`-symbols.")
 		}
 	}
diff --git a/src/vs/workbench/contrib/outline/browser/outlinePane.ts b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
index ab48b16b7..5a3c40481 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePane.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
@@ -6,263 +6,91 @@
 import 'vs/css!./outlinePane';
 import * as dom from 'vs/base/browser/dom';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Action, IAction, RadioGroup, Separator } from 'vs/base/common/actions';
-import { createCancelablePromise, TimeoutTimer } from 'vs/base/common/async';
-import { isPromiseCanceledError } from 'vs/base/common/errors';
-import { Emitter, Event } from 'vs/base/common/event';
-import { defaultGenerator } from 'vs/base/common/idGenerator';
+import { TimeoutTimer } from 'vs/base/common/async';
 import { IDisposable, toDisposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { LRUCache } from 'vs/base/common/map';
-import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ITextModel } from 'vs/editor/common/model';
-import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
-import { DocumentSymbolProviderRegistry } from 'vs/editor/common/modes';
-import { LanguageFeatureRegistry } from 'vs/editor/common/modes/languageFeatureRegistry';
-import { OutlineElement, OutlineModel, TreeElement, IOutlineMarker } from 'vs/editor/contrib/documentSymbols/outlineModel';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { WorkbenchDataTree } from 'vs/platform/list/browser/listService';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { CollapseAction } from 'vs/workbench/browser/viewlet';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { OutlineConfigKeys, OutlineViewFocused, OutlineViewFiltered } from 'vs/editor/contrib/documentSymbols/outline';
 import { FuzzyScore } from 'vs/base/common/filters';
-import { OutlineDataSource, OutlineItemComparator, OutlineSortOrder, OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItem, OutlineIdentityProvider, OutlineNavigationLabelProvider, OutlineFilter, OutlineAccessibilityProvider } from 'vs/editor/contrib/documentSymbols/outlineTree';
 import { IDataTreeViewState } from 'vs/base/browser/ui/tree/dataTree';
 import { basename } from 'vs/base/common/resources';
-import { IDataSource } from 'vs/base/browser/ui/tree/tree';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
-import { MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Codicon } from 'vs/base/common/codicons';
+import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { OutlineSortOrder, OutlineViewState } from './outlineViewState';
+import { IOutline, IOutlineComparator, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { EditorResourceAccessor, IEditorPane } from 'vs/workbench/common/editor';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Event } from 'vs/base/common/event';
+import { ITreeSorter } from 'vs/base/browser/ui/tree/tree';
 
-class RequestState {
+const _ctxFollowsCursor = new RawContextKey('outlineFollowsCursor', false);
+const _ctxFilterOnType = new RawContextKey('outlineFiltersOnType', false);
+const _ctxSortMode = new RawContextKey<OutlineSortOrder>('outlineSortMode', OutlineSortOrder.ByPosition);
+
+class OutlineTreeSorter<E> implements ITreeSorter<E> {
 
 	constructor(
-		private _editorId: string,
-		private _modelId: string,
-		private _modelVersion: number,
-		private _providerCount: number
-	) {
-		//
-	}
+		private _comparator: IOutlineComparator<E>,
+		public order: OutlineSortOrder
+	) { }
 
-	equals(other: RequestState): boolean {
-		return other
-			&& this._editorId === other._editorId
-			&& this._modelId === other._modelId
-			&& this._modelVersion === other._modelVersion
-			&& this._providerCount === other._providerCount;
-	}
-}
-
-class RequestOracle {
-
-	private readonly _disposables = new DisposableStore();
-	private _sessionDisposable = new MutableDisposable();
-	private _lastState?: RequestState;
-
-	constructor(
-		private readonly _callback: (editor: ICodeEditor | undefined, change: IModelContentChangedEvent | undefined) => any,
-		private readonly _featureRegistry: LanguageFeatureRegistry<any>,
-		@IEditorService private readonly _editorService: IEditorService,
-	) {
-		_editorService.onDidActiveEditorChange(this._update, this, this._disposables);
-		_featureRegistry.onDidChange(this._update, this, this._disposables);
-		this._update();
-	}
-
-	dispose(): void {
-		this._disposables.dispose();
-		this._sessionDisposable.dispose();
-	}
-
-	private _update(): void {
-
-		let control = this._editorService.activeTextEditorControl;
-		let codeEditor: ICodeEditor | undefined = undefined;
-		if (isCodeEditor(control)) {
-			codeEditor = control;
-		} else if (isDiffEditor(control)) {
-			codeEditor = control.getModifiedEditor();
-		}
-
-		if (!codeEditor || !codeEditor.hasModel()) {
-			this._lastState = undefined;
-			this._callback(undefined, undefined);
-			return;
-		}
-
-		let thisState = new RequestState(
-			codeEditor.getId(),
-			codeEditor.getModel().id,
-			codeEditor.getModel().getVersionId(),
-			this._featureRegistry.all(codeEditor.getModel()).length
-		);
-
-		if (this._lastState && thisState.equals(this._lastState)) {
-			// prevent unnecessary changes...
-			return;
-		}
-		this._lastState = thisState;
-		this._callback(codeEditor, undefined);
-
-		let handle: any;
-		let contentListener = codeEditor.onDidChangeModelContent(event => {
-			clearTimeout(handle);
-			const timeout = OutlineModel.getRequestDelay(codeEditor!.getModel());
-			handle = setTimeout(() => this._callback(codeEditor!, event), timeout);
-		});
-		let modeListener = codeEditor.onDidChangeModelLanguage(_ => {
-			this._callback(codeEditor!, undefined);
-		});
-		let disposeListener = codeEditor.onDidDispose(() => {
-			this._callback(undefined, undefined);
-		});
-		this._sessionDisposable.value = {
-			dispose() {
-				contentListener.dispose();
-				clearTimeout(handle);
-				modeListener.dispose();
-				disposeListener.dispose();
-			}
-		};
-	}
-}
-
-class SimpleToggleAction extends Action {
-
-	private readonly _listener: IDisposable;
-
-	constructor(state: OutlineViewState, label: string, isChecked: () => boolean, callback: (action: SimpleToggleAction) => any, className?: string) {
-		super(`simple` + defaultGenerator.nextId(), label, className, true, () => {
-			this.checked = !this.checked;
-			callback(this);
-			return Promise.resolve();
-		});
-		this.checked = isChecked();
-		this._listener = state.onDidChange(() => this.checked = isChecked());
-	}
-
-	dispose(): void {
-		this._listener.dispose();
-		super.dispose();
-	}
-}
-
-
-class OutlineViewState {
-
-	private _followCursor = false;
-	private _filterOnType = true;
-	private _sortBy = OutlineSortOrder.ByKind;
-
-	private readonly _onDidChange = new Emitter<{ followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }>();
-	readonly onDidChange = this._onDidChange.event;
-
-	set followCursor(value: boolean) {
-		if (value !== this._followCursor) {
-			this._followCursor = value;
-			this._onDidChange.fire({ followCursor: true });
-		}
-	}
-
-	get followCursor(): boolean {
-		return this._followCursor;
-	}
-
-	get filterOnType() {
-		return this._filterOnType;
-	}
-
-	set filterOnType(value) {
-		if (value !== this._filterOnType) {
-			this._filterOnType = value;
-			this._onDidChange.fire({ filterOnType: true });
-		}
-	}
-
-	set sortBy(value: OutlineSortOrder) {
-		if (value !== this._sortBy) {
-			this._sortBy = value;
-			this._onDidChange.fire({ sortBy: true });
-		}
-	}
-
-	get sortBy(): OutlineSortOrder {
-		return this._sortBy;
-	}
-
-	persist(storageService: IStorageService): void {
-		storageService.store('outline/state', JSON.stringify({
-			followCursor: this.followCursor,
-			sortBy: this.sortBy,
-			filterOnType: this.filterOnType,
-		}), StorageScope.WORKSPACE, StorageTarget.USER);
-	}
-
-	restore(storageService: IStorageService): void {
-		let raw = storageService.get('outline/state', StorageScope.WORKSPACE);
-		if (!raw) {
-			return;
-		}
-		let data: any;
-		try {
-			data = JSON.parse(raw);
-		} catch (e) {
-			return;
-		}
-		this.followCursor = data.followCursor;
-		this.sortBy = data.sortBy;
-		if (typeof data.filterOnType === 'boolean') {
-			this.filterOnType = data.filterOnType;
+	compare(a: E, b: E): number {
+		if (this.order === OutlineSortOrder.ByKind) {
+			return this._comparator.compareByType(a, b);
+		} else if (this.order === OutlineSortOrder.ByName) {
+			return this._comparator.compareByName(a, b);
+		} else {
+			return this._comparator.compareByPosition(a, b);
 		}
 	}
 }
 
 export class OutlinePane extends ViewPane {
 
-	private _disposables = new DisposableStore();
+	static readonly Id = 'outline';
+
+	private readonly _disposables = new DisposableStore();
+
+	private readonly _editorDisposables = new DisposableStore();
+	private readonly _outlineViewState = new OutlineViewState();
+
+	private readonly _editorListener = new MutableDisposable();
 
-	private _editorDisposables = new DisposableStore();
-	private _outlineViewState = new OutlineViewState();
-	private _requestOracle?: RequestOracle;
 	private _domNode!: HTMLElement;
 	private _message!: HTMLDivElement;
 	private _progressBar!: ProgressBar;
-	private _tree!: WorkbenchDataTree<OutlineModel, OutlineItem, FuzzyScore>;
-	private _treeDataSource!: OutlineDataSource;
-	private _treeRenderer!: OutlineElementRenderer;
-	private _treeComparator!: OutlineItemComparator;
-	private _treeFilter!: OutlineFilter;
+	private _treeContainer!: HTMLElement;
+	private _tree?: WorkbenchDataTree<IOutline<any> | undefined, any, FuzzyScore>;
+	private _treeDimensions?: dom.Dimension;
 	private _treeStates = new LRUCache<string, IDataTreeViewState>(10);
 
-	private readonly _contextKeyFocused: IContextKey<boolean>;
-	private readonly _contextKeyFiltered: IContextKey<boolean>;
+	private _ctxFollowsCursor!: IContextKey<boolean>;
+	private _ctxFilterOnType!: IContextKey<boolean>;
+	private _ctxSortMode!: IContextKey<OutlineSortOrder>;
 
 	constructor(
 		options: IViewletViewOptions,
+		@IOutlineService private readonly _outlineService: IOutlineService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IStorageService private readonly _storageService: IStorageService,
-		@ICodeEditorService private readonly _editorService: ICodeEditorService,
-		@IMarkerDecorationsService private readonly _markerDecorationService: IMarkerDecorationsService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -270,25 +98,34 @@ export class OutlinePane extends ViewPane {
 		@IThemeService themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
 	) {
-		super(options, keybindingService, contextMenuService, _configurationService, contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, telemetryService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, telemetryService);
 		this._outlineViewState.restore(this._storageService);
-		this._contextKeyFocused = OutlineViewFocused.bindTo(contextKeyService);
-		this._contextKeyFiltered = OutlineViewFiltered.bindTo(contextKeyService);
-		this._disposables.add(this.onDidFocus(_ => this._contextKeyFocused.set(true)));
-		this._disposables.add(this.onDidBlur(_ => this._contextKeyFocused.set(false)));
+		this._disposables.add(this._outlineViewState);
+
+		contextKeyService.bufferChangeEvents(() => {
+			this._ctxFollowsCursor = _ctxFollowsCursor.bindTo(contextKeyService);
+			this._ctxFilterOnType = _ctxFilterOnType.bindTo(contextKeyService);
+			this._ctxSortMode = _ctxSortMode.bindTo(contextKeyService);
+		});
+
+		const updateContext = () => {
+			this._ctxFollowsCursor.set(this._outlineViewState.followCursor);
+			this._ctxFilterOnType.set(this._outlineViewState.filterOnType);
+			this._ctxSortMode.set(this._outlineViewState.sortBy);
+		};
+		updateContext();
+		this._disposables.add(this._outlineViewState.onDidChange(updateContext));
 	}
 
 	dispose(): void {
 		this._disposables.dispose();
-		this._requestOracle?.dispose();
 		this._editorDisposables.dispose();
+		this._editorListener.dispose();
 		super.dispose();
 	}
 
 	focus(): void {
-		if (this._tree) {
-			this._tree.domFocus();
-		}
+		this._tree?.domFocus();
 	}
 
 	protected renderBody(container: HTMLElement): void {
@@ -301,340 +138,325 @@ export class OutlinePane extends ViewPane {
 		this._message = dom.$('.outline-message');
 
 		this._progressBar = new ProgressBar(progressContainer);
-		this._register(attachProgressBarStyler(this._progressBar, this._themeService));
+		this._disposables.add(attachProgressBarStyler(this._progressBar, this._themeService));
 
-		let treeContainer = dom.$('.outline-tree');
-		dom.append(
-			container,
-			progressContainer, this._message, treeContainer
-		);
+		this._treeContainer = dom.$('.outline-tree');
+		dom.append(container, progressContainer, this._message, this._treeContainer);
 
-		this._treeRenderer = this._instantiationService.createInstance(OutlineElementRenderer);
-		this._treeDataSource = new OutlineDataSource();
-		this._treeComparator = new OutlineItemComparator(this._outlineViewState.sortBy);
-		this._treeFilter = this._instantiationService.createInstance(OutlineFilter, 'outline');
-		this._tree = <WorkbenchDataTree<OutlineModel, OutlineItem, FuzzyScore>>this._instantiationService.createInstance(
-			WorkbenchDataTree,
-			'OutlinePane',
-			treeContainer,
-			new OutlineVirtualDelegate(),
-			[new OutlineGroupRenderer(), this._treeRenderer],
-			// https://github.com/microsoft/TypeScript/issues/32526
-			this._treeDataSource as IDataSource<OutlineModel, OutlineItem>,
-			{
-				expandOnlyOnTwistieClick: true,
-				multipleSelectionSupport: false,
-				filterOnType: this._outlineViewState.filterOnType,
-				sorter: this._treeComparator,
-				filter: this._treeFilter,
-				identityProvider: new OutlineIdentityProvider(),
-				keyboardNavigationLabelProvider: new OutlineNavigationLabelProvider(),
-				accessibilityProvider: new OutlineAccessibilityProvider(localize('outline', "Outline")),
-				hideTwistiesOfChildlessElements: true,
-				overrideStyles: {
-					listBackground: this.getBackgroundColor()
-				},
-				openOnSingleClick: true
-			}
-		);
+		this._disposables.add(this.onDidChangeBodyVisibility(visible => {
+			if (!visible) {
+				// stop everything when not visible
+				this._editorListener.clear();
+				this._editorDisposables.clear();
 
-
-		this._disposables.add(this._tree);
-		this._disposables.add(this._outlineViewState.onDidChange(this._onDidChangeUserState, this));
-		this._disposables.add(this.viewDescriptorService.onDidChangeLocation(({ views }) => {
-			if (views.some(v => v.id === this.id)) {
-				this._tree.updateOptions({ overrideStyles: { listBackground: this.getBackgroundColor() } });
-			}
-		}));
-
-		// override the globally defined behaviour
-		this._tree.updateOptions({
-			filterOnType: this._outlineViewState.filterOnType
-		});
-
-		// feature: filter on type - keep tree and menu in sync
-		this._register(this._tree.onDidUpdateOptions(e => {
-			this._outlineViewState.filterOnType = Boolean(e.filterOnType);
-		}));
-
-		// feature: expand all nodes when filtering (not when finding)
-		let viewState: IDataTreeViewState | undefined;
-		this._register(this._tree.onDidChangeTypeFilterPattern(pattern => {
-			if (!this._tree.options.filterOnType) {
-				return;
-			}
-			if (!viewState && pattern) {
-				viewState = this._tree.getViewState();
-				this._tree.expandAll();
-			} else if (!pattern && viewState) {
-				this._tree.setInput(this._tree.getInput()!, viewState);
-				viewState = undefined;
-			}
-		}));
-
-		// feature: toggle icons
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(OutlineConfigKeys.icons)) {
-				this._tree.updateChildren();
-			}
-			if (e.affectsConfiguration('outline')) {
-				this._tree.refilter();
-			}
-		}));
-
-		this._register(this.onDidChangeBodyVisibility(visible => {
-			if (visible && !this._requestOracle) {
-				this._requestOracle = this._instantiationService.createInstance(RequestOracle, (editor, event) => this._doUpdate(editor, event), DocumentSymbolProviderRegistry);
-			} else if (!visible) {
-				this._requestOracle?.dispose();
-				this._requestOracle = undefined;
-				this._doUpdate(undefined, undefined);
+			} else if (!this._editorListener.value) {
+				const event = Event.any(this._editorService.onDidActiveEditorChange, this._outlineService.onDidChange);
+				this._editorListener.value = event(() => this._handleEditorChanged(this._editorService.activeEditorPane));
+				this._handleEditorChanged(this._editorService.activeEditorPane);
 			}
 		}));
 	}
 
 	protected layoutBody(height: number, width: number): void {
 		super.layoutBody(height, width);
-		this._tree.layout(height, width);
+		this._tree?.layout(height, width);
+		this._treeDimensions = new dom.Dimension(width, height);
 	}
 
-	getActions(): IAction[] {
-		return [
-			new CollapseAction(() => this._tree, true, 'explorer-action ' + Codicon.collapseAll.classNames)
-		];
+	collapseAll(): void {
+		this._tree?.collapseAll();
 	}
 
-	getSecondaryActions(): IAction[] {
-		const group = this._register(new RadioGroup([
-			new SimpleToggleAction(this._outlineViewState, localize('sortByPosition', "Sort By: Position"), () => this._outlineViewState.sortBy === OutlineSortOrder.ByPosition, _ => this._outlineViewState.sortBy = OutlineSortOrder.ByPosition),
-			new SimpleToggleAction(this._outlineViewState, localize('sortByName', "Sort By: Name"), () => this._outlineViewState.sortBy === OutlineSortOrder.ByName, _ => this._outlineViewState.sortBy = OutlineSortOrder.ByName),
-			new SimpleToggleAction(this._outlineViewState, localize('sortByKind', "Sort By: Category"), () => this._outlineViewState.sortBy === OutlineSortOrder.ByKind, _ => this._outlineViewState.sortBy = OutlineSortOrder.ByKind),
-		]));
-		const result = [
-			new SimpleToggleAction(this._outlineViewState, localize('followCur', "Follow Cursor"), () => this._outlineViewState.followCursor, action => this._outlineViewState.followCursor = action.checked),
-			new SimpleToggleAction(this._outlineViewState, localize('filterOnType', "Filter on Type"), () => this._outlineViewState.filterOnType, action => this._outlineViewState.filterOnType = action.checked),
-			new Separator(),
-			...group.actions,
-		];
-		for (const r of result) {
-			this._register(r);
-		}
-
-		return result;
-	}
-
-	private _onDidChangeUserState(e: { followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }) {
-		this._outlineViewState.persist(this._storageService);
-		if (e.followCursor) {
-			// todo@jrieken update immediately
-		}
-		if (e.sortBy) {
-			this._treeComparator.type = this._outlineViewState.sortBy;
-			this._tree.resort();
-		}
-		if (e.filterOnType) {
-			this._tree.updateOptions({
-				filterOnType: this._outlineViewState.filterOnType
-			});
-		}
+	get outlineViewState() {
+		return this._outlineViewState;
 	}
 
 	private _showMessage(message: string) {
 		this._domNode.classList.add('message');
-		this._tree.setInput(undefined!);
 		this._progressBar.stop().hide();
 		this._message.innerText = message;
 	}
 
-	private static _createOutlineModel(model: ITextModel, disposables: DisposableStore): Promise<OutlineModel | undefined> {
-		let promise = createCancelablePromise(token => OutlineModel.create(model, token));
-		disposables.add({ dispose() { promise.cancel(); } });
-		return promise.catch(err => {
-			if (!isPromiseCanceledError(err)) {
-				throw err;
-			}
-			return undefined;
-		});
-	}
-
-	private async _doUpdate(editor: ICodeEditor | undefined, event: IModelContentChangedEvent | undefined): Promise<void> {
+	private async _handleEditorChanged(pane: IEditorPane | undefined): Promise<void> {
 		this._editorDisposables.clear();
 
-
-		const oldModel = this._tree.getInput();
+		const oldOutline = this._tree?.getInput();
+		const resource = EditorResourceAccessor.getOriginalUri(pane?.input);
 
 		// persist state
-		if (oldModel) {
-			this._treeStates.set(oldModel.uri.toString(), this._tree.getViewState());
+		if (oldOutline) {
+			this._treeStates.set(`${oldOutline.outlineKind}/${resource}`, this._tree!.getViewState());
 		}
 
-		if (!editor || !editor.hasModel() || !DocumentSymbolProviderRegistry.has(editor.getModel())) {
+		if (!pane || !this._outlineService.canCreateOutline(pane) || !resource) {
 			return this._showMessage(localize('no-editor', "The active editor cannot provide outline information."));
 		}
 
-		const textModel = editor.getModel();
-
 		let loadingMessage: IDisposable | undefined;
-		if (!oldModel) {
-			loadingMessage = new TimeoutTimer(
-				() => this._showMessage(localize('loading', "Loading document symbols for '{0}'...", basename(textModel.uri))),
-				100
-			);
+		if (!oldOutline) {
+			loadingMessage = new TimeoutTimer(() => {
+				this._showMessage(localize('loading', "Loading document symbols for '{0}'...", basename(resource)));
+			}, 100);
 		}
 
-		const requestDelay = OutlineModel.getRequestDelay(textModel);
-		this._progressBar.infinite().show(requestDelay);
+		this._progressBar.infinite().show(500);
 
-		const createdModel = await OutlinePane._createOutlineModel(textModel, this._editorDisposables);
+		const cts = new CancellationTokenSource();
+		this._editorDisposables.add(toDisposable(() => cts.dispose(true)));
+
+		const newOutline = await this._outlineService.createOutline(pane, OutlineTarget.OutlinePane, cts.token);
 		loadingMessage?.dispose();
-		if (!createdModel) {
+
+		if (!newOutline) {
 			return;
 		}
 
-		let newModel = createdModel;
-		if (TreeElement.empty(newModel)) {
-			return this._showMessage(localize('no-symbols', "No symbols found in document '{0}'", basename(textModel.uri)));
-		}
-
-		this._domNode.classList.remove('message');
-
-		if (event && oldModel && textModel.getLineCount() >= 25) {
-			// heuristic: when the symbols-to-lines ratio changes by 50% between edits
-			// wait a little (and hope that the next change isn't as drastic).
-			let newSize = TreeElement.size(newModel);
-			let newLength = textModel.getValueLength();
-			let newRatio = newSize / newLength;
-			let oldSize = TreeElement.size(oldModel);
-			let oldLength = newLength - event.changes.reduce((prev, value) => prev + value.rangeLength, 0);
-			let oldRatio = oldSize / oldLength;
-			if (newRatio <= oldRatio * 0.5 || newRatio >= oldRatio * 1.5) {
-
-				let waitPromise = new Promise<boolean>(resolve => {
-					let handle: any = setTimeout(() => {
-						handle = undefined;
-						resolve(true);
-					}, 2000);
-					this._disposables.add({
-						dispose() {
-							clearTimeout(handle);
-							resolve(false);
-						}
-					});
-				});
-
-				if (!await waitPromise) {
-					return;
-				}
-			}
+		if (cts.token.isCancellationRequested) {
+			newOutline?.dispose();
+			return;
 		}
 
+		this._editorDisposables.add(newOutline);
 		this._progressBar.stop().hide();
 
-		if (oldModel && oldModel.merge(newModel)) {
-			this._tree.updateChildren();
-			newModel = oldModel;
-		} else {
-			let state = this._treeStates.get(newModel.uri.toString());
-			this._tree.setInput(newModel, state);
-		}
+		const sorter = new OutlineTreeSorter(newOutline.config.comparator, this._outlineViewState.sortBy);
 
-		this._editorDisposables.add(toDisposable(() => this._contextKeyFiltered.reset()));
+		const tree = <WorkbenchDataTree<IOutline<any> | undefined, any, FuzzyScore>>this._instantiationService.createInstance(
+			WorkbenchDataTree,
+			'OutlinePane',
+			this._treeContainer,
+			newOutline.config.delegate,
+			newOutline.config.renderers,
+			newOutline.config.treeDataSource,
+			{
+				...newOutline.config.options,
+				sorter,
+				openOnSingleClick: true,
+				expandOnlyOnTwistieClick: true,
+				multipleSelectionSupport: false,
+				hideTwistiesOfChildlessElements: true,
+				filterOnType: this._outlineViewState.filterOnType,
+				overrideStyles: { listBackground: this.getBackgroundColor() }
+			}
+		);
+
+		// update tree, listen to changes
+		const updateTree = () => {
+			if (newOutline.isEmpty) {
+				// no more elements
+				this._showMessage(localize('no-symbols', "No symbols found in document '{0}'", basename(resource)));
+				tree.setInput(undefined);
+
+			} else if (!tree.getInput()) {
+				// first: init tree
+				this._domNode.classList.remove('message');
+				const state = this._treeStates.get(`${newOutline.outlineKind}/${resource}`);
+				tree.setInput(newOutline, state);
+
+			} else {
+				// update: refresh tree
+				this._domNode.classList.remove('message');
+				tree.updateChildren();
+			}
+		};
+		updateTree();
+		this._editorDisposables.add(newOutline.onDidChange(updateTree));
+
+		// feature: apply panel background to tree
+		this._editorDisposables.add(this.viewDescriptorService.onDidChangeLocation(({ views }) => {
+			if (views.some(v => v.id === this.id)) {
+				tree.updateOptions({ overrideStyles: { listBackground: this.getBackgroundColor() } });
+			}
+		}));
+
+		// feature: filter on type - keep tree and menu in sync
+		this._editorDisposables.add(tree.onDidUpdateOptions(e => this._outlineViewState.filterOnType = Boolean(e.filterOnType)));
 
 		// feature: reveal outline selection in editor
 		// on change -> reveal/select defining range
-		this._editorDisposables.add(this._tree.onDidOpen(e => {
-			if (!(e.element instanceof OutlineElement)) {
-				return;
-			}
-
-			this._revealTreeSelection(newModel, e.element, !!e.editorOptions.preserveFocus, !!e.editorOptions.pinned, e.sideBySide);
-		}));
+		this._editorDisposables.add(tree.onDidOpen(e => newOutline.reveal(e.element, e.editorOptions, e.sideBySide)));
 
 		// feature: reveal editor selection in outline
-		this._revealEditorSelection(newModel, editor.getSelection());
-		const versionIdThen = textModel.getVersionId();
-		this._editorDisposables.add(editor.onDidChangeCursorSelection(e => {
-			// first check if the document has changed and stop revealing the
-			// cursor position iff it has -> we will update/recompute the
-			// outline view then anyways
-			if (!textModel.isDisposed() && textModel.getVersionId() === versionIdThen) {
-				this._revealEditorSelection(newModel, e.selection);
-			}
-		}));
-
-		// feature: show markers in outline
-		const updateMarker = (model: ITextModel, ignoreEmpty?: boolean) => {
-			if (!this._configurationService.getValue(OutlineConfigKeys.problemsEnabled)) {
+		const revealActiveElement = () => {
+			if (!this._outlineViewState.followCursor || !newOutline.activeElement) {
 				return;
 			}
-			if (model !== textModel) {
-				return;
-			}
-			const markers: IOutlineMarker[] = [];
-			for (const [range, marker] of this._markerDecorationService.getLiveMarkers(textModel)) {
-				if (marker.severity === MarkerSeverity.Error || marker.severity === MarkerSeverity.Warning) {
-					markers.push({ ...range, severity: marker.severity });
-				}
-			}
-			if (markers.length > 0 || !ignoreEmpty) {
-				newModel.updateMarker(markers);
-				this._tree.updateChildren();
+			const item = newOutline.activeElement;
+			const top = tree.getRelativeTop(item);
+			if (top === null) {
+				tree.reveal(item, 0.5);
 			}
+			tree.setFocus([item]);
+			tree.setSelection([item]);
 		};
-		updateMarker(textModel, true);
-		this._editorDisposables.add(Event.debounce(this._markerDecorationService.onDidChangeMarker, (_, e) => e, 64)(updateMarker));
+		revealActiveElement();
+		this._editorDisposables.add(newOutline.onDidChange(revealActiveElement));
 
-		this._editorDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(OutlineConfigKeys.problemsBadges) || e.affectsConfiguration(OutlineConfigKeys.problemsColors)) {
-				this._tree.updateChildren();
-				return;
+		// feature: update view when user state changes
+		this._editorDisposables.add(this._outlineViewState.onDidChange((e: { followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }) => {
+			this._outlineViewState.persist(this._storageService);
+			if (e.filterOnType) {
+				tree.updateOptions({ filterOnType: this._outlineViewState.filterOnType });
 			}
-			if (!e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
-				return;
+			if (e.followCursor) {
+				revealActiveElement();
 			}
-			if (!this._configurationService.getValue(OutlineConfigKeys.problemsEnabled)) {
-				newModel.updateMarker([]);
-				this._tree.updateChildren();
-			} else {
-				updateMarker(textModel, true);
+			if (e.sortBy) {
+				sorter.order = this._outlineViewState.sortBy;
+				tree.resort();
 			}
 		}));
-	}
 
-	private async _revealTreeSelection(model: OutlineModel, element: OutlineElement, preserveFocus: boolean, pinned: boolean, aside: boolean): Promise<void> {
-		await this._editorService.openCodeEditor(
-			{
-				resource: model.uri,
-				options: {
-					preserveFocus,
-					pinned,
-					selection: Range.collapseToStart(element.symbol.selectionRange),
-					selectionRevealType: TextEditorSelectionRevealType.NearTopIfOutsideViewport,
-				}
-			},
-			this._editorService.getActiveCodeEditor(),
-			aside
-		);
-	}
+		// feature: expand all nodes when filtering (not when finding)
+		let viewState: IDataTreeViewState | undefined;
+		this._editorDisposables.add(tree.onDidChangeTypeFilterPattern(pattern => {
+			if (!tree.options.filterOnType) {
+				return;
+			}
+			if (!viewState && pattern) {
+				viewState = tree.getViewState();
+				tree.expandAll();
+			} else if (!pattern && viewState) {
+				tree.setInput(tree.getInput()!, viewState);
+				viewState = undefined;
+			}
+		}));
 
-	private _revealEditorSelection(model: OutlineModel, selection: Selection): void {
-		if (!this._outlineViewState.followCursor || !this._tree.getInput() || !selection) {
-			return;
-		}
-		let [first] = this._tree.getSelection();
-		let item = model.getItemEnclosingPosition({
-			lineNumber: selection.selectionStartLineNumber,
-			column: selection.selectionStartColumn
-		}, first instanceof OutlineElement ? first : undefined);
-		if (!item) {
-			// nothing to reveal
-			return;
-		}
-		let top = this._tree.getRelativeTop(item);
-		if (top === null) {
-			this._tree.reveal(item, 0.5);
-		}
-		this._tree.setFocus([item]);
-		this._tree.setSelection([item]);
+		// last: set tree property
+		tree.layout(this._treeDimensions?.height, this._treeDimensions?.width);
+		this._tree = tree;
+		this._editorDisposables.add(toDisposable(() => {
+			tree.dispose();
+			this._tree = undefined;
+		}));
 	}
 }
+
+
+// --- commands
+
+registerAction2(class Collapse extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.collapse',
+			title: localize('collapse', "Collapse All"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.collapseAll();
+	}
+});
+
+registerAction2(class FollowCursor extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.followCursor',
+			title: localize('followCur', "Follow Cursor"),
+			f1: false,
+			toggled: _ctxFollowsCursor,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'config',
+				order: 1,
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.outlineViewState.followCursor = !view.outlineViewState.followCursor;
+	}
+});
+
+registerAction2(class FilterOnType extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.filterOnType',
+			title: localize('filterOnType', "Filter on Type"),
+			f1: false,
+			toggled: _ctxFilterOnType,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'config',
+				order: 2,
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.outlineViewState.filterOnType = !view.outlineViewState.filterOnType;
+	}
+});
+
+
+registerAction2(class SortByPosition extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.sortByPosition',
+			title: localize('sortByPosition', "Sort By: Position"),
+			f1: false,
+			toggled: _ctxSortMode.isEqualTo(OutlineSortOrder.ByPosition),
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'sort',
+				order: 1,
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.outlineViewState.sortBy = OutlineSortOrder.ByPosition;
+	}
+});
+
+registerAction2(class SortByName extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.sortByName',
+			title: localize('sortByName', "Sort By: Name"),
+			f1: false,
+			toggled: _ctxSortMode.isEqualTo(OutlineSortOrder.ByName),
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'sort',
+				order: 2,
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.outlineViewState.sortBy = OutlineSortOrder.ByName;
+	}
+});
+
+registerAction2(class SortByKind extends ViewAction<OutlinePane> {
+	constructor() {
+		super({
+			viewId: OutlinePane.Id,
+			id: 'outline.sortByKind',
+			title: localize('sortByKind', "Sort By: Category"),
+			f1: false,
+			toggled: _ctxSortMode.isEqualTo(OutlineSortOrder.ByKind),
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'sort',
+				order: 3,
+				when: ContextKeyEqualsExpr.create('view', OutlinePane.Id)
+			}
+		});
+	}
+	runInView(_accessor: ServicesAccessor, view: OutlinePane) {
+		view.outlineViewState.sortBy = OutlineSortOrder.ByKind;
+	}
+});
diff --git a/src/vs/workbench/contrib/outline/browser/outlineViewState.ts b/src/vs/workbench/contrib/outline/browser/outlineViewState.ts
new file mode 100644
index 000000000..89f95e571
--- /dev/null
+++ b/src/vs/workbench/contrib/outline/browser/outlineViewState.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from 'vs/base/common/event';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+
+
+export const enum OutlineSortOrder {
+	ByPosition,
+	ByName,
+	ByKind
+}
+
+export class OutlineViewState {
+
+	private _followCursor = false;
+	private _filterOnType = true;
+	private _sortBy = OutlineSortOrder.ByPosition;
+
+	private readonly _onDidChange = new Emitter<{ followCursor?: boolean, sortBy?: boolean, filterOnType?: boolean }>();
+	readonly onDidChange = this._onDidChange.event;
+
+	dispose(): void {
+		this._onDidChange.dispose();
+	}
+
+	set followCursor(value: boolean) {
+		if (value !== this._followCursor) {
+			this._followCursor = value;
+			this._onDidChange.fire({ followCursor: true });
+		}
+	}
+
+	get followCursor(): boolean {
+		return this._followCursor;
+	}
+
+	get filterOnType() {
+		return this._filterOnType;
+	}
+
+	set filterOnType(value) {
+		if (value !== this._filterOnType) {
+			this._filterOnType = value;
+			this._onDidChange.fire({ filterOnType: true });
+		}
+	}
+
+	set sortBy(value: OutlineSortOrder) {
+		if (value !== this._sortBy) {
+			this._sortBy = value;
+			this._onDidChange.fire({ sortBy: true });
+		}
+	}
+
+	get sortBy(): OutlineSortOrder {
+		return this._sortBy;
+	}
+
+	persist(storageService: IStorageService): void {
+		storageService.store('outline/state', JSON.stringify({
+			followCursor: this.followCursor,
+			sortBy: this.sortBy,
+			filterOnType: this.filterOnType,
+		}), StorageScope.WORKSPACE, StorageTarget.USER);
+	}
+
+	restore(storageService: IStorageService): void {
+		let raw = storageService.get('outline/state', StorageScope.WORKSPACE);
+		if (!raw) {
+			return;
+		}
+		let data: any;
+		try {
+			data = JSON.parse(raw);
+		} catch (e) {
+			return;
+		}
+		this.followCursor = data.followCursor;
+		this.sortBy = data.sortBy ?? OutlineSortOrder.ByPosition;
+		if (typeof data.filterOnType === 'boolean') {
+			this.filterOnType = data.filterOnType;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 0b6157459..6be631f45 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -21,7 +21,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWo
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry, IViewsService, IViewDescriptorService } from 'vs/workbench/common/views';
+import { ViewContainer, IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions, IViewsRegistry, IViewsService } from 'vs/workbench/common/views';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -29,8 +29,7 @@ import { IQuickPickItem, IQuickInputService } from 'vs/platform/quickinput/commo
 import { IOutputChannelDescriptor, IFileOutputChannelDescriptor } from 'vs/workbench/services/output/common/output';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { assertIsDefined } from 'vs/base/common/types';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { ContextKeyEqualsExpr, ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ToggleViewAction } from 'vs/workbench/browser/actions/layoutActions';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
@@ -160,7 +159,7 @@ registerAction2(class extends Action2 {
 		super({
 			id: `workbench.output.action.toggleAutoScroll`,
 			title: { value: nls.localize('toggleAutoScroll', "Toggle Auto Scrolling"), original: 'Toggle Auto Scrolling' },
-			tooltip: { value: nls.localize('outputScrollOff', "Turn Auto Scrolling Off"), original: 'Turn Auto Scrolling Off' },
+			tooltip: nls.localize('outputScrollOff', "Turn Auto Scrolling Off"),
 			menu: {
 				id: MenuId.ViewTitle,
 				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', OUTPUT_VIEW_ID)),
@@ -171,7 +170,7 @@ registerAction2(class extends Action2 {
 			toggled: {
 				condition: CONTEXT_OUTPUT_SCROLL_LOCK,
 				icon: Codicon.lock,
-				tooltip: { value: nls.localize('outputScrollOn', "Turn Auto Scrolling On"), original: 'Turn Auto Scrolling On' }
+				tooltip: nls.localize('outputScrollOn', "Turn Auto Scrolling On")
 			}
 		});
 	}
@@ -239,15 +238,7 @@ registerAction2(class extends Action2 {
 		});
 	}
 	async run(accessor: ServicesAccessor): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const viewDescriptorService = accessor.get(IViewDescriptorService);
-		const contextKeyService = accessor.get(IContextKeyService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
-		return new class ToggleOutputAction extends ToggleViewAction {
-			constructor() {
-				super(toggleOutputAcitonId, 'Toggle Output', OUTPUT_VIEW_ID, viewsService, viewDescriptorService, contextKeyService, layoutService);
-			}
-		}().run();
+		return accessor.get(IInstantiationService).createInstance(ToggleViewAction, toggleOutputAcitonId, 'Toggle Output', OUTPUT_VIEW_ID).run();
 	}
 });
 
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index a01c54ae7..ddd71be77 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -21,7 +21,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
diff --git a/src/vs/workbench/contrib/output/common/outputChannelModel.ts b/src/vs/workbench/contrib/output/common/outputChannelModel.ts
index 364c4a8b1..d55076583 100644
--- a/src/vs/workbench/contrib/output/common/outputChannelModel.ts
+++ b/src/vs/workbench/contrib/output/common/outputChannelModel.ts
@@ -128,7 +128,7 @@ export abstract class AbstractFileOutputChannelModel extends Disposable implemen
 	}
 }
 
-// TODO@ben see if new watchers can cope with spdlog and avoid polling then
+// TODO@bpasero see if new watchers can cope with spdlog and avoid polling then
 class OutputFileListener extends Disposable {
 
 	private readonly _onDidContentChange = new Emitter<number | undefined>();
diff --git a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
index 60f7caa47..93974d117 100644
--- a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
+++ b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
@@ -12,9 +12,8 @@ import { ILifecycleService, LifecyclePhase, StartupKindToString } from 'vs/workb
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { ITimerService, IStartupMetrics } from 'vs/workbench/services/timer/browser/timerService';
+import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import * as perf from 'vs/base/common/performance';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { writeTransientState } from 'vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
@@ -117,24 +116,24 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 	private _updateModel(): void {
 
 		Promise.all([
-			this._timerService.startupMetrics,
+			this._timerService.whenReady(),
 			this._lifecycleService.when(LifecyclePhase.Eventually),
 			this._extensionService.whenInstalledExtensionsRegistered()
-		]).then(([metrics]) => {
+		]).then(() => {
 			if (this._model && !this._model.isDisposed()) {
 
 				let stats = LoaderStats.get();
 				let md = new MarkdownBuilder();
-				this._addSummary(md, metrics);
+				this._addSummary(md);
 				md.blank();
-				this._addSummaryTable(md, metrics, stats);
+				this._addSummaryTable(md, stats);
 				md.blank();
 				this._addExtensionsTable(md);
 				md.blank();
 				this._addRawPerfMarks(md);
 				md.blank();
-				this._addLoaderStats(md, stats);
-				md.blank();
+				// this._addLoaderStats(md, stats);
+				// md.blank();
 				this._addCachedDataStats(md);
 
 				this._model.setValue(md.value);
@@ -143,7 +142,8 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 
 	}
 
-	private _addSummary(md: MarkdownBuilder, metrics: IStartupMetrics): void {
+	private _addSummary(md: MarkdownBuilder): void {
+		const metrics = this._timerService.startupMetrics;
 		md.heading(2, 'System Info');
 		md.li(`${this._productService.nameShort}: ${this._productService.version} (${this._productService.commit || '0000000'})`);
 		md.li(`OS: ${metrics.platform}(${metrics.release})`);
@@ -163,12 +163,13 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		md.li(`Empty Workspace: ${metrics.emptyWorkbench}`);
 	}
 
-	private _addSummaryTable(md: MarkdownBuilder, metrics: IStartupMetrics, stats?: LoaderStats): void {
+	private _addSummaryTable(md: MarkdownBuilder, stats?: LoaderStats): void {
 
+		const metrics = this._timerService.startupMetrics;
 		const table: Array<Array<string | number | undefined>> = [];
 		table.push(['start => app.isReady', metrics.timers.ellapsedAppReady, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['nls:start => nls:end', metrics.timers.ellapsedNlsGeneration, '[main]', `initial startup: ${metrics.initialStartup}`]);
-		table.push(['require(main.bundle.js)', metrics.initialStartup ? perf.getDuration('willLoadMainBundle', 'didLoadMainBundle') : undefined, '[main]', `initial startup: ${metrics.initialStartup}`]);
+		table.push(['require(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['app.isReady => window.loadUrl()', metrics.timers.ellapsedWindowLoad, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['window.loadUrl() => begin to require(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
 		table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
@@ -220,34 +221,37 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 	}
 
 	private _addRawPerfMarks(md: MarkdownBuilder): void {
-		md.heading(2, 'Raw Perf Marks');
-		md.value += '```\n';
-		md.value += `Name\tTimestamp\tDelta\tTotal\n`;
-		let lastStartTime = -1;
-		let total = 0;
-		for (const { name, startTime } of perf.getEntries()) {
-			let delta = lastStartTime !== -1 ? startTime - lastStartTime : 0;
-			total += delta;
-			md.value += `${name}\t${startTime}\t${delta}\t${total}\n`;
-			lastStartTime = startTime;
+
+		for (let [source, marks] of this._timerService.getPerformanceMarks()) {
+			md.heading(2, `Raw Perf Marks: ${source}`);
+			md.value += '```\n';
+			md.value += `Name\tTimestamp\tDelta\tTotal\n`;
+			let lastStartTime = -1;
+			let total = 0;
+			for (const { name, startTime } of marks) {
+				let delta = lastStartTime !== -1 ? startTime - lastStartTime : 0;
+				total += delta;
+				md.value += `${name}\t${startTime}\t${delta}\t${total}\n`;
+				lastStartTime = startTime;
+			}
+			md.value += '```\n';
 		}
-		md.value += '```\n';
 	}
 
-	private _addLoaderStats(md: MarkdownBuilder, stats: LoaderStats): void {
-		md.heading(2, 'Loader Stats');
-		md.heading(3, 'Load AMD-module');
-		md.table(['Module', 'Duration'], stats.amdLoad);
-		md.blank();
-		md.heading(3, 'Load commonjs-module');
-		md.table(['Module', 'Duration'], stats.nodeRequire);
-		md.blank();
-		md.heading(3, 'Invoke AMD-module factory');
-		md.table(['Module', 'Duration'], stats.amdInvoke);
-		md.blank();
-		md.heading(3, 'Invoke commonjs-module');
-		md.table(['Module', 'Duration'], stats.nodeEval);
-	}
+	// private _addLoaderStats(md: MarkdownBuilder, stats: LoaderStats): void {
+	// 	md.heading(2, 'Loader Stats');
+	// 	md.heading(3, 'Load AMD-module');
+	// 	md.table(['Module', 'Duration'], stats.amdLoad);
+	// 	md.blank();
+	// 	md.heading(3, 'Load commonjs-module');
+	// 	md.table(['Module', 'Duration'], stats.nodeRequire);
+	// 	md.blank();
+	// 	md.heading(3, 'Invoke AMD-module factory');
+	// 	md.table(['Module', 'Duration'], stats.amdInvoke);
+	// 	md.blank();
+	// 	md.heading(3, 'Invoke commonjs-module');
+	// 	md.table(['Module', 'Duration'], stats.nodeEval);
+	// }
 
 	private _addCachedDataStats(md: MarkdownBuilder): void {
 
diff --git a/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts b/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts
index 52f82c64d..47c85ed53 100644
--- a/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts
+++ b/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts
@@ -55,10 +55,10 @@ export class StartupTimings implements IWorkbenchContribution {
 		const { sessionId } = await this._telemetryService.getTelemetryInfo();
 
 		Promise.all([
-			this._timerService.startupMetrics,
+			this._timerService.whenReady(),
 			timeout(15000), // wait: cached data creation, telemetry sending
-		]).then(([startupMetrics]) => {
-			return promisify(appendFile)(appendTo, `${startupMetrics.ellapsed}\t${this._productService.nameShort}\t${(this._productService.commit || '').slice(0, 10) || '0000000000'}\t${sessionId}\t${standardStartupError === undefined ? 'standard_start' : 'NO_standard_start : ' + standardStartupError}\n`);
+		]).then(() => {
+			return promisify(appendFile)(appendTo, `${this._timerService.startupMetrics.ellapsed}\t${this._productService.nameShort}\t${(this._productService.commit || '').slice(0, 10) || '0000000000'}\t${sessionId}\t${standardStartupError === undefined ? 'standard_start' : 'NO_standard_start : ' + standardStartupError}\n`);
 		}).then(() => {
 			this._nativeHostService.quit();
 		}).catch(err => {
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
index 7b7c3dd59..04fd316a8 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -18,7 +18,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel, KEYBINDING_ENTRY_TEMPLATE_ID } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { DefineKeybindingWidget, KeybindingsSearchWidget } from 'vs/workbench/contrib/preferences/browser/keybindingWidgets';
@@ -35,7 +35,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { attachStylerCallback, attachInputBoxStyler, attachCheckboxStyler } from 'vs/platform/theme/common/styler';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
@@ -46,7 +46,7 @@ import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { Color, RGBA } from 'vs/base/common/color';
 import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { IKeybindingsEditorPane } from 'vs/workbench/services/preferences/common/preferences';
+import { IKeybindingItemEntry, IKeybindingsEditorPane } from 'vs/workbench/services/preferences/common/preferences';
 import { keybindingsRecordKeysIcon, keybindingsSortIcon, keybindingsAddIcon, preferencesClearInputIcon, keybindingsEditIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
 
 const $ = DOM.$;
@@ -96,8 +96,8 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 	private columnItems: ColumnItem[] = [];
 	private keybindingsListContainer!: HTMLElement;
 	private unAssignedKeybindingItemToRevealAndFocus: IKeybindingItemEntry | null = null;
-	private listEntries: IListEntry[] = [];
-	private keybindingsList!: WorkbenchList<IListEntry>;
+	private listEntries: IKeybindingItemEntry[] = [];
+	private keybindingsList!: WorkbenchList<IKeybindingItemEntry>;
 
 	private dimension: DOM.Dimension | null = null;
 	private delayedFiltering: Delayer<void>;
@@ -479,7 +479,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 	private createList(parent: HTMLElement): void {
 		this.keybindingsListContainer = DOM.append(parent, $('.keybindings-list-container'));
 		this.keybindingsList = this._register(this.instantiationService.createInstance(WorkbenchList, 'KeybindingsEditor', this.keybindingsListContainer, new Delegate(), [new KeybindingItemRenderer(this, this.instantiationService)], {
-			identityProvider: { getId: (e: IListEntry) => e.id },
+			identityProvider: { getId: (e: IKeybindingItemEntry) => e.id },
 			setRowLineHeight: false,
 			horizontalScrolling: false,
 			accessibilityProvider: new AccessibilityProvider(),
@@ -487,7 +487,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 			overrideStyles: {
 				listBackground: editorBackground
 			}
-		})) as WorkbenchList<IListEntry>;
+		})) as WorkbenchList<IKeybindingItemEntry>;
 
 		this._register(this.keybindingsList.onContextMenu(e => this.onContextMenu(e)));
 		this._register(this.keybindingsList.onDidChangeFocus(e => this.onFocusChange(e)));
@@ -620,7 +620,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		this.keybindingsList.layout(listHeight);
 	}
 
-	private getIndexOf(listEntry: IListEntry): number {
+	private getIndexOf(listEntry: IKeybindingItemEntry): number {
 		const index = this.listEntries.indexOf(listEntry);
 		if (index === -1) {
 			for (let i = 0; i < this.listEntries.length; i++) {
@@ -674,7 +674,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		this.sortByPrecedenceAction.checked = !this.sortByPrecedenceAction.checked;
 	}
 
-	private onContextMenu(e: IListContextMenuEvent<IListEntry>): void {
+	private onContextMenu(e: IListContextMenuEvent<IKeybindingItemEntry>): void {
 		if (!e.element) {
 			return;
 		}
@@ -702,7 +702,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		}
 	}
 
-	private onFocusChange(e: IListEvent<IListEntry>): void {
+	private onFocusChange(e: IListEvent<IKeybindingItemEntry>): void {
 		this.keybindingFocusContextKey.reset();
 		const element = e.elements[0];
 		if (!element) {
@@ -821,9 +821,9 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 	}
 }
 
-class Delegate implements IListVirtualDelegate<IListEntry> {
+class Delegate implements IListVirtualDelegate<IKeybindingItemEntry> {
 
-	getHeight(element: IListEntry) {
+	getHeight(element: IKeybindingItemEntry) {
 		if (element.templateId === KEYBINDING_ENTRY_TEMPLATE_ID) {
 			const commandIdMatched = (<IKeybindingItemEntry>element).keybindingItem.commandLabel && (<IKeybindingItemEntry>element).commandIdMatches;
 			const commandDefaultLabelMatched = !!(<IKeybindingItemEntry>element).commandDefaultLabelMatches;
@@ -837,7 +837,7 @@ class Delegate implements IListVirtualDelegate<IListEntry> {
 		return 24;
 	}
 
-	getTemplateId(element: IListEntry) {
+	getTemplateId(element: IKeybindingItemEntry) {
 		return element.templateId;
 	}
 }
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
index 3a8907a4c..35e42607f 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
@@ -18,7 +18,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
 import { SmartSnippetInserter } from 'vs/workbench/contrib/preferences/common/smartSnippetInserter';
 import { DefineKeybindingOverlayWidget } from 'vs/workbench/contrib/preferences/browser/keybindingWidgets';
-import { FloatingClickWidget } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
 import { parseTree, Node } from 'vs/base/common/json';
 import { ScanCodeBinding } from 'vs/base/common/scanCode';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index 511b2c236..0322320a7 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -33,13 +33,13 @@ import { KeybindingsEditor } from 'vs/workbench/contrib/preferences/browser/keyb
 import { ConfigureLanguageBasedSettingsAction } from 'vs/workbench/contrib/preferences/browser/preferencesActions';
 import { PreferencesEditor } from 'vs/workbench/contrib/preferences/browser/preferencesEditor';
 import { SettingsEditor2, SettingsFocusContext } from 'vs/workbench/contrib/preferences/browser/settingsEditor2';
-import { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, MODIFIED_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
+import { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, MODIFIED_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
 import { PreferencesContribution } from 'vs/workbench/contrib/preferences/common/preferencesContribution';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
-import { DefaultPreferencesEditorInput, KeybindingsEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { DefaultPreferencesEditorInput, KeybindingsEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { preferencesOpenSettingsIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
 
 const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
@@ -909,6 +909,27 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 				}
 			}
 		});
+		registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS,
+					title: { value: nls.localize('showExtensionKeybindings', "Show Extension Keybindings"), original: 'Show Extension Keybindings' },
+					menu: [
+						{
+							id: MenuId.EditorTitle,
+							when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR),
+							group: '1_keyboard_preferences_actions'
+						}
+					]
+				});
+			}
+			run(accessor: ServicesAccessor) {
+				const editorPane = accessor.get(IEditorService).activeEditorPane;
+				if (editorPane instanceof KeybindingsEditor) {
+					editorPane.search('@source:extension');
+				}
+			}
+		});
 		registerAction2(class extends Action2 {
 			constructor() {
 				super({
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
index 8f4719506..8e839d2e3 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
@@ -49,7 +49,7 @@ import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IFilterResult, IPreferencesService, ISetting, ISettingsEditorModel, ISettingsGroup, SettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
-import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { DefaultSettingsEditorModel, SettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 
 export class PreferencesEditor extends EditorPane {
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index 49511397c..6fdb4aa51 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -24,7 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
+import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
 import { DefaultSettingsHeaderWidget, EditPreferenceWidget, SettingsGroupTitleWidget, SettingsHeaderWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
 import { IFilterResult, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 import { DefaultSettingsEditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 7abb3fca7..676ccc6fe 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -49,7 +49,7 @@ import { createTOCIterator, TOCTree, TOCTreeModel } from 'vs/workbench/contrib/p
 import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, ISearchProvider, MODIFIED_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS } from 'vs/workbench/contrib/preferences/common/preferences';
 import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IPreferencesService, ISearchResult, ISettingsEditorModel, ISettingsEditorOptions, SettingsEditorOptions, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
-import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { SettingsEditor2Input } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync';
 import { preferencesClearInputIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 86b50e989..b6792cc70 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -216,7 +216,7 @@ export const tocData: ITOCEntry<string> = {
 				{
 					id: 'application/settingsSync',
 					label: localize('settingsSync', "Settings Sync"),
-					settings: ['settingsSync.*', 'sync.*']
+					settings: ['settingsSync.*']
 				}
 			]
 		}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 3b26e64a1..5b50e8b1f 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -38,7 +38,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { editorBackground, errorForeground, focusBorder, foreground, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler, attachStyler } from 'vs/platform/theme/common/styler';
-import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { getIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
 import { ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
 import { ISettingsEditorViewState, settingKeyToDisplayFormat, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
@@ -49,7 +49,7 @@ import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/service
 import { getDefaultIgnoredSettings, IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 import { getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation';
 import { Codicon } from 'vs/base/common/codicons';
-import { CodiconLabel } from 'vs/base/browser/ui/codicons/codiconLabel';
+import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
 import { IListService, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
@@ -315,6 +315,12 @@ function _resolveSettingsTree(tocData: ITOCEntry<string>, allSettings: Set<ISett
 	};
 }
 
+const knownDynamicSettingGroups = [
+	/^settingsSync\..*/,
+	/^sync\..*/,
+	/^workbench.fontAliasing$/,
+];
+
 function getMatchingSettings(allSettings: Set<ISetting>, pattern: string, logService: ILogService): ISetting[] {
 	const result: ISetting[] = [];
 
@@ -325,7 +331,7 @@ function getMatchingSettings(allSettings: Set<ISetting>, pattern: string, logSer
 		}
 	});
 
-	if (!result.length) {
+	if (!result.length && !knownDynamicSettingGroups.some(r => r.test(pattern))) {
 		logService.warn(`Settings pattern "${pattern}" doesn't match any settings`);
 	}
 
@@ -552,7 +558,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 
 	protected createSyncIgnoredElement(container: HTMLElement): HTMLElement {
 		const syncIgnoredElement = DOM.append(container, $('span.setting-item-ignored'));
-		const syncIgnoredLabel = new CodiconLabel(syncIgnoredElement);
+		const syncIgnoredLabel = new SimpleIconLabel(syncIgnoredElement);
 		syncIgnoredLabel.text = `($(sync-ignored) ${localize('extensionSyncIgnoredLabel', 'Sync: Ignored')})`;
 
 		return syncIgnoredElement;
@@ -637,7 +643,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		const toolbar = new ToolBar(container, this._contextMenuService, {
 			toggleMenuTitle,
 			renderDropdownAsChildElement: true,
-			moreIcon: ThemeIcon.asCSSIcon(settingsMoreActionIcon) // change icon from ellipsis to gear
+			moreIcon: settingsMoreActionIcon // change icon from ellipsis to gear
 		});
 		return toolbar;
 	}
diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
index 928106092..9d5ab0f1b 100644
--- a/src/vs/workbench/contrib/preferences/common/preferences.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -67,6 +67,7 @@ export const KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR = 'keybindings.editor.showC
 export const KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS = 'keybindings.editor.focusKeybindings';
 export const KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS = 'keybindings.editor.showDefaultKeybindings';
 export const KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS = 'keybindings.editor.showUserKeybindings';
+export const KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS = 'keybindings.editor.showExtensionKeybindings';
 
 export const MODIFIED_SETTING_TAG = 'modified';
 export const EXTENSION_SETTING_TAG = 'ext:';
diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
index d742a1d28..54129ffb2 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
@@ -22,7 +22,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { DefaultQuickAccessFilterValue } from 'vs/platform/quickinput/common/quickAccess';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchQuickAccessConfiguration } from 'vs/workbench/browser/quickaccess';
-import { Codicon, stripCodicons } from 'vs/base/common/codicons';
+import { Codicon } from 'vs/base/common/codicons';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -30,6 +30,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { TriggerAction } from 'vs/platform/quickinput/browser/pickerQuickAccess';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { stripIcons } from 'vs/base/common/iconLabels';
 
 export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
 
@@ -136,7 +137,7 @@ export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAcce
 			globalCommandPicks.push({
 				commandId: action.item.id,
 				commandAlias,
-				label: stripCodicons(label)
+				label: stripIcons(label)
 			});
 		}
 
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index c5a10561f..5a26733a7 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -34,9 +34,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private nativeFullScreen: boolean | undefined;
 	private clickThroughInactive: boolean | undefined;
 	private updateMode: string | undefined;
-	private debugConsoleWordWrap: boolean | undefined;
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
-	private enableExperimentalProxyLoginDialog = true; // default
 
 	constructor(
 		@IHostService private readonly hostService: IHostService,
@@ -53,12 +51,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private onConfigurationChange(config: IConfiguration, notify: boolean): void {
 		let changed = false;
 
-		// Debug console word wrap
-		if (typeof config.debug?.console.wordWrap === 'boolean' && config.debug.console.wordWrap !== this.debugConsoleWordWrap) {
-			this.debugConsoleWordWrap = config.debug.console.wordWrap;
-			changed = true;
-		}
-
 		if (isNative) {
 
 			// Titlebar style
@@ -98,12 +90,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 					changed = true;
 				}
 			}
-
-			// Experimental proxy login dialog
-			if (typeof config.window?.enableExperimentalProxyLoginDialog === 'boolean' && config.window.enableExperimentalProxyLoginDialog !== this.enableExperimentalProxyLoginDialog) {
-				this.enableExperimentalProxyLoginDialog = config.window.enableExperimentalProxyLoginDialog;
-				changed = true;
-			}
 		}
 
 		// Notify only when changed and we are the focused window (avoids notification spam across windows)
diff --git a/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts b/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
index 99604f4fa..955389336 100644
--- a/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
+++ b/src/vs/workbench/contrib/remote/browser/explorerViewItems.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { IAction, Action } from 'vs/base/common/actions';
+import { IAction } from 'vs/base/common/actions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -14,8 +14,11 @@ import { IViewDescriptor } from 'vs/workbench/common/views';
 import { isStringArray } from 'vs/base/common/types';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { SelectActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { Action2, MenuId } from 'vs/platform/actions/common/actions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { VIEWLET_ID } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
 
 export interface IRemoteSelectItem extends ISelectOptionItem {
 	authority: string[];
@@ -28,36 +31,42 @@ export class SwitchRemoteViewItem extends SelectActionViewItem {
 		private readonly optionsItems: IRemoteSelectItem[],
 		@IThemeService themeService: IThemeService,
 		@IContextViewService contextViewService: IContextViewService,
-		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService,
-		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IRemoteExplorerService private remoteExplorerService: IRemoteExplorerService,
+		@IWorkbenchEnvironmentService private environmentService: IWorkbenchEnvironmentService,
 		@IStorageService private readonly storageService: IStorageService
 	) {
 		super(null, action, optionsItems, 0, contextViewService, { ariaLabel: nls.localize('remotes', 'Switch Remote') });
 		this._register(attachSelectBoxStyler(this.selectBox, themeService));
-
-		this.setSelectionForConnection(optionsItems, environmentService, remoteExplorerService);
 	}
 
-	private setSelectionForConnection(optionsItems: IRemoteSelectItem[], environmentService: IWorkbenchEnvironmentService, remoteExplorerService: IRemoteExplorerService) {
+	public setSelectionForConnection(): boolean {
+		let isSetForConnection = false;
 		if (this.optionsItems.length > 0) {
 			let index = 0;
-			const remoteAuthority = environmentService.remoteAuthority;
+			const remoteAuthority = this.environmentService.remoteAuthority;
+			isSetForConnection = true;
 			const explorerType: string[] | undefined = remoteAuthority ? [remoteAuthority.split('+')[0]] :
 				this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, StorageScope.WORKSPACE)?.split(',') ?? this.storageService.get(REMOTE_EXPLORER_TYPE_KEY, StorageScope.GLOBAL)?.split(',');
 			if (explorerType !== undefined) {
-				index = this.getOptionIndexForExplorerType(optionsItems, explorerType);
+				index = this.getOptionIndexForExplorerType(explorerType);
 			}
 			this.select(index);
-			remoteExplorerService.targetType = optionsItems[index].authority;
+			this.remoteExplorerService.targetType = this.optionsItems[index].authority;
 		}
+		return isSetForConnection;
 	}
 
-	private getOptionIndexForExplorerType(optionsItems: IRemoteSelectItem[], explorerType: string[]): number {
+	public setSelection() {
+		const index = this.getOptionIndexForExplorerType(this.remoteExplorerService.targetType);
+		this.select(index);
+	}
+
+	private getOptionIndexForExplorerType(explorerType: string[]): number {
 		let index = 0;
 		for (let optionIterator = 0; (optionIterator < this.optionsItems.length) && (index === 0); optionIterator++) {
-			for (let authorityIterator = 0; authorityIterator < optionsItems[optionIterator].authority.length; authorityIterator++) {
+			for (let authorityIterator = 0; authorityIterator < this.optionsItems[optionIterator].authority.length; authorityIterator++) {
 				for (let i = 0; i < explorerType.length; i++) {
-					if (optionsItems[optionIterator].authority[authorityIterator] === explorerType[i]) {
+					if (this.optionsItems[optionIterator].authority[authorityIterator] === explorerType[i]) {
 						index = optionIterator;
 						break;
 					}
@@ -89,19 +98,25 @@ export class SwitchRemoteViewItem extends SelectActionViewItem {
 	}
 }
 
-export class SwitchRemoteAction extends Action {
+export class SwitchRemoteAction extends Action2 {
 
 	public static readonly ID = 'remote.explorer.switch';
 	public static readonly LABEL = nls.localize('remote.explorer.switch', "Switch Remote");
 
-	constructor(
-		id: string, label: string,
-		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService
-	) {
-		super(id, label);
+	constructor() {
+		super({
+			id: SwitchRemoteAction.ID,
+			title: SwitchRemoteAction.LABEL,
+			menu: [{
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID),
+				group: 'navigation',
+				order: 1
+			}],
+		});
 	}
 
-	public async run(item: IRemoteSelectItem): Promise<any> {
-		this.remoteExplorerService.targetType = item.authority;
+	public async run(accessor: ServicesAccessor, args: IRemoteSelectItem): Promise<any> {
+		accessor.get(IRemoteExplorerService).targetType = args.authority;
 	}
 }
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 29ab926a3..5648d75f1 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -17,7 +17,7 @@ import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService'
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { AutomaticPortForwarding, ForwardedPortsView, VIEWLET_ID } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
+import { AutomaticPortForwarding, ForwardedPortsView, PortRestore, VIEWLET_ID } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IViewDescriptor, IViewsRegistry, Extensions, ViewContainerLocation, IViewContainersRegistry, IViewDescriptorService } from 'vs/workbench/common/views';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -29,7 +29,7 @@ import { ShowViewletAction } from 'vs/workbench/browser/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions, CATEGORIES } from 'vs/workbench/common/actions';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { registerAction2, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { IProgress, IProgressStep, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@@ -37,14 +37,14 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { ReconnectionWaitEvent, PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
 import Severity from 'vs/base/common/severity';
 import { ReloadWindowAction } from 'vs/workbench/browser/actions/windowActions';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { SwitchRemoteViewItem, SwitchRemoteAction } from 'vs/workbench/contrib/remote/browser/explorerViewItems';
-import { Action, IActionViewItem, IAction } from 'vs/base/common/actions';
+import { Action, IActionViewItem } from 'vs/base/common/actions';
 import { isStringArray } from 'vs/base/common/types';
 import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { ITreeRenderer, ITreeNode, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
 import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
@@ -53,9 +53,11 @@ import { Event } from 'vs/base/common/event';
 import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remoteIndicator';
-import { inQuickPickContextKeyValue } from 'vs/workbench/browser/quickaccess';
-import { Codicon } from 'vs/base/common/codicons';
-import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import * as icons from 'vs/workbench/contrib/remote/browser/remoteIcons';
+import { ILogService } from 'vs/platform/log/common/log';
+import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
+import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
+
 
 export interface HelpInformation {
 	extensionDescription: IExtensionDescription;
@@ -149,14 +151,6 @@ class HelpDataSource implements IAsyncDataSource<HelpModel, IHelpItem> {
 		return [];
 	}
 }
-
-const getStartedIcon = registerIcon('remote-explorer-get-started', Codicon.star, nls.localize('getStartedIcon', 'Getting started icon in the remote explorer view.'));
-const documentationIcon = registerIcon('remote-explorer-documentation', Codicon.book, nls.localize('documentationIcon', 'Documentation icon in the remote explorer view.'));
-const feedbackIcon = registerIcon('remote-explorer-feedback', Codicon.twitter, nls.localize('feedbackIcon', 'Feedback icon in the remote explorer view.'));
-const reviewIssuesIcon = registerIcon('remote-explorer-review-issues', Codicon.issues, nls.localize('reviewIssuesIcon', 'Review issue icon in the remote explorer view.'));
-const reportIssuesIcon = registerIcon('remote-explorer-report-issues', Codicon.comment, nls.localize('reportIssuesIcon', 'Report issue icon in the remote explorer view.'));
-const remoteExplorerViewIcon = registerIcon('remote-explorer-view-icon', Codicon.remoteExplorer, nls.localize('remoteExplorerViewIcon', 'View icon of the remote explorer view.'));
-
 interface IHelpItem {
 	icon: ThemeIcon,
 	iconClasses: string[];
@@ -180,7 +174,7 @@ class HelpModel {
 
 		if (getStarted.length) {
 			helpItems.push(new HelpItem(
-				getStartedIcon,
+				icons.getStartedIcon,
 				nls.localize('remote.help.getStarted', "Get Started"),
 				getStarted.map((info: HelpInformation) => (new HelpItemValue(commandService,
 					info.extensionDescription,
@@ -198,7 +192,7 @@ class HelpModel {
 
 		if (documentation.length) {
 			helpItems.push(new HelpItem(
-				documentationIcon,
+				icons.documentationIcon,
 				nls.localize('remote.help.documentation', "Read Documentation"),
 				documentation.map((info: HelpInformation) => (new HelpItemValue(commandService,
 					info.extensionDescription,
@@ -216,7 +210,7 @@ class HelpModel {
 
 		if (feedback.length) {
 			helpItems.push(new HelpItem(
-				feedbackIcon,
+				icons.feedbackIcon,
 				nls.localize('remote.help.feedback', "Provide Feedback"),
 				feedback.map((info: HelpInformation) => (new HelpItemValue(commandService,
 					info.extensionDescription,
@@ -234,7 +228,7 @@ class HelpModel {
 
 		if (issues.length) {
 			helpItems.push(new HelpItem(
-				reviewIssuesIcon,
+				icons.reviewIssuesIcon,
 				nls.localize('remote.help.issues', "Review Issues"),
 				issues.map((info: HelpInformation) => (new HelpItemValue(commandService,
 					info.extensionDescription,
@@ -250,7 +244,7 @@ class HelpModel {
 
 		if (helpItems.length) {
 			helpItems.push(new IssueReporterItem(
-				reportIssuesIcon,
+				icons.reportIssuesIcon,
 				nls.localize('remote.help.report', "Report Issue"),
 				viewModel.helpInformation.map(info => (new HelpItemValue(commandService,
 					info.extensionDescription,
@@ -457,8 +451,8 @@ class HelpPanelDescriptor implements IViewDescriptor {
 	readonly ctorDescriptor: SyncDescriptor<HelpPanel>;
 	readonly canToggleVisibility = true;
 	readonly hideByDefault = false;
-	readonly workspace = true;
 	readonly group = 'help@50';
+	readonly order = -10;
 
 	constructor(viewModel: IViewModel) {
 		this.ctorDescriptor = new SyncDescriptor(HelpPanel, [viewModel]);
@@ -468,7 +462,7 @@ class HelpPanelDescriptor implements IViewDescriptor {
 export class RemoteViewPaneContainer extends FilterViewPaneContainer implements IViewModel {
 	private helpPanelDescriptor = new HelpPanelDescriptor(this);
 	helpInformation: HelpInformation[] = [];
-	private actions: IAction[] | undefined;
+	private hasSetSwitchForConnection: boolean = false;
 
 	constructor(
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -529,31 +523,27 @@ export class RemoteViewPaneContainer extends FilterViewPaneContainer implements
 
 	public getActionViewItem(action: Action): IActionViewItem | undefined {
 		if (action.id === SwitchRemoteAction.ID) {
-			return this.instantiationService.createInstance(SwitchRemoteViewItem, action, SwitchRemoteViewItem.createOptionItems(Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).getViews(this.viewContainer), this.contextKeyService));
+			const optionItems = SwitchRemoteViewItem.createOptionItems(Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).getViews(this.viewContainer), this.contextKeyService);
+			const item = this.instantiationService.createInstance(SwitchRemoteViewItem, action, optionItems);
+			if (!this.hasSetSwitchForConnection) {
+				this.hasSetSwitchForConnection = item.setSelectionForConnection();
+			} else {
+				item.setSelection();
+			}
+			return item;
 		}
 
 		return super.getActionViewItem(action);
 	}
 
-	public getActions(): IAction[] {
-		if (!this.actions) {
-			this.actions = [
-				this.instantiationService.createInstance(SwitchRemoteAction, SwitchRemoteAction.ID, SwitchRemoteAction.LABEL)
-			];
-			this.actions.forEach(a => {
-				this._register(a);
-			});
-		}
-		return this.actions;
-	}
-
 	getTitle(): string {
 		const title = nls.localize('remote.explorer', "Remote Explorer");
 		return title;
 	}
-
 }
 
+registerAction2(SwitchRemoteAction);
+
 Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer(
 	{
 		id: VIEWLET_ID,
@@ -585,7 +575,7 @@ Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).register
 				return;
 			}
 		},
-		icon: remoteExplorerViewIcon,
+		icon: icons.remoteExplorerViewIcon,
 		order: 4
 	}, ViewContainerLocation.Sidebar);
 
@@ -608,8 +598,23 @@ Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExtensions.WorkbenchActions
 	CATEGORIES.View.value
 );
 
+class RemoteMarkers implements IWorkbenchContribution {
+
+	constructor(
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@ITimerService timerService: ITimerService,
+	) {
+		remoteAgentService.getEnvironment().then(remoteEnv => {
+			if (remoteEnv) {
+				timerService.setPerformanceMarks('server', remoteEnv.marks);
+			}
+		});
+	}
+}
+
 class VisibleProgress {
 
+	public readonly location: ProgressLocation;
 	private _isDisposed: boolean;
 	private _lastReport: string | null;
 	private _currentProgressPromiseResolve: (() => void) | null;
@@ -621,6 +626,7 @@ class VisibleProgress {
 	}
 
 	constructor(progressService: IProgressService, location: ProgressLocation, initialReport: string | null, buttons: string[], onDidCancel: (choice: number | undefined, lastReport: string | null) => void) {
+		this.location = location;
 		this._isDisposed = false;
 		this._lastReport = initialReport;
 		this._currentProgressPromiseResolve = null;
@@ -706,28 +712,45 @@ class ReconnectionTimer2 implements IDisposable {
 	}
 }
 
-class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
+/**
+ * The time when a prompt is shown to the user
+ */
+const DISCONNECT_PROMPT_TIME = 40 * 1000; // 40 seconds
+
+class RemoteAgentConnectionStatusListener extends Disposable implements IWorkbenchContribution {
+
+	private _reloadWindowShown: boolean = false;
+
 	constructor(
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@IProgressService progressService: IProgressService,
 		@IDialogService dialogService: IDialogService,
 		@ICommandService commandService: ICommandService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IQuickInputService quickInputService: IQuickInputService,
+		@ILogService logService: ILogService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@ITelemetryService telemetryService: ITelemetryService
 	) {
+		super();
 		const connection = remoteAgentService.getConnection();
 		if (connection) {
+			let quickInputVisible = false;
+			quickInputService.onShow(() => quickInputVisible = true);
+			quickInputService.onHide(() => quickInputVisible = false);
+
 			let visibleProgress: VisibleProgress | null = null;
-			let lastLocation: ProgressLocation.Dialog | ProgressLocation.Notification | null = null;
 			let reconnectWaitEvent: ReconnectionWaitEvent | null = null;
 			let disposableListener: IDisposable | null = null;
 
-			function showProgress(location: ProgressLocation.Dialog | ProgressLocation.Notification, buttons: { label: string, callback: () => void }[], initialReport: string | null = null): VisibleProgress {
+			function showProgress(location: ProgressLocation.Dialog | ProgressLocation.Notification | null, buttons: { label: string, callback: () => void }[], initialReport: string | null = null): VisibleProgress {
 				if (visibleProgress) {
 					visibleProgress.dispose();
 					visibleProgress = null;
 				}
 
-				lastLocation = location;
+				if (!location) {
+					location = quickInputVisible ? ProgressLocation.Notification : ProgressLocation.Dialog;
+				}
 
 				return new VisibleProgress(
 					progressService, location, initialReport, buttons.map(button => button.label),
@@ -753,6 +776,10 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 				}
 			}
 
+			let reconnectionToken: string = '';
+			let lastIncomingDataTime: number = 0;
+			let reconnectionAttempts: number = 0;
+
 			const reconnectButton = {
 				label: nls.localize('reconnectNow', "Reconnect Now"),
 				callback: () => {
@@ -765,10 +792,36 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 			const reloadButton = {
 				label: nls.localize('reloadWindow', "Reload Window"),
 				callback: () => {
+
+					type ReconnectReloadClassification = {
+						remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						reconnectionToken: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						millisSinceLastIncomingData: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						attempt: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					};
+					type ReconnectReloadEvent = {
+						remoteName: string | undefined;
+						reconnectionToken: string;
+						millisSinceLastIncomingData: number;
+						attempt: number;
+					};
+					telemetryService.publicLog2<ReconnectReloadEvent, ReconnectReloadClassification>('remoteReconnectionReload', {
+						remoteName: getRemoteName(environmentService.remoteAuthority),
+						reconnectionToken: reconnectionToken,
+						millisSinceLastIncomingData: Date.now() - lastIncomingDataTime,
+						attempt: reconnectionAttempts
+					});
+
 					commandService.executeCommand(ReloadWindowAction.ID);
 				}
 			};
 
+			// Possible state transitions:
+			// ConnectionGain      -> ConnectionLost
+			// ConnectionLost      -> ReconnectionWait, ReconnectionRunning
+			// ReconnectionWait    -> ReconnectionRunning
+			// ReconnectionRunning -> ConnectionGain, ReconnectionPermanentFailure
+
 			connection.onDidStateChange((e) => {
 				if (visibleProgress) {
 					visibleProgress.stopTimer();
@@ -780,43 +833,145 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
 				}
 				switch (e.type) {
 					case PersistentConnectionEventType.ConnectionLost:
-						if (!visibleProgress) {
-							visibleProgress = showProgress(ProgressLocation.Dialog, [reconnectButton, reloadButton]);
-						}
-						visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
-						break;
-					case PersistentConnectionEventType.ReconnectionWait:
-						reconnectWaitEvent = e;
-						visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reconnectButton, reloadButton]);
-						visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
-						break;
-					case PersistentConnectionEventType.ReconnectionRunning:
-						visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reloadButton]);
-						visibleProgress.report(nls.localize('reconnectionRunning', "Attempting to reconnect..."));
+						reconnectionToken = e.reconnectionToken;
+						lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
+						reconnectionAttempts = 0;
 
-						// Register to listen for quick input is opened
-						disposableListener = contextKeyService.onDidChangeContext((contextKeyChangeEvent) => {
-							const reconnectInteraction = new Set<string>([inQuickPickContextKeyValue]);
-							if (contextKeyChangeEvent.affectsSome(reconnectInteraction)) {
+						type RemoteConnectionLostClassification = {
+							remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							reconnectionToken: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						};
+						type RemoteConnectionLostEvent = {
+							remoteName: string | undefined;
+							reconnectionToken: string;
+						};
+						telemetryService.publicLog2<RemoteConnectionLostEvent, RemoteConnectionLostClassification>('remoteConnectionLost', {
+							remoteName: getRemoteName(environmentService.remoteAuthority),
+							reconnectionToken: e.reconnectionToken,
+						});
+
+						if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
+							if (!visibleProgress) {
+								visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
+							}
+							visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
+						}
+						break;
+
+					case PersistentConnectionEventType.ReconnectionWait:
+						if (visibleProgress) {
+							reconnectWaitEvent = e;
+							visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
+							visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
+						}
+						break;
+
+					case PersistentConnectionEventType.ReconnectionRunning:
+						reconnectionToken = e.reconnectionToken;
+						lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
+						reconnectionAttempts = e.attempt;
+
+						type RemoteReconnectionRunningClassification = {
+							remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							reconnectionToken: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							millisSinceLastIncomingData: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							attempt: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						};
+						type RemoteReconnectionRunningEvent = {
+							remoteName: string | undefined;
+							reconnectionToken: string;
+							millisSinceLastIncomingData: number;
+							attempt: number;
+						};
+						telemetryService.publicLog2<RemoteReconnectionRunningEvent, RemoteReconnectionRunningClassification>('remoteReconnectionRunning', {
+							remoteName: getRemoteName(environmentService.remoteAuthority),
+							reconnectionToken: e.reconnectionToken,
+							millisSinceLastIncomingData: e.millisSinceLastIncomingData,
+							attempt: e.attempt
+						});
+
+						if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
+							visibleProgress = showProgress(null, [reloadButton]);
+							visibleProgress.report(nls.localize('reconnectionRunning', "Disconnected. Attempting to reconnect..."));
+
+							// Register to listen for quick input is opened
+							disposableListener = quickInputService.onShow(() => {
 								// Need to move from dialog if being shown and user needs to type in a prompt
-								if (lastLocation === ProgressLocation.Dialog && visibleProgress !== null) {
+								if (visibleProgress && visibleProgress.location === ProgressLocation.Dialog) {
 									visibleProgress = showProgress(ProgressLocation.Notification, [reloadButton], visibleProgress.lastReport);
 								}
-							}
-						});
+							});
+						}
 
 						break;
+
 					case PersistentConnectionEventType.ReconnectionPermanentFailure:
+						reconnectionToken = e.reconnectionToken;
+						lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
+						reconnectionAttempts = e.attempt;
+
+						type RemoteReconnectionPermanentFailureClassification = {
+							remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							reconnectionToken: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							millisSinceLastIncomingData: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							attempt: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							handled: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						};
+						type RemoteReconnectionPermanentFailureEvent = {
+							remoteName: string | undefined;
+							reconnectionToken: string;
+							millisSinceLastIncomingData: number;
+							attempt: number;
+							handled: boolean;
+						};
+						telemetryService.publicLog2<RemoteReconnectionPermanentFailureEvent, RemoteReconnectionPermanentFailureClassification>('remoteReconnectionPermanentFailure', {
+							remoteName: getRemoteName(environmentService.remoteAuthority),
+							reconnectionToken: e.reconnectionToken,
+							millisSinceLastIncomingData: e.millisSinceLastIncomingData,
+							attempt: e.attempt,
+							handled: e.handled
+						});
+
 						hideProgress();
 
-						dialogService.show(Severity.Error, nls.localize('reconnectionPermanentFailure', "Cannot reconnect. Please reload the window."), [nls.localize('reloadWindow', "Reload Window"), nls.localize('cancel', "Cancel")], { cancelId: 1 }).then(result => {
-							// Reload the window
-							if (result.choice === 0) {
-								commandService.executeCommand(ReloadWindowAction.ID);
-							}
-						});
+						if (e.handled) {
+							logService.info(`Error handled: Not showing a notification for the error.`);
+							console.log(`Error handled: Not showing a notification for the error.`);
+						} else if (!this._reloadWindowShown) {
+							this._reloadWindowShown = true;
+							dialogService.show(Severity.Error, nls.localize('reconnectionPermanentFailure', "Cannot reconnect. Please reload the window."), [nls.localize('reloadWindow', "Reload Window"), nls.localize('cancel', "Cancel")], { cancelId: 1, useCustom: true }).then(result => {
+								// Reload the window
+								if (result.choice === 0) {
+									commandService.executeCommand(ReloadWindowAction.ID);
+								}
+							});
+						}
 						break;
+
 					case PersistentConnectionEventType.ConnectionGain:
+						reconnectionToken = e.reconnectionToken;
+						lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
+						reconnectionAttempts = e.attempt;
+
+						type RemoteConnectionGainClassification = {
+							remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							reconnectionToken: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							millisSinceLastIncomingData: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+							attempt: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+						};
+						type RemoteConnectionGainEvent = {
+							remoteName: string | undefined;
+							reconnectionToken: string;
+							millisSinceLastIncomingData: number;
+							attempt: number;
+						};
+						telemetryService.publicLog2<RemoteConnectionGainEvent, RemoteConnectionGainClassification>('remoteConnectionGain', {
+							remoteName: getRemoteName(environmentService.remoteAuthority),
+							reconnectionToken: e.reconnectionToken,
+							millisSinceLastIncomingData: e.millisSinceLastIncomingData,
+							attempt: e.attempt
+						});
+
 						hideProgress();
 						break;
 				}
@@ -829,4 +984,6 @@ const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegist
 workbenchContributionsRegistry.registerWorkbenchContribution(RemoteAgentConnectionStatusListener, LifecyclePhase.Eventually);
 workbenchContributionsRegistry.registerWorkbenchContribution(RemoteStatusIndicator, LifecyclePhase.Starting);
 workbenchContributionsRegistry.registerWorkbenchContribution(ForwardedPortsView, LifecyclePhase.Eventually);
+workbenchContributionsRegistry.registerWorkbenchContribution(PortRestore, LifecyclePhase.Eventually);
 workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwarding, LifecyclePhase.Eventually);
+workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index aaabe66b0..f8c12cf26 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -6,7 +6,7 @@ import * as nls from 'vs/nls';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { Extensions, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, IViewsService, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, PortsAttributes, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { PORT_AUTO_FORWARD_SETTING, forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel } from 'vs/workbench/contrib/remote/browser/tunnelView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@@ -21,13 +21,14 @@ import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal
 import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { OperatingSystem } from 'vs/base/common/platform';
-import { RemoteTunnel } from 'vs/platform/remote/common/tunnel';
-import { Codicon } from 'vs/base/common/codicons';
+import { isPortPrivileged, ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { ITASExperimentService } from 'vs/workbench/services/experiment/common/experimentService';
 import { optional } from 'vs/platform/instantiation/common/instantiation';
+import { portsViewIcon } from 'vs/workbench/contrib/remote/browser/remoteIcons';
+import { Event } from 'vs/base/common/event';
 
 export const VIEWLET_ID = 'workbench.view.remote';
 
@@ -68,7 +69,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 			return Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer({
 				id: TunnelPanel.ID,
 				name: nls.localize('ports', "Ports"),
-				icon: Codicon.plug,
+				icon: portsViewIcon,
 				ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [TunnelPanel.ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]),
 				storageId: TunnelPanel.ID,
 				hideIfEmpty: true,
@@ -92,6 +93,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 			const tunnelPanelDescriptor = new TunnelPanelDescriptor(new TunnelViewModel(this.remoteExplorerService, this.configurationService), this.environmentService);
 			const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
 			if (viewContainer) {
+				this.remoteExplorerService.enablePortsFeatures();
 				viewsRegistry.registerViews([tunnelPanelDescriptor!], viewContainer);
 			}
 		} else if (this.environmentService.remoteAuthority) {
@@ -123,12 +125,12 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 	}
 
 	private async updateActivityBadge() {
-		if (this._activityBadge) {
-			this._activityBadge.dispose();
-		}
 		if (!(await this.usePanelTreatment())) {
 			return;
 		}
+		if (this._activityBadge) {
+			this._activityBadge.dispose();
+		}
 		if (this.remoteExplorerService.tunnelModel.forwarded.size > 0) {
 			const viewContainer = this.viewDescriptorService.getViewContainerByViewId(TUNNEL_VIEW_ID);
 			if (viewContainer) {
@@ -169,6 +171,24 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 	}
 }
 
+export class PortRestore implements IWorkbenchContribution {
+	constructor(
+		@IRemoteExplorerService readonly remoteExplorerService: IRemoteExplorerService,
+	) {
+		if (!this.remoteExplorerService.tunnelModel.environmentTunnelsSet) {
+			Event.once(this.remoteExplorerService.tunnelModel.onEnvironmentTunnelsSet)(async () => {
+				await this.restore();
+			});
+		} else {
+			this.restore();
+		}
+	}
+
+	private async restore() {
+		return this.remoteExplorerService.restore();
+	}
+}
+
 
 export class AutomaticPortForwarding extends Disposable implements IWorkbenchContribution {
 
@@ -182,7 +202,8 @@ export class AutomaticPortForwarding extends Disposable implements IWorkbenchCon
 		@IContextKeyService readonly contextKeyService: IContextKeyService,
 		@IConfigurationService readonly configurationService: IConfigurationService,
 		@IDebugService readonly debugService: IDebugService,
-		@IRemoteAgentService readonly remoteAgentService: IRemoteAgentService
+		@IRemoteAgentService readonly remoteAgentService: IRemoteAgentService,
+		@ITunnelService readonly tunnelService: ITunnelService
 	) {
 		super();
 		if (!this.environmentService.remoteAuthority) {
@@ -191,37 +212,57 @@ export class AutomaticPortForwarding extends Disposable implements IWorkbenchCon
 
 		remoteAgentService.getEnvironment().then(environment => {
 			if (environment?.os === OperatingSystem.Windows) {
-				this._register(new WindowsAutomaticPortForwarding(terminalService, notificationService, openerService,
-					remoteExplorerService, contextKeyService, configurationService, debugService));
+				this._register(new OutputAutomaticPortForwarding(terminalService, notificationService, openerService,
+					remoteExplorerService, configurationService, debugService, tunnelService, remoteAgentService, false));
 			} else if (environment?.os === OperatingSystem.Linux) {
-				this._register(new LinuxAutomaticPortForwarding(configurationService, remoteExplorerService, notificationService, openerService, contextKeyService));
+				this._register(new ProcAutomaticPortForwarding(configurationService, remoteExplorerService, notificationService, openerService, tunnelService));
+				this._register(new OutputAutomaticPortForwarding(terminalService, notificationService, openerService,
+					remoteExplorerService, configurationService, debugService, tunnelService, remoteAgentService, true));
 			}
 		});
 	}
 }
 
-class ForwardedPortNotifier extends Disposable {
+class OnAutoForwardedAction extends Disposable {
 	private lastNotifyTime: Date;
-	private static COOL_DOWN = 5000; // milliseconds
+	private static NOTIFY_COOL_DOWN = 5000; // milliseconds
 	private lastNotification: INotificationHandle | undefined;
+	private lastShownPort: number | undefined;
 
 	constructor(private readonly notificationService: INotificationService,
 		private readonly remoteExplorerService: IRemoteExplorerService,
-		private readonly openerService: IOpenerService) {
+		private readonly openerService: IOpenerService,
+		private readonly tunnelService: ITunnelService,
+		private readonly portsAttributes: PortsAttributes) {
 		super();
 		this.lastNotifyTime = new Date();
 		this.lastNotifyTime.setFullYear(this.lastNotifyTime.getFullYear() - 1);
 	}
 
-	public async notify(tunnels: RemoteTunnel[]) {
+	public async doAction(tunnels: RemoteTunnel[]): Promise<void> {
 		const tunnel = await this.portNumberHeuristicDelay(tunnels);
 		if (tunnel) {
-			if (Date.now() - this.lastNotifyTime.getTime() > ForwardedPortNotifier.COOL_DOWN) {
-				this.showNotification(tunnel);
+			switch (this.portsAttributes.getAttributes(tunnel.tunnelRemotePort)?.onAutoForward) {
+				case OnPortForward.OpenBrowser: {
+					const address = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
+					await OpenPortInBrowserAction.run(this.remoteExplorerService.tunnelModel, this.openerService, address);
+					break;
+				}
+				case OnPortForward.Silent: break;
+				default:
+					if (Date.now() - this.lastNotifyTime.getTime() > OnAutoForwardedAction.NOTIFY_COOL_DOWN) {
+						this.showNotification(tunnel);
+					}
 			}
 		}
 	}
 
+	public async hide(removedPorts: number[]) {
+		if (this.lastShownPort && removedPorts.indexOf(this.lastShownPort) >= 0) {
+			this.lastNotification?.close();
+		}
+	}
+
 	private newerTunnel: RemoteTunnel | undefined;
 	private async portNumberHeuristicDelay(tunnels: RemoteTunnel[]): Promise<RemoteTunnel | undefined> {
 		if (tunnels.length === 0) {
@@ -251,48 +292,99 @@ class ForwardedPortNotifier extends Disposable {
 		});
 	}
 
+	private basicMessage(tunnel: RemoteTunnel) {
+		return nls.localize('remote.tunnelsView.automaticForward', "Your service running on port {0} is available.  ",
+			tunnel.tunnelRemotePort);
+	}
+
+	private linkMessage() {
+		return nls.localize('remote.tunnelsView.notificationLink', "[See all forwarded ports](command:{0}.focus)", TunnelPanel.ID);
+	}
+
 	private showNotification(tunnel: RemoteTunnel) {
-		const address = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
-		const message = nls.localize('remote.tunnelsView.automaticForward', "Your service running on port {0} is available. [See all forwarded ports](command:{1}.focus)",
-			tunnel.tunnelRemotePort, TunnelPanel.ID);
-		const browserChoice: IPromptChoice = {
-			label: OpenPortInBrowserAction.LABEL,
-			run: () => OpenPortInBrowserAction.run(this.remoteExplorerService.tunnelModel, this.openerService, address)
-		};
-		this.lastNotification = this.notificationService.prompt(Severity.Info, message, [browserChoice], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+		if (this.lastNotification) {
+			this.lastNotification.close();
+		}
+		let message = this.basicMessage(tunnel);
+		const choices = [this.openChoice(tunnel)];
+
+		if ((tunnel.tunnelLocalPort !== tunnel.tunnelRemotePort) && this.tunnelService.canElevate && isPortPrivileged(tunnel.tunnelRemotePort)) {
+			// Privileged ports are not on Windows, so it's safe to use "superuser"
+			message += nls.localize('remote.tunnelsView.elevationMessage', "You'll need to run as superuser to use port {0} locally.  ", tunnel.tunnelRemotePort);
+			choices.unshift(this.elevateChoice(tunnel));
+		}
+
+		message += this.linkMessage();
+
+		this.lastNotification = this.notificationService.prompt(Severity.Info, message, choices, { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+		this.lastShownPort = tunnel.tunnelRemotePort;
 		this.lastNotifyTime = new Date();
 		this.lastNotification.onDidClose(() => {
 			this.lastNotification = undefined;
+			this.lastShownPort = undefined;
 		});
 	}
+
+	private openChoice(tunnel: RemoteTunnel): IPromptChoice {
+		const address = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
+		return {
+			label: OpenPortInBrowserAction.LABEL,
+			run: () => OpenPortInBrowserAction.run(this.remoteExplorerService.tunnelModel, this.openerService, address)
+		};
+	}
+
+	private elevateChoice(tunnel: RemoteTunnel): IPromptChoice {
+		return {
+			// Privileged ports are not on Windows, so it's ok to stick to just "sudo".
+			label: nls.localize('remote.tunnelsView.elevationButton', "Use Port {0} as Sudo...", tunnel.tunnelRemotePort),
+			run: async () => {
+				await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort });
+				const newTunnel = await this.remoteExplorerService.forward({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, tunnel.tunnelRemotePort, undefined, undefined, true);
+				if (!newTunnel) {
+					return;
+				}
+				if (this.lastNotification) {
+					this.lastNotification.close();
+				}
+				this.lastShownPort = newTunnel.tunnelRemotePort;
+				this.lastNotification = this.notificationService.prompt(Severity.Info, this.basicMessage(newTunnel) + this.linkMessage(), [this.openChoice(newTunnel)], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+				this.lastNotification.onDidClose(() => {
+					this.lastNotification = undefined;
+					this.lastShownPort = undefined;
+				});
+			}
+		};
+	}
 }
 
-class WindowsAutomaticPortForwarding extends Disposable {
-	private contextServiceListener?: IDisposable;
+class OutputAutomaticPortForwarding extends Disposable {
+	private portsFeatures?: IDisposable;
 	private urlFinder?: UrlFinder;
-	private notifier: ForwardedPortNotifier;
+	private notifier: OnAutoForwardedAction;
+	private portsAttributes: PortsAttributes;
 
 	constructor(
 		private readonly terminalService: ITerminalService,
 		readonly notificationService: INotificationService,
 		readonly openerService: IOpenerService,
 		private readonly remoteExplorerService: IRemoteExplorerService,
-		private readonly contextKeyService: IContextKeyService,
 		private readonly configurationService: IConfigurationService,
-		private readonly debugService: IDebugService
+		private readonly debugService: IDebugService,
+		readonly tunnelService: ITunnelService,
+		private readonly remoteAgentService: IRemoteAgentService,
+		readonly privilegedOnly: boolean
 	) {
 		super();
-		this.notifier = new ForwardedPortNotifier(notificationService, remoteExplorerService, openerService);
+		this.portsAttributes = new PortsAttributes(configurationService);
+		this.notifier = new OnAutoForwardedAction(notificationService, remoteExplorerService, openerService, tunnelService, this.portsAttributes);
 		this._register(configurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING)) {
 				this.tryStartStopUrlFinder();
 			}
 		}));
 
-		this.contextServiceListener = this._register(this.contextKeyService.onDidChangeContext(e => {
-			if (e.affectsSome(new Set(forwardedPortsViewEnabled.keys()))) {
-				this.tryStartStopUrlFinder();
-			}
+		this.portsFeatures = this._register(this.remoteExplorerService.onEnabledPortsFeatures(() => {
+			this.tryStartStopUrlFinder();
 		}));
 		this.tryStartStopUrlFinder();
 	}
@@ -306,20 +398,26 @@ class WindowsAutomaticPortForwarding extends Disposable {
 	}
 
 	private startUrlFinder() {
-		if (!this.urlFinder && !forwardedPortsViewEnabled.getValue(this.contextKeyService)) {
+		if (!this.urlFinder && !this.remoteExplorerService.portsFeaturesEnabled) {
 			return;
 		}
-		if (this.contextServiceListener) {
-			this.contextServiceListener.dispose();
+		if (this.portsFeatures) {
+			this.portsFeatures.dispose();
 		}
 		this.urlFinder = this._register(new UrlFinder(this.terminalService, this.debugService));
 		this._register(this.urlFinder.onDidMatchLocalUrl(async (localUrl) => {
 			if (mapHasAddressLocalhostOrAllInterfaces(this.remoteExplorerService.tunnelModel.forwarded, localUrl.host, localUrl.port)) {
 				return;
 			}
+			if (this.portsAttributes.getAttributes(localUrl.port)?.onAutoForward === OnPortForward.Ignore) {
+				return;
+			}
+			if (this.privilegedOnly && !isPortPrivileged(localUrl.port, (await this.remoteAgentService.getEnvironment())?.os)) {
+				return;
+			}
 			const forwarded = await this.remoteExplorerService.forward(localUrl);
 			if (forwarded) {
-				this.notifier.notify([forwarded]);
+				this.notifier.doAction([forwarded]);
 			}
 		}));
 	}
@@ -332,32 +430,32 @@ class WindowsAutomaticPortForwarding extends Disposable {
 	}
 }
 
-class LinuxAutomaticPortForwarding extends Disposable {
+class ProcAutomaticPortForwarding extends Disposable {
 	private candidateListener: IDisposable | undefined;
 	private autoForwarded: Set<string> = new Set();
-	private notifier: ForwardedPortNotifier;
+	private notifier: OnAutoForwardedAction;
 	private initialCandidates: Set<string> = new Set();
-	private contextServiceListener: IDisposable | undefined;
+	private portsFeatures: IDisposable | undefined;
+	private portsAttributes: PortsAttributes;
 
 	constructor(
 		private readonly configurationService: IConfigurationService,
 		readonly remoteExplorerService: IRemoteExplorerService,
 		readonly notificationService: INotificationService,
 		readonly openerService: IOpenerService,
-		readonly contextKeyService: IContextKeyService
+		readonly tunnelService: ITunnelService
 	) {
 		super();
-		this.notifier = new ForwardedPortNotifier(notificationService, remoteExplorerService, openerService);
+		this.portsAttributes = new PortsAttributes(configurationService);
+		this.notifier = new OnAutoForwardedAction(notificationService, remoteExplorerService, openerService, tunnelService, this.portsAttributes);
 		this._register(configurationService.onDidChangeConfiguration(async (e) => {
 			if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING)) {
 				await this.startStopCandidateListener();
 			}
 		}));
 
-		this.contextServiceListener = this._register(this.contextKeyService.onDidChangeContext(async (e) => {
-			if (e.affectsSome(new Set(forwardedPortsViewEnabled.keys()))) {
-				await this.startStopCandidateListener();
-			}
+		this.portsFeatures = this._register(this.remoteExplorerService.onEnabledPortsFeatures(async () => {
+			await this.startStopCandidateListener();
 		}));
 
 		this.startStopCandidateListener();
@@ -379,11 +477,11 @@ class LinuxAutomaticPortForwarding extends Disposable {
 	}
 
 	private async startCandidateListener() {
-		if (this.candidateListener || !forwardedPortsViewEnabled.getValue(this.contextKeyService)) {
+		if (this.candidateListener || !this.remoteExplorerService.portsFeaturesEnabled) {
 			return;
 		}
-		if (this.contextServiceListener) {
-			this.contextServiceListener.dispose();
+		if (this.portsFeatures) {
+			this.portsFeatures.dispose();
 		}
 
 		if (!this.remoteExplorerService.tunnelModel.environmentTunnelsSet) {
@@ -391,13 +489,19 @@ class LinuxAutomaticPortForwarding extends Disposable {
 		}
 
 		// Capture list of starting candidates so we don't auto forward them later.
-		this.setInitialCandidates();
+		await this.setInitialCandidates();
 
 		this.candidateListener = this._register(this.remoteExplorerService.tunnelModel.onCandidatesChanged(this.handleCandidateUpdate, this));
 	}
 
-	private setInitialCandidates() {
-		this.remoteExplorerService.tunnelModel.candidates.forEach(async (value) => {
+	private async setInitialCandidates() {
+		let startingCandidates = this.remoteExplorerService.tunnelModel.candidatesOrUndefined;
+		if (!startingCandidates) {
+			await new Promise<void>(resolve => this.remoteExplorerService.tunnelModel.onCandidatesChanged(() => resolve()));
+			startingCandidates = this.remoteExplorerService.tunnelModel.candidates;
+		}
+
+		startingCandidates.forEach(async (value) => {
 			this.initialCandidates.add(makeAddress(value.host, value.port));
 		});
 	}
@@ -414,6 +518,9 @@ class LinuxAutomaticPortForwarding extends Disposable {
 			if (mapHasAddressLocalhostOrAllInterfaces(this.remoteExplorerService.tunnelModel.forwarded, value.host, value.port)) {
 				return undefined;
 			}
+			if (this.portsAttributes.getAttributes(value.port)?.onAutoForward === OnPortForward.Ignore) {
+				return undefined;
+			}
 			const forwarded = await this.remoteExplorerService.forward(value);
 			if (forwarded) {
 				this.autoForwarded.add(address);
@@ -427,18 +534,24 @@ class LinuxAutomaticPortForwarding extends Disposable {
 	}
 
 	private async handleCandidateUpdate(removed: Map<string, { host: string, port: number }>) {
+		const removedPorts: number[] = [];
 		removed.forEach((value, key) => {
 			if (this.autoForwarded.has(key)) {
 				this.remoteExplorerService.close(value);
 				this.autoForwarded.delete(key);
+				removedPorts.push(value.port);
 			} else if (this.initialCandidates.has(key)) {
 				this.initialCandidates.delete(key);
 			}
 		});
 
+		if (removedPorts.length > 0) {
+			await this.notifier.hide(removedPorts);
+		}
+
 		const tunnels = await this.forwardCandidates();
 		if (tunnels) {
-			this.notifier.notify(tunnels);
+			await this.notifier.doAction(tunnels);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIcons.ts b/src/vs/workbench/contrib/remote/browser/remoteIcons.ts
new file mode 100644
index 000000000..526b7cc06
--- /dev/null
+++ b/src/vs/workbench/contrib/remote/browser/remoteIcons.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+
+import { Codicon } from 'vs/base/common/codicons';
+import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+
+export const getStartedIcon = registerIcon('remote-explorer-get-started', Codicon.star, nls.localize('getStartedIcon', 'Getting started icon in the remote explorer view.'));
+export const documentationIcon = registerIcon('remote-explorer-documentation', Codicon.book, nls.localize('documentationIcon', 'Documentation icon in the remote explorer view.'));
+export const feedbackIcon = registerIcon('remote-explorer-feedback', Codicon.twitter, nls.localize('feedbackIcon', 'Feedback icon in the remote explorer view.'));
+export const reviewIssuesIcon = registerIcon('remote-explorer-review-issues', Codicon.issues, nls.localize('reviewIssuesIcon', 'Review issue icon in the remote explorer view.'));
+export const reportIssuesIcon = registerIcon('remote-explorer-report-issues', Codicon.comment, nls.localize('reportIssuesIcon', 'Report issue icon in the remote explorer view.'));
+export const remoteExplorerViewIcon = registerIcon('remote-explorer-view-icon', Codicon.remoteExplorer, nls.localize('remoteExplorerViewIcon', 'View icon of the remote explorer view.'));
+
+export const portsViewIcon = registerIcon('ports-view-icon', Codicon.plug, nls.localize('portsViewIcon', 'View icon of the remote ports view.'));
+export const portIcon = registerIcon('ports-view-icon', Codicon.plug, nls.localize('portIcon', 'Icon representing a remote port.'));
+export const privatePortIcon = registerIcon('private-ports-view-icon', Codicon.lock, nls.localize('privatePortIcon', 'Icon representing a private remote port.'));
+export const publicPortIcon = registerIcon('public-ports-view-icon', Codicon.eye, nls.localize('publicPortIcon', 'Icon representing a public remote port.'));
+
+export const forwardPortIcon = registerIcon('ports-forward-icon', Codicon.plus, nls.localize('forwardPortIcon', 'Icon for the forward action.'));
+export const stopForwardIcon = registerIcon('ports-stop-forward-icon', Codicon.x, nls.localize('stopForwardIcon', 'Icon for the stop forwarding action.'));
+export const openBrowserIcon = registerIcon('ports-open-browser-icon', Codicon.globe, nls.localize('openBrowserIcon', 'Icon for the open browser action.'));
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
index f3ee1a1f6..4f683236f 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
@@ -39,7 +39,7 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 	private hasRemoteActions = false;
 
 	private readonly remoteAuthority = this.environmentService.remoteAuthority;
-	private connectionState: 'initializing' | 'connected' | 'disconnected' | undefined = undefined;
+	private connectionState: 'initializing' | 'connected' | 'reconnecting' | 'disconnected' | undefined = undefined;
 	private readonly connectionStateContextKey = new RawContextKey<'' | 'initializing' | 'disconnected' | 'connected'>('remoteConnectionState', '').bindTo(this.contextKeyService);
 
 	constructor(
@@ -133,13 +133,15 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 				this._register(connection.onDidStateChange((e) => {
 					switch (e.type) {
 						case PersistentConnectionEventType.ConnectionLost:
-						case PersistentConnectionEventType.ReconnectionPermanentFailure:
 						case PersistentConnectionEventType.ReconnectionRunning:
 						case PersistentConnectionEventType.ReconnectionWait:
-							this.setDisconnected(true);
+							this.setState('reconnecting');
+							break;
+						case PersistentConnectionEventType.ReconnectionPermanentFailure:
+							this.setState('disconnected');
 							break;
 						case PersistentConnectionEventType.ConnectionGain:
-							this.setDisconnected(false);
+							this.setState('connected');
 							break;
 					}
 				}));
@@ -158,9 +160,9 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 				try {
 					await this.remoteAuthorityResolverService.resolveAuthority(remoteAuthority);
 
-					this.setDisconnected(false);
+					this.setState('connected');
 				} catch (error) {
-					this.setDisconnected(true);
+					this.setState('disconnected');
 				}
 			})();
 		}
@@ -168,11 +170,16 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 		this.updateRemoteStatusIndicator();
 	}
 
-	private setDisconnected(isDisconnected: boolean): void {
-		const newState = isDisconnected ? 'disconnected' : 'connected';
+	private setState(newState: 'disconnected' | 'connected' | 'reconnecting'): void {
 		if (this.connectionState !== newState) {
 			this.connectionState = newState;
-			this.connectionStateContextKey.set(this.connectionState);
+
+			// simplify context key which doesn't support `connecting`
+			if (this.connectionState === 'reconnecting') {
+				this.connectionStateContextKey.set('disconnected');
+			} else {
+				this.connectionStateContextKey.set(this.connectionState);
+			}
 
 			this.updateRemoteStatusIndicator();
 		}
@@ -202,6 +209,9 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 				case 'initializing':
 					this.renderRemoteStatusIndicator(nls.localize('host.open', "Opening Remote..."), nls.localize('host.open', "Opening Remote..."), undefined, true /* progress */);
 					break;
+				case 'reconnecting':
+					this.renderRemoteStatusIndicator(`${nls.localize('host.reconnecting', "Reconnecting to {0}...", truncate(hostLabel, RemoteStatusIndicator.REMOTE_STATUS_LABEL_MAX_LENGTH))}`, nls.localize('host.tooltipReconnecting', "Reconnecting to {0}...", hostLabel), undefined, true);
+					break;
 				case 'disconnected':
 					this.renderRemoteStatusIndicator(`$(alert) ${nls.localize('disconnectedFrom', "Disconnected from {0}", truncate(hostLabel, RemoteStatusIndicator.REMOTE_STATUS_LABEL_MAX_LENGTH))}`, nls.localize('host.tooltipDisconnected', "Disconnected from {0}", hostLabel));
 					break;
@@ -246,45 +256,48 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 	}
 
 	private showRemoteMenu(menu: IMenu) {
-		const actions = menu.getActions();
+		const computeItems = () => {
+			const actions = menu.getActions();
+			const items: (IQuickPickItem
+				| IQuickPickSeparator)[] = [];
+			for (let actionGroup of actions) {
+				if (items.length) {
+					items.push({ type: 'separator' });
+				}
 
-		const items: (IQuickPickItem | IQuickPickSeparator)[] = [];
-		for (let actionGroup of actions) {
-			if (items.length) {
-				items.push({ type: 'separator' });
-			}
+				for (let action of actionGroup[1]) {
+					if (action instanceof MenuItemAction) {
+						let label = typeof action.item.title === 'string' ? action.item.title : action.item.title.value;
+						if (action.item.category) {
+							const category = typeof action.item.category === 'string' ? action.item.category : action.item.category.value;
+							label = nls.localize('cat.title', "{0}: {1}", category, label);
+						}
 
-			for (let action of actionGroup[1]) {
-				if (action instanceof MenuItemAction) {
-					let label = typeof action.item.title === 'string' ? action.item.title : action.item.title.value;
-					if (action.item.category) {
-						const category = typeof action.item.category === 'string' ? action.item.category : action.item.category.value;
-						label = nls.localize('cat.title', "{0}: {1}", category, label);
+						items.push({
+							type: 'item',
+							id: action.item.id,
+							label
+						});
 					}
-
-					items.push({
-						type: 'item',
-						id: action.item.id,
-						label
-					});
 				}
 			}
-		}
 
-		if (RemoteStatusIndicator.SHOW_CLOSE_REMOTE_COMMAND_ID && this.remoteAuthority) {
-			if (items.length) {
-				items.push({ type: 'separator' });
+			if (RemoteStatusIndicator.SHOW_CLOSE_REMOTE_COMMAND_ID && this.remoteAuthority) {
+				if (items.length) {
+					items.push({ type: 'separator' });
+				}
+
+				items.push({
+					type: 'item',
+					id: RemoteStatusIndicator.CLOSE_REMOTE_COMMAND_ID,
+					label: nls.localize('closeRemote.title', 'Close Remote Connection')
+				});
 			}
-
-			items.push({
-				type: 'item',
-				id: RemoteStatusIndicator.CLOSE_REMOTE_COMMAND_ID,
-				label: nls.localize('closeRemote.title', 'Close Remote Connection')
-			});
-		}
+			return items;
+		};
 
 		const quickPick = this.quickInputService.createQuickPick();
-		quickPick.items = items;
+		quickPick.items = computeItems();
 		quickPick.canSelectMany = false;
 		once(quickPick.onDidAccept)((_ => {
 			const selectedItems = quickPick.selectedItems;
@@ -294,6 +307,9 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 
 			quickPick.hide();
 		}));
+		// refresh the items when actions change
+		const itemUpdater = menu.onDidChange(() => quickPick.items = computeItems());
+		quickPick.onDidHide(itemUpdater.dispose);
 
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index 7ed9fa790..d712a5102 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -10,9 +10,9 @@ import { IViewDescriptor, IEditableData, IViewsService, IViewDescriptorService }
 import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { ICommandService, ICommandHandler, CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -24,25 +24,25 @@ import { Disposable, IDisposable, toDisposable, MutableDisposable, dispose, Disp
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { ActionRunner, IAction } from 'vs/base/common/actions';
-import { IMenuService, MenuId, IMenu, MenuRegistry, MenuItemAction, ILocalizedString, SubmenuItemAction } from 'vs/platform/actions/common/actions';
-import { createAndFillInContextMenuActions, createAndFillInActionBarActions, MenuEntryActionViewItem, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { IRemoteExplorerService, TunnelModel, makeAddress, TunnelType, ITunnelItem, Tunnel, mapHasAddressLocalhostOrAllInterfaces, TUNNEL_VIEW_ID, parseAddress } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { IMenuService, MenuId, IMenu, MenuRegistry, ILocalizedString, Action2, registerAction2 } from 'vs/platform/actions/common/actions';
+import { createAndFillInContextMenuActions, createAndFillInActionBarActions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IRemoteExplorerService, TunnelModel, makeAddress, TunnelType, ITunnelItem, Tunnel, mapHasAddressLocalhostOrAllInterfaces, TUNNEL_VIEW_ID, parseAddress, CandidatePort, TunnelPrivacy } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { InputBox, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
 import { once } from 'vs/base/common/functional';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { URI } from 'vs/base/common/uri';
-import { RemoteTunnel } from 'vs/platform/remote/common/tunnel';
+import { isPortPrivileged, ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { Codicon } from 'vs/base/common/codicons';
+import { forwardPortIcon, openBrowserIcon, portsViewIcon, privatePortIcon, publicPortIcon, stopForwardIcon } from 'vs/workbench/contrib/remote/browser/remoteIcons';
 
 export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false);
 export const PORT_AUTO_FORWARD_SETTING = 'remote.autoForwardPorts';
@@ -71,7 +71,7 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
 	public onForwardedPortsChanged: Event<void> = this._onForwardedPortsChanged.event;
 	private model: TunnelModel;
 	private _input: TunnelItem;
-	private _candidates: Map<string, { host: string, port: number, detail: string }> = new Map();
+	private _candidates: Map<string, CandidatePort> = new Map();
 
 	constructor(
 		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
@@ -88,7 +88,8 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
 			remoteHost: 'localhost',
 			remotePort: 0,
 			description: '',
-			iconClasses: undefined
+			wideDescription: '',
+			icon: undefined
 		};
 	}
 
@@ -162,7 +163,7 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
 		this._candidates.forEach(value => {
 			if (!mapHasAddressLocalhostOrAllInterfaces(this.model.forwarded, value.host, value.port) &&
 				!mapHasAddressLocalhostOrAllInterfaces(this.model.detected, value.host, value.port)) {
-				candidates.push(new TunnelItem(TunnelType.Candidate, value.host, value.port, undefined, undefined, false, undefined, value.detail));
+				candidates.push(new TunnelItem(TunnelType.Candidate, value.host, value.port, undefined, undefined, false, undefined, value.detail, undefined, value.pid));
 			}
 		});
 		return candidates;
@@ -219,15 +220,7 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
 		// dom.addClass(iconLabel.element, 'tunnel-view-label');
 		const actionsContainer = dom.append(iconLabel.element, dom.$('.actions'));
 		const actionBar = new ActionBar(actionsContainer, {
-			actionViewItemProvider: (action: IAction) => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-				} else if (action instanceof SubmenuItemAction) {
-					return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-				}
-
-				return undefined;
-			}
+			actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
 		});
 
 		return { icon, iconLabel, actionBar, container, elementDisposable: Disposable.None };
@@ -266,8 +259,10 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
 	}
 
 	private renderTunnel(node: ITunnelItem, templateData: ITunnelTemplateData) {
-		const label = node.label + (node.description ? (' - ' + node.description) : '');
-		templateData.iconLabel.setLabel(node.label, node.description, { title: label, extraClasses: ['tunnel-view-label'] });
+		const isWide = templateData.container.parentElement?.parentElement?.parentElement?.parentElement?.parentElement?.parentElement?.parentElement?.parentElement?.classList.contains('wide');
+		const description = isWide ? node.wideDescription : node.description;
+		const label = node.label + (description ? (' - ' + description) : '');
+		templateData.iconLabel.setLabel(node.label, description, { title: label, extraClasses: ['tunnel-view-label'] });
 
 		templateData.actionBar.context = node;
 		const contextKeyService = this._register(this.contextKeyService.createScoped());
@@ -285,8 +280,8 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
 				templateData.actionBar.actionRunner = this._actionRunner;
 			}
 		}
-		if (node.iconClasses) {
-			templateData.icon.className = `custom-view-tree-node-item-icon ${node.iconClasses}`;
+		if (node.icon) {
+			templateData.icon.className = `custom-view-tree-node-item-icon ${ThemeIcon.asClassName(node.icon)}`;
 			templateData.icon.hidden = false;
 		} else {
 			templateData.icon.className = 'custom-view-tree-node-item-icon';
@@ -309,14 +304,14 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
 			validationOptions: {
 				validation: (value) => {
 					const message = editableData.validationMessage(value);
-					if (!message || message.severity !== Severity.Error) {
+					if (!message) {
 						return null;
 					}
 
 					return {
 						content: message.content,
 						formatContent: true,
-						type: MessageType.ERROR
+						type: message.severity === Severity.Error ? MessageType.ERROR : MessageType.INFO
 					};
 				}
 			},
@@ -345,15 +340,17 @@ class TunnelTreeRenderer extends Disposable implements ITreeRenderer<ITunnelGrou
 			inputBox,
 			dom.addStandardDisposableListener(inputBox.inputElement, dom.EventType.KEY_DOWN, (e: IKeyboardEvent) => {
 				if (e.equals(KeyCode.Enter)) {
-					if (inputBox.validate()) {
+					if (inputBox.validate() !== MessageType.ERROR) {
 						done(true, true);
+					} else {
+						done(false, true);
 					}
 				} else if (e.equals(KeyCode.Escape)) {
 					done(false, true);
 				}
 			}),
 			dom.addDisposableListener(inputBox.inputElement, dom.EventType.BLUR, () => {
-				done(inputBox.isInputValid(), true);
+				done(inputBox.validate() !== MessageType.ERROR, true);
 			}),
 			styler
 		];
@@ -405,7 +402,17 @@ interface ITunnelGroup {
 
 class TunnelItem implements ITunnelItem {
 	static createFromTunnel(tunnel: Tunnel, type: TunnelType = TunnelType.Forwarded, closeable?: boolean) {
-		return new TunnelItem(type, tunnel.remoteHost, tunnel.remotePort, tunnel.localAddress, tunnel.localPort, closeable === undefined ? tunnel.closeable : closeable, tunnel.name, tunnel.description ?? tunnel.runningProcess, tunnel.source);
+		return new TunnelItem(type,
+			tunnel.remoteHost,
+			tunnel.remotePort,
+			tunnel.localAddress,
+			tunnel.localPort,
+			closeable === undefined ? tunnel.closeable : closeable,
+			tunnel.name,
+			tunnel.runningProcess,
+			tunnel.source,
+			tunnel.pid,
+			tunnel.privacy);
 	}
 
 	constructor(
@@ -416,8 +423,10 @@ class TunnelItem implements ITunnelItem {
 		public localPort?: number,
 		public closeable?: boolean,
 		public name?: string,
-		private _description?: string,
-		private source?: string
+		private runningProcess?: string,
+		private source?: string,
+		private pid?: number,
+		public privacy?: TunnelPrivacy,
 	) { }
 	get label(): string {
 		if (this.name) {
@@ -453,22 +462,34 @@ class TunnelItem implements ITunnelItem {
 	}
 
 	set description(description: string | undefined) {
-		this._description = description;
+		this.runningProcess = description;
 	}
 
-	get description(): string | undefined {
+	private static getDescription(item: TunnelItem, isWide: boolean) {
 		const description: string[] = [];
 
-		if (this.name && this.localAddress) {
-			description.push(nls.localize('remote.tunnelsView.forwardedPortDescription0', "{0} \u2192 {1}", this.remotePort, TunnelItem.compactLongAddress(this.localAddress)));
+		if (item.name && item.localAddress) {
+			description.push(nls.localize('remote.tunnelsView.forwardedPortDescription0', "{0} \u2192 {1}", item.remotePort, TunnelItem.compactLongAddress(item.localAddress)));
 		}
 
-		if (this._description) {
-			description.push(this._description);
+		if (item.runningProcess) {
+			let processPid: string;
+			if (isWide) {
+				processPid = item.runningProcess.replace(/\0/g, ' ').trim();
+			} else {
+				const nullIndex = item.runningProcess.indexOf('\0');
+				processPid = item.runningProcess.substr(0, nullIndex > 0 ? nullIndex : item.runningProcess.length).trim();
+				const spaceIndex = processPid.indexOf(' ', 110);
+				processPid = processPid.substr(0, spaceIndex > 0 ? spaceIndex : processPid.length);
+			}
+			if (item.pid) {
+				processPid += ` (${item.pid})`;
+			}
+			description.push(processPid);
 		}
 
-		if (this.source) {
-			description.push(this.source);
+		if (item.source) {
+			description.push(item.source);
 		}
 
 		if (description.length > 0) {
@@ -478,13 +499,27 @@ class TunnelItem implements ITunnelItem {
 		return undefined;
 	}
 
-	get iconClasses(): string | undefined {
-		return this.tunnelType === TunnelType.Detected || this.tunnelType === TunnelType.Forwarded ? Codicon.plug.classNames : undefined;
+	get description(): string | undefined {
+		return TunnelItem.getDescription(this, false);
+	}
+
+	get wideDescription(): string | undefined {
+		return TunnelItem.getDescription(this, true);
+	}
+
+	get icon(): ThemeIcon | undefined {
+		switch (this.privacy) {
+			case TunnelPrivacy.Private: return privatePortIcon;
+			case TunnelPrivacy.Public: return publicPortIcon;
+			default: return undefined;
+
+		}
 	}
 }
 
 export const TunnelTypeContextKey = new RawContextKey<TunnelType>('tunnelType', TunnelType.Add);
 export const TunnelCloseableContextKey = new RawContextKey<boolean>('tunnelCloseable', false);
+const TunnelPrivacyContextKey = new RawContextKey<TunnelPrivacy | undefined>('tunnelPrivacy', undefined);
 const TunnelViewFocusContextKey = new RawContextKey<boolean>('tunnelViewFocus', false);
 const TunnelViewSelectionKeyName = 'tunnelViewSelection';
 const TunnelViewSelectionContextKey = new RawContextKey<ITunnelItem | undefined>(TunnelViewSelectionKeyName, undefined);
@@ -498,6 +533,7 @@ export class TunnelPanel extends ViewPane {
 	private tree!: TunnelDataTree;
 	private tunnelTypeContext: IContextKey<TunnelType>;
 	private tunnelCloseableContext: IContextKey<boolean>;
+	private tunnelPrivacyContext: IContextKey<TunnelPrivacy | undefined>;
 	private tunnelViewFocusContext: IContextKey<boolean>;
 	private tunnelViewSelectionContext: IContextKey<ITunnelItem | undefined>;
 	private portChangableContextKey: IContextKey<boolean>;
@@ -526,6 +562,7 @@ export class TunnelPanel extends ViewPane {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
 		this.tunnelTypeContext = TunnelTypeContextKey.bindTo(contextKeyService);
 		this.tunnelCloseableContext = TunnelCloseableContextKey.bindTo(contextKeyService);
+		this.tunnelPrivacyContext = TunnelPrivacyContextKey.bindTo(contextKeyService);
 		this.tunnelViewFocusContext = TunnelViewFocusContextKey.bindTo(contextKeyService);
 		this.tunnelViewSelectionContext = TunnelViewSelectionContextKey.bindTo(contextKeyService);
 		this.portChangableContextKey = PortChangableContextKey.bindTo(contextKeyService);
@@ -637,10 +674,6 @@ export class TunnelPanel extends ViewPane {
 		return contributedContextMenu;
 	}
 
-	getActions(): IAction[] {
-		return this.titleActions;
-	}
-
 	shouldShowWelcome(): boolean {
 		return (this.viewModel.forwarded.length === 0) && (this.viewModel.candidates.length === 0) &&
 			(this.viewModel.detected.length === 0) && !this.isEditing;
@@ -657,11 +690,13 @@ export class TunnelPanel extends ViewPane {
 			this.tunnelViewSelectionContext.set(item);
 			this.tunnelTypeContext.set(item.tunnelType);
 			this.tunnelCloseableContext.set(!!item.closeable);
+			this.tunnelPrivacyContext.set(item.privacy);
 			this.portChangableContextKey.set(!!item.localPort);
 		} else {
 			this.tunnelTypeContext.reset();
 			this.tunnelViewSelectionContext.reset();
 			this.tunnelCloseableContext.reset();
+			this.tunnelPrivacyContext.reset();
 			this.portChangableContextKey.reset();
 		}
 	}
@@ -680,10 +715,12 @@ export class TunnelPanel extends ViewPane {
 			this.tree!.setFocus([node]);
 			this.tunnelTypeContext.set(node.tunnelType);
 			this.tunnelCloseableContext.set(!!node.closeable);
+			this.tunnelPrivacyContext.set(node.privacy);
 			this.portChangableContextKey.set(!!node.localPort);
 		} else {
 			this.tunnelTypeContext.set(TunnelType.Add);
 			this.tunnelCloseableContext.set(false);
+			this.tunnelPrivacyContext.set(undefined);
 			this.portChangableContextKey.set(false);
 		}
 
@@ -735,7 +772,7 @@ export class TunnelPanelDescriptor implements IViewDescriptor {
 	readonly order = -500;
 	readonly remoteAuthority?: string | string[];
 	readonly canMoveView = true;
-	readonly containerIcon = Codicon.plug;
+	readonly containerIcon = portsViewIcon;
 
 	constructor(viewModel: ITunnelViewModel, environmentService: IWorkbenchEnvironmentService) {
 		this.ctorDescriptor = new SyncDescriptor(TunnelPanel, [viewModel]);
@@ -743,17 +780,6 @@ export class TunnelPanelDescriptor implements IViewDescriptor {
 	}
 }
 
-function validationMessage(validationString: string | null): { content: string, severity: Severity } | null {
-	if (!validationString) {
-		return null;
-	}
-
-	return {
-		content: validationString,
-		severity: Severity.Error
-	};
-}
-
 namespace LabelTunnelAction {
 	export const ID = 'remote.tunnel.label';
 	export const LABEL = nls.localize('remote.tunnel.label', "Set Label");
@@ -783,6 +809,7 @@ namespace LabelTunnelAction {
 const invalidPortString: string = nls.localize('remote.tunnelsView.portNumberValid', "Forwarded port is invalid.");
 const maxPortNumber: number = 65536;
 const invalidPortNumberString: string = nls.localize('remote.tunnelsView.portNumberToHigh', "Port number must be \u2265 0 and < {0}.", maxPortNumber);
+const requiresSudoString: string = nls.localize('remote.tunnelView.inlineElevationMessage', "May Require Sudo");
 
 export namespace ForwardPortAction {
 	export const INLINE_ID = 'remote.tunnel.forwardInline';
@@ -791,12 +818,14 @@ export namespace ForwardPortAction {
 	export const TREEITEM_LABEL = nls.localize('remote.tunnel.forwardItem', "Forward Port");
 	const forwardPrompt = nls.localize('remote.tunnel.forwardPrompt', "Port number or address (eg. 3000 or 10.10.10.10:2000).");
 
-	function validateInput(value: string): string | null {
+	function validateInput(value: string, canElevate: boolean): { content: string, severity: Severity } | null {
 		const parsed = parseAddress(value);
 		if (!parsed) {
-			return invalidPortString;
+			return { content: invalidPortString, severity: Severity.Error };
 		} else if (parsed.port >= maxPortNumber) {
-			return invalidPortNumberString;
+			return { content: invalidPortNumberString, severity: Severity.Error };
+		} else if (canElevate && isPortPrivileged(parsed.port)) {
+			return { content: requiresSudoString, severity: Severity.Info };
 		}
 		return null;
 	}
@@ -811,6 +840,7 @@ export namespace ForwardPortAction {
 		return async (accessor, arg) => {
 			const remoteExplorerService = accessor.get(IRemoteExplorerService);
 			const notificationService = accessor.get(INotificationService);
+			const tunnelService = accessor.get(ITunnelService);
 			if (arg instanceof TunnelItem) {
 				remoteExplorerService.forward({ host: arg.remoteHost, port: arg.remotePort }).then(tunnel => error(notificationService, tunnel, arg.remoteHost, arg.remotePort));
 			} else {
@@ -818,11 +848,11 @@ export namespace ForwardPortAction {
 					onFinish: async (value, success) => {
 						let parsed: { host: string, port: number } | undefined;
 						if (success && (parsed = parseAddress(value))) {
-							remoteExplorerService.forward({ host: parsed.host, port: parsed.port }).then(tunnel => error(notificationService, tunnel, parsed!.host, parsed!.port));
+							remoteExplorerService.forward({ host: parsed.host, port: parsed.port }, undefined, undefined, undefined, true).then(tunnel => error(notificationService, tunnel, parsed!.host, parsed!.port));
 						}
 						remoteExplorerService.setEditable(undefined, null);
 					},
-					validationMessage: (value) => validationMessage(validateInput(value)),
+					validationMessage: (value) => validateInput(value, tunnelService.canElevate),
 					placeholder: forwardPrompt
 				});
 			}
@@ -835,14 +865,15 @@ export namespace ForwardPortAction {
 			const notificationService = accessor.get(INotificationService);
 			const viewsService = accessor.get(IViewsService);
 			const quickInputService = accessor.get(IQuickInputService);
+			const tunnelService = accessor.get(ITunnelService);
 			await viewsService.openView(TunnelPanel.ID, true);
 			const value = await quickInputService.input({
 				prompt: forwardPrompt,
-				validateInput: (value) => Promise.resolve(validateInput(value))
+				validateInput: (value) => Promise.resolve(validateInput(value, tunnelService.canElevate)?.content)
 			});
 			let parsed: { host: string, port: number } | undefined;
 			if (value && (parsed = parseAddress(value))) {
-				remoteExplorerService.forward({ host: parsed.host, port: parsed.port }).then(tunnel => error(notificationService, tunnel, parsed!.host, parsed!.port));
+				remoteExplorerService.forward({ host: parsed.host, port: parsed.port }, undefined, undefined, undefined, true).then(tunnel => error(notificationService, tunnel, parsed!.host, parsed!.port));
 			}
 		};
 	}
@@ -1019,11 +1050,13 @@ namespace ChangeLocalPortAction {
 	export const ID = 'remote.tunnel.changeLocalPort';
 	export const LABEL = nls.localize('remote.tunnel.changeLocalPort', "Change Local Port");
 
-	function validateInput(value: string): string | null {
+	function validateInput(value: string, canElevate: boolean): { content: string, severity: Severity } | null {
 		if (!value.match(/^[0-9]+$/)) {
-			return invalidPortString;
+			return { content: invalidPortString, severity: Severity.Error };
 		} else if (Number(value) >= maxPortNumber) {
-			return invalidPortNumberString;
+			return { content: invalidPortNumberString, severity: Severity.Error };
+		} else if (canElevate && isPortPrivileged(Number(value))) {
+			return { content: requiresSudoString, severity: Severity.Info };
 		}
 		return null;
 	}
@@ -1032,6 +1065,7 @@ namespace ChangeLocalPortAction {
 		return async (accessor, arg) => {
 			const remoteExplorerService = accessor.get(IRemoteExplorerService);
 			const notificationService = accessor.get(INotificationService);
+			const tunnelService = accessor.get(ITunnelService);
 			const context = (arg !== undefined || arg instanceof TunnelItem) ? arg : accessor.get(IContextKeyService).getContextKeyValue(TunnelViewSelectionKeyName);
 			if (context instanceof TunnelItem) {
 				remoteExplorerService.setEditable(context, {
@@ -1040,13 +1074,13 @@ namespace ChangeLocalPortAction {
 						if (success) {
 							await remoteExplorerService.close({ host: context.remoteHost, port: context.remotePort });
 							const numberValue = Number(value);
-							const newForward = await remoteExplorerService.forward({ host: context.remoteHost, port: context.remotePort }, numberValue, context.name);
+							const newForward = await remoteExplorerService.forward({ host: context.remoteHost, port: context.remotePort }, numberValue, context.name, undefined, true);
 							if (newForward && newForward.tunnelLocalPort !== numberValue) {
 								notificationService.warn(nls.localize('remote.tunnel.changeLocalPortNumber', "The local port {0} is not available. Port number {1} has been used instead", value, newForward.tunnelLocalPort ?? newForward.localAddress));
 							}
 						}
 					},
-					validationMessage: (value) => validationMessage(validateInput(value)),
+					validationMessage: (value) => validateInput(value, tunnelService.canElevate),
 					placeholder: nls.localize('remote.tunnelsView.changePort', "New local port")
 				});
 			}
@@ -1054,6 +1088,36 @@ namespace ChangeLocalPortAction {
 	}
 }
 
+namespace MakePortPublicAction {
+	export const ID = 'remote.tunnel.makePublic';
+	export const LABEL = nls.localize('remote.tunnel.makePublic', "Make Public");
+
+	export function handler(): ICommandHandler {
+		return async (accessor, arg) => {
+			if (arg instanceof TunnelItem) {
+				const remoteExplorerService = accessor.get(IRemoteExplorerService);
+				await remoteExplorerService.close({ host: arg.remoteHost, port: arg.remotePort });
+				return remoteExplorerService.forward({ host: arg.remoteHost, port: arg.remotePort }, arg.localPort, arg.name, undefined, true, true);
+			}
+		};
+	}
+}
+
+namespace MakePortPrivateAction {
+	export const ID = 'remote.tunnel.makePrivate';
+	export const LABEL = nls.localize('remote.tunnel.makePrivate', "Make Private");
+
+	export function handler(): ICommandHandler {
+		return async (accessor, arg) => {
+			if (arg instanceof TunnelItem) {
+				const remoteExplorerService = accessor.get(IRemoteExplorerService);
+				await remoteExplorerService.close({ host: arg.remoteHost, port: arg.remotePort });
+				return remoteExplorerService.forward({ host: arg.remoteHost, port: arg.remotePort }, arg.localPort, arg.name, undefined, true, false);
+			}
+		};
+	}
+}
+
 const tunnelViewCommandsWeightBonus = 10; // give our commands a little bit more weight over other default list/tree commands
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -1091,6 +1155,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 CommandsRegistry.registerCommand(CopyAddressAction.COMMANDPALETTE_ID, CopyAddressAction.commandPaletteHandler());
 CommandsRegistry.registerCommand(ChangeLocalPortAction.ID, ChangeLocalPortAction.handler());
+CommandsRegistry.registerCommand(MakePortPublicAction.ID, MakePortPublicAction.handler());
+CommandsRegistry.registerCommand(MakePortPrivateAction.ID, MakePortPrivateAction.handler());
 
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, ({
 	command: {
@@ -1120,15 +1186,25 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, ({
 	},
 	when: forwardedPortsViewEnabled
 }));
-MenuRegistry.appendMenuItem(MenuId.TunnelTitle, ({
-	group: 'navigation',
-	order: 0,
-	command: {
-		id: ForwardPortAction.INLINE_ID,
-		title: ForwardPortAction.LABEL,
-		icon: Codicon.plus
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: ForwardPortAction.INLINE_ID,
+			title: ForwardPortAction.LABEL,
+			icon: forwardPortIcon,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyEqualsExpr.create('view', TUNNEL_VIEW_ID),
+			}]
+		});
 	}
-}));
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return ForwardPortAction.inlineHandler()(accessor, args);
+	}
+});
+
 MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 	group: '0_manage',
 	order: 0,
@@ -1159,6 +1235,24 @@ MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 	group: '1_manage',
 	order: 0,
+	command: {
+		id: MakePortPublicAction.ID,
+		title: MakePortPublicAction.LABEL,
+	},
+	when: TunnelPrivacyContextKey.isEqualTo(TunnelPrivacy.Private)
+}));
+MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
+	group: '1_manage',
+	order: 0,
+	command: {
+		id: MakePortPrivateAction.ID,
+		title: MakePortPrivateAction.LABEL,
+	},
+	when: TunnelPrivacyContextKey.isEqualTo(TunnelPrivacy.Public)
+}));
+MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
+	group: '1_manage',
+	order: 1,
 	command: {
 		id: ChangeLocalPortAction.ID,
 		title: ChangeLocalPortAction.LABEL,
@@ -1176,7 +1270,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 }));
 MenuRegistry.appendMenuItem(MenuId.TunnelContext, ({
 	group: '1_manage',
-	order: 1,
+	order: 2,
 	command: {
 		id: ClosePortAction.INLINE_ID,
 		title: ClosePortAction.LABEL,
@@ -1189,7 +1283,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelInline, ({
 	command: {
 		id: OpenPortInBrowserAction.ID,
 		title: OpenPortInBrowserAction.LABEL,
-		icon: Codicon.globe
+		icon: openBrowserIcon
 	},
 	when: ContextKeyExpr.or(TunnelTypeContextKey.isEqualTo(TunnelType.Forwarded), TunnelTypeContextKey.isEqualTo(TunnelType.Detected))
 }));
@@ -1198,7 +1292,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelInline, ({
 	command: {
 		id: ForwardPortAction.INLINE_ID,
 		title: ForwardPortAction.TREEITEM_LABEL,
-		icon: Codicon.plus
+		icon: forwardPortIcon
 	},
 	when: TunnelTypeContextKey.isEqualTo(TunnelType.Candidate)
 }));
@@ -1207,7 +1301,7 @@ MenuRegistry.appendMenuItem(MenuId.TunnelInline, ({
 	command: {
 		id: ClosePortAction.INLINE_ID,
 		title: ClosePortAction.LABEL,
-		icon: Codicon.x
+		icon: stopForwardIcon
 	},
 	when: TunnelCloseableContextKey
 }));
diff --git a/src/vs/workbench/contrib/remote/browser/urlFinder.ts b/src/vs/workbench/contrib/remote/browser/urlFinder.ts
index e9c21167a..cb3c96dc2 100644
--- a/src/vs/workbench/contrib/remote/browser/urlFinder.ts
+++ b/src/vs/workbench/contrib/remote/browser/urlFinder.ts
@@ -18,6 +18,7 @@ export class UrlFinder extends Disposable {
 	 * http://0.0.0.0:4000 - Elixir Phoenix
 	 */
 	private static readonly localUrlRegex = /\b\w{2,20}:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0|:\d{2,5})[\w\-\.\~:\/\?\#[\]\@!\$&\(\)\*\+\,\;\=]*/gim;
+	private static readonly extractPortRegex = /(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d{1,5})/;
 	/**
 	 * https://github.com/microsoft/vscode-remote-release/issues/3949
 	 */
@@ -106,7 +107,8 @@ export class UrlFinder extends Disposable {
 				const serverUrl = new URL(match);
 				if (serverUrl) {
 					// check if the port is a valid integer value
-					const port = parseFloat(serverUrl.port!);
+					const portMatch = match.match(UrlFinder.extractPortRegex);
+					const port = parseFloat(serverUrl.port ? serverUrl.port : (portMatch ? portMatch[2] : 'NaN'));
 					if (!isNaN(port) && Number.isInteger(port) && port > 0 && port <= 65535) {
 						// normalize the host name
 						let host = serverUrl.hostname;
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index 93911f192..cb8a00c66 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -127,12 +127,50 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 			'remote.restoreForwardedPorts': {
 				type: 'boolean',
 				markdownDescription: localize('remote.restoreForwardedPorts', "Restores the ports you forwarded in a workspace."),
-				default: false
+				default: true
 			},
 			'remote.autoForwardPorts': {
 				type: 'boolean',
 				markdownDescription: localize('remote.autoForwardPorts', "When enabled, new running processes are detected and ports that they listen on are automatically forwarded."),
 				default: true
+			},
+			'remote.portsAttributes': {
+				type: 'object',
+				patternProperties: {
+					'^\\d+(\\-\\d+)?$': {
+						type: 'object',
+						description: localize('remote.portsAttributes.port', "A port, or range of ports (ex. \"40000-55000\") that the attributes should apply to"),
+						properties: {
+							'onAutoForward': {
+								type: 'string',
+								enum: ['notify', 'openBrowser', 'silent', 'ignore'],
+								enumDescriptions: [
+									localize('remote.portsAttributes.notify', "Shows a notification when a port is automatically forwarded."),
+									localize('remote.portsAttributes.openBrowser', "Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."),
+									localize('remote.portsAttributes.silent', "Shows no notification and takes no action when this port is automatically forwarded."),
+									localize('remote.portsAttributes.ignore', "This port will not be automatically forwarded.")
+								],
+								description: localize('remote.portsAttributes.onForward', "Defines the action that occurs when the port is discovered for automatic forwarding"),
+								default: 'notify'
+							},
+							'elevateIfNeeded': {
+								type: 'boolean',
+								description: localize('remote.portsAttributes.elevateIfNeeded', "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: localize('remote.portsAttributes.label', "Label that will be shown in the UI for this port."),
+								default: localize('remote.portsAttributes.labelDefault', "Labeled Port")
+							}
+						},
+						default: {
+							'label': localize('remote.portsAttributes.labelDefault', "Labeled Port"),
+							'onAutoForward': 'notify'
+						}
+					}
+				},
+				markdownDescription: localize('remote.portsAttributes', "Allows setting of default properties that are set 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```")
 			}
 		}
 	});
diff --git a/src/vs/workbench/contrib/remote/common/showCandidate.ts b/src/vs/workbench/contrib/remote/common/showCandidate.ts
index c8283e27a..e74b2fe53 100644
--- a/src/vs/workbench/contrib/remote/common/showCandidate.ts
+++ b/src/vs/workbench/contrib/remote/common/showCandidate.ts
@@ -6,7 +6,7 @@
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { CandidatePort, IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
 
 export class ShowCandidateContribution extends Disposable implements IWorkbenchContribution {
 	constructor(
@@ -16,9 +16,9 @@ export class ShowCandidateContribution extends Disposable implements IWorkbenchC
 		super();
 		const showPortCandidate = environmentService.options?.tunnelProvider?.showPortCandidate;
 		if (showPortCandidate) {
-			this._register(remoteExplorerService.setCandidateFilter(async (candidates: { host: string, port: number, detail: string }[]): Promise<{ host: string, port: number, detail: string }[]> => {
+			this._register(remoteExplorerService.setCandidateFilter(async (candidates: CandidatePort[]): Promise<CandidatePort[]> => {
 				const filters: boolean[] = await Promise.all(candidates.map(candidate => showPortCandidate(candidate.host, candidate.port, candidate.detail)));
-				const filteredCandidates: { host: string, port: number, detail: string }[] = [];
+				const filteredCandidates: CandidatePort[] = [];
 				if (filters.length !== candidates.length) {
 					return candidates;
 				}
diff --git a/src/vs/workbench/contrib/remote/common/tunnelFactory.ts b/src/vs/workbench/contrib/remote/common/tunnelFactory.ts
index 6da6a2745..36524ca4b 100644
--- a/src/vs/workbench/contrib/remote/common/tunnelFactory.ts
+++ b/src/vs/workbench/contrib/remote/common/tunnelFactory.ts
@@ -3,46 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITunnelService, TunnelOptions, RemoteTunnel, TunnelCreationOptions } from 'vs/platform/remote/common/tunnel';
+import { ITunnelService, TunnelOptions, RemoteTunnel, TunnelCreationOptions, ITunnel } from 'vs/platform/remote/common/tunnel';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { URI } from 'vs/base/common/uri';
 import { IRemoteExplorerService } from 'vs/workbench/services/remote/common/remoteExplorerService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class TunnelFactoryContribution extends Disposable implements IWorkbenchContribution {
 	constructor(
 		@ITunnelService tunnelService: ITunnelService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IOpenerService openerService: IOpenerService,
-		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService
+		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService,
+		@ILogService logService: ILogService
 	) {
 		super();
 		const tunnelFactory = environmentService.options?.tunnelProvider?.tunnelFactory;
 		if (tunnelFactory) {
 			this._register(tunnelService.setTunnelProvider({
-				forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<RemoteTunnel> | undefined => {
-					const tunnelPromise = tunnelFactory(tunnelOptions, tunnelCreationOptions);
-					if (!tunnelPromise) {
-						return undefined;
+				forwardPort: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions): Promise<RemoteTunnel | undefined> | undefined => {
+					let tunnelPromise: Promise<ITunnel> | undefined;
+					try {
+						tunnelPromise = tunnelFactory(tunnelOptions, tunnelCreationOptions);
+					} catch (e) {
+						logService.trace('tunnelFactory: tunnel provider error');
 					}
-					return new Promise(resolve => {
-						tunnelPromise.then(async (tunnel) => {
-							const localAddress = tunnel.localAddress.startsWith('http') ? tunnel.localAddress : `http://${tunnel.localAddress}`;
-							const remoteTunnel: RemoteTunnel = {
-								tunnelRemotePort: tunnel.remoteAddress.port,
-								tunnelRemoteHost: tunnel.remoteAddress.host,
-								// The tunnel factory may give us an inaccessible local address.
-								// To make sure this doesn't happen, resolve the uri immediately.
-								localAddress: (await openerService.resolveExternalUri(URI.parse(localAddress))).resolved.toString(),
-								dispose: tunnel.dispose
-							};
-							resolve(remoteTunnel);
-						});
+
+					return new Promise(async (resolve) => {
+						if (!tunnelPromise) {
+							resolve(undefined);
+							return;
+						}
+						let tunnel: ITunnel;
+						try {
+							tunnel = await tunnelPromise;
+						} catch (e) {
+							logService.trace('tunnelFactory: tunnel provider promise error');
+							resolve(undefined);
+							return;
+						}
+						const localAddress = tunnel.localAddress.startsWith('http') ? tunnel.localAddress : `http://${tunnel.localAddress}`;
+						const remoteTunnel: RemoteTunnel = {
+							tunnelRemotePort: tunnel.remoteAddress.port,
+							tunnelRemoteHost: tunnel.remoteAddress.host,
+							// The tunnel factory may give us an inaccessible local address.
+							// To make sure this doesn't happen, resolve the uri immediately.
+							localAddress: (await openerService.resolveExternalUri(URI.parse(localAddress))).resolved.toString(),
+							public: !!tunnel.public,
+							dispose: async () => { await tunnel.dispose(); }
+						};
+						resolve(remoteTunnel);
 					});
 				}
-			}));
+			}, environmentService.options?.tunnelProvider?.features ?? { elevation: false, public: false }));
 			remoteExplorerService.setTunnelInformation(undefined);
 		}
 	}
diff --git a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts b/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
index 5a7503426..9539d660d 100644
--- a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts
@@ -28,6 +28,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'v
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { OpenLocalFileFolderCommand, OpenLocalFileCommand, OpenLocalFolderCommand, SaveLocalFileCommand, RemoteFileDialogContext } from 'vs/workbench/services/dialogs/browser/simpleFileDialog';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 
 class RemoteChannelsContribution implements IWorkbenchContribution {
 
@@ -124,6 +125,7 @@ class RemoteEmptyWorkbenchPresentation extends Disposable implements IWorkbenchC
 		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@ICommandService commandService: ICommandService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
 		super();
 
@@ -136,8 +138,8 @@ class RemoteEmptyWorkbenchPresentation extends Disposable implements IWorkbenchC
 			return shouldShowExplorer();
 		}
 
-		const { remoteAuthority, folderUri, workspace, filesToDiff, filesToOpenOrCreate, filesToWait } = environmentService.configuration;
-		if (remoteAuthority && !folderUri && !workspace && !filesToDiff?.length && !filesToOpenOrCreate?.length && !filesToWait) {
+		const { remoteAuthority, filesToDiff, filesToOpenOrCreate, filesToWait } = environmentService.configuration;
+		if (remoteAuthority && contextService.getWorkbenchState() === WorkbenchState.EMPTY && !filesToDiff?.length && !filesToOpenOrCreate?.length && !filesToWait) {
 			remoteAuthorityResolverService.resolveAuthority(remoteAuthority).then(() => {
 				if (shouldShowExplorer()) {
 					commandService.executeCommand('workbench.view.explorer');
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index 87764bb28..2c8425de6 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -164,8 +164,6 @@ export class SCMStatusController implements IWorkbenchContribution {
 	}
 
 	private renderActivityCount(): void {
-		this.badgeDisposable.clear();
-
 		const countBadgeType = this.configurationService.getValue<'all' | 'focused' | 'off'>('scm.countBadge');
 
 		let count = 0;
@@ -180,7 +178,7 @@ export class SCMStatusController implements IWorkbenchContribution {
 			const badge = new NumberBadge(count, num => localize('scmPendingChangesBadge', '{0} pending changes', num));
 			this.badgeDisposable.value = this.activityService.showViewActivity(VIEW_PANE_ID, { badge, clazz: 'scm-viewlet-label' });
 		} else {
-			this.badgeDisposable.clear();
+			this.badgeDisposable.value = undefined;
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 74f6922e9..c92d9cdfe 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -19,7 +19,7 @@
 }
 
 .scm-view .monaco-tl-contents > div {
-	margin-right: 12px;
+	padding-right: 12px;
 	overflow: hidden;
 }
 
@@ -190,7 +190,7 @@
 
 .scm-view .scm-input {
 	height: 100%;
-	margin-left: 9px;
+	padding-left: 8px;
 }
 
 .scm-view .scm-editor {
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index 1a5d3329a..7945dc95a 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./media/scm';
 import { localize } from 'vs/nls';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { append, $ } from 'vs/base/browser/dom';
 import { IListVirtualDelegate, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
 import { ISCMRepository, ISCMService, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm';
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 4095bee20..f25046fbe 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/scm';
 import { Event, Emitter } from 'vs/base/common/event';
 import { basename, dirname } from 'vs/base/common/resources';
 import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, asCSSUrl } from 'vs/base/browser/dom';
 import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
 import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason } from 'vs/workbench/contrib/scm/common/scm';
@@ -954,24 +954,14 @@ class ViewModel {
 	}
 
 	private refresh(item?: IRepositoryItem | IGroupItem): void {
-		const focusedInput = this.inputRenderer.getFocusedInput();
-
 		if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
 			const item = Iterable.first(this.items.values())!;
-			this.tree.setChildren(null, this.render(item, this._treeViewState).children);
+			this.tree.setChildren(null, this.render(item, this.treeViewState).children);
 		} else if (item) {
-			this.tree.setChildren(item.element, this.render(item, this._treeViewState).children);
+			this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
 		} else {
 			const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
-			this.tree.setChildren(null, items.map(item => this.render(item, this._treeViewState)));
-		}
-
-		if (focusedInput) {
-			const inputWidget = this.inputRenderer.getRenderedInputWidget(focusedInput);
-
-			if (inputWidget) {
-				inputWidget.focus();
-			}
+			this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
 		}
 
 		this._onDidChangeRepositoryCollapseState.fire();
@@ -982,11 +972,11 @@ class ViewModel {
 			const children: ICompressedTreeElement<TreeElement>[] = [];
 			const hasSomeChanges = item.groupItems.some(item => item.element.elements.length > 0);
 
-			if (this.items.size === 1 || hasSomeChanges) {
-				if (item.element.input.visible) {
-					children.push({ element: item.element.input, incompressible: true, collapsible: false });
-				}
+			if (item.element.input.visible) {
+				children.push({ element: item.element.input, incompressible: true, collapsible: false });
+			}
 
+			if (this.items.size === 1 || hasSomeChanges) {
 				children.push(...item.groupItems.map(i => this.render(i, treeViewState)));
 			}
 
@@ -1101,7 +1091,7 @@ class ViewModel {
 		}
 
 		if (this.alwaysShowRepositories || this.scmViewService.visibleRepositories.length !== 1) {
-			return this.viewSubMenuAction.actions;
+			return this.viewSubMenuAction.actions.slice(0);
 		}
 
 		const menus = this.scmViewService.menus.getRepositoryMenus(this.scmViewService.visibleRepositories[0].provider);
@@ -1180,7 +1170,9 @@ class SCMViewRepositoriesSubMenuAction extends SubmenuAction {
 	}
 }
 
-class SCMViewSubMenuAction extends SubmenuAction {
+class SCMViewSubMenuAction extends SubmenuAction implements IDisposable {
+
+	private disposable: IDisposable;
 
 	constructor(
 		viewModel: ViewModel,
@@ -1205,7 +1197,11 @@ class SCMViewSubMenuAction extends SubmenuAction {
 			actions
 		);
 
-		this._register(combinedDisposable(listAction, treeAction, sortByNameAction, sortByPathAction, sortByStatusAction));
+		this.disposable = combinedDisposable(listAction, treeAction, sortByNameAction, sortByPathAction, sortByStatusAction);
+	}
+
+	dispose(): void {
+		this.disposable.dispose();
 	}
 }
 
@@ -1756,6 +1752,7 @@ export class SCMViewPane extends ViewPane {
 			delegate,
 			renderers,
 			{
+				transformOptimization: false,
 				identityProvider,
 				horizontalScrolling: false,
 				setRowLineHeight: false,
diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts
index 1c0d1e0e3..664dea507 100644
--- a/src/vs/workbench/contrib/scm/browser/util.ts
+++ b/src/vs/workbench/contrib/scm/browser/util.ts
@@ -11,7 +11,7 @@ import { Action, IAction } from 'vs/base/common/actions';
 import { createAndFillInActionBarActions, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { equals } from 'vs/base/common/arrays';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
-import { renderCodicons } from 'vs/base/browser/codicons';
+import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { Command } from 'vs/editor/common/modes';
 import { basename } from 'vs/base/common/resources';
@@ -104,7 +104,7 @@ export class StatusBarActionViewItem extends ActionViewItem {
 
 	updateLabel(): void {
 		if (this.options.label && this.label) {
-			reset(this.label, ...renderCodicons(this.getAction().label));
+			reset(this.label, ...renderLabelWithIcons(this.getAction().label));
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 4ada84026..9ea5ebd26 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -48,8 +48,9 @@ import { once } from 'vs/base/common/functional';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { getIEditor } from 'vs/editor/browser/editorBrowser';
 import { withNullAsUndefined } from 'vs/base/common/types';
-import { Codicon, stripCodicons } from 'vs/base/common/codicons';
+import { Codicon } from 'vs/base/common/codicons';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
+import { stripIcons } from 'vs/base/common/iconLabels';
 
 interface IAnythingQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource { }
 
@@ -184,16 +185,16 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 	}
 
 	private get configuration() {
-		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor;
+		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench?.editor;
 		const searchConfig = this.configurationService.getValue<IWorkbenchSearchConfiguration>().search;
 		const quickAccessConfig = this.configurationService.getValue<IWorkbenchQuickAccessConfiguration>().workbench.quickOpen;
 
 		return {
-			openEditorPinned: !editorConfig.enablePreviewFromQuickOpen,
-			openSideBySideDirection: editorConfig.openSideBySideDirection,
-			includeSymbols: searchConfig.quickOpen.includeSymbols,
-			includeHistory: searchConfig.quickOpen.includeHistory,
-			historyFilterSortOrder: searchConfig.quickOpen.history.filterSortOrder,
+			openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview,
+			openSideBySideDirection: editorConfig?.openSideBySideDirection,
+			includeSymbols: searchConfig?.quickOpen.includeSymbols,
+			includeHistory: searchConfig?.quickOpen.includeHistory,
+			historyFilterSortOrder: searchConfig?.quickOpen.history.filterSortOrder,
 			shortAutoSaveDelay: this.filesConfigurationService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY,
 			preserveInput: quickAccessConfig.preserveInput
 		};
@@ -815,7 +816,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		}
 
 		// Ask provider for editor symbols
-		const editorSymbolPicks = (await this.editorSymbolsQuickAccess.getSymbolPicks(model, filter, { extraContainerLabel: stripCodicons(activeGlobalPick.label) }, disposables, token));
+		const editorSymbolPicks = (await this.editorSymbolsQuickAccess.getSymbolPicks(model, filter, { extraContainerLabel: stripIcons(activeGlobalPick.label) }, disposables, token));
 		if (token.isCancellationRequested) {
 			return [];
 		}
@@ -932,11 +933,11 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 	private async openAnything(resourceOrEditor: URI | IEditorInput | IResourceEditorInput, options: { keyMods?: IKeyMods, preserveFocus?: boolean, range?: IRange, forceOpenSideBySide?: boolean, forcePinned?: boolean }): Promise<void> {
 		const editorOptions: ITextEditorOptions = {
 			preserveFocus: options.preserveFocus,
-			pinned: options.keyMods?.alt || options.forcePinned || this.configuration.openEditorPinned,
+			pinned: options.keyMods?.ctrlCmd || options.forcePinned || this.configuration.openEditorPinned,
 			selection: options.range ? Range.collapseToStart(options.range) : undefined
 		};
 
-		const targetGroup = options.keyMods?.ctrlCmd || options.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP;
+		const targetGroup = options.keyMods?.alt || (this.configuration.openEditorPinned && options.keyMods?.ctrlCmd) || options.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP;
 
 		// Restore any view state if the target is the side group
 		if (targetGroup === SIDE_GROUP) {
diff --git a/src/vs/workbench/contrib/search/browser/media/searchEditor.css b/src/vs/workbench/contrib/search/browser/media/searchEditor.css
index c12e7737a..04fbe328a 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchEditor.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchEditor.css
@@ -45,31 +45,31 @@
 	width: 100%;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper {
 	height: 100%;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper > .mirror,
-.search-editor .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror,
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	padding: 3px;
 	padding-left: 4px;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper > .mirror {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror {
 	max-height: 134px;
 }
 
 /* NOTE: height is also used in searchWidget.ts as a constant*/
-.search-editor .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	overflow: initial;
 	height: 24px; /* set initial height before measure */
 }
 
-.search-editor .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .monaco-inputbox > .ibwrapper > textarea.input {
 	scrollbar-width: none; /* Firefox: hide scrollbar */
 }
 
-.search-editor .monaco-inputbox > .wrapper > textarea.input::-webkit-scrollbar {
+.search-editor .monaco-inputbox > .ibwrapper > textarea.input::-webkit-scrollbar {
 	display: none;
 }
 
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index f8484082b..896a356ac 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -30,18 +30,18 @@
 	margin-left: 18px;
 }
 
-.search-view .search-widget .monaco-inputbox > .wrapper {
+.search-view .search-widget .monaco-inputbox > .ibwrapper {
 	height: 100%;
 }
 
-.search-view .search-widget .monaco-inputbox > .wrapper > .mirror,
-.search-view .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-view .search-widget .monaco-inputbox > .ibwrapper > .mirror,
+.search-view .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	padding: 3px;
 	padding-left: 4px;
 }
 
 /* NOTE: height is also used in searchWidget.ts as a constant*/
-.search-view .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-view .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	overflow: initial;
 	height: 24px; /* set initial height before measure */
 }
@@ -50,11 +50,11 @@
 	opacity: 0;
 }
 
-.search-view .monaco-inputbox > .wrapper > textarea.input {
+.search-view .monaco-inputbox > .ibwrapper > textarea.input {
 	scrollbar-width: none; /* Firefox: hide scrollbar */
 }
 
-.search-view .monaco-inputbox > .wrapper > textarea.input::-webkit-scrollbar {
+.search-view .monaco-inputbox > .ibwrapper > textarea.input::-webkit-scrollbar {
 	display: none;
 }
 
diff --git a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
index 63bf2771a..d59e77968 100644
--- a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
@@ -18,7 +18,8 @@ import { ContextScopedHistoryInputBox } from 'vs/platform/browser/contextScopedH
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import type { IThemable } from 'vs/base/common/styler';
 import { Codicon } from 'vs/base/common/codicons';
-
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ISearchConfiguration } from 'vs/workbench/services/search/common/search';
 export interface IOptions {
 	placeholder?: string;
 	width?: number;
@@ -50,7 +51,8 @@ export class PatternInputWidget extends Widget implements IThemable {
 
 	constructor(parent: HTMLElement, private contextViewProvider: IContextViewProvider, options: IOptions = Object.create(null),
 		@IThemeService protected themeService: IThemeService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IConfigurationService protected readonly configurationService: IConfigurationService
 	) {
 		super();
 		this.width = options.width || 100;
@@ -178,6 +180,62 @@ export class PatternInputWidget extends Widget implements IThemable {
 	}
 }
 
+export class IncludePatternInputWidget extends PatternInputWidget {
+
+	private _onChangeSearchInEditorsBoxEmitter = this._register(new Emitter<void>());
+	onChangeSearchInEditorsBox = this._onChangeSearchInEditorsBoxEmitter.event;
+
+	constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions = Object.create(null),
+		@IThemeService themeService: IThemeService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super(parent, contextViewProvider, options, themeService, contextKeyService, configurationService);
+	}
+
+	private useSearchInEditorsBox!: Checkbox;
+
+	dispose(): void {
+		super.dispose();
+		this.useSearchInEditorsBox.dispose();
+	}
+
+	onlySearchInOpenEditors(): boolean {
+		return this.useSearchInEditorsBox.checked;
+	}
+
+	setOnlySearchInOpenEditors(value: boolean) {
+		this.useSearchInEditorsBox.checked = value;
+	}
+
+	protected getSubcontrolsWidth(): number {
+		if (this.configurationService.getValue<ISearchConfiguration>().search?.experimental?.searchInOpenEditors) {
+			return super.getSubcontrolsWidth() + this.useSearchInEditorsBox.width();
+		}
+		return super.getSubcontrolsWidth();
+	}
+
+	protected renderSubcontrols(controlsDiv: HTMLDivElement): void {
+		this.useSearchInEditorsBox = this._register(new Checkbox({
+			icon: Codicon.book,
+			title: nls.localize('onlySearchInOpenEditors', "Search only in Open Editors"),
+			isChecked: false,
+		}));
+		if (!this.configurationService.getValue<ISearchConfiguration>().search?.experimental?.searchInOpenEditors) {
+			return;
+		}
+		this._register(this.useSearchInEditorsBox.onChange(viaKeyboard => {
+			this._onChangeSearchInEditorsBoxEmitter.fire();
+			if (!viaKeyboard) {
+				this.inputBox.focus();
+			}
+		}));
+		this._register(attachCheckboxStyler(this.useSearchInEditorsBox, this.themeService));
+		controlsDiv.appendChild(this.useSearchInEditorsBox.domNode);
+		super.renderSubcontrols(controlsDiv);
+	}
+}
+
 export class ExcludePatternInputWidget extends PatternInputWidget {
 
 	private _onChangeIgnoreBoxEmitter = this._register(new Emitter<void>());
@@ -185,9 +243,10 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 
 	constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions = Object.create(null),
 		@IThemeService themeService: IThemeService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(parent, contextViewProvider, options, themeService, contextKeyService);
+		super(parent, contextViewProvider, options, themeService, contextKeyService, configurationService);
 	}
 
 	private useExcludesAndIgnoreFilesBox!: Checkbox;
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
index b0ccc8847..cfbbb00c6 100644
--- a/src/vs/workbench/contrib/search/browser/search.contribution.ts
+++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -4,57 +4,58 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Action } from 'vs/base/common/actions';
-import { distinct } from 'vs/base/common/arrays';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import * as platform from 'vs/base/common/platform';
 import { dirname } from 'vs/base/common/resources';
+import { assertIsDefined, assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/findModel';
+import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/gotoLineQuickAccess';
 import * as nls from 'vs/nls';
-import { ICommandAction, MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { Action2, ICommandAction, MenuId, MenuRegistry, registerAction2, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { CommandsRegistry, ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
+import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ConfigurationScope, Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyAndExpr, ContextKeyEqualsExpr, ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IFileService } from 'vs/platform/files/common/files';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { IListService, WorkbenchListFocusContextKey, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
+import product from 'vs/platform/product/common/product';
+import { Extensions as QuickAccessExtensions, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { defaultQuickAccessContextKeyValue } from 'vs/workbench/browser/quickaccess';
 import { CATEGORIES, Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
 import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
-import { Extensions as ViewExtensions, IViewsRegistry, IViewContainersRegistry, ViewContainerLocation, IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
+import { Extensions as ViewExtensions, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
+import { GotoSymbolQuickAccessProvider } from 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
+import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
 import { getMultiSelectedResources, IExplorerService } from 'vs/workbench/contrib/files/browser/files';
 import { ExplorerFolderContext, ExplorerRootContext, FilesExplorerFocusCondition, VIEWLET_ID as VIEWLET_ID_FILES } from 'vs/workbench/contrib/files/common/files';
+import { AnythingQuickAccessProvider } from 'vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { registerContributions as replaceContributions } from 'vs/workbench/contrib/search/browser/replaceContributions';
-import { clearHistoryCommand, ClearSearchResultsAction, CloseReplaceAction, CollapseDeepestExpandedLevelAction, copyAllCommand, copyMatchCommand, copyPathCommand, FocusNextInputAction, FocusNextSearchResultAction, FocusPreviousInputAction, FocusPreviousSearchResultAction, focusSearchListCommand, getSearchView, openSearchView, OpenSearchViewletAction, RefreshAction, RemoveAction, ReplaceAction, ReplaceAllAction, ReplaceAllInFolderAction, ReplaceInFilesAction, toggleCaseSensitiveCommand, togglePreserveCaseCommand, toggleRegexCommand, toggleWholeWordCommand, FindInFilesCommand, ToggleSearchOnTypeAction, ExpandAllAction } from 'vs/workbench/contrib/search/browser/searchActions';
+import { cancelSearch, clearHistoryCommand, clearSearchResults, CloseReplaceAction, collapseDeepestExpandedLevel, copyAllCommand, copyMatchCommand, copyPathCommand, expandAll, FindInFilesCommand, FocusNextInputAction, FocusNextSearchResultAction, FocusPreviousInputAction, FocusPreviousSearchResultAction, focusSearchListCommand, getSearchView, openSearchView, OpenSearchViewletAction, refreshSearch, RemoveAction, ReplaceAction, ReplaceAllAction, ReplaceAllInFolderAction, ReplaceInFilesAction, toggleCaseSensitiveCommand, togglePreserveCaseCommand, toggleRegexCommand, ToggleSearchOnTypeAction, toggleWholeWordCommand } from 'vs/workbench/contrib/search/browser/searchActions';
+import { searchClearIcon, searchCollapseAllIcon, searchExpandAllIcon, searchRefreshIcon, searchStopIcon, searchViewIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
 import { registerContributions as searchWidgetContributions } from 'vs/workbench/contrib/search/browser/searchWidget';
-import * as Constants from 'vs/workbench/contrib/search/common/constants';
-import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { getWorkspaceSymbols } from 'vs/workbench/contrib/search/common/search';
-import { ISearchHistoryService, SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { FileMatchOrMatch, ISearchWorkbenchService, RenderableMatch, SearchWorkbenchService, FileMatch, Match, FolderMatch } from 'vs/workbench/contrib/search/common/searchModel';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG, SearchSortOrder } from 'vs/workbench/services/search/common/search';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ExplorerViewPaneContainer } from 'vs/workbench/contrib/files/browser/explorerViewlet';
-import { assertType, assertIsDefined } from 'vs/base/common/types';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
 import { SymbolsQuickAccessProvider } from 'vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { AnythingQuickAccessProvider } from 'vs/workbench/contrib/search/browser/anythingQuickAccess';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
-import { AbstractGotoLineQuickAccessProvider } from 'vs/editor/contrib/quickAccess/gotoLineQuickAccess';
-import { GotoSymbolQuickAccessProvider } from 'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { searchViewIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
+import * as Constants from 'vs/workbench/contrib/search/common/constants';
+import { resolveResourcesForSearchIncludes } from 'vs/workbench/contrib/search/common/queryBuilder';
+import { getWorkspaceSymbols, SearchStateKey, SearchUIState } from 'vs/workbench/contrib/search/common/search';
+import { ISearchHistoryService, SearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
+import { FileMatch, FileMatchOrMatch, FolderMatch, ISearchWorkbenchService, Match, RenderableMatch, SearchWorkbenchService } from 'vs/workbench/contrib/search/common/searchModel';
+import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
+import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { ISearchConfiguration, SearchSortOrder, SEARCH_EXCLUDE_CONFIG, VIEWLET_ID, VIEW_ID } from 'vs/workbench/services/search/common/search';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 
 registerSingleton(ISearchWorkbenchService, SearchWorkbenchService, true);
 registerSingleton(ISearchHistoryService, SearchHistoryService, true);
@@ -128,19 +129,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: Constants.CancelActionId,
-	weight: KeybindingWeight.WorkbenchContrib,
-	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, WorkbenchListFocusContextKey),
-	primary: KeyCode.Escape,
-	handler: (accessor, args: any) => {
-		const searchView = getSearchView(accessor.get(IViewsService));
-		if (searchView) {
-			searchView.cancelSearch();
-		}
-	}
-});
-
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.RemoveActionId,
 	weight: KeybindingWeight.WorkbenchContrib,
@@ -373,6 +361,121 @@ CommandsRegistry.registerCommand({
 	}
 });
 
+registerAction2(class CancelSearchAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.cancel',
+			title: nls.localize('CancelSearchAction.label', "Cancel Search"),
+			icon: searchStopIcon,
+			category,
+			f1: true,
+			precondition: SearchStateKey.isEqualTo(SearchUIState.Idle).negate(),
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, WorkbenchListFocusContextKey),
+				primary: KeyCode.Escape,
+			},
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', VIEW_ID), SearchStateKey.isEqualTo(SearchUIState.SlowSearch)),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return cancelSearch(accessor);
+	}
+});
+
+registerAction2(class RefreshAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.refreshSearchResults',
+			title: nls.localize('RefreshAction.label', "Refresh"),
+			icon: searchRefreshIcon,
+			precondition: Constants.ViewHasSearchPatternKey,
+			category,
+			f1: true,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 0,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', VIEW_ID), SearchStateKey.isEqualTo(SearchUIState.SlowSearch).negate()),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return refreshSearch(accessor);
+	}
+});
+
+registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.collapseSearchResults',
+			title: nls.localize('CollapseDeepestExpandedLevelAction.label', "Collapse All"),
+			category,
+			icon: searchCollapseAllIcon,
+			f1: true,
+			precondition: ContextKeyExpr.and(Constants.HasSearchResults, Constants.ViewHasSomeCollapsibleKey),
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 3,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', VIEW_ID), ContextKeyExpr.or(Constants.HasSearchResults.negate(), Constants.ViewHasSomeCollapsibleKey)),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return collapseDeepestExpandedLevel(accessor);
+	}
+});
+
+registerAction2(class ExpandAllAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.expandSearchResults',
+			title: nls.localize('ExpandAllAction.label', "Expand All"),
+			category,
+			icon: searchExpandAllIcon,
+			f1: true,
+			precondition: ContextKeyExpr.and(Constants.HasSearchResults, Constants.ViewHasSomeCollapsibleKey.toNegated()),
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 3,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', VIEW_ID), Constants.HasSearchResults, Constants.ViewHasSomeCollapsibleKey.toNegated()),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return expandAll(accessor);
+	}
+});
+
+registerAction2(class ClearSearchResultsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.clearSearchResults',
+			title: nls.localize('ClearSearchResultsAction.label', "Clear Search Results"),
+			category,
+			icon: searchClearIcon,
+			f1: true,
+			precondition: ContextKeyExpr.or(Constants.HasSearchResults, Constants.ViewHasSearchPatternKey, Constants.ViewHasReplacePatternKey, Constants.ViewHasFilePatternKey),
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 1,
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return clearSearchResults(accessor);
+	}
+});
+
 const RevealInSideBarForSearchResultsCommand: ICommandAction = {
 	id: Constants.RevealInSideBarForSearchResults,
 	title: nls.localize('revealInSideBar', "Reveal in Side Bar")
@@ -404,29 +507,40 @@ const FocusSearchListCommand: ICommandAction = {
 };
 MenuRegistry.addCommand(FocusSearchListCommand);
 
-const searchInFolderCommand: ICommandHandler = (accessor, resource?: URI) => {
+
+const searchInFolderCommand: ICommandHandler = async (accessor, resource?: URI) => {
 	const listService = accessor.get(IListService);
 	const fileService = accessor.get(IFileService);
 	const viewsService = accessor.get(IViewsService);
+	const contextService = accessor.get(IWorkspaceContextService);
+	const commandService = accessor.get(ICommandService);
 	const resources = getMultiSelectedResources(resource, listService, accessor.get(IEditorService), accessor.get(IExplorerService));
+	const searchConfig = accessor.get(IConfigurationService).getValue<ISearchConfiguration>().search;
+	const mode = searchConfig.mode;
 
-	return openSearchView(viewsService, true).then(searchView => {
-		if (resources && resources.length && searchView) {
-			return fileService.resolveAll(resources.map(resource => ({ resource }))).then(results => {
-				const folders: URI[] = [];
-
-				results.forEach(result => {
-					if (result.success && result.stat) {
-						folders.push(result.stat.isDirectory ? result.stat.resource : dirname(result.stat.resource));
-					}
-				});
-
-				searchView.searchInFolders(distinct(folders, folder => folder.toString()));
-			});
-		}
-
-		return undefined;
+	const resolvedResources = fileService.resolveAll(resources.map(resource => ({ resource }))).then(results => {
+		const folders: URI[] = [];
+		results.forEach(result => {
+			if (result.success && result.stat) {
+				folders.push(result.stat.isDirectory ? result.stat.resource : dirname(result.stat.resource));
+			}
+		});
+		return resolveResourcesForSearchIncludes(folders, contextService);
 	});
+
+	if (mode === 'view') {
+		const searchView = await openSearchView(viewsService, true);
+		if (resources && resources.length && searchView) {
+			searchView.searchInFolders(await resolvedResources);
+		}
+		return undefined;
+	} else {
+		return commandService.executeCommand(SearchEditorConstants.OpenEditorCommandId, {
+			filesToInclude: (await resolvedResources).join(', '),
+			showIncludesExcludes: true,
+			location: mode === 'newEditor' ? 'new' : 'reuse',
+		});
+	}
 };
 
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';
@@ -438,29 +552,25 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: searchInFolderCommand
 });
 
-CommandsRegistry.registerCommand({
-	id: ClearSearchResultsAction.ID,
-	handler: (accessor, args: any) => {
-		accessor.get(IInstantiationService).createInstance(ClearSearchResultsAction, ClearSearchResultsAction.ID, '').run();
-	}
-});
-
-CommandsRegistry.registerCommand({
-	id: RefreshAction.ID,
-	handler: (accessor, args: any) => {
-		accessor.get(IInstantiationService).createInstance(RefreshAction, RefreshAction.ID, '').run();
-	}
-});
-
 const FIND_IN_WORKSPACE_ID = 'filesExplorer.findInWorkspace';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_WORKSPACE_ID,
-	handler: (accessor) => {
-		return openSearchView(accessor.get(IViewsService), true).then(searchView => {
+	handler: async (accessor) => {
+		const searchConfig = accessor.get(IConfigurationService).getValue<ISearchConfiguration>().search;
+		const mode = searchConfig.mode;
+
+		if (mode === 'view') {
+			const searchView = await openSearchView(accessor.get(IViewsService), true);
 			if (searchView) {
 				searchView.searchInFolders();
 			}
-		});
+		}
+		else {
+			return accessor.get(ICommandService).executeCommand(SearchEditorConstants.OpenEditorCommandId, {
+				location: mode === 'newEditor' ? 'new' : 'reuse',
+				filesToInclude: '',
+			});
+		}
 	}
 });
 
@@ -557,9 +667,16 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 // Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 
-// Show Search and Find in Files are redundant, but we can't break keybindings by removing one. So it's the same action, same keybinding, registered to different IDs.
-// Show Search 'when' is redundant but if the two conflict with exactly the same keybinding and 'when' clause, then they can show up as "unbound" - #51780
-registry.registerWorkbenchAction(SyncActionDescriptor.from(OpenSearchViewletAction, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F }, Constants.SearchViewVisibleKey.toNegated()), 'View: Show Search', CATEGORIES.View.value);
+// View: Show Search is used for the keybindings in the View menu and the sidebar #115556, but it should only be enabbled when search.mode == view, or else it will steal priority over opening a search editor #115511
+const SEARCH_MODE_CONFIG = 'search.mode';
+registry.registerWorkbenchAction(
+	SyncActionDescriptor.from(
+		OpenSearchViewletAction,
+		{ primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F },
+		ContextKeyAndExpr.create([Constants.SearchViewVisibleKey.toNegated(), ContextKeyEqualsExpr.create(`config.${SEARCH_MODE_CONFIG}`, 'view')])),
+	'View: Show Search', CATEGORIES.View.value);
+
+// Find in Files by default is the same as View: Show Search, but can be configured to open a search editor instead with the `search.mode` binding
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	description: {
 		description: nls.localize('findInFiles.description', "Open the search viewlet"),
@@ -665,12 +782,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-registry.registerWorkbenchAction(SyncActionDescriptor.from(CollapseDeepestExpandedLevelAction), 'Search: Collapse All', category.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ExpandAllAction), 'Search: Expand All', category.value);
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ShowAllSymbolsAction, { primary: KeyMod.CtrlCmd | KeyCode.KEY_T }), 'Go to Symbol in Workspace...');
 registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleSearchOnTypeAction), 'Search: Toggle Search on Type', category.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(RefreshAction), 'Search: Refresh', category.value);
-registry.registerWorkbenchAction(SyncActionDescriptor.from(ClearSearchResultsAction), 'Search: Clear Search Results', category.value);
 
 // Register Quick Access Handler
 const quickAccessRegistry = Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess);
@@ -724,6 +837,17 @@ configurationRegistry.registerConfiguration({
 			},
 			scope: ConfigurationScope.RESOURCE
 		},
+		[SEARCH_MODE_CONFIG]: {
+			type: 'string',
+			enum: ['view', 'reuseEditor', 'newEditor'],
+			default: 'view',
+			markdownDescription: nls.localize('search.mode', "Controls where new `Search: Find in Files` and `Find in Folder` operations occur: either in the sidebar's search view, or in a search editor"),
+			enumDescriptions: [
+				nls.localize('search.mode.view', "Search in the search view, either in the panel or sidebar."),
+				nls.localize('search.mode.reuseEditor', "Search in an existing search editor if present, otherwise in a new search editor"),
+				nls.localize('search.mode.newEditor', "Search in a new search editor"),
+			]
+		},
 		'search.useRipgrep': {
 			type: 'boolean',
 			description: nls.localize('useRipgrep', "This setting is deprecated and now falls back on \"search.usePCRE2\"."),
@@ -840,7 +964,7 @@ configurationRegistry.registerConfiguration({
 		'search.seedOnFocus': {
 			type: 'boolean',
 			default: false,
-			description: nls.localize('search.seedOnFocus', "Update workspace search query to the editor's selected text when focusing the search view. This happens either on click or when triggering the `workbench.views.search.focus` command.")
+			description: nls.localize('search.seedOnFocus', "Update the search query to the editor's selected text when focusing the search view. This happens either on click or when triggering the `workbench.views.search.focus` command.")
 		},
 		'search.searchOnTypeDebouncePeriod': {
 			type: 'number',
@@ -882,6 +1006,11 @@ configurationRegistry.registerConfiguration({
 			],
 			'description': nls.localize('search.sortOrder', "Controls sorting order of search results.")
 		},
+		'search.experimental.searchInOpenEditors': {
+			type: 'boolean',
+			default: product.quality !== 'stable',
+			markdownDescription: nls.localize('search.experimental.searchInOpenEditors', "Experimental. When enabled, an option is provided to make workspace search only search files that have been opened. **Requires restart to take effect.**")
+		}
 	}
 });
 
diff --git a/src/vs/workbench/contrib/search/browser/searchActions.ts b/src/vs/workbench/contrib/search/browser/searchActions.ts
index 4e136901b..d0e84ccc9 100644
--- a/src/vs/workbench/contrib/search/browser/searchActions.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActions.ts
@@ -4,32 +4,34 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { ITreeNavigator } from 'vs/base/browser/ui/tree/tree';
 import { Action } from 'vs/base/common/actions';
 import { createKeybinding, ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { isWindows, OS } from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { ICommandHandler } from 'vs/platform/commands/common/commands';
+import { ICommandHandler, ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { ILabelService } from 'vs/platform/label/common/label';
 import { getSelectionKeyboardEvent, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IViewsService } from 'vs/workbench/common/views';
+import { searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 import { SearchView } from 'vs/workbench/contrib/search/browser/searchView';
 import * as Constants from 'vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vs/workbench/contrib/search/common/replace';
-import { FolderMatch, FileMatch, FolderMatchWithResource, Match, RenderableMatch, searchMatchComparer, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
+import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
+import { FileMatch, FolderMatch, FolderMatchWithResource, Match, RenderableMatch, searchMatchComparer, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
+import { OpenEditorCommandId } from 'vs/workbench/contrib/searchEditor/browser/constants';
+import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
+import { OpenSearchEditorArgs } from 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
+import { SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ISearchConfiguration, VIEW_ID, VIEWLET_ID } from 'vs/workbench/services/search/common/search';
-import { ISearchHistoryService } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { ITreeNavigator } from 'vs/base/browser/ui/tree/tree';
-import { IViewsService } from 'vs/workbench/common/views';
-import { SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
-import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchReplaceAllIcon, searchReplaceIcon, searchRemoveIcon, searchStopIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
+import { ISearchConfiguration, VIEWLET_ID, VIEW_ID } from 'vs/workbench/services/search/common/search';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 export function isSearchViewFocused(viewsService: IViewsService): boolean {
 	const searchView = getSearchView(viewsService);
@@ -173,21 +175,37 @@ export interface IFindInFilesArgs {
 	useExcludeSettingsAndIgnoreFiles?: boolean;
 }
 export const FindInFilesCommand: ICommandHandler = (accessor, args: IFindInFilesArgs = {}) => {
-
-	const viewsService = accessor.get(IViewsService);
-	openSearchView(viewsService, false).then(openedView => {
-		if (openedView) {
-			const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
-			searchAndReplaceWidget.toggleReplace(typeof args.replace === 'string');
-			let updatedText = false;
-			if (typeof args.query === 'string') {
-				openedView.setSearchParameters(args);
-			} else {
-				updatedText = openedView.updateTextFromFindWidgetOrSelection({ allowUnselectedWord: typeof args.replace !== 'string' });
+	const searchConfig = accessor.get(IConfigurationService).getValue<ISearchConfiguration>().search;
+	const mode = searchConfig.mode;
+	if (mode === 'view') {
+		const viewsService = accessor.get(IViewsService);
+		openSearchView(viewsService, false).then(openedView => {
+			if (openedView) {
+				const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
+				searchAndReplaceWidget.toggleReplace(typeof args.replace === 'string');
+				let updatedText = false;
+				if (typeof args.query === 'string') {
+					openedView.setSearchParameters(args);
+				} else {
+					updatedText = openedView.updateTextFromFindWidgetOrSelection({ allowUnselectedWord: typeof args.replace !== 'string' });
+				}
+				openedView.searchAndReplaceWidget.focus(undefined, updatedText, updatedText);
 			}
-			openedView.searchAndReplaceWidget.focus(undefined, updatedText, updatedText);
-		}
-	});
+		});
+	} else {
+		const convertArgs = (args: IFindInFilesArgs): OpenSearchEditorArgs => ({
+			location: mode === 'newEditor' ? 'new' : 'reuse',
+			query: args.query,
+			filesToInclude: args.filesToInclude,
+			filesToExclude: args.filesToExclude,
+			matchWholeWord: args.matchWholeWord,
+			isCaseSensitive: args.isCaseSensitive,
+			isRegexp: args.isRegex,
+			useExcludeSettingsAndIgnoreFiles: args.useExcludeSettingsAndIgnoreFiles,
+			showIncludesExcludes: !!(args.filesToExclude || args.filesToExclude || !args.useExcludeSettingsAndIgnoreFiles),
+		});
+		accessor.get(ICommandService).executeCommand(OpenEditorCommandId, convertArgs(args));
+	}
 };
 
 export class OpenSearchViewletAction extends FindOrReplaceInFilesAction {
@@ -271,227 +289,77 @@ export class ToggleSearchOnTypeAction extends Action {
 	}
 }
 
-
-export class RefreshAction extends Action {
-
-	static readonly ID: string = 'search.action.refreshSearchResults';
-	static LABEL: string = nls.localize('RefreshAction.label', "Refresh");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'search-action ' + ThemeIcon.asClassName(searchRefreshIcon));
-	}
-
-	get enabled(): boolean {
-		const searchView = getSearchView(this.viewsService);
-		return !!searchView && searchView.hasSearchPattern();
-	}
-
-	update(): void {
-		this._setEnabled(this.enabled);
-	}
-
-	run(): Promise<void> {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			searchView.triggerQueryChange({ preserveFocus: false });
-		}
-
-		return Promise.resolve();
+export function expandAll(accessor: ServicesAccessor) {
+	const viewsService = accessor.get(IViewsService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		const viewer = searchView.getControl();
+		viewer.expandAll();
+		viewer.domFocus();
+		viewer.focusFirst();
 	}
 }
 
-export class CollapseDeepestExpandedLevelAction extends Action {
-
-	static readonly ID: string = 'search.action.collapseSearchResults';
-	static LABEL: string = nls.localize('CollapseDeepestExpandedLevelAction.label', "Collapse All");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'search-action ' + ThemeIcon.asClassName(searchCollapseAllIcon));
-		this.update();
+export function clearSearchResults(accessor: ServicesAccessor) {
+	const viewsService = accessor.get(IViewsService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		searchView.clearSearchResults();
 	}
+}
 
-	update(): void {
-		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && searchView.hasSearchResults();
+export function cancelSearch(accessor: ServicesAccessor) {
+	const viewsService = accessor.get(IViewsService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		searchView.cancelSearch();
 	}
+}
 
-	run(): Promise<void> {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			const viewer = searchView.getControl();
+export function refreshSearch(accessor: ServicesAccessor) {
+	const viewsService = accessor.get(IViewsService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		searchView.triggerQueryChange({ preserveFocus: false });
+	}
+}
 
-			/**
-			 * one level to collapse so collapse everything. If FolderMatch, check if there are visible grandchildren,
-			 * i.e. if Matches are returned by the navigator, and if so, collapse to them, otherwise collapse all levels.
-			 */
-			const navigator = viewer.navigate();
-			let node = navigator.first();
-			let collapseFileMatchLevel = false;
-			if (node instanceof FolderMatch) {
-				while (node = navigator.next()) {
-					if (node instanceof Match) {
-						collapseFileMatchLevel = true;
-						break;
-					}
+export function collapseDeepestExpandedLevel(accessor: ServicesAccessor) {
+
+	const viewsService = accessor.get(IViewsService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		const viewer = searchView.getControl();
+
+		/**
+		 * one level to collapse so collapse everything. If FolderMatch, check if there are visible grandchildren,
+		 * i.e. if Matches are returned by the navigator, and if so, collapse to them, otherwise collapse all levels.
+		 */
+		const navigator = viewer.navigate();
+		let node = navigator.first();
+		let collapseFileMatchLevel = false;
+		if (node instanceof FolderMatch) {
+			while (node = navigator.next()) {
+				if (node instanceof Match) {
+					collapseFileMatchLevel = true;
+					break;
 				}
 			}
-
-			if (collapseFileMatchLevel) {
-				node = navigator.first();
-				do {
-					if (node instanceof FileMatch) {
-						viewer.collapse(node);
-					}
-				} while (node = navigator.next());
-			} else {
-				viewer.collapseAll();
-			}
-
-			viewer.domFocus();
-			viewer.focusFirst();
 		}
-		return Promise.resolve(undefined);
-	}
-}
 
-export class ExpandAllAction extends Action {
-
-	static readonly ID: string = 'search.action.expandSearchResults';
-	static LABEL: string = nls.localize('ExpandAllAction.label', "Expand All");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'search-action ' + ThemeIcon.asClassName(searchExpandAllIcon));
-		this.update();
-	}
-
-	update(): void {
-		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && searchView.hasSearchResults();
-	}
-
-	run(): Promise<void> {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			const viewer = searchView.getControl();
-			viewer.expandAll();
-			viewer.domFocus();
-			viewer.focusFirst();
-		}
-		return Promise.resolve(undefined);
-	}
-}
-
-export class ToggleCollapseAndExpandAction extends Action {
-	static readonly ID: string = 'search.action.collapseOrExpandSearchResults';
-	static LABEL: string = nls.localize('ToggleCollapseAndExpandAction.label', "Toggle Collapse and Expand");
-
-	// Cache to keep from crawling the tree too often.
-	private action: CollapseDeepestExpandedLevelAction | ExpandAllAction | undefined;
-
-	constructor(id: string, label: string,
-		private collapseAction: CollapseDeepestExpandedLevelAction,
-		private expandAction: ExpandAllAction,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, collapseAction.class);
-		this.update();
-	}
-
-	update(): void {
-		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && searchView.hasSearchResults();
-		this.onTreeCollapseStateChange();
-	}
-
-	onTreeCollapseStateChange() {
-		this.action = undefined;
-		this.determineAction();
-	}
-
-	private determineAction(): CollapseDeepestExpandedLevelAction | ExpandAllAction {
-		if (this.action !== undefined) { return this.action; }
-		this.action = this.isSomeCollapsible() ? this.collapseAction : this.expandAction;
-		this.class = this.action.class;
-		return this.action;
-	}
-
-	private isSomeCollapsible(): boolean {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			const viewer = searchView.getControl();
-			const navigator = viewer.navigate();
-			let node = navigator.first();
+		if (collapseFileMatchLevel) {
+			node = navigator.first();
 			do {
-				if (!viewer.isCollapsed(node)) {
-					return true;
+				if (node instanceof FileMatch) {
+					viewer.collapse(node);
 				}
 			} while (node = navigator.next());
-		}
-		return false;
-	}
-
-
-	async run(): Promise<void> {
-		await this.determineAction().run();
-	}
-}
-
-export class ClearSearchResultsAction extends Action {
-
-	static readonly ID: string = 'search.action.clearSearchResults';
-	static LABEL: string = nls.localize('ClearSearchResultsAction.label', "Clear Search Results");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'search-action ' + ThemeIcon.asClassName(searchClearIcon));
-		this.update();
-	}
-
-	update(): void {
-		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && (!searchView.allSearchFieldsClear() || searchView.hasSearchResults() || !searchView.allFilePatternFieldsClear());
-	}
-
-	run(): Promise<void> {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			searchView.clearSearchResults();
-		}
-		return Promise.resolve();
-	}
-}
-
-export class CancelSearchAction extends Action {
-
-	static readonly ID: string = 'search.action.cancelSearch';
-	static LABEL: string = nls.localize('CancelSearchAction.label', "Cancel Search");
-
-	constructor(id: string, label: string,
-		@IViewsService private readonly viewsService: IViewsService
-	) {
-		super(id, label, 'search-action ' + ThemeIcon.asClassName(searchStopIcon));
-		this.update();
-	}
-
-	update(): void {
-		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && searchView.isSlowSearch();
-	}
-
-	run(): Promise<void> {
-		const searchView = getSearchView(this.viewsService);
-		if (searchView) {
-			searchView.cancelSearch();
+		} else {
+			viewer.collapseAll();
 		}
 
-		return Promise.resolve(undefined);
+		viewer.domFocus();
+		viewer.focusFirst();
 	}
 }
 
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index 5a42e7b88..4da73bd5b 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -8,9 +8,11 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
+import { Orientation } from 'vs/base/browser/ui/sash/sash';
 import { ITreeContextMenuEvent, ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { IAction, ActionRunner } from 'vs/base/common/actions';
+import { ActionRunner, IAction } from 'vs/base/common/actions';
 import { Delayer } from 'vs/base/common/async';
+import { Color, RGBA } from 'vs/base/common/color';
 import * as errors from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
 import { Iterable } from 'vs/base/common/iterator';
@@ -20,10 +22,13 @@ import * as env from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import 'vs/css!./media/searchview';
-import { ICodeEditor, isCodeEditor, isDiffEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { getCodeEditor, ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { Selection } from 'vs/editor/common/core/selection';
 import { CommonFindController } from 'vs/editor/contrib/find/findController';
+import { MultiCursorSelectionController } from 'vs/editor/contrib/multicursor/multicursor';
 import * as nls from 'vs/nls';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -32,54 +37,42 @@ import { IContextMenuService, IContextViewService } from 'vs/platform/contextvie
 import { IConfirmation, IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WorkbenchObjectTree, getSelectionKeyboardEvent } from 'vs/platform/list/browser/listService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { getSelectionKeyboardEvent, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IProgressService, IProgressStep, IProgress } from 'vs/platform/progress/common/progress';
-import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ITextQuery, SearchSortOrder, SearchCompletionExitCode } from 'vs/workbench/services/search/common/search';
-import { ISearchHistoryService, ISearchHistoryValues } from 'vs/workbench/contrib/search/common/searchHistoryService';
-import { diffInserted, diffInsertedOutline, diffRemoved, diffRemovedOutline, editorFindMatchHighlight, editorFindMatchHighlightBorder, listActiveSelectionForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
-import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IProgress, IProgressService, IProgressStep } from 'vs/platform/progress/common/progress';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { diffInserted, diffInsertedOutline, diffRemoved, diffRemovedOutline, editorFindMatchHighlight, editorFindMatchHighlightBorder, foreground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry';
+import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { OpenFileFolderAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ResourceLabels } from 'vs/workbench/browser/labels';
+import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IEditorPane } from 'vs/workbench/common/editor';
-import { ExcludePatternInputWidget, PatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
-import { CancelSearchAction, ClearSearchResultsAction, CollapseDeepestExpandedLevelAction, RefreshAction, IFindInFilesArgs, appendKeyBindingLabel, ExpandAllAction, ToggleCollapseAndExpandAction } from 'vs/workbench/contrib/search/browser/searchActions';
+import { Memento, MementoObject } from 'vs/workbench/common/memento';
+import { IViewDescriptorService } from 'vs/workbench/common/views';
+import { ExcludePatternInputWidget, IncludePatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
+import { appendKeyBindingLabel, IFindInFilesArgs } from 'vs/workbench/contrib/search/browser/searchActions';
+import { searchDetailsIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 import { FileMatchRenderer, FolderMatchRenderer, MatchRenderer, SearchAccessibilityProvider, SearchDelegate, SearchDND } from 'vs/workbench/contrib/search/browser/searchResultsView';
 import { ISearchWidgetOptions, SearchWidget } from 'vs/workbench/contrib/search/browser/searchWidget';
 import * as Constants from 'vs/workbench/contrib/search/common/constants';
 import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
 import { IReplaceService } from 'vs/workbench/contrib/search/common/replace';
-import { getOutOfWorkspaceEditorResources } from 'vs/workbench/contrib/search/common/search';
-import { FileMatch, FileMatchOrMatch, IChangeEvent, ISearchWorkbenchService, Match, RenderableMatch, searchMatchComparer, SearchModel, SearchResult, FolderMatch, FolderMatchWithResource } from 'vs/workbench/contrib/search/common/searchModel';
+import { getOutOfWorkspaceEditorResources, SearchStateKey, SearchUIState } from 'vs/workbench/contrib/search/common/search';
+import { ISearchHistoryService, ISearchHistoryValues } from 'vs/workbench/contrib/search/common/searchHistoryService';
+import { FileMatch, FileMatchOrMatch, FolderMatch, FolderMatchWithResource, IChangeEvent, ISearchWorkbenchService, Match, RenderableMatch, searchMatchComparer, SearchModel, SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
+import { createEditorFromSearchResult } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
 import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IPreferencesService, ISettingsEditorOptions } from 'vs/workbench/services/preferences/common/preferences';
+import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ITextQuery, SearchCompletionExitCode, SearchSortOrder } from 'vs/workbench/services/search/common/search';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { relativePath } from 'vs/base/common/resources';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Memento, MementoObject } from 'vs/workbench/common/memento';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { MultiCursorSelectionController } from 'vs/editor/contrib/multicursor/multicursor';
-import { Selection } from 'vs/editor/common/core/selection';
-import { Color, RGBA } from 'vs/base/common/color';
-import { IViewDescriptorService } from 'vs/workbench/common/views';
-import { OpenSearchEditorAction, createEditorFromSearchResult } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { Orientation } from 'vs/base/browser/ui/sash/sash';
-import { searchDetailsIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 
 const $ = dom.$;
 
-enum SearchUIState {
-	Idle,
-	Searching,
-	SlowSearch
-}
-
 export enum SearchViewPosition {
 	SideBar,
 	Panel
@@ -113,12 +106,12 @@ export class SearchView extends ViewPane {
 	private hasSearchResultsKey: IContextKey<boolean>;
 	private lastFocusState: 'input' | 'tree' = 'input';
 
-	private state: SearchUIState = SearchUIState.Idle;
+	private searchStateKey: IContextKey<SearchUIState>;
+	private hasSearchPatternKey: IContextKey<boolean>;
+	private hasReplacePatternKey: IContextKey<boolean>;
+	private hasFilePatternKey: IContextKey<boolean>;
+	private hasSomeCollapsibleResultKey: IContextKey<boolean>;
 
-	private actions: Array<CollapseDeepestExpandedLevelAction | ClearSearchResultsAction | OpenSearchEditorAction> = [];
-	private toggleCollapseAction: ToggleCollapseAndExpandAction;
-	private cancelAction: CancelSearchAction;
-	private refreshAction: RefreshAction;
 	private contextMenu: IMenu | null = null;
 
 	private tree!: WorkbenchObjectTree<RenderableMatch>;
@@ -132,14 +125,13 @@ export class SearchView extends ViewPane {
 	private queryDetails!: HTMLElement;
 	private toggleQueryDetailsButton!: HTMLElement;
 	private inputPatternExcludes!: ExcludePatternInputWidget;
-	private inputPatternIncludes!: PatternInputWidget;
+	private inputPatternIncludes!: IncludePatternInputWidget;
 	private resultsElement!: HTMLElement;
 
 	private currentSelectedFileMatch: FileMatch | undefined;
 
 	private delayedRefresh: Delayer<void>;
 	private changedWhileHidden: boolean = false;
-	private updatedActionsWhileHidden = false;
 
 	private searchWithoutFolderMessageElement: HTMLElement | undefined;
 
@@ -195,6 +187,11 @@ export class SearchView extends ViewPane {
 		this.folderMatchFocused = Constants.FolderFocusKey.bindTo(this.contextKeyService);
 		this.hasSearchResultsKey = Constants.HasSearchResults.bindTo(this.contextKeyService);
 		this.matchFocused = Constants.MatchFocusKey.bindTo(this.contextKeyService);
+		this.searchStateKey = SearchStateKey.bindTo(this.contextKeyService);
+		this.hasSearchPatternKey = Constants.ViewHasSearchPatternKey.bindTo(this.contextKeyService);
+		this.hasReplacePatternKey = Constants.ViewHasReplacePatternKey.bindTo(this.contextKeyService);
+		this.hasFilePatternKey = Constants.ViewHasFilePatternKey.bindTo(this.contextKeyService);
+		this.hasSomeCollapsibleResultKey = Constants.ViewHasSomeCollapsibleKey.bindTo(this.contextKeyService);
 
 		// scoped
 		this.contextKeyService = this._register(this.contextKeyService.createScoped(this.container));
@@ -233,21 +230,17 @@ export class SearchView extends ViewPane {
 		this.toggleCollapseStateDelayer = this._register(new Delayer<void>(100));
 		this.triggerQueryDelayer = this._register(new Delayer<void>(0));
 
-		const collapseDeepestExpandedLevelAction = this.instantiationService.createInstance(CollapseDeepestExpandedLevelAction, CollapseDeepestExpandedLevelAction.ID, CollapseDeepestExpandedLevelAction.LABEL);
-		const expandAllAction = this.instantiationService.createInstance(ExpandAllAction, ExpandAllAction.ID, ExpandAllAction.LABEL);
-
-		this.actions = [
-			this._register(this.instantiationService.createInstance(ClearSearchResultsAction, ClearSearchResultsAction.ID, ClearSearchResultsAction.LABEL)),
-			this._register(this.instantiationService.createInstance(OpenSearchEditorAction, OpenSearchEditorAction.ID, OpenSearchEditorAction.LABEL))
-		];
-
-		this.refreshAction = this._register(this.instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL));
-		this.cancelAction = this._register(this.instantiationService.createInstance(CancelSearchAction, CancelSearchAction.ID, CancelSearchAction.LABEL));
-		this.toggleCollapseAction = this._register(this.instantiationService.createInstance(ToggleCollapseAndExpandAction, ToggleCollapseAndExpandAction.ID, ToggleCollapseAndExpandAction.LABEL, collapseDeepestExpandedLevelAction, expandAllAction));
-
 		this.treeAccessibilityProvider = this.instantiationService.createInstance(SearchAccessibilityProvider, this.viewModel);
 	}
 
+	private get state(): SearchUIState {
+		return this.searchStateKey.get() ?? SearchUIState.Idle;
+	}
+
+	private set state(v: SearchUIState) {
+		this.searchStateKey.set(v);
+	}
+
 	getContainer(): HTMLElement {
 		return this.container;
 	}
@@ -275,6 +268,8 @@ export class SearchView extends ViewPane {
 		const patternExclusionsHistory: string[] = history.exclude || [];
 		const patternIncludes = this.viewletState['query.folderIncludes'] || '';
 		const patternIncludesHistory: string[] = history.include || [];
+		const onlyOpenEditors = this.viewletState['query.onlyOpenEditors'] || false;
+
 		const queryDetailsExpanded = this.viewletState['query.queryDetailsExpanded'] || '';
 		const useExcludesAndIgnoreFiles = typeof this.viewletState['query.useExcludesAndIgnoreFiles'] === 'boolean' ?
 			this.viewletState['query.useExcludesAndIgnoreFiles'] : true;
@@ -316,15 +311,18 @@ export class SearchView extends ViewPane {
 		const filesToIncludeTitle = nls.localize('searchScope.includes', "files to include");
 		dom.append(folderIncludesList, $('h4', undefined, filesToIncludeTitle));
 
-		this.inputPatternIncludes = this._register(this.instantiationService.createInstance(PatternInputWidget, folderIncludesList, this.contextViewService, {
+		this.inputPatternIncludes = this._register(this.instantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
 			ariaLabel: nls.localize('label.includes', 'Search Include Patterns'),
 			history: patternIncludesHistory,
 		}));
 
 		this.inputPatternIncludes.setValue(patternIncludes);
+		this.inputPatternIncludes.setOnlySearchInOpenEditors(onlyOpenEditors);
+
+		this._register(this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerQueryChange({ triggeredOnType, delay: this.searchConfig.searchOnTypeDebouncePeriod })));
+		this._register(this.inputPatternIncludes.onCancel(() => this.cancelSearch(false)));
+		this._register(this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerQueryChange()));
 
-		this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerQueryChange({ triggeredOnType, delay: this.searchConfig.searchOnTypeDebouncePeriod }));
-		this.inputPatternIncludes.onCancel(() => this.cancelSearch(false));
 		this.trackInputBox(this.inputPatternIncludes.inputFocusTracker, this.inputPatternIncludesFocused);
 
 		// excludes list
@@ -339,11 +337,21 @@ export class SearchView extends ViewPane {
 		this.inputPatternExcludes.setValue(patternExclusions);
 		this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
 
-		this.inputPatternExcludes.onSubmit(triggeredOnType => this.triggerQueryChange({ triggeredOnType, delay: this.searchConfig.searchOnTypeDebouncePeriod }));
-		this.inputPatternExcludes.onCancel(() => this.cancelSearch(false));
-		this.inputPatternExcludes.onChangeIgnoreBox(() => this.triggerQueryChange());
+		this._register(this.inputPatternExcludes.onCancel(() => this.cancelSearch(false)));
+		this._register(this.inputPatternExcludes.onChangeIgnoreBox(() => this.triggerQueryChange()));
 		this.trackInputBox(this.inputPatternExcludes.inputFocusTracker, this.inputPatternExclusionsFocused);
 
+		const updateHasFilePatternKey = () => this.hasFilePatternKey.set(this.inputPatternIncludes.getValue().length > 0 || this.inputPatternExcludes.getValue().length > 0);
+		updateHasFilePatternKey();
+		const onFilePatternSubmit = (triggeredOnType: boolean) => {
+			this.triggerQueryChange({ triggeredOnType, delay: this.searchConfig.searchOnTypeDebouncePeriod });
+			if (triggeredOnType) {
+				updateHasFilePatternKey();
+			}
+		};
+		this._register(this.inputPatternIncludes.onSubmit(onFilePatternSubmit));
+		this._register(this.inputPatternExcludes.onSubmit(onFilePatternSubmit));
+
 		this.messagesElement = dom.append(this.container, $('.messages'));
 		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 			this.showSearchWithoutFolderMessage();
@@ -357,9 +365,6 @@ export class SearchView extends ViewPane {
 
 		this._register(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
 
-		this._register(this.searchWidget.searchInput.onInput(() => this.updateActions()));
-		this._register(this.searchWidget.replaceInput.onInput(() => this.updateActions()));
-
 		this._register(this.onDidChangeBodyVisibility(visible => this.onVisibilityChanged(visible)));
 	}
 
@@ -371,13 +376,6 @@ export class SearchView extends ViewPane {
 				this.refreshAndUpdateCount();
 				this.changedWhileHidden = false;
 			}
-
-			if (this.updatedActionsWhileHidden) {
-				// The actions can only run or update their enablement when the view is visible,
-				// because they can only access the view when it's visible
-				this.updateActions();
-				this.updatedActionsWhileHidden = false;
-			}
 		} else {
 			// Reset last focus to input to preserve opening the viewlet always focusing the query editor.
 			this.lastFocusState = 'input';
@@ -393,33 +391,14 @@ export class SearchView extends ViewPane {
 		return this.searchWidget;
 	}
 
-	get searchIncludePattern(): PatternInputWidget {
+	get searchIncludePattern(): IncludePatternInputWidget {
 		return this.inputPatternIncludes;
 	}
 
-	get searchExcludePattern(): PatternInputWidget {
+	get searchExcludePattern(): ExcludePatternInputWidget {
 		return this.inputPatternExcludes;
 	}
 
-	/**
-	 * Warning: a bit expensive due to updating the view title
-	 */
-	protected updateActions(): void {
-		if (!this.isVisible()) {
-			this.updatedActionsWhileHidden = true;
-		}
-
-		for (const action of this.actions) {
-			action.update();
-		}
-
-		this.refreshAction.update();
-		this.cancelAction.update();
-		this.toggleCollapseAction.update();
-
-		super.updateActions();
-	}
-
 	private createSearchWidget(container: HTMLElement): void {
 		const contentPattern = this.viewletState['query.contentPattern'] || '';
 		const replaceText = this.viewletState['query.replaceText'] || '';
@@ -451,6 +430,14 @@ export class SearchView extends ViewPane {
 		this._register(this.searchWidget.onSearchCancel(({ focus }) => this.cancelSearch(focus)));
 		this._register(this.searchWidget.searchInput.onDidOptionChange(() => this.triggerQueryChange()));
 
+		const updateHasPatternKey = () => this.hasSearchPatternKey.set(this.searchWidget.searchInput.getValue().length > 0);
+		updateHasPatternKey();
+		this._register(this.searchWidget.searchInput.onDidChange(() => updateHasPatternKey()));
+
+		const updateHasReplacePatternKey = () => this.hasReplacePatternKey.set(this.searchWidget.getReplaceValue().length > 0);
+		updateHasReplacePatternKey();
+		this._register(this.searchWidget.replaceInput.inputBox.onDidChange(() => updateHasReplacePatternKey()));
+
 		this._register(this.searchWidget.onDidHeightChange(() => this.reLayout()));
 
 		this._register(this.searchWidget.onReplaceToggled(() => this.reLayout()));
@@ -730,9 +717,10 @@ export class SearchView extends ViewPane {
 				}
 			}));
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-		this._register(this.tree.onDidChangeCollapseState(() =>
-			this.toggleCollapseStateDelayer.trigger(() => this.toggleCollapseAction.onTreeCollapseStateChange())
-		));
+		const updateHasSomeCollapsible = () => this.toggleCollapseStateDelayer.trigger(() => this.hasSomeCollapsibleResultKey.set(this.hasSomeCollapsible()));
+		updateHasSomeCollapsible();
+		this._register(this.viewModel.searchResult.onChange(() => updateHasSomeCollapsible()));
+		this._register(this.tree.onDidChangeCollapseState(() => updateHasSomeCollapsible()));
 
 		this._register(Event.debounce(this.tree.onDidOpen, (last, event) => event, 75, true)(options => {
 			if (options.element instanceof Match) {
@@ -791,6 +779,19 @@ export class SearchView extends ViewPane {
 		});
 	}
 
+	private hasSomeCollapsible(): boolean {
+		const viewer = this.getControl();
+		const navigator = viewer.navigate();
+		let node = navigator.first();
+		do {
+			if (!viewer.isCollapsed(node)) {
+				return true;
+			}
+		} while (node = navigator.next());
+
+		return false;
+	}
+
 	selectNextMatch(): void {
 		if (!this.hasSearchResults()) {
 			return;
@@ -827,7 +828,7 @@ export class SearchView extends ViewPane {
 			if (next === selected) {
 				this.tree.setFocus([]);
 			}
-			this.tree.setFocus([next], getSelectionKeyboardEvent(undefined, false));
+			this.tree.setFocus([next], getSelectionKeyboardEvent(undefined, false, false));
 			this.tree.reveal(next);
 			const ariaLabel = this.treeAccessibilityProvider.getAriaLabel(next);
 			if (ariaLabel) { aria.alert(ariaLabel); }
@@ -868,7 +869,7 @@ export class SearchView extends ViewPane {
 			if (prev === selected) {
 				this.tree.setFocus([]);
 			}
-			this.tree.setFocus([prev], getSelectionKeyboardEvent(undefined, false));
+			this.tree.setFocus([prev], getSelectionKeyboardEvent(undefined, false, false));
 			this.tree.reveal(prev);
 			const ariaLabel = this.treeAccessibilityProvider.getAriaLabel(prev);
 			if (ariaLabel) { aria.alert(ariaLabel); }
@@ -1054,10 +1055,6 @@ export class SearchView extends ViewPane {
 		return this.tree;
 	}
 
-	isSlowSearch(): boolean {
-		return this.state === SearchUIState.SlowSearch;
-	}
-
 	allSearchFieldsClear(): boolean {
 		return this.searchWidget.getReplaceValue() === '' &&
 			this.searchWidget.searchInput.getValue() === '';
@@ -1072,10 +1069,6 @@ export class SearchView extends ViewPane {
 		return !this.viewModel.searchResult.isEmpty();
 	}
 
-	hasSearchPattern(): boolean {
-		return this.searchWidget && this.searchWidget.searchInput.getValue().length > 0;
-	}
-
 	clearSearchResults(clearInput = true): void {
 		this.viewModel.searchResult.clear();
 		this.showEmptyStage(true);
@@ -1089,7 +1082,6 @@ export class SearchView extends ViewPane {
 			this.searchWidget.clear();
 		}
 		this.viewModel.cancelSearch();
-		this.updateActions();
 		this.tree.ariaLabel = nls.localize('emptySearch', "Empty Search");
 
 		aria.status(nls.localize('ariaSearchResultsClearStatus', "The search results have been cleared"));
@@ -1269,45 +1261,7 @@ export class SearchView extends ViewPane {
 		}
 	}
 
-	searchInFolders(resources?: URI[]): void {
-		const folderPaths: string[] = [];
-		const workspace = this.contextService.getWorkspace();
-
-		if (resources) {
-			resources.forEach(resource => {
-				let folderPath: string | undefined;
-				if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
-					// Show relative path from the root for single-root mode
-					folderPath = relativePath(workspace.folders[0].uri, resource); // always uses forward slashes
-					if (folderPath && folderPath !== '.') {
-						folderPath = './' + folderPath;
-					}
-				} else {
-					const owningFolder = this.contextService.getWorkspaceFolder(resource);
-					if (owningFolder) {
-						const owningRootName = owningFolder.name;
-
-						// If this root is the only one with its basename, use a relative ./ path. If there is another, use an absolute path
-						const isUniqueFolder = workspace.folders.filter(folder => folder.name === owningRootName).length === 1;
-						if (isUniqueFolder) {
-							const relPath = relativePath(owningFolder.uri, resource); // always uses forward slashes
-							if (relPath === '') {
-								folderPath = `./${owningFolder.name}`;
-							} else {
-								folderPath = `./${owningFolder.name}/${relPath}`;
-							}
-						} else {
-							folderPath = resource.fsPath; // TODO rob: handle on-file URIs
-						}
-					}
-				}
-
-				if (folderPath) {
-					folderPaths.push(folderPath);
-				}
-			});
-		}
-
+	searchInFolders(folderPaths: string[] = []): void {
 		if (!folderPaths.length || folderPaths.some(folderPath => folderPath === '.')) {
 			this.inputPatternIncludes.setValue('');
 			this.searchWidget.focus();
@@ -1345,6 +1299,7 @@ export class SearchView extends ViewPane {
 		const excludePatternText = this.inputPatternExcludes.getValue().trim();
 		const includePatternText = this.inputPatternIncludes.getValue().trim();
 		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
+		const onlySearchInOpenEditors = this.inputPatternIncludes.onlySearchInOpenEditors();
 
 		if (contentPattern.length === 0) {
 			this.clearSearchResults(false);
@@ -1373,6 +1328,7 @@ export class SearchView extends ViewPane {
 			maxResults: SearchView.MAX_TEXT_RESULTS,
 			disregardIgnoreFiles: !useExcludesAndIgnoreFiles || undefined,
 			disregardExcludeSettings: !useExcludesAndIgnoreFiles || undefined,
+			onlyOpenEditors: onlySearchInOpenEditors,
 			excludePattern,
 			includePattern,
 			previewOptions: {
@@ -1410,7 +1366,7 @@ export class SearchView extends ViewPane {
 		// Validate folderQueries
 		const folderQueriesExistP =
 			query.folderQueries.map(fq => {
-				return this.fileService.exists(fq.folder);
+				return this.fileService.exists(fq.folder).catch(() => false);
 			});
 
 		return Promise.all(folderQueriesExistP).then(existResults => {
@@ -1454,7 +1410,6 @@ export class SearchView extends ViewPane {
 
 		const slowTimer = setTimeout(() => {
 			this.state = SearchUIState.SlowSearch;
-			this.updateActions();
 		}, 2000);
 
 		const onComplete = (completed?: ISearchComplete) => {
@@ -1477,9 +1432,7 @@ export class SearchView extends ViewPane {
 
 			this.viewModel.replaceString = this.searchWidget.getReplaceValue();
 
-			this.updateActions();
 			const hasResults = !this.viewModel.searchResult.isEmpty();
-
 			if (completed?.exit === SearchCompletionExitCode.NewSearchStarted) {
 				return;
 			}
@@ -1498,14 +1451,26 @@ export class SearchView extends ViewPane {
 
 				if (!completed) {
 					message = SEARCH_CANCELLED_MESSAGE;
-				} else if (hasIncludes && hasExcludes) {
-					message = nls.localize('noResultsIncludesExcludes', "No results found in '{0}' excluding '{1}' - ", includePatternText, excludePatternText);
-				} else if (hasIncludes) {
-					message = nls.localize('noResultsIncludes', "No results found in '{0}' - ", includePatternText);
-				} else if (hasExcludes) {
-					message = nls.localize('noResultsExcludes', "No results found excluding '{0}' - ", excludePatternText);
+				} else if (this.inputPatternIncludes.onlySearchInOpenEditors()) {
+					if (hasIncludes && hasExcludes) {
+						message = nls.localize('noOpenEditorResultsIncludesExcludes', "No results found in open editors matching '{0}' excluding '{1}' - ", includePatternText, excludePatternText);
+					} else if (hasIncludes) {
+						message = nls.localize('noOpenEditorResultsIncludes', "No results found in open editors matching '{0}' - ", includePatternText);
+					} else if (hasExcludes) {
+						message = nls.localize('noOpenEditorResultsExcludes', "No results found in open editors excluding '{0}' - ", excludePatternText);
+					} else {
+						message = nls.localize('noOpenEditorResultsFound', "No results found in open editors. Review your settings for configured exclusions and check your gitignore files - ");
+					}
 				} else {
-					message = nls.localize('noResultsFound', "No results found. Review your settings for configured exclusions and check your gitignore files - ");
+					if (hasIncludes && hasExcludes) {
+						message = nls.localize('noResultsIncludesExcludes', "No results found in '{0}' excluding '{1}' - ", includePatternText, excludePatternText);
+					} else if (hasIncludes) {
+						message = nls.localize('noResultsIncludes', "No results found in '{0}' - ", includePatternText);
+					} else if (hasExcludes) {
+						message = nls.localize('noResultsExcludes', "No results found excluding '{0}' - ", excludePatternText);
+					} else {
+						message = nls.localize('noResultsFound', "No results found. Review your settings for configured exclusions and check your gitignore files - ");
+					}
 				}
 
 				// Indicate as status to ARIA
@@ -1527,6 +1492,7 @@ export class SearchView extends ViewPane {
 
 						this.inputPatternExcludes.setValue('');
 						this.inputPatternIncludes.setValue('');
+						this.inputPatternIncludes.setOnlySearchInOpenEditors(false);
 
 						this.triggerQueryChange({ preserveFocus: false });
 					}));
@@ -1560,7 +1526,6 @@ export class SearchView extends ViewPane {
 			if (errors.isPromiseCanceledError(e)) {
 				return onComplete(undefined);
 			} else {
-				this.updateActions();
 				progressComplete();
 				this.searchWidget.searchInput.showMessage({ content: e.message, type: MessageType.ERROR });
 				this.viewModel.searchResult.clear();
@@ -1571,8 +1536,6 @@ export class SearchView extends ViewPane {
 
 		let visibleMatches = 0;
 
-		let updatedActionsForFileCount = false;
-
 		// Handle UI updates in an interval to show frequent progress and results
 		const uiRefreshHandle: any = setInterval(() => {
 			if (this.state === SearchUIState.Idle) {
@@ -1586,11 +1549,6 @@ export class SearchView extends ViewPane {
 				visibleMatches = fileCount;
 				this.refreshAndUpdateCount();
 			}
-
-			if (fileCount > 0 && !updatedActionsForFileCount) {
-				updatedActionsForFileCount = true;
-				this.updateActions();
-			}
 		}, 100);
 
 		this.searchWidget.setReplaceAllActionState(false);
@@ -1662,7 +1620,7 @@ export class SearchView extends ViewPane {
 
 			this.messageDisposables.push(dom.addDisposableListener(openInEditorLink, dom.EventType.CLICK, (e: MouseEvent) => {
 				dom.EventHelper.stop(e, false);
-				this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue());
+				this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue(), this.searchIncludePattern.onlySearchInOpenEditors());
 			}));
 
 			this.reLayout();
@@ -1710,9 +1668,6 @@ export class SearchView extends ViewPane {
 	}
 
 	private showEmptyStage(forceHideMessages = false): void {
-		// disable 'result'-actions
-		this.updateActions();
-
 		const showingCancelled = (this.messagesElement.firstChild?.textContent?.indexOf(SEARCH_CANCELLED_MESSAGE) ?? -1) > -1;
 
 		// clean up ui
@@ -1745,9 +1700,10 @@ export class SearchView extends ViewPane {
 				revealIfVisible: true
 			}
 		}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP).then(editor => {
-			if (element instanceof Match && preserveFocus && isCodeEditor(editor)) {
+			const editorControl = editor?.getControl();
+			if (element instanceof Match && preserveFocus && isCodeEditor(editorControl)) {
 				this.viewModel.searchResult.rangeHighlightDecorations.highlightRange(
-					(<ICodeEditor>editor.getControl()).getModel()!,
+					editorControl.getModel()!,
 					element.range()
 				);
 			} else {
@@ -1846,16 +1802,6 @@ export class SearchView extends ViewPane {
 		}
 	}
 
-	getActions(): IAction[] {
-		return [
-			this.state === SearchUIState.SlowSearch ?
-				this.cancelAction :
-				this.refreshAction,
-			...this.actions,
-			this.toggleCollapseAction
-		];
-	}
-
 	private get searchConfig(): ISearchConfigurationProperties {
 		return this.configurationService.getValue<ISearchConfigurationProperties>('search');
 	}
@@ -1873,6 +1819,7 @@ export class SearchView extends ViewPane {
 		const contentPattern = this.searchWidget.searchInput.getValue();
 		const patternExcludes = this.inputPatternExcludes.getValue().trim();
 		const patternIncludes = this.inputPatternIncludes.getValue().trim();
+		const onlyOpenEditors = this.inputPatternIncludes.onlySearchInOpenEditors();
 		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
 		const preserveCase = this.viewModel.preserveCase;
 
@@ -1884,6 +1831,7 @@ export class SearchView extends ViewPane {
 		this.viewletState['query.folderIncludes'] = patternIncludes;
 		this.viewletState['query.useExcludesAndIgnoreFiles'] = useExcludesAndIgnoreFiles;
 		this.viewletState['query.preserveCase'] = preserveCase;
+		this.viewletState['query.onlyOpenEditors'] = onlyOpenEditors;
 
 		const isReplaceShown = this.searchAndReplaceWidget.isReplaceShown();
 		this.viewletState['view.showReplace'] = isReplaceShown;
diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
index a7dbe426c..6090d5997 100644
--- a/src/vs/workbench/contrib/search/browser/searchWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -295,7 +295,7 @@ export class SearchWidget extends Widget {
 		this.toggleReplaceButton = this._register(new Button(parent, opts));
 		this.toggleReplaceButton.element.setAttribute('aria-expanded', 'false');
 		this.toggleReplaceButton.element.classList.add('toggle-replace-button');
-		this.toggleReplaceButton.icon = ThemeIcon.asCSSIcon(searchHideReplaceIcon);
+		this.toggleReplaceButton.icon = searchHideReplaceIcon;
 		// TODO@joao need to dispose this listener eventually
 		this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
 		this.toggleReplaceButton.element.title = nls.localize('search.replace.toggle.button.title', "Toggle Replace");
@@ -355,7 +355,7 @@ export class SearchWidget extends Widget {
 		this.showContextCheckbox = new Checkbox({
 			isChecked: false,
 			title: appendKeyBindingLabel(nls.localize('showContext', "Toggle Context Lines"), this.keyBindingService.lookupKeybinding(ToggleSearchEditorContextLinesCommandId), this.keyBindingService),
-			icon: ThemeIcon.asCSSIcon(searchShowContextIcon)
+			icon: searchShowContextIcon
 		});
 		this._register(this.showContextCheckbox.onChange(() => this.onContextLinesChanged()));
 
diff --git a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
index b8c5366d4..3c7d555da 100644
--- a/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.ts
@@ -75,11 +75,11 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 	}
 
 	private get configuration() {
-		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor;
+		const editorConfig = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench?.editor;
 
 		return {
-			openEditorPinned: !editorConfig.enablePreviewFromQuickOpen,
-			openSideBySideDirection: editorConfig.openSideBySideDirection
+			openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview,
+			openSideBySideDirection: editorConfig?.openSideBySideDirection
 		};
 	}
 
@@ -239,7 +239,7 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 
 		// Open HTTP(s) links with opener service
 		if (symbolToOpen.location.uri.scheme === Schemas.http || symbolToOpen.location.uri.scheme === Schemas.https) {
-			await this.openerService.open(symbolToOpen.location.uri, { fromUserGesture: true });
+			await this.openerService.open(symbolToOpen.location.uri, { fromUserGesture: true, allowContributedOpeners: true });
 		}
 
 		// Otherwise open as editor
@@ -248,10 +248,10 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
 				resource: symbolToOpen.location.uri,
 				options: {
 					preserveFocus: options?.preserveFocus,
-					pinned: options.keyMods.alt || options.forcePinned || this.configuration.openEditorPinned,
+					pinned: options.keyMods.ctrlCmd || options.forcePinned || this.configuration.openEditorPinned,
 					selection: symbolToOpen.location.range ? Range.collapseToStart(symbolToOpen.location.range) : undefined
 				}
-			}, options.keyMods.ctrlCmd || options?.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+			}, options.keyMods.alt || (this.configuration.openEditorPinned && options.keyMods.ctrlCmd) || options?.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/search/common/constants.ts b/src/vs/workbench/contrib/search/common/constants.ts
index 38e04a3de..63c8976ea 100644
--- a/src/vs/workbench/contrib/search/common/constants.ts
+++ b/src/vs/workbench/contrib/search/common/constants.ts
@@ -11,7 +11,6 @@ export const FocusActiveEditorCommandId = 'search.action.focusActiveEditor';
 export const FocusSearchFromResults = 'search.action.focusSearchFromResults';
 export const OpenMatch = 'search.action.openResult';
 export const OpenMatchToSide = 'search.action.openResultToSide';
-export const CancelActionId = 'search.action.cancel';
 export const RemoveActionId = 'search.action.remove';
 export const CopyPathCommandId = 'search.action.copyPath';
 export const CopyMatchCommandId = 'search.action.copyMatch';
@@ -46,3 +45,7 @@ export const FileMatchOrFolderMatchWithResourceFocusKey = new RawContextKey<bool
 export const FileFocusKey = new RawContextKey<boolean>('fileMatchFocus', false);
 export const FolderFocusKey = new RawContextKey<boolean>('folderMatchFocus', false);
 export const MatchFocusKey = new RawContextKey<boolean>('matchFocus', false);
+export const ViewHasSearchPatternKey = new RawContextKey<boolean>('viewHasSearchPattern', false);
+export const ViewHasReplacePatternKey = new RawContextKey<boolean>('viewHasReplacePattern', false);
+export const ViewHasFilePatternKey = new RawContextKey<boolean>('viewHasFilePattern', false);
+export const ViewHasSomeCollapsibleKey = new RawContextKey<boolean>('viewHasSomeCollapsibleResult', false);
diff --git a/src/vs/workbench/contrib/search/common/queryBuilder.ts b/src/vs/workbench/contrib/search/common/queryBuilder.ts
index 7a99e0557..e0035ce5e 100644
--- a/src/vs/workbench/contrib/search/common/queryBuilder.ts
+++ b/src/vs/workbench/contrib/search/common/queryBuilder.ts
@@ -7,15 +7,18 @@ import * as arrays from 'vs/base/common/arrays';
 import * as collections from 'vs/base/common/collections';
 import * as glob from 'vs/base/common/glob';
 import { untildify } from 'vs/base/common/labels';
+import { ResourceMap } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import * as path from 'vs/base/common/path';
-import { isEqual } from 'vs/base/common/resources';
+import { isEqual, basename, relativePath, isAbsolutePath } from 'vs/base/common/resources';
 import * as strings from 'vs/base/common/strings';
-import { URI as uri } from 'vs/base/common/uri';
+import { assertIsDefined } from 'vs/base/common/types';
+import { URI, URI as uri } from 'vs/base/common/uri';
 import { isMultilineRegexSource } from 'vs/editor/common/model/textModelSearch';
 import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService, IWorkspaceFolderData, toWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { getExcludes, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo, ISearchConfiguration, ITextQuery, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType } from 'vs/workbench/services/search/common/search';
 
@@ -45,8 +48,8 @@ export interface ISearchPathsInfo {
 
 export interface ICommonQueryBuilderOptions {
 	_reason?: string;
-	excludePattern?: string;
-	includePattern?: string;
+	excludePattern?: string | string[];
+	includePattern?: string | string[];
 	extraFileResources?: uri[];
 
 	/** Parse the special ./ syntax supported by the searchview, and expand foo to ** /foo */
@@ -59,6 +62,7 @@ export interface ICommonQueryBuilderOptions {
 	disregardExcludeSettings?: boolean;
 	disregardSearchExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
+	onlyOpenEditors?: boolean;
 }
 
 export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
@@ -81,6 +85,7 @@ export class QueryBuilder {
 	constructor(
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IPathService private readonly pathService: IPathService
 	) {
 	}
@@ -134,7 +139,7 @@ export class QueryBuilder {
 		return newPattern;
 	}
 
-	file(folders: IWorkspaceFolderData[], options: IFileQueryBuilderOptions = {}): IFileQuery {
+	file(folders: (IWorkspaceFolderData | URI)[], options: IFileQueryBuilderOptions = {}): IFileQuery {
 		const commonQuery = this.commonQuery(folders, options);
 		return <IFileQuery>{
 			...commonQuery,
@@ -148,22 +153,20 @@ export class QueryBuilder {
 		};
 	}
 
-	private commonQuery(folderResources: IWorkspaceFolderData[] = [], options: ICommonQueryBuilderOptions = {}): ICommonQueryProps<uri> {
-		let includeSearchPathsInfo: ISearchPathsInfo = {};
-		if (options.includePattern) {
-			const includePattern = normalizeSlashes(options.includePattern);
-			includeSearchPathsInfo = options.expandPatterns ?
-				this.parseSearchPaths(includePattern) :
-				{ pattern: patternListToIExpression(includePattern) };
+	private handleIncludeExclude(pattern: string | string[] | undefined, expandPatterns: boolean | undefined): ISearchPathsInfo {
+		if (!pattern) {
+			return {};
 		}
 
-		let excludeSearchPathsInfo: ISearchPathsInfo = {};
-		if (options.excludePattern) {
-			const excludePattern = normalizeSlashes(options.excludePattern);
-			excludeSearchPathsInfo = options.expandPatterns ?
-				this.parseSearchPaths(excludePattern) :
-				{ pattern: patternListToIExpression(excludePattern) };
-		}
+		pattern = Array.isArray(pattern) ? pattern.map(normalizeSlashes) : normalizeSlashes(pattern);
+		return expandPatterns
+			? this.parseSearchPaths(pattern)
+			: { pattern: patternListToIExpression(...(Array.isArray(pattern) ? pattern : [pattern])) };
+	}
+
+	private commonQuery(folderResources: (IWorkspaceFolderData | URI)[] = [], options: ICommonQueryBuilderOptions = {}): ICommonQueryProps<uri> {
+		const includeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.includePattern, options.expandPatterns);
+		const excludeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.excludePattern, options.expandPatterns);
 
 		// Build folderQueries from searchPaths, if given, otherwise folderResources
 		const includeFolderName = folderResources.length > 1;
@@ -180,9 +183,17 @@ export class QueryBuilder {
 
 			excludePattern: excludeSearchPathsInfo.pattern,
 			includePattern: includeSearchPathsInfo.pattern,
+			onlyOpenEditors: options.onlyOpenEditors,
 			maxResults: options.maxResults
 		};
 
+		if (options.onlyOpenEditors) {
+			const openEditors = arrays.coalesce(arrays.flatten(this.editorGroupsService.groups.map(group => group.editors.map(editor => editor.resource))));
+			const openEditorsInQuery = openEditors.filter(editor => pathIncludedInQuery(queryProps, editor.fsPath));
+			const openEditorsQueryProps = this.commonQueryFromFileList(openEditorsInQuery);
+			return { ...queryProps, ...openEditorsQueryProps };
+		}
+
 		// Filter extraFileResources against global include/exclude patterns - they are already expected to not belong to a workspace
 		const extraFileResources = options.extraFileResources && options.extraFileResources.filter(extraFile => pathIncludedInQuery(queryProps, extraFile.fsPath));
 		queryProps.extraFileResources = extraFileResources && extraFileResources.length ? extraFileResources : undefined;
@@ -190,6 +201,46 @@ export class QueryBuilder {
 		return queryProps;
 	}
 
+	private commonQueryFromFileList(files: URI[]): ICommonQueryProps<URI> {
+		const folderQueries: IFolderQuery[] = [];
+		const foldersToSearch: ResourceMap<IFolderQuery> = new ResourceMap();
+		const includePattern: glob.IExpression = {};
+		let hasIncludedFile = false;
+		files.forEach(file => {
+			if (file.scheme === Schemas.walkThrough) { return; }
+
+			const providerExists = isAbsolutePath(file);
+			// Special case userdata as we don't have a search provider for it, but it can be searched.
+			const isUserdata = file.scheme === Schemas.userData;
+			if (providerExists && !isUserdata) {
+				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: path.dirname(file.fsPath) });
+
+				let folderQuery = foldersToSearch.get(searchRoot);
+				if (!folderQuery) {
+					hasIncludedFile = true;
+					folderQuery = { folder: searchRoot, includePattern: {} };
+					folderQueries.push(folderQuery);
+					foldersToSearch.set(searchRoot, folderQuery);
+				}
+
+				const relPath = path.relative(searchRoot.fsPath, file.fsPath);
+				assertIsDefined(folderQuery.includePattern)[relPath.replace(/\\/g, '/')] = true;
+			} else {
+				if (file.fsPath) {
+					hasIncludedFile = true;
+					includePattern[file.fsPath] = true;
+				}
+			}
+		});
+
+		return {
+			folderQueries,
+			includePattern,
+			usingSearchPaths: true,
+			excludePattern: hasIncludedFile ? undefined : { '**/*': true }
+		};
+	}
+
 	/**
 	 * Resolve isCaseSensitive flag based on the query and the isSmartCase flag, for search providers that don't support smart case natively.
 	 */
@@ -230,13 +281,14 @@ export class QueryBuilder {
 	 *
 	 * Public for test.
 	 */
-	parseSearchPaths(pattern: string): ISearchPathsInfo {
+	parseSearchPaths(pattern: string | string[]): ISearchPathsInfo {
 		const isSearchPath = (segment: string) => {
 			// A segment is a search path if it is an absolute path or starts with ./, ../, .\, or ..\
 			return path.isAbsolute(segment) || /^\.\.?([\/\\]|$)/.test(segment);
 		};
 
-		const segments = splitGlobPattern(pattern)
+		const patterns = Array.isArray(pattern) ? pattern : splitGlobPattern(pattern);
+		const segments = patterns
 			.map(segment => {
 				const userHome = this.pathService.resolvedUserHome;
 				if (userHome) {
@@ -378,7 +430,7 @@ export class QueryBuilder {
 					});
 				} else {
 					// No root folder with name
-					const searchPathNotFoundError = nls.localize('search.noWorkspaceWithName', "No folder in workspace with name: {0}", searchPathRoot);
+					const searchPathNotFoundError = nls.localize('search.noWorkspaceWithName', "Workspace folder does not exist: {0}", searchPathRoot);
 					throw new Error(searchPathNotFoundError);
 				}
 			} else {
@@ -424,10 +476,11 @@ export class QueryBuilder {
 		};
 	}
 
-	private getFolderQueryForRoot(folder: IWorkspaceFolderData, options: ICommonQueryBuilderOptions, searchPathExcludes: ISearchPathsInfo, includeFolderName: boolean): IFolderQuery | null {
+	private getFolderQueryForRoot(folder: (IWorkspaceFolderData | URI), options: ICommonQueryBuilderOptions, searchPathExcludes: ISearchPathsInfo, includeFolderName: boolean): IFolderQuery | null {
 		let thisFolderExcludeSearchPathPattern: glob.IExpression | undefined;
+		const folderUri = URI.isUri(folder) ? folder : folder.uri;
 		if (searchPathExcludes.searchPaths) {
-			const thisFolderExcludeSearchPath = searchPathExcludes.searchPaths.filter(sp => isEqual(sp.searchPath, folder.uri))[0];
+			const thisFolderExcludeSearchPath = searchPathExcludes.searchPaths.filter(sp => isEqual(sp.searchPath, folderUri))[0];
 			if (thisFolderExcludeSearchPath && !thisFolderExcludeSearchPath.pattern) {
 				// entire folder is excluded
 				return null;
@@ -436,16 +489,17 @@ export class QueryBuilder {
 			}
 		}
 
-		const folderConfig = this.configurationService.getValue<ISearchConfiguration>({ resource: folder.uri });
+		const folderConfig = this.configurationService.getValue<ISearchConfiguration>({ resource: folderUri });
 		const settingExcludes = this.getExcludesForFolder(folderConfig, options);
 		const excludePattern: glob.IExpression = {
 			...(settingExcludes || {}),
 			...(thisFolderExcludeSearchPathPattern || {})
 		};
 
+		const folderName = URI.isUri(folder) ? basename(folder) : folder.name;
 		return <IFolderQuery>{
-			folder: folder.uri,
-			folderName: includeFolderName ? folder.name : undefined,
+			folder: folderUri,
+			folderName: includeFolderName ? folderName : undefined,
 			excludePattern: Object.keys(excludePattern).length > 0 ? excludePattern : undefined,
 			fileEncoding: folderConfig.files && folderConfig.files.encoding,
 			disregardIgnoreFiles: typeof options.disregardIgnoreFiles === 'boolean' ? options.disregardIgnoreFiles : !folderConfig.search.useIgnoreFiles,
@@ -516,3 +570,48 @@ function normalizeGlobPattern(pattern: string): string {
 		.replace(/^\.\//, '')
 		.replace(/\/+$/g, '');
 }
+
+/**
+ * Construct an include pattern from a list of folders uris to search in.
+ */
+export function resolveResourcesForSearchIncludes(resources: URI[], contextService: IWorkspaceContextService): string[] {
+	resources = arrays.distinct(resources, resource => resource.toString());
+
+	const folderPaths: string[] = [];
+	const workspace = contextService.getWorkspace();
+
+	if (resources) {
+		resources.forEach(resource => {
+			let folderPath: string | undefined;
+			if (contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+				// Show relative path from the root for single-root mode
+				folderPath = relativePath(workspace.folders[0].uri, resource); // always uses forward slashes
+				if (folderPath && folderPath !== '.') {
+					folderPath = './' + folderPath;
+				}
+			} else {
+				const owningFolder = contextService.getWorkspaceFolder(resource);
+				if (owningFolder) {
+					const owningRootName = owningFolder.name;
+					// If this root is the only one with its basename, use a relative ./ path. If there is another, use an absolute path
+					const isUniqueFolder = workspace.folders.filter(folder => folder.name === owningRootName).length === 1;
+					if (isUniqueFolder) {
+						const relPath = relativePath(owningFolder.uri, resource); // always uses forward slashes
+						if (relPath === '') {
+							folderPath = `./${owningFolder.name}`;
+						} else {
+							folderPath = `./${owningFolder.name}/${relPath}`;
+						}
+					} else {
+						folderPath = resource.fsPath; // TODO rob: handle non-file URIs
+					}
+				}
+			}
+
+			if (folderPath) {
+				folderPaths.push(folderPath);
+			}
+		});
+	}
+	return folderPaths;
+}
diff --git a/src/vs/workbench/contrib/search/common/search.ts b/src/vs/workbench/contrib/search/common/search.ts
index c0e440eb3..1720c9fa2 100644
--- a/src/vs/workbench/contrib/search/common/search.ts
+++ b/src/vs/workbench/contrib/search/common/search.ts
@@ -16,6 +16,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { IFileService } from 'vs/platform/files/common/files';
 import { IRange } from 'vs/editor/common/core/range';
 import { isNumber } from 'vs/base/common/types';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export interface IWorkspaceSymbol {
 	name: string;
@@ -164,3 +165,11 @@ export function extractRangeFromFilter(filter: string, unless?: string[]): IFilt
 
 	return undefined;
 }
+
+export enum SearchUIState {
+	Idle,
+	Searching,
+	SlowSearch
+}
+
+export const SearchStateKey = new RawContextKey<SearchUIState>('searchState', SearchUIState.Idle);
diff --git a/src/vs/workbench/contrib/search/common/searchModel.ts b/src/vs/workbench/contrib/search/common/searchModel.ts
index 3c7044d06..1e3b7a634 100644
--- a/src/vs/workbench/contrib/search/common/searchModel.ts
+++ b/src/vs/workbench/contrib/search/common/searchModel.ts
@@ -428,7 +428,7 @@ export class FileMatch extends Disposable implements IFileMatch {
 	}
 
 	async resolveFileStat(fileService: IFileService): Promise<void> {
-		this._fileStat = await fileService.resolve(this.resource, { resolveMetadata: true });
+		this._fileStat = await fileService.resolve(this.resource, { resolveMetadata: true }).catch(() => undefined);
 	}
 
 	public get fileStat(): IFileStatWithMetadata | undefined {
diff --git a/src/vs/workbench/contrib/search/test/browser/queryBuilder.test.ts b/src/vs/workbench/contrib/search/test/browser/queryBuilder.test.ts
index 9bd262f90..12768a7b1 100644
--- a/src/vs/workbench/contrib/search/test/browser/queryBuilder.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/queryBuilder.test.ts
@@ -10,7 +10,8 @@ import { URI as uri } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IWorkspaceContextService, toWorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
 import { ISearchPathsInfo, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { IFileQuery, IFolderQuery, IPatternInfo, ITextQuery, QueryType } from 'vs/workbench/services/search/common/search';
@@ -18,6 +19,7 @@ import { TestPathService, TestEnvironmentService } from 'vs/workbench/test/brows
 import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 
 const DEFAULT_EDITOR_CONFIG = {};
 const DEFAULT_USER_CONFIG = { useRipgrep: true, useIgnoreFiles: true, useGlobalIgnoreFiles: true };
@@ -92,7 +94,27 @@ suite('QueryBuilder', () => {
 			});
 	});
 
-	test('does not split glob pattern when expandPatterns disabled', () => {
+	test('splits include pattern when expandPatterns enabled', () => {
+		assertEqualQueries(
+			queryBuilder.file(
+				[ROOT_1_NAMED_FOLDER],
+				{ includePattern: '**/foo, **/bar', expandPatterns: true },
+			),
+			{
+				folderQueries: [{
+					folder: ROOT_1_URI
+				}],
+				type: QueryType.File,
+				includePattern: {
+					'**/foo': true,
+					'**/foo/**': true,
+					'**/bar': true,
+					'**/bar/**': true,
+				}
+			});
+	});
+
+	test('does not split include pattern when expandPatterns disabled', () => {
 		assertEqualQueries(
 			queryBuilder.file(
 				[ROOT_1_NAMED_FOLDER],
@@ -109,6 +131,44 @@ suite('QueryBuilder', () => {
 			});
 	});
 
+	test('includePattern array', () => {
+		assertEqualQueries(
+			queryBuilder.file(
+				[ROOT_1_NAMED_FOLDER],
+				{ includePattern: ['**/foo', '**/bar'] },
+			),
+			{
+				folderQueries: [{
+					folder: ROOT_1_URI
+				}],
+				type: QueryType.File,
+				includePattern: {
+					'**/foo': true,
+					'**/bar': true
+				}
+			});
+	});
+
+	test('includePattern array with expandPatterns', () => {
+		assertEqualQueries(
+			queryBuilder.file(
+				[ROOT_1_NAMED_FOLDER],
+				{ includePattern: ['**/foo', '**/bar'], expandPatterns: true },
+			),
+			{
+				folderQueries: [{
+					folder: ROOT_1_URI
+				}],
+				type: QueryType.File,
+				includePattern: {
+					'**/foo': true,
+					'**/foo/**': true,
+					'**/bar': true,
+					'**/bar/**': true,
+				}
+			});
+	});
+
 	test('folderResources', () => {
 		assertEqualTextQueries(
 			queryBuilder.text(
@@ -287,7 +347,7 @@ suite('QueryBuilder', () => {
 		const ROOT_2_URI = getUri(ROOT_2);
 		const ROOT_3 = fixPath('/project/root3');
 		const ROOT_3_URI = getUri(ROOT_3);
-		mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: ROOT_2_URI.fsPath }, { path: ROOT_3_URI.fsPath }], WS_CONFIG_PATH);
+		mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: ROOT_2_URI.fsPath }, { path: ROOT_3_URI.fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
 		mockWorkspace.configuration = uri.file(fixPath('/config'));
 
 		mockConfigService.setUserConfiguration('search', {
@@ -673,7 +733,7 @@ suite('QueryBuilder', () => {
 
 		test('relative includes w/two root folders', () => {
 			const ROOT_2 = '/project/root2';
-			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH);
+			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
 			mockWorkspace.configuration = uri.file(fixPath('config'));
 
 			const cases: [string, ISearchPathsInfo][] = [
@@ -714,7 +774,7 @@ suite('QueryBuilder', () => {
 		test('include ./foldername', () => {
 			const ROOT_2 = '/project/root2';
 			const ROOT_1_FOLDERNAME = 'foldername';
-			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath, name: ROOT_1_FOLDERNAME }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH);
+			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath, name: ROOT_1_FOLDERNAME }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
 			mockWorkspace.configuration = uri.file(fixPath('config'));
 
 			const cases: [string, ISearchPathsInfo][] = [
@@ -742,7 +802,7 @@ suite('QueryBuilder', () => {
 		test('relative includes w/multiple ambiguous root folders', () => {
 			const ROOT_2 = '/project/rootB';
 			const ROOT_3 = '/otherproject/rootB';
-			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }, { path: getUri(ROOT_3).fsPath }], WS_CONFIG_PATH);
+			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }, { path: getUri(ROOT_3).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
 			mockWorkspace.configuration = uri.file(fixPath('/config'));
 
 			const cases: [string, ISearchPathsInfo][] = [
diff --git a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
index 13eb04129..19179f52a 100644
--- a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts
@@ -5,9 +5,9 @@
 
 import * as assert from 'assert';
 import * as errors from 'vs/base/common/errors';
-import { DeferredPromise } from 'vs/base/test/common/utils';
 import { QueryType, IFileQuery } from 'vs/workbench/services/search/common/search';
 import { FileQueryCacheState } from 'vs/workbench/contrib/search/common/cacheState';
+import { DeferredPromise } from 'vs/base/common/async';
 
 suite('FileQueryCacheState', () => {
 
diff --git a/src/vs/workbench/contrib/search/test/common/searchModel.test.ts b/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
index 0a99a6a7a..11d57d0cf 100644
--- a/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/searchModel.test.ts
@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { timeout } from 'vs/base/common/async';
+import { DeferredPromise, timeout } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
-import { DeferredPromise } from 'vs/base/test/common/utils';
 import { Range } from 'vs/editor/common/core/range';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
diff --git a/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css b/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
index 06950ece2..7250c5876 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
+++ b/src/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css
@@ -45,31 +45,31 @@
 	width: 100%;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper {
 	height: 100%;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper > .mirror,
-.search-editor .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror,
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	padding: 3px;
 	padding-left: 4px;
 }
 
-.search-editor .search-widget .monaco-inputbox > .wrapper > .mirror {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > .mirror {
 	max-height: 134px;
 }
 
 /* NOTE: height is also used in searchWidget.ts as a constant*/
-.search-editor .search-widget .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .search-widget .monaco-inputbox > .ibwrapper > textarea.input {
 	overflow: initial;
 	height: 24px; /* set initial height before measure */
 }
 
-.search-editor .monaco-inputbox > .wrapper > textarea.input {
+.search-editor .monaco-inputbox > .ibwrapper > textarea.input {
 	scrollbar-width: none; /* Firefox: hide scrollbar */
 }
 
-.search-editor .monaco-inputbox > .wrapper > textarea.input::-webkit-scrollbar {
+.search-editor .monaco-inputbox > .ibwrapper > textarea.input::-webkit-scrollbar {
 	display: none;
 }
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
index cc6faa97d..e16b8167c 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
@@ -12,7 +12,7 @@ import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKe
 import { localize } from 'vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -24,14 +24,15 @@ import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchCo
 import { ActiveEditorContext, Extensions as EditorInputExtensions, IEditorInputFactory, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
 import { IViewsService } from 'vs/workbench/common/views';
 import { getSearchView } from 'vs/workbench/contrib/search/browser/searchActions';
-import { searchRefreshIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
+import { searchNewEditorIcon, searchRefreshIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 import * as SearchConstants from 'vs/workbench/contrib/search/common/constants';
 import * as SearchEditorConstants from 'vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
-import { createEditorFromSearchResult, modifySearchEditorContextLinesCommand, openNewSearchEditor, selectAllSearchEditorMatchesCommand, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorContextLinesCommand, toggleSearchEditorRegexCommand, toggleSearchEditorWholeWordCommand } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
+import { createEditorFromSearchResult, modifySearchEditorContextLinesCommand, openNewSearchEditor, openSearchEditor, selectAllSearchEditorMatchesCommand, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorContextLinesCommand, toggleSearchEditorRegexCommand, toggleSearchEditorWholeWordCommand } from 'vs/workbench/contrib/searchEditor/browser/searchEditorActions';
 import { getOrMakeSearchEditorInput, SearchConfiguration, SearchEditorInput, SEARCH_EDITOR_EXT } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
 import { parseSavedSearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { VIEW_ID } from 'vs/workbench/services/search/common/search';
 
 
 const OpenInEditorCommandId = 'search.action.openInEditor';
@@ -261,7 +262,7 @@ registerAction2(class extends Action2 {
 		});
 	}
 	async run(accessor: ServicesAccessor, args: LegacySearchEditorArgs | OpenSearchEditorArgs) {
-		await accessor.get(IInstantiationService).invokeFunction(openNewSearchEditor, translateLegacyConfig({ ...args, location: 'new' }));
+		await accessor.get(IInstantiationService).invokeFunction(openNewSearchEditor, translateLegacyConfig({ location: 'new', ...args }));
 	}
 });
 
@@ -276,7 +277,7 @@ registerAction2(class extends Action2 {
 		});
 	}
 	async run(accessor: ServicesAccessor, args: LegacySearchEditorArgs | OpenSearchEditorArgs) {
-		await accessor.get(IInstantiationService).invokeFunction(openNewSearchEditor, translateLegacyConfig({ ...args, location: 'reuse' }));
+		await accessor.get(IInstantiationService).invokeFunction(openNewSearchEditor, translateLegacyConfig({ location: 'reuse', ...args }));
 	}
 });
 
@@ -317,7 +318,7 @@ registerAction2(class extends Action2 {
 		const instantiationService = accessor.get(IInstantiationService);
 		const searchView = getSearchView(viewsService);
 		if (searchView) {
-			await instantiationService.invokeFunction(createEditorFromSearchResult, searchView.searchResult, searchView.searchIncludePattern.getValue(), searchView.searchExcludePattern.getValue());
+			await instantiationService.invokeFunction(createEditorFromSearchResult, searchView.searchResult, searchView.searchIncludePattern.getValue(), searchView.searchExcludePattern.getValue(), searchView.searchIncludePattern.onlySearchInOpenEditors());
 		}
 	}
 });
@@ -506,4 +507,24 @@ registerAction2(class extends Action2 {
 		selectAllSearchEditorMatchesCommand(accessor);
 	}
 });
+
+registerAction2(class OpenSearchEditorAction extends Action2 {
+	constructor() {
+		super({
+			id: 'search.action.openNewEditorFromView',
+			title: localize('search.openNewEditor', "Open New Search Editor from View"),
+			category,
+			icon: searchNewEditorIcon,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 2,
+				when: ContextKeyEqualsExpr.create('view', VIEW_ID),
+			}]
+		});
+	}
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		return openSearchEditor(accessor);
+	}
+});
 //#endregion
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index caf6d8012..b42829974 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -38,7 +38,7 @@ import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platfor
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
 import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
-import { ExcludePatternInputWidget, PatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
+import { ExcludePatternInputWidget, IncludePatternInputWidget } from 'vs/workbench/contrib/search/browser/patternInputWidget';
 import { SearchWidget } from 'vs/workbench/contrib/search/browser/searchWidget';
 import { InputBoxFocusedKey } from 'vs/workbench/contrib/search/common/constants';
 import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/contrib/search/common/queryBuilder';
@@ -67,7 +67,7 @@ export class SearchEditor extends BaseTextEditor {
 	private searchResultEditor!: CodeEditorWidget;
 	private queryEditorContainer!: HTMLElement;
 	private dimension?: DOM.Dimension;
-	private inputPatternIncludes!: PatternInputWidget;
+	private inputPatternIncludes!: IncludePatternInputWidget;
 	private inputPatternExcludes!: ExcludePatternInputWidget;
 	private includesExcludesContainer!: HTMLElement;
 	private toggleQueryDetailsButton!: HTMLElement;
@@ -168,10 +168,11 @@ export class SearchEditor extends BaseTextEditor {
 		const folderIncludesList = DOM.append(this.includesExcludesContainer, DOM.$('.file-types.includes'));
 		const filesToIncludeTitle = localize('searchScope.includes', "files to include");
 		DOM.append(folderIncludesList, DOM.$('h4', undefined, filesToIncludeTitle));
-		this.inputPatternIncludes = this._register(this.instantiationService.createInstance(PatternInputWidget, folderIncludesList, this.contextViewService, {
+		this.inputPatternIncludes = this._register(this.instantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
 			ariaLabel: localize('label.includes', 'Search Include Patterns'),
 		}));
 		this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
+		this._register(this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch()));
 
 		// // Excludes
 		const excludesList = DOM.append(this.includesExcludesContainer, DOM.$('.file-types.excludes'));
@@ -181,7 +182,7 @@ export class SearchEditor extends BaseTextEditor {
 			ariaLabel: localize('label.excludes', 'Search Exclude Patterns'),
 		}));
 		this.inputPatternExcludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
-		this.inputPatternExcludes.onChangeIgnoreBox(() => this.triggerSearch());
+		this._register(this.inputPatternExcludes.onChangeIgnoreBox(() => this.triggerSearch()));
 
 		[this.queryEditorWidget.searchInput, this.inputPatternIncludes, this.inputPatternExcludes].map(input =>
 			this._register(attachInputBoxStyler(input, this.themeService, { inputBorder: searchEditorTextInputBorder })));
@@ -449,6 +450,7 @@ export class SearchEditor extends BaseTextEditor {
 			isRegexp: this.queryEditorWidget.searchInput.getRegex(),
 			matchWholeWord: this.queryEditorWidget.searchInput.getWholeWords(),
 			useExcludeSettingsAndIgnoreFiles: this.inputPatternExcludes.useExcludesAndIgnoreFiles(),
+			onlyOpenEditors: this.inputPatternIncludes.onlySearchInOpenEditors(),
 			showIncludesExcludes: this.showingIncludesExcludes
 		};
 	}
@@ -483,6 +485,7 @@ export class SearchEditor extends BaseTextEditor {
 			disregardExcludeSettings: !config.useExcludeSettingsAndIgnoreFiles || undefined,
 			excludePattern: config.filesToExclude,
 			includePattern: config.filesToInclude,
+			onlyOpenEditors: config.onlyOpenEditors,
 			previewOptions: {
 				matchLines: 1,
 				charsPerLine: 1000
@@ -567,6 +570,19 @@ export class SearchEditor extends BaseTextEditor {
 		return this._input as SearchEditorInput;
 	}
 
+	setSearchConfig(config: Partial<Readonly<SearchConfiguration>>) {
+		if (config.query !== undefined) { this.queryEditorWidget.setValue(config.query); }
+		if (config.isCaseSensitive !== undefined) { this.queryEditorWidget.searchInput.setCaseSensitive(config.isCaseSensitive); }
+		if (config.isRegexp !== undefined) { this.queryEditorWidget.searchInput.setRegex(config.isRegexp); }
+		if (config.matchWholeWord !== undefined) { this.queryEditorWidget.searchInput.setWholeWords(config.matchWholeWord); }
+		if (config.contextLines !== undefined) { this.queryEditorWidget.setContextLines(config.contextLines); }
+		if (config.filesToExclude !== undefined) { this.inputPatternExcludes.setValue(config.filesToExclude); }
+		if (config.filesToInclude !== undefined) { this.inputPatternIncludes.setValue(config.filesToInclude); }
+		if (config.onlyOpenEditors !== undefined) { this.inputPatternIncludes.setOnlySearchInOpenEditors(config.onlyOpenEditors); }
+		if (config.useExcludeSettingsAndIgnoreFiles !== undefined) { this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(config.useExcludeSettingsAndIgnoreFiles); }
+		if (config.showIncludesExcludes !== undefined) { this.toggleIncludesExcludes(config.showIncludesExcludes); }
+	}
+
 	async setInput(newInput: SearchEditorInput, options: EditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		this.saveViewState();
 
@@ -581,15 +597,7 @@ export class SearchEditor extends BaseTextEditor {
 
 		this.toggleRunAgainMessage(body.getLineCount() === 1 && body.getValue() === '' && config.query !== '');
 
-		this.queryEditorWidget.setValue(config.query);
-		this.queryEditorWidget.searchInput.setCaseSensitive(config.isCaseSensitive);
-		this.queryEditorWidget.searchInput.setRegex(config.isRegexp);
-		this.queryEditorWidget.searchInput.setWholeWords(config.matchWholeWord);
-		this.queryEditorWidget.setContextLines(config.contextLines);
-		this.inputPatternExcludes.setValue(config.filesToExclude);
-		this.inputPatternIncludes.setValue(config.filesToInclude);
-		this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(config.useExcludeSettingsAndIgnoreFiles);
-		this.toggleIncludesExcludes(config.showIncludesExcludes);
+		this.setSearchConfig(config);
 
 		this.restoreViewState();
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
index f1d1426f4..f8aa2378e 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
@@ -3,32 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
+import { Schemas } from 'vs/base/common/network';
+import { assertIsDefined, withNullAsUndefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import 'vs/css!./media/searchEditor';
 import { ICodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
-import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { EditorsOrder } from 'vs/workbench/common/editor';
+import { IViewsService } from 'vs/workbench/common/views';
+import { getSearchView } from 'vs/workbench/contrib/search/browser/searchActions';
 import { SearchResult } from 'vs/workbench/contrib/search/common/searchModel';
 import { SearchEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditor';
+import { OpenSearchEditorArgs } from 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
 import { getOrMakeSearchEditorInput, SearchEditorInput } from 'vs/workbench/contrib/searchEditor/browser/searchEditorInput';
 import { serializeSearchResultForEditor } from 'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
-import { searchNewEditorIcon } from 'vs/workbench/contrib/search/browser/searchIcons';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { Schemas } from 'vs/base/common/network';
-import { withNullAsUndefined, assertIsDefined } from 'vs/base/common/types';
-import { OpenNewEditorCommandId } from 'vs/workbench/contrib/searchEditor/browser/constants';
-import { OpenSearchEditorArgs } from 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution';
-import { EditorsOrder } from 'vs/workbench/common/editor';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IHistoryService } from 'vs/workbench/services/history/common/history';
+import { ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
 
 export const toggleSearchEditorCaseSensitiveCommand = (accessor: ServicesAccessor) => {
 	const editorService = accessor.get(IEditorService);
@@ -78,27 +75,23 @@ export const selectAllSearchEditorMatchesCommand = (accessor: ServicesAccessor)
 	}
 };
 
-export class OpenSearchEditorAction extends Action {
-
-	static readonly ID: string = OpenNewEditorCommandId;
-	static readonly LABEL = localize('search.openNewEditor', "Open New Search Editor");
-
-	constructor(id: string, label: string,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super(id, label, ThemeIcon.asClassName(searchNewEditorIcon));
-	}
-
-	update() {
-		// pass
-	}
-
-	get enabled(): boolean {
-		return true;
-	}
-
-	async run() {
-		await this.instantiationService.invokeFunction(openNewSearchEditor);
+export async function openSearchEditor(accessor: ServicesAccessor): Promise<void> {
+	const viewsService = accessor.get(IViewsService);
+	const instantiationService = accessor.get(IInstantiationService);
+	const searchView = getSearchView(viewsService);
+	if (searchView) {
+		await instantiationService.invokeFunction(openNewSearchEditor, {
+			filesToInclude: searchView.searchIncludePattern.getValue(),
+			onlyOpenEditors: searchView.searchIncludePattern.onlySearchInOpenEditors(),
+			filesToExclude: searchView.searchExcludePattern.getValue(),
+			isRegexp: searchView.searchAndReplaceWidget.searchInput.getRegex(),
+			isCaseSensitive: searchView.searchAndReplaceWidget.searchInput.getCaseSensitive(),
+			matchWholeWord: searchView.searchAndReplaceWidget.searchInput.getWholeWords(),
+			useExcludeSettingsAndIgnoreFiles: searchView.searchExcludePattern.useExcludesAndIgnoreFiles(),
+			showIncludesExcludes: !!(searchView.searchIncludePattern.getValue() || searchView.searchExcludePattern.getValue() || !searchView.searchExcludePattern.useExcludesAndIgnoreFiles())
+		});
+	} else {
+		await instantiationService.invokeFunction(openNewSearchEditor);
 	}
 }
 
@@ -140,7 +133,7 @@ export const openNewSearchEditor =
 
 		telemetryService.publicLog2('searchEditor/openNewSearchEditor');
 
-		const args: OpenSearchEditorArgs = { query: selected };
+		const args: OpenSearchEditorArgs = { query: selected || undefined };
 		Object.entries(_args).forEach(([name, value]) => {
 			(args as any)[name as any] = (typeof value === 'string') ? configurationResolverService.resolve(lastActiveWorkspaceRoot, value) : value;
 		});
@@ -151,6 +144,7 @@ export const openNewSearchEditor =
 			editor = assertIsDefined(await assertIsDefined(editorGroupsService.getGroup(existing.groupId)).openEditor(input)) as SearchEditor;
 			if (selected) { editor.setQuery(selected); }
 			else { editor.selectQuery(); }
+			editor.setSearchConfig(args);
 		} else {
 			const input = instantiationService.invokeFunction(getOrMakeSearchEditorInput, { config: args, text: '' });
 			editor = await editorService.openEditor(input, { pinned: true }, toSide ? SIDE_GROUP : ACTIVE_GROUP) as SearchEditor;
@@ -168,7 +162,7 @@ export const openNewSearchEditor =
 	};
 
 export const createEditorFromSearchResult =
-	async (accessor: ServicesAccessor, searchResult: SearchResult, rawIncludePattern: string, rawExcludePattern: string) => {
+	async (accessor: ServicesAccessor, searchResult: SearchResult, rawIncludePattern: string, rawExcludePattern: string, onlySearchInOpenEditors: boolean) => {
 		if (!searchResult.query) {
 			console.error('Expected searchResult.query to be defined. Got', searchResult);
 			return;
@@ -187,6 +181,7 @@ export const createEditorFromSearchResult =
 		const labelFormatter = (uri: URI): string => labelService.getUriLabel(uri, { relative: true });
 
 		const { text, matchRanges, config } = serializeSearchResultForEditor(searchResult, rawIncludePattern, rawExcludePattern, 0, labelFormatter, sortOrder);
+		config.onlyOpenEditors = onlySearchInOpenEditors;
 		const contextLines = configurationService.getValue<ISearchConfigurationProperties>('search').searchEditor.defaultNumberOfContextLines;
 
 		if (searchResult.isDirty || contextLines === 0 || contextLines === null) {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
index c5a551a47..9d02af8f6 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
@@ -40,6 +40,7 @@ export type SearchConfiguration = {
 	isRegexp: boolean,
 	useExcludeSettingsAndIgnoreFiles: boolean,
 	showIncludesExcludes: boolean,
+	onlyOpenEditors: boolean,
 };
 
 export const SEARCH_EDITOR_EXT = '.code-search';
@@ -147,7 +148,7 @@ export class SearchEditorInput extends EditorInput {
 		if (path) {
 			this.telemetryService.publicLog2('searchEditor/saveSearchResults');
 			const toWrite = await this.serializeForDisk();
-			if (await this.textFileService.create(path, toWrite, { overwrite: true })) {
+			if (await this.textFileService.create([{ resource: path, value: toWrite, options: { overwrite: true } }])) {
 				this.setDirty(false);
 				if (!isEqual(path, this.modelUri)) {
 					const input = this.instantiationService.invokeFunction(getOrMakeSearchEditorInput, { config: this.config, backingUri: path });
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
index 951be0542..51ccafc40 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
@@ -115,6 +115,7 @@ const contentPatternToSearchConfiguration = (pattern: ITextQuery, includes: stri
 		showIncludesExcludes: !!(includes || excludes || pattern?.userDisabledExcludesAndIgnoreFiles),
 		useExcludeSettingsAndIgnoreFiles: (pattern?.userDisabledExcludesAndIgnoreFiles === undefined ? true : !pattern.userDisabledExcludesAndIgnoreFiles),
 		contextLines,
+		onlyOpenEditors: !!pattern.onlyOpenEditors,
 	};
 };
 
@@ -131,6 +132,7 @@ export const serializeSearchConfiguration = (config: Partial<SearchConfiguration
 			config.isCaseSensitive && 'CaseSensitive',
 			config.matchWholeWord && 'WordMatch',
 			config.isRegexp && 'RegExp',
+			config.onlyOpenEditors && 'OpenEditors',
 			(config.useExcludeSettingsAndIgnoreFiles === false) && 'IgnoreExcludeSettings'
 		]).join(' ')}`,
 		config.filesToInclude ? `# Including: ${config.filesToInclude}` : undefined,
@@ -153,6 +155,7 @@ export const defaultSearchConfig = (): SearchConfiguration => ({
 	matchWholeWord: false,
 	contextLines: 0,
 	showIncludesExcludes: false,
+	onlyOpenEditors: false,
 });
 
 export const extractSearchQueryFromLines = (lines: string[]): SearchConfiguration => {
@@ -197,6 +200,7 @@ export const extractSearchQueryFromLines = (lines: string[]): SearchConfiguratio
 				query.isCaseSensitive = value.indexOf('CaseSensitive') !== -1;
 				query.useExcludeSettingsAndIgnoreFiles = value.indexOf('IgnoreExcludeSettings') === -1;
 				query.matchWholeWord = value.indexOf('WordMatch') !== -1;
+				query.onlyOpenEditors = value.indexOf('OpenEditors') !== -1;
 			}
 		}
 	}
diff --git a/src/vs/workbench/contrib/snippets/browser/insertSnippet.ts b/src/vs/workbench/contrib/snippets/browser/insertSnippet.ts
index 48b60f977..99dbc8150 100644
--- a/src/vs/workbench/contrib/snippets/browser/insertSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/insertSnippet.ts
@@ -128,7 +128,7 @@ class InsertSnippetAction extends EditorAction {
 
 			if (name) {
 				// take selected snippet
-				const snippet = (await snippetService.getSnippets(languageId)).find(snippet => snippet.name === name);
+				const snippet = (await snippetService.getSnippets(languageId, { includeNoPrefixSnippets: true })).find(snippet => snippet.name === name);
 				resolve(snippet);
 
 			} else {
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
index b7e570afb..6dbfecade 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
@@ -16,6 +16,7 @@ import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets
 import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
 import { isPatternInWord } from 'vs/base/common/filters';
 import { StopWatch } from 'vs/base/common/stopwatch';
+import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 
 export class SnippetCompletion implements CompletionItem {
 
@@ -110,8 +111,27 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
 					const prefixPos = position.column - (1 + start);
 					const prefixRestLen = snippet.prefixLow.length - prefixPos;
 					const endsWithPrefixRest = compareSubstring(lineContent, snippet.prefixLow, columnOffset, (columnOffset) + prefixRestLen, prefixPos, prefixPos + prefixRestLen);
-					const endColumn = endsWithPrefixRest === 0 ? position.column + prefixRestLen : position.column;
-					const replace = Range.fromPositions(position.delta(0, -prefixPos), { lineNumber: position.lineNumber, column: endColumn });
+					const startPosition = position.delta(0, -prefixPos);
+					let endColumn = endsWithPrefixRest === 0 ? position.column + prefixRestLen : position.column;
+
+					// First check if there is anything to the right of the cursor
+					if (columnOffset < lineContent.length) {
+						const autoClosingPairs = LanguageConfigurationRegistry.getAutoClosingPairs(languageId);
+						const standardAutoClosingPairConditionals = autoClosingPairs.autoClosingPairsCloseSingleChar.get(lineContent[columnOffset]);
+						// If the character to the right of the cursor is a closing character of an autoclosing pair
+						if (standardAutoClosingPairConditionals?.some(p =>
+							// and the start position is the opening character of an autoclosing pair
+							p.open === lineContent[startPosition.column - 1] &&
+							// and the snippet prefix contains the opening and closing pair at its edges
+							snippet.prefix.startsWith(p.open) &&
+							snippet.prefix[snippet.prefix.length - 1] === p.close)) {
+
+							// Eat the character that was likely inserted because of auto-closing pairs
+							endColumn++;
+						}
+					}
+
+					const replace = Range.fromPositions(startPosition, { lineNumber: position.lineNumber, column: endColumn });
 					const insert = replace.setEndPosition(position.lineNumber, position.column);
 
 					suggestions.push(new SnippetCompletion(snippet, { replace, insert }));
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
index a1bace7ed..4fd656c8b 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
@@ -29,6 +29,7 @@ import { ResourceMap } from 'vs/base/common/map';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { isStringArray } from 'vs/base/common/types';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 namespace snippetExt {
 
@@ -180,6 +181,7 @@ class SnippetsService implements ISnippetsService {
 		@IModeService private readonly _modeService: IModeService,
 		@ILogService private readonly _logService: ILogService,
 		@IFileService private readonly _fileService: IFileService,
+		@ITextFileService private readonly _textfileService: ITextFileService,
 		@IExtensionResourceLoaderService private readonly _extensionResourceLoaderService: IExtensionResourceLoaderService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -371,6 +373,11 @@ class SnippetsService implements ISnippetsService {
 			}
 		};
 
+		bucket.add(this._textfileService.files.onDidSave(e => {
+			if (resources.isEqualOrParent(e.model.resource, folder)) {
+				addFolderSnippets();
+			}
+		}));
 		bucket.add(watch(this._fileService, folder, addFolderSnippets));
 		bucket.add(disposables);
 		return addFolderSnippets();
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
index 25d373fd0..c0542b6b2 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts
@@ -21,7 +21,7 @@ suite('Snippets', function () {
 		let file = new TestSnippetFile(URI.file('somepath/foo.code-snippets'), []);
 		let bucket: Snippet[] = [];
 		file.select('', bucket);
-		assert.equal(bucket.length, 0);
+		assert.strictEqual(bucket.length, 0);
 
 		file = new TestSnippetFile(URI.file('somepath/foo.code-snippets'), [
 			new Snippet(['foo'], 'FooSnippet1', 'foo', '', 'snippet', 'test', SnippetSource.User),
@@ -34,23 +34,23 @@ suite('Snippets', function () {
 
 		bucket = [];
 		file.select('foo', bucket);
-		assert.equal(bucket.length, 2);
+		assert.strictEqual(bucket.length, 2);
 
 		bucket = [];
 		file.select('fo', bucket);
-		assert.equal(bucket.length, 0);
+		assert.strictEqual(bucket.length, 0);
 
 		bucket = [];
 		file.select('bar', bucket);
-		assert.equal(bucket.length, 1);
+		assert.strictEqual(bucket.length, 1);
 
 		bucket = [];
 		file.select('bar.comment', bucket);
-		assert.equal(bucket.length, 2);
+		assert.strictEqual(bucket.length, 2);
 
 		bucket = [];
 		file.select('bazz', bucket);
-		assert.equal(bucket.length, 1);
+		assert.strictEqual(bucket.length, 1);
 	});
 
 	test('SnippetFile#select - any scope', function () {
@@ -62,7 +62,7 @@ suite('Snippets', function () {
 
 		let bucket: Snippet[] = [];
 		file.select('foo', bucket);
-		assert.equal(bucket.length, 2);
+		assert.strictEqual(bucket.length, 2);
 
 	});
 
@@ -70,9 +70,9 @@ suite('Snippets', function () {
 
 		function assertNeedsClipboard(body: string, expected: boolean): void {
 			let snippet = new Snippet(['foo'], 'FooSnippet1', 'foo', '', body, 'test', SnippetSource.User);
-			assert.equal(snippet.needsClipboard, expected);
+			assert.strictEqual(snippet.needsClipboard, expected);
 
-			assert.equal(SnippetParser.guessNeedsClipboard(body), expected);
+			assert.strictEqual(SnippetParser.guessNeedsClipboard(body), expected);
 		}
 
 		assertNeedsClipboard('foo$CLIPBOARD', true);
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
index 62d57763e..b8b94f7b3 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts
@@ -14,7 +14,7 @@ suite('getNonWhitespacePrefix', () => {
 			getLineContent: (lineNumber: number) => line
 		};
 		let actual = getNonWhitespacePrefix(model, new Position(1, column));
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	}
 
 	test('empty line', () => {
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
index 98d3cffdd..50c826d58 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts
@@ -11,9 +11,9 @@ suite('SnippetRewrite', function () {
 	function assertRewrite(input: string, expected: string | boolean): void {
 		const actual = new Snippet(['foo'], 'foo', 'foo', 'foo', input, 'foo', SnippetSource.User);
 		if (typeof expected === 'boolean') {
-			assert.equal(actual.codeSnippet, input);
+			assert.strictEqual(actual.codeSnippet, input);
 		} else {
-			assert.equal(actual.codeSnippet, expected);
+			assert.strictEqual(actual.codeSnippet, expected);
 		}
 	}
 
@@ -48,8 +48,8 @@ suite('SnippetRewrite', function () {
 
 	test('lazy bogous variable rewrite', function () {
 		const snippet = new Snippet(['fooLang'], 'foo', 'prefix', 'desc', 'This is ${bogous} because it is a ${var}', 'source', SnippetSource.Extension);
-		assert.equal(snippet.body, 'This is ${bogous} because it is a ${var}');
-		assert.equal(snippet.codeSnippet, 'This is ${1:bogous} because it is a ${2:var}');
-		assert.equal(snippet.isBogous, true);
+		assert.strictEqual(snippet.body, 'This is ${bogous} because it is a ${var}');
+		assert.strictEqual(snippet.codeSnippet, 'This is ${1:bogous} because it is a ${2:var}');
+		assert.strictEqual(snippet.isBogous, true);
 	});
 });
diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
index 10419ba6c..a18faaea0 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
@@ -13,6 +13,7 @@ import { ISnippetsService } from 'vs/workbench/contrib/snippets/browser/snippets
 import { Snippet, SnippetSource } from 'vs/workbench/contrib/snippets/browser/snippetsFile';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { CompletionContext, CompletionTriggerKind } from 'vs/editor/common/modes';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 class SimpleSnippetService implements ISnippetsService {
 	declare readonly _serviceBrand: undefined;
@@ -35,6 +36,8 @@ class SimpleSnippetService implements ISnippetsService {
 }
 
 suite('SnippetsService', function () {
+	const disposableStore: DisposableStore = new DisposableStore();
+	const context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
 
 	suiteSetup(function () {
 		ModesRegistry.registerLanguage({
@@ -43,9 +46,12 @@ suite('SnippetsService', function () {
 		});
 	});
 
+	suiteTeardown(function () {
+		disposableStore.dispose();
+	});
+
 	let modeService: ModeServiceImpl;
 	let snippetService: ISnippetsService;
-	let context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
 
 	setup(function () {
 		modeService = new ModeServiceImpl();
@@ -68,15 +74,14 @@ suite('SnippetsService', function () {
 		)]);
 	});
 
-
 	test('snippet completions - simple', function () {
 
 		const provider = new SnippetCompletionProvider(modeService, snippetService);
 		const model = createTextModel('', undefined, modeService.getLanguageIdentifier('fooLang'));
 
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
-			assert.equal(result.incomplete, undefined);
-			assert.equal(result.suggestions.length, 2);
+			assert.strictEqual(result.incomplete, undefined);
+			assert.strictEqual(result.suggestions.length, 2);
 		});
 	});
 
@@ -86,14 +91,14 @@ suite('SnippetsService', function () {
 		const model = createTextModel('bar', undefined, modeService.getLanguageIdentifier('fooLang'));
 
 		return provider.provideCompletionItems(model, new Position(1, 4), context)!.then(result => {
-			assert.equal(result.incomplete, undefined);
-			assert.equal(result.suggestions.length, 1);
-			assert.deepEqual(result.suggestions[0].label, {
+			assert.strictEqual(result.incomplete, undefined);
+			assert.strictEqual(result.suggestions.length, 1);
+			assert.deepStrictEqual(result.suggestions[0].label, {
 				name: 'bar',
 				type: 'barTest'
 			});
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 1);
-			assert.equal(result.suggestions[0].insertText, 'barCodeSnippet');
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 1);
+			assert.strictEqual(result.suggestions[0].insertText, 'barCodeSnippet');
 		});
 	});
 
@@ -121,48 +126,48 @@ suite('SnippetsService', function () {
 		const model = createTextModel('bar-bar', undefined, modeService.getLanguageIdentifier('fooLang'));
 
 		await provider.provideCompletionItems(model, new Position(1, 3), context)!.then(result => {
-			assert.equal(result.incomplete, undefined);
-			assert.equal(result.suggestions.length, 2);
-			assert.deepEqual(result.suggestions[0].label, {
+			assert.strictEqual(result.incomplete, undefined);
+			assert.strictEqual(result.suggestions.length, 2);
+			assert.deepStrictEqual(result.suggestions[0].label, {
 				name: 'bar',
 				type: 'barTest'
 			});
-			assert.equal(result.suggestions[0].insertText, 's1');
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 1);
-			assert.deepEqual(result.suggestions[1].label, {
+			assert.strictEqual(result.suggestions[0].insertText, 's1');
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 1);
+			assert.deepStrictEqual(result.suggestions[1].label, {
 				name: 'bar-bar',
 				type: 'name'
 			});
-			assert.equal(result.suggestions[1].insertText, 's2');
-			assert.equal((result.suggestions[1].range as any).insert.startColumn, 1);
+			assert.strictEqual(result.suggestions[1].insertText, 's2');
+			assert.strictEqual((result.suggestions[1].range as any).insert.startColumn, 1);
 		});
 
 		await provider.provideCompletionItems(model, new Position(1, 5), context)!.then(result => {
-			assert.equal(result.incomplete, undefined);
-			assert.equal(result.suggestions.length, 1);
-			assert.deepEqual(result.suggestions[0].label, {
+			assert.strictEqual(result.incomplete, undefined);
+			assert.strictEqual(result.suggestions.length, 1);
+			assert.deepStrictEqual(result.suggestions[0].label, {
 				name: 'bar-bar',
 				type: 'name'
 			});
-			assert.equal(result.suggestions[0].insertText, 's2');
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 1);
+			assert.strictEqual(result.suggestions[0].insertText, 's2');
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 1);
 		});
 
 		await provider.provideCompletionItems(model, new Position(1, 6), context)!.then(result => {
-			assert.equal(result.incomplete, undefined);
-			assert.equal(result.suggestions.length, 2);
-			assert.deepEqual(result.suggestions[0].label, {
+			assert.strictEqual(result.incomplete, undefined);
+			assert.strictEqual(result.suggestions.length, 2);
+			assert.deepStrictEqual(result.suggestions[0].label, {
 				name: 'bar',
 				type: 'barTest'
 			});
-			assert.equal(result.suggestions[0].insertText, 's1');
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 5);
-			assert.deepEqual(result.suggestions[1].label, {
+			assert.strictEqual(result.suggestions[0].insertText, 's1');
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 5);
+			assert.deepStrictEqual(result.suggestions[1].label, {
 				name: 'bar-bar',
 				type: 'name'
 			});
-			assert.equal(result.suggestions[1].insertText, 's2');
-			assert.equal((result.suggestions[1].range as any).insert.startColumn, 1);
+			assert.strictEqual(result.suggestions[1].insertText, 's2');
+			assert.strictEqual((result.suggestions[1].range as any).insert.startColumn, 1);
 		});
 	});
 
@@ -181,21 +186,21 @@ suite('SnippetsService', function () {
 
 		let model = createTextModel('\t<?php', undefined, modeService.getLanguageIdentifier('fooLang'));
 		return provider.provideCompletionItems(model, new Position(1, 7), context)!.then(result => {
-			assert.equal(result.suggestions.length, 1);
+			assert.strictEqual(result.suggestions.length, 1);
 			model.dispose();
 
 			model = createTextModel('\t<?', undefined, modeService.getLanguageIdentifier('fooLang'));
 			return provider.provideCompletionItems(model, new Position(1, 4), context)!;
 		}).then(result => {
-			assert.equal(result.suggestions.length, 1);
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 2);
+			assert.strictEqual(result.suggestions.length, 1);
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 2);
 			model.dispose();
 
 			model = createTextModel('a<?', undefined, modeService.getLanguageIdentifier('fooLang'));
 			return provider.provideCompletionItems(model, new Position(1, 4), context)!;
 		}).then(result => {
-			assert.equal(result.suggestions.length, 1);
-			assert.equal((result.suggestions[0].range as any).insert.startColumn, 2);
+			assert.strictEqual(result.suggestions.length, 1);
+			assert.strictEqual((result.suggestions[0].range as any).insert.startColumn, 2);
 			model.dispose();
 		});
 	});
@@ -216,10 +221,10 @@ suite('SnippetsService', function () {
 
 		let model = createTextModel('<head>\n\t\n>/head>', undefined, modeService.getLanguageIdentifier('fooLang'));
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
-			assert.equal(result.suggestions.length, 1);
+			assert.strictEqual(result.suggestions.length, 1);
 			return provider.provideCompletionItems(model, new Position(2, 2), context)!;
 		}).then(result => {
-			assert.equal(result.suggestions.length, 1);
+			assert.strictEqual(result.suggestions.length, 1);
 		});
 	});
 
@@ -246,13 +251,13 @@ suite('SnippetsService', function () {
 
 		let model = createTextModel('', undefined, modeService.getLanguageIdentifier('fooLang'));
 		return provider.provideCompletionItems(model, new Position(1, 1), context)!.then(result => {
-			assert.equal(result.suggestions.length, 2);
+			assert.strictEqual(result.suggestions.length, 2);
 			let [first, second] = result.suggestions;
-			assert.deepEqual(first.label, {
+			assert.deepStrictEqual(first.label, {
 				name: 'first',
 				type: 'first'
 			});
-			assert.deepEqual(second.label, {
+			assert.deepStrictEqual(second.label, {
 				name: 'second',
 				type: 'second'
 			});
@@ -274,13 +279,13 @@ suite('SnippetsService', function () {
 		let model = createTextModel('p-', undefined, modeService.getLanguageIdentifier('fooLang'));
 
 		let result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 
 		result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 
 		result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 	});
 
 	test('No snippets suggestion on long lines beyond character 100 #58807', async function () {
@@ -299,7 +304,7 @@ suite('SnippetsService', function () {
 		let model = createTextModel('Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 158), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 	});
 
 	test('Type colon will trigger snippet #60746', async function () {
@@ -318,7 +323,7 @@ suite('SnippetsService', function () {
 		let model = createTextModel(':', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
 
-		assert.equal(result.suggestions.length, 0);
+		assert.strictEqual(result.suggestions.length, 0);
 	});
 
 	test('substring of prefix can\'t trigger snippet #60737', async function () {
@@ -337,8 +342,8 @@ suite('SnippetsService', function () {
 		let model = createTextModel('template', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 9), context)!;
 
-		assert.equal(result.suggestions.length, 1);
-		assert.deepEqual(result.suggestions[0].label, {
+		assert.strictEqual(result.suggestions.length, 1);
+		assert.deepStrictEqual(result.suggestions[0].label, {
 			name: 'mytemplate',
 			type: 'mytemplate'
 		});
@@ -360,13 +365,14 @@ suite('SnippetsService', function () {
 		let model = createTextModel('Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea Thisisaverylonglinegoingwithmore100bcharactersandthismakesintellisensebecomea b text_after_b', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 158), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 	});
 
 	test('issue #61296: VS code freezes when editing CSS file with emoji', async function () {
-		let toDispose = LanguageConfigurationRegistry.register(modeService.getLanguageIdentifier('fooLang')!, {
+		disposableStore.add(LanguageConfigurationRegistry.register(modeService.getLanguageIdentifier('fooLang')!, {
 			wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g
-		});
+		}));
+
 		snippetService = new SimpleSnippetService([new Snippet(
 			['fooLang'],
 			'bug',
@@ -382,9 +388,7 @@ suite('SnippetsService', function () {
 		let model = createTextModel('.🐷-a-b', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 8), context)!;
 
-		assert.equal(result.suggestions.length, 1);
-
-		toDispose.dispose();
+		assert.strictEqual(result.suggestions.length, 1);
 	});
 
 	test('No snippets shown when triggering completions at whitespace on line that already has text #62335', async function () {
@@ -403,7 +407,7 @@ suite('SnippetsService', function () {
 		let model = createTextModel('a ', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 	});
 
 	test('Snippet prefix with special chars and numbers does not work #62906', async function () {
@@ -430,16 +434,16 @@ suite('SnippetsService', function () {
 		let model = createTextModel(' <', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		let [first] = result.suggestions;
-		assert.equal((first.range as any).insert.startColumn, 2);
+		assert.strictEqual((first.range as any).insert.startColumn, 2);
 
 		model = createTextModel('1', undefined, modeService.getLanguageIdentifier('fooLang'));
 		result = await provider.provideCompletionItems(model, new Position(1, 2), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		[first] = result.suggestions;
-		assert.equal((first.range as any).insert.startColumn, 1);
+		assert.strictEqual((first.range as any).insert.startColumn, 1);
 	});
 
 	test('Snippet replace range', async function () {
@@ -458,26 +462,26 @@ suite('SnippetsService', function () {
 		let model = createTextModel('not wordFoo bar', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		let [first] = result.suggestions;
-		assert.equal((first.range as any).insert.endColumn, 3);
-		assert.equal((first.range as any).replace.endColumn, 9);
+		assert.strictEqual((first.range as any).insert.endColumn, 3);
+		assert.strictEqual((first.range as any).replace.endColumn, 9);
 
 		model = createTextModel('not woFoo bar', undefined, modeService.getLanguageIdentifier('fooLang'));
 		result = await provider.provideCompletionItems(model, new Position(1, 3), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		[first] = result.suggestions;
-		assert.equal((first.range as any).insert.endColumn, 3);
-		assert.equal((first.range as any).replace.endColumn, 3);
+		assert.strictEqual((first.range as any).insert.endColumn, 3);
+		assert.strictEqual((first.range as any).replace.endColumn, 3);
 
 		model = createTextModel('not word', undefined, modeService.getLanguageIdentifier('fooLang'));
 		result = await provider.provideCompletionItems(model, new Position(1, 1), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		[first] = result.suggestions;
-		assert.equal((first.range as any).insert.endColumn, 1);
-		assert.equal((first.range as any).replace.endColumn, 9);
+		assert.strictEqual((first.range as any).insert.endColumn, 1);
+		assert.strictEqual((first.range as any).replace.endColumn, 9);
 	});
 
 	test('Snippet replace-range incorrect #108894', async function () {
@@ -497,9 +501,40 @@ suite('SnippetsService', function () {
 		let model = createTextModel('filler e KEEP ng filler', undefined, modeService.getLanguageIdentifier('fooLang'));
 		let result = await provider.provideCompletionItems(model, new Position(1, 9), context)!;
 
-		assert.equal(result.suggestions.length, 1);
+		assert.strictEqual(result.suggestions.length, 1);
 		let [first] = result.suggestions;
-		assert.equal((first.range as any).insert.endColumn, 9);
-		assert.equal((first.range as any).replace.endColumn, 9);
+		assert.strictEqual((first.range as any).insert.endColumn, 9);
+		assert.strictEqual((first.range as any).replace.endColumn, 9);
+	});
+
+	test('Snippet will replace auto-closing pair if specified in prefix', async function () {
+		disposableStore.add(LanguageConfigurationRegistry.register(modeService.getLanguageIdentifier('fooLang')!, {
+			brackets: [
+				['{', '}'],
+				['[', ']'],
+				['(', ')'],
+			]
+		}));
+
+		snippetService = new SimpleSnippetService([new Snippet(
+			['fooLang'],
+			'PSCustomObject',
+			'[PSCustomObject]',
+			'',
+			'[PSCustomObject] @{ Key = Value }',
+			'',
+			SnippetSource.User
+		)]);
+
+		const provider = new SnippetCompletionProvider(modeService, snippetService);
+
+		let model = createTextModel('[psc]', undefined, modeService.getLanguageIdentifier('fooLang'));
+		let result = await provider.provideCompletionItems(model, new Position(1, 5), context)!;
+
+		assert.strictEqual(result.suggestions.length, 1);
+		let [first] = result.suggestions;
+		assert.strictEqual((first.range as any).insert.endColumn, 5);
+		// This is 6 because it should eat the `]` at the end of the text even if cursor is before it
+		assert.strictEqual((first.range as any).replace.endColumn, 6);
 	});
 });
diff --git a/src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts b/src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts
index 76c12fa6a..db5f64070 100644
--- a/src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts
+++ b/src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts
@@ -49,7 +49,7 @@ class PartsSplash {
 	) {
 		lifecycleService.when(LifecyclePhase.Restored).then(_ => {
 			this._removePartsSplash();
-			perf.mark('didRemovePartsSplash');
+			perf.mark('code/didRemovePartsSplash');
 		});
 		Event.debounce(Event.any<any>(
 			onDidChangeFullscreen,
diff --git a/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
new file mode 100644
index 000000000..cebb545f5
--- /dev/null
+++ b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const GradleDependencyLooseRegex = /group\s*:\s*[\'\"](.*?)[\'\"]\s*,\s*name\s*:\s*[\'\"](.*?)[\'\"]\s*,\s*version\s*:\s*[\'\"](.*?)[\'\"]/g;
+export const GradleDependencyCompactRegex = /[\'\"]([^\'\"\s]*?)\:([^\'\"\s]*?)\:([^\'\"\s]*?)[\'\"]/g;
+
+export const MavenDependenciesRegex = /<dependencies>([\s\S]*?)<\/dependencies>/g;
+export const MavenDependencyRegex = /<dependency>([\s\S]*?)<\/dependency>/g;
+export const MavenGroupIdRegex = /<groupId>([\s\S]*?)<\/groupId>/;
+export const MavenArtifactIdRegex = /<artifactId>([\s\S]*?)<\/artifactId>/;
+
+export const JavaLibrariesToLookFor: { groupId: string, artifactId: string, tag: string }[] = [
+	// azure
+	{ 'groupId': 'com.microsoft.azure', 'artifactId': 'azure', 'tag': 'azure' },
+	{ 'groupId': 'com.microsoft.azure', 'artifactId': 'azure-mgmt-.*', 'tag': 'azure' },
+	{ 'groupId': 'com\\.microsoft\\.azure\\..*', 'artifactId': 'azure-mgmt-.*', 'tag': 'azure' },
+	// java ee
+	{ 'groupId': 'javax', 'artifactId': 'javaee-api', 'tag': 'javaee' },
+	{ 'groupId': 'javax.xml.bind', 'artifactId': 'jaxb-api', 'tag': 'javaee' },
+	// jdbc
+	{ 'groupId': 'mysql', 'artifactId': 'mysql-connector-java', 'tag': 'jdbc' },
+	{ 'groupId': 'com.microsoft.sqlserver', 'artifactId': 'mssql-jdbc', 'tag': 'jdbc' },
+	{ 'groupId': 'com.oracle.database.jdbc', 'artifactId': 'ojdbc10', 'tag': 'jdbc' },
+	// jpa
+	{ 'groupId': 'org.hibernate', 'artifactId': 'hibernate-core', 'tag': 'jpa' },
+	{ 'groupId': 'org.eclipse.persistence', 'artifactId': 'eclipselink', 'tag': 'jpa' },
+	// lombok
+	{ 'groupId': 'org.projectlombok', 'artifactId': 'lombok', 'tag': 'lombok' },
+	// mockito
+	{ 'groupId': 'org.mockito', 'artifactId': 'mockito-core', 'tag': 'mockito' },
+	{ 'groupId': 'org.powermock', 'artifactId': 'powermock-core', 'tag': 'mockito' },
+	// redis
+	{ 'groupId': 'org.springframework.data', 'artifactId': 'spring-data-redis', 'tag': 'redis' },
+	{ 'groupId': 'redis.clients', 'artifactId': 'jedis', 'tag': 'redis' },
+	{ 'groupId': 'org.redisson', 'artifactId': 'redisson', 'tag': 'redis' },
+	{ 'groupId': 'io.lettuce', 'artifactId': 'lettuce-core', 'tag': 'redis' },
+	// spring boot
+	{ 'groupId': 'org.springframework.boot', 'artifactId': '.*', 'tag': 'springboot' },
+	// sql
+	{ 'groupId': 'org.jooq', 'artifactId': 'jooq', 'tag': 'sql' },
+	{ 'groupId': 'org.mybatis', 'artifactId': 'mybatis', 'tag': 'sql' },
+	// unit test
+	{ 'groupId': 'org.junit.jupiter', 'artifactId': 'junit-jupiter-api', 'tag': 'unitTest' },
+	{ 'groupId': 'junit', 'artifactId': 'junit', 'tag': 'unitTest' },
+	{ 'groupId': 'org.testng', 'artifactId': 'testng', 'tag': 'unitTest' }
+];
diff --git a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
index bf203f81c..5eb62f3d0 100644
--- a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
+++ b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
@@ -15,6 +15,7 @@ import { IWorkspaceTagsService, Tags } from 'vs/workbench/contrib/tags/common/wo
 import { getHashedRemotesFromConfig } from 'vs/workbench/contrib/tags/electron-browser/workspaceTags';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { splitLines } from 'vs/base/common/strings';
+import { MavenArtifactIdRegex, MavenDependenciesRegex, MavenDependencyRegex, GradleDependencyCompactRegex, GradleDependencyLooseRegex, MavenGroupIdRegex, JavaLibrariesToLookFor } from 'vs/workbench/contrib/tags/common/javaWorkspaceTags';
 
 const MetaModulesToLookFor = [
 	// Azure packages
@@ -333,6 +334,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			tags['workspace.bower'] = nameSet.has('bower.json') || nameSet.has('bower_components');
 
 			tags['workspace.java.pom'] = nameSet.has('pom.xml');
+			tags['workspace.java.gradle'] = nameSet.has('build.gradle') || nameSet.has('settings.gradle');
 
 			tags['workspace.yeoman.code.ext'] = nameSet.has('vsc-extension-quickstart.md');
 
@@ -468,10 +470,71 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 					// Ignore errors when resolving file or parsing file contents
 				}
 			});
-			return Promise.all([...packageJsonPromises, ...requirementsTxtPromises, ...pipfilePromises]).then(() => tags);
+
+			const pomPromises = getFilePromises('pom.xml', this.fileService, this.textFileService, content => {
+				try {
+					let dependenciesContent;
+					while (dependenciesContent = MavenDependenciesRegex.exec(content.value)) {
+						let dependencyContent;
+						while (dependencyContent = MavenDependencyRegex.exec(dependenciesContent[1])) {
+							const groupIdContent = MavenGroupIdRegex.exec(dependencyContent[1]);
+							const artifactIdContent = MavenArtifactIdRegex.exec(dependencyContent[1]);
+							if (groupIdContent && artifactIdContent) {
+								this.tagJavaDependency(groupIdContent[1], artifactIdContent[1], 'workspace.pom.', tags);
+							}
+						}
+					}
+				}
+				catch (e) {
+					// Ignore errors when resolving maven dependencies
+				}
+			});
+
+			const gradlePromises = getFilePromises('build.gradle', this.fileService, this.textFileService, content => {
+				try {
+					this.processGradleDependencies(content.value, GradleDependencyLooseRegex, tags);
+					this.processGradleDependencies(content.value, GradleDependencyCompactRegex, tags);
+				}
+				catch (e) {
+					// Ignore errors when resolving gradle dependencies
+				}
+			});
+
+			const androidPromises = folders.map(workspaceUri => {
+				const manifest = URI.joinPath(workspaceUri, '/app/src/main/AndroidManifest.xml');
+				return this.fileService.exists(manifest).then(result => {
+					if (result) {
+						tags['workspace.java.android'] = true;
+					}
+				}, err => {
+					// Ignore errors when resolving android
+				});
+			});
+			return Promise.all([...packageJsonPromises, ...requirementsTxtPromises, ...pipfilePromises, ...pomPromises, ...gradlePromises, ...androidPromises]).then(() => tags);
 		});
 	}
 
+	private processGradleDependencies(content: string, regex: RegExp, tags: Tags): void {
+		let dependencyContent;
+		while (dependencyContent = regex.exec(content)) {
+			const groupId = dependencyContent[1];
+			const artifactId = dependencyContent[2];
+			if (groupId && artifactId) {
+				this.tagJavaDependency(groupId, artifactId, 'workspace.gradle.', tags);
+			}
+		}
+	}
+
+	private tagJavaDependency(groupId: string, artifactId: string, prefix: string, tags: Tags): void {
+		for (const javaLibrary of JavaLibrariesToLookFor) {
+			if ((groupId === javaLibrary.groupId || new RegExp(javaLibrary.groupId).test(groupId)) &&
+				(artifactId === javaLibrary.artifactId || new RegExp(javaLibrary.artifactId).test(artifactId))) {
+				tags[prefix + javaLibrary.tag] = true;
+				return;
+			}
+		}
+	}
+
 	private findFolders(): URI[] | undefined {
 		const folder = this.findFolder();
 		return folder && [folder];
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 64f74982d..5890d50f7 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -854,7 +854,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	}
 
 	private openDocumentation(): void {
-		this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?LinkId=733558'));
+		this.openerService.open(URI.parse('https://code.visualstudio.com/docs/editor/tasks#_defining-a-problem-matcher'));
 	}
 
 	public async build(): Promise<ITaskSummary> {
@@ -1250,7 +1250,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			if (editorConfig.editor.insertSpaces) {
 				content = content.replace(/(\n)(\t+)/g, (_, s1, s2) => s1 + ' '.repeat(s2.length * editorConfig.editor.tabSize));
 			}
-			promise = this.textFileService.create(workspaceFolder.toResource('.vscode/tasks.json'), content).then(() => { });
+			promise = this.textFileService.create([{ resource: workspaceFolder.toResource('.vscode/tasks.json'), value: content }]).then(() => { });
 		} else {
 			// We have a global task configuration
 			if ((index === -1) && properties) {
@@ -1977,7 +1977,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		await this.computeTasksForSingleConfig(workspaceFolder, configuration.config, runSource, custom, customizedTasks.byIdentifier, TaskConfig.TaskConfigSource.WorkspaceFile);
 		const engine = configuration.config ? TaskConfig.ExecutionEngine.from(configuration.config) : ExecutionEngine.Terminal;
 		if (engine === ExecutionEngine.Process) {
-			this.notificationService.warn(nls.localize('TaskSystem.versionWorkspaceFile', 'Only tasks version 2.0.0 permitted in .codeworkspace.'));
+			this.notificationService.warn(nls.localize('TaskSystem.versionWorkspaceFile', 'Only tasks version 2.0.0 permitted in workspace configuration files.'));
 			return this.emptyWorkspaceTaskResults(workspaceFolder);
 		}
 		return { workspaceFolder, set: { tasks: custom }, configurations: customizedTasks, hasErrors: configuration.hasParseErrors };
@@ -2822,8 +2822,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			}
 
 			if (!fileExists && content) {
-				return this.textFileService.create(resource, content).then((result): URI => {
-					return result.resource;
+				return this.textFileService.create([{ resource, value: content }]).then(result => {
+					return result[0].resource;
 				});
 			} else if (fileExists && (tasksExistInFile || content)) {
 				if (content) {
@@ -2866,7 +2866,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 		if (this.isTaskEntry(selection)) {
 			this.configureTask(selection.task);
-		} else if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
+		} else if (selection.folder && (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY)) {
 			this.openTaskFile(selection.folder.toResource('.vscode/tasks.json'), TaskSourceKind.Workspace);
 		} else {
 			const resource = this.getResourceForKind(TaskSourceKind.User);
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index b011e99c7..299b20f08 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -565,6 +565,12 @@ export class TerminalTaskSystem implements ITaskSystem {
 		}
 	}
 
+	private async acquireInput(taskSystemInfo: TaskSystemInfo | undefined, workspaceFolder: IWorkspaceFolder | undefined, task: CustomTask | ContributedTask, variables: Set<string>, alreadyResolved: Map<string, string>): Promise<ResolvedVariables | undefined> {
+		const resolved = await this.resolveVariablesFromSet(taskSystemInfo, workspaceFolder, task, variables, alreadyResolved);
+		this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.AcquiredInput, task));
+		return resolved;
+	}
+
 	private resolveVariablesFromSet(taskSystemInfo: TaskSystemInfo | undefined, workspaceFolder: IWorkspaceFolder | undefined, task: CustomTask | ContributedTask, variables: Set<string>, alreadyResolved: Map<string, string>): Promise<ResolvedVariables | undefined> {
 		let isProcess = task.command && task.command.runtime === RuntimeType.Process;
 		let options = task.command && task.command.options ? task.command.options : undefined;
@@ -658,7 +664,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 
 		let variables = new Set<string>();
 		this.collectTaskVariables(variables, task);
-		const resolvedVariables = this.resolveVariablesFromSet(systemInfo, workspaceFolder, task, variables, alreadyResolved);
+		const resolvedVariables = this.acquireInput(systemInfo, workspaceFolder, task, variables, alreadyResolved);
 
 		return resolvedVariables.then((resolvedVariables) => {
 			if (resolvedVariables && !this.isTaskEmpty(task)) {
@@ -697,8 +703,10 @@ export class TerminalTaskSystem implements ITaskSystem {
 		});
 
 		if (!hasAllVariables) {
-			return this.resolveVariablesFromSet(lastTask.getVerifiedTask().systemInfo, lastTask.getVerifiedTask().workspaceFolder, task, variables, alreadyResolved).then((resolvedVariables) => {
+			return this.acquireInput(lastTask.getVerifiedTask().systemInfo, lastTask.getVerifiedTask().workspaceFolder, task, variables, alreadyResolved).then((resolvedVariables) => {
 				if (!resolvedVariables) {
+					// Allows the taskExecutions array to be updated in the extension host
+					this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.End, task));
 					return { exitCode: 0 };
 				}
 				this.currentTask.resolvedVariables = resolvedVariables;
diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
index f4d95ecf2..66db97d2f 100644
--- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
@@ -1206,7 +1206,7 @@ class ProblemPatternRegistryImpl implements IProblemPatternRegistry {
 
 	private fillDefaults(): void {
 		this.add('msCompile', {
-			regexp: /^(?:\s+\d+\>)?([^\s].*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\)\s*:\s+(error|warning|info)\s+(\w{1,2}\d+)\s*:\s*(.*)$/,
+			regexp: /^(?:\s+\d+\>)?([^\s].*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\)\s*:\s+(error|warning|info)\s+(\w+\d+)\s*:\s*(.*)$/,
 			kind: ProblemLocationKind.Location,
 			file: 1,
 			location: 2,
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
index a88910f48..f066f65d0 100644
--- a/src/vs/workbench/contrib/tasks/common/tasks.ts
+++ b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -1041,6 +1041,7 @@ export class TaskSorter {
 
 export const enum TaskEventKind {
 	DependsOnStarted = 'dependsOnStarted',
+	AcquiredInput = 'acquiredInput',
 	Start = 'start',
 	ProcessStarted = 'processStarted',
 	Active = 'active',
@@ -1080,7 +1081,7 @@ export const enum TaskRunSource {
 export namespace TaskEvent {
 	export function create(kind: TaskEventKind.ProcessStarted | TaskEventKind.ProcessEnded, task: Task, processIdOrExitCode?: number): TaskEvent;
 	export function create(kind: TaskEventKind.Start, task: Task, terminalId?: number, resolvedVariables?: Map<string, string>): TaskEvent;
-	export function create(kind: TaskEventKind.DependsOnStarted | TaskEventKind.Start | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.Terminated | TaskEventKind.End, task: Task): TaskEvent;
+	export function create(kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Start | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.Terminated | TaskEventKind.End, task: Task): TaskEvent;
 	export function create(kind: TaskEventKind.Changed): TaskEvent;
 	export function create(kind: TaskEventKind, task?: Task, processIdOrExitCodeOrTerminalId?: number, resolvedVariables?: Map<string, string>): TaskEvent {
 		if (task) {
diff --git a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
index 64fe0389f..3df8b8499 100644
--- a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
@@ -116,7 +116,7 @@ export class TaskService extends AbstractTaskService {
 			preferencesService,
 			viewDescriptorService,
 			logService);
-		this._register(lifecycleService.onBeforeShutdown(event => event.veto(this.beforeShutdown())));
+		this._register(lifecycleService.onBeforeShutdown(event => event.veto(this.beforeShutdown(), 'veto.tasks')));
 	}
 
 	protected getTaskSystem(): ITaskSystem {
diff --git a/src/vs/workbench/contrib/tasks/test/common/configuration.test.ts b/src/vs/workbench/contrib/tasks/test/common/configuration.test.ts
index 9e1ecd640..57ada139d 100644
--- a/src/vs/workbench/contrib/tasks/test/common/configuration.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/common/configuration.test.ts
@@ -1650,10 +1650,7 @@ suite('Tasks version 2.0.0', () => {
 });
 
 suite('Bugs / regression tests', () => {
-	test('Bug 19548', () => {
-		if (Platform.isLinux) {
-			return;
-		}
+	(Platform.isLinux ? test.skip : test)('Bug 19548', () => {
 		let external: ExternalTaskRunnerConfiguration = {
 			version: '0.1.0',
 			windows: {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
index 10c3aca94..e93fc0f74 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts
@@ -27,6 +27,7 @@ import { XTermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
 import { TerminalHover, ILinkHoverTargetOptions } from 'vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget';
 import { TerminalLink } from 'vs/workbench/contrib/terminal/browser/links/terminalLink';
 import { TerminalExternalLinkProviderAdapter } from 'vs/workbench/contrib/terminal/browser/links/terminalExternalLinkProviderAdapter';
+import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 
 export type XtermLinkMatcherHandler = (event: MouseEvent | undefined, link: string) => Promise<void>;
 export type XtermLinkMatcherValidationCallback = (uri: string, callback: (isValid: boolean) => void) => void;
@@ -53,7 +54,8 @@ export class TerminalLinkManager extends DisposableStore {
 		@IEditorService private readonly _editorService: IEditorService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IFileService private readonly _fileService: IFileService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITunnelService private readonly _tunnelService: ITunnelService
 	) {
 		super();
 
@@ -185,7 +187,10 @@ export class TerminalLinkManager extends DisposableStore {
 	}
 
 	private _handleHypertextLink(url: string): void {
-		this._openerService.open(url, { allowTunneling: !!(this._processManager && this._processManager.remoteAuthority) });
+		this._openerService.open(url, {
+			allowTunneling: !!(this._processManager && this._processManager.remoteAuthority),
+			allowContributedOpeners: true,
+		});
 	}
 
 	private async _handleProtocolLink(link: string): Promise<void> {
@@ -229,8 +234,33 @@ export class TerminalLinkManager extends DisposableStore {
 			}
 		}
 
-		// Use 'undefined' when uri is '' so the link displays correctly
-		return new MarkdownString(`[${label || nls.localize('followLink', "Follow Link")}](${uri || 'undefined'}) (${clickLabel})`, true);
+		let fallbackLabel: string;
+		if (this._tunnelService.canTunnel(URI.parse(uri))) {
+			fallbackLabel = nls.localize('followForwardedLink', "Follow Link using Forwarded Port");
+		} else {
+			fallbackLabel = nls.localize('followLink', "Follow Link");
+		}
+
+		const markdown = new MarkdownString('', true);
+		// Escapes markdown in label & uri
+		if (label) {
+			label = markdown.appendText(label).value;
+			markdown.value = '';
+		}
+		if (uri) {
+			uri = markdown.appendText(uri).value;
+			markdown.value = '';
+		}
+
+		label = label || fallbackLabel;
+		// Use the label when uri is '' so the link displays correctly
+		uri = uri || label;
+		// Although if there is a space in the uri, just replace it completely
+		if (/(\s|&nbsp;)/.test(uri)) {
+			uri = nls.localize('followLinkUrl', 'Link');
+		}
+
+		return markdown.appendMarkdown(`[${label}](${uri}) (${clickLabel})`);
 	}
 
 	private get osPath(): IPath {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts
index fb420ef52..c2910ec11 100644
--- a/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts
+++ b/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts
@@ -9,7 +9,7 @@ import { OperatingSystem } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { TerminalLink, OPEN_FILE_LABEL, FOLDER_IN_WORKSPACE_LABEL, FOLDER_NOT_IN_WORKSPACE_LABEL } from 'vs/workbench/contrib/terminal/browser/links/terminalLink';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { isEqualOrParent } from 'vs/base/common/resources';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
@@ -62,7 +62,8 @@ export class TerminalValidatedLocalLinkProvider extends TerminalBaseLinkProvider
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ICommandService private readonly _commandService: ICommandService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
-		@IHostService private readonly _hostService: IHostService
+		@IHostService private readonly _hostService: IHostService,
+		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService
 	) {
 		super();
 	}
@@ -183,7 +184,7 @@ export class TerminalValidatedLocalLinkProvider extends TerminalBaseLinkProvider
 	private _isDirectoryInsideWorkspace(uri: URI) {
 		const folders = this._workspaceContextService.getWorkspace().folders;
 		for (let i = 0; i < folders.length; i++) {
-			if (isEqualOrParent(uri, folders[i].uri)) {
+			if (this._uriIdentityService.extUri.isEqualOrParent(uri, folders[i].uri)) {
 				return true;
 			}
 		}
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
index d380061dd..8cbe2db25 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
@@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { ILogService } from 'vs/platform/log/common/log';
 import { IRemoteTerminalService, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { IRemoteTerminalProcessExecCommandEvent, IShellLaunchConfigDto, RemoteTerminalChannelClient, REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel';
-import { IProcessDataEvent, IRemoteTerminalAttachTarget, IShellLaunchConfig, ITerminalChildProcess, ITerminalConfigHelper, ITerminalDimensionsOverride, ITerminalLaunchError } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IProcessDataEvent, IRemoteTerminalAttachTarget, IShellLaunchConfig, ITerminalChildProcess, ITerminalConfigHelper, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalsLayoutInfoById } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 export class RemoteTerminalService extends Disposable implements IRemoteTerminalService {
@@ -69,6 +69,22 @@ export class RemoteTerminalService extends Disposable implements IRemoteTerminal
 			};
 		});
 	}
+
+	public setTerminalLayoutInfo(layout: ITerminalsLayoutInfoById): Promise<void> {
+		if (!this._remoteTerminalChannel) {
+			throw new Error(`Cannot call setActiveInstanceId when there is no remote`);
+		}
+
+		return this._remoteTerminalChannel.setTerminalLayoutInfo(layout);
+	}
+
+	public getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined> {
+		if (!this._remoteTerminalChannel) {
+			throw new Error(`Cannot call getActiveInstanceId when there is no remote`);
+		}
+
+		return this._remoteTerminalChannel.getTerminalLayoutInfo();
+	}
 }
 
 export class RemoteTerminalProcess extends Disposable implements ITerminalChildProcess {
@@ -115,7 +131,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		}
 	}
 
-	public async start(): Promise<ITerminalLaunchError | undefined> {
+	public async start(): Promise<ITerminalLaunchError | { remoteTerminalId: number } | undefined> {
 		// Fetch the environment to check shell permissions
 		const env = await this._remoteAgentService.getEnvironment();
 		if (!env) {
@@ -166,7 +182,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		}
 
 		this._startBarrier.open();
-		return undefined;
+		return { remoteTerminalId: this._remoteTerminalId };
 	}
 
 	public shutdown(immediate: boolean): void {
@@ -236,6 +252,17 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP
 		});
 	}
 
+	public acknowledgeDataEvent(charCount: number): void {
+		// Support flow control for server spawned processes
+		if (this._inReplay) {
+			return;
+		}
+
+		this._startBarrier.wait().then(_ => {
+			this._remoteTerminalChannel.sendCharCountToTerminalProcess(this._remoteTerminalId, charCount);
+		});
+	}
+
 	public async getInitialCwd(): Promise<string> {
 		await this._startBarrier.wait();
 		return this._remoteTerminalChannel.getTerminalInitialCwd(this._remoteTerminalId);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 1f58d65ea..cdf55b05f 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -7,7 +7,7 @@ import type { Terminal as XTermTerminal } from 'xterm';
 import type { SearchAddon as XTermSearchAddon } from 'xterm-addon-search';
 import type { Unicode11Addon as XTermUnicode11Addon } from 'xterm-addon-unicode11';
 import type { WebglAddon as XTermWebglAddon } from 'xterm-addon-webgl';
-import { IWindowsShellHelper, ITerminalConfigHelper, ITerminalChildProcess, IShellLaunchConfig, IDefaultShellAndArgsRequest, ISpawnExtHostProcessRequest, IStartExtensionTerminalRequest, IAvailableShellsRequest, ITerminalProcessExtHostProxy, ICommandTracker, INavigationMode, TitleEventSource, ITerminalDimensions, ITerminalLaunchError, ITerminalNativeWindowsDelegate, LinuxDistro, IRemoteTerminalAttachTarget } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IWindowsShellHelper, ITerminalConfigHelper, ITerminalChildProcess, IShellLaunchConfig, IDefaultShellAndArgsRequest, ISpawnExtHostProcessRequest, IStartExtensionTerminalRequest, IAvailableShellsRequest, ITerminalProcessExtHostProxy, ICommandTracker, INavigationMode, TitleEventSource, ITerminalDimensions, ITerminalLaunchError, ITerminalNativeWindowsDelegate, LinuxDistro, IRemoteTerminalAttachTarget, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ITerminalTabLayoutInfoById } from 'vs/workbench/contrib/terminal/common/terminal';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IProcessEnvironment, Platform } from 'vs/base/common/platform';
 import { Event } from 'vs/base/common/event';
@@ -58,16 +58,17 @@ export interface ITerminalTab {
 	title: string;
 	onDisposed: Event<ITerminalTab>;
 	onInstancesChanged: Event<void>;
-
 	focusPreviousPane(): void;
 	focusNextPane(): void;
 	resizePane(direction: Direction): void;
+	resizePanes(relativeSizes: number[]): void;
 	setActiveInstanceByIndex(index: number): void;
 	attachToElement(element: HTMLElement): void;
 	setVisible(visible: boolean): void;
 	layout(width: number, height: number): void;
 	addDisposable(disposable: IDisposable): void;
 	split(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
+	getLayoutInfo(isActive: boolean): ITerminalTabLayoutInfoById;
 }
 
 export const enum TerminalConnectionState {
@@ -186,11 +187,12 @@ export interface ITerminalService {
 
 export interface IRemoteTerminalService {
 	readonly _serviceBrand: undefined;
-
 	dispose(): void;
-
 	listTerminals(isInitialization?: boolean): Promise<IRemoteTerminalAttachTarget[]>;
 	createRemoteTerminalProcess(terminalId: number, shellLaunchConfig: IShellLaunchConfig, activeWorkspaceRootUri: URI | undefined, cols: number, rows: number, configHelper: ITerminalConfigHelper,): Promise<ITerminalChildProcess>;
+
+	setTerminalLayoutInfo(layout: ITerminalsLayoutInfoById): Promise<void>;
+	getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined>;
 }
 
 /**
@@ -261,6 +263,12 @@ export interface ITerminalInstance {
 	 */
 	processId: number | undefined;
 
+	/**
+	 * The id of a terminal on the remote server. Defined if this is a terminal created
+	 * by the RemoteTerminalService.
+	 */
+	readonly remoteTerminalId: number | undefined;
+
 	/**
 	 * An event that fires when the terminal instance's title changes.
 	 */
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
index e2c091ae9..6773ae9e4 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.web.contribution.ts
@@ -8,12 +8,12 @@ import { KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/co
 import { Registry } from 'vs/platform/registry/common/platform';
 import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { getTerminalShellConfiguration } from 'vs/workbench/contrib/terminal/common/terminalConfiguration';
+import { getNoDefaultTerminalShellConfiguration } from 'vs/workbench/contrib/terminal/common/terminalConfiguration';
 
 // Desktop shell configuration are registered in electron-browser as their default values rely
 // on process.env
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-configurationRegistry.registerConfiguration(getTerminalShellConfiguration());
+configurationRegistry.registerConfiguration(getNoDefaultTerminalShellConfiguration());
 
 // Register standard external terminal keybinding as integrated terminal when in web as the
 // external terminal is not available
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 63264f9ab..6946e83e3 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -6,7 +6,7 @@
 import { Action, IAction } from 'vs/base/common/actions';
 import { EndOfLinePreference } from 'vs/editor/common/model';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { TERMINAL_VIEW_ID, ITerminalConfigHelper, TitleEventSource, TERMINAL_COMMAND_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED, TERMINAL_ACTION_CATEGORY, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_NOT_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS, KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED, IRemoteTerminalAttachTarget } from 'vs/workbench/contrib/terminal/common/terminal';
+import { TERMINAL_VIEW_ID, ITerminalConfigHelper, TitleEventSource, TERMINAL_COMMAND_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED, TERMINAL_ACTION_CATEGORY, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_NOT_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS, KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED, IRemoteTerminalAttachTarget, KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { attachSelectBoxStyler, attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
@@ -750,7 +750,7 @@ export function registerTerminalActions() {
 				keybinding: {
 					primary: KeyMod.Shift | KeyCode.PageDown,
 					mac: { primary: KeyCode.PageDown },
-					when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
+					when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE.negate()),
 					weight: KeybindingWeight.WorkbenchContrib
 				},
 				precondition: KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED
@@ -810,7 +810,7 @@ export function registerTerminalActions() {
 				keybinding: {
 					primary: KeyMod.Shift | KeyCode.PageUp,
 					mac: { primary: KeyCode.PageUp },
-					when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
+					when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE.negate()),
 					weight: KeybindingWeight.WorkbenchContrib
 				},
 				precondition: KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED
@@ -1416,7 +1416,7 @@ export function registerTerminalActions() {
 					{
 						primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F,
 						when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED),
-						weight: KeybindingWeight.WorkbenchContrib
+						weight: KeybindingWeight.WorkbenchContrib + 50
 					}
 				],
 				precondition: KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 08dfc59ed..68be8ffb9 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -25,7 +25,7 @@ import { activeContrastBorder, scrollbarSliderActiveBackground, scrollbarSliderB
 import { ICssStyleCollector, IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { IShellLaunchConfig, ITerminalProcessManager, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, NEVER_MEASURE_RENDER_TIME_STORAGE_KEY, ProcessState, TERMINAL_VIEW_ID, IWindowsShellHelper, KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS, INavigationMode, TitleEventSource, DEFAULT_COMMANDS_TO_SKIP_SHELL, ITerminalLaunchError, IProcessDataEvent, ITerminalDimensionsOverride, SHOW_TERMINAL_CONFIG_PROMPT } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IShellLaunchConfig, ITerminalProcessManager, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, NEVER_MEASURE_RENDER_TIME_STORAGE_KEY, ProcessState, TERMINAL_VIEW_ID, IWindowsShellHelper, KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS, INavigationMode, TitleEventSource, DEFAULT_COMMANDS_TO_SKIP_SHELL, ITerminalLaunchError, IProcessDataEvent, ITerminalDimensionsOverride, TERMINAL_CREATION_COMMANDS, KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE } from 'vs/workbench/contrib/terminal/common/terminal';
 import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
 import { TerminalLinkManager } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkManager';
@@ -89,6 +89,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _wrapperElement: (HTMLElement & { xterm?: XTermTerminal }) | undefined;
 	private _xterm: XTermTerminal | undefined;
 	private _xtermCore: XTermCore | undefined;
+	private _xtermTypeAhead: TypeAheadAddon | undefined;
 	private _xtermSearch: SearchAddon | undefined;
 	private _xtermUnicode11: Unicode11Addon | undefined;
 	private _xtermElement: HTMLDivElement | undefined;
@@ -115,6 +116,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	private _timeoutDimension: dom.Dimension | undefined;
 
+	private hasHadInput: boolean;
+
 	public disableLayout: boolean;
 	public get id(): number { return this._id; }
 	public get cols(): number {
@@ -181,6 +184,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	public constructor(
 		private readonly _terminalFocusContextKey: IContextKey<boolean>,
 		private readonly _terminalShellTypeContextKey: IContextKey<string>,
+		private readonly _terminalAltBufferActiveContextKey: IContextKey<boolean>,
 		private readonly _configHelper: TerminalConfigHelper,
 		private _container: HTMLElement | undefined,
 		private _shellLaunchConfig: IShellLaunchConfig,
@@ -208,12 +212,15 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._isDisposed = false;
 		this._id = TerminalInstance._idCounter++;
 
+		this.hasHadInput = false;
+
 		this._titleReadyPromise = new Promise<string>(c => {
 			this._titleReadyComplete = c;
 		});
 
 		this._terminalHasTextContextKey = KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED.bindTo(this._contextKeyService);
 		this._terminalA11yTreeFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS.bindTo(this._contextKeyService);
+		this._terminalAltBufferActiveContextKey = KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE.bindTo(this._contextKeyService);
 		this.disableLayout = false;
 
 		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
@@ -231,7 +238,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		});
 
 		this.addDisposable(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('terminal.integrated') || e.affectsConfiguration('editor.fastScrollSensitivity') || e.affectsConfiguration('editor.mouseWheelScrollSensitivity')) {
+			if (e.affectsConfiguration('terminal.integrated') || e.affectsConfiguration('editor.fastScrollSensitivity') || e.affectsConfiguration('editor.mouseWheelScrollSensitivity') || e.affectsConfiguration('editor.multiCursorModifier')) {
 				this.updateConfig();
 				// HACK: Trigger another async layout to ensure xterm's CharMeasure is ready to use,
 				// this hack can be removed when https://github.com/xtermjs/xterm.js/issues/702 is
@@ -365,6 +372,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return TerminalInstance._lastKnownCanvasDimensions;
 	}
 
+	public get remoteTerminalId(): number | undefined { return this._processManager.remoteTerminalId; }
+
 	private async _getXtermConstructor(): Promise<typeof XTermTerminal> {
 		if (xtermConstructor) {
 			return xtermConstructor;
@@ -389,6 +398,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const editorOptions = this._configurationService.getValue<IEditorOptions>('editor');
 
 		const xterm = new Terminal({
+			altClickMovesCursor: config.altClickMovesCursor && editorOptions.multiCursorModifier === 'alt',
 			scrollback: config.scrollback,
 			theme: this._getXtermTheme(),
 			drawBoldTextInBrightColors: config.drawBoldTextInBrightColors,
@@ -423,6 +433,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._xterm.onLineFeed(() => this._onLineFeed());
 		this._xterm.onKey(e => this._onKey(e.key, e.domEvent));
 		this._xterm.onSelectionChange(async () => this._onSelectionChange());
+		this._xterm.buffer.onBufferChange(() => this._refreshAltBufferContextKey());
 
 		this._processManager.onProcessData(e => this._onProcessData(e));
 		this._xterm.onData(data => this._processManager.write(data));
@@ -458,8 +469,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 		}));
 
-		const typeaheadAddon = this._register(this._instantiationService.createInstance(TypeAheadAddon, this._processManager, this._configHelper));
-		this._xterm.loadAddon(typeaheadAddon);
+		this._xtermTypeAhead = this._register(this._instantiationService.createInstance(TypeAheadAddon, this._processManager, this._configHelper));
+		this._xterm.loadAddon(this._xtermTypeAhead);
 
 		return xterm;
 	}
@@ -518,12 +529,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			throw new Error('xterm elements not set after open');
 		}
 
-		// Check if custom Terminal title exists and set same
-		if (this._title.length > 0) {
-			xterm.textarea.setAttribute('aria-label', nls.localize('terminalTextBoxAriaLabelNumberAndTitle', "Terminal {0}, {1}", this._id, this._title));
-		} else {
-			xterm.textarea.setAttribute('aria-label', nls.localize('terminalTextBoxAriaLabel', "Terminal {0}", this._id));
-		}
+		this._setAriaLabel(xterm, this._id, this._title);
 
 		xterm.textarea.addEventListener('focus', () => this._onFocus.fire(this));
 		xterm.attachCustomKeyEventHandler((event: KeyboardEvent): boolean => {
@@ -544,15 +550,25 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				return false;
 			}
 
+			const SHOW_TERMINAL_CONFIG_PROMPT = 'terminal.integrated.showTerminalConfigPrompt';
+			const EXCLUDED_KEYS = ['RightArrow', 'LeftArrow', 'UpArrow', 'DownArrow', 'Space', 'Meta', 'Control', 'Shift', 'Alt', '', 'Delete', 'Backspace', 'Tab'];
+
+			// only keep track of input if prompt hasn't already been shown
+			if (this._storageService.getBoolean(SHOW_TERMINAL_CONFIG_PROMPT, StorageScope.GLOBAL, true) &&
+				!EXCLUDED_KEYS.includes(event.key) &&
+				!event.ctrlKey &&
+				!event.shiftKey &&
+				!event.altKey) {
+				this.hasHadInput = true;
+			}
+
 			// for keyboard events that resolve to commands described
 			// within commandsToSkipShell, either alert or skip processing by xterm.js
-			if (resolveResult && this._skipTerminalCommands.some(k => k === resolveResult.commandId) && !this._configHelper.config.sendKeybindingsToShell) {
+			if (resolveResult && resolveResult.commandId && this._skipTerminalCommands.some(k => k === resolveResult.commandId) && !this._configHelper.config.sendKeybindingsToShell) {
 				// don't alert when terminal is opened or closed
 				if (this._storageService.getBoolean(SHOW_TERMINAL_CONFIG_PROMPT, StorageScope.GLOBAL, true) &&
-					resolveResult.commandId !== 'workbench.action.terminal.toggleTerminal' &&
-					resolveResult.commandId !== 'workbench.action.terminal.new' &&
-					resolveResult.commandId !== 'workbench.action.togglePanel' &&
-					resolveResult.commandId !== 'workbench.action.terminal.focus') {
+					this.hasHadInput &&
+					!TERMINAL_CREATION_COMMANDS.includes(resolveResult.commandId)) {
 					this._notificationService.prompt(
 						Severity.Info,
 						nls.localize('configure terminal settings', "Some keybindings are dispatched to the workbench by default."),
@@ -761,6 +777,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this.notifyFindWidgetFocusChanged(false);
 	}
 
+	private _refreshAltBufferContextKey() {
+		this._terminalAltBufferActiveContextKey.set(!!(this._xterm && this._xterm.buffer.active === this._xterm.buffer.alternate));
+	}
+
 	public dispose(immediate?: boolean): void {
 		this._logService.trace(`terminalInstance#dispose (id: ${this.id})`);
 
@@ -815,6 +835,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	public focus(force?: boolean): void {
+		this._refreshAltBufferContextKey();
 		if (!this._xterm) {
 			return;
 		}
@@ -984,6 +1005,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			case 'pwsh.exe':
 				return WindowsShellType.PowerShell;
 			case 'bash.exe':
+			case 'git-cmd.exe':
 				return WindowsShellType.GitBash;
 			case 'wsl.exe':
 			case 'ubuntu.exe':
@@ -1003,7 +1025,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			this._xtermCore?.writeSync(ev.data);
 		} else {
 			const messageId = ++this._latestXtermWriteData;
-			this._xterm?.write(ev.data, () => this._latestXtermParseData = messageId);
+			this._xterm?.write(ev.data, () => {
+				this._latestXtermParseData = messageId;
+				if (this._shellLaunchConfig.flowControl) {
+					this._processManager.acknowledgeDataEvent(ev.data.length);
+				}
+			});
 		}
 	}
 
@@ -1144,9 +1171,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._pressAnyKeyToCloseListener?.dispose();
 		this._pressAnyKeyToCloseListener = undefined;
 
-		// Kill and clear up the process, making the process manager ready for a new process
-		this._processManager.dispose();
-
 		if (this._xterm) {
 			if (reset) {
 				this._xterm.reset();
@@ -1182,6 +1206,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// Set the new shell launch config
 		this._shellLaunchConfig = shell; // Must be done before calling _createProcess()
 
+		// Kill and clear up the process, making the process manager ready for a new process
+		this._processManager.dispose();
+
 		// Launch the process unless this is only a renderer.
 		// In the renderer only cases, we still need to set the title correctly.
 		const oldTitle = this._title;
@@ -1193,6 +1220,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 		this._processManager.onProcessData(data => this._onProcessData(data));
 		this._createProcess();
+
+		this._xtermTypeAhead?.reset(this._processManager);
 	}
 
 	public relaunch(): void {
@@ -1262,6 +1291,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	public updateConfig(): void {
 		const config = this._configHelper.config;
+		this._safeSetOption('altClickMovesCursor', config.altClickMovesCursor);
 		this._setCursorBlink(config.cursorBlinking);
 		this._setCursorStyle(config.cursorStyle);
 		this._setCursorWidth(config.cursorWidth);
@@ -1272,6 +1302,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._safeSetOption('fastScrollSensitivity', config.fastScrollSensitivity);
 		this._safeSetOption('scrollSensitivity', config.mouseWheelScrollSensitivity);
 		this._safeSetOption('macOptionIsMeta', config.macOptionIsMeta);
+		const editorOptions = this._configurationService.getValue<IEditorOptions>('editor');
+		this._safeSetOption('altClickMovesCursor', config.altClickMovesCursor && editorOptions.multiCursorModifier === 'alt');
 		this._safeSetOption('macOptionClickForcesSelection', config.macOptionClickForcesSelection);
 		this._safeSetOption('rightClickSelectsWord', config.rightClickBehavior === 'selectWord');
 		this._safeSetOption('wordSeparator', config.wordSeparators);
@@ -1458,6 +1490,16 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._shellType = shellType;
 	}
 
+	private _setAriaLabel(xterm: XTermTerminal | undefined, terminalId: number, title: string | undefined): void {
+		if (xterm) {
+			if (title && title.length > 0) {
+				xterm.textarea?.setAttribute('aria-label', nls.localize('terminalTextBoxAriaLabelNumberAndTitle', "Terminal {0}, {1}", terminalId, title));
+			} else {
+				xterm.textarea?.setAttribute('aria-label', nls.localize('terminalTextBoxAriaLabel', "Terminal {0}", terminalId));
+			}
+		}
+	}
+
 	public setTitle(title: string | undefined, eventSource: TitleEventSource): void {
 		if (!title) {
 			return;
@@ -1482,6 +1524,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const didTitleChange = title !== this._title;
 		this._title = title;
 		if (didTitleChange) {
+			this._setAriaLabel(this._xterm, this._id, this._title);
+
 			if (this._titleReadyComplete) {
 				this._titleReadyComplete(title);
 				this._titleReadyComplete = undefined;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
index c7069f89f..0be5cf88b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
@@ -34,6 +34,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 	public readonly onInput: Event<string> = this._onInput.event;
 	private readonly _onResize: Emitter<{ cols: number, rows: number }> = this._register(new Emitter<{ cols: number, rows: number }>());
 	public readonly onResize: Event<{ cols: number, rows: number }> = this._onResize.event;
+	private readonly _onAcknowledgeDataEvent = this._register(new Emitter<number>());
+	public readonly onAcknowledgeDataEvent: Event<number> = this._onAcknowledgeDataEvent.event;
 	private readonly _onShutdown = this._register(new Emitter<boolean>());
 	public readonly onShutdown: Event<boolean> = this._onShutdown.event;
 	private readonly _onRequestInitialCwd = this._register(new Emitter<void>());
@@ -139,6 +141,10 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		this._onResize.fire({ cols, rows });
 	}
 
+	public acknowledgeDataEvent(charCount: number): void {
+		this._onAcknowledgeDataEvent.fire(charCount);
+	}
+
 	public getInitialCwd(): Promise<string> {
 		return new Promise<string>(resolve => {
 			this._onRequestInitialCwd.fire();
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 5fbf29637..04bff8930 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -6,7 +6,7 @@
 import * as platform from 'vs/base/common/platform';
 import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { env as processEnv } from 'vs/base/common/process';
-import { ProcessState, ITerminalProcessManager, IShellLaunchConfig, ITerminalConfigHelper, ITerminalChildProcess, IBeforeProcessDataEvent, ITerminalEnvironment, ITerminalLaunchError, IProcessDataEvent, ITerminalDimensionsOverride } from 'vs/workbench/contrib/terminal/common/terminal';
+import { ProcessState, ITerminalProcessManager, IShellLaunchConfig, ITerminalConfigHelper, ITerminalChildProcess, IBeforeProcessDataEvent, ITerminalEnvironment, ITerminalLaunchError, IProcessDataEvent, ITerminalDimensionsOverride, FlowControlConstants } from 'vs/workbench/contrib/terminal/common/terminal';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
@@ -24,8 +24,9 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { Disposable } from 'vs/base/common/lifecycle';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { IEnvironmentVariableService, IMergedEnvironmentVariableCollection, IEnvironmentVariableInfo } from 'vs/workbench/contrib/terminal/common/environmentVariable';
-import { EnvironmentVariableInfoStale, EnvironmentVariableInfoChangesActive } from 'vs/workbench/contrib/terminal/browser/environmentVariableInfo';
+import { EnvironmentVariableInfoChangesActive, EnvironmentVariableInfoStale } from 'vs/workbench/contrib/terminal/browser/environmentVariableInfo';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { URI } from 'vs/base/common/uri';
 
 /** The amount of time to consider terminal errors to be related to the launch */
 const LAUNCHING_DURATION = 500;
@@ -64,6 +65,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 	private _initialCwd: string | undefined;
 	private _extEnvironmentVariableCollection: IMergedEnvironmentVariableCollection | undefined;
 	private _environmentVariableInfo: IEnvironmentVariableInfo | undefined;
+	private _ackDataBufferer: AckDataBufferer;
 
 	private readonly _onProcessReady = this._register(new Emitter<void>());
 	public get onProcessReady(): Event<void> { return this._onProcessReady.event; }
@@ -83,6 +85,8 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 	public get onEnvironmentVariableInfoChanged(): Event<IEnvironmentVariableInfo> { return this._onEnvironmentVariableInfoChange.event; }
 
 	public get environmentVariableInfo(): IEnvironmentVariableInfo | undefined { return this._environmentVariableInfo; }
+	private _remoteTerminalId: number | undefined;
+	public get remoteTerminalId(): number | undefined { return this._remoteTerminalId; }
 
 	constructor(
 		private readonly _terminalId: number,
@@ -109,6 +113,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			});
 		});
 		this.ptyProcessReady.then(async () => await this.getLatency());
+		this._ackDataBufferer = new AckDataBufferer(e => this._process?.acknowledgeDataEvent(e));
 	}
 
 	public dispose(immediate: boolean = false): void {
@@ -129,7 +134,10 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		rows: number,
 		isScreenReaderModeEnabled: boolean
 	): Promise<ITerminalLaunchError | undefined> {
+		shellLaunchConfig.flowControl = this._configHelper.config.flowControl;
 		if (shellLaunchConfig.isExtensionTerminal) {
+			// Flow control is not supported for extension terminals
+			shellLaunchConfig.flowControl = false;
 			this._processType = ProcessType.ExtensionTerminal;
 			this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, undefined, cols, rows, this._configHelper);
 		} else {
@@ -150,14 +158,19 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 				const userHomeUri = await this._pathService.userHome();
 				this.userHome = userHomeUri.path;
 				if (hasRemoteAuthority) {
-					const remoteEnv = await this._remoteAgentService.getEnvironment();
-					if (remoteEnv) {
-						this.userHome = remoteEnv.userHome.path;
-						this.os = remoteEnv.os;
-					}
+					this._remoteAgentService.getEnvironment().then(remoteEnv => {
+						if (remoteEnv) {
+							this.userHome = remoteEnv.userHome.path;
+							this.os = remoteEnv.os;
+						}
+					});
 				}
 
 				const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
+
+				// this is a copy of what the merged environment collection is on the remote side
+				await this._setupEnvVariableInfo(activeWorkspaceRootUri, shellLaunchConfig);
+
 				const enableRemoteAgentTerminals = this._configHelper.config.serverSpawn;
 				if (enableRemoteAgentTerminals) {
 					this._process = await this._remoteTerminalService.createRemoteTerminalProcess(this._terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, this._configHelper);
@@ -165,7 +178,10 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 					this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, activeWorkspaceRootUri, cols, rows, this._configHelper);
 				}
 			} else {
-				this._process = await this._launchProcess(shellLaunchConfig, cols, rows, this.userHome, isScreenReaderModeEnabled);
+				// Flow control is not needed for ptys hosted in the same process (ie. the electron
+				// renderer).
+				shellLaunchConfig.flowControl = false;
+				this._process = await this._launchLocalProcess(shellLaunchConfig, cols, rows, this.userHome, isScreenReaderModeEnabled);
 			}
 		}
 
@@ -208,15 +224,46 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			}
 		}, LAUNCHING_DURATION);
 
-		const error = await this._process.start();
-		if (error) {
-			return error;
+		const result = await this._process.start();
+		if (result && 'remoteTerminalId' in result) {
+			this._remoteTerminalId = result.remoteTerminalId;
+		} else if (result) {
+			// Error
+			return result;
 		}
 
 		return undefined;
 	}
 
-	private async _launchProcess(
+	// Fetch any extension environment additions and apply them
+	private async _setupEnvVariableInfo(activeWorkspaceRootUri: URI | undefined, shellLaunchConfig: IShellLaunchConfig): Promise<platform.IProcessEnvironment> {
+		const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
+		const lastActiveWorkspace = activeWorkspaceRootUri ? withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+		const envFromConfigValue = this._workspaceConfigurationService.inspect<ITerminalEnvironment | undefined>(`terminal.integrated.env.${platformKey}`);
+		const isWorkspaceShellAllowed = this._configHelper.checkWorkspaceShellPermissions();
+		this._configHelper.showRecommendations(shellLaunchConfig);
+		const baseEnv = this._configHelper.config.inheritEnv ? processEnv : await this._terminalInstanceService.getMainProcessParentEnv();
+		const env = terminalEnvironment.createTerminalEnvironment(shellLaunchConfig, envFromConfigValue, terminalEnvironment.createVariableResolver(lastActiveWorkspace, this._configurationResolverService), isWorkspaceShellAllowed, this._productService.version, this._configHelper.config.detectLocale, baseEnv);
+
+		if (!shellLaunchConfig.strictEnv) {
+			this._extEnvironmentVariableCollection = this._environmentVariableService.mergedCollection;
+			this._register(this._environmentVariableService.onDidChangeCollections(newCollection => this._onEnvironmentVariableCollectionChange(newCollection)));
+			// For remote terminals, this is a copy of the mergedEnvironmentCollection created on
+			// the remote side. Since the environment collection is synced between the remote and
+			// local sides immediately this is a fairly safe way of enabling the env var diffing and
+			// info widget. While technically these could differ due to the slight change of a race
+			// condition, the chance is minimal plus the impact on the user is also not that great
+			// if it happens - it's not worth adding plumbing to sync back the resolved collection.
+			this._extEnvironmentVariableCollection.applyToProcessEnvironment(env);
+			if (this._extEnvironmentVariableCollection.map.size > 0) {
+				this._environmentVariableInfo = new EnvironmentVariableInfoChangesActive(this._extEnvironmentVariableCollection);
+				this._onEnvironmentVariableInfoChange.fire(this._environmentVariableInfo);
+			}
+		}
+		return env;
+	}
+
+	private async _launchLocalProcess(
 		shellLaunchConfig: IShellLaunchConfig,
 		cols: number,
 		rows: number,
@@ -224,7 +271,6 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		isScreenReaderModeEnabled: boolean
 	): Promise<ITerminalChildProcess> {
 		const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
-		const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
 		const lastActiveWorkspace = activeWorkspaceRootUri ? withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
 		if (!shellLaunchConfig.executable) {
 			const defaultConfig = await this._terminalInstanceService.getDefaultShellAndArgs(false);
@@ -253,22 +299,8 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			this._configHelper.config.cwd,
 			this._logService
 		);
-		const envFromConfigValue = this._workspaceConfigurationService.inspect<ITerminalEnvironment | undefined>(`terminal.integrated.env.${platformKey}`);
-		const isWorkspaceShellAllowed = this._configHelper.checkWorkspaceShellPermissions();
-		this._configHelper.showRecommendations(shellLaunchConfig);
-		const baseEnv = this._configHelper.config.inheritEnv ? processEnv : await this._terminalInstanceService.getMainProcessParentEnv();
-		const env = terminalEnvironment.createTerminalEnvironment(shellLaunchConfig, envFromConfigValue, terminalEnvironment.createVariableResolver(lastActiveWorkspace, this._configurationResolverService), isWorkspaceShellAllowed, this._productService.version, this._configHelper.config.detectLocale, baseEnv);
 
-		// Fetch any extension environment additions and apply them
-		if (!shellLaunchConfig.strictEnv) {
-			this._extEnvironmentVariableCollection = this._environmentVariableService.mergedCollection;
-			this._register(this._environmentVariableService.onDidChangeCollections(newCollection => this._onEnvironmentVariableCollectionChange(newCollection)));
-			this._extEnvironmentVariableCollection.applyToProcessEnvironment(env);
-			if (this._extEnvironmentVariableCollection.map.size > 0) {
-				this._environmentVariableInfo = new EnvironmentVariableInfoChangesActive(this._extEnvironmentVariableCollection);
-				this._onEnvironmentVariableInfoChange.fire(this._environmentVariableInfo);
-			}
-		}
+		const env = await this._setupEnvVariableInfo(activeWorkspaceRootUri, shellLaunchConfig);
 
 		const useConpty = this._configHelper.config.windowsEnableConpty && !isScreenReaderModeEnabled;
 		return this._terminalInstanceService.createTerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, useConpty);
@@ -326,6 +358,10 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		return Promise.resolve(this._latency);
 	}
 
+	public acknowledgeDataEvent(charCount: number): void {
+		this._ackDataBufferer.ack(charCount);
+	}
+
 	private _onExit(exitCode: number | undefined): void {
 		this._process = null;
 
@@ -354,3 +390,20 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		this._onEnvironmentVariableInfoChange.fire(this._environmentVariableInfo);
 	}
 }
+
+class AckDataBufferer {
+	private _unsentCharCount: number = 0;
+
+	constructor(
+		private readonly _callback: (charCount: number) => void
+	) {
+	}
+
+	ack(charCount: number) {
+		this._unsentCharCount += charCount;
+		while (this._unsentCharCount > FlowControlConstants.CharCountAckSize) {
+			this._unsentCharCount -= FlowControlConstants.CharCountAckSize;
+			this._callback(FlowControlConstants.CharCountAckSize);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index f82474d5f..4eeb0bcfa 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { timeout } from 'vs/base/common/async';
+import { debounce } from 'vs/base/common/decorators';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { basename } from 'vs/base/common/path';
@@ -17,14 +18,13 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IPickOptions, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IViewDescriptorService, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
 import { TerminalConnectionState, IRemoteTerminalService, ITerminalExternalLinkProvider, ITerminalInstance, ITerminalService, ITerminalTab, TerminalShellType, WindowsShellType } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper';
 import { TerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminalInstance';
 import { TerminalTab } from 'vs/workbench/contrib/terminal/browser/terminalTab';
 import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
-import { IAvailableShellsRequest, IRemoteTerminalAttachTarget, IShellDefinition, IShellLaunchConfig, ISpawnExtHostProcessRequest, IStartExtensionTerminalRequest, ITerminalConfigHelper, ITerminalLaunchError, ITerminalNativeWindowsDelegate, ITerminalProcessExtHostProxy, KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_IS_OPEN, KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED, KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE, LinuxDistro, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IAvailableShellsRequest, IRemoteTerminalAttachTarget, IShellDefinition, IShellLaunchConfig, ISpawnExtHostProcessRequest, IStartExtensionTerminalRequest, ITerminalConfigHelper, ITerminalLaunchError, ITerminalNativeWindowsDelegate, ITerminalProcessExtHostProxy, ITerminalsLayoutInfoById, KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE, KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_IS_OPEN, KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED, KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE, LinuxDistro, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
 import { escapeNonWindowsPath } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -43,6 +43,7 @@ export class TerminalService implements ITerminalService {
 	private _isShuttingDown: boolean;
 	private _terminalFocusContextKey: IContextKey<boolean>;
 	private _terminalShellTypeContextKey: IContextKey<string>;
+	private _terminalAltBufferActiveContextKey: IContextKey<boolean>;
 	private _findWidgetVisible: IContextKey<boolean>;
 	private _terminalTabs: ITerminalTab[] = [];
 	private _backgroundedTerminalInstances: ITerminalInstance[] = [];
@@ -64,7 +65,7 @@ export class TerminalService implements ITerminalService {
 	private _configHelper: TerminalConfigHelper;
 	private _terminalContainer: HTMLElement | undefined;
 	private _nativeWindowsDelegate: ITerminalNativeWindowsDelegate | undefined;
-	private _remoteTerminalsInitialized: Promise<void> | undefined;
+	private _remoteTerminalsInitPromise: Promise<void> | undefined;
 	private _connectionState: TerminalConnectionState;
 
 	public get configHelper(): ITerminalConfigHelper { return this._configHelper; }
@@ -117,16 +118,16 @@ export class TerminalService implements ITerminalService {
 		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
 		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
 		@IRemoteTerminalService private readonly _remoteTerminalService: IRemoteTerminalService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService
+		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
 		this._activeTabIndex = 0;
 		this._isShuttingDown = false;
 		this._findState = new FindReplaceState();
-		lifecycleService.onBeforeShutdown(async event => event.veto(this._onBeforeShutdown()));
+		lifecycleService.onBeforeShutdown(async event => event.veto(this._onBeforeShutdown(), 'veto.terminal'));
 		lifecycleService.onShutdown(() => this._onShutdown());
 		this._terminalFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_FOCUS.bindTo(this._contextKeyService);
 		this._terminalShellTypeContextKey = KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE.bindTo(this._contextKeyService);
+		this._terminalAltBufferActiveContextKey = KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE.bindTo(this._contextKeyService);
 		this._findWidgetVisible = KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE.bindTo(this._contextKeyService);
 		this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper);
 		this.onTabDisposed(tab => this._removeTab(tab));
@@ -135,7 +136,6 @@ export class TerminalService implements ITerminalService {
 			this._onActiveInstanceChanged.fire(instance ? instance : undefined);
 		});
 		this.onInstanceLinksReady(instance => this._setInstanceLinkProviders(instance));
-
 		this._handleInstanceContextKeys();
 		this._processSupportContextKey = KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED.bindTo(this._contextKeyService);
 		this._processSupportContextKey.set(!isWeb || this._remoteAgentService.getConnection() !== null);
@@ -143,40 +143,78 @@ export class TerminalService implements ITerminalService {
 		const enableTerminalReconnection = this.configHelper.config.enablePersistentSessions;
 		const serverSpawn = this.configHelper.config.serverSpawn;
 		if (!!this._environmentService.remoteAuthority && enableTerminalReconnection && serverSpawn) {
-			this._remoteTerminalsInitialized = this._reconnectToRemoteTerminals();
+			this._remoteTerminalsInitPromise = this._reconnectToRemoteTerminals();
 			this._connectionState = TerminalConnectionState.Connecting;
 		} else {
 			this._connectionState = TerminalConnectionState.Connected;
+			this.attachRemoteListeners();
 		}
 	}
 
 	private async _reconnectToRemoteTerminals(): Promise<void> {
-		const remoteTerms = await this._remoteTerminalService.listTerminals(true);
-		const workspace = this._workspaceContextService.getWorkspace();
-		const unattachedWorkspaceRemoteTerms = remoteTerms
-			.filter(term => term.workspaceId === workspace.id)
-			.filter(term => !this.isAttachedToTerminal(term));
-
+		// Reattach to all remote terminals
+		const layoutInfo = await this._remoteTerminalService.getTerminalLayoutInfo();
+		let reconnectCounter = 0;
+		let activeTab: ITerminalTab | undefined;
+		if (layoutInfo) {
+			layoutInfo.tabs.forEach((tabLayout) => {
+				const terminalLayouts = tabLayout.terminals.filter(t => t.terminal && t.terminal.isOrphan);
+				if (terminalLayouts.length) {
+					reconnectCounter += terminalLayouts.length;
+					let terminalInstance: ITerminalInstance | undefined;
+					let tab: ITerminalTab | undefined;
+					terminalLayouts.forEach((terminalLayout) => {
+						if (!terminalInstance) {
+							// create tab and terminal
+							terminalInstance = this.createTerminal({ remoteAttach: terminalLayout.terminal! });
+							tab = this._getTabForInstance(terminalInstance);
+							if (tabLayout.isActive) {
+								activeTab = tab;
+							}
+						} else {
+							// add split terminals to this tab
+							this.splitInstance(terminalInstance, { remoteAttach: terminalLayout.terminal! });
+						}
+					});
+					const activeInstance = this.terminalInstances.find(t => t.shellLaunchConfig.remoteAttach?.pid === tabLayout.activeTerminalProcessId);
+					if (activeInstance) {
+						this.setActiveInstance(activeInstance);
+					}
+					tab?.resizePanes(tabLayout.terminals.map(terminal => terminal.relativeSize));
+				}
+			});
+			if (layoutInfo.tabs.length) {
+				this.setActiveTabByIndex(activeTab ? this.terminalTabs.indexOf(activeTab) : 0);
+			}
+		}
 		/* __GDPR__
 			"terminalReconnection" : {
 				"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 			}
 		 */
 		const data = {
-			count: unattachedWorkspaceRemoteTerms.length
+			count: reconnectCounter
 		};
 		this._telemetryService.publicLog('terminalReconnection', data);
-		if (unattachedWorkspaceRemoteTerms.length > 0) {
-			// Reattach to all remote terminals
-			for (let term of unattachedWorkspaceRemoteTerms) {
-				this.createTerminal({ remoteAttach: term });
-			}
-		}
-
 		this._connectionState = TerminalConnectionState.Connected;
+		// now that terminals have been restored,
+		// attach listeners to update remote when terminals are changed
+		this.attachRemoteListeners();
 		this._onDidChangeConnectionState.fire();
 	}
 
+	private attachRemoteListeners(): void {
+		this.onActiveTabChanged(() => {
+			this._updateRemoteState();
+		});
+		this.onActiveInstanceChanged(() => {
+			this._updateRemoteState();
+		});
+		this.onInstancesChanged(() => {
+			this._updateRemoteState();
+		});
+	}
+
 	public setNativeWindowsDelegate(delegate: ITerminalNativeWindowsDelegate): void {
 		this._nativeWindowsDelegate = delegate;
 	}
@@ -253,7 +291,7 @@ export class TerminalService implements ITerminalService {
 	}
 
 	private async _onBeforeShutdownAsync(): Promise<boolean> {
-		// veto if configured to show confirmation and the user choosed not to exit
+		// veto if configured to show confirmation and the user chose not to exit
 		const veto = await this._showTerminalCloseConfirmation();
 		if (!veto) {
 			this._isShuttingDown = true;
@@ -274,6 +312,16 @@ export class TerminalService implements ITerminalService {
 		return this._findState;
 	}
 
+	@debounce(500)
+	private _updateRemoteState(): void {
+		if (!!this._environmentService.remoteAuthority) {
+			const state: ITerminalsLayoutInfoById = {
+				tabs: this.terminalTabs.map(t => t.getLayoutInfo(t === this.getActiveTab()))
+			};
+			this._remoteTerminalService.setTerminalLayoutInfo(state);
+		}
+	}
+
 	private _removeTab(tab: ITerminalTab): void {
 		// Get the index of the tab and remove it from the list
 		const index = this._terminalTabs.indexOf(tab);
@@ -390,14 +438,14 @@ export class TerminalService implements ITerminalService {
 	}
 
 	public async initializeTerminals(): Promise<void> {
-		if (this._remoteTerminalsInitialized) {
-			await this._remoteTerminalsInitialized;
+		if (this._remoteTerminalsInitPromise) {
+			await this._remoteTerminalsInitPromise;
 
 			if (!this.terminalTabs.length) {
 				this.createTerminal(undefined);
 			}
-		} else if (!this._environmentService.remoteAuthority && this.terminalTabs.length === 0) {
-			// Local, just create a terminal
+		} else if (this.terminalTabs.length === 0) {
+			// Local window, or remote terminal reconnection is disabled, just create a terminal
 			this.createTerminal();
 		}
 	}
@@ -467,6 +515,7 @@ export class TerminalService implements ITerminalService {
 		}
 
 		const instance = tab.split(shellLaunchConfig);
+
 		this._initInstanceListeners(instance);
 		this._onInstancesChanged.fire();
 
@@ -479,7 +528,10 @@ export class TerminalService implements ITerminalService {
 		instance.addDisposable(instance.onTitleChanged(this._onInstanceTitleChanged.fire, this._onInstanceTitleChanged));
 		instance.addDisposable(instance.onProcessIdReady(this._onInstanceProcessIdReady.fire, this._onInstanceProcessIdReady));
 		instance.addDisposable(instance.onLinksReady(this._onInstanceLinksReady.fire, this._onInstanceLinksReady));
-		instance.addDisposable(instance.onDimensionsChanged(() => this._onInstanceDimensionsChanged.fire(instance)));
+		instance.addDisposable(instance.onDimensionsChanged(() => {
+			this._onInstanceDimensionsChanged.fire(instance);
+			this._updateRemoteState();
+		}));
 		instance.addDisposable(instance.onMaximumDimensionsChanged(() => this._onInstanceMaximumDimensionsChanged.fire(instance)));
 		instance.addDisposable(instance.onFocus(this._onActiveInstanceChanged.fire, this._onActiveInstanceChanged));
 	}
@@ -668,7 +720,14 @@ export class TerminalService implements ITerminalService {
 
 
 	public createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
-		const instance = this._instantiationService.createInstance(TerminalInstance, this._terminalFocusContextKey, this._terminalShellTypeContextKey, this._configHelper, container, shellLaunchConfig);
+		const instance = this._instantiationService.createInstance(TerminalInstance,
+			this._terminalFocusContextKey,
+			this._terminalShellTypeContextKey,
+			this._terminalAltBufferActiveContextKey,
+			this._configHelper,
+			container,
+			shellLaunchConfig
+		);
 		this._onInstanceCreated.fire(instance);
 		return instance;
 	}
@@ -746,7 +805,7 @@ export class TerminalService implements ITerminalService {
 		}
 	}
 
-	public setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void {
+	public async setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): Promise<void> {
 		this._configHelper.panelContainer = panelContainer;
 		this._terminalContainer = terminalContainer;
 		this._terminalTabs.forEach(tab => tab.attachToElement(terminalContainer));
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
index 6e8e1f58d..740a03e36 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTab.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IShellLaunchConfig, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { SplitView, Orientation, IView, Sizing } from 'vs/base/browser/ui/splitview/splitview';
@@ -100,6 +100,22 @@ class SplitPaneContainer extends Disposable {
 		}
 	}
 
+	public resizePanes(relativeSizes: number[]): void {
+		if (this._children.length <= 1) {
+			return;
+		}
+
+		// assign any extra size to last terminal
+		relativeSizes[relativeSizes.length - 1] += 1 - relativeSizes.reduce((totalValue, currentValue) => totalValue + currentValue, 0);
+		let totalSize = 0;
+		for (let i = 0; i < this._splitView.length; i++) {
+			totalSize += this._splitView.getViewSize(i);
+		}
+		for (let i = 0; i < this._splitView.length; i++) {
+			this._splitView.resizeView(i, totalSize * relativeSizes[i]);
+		}
+	}
+
 	private _addChild(instance: ITerminalInstance, index: number): void {
 		const child = new SplitPane(instance, this.orientation === Orientation.HORIZONTAL ? this._height : this._width);
 		child.orientation = this.orientation;
@@ -212,6 +228,7 @@ class SplitPane implements IView {
 export class TerminalTab extends Disposable implements ITerminalTab {
 	private _terminalInstances: ITerminalInstance[] = [];
 	private _splitPaneContainer: SplitPaneContainer | undefined;
+	private get splitPaneContainer(): SplitPaneContainer | undefined { return this._splitPaneContainer; }
 	private _tabElement: HTMLElement | undefined;
 	private _panelPosition: Position = Position.BOTTOM;
 	private _terminalLocation: ViewContainerLocation = ViewContainerLocation.Panel;
@@ -221,11 +238,12 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 	public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
 
+	private _initialRelativeSizes: number[] | undefined;
+
 	private readonly _onDisposed: Emitter<ITerminalTab> = this._register(new Emitter<ITerminalTab>());
 	public readonly onDisposed: Event<ITerminalTab> = this._onDisposed.event;
 	private readonly _onInstancesChanged: Emitter<void> = this._register(new Emitter<void>());
 	public readonly onInstancesChanged: Event<void> = this._onInstancesChanged.event;
-
 	constructor(
 		private _container: HTMLElement | undefined,
 		shellLaunchConfigOrInstance: IShellLaunchConfig | ITerminalInstance | undefined,
@@ -235,13 +253,10 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
-
 		if (shellLaunchConfigOrInstance) {
 			this.addInstance(shellLaunchConfigOrInstance);
 		}
-
 		this._activeInstanceIndex = 0;
-
 		if (this._container) {
 			this.attachToElement(this._container);
 		}
@@ -281,6 +296,22 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 		return this._terminalInstances[this._activeInstanceIndex];
 	}
 
+	public getLayoutInfo(isActive: boolean): ITerminalTabLayoutInfoById {
+		const isHorizontal = this.splitPaneContainer?.orientation === Orientation.HORIZONTAL;
+		const remoteInstances = this.terminalInstances.filter(instance => typeof instance.remoteTerminalId === 'number');
+		const totalSize = remoteInstances.map(instance => isHorizontal ? instance.cols : instance.rows).reduce((totalValue, currentValue) => totalValue + currentValue, 0);
+		return {
+			isActive: isActive,
+			activeTerminalProcessId: this.activeInstance?.processId || 0,
+			terminals: remoteInstances.map(t => {
+				return {
+					relativeSize: isHorizontal ? t.cols / totalSize : t.rows / totalSize,
+					terminal: t.remoteTerminalId!
+				};
+			})
+		};
+	}
+
 	private _initInstanceListeners(instance: ITerminalInstance): void {
 		instance.addDisposable(instance.onDisposed(instance => this._onInstanceDisposed(instance)));
 		instance.addDisposable(instance.onFocused(instance => this._setActiveInstance(instance)));
@@ -366,7 +397,6 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 			this._splitPaneContainer = newLocal;
 			this.terminalInstances.forEach(instance => this._splitPaneContainer!.split(instance));
 		}
-
 		this.setVisible(this._isVisible);
 	}
 
@@ -389,10 +419,6 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 	}
 
 	public split(shellLaunchConfig: IShellLaunchConfig): ITerminalInstance {
-		if (!this._container) {
-			throw new Error('Cannot split terminal that has not been attached');
-		}
-
 		const instance = this._terminalService.createInstance(undefined, shellLaunchConfig);
 		this._terminalInstances.splice(this._activeInstanceIndex + 1, 0, instance);
 		this._initInstanceListeners(instance);
@@ -415,15 +441,17 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 			const newPanelPosition = this._layoutService.getPanelPosition();
 			const newTerminalLocation = this._viewDescriptorService.getViewLocationById(TERMINAL_VIEW_ID)!;
 			const terminalPositionChanged = newPanelPosition !== this._panelPosition || newTerminalLocation !== this._terminalLocation;
-
 			if (terminalPositionChanged) {
 				const newOrientation = newTerminalLocation === ViewContainerLocation.Panel && newPanelPosition === Position.BOTTOM ? Orientation.HORIZONTAL : Orientation.VERTICAL;
 				this._splitPaneContainer.setOrientation(newOrientation);
 				this._panelPosition = newPanelPosition;
 				this._terminalLocation = newTerminalLocation;
 			}
-
 			this._splitPaneContainer.layout(width, height);
+			if (this._initialRelativeSizes && height > 0 && width > 0) {
+				this.resizePanes(this._initialRelativeSizes);
+				this._initialRelativeSizes = undefined;
+			}
 		}
 	}
 
@@ -450,4 +478,13 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 			this._splitPaneContainer.resizePane(this._activeInstanceIndex, direction, amount);
 		}
 	}
+
+	public resizePanes(relativeSizes: number[]): void {
+		if (!this._splitPaneContainer) {
+			this._initialRelativeSizes = relativeSizes;
+			return;
+		}
+
+		this._splitPaneContainer.resizePanes(relativeSizes);
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
index 5a9b02d8e..de5793f66 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
@@ -22,7 +22,7 @@ const HIDE_CURSOR = `${CSI}?25l`;
 const DELETE_CHAR = `${CSI}X`;
 const DELETE_REST_OF_LINE = `${CSI}K`;
 const CSI_STYLE_RE = /^\x1b\[[0-9;]*m/;
-const CSI_MOVE_RE = /^\x1b\[([0-9]*)(;[35])?O?([DC])/;
+const CSI_MOVE_RE = /^\x1b\[?([0-9]*)(;[35])?O?([DC])/;
 const NOT_WORD_RE = /[^a-z0-9]/i;
 
 const statsBufferSize = 24;
@@ -201,8 +201,10 @@ export interface IPrediction {
 
 	/**
 	 * Returns whether the given input is one expected by this prediction.
+	 * @param input reader for the input the PTY is giving
+	 * @param lookBehind the last successfully-made prediction, if any
 	 */
-	matches(input: StringReader): MatchResult;
+	matches(input: StringReader, lookBehind?: IPrediction): MatchResult;
 }
 
 class StringReader {
@@ -330,7 +332,8 @@ class TentativeBoundary implements IPrediction {
 		return '';
 	}
 
-	public rollback() {
+	public rollback(cursor: Cursor) {
+		this.inner.rollback(cursor);
 		return '';
 	}
 
@@ -389,7 +392,7 @@ class CharacterPrediction implements IPrediction {
 		return cursor.clone().moveTo(this.appliedAt.pos) + input;
 	}
 
-	public matches(input: StringReader) {
+	public matches(input: StringReader, lookBehind?: IPrediction) {
 		let startIndex = input.index;
 
 		// remove any styling CSI before checking the char
@@ -403,6 +406,14 @@ class CharacterPrediction implements IPrediction {
 			return MatchResult.Success;
 		}
 
+		if (lookBehind instanceof CharacterPrediction) {
+			// see #112842
+			const sillyZshOutcome = input.eatGradually(`\b${lookBehind.char}${this.char}`);
+			if (sillyZshOutcome !== MatchResult.Failure) {
+				return sillyZshOutcome;
+			}
+		}
+
 		input.index = startIndex;
 		return MatchResult.Failure;
 	}
@@ -703,6 +714,11 @@ export class PredictionTimeline {
 	 */
 	private showPredictions = false;
 
+	/**
+	 * The last successfully-made prediction.
+	 */
+	private lookBehind?: IPrediction;
+
 	private readonly addedEmitter = new Emitter<IPrediction>();
 	public readonly onPredictionAdded = this.addedEmitter.event;
 	private readonly failedEmitter = new Emitter<IPrediction>();
@@ -771,13 +787,13 @@ export class PredictionTimeline {
 		}
 
 		if (!this.expected.length) {
-			this.cursor = undefined;
+			this.clearPredictionState();
 			return input;
 		}
 
 		const buffer = this.getActiveBuffer();
 		if (!buffer) {
-			this.cursor = undefined;
+			this.clearPredictionState();
 			return input;
 		}
 
@@ -798,7 +814,7 @@ export class PredictionTimeline {
 			const { p: prediction, gen } = this.expected[0];
 			const cursor = this.getCursor(buffer);
 			let beforeTestReaderIndex = reader.index;
-			switch (prediction.matches(reader)) {
+			switch (prediction.matches(reader, this.lookBehind)) {
 				case MatchResult.Success:
 					// if the input character matches what the next prediction expected, undo
 					// the prediction and write the real character out.
@@ -811,6 +827,7 @@ export class PredictionTimeline {
 					}
 
 					this.succeededEmitter.fire(prediction);
+					this.lookBehind = prediction;
 					this.expected.shift();
 					break;
 				case MatchResult.Buffer:
@@ -829,8 +846,7 @@ export class PredictionTimeline {
 						// always restore the style if they modify it.
 						output += attributesToSeq(core(this.terminal)._inputHandler._curAttrData);
 					}
-					this.expected = [];
-					this.cursor = undefined;
+					this.clearPredictionState();
 					this.failedEmitter.fire(prediction);
 					break ReadLoop;
 			}
@@ -842,8 +858,7 @@ export class PredictionTimeline {
 		// reset the cursor
 		if (!reader.eof) {
 			output += reader.rest;
-			this.expected = [];
-			this.cursor = undefined;
+			this.clearPredictionState();
 		}
 
 		// If we passed a generation boundary, apply the current generation's predictions
@@ -878,6 +893,16 @@ export class PredictionTimeline {
 		return output;
 	}
 
+	/**
+	 * Clears any expected predictions and stored state. Should be called when
+	 * the pty gives us something we don't recognize.
+	 */
+	private clearPredictionState() {
+		this.expected = [];
+		this.cursor = undefined;
+		this.lookBehind = undefined;
+	}
+
 	/**
 	 * Appends a typeahead prediction.
 	 */
@@ -1199,7 +1224,7 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 	private typeaheadStyle?: TypeAheadStyle;
 	private typeaheadThreshold = this.config.config.localEchoLatencyThreshold;
 	private excludeProgramRe = compileExcludeRegexp(this.config.config.localEchoExcludePrograms);
-	protected lastRow?: { y: number; startingX: number; charState: CharPredictState };
+	protected lastRow?: { y: number; startingX: number; endingX: number; charState: CharPredictState };
 	protected timeline?: PredictionTimeline;
 	private terminalTitle = '';
 	public stats?: PredictionStats;
@@ -1210,7 +1235,7 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 	private clearPredictionDebounce?: IDisposable;
 
 	constructor(
-		private readonly processManager: ITerminalProcessManager,
+		private processManager: ITerminalProcessManager,
 		private readonly config: TerminalConfigHelper,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
@@ -1266,6 +1291,12 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 		}));
 	}
 
+	public reset(processManager: ITerminalProcessManager) {
+		this.lastRow = undefined;
+		this.processManager = processManager;
+		this._register(this.processManager.onBeforeProcessData(e => this.onBeforeProcessData(e)));
+	}
+
 	private deferClearingPredictions() {
 		if (!this.stats || !this.timeline) {
 			return;
@@ -1356,9 +1387,10 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 		// the user gave input, and mark all additions before that as tentative.
 		const actualY = buffer.baseY + buffer.cursorY;
 		if (actualY !== this.lastRow?.y) {
-			this.lastRow = { y: actualY, startingX: buffer.cursorX, charState: CharPredictState.Unknown };
+			this.lastRow = { y: actualY, startingX: buffer.cursorX, endingX: buffer.cursorX, charState: CharPredictState.Unknown };
 		} else {
 			this.lastRow.startingX = Math.min(this.lastRow.startingX, buffer.cursorX);
+			this.lastRow.endingX = Math.max(this.lastRow.endingX, this.timeline.getCursor(buffer).x);
 		}
 
 		const addLeftNavigating = (p: IPrediction) =>
@@ -1366,6 +1398,11 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 				? this.timeline!.addBoundary(buffer, new TentativeBoundary(p))
 				: this.timeline!.addPrediction(buffer, p);
 
+		const addRightNavigating = (p: IPrediction) =>
+			this.timeline!.getCursor(buffer).x >= this.lastRow!.endingX - 1
+				? this.timeline!.addBoundary(buffer, new TentativeBoundary(p))
+				: this.timeline!.addPrediction(buffer, p);
+
 		/** @see https://github.com/xtermjs/xterm.js/blob/1913e9512c048e3cf56bb5f5df51bfff6899c184/src/common/input/Keyboard.ts */
 		const reader = new StringReader(data);
 		while (reader.remaining > 0) {
@@ -1381,7 +1418,14 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 					flushOutput(this.timeline.terminal);
 				}
 
-				addLeftNavigating(new BackspacePrediction(this.timeline.terminal));
+				if (this.timeline!.getCursor(buffer).x <= this.lastRow!.startingX) {
+					this.timeline!.addBoundary(buffer, new TentativeBoundary(new BackspacePrediction(this.timeline.terminal)));
+				} else {
+					// Backspace decrements our ability to go right.
+					this.lastRow.endingX--;
+					this.timeline!.addPrediction(buffer, new BackspacePrediction(this.timeline.terminal));
+				}
+
 				continue;
 			}
 
@@ -1409,13 +1453,13 @@ export class TypeAheadAddon extends Disposable implements ITerminalAddon {
 				if (direction === CursorMoveDirection.Back) {
 					addLeftNavigating(p);
 				} else {
-					this.timeline.addPrediction(buffer, p);
+					addRightNavigating(p);
 				}
 				continue;
 			}
 
 			if (reader.eatStr(`${ESC}f`)) {
-				this.timeline.addPrediction(buffer, new CursorMovePrediction(CursorMoveDirection.Forwards, true, 1));
+				addRightNavigating(new CursorMovePrediction(CursorMoveDirection.Forwards, true, 1));
 				continue;
 			}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 2d2f0a1b2..df2a73c85 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -21,7 +21,7 @@ import { DataTransfers } from 'vs/base/browser/dnd';
 import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { ITerminalService, TerminalConnectionState } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
diff --git a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
index cc4de710a..7bb093357 100644
--- a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
+++ b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts
@@ -7,13 +7,13 @@ import { Event } from 'vs/base/common/event';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentVariableService, ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { serializeEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariableShared';
-import { ITerminalConfiguration, ITerminalEnvironment, ITerminalLaunchError, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IRawTerminalTabLayoutInfo, ITerminalConfiguration, ITerminalEnvironment, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ITerminalTabLayoutInfoById, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { SideBySideEditor, EditorResourceAccessor } from 'vs/workbench/common/editor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -53,6 +53,7 @@ export interface ICompleteTerminalConfiguration {
 	'terminal.integrated.inheritEnv': boolean;
 	'terminal.integrated.cwd': string;
 	'terminal.integrated.detectLocale': 'auto' | 'off' | 'on';
+	'terminal.flowControl': boolean;
 }
 
 export type ITerminalEnvironmentVariableCollections = [string, ISerializableEnvironmentVariableCollection][];
@@ -128,6 +129,15 @@ export interface IListTerminalsArgs {
 	isInitialization: boolean;
 }
 
+export interface ISetTerminalLayoutInfoArgs {
+	workspaceId: string;
+	tabs: ITerminalTabLayoutInfoById[];
+}
+
+export interface IGetTerminalLayoutInfoArgs {
+	workspaceId: string;
+}
+
 export interface IRemoteTerminalDescriptionDto {
 	id: number;
 	pid: number;
@@ -135,12 +145,20 @@ export interface IRemoteTerminalDescriptionDto {
 	cwd: string;
 	workspaceId: string;
 	workspaceName: string;
+	isOrphan: boolean;
 }
 
+export type ITerminalTabLayoutInfoDto = IRawTerminalTabLayoutInfo<IRemoteTerminalDescriptionDto>;
+
 export interface ITriggerTerminalDataReplayArguments {
 	id: number;
 }
 
+export interface ISendCharCountToTerminalProcessArguments {
+	id: number;
+	charCount: number;
+}
+
 export interface IRemoteTerminalProcessReadyEvent {
 	type: 'ready';
 	pid: number;
@@ -191,7 +209,7 @@ export class RemoteTerminalChannelClient {
 	constructor(
 		private readonly _remoteAuthority: string,
 		private readonly _channel: IChannel,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IWorkbenchConfigurationService private readonly _configurationService: IWorkbenchConfigurationService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@IConfigurationResolverService private readonly _resolverService: IConfigurationResolverService,
 		@IEnvironmentVariableService private readonly _environmentVariableService: IEnvironmentVariableService,
@@ -211,6 +229,9 @@ export class RemoteTerminalChannelClient {
 	}
 
 	public async createTerminalProcess(shellLaunchConfig: IShellLaunchConfigDto, activeWorkspaceRootUri: URI | undefined, shouldPersistTerminal: boolean, cols: number, rows: number, isWorkspaceShellAllowed: boolean): Promise<ICreateTerminalProcessResult> {
+		// Be sure to first wait for the remote configuration
+		await this._configurationService.whenRemoteConfigurationLoaded();
+
 		const terminalConfig = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION);
 		const configuration: ICompleteTerminalConfiguration = {
 			'terminal.integrated.automationShell.windows': this._readSingleTerminalConfiguration('terminal.integrated.automationShell.windows'),
@@ -228,6 +249,7 @@ export class RemoteTerminalChannelClient {
 			'terminal.integrated.inheritEnv': terminalConfig.inheritEnv,
 			'terminal.integrated.cwd': terminalConfig.cwd,
 			'terminal.integrated.detectLocale': terminalConfig.detectLocale,
+			'terminal.flowControl': terminalConfig.flowControl
 		};
 
 		// We will use the resolver service to resolve all the variables in the config / launch config
@@ -308,6 +330,13 @@ export class RemoteTerminalChannelClient {
 		return this._channel.call<void>('$sendInputToTerminalProcess', args);
 	}
 
+	public sendCharCountToTerminalProcess(id: number, charCount: number): Promise<void> {
+		const args: ISendCharCountToTerminalProcessArguments = {
+			id, charCount
+		};
+		return this._channel.call<void>('$sendCharCountToTerminalProcess', args);
+	}
+
 	public shutdownTerminalProcess(id: number, immediate: boolean): Promise<void> {
 		const args: IShutdownTerminalProcessArguments = {
 			id, immediate
@@ -359,4 +388,21 @@ export class RemoteTerminalChannelClient {
 		};
 		return this._channel.call<IRemoteTerminalDescriptionDto[]>('$listTerminals', args);
 	}
+
+	public setTerminalLayoutInfo(layout: ITerminalsLayoutInfoById): Promise<void> {
+		const workspace = this._workspaceContextService.getWorkspace();
+		const args: ISetTerminalLayoutInfoArgs = {
+			workspaceId: workspace.id,
+			tabs: layout.tabs
+		};
+		return this._channel.call<void>('$setTerminalLayoutInfo', args);
+	}
+
+	public getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined> {
+		const workspace = this._workspaceContextService.getWorkspace();
+		const args: IGetTerminalLayoutInfoArgs = {
+			workspaceId: workspace.id,
+		};
+		return this._channel.call<ITerminalsLayoutInfo>('$getTerminalLayoutInfo', args);
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index ef7ff2e50..a8d2a66e3 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -24,6 +24,8 @@ export const KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE_KEY = 'terminalShellType';
 /** A context key that is set to the detected shell for the most recently active terminal, this is set to the last known value when no terminals exist. */
 export const KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE = new RawContextKey<string>(KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE_KEY, undefined);
 
+export const KEYBINDING_CONTEXT_TERMINAL_ALT_BUFFER_ACTIVE = new RawContextKey<boolean>('terminalAltBufferActive', false);
+
 /** A context key that is set when the integrated terminal does not have focus. */
 export const KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED = KEYBINDING_CONTEXT_TERMINAL_FOCUS.toNegated();
 
@@ -50,11 +52,8 @@ export const KEYBINDING_CONTEXT_TERMINAL_PROCESS_SUPPORTED = new RawContextKey<b
 
 export const IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY = 'terminal.integrated.isWorkspaceShellAllowed';
 export const NEVER_MEASURE_RENDER_TIME_STORAGE_KEY = 'terminal.integrated.neverMeasureRenderTime';
-export const SHOW_TERMINAL_CONFIG_PROMPT = 'terminal.integrated.showTerminalConfigPrompt';
-// The creation of extension host terminals is delayed by this value (milliseconds). The purpose of
-// this delay is to allow the terminal instance to initialize correctly and have its ID set before
-// trying to create the corressponding object on the ext host.
-export const EXT_HOST_CREATION_DELAY = 100;
+
+export const TERMINAL_CREATION_COMMANDS = ['workbench.action.terminal.toggleTerminal', 'workbench.action.terminal.new', 'workbench.action.togglePanel', 'workbench.action.terminal.focus'];
 
 export const TerminalCursorStyle = {
 	BLOCK: 'block',
@@ -94,6 +93,7 @@ export interface ITerminalConfiguration {
 		osx: string[];
 		windows: string[];
 	};
+	altClickMovesCursor: boolean;
 	macOptionIsMeta: boolean;
 	macOptionClickForcesSelection: boolean;
 	rendererType: 'auto' | 'canvas' | 'dom' | 'experimentalWebgl';
@@ -141,6 +141,7 @@ export interface ITerminalConfiguration {
 	localEchoStyle: 'bold' | 'dim' | 'italic' | 'underlined' | 'inverted' | string;
 	serverSpawn: boolean;
 	enablePersistentSessions: boolean;
+	flowControl: boolean;
 }
 
 export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray<string> = ['vim', 'vi', 'nano', 'tmux'];
@@ -178,8 +179,33 @@ export interface IRemoteTerminalAttachTarget {
 	cwd: string;
 	workspaceId: string;
 	workspaceName: string;
+	isOrphan: boolean;
 }
 
+export interface IRawTerminalInstanceLayoutInfo<T> {
+	relativeSize: number;
+	terminal: T;
+}
+
+export type ITerminalInstanceLayoutInfoById = IRawTerminalInstanceLayoutInfo<number>;
+export type ITerminalInstanceLayoutInfo = IRawTerminalInstanceLayoutInfo<IRemoteTerminalAttachTarget>;
+
+export interface IRawTerminalTabLayoutInfo<T> {
+	isActive: boolean;
+	activeTerminalProcessId: number;
+	terminals: IRawTerminalInstanceLayoutInfo<T>[];
+}
+
+export type ITerminalTabLayoutInfoById = IRawTerminalTabLayoutInfo<number>;
+export type ITerminalTabLayoutInfo = IRawTerminalTabLayoutInfo<IRemoteTerminalAttachTarget | null>;
+
+export interface IRawTerminalsLayoutInfo<T> {
+	tabs: IRawTerminalTabLayoutInfo<T>[];
+}
+
+export type ITerminalsLayoutInfo = IRawTerminalsLayoutInfo<IRemoteTerminalAttachTarget | null>;
+export type ITerminalsLayoutInfoById = IRawTerminalsLayoutInfo<number>;
+
 export interface IShellLaunchConfig {
 	/**
 	 * The name of the terminal, if this is not set the name of the process will be used.
@@ -232,6 +258,11 @@ export interface IShellLaunchConfig {
 	 */
 	isExtensionTerminal?: boolean;
 
+	/**
+	 * A UUID generated by the extension host process for terminals created on the extension host process.
+	 */
+	extHostTerminalId?: string;
+
 	/**
 	 * This is a terminal that attaches to an already running remote terminal.
 	 */
@@ -260,6 +291,11 @@ export interface IShellLaunchConfig {
 	 * a terminal used to drive some VS Code feature.
 	 */
 	isFeatureTerminal?: boolean;
+
+	/**
+	 * Whether flow control is enabled for this terminal.
+	 */
+	flowControl?: boolean;
 }
 
 /**
@@ -337,6 +373,7 @@ export interface ITerminalProcessManager extends IDisposable {
 	readonly os: OperatingSystem | undefined;
 	readonly userHome: string | undefined;
 	readonly environmentVariableInfo: IEnvironmentVariableInfo | undefined;
+	readonly remoteTerminalId: number | undefined;
 
 	readonly onProcessReady: Event<void>;
 	readonly onBeforeProcessData: Event<IBeforeProcessDataEvent>;
@@ -351,6 +388,7 @@ export interface ITerminalProcessManager extends IDisposable {
 	createProcess(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number, isScreenReaderModeEnabled: boolean): Promise<ITerminalLaunchError | undefined>;
 	write(data: string): void;
 	setDimensions(cols: number, rows: number): void;
+	acknowledgeDataEvent(charCount: number): void;
 
 	getInitialCwd(): Promise<string>;
 	getCwd(): Promise<string>;
@@ -391,6 +429,7 @@ export interface ITerminalProcessExtHostProxy extends IDisposable {
 
 	onInput: Event<string>;
 	onResize: Event<{ cols: number, rows: number }>;
+	onAcknowledgeDataEvent: Event<number>;
 	onShutdown: Event<boolean>;
 	onRequestInitialCwd: Event<void>;
 	onRequestCwd: Event<void>;
@@ -467,7 +506,7 @@ export interface ITerminalChildProcess {
 	 * @returns undefined when the process was successfully started, otherwise an object containing
 	 * information on what went wrong.
 	 */
-	start(): Promise<ITerminalLaunchError | undefined>;
+	start(): Promise<ITerminalLaunchError | { remoteTerminalId: number } | undefined>;
 
 	/**
 	 * Shutdown the terminal process.
@@ -479,11 +518,42 @@ export interface ITerminalChildProcess {
 	input(data: string): void;
 	resize(cols: number, rows: number): void;
 
+	/**
+	 * Acknowledge a data event has been parsed by the terminal, this is used to implement flow
+	 * control to ensure remote processes to not get too far ahead of the client and flood the
+	 * connection.
+	 * @param charCount The number of characters being acknowledged.
+	 */
+	acknowledgeDataEvent(charCount: number): void;
+
 	getInitialCwd(): Promise<string>;
 	getCwd(): Promise<string>;
 	getLatency(): Promise<number>;
 }
 
+export const enum FlowControlConstants {
+	/**
+	 * The number of _unacknowledged_ chars to have been sent before the pty is paused in order for
+	 * the client to catch up.
+	 */
+	HighWatermarkChars = 100000,
+	/**
+	 * After flow control pauses the pty for the client the catch up, this is the number of
+	 * _unacknowledged_ chars to have been caught up to on the client before resuming the pty again.
+	 * This is used to attempt to prevent pauses in the flowing data; ideally while the pty is
+	 * paused the number of unacknowledged chars would always be greater than 0 or the client will
+	 * appear to stutter. In reality this balance is hard to accomplish though so heavy commands
+	 * will likely pause as latency grows, not flooding the connection is the important thing as
+	 * it's shared with other core functionality.
+	 */
+	LowWatermarkChars = 5000,
+	/**
+	 * The number characters that are accumulated on the client side before sending an ack event.
+	 * This must be less than or equal to LowWatermarkChars or the terminal max never unpause.
+	 */
+	CharCountAckSize = 5000
+}
+
 export const enum TERMINAL_COMMAND_ID {
 	FIND_NEXT = 'workbench.action.terminal.findNext',
 	FIND_PREVIOUS = 'workbench.action.terminal.findPrevious',
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index ed21243bf..3bb23da28 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -90,6 +90,11 @@ export const terminalConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: false
 		},
+		'terminal.integrated.altClickMovesCursor': {
+			description: localize('terminal.integrated.altClickMovesCursor', "If enabled, alt/option + click will reposition the prompt cursor to underneath the mouse when `#editor.multiCursorModifier#` is set to `'alt'` (the default value). This may not work reliably depending on your shell."),
+			type: 'boolean',
+			default: true
+		},
 		'terminal.integrated.copyOnSelection': {
 			description: localize('terminal.integrated.copyOnSelection', "Controls whether text selected in the terminal will be copied to the clipboard."),
 			type: 'boolean',
@@ -262,7 +267,7 @@ export const terminalConfiguration: IConfigurationNode = {
 			default: true
 		},
 		'terminal.integrated.allowMnemonics': {
-			markdownDescription: localize('terminal.integrated.allowMnemonics', "Whether to allow menubar mnemonics (eg. alt+f) to trigger the open the menubar. Note that this will cause all alt keystrokes will skip the shell when true. This does nothing on macOS."),
+			markdownDescription: localize('terminal.integrated.allowMnemonics', "Whether to allow menubar mnemonics (eg. alt+f) to trigger the open the menubar. Note that this will cause all alt keystrokes to skip the shell when true. This does nothing on macOS."),
 			type: 'boolean',
 			default: false
 		},
@@ -397,11 +402,16 @@ export const terminalConfiguration: IConfigurationNode = {
 			description: localize('terminal.integrated.enablePersistentSessions', "Experimental: persist terminal sessions for the workspace across window reloads. Currently only supported in VS Code Remote workspaces."),
 			type: 'boolean',
 			default: true
+		},
+		'terminal.integrated.flowControl': {
+			description: localize('terminal.integrated.flowControl', "Experimental: whether to enable flow control which will slow the program on the remote side to avoid flooding remote connections with terminal output. This setting has no effect for local terminals and terminals where the output/input is controlled by an extension. Changing this will only affect new terminals."),
+			type: 'boolean',
+			default: true
 		}
 	}
 };
 
-export function getTerminalShellConfiguration(getSystemShell?: (p: Platform) => string): IConfigurationNode {
+function getTerminalShellConfigurationStub(linux: string, osx: string, windows: string): IConfigurationNode {
 	return {
 		id: 'terminal',
 		order: 100,
@@ -409,29 +419,34 @@ export function getTerminalShellConfiguration(getSystemShell?: (p: Platform) =>
 		type: 'object',
 		properties: {
 			'terminal.integrated.shell.linux': {
-				markdownDescription:
-					getSystemShell
-						? localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", getSystemShell(Platform.Linux))
-						: localize('terminal.integrated.shell.linux.noDefault', "The path of the shell that the terminal uses on Linux. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+				markdownDescription: linux,
 				type: ['string', 'null'],
 				default: null
 			},
 			'terminal.integrated.shell.osx': {
-				markdownDescription:
-					getSystemShell
-						? localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on macOS (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", getSystemShell(Platform.Mac))
-						: localize('terminal.integrated.shell.osx.noDefault', "The path of the shell that the terminal uses on macOS. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+				markdownDescription: osx,
 				type: ['string', 'null'],
 				default: null
 			},
 			'terminal.integrated.shell.windows': {
-				markdownDescription:
-					getSystemShell
-						? localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", getSystemShell(Platform.Windows))
-						: localize('terminal.integrated.shell.windows.noDefault', "The path of the shell that the terminal uses on Windows. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+				markdownDescription: windows,
 				type: ['string', 'null'],
 				default: null
 			}
 		}
 	};
 }
+
+export function getNoDefaultTerminalShellConfiguration(): IConfigurationNode {
+	return getTerminalShellConfigurationStub(
+		localize('terminal.integrated.shell.linux.noDefault', "The path of the shell that the terminal uses on Linux. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+		localize('terminal.integrated.shell.osx.noDefault', "The path of the shell that the terminal uses on macOS. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."),
+		localize('terminal.integrated.shell.windows.noDefault', "The path of the shell that the terminal uses on Windows. [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration)."));
+}
+
+export async function getTerminalShellConfiguration(getSystemShell: (p: Platform) => Promise<string>): Promise<IConfigurationNode> {
+	return getTerminalShellConfigurationStub(
+		localize('terminal.integrated.shell.linux', "The path of the shell that the terminal uses on Linux (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", await getSystemShell(Platform.Linux)),
+		localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on macOS (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", await getSystemShell(Platform.Mac)),
+		localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows (default: {0}). [Read more about configuring the shell](https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration).", await getSystemShell(Platform.Windows)));
+}
diff --git a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
index 92dcbb35b..0af9ae950 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
@@ -237,12 +237,12 @@ export function escapeNonWindowsPath(path: string): string {
 	if (newPath.indexOf('\\') !== 0) {
 		newPath = newPath.replace(/\\/g, '\\\\');
 	}
-	if (!newPath && (newPath.indexOf('"') !== -1)) {
-		newPath = '\'' + newPath + '\'';
-	} else if (newPath.indexOf(' ') !== -1) {
+	if (newPath.indexOf(' ') !== -1) {
 		newPath = newPath.replace(/ /g, '\\ ');
 	}
-	return newPath;
+	const bannedChars = /[\`\$\|\&\>\~\#\!\^\*\;\<\"\']/g;
+	newPath = newPath.replace(bannedChars, '');
+	return `'${newPath}'`;
 }
 
 export type TerminalShellSetting = (
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts
index ca107b15e..0c11faaf0 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts
@@ -7,12 +7,12 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/electron-browser/terminalInstanceService';
-import { getSystemShell } from 'vs/workbench/contrib/terminal/node/terminal';
 import { TerminalNativeContribution } from 'vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { getTerminalShellConfiguration } from 'vs/workbench/contrib/terminal/common/terminalConfiguration';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { getSystemShell } from 'vs/base/node/shell';
 
 // This file contains additional desktop-only contributions on top of those in browser/
 
@@ -24,4 +24,5 @@ workbenchRegistry.registerWorkbenchContribution(TerminalNativeContribution, Life
 
 // Register configurations
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-configurationRegistry.registerConfiguration(getTerminalShellConfiguration(getSystemShell));
+
+getTerminalShellConfiguration(getSystemShell).then(config => configurationRegistry.registerConfiguration(config));
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
index 9618773c0..2692cf9e1 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
@@ -9,7 +9,6 @@ import { WindowsShellHelper } from 'vs/workbench/contrib/terminal/electron-brows
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProcessEnvironment, platform, Platform } from 'vs/base/common/platform';
 import { TerminalProcess } from 'vs/workbench/contrib/terminal/node/terminalProcess';
-import { getSystemShell } from 'vs/workbench/contrib/terminal/node/terminal';
 import type { Terminal as XTermTerminal } from 'xterm';
 import type { SearchAddon as XTermSearchAddon } from 'xterm-addon-search';
 import type { Unicode11Addon as XTermUnicode11Addon } from 'xterm-addon-unicode11';
@@ -22,6 +21,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ILogService } from 'vs/platform/log/common/log';
+import { getSystemShell } from 'vs/base/node/shell';
 
 let Terminal: typeof XTermTerminal;
 let SearchAddon: typeof XTermSearchAddon;
@@ -82,7 +82,7 @@ export class TerminalInstanceService implements ITerminalInstanceService {
 		return this._storageService.getBoolean(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, StorageScope.WORKSPACE, false);
 	}
 
-	public getDefaultShellAndArgs(useAutomationShell: boolean, platformOverride: Platform = platform): Promise<{ shell: string, args: string | string[] }> {
+	public async getDefaultShellAndArgs(useAutomationShell: boolean, platformOverride: Platform = platform): Promise<{ shell: string, args: string | string[] }> {
 		const isWorkspaceShellAllowed = this._isWorkspaceShellAllowed();
 		const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
 		let lastActiveWorkspace = activeWorkspaceRootUri ? this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) : undefined;
@@ -90,7 +90,7 @@ export class TerminalInstanceService implements ITerminalInstanceService {
 		const shell = getDefaultShell(
 			(key) => this._configurationService.inspect(key),
 			isWorkspaceShellAllowed,
-			getSystemShell(platformOverride),
+			await getSystemShell(platformOverride),
 			process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432'),
 			process.env.windir,
 			createVariableResolver(lastActiveWorkspace, this._configurationResolverService),
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts b/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts
index 495e9fccc..b510486ba 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts
@@ -52,10 +52,6 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 	}
 
 	private async _startMonitoringShell(): Promise<void> {
-		if (!windowsProcessTree) {
-			windowsProcessTree = await import('windows-process-tree');
-		}
-
 		if (this._isDisposed) {
 			return;
 		}
@@ -133,7 +129,10 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 		if (this._currentRequest) {
 			return this._currentRequest;
 		}
-		this._currentRequest = new Promise<string>(resolve => {
+		this._currentRequest = new Promise<string>(async resolve => {
+			if (!windowsProcessTree) {
+				windowsProcessTree = await import('windows-process-tree');
+			}
 			windowsProcessTree.getProcessTree(this._rootProcessId, (tree) => {
 				const name = this.traverseTree(tree);
 				this._currentRequest = undefined;
diff --git a/src/vs/workbench/contrib/terminal/node/terminal.ts b/src/vs/workbench/contrib/terminal/node/terminal.ts
index 4a006c386..ff36c4e63 100644
--- a/src/vs/workbench/contrib/terminal/node/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/node/terminal.ts
@@ -5,61 +5,11 @@
 
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
-import * as processes from 'vs/base/node/processes';
-import { readFile, fileExists, stat } from 'vs/base/node/pfs';
+import { readFile, fileExists, stat, lstat } from 'vs/base/node/pfs';
 import { LinuxDistro, IShellDefinition } from 'vs/workbench/contrib/terminal/common/terminal';
 import { coalesce } from 'vs/base/common/arrays';
 import { normalize, basename } from 'vs/base/common/path';
-
-/**
- * Gets the detected default shell for the _system_, not to be confused with VS Code's _default_
- * shell that the terminal uses by default.
- * @param p The platform to detect the shell of.
- */
-export function getSystemShell(p: platform.Platform, environment: platform.IProcessEnvironment = process.env as platform.IProcessEnvironment): string {
-	if (p === platform.Platform.Windows) {
-		if (platform.isWindows) {
-			return getSystemShellWindows(environment);
-		}
-		// Don't detect Windows shell when not on Windows
-		return processes.getWindowsShell(environment);
-	}
-	// Only use $SHELL for the current OS
-	if (platform.isLinux && p === platform.Platform.Mac || platform.isMacintosh && p === platform.Platform.Linux) {
-		return '/bin/bash';
-	}
-	return getSystemShellUnixLike(environment);
-}
-
-let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string | null = null;
-function getSystemShellUnixLike(environment: platform.IProcessEnvironment): string {
-	if (!_TERMINAL_DEFAULT_SHELL_UNIX_LIKE) {
-		let unixLikeTerminal = 'sh';
-		if (!platform.isWindows && environment.SHELL) {
-			unixLikeTerminal = environment.SHELL;
-			// Some systems have $SHELL set to /bin/false which breaks the terminal
-			if (unixLikeTerminal === '/bin/false') {
-				unixLikeTerminal = '/bin/bash';
-			}
-		}
-		if (platform.isWindows) {
-			unixLikeTerminal = '/bin/bash'; // for WSL
-		}
-		_TERMINAL_DEFAULT_SHELL_UNIX_LIKE = unixLikeTerminal;
-	}
-	return _TERMINAL_DEFAULT_SHELL_UNIX_LIKE;
-}
-
-let _TERMINAL_DEFAULT_SHELL_WINDOWS: string | null = null;
-function getSystemShellWindows(environment: platform.IProcessEnvironment): string {
-	if (!_TERMINAL_DEFAULT_SHELL_WINDOWS) {
-		const isAtLeastWindows10 = platform.isWindows && parseFloat(os.release()) >= 10;
-		const is32ProcessOn64Windows = environment.hasOwnProperty('PROCESSOR_ARCHITEW6432');
-		const powerShellPath = `${environment.windir}\\${is32ProcessOn64Windows ? 'Sysnative' : 'System32'}\\WindowsPowerShell\\v1.0\\powershell.exe`;
-		_TERMINAL_DEFAULT_SHELL_WINDOWS = isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell(environment);
-	}
-	return _TERMINAL_DEFAULT_SHELL_WINDOWS;
-}
+import { enumeratePowerShellInstallations } from 'vs/base/node/powershell';
 
 let detectedDistro = LinuxDistro.Unknown;
 if (platform.isLinux) {
@@ -109,8 +59,6 @@ async function detectAvailableWindowsShells(): Promise<IShellDefinition[]> {
 
 	const expectedLocations: { [key: string]: string[] } = {
 		'Command Prompt': [`${system32Path}\\cmd.exe`],
-		'Windows PowerShell': [`${system32Path}\\WindowsPowerShell\\v1.0\\powershell.exe`],
-		'PowerShell': [await getShellPathFromRegistry('pwsh')],
 		'WSL Bash': [`${system32Path}\\${useWSLexe ? 'wsl.exe' : 'bash.exe'}`],
 		'Git Bash': [
 			`${process.env['ProgramW6432']}\\Git\\bin\\bash.exe`,
@@ -125,6 +73,12 @@ async function detectAvailableWindowsShells(): Promise<IShellDefinition[]> {
 		// 	`${process.env['HOMEDRIVE']}\\cygwin\\bin\\bash.exe`
 		// ]
 	};
+
+	// Add all of the different kinds of PowerShells
+	for await (const pwshExe of enumeratePowerShellInstallations()) {
+		expectedLocations[pwshExe.displayName] = [pwshExe.exePath];
+	}
+
 	const promises: Promise<IShellDefinition | undefined>[] = [];
 	Object.keys(expectedLocations).forEach(key => promises.push(validateShellPaths(key, expectedLocations[key])));
 	const shells = await Promise.all(promises);
@@ -158,16 +112,22 @@ async function validateShellPaths(label: string, potentialPaths: string[]): Prom
 				path: current
 			};
 		}
-	} catch { /* noop */ }
+	} catch (e) {
+		// Also try using lstat as some symbolic links on Windows
+		// throw 'permission denied' using 'stat' but don't throw
+		// using 'lstat'
+		try {
+			const result = await lstat(normalize(current));
+			if (result.isFile() || result.isSymbolicLink()) {
+				return {
+					label,
+					path: current
+				};
+			}
+		}
+		catch (e) {
+			// noop
+		}
+	}
 	return validateShellPaths(label, potentialPaths);
 }
-
-async function getShellPathFromRegistry(shellName: string): Promise<string> {
-	const Registry = await import('vscode-windows-registry');
-	try {
-		const shellPath = Registry.GetStringRegKey('HKEY_LOCAL_MACHINE', `SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\${shellName}.exe`, '');
-		return shellPath ? shellPath : '';
-	} catch (error) {
-		return '';
-	}
-}
diff --git a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts
index 807489956..79bb093ca 100644
--- a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts
+++ b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts
@@ -7,10 +7,11 @@ import * as path from 'vs/base/common/path';
 import * as platform from 'vs/base/common/platform';
 import type * as pty from 'node-pty';
 import * as fs from 'fs';
+import * as os from 'os';
 import { Event, Emitter } from 'vs/base/common/event';
 import { getWindowsBuildNumber } from 'vs/workbench/contrib/terminal/node/terminal';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError } from 'vs/workbench/contrib/terminal/common/terminal';
+import { IShellLaunchConfig, ITerminalChildProcess, ITerminalDimensionsOverride, ITerminalLaunchError, FlowControlConstants } from 'vs/workbench/contrib/terminal/common/terminal';
 import { exec } from 'child_process';
 import { ILogService } from 'vs/platform/log/common/log';
 import { stat } from 'vs/base/node/pfs';
@@ -40,6 +41,9 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	private readonly _initialCwd: string;
 	private readonly _ptyOptions: pty.IPtyForkOptions | pty.IWindowsPtyForkOptions;
 
+	private _isPtyPaused: boolean = false;
+	private _unacknowledgedCharCount: number = 0;
+
 	public get exitMessage(): string | undefined { return this._exitMessage; }
 
 	private readonly _onProcessData = this._register(new Emitter<string>());
@@ -97,6 +101,8 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			}));
 		}
 	}
+	onProcessOverrideDimensions?: Event<ITerminalDimensionsOverride | undefined> | undefined;
+	onProcessResolvedShellLaunchConfig?: Event<IShellLaunchConfig> | undefined;
 
 	public async start(): Promise<ITerminalLaunchError | undefined> {
 		const results = await Promise.all([this._validateCwd(), this._validateExecutable()]);
@@ -161,6 +167,14 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			this.onProcessReady(() => c());
 		});
 		ptyProcess.onData(data => {
+			if (this._shellLaunchConfig.flowControl) {
+				this._unacknowledgedCharCount += data.length;
+				if (!this._isPtyPaused && this._unacknowledgedCharCount > FlowControlConstants.HighWatermarkChars) {
+					this._logService.trace(`Flow control: Pause (${this._unacknowledgedCharCount} > ${FlowControlConstants.HighWatermarkChars})`);
+					this._isPtyPaused = true;
+					ptyProcess.pause();
+				}
+			}
 			this._onProcessData.fire(data);
 			if (this._closeTimeout) {
 				clearTimeout(this._closeTimeout);
@@ -323,24 +337,59 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		}
 	}
 
+	public acknowledgeDataEvent(charCount: number): void {
+		if (!this._shellLaunchConfig.flowControl) {
+			return;
+		}
+		// Prevent lower than 0 to heal from errors
+		this._unacknowledgedCharCount = Math.max(this._unacknowledgedCharCount - charCount, 0);
+		this._logService.trace(`Flow control: Ack ${charCount} chars (unacknowledged: ${this._unacknowledgedCharCount})`);
+		if (this._isPtyPaused && this._unacknowledgedCharCount < FlowControlConstants.LowWatermarkChars) {
+			this._logService.trace(`Flow control: Resume (${this._unacknowledgedCharCount} < ${FlowControlConstants.LowWatermarkChars})`);
+			this._ptyProcess?.resume();
+			this._isPtyPaused = false;
+		}
+	}
+
+	public clearUnacknowledgedChars(): void {
+		if (!this._shellLaunchConfig.flowControl) {
+			return;
+		}
+
+		this._unacknowledgedCharCount = 0;
+		this._logService.trace(`Flow control: Cleared all unacknowledged chars, forcing resume`);
+		if (this._isPtyPaused) {
+			this._ptyProcess?.resume();
+			this._isPtyPaused = false;
+		}
+	}
+
 	public getInitialCwd(): Promise<string> {
 		return Promise.resolve(this._initialCwd);
 	}
 
 	public getCwd(): Promise<string> {
 		if (platform.isMacintosh) {
-			return new Promise<string>(resolve => {
-				if (!this._ptyProcess) {
-					resolve(this._initialCwd);
-					return;
-				}
-				this._logService.trace('IPty#pid');
-				exec('lsof -OPl -p ' + this._ptyProcess.pid + ' | grep cwd', (error, stdout, stderr) => {
-					if (stdout !== '') {
-						resolve(stdout.substring(stdout.indexOf('/'), stdout.length - 1));
+			// Disable cwd lookup on macOS Big Sur due to spawn blocking thread (darwin v20 is macOS
+			// Big Sur) https://github.com/Microsoft/vscode/issues/105446
+			const osRelease = os.release().split('.');
+			if (osRelease.length > 0 && parseInt(osRelease[0]) < 20) {
+				return new Promise<string>(resolve => {
+					if (!this._ptyProcess) {
+						resolve(this._initialCwd);
+						return;
 					}
+					this._logService.trace('IPty#pid');
+					exec('lsof -OPln -p ' + this._ptyProcess.pid + ' | grep cwd', (error, stdout, stderr) => {
+						if (!error && stdout !== '') {
+							resolve(stdout.substring(stdout.indexOf('/'), stdout.length - 1));
+						} else {
+							this._logService.error('lsof did not run successfully, it may not be on the $PATH?', error, stdout, stderr);
+							resolve(this._initialCwd);
+						}
+					});
 				});
-			});
+			}
 		}
 
 		if (platform.isLinux) {
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalTypeahead.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalTypeahead.test.ts
index 0814572f0..b7da5f08d 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalTypeahead.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalTypeahead.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { Terminal } from 'xterm';
+import { IBuffer, Terminal } from 'xterm';
 import { SinonStub, stub, useFakeTimers } from 'sinon';
 import { Emitter } from 'vs/base/common/event';
 import { CharPredictState, IPrediction, PredictionStats, TypeAheadAddon } from 'vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon';
@@ -14,6 +14,11 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 const CSI = `\x1b[`;
 
+const enum CursorMoveDirection {
+	Back = 'D',
+	Forwards = 'C',
+}
+
 suite('Workbench - Terminal Typeahead', () => {
 	suite('PredictionStats', () => {
 		let stats: PredictionStats;
@@ -123,6 +128,41 @@ suite('Workbench - Terminal Typeahead', () => {
 			assert.strictEqual(addon.stats?.accuracy, 1);
 		});
 
+		test('validates zsh prediction (#112842)', () => {
+			const t = createMockTerminal({ lines: ['hello|'] });
+			addon.activate(t.terminal);
+			t.onData('o');
+			expectProcessed('o', predictedHelloo);
+
+			t.onData('x');
+			expectProcessed('\box', [
+				`${CSI}?25l`, // hide cursor
+				`${CSI}2;8H`, // move cursor
+				'\box', // new data
+				`${CSI}2;9H`, // place cursor back at end of line
+				`${CSI}?25h`, // show cursor
+			].join(''));
+			assert.strictEqual(addon.stats?.accuracy, 1);
+		});
+
+		test('does not validate zsh prediction on differing lookbehindn (#112842)', () => {
+			const t = createMockTerminal({ lines: ['hello|'] });
+			addon.activate(t.terminal);
+			t.onData('o');
+			expectProcessed('o', predictedHelloo);
+
+			t.onData('x');
+			expectProcessed('\bqx', [
+				`${CSI}?25l`, // hide cursor
+				`${CSI}2;8H`, // move cursor cursor
+				`${CSI}X`, // delete character
+				`${CSI}0m`, // reset style
+				'\bqx', // new data
+				`${CSI}?25h`, // show cursor
+			].join(''));
+			assert.strictEqual(addon.stats?.accuracy, 0.5);
+		});
+
 		test('rolls back character prediction', () => {
 			const t = createMockTerminal({ lines: ['hello|'] });
 			addon.activate(t.terminal);
@@ -139,6 +179,61 @@ suite('Workbench - Terminal Typeahead', () => {
 			assert.strictEqual(addon.stats?.accuracy, 0);
 		});
 
+		test('handles left arrow when we hit the boundary', () => {
+			const t = createMockTerminal({ lines: ['|'] });
+			addon.activate(t.terminal);
+			addon.unlockNavigating();
+
+			const cursorXBefore = addon.getCursor(t.terminal.buffer.active)?.x!;
+			t.onData(`${CSI}${CursorMoveDirection.Back}`);
+			t.expectWritten('');
+
+			// Trigger rollback because we don't expect this data
+			onBeforeProcessData.fire({ data: 'xy' });
+
+			assert.strictEqual(
+				addon.getCursor(t.terminal.buffer.active)?.x,
+				// The cursor should not have changed because we've hit the
+				// boundary (start of prompt)
+				cursorXBefore);
+		});
+
+		test('handles right arrow when we hit the boundary', () => {
+			const t = createMockTerminal({ lines: ['|'] });
+			addon.activate(t.terminal);
+			addon.unlockNavigating();
+
+			const cursorXBefore = addon.getCursor(t.terminal.buffer.active)?.x!;
+			t.onData(`${CSI}${CursorMoveDirection.Forwards}`);
+			t.expectWritten('');
+
+			// Trigger rollback because we don't expect this data
+			onBeforeProcessData.fire({ data: 'xy' });
+
+			assert.strictEqual(
+				addon.getCursor(t.terminal.buffer.active)?.x,
+				// The cursor should not have changed because we've hit the
+				// boundary (end of prompt)
+				cursorXBefore);
+		});
+
+		test('internal cursor state is reset when all predictions are undone', () => {
+			const t = createMockTerminal({ lines: ['|'] });
+			addon.activate(t.terminal);
+			addon.unlockNavigating();
+
+			const cursorXBefore = addon.getCursor(t.terminal.buffer.active)?.x!;
+			t.onData(`${CSI}${CursorMoveDirection.Back}`);
+			t.expectWritten('');
+			addon.undoAllPredictions();
+
+			assert.strictEqual(
+				addon.getCursor(t.terminal.buffer.active)?.x,
+				// The cursor should not have changed because we've hit the
+				// boundary (start of prompt)
+				cursorXBefore);
+		});
+
 		test('restores cursor graphics mode', () => {
 			const t = createMockTerminal({
 				lines: ['hello|'],
@@ -217,7 +312,7 @@ suite('Workbench - Terminal Typeahead', () => {
 		test('restores old character after invalid backspace', () => {
 			const t = createMockTerminal({ lines: ['hel|lo'] });
 			addon.activate(t.terminal);
-			addon.unlockLeftNavigating();
+			addon.unlockNavigating();
 			t.onData('\x7F');
 			t.expectWritten(`${CSI}2;4H${CSI}X`);
 			expectProcessed('x', `${CSI}?25l${CSI}0ml${CSI}2;5H${CSI}0mx${CSI}?25h`);
@@ -278,15 +373,15 @@ suite('Workbench - Terminal Typeahead', () => {
 
 class TestTypeAheadAddon extends TypeAheadAddon {
 	public unlockMakingPredictions() {
-		this.lastRow = { y: 1, startingX: 100, charState: CharPredictState.Validated };
+		this.lastRow = { y: 1, startingX: 100, endingX: 100, charState: CharPredictState.Validated };
 	}
 
 	public lockMakingPredictions() {
 		this.lastRow = undefined;
 	}
 
-	public unlockLeftNavigating() {
-		this.lastRow = { y: 1, startingX: 1, charState: CharPredictState.Validated };
+	public unlockNavigating() {
+		this.lastRow = { y: 1, startingX: 1, endingX: 1, charState: CharPredictState.Validated };
 	}
 
 	public reevaluateNow() {
@@ -296,6 +391,14 @@ class TestTypeAheadAddon extends TypeAheadAddon {
 	public get isShowing() {
 		return !!this.timeline?.isShowingPredictions;
 	}
+
+	public undoAllPredictions() {
+		this.timeline?.undoAllPredictions();
+	}
+
+	public getCursor(buffer: IBuffer) {
+		return this.timeline?.getCursor(buffer);
+	}
 }
 
 function upcastPartial<T>(v: Partial<T>): T {
diff --git a/src/vs/workbench/contrib/terminal/test/node/terminalEnvironment.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
similarity index 97%
rename from src/vs/workbench/contrib/terminal/test/node/terminalEnvironment.test.ts
rename to src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
index 29a042b4e..a06b75e03 100644
--- a/src/vs/workbench/contrib/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
@@ -132,10 +132,7 @@ suite('Workbench - TerminalEnvironment', () => {
 			});
 		});
 
-		test('should add keys ignoring case on Windows', () => {
-			if (!platform.isWindows) {
-				return;
-			}
+		(!platform.isWindows ? test.skip : test)('should add keys ignoring case on Windows', () => {
 			const parent = {
 				a: 'b'
 			};
@@ -162,10 +159,7 @@ suite('Workbench - TerminalEnvironment', () => {
 			});
 		});
 
-		test('null values should delete keys from the parent env ignoring case on Windows', () => {
-			if (!platform.isWindows) {
-				return;
-			}
+		(!platform.isWindows ? test.skip : test)('null values should delete keys from the parent env ignoring case on Windows', () => {
 			const parent = {
 				a: 'b',
 				c: 'd'
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation.ts
new file mode 100644
index 000000000..e1858ddb9
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation.ts
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { Emitter } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
+import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { HierarchicalElement, HierarchicalFolder } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes';
+import { locationsEqual, TestLocationStore } from 'vs/workbench/contrib/testing/browser/explorerProjections/locationStore';
+import { NodeChangeList, NodeRenderDirective, NodeRenderFn, peersHaveChildren } from 'vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper';
+import { InternalTestItem, TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+
+/**
+ * Projection that lists tests in their traditional tree view.
+ */
+export class HierarchicalByLocationProjection extends Disposable implements ITestTreeProjection {
+	private readonly updateEmitter = new Emitter<void>();
+	private readonly changes = new NodeChangeList<HierarchicalElement | HierarchicalFolder>();
+	private readonly locations = new TestLocationStore<HierarchicalElement>();
+
+	/**
+	 * Map of item IDs to test item objects.
+	 */
+	protected readonly items = new Map<string, HierarchicalElement>();
+
+	/**
+	 * Root folders
+	 */
+	protected readonly folders = new Map<string, HierarchicalFolder>();
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onUpdate = this.updateEmitter.event;
+
+	constructor(listener: TestSubscriptionListener) {
+		super();
+		this._register(listener.onDiff(([folder, diff]) => this.applyDiff(folder, diff)));
+		this._register(listener.onFolderChange(this.applyFolderChange, this));
+
+		for (const [folder, collection] of listener.workspaceFolderCollections) {
+			for (const node of collection.all) {
+				this.storeItem(this.createItem(node, folder.folder));
+			}
+		}
+
+		for (const folder of this.folders.values()) {
+			this.changes.added(folder);
+		}
+	}
+
+	private applyFolderChange(evt: IWorkspaceFoldersChangeEvent) {
+		for (const folder of evt.removed) {
+			const existing = this.folders.get(folder.uri.toString());
+			if (existing) {
+				this.folders.delete(folder.uri.toString());
+				this.changes.removed(existing);
+			}
+			this.updateEmitter.fire();
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public getTestAtPosition(uri: URI, position: Position) {
+		return this.locations.getTestAtPosition(uri, position);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	private applyDiff(folder: IWorkspaceFolder, diff: TestsDiff) {
+		for (const op of diff) {
+			switch (op[0]) {
+				case TestDiffOpType.Add: {
+					const item = this.createItem(op[1], folder);
+					this.storeItem(item);
+					this.changes.added(item);
+					break;
+				}
+
+				case TestDiffOpType.Update: {
+					const item = op[1];
+					const existing = this.items.get(item.id);
+					if (!existing) {
+						break;
+					}
+
+					const locationChanged = !locationsEqual(existing.location, item.item.location);
+					if (locationChanged) { this.locations.remove(existing); }
+					existing.update(item, this.addUpdated);
+					if (locationChanged) { this.locations.add(existing); }
+					this.addUpdated(existing);
+					break;
+				}
+
+				case TestDiffOpType.Remove: {
+					const toRemove = this.items.get(op[1]);
+					if (!toRemove) {
+						break;
+					}
+
+					this.changes.removed(toRemove);
+
+					const queue: Iterable<HierarchicalElement>[] = [[toRemove]];
+					while (queue.length) {
+						for (const item of queue.pop()!) {
+							queue.push(this.unstoreItem(item));
+						}
+					}
+				}
+			}
+		}
+
+		if (diff.length !== 0) {
+			this.updateEmitter.fire();
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public applyTo(tree: ObjectTree<ITestTreeElement, FuzzyScore>) {
+		this.changes.applyTo(tree, this.renderNode, () => this.folders.values());
+	}
+
+	protected createItem(item: InternalTestItem, folder: IWorkspaceFolder): HierarchicalElement {
+		const parent = item.parent ? this.items.get(item.parent)! : this.getOrCreateFolderElement(folder);
+		return new HierarchicalElement(item, parent);
+	}
+
+	protected getOrCreateFolderElement(folder: IWorkspaceFolder) {
+		let f = this.folders.get(folder.uri.toString());
+		if (!f) {
+			f = new HierarchicalFolder(folder);
+			this.changes.added(f);
+			this.folders.set(folder.uri.toString(), f);
+		}
+
+		return f;
+	}
+
+	protected readonly addUpdated = (item: ITestTreeElement) => {
+		const cast = item as HierarchicalElement | HierarchicalFolder;
+		this.changes.updated(cast);
+	};
+
+	protected renderNode: NodeRenderFn<HierarchicalElement | HierarchicalFolder> = (node, recurse) => {
+		if (node.depth < 2 && !peersHaveChildren(node, () => this.folders.values())) {
+			return NodeRenderDirective.Concat;
+		}
+
+		return { element: node, incompressible: true, children: recurse(node.children) };
+	};
+
+	protected unstoreItem(item: HierarchicalElement) {
+		item.parentItem.children.delete(item);
+		this.items.delete(item.test.id);
+		this.locations.remove(item);
+		return item.children;
+	}
+
+	protected storeItem(item: HierarchicalElement) {
+		item.parentItem.children.add(item);
+		this.items.set(item.test.id, item);
+		this.locations.add(item);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName.ts
new file mode 100644
index 000000000..b263ca46c
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName.ts
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Iterable } from 'vs/base/common/iterator';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { ITestTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { HierarchicalByLocationProjection as HierarchicalByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation';
+import { HierarchicalElement, HierarchicalFolder } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes';
+import { NodeRenderDirective } from 'vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper';
+import { InternalTestItem } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+
+/**
+ * Type of test element in the list.
+ */
+export const enum ListElementType {
+	/** The element is a leaf test that should be shown in the list */
+	TestLeaf,
+	/** The element is not runnable, but doesn't have any nested leaf tests */
+	BranchWithLeaf,
+	/** The element has nested leaf tests */
+	BranchWithoutLeaf,
+	/** State not yet computed */
+	Unset,
+}
+
+/**
+ * Version of the HierarchicalElement that is displayed as a list.
+ */
+export class HierarchicalByNameElement extends HierarchicalElement {
+	public elementType: ListElementType = ListElementType.Unset;
+	public readonly isTestRoot = !this.actualParent;
+	public readonly actualChildren = new Set<HierarchicalByNameElement>();
+
+	public get description() {
+		let description: string | undefined;
+		for (let parent = this.actualParent; parent && !parent.isTestRoot; parent = parent.actualParent) {
+			description = description ? `${parent.label} › ${description}` : parent.label;
+		}
+
+		return description;
+	}
+
+	public get testId() {
+		return `hintest:${this.test.id}`;
+	}
+
+	/**
+	 * @param actualParent Parent of the item in the test heirarchy
+	 */
+	constructor(
+		internal: InternalTestItem,
+		parentItem: HierarchicalFolder | HierarchicalElement,
+		private readonly addUpdated: (n: ITestTreeElement) => void,
+		private readonly actualParent?: HierarchicalByNameElement,
+	) {
+		super(internal, parentItem);
+		actualParent?.addChild(this);
+		this.updateLeafTestState();
+	}
+
+	/**
+	 * @override
+	 */
+	public update(actual: InternalTestItem, addUpdated: (n: ITestTreeElement) => void) {
+		const wasRunnable = this.test.item.runnable;
+		super.update(actual, addUpdated);
+
+		if (this.test.item.runnable !== wasRunnable) {
+			this.updateLeafTestState();
+		}
+	}
+
+	/**
+	 * Should be called when the list element is removed.
+	 */
+	public remove() {
+		this.actualParent?.removeChild(this);
+	}
+
+	private removeChild(element: HierarchicalByNameElement) {
+		this.actualChildren.delete(element);
+		this.updateLeafTestState();
+	}
+
+	private addChild(element: HierarchicalByNameElement) {
+		this.actualChildren.add(element);
+		this.updateLeafTestState();
+	}
+
+	/**
+	 * Updates the test leaf state for this node. Should be called when a child
+	 * or this node is modified. Note that we never need to look at the children
+	 * here, the children will already be leaves, or not.
+	 */
+	private updateLeafTestState() {
+		const newType = Iterable.some(this.actualChildren, c => c.elementType !== ListElementType.BranchWithoutLeaf)
+			? ListElementType.BranchWithLeaf
+			: this.test.item.runnable
+				? ListElementType.TestLeaf
+				: ListElementType.BranchWithoutLeaf;
+
+		if (newType !== this.elementType) {
+			this.elementType = newType;
+			this.addUpdated(this);
+		}
+
+		this.actualParent?.updateLeafTestState();
+	}
+}
+
+/**
+ * Projection that shows tests in a flat list (grouped by provider). The only
+ * change is that, while creating the item, the item parent is set to the
+ * test root rather than the heirarchal parent.
+ */
+export class HierarchicalByNameProjection extends HierarchicalByLocationProjection {
+	constructor(listener: TestSubscriptionListener) {
+		super(listener);
+
+		const originalRenderNode = this.renderNode.bind(this);
+		this.renderNode = (node, recurse) => {
+			if (node instanceof HierarchicalByNameElement && node.elementType !== ListElementType.TestLeaf && !node.isTestRoot) {
+				return NodeRenderDirective.Concat;
+			}
+
+			return originalRenderNode(node, recurse);
+		};
+	}
+
+	/**
+	 * @override
+	 */
+	protected createItem(item: InternalTestItem, folder: IWorkspaceFolder): HierarchicalElement {
+		const parent = this.getOrCreateFolderElement(folder);
+		const actualParent = item.parent ? this.items.get(item.parent) as HierarchicalByNameElement : undefined;
+		for (const testRoot of parent.children) {
+			if (testRoot.test.providerId === item.providerId) {
+				return new HierarchicalByNameElement(item, testRoot, this.addUpdated, actualParent);
+			}
+		}
+
+		return new HierarchicalByNameElement(item, parent, this.addUpdated);
+	}
+
+	/**
+	 * @override
+	 */
+	protected unstoreItem(item: HierarchicalElement) {
+		const treeChildren = super.unstoreItem(item);
+		if (item instanceof HierarchicalByNameElement) {
+			item.remove();
+			return item.actualChildren;
+		}
+
+		return treeChildren;
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
new file mode 100644
index 000000000..07bd0d0c1
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes.ts
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Iterable } from 'vs/base/common/iterator';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { ITestTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { maxPriority, statePriority } from 'vs/workbench/contrib/testing/common/testingStates';
+import { InternalTestItem, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+
+/**
+ * Test tree element element that groups be hierarchy.
+ */
+export class HierarchicalElement implements ITestTreeElement {
+	public readonly children = new Set<HierarchicalElement>();
+	public computedState: TestRunState | undefined;
+	public readonly depth: number = this.parentItem.depth + 1;
+
+	public get treeId() {
+		return `hitest:${this.test.id}`;
+	}
+
+	public get label() {
+		return this.test.item.label;
+	}
+
+	public get state() {
+		return this.test.item.state.runState;
+	}
+
+	public get location() {
+		return this.test.item.location;
+	}
+
+	public get runnable(): Iterable<TestIdWithProvider> {
+		return this.test.item.runnable
+			? [{ providerId: this.test.providerId, testId: this.test.id }]
+			: Iterable.empty();
+	}
+
+	public get debuggable() {
+		return this.test.item.debuggable
+			? [{ providerId: this.test.providerId, testId: this.test.id }]
+			: Iterable.empty();
+	}
+
+	constructor(public readonly test: InternalTestItem, public readonly parentItem: HierarchicalFolder | HierarchicalElement) {
+		this.test = { ...test, item: { ...test.item } }; // clone since we Object.assign updatese
+	}
+
+	public update(actual: InternalTestItem, addUpdated: (n: ITestTreeElement) => void) {
+		const stateChange = actual.item.state.runState !== this.state;
+		Object.assign(this.test, actual);
+		if (stateChange) {
+			refreshComputedState(this, addUpdated);
+		}
+	}
+}
+
+/**
+ * Workspace folder in the hierarcha view.
+ */
+export class HierarchicalFolder implements ITestTreeElement {
+	public readonly children = new Set<HierarchicalElement>();
+	public readonly parentItem = null;
+	public readonly depth = 0;
+	public computedState: TestRunState | undefined;
+
+	public get treeId() {
+		return `hifolder:${this.folder.index}`;
+	}
+
+	public get runnable() {
+		return Iterable.concatNested(Iterable.map(this.children, c => c.runnable));
+	}
+
+	public get debuggable() {
+		return Iterable.concatNested(Iterable.map(this.children, c => c.debuggable));
+	}
+
+	constructor(private readonly folder: IWorkspaceFolder) { }
+
+	public get label() {
+		return this.folder.name;
+	}
+}
+
+/**
+ * Gets the computed state for the node.
+ */
+export const getComputedState = (node: ITestTreeElement) => {
+	if (node.computedState === undefined) {
+		node.computedState = node.state ?? TestRunState.Unset;
+		for (const child of node.children) {
+			node.computedState = maxPriority(node.computedState, getComputedState(child));
+		}
+	}
+
+	return node.computedState;
+};
+
+/**
+ * Refreshes the computed state for the node and its parents. Any changes
+ * elements cause `addUpdated` to be called.
+ */
+export const refreshComputedState = (node: ITestTreeElement, addUpdated: (n: ITestTreeElement) => void) => {
+	if (node.computedState === undefined) {
+		return;
+	}
+
+	const oldPriority = statePriority[node.computedState];
+	node.computedState = undefined;
+	const newState = getComputedState(node);
+	const newPriority = statePriority[getComputedState(node)];
+	if (newPriority === oldPriority) {
+		return;
+	}
+
+	addUpdated(node);
+	if (newPriority > oldPriority) {
+		// Update all parents to ensure they're at least this priority.
+		for (let parent = node.parentItem; parent; parent = parent.parentItem) {
+			const prev = parent.computedState;
+			if (prev !== undefined && statePriority[prev] >= newPriority) {
+				break;
+			}
+
+			parent.computedState = newState;
+			addUpdated(parent);
+		}
+	} else if (newPriority < oldPriority) {
+		// Re-render all parents of this node whose computed priority might have come from this node
+		for (let parent = node.parentItem; parent; parent = parent.parentItem) {
+			const prev = parent.computedState;
+			if (prev === undefined || statePriority[prev] > oldPriority) {
+				break;
+			}
+
+			parent.computedState = undefined;
+			parent.computedState = getComputedState(parent);
+			addUpdated(parent);
+		}
+	}
+};
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
new file mode 100644
index 000000000..78459dfe3
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/index.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { Event } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { InternalTestItem, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+
+/**
+ * Describes a rendering of tests in the explorer view. Different
+ * implementations of this are used for trees and lists, and groupings.
+ * Originally this was implemented as inline logic within the ViewModel and
+ * using a single IncrementalTestChangeCollector, but this became hairy
+ * with status projections.
+ */
+export interface ITestTreeProjection extends IDisposable {
+	/**
+	 * Event that fires when the projection changes.
+	 */
+	onUpdate: Event<void>;
+
+	/**
+	 * Gets the test at the given position in th editor. Should be fast,
+	 * since it is called on each cursor move.
+	 */
+	getTestAtPosition(uri: URI, position: Position): ITestTreeElement | undefined;
+
+	/**
+	 * Applies pending update to the tree.
+	 */
+	applyTo(tree: ObjectTree<ITestTreeElement, FuzzyScore>): void;
+}
+
+
+export interface ITestTreeElement {
+	/**
+	 * Computed element state. Will be set automatically if not initially provided.
+	 * The projection is responsible for clearing (or updating) this if it
+	 * becomes invalid.
+	 */
+	computedState: TestRunState | undefined;
+
+	readonly children: Set<ITestTreeElement>;
+
+	/**
+	 * Unique ID of the element in the tree.
+	 */
+	readonly treeId: string;
+
+	/**
+	 * Location of the test, if any.
+	 */
+	readonly location?: { uri: URI; range: ITextEditorSelection };
+
+	/**
+	 * Test item, if any.
+	 */
+	readonly test?: Readonly<InternalTestItem>;
+
+	/**
+	 * Tree description.
+	 */
+	readonly description?: string;
+
+	/**
+	 * Depth of the item in the tree.
+	 */
+	readonly depth: number;
+
+	/**
+	 * Tests that can be run using this tree item.
+	 */
+	readonly runnable: Iterable<TestIdWithProvider>;
+
+	/**
+	 * Tests that can be run using this tree item.
+	 */
+	readonly debuggable: Iterable<TestIdWithProvider>;
+
+	/**
+	 * State of of the tree item. Mostly used for deriving the computed state.
+	 */
+	readonly state?: TestRunState;
+	readonly label: string;
+	readonly parentItem: ITestTreeElement | null;
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/locationStore.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/locationStore.ts
new file mode 100644
index 000000000..747d62963
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/locationStore.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { findFirstInSorted } from 'vs/base/common/arrays';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { Location as ModeLocation } from 'vs/editor/common/modes';
+
+export const locationsEqual = (a: ModeLocation | undefined, b: ModeLocation | undefined) => {
+	if (a === undefined || b === undefined) {
+		return b === a;
+	}
+
+	return a.uri.toString() === b.uri.toString()
+		&& a.range.startLineNumber === b.range.startLineNumber
+		&& a.range.startColumn === b.range.startColumn
+		&& a.range.endLineNumber === b.range.endLineNumber
+		&& a.range.endColumn === b.range.endColumn;
+};
+
+/**
+ * Stores and looks up test-item-like-objects by their uri/range. Used to
+ * implement the 'reveal' action efficiently.
+ */
+export class TestLocationStore<T extends { location?: ModeLocation, depth: number }> {
+	private readonly itemsByUri = new Map<string, T[]>();
+
+	public getTestAtPosition(uri: URI, position: Position) {
+		const tests = this.itemsByUri.get(uri.toString());
+		if (!tests) {
+			return;
+		}
+
+		return tests.find(test => {
+			const range = test.location?.range;
+			return range
+				&& new Position(range.startLineNumber, range.startColumn).isBeforeOrEqual(position)
+				&& position.isBeforeOrEqual(new Position(
+					range.endLineNumber ?? range.startLineNumber,
+					range.endColumn ?? range.startColumn,
+				));
+		});
+	}
+
+	public remove(item: T, fromLocation = item.location) {
+		if (!fromLocation) {
+			return;
+		}
+
+		const key = fromLocation.uri.toString();
+		const arr = this.itemsByUri.get(key);
+		if (!arr) {
+			return;
+		}
+
+		for (let i = 0; i < arr.length; i++) {
+			if (arr[i] === item) {
+				arr.splice(i, 1);
+				return;
+			}
+		}
+	}
+
+	public add(item: T) {
+		if (!item.location) {
+			return;
+		}
+
+		const key = item.location.uri.toString();
+		const arr = this.itemsByUri.get(key);
+		if (!arr) {
+			this.itemsByUri.set(key, [item]);
+			return;
+		}
+
+		arr.splice(findFirstInSorted(arr, x => x.depth < item.depth), 0, item);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper.ts
new file mode 100644
index 000000000..7500b77cf
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IIdentityProvider } from 'vs/base/browser/ui/list/list';
+import { ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
+import { ITestTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+
+export const testIdentityProvider: IIdentityProvider<ITestTreeElement> = {
+	getId(element) {
+		return element.treeId;
+	}
+};
+
+/**
+ * Removes nodes from the set whose parents don't exist in the tree. This is
+ * useful to remove nodes that are queued to be updated or rendered, who will
+ * be rendered by a call to setChildren.
+ */
+export const pruneNodesWithParentsNotInTree = <T extends ITestTreeElement>(nodes: Set<T | null>, tree: ObjectTree<ITestTreeElement, any>) => {
+	for (const node of nodes) {
+		if (node && node.parentItem && !tree.hasElement(node.parentItem)) {
+			nodes.delete(node);
+		}
+	}
+};
+
+/**
+ * Returns whether there are any children for other nodes besides this one
+ * in the tree.
+ *
+ * This is used for omitting test provider nodes if there's only a single
+ * test provider in the workspace (the common case)
+ */
+export const peersHaveChildren = (node: ITestTreeElement, roots: () => Iterable<ITestTreeElement>) => {
+	for (const child of node.parentItem ? node.parentItem.children : roots()) {
+		if (child !== node && child.children.size) {
+			return true;
+		}
+	}
+
+	return false;
+};
+
+export const enum NodeRenderDirective {
+	/** Omit node and all its children */
+	Omit,
+	/** Concat children with parent */
+	Concat
+}
+
+export type NodeRenderFn<T> = (n: T, recurse: (items: Iterable<T>) => Iterable<ITreeElement<ITestTreeElement>>) =>
+	ITreeElement<ITestTreeElement> | NodeRenderDirective;
+
+const pruneNodesNotInTree = <T extends ITestTreeElement>(nodes: Set<T | null>, tree: ObjectTree<ITestTreeElement, any>) => {
+	for (const node of nodes) {
+		if (node && !tree.hasElement(node)) {
+			nodes.delete(node);
+		}
+	}
+};
+
+/**
+ * Helper to gather and bulk-apply tree updates.
+ */
+export class NodeChangeList<T extends ITestTreeElement & { children: Iterable<T>; parentItem: T | null; }> {
+	private changedParents = new Set<T | null>();
+	private updatedNodes = new Set<T>();
+	private omittedNodes = new WeakSet<T>();
+	private isFirstApply = true;
+
+	public updated(node: T) {
+		this.updatedNodes.add(node);
+	}
+
+	public removed(node: T) {
+		this.added(node);
+	}
+
+	public added(node: T) {
+		this.changedParents.add(this.getNearestNotOmittedParent(node));
+	}
+
+	public applyTo(
+		tree: ObjectTree<ITestTreeElement, any>,
+		renderNode: NodeRenderFn<T>,
+		roots: () => Iterable<T>,
+	) {
+		pruneNodesNotInTree(this.changedParents, tree);
+		pruneNodesNotInTree(this.updatedNodes, tree);
+
+		const diffDepth = this.isFirstApply ? Infinity : 0;
+		this.isFirstApply = false;
+
+		for (let parent of this.changedParents) {
+			while (parent && typeof renderNode(parent, () => []) !== 'object') {
+				parent = parent.parentItem;
+			}
+
+			if (parent === null || tree.hasElement(parent)) {
+				tree.setChildren(
+					parent,
+					this.renderNodeList(renderNode, parent === null ? roots() : parent.children),
+					{ diffIdentityProvider: testIdentityProvider, diffDepth },
+				);
+			}
+		}
+
+		for (const node of this.updatedNodes) {
+			if (tree.hasElement(node)) {
+				tree.rerender(node);
+			}
+		}
+
+		this.changedParents.clear();
+		this.updatedNodes.clear();
+	}
+
+	private getNearestNotOmittedParent(node: T | null) {
+		let parent = node && node.parentItem;
+		while (parent && this.omittedNodes.has(parent)) {
+			parent = parent.parentItem;
+		}
+
+		return parent;
+	}
+
+	private *renderNodeList(renderNode: NodeRenderFn<T>, nodes: Iterable<T>): Iterable<ICompressedTreeElement<ITestTreeElement>> {
+		for (const node of nodes) {
+			const rendered = renderNode(node, this.renderNodeList.bind(this, renderNode));
+			if (rendered === NodeRenderDirective.Omit) {
+				this.omittedNodes.add(node);
+			} else if (rendered === NodeRenderDirective.Concat) {
+				this.omittedNodes.add(node);
+				for (const nested of this.renderNodeList(renderNode, node.children)) {
+					yield nested;
+				}
+			} else {
+				this.omittedNodes.delete(node);
+				yield rendered;
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation.ts
new file mode 100644
index 000000000..ea6f7c791
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation.ts
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { Emitter } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { Iterable } from 'vs/base/common/iterator';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { Location as ModeLocation } from 'vs/editor/common/modes';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { locationsEqual, TestLocationStore } from 'vs/workbench/contrib/testing/browser/explorerProjections/locationStore';
+import { NodeChangeList, NodeRenderDirective, NodeRenderFn, peersHaveChildren } from 'vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper';
+import { StateElement } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateNodes';
+import { AbstractIncrementalTestCollection, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { isRunningState, statesInOrder } from 'vs/workbench/contrib/testing/common/testingStates';
+import { TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+
+interface IStatusTestItem extends IncrementalTestCollectionItem {
+	treeElements: Map<TestRunState, TestStateElement>;
+	previousState: TestRunState;
+	depth: number;
+	parentItem?: IStatusTestItem;
+	location?: ModeLocation;
+}
+
+type TreeElement = StateElement<TestStateElement> | TestStateElement;
+
+class TestStateElement implements ITestTreeElement {
+	public computedState = this.state;
+
+	public get treeId() {
+		return `sltest:${this.test.id}`;
+	}
+
+	public get label() {
+		return this.test.item.label;
+	}
+
+	public get location() {
+		return this.test.item.location;
+	}
+
+	public get runnable(): Iterable<TestIdWithProvider> {
+		// if this item is runnable and all its children are in the same state,
+		// we can run all of them in one go. This will eventually be true
+		// for leaf nodes, whose treeElements contain only their own state.
+		if (this.test.item.runnable && this.test.treeElements.size === 1) {
+			return [{ testId: this.test.id, providerId: this.test.providerId }];
+		}
+
+		return Iterable.concatNested(Iterable.map(this.children, c => c.runnable));
+	}
+
+	public get debuggable(): Iterable<TestIdWithProvider> {
+		// same logic as runnable above
+		if (this.test.item.debuggable && this.test.treeElements.size === 1) {
+			return [{ testId: this.test.id, providerId: this.test.providerId }];
+		}
+
+		return Iterable.concatNested(Iterable.map(this.children, c => c.debuggable));
+	}
+
+	public readonly depth = this.test.depth;
+	public readonly children = new Set<TestStateElement>();
+
+	constructor(
+		public readonly state: TestRunState,
+		public readonly test: IStatusTestItem,
+		public readonly parentItem: TestStateElement | StateElement<TestStateElement>,
+	) {
+		parentItem.children.add(this);
+	}
+
+	public remove() {
+		this.parentItem.children.delete(this);
+	}
+}
+
+/**
+ * Shows tests in a hierarchical way, but grouped by status. This is more
+ * complex than it may look at first glance, because nodes can appear in
+ * multiple places if they have children with different statuses.
+ */
+export class StateByLocationProjection extends AbstractIncrementalTestCollection<IStatusTestItem> implements ITestTreeProjection {
+	private readonly updateEmitter = new Emitter<void>();
+	private readonly changes = new NodeChangeList<TreeElement>();
+	private readonly locations = new TestLocationStore<IStatusTestItem>();
+	private readonly disposable = new DisposableStore();
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onUpdate = this.updateEmitter.event;
+
+	/**
+	 * Root elements for states in the tree.
+	 */
+	protected readonly stateRoots = new Map<TestRunState, StateElement<TestStateElement>>();
+
+	constructor(listener: TestSubscriptionListener) {
+		super();
+
+		this.disposable.add(listener.onDiff(([, diff]) => this.apply(diff)));
+
+		const firstDiff: TestsDiff = [];
+		for (const [, collection] of listener.workspaceFolderCollections) {
+			firstDiff.push(...collection.getReviverDiff());
+		}
+
+		this.apply(firstDiff);
+	}
+
+	/**
+	 * Frees listeners associated with the projection.
+	 */
+	public dispose() {
+		this.disposable.dispose();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public getTestAtPosition(uri: URI, position: Position) {
+		const item = this.locations.getTestAtPosition(uri, position);
+		if (!item) {
+			return undefined;
+		}
+
+		for (const state of statesInOrder) {
+			const element = item.treeElements.get(state);
+			if (element) {
+				return element;
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public applyTo(tree: ObjectTree<ITestTreeElement, FuzzyScore>) {
+		this.changes.applyTo(tree, this.renderNode, () => this.stateRoots.values());
+	}
+
+	private readonly renderNode: NodeRenderFn<TreeElement> = (node, recurse) => {
+		if (node.depth === 1 /* test provider */) {
+			if (node.children.size === 0) {
+				return NodeRenderDirective.Omit;
+			} else if (!peersHaveChildren(node, () => this.stateRoots.values())) {
+				return NodeRenderDirective.Concat;
+			}
+		}
+
+		return {
+			element: node,
+			children: recurse(node.children),
+		};
+	};
+
+	/**
+	 * @override
+	 */
+	protected createChangeCollector(): IncrementalChangeCollector<IStatusTestItem> {
+		return {
+			add: node => {
+				this.resolveNodesRecursive(node);
+				this.locations.add(node);
+			},
+			remove: (node, isNested) => {
+				this.locations.remove(node);
+
+				if (!isNested) {
+					for (const state of node.treeElements.keys()) {
+						this.pruneStateElements(node, state, true);
+					}
+				}
+			},
+			update: node => {
+				const isRunning = isRunningState(node.item.state.runState);
+				if (node.item.state.runState !== node.previousState) {
+					if (isRunning && node.treeElements.has(node.previousState)) {
+						node.treeElements.get(node.previousState)!.computedState = TestRunState.Running;
+					} else {
+						this.pruneStateElements(node, node.previousState);
+						this.resolveNodesRecursive(node);
+					}
+				} else if (!isRunning) {
+					const previous = node.treeElements.get(node.item.state.runState);
+					if (previous) {
+						previous.computedState = node.item.state.runState;
+					}
+				}
+
+				const locationChanged = !locationsEqual(node.location, node.item.location);
+				if (locationChanged) {
+					this.locations.remove(node);
+					node.location = node.item.location;
+					this.locations.add(node);
+				}
+
+				const treeNode = node.treeElements.get(node.previousState)!;
+				this.changes.updated(treeNode);
+			},
+			complete: () => {
+				this.updateEmitter.fire();
+			}
+		};
+	}
+
+	/**
+	 * Ensures tree nodes for the item state are present in the tree.
+	 */
+	protected resolveNodesRecursive(item: IStatusTestItem) {
+		const state = item.item.state.runState;
+		item.previousState = item.item.state.runState;
+
+		// Create a list of items until the current item who don't have a tree node for the status yet
+		let chain: IStatusTestItem[] = [];
+		for (let i: IStatusTestItem | undefined = item; i && !i.treeElements.has(state); i = i.parentItem) {
+			chain.push(i);
+		}
+
+		for (let i = chain.length - 1; i >= 0; i--) {
+			const item2 = chain[i];
+			// the loop would have stopped pushing parents when either it reaches
+			// the root, or it reaches a parent who already has a node for this state.
+			const parent = item2.parentItem?.treeElements.get(state) ?? this.getOrCreateStateElement(state);
+			const node = this.createElement(state, item2, parent);
+
+			item2.treeElements.set(state, node);
+			parent.children.add(node);
+
+			if (i === chain.length - 1) {
+				this.changes.added(node);
+			}
+		}
+	}
+
+	protected createElement(state: TestRunState, item: IStatusTestItem, parent: TreeElement) {
+		return new TestStateElement(state, item, parent);
+	}
+
+
+	/**
+	 * Recursively (from the leaf to the root) removes tree elements if there's
+	 * no children who have the given state left.
+	 *
+	 * Returns true if it resulted in a node being removed.
+	 */
+	protected pruneStateElements(item: IStatusTestItem | undefined, state: TestRunState, force = false) {
+		if (!item) {
+			const stateRoot = this.stateRoots.get(state);
+			if (stateRoot?.children.size === 0) {
+				this.changes.removed(stateRoot);
+				this.stateRoots.delete(state);
+				return true;
+			}
+
+			return false;
+		}
+
+		const node = item.treeElements.get(state);
+		if (!node) {
+			return false;
+		}
+
+		// Check to make sure we aren't in the state, and there's no child with the
+		// state. For the unset state, only show the node if it's a leaf or it
+		// has children in the unset state.
+		if (!force) {
+			if (item.item.state.runState === state && !(state === TestRunState.Unset && item.children.size > 0)) {
+				return false;
+			}
+
+			for (const childId of item.children) {
+				if (this.items.get(childId)?.treeElements.has(state)) {
+					return false;
+				}
+			}
+		}
+
+		// If so, proceed to deletion and recurse upwards.
+		item.treeElements.delete(state);
+		node.remove();
+
+		if (!this.pruneStateElements(item.parentItem, state)) {
+			this.changes.removed(node);
+		}
+
+		return true;
+	}
+
+	protected getOrCreateStateElement(state: TestRunState) {
+		let s = this.stateRoots.get(state);
+		if (!s) {
+			s = new StateElement(state);
+			this.changes.added(s);
+			this.stateRoots.set(state, s);
+		}
+
+		return s;
+	}
+
+	protected createItem(item: InternalTestItem, parentItem?: IStatusTestItem): IStatusTestItem {
+		return {
+			...item,
+			depth: parentItem ? parentItem.depth + 1 : 1,
+			parentItem: parentItem,
+			previousState: item.item.state.runState,
+			location: item.item.location,
+			children: new Set(),
+			treeElements: new Map(),
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByName.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByName.ts
new file mode 100644
index 000000000..cd7ad2a07
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateByName.ts
@@ -0,0 +1,289 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { Emitter } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { Iterable } from 'vs/base/common/iterator';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { Location as ModeLocation } from 'vs/editor/common/modes';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { ListElementType } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName';
+import { locationsEqual, TestLocationStore } from 'vs/workbench/contrib/testing/browser/explorerProjections/locationStore';
+import { NodeChangeList, NodeRenderFn } from 'vs/workbench/contrib/testing/browser/explorerProjections/nodeHelper';
+import { StateElement } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateNodes';
+import { AbstractIncrementalTestCollection, IncrementalChangeCollector, IncrementalTestCollectionItem, InternalTestItem, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { isRunningState } from 'vs/workbench/contrib/testing/common/testingStates';
+import { TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+
+class ListTestStateElement implements ITestTreeElement {
+	public computedState = this.test.item.state.runState;
+
+	public get treeId() {
+		return `sntest:${this.test.id}`;
+	}
+
+	public get label() {
+		return this.test.item.label;
+	}
+
+	public get location() {
+		return this.test.item.location;
+	}
+
+	public get runnable(): Iterable<TestIdWithProvider> {
+		return this.test.item.runnable
+			? [{ testId: this.test.id, providerId: this.test.providerId }]
+			: Iterable.empty();
+	}
+
+	public get debuggable(): Iterable<TestIdWithProvider> {
+		return this.test.item.debuggable
+			? [{ testId: this.test.id, providerId: this.test.providerId }]
+			: Iterable.empty();
+	}
+
+	public get description() {
+		let description: string | undefined;
+		for (let parent = this.test.parentItem; parent && parent.depth > 0; parent = parent.parentItem) {
+			description = description ? `${parent.item.label} › ${description}` : parent.item.label;
+		}
+
+		return description;
+	}
+
+	public readonly depth = 1;
+	public readonly children = new Set<never>();
+
+	constructor(
+		public readonly test: IStatusListTestItem,
+		public readonly parentItem: StateElement<ListTestStateElement>,
+	) {
+		parentItem.children.add(this);
+	}
+
+	public remove() {
+		this.parentItem.children.delete(this);
+	}
+}
+
+interface IStatusListTestItem extends IncrementalTestCollectionItem {
+	node?: ListTestStateElement;
+	type: ListElementType;
+	previousState: TestRunState;
+	depth: number;
+	parentItem?: IStatusListTestItem;
+	location?: ModeLocation;
+}
+
+type TreeElement = StateElement<ListTestStateElement> | ListTestStateElement;
+
+/**
+ * Projection that shows tests in a flat list (grouped by status).
+ */
+export class StateByNameProjection extends AbstractIncrementalTestCollection<IStatusListTestItem> implements ITestTreeProjection {
+	private readonly updateEmitter = new Emitter<void>();
+	private readonly changes = new NodeChangeList<TreeElement>();
+	private readonly locations = new TestLocationStore<IStatusListTestItem>();
+	private readonly disposable = new DisposableStore();
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onUpdate = this.updateEmitter.event;
+
+	/**
+	 * Root elements for states in the tree.
+	 */
+	protected readonly stateRoots = new Map<TestRunState, StateElement<ListTestStateElement>>();
+
+	constructor(listener: TestSubscriptionListener) {
+		super();
+
+		this.disposable.add(listener.onDiff(([, diff]) => this.apply(diff)));
+
+		const firstDiff: TestsDiff = [];
+		for (const [, collection] of listener.workspaceFolderCollections) {
+			firstDiff.push(...collection.getReviverDiff());
+		}
+
+		this.apply(firstDiff);
+	}
+
+	/**
+	 * Frees listeners associated with the projection.
+	 */
+	public dispose() {
+		this.disposable.dispose();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public getTestAtPosition(uri: URI, position: Position) {
+		return this.locations.getTestAtPosition(uri, position)?.node;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public applyTo(tree: ObjectTree<ITestTreeElement, FuzzyScore>) {
+		this.changes.applyTo(tree, this.renderNode, () => this.stateRoots.values());
+	}
+
+	private readonly renderNode: NodeRenderFn<TreeElement> = (node, recurse) => {
+		return {
+			element: node,
+			children: node instanceof StateElement ? recurse(node.children) : undefined,
+		};
+	};
+
+	/**
+	 * @override
+	 */
+	protected createChangeCollector(): IncrementalChangeCollector<IStatusListTestItem> {
+		return {
+			add: node => {
+				this.resolveNodesRecursive(node);
+				this.locations.add(node);
+			},
+			remove: (node, isNested) => {
+				if (node.node) {
+					this.locations.remove(node);
+				}
+
+				// for the top node being deleted, we need to update parents. For
+				// others we only need to remove them from the locations cache.
+				if (isNested) {
+					this.removeNodeSingle(node);
+				} else {
+					this.removeNode(node);
+				}
+			},
+			update: node => {
+				if (node.item.state.runState !== node.previousState && node.node) {
+					if (isRunningState(node.item.state.runState)) {
+						node.node.computedState = node.item.state.runState;
+					} else {
+						this.removeNode(node);
+					}
+				}
+
+				node.previousState = node.item.state.runState;
+				this.resolveNodesRecursive(node);
+
+				const locationChanged = !locationsEqual(node.location, node.item.location);
+				if (locationChanged) {
+					this.locations.remove(node);
+					node.location = node.item.location;
+					this.locations.add(node);
+				}
+
+				if (node.node) {
+					this.changes.updated(node.node);
+				}
+			},
+			complete: () => {
+				this.updateEmitter.fire();
+			}
+		};
+	}
+
+	/**
+	 * Ensures tree nodes for the item state are present in the tree.
+	 */
+	protected resolveNodesRecursive(item: IStatusListTestItem) {
+		const newType = Iterable.some(item.children, c => this.items.get(c)?.type !== ListElementType.BranchWithoutLeaf)
+			? ListElementType.BranchWithLeaf
+			: item.item.runnable
+				? ListElementType.TestLeaf
+				: ListElementType.BranchWithoutLeaf;
+
+		if (newType === item.type) {
+			return;
+		}
+
+		const isVisible = newType === ListElementType.TestLeaf;
+		const wasVisible = item.type === ListElementType.TestLeaf;
+		item.type = newType;
+
+		if (!isVisible && wasVisible && item.node) {
+			this.removeNodeSingle(item);
+		} else if (isVisible && !wasVisible) {
+			const state = item.item.state.runState;
+			item.node = item.node || new ListTestStateElement(item, this.getOrCreateStateElement(state));
+			this.changes.added(item.node);
+		}
+
+		if (item.parentItem) {
+			this.resolveNodesRecursive(item.parentItem);
+		}
+	}
+
+	/**
+	 * Recursively (from the leaf to the root) removes tree elements if there's
+	 * no children who have the given state left.
+	 *
+	 * Returns true if it resulted in a node being removed.
+	 */
+	private removeNode(item: IStatusListTestItem) {
+		if (!item.node) {
+			return;
+		}
+
+		this.removeNodeSingle(item);
+
+		if (item.parentItem) {
+			this.resolveNodesRecursive(item.parentItem);
+		}
+	}
+
+	private removeNodeSingle(item: IStatusListTestItem) {
+		if (!item.node) {
+			return;
+		}
+
+		item.node.remove();
+		this.changes.removed(item.node);
+
+		const parent = item.node.parentItem;
+		item.node = undefined;
+		item.type = ListElementType.Unset;
+
+		if (parent.children.size === 0) {
+			this.changes.removed(parent);
+			this.stateRoots.delete(parent.state);
+		}
+	}
+
+	private getOrCreateStateElement(state: TestRunState) {
+		let s = this.stateRoots.get(state);
+		if (!s) {
+			s = new StateElement(state);
+			this.changes.added(s);
+			this.stateRoots.set(state, s);
+		}
+
+		return s;
+	}
+
+	/**
+	 * @override
+	 */
+	protected createItem(item: InternalTestItem, parentItem?: IStatusListTestItem): IStatusListTestItem {
+		return {
+			...item,
+			type: ListElementType.Unset,
+			depth: parentItem ? parentItem.depth + 1 : 0,
+			parentItem: parentItem,
+			previousState: item.item.state.runState,
+			location: item.item.location,
+			children: new Set(),
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/explorerProjections/stateNodes.ts b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateNodes.ts
new file mode 100644
index 000000000..5b3fed98a
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/explorerProjections/stateNodes.ts
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Iterable } from 'vs/base/common/iterator';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { ITestTreeElement } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { testStateNames } from 'vs/workbench/contrib/testing/common/constants';
+
+/**
+ * Base state node element, used in both name and location grouping.
+ */
+export class StateElement<T extends ITestTreeElement> implements ITestTreeElement {
+	public computedState = this.state;
+
+	public get treeId() {
+		return `sestate:${this.state}`;
+	}
+
+	public readonly depth = 0;
+	public readonly label = testStateNames[this.state];
+	public readonly parentItem = null;
+	public readonly children = new Set<T>();
+
+	public get runnable() {
+		return Iterable.concatNested(Iterable.map(this.children, c => c.runnable));
+	}
+
+	public get debuggable() {
+		return Iterable.concatNested(Iterable.map(this.children, c => c.debuggable));
+	}
+
+	constructor(public readonly state: TestRunState) { }
+}
diff --git a/src/vs/workbench/contrib/testing/browser/icons.ts b/src/vs/workbench/contrib/testing/browser/icons.ts
new file mode 100644
index 000000000..62df586f8
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/icons.ts
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from 'vs/base/common/codicons';
+import { localize } from 'vs/nls';
+import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { testingColorRunAction, testStatesToIconColors } from 'vs/workbench/contrib/testing/browser/theme';
+
+export const testingViewIcon = registerIcon('test-view-icon', Codicon.beaker, localize('testViewIcon', 'View icon of the test view.'));
+export const testingRunIcon = registerIcon('testing-run-icon', Codicon.run, localize('testingRunIcon', 'Icon of the "run test" action.'));
+export const testingRunAllIcon = registerIcon('testing-run-all-icon', Codicon.runAll, localize('testingRunAllIcon', 'Icon of the "run all tests" action.'));
+export const testingDebugIcon = registerIcon('testing-debug-icon', Codicon.debugAlt, localize('testingDebugIcon', 'Icon of the "debug test" action.'));
+export const testingCancelIcon = registerIcon('testing-cancel-icon', Codicon.close, localize('testingCancelIcon', 'Icon to cancel ongoing test runs.'));
+
+export const testingShowAsList = registerIcon('testing-show-as-list-icon', Codicon.listTree, localize('testingShowAsList', 'Icon shown when the test explorer is disabled as a tree.'));
+export const testingShowAsTree = registerIcon('testing-show-as-list-icon', Codicon.listFlat, localize('testingShowAsTree', 'Icon shown when the test explorer is disabled as a list.'));
+
+export const testingStatesToIcons = new Map<TestRunState, ThemeIcon>([
+	[TestRunState.Errored, registerIcon('testing-error-icon', Codicon.warning, localize('testingErrorIcon', 'Icon shown for tests that have an error.'))],
+	[TestRunState.Failed, registerIcon('testing-failed-icon', Codicon.close, localize('testingFailedIcon', 'Icon shown for tests that failed.'))],
+	[TestRunState.Passed, registerIcon('testing-passed-icon', Codicon.pass, localize('testingPassedIcon', 'Icon shown for tests that passed.'))],
+	[TestRunState.Queued, registerIcon('testing-queued-icon', Codicon.watch, localize('testingQueuedIcon', 'Icon shown for tests that are queued.'))],
+	[TestRunState.Running, ThemeIcon.modify(Codicon.loading, 'spin')],
+	[TestRunState.Skipped, registerIcon('testing-skipped-icon', Codicon.debugStepOver, localize('testingSkippedIcon', 'Icon shown for tests that are skipped.'))],
+	[TestRunState.Unset, registerIcon('testing-unset-icon', Codicon.circleOutline, localize('testingUnsetIcon', 'Icon shown for tests that are in an unset state.'))],
+]);
+
+registerThemingParticipant((theme, collector) => {
+	for (const [state, icon] of testingStatesToIcons.entries()) {
+		const color = testStatesToIconColors[state];
+		if (!color) {
+			continue;
+		}
+		collector.addRule(`.monaco-workbench ${ThemeIcon.asCSSSelector(icon)} {
+			color: ${theme.getColor(color)} !important;
+		}`);
+	}
+
+	collector.addRule(`
+		.monaco-editor ${ThemeIcon.asCSSSelector(testingRunIcon)},
+		.monaco-editor ${ThemeIcon.asCSSSelector(testingRunAllIcon)} {
+			color: ${theme.getColor(testingColorRunAction)};
+		}
+	`);
+});
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
new file mode 100644
index 000000000..3c0b58543
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/** -- explorer */
+.test-explorer {
+	display: flex;
+	flex-direction: column;
+}
+
+.test-explorer > .test-explorer-tree {
+	flex-grow: 1;
+	height: 0px;
+}
+
+.test-explorer .test-item {
+	display: flex;
+	align-items: center;
+}
+
+.test-explorer .monaco-list-row .monaco-action-bar {
+	display: none;
+	flex-shrink: 0;
+	margin-right: 1px;
+}
+
+.test-explorer .monaco-list-row:hover .monaco-action-bar {
+	display: initial;
+}
+
+.test-explorer .name {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	flex-grow: 1;
+	height: 22px;
+	align-items: center;
+}
+
+.test-explorer .computed-state {
+	margin-right: 0.25em;
+}
+
+.test-explorer .test-explorer-messages {
+	padding: 0 12px 8px;
+}
+
+.monaco-workbench
+	.test-explorer
+	.monaco-action-bar
+	.action-item
+	> .action-label {
+	width: 16px;
+	height: 100%;
+	line-height: 22px;
+	margin-right: 8px;
+}
+
+.codicon-testing-loading-icon::before {
+	/* Use steps to throttle FPS to reduce CPU usage */
+	animation: codicon-spin 1.25s steps(30) infinite;
+}
+
+/** -- peek */
+.monaco-editor .zone-widget.test-output-peek .zone-widget-container.peekview-widget {
+	border-top-width: 2px;
+	border-bottom-width: 2px;
+}
+
+.monaco-editor .zone-widget.test-output-peek .zone-widget-container.peekview-widget .peekview-title .filename {
+	max-height: 29px;
+}
+
+/** -- filter  */
+.testing-filter-action-bar {
+	flex-shrink: 0;
+	margin: 4px 12px;
+}
+
+.testing-filter-action-item {
+	display: flex !important;
+	flex-grow: 1;
+	max-width: 400px;
+	align-items: center;
+}
+
+.testing-filter-action-bar .testing-filter-action-item {
+	max-width: none;
+}
+
+.testing-filter-action-item .testing-filter-wrapper {
+	flex-grow: 1;
+}
+
+/** -- decorations  */
+
+.monaco-editor .testing-run-glyph {
+	cursor: pointer;
+}
+
+.monaco-editor .testing-inline-message-content {
+	cursor: pointer;
+}
+
+.monaco-editor .testing-inline-message-line {
+	background: red;
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
new file mode 100644
index 000000000..84fd06630
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
@@ -0,0 +1,473 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { Action } from 'vs/base/common/actions';
+import { Codicon } from 'vs/base/common/codicons';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { isDefined } from 'vs/base/common/types';
+import { localize } from 'vs/nls';
+import { Action2, MenuId } from 'vs/platform/actions/common/actions';
+import { ContextKeyAndExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
+import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
+import { ShowViewletAction2 } from 'vs/workbench/browser/viewlet';
+import { CATEGORIES } from 'vs/workbench/common/actions';
+import { FocusedViewContext } from 'vs/workbench/common/views';
+import * as icons from 'vs/workbench/contrib/testing/browser/icons';
+import { TestingExplorerView, TestingExplorerViewModel } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
+import { TestExplorerViewGrouping, TestExplorerViewMode, Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { EMPTY_TEST_RESULT, InternalTestItem, RunTestsResult, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { ITestService, waitForAllRoots } from 'vs/workbench/contrib/testing/common/testService';
+import { IWorkspaceTestCollectionService } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+
+const category = localize('testing.category', 'Test');
+
+const enum ActionOrder {
+	Run = 10,
+	Debug,
+	Refresh,
+	Collapse,
+}
+
+export class DebugAction extends Action {
+	constructor(
+		private readonly tests: Iterable<TestIdWithProvider>,
+		isRunning: boolean,
+		@ITestService private readonly testService: ITestService
+	) {
+		super(
+			'testing.run',
+			localize('debug test', 'Debug Test'),
+			'test-action ' + ThemeIcon.asClassName(icons.testingDebugIcon),
+			/* enabled= */ !isRunning
+		);
+	}
+
+	/**
+	 * @override
+	 */
+	public run(): Promise<any> {
+		return this.testService.runTests({
+			tests: [...this.tests],
+			debug: true,
+		});
+	}
+}
+
+export class RunAction extends Action {
+	constructor(
+		private readonly tests: Iterable<TestIdWithProvider>,
+		isRunning: boolean,
+		@ITestService private readonly testService: ITestService
+	) {
+		super(
+			'testing.run',
+			localize('run test', 'Run Test'),
+			'test-action ' + ThemeIcon.asClassName(icons.testingRunIcon),
+			/* enabled= */ !isRunning,
+		);
+	}
+
+	/**
+	 * @override
+	 */
+	public run(): Promise<any> {
+		return this.testService.runTests({
+			tests: [...this.tests],
+			debug: false,
+		});
+	}
+}
+
+abstract class RunOrDebugAction extends ViewAction<TestingExplorerView> {
+	constructor(id: string, title: string, icon: ThemeIcon, private readonly debug: boolean) {
+		super({
+			id,
+			title,
+			icon,
+			viewId: Testing.ExplorerViewId,
+			f1: true,
+			category,
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(accessor: ServicesAccessor, view: TestingExplorerView): Promise<RunTestsResult> {
+		const tests = this.getActionableTests(accessor.get(IWorkspaceTestCollectionService), view.viewModel);
+		if (!tests.length) {
+			return Promise.resolve(EMPTY_TEST_RESULT);
+		}
+
+		return accessor.get(ITestService).runTests({ tests, debug: this.debug });
+	}
+
+	private getActionableTests(testCollection: IWorkspaceTestCollectionService, viewModel: TestingExplorerViewModel) {
+		const selected = viewModel.getSelectedTests();
+		const tests: TestIdWithProvider[] = [];
+		if (!selected.length) {
+			for (const folder of testCollection.workspaceFolders()) {
+				for (const child of folder.getChildren()) {
+					if (this.filter(child)) {
+						tests.push({ testId: child.id, providerId: child.providerId });
+					}
+				}
+			}
+		} else {
+			for (const item of selected) {
+				if (item?.test && this.filter(item.test)) {
+					tests.push({ testId: item.test.id, providerId: item.test.providerId });
+				}
+			}
+		}
+
+		return tests;
+	}
+
+	protected abstract filter(item: InternalTestItem): boolean;
+}
+
+export class RunSelectedAction extends RunOrDebugAction {
+	constructor(
+	) {
+		super(
+			'testing.runSelected',
+			localize('runSelectedTests', 'Run Selected Tests'),
+			icons.testingRunIcon,
+			false,
+		);
+	}
+
+	/**
+	 * @override
+	 */
+	public filter({ item }: InternalTestItem) {
+		return item.runnable;
+	}
+}
+
+export class DebugSelectedAction extends RunOrDebugAction {
+	constructor() {
+		super(
+			'testing.debugSelected',
+			localize('debugSelectedTests', 'Debug Selected Tests'),
+			icons.testingDebugIcon,
+			true,
+		);
+	}
+
+	/**
+	 * @override
+	 */
+	public filter({ item }: InternalTestItem) {
+		return item.debuggable;
+	}
+}
+
+abstract class RunOrDebugAllAllAction extends Action2 {
+	constructor(id: string, title: string, icon: ThemeIcon, private readonly debug: boolean, private noTestsFoundError: string) {
+		super({
+			id,
+			title,
+			icon,
+			f1: true,
+			category,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: debug ? ActionOrder.Debug : ActionOrder.Run,
+				group: 'navigation',
+				when: ContextKeyAndExpr.create([
+					ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId),
+					ContextKeyEqualsExpr.create(TestingContextKeys.isRunning.serialize(), false),
+				])
+			}
+		});
+	}
+
+	public async run(accessor: ServicesAccessor) {
+		const testService = accessor.get(ITestService);
+		const workspace = accessor.get(IWorkspaceContextService);
+		const notifications = accessor.get(INotificationService);
+
+		const tests: TestIdWithProvider[] = [];
+		await Promise.all(workspace.getWorkspace().folders.map(async (folder) => {
+			const ref = testService.subscribeToDiffs(ExtHostTestingResource.Workspace, folder.uri);
+			try {
+				await waitForAllRoots(ref.object);
+
+				for (const root of ref.object.rootIds) {
+					const node = ref.object.getNodeById(root);
+					if (node && (this.debug ? node.item.debuggable : node.item.runnable)) {
+						tests.push({ testId: node.id, providerId: node.providerId });
+					}
+				}
+			} finally {
+				ref.dispose();
+			}
+		}));
+
+		if (tests.length === 0) {
+			notifications.info(this.noTestsFoundError);
+			return;
+		}
+
+		await testService.runTests({ tests, debug: this.debug });
+	}
+}
+
+export class RunAllAction extends RunOrDebugAllAllAction {
+	constructor() {
+		super(
+			'testing.runAll',
+			localize('runAllTests', 'Run All Tests'),
+			icons.testingRunAllIcon,
+			false,
+			localize('noTestProvider', 'No tests found in this workspace. You may need to install a test provider extension'),
+		);
+	}
+}
+
+export class DebugAllAction extends RunOrDebugAllAllAction {
+	constructor() {
+		super(
+			'testing.debugAll',
+			localize('debugAllTests', 'Debug All Tests'),
+			icons.testingDebugIcon,
+			true,
+			localize('noDebugTestProvider', 'No debuggable tests found in this workspace. You may need to install a test provider extension'),
+		);
+	}
+}
+
+export class CancelTestRunAction extends Action2 {
+	constructor() {
+		super({
+			id: 'testing.cancelRun',
+			title: localize('testing.cancelRun', "Cancel Test Run"),
+			icon: icons.testingCancelIcon,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: ActionOrder.Run,
+				group: 'navigation',
+				when: ContextKeyAndExpr.create([
+					ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId),
+					ContextKeyEqualsExpr.create(TestingContextKeys.isRunning.serialize(), true),
+				])
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public async run(accessor: ServicesAccessor) {
+		const testService = accessor.get(ITestService);
+		for (const run of testService.testRuns) {
+			testService.cancelTestRun(run);
+		}
+	}
+}
+
+export class TestingViewAsListAction extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.viewAsList',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.viewAsList', "View as List"),
+			f1: false,
+			toggled: TestingContextKeys.viewMode.isEqualTo(TestExplorerViewMode.List),
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 10,
+				group: 'viewAs',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		view.viewModel.viewMode = TestExplorerViewMode.List;
+	}
+}
+
+export class TestingViewAsTreeAction extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.viewAsTree',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.viewAsTree', "View as Tree"),
+			f1: false,
+			toggled: TestingContextKeys.viewMode.isEqualTo(TestExplorerViewMode.Tree),
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 10,
+				group: 'viewAs',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		view.viewModel.viewMode = TestExplorerViewMode.Tree;
+	}
+}
+
+
+export class TestingGroupByLocationAction extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.groupByLocation',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.groupByLocation', "Sort by Name"),
+			f1: false,
+			toggled: TestingContextKeys.viewGrouping.isEqualTo(TestExplorerViewGrouping.ByLocation),
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 10,
+				group: 'groupBy',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		view.viewModel.viewGrouping = TestExplorerViewGrouping.ByLocation;
+	}
+}
+
+export class TestingGroupByStatusAction extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.groupByStatus',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.groupByStatus', "Sort by Status"),
+			f1: false,
+			toggled: TestingContextKeys.viewGrouping.isEqualTo(TestExplorerViewGrouping.ByStatus),
+			menu: {
+				id: MenuId.ViewTitle,
+				order: 10,
+				group: 'groupBy',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		view.viewModel.viewGrouping = TestExplorerViewGrouping.ByStatus;
+	}
+}
+
+export class CollapseAllAction extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.collapseAll',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.collapseAll', "Collapse All Tests"),
+			f1: false,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: ActionOrder.Collapse,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		view.viewModel.collapseAll();
+	}
+}
+
+export class RefreshTestsAction extends Action2 {
+	constructor() {
+		super({
+			id: 'testing.refreshTests',
+			title: localize('testing.refresh', "Refresh Tests"),
+			category,
+			f1: true,
+			icon: Codicon.refresh,
+			menu: {
+				id: MenuId.ViewTitle,
+				order: ActionOrder.Refresh,
+				group: 'navigation',
+				when: ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId)
+			}
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public run(accessor: ServicesAccessor) {
+		accessor.get(ITestService).resubscribeToAllTests();
+	}
+}
+
+export class ShowTestView extends ShowViewletAction2 {
+	constructor() {
+		super({
+			// matches old test action for back-compat
+			id: 'workbench.view.extension.test',
+			title: localize('showTestViewley', "Show Test"),
+			category: CATEGORIES.View.value,
+			f1: true,
+		});
+	}
+
+	protected viewletId() {
+		return Testing.ViewletId;
+	}
+}
+
+
+export class EditFocusedTest extends ViewAction<TestingExplorerView> {
+	constructor() {
+		super({
+			id: 'testing.editFocusedTest',
+			viewId: Testing.ExplorerViewId,
+			title: localize('testing.editFocusedTest', "Open Focused Test in Editor"),
+			f1: false,
+			keybinding: {
+				weight: KeybindingWeight.EditorContrib - 10,
+				when: FocusedViewContext.isEqualTo(Testing.ExplorerViewId),
+				primary: KeyCode.Enter | KeyMod.Alt,
+			},
+		});
+	}
+
+	/**
+	 * @override
+	 */
+	public runInView(_accessor: ServicesAccessor, view: TestingExplorerView) {
+		const selected = view.viewModel.tree.getFocus().find(isDefined);
+		if (selected) {
+			view.viewModel.openEditorForItem(selected, false);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
index 4e541bc83..5681ef35c 100644
--- a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
+++ b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
@@ -3,8 +3,121 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { localize } from 'vs/nls';
+import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
+import { Extensions as ViewContainerExtensions, IViewContainersRegistry, IViewsRegistry, ViewContainerLocation } from 'vs/workbench/common/views';
+import { testingViewIcon } from 'vs/workbench/contrib/testing/browser/icons';
+import { TestingDecorations } from 'vs/workbench/contrib/testing/browser/testingDecorations';
+import { ITestExplorerFilterState, TestExplorerFilterState } from 'vs/workbench/contrib/testing/browser/testingExplorerFilter';
+import { TestingExplorerView } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
+import { CloseTestPeek, TestingOutputPeekController } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
+import { TestingViewPaneContainer } from 'vs/workbench/contrib/testing/browser/testingViewPaneContainer';
+import { Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestingContentProvider } from 'vs/workbench/contrib/testing/common/testingContentProvider';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { ITestResultService, TestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
 import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
 import { TestService } from 'vs/workbench/contrib/testing/common/testServiceImpl';
+import { IWorkspaceTestCollectionService, WorkspaceTestCollectionService } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import * as Action from './testExplorerActions';
 
 registerSingleton(ITestService, TestService);
+registerSingleton(ITestResultService, TestResultService);
+registerSingleton(ITestExplorerFilterState, TestExplorerFilterState);
+registerSingleton(IWorkspaceTestCollectionService, WorkspaceTestCollectionService);
+
+const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
+	id: Testing.ViewletId,
+	name: localize('test', "Test"),
+	ctorDescriptor: new SyncDescriptor(TestingViewPaneContainer),
+	icon: testingViewIcon,
+	alwaysUseContainerInfo: true,
+	order: 6,
+	hideIfEmpty: true,
+}, ViewContainerLocation.Sidebar);
+
+
+const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
+
+viewsRegistry.registerViewWelcomeContent(Testing.ExplorerViewId, {
+	content: localize('noTestProvidersRegistered', "No test providers are registered for this workspace."),
+});
+
+viewsRegistry.registerViewWelcomeContent(Testing.ExplorerViewId, {
+	content: localize(
+		{
+			key: 'searchMarketplaceForTestExtensions',
+			comment: ['Please do not translate the word "commmand", it is part of our internal syntax which must not change'],
+		},
+		"[Search Marketplace](command:{0})",
+		`workbench.extensions.search?${encodeURIComponent(JSON.stringify(['@tag:testing']))}`
+	),
+});
+
+viewsRegistry.registerViews([{
+	id: Testing.ExplorerViewId,
+	name: localize('testExplorer', "Test Explorer"),
+	ctorDescriptor: new SyncDescriptor(TestingExplorerView),
+	canToggleVisibility: true,
+	workspace: true,
+	canMoveView: true,
+	weight: 80,
+	order: -999,
+	containerIcon: testingViewIcon,
+	// temporary until release, at which point we can show the welcome view:
+	when: ContextKeyExpr.greater(TestingContextKeys.providerCount.serialize(), 0),
+}], viewContainer);
+
+registerAction2(Action.TestingViewAsListAction);
+registerAction2(Action.TestingViewAsTreeAction);
+registerAction2(Action.CancelTestRunAction);
+registerAction2(Action.RunSelectedAction);
+registerAction2(Action.DebugSelectedAction);
+registerAction2(Action.TestingGroupByLocationAction);
+registerAction2(Action.TestingGroupByStatusAction);
+registerAction2(Action.RefreshTestsAction);
+registerAction2(Action.ShowTestView);
+registerAction2(Action.CollapseAllAction);
+registerAction2(Action.RunAllAction);
+registerAction2(Action.DebugAllAction);
+registerAction2(Action.EditFocusedTest);
+registerAction2(CloseTestPeek);
+
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingContentProvider, LifecyclePhase.Eventually);
+
+registerEditorContribution(Testing.OutputPeekContributionId, TestingOutputPeekController);
+registerEditorContribution(Testing.DecorationsContributionId, TestingDecorations);
+
+CommandsRegistry.registerCommand({
+	id: 'vscode.runTests',
+	handler: async (accessor: ServicesAccessor, tests: TestIdWithProvider[]) => {
+		const testService = accessor.get(ITestService);
+		testService.runTests({ debug: false, tests: tests.filter(t => t.providerId && t.testId) });
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: 'vscode.debugTests',
+	handler: async (accessor: ServicesAccessor, tests: TestIdWithProvider[]) => {
+		const testService = accessor.get(ITestService);
+		testService.runTests({ debug: true, tests: tests.filter(t => t.providerId && t.testId) });
+	}
+});
+
+CommandsRegistry.registerCommand({
+	id: 'vscode.revealTestInExplorer',
+	handler: async (accessor: ServicesAccessor, path: string[]) => {
+		accessor.get(ITestExplorerFilterState).reveal = path;
+		await new Action.ShowTestView().run(accessor);
+	}
+});
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
new file mode 100644
index 000000000..e0d3fba41
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -0,0 +1,326 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Action, IAction, Separator } from 'vs/base/common/actions';
+import { MarkdownString } from 'vs/base/common/htmlContent';
+import { Disposable, dispose, IDisposable, IReference, MutableDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { IRange } from 'vs/editor/common/core/range';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { Location as ModeLocation } from 'vs/editor/common/modes';
+import { overviewRulerError, overviewRulerInfo, overviewRulerWarning } from 'vs/editor/common/view/editorColorRegistry';
+import { localize } from 'vs/nls';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IThemeService, themeColorFromId, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
+import { TestMessageSeverity, TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, IBreakpointEditorContribution } from 'vs/workbench/contrib/debug/common/debug';
+import { testingRunAllIcon, testingRunIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
+import { TestingOutputPeekController } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
+import { testMessageSeverityColors } from 'vs/workbench/contrib/testing/browser/theme';
+import { IncrementalTestCollectionItem, ITestMessage } from 'vs/workbench/contrib/testing/common/testCollection';
+import { maxPriority } from 'vs/workbench/contrib/testing/common/testingStates';
+import { buildTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
+import { IMainThreadTestCollection, ITestService } from 'vs/workbench/contrib/testing/common/testService';
+
+export class TestingDecorations extends Disposable implements IEditorContribution {
+	private collection = this._register(new MutableDisposable<IReference<IMainThreadTestCollection>>());
+	private lastDecorations: ITestDecoration[] = [];
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		@ITestService private readonly testService: ITestService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+		this.attachModel(editor.getModel()?.uri);
+		this._register(this.editor.onDidChangeModel(e => this.attachModel(e.newModelUrl || undefined)));
+		this._register(this.editor.onMouseDown(e => {
+			for (const decoration of this.lastDecorations) {
+				if (decoration.click(e)) {
+					e.event.stopPropagation();
+					return;
+				}
+			}
+		}));
+	}
+
+	private attachModel(uri?: URI) {
+		if (!uri) {
+			this.collection.value = undefined;
+			this.clearDecorations();
+			return;
+		}
+
+		this.collection.value = this.testService.subscribeToDiffs(ExtHostTestingResource.TextDocument, uri, () => this.setDecorations(uri));
+		this.setDecorations(uri);
+	}
+
+	private setDecorations(uri: URI): void {
+		const ref = this.collection.value;
+		if (!ref) {
+			return;
+		}
+
+		this.editor.changeDecorations(accessor => {
+			const newDecorations: ITestDecoration[] = [];
+			for (const test of ref.object.all) {
+				if (hasValidLocation(uri, test.item)) {
+					newDecorations.push(this.instantiationService.createInstance(
+						RunTestDecoration, test, ref.object, test.item.location, this.editor));
+				}
+
+				for (let i = 0; i < test.item.state.messages.length; i++) {
+					const m = test.item.state.messages[i];
+					if (hasValidLocation(uri, m)) {
+						const uri = buildTestUri({
+							type: TestUriType.LiveMessage,
+							messageIndex: i,
+							providerId: test.providerId,
+							testId: test.id,
+						});
+
+						newDecorations.push(this.instantiationService.createInstance(TestMessageDecoration, m, uri, m.location, this.editor));
+					}
+				}
+			}
+
+			accessor
+				.deltaDecorations(this.lastDecorations.map(d => d.id), newDecorations.map(d => d.editorDecoration))
+				.forEach((id, i) => newDecorations[i].id = id);
+
+			this.lastDecorations = newDecorations;
+		});
+	}
+
+	private clearDecorations(): void {
+		this.editor.changeDecorations(accessor => {
+			for (const decoration of this.lastDecorations) {
+				accessor.removeDecoration(decoration.id);
+			}
+
+			this.lastDecorations = [];
+		});
+	}
+}
+
+interface ITestDecoration extends IDisposable {
+	/**
+	 * ID of the decoration after being added to the editor, set after the
+	 * decoration is applied.
+	 */
+	id: string;
+
+	readonly editorDecoration: IModelDeltaDecoration;
+
+	/**
+	 * Handles a click event, returns true if it was handled.
+	 */
+	click(e: IEditorMouseEvent): boolean;
+}
+
+const hasValidLocation = <T extends { location?: ModeLocation }>(editorUri: URI, t: T): t is T & { location: ModeLocation } =>
+	t.location?.uri.toString() === editorUri.toString();
+
+const firstLineRange = (originalRange: IRange) => ({
+	startLineNumber: originalRange.startLineNumber,
+	endLineNumber: originalRange.startLineNumber,
+	startColumn: 0,
+	endColumn: 1,
+});
+
+class RunTestDecoration implements ITestDecoration {
+	/**
+	 * @inheritdoc
+	 */
+	id = '';
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly editorDecoration: IModelDeltaDecoration;
+
+	private line: number;
+
+	constructor(
+		private readonly test: IncrementalTestCollectionItem,
+		private readonly collection: IMainThreadTestCollection,
+		private readonly location: ModeLocation,
+		private readonly editor: ICodeEditor,
+		@ITestService private readonly testService: ITestService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@ICommandService private readonly commandService: ICommandService,
+	) {
+		this.line = location.range.startLineNumber;
+
+		const queue = [test.children];
+		let state = this.test.item.state.runState;
+		while (queue.length) {
+			for (const child of queue.pop()!) {
+				const node = collection.getNodeById(child);
+				if (node) {
+					state = maxPriority(node.item.state.runState, state);
+				}
+			}
+		}
+
+		const icon = state !== TestRunState.Unset
+			? testingStatesToIcons.get(state)!
+			: test.children.size > 0 ? testingRunAllIcon : testingRunIcon;
+
+		this.editorDecoration = {
+			range: firstLineRange(this.location.range),
+			options: {
+				isWholeLine: true,
+				glyphMarginClassName: ThemeIcon.asClassName(icon) + ' testing-run-glyph',
+				stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+				glyphMarginHoverMessage: new MarkdownString().appendText(localize('testing.clickToRun', 'Click to run tests, right click for more options')),
+			}
+		};
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public click(e: IEditorMouseEvent): boolean {
+		if (e.target.position?.lineNumber !== this.line || e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN) {
+			return false;
+		}
+
+		if (e.event.rightButton) {
+			const actions = this.getContextMenu();
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => ({ x: e.event.posx, y: e.event.posy }),
+				getActions: () => actions,
+				onHide: () => dispose(actions),
+			});
+		} else {
+			// todo: customize click behavior
+			this.testService.runTests({ tests: [{ testId: this.test.id, providerId: this.test.providerId }], debug: false });
+		}
+
+		return true;
+	}
+
+	public dispose() {
+		// no-op
+	}
+
+	private getContextMenu() {
+		const model = this.editor.getModel();
+		if (!model) {
+			return [];
+		}
+
+		const testActions: IAction[] = [];
+		if (this.test.item.runnable) {
+			testActions.push(new Action('testing.run', localize('run test', 'Run Test'), undefined, undefined, () => this.testService.runTests({
+				debug: false,
+				tests: [{ providerId: this.test.providerId, testId: this.test.id }],
+			})));
+		}
+
+		if (this.test.item.debuggable) {
+			testActions.push(new Action('testing.debug', localize('debug test', 'Debug Test'), undefined, undefined, () => this.testService.runTests({
+				debug: true,
+				tests: [{ providerId: this.test.providerId, testId: this.test.id }],
+			})));
+		}
+
+		testActions.push(new Action('testing.reveal', localize('reveal test', 'Reveal in Test Explorer'), undefined, undefined, async () => {
+			const path = [];
+			for (let id: string | null = this.test.id; id;) {
+				const node = this.collection.getNodeById(id);
+				if (!node) {
+					break;
+				}
+
+				path.unshift(node.item.label);
+				id = node.parent;
+			}
+
+			await this.commandService.executeCommand('vscode.revealTestInExplorer', this.test);
+		}));
+
+		const breakpointActions = this.editor
+			.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID)
+			.getContextMenuActionsAtPosition(this.line, model);
+
+		return breakpointActions.length ? [...testActions, new Separator(), ...breakpointActions] : testActions;
+	}
+}
+
+class TestMessageDecoration implements ITestDecoration {
+	public id = '';
+
+	public readonly editorDecoration: IModelDeltaDecoration;
+	private readonly decorationId = `testmessage-${generateUuid()}`;
+
+	constructor(
+		{ message, severity }: ITestMessage,
+		private readonly messageUri: URI,
+		location: ModeLocation,
+		private readonly editor: ICodeEditor,
+		@ICodeEditorService private readonly editorService: ICodeEditorService,
+		@IThemeService themeService: IThemeService,
+	) {
+		severity = severity || TestMessageSeverity.Error;
+
+		const colorTheme = themeService.getColorTheme();
+		editorService.registerDecorationType(this.decorationId, {
+			after: {
+				contentText: message.toString(),
+				color: `${colorTheme.getColor(testMessageSeverityColors[severity].decorationForeground)}`,
+				fontSize: `${editor.getOption(EditorOption.fontSize)}px`,
+				fontFamily: editor.getOption(EditorOption.fontFamily),
+				padding: `0px 12px 0px 24px`,
+			},
+		}, undefined, editor);
+
+		const options = editorService.resolveDecorationOptions(this.decorationId, true);
+		options.hoverMessage = typeof message === 'string' ? new MarkdownString().appendText(message) : message;
+		options.afterContentClassName = `${options.afterContentClassName} testing-inline-message-content`;
+		options.zIndex = 10; // todo: in spite of the z-index, this appears behind gitlens
+		options.className = `testing-inline-message-margin testing-inline-message-severity-${severity}`;
+		options.isWholeLine = true;
+
+		const rulerColor = severity === TestMessageSeverity.Error
+			? overviewRulerError
+			: severity === TestMessageSeverity.Warning
+				? overviewRulerWarning
+				: severity === TestMessageSeverity.Information
+					? overviewRulerInfo
+					: undefined;
+
+		if (rulerColor) {
+			options.overviewRuler = { color: themeColorFromId(rulerColor), position: OverviewRulerLane.Right };
+		}
+
+		this.editorDecoration = { range: firstLineRange(location.range), options };
+	}
+
+	click(e: IEditorMouseEvent): boolean {
+		if (e.event.rightButton) {
+			return false;
+		}
+
+		if (e.target.element?.className.includes(this.decorationId)) {
+			TestingOutputPeekController.get(this.editor).show(this.messageUri);
+		}
+
+		return false;
+	}
+
+	dispose(): void {
+		this.editorService.removeDecorationType(this.decorationId);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
new file mode 100644
index 000000000..244161a29
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerFilter.ts
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { HistoryInputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { IAction } from 'vs/base/common/actions';
+import { Delayer } from 'vs/base/common/async';
+import { Event, Emitter } from 'vs/base/common/event';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { localize } from 'vs/nls';
+import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { ContextScopedHistoryInputBox } from 'vs/platform/browser/contextScopedHistoryWidget';
+import { ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { ViewContainerLocation } from 'vs/workbench/common/views';
+import { Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+
+export interface ITestExplorerFilterState {
+	_serviceBrand: undefined;
+	readonly onDidChange: Event<string>;
+	readonly onDidRequestReveal: Event<string[]>;
+	value: string;
+	reveal: string[] | undefined;
+
+	readonly onDidRequestInputFocus: Event<void>;
+	focusInput(): void;
+}
+
+export const ITestExplorerFilterState = createDecorator<ITestExplorerFilterState>('testingFilterState');
+
+export class TestExplorerFilterState implements ITestExplorerFilterState {
+	declare _serviceBrand: undefined;
+	private readonly revealRequest = new Emitter<string[]>();
+	private readonly changeEmitter = new Emitter<string>();
+	private readonly focusEmitter = new Emitter<void>();
+	private _value = '';
+	private _reveal?: string[];
+
+	public readonly onDidRequestInputFocus = this.focusEmitter.event;
+	public readonly onDidRequestReveal = this.revealRequest.event;
+	public readonly onDidChange = this.changeEmitter.event;
+
+	public get reveal() {
+		return this._reveal;
+	}
+
+	public set reveal(v: string[] | undefined) {
+		this._reveal = v;
+		if (v !== undefined) {
+			this.revealRequest.fire(v);
+		}
+	}
+
+	public get value() {
+		return this._value;
+	}
+
+	public set value(v: string) {
+		if (v !== this._value) {
+			this._value = v;
+			this.changeEmitter.fire(v);
+		}
+	}
+
+	public focusInput() {
+		this.focusEmitter.fire();
+	}
+}
+
+export class TestingExplorerFilter extends BaseActionViewItem {
+	private input!: HistoryInputBox;
+	private readonly history: StoredValue<string[]> = this.instantiationService.createInstance(StoredValue, {
+		key: 'testing.filterHistory',
+		scope: StorageScope.WORKSPACE,
+		target: StorageTarget.USER
+	});
+
+	constructor(
+		action: IAction,
+		@ITestExplorerFilterState private readonly state: ITestExplorerFilterState,
+		@IContextViewService private readonly contextViewService: IContextViewService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(null, action);
+	}
+
+	/**
+	 * @override
+	 */
+	public render(container: HTMLElement) {
+		container.classList.add('testing-filter-action-item');
+
+		const updateDelayer = this._register(new Delayer<void>(400));
+		const wrapper = dom.$('.testing-filter-wrapper');
+		container.appendChild(wrapper);
+
+		const input = this.input = this._register(this.instantiationService.createInstance(ContextScopedHistoryInputBox, wrapper, this.contextViewService, {
+			placeholder: localize('testExplorerFilter', "Filter (e.g. text, !exclude)"),
+			history: this.history.get([]),
+		}));
+		input.value = this.state.value;
+		this._register(attachInputBoxStyler(input, this.themeService));
+
+		this._register(this.state.onDidChange(newValue => {
+			input.value = newValue;
+		}));
+
+		this._register(this.state.onDidRequestInputFocus(() => {
+			input.focus();
+		}));
+
+		this._register(input.onDidChange(() => updateDelayer.trigger(() => {
+			input.addToHistory();
+			this.state.value = input.value;
+		})));
+
+		this._register(dom.addStandardDisposableListener(input.inputElement, dom.EventType.KEY_DOWN, e => {
+			if (e.equals(KeyCode.Escape)) {
+				input.value = '';
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		}));
+	}
+
+
+	/**
+	 * Focuses the filter input.
+	 */
+	public focus(): void {
+		this.input.focus();
+	}
+
+	/**
+	 * Persists changes to the input history.
+	 */
+	public saveState() {
+		const history = this.input.getHistory();
+		if (history.length) {
+			this.history.store(history);
+		} else {
+			this.history.delete();
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	public dispose() {
+		this.saveState();
+		super.dispose();
+	}
+}
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: Testing.FilterActionId,
+			title: localize('filter', "Filter"),
+			menu: {
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', Testing.ExplorerViewId), TestingContextKeys.explorerLocation.isEqualTo(ViewContainerLocation.Panel)),
+				group: 'navigation',
+				order: 1,
+			},
+		});
+	}
+	async run(): Promise<void> { }
+});
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
new file mode 100644
index 000000000..0bbd79172
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -0,0 +1,841 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { DefaultKeyboardNavigationDelegate, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
+import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { ITreeEvent, ITreeFilter, ITreeNode, ITreeRenderer, ITreeSorter, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
+import * as aria from 'vs/base/browser/ui/aria/aria';
+import { Action, IAction, IActionViewItem } from 'vs/base/common/actions';
+import { DeferredPromise } from 'vs/base/common/async';
+import { Color, RGBA } from 'vs/base/common/color';
+import { throttle } from 'vs/base/common/decorators';
+import { Event } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { splitGlobAware } from 'vs/base/common/glob';
+import { Iterable } from 'vs/base/common/iterator';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import 'vs/css!./media/testing';
+import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { localize } from 'vs/nls';
+import { MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuItemAction } from 'vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { FileKind } from 'vs/platform/files/common/files';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IProgress, IProgressService, IProgressStep } from 'vs/platform/progress/common/progress';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { IResourceLabel, IResourceLabelOptions, IResourceLabelProps, ResourceLabels } from 'vs/workbench/browser/labels';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
+import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
+import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { HierarchicalByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation';
+import { HierarchicalByNameProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName';
+import { getComputedState } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalNodes';
+import { StateByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation';
+import { StateByNameProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateByName';
+import { StateElement } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateNodes';
+import { testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
+import { ITestExplorerFilterState, TestExplorerFilterState, TestingExplorerFilter } from 'vs/workbench/contrib/testing/browser/testingExplorerFilter';
+import { TestingOutputPeekController } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
+import { TestExplorerViewGrouping, TestExplorerViewMode, Testing, testStateNames } from 'vs/workbench/contrib/testing/common/constants';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { cmpPriority, isFailedState } from 'vs/workbench/contrib/testing/common/testingStates';
+import { buildTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
+import { ITestResultService, sumCounts, TestStateCount } from 'vs/workbench/contrib/testing/common/testResultService';
+import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
+import { IWorkspaceTestCollectionService, TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+import { IActivityService, NumberBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { DebugAction, RunAction } from './testExplorerActions';
+
+export class TestingExplorerView extends ViewPane {
+	public viewModel!: TestingExplorerViewModel;
+	private filterActionBar = this._register(new MutableDisposable());
+	private currentSubscription?: TestSubscriptionListener;
+	private container!: HTMLElement;
+	private finishDiscovery?: () => void;
+	private readonly location = TestingContextKeys.explorerLocation.bindTo(this.contextKeyService);;
+
+	constructor(
+		options: IViewletViewOptions,
+		@IWorkspaceTestCollectionService private readonly testCollection: IWorkspaceTestCollectionService,
+		@ITestService private readonly testService: ITestService,
+		@IProgressService private readonly progress: IProgressService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService themeService: IThemeService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+		this._register(testService.onDidChangeProviders(() => this._onDidChangeViewWelcomeState.fire()));
+		this.location.set(viewDescriptorService.getViewLocationById(Testing.ExplorerViewId) ?? ViewContainerLocation.Sidebar);
+	}
+
+	/**
+	 * @override
+	 */
+	public shouldShowWelcome() {
+		return this.testService.providers === 0;
+	}
+
+	/**
+	 * @override
+	 */
+	protected renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this.container = dom.append(container, dom.$('.test-explorer'));
+
+		if (this.location.get() === ViewContainerLocation.Sidebar) {
+			this.filterActionBar.value = this.createFilterActionBar();
+		}
+
+		const messagesContainer = dom.append(this.container, dom.$('.test-explorer-messages'));
+		this._register(this.instantiationService.createInstance(TestRunProgress, messagesContainer, this.getProgressLocation()));
+
+		const listContainer = dom.append(this.container, dom.$('.test-explorer-tree'));
+		this.viewModel = this.instantiationService.createInstance(TestingExplorerViewModel, listContainer, this.onDidChangeBodyVisibility, this.currentSubscription);
+		this._register(this.viewModel);
+
+		this._register(this.onDidChangeBodyVisibility(visible => {
+			if (!visible && this.currentSubscription) {
+				this.currentSubscription.dispose();
+				this.currentSubscription = undefined;
+				this.viewModel.replaceSubscription(undefined);
+			} else if (visible && !this.currentSubscription) {
+				this.currentSubscription = this.createSubscription();
+				this.viewModel.replaceSubscription(this.currentSubscription);
+			}
+		}));
+	}
+
+	/**
+	 * @override
+	 */
+	public getActionViewItem(action: IAction): IActionViewItem | undefined {
+		if (action.id === Testing.FilterActionId) {
+			return this.instantiationService.createInstance(TestingExplorerFilter, action);
+		}
+
+		return super.getActionViewItem(action);
+	}
+
+	/**
+	 * @override
+	 */
+	public saveState() {
+		super.saveState();
+	}
+
+	private createFilterActionBar() {
+		const bar = new ActionBar(this.container, { actionViewItemProvider: action => this.getActionViewItem(action) });
+		bar.push(new Action(Testing.FilterActionId));
+		bar.getContainer().classList.add('testing-filter-action-bar');
+		return bar;
+	}
+
+	private updateDiscoveryProgress(busy: number) {
+		if (!busy && this.finishDiscovery) {
+			this.finishDiscovery();
+			this.finishDiscovery = undefined;
+		} else if (busy && !this.finishDiscovery) {
+			const promise = new Promise<void>(resolve => { this.finishDiscovery = resolve; });
+			this.progress.withProgress({ location: this.getProgressLocation() }, () => promise);
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	protected layoutBody(height: number, width: number): void {
+		super.layoutBody(height, width);
+		this.container.style.height = `${height}px`;
+		this.viewModel.layout(height, width);
+	}
+
+	private createSubscription() {
+		const handle = this.testCollection.subscribeToWorkspaceTests();
+		handle.subscription.onBusyProvidersChange(() => this.updateDiscoveryProgress(handle.subscription.busyProviders));
+		return handle;
+	}
+}
+
+export class TestingExplorerViewModel extends Disposable {
+	public tree: ObjectTree<ITestTreeElement, FuzzyScore>;
+	private filter: TestsFilter;
+	public projection!: ITestTreeProjection;
+
+	private readonly _viewMode = TestingContextKeys.viewMode.bindTo(this.contextKeyService);
+	private readonly _viewGrouping = TestingContextKeys.viewGrouping.bindTo(this.contextKeyService);
+
+	/**
+	 * Fires when the selected tests change.
+	 */
+	public readonly onDidChangeSelection: Event<ITreeEvent<ITestTreeElement | null>>;
+
+	public get viewMode() {
+		return this._viewMode.get() ?? TestExplorerViewMode.Tree;
+	}
+
+	public set viewMode(newMode: TestExplorerViewMode) {
+		if (newMode === this._viewMode.get()) {
+			return;
+		}
+
+		this._viewMode.set(newMode);
+		this.updatePreferredProjection();
+		this.storageService.store('testing.viewMode', newMode, StorageScope.WORKSPACE, StorageTarget.USER);
+	}
+
+
+	public get viewGrouping() {
+		return this._viewGrouping.get() ?? TestExplorerViewGrouping.ByLocation;
+	}
+
+	public set viewGrouping(newGrouping: TestExplorerViewGrouping) {
+		if (newGrouping === this._viewGrouping.get()) {
+			return;
+		}
+
+		this._viewGrouping.set(newGrouping);
+		this.updatePreferredProjection();
+		this.storageService.store('testing.viewGrouping', newGrouping, StorageScope.WORKSPACE, StorageTarget.USER);
+	}
+
+	constructor(
+		listContainer: HTMLElement,
+		onDidChangeVisibility: Event<boolean>,
+		private listener: TestSubscriptionListener | undefined,
+		@ITestExplorerFilterState filterState: TestExplorerFilterState,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		this._viewMode.set(this.storageService.get('testing.viewMode', StorageScope.WORKSPACE, TestExplorerViewMode.Tree) as TestExplorerViewMode);
+		this._viewGrouping.set(this.storageService.get('testing.viewGrouping', StorageScope.WORKSPACE, TestExplorerViewGrouping.ByLocation) as TestExplorerViewGrouping);
+
+		const labels = this._register(instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: onDidChangeVisibility }));
+
+		this.filter = new TestsFilter(filterState.value);
+
+		this._register(filterState.onDidChange(text => {
+			this.filter.setFilter(text);
+			this.tree.refilter();
+		}));
+
+		this.tree = instantiationService.createInstance(
+			WorkbenchObjectTree,
+			'Test Explorer List',
+			listContainer,
+			new ListDelegate(),
+			[
+				instantiationService.createInstance(TestsRenderer, labels)
+			],
+			{
+				simpleKeyboardNavigation: true,
+				identityProvider: instantiationService.createInstance(IdentityProvider),
+				hideTwistiesOfChildlessElements: true,
+				sorter: instantiationService.createInstance(TreeSorter),
+				keyboardNavigationLabelProvider: instantiationService.createInstance(TreeKeyboardNavigationLabelProvider),
+				accessibilityProvider: instantiationService.createInstance(ListAccessibilityProvider),
+				filter: this.filter,
+			}) as WorkbenchObjectTree<ITestTreeElement, FuzzyScore>;
+		this._register(this.tree);
+
+		this._register(dom.addStandardDisposableListener(this.tree.getHTMLElement(), 'keydown', evt => {
+			if (DefaultKeyboardNavigationDelegate.mightProducePrintableCharacter(evt)) {
+				filterState.value = evt.browserEvent.key;
+				filterState.focusInput();
+			}
+		}));
+
+		this.updatePreferredProjection();
+
+		this.onDidChangeSelection = this.tree.onDidChangeSelection;
+		this._register(this.tree.onDidChangeSelection(evt => {
+			const selected = evt.elements[0];
+			if (selected && evt.browserEvent) {
+				this.openEditorForItem(selected);
+			}
+		}));
+
+		const tracker = this._register(new CodeEditorTracker(codeEditorService, this));
+		this._register(onDidChangeVisibility(visible => {
+			if (visible) {
+				tracker.activate();
+			} else {
+				tracker.deactivate();
+			}
+		}));
+	}
+
+	/**
+	 * Re-layout the tree.
+	 */
+	public layout(height: number, width: number): void {
+		this.tree.layout(height, width);
+	}
+
+	/**
+	 * Replaces the test listener and recalculates the tree.
+	 */
+	public replaceSubscription(listener: TestSubscriptionListener | undefined) {
+		this.listener = listener;
+		this.updatePreferredProjection();
+	}
+
+	/**
+	 * Reveals and moves focus to the item.
+	 */
+	public async revealItem(item: ITestTreeElement, reveal = true): Promise<void> {
+		if (!this.tree.hasElement(item)) {
+			return;
+		}
+
+		const chain: ITestTreeElement[] = [];
+		for (let parent = item.parentItem; parent; parent = parent.parentItem) {
+			chain.push(parent);
+		}
+
+		for (const parent of chain.reverse()) {
+			try {
+				this.tree.expand(parent);
+			} catch {
+				// ignore if not present
+			}
+		}
+
+		if (reveal === true && this.tree.getRelativeTop(item) === null) {
+			// Don't scroll to the item if it's already visible, or if set not to.
+			this.tree.reveal(item, 0.5);
+		}
+
+		this.tree.setFocus([item]);
+		this.tree.setSelection([item]);
+	}
+
+	/**
+	 * Collapse all items in the tree.
+	 */
+	public async collapseAll() {
+		this.tree.collapseAll();
+	}
+
+	/**
+	 * Opens an editor for the item. If there is a failure associated with the
+	 * test item, it will be shown.
+	 */
+	public async openEditorForItem(item: ITestTreeElement, preserveFocus = true) {
+		if (await this.tryPeekError(item)) {
+			return;
+		}
+
+		const location = item?.location;
+		if (!location) {
+			return;
+		}
+
+		const pane = await this.editorService.openEditor({
+			resource: location.uri,
+			options: {
+				selection: { startColumn: location.range.startColumn, startLineNumber: location.range.startLineNumber },
+				preserveFocus,
+			},
+		});
+
+		// if the user selected a failed test and now they didn't, hide the peek
+		const control = pane?.getControl();
+		if (isCodeEditor(control)) {
+			TestingOutputPeekController.get(control).removePeek();
+		}
+	}
+
+	/**
+	 * Tries to peek the first test error, if the item is in a failed state.
+	 */
+	private async tryPeekError(item: ITestTreeElement) {
+		if (!item.test || !isFailedState(item.test.item.state.runState)) {
+			return false;
+		}
+
+		const index = item.test.item.state.messages.findIndex(m => !!m.location);
+		if (index === -1) {
+			return;
+		}
+
+		const message = item.test.item.state.messages[index];
+		const pane = await this.editorService.openEditor({
+			resource: message.location!.uri,
+			options: { selection: message.location!.range, preserveFocus: true }
+		});
+
+		const control = pane?.getControl();
+		if (!isCodeEditor(control)) {
+			return false;
+		}
+
+		TestingOutputPeekController.get(control).show(buildTestUri({
+			type: TestUriType.LiveMessage,
+			messageIndex: index,
+			providerId: item.test.providerId,
+			testId: item.test.id,
+		}));
+
+		return true;
+	}
+
+	private updatePreferredProjection() {
+		this.projection?.dispose();
+		if (!this.listener) {
+			this.tree.setChildren(null, []);
+			return;
+		}
+
+		if (this._viewGrouping.get() === TestExplorerViewGrouping.ByLocation) {
+			if (this._viewMode.get() === TestExplorerViewMode.List) {
+				this.projection = new HierarchicalByNameProjection(this.listener);
+			} else {
+				this.projection = new HierarchicalByLocationProjection(this.listener);
+			}
+		} else {
+			if (this._viewMode.get() === TestExplorerViewMode.List) {
+				this.projection = new StateByNameProjection(this.listener);
+			} else {
+				this.projection = new StateByLocationProjection(this.listener);
+			}
+		}
+
+		this.projection.onUpdate(this.deferUpdate, this);
+		this.projection.applyTo(this.tree);
+	}
+
+	@throttle(200)
+	private deferUpdate() {
+		this.projection.applyTo(this.tree);
+	}
+
+	/**
+	 * Gets the selected tests from the tree.
+	 */
+	public getSelectedTests() {
+		return this.tree.getSelection();
+	}
+}
+
+class CodeEditorTracker {
+	private store = new DisposableStore();
+	private lastRevealed?: ITestTreeElement;
+
+	constructor(@ICodeEditorService private readonly codeEditorService: ICodeEditorService, private readonly model: TestingExplorerViewModel) {
+	}
+
+	public activate() {
+		const editorStores = new Set<DisposableStore>();
+		this.store.add(toDisposable(() => {
+			for (const store of editorStores) {
+				store.dispose();
+			}
+		}));
+
+		const register = (editor: ICodeEditor) => {
+			const store = new DisposableStore();
+			editorStores.add(store);
+
+			store.add(editor.onDidChangeCursorPosition(evt => {
+				const uri = editor.getModel()?.uri;
+				if (!uri) {
+					return;
+				}
+
+				const test = this.model.projection.getTestAtPosition(uri, evt.position);
+				if (test && test !== this.lastRevealed) {
+					this.model.revealItem(test);
+					this.lastRevealed = test;
+				}
+			}));
+
+			editor.onDidDispose(() => {
+				store.dispose();
+				editorStores.delete(store);
+			});
+		};
+
+		this.store.add(this.codeEditorService.onCodeEditorAdd(register));
+		this.codeEditorService.listCodeEditors().forEach(register);
+	}
+
+	public deactivate() {
+		this.store.dispose();
+		this.store = new DisposableStore();
+	}
+
+	public dispose() {
+		this.store.dispose();
+	}
+}
+
+const enum FilterResult {
+	Include,
+	Exclude,
+	Inherit,
+}
+
+class TestsFilter implements ITreeFilter<ITestTreeElement> {
+	private filters: [include: boolean, value: string][] | undefined;
+
+	constructor(initialFilter: string) {
+		this.setFilter(initialFilter);
+	}
+
+	/**
+	 * Parses and updates the tree filter. Supports lists of patterns that can be !negated.
+	 */
+	public setFilter(text: string) {
+		text = text.trim();
+
+		if (!text) {
+			this.filters = undefined;
+			return;
+		}
+
+		this.filters = [];
+		for (const filter of splitGlobAware(text, ',').map(s => s.trim()).filter(s => !!s.length)) {
+			if (filter.startsWith('!')) {
+				this.filters.push([false, filter.slice(1).toLowerCase()]);
+			} else {
+				this.filters.push([true, filter.toLowerCase()]);
+			}
+		}
+	}
+
+	public filter(element: ITestTreeElement): TreeFilterResult<void> {
+		for (let e: ITestTreeElement | null = element; e; e = e.parentItem) {
+			switch (this.testFilterText(e.label)) {
+				case FilterResult.Exclude:
+					return TreeVisibility.Hidden;
+				case FilterResult.Include:
+					return TreeVisibility.Visible;
+				case FilterResult.Inherit:
+				// continue to parent
+			}
+		}
+
+		return TreeVisibility.Recurse;
+	}
+
+	private testFilterText(data: string) {
+		if (!this.filters) {
+			return FilterResult.Include;
+		}
+
+		// start as included if the first glob is a negation
+		let included = this.filters[0][0] === false ? FilterResult.Exclude : FilterResult.Inherit;
+		data = data.toLowerCase();
+
+		for (const [include, filter] of this.filters) {
+			if (data.includes(filter)) {
+				included = include ? FilterResult.Include : FilterResult.Exclude;
+			}
+		}
+
+		return included;
+	}
+}
+
+class TreeSorter implements ITreeSorter<ITestTreeElement> {
+	public compare(a: ITestTreeElement, b: ITestTreeElement): number {
+		if (a instanceof StateElement && b instanceof StateElement) {
+			return cmpPriority(a.computedState, b.computedState);
+		}
+
+		return a.label.localeCompare(b.label);
+	}
+}
+
+class ListAccessibilityProvider implements IListAccessibilityProvider<ITestTreeElement> {
+	getWidgetAriaLabel(): string {
+		return localize('testExplorer', "Test Explorer");
+	}
+
+	getAriaLabel(element: ITestTreeElement): string {
+		return localize({
+			key: 'testing.treeElementLabel',
+			comment: ['label then the unit tests state, for example "Addition Tests (Running)"'],
+		}, '{0} ({1})', element.label, testStateNames[getComputedState(element)]);
+	}
+}
+
+class TreeKeyboardNavigationLabelProvider implements IKeyboardNavigationLabelProvider<ITestTreeElement> {
+	getKeyboardNavigationLabel(element: ITestTreeElement) {
+		return element.label;
+	}
+}
+
+class ListDelegate implements IListVirtualDelegate<ITestTreeElement> {
+	getHeight(_element: ITestTreeElement) {
+		return 22;
+	}
+
+	getTemplateId(_element: ITestTreeElement) {
+		return TestsRenderer.ID;
+	}
+}
+
+class IdentityProvider implements IIdentityProvider<ITestTreeElement> {
+	public getId(element: ITestTreeElement) {
+		return element.treeId;
+	}
+}
+
+interface TestTemplateData {
+	label: IResourceLabel;
+	icon: HTMLElement;
+	actionBar: ActionBar;
+}
+
+class TestsRenderer implements ITreeRenderer<ITestTreeElement, FuzzyScore, TestTemplateData> {
+	public static readonly ID = 'testExplorer';
+
+	constructor(
+		private labels: ResourceLabels,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
+	) { }
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<ITestTreeElement>, FuzzyScore>, index: number, templateData: TestTemplateData): void {
+		const element = node.element.elements[node.element.elements.length - 1];
+		this.renderElementDirect(element, templateData);
+	}
+
+	get templateId(): string {
+		return TestsRenderer.ID;
+	}
+
+	public renderTemplate(container: HTMLElement): TestTemplateData {
+		const wrapper = dom.append(container, dom.$('.test-item'));
+
+		const icon = dom.append(wrapper, dom.$('.computed-state'));
+		const name = dom.append(wrapper, dom.$('.name'));
+		const label = this.labels.create(name, { supportHighlights: true });
+
+		const actionBar = new ActionBar(wrapper, {
+			actionViewItemProvider: action =>
+				action instanceof MenuItemAction
+					? this.instantiationService.createInstance(MenuEntryActionViewItem, action)
+					: undefined
+		});
+
+		return { label, actionBar, icon };
+	}
+
+	public renderElement(node: ITreeNode<ITestTreeElement, FuzzyScore>, index: number, data: TestTemplateData): void {
+		this.renderElementDirect(node.element, data);
+	}
+
+	private renderElementDirect(element: ITestTreeElement, data: TestTemplateData) {
+		const label: IResourceLabelProps = { name: element.label };
+		const options: IResourceLabelOptions = {};
+		data.actionBar.clear();
+
+		const state = getComputedState(element);
+		const icon = testingStatesToIcons.get(state);
+		data.icon.className = 'computed-state ' + (icon ? ThemeIcon.asClassName(icon) : '');
+		const test = element.test;
+		if (test) {
+			if (test.item.location) {
+				label.resource = test.item.location.uri;
+			}
+
+			let title = element.label;
+			for (let p = element.parentItem; p; p = p.parentItem) {
+				title = `${p.label}, ${title}`;
+			}
+
+			options.title = title;
+			options.fileKind = FileKind.FILE;
+			label.description = element.description;
+		} else {
+			options.fileKind = FileKind.ROOT_FOLDER;
+		}
+
+		const running = state === TestRunState.Running;
+		if (!Iterable.isEmpty(element.runnable)) {
+			data.actionBar.push(
+				this.instantiationService.createInstance(RunAction, element.runnable, running),
+				{ icon: true, label: false },
+			);
+		}
+
+		if (!Iterable.isEmpty(element.debuggable)) {
+			data.actionBar.push(
+				this.instantiationService.createInstance(DebugAction, element.debuggable, running),
+				{ icon: true, label: false },
+			);
+		}
+
+		data.label.setResource(label, options);
+	}
+
+	disposeTemplate(templateData: TestTemplateData): void {
+		templateData.label.dispose();
+		templateData.actionBar.dispose();
+	}
+}
+
+const collectCounts = (count: TestStateCount) => {
+	const failed = count[TestRunState.Errored] + count[TestRunState.Failed];
+	const passed = count[TestRunState.Passed];
+	const skipped = count[TestRunState.Skipped];
+
+	return {
+		passed,
+		failed,
+		runSoFar: passed + failed,
+		totalWillBeRun: passed + failed + count[TestRunState.Queued] + count[TestRunState.Running],
+		skipped,
+	};
+};
+
+const getProgressText = ({ passed, runSoFar, skipped }: { passed: number, runSoFar: number, skipped: number }) => {
+	const percent = (passed / runSoFar * 100).toFixed(0);
+	if (skipped === 0) {
+		return localize('testProgress', '{0}/{1} tests passed ({2}%)', passed, runSoFar, percent);
+	} else {
+		return localize('testProgressWithSkip', '{0}/{1} tests passed ({2}%, {3} skipped)', passed, runSoFar, percent, skipped);
+	}
+};
+
+class TestRunProgress {
+	private current?: { update: IProgress<IProgressStep>; deferred: DeferredPromise<void> };
+	private badge = new MutableDisposable();
+	private readonly resultLister = this.resultService.onNewTestResult(result => {
+		this.updateProgress();
+		this.updateBadge();
+
+		result.onChange(this.throttledProgressUpdate, this);
+		result.onComplete(() => {
+			this.throttledProgressUpdate();
+			this.updateBadge();
+		});
+	});
+
+	constructor(
+		private readonly messagesContainer: HTMLElement,
+		private readonly location: string,
+		@IProgressService private readonly progress: IProgressService,
+		@ITestResultService private readonly resultService: ITestResultService,
+		@IActivityService private readonly activityService: IActivityService,
+	) {
+	}
+
+	public dispose() {
+		this.resultLister.dispose();
+		this.current?.deferred.complete();
+		this.badge.dispose();
+	}
+
+	@throttle(200)
+	private throttledProgressUpdate() {
+		this.updateProgress();
+	}
+
+	private updateProgress() {
+		const running = this.resultService.results.filter(r => !r.isComplete);
+		if (!running.length) {
+			this.setIdleText(this.resultService.results[0]?.counts);
+			this.current?.deferred.complete();
+			this.current = undefined;
+		} else if (!this.current) {
+			this.progress.withProgress({ location: this.location, total: 100 }, update => {
+				this.current = { update, deferred: new DeferredPromise() };
+				this.updateProgress();
+				return this.current.deferred.p;
+			});
+		} else {
+			const counts = sumCounts(running.map(r => r.counts));
+			this.setRunningText(counts);
+			const { runSoFar, totalWillBeRun } = collectCounts(counts);
+			this.current.update.report({ increment: runSoFar, total: totalWillBeRun });
+		}
+	}
+
+	private setRunningText(counts: TestStateCount) {
+		this.messagesContainer.dataset.state = 'running';
+
+		const collected = collectCounts(counts);
+		if (collected.runSoFar === 0) {
+			this.messagesContainer.innerText = localize('testResultStarting', 'Test run is starting...');
+		} else {
+			this.messagesContainer.innerText = getProgressText(collected);
+		}
+	}
+
+	private setIdleText(lastCount?: TestStateCount) {
+		if (!lastCount) {
+			this.messagesContainer.innerText = '';
+		} else {
+			const collected = collectCounts(lastCount);
+			this.messagesContainer.dataset.state = collected.failed ? 'failed' : 'running';
+			const doneMessage = getProgressText(collected);
+			this.messagesContainer.innerText = doneMessage;
+			aria.alert(doneMessage);
+		}
+	}
+
+	private updateBadge() {
+		this.badge.value = undefined;
+		const result = this.resultService.results[0]; // currently running, or last run
+		if (!result) {
+			return;
+		}
+
+		if (!result.isComplete) {
+			const badge = new ProgressBadge(() => localize('testBadgeRunning', 'Test run in progress'));
+			this.badge.value = this.activityService.showViewActivity(Testing.ExplorerViewId, { badge, clazz: 'progress-badge' });
+			return;
+		}
+
+		const failures = result.counts[TestRunState.Failed] + result.counts[TestRunState.Errored];
+		if (failures === 0) {
+			return;
+		}
+
+		const badge = new NumberBadge(failures, () => localize('testBadgeFailures', '{0} tests failed', failures));
+		this.badge.value = this.activityService.showViewActivity(Testing.ExplorerViewId, { badge });
+	}
+}
+
+registerThemingParticipant((theme, collector) => {
+	if (theme.type === 'dark') {
+		const foregroundColor = theme.getColor(foreground);
+		if (foregroundColor) {
+			const fgWithOpacity = new Color(new RGBA(foregroundColor.rgba.r, foregroundColor.rgba.g, foregroundColor.rgba.b, 0.65));
+			collector.addRule(`.test-explorer .test-explorer-messages { color: ${fgWithOpacity}; }`);
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
new file mode 100644
index 000000000..9c2dc7a00
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -0,0 +1,374 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { Codicon } from 'vs/base/common/codicons';
+import { Color } from 'vs/base/common/color';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { Disposable, IReference, MutableDisposable } from 'vs/base/common/lifecycle';
+import { clamp } from 'vs/base/common/numbers';
+import { count } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import { getOuterEditor, IPeekViewService, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from 'vs/editor/contrib/peekView/peekView';
+import { localize } from 'vs/nls';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import { EditorModel } from 'vs/workbench/common/editor';
+import { testingPeekBorder } from 'vs/workbench/contrib/testing/browser/theme';
+import { Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { InternalTestItem, ITestMessage } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { buildTestUri, parseTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
+import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
+import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
+
+interface ITestDto {
+	messageIndex: number;
+	test: InternalTestItem;
+	expectedUri: URI;
+	actualUri: URI;
+	messageUri: URI;
+}
+
+/**
+ * Adds output/message peek functionality to code editors.
+ */
+export class TestingOutputPeekController extends Disposable implements IEditorContribution {
+	/**
+	 * Gets the controller associated with the given code editor.
+	 */
+	public static get(editor: ICodeEditor): TestingOutputPeekController {
+		return editor.getContribution<TestingOutputPeekController>(Testing.OutputPeekContributionId);
+	}
+
+	/**
+	 * Currently-shown peek view.
+	 */
+	private readonly peek = this._register(new MutableDisposable<TestingOutputPeek>());
+
+	/**
+	 * Context key updated when the peek is visible/hidden.
+	 */
+	private readonly visible: IContextKey<boolean>;
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITestResultService private readonly testResults: ITestResultService,
+		@ITestService private readonly testService: ITestService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super();
+		this.visible = TestingContextKeys.isPeekVisible.bindTo(contextKeyService);
+		this._register(editor.onDidChangeModel(() => this.peek.clear()));
+	}
+
+	/**
+	 * Shows a peek for the message in th editor.
+	 */
+	public async show(uri: URI) {
+		const dto = await this.retrieveTest(uri);
+		if (!dto) {
+			return;
+		}
+
+		const message = dto.test.item.state.messages[dto.messageIndex];
+		if (!message?.location) {
+			return;
+		}
+
+		const ctor = message.actualOutput !== undefined && message.expectedOutput !== undefined
+			? TestingDiffOutputPeek : TestingMessageOutputPeek;
+		const isNew = !(this.peek.value instanceof ctor);
+		if (isNew) {
+			this.peek.value = this.instantiationService.createInstance(ctor, this.editor);
+			this.peek.value.onDidClose(() => {
+				this.visible.set(false);
+				this.peek.value = undefined;
+			});
+		}
+
+		if (isNew) {
+			this.visible.set(true);
+			this.peek.value!.create();
+		}
+
+		this.peek.value!.setModel(dto);
+	}
+
+	/**
+	 * Disposes the peek view, if any.
+	 */
+	public removePeek() {
+		this.peek.clear();
+	}
+
+	private async retrieveTest(uri: URI): Promise<ITestDto | undefined> {
+		const parts = parseTestUri(uri);
+		if (!parts) {
+			return undefined;
+		}
+
+		if ('resultId' in parts) {
+			const test = this.testResults.lookup(parts.resultId)?.tests.find(t => t.id === parts.testId);
+			return test && {
+				test,
+				messageIndex: parts.messageIndex,
+				expectedUri: buildTestUri({ ...parts, type: TestUriType.ResultExpectedOutput }),
+				actualUri: buildTestUri({ ...parts, type: TestUriType.ResultActualOutput }),
+				messageUri: buildTestUri({ ...parts, type: TestUriType.ResultMessage }),
+			};
+		}
+
+		const test = await this.testService.lookupTest({ providerId: parts.providerId, testId: parts.testId });
+		if (!test) {
+			return;
+		}
+
+		return {
+			test,
+			messageIndex: parts.messageIndex,
+			expectedUri: buildTestUri({ ...parts, type: TestUriType.LiveActualOutput }),
+			actualUri: buildTestUri({ ...parts, type: TestUriType.LiveExpectedOutput }),
+			messageUri: buildTestUri({ ...parts, type: TestUriType.LiveMessage }),
+		};
+	}
+}
+
+abstract class TestingOutputPeek extends PeekViewWidget {
+	protected model = new MutableDisposable();
+	protected dimension?: dom.Dimension;
+
+	constructor(
+		editor: ICodeEditor,
+		@IThemeService themeService: IThemeService,
+		@IPeekViewService peekViewService: IPeekViewService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@ITextModelService protected readonly modelService: ITextModelService,
+	) {
+		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true, className: 'test-output-peek' }, instantiationService);
+
+		TestingContextKeys.isInPeek.bindTo(contextKeyService);
+		this._disposables.add(themeService.onDidColorThemeChange(this.applyTheme, this));
+		this._disposables.add(this.model);
+		this.applyTheme(themeService.getColorTheme());
+		peekViewService.addExclusiveWidget(editor, this);
+	}
+
+	private applyTheme(theme: IColorTheme) {
+		const borderColor = theme.getColor(testingPeekBorder) || Color.transparent;
+		this.style({
+			arrowColor: borderColor,
+			frameColor: borderColor,
+			headerBackgroundColor: theme.getColor(peekViewTitleBackground) || Color.transparent,
+			primaryHeadingColor: theme.getColor(peekViewTitleForeground),
+			secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground)
+		});
+	}
+
+	/**
+	 * Updates the test to be shown.
+	 */
+	public abstract setModel(dto: ITestDto): Promise<void>;
+
+	/**
+	 * @override
+	 */
+	protected _doLayoutBody(height: number, width: number) {
+		super._doLayoutBody(height, width);
+		this.dimension = new dom.Dimension(width, height);
+	}
+}
+
+const commonEditorOptions: IEditorOptions = {
+	scrollBeyondLastLine: false,
+	scrollbar: {
+		verticalScrollbarSize: 14,
+		horizontal: 'auto',
+		useShadows: true,
+		verticalHasArrows: false,
+		horizontalHasArrows: false,
+		alwaysConsumeMouseWheel: false
+	},
+	fixedOverflowWidgets: true,
+	readOnly: true,
+	minimap: {
+		enabled: false
+	},
+};
+
+const diffEditorOptions: IDiffEditorOptions = {
+	...commonEditorOptions,
+	enableSplitViewResizing: true,
+	isInEmbeddedEditor: true,
+	renderOverviewRuler: false,
+	ignoreTrimWhitespace: false,
+	renderSideBySide: true,
+};
+
+class TestingDiffOutputPeek extends TestingOutputPeek {
+	private readonly diff = this._disposables.add(new MutableDisposable<EmbeddedDiffEditorWidget>());
+
+	/**
+	 * @override
+	 */
+	protected _fillBody(containerElement: HTMLElement): void {
+		const diffContainer = dom.append(containerElement, dom.$('div.preview.inline'));
+		const preview = this.diff.value = this.instantiationService.createInstance(EmbeddedDiffEditorWidget, diffContainer, diffEditorOptions, this.editor);
+
+		if (this.dimension) {
+			preview.layout(this.dimension);
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	public async setModel({ test, messageIndex, expectedUri, actualUri }: ITestDto) {
+		const message = test.item.state.messages[messageIndex];
+		if (!message?.location) {
+			return;
+		}
+
+		this.show(message.location.range, hintDiffPeekHeight(message));
+		this.setTitle(message.message.toString(), test.item.label);
+
+		const [original, modified] = await Promise.all([
+			this.modelService.createModelReference(expectedUri),
+			this.modelService.createModelReference(actualUri),
+		]);
+
+		const model = this.model.value = new SimpleDiffEditorModel(original, modified);
+		if (!this.diff.value) {
+			this.model.value = undefined;
+		} else {
+			this.diff.value.setModel(model);
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	protected _doLayoutBody(height: number, width: number) {
+		super._doLayoutBody(height, width);
+		this.diff.value?.layout(this.dimension);
+	}
+}
+
+class TestingMessageOutputPeek extends TestingOutputPeek {
+	private readonly preview = this._disposables.add(new MutableDisposable<EmbeddedCodeEditorWidget>());
+
+	/**
+	 * @override
+	 */
+	protected _fillBody(containerElement: HTMLElement): void {
+		const diffContainer = dom.append(containerElement, dom.$('div.preview.inline'));
+		const preview = this.preview.value = this.instantiationService.createInstance(EmbeddedCodeEditorWidget, diffContainer, commonEditorOptions, this.editor);
+
+		if (this.dimension) {
+			preview.layout(this.dimension);
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	public async setModel({ test, messageIndex, messageUri }: ITestDto) {
+		const message = test.item.state.messages[messageIndex];
+		if (!message?.location) {
+			return;
+		}
+
+		this.show(message.location.range, hintPeekStrHeight(message.message.toString()));
+		this.setTitle(message.message.toString(), test.item.label);
+
+		const modelRef = this.model.value = await this.modelService.createModelReference(messageUri);
+		if (this.preview.value) {
+			this.preview.value.setModel(modelRef.object.textEditorModel);
+		} else {
+			this.model.value = undefined;
+		}
+	}
+
+	/**
+	 * @override
+	 */
+	protected _doLayoutBody(height: number, width: number) {
+		super._doLayoutBody(height, width);
+		this.preview.value?.layout(this.dimension);
+	}
+}
+
+const hintDiffPeekHeight = (message: ITestMessage) =>
+	Math.max(hintPeekStrHeight(message.actualOutput), hintPeekStrHeight(message.expectedOutput));
+
+const hintPeekStrHeight = (str: string | undefined) => clamp(count(str || '', '\n'), 5, 20);
+
+class SimpleDiffEditorModel extends EditorModel {
+	public readonly original = this._original.object.textEditorModel;
+	public readonly modified = this._modified.object.textEditorModel;
+
+	constructor(
+		private readonly _original: IReference<IResolvedTextEditorModel>,
+		private readonly _modified: IReference<IResolvedTextEditorModel>,
+	) {
+		super();
+	}
+
+	async load(): Promise<this> {
+		return this;
+	}
+
+	public dispose() {
+		super.dispose();
+		this._original.dispose();
+		this._modified.dispose();
+	}
+}
+
+function getOuterEditorFromDiffEditor(accessor: ServicesAccessor): ICodeEditor | null {
+	const diffEditors = accessor.get(ICodeEditorService).listDiffEditors();
+
+	for (const diffEditor of diffEditors) {
+		if (diffEditor.hasTextFocus() && diffEditor instanceof EmbeddedDiffEditorWidget) {
+			return diffEditor.getParentEditor();
+		}
+	}
+
+	return getOuterEditor(accessor);
+}
+
+export class CloseTestPeek extends EditorAction2 {
+	constructor() {
+		super({
+			id: 'editor.closeTestPeek',
+			title: localize('close', 'Close'),
+			icon: Codicon.close,
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.or(TestingContextKeys.isInPeek, TestingContextKeys.isPeekVisible),
+				ContextKeyExpr.not('config.editor.stablePeek')
+			),
+			keybinding: {
+				weight: KeybindingWeight.EditorContrib - 101,
+				primary: KeyCode.Escape
+			}
+		});
+	}
+
+	runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		const parent = getOuterEditorFromDiffEditor(accessor);
+		TestingOutputPeekController.get(parent ?? editor).removePeek();
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
new file mode 100644
index 000000000..974f93ba5
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IViewDescriptorService } from 'vs/workbench/common/views';
+import { Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
+
+export class TestingViewPaneContainer extends ViewPaneContainer {
+
+	constructor(
+		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IThemeService themeService: IThemeService,
+		@IStorageService storageService: IStorageService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IExtensionService extensionService: IExtensionService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+	) {
+		super(Testing.ViewletId, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+	}
+
+	create(parent: HTMLElement): void {
+		super.create(parent);
+		parent.classList.add('testing-view-pane');
+	}
+
+	getOptimalWidth(): number {
+		return 400;
+	}
+
+	getTitle(): string {
+		return localize('testing', "Testing");
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/browser/theme.ts b/src/vs/workbench/contrib/testing/browser/theme.ts
new file mode 100644
index 000000000..dfd5607d8
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/browser/theme.ts
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Color, RGBA } from 'vs/base/common/color';
+import { localize } from 'vs/nls';
+import { editorErrorForeground, editorForeground, editorHintForeground, editorInfoForeground, editorWarningForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { TestMessageSeverity, TestRunState } from 'vs/workbench/api/common/extHostTypes';
+
+export const testingColorIconFailed = registerColor('testing.iconFailed', {
+	dark: '#f14c4c',
+	light: '#f14c4c',
+	hc: '#000000'
+}, localize('testing.iconFailed', "Color for the 'failed' icon in the test explorer."));
+
+export const testingColorIconErrored = registerColor('testing.iconErrored', {
+	dark: '#f14c4c',
+	light: '#f14c4c',
+	hc: '#000000'
+}, localize('testing.iconErrored', "Color for the 'Errored' icon in the test explorer."));
+
+export const testingColorIconPassed = registerColor('testing.iconPassed', {
+	dark: '#73c991',
+	light: '#73c991',
+	hc: '#000000'
+}, localize('testing.iconPassed', "Color for the 'passed' icon in the test explorer."));
+
+export const testingColorRunAction = registerColor('testing.runAction', {
+	dark: testingColorIconPassed,
+	light: testingColorIconPassed,
+	hc: testingColorIconPassed
+}, localize('testing.runAction', "Color for 'run' icons in the editor."));
+
+export const testingColorIconQueued = registerColor('testing.iconQueued', {
+	dark: '#cca700',
+	light: '#cca700',
+	hc: '#000000'
+}, localize('testing.iconQueued', "Color for the 'Queued' icon in the test explorer."));
+
+export const testingColorIconUnset = registerColor('testing.iconUnset', {
+	dark: '#848484',
+	light: '#848484',
+	hc: '#848484'
+}, localize('testing.iconUnset', "Color for the 'Unset' icon in the test explorer."));
+
+export const testingColorIconSkipped = registerColor('testing.iconSkipped', {
+	dark: '#848484',
+	light: '#848484',
+	hc: '#848484'
+}, localize('testing.iconSkipped', "Color for the 'Skipped' icon in the test explorer."));
+
+export const testingPeekBorder = registerColor('testing.peekBorder', {
+	dark: editorErrorForeground,
+	light: editorErrorForeground,
+	hc: editorErrorForeground,
+}, localize('testing.peekBorder', 'Color of the peek view borders and arrow.'));
+
+export const testMessageSeverityColors: {
+	[K in TestMessageSeverity]: {
+		decorationForeground: string,
+		marginBackground: string,
+	};
+} = {
+	[TestMessageSeverity.Error]: {
+		decorationForeground: registerColor(
+			'testing.message.error.decorationForeground',
+			{ dark: editorErrorForeground, light: editorErrorForeground, hc: editorForeground },
+			localize('testing.message.error.decorationForeground', 'Text color of test error messages shown inline in the editor.')
+		),
+		marginBackground: registerColor(
+			'testing.message.error.lineBackground',
+			{ dark: new Color(new RGBA(255, 0, 0, 0.2)), light: new Color(new RGBA(255, 0, 0, 0.2)), hc: null },
+			localize('testing.message.error.marginBackground', 'Margin color beside error messages shown inline in the editor.')
+		),
+	},
+	[TestMessageSeverity.Warning]: {
+		decorationForeground: registerColor(
+			'testing.message.warning.decorationForeground',
+			{ dark: editorWarningForeground, light: editorWarningForeground, hc: editorForeground },
+			localize('testing.message.warning.decorationForeground', 'Text color of test warning messages shown inline in the editor.')
+		),
+		marginBackground: registerColor(
+			'testing.message.warning.lineBackground',
+			{ dark: new Color(new RGBA(255, 208, 0, 0.2)), light: new Color(new RGBA(255, 208, 0, 0.2)), hc: null },
+			localize('testing.message.warning.marginBackground', 'Margin color beside warning messages shown inline in the editor.')
+		),
+	},
+	[TestMessageSeverity.Information]: {
+		decorationForeground: registerColor(
+			'testing.message.info.decorationForeground',
+			{ dark: editorInfoForeground, light: editorInfoForeground, hc: editorForeground },
+			localize('testing.message.info.decorationForeground', 'Text color of test info messages shown inline in the editor.')
+		),
+		marginBackground: registerColor(
+			'testing.message.info.lineBackground',
+			{ dark: new Color(new RGBA(0, 127, 255, 0.2)), light: new Color(new RGBA(0, 127, 255, 0.2)), hc: null },
+			localize('testing.message.info.marginBackground', 'Margin color beside info messages shown inline in the editor.')
+		),
+	},
+	[TestMessageSeverity.Hint]: {
+		decorationForeground: registerColor(
+			'testing.message.hint.decorationForeground',
+			{ dark: editorHintForeground, light: editorHintForeground, hc: editorForeground },
+			localize('testing.message.hint.decorationForeground', 'Text color of test hint messages shown inline in the editor.')
+		),
+		marginBackground: registerColor(
+			'testing.message.hint.lineBackground',
+			{ dark: null, light: null, hc: editorForeground },
+			localize('testing.message.hint.marginBackground', 'Margin color beside hint messages shown inline in the editor.')
+		),
+	},
+};
+
+export const testStatesToIconColors: { [K in TestRunState]?: string } = {
+	[TestRunState.Errored]: testingColorIconErrored,
+	[TestRunState.Failed]: testingColorIconFailed,
+	[TestRunState.Passed]: testingColorIconPassed,
+	[TestRunState.Queued]: testingColorIconQueued,
+	[TestRunState.Unset]: testingColorIconUnset,
+	[TestRunState.Skipped]: testingColorIconUnset,
+};
+
+
+registerThemingParticipant((theme, collector) => {
+	for (const [state, { marginBackground }] of Object.entries(testMessageSeverityColors)) {
+		collector.addRule(`.monaco-editor .testing-inline-message-severity-${state} {
+			background: ${theme.getColor(marginBackground)};
+		}`);
+	}
+});
diff --git a/src/vs/workbench/contrib/testing/common/constants.ts b/src/vs/workbench/contrib/testing/common/constants.ts
new file mode 100644
index 000000000..d828393d0
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/constants.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+
+export const enum Testing {
+	// marked as "extension" so that any existing test extensions are assigned to it.
+	ViewletId = 'workbench.view.extension.test',
+	ExplorerViewId = 'workbench.view.testing',
+	OutputPeekContributionId = 'editor.contrib.testingOutputPeek',
+	DecorationsContributionId = 'editor.contrib.testingDecorations',
+	FilterActionId = 'workbench.actions.treeView.testExplorer.filter',
+}
+
+export const enum TestExplorerViewMode {
+	List = 'list',
+	Tree = 'true'
+}
+
+export const enum TestExplorerViewGrouping {
+	ByLocation = 'location',
+	ByStatus = 'status',
+}
+
+export const testStateNames: { [K in TestRunState]: string } = {
+	[TestRunState.Errored]: localize('testState.errored', 'Errored'),
+	[TestRunState.Failed]: localize('testState.failed', 'Failed'),
+	[TestRunState.Passed]: localize('testState.passed', 'Passed'),
+	[TestRunState.Queued]: localize('testState.queued', 'Queued'),
+	[TestRunState.Running]: localize('testState.running', 'Running'),
+	[TestRunState.Skipped]: localize('testState.skipped', 'Skipped'),
+	[TestRunState.Unset]: localize('testState.unset', 'Unset'),
+};
diff --git a/src/vs/workbench/contrib/testing/common/ownedTestCollection.ts b/src/vs/workbench/contrib/testing/common/ownedTestCollection.ts
new file mode 100644
index 000000000..41f4c891f
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/ownedTestCollection.ts
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { throttle } from 'vs/base/common/decorators';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { generateUuid } from 'vs/base/common/uuid';
+import { TestItem } from 'vs/workbench/api/common/extHostTypeConverters';
+import { RequiredTestItem, TestItem as ApiTestItem } from 'vs/workbench/api/common/extHostTypes';
+import { InternalTestItem, TestDiffOpType, TestsDiff, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testCollection';
+
+/**
+ * @private
+ */
+export class OwnedTestCollection {
+	protected readonly testIdToInternal = new Map<string, OwnedCollectionTestItem>();
+
+	/**
+	 * Gets test information by ID, if it was defined and still exists in this
+	 * extension host.
+	 */
+	public getTestById(id: string) {
+		return this.testIdToInternal.get(id);
+	}
+
+	/**
+	 * Creates a new test collection for a specific hierarchy for a workspace
+	 * or document observation.
+	 */
+	public createForHierarchy(publishDiff: (diff: TestsDiff) => void = () => undefined) {
+		return new SingleUseTestCollection(this.testIdToInternal, publishDiff);
+	}
+}
+/**
+ * @private
+ */
+export interface OwnedCollectionTestItem extends InternalTestItem {
+	actual: ApiTestItem;
+	previousChildren: Set<string>;
+	previousEquals: (v: ApiTestItem) => boolean;
+}
+
+
+/**
+ * Maintains tests created and registered for a single set of hierarchies
+ * for a workspace or document.
+ * @private
+ */
+export class SingleUseTestCollection implements IDisposable {
+	protected readonly testItemToInternal = new Map<ApiTestItem, OwnedCollectionTestItem>();
+	protected diff: TestsDiff = [];
+	private disposed = false;
+
+	/**
+	 * Debouncer for sending diffs. We use both a throttle and a debounce here,
+	 * so that tests that all change state simultenously are effected together,
+	 * but so we don't send hundreds of test updates per second to the main thread.
+	 */
+	private readonly debounceSendDiff = new RunOnceScheduler(() => this.throttleSendDiff(), 2);
+
+	constructor(private readonly testIdToInternal: Map<string, OwnedCollectionTestItem>, private readonly publishDiff: (diff: TestsDiff) => void) { }
+
+	/**
+	 * Adds a new root node to the collection.
+	 */
+	public addRoot(item: ApiTestItem, providerId: string) {
+		this.addItem(item, providerId, null);
+		this.debounceSendDiff.schedule();
+	}
+
+	/**
+	 * Gets test information by its reference, if it was defined and still exists
+	 * in this extension host.
+	 */
+	public getTestByReference(item: ApiTestItem) {
+		return this.testItemToInternal.get(item);
+	}
+
+	/**
+	 * Should be called when an item change is fired on the test provider.
+	 */
+	public onItemChange(item: ApiTestItem, providerId: string) {
+		const existing = this.testItemToInternal.get(item);
+		if (!existing) {
+			if (!this.disposed) {
+				console.warn(`Received a TestProvider.onDidChangeTest for a test that wasn't seen before as a child.`);
+			}
+			return;
+		}
+
+		this.addItem(item, providerId, existing.parent);
+		this.debounceSendDiff.schedule();
+	}
+
+	/**
+	 * Gets a diff of all changes that have been made, and clears the diff queue.
+	 */
+	public collectDiff() {
+		const diff = this.diff;
+		this.diff = [];
+		return diff;
+	}
+
+	/**
+	 * Pushes a new diff entry onto the collected diff list.
+	 */
+	public pushDiff(diff: TestsDiffOp) {
+		this.diff.push(diff);
+		this.debounceSendDiff.schedule();
+	}
+
+	public dispose() {
+		for (const item of this.testItemToInternal.values()) {
+			this.testIdToInternal.delete(item.id);
+		}
+
+		this.diff = [];
+		this.disposed = true;
+	}
+
+	protected getId(): string {
+		return generateUuid();
+	}
+
+	private addItem(actual: ApiTestItem, providerId: string, parent: string | null) {
+		let internal = this.testItemToInternal.get(actual);
+		const parentItem = parent ? this.testIdToInternal.get(parent) : null;
+		if (!internal) {
+			internal = {
+				actual,
+				id: this.getId(),
+				parent,
+				item: TestItem.from(actual, parentItem?.item.extId),
+				providerId,
+				previousChildren: new Set(),
+				previousEquals: itemEqualityComparator(actual),
+			};
+
+			this.testItemToInternal.set(actual, internal);
+			this.testIdToInternal.set(internal.id, internal);
+			this.diff.push([TestDiffOpType.Add, { id: internal.id, parent, providerId, item: internal.item }]);
+		} else if (!internal.previousEquals(actual)) {
+			internal.item = TestItem.from(actual, parentItem?.item.extId);
+			internal.previousEquals = itemEqualityComparator(actual);
+			this.diff.push([TestDiffOpType.Update, { id: internal.id, parent, providerId, item: internal.item }]);
+		}
+
+		// If there are children, track which ones are deleted
+		// and recursively and/update them.
+		if (actual.children) {
+			const deletedChildren = internal.previousChildren;
+			const currentChildren = new Set<string>();
+			for (const child of actual.children) {
+				const c = this.addItem(child, providerId, internal.id);
+				deletedChildren.delete(c.id);
+				currentChildren.add(c.id);
+			}
+
+			for (const child of deletedChildren) {
+				this.removeItembyId(child);
+			}
+
+			internal.previousChildren = currentChildren;
+		}
+
+
+		return internal;
+	}
+
+	private removeItembyId(id: string) {
+		this.diff.push([TestDiffOpType.Remove, id]);
+
+		const queue = [this.testIdToInternal.get(id)];
+		while (queue.length) {
+			const item = queue.pop();
+			if (!item) {
+				continue;
+			}
+
+			this.testIdToInternal.delete(item.id);
+			this.testItemToInternal.delete(item.actual);
+			for (const child of item.previousChildren) {
+				queue.push(this.testIdToInternal.get(child));
+			}
+		}
+	}
+
+	@throttle(200)
+	protected throttleSendDiff() {
+		this.flushDiff();
+	}
+
+	public flushDiff() {
+		const diff = this.collectDiff();
+		if (diff.length) {
+			this.publishDiff(diff);
+		}
+	}
+}
+
+const keyMap: { [K in keyof Omit<RequiredTestItem, 'children'>]: null } = {
+	id: null,
+	label: null,
+	location: null,
+	state: null,
+	debuggable: null,
+	description: null,
+	runnable: null
+};
+
+const simpleProps = Object.keys(keyMap) as ReadonlyArray<keyof typeof keyMap>;
+
+const itemEqualityComparator = (a: ApiTestItem) => {
+	const values: unknown[] = [];
+	for (const prop of simpleProps) {
+		values.push(a[prop]);
+	}
+
+	return (b: ApiTestItem) => {
+		for (let i = 0; i < simpleProps.length; i++) {
+			if (values[i] !== b[simpleProps[i]]) {
+				return false;
+			}
+		}
+
+		return true;
+	};
+};
diff --git a/src/vs/workbench/contrib/testing/common/storedValue.ts b/src/vs/workbench/contrib/testing/common/storedValue.ts
new file mode 100644
index 000000000..610235812
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/storedValue.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from 'vs/base/common/event';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+
+export interface IStoredValueSerialization<T> {
+	deserialize(data: string): T;
+	serialize(data: T): string;
+}
+
+const defaultSerialization: IStoredValueSerialization<any> = {
+	deserialize: d => JSON.parse(d),
+	serialize: d => JSON.stringify(d),
+};
+
+interface IStoredValueOptions<T> {
+	key: string;
+	scope: StorageScope;
+	target: StorageTarget;
+	serialization?: IStoredValueSerialization<T>;
+}
+
+/**
+ * todo@connor4312: is this worthy to be in common?
+ */
+export class StoredValue<T> {
+	private readonly serialization: IStoredValueSerialization<T>;
+	private readonly key: string;
+	private readonly scope: StorageScope;
+	private readonly target: StorageTarget;
+
+	/**
+	 * Emitted whenever the value is updated or deleted.
+	 */
+	public readonly onDidChange = Event.filter(this.storage.onDidChangeValue, e => e.key === this.key);
+
+	constructor(
+		options: IStoredValueOptions<T>,
+		@IStorageService private readonly storage: IStorageService,
+	) {
+		this.key = options.key;
+		this.scope = options.scope;
+		this.target = options.target;
+		this.serialization = options.serialization ?? defaultSerialization;
+	}
+
+	/**
+	 * Reads the value, returning the undefined if it's not set.
+	 */
+	public get(): T | undefined;
+
+	/**
+	 * Reads the value, returning the default value if it's not set.
+	 */
+	public get(defaultValue: T): T;
+
+	public get(defaultValue?: T): T | undefined {
+		const value = this.storage.get(this.key, this.scope);
+		return value === undefined ? defaultValue : this.serialization.deserialize(value);
+	}
+
+	/**
+	 * Persists changes to the value.
+	 * @param value
+	 */
+	public store(value: T) {
+		this.storage.store(this.key, this.serialization.serialize(value), this.scope, this.target);
+	}
+
+	/**
+	 * Delete an element stored under the provided key from storage.
+	 */
+	public delete() {
+		this.storage.remove(this.key, this.scope);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/common/testCollection.ts b/src/vs/workbench/contrib/testing/common/testCollection.ts
index ab76dab73..566146dc0 100644
--- a/src/vs/workbench/contrib/testing/common/testCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/testCollection.ts
@@ -9,11 +9,16 @@ import { Location as ModeLocation } from 'vs/editor/common/modes';
 import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
 import { TestMessageSeverity, TestRunState } from 'vs/workbench/api/common/extHostTypes';
 
+export interface TestIdWithProvider {
+	testId: string;
+	providerId: string;
+}
+
 /**
  * Request to them main thread to run a set of tests.
  */
 export interface RunTestsRequest {
-	tests: { testId: string; providerId: string }[];
+	tests: TestIdWithProvider[];
 	debug: boolean;
 }
 
@@ -57,12 +62,14 @@ export interface ITestState {
  * The TestItem from .d.ts, as a plain object without children.
  */
 export interface ITestItem {
+	/** ID of the test given by the test provider */
+	extId: string;
 	label: string;
 	children?: never;
 	location: ModeLocation | undefined;
 	description: string | undefined;
-	runnable: boolean | undefined;
-	debuggable: boolean | undefined;
+	runnable: boolean;
+	debuggable: boolean;
 	state: ITestState;
 }
 
@@ -76,16 +83,32 @@ export interface InternalTestItem {
 	item: ITestItem;
 }
 
+export interface InternalTestItemWithChildren extends InternalTestItem {
+	children: InternalTestItemWithChildren[];
+}
+
+export interface InternalTestResults {
+	tests: InternalTestItemWithChildren[];
+}
+
 export const enum TestDiffOpType {
+	/** Adds a new test (with children) */
 	Add,
+	/** Shallow-updates an existing test */
 	Update,
+	/** Removes a test (and all its children) */
 	Remove,
+	/** Changes the number of providers running initial test discovery. */
+	DeltaDiscoverComplete,
+	/** Changes the number of providers who are yet to publish their collection roots. */
+	DeltaRootsComplete,
 }
 
 export type TestsDiffOp =
 	| [op: TestDiffOpType.Add, item: InternalTestItem]
 	| [op: TestDiffOpType.Update, item: InternalTestItem]
-	| [op: TestDiffOpType.Remove, itemId: string];
+	| [op: TestDiffOpType.Remove, itemId: string]
+	| [op: TestDiffOpType.DeltaDiscoverComplete | TestDiffOpType.DeltaRootsComplete, amount: number];
 
 /**
  * Utility function to get a unique string for a subscription to a resource,
@@ -127,7 +150,7 @@ export class IncrementalChangeCollector<T> {
 	/**
 	 * A node was removed.
 	 */
-	public remove(node: T): void { }
+	public remove(node: T, isNestedOperation: boolean): void { }
 
 	/**
 	 * Called when the diff has been applied.
@@ -204,17 +227,42 @@ export abstract class AbstractIncrementalTestCollection<T extends IncrementalTes
 							if (existing) {
 								queue.push(existing.children);
 								this.items.delete(itemId);
-								changes.remove(existing);
+								changes.remove(existing, existing !== toRemove);
 							}
 						}
 					}
+					break;
 				}
+
+				case TestDiffOpType.DeltaDiscoverComplete:
+					this.updateBusyProviders(op[1]);
+					break;
+
+				case TestDiffOpType.DeltaRootsComplete:
+					this.updatePendingRoots(op[1]);
+					break;
 			}
 		}
 
 		changes.complete();
 	}
 
+	/**
+	 * Updates the number of providers who are still discovering items.
+	 */
+	protected updateBusyProviders(delta: number) {
+		// no-op
+	}
+
+	/**
+	 * Updates the number of test root sources who are yet to report. When
+	 * the total pending test roots reaches 0, the roots for all providers
+	 * will exist in the collection.
+	 */
+	protected updatePendingRoots(delta: number) {
+		// no-op
+	}
+
 	/**
 	 * Called before a diff is applied to create a new change collector.
 	 */
diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts
new file mode 100644
index 000000000..992081d3a
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testResultService.ts
@@ -0,0 +1,245 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from 'vs/base/common/event';
+import { generateUuid } from 'vs/base/common/uuid';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+import { IncrementalTestCollectionItem, InternalTestItemWithChildren, TestIdWithProvider } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { isRunningState, statesInOrder } from 'vs/workbench/contrib/testing/common/testingStates';
+import { IMainThreadTestCollection } from 'vs/workbench/contrib/testing/common/testService';
+
+export type TestStateCount = { [K in TestRunState]: number };
+
+const makeEmptyCounts = () => {
+	const o: Partial<TestStateCount> = {};
+	for (const state of statesInOrder) {
+		o[state] = 0;
+	}
+
+	return o as TestStateCount;
+};
+
+export const sumCounts = (counts: TestStateCount[]) => {
+	const total = makeEmptyCounts();
+	for (const count of counts) {
+		for (const state of statesInOrder) {
+			total[state] += count[state];
+		}
+	}
+
+	return total;
+};
+
+const makeNode = (
+	collection: IMainThreadTestCollection,
+	test: IncrementalTestCollectionItem,
+): TestResultItem => {
+	const mapped: TestResultItem = { ...test, children: [] };
+	for (const childId of test.children) {
+		const child = collection.getNodeById(childId);
+		if (child) {
+			mapped.children.push(makeNode(collection, child));
+		}
+	}
+
+	return mapped;
+};
+
+export interface TestResultItem extends InternalTestItemWithChildren { }
+
+/**
+ * Results of a test. These are created when the test initially started running
+ * and marked as "complete" when the run finishes.
+ */
+export class TestResult {
+	/**
+	 * Creates a new TestResult, pulling tests from the associated list
+	 * of collections.
+	 */
+	public static from(
+		collections: ReadonlyArray<IMainThreadTestCollection>,
+		tests: ReadonlyArray<TestIdWithProvider>,
+	) {
+		const mapped: TestResultItem[] = [];
+		for (const test of tests) {
+			for (const collection of collections) {
+				const node = collection.getNodeById(test.testId);
+				if (node) {
+					mapped.push(makeNode(collection, node));
+					break;
+				}
+			}
+		}
+
+		return new TestResult(mapped);
+	}
+
+	private completeEmitter = new Emitter<void>();
+	private changeEmitter = new Emitter<void>();
+	private _complete = false;
+	private _cachedCounts?: { [K in TestRunState]: number };
+
+	public onChange = this.changeEmitter.event;
+	public onComplete = this.completeEmitter.event;
+
+	/**
+	 * Unique ID for referring to this set of test results.
+	 */
+	public readonly id = generateUuid();
+
+	/**
+	 * Gets whether the test run has finished.
+	 */
+	public get isComplete() {
+		return this._complete;
+	}
+
+	/**
+	 * Gets a count of tests in each state.
+	 */
+	public get counts() {
+		if (this._cachedCounts) {
+			return this._cachedCounts;
+		}
+
+		const counts = makeEmptyCounts();
+		this.forEachTest(({ item }) => {
+			counts[item.state.runState]++;
+		});
+
+		if (this._complete) {
+			this._cachedCounts = counts;
+		}
+
+		return counts;
+	}
+
+	constructor(public readonly tests: TestResultItem[]) { }
+
+
+	/**
+	 * Notifies the service that all tests are complete.
+	 */
+	public markComplete() {
+		if (this._complete) {
+			throw new Error('cannot complete a test result multiple times');
+		}
+
+		// shallow clone test items to 'disconnect' them from the underlying
+		// connection and stop state changes. Also, marked any still-running
+		// tests as skipped.
+		this.forEachTest(test => {
+			test.item = { ...test.item };
+			if (isRunningState(test.item.state.runState)) {
+				test.item.state = { ...test.item.state, runState: TestRunState.Skipped };
+			}
+		});
+
+		this._complete = true;
+		this.completeEmitter.fire();
+	}
+
+	/**
+	 * Fires the 'change' event, should be called by the runner.
+	 */
+	public notifyChanged() {
+		this.changeEmitter.fire();
+	}
+
+	private forEachTest(fn: (test: TestResultItem) => void) {
+		const queue = [this.tests];
+		while (queue.length) {
+			for (const test of queue.pop()!) {
+				fn(test);
+				queue.push(test.children);
+			}
+		}
+	}
+}
+
+export interface ITestResultService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * List of test results. Currently running tests are always at the top.
+	 */
+	readonly results: TestResult[];
+
+	/**
+	 * Fired after a new event is added to the 'active' array.
+	 */
+	readonly onNewTestResult: Event<TestResult>;
+
+	/**
+	 * Adds a new test result to the collection.
+	 */
+	push(result: TestResult): TestResult;
+
+	/**
+	 * Looks up a set of test results by ID.
+	 */
+	lookup(resultId: string): TestResult | undefined;
+}
+
+export const ITestResultService = createDecorator<ITestResultService>('testResultService');
+
+const RETAIN_LAST_RESULTS = 16;
+
+export class TestResultService implements ITestResultService {
+	declare _serviceBrand: undefined;
+	private newResultEmitter = new Emitter<TestResult>();
+
+	/**
+	 * @inheritdoc
+	 */
+	public results: TestResult[] = [];
+
+	/**
+	 * @inheritdoc
+	 */
+	public readonly onNewTestResult = this.newResultEmitter.event;
+
+	private readonly isRunning: IContextKey<boolean>;
+
+	constructor(@IContextKeyService contextKeyService: IContextKeyService) {
+		this.isRunning = TestingContextKeys.isRunning.bindTo(contextKeyService);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public push(result: TestResult): TestResult {
+		this.results.unshift(result);
+		if (this.results.length > RETAIN_LAST_RESULTS) {
+			this.results.pop();
+		}
+
+		result.onComplete(this.onComplete, this);
+		this.isRunning.set(true);
+		this.newResultEmitter.fire(result);
+		return result;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public lookup(id: string) {
+		return this.results.find(r => r.id === id);
+	}
+
+	private onComplete() {
+		// move the complete test run down behind any still-running ones
+		for (let i = 0; i < this.results.length - 2; i++) {
+			if (this.results[i].isComplete && !this.results[i + 1].isComplete) {
+				[this.results[i], this.results[i + 1]] = [this.results[i + 1], this.results[i]];
+			}
+		}
+
+		this.isRunning.set(!this.results[0]?.isComplete);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/common/testService.ts b/src/vs/workbench/contrib/testing/common/testService.ts
index f4d84d583..d9fbf494a 100644
--- a/src/vs/workbench/contrib/testing/common/testService.ts
+++ b/src/vs/workbench/contrib/testing/common/testService.ts
@@ -3,28 +3,107 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, IReference } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
-import { RunTestForProviderRequest, RunTestsRequest, RunTestsResult, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { AbstractIncrementalTestCollection, IncrementalTestCollectionItem, InternalTestItem, RunTestForProviderRequest, RunTestsRequest, RunTestsResult, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
 
 export const ITestService = createDecorator<ITestService>('testService');
 
 export interface MainTestController {
-	runTests(request: RunTestForProviderRequest): Promise<RunTestsResult>;
+	lookupTest(test: TestIdWithProvider): Promise<InternalTestItem | undefined>;
+	runTests(request: RunTestForProviderRequest, token: CancellationToken): Promise<RunTestsResult>;
 }
 
 export type TestDiffListener = (diff: TestsDiff) => void;
 
+export interface IMainThreadTestCollection extends AbstractIncrementalTestCollection<IncrementalTestCollectionItem> {
+	onPendingRootProvidersChange: Event<number>;
+	onBusyProvidersChange: Event<number>;
+
+	/**
+	 * Number of test root sources who are yet to report.
+	 */
+	pendingRootProviders: number;
+
+	/**
+	 * Number of providers working to discover tests.
+	 */
+	busyProviders: number;
+
+	/**
+	 * Root node IDs.
+	 */
+	rootIds: ReadonlySet<string>;
+
+	/**
+	 * Iterates over every test in the collection.
+	 */
+	all: Iterable<IncrementalTestCollectionItem>;
+
+	/**
+	 * Gets a node in the collection by ID.
+	 */
+	getNodeById(id: string): IncrementalTestCollectionItem | undefined;
+
+	/**
+	 * Gets a diff that adds all items currently in the tree to a new collection,
+	 * allowing it to fully hydrate.
+	 */
+	getReviverDiff(): TestsDiff;
+}
+
+export const waitForAllRoots = (collection: IMainThreadTestCollection, timeout = 3000) => {
+	if (collection.pendingRootProviders === 0) {
+		return Promise.resolve();
+	}
+
+	let listener: IDisposable;
+	return new Promise<void>(resolve => {
+		listener = collection.onPendingRootProvidersChange(count => {
+			if (count === 0) {
+				resolve();
+			}
+		});
+
+		setTimeout(resolve, timeout);
+	}).finally(() => listener.dispose());
+};
+
 export interface ITestService {
 	readonly _serviceBrand: undefined;
-	readonly onShouldSubscribe: Event<{ resource: ExtHostTestingResource, uri: URI }>;
-	readonly onShouldUnsubscribe: Event<{ resource: ExtHostTestingResource, uri: URI }>;
+	readonly onShouldSubscribe: Event<{ resource: ExtHostTestingResource, uri: URI; }>;
+	readonly onShouldUnsubscribe: Event<{ resource: ExtHostTestingResource, uri: URI; }>;
+	readonly onDidChangeProviders: Event<{ delta: number; }>;
+	readonly providers: number;
+	readonly subscriptions: ReadonlyArray<{ resource: ExtHostTestingResource, uri: URI; }>;
+	readonly testRuns: Iterable<RunTestsRequest>;
+
 	registerTestController(id: string, controller: MainTestController): void;
 	unregisterTestController(id: string): void;
-	runTests(req: RunTestsRequest): Promise<RunTestsResult>;
+	runTests(req: RunTestsRequest, token?: CancellationToken): Promise<RunTestsResult>;
+	cancelTestRun(req: RunTestsRequest): void;
 	publishDiff(resource: ExtHostTestingResource, uri: URI, diff: TestsDiff): void;
-	subscribeToDiffs(resource: ExtHostTestingResource, uri: URI, acceptDiff: TestDiffListener): IDisposable;
+	subscribeToDiffs(resource: ExtHostTestingResource, uri: URI, acceptDiff?: TestDiffListener): IReference<IMainThreadTestCollection>;
+
+	/**
+	 * Updates the number of sources who provide test roots when subscription
+	 * is requested. This is equal to the number of extension hosts, and used
+	 * with `TestDiffOpType.DeltaRootsComplete` to signal when all roots
+	 * are available.
+	 */
+	updateRootProviderCount(delta: number): void;
+
+	/**
+	 * Looks up a test, by a request to extension hosts.
+	 */
+	lookupTest(test: TestIdWithProvider): Promise<InternalTestItem | undefined>;
+
+	/**
+	 * Requests to resubscribe to all active subscriptions, discarding old tests.
+	 */
+	resubscribeToAllTests(): void;
 }
diff --git a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
index 845534dd8..7ff73345c 100644
--- a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
+++ b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
@@ -4,24 +4,68 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { groupBy } from 'vs/base/common/arrays';
+import { disposableTimeout } from 'vs/base/common/async';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Emitter } from 'vs/base/common/event';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, IReference } from 'vs/base/common/lifecycle';
 import { isDefined } from 'vs/base/common/types';
 import { URI, UriComponents } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
-import { AbstractIncrementalTestCollection, collectTestResults, getTestSubscriptionKey, IncrementalTestCollectionItem, InternalTestItem, RunTestsRequest, RunTestsResult, TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
-import { ITestService, MainTestController, TestDiffListener } from 'vs/workbench/contrib/testing/common/testService';
+import { AbstractIncrementalTestCollection, collectTestResults, EMPTY_TEST_RESULT, getTestSubscriptionKey, IncrementalTestCollectionItem, InternalTestItem, RunTestsRequest, RunTestsResult, TestDiffOpType, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys';
+import { ITestResultService, TestResult } from 'vs/workbench/contrib/testing/common/testResultService';
+import { IMainThreadTestCollection, ITestService, MainTestController, TestDiffListener } from 'vs/workbench/contrib/testing/common/testService';
+
+type TestLocationIdent = { resource: ExtHostTestingResource, uri: URI };
+
+const workspaceUnsubscribeDelay = 30_000;
+const documentUnsubscribeDelay = 5_000;
 
 export class TestService extends Disposable implements ITestService {
 	declare readonly _serviceBrand: undefined;
 	private testControllers = new Map<string, MainTestController>();
 	private readonly testSubscriptions = new Map<string, {
 		collection: MainThreadTestCollection;
+		ident: TestLocationIdent;
 		onDiff: Emitter<TestsDiff>;
+		disposeTimeout?: IDisposable,
 		listeners: number;
 	}>();
-	private readonly subscribeEmitter = new Emitter<{ resource: ExtHostTestingResource, uri: URI }>();
-	private readonly unsubscribeEmitter = new Emitter<{ resource: ExtHostTestingResource, uri: URI }>();
+
+	private readonly subscribeEmitter = new Emitter<TestLocationIdent>();
+	private readonly unsubscribeEmitter = new Emitter<TestLocationIdent>();
+	private readonly busyStateChangeEmitter = new Emitter<TestLocationIdent & { busy: boolean }>();
+	private readonly changeProvidersEmitter = new Emitter<{ delta: number }>();
+	private readonly providerCount: IContextKey<number>;
+	private readonly runStartedEmitter = new Emitter<RunTestsRequest>();
+	private readonly runCompletedEmitter = new Emitter<{ req: RunTestsRequest, result: RunTestsResult }>();
+	private readonly runningTests = new Map<RunTestsRequest, CancellationTokenSource>();
+	private rootProviderCount = 0;
+
+	public readonly onTestRunStarted = this.runStartedEmitter.event;
+	public readonly onTestRunCompleted = this.runCompletedEmitter.event;
+
+	constructor(@IContextKeyService contextKeyService: IContextKeyService, @INotificationService private readonly notificationService: INotificationService, @ITestResultService private readonly testResults: ITestResultService) {
+		super();
+		this.providerCount = TestingContextKeys.providerCount.bindTo(contextKeyService);
+	}
+
+	/**
+	 * Gets currently running tests.
+	 */
+	public get testRuns() {
+		return this.runningTests.keys();
+	}
+
+	/**
+	 * Gets the current provider count.
+	 */
+	public get providers() {
+		return this.providerCount.get() || 0;
+	}
 
 	/**
 	 * Fired when extension hosts should pull events from their test factories.
@@ -33,48 +77,147 @@ export class TestService extends Disposable implements ITestService {
 	 */
 	public readonly onShouldUnsubscribe = this.unsubscribeEmitter.event;
 
+	/**
+	 * Fired when the number of providers change.
+	 */
+	public readonly onDidChangeProviders = this.changeProvidersEmitter.event;
+
 	/**
 	 * @inheritdoc
 	 */
-	async runTests(req: RunTestsRequest): Promise<RunTestsResult> {
-		const tests = groupBy(req.tests, (a, b) => a.providerId === b.providerId ? 0 : 1);
-		const requests = tests.map(group => {
-			const providerId = group[0].providerId;
-			const controller = this.testControllers.get(providerId);
-			return controller?.runTests({ providerId, debug: req.debug, ids: group.map(t => t.testId) });
-		}).filter(isDefined);
+	public readonly onBusyStateChange = this.busyStateChangeEmitter.event;
 
-		return collectTestResults(await Promise.all(requests));
+	/**
+	 * @inheritdoc
+	 */
+	public get subscriptions() {
+		return [...this.testSubscriptions].map(([, s]) => s.ident);
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public subscribeToDiffs(resource: ExtHostTestingResource, uri: URI, acceptDiff: TestDiffListener) {
+	public cancelTestRun(req: RunTestsRequest) {
+		this.runningTests.get(req)?.cancel();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public async lookupTest(test: TestIdWithProvider) {
+		for (const { collection } of this.testSubscriptions.values()) {
+			const node = collection.getNodeById(test.testId);
+			if (node) {
+				return node;
+			}
+		}
+
+		return this.testControllers.get(test.providerId)?.lookupTest(test);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public updateRootProviderCount(delta: number) {
+		this.rootProviderCount += delta;
+	}
+
+
+	/**
+	 * @inheritdoc
+	 */
+	public async runTests(req: RunTestsRequest, token = CancellationToken.None): Promise<RunTestsResult> {
+		let result: TestResult | undefined;
+		const subscriptions = [...this.testSubscriptions.values()]
+			.filter(v => req.tests.some(t => v.collection.getNodeById(t.testId)))
+			.map(s => this.subscribeToDiffs(s.ident.resource, s.ident.uri, () => result?.notifyChanged()));
+		result = this.testResults.push(TestResult.from(subscriptions.map(s => s.object), req.tests));
+
+		try {
+			const tests = groupBy(req.tests, (a, b) => a.providerId === b.providerId ? 0 : 1);
+			const cancelSource = new CancellationTokenSource(token);
+			const requests = tests.map(group => {
+				const providerId = group[0].providerId;
+				const controller = this.testControllers.get(providerId);
+				return controller?.runTests({ providerId, debug: req.debug, ids: group.map(t => t.testId) }, cancelSource.token).catch(err => {
+					this.notificationService.error(localize('testError', 'An error occurred attempting to run tests: {0}', err.message));
+					return EMPTY_TEST_RESULT;
+				});
+			}).filter(isDefined);
+
+			if (requests.length === 0) {
+				return EMPTY_TEST_RESULT;
+			}
+
+			this.runningTests.set(req, cancelSource);
+			const result = collectTestResults(await Promise.all(requests));
+			this.runningTests.delete(req);
+
+			return result;
+		} finally {
+			subscriptions.forEach(s => s.dispose());
+			result.markComplete();
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public resubscribeToAllTests() {
+		for (const subscription of this.testSubscriptions.values()) {
+			this.unsubscribeEmitter.fire(subscription.ident);
+			const diff = subscription.collection.clear();
+			subscription.onDiff.fire(diff);
+			this.subscribeEmitter.fire(subscription.ident);
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public subscribeToDiffs(resource: ExtHostTestingResource, uri: URI, acceptDiff?: TestDiffListener): IReference<IMainThreadTestCollection> {
 		const subscriptionKey = getTestSubscriptionKey(resource, uri);
 		let subscription = this.testSubscriptions.get(subscriptionKey);
 		if (!subscription) {
-			subscription = { collection: new MainThreadTestCollection(), listeners: 0, onDiff: new Emitter() };
+			subscription = {
+				ident: { resource, uri },
+				collection: new MainThreadTestCollection(this.rootProviderCount),
+				listeners: 0,
+				onDiff: new Emitter(),
+			};
 			this.subscribeEmitter.fire({ resource, uri });
 			this.testSubscriptions.set(subscriptionKey, subscription);
+		} else if (subscription.disposeTimeout) {
+			subscription.disposeTimeout.dispose();
+			subscription.disposeTimeout = undefined;
 		}
 
 		subscription.listeners++;
 
-		const revive = subscription.collection.getReviverDiff();
-		if (revive.length) {
-			acceptDiff(revive);
+		if (acceptDiff) {
+			acceptDiff(subscription.collection.getReviverDiff());
 		}
 
-		const listener = subscription.onDiff.event(acceptDiff);
-		return toDisposable(() => {
-			listener.dispose();
+		const listener = acceptDiff && subscription.onDiff.event(acceptDiff);
+		return {
+			object: subscription.collection,
+			dispose: () => {
+				listener?.dispose();
 
-			if (!--subscription!.listeners) {
-				this.unsubscribeEmitter.fire({ resource, uri });
-				this.testSubscriptions.delete(subscriptionKey);
+				if (--subscription!.listeners > 0) {
+					return;
+				}
+
+
+				subscription!.disposeTimeout = disposableTimeout(
+					() => {
+						this.unsubscribeEmitter.fire({ resource, uri });
+						this.testSubscriptions.delete(subscriptionKey);
+					},
+					resource === ExtHostTestingResource.TextDocument ? documentUnsubscribeDelay : workspaceUnsubscribeDelay,
+				);
 			}
-		});
+		};
 	}
 
 	/**
@@ -84,6 +227,7 @@ export class TestService extends Disposable implements ITestService {
 		const sub = this.testSubscriptions.get(getTestSubscriptionKey(resource, URI.revive(uri)));
 		if (sub) {
 			sub.collection.apply(diff);
+			// console.log('accept', sub.collection, diff);
 			sub.onDiff.fire(diff);
 		}
 	}
@@ -93,6 +237,8 @@ export class TestService extends Disposable implements ITestService {
 	 */
 	public registerTestController(id: string, controller: MainTestController): void {
 		this.testControllers.set(id, controller);
+		this.providerCount.set(this.testControllers.size);
+		this.changeProvidersEmitter.fire({ delta: 1 });
 	}
 
 	/**
@@ -100,16 +246,68 @@ export class TestService extends Disposable implements ITestService {
 	 */
 	public unregisterTestController(id: string): void {
 		this.testControllers.delete(id);
+		this.providerCount.set(this.testControllers.size);
+		this.changeProvidersEmitter.fire({ delta: -1 });
 	}
 }
 
-class MainThreadTestCollection extends AbstractIncrementalTestCollection<IncrementalTestCollectionItem> {
+class MainThreadTestCollection extends AbstractIncrementalTestCollection<IncrementalTestCollectionItem> implements IMainThreadTestCollection {
+	private pendingRootChangeEmitter = new Emitter<number>();
+	private busyProvidersChangeEmitter = new Emitter<number>();
+	private _busyProviders = 0;
+
 	/**
-	 * Gets a diff that adds all items currently in the tree to a new collection,
-	 * allowing it to fully hydrate.
+	 * @inheritdoc
+	 */
+	public get pendingRootProviders() {
+		return this._pendingRootProviders;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public get busyProviders() {
+		return this._busyProviders;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public get rootIds() {
+		return this.roots;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public get all() {
+		return this.getIterator();
+	}
+
+
+	public readonly onPendingRootProvidersChange = this.pendingRootChangeEmitter.event;
+	public readonly onBusyProvidersChange = this.busyProvidersChangeEmitter.event;
+
+	constructor(private _pendingRootProviders: number) {
+		super();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public getNodeById(id: string) {
+		return this.items.get(id);
+	}
+
+	/**
+	 * @inheritdoc
 	 */
 	public getReviverDiff() {
-		const ops: TestsDiff = [];
+		const ops: TestsDiff = [
+			[TestDiffOpType.DeltaDiscoverComplete, this._busyProviders],
+			[TestDiffOpType.DeltaRootsComplete, this._pendingRootProviders],
+		];
+
 		const queue = [this.roots];
 		while (queue.length) {
 			for (const child of queue.pop()!) {
@@ -122,7 +320,53 @@ class MainThreadTestCollection extends AbstractIncrementalTestCollection<Increme
 		return ops;
 	}
 
+	/**
+	 * Clears everything from the collection, and returns a diff that applies
+	 * that action.
+	 */
+	public clear() {
+		const ops: TestsDiff = [];
+		for (const root of this.roots) {
+			ops.push([TestDiffOpType.Remove, root]);
+		}
+
+		this.roots.clear();
+		this.items.clear();
+
+		return ops;
+	}
+
+	/**
+	 * @override
+	 */
+	protected updateBusyProviders(delta: number) {
+		this._busyProviders += delta;
+		this.busyProvidersChangeEmitter.fire(this._busyProviders);
+	}
+
+	/**
+	 * @override
+	 */
+	protected updatePendingRoots(delta: number) {
+		this._pendingRootProviders += delta;
+		this.pendingRootChangeEmitter.fire(this._pendingRootProviders);
+	}
+
+	/**
+	 * @override
+	 */
 	protected createItem(internal: InternalTestItem): IncrementalTestCollectionItem {
 		return { ...internal, children: new Set() };
 	}
+
+	private *getIterator() {
+		const queue = [this.rootIds];
+		while (queue.length) {
+			for (const id of queue.pop()!) {
+				const node = this.getNodeById(id)!;
+				yield node;
+				queue.push(node.children);
+			}
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/testing/common/testStubs.ts b/src/vs/workbench/contrib/testing/common/testStubs.ts
new file mode 100644
index 000000000..33a9b5295
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testStubs.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TestItem, TestRunState, TestState } from 'vs/workbench/api/common/extHostTypes';
+
+export const stubTest = (label: string): TestItem => ({
+	label,
+	location: undefined,
+	state: new TestState(TestRunState.Unset),
+	debuggable: true,
+	runnable: true,
+	description: ''
+});
+
+export const testStubs = {
+	test: stubTest,
+	nested: () => ({
+		...stubTest('root'),
+		children: [
+			{ ...stubTest('a'), children: [stubTest('aa'), stubTest('ab')] },
+			stubTest('b'),
+		],
+	}),
+};
+
+export const ReExportedTestRunState = TestRunState;
diff --git a/src/vs/workbench/contrib/testing/common/testingContentProvider.ts b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts
new file mode 100644
index 000000000..e03a0659e
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { ITextModel } from 'vs/editor/common/model';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { parseTestUri, TestUriType, TEST_DATA_SCHEME } from 'vs/workbench/contrib/testing/common/testingUri';
+import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService';
+import { ITestService } from 'vs/workbench/contrib/testing/common/testService';
+
+/**
+ * A content provider that returns various outputs for tests. This is used
+ * in the inline peek view.
+ */
+export class TestingContentProvider implements IWorkbenchContribution, ITextModelContentProvider {
+	constructor(
+		@ITextModelService textModelResolverService: ITextModelService,
+		@IModelService private readonly modelService: IModelService,
+		@ITestService private readonly testService: ITestService,
+		@ITestService private readonly resultService: ITestResultService,
+	) {
+		textModelResolverService.registerTextModelContentProvider(TEST_DATA_SCHEME, this);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public async provideTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this.modelService.getModel(resource);
+		if (existing && !existing.isDisposed()) {
+			return existing;
+		}
+
+		const parsed = parseTestUri(resource);
+		if (!parsed) {
+			return null;
+		}
+
+		const test = 'providerId' in parsed
+			? await this.testService.lookupTest({ providerId: parsed.providerId, testId: parsed.testId })
+			: this.resultService.lookup(parsed.resultId)?.tests.find(t => t.id === parsed.testId);
+
+		if (!test) {
+			return null;
+		}
+
+		let text: string | undefined;
+		switch (parsed.type) {
+			case TestUriType.ResultActualOutput:
+			case TestUriType.LiveActualOutput:
+				text = test.item.state.messages[parsed.messageIndex]?.actualOutput;
+				break;
+			case TestUriType.ResultExpectedOutput:
+			case TestUriType.LiveExpectedOutput:
+				text = test.item.state.messages[parsed.messageIndex]?.expectedOutput;
+				break;
+			case TestUriType.ResultMessage:
+			case TestUriType.LiveMessage:
+				text = test.item.state.messages[parsed.messageIndex]?.message.toString();
+				break;
+		}
+
+		if (text === undefined) {
+			return null;
+		}
+
+		return this.modelService.createModel(text, null, resource, true);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/common/testingContextKeys.ts b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
new file mode 100644
index 000000000..64c192351
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ViewContainerLocation } from 'vs/workbench/common/views';
+import { TestExplorerViewMode, TestExplorerViewGrouping } from 'vs/workbench/contrib/testing/common/constants';
+
+export namespace TestingContextKeys {
+	export const providerCount = new RawContextKey('testing.providerCount', 0);
+	export const viewMode = new RawContextKey('testing.explorerViewMode', TestExplorerViewMode.List);
+	export const viewGrouping = new RawContextKey('testing.explorerViewGrouping', TestExplorerViewGrouping.ByLocation);
+	export const isRunning = new RawContextKey('testing.isRunning', false);
+	export const isInPeek = new RawContextKey('testing.isInPeek', true);
+	export const isPeekVisible = new RawContextKey('testing.isPeekVisible', false);
+	export const explorerLocation = new RawContextKey('testing.explorerLocation', ViewContainerLocation.Sidebar);
+}
diff --git a/src/vs/workbench/contrib/testing/common/testingStates.ts b/src/vs/workbench/contrib/testing/common/testingStates.ts
new file mode 100644
index 000000000..59aa0b93b
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testingStates.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TestRunState } from 'vs/workbench/api/common/extHostTypes';
+
+export type TreeStateNode = { statusNode: true; state: TestRunState; priority: number };
+
+/**
+ * List of display priorities for different run states. When tests update,
+ * the highest-priority state from any of their children will be the state
+ * reflected in the parent node.
+ */
+export const statePriority: { [K in TestRunState]: number } = {
+	[TestRunState.Running]: 6,
+	[TestRunState.Queued]: 5,
+	[TestRunState.Errored]: 4,
+	[TestRunState.Failed]: 3,
+	[TestRunState.Passed]: 2,
+	[TestRunState.Skipped]: 1,
+	[TestRunState.Unset]: 0,
+};
+
+export const isFailedState = (s: TestRunState) => s === TestRunState.Errored || s === TestRunState.Failed;
+
+export const stateNodes = Object.entries(statePriority).reduce(
+	(acc, [stateStr, priority]) => {
+		const state = Number(stateStr) as TestRunState;
+		acc[state] = { statusNode: true, state, priority };
+		return acc;
+	}, {} as { [K in TestRunState]: TreeStateNode }
+);
+
+export const cmpPriority = (a: TestRunState, b: TestRunState) => statePriority[b] - statePriority[a];
+
+export const maxPriority = (a: TestRunState, b: TestRunState) => statePriority[a] > statePriority[b] ? a : b;
+
+export const statesInOrder = Object.keys(statePriority).map(s => Number(s) as TestRunState).sort(cmpPriority);
+
+export const isRunningState = (s: TestRunState) => s === TestRunState.Queued || s === TestRunState.Running;
diff --git a/src/vs/workbench/contrib/testing/common/testingUri.ts b/src/vs/workbench/contrib/testing/common/testingUri.ts
new file mode 100644
index 000000000..e66995a46
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/testingUri.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+
+export const TEST_DATA_SCHEME = 'vscode-test-data';
+
+export const enum TestUriType {
+	LiveMessage,
+	LiveActualOutput,
+	LiveExpectedOutput,
+	ResultMessage,
+	ResultActualOutput,
+	ResultExpectedOutput,
+}
+
+interface ILiveTestUri {
+	providerId: string;
+	testId: string;
+}
+
+interface ILiveTestMessageReference extends ILiveTestUri {
+	type: TestUriType.LiveMessage;
+	messageIndex: number;
+}
+
+interface ILiveTestOutputReference extends ILiveTestUri {
+	type: TestUriType.LiveActualOutput | TestUriType.LiveExpectedOutput;
+	messageIndex: number;
+}
+
+interface IResultTestUri {
+	resultId: string;
+	testId: string;
+}
+
+interface IResultTestMessageReference extends IResultTestUri {
+	type: TestUriType.ResultMessage;
+	messageIndex: number;
+}
+
+interface IResultTestOutputReference extends IResultTestUri {
+	type: TestUriType.ResultActualOutput | TestUriType.ResultExpectedOutput;
+	messageIndex: number;
+}
+
+export type ParsedTestUri =
+	| IResultTestMessageReference
+	| IResultTestOutputReference
+	| ILiveTestMessageReference
+	| ILiveTestOutputReference;
+
+const enum TestUriParts {
+	Results = 'results',
+	Live = 'live',
+
+	Messages = 'message',
+	Text = 'text',
+	ActualOutput = 'actualOutput',
+	ExpectedOutput = 'expectedOutput',
+}
+
+export const parseTestUri = (uri: URI): ParsedTestUri | undefined => {
+	const type = uri.authority;
+	const [locationId, testId, ...request] = uri.path.slice(1).split('/');
+
+	if (request[0] === TestUriParts.Messages) {
+		const index = Number(request[1]);
+		const part = request[2];
+		if (type === TestUriParts.Results) {
+			switch (part) {
+				case TestUriParts.Text:
+					return { resultId: locationId, testId, messageIndex: index, type: TestUriType.ResultMessage };
+				case TestUriParts.ActualOutput:
+					return { resultId: locationId, testId, messageIndex: index, type: TestUriType.ResultActualOutput };
+				case TestUriParts.ExpectedOutput:
+					return { resultId: locationId, testId, messageIndex: index, type: TestUriType.ResultExpectedOutput };
+			}
+		} else if (type === TestUriParts.Live) {
+			switch (part) {
+				case TestUriParts.Text:
+					return { providerId: locationId, testId, messageIndex: index, type: TestUriType.LiveMessage };
+				case TestUriParts.ActualOutput:
+					return { providerId: locationId, testId, messageIndex: index, type: TestUriType.LiveActualOutput };
+				case TestUriParts.ExpectedOutput:
+					return { providerId: locationId, testId, messageIndex: index, type: TestUriType.LiveExpectedOutput };
+			}
+		}
+	}
+
+	return undefined;
+};
+
+export const buildTestUri = (parsed: ParsedTestUri): URI => {
+	const uriParts = {
+		scheme: TEST_DATA_SCHEME,
+		authority: 'resultId' in parsed ? TestUriParts.Results : TestUriParts.Live
+	};
+	const msgRef = (locationId: string, index: number, ...remaining: string[]) =>
+		URI.from({
+			...uriParts,
+			path: ['', locationId, parsed.testId, TestUriParts.Messages, index, ...remaining].join('/'),
+		});
+
+	switch (parsed.type) {
+		case TestUriType.ResultActualOutput:
+			return msgRef(parsed.resultId, parsed.messageIndex, TestUriParts.ActualOutput);
+		case TestUriType.ResultExpectedOutput:
+			return msgRef(parsed.resultId, parsed.messageIndex, TestUriParts.ExpectedOutput);
+		case TestUriType.ResultMessage:
+			return msgRef(parsed.resultId, parsed.messageIndex, TestUriParts.Text);
+		case TestUriType.LiveActualOutput:
+			return msgRef(parsed.providerId, parsed.messageIndex, TestUriParts.ActualOutput);
+		case TestUriType.LiveExpectedOutput:
+			return msgRef(parsed.providerId, parsed.messageIndex, TestUriParts.ExpectedOutput);
+		case TestUriType.LiveMessage:
+			return msgRef(parsed.providerId, parsed.messageIndex, TestUriParts.Text);
+		default:
+			throw new Error('Invalid test uri');
+	}
+};
diff --git a/src/vs/workbench/contrib/testing/common/workspaceTestCollectionService.ts b/src/vs/workbench/contrib/testing/common/workspaceTestCollectionService.ts
new file mode 100644
index 000000000..e38fb6d1a
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/common/workspaceTestCollectionService.ts
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter } from 'vs/base/common/event';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
+import { ExtHostTestingResource } from 'vs/workbench/api/common/extHost.protocol';
+import { IncrementalTestCollectionItem, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { IMainThreadTestCollection, ITestService } from 'vs/workbench/contrib/testing/common/testService';
+
+export interface ITestSubscriptionFolder {
+	folder: IWorkspaceFolder;
+	getChildren(): Iterable<IncrementalTestCollectionItem>;
+}
+
+export interface ITestSubscriptionItem extends IncrementalTestCollectionItem {
+	root: ITestSubscriptionFolder;
+}
+
+export class TestSubscriptionListener extends Disposable {
+	private onDiffEmitter = new Emitter<[workspaceFolder: IWorkspaceFolder, diff: TestsDiff]>();
+	private onFolderChangeEmitter = new Emitter<IWorkspaceFoldersChangeEvent>();
+
+	public readonly onDiff = this.onDiffEmitter.event;
+	public readonly onFolderChange = this.onFolderChangeEmitter.event;
+
+	public get workspaceFolders() {
+		return this.subscription.workspaceFolders;
+	}
+
+	public get workspaceFolderCollections() {
+		return this.subscription.workspaceFolderCollections;
+	}
+
+	constructor(public readonly subscription: TestSubscription, public readonly onDispose: () => void) {
+		super();
+		this._register(toDisposable(onDispose));
+	}
+
+	public publishFolderChange(evt: IWorkspaceFoldersChangeEvent) {
+		this.onFolderChangeEmitter.fire(evt);
+	}
+
+	public publishDiff(folder: IWorkspaceFolder, diff: TestsDiff) {
+		this.onDiffEmitter.fire([folder, diff]);
+	}
+}
+
+/**
+ * Maintains an observable set of tests in the core.
+ */
+export interface IWorkspaceTestCollectionService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Gets all workspace folders we're listening to.
+	 */
+	workspaceFolders(): ReadonlyArray<ITestSubscriptionFolder>;
+
+	/**
+	 * Adds a listener that receives updates about tests.
+	 */
+	subscribeToWorkspaceTests(): TestSubscriptionListener;
+}
+
+export const IWorkspaceTestCollectionService = createDecorator<IWorkspaceTestCollectionService>('ITestingViewService');
+
+export class WorkspaceTestCollectionService implements IWorkspaceTestCollectionService {
+	declare _serviceBrand: undefined;
+
+	private subscription?: TestSubscription;
+
+	public workspaceFolders() {
+		return this.subscription?.workspaceFolders || [];
+	}
+
+	constructor(@IInstantiationService protected instantiationService: IInstantiationService) { }
+
+	/**
+	 * @inheritdoc
+	 */
+	public subscribeToWorkspaceTests(): TestSubscriptionListener {
+		if (!this.subscription) {
+			this.subscription = this.instantiationService.createInstance(TestSubscription);
+		}
+
+		const listener = new TestSubscriptionListener(this.subscription, () => {
+			if (!this.subscription) {
+				return;
+			}
+
+			this.subscription.removeListener(listener);
+			if (this.subscription.listenerCount === 0) {
+				this.subscription.dispose();
+				this.subscription = undefined;
+			}
+		});
+
+		this.subscription.addListener(listener);
+		return listener;
+	}
+}
+
+
+class TestSubscription extends Disposable {
+	private listeners = new Set<TestSubscriptionListener>();
+	private pendingRootChangeEmitter = new Emitter<number>();
+	private busyProvidersChangeEmitter = new Emitter<number>();
+	private readonly collectionsForWorkspaces = new Map<string, {
+		listener: IDisposable,
+		folder: ITestSubscriptionFolder,
+		collection: IMainThreadTestCollection,
+	}>();
+
+	public readonly onPendingRootProvidersChange = this.pendingRootChangeEmitter.event;
+	public readonly onBusyProvidersChange = this.busyProvidersChangeEmitter.event;
+
+	public get busyProviders() {
+		let total = 0;
+		for (const { collection } of this.collectionsForWorkspaces.values()) {
+			total += collection.busyProviders;
+		}
+
+		return total;
+	}
+
+	public get pendingRootProviders() {
+		let total = 0;
+		for (const { collection } of this.collectionsForWorkspaces.values()) {
+			total += collection.pendingRootProviders;
+		}
+
+		return total;
+	}
+
+	public get listenerCount() {
+		return this.listeners.size;
+	}
+
+	public get workspaceFolders() {
+		return [...this.collectionsForWorkspaces.values()].map(v => v.folder);
+	}
+
+	public get workspaceFolderCollections() {
+		return [...this.collectionsForWorkspaces.values()].map(v => [v.folder, v.collection] as const);
+	}
+
+	constructor(
+		@IWorkspaceContextService workspaceContext: IWorkspaceContextService,
+		@ITestService private readonly testService: ITestService,
+	) {
+		super();
+
+		this._register(toDisposable(() => {
+			for (const { listener } of this.collectionsForWorkspaces.values()) {
+				listener.dispose();
+			}
+		}));
+
+		this._register(workspaceContext.onDidChangeWorkspaceFolders(evt => {
+			for (const folder of evt.added) {
+				this.subscribeToWorkspace(folder);
+			}
+
+			for (const folder of evt.removed) {
+				const existing = this.collectionsForWorkspaces.get(folder.uri.toString());
+				if (existing) {
+					this.collectionsForWorkspaces.delete(folder.uri.toString());
+					existing.listener.dispose();
+				}
+			}
+
+			for (const listener of this.listeners) {
+				listener.publishFolderChange(evt);
+			}
+		}));
+
+		for (const folder of workspaceContext.getWorkspace().folders) {
+			this.subscribeToWorkspace(folder);
+		}
+	}
+
+	public addListener(listener: TestSubscriptionListener) {
+		this.listeners.add(listener);
+	}
+
+	public removeListener(listener: TestSubscriptionListener) {
+		this.listeners.delete(listener);
+	}
+
+	private subscribeToWorkspace(folder: IWorkspaceFolder) {
+		const folderNode: ITestSubscriptionFolder = {
+			folder,
+			getChildren: function* () {
+				for (const rootId of ref.object.rootIds) {
+					const node = ref.object.getNodeById(rootId);
+					if (node) {
+						yield node;
+					}
+				}
+			},
+		};
+
+		const ref = this.testService.subscribeToDiffs(
+			ExtHostTestingResource.Workspace,
+			folder.uri,
+			diff => {
+				for (const listener of this.listeners) {
+					listener.publishDiff(folder, diff);
+				}
+			},
+		);
+
+		const disposable = new DisposableStore();
+		disposable.add(ref);
+		disposable.add(ref.object.onBusyProvidersChange(
+			() => this.pendingRootChangeEmitter.fire(this.pendingRootProviders)));
+		disposable.add(ref.object.onBusyProvidersChange(
+			() => this.busyProvidersChangeEmitter.fire(this.busyProviders)));
+
+		this.collectionsForWorkspaces.set(folder.uri.toString(), {
+			listener: disposable,
+			collection: ref.object,
+			folder: folderNode,
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
new file mode 100644
index 000000000..3975417f6
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByLocation.test.ts
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { HierarchicalByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByLocation';
+import { testStubs } from 'vs/workbench/contrib/testing/common/testStubs';
+import { makeTestWorkspaceFolder, TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
+
+suite('Workbench - Testing Explorer Hierarchal by Location Projection', () => {
+	let harness: TestTreeTestHarness;
+	const folder1 = makeTestWorkspaceFolder('f1');
+	const folder2 = makeTestWorkspaceFolder('f2');
+	setup(() => {
+		harness = new TestTreeTestHarness(l => new HierarchicalByLocationProjection(l));
+	});
+
+	teardown(() => {
+		harness.dispose();
+	});
+
+	test('renders initial tree', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }
+		]);
+	});
+
+	test('updates render if a second folder is added', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder2);
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'f1', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+			{ e: 'f2', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+		]);
+	});
+
+	test('updates render if second folder is removed', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder2);
+		harness.onFolderChange.fire({ added: [], changed: [], removed: [folder1] });
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' },
+		]);
+	});
+
+	test('updates render if second test provider appears', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot({
+			...testStubs.test('root2'),
+			children: [testStubs.test('c')]
+		}, 'b');
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'root', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+			{ e: 'root2', children: [{ e: 'c' }] },
+		]);
+	});
+
+	test('updates nodes if they add children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[0].children?.push(testStubs.test('ac'));
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'ac' }] },
+			{ e: 'b' }
+		]);
+	});
+
+	test('updates nodes if they remove children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[0].children?.pop();
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'a', children: [{ e: 'aa' }] },
+			{ e: 'b' }
+		]);
+	});
+});
+
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByName.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByName.test.ts
new file mode 100644
index 000000000..b699c9102
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/hierarchalByName.test.ts
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { HierarchicalByNameProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/hierarchalByName';
+import { testStubs } from 'vs/workbench/contrib/testing/common/testStubs';
+import { makeTestWorkspaceFolder, TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
+
+suite('Workbench - Testing Explorer Hierarchal by Name Projection', () => {
+	let harness: TestTreeTestHarness;
+	const folder1 = makeTestWorkspaceFolder('f1');
+	const folder2 = makeTestWorkspaceFolder('f2');
+	setup(() => {
+		harness = new TestTreeTestHarness(l => new HierarchicalByNameProjection(l));
+	});
+
+	teardown(() => {
+		harness.dispose();
+	});
+
+	test('renders initial tree', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' }, { e: 'ab' }, { e: 'b' }
+		]);
+	});
+
+	test('updates render if a second folder is added', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder2);
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'f1', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] },
+			{ e: 'f2', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] },
+		]);
+	});
+
+	test('updates render if second folder is removed', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder2);
+		harness.onFolderChange.fire({ added: [], changed: [], removed: [folder1] });
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' }, { e: 'ab' }, { e: 'b' },
+		]);
+	});
+
+	test('updates render if second test provider appears', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush(folder1);
+		harness.c.addRoot({
+			...testStubs.test('root2'),
+			children: [testStubs.test('c')]
+		}, 'b');
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'root', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] },
+			{ e: 'root2', children: [{ e: 'c' }] },
+		]);
+	});
+
+	test('updates nodes if they add children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[0].children?.push(testStubs.test('ac'));
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' },
+			{ e: 'ab' },
+			{ e: 'ac' },
+			{ e: 'b' }
+		]);
+	});
+
+	test('updates nodes if they remove children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[0].children?.pop();
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' },
+			{ e: 'b' }
+		]);
+	});
+
+	test('swaps when node is no longer leaf', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[1].children = [testStubs.test('ba')];
+		harness.c.onItemChange(tests.children[1], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' },
+			{ e: 'ab' },
+			{ e: 'ba' },
+		]);
+	});
+
+	test('swaps when node is no longer runnable', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush(folder1);
+
+		tests.children[1].children = [testStubs.test('ba')];
+		harness.c.onItemChange(tests.children[0], 'a');
+		harness.flush(folder1);
+
+		tests.children[1].children[0].runnable = false;
+		harness.c.onItemChange(tests.children[1].children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(folder1), [
+			{ e: 'aa' },
+			{ e: 'ab' },
+			{ e: 'b' },
+		]);
+	});
+});
+
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByLocation.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByLocation.test.ts
new file mode 100644
index 000000000..8472bd48c
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByLocation.test.ts
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { StateByLocationProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateByLocation';
+import { ReExportedTestRunState as TestRunState, testStubs } from 'vs/workbench/contrib/testing/common/testStubs';
+import { TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
+
+suite('Workbench - Testing Explorer State by Location Projection', () => {
+	let harness: TestTreeTestHarness;
+	setup(() => {
+		harness = new TestTreeTestHarness(l => new StateByLocationProjection(l));
+	});
+
+	teardown(() => {
+		harness.dispose();
+	});
+
+	test('renders initial tree', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] }
+		]);
+	});
+
+	test('expands if second root is added', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush();
+		harness.c.addRoot({
+			...testStubs.test('root2'),
+			children: [testStubs.test('c')]
+		}, 'b');
+		assert.deepStrictEqual(harness.flush(), [
+			{
+				e: 'Unset', children: [
+					{ e: 'root', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+					{ e: 'root2', children: [{ e: 'c' }] },
+				]
+			}
+		]);
+	});
+
+	test('recompacts if second root children are removed', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		harness.flush();
+		const root2 = {
+			...testStubs.test('root2'),
+			children: [testStubs.test('c')]
+		};
+
+		harness.c.addRoot(root2, 'b');
+		harness.flush();
+
+		root2.children.pop();
+		harness.c.onItemChange(root2, 'b');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] }
+		]);
+	});
+
+	test('updates nodes if they change', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[0].label = 'changed';
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'changed', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] }
+		]);
+	});
+
+	test('updates nodes if they add children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[0].children?.push(testStubs.test('ac'));
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'ac' }] }, { e: 'b' }] }
+		]);
+	});
+
+	test('updates nodes if they remove children', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[0].children?.pop();
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }] }, { e: 'b' }] }
+		]);
+	});
+
+	test('moves nodes when states change', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		const subchild = tests.children[0].children![0];
+		subchild.state = { runState: TestRunState.Passed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Passed', children: [{ e: 'a', children: [{ e: 'aa' }] }] },
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'ab' }] }, { e: 'b' }] },
+		]);
+
+		subchild.state = { runState: TestRunState.Failed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Failed', children: [{ e: 'a', children: [{ e: 'aa' }] }] },
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'ab' }] }, { e: 'b' }] },
+		]);
+
+		subchild.state = { runState: TestRunState.Unset, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+		]);
+	});
+
+	test('does not move when state is running', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		const subchild = tests.children[0].children![0];
+		subchild.state = { runState: TestRunState.Running, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'aa' }, { e: 'ab' }] }, { e: 'b' }] },
+		]);
+
+		subchild.state = { runState: TestRunState.Failed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Failed', children: [{ e: 'a', children: [{ e: 'aa' }] }] },
+			{ e: 'Unset', children: [{ e: 'a', children: [{ e: 'ab' }] }, { e: 'b' }] },
+		]);
+	});
+});
diff --git a/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByName.test.ts b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByName.test.ts
new file mode 100644
index 000000000..2670617d2
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/browser/explorerProjections/stateByName.test.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { StateByNameProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections/stateByName';
+import { ReExportedTestRunState as TestRunState, testStubs } from 'vs/workbench/contrib/testing/common/testStubs';
+import { TestTreeTestHarness } from 'vs/workbench/contrib/testing/test/browser/testObjectTree';
+
+suite('Workbench - Testing Explorer State by Name Projection', () => {
+	let harness: TestTreeTestHarness;
+	setup(() => {
+		harness = new TestTreeTestHarness(l => new StateByNameProjection(l));
+	});
+
+	teardown(() => {
+		harness.dispose();
+	});
+
+	test('renders initial tree', () => {
+		harness.c.addRoot(testStubs.nested(), 'a');
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] }
+		]);
+	});
+
+	test('swaps when node becomes leaf', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[0].children = [];
+		harness.c.onItemChange(tests.children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'a' }, { e: 'b' }] }
+		]);
+	});
+
+	test('swaps when node is no longer leaf', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[1].children = [testStubs.test('ba')];
+		harness.c.onItemChange(tests.children[1], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'ba' }] }
+		]);
+	});
+
+	test('swaps when node is no longer runnable', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		tests.children[1].children = [testStubs.test('ba')];
+		harness.c.onItemChange(tests.children[0], 'a');
+		harness.flush();
+
+		tests.children[1].children[0].runnable = false;
+		harness.c.onItemChange(tests.children[1].children[0], 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] }
+		]);
+	});
+
+	test('moves nodes when states change', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		const subchild = tests.children[0].children![0];
+		subchild.state = { runState: TestRunState.Passed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Passed', children: [{ e: 'aa' }] },
+			{ e: 'Unset', children: [{ e: 'ab' }, { e: 'b' }] },
+		]);
+
+		subchild.state = { runState: TestRunState.Failed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Failed', children: [{ e: 'aa' }] },
+			{ e: 'Unset', children: [{ e: 'ab' }, { e: 'b' }] },
+		]);
+
+		subchild.state = { runState: TestRunState.Unset, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] }
+		]);
+	});
+
+	test('does not move when state is running', () => {
+		const tests = testStubs.nested();
+		harness.c.addRoot(tests, 'a');
+		harness.flush();
+
+		const subchild = tests.children[0].children![0];
+		subchild.state = { runState: TestRunState.Running, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Unset', children: [{ e: 'aa' }, { e: 'ab' }, { e: 'b' }] }
+		]);
+
+		subchild.state = { runState: TestRunState.Failed, messages: [] };
+		harness.c.onItemChange(subchild, 'a');
+
+		assert.deepStrictEqual(harness.flush(), [
+			{ e: 'Failed', children: [{ e: 'aa' }] },
+			{ e: 'Unset', children: [{ e: 'ab' }, { e: 'b' }] },
+		]);
+	});
+});
diff --git a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
new file mode 100644
index 000000000..a7c1201b3
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ObjectTree } from 'vs/base/browser/ui/tree/objectTree';
+import { Emitter } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { IWorkspaceFolder, IWorkspaceFolderData, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
+import { ITestTreeElement, ITestTreeProjection } from 'vs/workbench/contrib/testing/browser/explorerProjections';
+import { TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { TestSubscriptionListener } from 'vs/workbench/contrib/testing/common/workspaceTestCollectionService';
+import { TestOwnedTestCollection, TestSingleUseCollection } from 'vs/workbench/contrib/testing/test/common/ownedTestCollection';
+
+type SerializedTree = { e: string; children?: SerializedTree[] };
+
+const element = document.createElement('div');
+element.style.height = '1000px';
+element.style.width = '200px';
+
+export class TestObjectTree<T> extends ObjectTree<T, any> {
+	constructor(serializer: (node: T) => string) {
+		super(
+			'test',
+			element,
+			{
+				getHeight: () => 20,
+				getTemplateId: () => 'default'
+			},
+			[
+				{
+					disposeTemplate: () => undefined,
+					renderElement: (node, _index, container: HTMLElement) => {
+						container.textContent = `${node.depth}:${serializer(node.element)}`;
+					},
+					renderTemplate: c => c,
+					templateId: 'default'
+				}
+			],
+			{
+				sorter: {
+					compare: (a, b) => serializer(a).localeCompare(serializer(b))
+				}
+			}
+		);
+		this.layout(1000, 200);
+	}
+
+	public getModel() {
+		return this.model;
+	}
+
+	public getRendered() {
+		const elements = element.querySelectorAll('.monaco-tl-contents');
+		const sorted = [...elements].sort((a, b) => pos(a) - pos(b));
+		let chain: SerializedTree[] = [{ e: '', children: [] }];
+		for (const element of sorted) {
+			const [depthStr, label] = element.textContent!.split(':');
+			const depth = Number(depthStr);
+			const parent = chain[depth - 1];
+			const child = { e: label };
+			parent.children = parent.children?.concat(child) ?? [child];
+			chain[depth] = child;
+		}
+
+		return chain[0].children;
+	}
+}
+
+const pos = (element: Element) => Number(element.parentElement!.parentElement!.getAttribute('aria-posinset'));
+
+export const makeTestWorkspaceFolder = (name: string): IWorkspaceFolder => ({
+	name,
+	uri: URI.file(`/${name}`),
+	index: 0,
+	toResource: path => URI.file(`/${name}/${path}`)
+});
+
+// names are hard
+export class TestTreeTestHarness<T extends ITestTreeProjection = ITestTreeProjection> extends Disposable {
+	private readonly owned = new TestOwnedTestCollection();
+	private readonly onDiff = this._register(new Emitter<[IWorkspaceFolderData, TestsDiff]>());
+	public readonly onFolderChange = this._register(new Emitter<IWorkspaceFoldersChangeEvent>());
+	public readonly c: TestSingleUseCollection = this._register(this.owned.createForHierarchy(d => this.c.setDiff(d /* don't clear during testing */)));
+	public readonly projection: T;
+	public readonly tree: TestObjectTree<ITestTreeElement>;
+
+	constructor(makeTree: (listener: TestSubscriptionListener) => T) {
+		super();
+		this.projection = this._register(makeTree({
+			workspaceFolderCollections: [],
+			onDiff: this.onDiff.event,
+			onFolderChange: this.onFolderChange.event,
+		} as any));
+		this.tree = this._register(new TestObjectTree(t => t.label));
+	}
+
+	public flush(folder?: IWorkspaceFolderData) {
+		this.onDiff.fire([folder!, this.c.collectDiff()]);
+		this.projection.applyTo(this.tree);
+		return this.tree.getRendered();
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/test/common/ownedTestCollection.ts b/src/vs/workbench/contrib/testing/test/common/ownedTestCollection.ts
new file mode 100644
index 000000000..a0f841e4b
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/common/ownedTestCollection.ts
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OwnedTestCollection, SingleUseTestCollection } from 'vs/workbench/contrib/testing/common/ownedTestCollection';
+import { TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+
+export class TestSingleUseCollection extends SingleUseTestCollection {
+	private idCounter = 0;
+
+	public get itemToInternal() {
+		return this.testItemToInternal;
+	}
+
+	public get currentDiff() {
+		return this.diff;
+	}
+
+	protected getId() {
+		return String(this.idCounter++);
+	}
+
+	public setDiff(diff: TestsDiff) {
+		this.diff = diff;
+	}
+}
+
+export class TestOwnedTestCollection extends OwnedTestCollection {
+	public get idToInternal() {
+		return this.testIdToInternal;
+	}
+
+	public createForHierarchy(publishDiff: (diff: TestsDiff) => void = () => undefined) {
+		return new TestSingleUseCollection(this.testIdToInternal, publishDiff);
+	}
+}
diff --git a/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
new file mode 100644
index 000000000..d28b37b00
--- /dev/null
+++ b/src/vs/workbench/contrib/testing/test/common/testingUri.test.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { buildTestUri, ParsedTestUri, parseTestUri, TestUriType } from 'vs/workbench/contrib/testing/common/testingUri';
+
+suite('Workbench - Testing URIs', () => {
+	test('round trip', () => {
+		const uris: ParsedTestUri[] = [
+			{ type: TestUriType.LiveActualOutput, messageIndex: 42, providerId: 'p', testId: 't' },
+			{ type: TestUriType.LiveExpectedOutput, messageIndex: 42, providerId: 'p', testId: 't' },
+			{ type: TestUriType.LiveMessage, messageIndex: 42, providerId: 'p', testId: 't' },
+			{ type: TestUriType.ResultActualOutput, messageIndex: 42, resultId: 'r', testId: 't' },
+			{ type: TestUriType.ResultExpectedOutput, messageIndex: 42, resultId: 'r', testId: 't' },
+			{ type: TestUriType.ResultMessage, messageIndex: 42, resultId: 'r', testId: 't' },
+		];
+
+		for (const uri of uris) {
+			const serialized = buildTestUri(uri);
+			assert.deepStrictEqual(uri, parseTestUri(serialized));
+		}
+	});
+});
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index ca1165af6..9787e91ad 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -198,7 +198,7 @@ class SelectFileIconThemeAction extends AbstractIconThemeAction {
 		super(id, label, quickInputService, extensionGalleryService, viewletService);
 	}
 
-	protected builtInEntry: QuickPickInput<ThemeItem> = { id: '', label: localize('noIconThemeLabel', 'None'), description: localize('noIconThemeDesc', 'Disable file icons') };
+	protected builtInEntry: QuickPickInput<ThemeItem> = { id: '', label: localize('noIconThemeLabel', 'None'), description: localize('noIconThemeDesc', 'Disable File Icons') };
 	protected installMessage = localize('installIconThemes', "Install Additional File Icon Themes...");
 	protected placeholderMessage = localize('themes.selectIconTheme', "Select File Icon Theme");
 	protected marketplaceTag = 'tag:icon-theme';
@@ -230,7 +230,7 @@ class SelectProductIconThemeAction extends AbstractIconThemeAction {
 	}
 
 	protected builtInEntry: QuickPickInput<ThemeItem> = { id: DEFAULT_PRODUCT_ICON_THEME_ID, label: localize('defaultProductIconThemeLabel', 'Default') };
-	protected installMessage = undefined; //localize('installProductIconThemes', "Install Additional Product Icon Themes...");
+	protected installMessage = localize('installProductIconThemes', "Install Additional Product Icon Themes...");
 	protected placeholderMessage = localize('themes.selectProductIconTheme', "Select Product Icon Theme");
 	protected marketplaceTag = 'tag:product-icon-theme';
 	protected setTheme(id: string, settingsTarget: ConfigurationTarget | undefined | 'auto') {
@@ -372,6 +372,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 	order: 2
 });
 
+MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
+	group: '4_themes',
+	command: {
+		id: SelectProductIconThemeAction.ID,
+		title: localize({ key: 'miSelectProductIconTheme', comment: ['&& denotes a mnemonic'] }, "&&Product Icon Theme")
+	},
+	order: 3
+});
+
+
 MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 	group: '4_themes',
 	command: {
@@ -389,3 +399,12 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 	},
 	order: 2
 });
+
+MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
+	group: '4_themes',
+	command: {
+		id: SelectProductIconThemeAction.ID,
+		title: localize('themes.selectProductIconTheme.label', "Product Icon Theme")
+	},
+	order: 3
+});
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index 64f30027e..2057bc5a2 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -21,7 +21,7 @@ import { URI } from 'vs/base/common/uri';
 import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IListVirtualDelegate, IIdentityProvider, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
 import { ITreeNode, ITreeRenderer, ITreeContextMenuEvent, ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
 import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -37,8 +37,8 @@ import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { MenuEntryActionViewItem, createAndFillInContextMenuActions, SubmenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuItemAction, IMenuService, MenuId, registerAction2, Action2, MenuRegistry, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { createAndFillInContextMenuActions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
@@ -1008,7 +1008,7 @@ export class TimelineElementTemplate implements IDisposable {
 		container.classList.add('custom-view-tree-node-item');
 		this.icon = DOM.append(container, DOM.$('.custom-view-tree-node-item-icon'));
 
-		this.iconLabel = new IconLabel(container, { supportHighlights: true, supportCodicons: true });
+		this.iconLabel = new IconLabel(container, { supportHighlights: true, supportIcons: true });
 
 		const timestampContainer = DOM.append(this.iconLabel.element, DOM.$('.timeline-timestamp-container'));
 		this.timestamp = DOM.append(timestampContainer, DOM.$('span.timeline-timestamp'));
@@ -1085,15 +1085,7 @@ class TimelineTreeRenderer implements ITreeRenderer<TreeElement, FuzzyScore, Tim
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 		@IThemeService private themeService: IThemeService
 	) {
-		this.actionViewItemProvider = (action: IAction) => {
-			if (action instanceof MenuItemAction) {
-				return this.instantiationService.createInstance(MenuEntryActionViewItem, action);
-			} else if (action instanceof SubmenuItemAction) {
-				return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action);
-			}
-
-			return undefined;
-		};
+		this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
 	}
 
 	private uri: URI | undefined;
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 0cf1e65ec..fa486e254 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -4,9 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/releasenoteseditor';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { escapeMarkdownSyntaxTokens } from 'vs/base/common/htmlContent';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 import { OS } from 'vs/base/common/platform';
+import { escape } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
+import { generateUuid } from 'vs/base/common/uuid';
 import { TokenizationRegistry } from 'vs/editor/common/modes';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -15,18 +20,15 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IRequestService, asText } from 'vs/platform/request/common/request';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
-import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { KeybindingParser } from 'vs/base/common/keybindingParser';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { generateUuid } from 'vs/base/common/uuid';
+import { asText, IRequestService } from 'vs/platform/request/common/request';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { renderMarkdownDocument } from 'vs/workbench/contrib/markdown/common/markdownDocumentRenderer';
+import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { IWebviewWorkbenchService } from 'vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { ACTIVE_GROUP, IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 export class ReleaseNotesManager {
 
@@ -106,6 +108,10 @@ export class ReleaseNotesManager {
 		const url = `${baseUrl}/v${versionLabel}.md`;
 		const unassigned = nls.localize('unassigned', "unassigned");
 
+		const escapeMdHtml = (text: string): string => {
+			return escape(text).replace(/\\/g, '\\\\');
+		};
+
 		const patchKeybindings = (text: string): string => {
 			const kb = (match: string, kb: string) => {
 				const keybinding = this._keybindingService.lookupKeybinding(kb);
@@ -135,19 +141,19 @@ export class ReleaseNotesManager {
 
 			const kbCode = (match: string, binding: string) => {
 				const resolved = kb(match, binding);
-				return resolved ? `<code title="${binding}">${resolved}</code>` : resolved;
+				return resolved ? `<code title="${binding}">${escapeMdHtml(resolved)}</code>` : resolved;
 			};
 
 			const kbstyleCode = (match: string, binding: string) => {
 				const resolved = kbstyle(match, binding);
-				return resolved ? `<code title="${binding}">${resolved}</code>` : resolved;
+				return resolved ? `<code title="${binding}">${escapeMdHtml(resolved)}</code>` : resolved;
 			};
 
 			return text
 				.replace(/`kb\(([a-z.\d\-]+)\)`/gi, kbCode)
 				.replace(/`kbstyle\(([^\)]+)\)`/gi, kbstyleCode)
-				.replace(/kb\(([a-z.\d\-]+)\)/gi, kb)
-				.replace(/kbstyle\(([^\)]+)\)/gi, kbstyle);
+				.replace(/kb\(([a-z.\d\-]+)\)/gi, (match, binding) => escapeMarkdownSyntaxTokens(kb(match, binding)))
+				.replace(/kbstyle\(([^\)]+)\)/gi, (match, binding) => escapeMarkdownSyntaxTokens(kbstyle(match, binding)));
 		};
 
 		const fetchReleaseNotes = async () => {
@@ -282,10 +288,16 @@ export class ReleaseNotesManager {
 					}
 
 					code {
+						font-family: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
+						font-size: 14px;
+						line-height: 19px;
+					}
+
+					pre code {
 						font-family: var(--vscode-editor-font-family);
 						font-weight: var(--vscode-editor-font-weight);
 						font-size: var(--vscode-editor-font-size);
-						line-height: 19px;
+						line-height: 1.5;
 					}
 
 					code > div {
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index f16c65f0c..06699f71d 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -18,7 +18,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { ReleaseNotesManager } from './releaseNotesEditor';
-import { isMacintosh, isNative, isWindows } from 'vs/base/common/platform';
+import { isWindows } from 'vs/base/common/platform';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
@@ -208,7 +208,6 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IProductService private readonly productService: IProductService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IOpenerService private readonly openerService: IOpenerService
 	) {
 		super();
 		this.state = updateService.state;
@@ -292,7 +291,7 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 			return;
 		}
 
-		error = error.replace(/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/, 'See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information');
+		error = error.replace(/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/, 'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information');
 
 		this.notificationService.notify({
 			severity: Severity.Error,
@@ -496,35 +495,7 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 			when: CONTEXT_UPDATE_STATE.isEqualTo(StateType.Updating)
 		});
 
-		CommandsRegistry.registerCommand('update.restart', async () => {
-			if (isNative && isMacintosh && typeof require !== 'undefined' && typeof require.__$__nodeRequire === 'function') {
-				const os = require.__$__nodeRequire('os') as { release(): string; };
-				const release = os.release();
-
-				if (parseInt(release) >= 20) { // Big Sur
-					const answer = await this.dialogService.show(
-						Severity.Warning,
-						nls.localize('good luck', "'Restart to Update' is not working properly on macOS Big Sur. Click 'Quit to Update' to quit {0} and update it. Then, relaunch it from Finder.", this.productService.nameShort),
-						[
-							nls.localize('quit', "Quit to Update"),
-							nls.localize('learn more', "Learn More"),
-							nls.localize('cancel', "Cancel")
-						],
-						{ cancelId: 2 }
-					);
-
-					if (answer.choice === 2) {
-						return;
-					} else if (answer.choice === 1) {
-						await this.openerService.open(URI.parse('https://github.com/microsoft/vscode/issues/109728'));
-						return;
-					}
-				}
-			}
-
-			this.updateService.quitAndInstall();
-		});
-
+		CommandsRegistry.registerCommand('update.restart', () => this.updateService.quitAndInstall());
 		MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 			group: '6_update',
 			command: {
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
index c8f144bda..564cf24f9 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
@@ -22,6 +22,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IdleValue } from 'vs/base/common/async';
 import { IAuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { testUrlMatchesGlob } from 'vs/workbench/contrib/url/common/urlGlob';
 
 type TrustedDomainsDialogActionClassification = {
 	action: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
@@ -216,94 +217,10 @@ export function isURLDomainTrusted(url: URI, trustedDomains: string[]) {
 			return true;
 		}
 
-		if (isTrusted(url.toString(), trustedDomains[i])) {
+		if (testUrlMatchesGlob(url.toString(), trustedDomains[i])) {
 			return true;
 		}
 	}
 
 	return false;
 }
-
-export const isTrusted = (url: string, trustedURL: string): boolean => {
-	const normalize = (url: string) => url.replace(/\/+$/, '');
-	trustedURL = normalize(trustedURL);
-	url = normalize(url);
-
-	const memo = Array.from({ length: url.length + 1 }).map(() =>
-		Array.from({ length: trustedURL.length + 1 }).map(() => undefined),
-	);
-
-	if (/^[^./:]*:\/\//.test(trustedURL)) {
-		return doURLMatch(memo, url, trustedURL, 0, 0);
-	}
-
-	const scheme = /^(https?):\/\//.exec(url)?.[1];
-	if (scheme) {
-		return doURLMatch(memo, url, `${scheme}://${trustedURL}`, 0, 0);
-	}
-
-	return false;
-};
-
-const doURLMatch = (
-	memo: (boolean | undefined)[][],
-	url: string,
-	trustedURL: string,
-	urlOffset: number,
-	trustedURLOffset: number,
-): boolean => {
-	if (memo[urlOffset]?.[trustedURLOffset] !== undefined) {
-		return memo[urlOffset][trustedURLOffset]!;
-	}
-
-	const options = [];
-
-	// Endgame.
-	// Fully exact match
-	if (urlOffset === url.length) {
-		return trustedURLOffset === trustedURL.length;
-	}
-
-	// Some path remaining in url
-	if (trustedURLOffset === trustedURL.length) {
-		const remaining = url.slice(urlOffset);
-		return remaining[0] === '/';
-	}
-
-	if (url[urlOffset] === trustedURL[trustedURLOffset]) {
-		// Exact match.
-		options.push(doURLMatch(memo, url, trustedURL, urlOffset + 1, trustedURLOffset + 1));
-	}
-
-	if (trustedURL[trustedURLOffset] + trustedURL[trustedURLOffset + 1] === '*.') {
-		// Any subdomain match. Either consume one thing that's not a / or : and don't advance base or consume nothing and do.
-		if (!['/', ':'].includes(url[urlOffset])) {
-			options.push(doURLMatch(memo, url, trustedURL, urlOffset + 1, trustedURLOffset));
-		}
-		options.push(doURLMatch(memo, url, trustedURL, urlOffset, trustedURLOffset + 2));
-	}
-
-	if (trustedURL[trustedURLOffset] === '*') {
-		// Any match. Either consume one thing and don't advance base or consume nothing and do.
-		if (urlOffset + 1 === url.length) {
-			// If we're at the end of the input url consume one from both.
-			options.push(doURLMatch(memo, url, trustedURL, urlOffset + 1, trustedURLOffset + 1));
-		} else {
-			options.push(doURLMatch(memo, url, trustedURL, urlOffset + 1, trustedURLOffset));
-		}
-		options.push(doURLMatch(memo, url, trustedURL, urlOffset, trustedURLOffset + 1));
-	}
-
-	if (trustedURL[trustedURLOffset] + trustedURL[trustedURLOffset + 1] === ':*') {
-		// any port match. Consume a port if it exists otherwise nothing. Always comsume the base.
-		if (url[urlOffset] === ':') {
-			let endPortIndex = urlOffset + 1;
-			do { endPortIndex++; } while (/[0-9]/.test(url[endPortIndex]));
-			options.push(doURLMatch(memo, url, trustedURL, endPortIndex, trustedURLOffset + 2));
-		} else {
-			options.push(doURLMatch(memo, url, trustedURL, urlOffset, trustedURLOffset + 2));
-		}
-	}
-
-	return (memo[urlOffset][trustedURLOffset] = options.some(a => a === true));
-};
diff --git a/src/vs/workbench/contrib/url/common/urlGlob.ts b/src/vs/workbench/contrib/url/common/urlGlob.ts
new file mode 100644
index 000000000..889379629
--- /dev/null
+++ b/src/vs/workbench/contrib/url/common/urlGlob.ts
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const testUrlMatchesGlob = (url: string, globUrl: string): boolean => {
+	const normalize = (url: string) => url.replace(/\/+$/, '');
+	globUrl = normalize(globUrl);
+	url = normalize(url);
+
+	const memo = Array.from({ length: url.length + 1 }).map(() =>
+		Array.from({ length: globUrl.length + 1 }).map(() => undefined),
+	);
+
+	if (/^[^./:]*:\/\//.test(globUrl)) {
+		return doUrlMatch(memo, url, globUrl, 0, 0);
+	}
+
+	const scheme = /^(https?):\/\//.exec(url)?.[1];
+	if (scheme) {
+		return doUrlMatch(memo, url, `${scheme}://${globUrl}`, 0, 0);
+	}
+
+	return false;
+};
+
+const doUrlMatch = (
+	memo: (boolean | undefined)[][],
+	url: string,
+	globUrl: string,
+	urlOffset: number,
+	globUrlOffset: number,
+): boolean => {
+	if (memo[urlOffset]?.[globUrlOffset] !== undefined) {
+		return memo[urlOffset][globUrlOffset]!;
+	}
+
+	const options = [];
+
+	// Endgame.
+	// Fully exact match
+	if (urlOffset === url.length) {
+		return globUrlOffset === globUrl.length;
+	}
+
+	// Some path remaining in url
+	if (globUrlOffset === globUrl.length) {
+		const remaining = url.slice(urlOffset);
+		return remaining[0] === '/';
+	}
+
+	if (url[urlOffset] === globUrl[globUrlOffset]) {
+		// Exact match.
+		options.push(doUrlMatch(memo, url, globUrl, urlOffset + 1, globUrlOffset + 1));
+	}
+
+	if (globUrl[globUrlOffset] + globUrl[globUrlOffset + 1] === '*.') {
+		// Any subdomain match. Either consume one thing that's not a / or : and don't advance base or consume nothing and do.
+		if (!['/', ':'].includes(url[urlOffset])) {
+			options.push(doUrlMatch(memo, url, globUrl, urlOffset + 1, globUrlOffset));
+		}
+		options.push(doUrlMatch(memo, url, globUrl, urlOffset, globUrlOffset + 2));
+	}
+
+	if (globUrl[globUrlOffset] === '*') {
+		// Any match. Either consume one thing and don't advance base or consume nothing and do.
+		if (urlOffset + 1 === url.length) {
+			// If we're at the end of the input url consume one from both.
+			options.push(doUrlMatch(memo, url, globUrl, urlOffset + 1, globUrlOffset + 1));
+		} else {
+			options.push(doUrlMatch(memo, url, globUrl, urlOffset + 1, globUrlOffset));
+		}
+		options.push(doUrlMatch(memo, url, globUrl, urlOffset, globUrlOffset + 1));
+	}
+
+	if (globUrl[globUrlOffset] + globUrl[globUrlOffset + 1] === ':*') {
+		// any port match. Consume a port if it exists otherwise nothing. Always comsume the base.
+		if (url[urlOffset] === ':') {
+			let endPortIndex = urlOffset + 1;
+			do { endPortIndex++; } while (/[0-9]/.test(url[endPortIndex]));
+			options.push(doUrlMatch(memo, url, globUrl, endPortIndex, globUrlOffset + 2));
+		} else {
+			options.push(doUrlMatch(memo, url, globUrl, urlOffset, globUrlOffset + 2));
+		}
+	}
+
+	return (memo[urlOffset][globUrlOffset] = options.some(a => a === true));
+};
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
index 51517c3e5..595b2875d 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
@@ -12,7 +12,6 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { Disposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { isWeb } from 'vs/base/common/platform';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { UserDataSyncTrigger } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger';
 
 class UserDataSyncReportIssueContribution extends Disposable implements IWorkbenchContribution {
@@ -40,34 +39,8 @@ class UserDataSyncReportIssueContribution extends Disposable implements IWorkben
 	}
 }
 
-export class UserDataSyncSettingsMigrationContribution implements IWorkbenchContribution {
-
-	constructor(
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) {
-		this.migrateSettings();
-	}
-
-	private async migrateSettings(): Promise<void> {
-		await this.migrateSetting('sync.keybindingsPerPlatform', 'settingsSync.keybindingsPerPlatform');
-		await this.migrateSetting('sync.ignoredExtensions', 'settingsSync.ignoredExtensions');
-		await this.migrateSetting('sync.ignoredSettings', 'settingsSync.ignoredSettings');
-	}
-
-	private async migrateSetting(oldSetting: string, newSetting: string): Promise<void> {
-		const userValue = this.configurationService.inspect(oldSetting).userValue;
-		if (userValue !== undefined) {
-			// remove the old setting
-			await this.configurationService.updateValue(oldSetting, undefined, ConfigurationTarget.USER);
-			// add the new setting
-			await this.configurationService.updateValue(newSetting, userValue, ConfigurationTarget.USER);
-		}
-	}
-}
-
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(UserDataSyncWorkbenchContribution, LifecyclePhase.Ready);
-workbenchRegistry.registerWorkbenchContribution(UserDataSyncSettingsMigrationContribution, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(UserDataSyncTrigger, LifecyclePhase.Eventually);
 
 if (isWeb) {
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 8a1aa13b2..4a641944c 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -20,7 +20,7 @@ import { localize } from 'vs/nls';
 import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyEqualsExpr, ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -31,7 +31,7 @@ import {
 	SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_SCHEME, IUserDataSyncResourceEnablementService,
 	getSyncResourceFromLocalPreview, IResourcePreview, IUserDataSyncStoreManagementService, UserDataSyncStoreType, IUserDataSyncStore, IUserDataAutoSyncEnablementService
 } from 'vs/platform/userDataSync/common/userDataSync';
-import { FloatingClickWidget } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IEditorInput, EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
@@ -50,8 +50,10 @@ import { IAuthenticationService } from 'vs/workbench/services/authentication/bro
 import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ViewContainerLocation, IViewContainersRegistry, Extensions, ViewContainer } from 'vs/workbench/common/views';
-import { UserDataSyncViewPaneContainer, UserDataSyncDataViews } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncViews';
+import { UserDataSyncDataViews } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncViews';
 import { IUserDataSyncWorkbenchService, getSyncAreaLabel, AccountStatus, CONTEXT_SYNC_STATE, CONTEXT_SYNC_ENABLEMENT, CONTEXT_ACCOUNT_STATE, CONFIGURE_SYNC_COMMAND_ID, SHOW_SYNC_LOG_COMMAND_ID, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_VIEW_ICON } from 'vs/workbench/services/userDataSync/common/userDataSync';
+import { Codicon } from 'vs/base/common/codicons';
+import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 
 const CONTEXT_CONFLICTS_SOURCES = new RawContextKey<string>('conflictsSources', '');
 
@@ -151,7 +153,8 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			textModelResolverService.registerTextModelContentProvider(USER_DATA_SYNC_SCHEME, instantiationService.createInstance(UserDataRemoteContentProvider));
 			registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution);
 
-			this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataAutoSyncEnablementService.onDidChangeEnablement)(() => this.turningOnSync = !userDataAutoSyncEnablementService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));
+			this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataAutoSyncEnablementService.onDidChangeEnablement)
+				(() => this.turningOnSync = !userDataAutoSyncEnablementService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));
 		}
 	}
 
@@ -203,19 +206,19 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					const handle = this.notificationService.prompt(Severity.Warning, localize('conflicts detected', "Unable to sync due to conflicts in {0}. Please resolve them to continue.", conflictsArea.toLowerCase()),
 						[
 							{
-								label: localize('accept remote', "Accept Remote"),
-								run: () => {
-									this.telemetryService.publicLog2<{ source: string, action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: 'acceptRemote' });
-									this.acceptRemote(syncResource, conflicts);
-								}
-							},
-							{
-								label: localize('accept local', "Accept Local"),
+								label: localize('replace remote', "Replace Remote"),
 								run: () => {
 									this.telemetryService.publicLog2<{ source: string, action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: 'acceptLocal' });
 									this.acceptLocal(syncResource, conflicts);
 								}
 							},
+							{
+								label: localize('replace local', "Replace Local"),
+								run: () => {
+									this.telemetryService.publicLog2<{ source: string, action: string }, SyncConflictsClassification>('sync/handleConflicts', { source: syncResource, action: 'acceptRemote' });
+									this.acceptRemote(syncResource, conflicts);
+								}
+							},
 							{
 								label: localize('show conflicts', "Show Conflicts"),
 								run: () => {
@@ -732,6 +735,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		this.registerConfigureSyncAction();
 		this.registerShowSettingsAction();
 		this.registerShowLogAction();
+		this.registerResetSyncDataAction();
 	}
 
 	private registerTurnOnSyncAction(): void {
@@ -1064,10 +1068,17 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				super({
 					id: configureSyncCommand.id,
 					title: configureSyncCommand.title,
-					menu: {
+					icon: Codicon.settingsGear,
+					tooltip: localize('configure', "Configure..."),
+					menu: [{
 						id: MenuId.CommandPalette,
 						when
-					}
+					}, {
+						id: MenuId.ViewContainerTitle,
+						when: ContextKeyEqualsExpr.create('viewContainer', SYNC_VIEW_CONTAINER_ID),
+						group: 'navigation',
+						order: 2
+					}]
 				});
 			}
 			run(): any { return that.configureSyncOptions(); }
@@ -1081,10 +1092,17 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				super({
 					id: SHOW_SYNC_LOG_COMMAND_ID,
 					title: localize('show sync log title', "{0}: Show Log", SYNC_TITLE),
-					menu: {
+					tooltip: localize('show sync log toolrip', "Show Log"),
+					icon: Codicon.output,
+					menu: [{
 						id: MenuId.CommandPalette,
 						when: ContextKeyExpr.and(CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized)),
-					},
+					}, {
+						id: MenuId.ViewContainerTitle,
+						when: ContextKeyEqualsExpr.create('viewContainer', SYNC_VIEW_CONTAINER_ID),
+						group: 'navigation',
+						order: 1
+					}],
 				});
 			}
 			run(): any { return that.showSyncActivity(); }
@@ -1120,14 +1138,31 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				id: SYNC_VIEW_CONTAINER_ID,
 				name: SYNC_TITLE,
 				ctorDescriptor: new SyncDescriptor(
-					UserDataSyncViewPaneContainer,
-					[SYNC_VIEW_CONTAINER_ID]
+					ViewPaneContainer,
+					[SYNC_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
 				),
 				icon: SYNC_VIEW_ICON,
 				hideIfEmpty: true,
 			}, ViewContainerLocation.Sidebar);
 	}
 
+	private registerResetSyncDataAction(): void {
+		const that = this;
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.actions.syncData.reset',
+					title: localize('workbench.actions.syncData.reset', "Clear Data in Cloud..."),
+					menu: [{
+						id: MenuId.ViewContainerTitle,
+						when: ContextKeyEqualsExpr.create('viewContainer', SYNC_VIEW_CONTAINER_ID)
+					}],
+				});
+			}
+			run(): any { return that.userDataSyncWorkbenchService.resetSyncedData(); }
+		}));
+	}
+
 	private registerDataViews(container: ViewContainer): void {
 		this._register(this.instantiationService.createInstance(UserDataSyncDataViews, container));
 	}
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
index 3610b1ca5..cbfc04896 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
@@ -34,7 +34,7 @@ import { attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { FloatingClickWidget } from 'vs/workbench/browser/parts/editor/editorWidgets';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
 import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { Severity } from 'vs/platform/notification/common/notification';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
index a668fc7be..8e253f9a6 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger.ts
@@ -6,7 +6,7 @@
 import { Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { SettingsEditor2Input, KeybindingsEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { SettingsEditor2Input, KeybindingsEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { isEqual } from 'vs/base/common/resources';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
index d26d9dd1a..86c71c405 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IViewsRegistry, Extensions, ITreeViewDescriptor, ITreeViewDataProvider, ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer, IViewDescriptorService } from 'vs/workbench/common/views';
+import { IViewsRegistry, Extensions, ITreeViewDescriptor, ITreeViewDataProvider, ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, ViewContainer } from 'vs/workbench/common/views';
 import { localize } from 'vs/nls';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { TreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
@@ -14,23 +14,14 @@ import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/act
 import { ContextKeyExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
 import { URI } from 'vs/base/common/uri';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { FolderThemeIcon, IThemeService } from 'vs/platform/theme/common/themeService';
+import { FolderThemeIcon } from 'vs/platform/theme/common/themeService';
 import { fromNow } from 'vs/base/common/date';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { Codicon } from 'vs/base/common/codicons';
-import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IAction, Action } from 'vs/base/common/actions';
-import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SHOW_SYNC_LOG_COMMAND_ID, CONFIGURE_SYNC_COMMAND_ID, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
+import { Action } from 'vs/base/common/actions';
+import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_TITLE } from 'vs/workbench/services/userDataSync/common/userDataSync';
 import { IUserDataSyncMachinesService, IUserDataSyncMachine } from 'vs/platform/userDataSync/common/userDataSyncMachines';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
@@ -38,41 +29,6 @@ import { flatten } from 'vs/base/common/arrays';
 import { UserDataSyncMergesViewPane } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView';
 import { basename } from 'vs/base/common/resources';
 
-export class UserDataSyncViewPaneContainer extends ViewPaneContainer {
-
-	constructor(
-		containerId: string,
-		@IUserDataSyncWorkbenchService private readonly userDataSyncWorkbenchService: IUserDataSyncWorkbenchService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IThemeService themeService: IThemeService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IStorageService storageService: IStorageService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IExtensionService extensionService: IExtensionService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-	) {
-		super(containerId, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
-	}
-
-	getActions(): IAction[] {
-		return [
-			new Action(SHOW_SYNC_LOG_COMMAND_ID, localize('showLog', "Show Log"), Codicon.output.classNames, true, async () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
-			new Action(CONFIGURE_SYNC_COMMAND_ID, localize('configure', "Configure..."), Codicon.settingsGear.classNames, true, async () => this.commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)),
-		];
-	}
-
-	getSecondaryActions(): IAction[] {
-		return [
-			new Action('workbench.actions.syncData.reset', localize('workbench.actions.syncData.reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
-		];
-	}
-
-}
-
 export class UserDataSyncDataViews extends Disposable {
 
 	constructor(
diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts
index 30340ca46..f08bda7c8 100644
--- a/src/vs/workbench/contrib/watermark/browser/watermark.ts
+++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts
@@ -17,7 +17,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { OpenFolderAction, OpenFileFolderAction, OpenFileAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ShowAllCommandsAction } from 'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess';
 import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
-import { StartAction } from 'vs/workbench/contrib/debug/browser/debugActions';
 import { FindInFilesActionId } from 'vs/workbench/contrib/search/common/constants';
 import * as dom from 'vs/base/browser/dom';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
@@ -27,6 +26,7 @@ import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/termin
 import { assertIsDefined } from 'vs/base/common/types';
 import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
 import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser/fileCommands';
+import { DEBUG_START_COMMAND_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
 
 const $ = dom.$;
 
@@ -46,7 +46,7 @@ const newUntitledFile: WatermarkEntry = { text: nls.localize('watermark.newUntit
 const newUntitledFileMacOnly: WatermarkEntry = Object.assign({ mac: true }, newUntitledFile);
 const toggleTerminal: WatermarkEntry = { text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: TERMINAL_COMMAND_ID.TOGGLE };
 const findInFiles: WatermarkEntry = { text: nls.localize('watermark.findInFiles', "Find in Files"), id: FindInFilesActionId };
-const startDebugging: WatermarkEntry = { text: nls.localize('watermark.startDebugging', "Start Debugging"), id: StartAction.ID };
+const startDebugging: WatermarkEntry = { text: nls.localize('watermark.startDebugging', "Start Debugging"), id: DEBUG_START_COMMAND_ID };
 
 const noFolderEntries = [
 	showCommands,
diff --git a/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts b/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts
index 6b84fbcb7..403c586c9 100644
--- a/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts
@@ -26,6 +26,7 @@ export const enum WebviewMessageChannels {
 	didLoad = 'did-load',
 	doUpdateState = 'do-update-state',
 	doReload = 'do-reload',
+	setConfirmBeforeClose = 'set-confirm-before-close',
 	loadResource = 'load-resource',
 	loadLocalhost = 'load-localhost',
 	webviewReady = 'webview-ready',
diff --git a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
index 142650d37..d67cf68e3 100644
--- a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
+++ b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
@@ -11,7 +11,7 @@ import { URI } from 'vs/base/common/uri';
 import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
-import { IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, Webview, WebviewContentOptions, WebviewElement, WebviewExtensionDescription, WebviewOptions, WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
+import { IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, Webview, WebviewContentOptions, WebviewElement, WebviewExtensionDescription, WebviewOptions, WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 
 /**
@@ -38,6 +38,7 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv
 
 	private readonly _scopedContextKeyService = this._register(new MutableDisposable<IContextKeyService>());
 	private _findWidgetVisible: IContextKey<boolean> | undefined;
+	private _findWidgetEnabled: IContextKey<boolean> | undefined;
 
 	public constructor(
 		public readonly id: string,
@@ -97,6 +98,10 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv
 
 			this._findWidgetVisible?.reset();
 			this._findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
+
+			this._findWidgetEnabled?.reset();
+			this._findWidgetEnabled = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED.bindTo(contextKeyService);
+			this._findWidgetEnabled.set(!!this.options.enableFindWidget);
 		}
 	}
 
@@ -122,10 +127,12 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv
 
 		const frameRect = element.getBoundingClientRect();
 		const containerRect = this.container.parentElement.getBoundingClientRect();
+		const parentBorderTop = (containerRect.height - this.container.parentElement.clientHeight) / 2.0;
+		const parentBorderLeft = (containerRect.width - this.container.parentElement.clientWidth) / 2.0;
 		this.container.style.position = 'absolute';
 		this.container.style.overflow = 'hidden';
-		this.container.style.top = `${frameRect.top - containerRect.top}px`;
-		this.container.style.left = `${frameRect.left - containerRect.left}px`;
+		this.container.style.top = `${frameRect.top - containerRect.top - parentBorderTop}px`;
+		this.container.style.left = `${frameRect.left - containerRect.left - parentBorderLeft}px`;
 		this.container.style.width = `${dimension ? dimension.width : frameRect.width}px`;
 		this.container.style.height = `${dimension ? dimension.height : frameRect.height}px`;
 	}
@@ -144,6 +151,8 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv
 				webview.initialScrollProgress = this._initialScrollProgress;
 			}
 
+			this._findWidgetEnabled?.set(!!this.options.enableFindWidget);
+
 			webview.mountTo(this.container);
 
 			// Forward events from inner webview to outer listeners
diff --git a/src/vs/workbench/contrib/webview/browser/pre/host.js b/src/vs/workbench/contrib/webview/browser/pre/host.js
index 16bc8e156..f313b0d1f 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/host.js
+++ b/src/vs/workbench/contrib/webview/browser/pre/host.js
@@ -9,7 +9,9 @@
 
 	const hostMessaging = new class HostMessaging {
 		constructor() {
+			/** @type {Map<string, Array<(event: MessageEvent, data: any) => void>>} */
 			this.handlers = new Map();
+
 			window.addEventListener('message', (e) => {
 				if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
 					// Came from inner iframe
@@ -18,21 +20,36 @@
 				}
 
 				const channel = e.data.channel;
-				const handler = this.handlers.get(channel);
-				if (handler) {
-					handler(e, e.data.args);
+				const handlers = this.handlers.get(channel);
+				if (handlers) {
+					for (const handler of handlers) {
+						handler(e, e.data.args);
+					}
 				} else {
 					console.log('no handler for ', e);
 				}
 			});
 		}
 
+		/**
+		 * @param {string} channel
+		 * @param {any} data
+		 */
 		postMessage(channel, data) {
 			window.parent.postMessage({ target: id, channel, data }, '*');
 		}
 
+		/**
+		 * @param {string} channel
+		 * @param {(event: MessageEvent, data: any) => void} handler
+		 */
 		onMessage(channel, handler) {
-			this.handlers.set(channel, handler);
+			let handlers = this.handlers.get(channel);
+			if (!handlers) {
+				handlers = [];
+				this.handlers.set(channel, handlers);
+			}
+			handlers.push(handler);
 		}
 	}();
 
@@ -41,6 +58,7 @@
 		hostMessaging.postMessage('fatal-error', { message });
 	}
 
+	/** @type {Promise<void>} */
 	const workerReady = new Promise(async (resolveWorkerReady) => {
 		if (onElectron) {
 			return resolveWorkerReady();
@@ -105,6 +123,60 @@
 		}
 	}
 
+	const unloadMonitor = new class {
+
+		constructor() {
+			this.confirmBeforeClose = 'keyboardOnly';
+			this.isModifierKeyDown = false;
+
+			hostMessaging.onMessage('set-confirm-before-close', (_e, /** @type {string} */ data) => {
+				this.confirmBeforeClose = data;
+			});
+
+			hostMessaging.onMessage('content', (_e, /** @type {any} */ data) => {
+				this.confirmBeforeClose = data.confirmBeforeClose;
+			});
+
+			window.addEventListener('beforeunload', (event) => {
+				if (onElectron) {
+					return;
+				}
+
+				switch (this.confirmBeforeClose) {
+					case 'always':
+						{
+							event.preventDefault();
+							event.returnValue = '';
+							return '';
+						}
+					case 'never':
+						{
+							break;
+						}
+					case 'keyboardOnly':
+					default: {
+						if (this.isModifierKeyDown) {
+							event.preventDefault();
+							event.returnValue = '';
+							return '';
+						}
+						break;
+					}
+				}
+			});
+		}
+
+		onIframeLoaded(/** @type {HTMLIFrameElement} */frame) {
+			frame.contentWindow.addEventListener('keydown', e => {
+				this.isModifierKeyDown = e.metaKey || e.ctrlKey || e.altKey;
+			});
+
+			frame.contentWindow.addEventListener('keyup', () => {
+				this.isModifierKeyDown = false;
+			});
+		}
+	};
+
 	/** @type {import('./main').WebviewHost} */
 	const host = {
 		postMessage: hostMessaging.postMessage.bind(hostMessaging),
@@ -112,6 +184,9 @@
 		ready: workerReady,
 		fakeLoad: !onElectron,
 		onElectron: onElectron,
+		onIframeLoaded: (/** @type {HTMLIFrameElement} */ frame) => {
+			unloadMonitor.onIframeLoaded(frame);
+		},
 		rewriteCSP: onElectron
 			? (csp) => {
 				return csp.replace(/vscode-resource:(?=(\s|;|$))/g, 'vscode-webview-resource:');
diff --git a/src/vs/workbench/contrib/webview/browser/pre/main.js b/src/vs/workbench/contrib/webview/browser/pre/main.js
index 726eff39c..b2f093ee1 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/main.js
+++ b/src/vs/workbench/contrib/webview/browser/pre/main.js
@@ -319,7 +319,8 @@
 		 */
 		function isCopyPasteOrCut(e) {
 			const hasMeta = e.ctrlKey || e.metaKey;
-			return hasMeta && ['c', 'v', 'x'].includes(e.key);
+			const shiftInsert = e.shiftKey && e.key.toLowerCase() === 'insert';
+			return (hasMeta && ['c', 'v', 'x'].includes(e.key.toLowerCase())) || shiftInsert;
 		}
 
 		/**
@@ -328,7 +329,7 @@
 		 */
 		function isUndoRedo(e) {
 			const hasMeta = e.ctrlKey || e.metaKey;
-			return hasMeta && ['z', 'y'].includes(e.key);
+			return hasMeta && ['z', 'y'].includes(e.key.toLowerCase());
 		}
 
 		let isHandlingScroll = false;
@@ -585,8 +586,6 @@
 							newFrame.contentWindow.focus();
 						}
 
-
-
 						contentWindow.addEventListener('scroll', handleInnerScroll);
 						contentWindow.addEventListener('wheel', handleWheel);
 
diff --git a/src/vs/workbench/contrib/webview/browser/webview.ts b/src/vs/workbench/contrib/webview/browser/webview.ts
index 945817c5d..189e52c3a 100644
--- a/src/vs/workbench/contrib/webview/browser/webview.ts
+++ b/src/vs/workbench/contrib/webview/browser/webview.ts
@@ -18,9 +18,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
  */
 export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('webviewFindWidgetVisible', false);
 export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED = new RawContextKey<boolean>('webviewFindWidgetFocused', false);
-
-export const webviewHasOwnEditFunctionsContextKey = 'webviewHasOwnEditFunctions';
-export const webviewHasOwnEditFunctionsContext = new RawContextKey<boolean>(webviewHasOwnEditFunctionsContextKey, false);
+export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED = new RawContextKey<boolean>('webviewFindWidgetEnabled', false);
 
 export const IWebviewService = createDecorator<IWebviewService>('webviewService');
 
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index f142c2c21..4403a2ac4 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -8,6 +8,7 @@ import { streamToBuffer } from 'vs/base/common/buffer';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -24,6 +25,7 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 
 export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Webview {
 	private readonly _portMappingManager: WebviewPortMappingManager;
+	private _confirmBeforeClose: string;
 
 	constructor(
 		id: string,
@@ -37,11 +39,23 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 		@IRequestService private readonly requestService: IRequestService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
-		@ILogService logService: ILogService,
+		@ILogService private readonly logService: ILogService,
 	) {
 		super(id, options, contentOptions, extension, webviewThemeDataProvider, notificationService, logService, telemetryService, environmentService);
 
+		/* __GDPR__
+			"webview.createWebview" : {
+				"extension": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"s": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+			}
+		*/
+		telemetryService.publicLog('webview.createWebview', {
+			extension: extension?.id.value,
+			webviewElementType: 'iframe',
+		});
+
 		this._portMappingManager = this._register(new WebviewPortMappingManager(
 			() => this.extension?.location,
 			() => this.content.options.portMapping || [],
@@ -59,6 +73,15 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 			this.localLocalhost(entry.origin);
 		}));
 
+		this._confirmBeforeClose = this._configurationService.getValue<string>('window.confirmBeforeClose');
+
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('window.confirmBeforeClose')) {
+				this._confirmBeforeClose = this._configurationService.getValue('window.confirmBeforeClose');
+				this._send(WebviewMessageChannels.setConfirmBeforeClose, this._confirmBeforeClose);
+			}
+		}));
+
 		this.initElement(extension, options);
 	}
 
@@ -75,8 +98,19 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 	}
 
 	protected initElement(extension: WebviewExtensionDescription | undefined, options: WebviewOptions) {
-		// The extensionId and purpose in the URL are used for filtering in js-debug:
-		this.element!.setAttribute('src', `${this.externalEndpoint}/index.html?id=${this.id}&extensionId=${extension?.id.value ?? ''}&purpose=${options.purpose}`);
+		const params = {
+			id: this.id,
+
+			// The extensionId and purpose in the URL are used for filtering in js-debug:
+			extensionId: extension?.id.value ?? '',
+			purpose: options.purpose,
+		} as const;
+
+		const queryString = (Object.keys(params) as Array<keyof typeof params>)
+			.map((key) => `${key}=${params[key]}`)
+			.join('&');
+
+		this.element!.setAttribute('src', `${this.externalEndpoint}/index.html?${queryString}`);
 	}
 
 	private get externalEndpoint(): string {
@@ -116,6 +150,7 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 	protected get extraContentOptions(): any {
 		return {
 			endpoint: this.externalEndpoint,
+			confirmBeforeClose: this._confirmBeforeClose,
 		};
 	}
 
@@ -167,8 +202,8 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 				remoteConnectionData,
 				rewriteUri,
 			}, {
-				readFileStream: (resource) => this.fileService.readFileStream(resource).then(x => x.value),
-			}, this.requestService);
+				readFileStream: (resource) => this.fileService.readFileStream(resource).then(x => ({ stream: x.value, etag: x.etag })),
+			}, this.requestService, this.logService);
 
 			if (result.type === WebviewResourceResponse.Type.Success) {
 				const { buffer } = await streamToBuffer(result.stream);
diff --git a/src/vs/workbench/contrib/webview/electron-browser/pre/electron-index.js b/src/vs/workbench/contrib/webview/electron-browser/pre/electron-index.js
index 3dfdad8b2..914585880 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/pre/electron-index.js
+++ b/src/vs/workbench/contrib/webview/electron-browser/pre/electron-index.js
@@ -6,16 +6,6 @@
 (function () {
 	'use strict';
 
-	const registerVscodeResourceScheme = (function () {
-		let hasRegistered = false;
-		return () => {
-			if (hasRegistered) {
-				return;
-			}
-			hasRegistered = true;
-		};
-	}());
-
 	const ipcRenderer = require('electron').ipcRenderer;
 
 	let isInDevelopmentMode = false;
@@ -73,8 +63,6 @@
 	});
 
 	document.addEventListener('DOMContentLoaded', () => {
-		registerVscodeResourceScheme();
-
 		// Forward messages from the embedded iframe
 		window.onmessage = (message) => {
 			ipcRenderer.sendToHost(message.data.command, message.data.data);
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
index d11fa2273..a10ee1601 100644
--- a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -15,7 +15,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { webviewPartitionId } from 'vs/platform/webview/common/resourceLoader';
@@ -62,20 +61,21 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IMainProcessService mainProcessService: IMainProcessService,
-		@INotificationService noficationService: INotificationService,
-		@INativeHostService nativeHostService: INativeHostService,
+		@INotificationService notificationService: INotificationService,
 	) {
-		super(id, options, contentOptions, extension, _webviewThemeDataProvider, noficationService, _myLogService, telemetryService, environmentService);
+		super(id, options, contentOptions, extension, _webviewThemeDataProvider, notificationService, _myLogService, telemetryService, environmentService);
 
 		/* __GDPR__
 			"webview.createWebview" : {
 				"extension": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"enableFindWidget": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
+				"enableFindWidget": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+				"webviewElementType": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 			}
 		*/
 		telemetryService.publicLog('webview.createWebview', {
 			enableFindWidget: !!options.enableFindWidget,
 			extension: extension?.id.value,
+			webviewElementType: 'webview',
 		});
 
 		this._myLogService.debug(`Webview(${this.id}): init`);
@@ -231,9 +231,11 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
 			return;
 		}
 
-		// Clear the existing focus first.
+		// Clear the existing focus first if not already on the webview.
 		// This is required because the next part where we set the focus is async.
-		if (document.activeElement && document.activeElement instanceof HTMLElement) {
+		if (document.activeElement && document.activeElement instanceof HTMLElement && document.activeElement !== this.element) {
+			// Don't blur if on the webview because this will also happen async and may unset the focus
+			// after the focus trigger fires below.
 			document.activeElement.blur();
 		}
 
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts b/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
index 8c010272b..d6c80d16f 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/iframeWebviewElement.ts
@@ -58,7 +58,7 @@ export class ElectronIframeWebview extends IFrameWebview {
 		@INativeHostService nativeHostService: INativeHostService,
 	) {
 		super(id, options, contentOptions, extension, webviewThemeDataProvider,
-			noficationService, tunnelService, fileService, requestService, telemetryService, environmentService, _remoteAuthorityResolverService, logService);
+			noficationService, tunnelService, fileService, requestService, telemetryService, environmentService, configurationService, _remoteAuthorityResolverService, logService);
 
 		this._resourceRequestManager = this._register(instantiationService.createInstance(WebviewResourceRequestManager, id, extension, this.content.options));
 
diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/resourceLoading.ts b/src/vs/workbench/contrib/webview/electron-sandbox/resourceLoading.ts
index b4236def6..99820e69b 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/resourceLoading.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/resourceLoading.ts
@@ -79,6 +79,7 @@ export class WebviewResourceRequestManager extends Disposable {
 		const remoteConnectionData = remoteAuthority ? remoteAuthorityResolverService.getConnectionData(remoteAuthority) : null;
 
 		this._logService.debug(`WebviewResourceRequestManager(${this.id}): did-start-loading`);
+
 		this._ready = this._webviewManagerService.registerWebview(this.id, nativeHostService.windowId, {
 			extensionLocation: this.extension?.location.toJSON(),
 			localResourceRoots: this._localResourceRoots.map(x => x.toJSON()),
@@ -101,14 +102,18 @@ export class WebviewResourceRequestManager extends Disposable {
 
 		const loadResourceChannel = `vscode:loadWebviewResource-${id}`;
 		const loadResourceListener = async (_event: any, requestId: number, resource: UriComponents) => {
+			const uri = URI.revive(resource);
 			try {
-				const response = await loadLocalResource(URI.revive(resource), {
+				this._logService.debug(`WebviewResourceRequestManager(${this.id}): starting resource load. uri: ${uri}`);
+
+				const response = await loadLocalResource(uri, {
 					extensionLocation: this.extension?.location,
 					roots: this._localResourceRoots,
 					remoteConnectionData: remoteConnectionData,
 				}, {
-					readFileStream: (resource) => fileService.readFileStream(resource).then(x => x.value),
-				}, requestService);
+					readFileStream: (resource) => fileService.readFileStream(resource).then(x => ({ stream: x.value, etag: x.etag })),
+				}, requestService, this._logService);
+				this._logService.debug(`WebviewResourceRequestManager(${this.id}): finished resource load. uri: ${uri}, type=${response.type}`);
 
 				if (response.type === WebviewResourceResponse.Type.Success) {
 					const buffer = await streamToBuffer(response.stream);
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
index ede437c81..84a4336e6 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.ts
@@ -10,7 +10,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CATEGORIES } from 'vs/workbench/common/actions';
-import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, Webview } from 'vs/workbench/contrib/webview/browser/webview';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE, Webview } from 'vs/workbench/contrib/webview/browser/webview';
 import { WebviewEditor } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditor';
 import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -26,7 +26,7 @@ export class ShowWebViewEditorFindWidgetAction extends Action2 {
 			id: ShowWebViewEditorFindWidgetAction.ID,
 			title: ShowWebViewEditorFindWidgetAction.LABEL,
 			keybinding: {
-				when: webviewActiveContextKeyExpr,
+				when: ContextKeyExpr.and(webviewActiveContextKeyExpr, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_ENABLED),
 				primary: KeyMod.CtrlCmd | KeyCode.KEY_F,
 				weight: KeybindingWeight.EditorContrib
 			}
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
index d9beb099f..eed36d2b0 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
@@ -19,7 +19,7 @@ import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { Memento, MementoObject } from 'vs/workbench/common/memento';
 import { IViewDescriptorService, IViewsService } from 'vs/workbench/common/views';
diff --git a/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts b/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts
index 6e19480fc..a90884eb3 100644
--- a/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts
+++ b/src/vs/workbench/contrib/welcome/common/viewsWelcomeExtensionPoint.ts
@@ -68,7 +68,7 @@ const viewsWelcomeExtensionPointSchema = Object.freeze<IConfigurationPropertySch
 			},
 			[ViewsWelcomeExtensionPointFields.enablement]: {
 				type: 'string',
-				description: nls.localize('contributes.viewsWelcome.view.enablement', "Condition when the welcome content buttons should be enabled."),
+				description: nls.localize('contributes.viewsWelcome.view.enablement', "Condition when the welcome content buttons and command links should be enabled."),
 			},
 		}
 	}
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts
index b53ddab85..a7628dd2c 100644
--- a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import { GettingStartedInputFactory, GettingStartedPage, GettingStartedInput } from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted';
+import { GettingStartedInputFactory, GettingStartedInput, getGettingStartedInput } from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions as EditorInputExtensions, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
 import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
@@ -13,6 +13,9 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
 import product from 'vs/platform/product/common/product';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+
+export * as icons from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons';
 
 registerAction2(class extends Action2 {
 	constructor() {
@@ -32,7 +35,7 @@ registerAction2(class extends Action2 {
 	}
 
 	public run(accessor: ServicesAccessor) {
-		return accessor.get(IInstantiationService).createInstance(GettingStartedPage, {}).openEditor();
+		accessor.get(IEditorService).openEditor(accessor.get(IInstantiationService).invokeFunction(getGettingStartedInput, {}), {});
 	}
 });
 
@@ -44,7 +47,7 @@ if (product.quality !== 'stable') {
 		properties: {
 			'workbench.experimental.gettingStarted': {
 				type: 'boolean',
-				description: localize('gettingStartedDescription', "Enables an experimental Getting Started page, accesible via the Help menu."),
+				description: localize('gettingStartedDescription', "Enables an experimental Getting Started page, available via the Help menu."),
 				default: false,
 			}
 		}
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.css b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.css
index 7c199b89d..5682e64e6 100644
--- a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.css
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.css
@@ -12,18 +12,22 @@
 	width: 100%;
 	height: 100%;
 	position: absolute;
-	transition: left 0.25s, opacity 0.25s;
 	left: 0;
+	top: 0;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer.animationReady .gettingStartedSlide {
+	transition: left 0.25s, opacity 0.25s;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories {
-	height: calc(100% - 50px);
 	display: flex;
 	flex-direction: column;
+	overflow: hidden;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .gap {
-	flex: 150px 0 1
+	flex: 150px 0 1000
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .header {
@@ -35,6 +39,7 @@
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .category-title {
 	margin-bottom: 4px;
+	font-weight: 600;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .category-description-container {
@@ -46,12 +51,18 @@
 	font-size: 12px;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories progress {
-	font-size: 12pt;
-	width: 100%;
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .progress-bar-outer {
+	height: 8px;
+	border-radius: 4px;
+	margin-top: 4px;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories #getting-started-categories-container {
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .progress-bar-inner {
+	height: 100%;
+	border-radius: 4px;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .getting-started-categories-container {
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: center;
@@ -59,9 +70,15 @@
 	margin: 32px auto;
 }
 
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .getting-started-categories-scrolling-container {
+	overflow: scroll;
+	height: 100%;
+}
+
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide .getting-started-category {
 	width: 330px;
 	min-height: 80px;
+	font-size: 13px;
 	margin: 12px;
 	text-align: left;
 	display: flex;
@@ -76,30 +93,60 @@
 	font-size: 32px;
 }
 
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail {
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .gap {
+	flex: 150px 0 1000
+}
+
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-category {
 	width: 330px;
 	display: flex;
-	padding: 40px 0 20px;
-	margin-left: 12px;
+	padding: 10px 0 20px 12px;
+	margin: 0;
 	min-height: auto;
 }
 
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-columns .gap {
+	flex: 150px 1 1000
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-media {
+	min-height: 300px;
+}
+
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-category .codicon {
 	margin-left:0;
 	font-size: 22pt;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail #getting-started-detail-columns {
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-columns {
 	display: flex;
-	height: 100%;
-	justify-content: center;
-	padding: 44px;
+	justify-content: flex-start;
+	padding: 20px 20px 0;
+	max-height: calc(100% - 20px);
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task {
 	display: flex;
 	width: 100%;
 	overflow: hidden;
+	transition: max-height .1s linear;
+	max-height: 150px;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task:not(.expanded) {
+	max-height: 54px;
+	background: none;
+	opacity: 0.8;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-columns .getting-started-detail-left > div {
+	width: 100%;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task:not(.expanded) .task-description,
@@ -109,19 +156,11 @@
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task.expanded {
-	width: 100%;
-	height: unset;
-}
-
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .task-title {
-	font-size: 14pt;
-}
 
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .task-description {
-	margin-top: 4px;
-	font-size: 13px;
+	padding-top: 8px;
+	font-size: 12px;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .actions {
@@ -132,6 +171,7 @@
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .task-next {
 	margin-left: auto;
+	margin-right: 10px;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .codicon.hidden {
@@ -140,26 +180,46 @@
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .codicon {
 	margin-right: 8px;
-	font-size: 20px;
+	font-size: 13px;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task-action {
 	padding: 6px 12px;
-	font-size: 11pt;
-	min-width: 100px;
+	font-size: 13px;
+	margin-bottom: 0;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail #getting-started-detail-left {
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-left {
 	min-width: 330px;
 	width: 40%;
 	max-width: 400px;
+	display: flex;
+	flex-direction: column;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail #getting-started-detail-right {
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .full-height-scrollable {
+	height: 100%;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-container {
+	height: 100%;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .gettingStartedDetailsContent {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-detail-right {
+	display: flex;
+	align-items: flex-start;
+	justify-content: center;
 	width: 66%;
-	text-align: center;
-	padding-left: 44px;
-	margin-bottom: 50px;
+	min-height: 300px;
+	padding: 0px 0 20px 44px;
+	min-width: 400px;
+	max-width: 800px;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer button {
@@ -168,11 +228,6 @@
 	text-align: left;
 	padding: 16px;
 }
-
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer button:not(:first-child) {
-	margin-top: 12px;
-}
-
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer button:hover {
 	cursor: pointer;
 }
@@ -183,9 +238,11 @@
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .prev-button {
 	position: absolute;
-	left: 0;
+	left: -2px;
+	top: -10px;
 	font-size: 12pt;
 	margin: 10px;
+	z-index: 1;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .prev-button:hover {
@@ -214,12 +271,13 @@
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide h2 {
 	font-weight: normal;
+	line-height: 26px;
 	margin: 0 0 4px 0;
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide h3 {
-	font-size: 18px;
-	font-weight: bold;
+	font-size: 13px;
+	font-weight: 700;
 	margin: 0;
 }
 
@@ -229,14 +287,6 @@
 	padding: 0;
 }
 
-.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .footer {
-	position: absolute;
-	text-align: center;
-	bottom: 0;
-	width: calc(100% - 40px);
-	margin-bottom: 20px;
-}
-
 .monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.next {
 	left: 100%;
 	opacity: 0;
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
index 637330e06..0d0fca860 100644
--- a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.ts
@@ -6,24 +6,27 @@
 import 'vs/css!./gettingStarted';
 import 'vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started';
 import { localize } from 'vs/nls';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { WalkThroughInput } from 'vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput';
+import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { IEditorInputFactory } from 'vs/workbench/common/editor';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { assertIsDefined } from 'vs/base/common/types';
 import { $, addDisposableListener } from 'vs/base/browser/dom';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IGettingStartedCategoryWithProgress, IGettingStartedService } from 'vs/workbench/services/gettingStarted/common/gettingStartedService';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { buttonBackground as welcomeButtonBackground, buttonHoverBackground as welcomeButtonHoverBackground, welcomePageBackground } from 'vs/workbench/contrib/welcome/page/browser/welcomePageColors';
-import { activeContrastBorder, buttonBackground, buttonForeground, buttonHoverBackground, contrastBorder, descriptionForeground, focusBorder, foreground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
+import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { welcomeButtonBackground, welcomeButtonHoverBackground, welcomePageBackground, welcomePageProgressBackground, welcomePageProgressForeground } from 'vs/workbench/contrib/welcome/page/browser/welcomePageColors';
+import { activeContrastBorder, buttonBackground, buttonForeground, buttonHoverBackground, buttonSecondaryBackground, contrastBorder, descriptionForeground, focusBorder, foreground, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { getExtraColor } from 'vs/workbench/contrib/welcome/walkThrough/common/walkThroughUtils';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
+import { gettingStartedCheckedCodicon, gettingStartedUncheckedCodicon } from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons';
+import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
 
 export const gettingStartedInputTypeId = 'workbench.editors.gettingStartedInput';
 const telemetryFrom = 'gettingStartedPage';
@@ -31,48 +34,74 @@ const telemetryFrom = 'gettingStartedPage';
 export class GettingStartedInput extends WalkThroughInput {
 	static readonly ID = gettingStartedInputTypeId;
 
+	constructor(
+		options: WalkThroughInputOptions & { selectedCategory?: string, selectedTask?: string },
+		@ITextModelService textModelResolverService: ITextModelService
+	) {
+		super(options, textModelResolverService);
+		this.selectedCategory = options.selectedCategory;
+		this.selectedTask = options.selectedTask;
+	}
+
 	selectedCategory: string | undefined;
 	selectedTask: string | undefined;
 }
 
+export function getGettingStartedInput(accessor: ServicesAccessor, options: { selectedCategory?: string, selectedTask?: string }) {
+	const resource = FileAccess.asBrowserUri('./vs_code_editor_getting_started.md', require)
+		.with({
+			scheme: Schemas.walkThrough,
+			query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started' })
+		});
+
+	const instantiationService = accessor.get(IInstantiationService);
+
+	const pages: GettingStartedPage[] = [];
+
+	const editorInput = instantiationService.createInstance(GettingStartedInput, {
+		typeId: gettingStartedInputTypeId,
+		name: localize('editorGettingStarted.title', "Getting Started"),
+		resource,
+		telemetryFrom,
+		selectedCategory: options.selectedCategory,
+		selectedTask: options.selectedTask,
+		onReady: (container: HTMLElement, disposableStore: DisposableStore) => {
+			const page = instantiationService.createInstance(GettingStartedPage, editorInput);
+			page.onReady(container);
+			pages.push(page);
+			disposableStore.add(page);
+		},
+		layout: () => pages.forEach(page => page.layout()),
+	});
+
+	return editorInput;
+}
+
 export class GettingStartedPage extends Disposable {
 	readonly editorInput: GettingStartedInput;
 	private inProgressScroll = Promise.resolve();
 
-	private dispatchListeners = new DisposableStore();
+	private dispatchListeners: DisposableStore = new DisposableStore();
 
 	private gettingStartedCategories: IGettingStartedCategoryWithProgress[];
 	private currentCategory: IGettingStartedCategoryWithProgress | undefined;
 
+	private categoriesScrollbar: DomScrollableElement | undefined;
+	private detailsScrollbar: DomScrollableElement | undefined;
+	private detailImageScrollbar: DomScrollableElement | undefined;
+
 	constructor(
-		initialState: { selectedCategory?: string, selectedTask?: string },
-		@IEditorService private readonly editorService: IEditorService,
+		editorInput: GettingStartedInput,
 		@ICommandService private readonly commandService: ICommandService,
 		@IProductService private readonly productService: IProductService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IGettingStartedService private readonly gettingStartedService: IGettingStartedService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IOpenerService private readonly openerService: IOpenerService,
 	) {
 		super();
 
-		const resource = FileAccess.asBrowserUri('./vs_code_editor_getting_started.md', require)
-			.with({
-				scheme: Schemas.walkThrough,
-				query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started' })
-			});
-
-
-		this.editorInput = this.instantiationService.createInstance(GettingStartedInput, {
-			typeId: gettingStartedInputTypeId,
-			name: localize('editorGettingStarted.title', "Getting Started"),
-			resource,
-			telemetryFrom,
-			onReady: (container: HTMLElement) => this.onReady(container)
-		});
-
-		this.editorInput.selectedCategory = initialState.selectedCategory;
-		this.editorInput.selectedTask = initialState.selectedTask;
+		this.editorInput = editorInput;
 
 		this.gettingStartedCategories = this.gettingStartedService.getCategories();
 		this._register(this.dispatchListeners);
@@ -88,24 +117,22 @@ export class GettingStartedPage extends Disposable {
 			}
 			ourTask.done = task.done;
 			if (category.id === this.currentCategory?.id) {
-				const badgeelement = assertIsDefined(document.getElementById('done-task-' + task.id));
-				if (task.done) {
-					badgeelement.classList.remove('codicon-star-empty');
-					badgeelement.classList.add('codicon-star-full');
-				}
-				else {
-					badgeelement.classList.add('codicon-star-empty');
-					badgeelement.classList.remove('codicon-star-full');
-				}
+				const badgeelements = assertIsDefined(document.querySelectorAll(`[data-done-task-id="${task.id}"]`));
+				badgeelements.forEach(badgeelement => {
+					if (task.done) {
+						badgeelement.classList.remove(...ThemeIcon.asClassNameArray(gettingStartedUncheckedCodicon));
+						badgeelement.classList.add('complete', ...ThemeIcon.asClassNameArray(gettingStartedCheckedCodicon));
+					}
+					else {
+						badgeelement.classList.add(...ThemeIcon.asClassNameArray(gettingStartedUncheckedCodicon));
+						badgeelement.classList.remove('complete', ...ThemeIcon.asClassNameArray(gettingStartedCheckedCodicon));
+					}
+				});
 			}
 			this.updateCategoryProgress();
 		}));
 	}
 
-	public openEditor(options: IEditorOptions = { pinned: true }) {
-		return this.editorService.openEditor(this.editorInput, options);
-	}
-
 	private registerDispatchListeners(container: HTMLElement) {
 		this.dispatchListeners.clear();
 
@@ -144,7 +171,7 @@ export class GettingStartedPage extends Disposable {
 							break;
 						}
 						case 'selectTask': {
-							this.selectTask(argument);
+							this.selectTask(container, argument);
 							e.stopPropagation();
 							break;
 						}
@@ -153,8 +180,14 @@ export class GettingStartedPage extends Disposable {
 								throw Error('cannot run task action for category of non items type' + this.currentCategory?.id);
 							}
 							const taskToRun = assertIsDefined(this.currentCategory?.content.items.find(task => task.id === argument));
-							const commandToRun = assertIsDefined(taskToRun.button?.command);
-							this.commandService.executeCommand(commandToRun);
+							if (taskToRun.button.command) {
+								this.commandService.executeCommand(taskToRun.button.command);
+							} else if (taskToRun.button.link) {
+								this.openerService.open(taskToRun.button.link);
+								this.gettingStartedService.progressByEvent('linkOpened:' + taskToRun.button.link);
+							} else {
+								throw Error('Task ' + JSON.stringify(taskToRun) + ' does not have an associated action');
+							}
 							break;
 						}
 						default: {
@@ -167,10 +200,10 @@ export class GettingStartedPage extends Disposable {
 		});
 	}
 
-	private selectTask(id: string | undefined) {
-		const mediaElement = assertIsDefined(document.getElementById('getting-started-media'));
+	private selectTask(container: HTMLElement, id: string | undefined) {
+		const mediaElement = assertIsDefined(container.querySelector('.getting-started-media'));
 		if (id) {
-			const taskElement = assertIsDefined(document.getElementById('getting-started-task-' + id));
+			const taskElement = assertIsDefined(container.querySelector(`[data-task-id="${id}"]`));
 			if (!this.currentCategory || this.currentCategory.content.type !== 'items') {
 				throw Error('cannot expand task for category of non items type' + this.currentCategory?.id);
 			}
@@ -185,9 +218,11 @@ export class GettingStartedPage extends Disposable {
 			mediaElement.setAttribute('src', '');
 			mediaElement.setAttribute('alt', '');
 		}
+		this.detailsScrollbar?.scanDomNode();
+		this.detailImageScrollbar?.scanDomNode();
 	}
 
-	private onReady(container: HTMLElement) {
+	onReady(container: HTMLElement) {
 		const categoryElements = this.gettingStartedCategories.map(
 			category => {
 				const categoryDescriptionElement =
@@ -195,31 +230,53 @@ export class GettingStartedPage extends Disposable {
 						$('.category-description-container', {},
 							$('h3.category-title', {}, category.title),
 							$('.category-description.description', {}, category.description),
-							$('.category-progress', { 'x-data-category-id': category.id, }, $('.message'), $('progress'))) :
+							$('.category-progress', { 'x-data-category-id': category.id, },
+								$('.message'),
+								$('.progress-bar-outer', {},
+									$('.progress-bar-inner'))))
+						:
 						$('.category-description-container', {},
 							$('h3.category-title', {}, category.title),
 							$('.category-description.description', {}, category.description));
 
 				return $('button.getting-started-category',
 					{ 'x-dispatch': 'selectCategory:' + category.id },
-					$('.codicon.codicon-' + category.codicon, {}), categoryDescriptionElement);
+					$(ThemeIcon.asCSSSelector(category.icon), {}), categoryDescriptionElement);
 			});
 
-		const rightColumn = assertIsDefined(container.querySelector('#getting-started-detail-right'));
-		rightColumn.appendChild($('img#getting-started-media'));
+		const categoriesSlide = assertIsDefined(container.querySelector('.gettingStartedSlideCategory'));
+		const tasksSlide = assertIsDefined(container.querySelector('.gettingStartedSlideDetails'));
 
-		const categoriesContainer = assertIsDefined(document.getElementById('getting-started-categories-container'));
+		const tasksContent = assertIsDefined(container.querySelector('.gettingStartedDetailsContent') as HTMLElement);
+		tasksContent.remove();
+		if (this.detailImageScrollbar) { this.detailImageScrollbar.dispose(); }
+		this.detailImageScrollbar = this._register(new DomScrollableElement(tasksContent, { className: 'full-height-scrollable' }));
+		tasksSlide.appendChild(this.detailImageScrollbar.getDomNode());
+		this.detailImageScrollbar.scanDomNode();
+
+		const rightColumn = assertIsDefined(container.querySelector('.getting-started-detail-right'));
+		rightColumn.appendChild($('img.getting-started-media'));
+
+		const categoryScrollContainer = $('.getting-started-categories-scrolling-container');
+		const categoriesContainer = $('.getting-started-categories-container');
 		categoryElements.forEach(element => {
 			categoriesContainer.appendChild(element);
 		});
 
+		categoryScrollContainer.appendChild(categoriesContainer);
+		categoryScrollContainer.appendChild($('.footer', {}, $('a.skip', { 'x-dispatch': 'skip' }, localize('gettingStarted.skip', "Skip"))));
+
+		if (this.categoriesScrollbar) { this.categoriesScrollbar.dispose(); }
+		this.categoriesScrollbar = this._register(new DomScrollableElement(categoryScrollContainer, {}));
+		categoriesSlide.appendChild(this.categoriesScrollbar.getDomNode());
+		categoriesSlide.appendChild($('.gap'));
+		this.categoriesScrollbar.scanDomNode();
+
 		this.updateCategoryProgress();
 
-		assertIsDefined(document.getElementById('product-name')).textContent = this.productService.nameLong;
+		assertIsDefined(container.querySelector('.product-name')).textContent = this.productService.nameLong;
 		this.registerDispatchListeners(container);
 
-		const categoriesSlide = assertIsDefined(document.getElementById('gettingStartedSlideCategory'));
-		const tasksSlide = assertIsDefined(document.getElementById('gettingStartedSlideDetails'));
 
 		if (this.editorInput.selectedCategory) {
 			this.currentCategory = this.gettingStartedCategories.find(category => category.id === this.editorInput.selectedCategory);
@@ -231,21 +288,28 @@ export class GettingStartedPage extends Disposable {
 		} else {
 			tasksSlide.classList.add('next');
 		}
+		setTimeout(() => assertIsDefined(container.querySelector('.gettingStartedContainer')).classList.add('animationReady'), 0);
+	}
+
+	layout() {
+		this.categoriesScrollbar?.scanDomNode();
+		this.detailsScrollbar?.scanDomNode();
+		this.detailImageScrollbar?.scanDomNode();
 	}
 
 	private updateCategoryProgress() {
 		document.querySelectorAll('.category-progress').forEach(element => {
 			const categoryID = element.getAttribute('x-data-category-id');
 			const category = this.gettingStartedCategories.find(category => category.id === categoryID);
-			if (!category) { throw Error('Could not find c=ategory with ID ' + categoryID); }
+			if (!category) { throw Error('Could not find category with ID ' + categoryID); }
 			if (category.content.type !== 'items') { throw Error('Category with ID ' + categoryID + ' is not of items type'); }
 			const numDone = category.content.items.filter(task => task.done).length;
 			const numTotal = category.content.items.length;
 
 			const message = assertIsDefined(element.firstChild);
-			const bar = assertIsDefined(element.lastChild) as HTMLProgressElement;
-			bar.value = numDone;
-			bar.max = numTotal;
+			const bar = assertIsDefined(element.querySelector('.progress-bar-inner')) as HTMLDivElement;
+			bar.style.width = `${(numDone / numTotal) * 100}%`;
+
 			if (numTotal === numDone) {
 				message.textContent = `All items complete!`;
 			}
@@ -257,7 +321,7 @@ export class GettingStartedPage extends Disposable {
 
 	private async scrollToCategory(container: HTMLElement, categoryID: string) {
 		this.inProgressScroll = this.inProgressScroll.then(async () => {
-			this.clearDetialView();
+			this.clearDetialView(container);
 			this.editorInput.selectedCategory = categoryID;
 			this.currentCategory = this.gettingStartedCategories.find(category => category.id === categoryID);
 			const slides = [...container.querySelectorAll('.gettingStartedSlide').values()];
@@ -275,19 +339,20 @@ export class GettingStartedPage extends Disposable {
 		if (!category) { throw Error('could not find category with ID ' + categoryID); }
 		if (category.content.type !== 'items') { throw Error('category with ID ' + categoryID + ' is not of items type'); }
 
-		const detailTitle = assertIsDefined(document.getElementById('getting-started-detail-title'));
+		const leftColumn = assertIsDefined(container.querySelector('.getting-started-detail-left'));
+		const detailTitle = assertIsDefined(container.querySelector('.getting-started-detail-title'));
 		detailTitle.appendChild(
 			$('.getting-started-category',
 				{},
-				$('.codicon.codicon-' + category.codicon, {}),
+				$(ThemeIcon.asCSSSelector(category.icon), {}),
 				$('.category-description-container', {},
 					$('h2.category-title', {}, category.title),
 					$('.category-description.description', {}, category.description))));
 
 		const categoryElements = category.content.items.map(
 			(task, i, arr) => $('button.getting-started-task',
-				{ 'x-dispatch': 'selectTask:' + task.id, id: 'getting-started-task-' + task.id },
-				$('.codicon' + (task.done ? '.codicon-pass-filled' : '.codicon-circle-large-outline'), { id: 'done-task-' + task.id }),
+				{ 'x-dispatch': 'selectTask:' + task.id, 'data-task-id': task.id },
+				$('.codicon' + (task.done ? '.complete.codicon-pass-filled' : '.codicon-circle-large-outline'), { 'data-done-task-id': task.id }),
 				$('.task-description-container', {},
 					$('h3.task-title', {}, task.title),
 					$('.task-description.description', {}, task.description),
@@ -295,7 +360,7 @@ export class GettingStartedPage extends Disposable {
 						...(
 							task.button
 								? [$('button.emphasis.getting-started-task-action', { 'x-dispatch': 'runTaskAction:' + task.id },
-									task.button.title + this.getKeybindingLabel(task.button.command)
+									task.button.title + (task.button.command ? this.getKeybindingLabel(task.button.command) : '')
 								)]
 								: []),
 						...(
@@ -307,18 +372,22 @@ export class GettingStartedPage extends Disposable {
 						))
 				)));
 
-		const detailContainer = assertIsDefined(document.getElementById('getting-started-detail-container'));
+		const detailContainer = $('.getting-started-detail-container');
+		if (this.detailsScrollbar) { this.detailsScrollbar.getDomNode().remove(); this.detailsScrollbar.dispose(); }
+		this.detailsScrollbar = this._register(new DomScrollableElement(detailContainer, { className: 'full-height-scrollable' }));
 		categoryElements.forEach(element => detailContainer.appendChild(element));
+		leftColumn.appendChild(this.detailsScrollbar.getDomNode());
 
 		const toExpand = category.content.items.find(item => !item.done) ?? category.content.items[0];
-		this.selectTask(selectedItem ?? toExpand.id);
+		this.selectTask(container, selectedItem ?? toExpand.id);
+		this.detailsScrollbar.scanDomNode();
 		this.registerDispatchListeners(container);
 	}
 
-	private clearDetialView() {
-		const detailContainer = assertIsDefined(document.getElementById('getting-started-detail-container'));
-		while (detailContainer.firstChild) { detailContainer.removeChild(detailContainer.firstChild); }
-		const detailTitle = assertIsDefined(document.getElementById('getting-started-detail-title'));
+	private clearDetialView(container: HTMLElement) {
+		const detailContainer = (container.querySelector('.getting-started-detail-container'));
+		detailContainer?.remove();
+		const detailTitle = assertIsDefined(container.querySelector('.getting-started-detail-title'));
 		while (detailTitle.firstChild) { detailTitle.removeChild(detailTitle.firstChild); }
 	}
 
@@ -333,7 +402,7 @@ export class GettingStartedPage extends Disposable {
 			this.currentCategory = undefined;
 			this.editorInput.selectedCategory = undefined;
 			this.editorInput.selectedTask = undefined;
-			this.selectTask(undefined);
+			this.selectTask(container, undefined);
 			const slides = [...container.querySelectorAll('.gettingStartedSlide').values()];
 			const currentSlide = slides.findIndex(element =>
 				!element.classList.contains('prev') && !element.classList.contains('next'));
@@ -357,9 +426,9 @@ export class GettingStartedInputFactory implements IEditorInputFactory {
 	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): GettingStartedInput {
 		try {
 			const { selectedCategory, selectedTask } = JSON.parse(serializedEditorInput);
-			return instantiationService.createInstance(GettingStartedPage, { selectedCategory, selectedTask }).editorInput;
+			return instantiationService.invokeFunction(getGettingStartedInput, { selectedCategory, selectedTask });
 		} catch { }
-		return instantiationService.createInstance(GettingStartedPage, {}).editorInput;
+		return instantiationService.invokeFunction(getGettingStartedInput, {});
 	}
 }
 
@@ -398,7 +467,12 @@ registerThemingParticipant((theme, collector) => {
 	if (emphasisButtonBackground) {
 		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer button.emphasis { background: ${emphasisButtonBackground}; }`);
 		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .getting-started-category .codicon { color: ${emphasisButtonBackground} }`);
-		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .codicon { color: ${emphasisButtonBackground} } `);
+		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .codicon.complete { color: ${emphasisButtonBackground} } `);
+	}
+
+	const pendingItemColor = theme.getColor(buttonSecondaryBackground);
+	if (pendingItemColor) {
+		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.detail .getting-started-task .codicon { color: ${pendingItemColor} } `);
 	}
 
 	const emphasisButtonHoverBackground = theme.getColor(buttonHoverBackground);
@@ -427,4 +501,13 @@ registerThemingParticipant((theme, collector) => {
 	if (activeBorder) {
 		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer button:hover { outline-color: ${activeBorder}; }`);
 	}
+
+	const progressBackground = theme.getColor(welcomePageProgressBackground);
+	if (progressBackground) {
+		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .progress-bar-outer { background-color: ${progressBackground}; }`);
+	}
+	const progressForeground = theme.getColor(welcomePageProgressForeground);
+	if (progressForeground) {
+		collector.addRule(`.monaco-workbench .part.editor > .content .walkThroughContent .gettingStartedContainer .gettingStartedSlide.categories .progress-bar-inner { background-color: ${progressForeground}; }`);
+	}
 });
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons.ts
new file mode 100644
index 000000000..d745beedd
--- /dev/null
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedIcons.ts
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls'; import { Codicon } from 'vs/base/common/codicons';
+import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+
+export const gettingStartedUncheckedCodicon = registerIcon('getting-started-item-unchecked', Codicon.circleLargeOutline, localize('gettingStartedUnchecked', "Used to represent getting started items which have not been completed"));
+export const gettingStartedCheckedCodicon = registerIcon('getting-started-item-checked', Codicon.passFilled, localize('gettingStartedChecked', "Used to represent getting started items which have been completed"));
diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started.ts
index dd6254527..9c09f066d 100644
--- a/src/vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started.ts
+++ b/src/vs/workbench/contrib/welcome/gettingStarted/browser/vs_code_editor_getting_started.ts
@@ -9,30 +9,28 @@ import { localize } from 'vs/nls';
 export default () => `
 <div class="gettingStartedContainer">
 	<div class="gettingStarted" role="document">
-		<div id="gettingStartedSlideCategory" class="gettingStartedSlide categories">
+		<div class="gettingStartedSlideCategory gettingStartedSlide categories">
 			<div class="gap"></div>
 			<div class="header">
-				<h1 id="product-name" class="caption">${escape(localize('gettingStarted.vscode', "Visual Studio Code"))}</h1>
+				<h1 class="product-name caption">${escape(localize('gettingStarted.vscode', "Visual Studio Code"))}</h1>
 				<p class="subtitle description">${escape(localize({ key: 'gettingStarted.editingRedefined', comment: ['Shown as subtitle on the Welcome page.'] }, "Code editing. Redefined"))}</p>
 			</div>
-			<div id="getting-started-categories-container"></div>
-			<div class="gap"></div>
 		</div>
-		<div id="gettingStartedSlideDetails" class="gettingStartedSlide detail">
-			<a class="prev-button" x-dispatch="scrollPrev"><span
-					class="scroll-button codicon codicon-chevron-left"></span>Back</a>
-			<div id="getting-started-detail-columns">
-				<div id="getting-started-detail-left">
-					<div id="getting-started-detail-title"></div>
-					<div id="getting-started-detail-container"></div>
-				</div>
-				<div id="getting-started-detail-right">
+		<div class="gettingStartedSlideDetails gettingStartedSlide detail">
+			<a class="prev-button" x-dispatch="scrollPrev"><span class="scroll-button codicon codicon-chevron-left"></span>Back</a>
+			<div class="gettingStartedDetailsContent">
+				<div class="gap"></div>
+				<div class="getting-started-detail-columns">
+					<div class="gap"></div>
+					<div class="getting-started-detail-left">
+						<div class="getting-started-detail-title"></div>
+					</div>
+					<div class="getting-started-detail-right"></div>
+					<div class="gap"></div>
 				</div>
+				<div class="gap"></div>
 			</div>
 		</div>
-		<div class="footer">
-			<a class="skip" x-dispatch="skip">Skip</a>
-		</div>
 	</div>
 </div>
 `.replace(/\|/g, '`');
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts
index 1a59cbb17..380122d25 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.contribution.ts
@@ -20,7 +20,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 		...workbenchConfigurationNodeBase,
 		'properties': {
 			'workbench.startupEditor': {
-				'scope': ConfigurationScope.APPLICATION, // Make sure repositories cannot trigger opening a README for tracking.
+				'scope': ConfigurationScope.RESOURCE,
 				'type': 'string',
 				'enum': [
 					...['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench'],
@@ -32,7 +32,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page (default)."),
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.readme' }, "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise."),
-					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file (only applies when opening an empty workspace)."),
+					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled file (only applies when opening an empty window)."),
 					localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePageInEmptyWorkbench' }, "Open the Welcome page when opening an empty workbench."),],
 				...(product.quality !== 'stable'
 					? [localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.gettingStarted' }, "Open the Getting Started page (experimental).")]
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
index 37a7512d4..63b1b5144 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
@@ -46,8 +46,8 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { gettingStartedInputTypeId, GettingStartedPage } from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted';
-import { buttonBackground, buttonHoverBackground, welcomePageBackground } from 'vs/workbench/contrib/welcome/page/browser/welcomePageColors';
+import { getGettingStartedInput, gettingStartedInputTypeId } from 'vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted';
+import { welcomeButtonBackground, welcomeButtonHoverBackground, welcomePageBackground } from 'vs/workbench/contrib/welcome/page/browser/welcomePageColors';
 
 const configurationKey = 'workbench.startupEditor';
 const oldConfigurationKey = 'workbench.welcome.enabled';
@@ -71,8 +71,8 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 			backupFileService.hasBackups().then(hasBackups => {
 				// Open the welcome even if we opened a set of default editors
 				if ((!editorService.activeEditor || layoutService.openedDefaultEditors) && !hasBackups) {
-					const startupEditorSetting = configurationService.getValue(configurationKey) as string;
-					const openWithReadme = startupEditorSetting === 'readme';
+					const startupEditorSetting = configurationService.inspect<string>(configurationKey);
+					const openWithReadme = startupEditorSetting.userValue === 'readme';
 					if (openWithReadme) {
 						return Promise.all(contextService.getWorkspace().folders.map(folder => {
 							const folderUri = folder.uri;
@@ -104,11 +104,7 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 								return undefined;
 							});
 					} else {
-						const startupEditorTypeID = startupEditorSetting === 'gettingStarted' ? gettingStartedInputTypeId : welcomeInputTypeId;
-						const launchEditor = startupEditorSetting === 'gettingStarted'
-							? instantiationService.createInstance(GettingStartedPage, {})
-							: instantiationService.createInstance(WelcomePage);
-
+						const startupEditorTypeID = startupEditorSetting.value === 'gettingStarted' ? gettingStartedInputTypeId : welcomeInputTypeId;
 						let options: IEditorOptions;
 						let editor = editorService.activeEditor;
 						if (editor) {
@@ -120,7 +116,13 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 						} else {
 							options = { pinned: false };
 						}
-						return launchEditor.openEditor(options);
+
+						if (startupEditorTypeID === gettingStartedInputTypeId) {
+							editorService.openEditor(instantiationService.invokeFunction(getGettingStartedInput, {}), options);
+						} else {
+							const launchEditor = instantiationService.createInstance(WelcomePage);
+							return launchEditor.openEditor(options);
+						}
 					}
 				}
 				return undefined;
@@ -130,14 +132,17 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 }
 
 function isWelcomePageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService) {
-	const startupEditor = configurationService.inspect(configurationKey);
+	const startupEditor = configurationService.inspect<string>(configurationKey);
 	if (!startupEditor.userValue && !startupEditor.workspaceValue) {
 		const welcomeEnabled = configurationService.inspect(oldConfigurationKey);
 		if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
 			return welcomeEnabled.value;
 		}
 	}
-	return startupEditor.value === 'welcomePage' || startupEditor.value === 'gettingStarted' || startupEditor.value === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY;
+	if (startupEditor.value === 'readme' && startupEditor.userValue !== 'readme') {
+		console.error('Warning: `workbench.startupEditor: readme` setting ignored due to being set somewhere other than user settings');
+	}
+	return startupEditor.value === 'welcomePage' || startupEditor.value === 'gettingStarted' || startupEditor.userValue === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY;
 }
 
 export class WelcomePageAction extends Action {
@@ -658,11 +663,11 @@ registerThemingParticipant((theme, collector) => {
 	if (descriptionColor) {
 		collector.addRule(`.monaco-workbench .part.editor > .content .welcomePage .detail { color: ${descriptionColor}; }`);
 	}
-	const buttonColor = getExtraColor(theme, buttonBackground, { dark: 'rgba(0, 0, 0, .2)', extra_dark: 'rgba(200, 235, 255, .042)', light: 'rgba(0,0,0,.04)', hc: 'black' });
+	const buttonColor = getExtraColor(theme, welcomeButtonBackground, { dark: 'rgba(0, 0, 0, .2)', extra_dark: 'rgba(200, 235, 255, .042)', light: 'rgba(0,0,0,.04)', hc: 'black' });
 	if (buttonColor) {
 		collector.addRule(`.monaco-workbench .part.editor > .content .welcomePage .commands .item button { background: ${buttonColor}; }`);
 	}
-	const buttonHoverColor = getExtraColor(theme, buttonHoverBackground, { dark: 'rgba(200, 235, 255, .072)', extra_dark: 'rgba(200, 235, 255, .072)', light: 'rgba(0,0,0,.10)', hc: null });
+	const buttonHoverColor = getExtraColor(theme, welcomeButtonHoverBackground, { dark: 'rgba(200, 235, 255, .072)', extra_dark: 'rgba(200, 235, 255, .072)', light: 'rgba(0,0,0,.10)', hc: null });
 	if (buttonHoverColor) {
 		collector.addRule(`.monaco-workbench .part.editor > .content .welcomePage .commands .item button:hover { background: ${buttonHoverColor}; }`);
 	}
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePageColors.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePageColors.ts
index e87483cf4..601636d0b 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePageColors.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePageColors.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { activeContrastBorder, buttonBackground, descriptionForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { localize } from 'vs/nls';
 
 // Seprate from main module to break dependency cycles between welcomePage and gettingStarted.
-export const buttonBackground = registerColor('welcomePage.buttonBackground', { dark: null, light: null, hc: null }, localize('welcomePage.buttonBackground', 'Background color for the buttons on the Welcome page.'));
-export const buttonHoverBackground = registerColor('welcomePage.buttonHoverBackground', { dark: null, light: null, hc: null }, localize('welcomePage.buttonHoverBackground', 'Hover background color for the buttons on the Welcome page.'));
+export const welcomeButtonBackground = registerColor('welcomePage.buttonBackground', { dark: null, light: null, hc: null }, localize('welcomePage.buttonBackground', 'Background color for the buttons on the Welcome page.'));
+export const welcomeButtonHoverBackground = registerColor('welcomePage.buttonHoverBackground', { dark: null, light: null, hc: null }, localize('welcomePage.buttonHoverBackground', 'Hover background color for the buttons on the Welcome page.'));
 export const welcomePageBackground = registerColor('welcomePage.background', { light: null, dark: null, hc: null }, localize('welcomePage.background', 'Background color for the Welcome page.'));
+
+export const welcomePageProgressBackground = registerColor('welcomePage.progress.background', { light: descriptionForeground, dark: descriptionForeground, hc: descriptionForeground }, localize('welcomePage.progress.background', 'Foreground color for the Welcome page progress bars.'));
+export const welcomePageProgressForeground = registerColor('welcomePage.progress.foreground', { light: buttonBackground, dark: buttonBackground, hc: activeContrastBorder }, localize('welcomePage.progress.foreground', 'Background color for the Welcome page progress bars.'));
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/vs_code_editor_walkthrough.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/vs_code_editor_walkthrough.ts
index ba2db38fb..3cfe0655f 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/vs_code_editor_walkthrough.ts
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/editor/vs_code_editor_walkthrough.ts
@@ -38,17 +38,14 @@ That is the tip of the iceberg for multi-cursor editing. Have a look at the sele
 
 ### IntelliSense
 
-Visual Studio Code comes with the powerful IntelliSense for JavaScript and TypeScript pre-installed. In the below example, position the text cursor in front of the error underline, right after the dot and press kb(editor.action.triggerSuggest) to invoke IntelliSense.  Notice how the suggestion comes from the Request API.
+Visual Studio Code comes with the powerful IntelliSense for JavaScript and TypeScript pre-installed. In the below example, position the text cursor right after the dot and press kb(editor.action.triggerSuggest) to invoke IntelliSense.  Notice how the suggestions come from the Canvas API.
 
 |||js
-const express = require('express');
-const app = express();
+const canvas = document.querySelector('canvas');
+const context = canvas.getContext('2d');
 
-app.get('/',  (req, res) => {
-	res.send(|Hello \${req.}|);
-});
-
-app.listen(3000);
+context.strokeStyle = 'blue';
+context.
 |||
 
 >**Tip:** while we ship JavaScript and TypeScript support out of the box other languages can be upgraded with better IntelliSense through one of the many [extensions](command:workbench.extensions.action.showPopularExtensions).
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput.ts
index a491c1577..09d5c3df1 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput.ts
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput.ts
@@ -5,12 +5,13 @@
 
 import { EditorInput, EditorModel, ITextEditorModel } from 'vs/workbench/common/editor';
 import { URI } from 'vs/base/common/uri';
-import { IReference } from 'vs/base/common/lifecycle';
+import { DisposableStore, IReference } from 'vs/base/common/lifecycle';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import * as marked from 'vs/base/common/marked/marked';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
 import { requireToContent } from 'vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider';
+import { Dimension } from 'vs/base/browser/dom';
 
 export class WalkThroughModel extends EditorModel {
 
@@ -41,7 +42,8 @@ export interface WalkThroughInputOptions {
 	readonly description?: string;
 	readonly resource: URI;
 	readonly telemetryFrom: string;
-	readonly onReady?: (container: HTMLElement) => void;
+	readonly onReady?: (container: HTMLElement, contentDisposables: DisposableStore) => void;
+	readonly layout?: (dimension: Dimension) => void;
 }
 
 export class WalkThroughInput extends EditorInput {
@@ -91,6 +93,10 @@ export class WalkThroughInput extends EditorInput {
 		return this.options.onReady;
 	}
 
+	get layout() {
+		return this.options.layout;
+	}
+
 	resolve(): Promise<WalkThroughModel> {
 		if (!this.promise) {
 			this.promise = requireToContent(this.options.resource)
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts
index 2d7de16e8..5422d5198 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts
+++ b/src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts
@@ -17,7 +17,7 @@ import { WalkThroughInput } from 'vs/workbench/contrib/welcome/walkThrough/brows
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { localize } from 'vs/nls';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -39,6 +39,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { domEvent } from 'vs/base/browser/event';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { ITASExperimentService } from 'vs/workbench/services/experiment/common/experimentService';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
@@ -66,6 +67,7 @@ export class WalkThroughPart extends EditorPane {
 	private lastFocus: HTMLElement | undefined;
 	private size: Dimension | undefined;
 	private editorMemento: IEditorMemento<IWalkThroughEditorViewState>;
+	private tasExperimentService: ITASExperimentService | undefined;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -79,11 +81,13 @@ export class WalkThroughPart extends EditorPane {
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@optional(ITASExperimentService) tasExperimentService: ITASExperimentService,
 	) {
 		super(WalkThroughPart.ID, telemetryService, themeService, storageService);
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
 		this.editorMemento = this.getEditorMemento<IWalkThroughEditorViewState>(editorGroupService, WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY);
+		this.tasExperimentService = tasExperimentService;
 	}
 
 	createEditor(container: HTMLElement): void {
@@ -189,6 +193,15 @@ export class WalkThroughPart extends EditorPane {
 			this.notificationService.info(localize('walkThrough.gitNotFound', "It looks like Git is not installed on your system."));
 			return;
 		}
+		if (uri.scheme === 'command' && uri.path === 'workbench.action.files.newUntitledFile') {
+			Promise.all([
+				this.tasExperimentService?.getTreatment<boolean>('newuntitledmode'),
+				this.openerService.open(this.addFrom(uri)),
+			]).then(([newUntitledMode]) => {
+				return newUntitledMode && this.openerService.open(this.addFrom(URI.parse('command:workbench.action.editor.changeLanguageMode')));
+			});
+			return;
+		}
 		this.openerService.open(this.addFrom(uri));
 	}
 
@@ -210,6 +223,10 @@ export class WalkThroughPart extends EditorPane {
 				disposable.layout();
 			}
 		});
+		const walkthroughInput = this.input instanceof WalkThroughInput && this.input;
+		if (walkthroughInput && walkthroughInput.layout) {
+			walkthroughInput.layout(dimension);
+		}
 		this.scrollbar.scanDomNode();
 	}
 
@@ -267,7 +284,9 @@ export class WalkThroughPart extends EditorPane {
 			this.saveTextEditorViewState(this.input);
 		}
 
-		this.contentDisposables = dispose(this.contentDisposables);
+		const store = new DisposableStore();
+		this.contentDisposables.push(store);
+
 		this.content.innerText = '';
 
 		return super.setInput(input, options, context, token)
@@ -290,7 +309,7 @@ export class WalkThroughPart extends EditorPane {
 					this.decorateContent();
 					this.contentDisposables.push(this.keybindingService.onDidUpdateKeybindings(() => this.decorateContent()));
 					if (input.onReady) {
-						input.onReady(this.content.firstElementChild as HTMLElement);
+						input.onReady(this.content.firstElementChild as HTMLElement, store);
 					}
 					this.scrollbar.scanDomNode();
 					this.loadTextEditorViewState(input);
@@ -400,7 +419,7 @@ export class WalkThroughPart extends EditorPane {
 					}
 				}));
 				if (input.onReady) {
-					input.onReady(innerContent);
+					input.onReady(innerContent, store);
 				}
 				this.scrollbar.scanDomNode();
 				this.loadTextEditorViewState(input);
@@ -496,6 +515,7 @@ export class WalkThroughPart extends EditorPane {
 		if (this.input instanceof WalkThroughInput) {
 			this.saveTextEditorViewState(this.input);
 		}
+		this.contentDisposables = dispose(this.contentDisposables);
 		super.clearInput();
 	}
 
diff --git a/src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts b/src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts
index 57213b63b..59c60ecc5 100644
--- a/src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts
+++ b/src/vs/workbench/contrib/welcome/walkThrough/common/walkThroughContentProvider.ts
@@ -77,7 +77,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 				if (i === j) { codeEditorModel = model; }
 				return '';
 			};
-			const textBuffer = factory.create(DefaultEndOfLine.LF);
+			const textBuffer = factory.create(DefaultEndOfLine.LF).textBuffer;
 			const lineCount = textBuffer.getLineCount();
 			const range = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
 			const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
diff --git a/src/vs/workbench/electron-browser/actions/developerActions.ts b/src/vs/workbench/electron-browser/actions/developerActions.ts
deleted file mode 100644
index 8b57bfc96..000000000
--- a/src/vs/workbench/electron-browser/actions/developerActions.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { CATEGORIES } from 'vs/workbench/common/actions';
-
-class ToggleSharedProcessAction extends Action2 {
-
-	constructor() {
-		super({
-			id: 'workbench.action.toggleSharedProcess',
-			title: { value: nls.localize('toggleSharedProcess', "Toggle Shared Process"), original: 'Toggle Shared Process' },
-			category: CATEGORIES.Developer,
-			f1: true
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		return accessor.get(ISharedProcessService).toggleSharedProcessWindow();
-	}
-}
-
-registerAction2(ToggleSharedProcessAction);
diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts
index 5f159a168..465542118 100644
--- a/src/vs/workbench/electron-browser/desktop.main.ts
+++ b/src/vs/workbench/electron-browser/desktop.main.ts
@@ -4,16 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as gracefulFs from 'graceful-fs';
-import { createHash } from 'crypto';
-import { stat } from 'vs/base/node/pfs';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { gracefulify } from 'graceful-fs';
 import { zoomLevelToZoomFactor } from 'vs/platform/windows/common/windows';
-import { importEntries, mark } from 'vs/base/common/performance';
+import { mark } from 'vs/base/common/performance';
 import { Workbench } from 'vs/workbench/browser/workbench';
 import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
 import { setZoomLevel, setZoomFactor, setFullscreen } from 'vs/base/browser/browser';
-import { domContentLoaded, addDisposableListener, EventType, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { domContentLoaded } from 'vs/base/browser/dom';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { URI } from 'vs/base/common/uri';
 import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
@@ -21,27 +18,26 @@ import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environ
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ISingleFolderWorkspaceIdentifier, IWorkspaceInitializationPayload, ISingleFolderWorkspaceInitializationPayload, reviveWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceInitializationPayload, reviveIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILogService } from 'vs/platform/log/common/log';
 import { NativeStorageService } from 'vs/platform/storage/node/storageService';
 import { Schemas } from 'vs/base/common/network';
-import { sanitizeFilePath } from 'vs/base/common/extpath';
 import { GlobalStorageDatabaseChannelClient } from 'vs/platform/storage/node/storageIpc';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
-import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
+import { IMainProcessService, ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { DiskFileSystemProvider } from 'vs/platform/files/electron-browser/diskFileSystemProvider';
 import { RemoteFileSystemProvider } from 'vs/workbench/services/remote/common/remoteAgentFileSystemChannel';
-import { ConfigurationCache } from 'vs/workbench/services/configuration/electron-browser/configurationCache';
+import { ConfigurationCache } from 'vs/workbench/services/configuration/electron-sandbox/configurationCache';
 import { SignService } from 'vs/platform/sign/node/signService';
 import { ISignService } from 'vs/platform/sign/common/sign';
 import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
@@ -70,14 +66,11 @@ class DesktopMain extends Disposable {
 	private init(): void {
 
 		// Enable gracefulFs
-		gracefulFs.gracefulify(fs);
+		gracefulify(fs);
 
 		// Massage configuration file URIs
 		this.reviveUris();
 
-		// Setup perf
-		importEntries(this.configuration.perfEntries);
-
 		// Browser config
 		const zoomLevel = this.configuration.zoomLevel || 0;
 		setZoomFactor(zoomLevelToZoomFactor(zoomLevel));
@@ -86,14 +79,11 @@ class DesktopMain extends Disposable {
 	}
 
 	private reviveUris() {
-		if (this.configuration.folderUri) {
-			this.configuration.folderUri = URI.revive(this.configuration.folderUri);
-		}
 
-		if (this.configuration.workspace) {
-			this.configuration.workspace = reviveWorkspaceIdentifier(this.configuration.workspace);
-		}
+		// Workspace
+		this.configuration.workspace = reviveIdentifier(this.configuration.workspace);
 
+		// Files
 		const filesToWait = this.configuration.filesToWait;
 		const filesToWaitPaths = filesToWait?.paths;
 		[filesToWaitPaths, this.configuration.filesToOpenOrCreate, this.configuration.filesToDiff].forEach(paths => {
@@ -115,7 +105,7 @@ class DesktopMain extends Disposable {
 		const services = await this.initServices();
 
 		await domContentLoaded();
-		mark('willStartWorkbench');
+		mark('code/willStartWorkbench');
 
 		// Create Workbench
 		const workbench = new Workbench(document.body, services.serviceCollection, services.logService);
@@ -140,30 +130,9 @@ class DesktopMain extends Disposable {
 
 	private registerListeners(workbench: Workbench, storageService: NativeStorageService): void {
 
-		// Layout
-		this._register(addDisposableListener(window, EventType.RESIZE, e => this.onWindowResize(e, true, workbench)));
-
 		// Workbench Lifecycle
 		this._register(workbench.onShutdown(() => this.dispose()));
-		this._register(workbench.onWillShutdown(event => event.join(storageService.close())));
-	}
-
-	private onWindowResize(e: Event, retry: boolean, workbench: Workbench): void {
-		if (e.target === window) {
-			if (window.document && window.document.body && window.document.body.clientWidth === 0) {
-				// TODO@Ben this is an electron issue on macOS when simple fullscreen is enabled
-				// where for some reason the window clientWidth is reported as 0 when switching
-				// between simple fullscreen and normal screen. In that case we schedule the layout
-				// call at the next animation frame once, in the hope that the dimensions are
-				// proper then.
-				if (retry) {
-					scheduleAtNextAnimationFrame(() => this.onWindowResize(e, false, workbench));
-				}
-				return;
-			}
-
-			workbench.layout();
-		}
+		this._register(workbench.onWillShutdown(event => event.join(storageService.close(), 'join.closeStorage')));
 	}
 
 	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: NativeStorageService }> {
@@ -184,7 +153,7 @@ class DesktopMain extends Disposable {
 
 
 		// Main Process
-		const mainProcessService = this._register(new MainProcessService(this.configuration.windowId));
+		const mainProcessService = this._register(new ElectronIPCMainProcessService(this.configuration.windowId));
 		serviceCollection.set(IMainProcessService, mainProcessService);
 
 		// Environment
@@ -242,6 +211,7 @@ class DesktopMain extends Disposable {
 		const uriIdentityService = new UriIdentityService(fileService);
 		serviceCollection.set(IUriIdentityService, uriIdentityService);
 
+
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 		//
 		// NOTE: Please do NOT register services here. Use `registerSingleton()`
@@ -261,7 +231,7 @@ class DesktopMain extends Disposable {
 			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
 		}
 
-		const payload = await this.resolveWorkspaceInitializationPayload();
+		const payload = this.resolveWorkspaceInitializationPayload();
 
 		const services = await Promise.all([
 			this.createWorkspaceService(payload, fileService, remoteAgentService, uriIdentityService, logService).then(service => {
@@ -270,7 +240,7 @@ class DesktopMain extends Disposable {
 				serviceCollection.set(IWorkspaceContextService, service);
 
 				// Configuration
-				serviceCollection.set(IConfigurationService, service);
+				serviceCollection.set(IWorkbenchConfigurationService, service);
 
 				return service;
 			}),
@@ -283,7 +253,7 @@ class DesktopMain extends Disposable {
 				return service;
 			}),
 
-			this.createKeyboardLayoutService(logService, mainProcessService).then(service => {
+			this.createKeyboardLayoutService(mainProcessService).then(service => {
 
 				// KeyboardLayout
 				serviceCollection.set(IKeyboardLayoutService, service);
@@ -309,18 +279,8 @@ class DesktopMain extends Disposable {
 		return { serviceCollection, logService, storageService: services[1] };
 	}
 
-	private async resolveWorkspaceInitializationPayload(): Promise<IWorkspaceInitializationPayload> {
-
-		// Multi-root workspace
-		if (this.configuration.workspace) {
-			return this.configuration.workspace;
-		}
-
-		// Single-folder workspace
-		let workspaceInitializationPayload: IWorkspaceInitializationPayload | undefined;
-		if (this.configuration.folderUri) {
-			workspaceInitializationPayload = await this.resolveSingleFolderWorkspaceInitializationPayload(this.configuration.folderUri);
-		}
+	private resolveWorkspaceInitializationPayload(): IWorkspaceInitializationPayload {
+		let workspaceInitializationPayload: IWorkspaceInitializationPayload | undefined = this.configuration.workspace;
 
 		// Fallback to empty workspace if we have no payload yet.
 		if (!workspaceInitializationPayload) {
@@ -339,48 +299,8 @@ class DesktopMain extends Disposable {
 		return workspaceInitializationPayload;
 	}
 
-	private async resolveSingleFolderWorkspaceInitializationPayload(folderUri: ISingleFolderWorkspaceIdentifier): Promise<ISingleFolderWorkspaceInitializationPayload | undefined> {
-		try {
-			const folder = folderUri.scheme === Schemas.file
-				? URI.file(sanitizeFilePath(folderUri.fsPath, process.env['VSCODE_CWD'] || process.cwd())) // For local: ensure path is absolute
-				: folderUri;
-			const id = await this.createHash(folderUri);
-			return { id, folder };
-		} catch (error) {
-			onUnexpectedError(error);
-		}
-
-		return;
-	}
-
-	private async createHash(resource: URI): Promise<string> {
-
-		// Return early the folder is not local
-		if (resource.scheme !== Schemas.file) {
-			return createHash('md5').update(resource.toString()).digest('hex');
-		}
-
-		const fileStat = await stat(resource.fsPath);
-		let ctime: number | undefined;
-		if (isLinux) {
-			ctime = fileStat.ino; // Linux: birthtime is ctime, so we cannot use it! We use the ino instead!
-		} else if (isMacintosh) {
-			ctime = fileStat.birthtime.getTime(); // macOS: birthtime is fine to use as is
-		} else if (isWindows) {
-			if (typeof fileStat.birthtimeMs === 'number') {
-				ctime = Math.floor(fileStat.birthtimeMs); // Windows: fix precision issue in node.js 8.x to get 7.x results (see https://github.com/nodejs/node/issues/19897)
-			} else {
-				ctime = fileStat.birthtime.getTime();
-			}
-		}
-
-		// we use the ctime as extra salt to the ID so that we catch the case of a folder getting
-		// deleted and recreated. in that case we do not want to carry over previous state
-		return createHash('md5').update(resource.fsPath).update(ctime ? String(ctime) : '').digest('hex');
-	}
-
 	private async createWorkspaceService(payload: IWorkspaceInitializationPayload, fileService: FileService, remoteAgentService: IRemoteAgentService, uriIdentityService: IUriIdentityService, logService: ILogService): Promise<WorkspaceService> {
-		const workspaceService = new WorkspaceService({ remoteAuthority: this.environmentService.remoteAuthority, configurationCache: new ConfigurationCache(this.environmentService) }, this.environmentService, fileService, remoteAgentService, uriIdentityService, logService);
+		const workspaceService = new WorkspaceService({ remoteAuthority: this.environmentService.remoteAuthority, configurationCache: new ConfigurationCache(URI.file(this.environmentService.userDataPath), fileService) }, this.environmentService, fileService, remoteAgentService, uriIdentityService, logService);
 
 		try {
 			await workspaceService.initialize(payload);
@@ -388,7 +308,6 @@ class DesktopMain extends Disposable {
 			return workspaceService;
 		} catch (error) {
 			onUnexpectedError(error);
-			logService.error(error);
 
 			return workspaceService;
 		}
@@ -404,13 +323,12 @@ class DesktopMain extends Disposable {
 			return storageService;
 		} catch (error) {
 			onUnexpectedError(error);
-			logService.error(error);
 
 			return storageService;
 		}
 	}
 
-	private async createKeyboardLayoutService(logService: ILogService, mainProcessService: IMainProcessService): Promise<KeyboardLayoutService> {
+	private async createKeyboardLayoutService(mainProcessService: IMainProcessService): Promise<KeyboardLayoutService> {
 		const keyboardLayoutService = new KeyboardLayoutService(mainProcessService);
 
 		try {
@@ -419,7 +337,6 @@ class DesktopMain extends Disposable {
 			return keyboardLayoutService;
 		} catch (error) {
 			onUnexpectedError(error);
-			logService.error(error);
 
 			return keyboardLayoutService;
 		}
diff --git a/src/vs/workbench/electron-sandbox/actions/developerActions.ts b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
index 8daa9ffde..ca7c10ca8 100644
--- a/src/vs/workbench/electron-sandbox/actions/developerActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
@@ -3,48 +3,97 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Action2, MenuId } from 'vs/platform/actions/common/actions';
+import { CATEGORIES } from 'vs/workbench/common/actions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IsDevelopmentContext } from 'vs/platform/contextkey/common/contextkeys';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 
-export class ToggleDevToolsAction extends Action {
+export class ToggleDevToolsAction extends Action2 {
 
-	static readonly ID = 'workbench.action.toggleDevTools';
-	static readonly LABEL = nls.localize('toggleDevTools', "Toggle Developer Tools");
-
-	constructor(
-		id: string,
-		label: string,
-		@INativeHostService private readonly nativeHostService: INativeHostService
-	) {
-		super(id, label);
+	constructor() {
+		super({
+			id: 'workbench.action.toggleDevTools',
+			title: { value: localize('toggleDevTools', "Toggle Developer Tools"), original: 'Toggle Developer Tools' },
+			category: CATEGORIES.Developer,
+			f1: true,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib + 50,
+				when: IsDevelopmentContext,
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_I }
+			},
+			menu: {
+				id: MenuId.MenubarHelpMenu,
+				group: '5_tools',
+				order: 1
+			}
+		});
 	}
 
-	run(): Promise<void> {
-		return this.nativeHostService.toggleDevTools();
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const nativeHostService = accessor.get(INativeHostService);
+
+		return nativeHostService.toggleDevTools();
 	}
 }
 
-export class ConfigureRuntimeArgumentsAction extends Action {
+export class ConfigureRuntimeArgumentsAction extends Action2 {
 
-	static readonly ID = 'workbench.action.configureRuntimeArguments';
-	static readonly LABEL = nls.localize('configureRuntimeArguments', "Configure Runtime Arguments");
-
-	constructor(
-		id: string,
-		label: string,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@IEditorService private readonly editorService: IEditorService
-	) {
-		super(id, label);
+	constructor() {
+		super({
+			id: 'workbench.action.configureRuntimeArguments',
+			title: { value: localize('configureRuntimeArguments', "Configure Runtime Arguments"), original: 'Configure Runtime Arguments' },
+			category: CATEGORIES.Preferences,
+			f1: true
+		});
 	}
 
-	async run(): Promise<void> {
-		await this.editorService.openEditor({
-			resource: this.environmentService.argvResource,
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const environmentService = accessor.get(IWorkbenchEnvironmentService);
+
+		await editorService.openEditor({
+			resource: environmentService.argvResource,
 			options: { pinned: true }
 		});
 	}
 }
+
+
+export class ToggleSharedProcessAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.toggleSharedProcess',
+			title: { value: localize('toggleSharedProcess', "Toggle Shared Process"), original: 'Toggle Shared Process' },
+			category: CATEGORIES.Developer,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		return accessor.get(INativeHostService).toggleSharedProcessWindow();
+	}
+}
+
+export class ReloadWindowWithExtensionsDisabledAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.reloadWindowWithExtensionsDisabled',
+			title: { value: localize('reloadWindowWithExtensionsDisabled', "Reload With Extensions Disabled"), original: 'Reload With Extensions Disabled' },
+			category: CATEGORIES.Developer,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		return accessor.get(INativeHostService).reload({ disableExtensions: true });
+	}
+}
diff --git a/src/vs/workbench/electron-sandbox/actions/windowActions.ts b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
index 57b01d68e..f153e7870 100644
--- a/src/vs/workbench/electron-sandbox/actions/windowActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/actions';
-
 import { URI } from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
 import * as nls from 'vs/nls';
@@ -21,6 +20,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { Codicon } from 'vs/base/common/codicons';
+import { isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 
 export class CloseCurrentWindowAction extends Action {
 
@@ -122,26 +122,6 @@ export class ZoomResetAction extends BaseZoomAction {
 	}
 }
 
-export class ReloadWindowWithExtensionsDisabledAction extends Action {
-
-	static readonly ID = 'workbench.action.reloadWindowWithExtensionsDisabled';
-	static readonly LABEL = nls.localize('reloadWindowWithExtensionsDisabled', "Reload With Extensions Disabled");
-
-	constructor(
-		id: string,
-		label: string,
-		@INativeHostService private readonly nativeHostService: INativeHostService
-	) {
-		super(id, label);
-	}
-
-	async run(): Promise<boolean> {
-		await this.nativeHostService.reload({ disableExtensions: true });
-
-		return true;
-	}
-}
-
 export abstract class BaseSwitchWindow extends Action {
 
 	private readonly closeWindowAction: IQuickInputButton = {
@@ -174,16 +154,16 @@ export abstract class BaseSwitchWindow extends Action {
 
 		const windows = await this.nativeHostService.getWindows();
 		const placeHolder = nls.localize('switchWindowPlaceHolder', "Select a window to switch to");
-		const picks = windows.map(win => {
-			const resource = win.filename ? URI.file(win.filename) : win.folderUri ? win.folderUri : win.workspace ? win.workspace.configPath : undefined;
-			const fileKind = win.filename ? FileKind.FILE : win.workspace ? FileKind.ROOT_FOLDER : win.folderUri ? FileKind.FOLDER : FileKind.FILE;
+		const picks = windows.map(window => {
+			const resource = window.filename ? URI.file(window.filename) : isSingleFolderWorkspaceIdentifier(window.workspace) ? window.workspace.uri : isWorkspaceIdentifier(window.workspace) ? window.workspace.configPath : undefined;
+			const fileKind = window.filename ? FileKind.FILE : isSingleFolderWorkspaceIdentifier(window.workspace) ? FileKind.FOLDER : isWorkspaceIdentifier(window.workspace) ? FileKind.ROOT_FOLDER : FileKind.FILE;
 			return {
-				payload: win.id,
-				label: win.title,
-				ariaLabel: win.dirty ? nls.localize('windowDirtyAriaLabel', "{0}, dirty window", win.title) : win.title,
+				payload: window.id,
+				label: window.title,
+				ariaLabel: window.dirty ? nls.localize('windowDirtyAriaLabel', "{0}, dirty window", window.title) : window.title,
 				iconClasses: getIconClasses(this.modelService, this.modeService, resource, fileKind),
-				description: (currentWindowId === win.id) ? nls.localize('current', "Current Window") : undefined,
-				buttons: currentWindowId !== win.id ? win.dirty ? [this.closeDirtyWindowAction] : [this.closeWindowAction] : undefined
+				description: (currentWindowId === window.id) ? nls.localize('current', "Current Window") : undefined,
+				buttons: currentWindowId !== window.id ? window.dirty ? [this.closeDirtyWindowAction] : [this.closeWindowAction] : undefined
 			};
 		});
 		const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.payload === currentWindowId)[0]) + 1) % picks.length;
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 63bc327fa..299561eb5 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import * as nls from 'vs/nls';
-import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+import product from 'vs/platform/product/common/product';
+import { SyncActionDescriptor, MenuRegistry, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions, CATEGORIES } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { ToggleDevToolsAction, ConfigureRuntimeArgumentsAction } from 'vs/workbench/electron-sandbox/actions/developerActions';
-import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, ReloadWindowWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-sandbox/actions/windowActions';
+import { ConfigureRuntimeArgumentsAction, ToggleDevToolsAction, ToggleSharedProcessAction, ReloadWindowWithExtensionsDisabledAction } from 'vs/workbench/electron-sandbox/actions/developerActions';
+import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-sandbox/actions/windowActions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IsDevelopmentContext, IsMacContext } from 'vs/platform/contextkey/common/contextkeys';
+import { IsMacContext } from 'vs/platform/contextkey/common/contextkeys';
 import { EditorsVisibleContext, SingleEditorGroupsContext } from 'vs/workbench/common/editor';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import product from 'vs/platform/product/common/product';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
 // Actions
@@ -68,12 +68,12 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 	(function registerMacOSNativeTabsActions(): void {
 		if (isMacintosh) {
 			[
-				{ handler: NewWindowTabHandler, id: 'workbench.action.newWindowTab', title: { value: nls.localize('newTab', "New Window Tab"), original: 'New Window Tab' } },
-				{ handler: ShowPreviousWindowTabHandler, id: 'workbench.action.showPreviousWindowTab', title: { value: nls.localize('showPreviousTab', "Show Previous Window Tab"), original: 'Show Previous Window Tab' } },
-				{ handler: ShowNextWindowTabHandler, id: 'workbench.action.showNextWindowTab', title: { value: nls.localize('showNextWindowTab', "Show Next Window Tab"), original: 'Show Next Window Tab' } },
-				{ handler: MoveWindowTabToNewWindowHandler, id: 'workbench.action.moveWindowTabToNewWindow', title: { value: nls.localize('moveWindowTabToNewWindow', "Move Window Tab to New Window"), original: 'Move Window Tab to New Window' } },
-				{ handler: MergeWindowTabsHandlerHandler, id: 'workbench.action.mergeAllWindowTabs', title: { value: nls.localize('mergeAllWindowTabs', "Merge All Windows"), original: 'Merge All Windows' } },
-				{ handler: ToggleWindowTabsBarHandler, id: 'workbench.action.toggleWindowTabsBar', title: { value: nls.localize('toggleWindowTabsBar', "Toggle Window Tabs Bar"), original: 'Toggle Window Tabs Bar' } }
+				{ handler: NewWindowTabHandler, id: 'workbench.action.newWindowTab', title: { value: localize('newTab', "New Window Tab"), original: 'New Window Tab' } },
+				{ handler: ShowPreviousWindowTabHandler, id: 'workbench.action.showPreviousWindowTab', title: { value: localize('showPreviousTab', "Show Previous Window Tab"), original: 'Show Previous Window Tab' } },
+				{ handler: ShowNextWindowTabHandler, id: 'workbench.action.showNextWindowTab', title: { value: localize('showNextWindowTab', "Show Next Window Tab"), original: 'Show Next Window Tab' } },
+				{ handler: MoveWindowTabToNewWindowHandler, id: 'workbench.action.moveWindowTabToNewWindow', title: { value: localize('moveWindowTabToNewWindow', "Move Window Tab to New Window"), original: 'Move Window Tab to New Window' } },
+				{ handler: MergeWindowTabsHandlerHandler, id: 'workbench.action.mergeAllWindowTabs', title: { value: localize('mergeAllWindowTabs', "Merge All Windows"), original: 'Merge All Windows' } },
+				{ handler: ToggleWindowTabsBarHandler, id: 'workbench.action.toggleWindowTabsBar', title: { value: localize('toggleWindowTabsBar', "Toggle Window Tabs Bar"), original: 'Toggle Window Tabs Bar' } }
 			].forEach(command => {
 				CommandsRegistry.registerCommand(command.id, command.handler);
 
@@ -87,22 +87,10 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
 	// Actions: Developer
 	(function registerDeveloperActions(): void {
-		registry.registerWorkbenchAction(SyncActionDescriptor.from(ReloadWindowWithExtensionsDisabledAction), 'Developer: Reload With Extensions Disabled', CATEGORIES.Developer.value);
-		registry.registerWorkbenchAction(SyncActionDescriptor.from(ToggleDevToolsAction), 'Developer: Toggle Developer Tools', CATEGORIES.Developer.value);
-
-		KeybindingsRegistry.registerKeybindingRule({
-			id: ToggleDevToolsAction.ID,
-			weight: KeybindingWeight.WorkbenchContrib + 50,
-			when: IsDevelopmentContext,
-			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I,
-			mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_I }
-		});
-	})();
-
-	// Actions: Runtime Arguments
-	(function registerRuntimeArgumentsAction(): void {
-		const preferencesCategory = nls.localize('preferences', "Preferences");
-		registry.registerWorkbenchAction(SyncActionDescriptor.from(ConfigureRuntimeArgumentsAction), 'Preferences: Configure Runtime Arguments', preferencesCategory);
+		registerAction2(ReloadWindowWithExtensionsDisabledAction);
+		registerAction2(ConfigureRuntimeArgumentsAction);
+		registerAction2(ToggleSharedProcessAction);
+		registerAction2(ToggleDevToolsAction);
 	})();
 })();
 
@@ -112,7 +100,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		group: '6_close',
 		command: {
 			id: CloseCurrentWindowAction.ID,
-			title: nls.localize({ key: 'miCloseWindow', comment: ['&& denotes a mnemonic'] }, "Clos&&e Window")
+			title: localize({ key: 'miCloseWindow', comment: ['&& denotes a mnemonic'] }, "Clos&&e Window")
 		},
 		order: 4
 	});
@@ -121,7 +109,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		group: 'z_Exit',
 		command: {
 			id: 'workbench.action.quit',
-			title: nls.localize({ key: 'miExit', comment: ['&& denotes a mnemonic'] }, "E&&xit")
+			title: localize({ key: 'miExit', comment: ['&& denotes a mnemonic'] }, "E&&xit")
 		},
 		order: 1,
 		when: IsMacContext.toNegated()
@@ -133,7 +121,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		group: '3_zoom',
 		command: {
 			id: ZoomInAction.ID,
-			title: nls.localize({ key: 'miZoomIn', comment: ['&& denotes a mnemonic'] }, "&&Zoom In")
+			title: localize({ key: 'miZoomIn', comment: ['&& denotes a mnemonic'] }, "&&Zoom In")
 		},
 		order: 1
 	});
@@ -142,7 +130,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		group: '3_zoom',
 		command: {
 			id: ZoomOutAction.ID,
-			title: nls.localize({ key: 'miZoomOut', comment: ['&& denotes a mnemonic'] }, "&&Zoom Out")
+			title: localize({ key: 'miZoomOut', comment: ['&& denotes a mnemonic'] }, "&&Zoom Out")
 		},
 		order: 2
 	});
@@ -151,7 +139,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		group: '3_zoom',
 		command: {
 			id: ZoomResetAction.ID,
-			title: nls.localize({ key: 'miZoomReset', comment: ['&& denotes a mnemonic'] }, "&&Reset Zoom")
+			title: localize({ key: 'miZoomReset', comment: ['&& denotes a mnemonic'] }, "&&Reset Zoom")
 		},
 		order: 3
 	});
@@ -161,27 +149,18 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 			group: '3_feedback',
 			command: {
 				id: 'workbench.action.openIssueReporter',
-				title: nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue")
+				title: localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue")
 			},
 			order: 3
 		});
 	}
 
 	// Tools
-	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
-		group: '5_tools',
-		command: {
-			id: ToggleDevToolsAction.ID,
-			title: nls.localize({ key: 'miToggleDevTools', comment: ['&& denotes a mnemonic'] }, "&&Toggle Developer Tools")
-		},
-		order: 1
-	});
-
 	MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
 		group: '5_tools',
 		command: {
 			id: 'workbench.action.openProcessExplorer',
-			title: nls.localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")
+			title: localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")
 		},
 		order: 2
 	});
@@ -195,95 +174,96 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 	registry.registerConfiguration({
 		'id': 'window',
 		'order': 8,
-		'title': nls.localize('windowConfigurationTitle', "Window"),
+		'title': localize('windowConfigurationTitle', "Window"),
 		'type': 'object',
 		'properties': {
 			'window.openWithoutArgumentsInNewWindow': {
 				'type': 'string',
 				'enum': ['on', 'off'],
 				'enumDescriptions': [
-					nls.localize('window.openWithoutArgumentsInNewWindow.on', "Open a new empty window."),
-					nls.localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance.")
+					localize('window.openWithoutArgumentsInNewWindow.on', "Open a new empty window."),
+					localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance.")
 				],
 				'default': isMacintosh ? 'off' : 'on',
 				'scope': ConfigurationScope.APPLICATION,
-				'markdownDescription': nls.localize('openWithoutArgumentsInNewWindow', "Controls whether a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).")
+				'markdownDescription': localize('openWithoutArgumentsInNewWindow', "Controls whether a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\nNote that there can still be cases where this setting is ignored (e.g. when using the `--new-window` or `--reuse-window` command line option).")
 			},
 			'window.restoreWindows': {
 				'type': 'string',
 				'enum': ['preserve', 'all', 'folders', 'one', 'none'],
 				'enumDescriptions': [
-					nls.localize('window.reopenFolders.preserve', "Always reopen all windows. If a folder or workspace is opened (e.g. from the command line) it opens as a new window unless it was opened before. If files are opened they will open in one of the restored windows."),
-					nls.localize('window.reopenFolders.all', "Reopen all windows unless a folder, workspace or file is opened (e.g. from the command line)."),
-					nls.localize('window.reopenFolders.folders', "Reopen all windows that had folders or workspaces opened unless a folder, workspace or file is opened (e.g. from the command line)."),
-					nls.localize('window.reopenFolders.one', "Reopen the last active window unless a folder, workspace or file is opened (e.g. from the command line)."),
-					nls.localize('window.reopenFolders.none', "Never reopen a window. Unless a folder or workspace is opened (e.g. from the command line), an empty window will appear.")
+					localize('window.reopenFolders.preserve', "Always reopen all windows. If a folder or workspace is opened (e.g. from the command line) it opens as a new window unless it was opened before. If files are opened they will open in one of the restored windows."),
+					localize('window.reopenFolders.all', "Reopen all windows unless a folder, workspace or file is opened (e.g. from the command line)."),
+					localize('window.reopenFolders.folders', "Reopen all windows that had folders or workspaces opened unless a folder, workspace or file is opened (e.g. from the command line)."),
+					localize('window.reopenFolders.one', "Reopen the last active window unless a folder, workspace or file is opened (e.g. from the command line)."),
+					localize('window.reopenFolders.none', "Never reopen a window. Unless a folder or workspace is opened (e.g. from the command line), an empty window will appear.")
 				],
 				'default': 'all',
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('restoreWindows', "Controls how windows are being reopened after starting for the first time. This setting has no effect when the application is already running.")
+				'description': localize('restoreWindows', "Controls how windows are being reopened after starting for the first time. This setting has no effect when the application is already running.")
 			},
 			'window.restoreFullscreen': {
 				'type': 'boolean',
 				'default': false,
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('restoreFullscreen', "Controls whether a window should restore to full screen mode if it was exited in full screen mode.")
+				'description': localize('restoreFullscreen', "Controls whether a window should restore to full screen mode if it was exited in full screen mode.")
 			},
 			'window.zoomLevel': {
 				'type': 'number',
 				'default': 0,
-				'description': nls.localize('zoomLevel', "Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.")
+				'description': localize('zoomLevel', "Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity."),
+				ignoreSync: true
 			},
 			'window.newWindowDimensions': {
 				'type': 'string',
 				'enum': ['default', 'inherit', 'offset', 'maximized', 'fullscreen'],
 				'enumDescriptions': [
-					nls.localize('window.newWindowDimensions.default', "Open new windows in the center of the screen."),
-					nls.localize('window.newWindowDimensions.inherit', "Open new windows with same dimension as last active one."),
-					nls.localize('window.newWindowDimensions.offset', "Open new windows with same dimension as last active one with an offset position."),
-					nls.localize('window.newWindowDimensions.maximized', "Open new windows maximized."),
-					nls.localize('window.newWindowDimensions.fullscreen', "Open new windows in full screen mode.")
+					localize('window.newWindowDimensions.default', "Open new windows in the center of the screen."),
+					localize('window.newWindowDimensions.inherit', "Open new windows with same dimension as last active one."),
+					localize('window.newWindowDimensions.offset', "Open new windows with same dimension as last active one with an offset position."),
+					localize('window.newWindowDimensions.maximized', "Open new windows maximized."),
+					localize('window.newWindowDimensions.fullscreen', "Open new windows in full screen mode.")
 				],
 				'default': 'default',
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
+				'description': localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
 			},
 			'window.closeWhenEmpty': {
 				'type': 'boolean',
 				'default': false,
-				'description': nls.localize('closeWhenEmpty', "Controls whether closing the last editor should also close the window. This setting only applies for windows that do not show folders.")
+				'description': localize('closeWhenEmpty', "Controls whether closing the last editor should also close the window. This setting only applies for windows that do not show folders.")
 			},
 			'window.doubleClickIconToClose': {
 				'type': 'boolean',
 				'default': false,
 				'scope': ConfigurationScope.APPLICATION,
-				'markdownDescription': nls.localize('window.doubleClickIconToClose', "If enabled, double clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.")
+				'markdownDescription': localize('window.doubleClickIconToClose', "If enabled, double clicking the application icon in the title bar will close the window and the window cannot be dragged by the icon. This setting only has an effect when `#window.titleBarStyle#` is set to `custom`.")
 			},
 			'window.titleBarStyle': {
 				'type': 'string',
 				'enum': ['native', 'custom'],
 				'default': isLinux ? 'native' : 'custom',
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply.")
+				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply.")
 			},
 			'window.dialogStyle': {
 				'type': 'string',
 				'enum': ['native', 'custom'],
 				'default': 'native',
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('dialogStyle', "Adjust the appearance of dialog windows.")
+				'description': localize('dialogStyle', "Adjust the appearance of dialog windows.")
 			},
 			'window.nativeTabs': {
 				'type': 'boolean',
 				'default': false,
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
+				'description': localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
 				'included': isMacintosh
 			},
 			'window.nativeFullScreen': {
 				'type': 'boolean',
 				'default': true,
-				'description': nls.localize('window.nativeFullScreen', "Controls if native full-screen should be used on macOS. Disable this option to prevent macOS from creating a new space when going full-screen."),
+				'description': localize('window.nativeFullScreen', "Controls if native full-screen should be used on macOS. Disable this option to prevent macOS from creating a new space when going full-screen."),
 				'scope': ConfigurationScope.APPLICATION,
 				'included': isMacintosh
 			},
@@ -291,14 +271,8 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 				'type': 'boolean',
 				'default': true,
 				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
+				'description': localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
 				'included': isMacintosh
-			},
-			'window.enableExperimentalProxyLoginDialog': {
-				'type': 'boolean',
-				'default': true,
-				'scope': ConfigurationScope.APPLICATION,
-				'description': nls.localize('window.enableExperimentalProxyLoginDialog', "Enables a new login dialog for proxy authentication. Requires a restart to take effect."),
 			}
 		}
 	});
@@ -307,12 +281,12 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 	registry.registerConfiguration({
 		'id': 'telemetry',
 		'order': 110,
-		title: nls.localize('telemetryConfigurationTitle', "Telemetry"),
+		title: localize('telemetryConfigurationTitle', "Telemetry"),
 		'type': 'object',
 		'properties': {
 			'telemetry.enableCrashReporter': {
 				'type': 'boolean',
-				'description': nls.localize('telemetry.enableCrashReporting', "Enable crash reports to be sent to a Microsoft online service. \nThis option requires restart to take effect."),
+				'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be sent to a Microsoft online service. \nThis option requires restart to take effect."),
 				'default': true,
 				'tags': ['usesOnlineServices']
 			}
@@ -324,12 +298,12 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		'id': 'keyboard',
 		'order': 15,
 		'type': 'object',
-		'title': nls.localize('keyboardConfigurationTitle', "Keyboard"),
+		'title': localize('keyboardConfigurationTitle', "Keyboard"),
 		'properties': {
 			'keyboard.touchbar.enabled': {
 				'type': 'boolean',
 				'default': true,
-				'description': nls.localize('touchbar.enabled', "Enables the macOS touchbar buttons on the keyboard if available."),
+				'description': localize('touchbar.enabled', "Enables the macOS touchbar buttons on the keyboard if available."),
 				'included': isMacintosh
 			},
 			'keyboard.touchbar.ignored': {
@@ -338,7 +312,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 					'type': 'string'
 				},
 				'default': [],
-				'markdownDescription': nls.localize('touchbar.ignored', 'A set of identifiers for entries in the touchbar that should not show up (for example `workbench.action.navigateBack`.'),
+				'markdownDescription': localize('touchbar.ignored', 'A set of identifiers for entries in the touchbar that should not show up (for example `workbench.action.navigateBack`.'),
 				'included': isMacintosh
 			}
 		}
@@ -359,31 +333,31 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 		properties: {
 			locale: {
 				type: 'string',
-				description: nls.localize('argv.locale', 'The display Language to use. Picking a different language requires the associated language pack to be installed.')
+				description: localize('argv.locale', 'The display Language to use. Picking a different language requires the associated language pack to be installed.')
 			},
 			'disable-hardware-acceleration': {
 				type: 'boolean',
-				description: nls.localize('argv.disableHardwareAcceleration', 'Disables hardware acceleration. ONLY change this option if you encounter graphic issues.')
+				description: localize('argv.disableHardwareAcceleration', 'Disables hardware acceleration. ONLY change this option if you encounter graphic issues.')
 			},
 			'disable-color-correct-rendering': {
 				type: 'boolean',
-				description: nls.localize('argv.disableColorCorrectRendering', 'Resolves issues around color profile selection. ONLY change this option if you encounter graphic issues.')
+				description: localize('argv.disableColorCorrectRendering', 'Resolves issues around color profile selection. ONLY change this option if you encounter graphic issues.')
 			},
 			'force-color-profile': {
 				type: 'string',
-				markdownDescription: nls.localize('argv.forceColorProfile', 'Allows to override the color profile to use. If you experience colors appear badly, try to set this to `srgb` and restart.')
+				markdownDescription: localize('argv.forceColorProfile', 'Allows to override the color profile to use. If you experience colors appear badly, try to set this to `srgb` and restart.')
 			},
 			'enable-crash-reporter': {
 				type: 'boolean',
-				markdownDescription: nls.localize('argv.enableCrashReporter', 'Allows to disable crash reporting, should restart the app if the value is changed.')
+				markdownDescription: localize('argv.enableCrashReporter', 'Allows to disable crash reporting, should restart the app if the value is changed.')
 			},
 			'crash-reporter-id': {
 				type: 'string',
-				markdownDescription: nls.localize('argv.crashReporterId', 'Unique id used for correlating crash reports sent from this app instance.')
+				markdownDescription: localize('argv.crashReporterId', 'Unique id used for correlating crash reports sent from this app instance.')
 			},
 			'enable-proposed-api': {
 				type: 'array',
-				description: nls.localize('argv.enebleProposedApi', "Enable proposed APIs for a list of extension ids (such as \`vscode.git\`). Proposed APIs are unstable and subject to breaking without warning at any time. This should only be set for extension development and testing purposes."),
+				description: localize('argv.enebleProposedApi', "Enable proposed APIs for a list of extension ids (such as \`vscode.git\`). Proposed APIs are unstable and subject to breaking without warning at any time. This should only be set for extension development and testing purposes."),
 				items: {
 					type: 'string'
 				}
@@ -393,7 +367,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 	if (isLinux) {
 		schema.properties!['force-renderer-accessibility'] = {
 			type: 'boolean',
-			description: nls.localize('argv.force-renderer-accessibility', 'Forces the renderer to be accessible. ONLY change this if you are using a screen reader on Linux. On other platforms the renderer will automatically be accessible. This flag is automatically set if you have editor.accessibilitySupport: on.'),
+			description: localize('argv.force-renderer-accessibility', 'Forces the renderer to be accessible. ONLY change this if you are using a screen reader on Linux. On other platforms the renderer will automatically be accessible. This flag is automatically set if you have editor.accessibilitySupport: on.'),
 		};
 	}
 
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index eddd5ab64..fa0cbdcea 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -4,24 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { zoomLevelToZoomFactor } from 'vs/platform/windows/common/windows';
-import { importEntries, mark } from 'vs/base/common/performance';
+import { mark } from 'vs/base/common/performance';
 import { Workbench } from 'vs/workbench/browser/workbench';
 import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
 import { setZoomLevel, setZoomFactor, setFullscreen } from 'vs/base/browser/browser';
-import { domContentLoaded, addDisposableListener, EventType, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { domContentLoaded } from 'vs/base/browser/dom';
 import { URI } from 'vs/base/common/uri';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { reviveWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { reviveIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Schemas } from 'vs/base/common/network';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
+import { IMainProcessService, ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { RemoteAgentService } from 'vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { RemoteFileSystemProvider } from 'vs/workbench/services/remote/common/remoteAgentFileSystemChannel';
@@ -31,7 +32,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import product from 'vs/platform/product/common/product';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
-import { SimpleConfigurationService, simpleFileSystemProvider, SimpleLogService, SimpleRemoteAgentService, SimpleSignService, SimpleStorageService, SimpleNativeWorkbenchEnvironmentService, SimpleWorkspaceService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
+import { SimpleConfigurationService, simpleFileSystemProvider, SimpleLogService, SimpleSignService, SimpleStorageService, SimpleNativeWorkbenchEnvironmentService, SimpleWorkspaceService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
 import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
@@ -39,6 +40,7 @@ import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uri
 
 class DesktopMain extends Disposable {
 
+	private readonly productService: IProductService = { _serviceBrand: undefined, ...product };
 	private readonly environmentService = new SimpleNativeWorkbenchEnvironmentService(this.configuration);
 
 	constructor(private configuration: INativeWorkbenchConfiguration) {
@@ -52,9 +54,6 @@ class DesktopMain extends Disposable {
 		// Massage configuration file URIs
 		this.reviveUris();
 
-		// Setup perf
-		importEntries(this.configuration.perfEntries);
-
 		// Browser config
 		const zoomLevel = this.configuration.zoomLevel || 0;
 		setZoomFactor(zoomLevelToZoomFactor(zoomLevel));
@@ -63,14 +62,11 @@ class DesktopMain extends Disposable {
 	}
 
 	private reviveUris() {
-		if (this.configuration.folderUri) {
-			this.configuration.folderUri = URI.revive(this.configuration.folderUri);
-		}
 
-		if (this.configuration.workspace) {
-			this.configuration.workspace = reviveWorkspaceIdentifier(this.configuration.workspace);
-		}
+		// Workspace
+		this.configuration.workspace = reviveIdentifier(this.configuration.workspace);
 
+		// Files
 		const filesToWait = this.configuration.filesToWait;
 		const filesToWaitPaths = filesToWait?.paths;
 		[filesToWaitPaths, this.configuration.filesToOpenOrCreate, this.configuration.filesToDiff].forEach(paths => {
@@ -92,7 +88,7 @@ class DesktopMain extends Disposable {
 		const services = await this.initServices();
 
 		await domContentLoaded();
-		mark('willStartWorkbench');
+		mark('code/willStartWorkbench');
 
 		// Create Workbench
 		const workbench = new Workbench(document.body, services.serviceCollection, services.logService);
@@ -112,35 +108,15 @@ class DesktopMain extends Disposable {
 
 	private registerListeners(workbench: Workbench, storageService: SimpleStorageService): void {
 
-		// Layout
-		this._register(addDisposableListener(window, EventType.RESIZE, e => this.onWindowResize(e, true, workbench)));
-
 		// Workbench Lifecycle
 		this._register(workbench.onShutdown(() => this.dispose()));
-		this._register(workbench.onWillShutdown(event => event.join(storageService.close())));
-	}
-
-	private onWindowResize(e: Event, retry: boolean, workbench: Workbench): void {
-		if (e.target === window) {
-			if (window.document && window.document.body && window.document.body.clientWidth === 0) {
-				// TODO@Ben this is an electron issue on macOS when simple fullscreen is enabled
-				// where for some reason the window clientWidth is reported as 0 when switching
-				// between simple fullscreen and normal screen. In that case we schedule the layout
-				// call at the next animation frame once, in the hope that the dimensions are
-				// proper then.
-				if (retry) {
-					scheduleAtNextAnimationFrame(() => this.onWindowResize(e, false, workbench));
-				}
-				return;
-			}
-
-			workbench.layout();
-		}
+		this._register(workbench.onWillShutdown(event => event.join(storageService.close(), 'join.closeStorage')));
 	}
 
 	private async initServices(): Promise<{ serviceCollection: ServiceCollection, logService: ILogService, storageService: SimpleStorageService }> {
 		const serviceCollection = new ServiceCollection();
 
+
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 		//
 		// NOTE: Please do NOT register services here. Use `registerSingleton()`
@@ -155,7 +131,7 @@ class DesktopMain extends Disposable {
 
 
 		// Main Process
-		const mainProcessService = this._register(new MainProcessService(this.configuration.windowId));
+		const mainProcessService = this._register(new ElectronIPCMainProcessService(this.configuration.windowId));
 		serviceCollection.set(IMainProcessService, mainProcessService);
 
 		// Environment
@@ -163,8 +139,7 @@ class DesktopMain extends Disposable {
 		serviceCollection.set(INativeWorkbenchEnvironmentService, this.environmentService);
 
 		// Product
-		const productService: IProductService = { _serviceBrand: undefined, ...product };
-		serviceCollection.set(IProductService, productService);
+		serviceCollection.set(IProductService, this.productService);
 
 		// Log
 		const logService = new SimpleLogService();
@@ -174,14 +149,6 @@ class DesktopMain extends Disposable {
 		const remoteAuthorityResolverService = new RemoteAuthorityResolverService();
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
-		// Sign
-		const signService = new SimpleSignService();
-		serviceCollection.set(ISignService, signService);
-
-		// Remote Agent
-		const remoteAgentService = new SimpleRemoteAgentService();
-		serviceCollection.set(IRemoteAgentService, remoteAgentService);
-
 
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 		//
@@ -196,6 +163,14 @@ class DesktopMain extends Disposable {
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
+		// Sign
+		const signService = new SimpleSignService();
+		serviceCollection.set(ISignService, signService);
+
+		// Remote Agent
+		const remoteAgentService = this._register(new RemoteAgentService(this.environmentService, this.productService, remoteAuthorityResolverService, signService, logService));
+		serviceCollection.set(IRemoteAgentService, remoteAgentService);
+
 		// Native Host
 		const nativeHostService = new NativeHostService(this.configuration.windowId, mainProcessService) as INativeHostService;
 		serviceCollection.set(INativeHostService, nativeHostService);
@@ -213,11 +188,6 @@ class DesktopMain extends Disposable {
 		const uriIdentityService = new UriIdentityService(fileService);
 		serviceCollection.set(IUriIdentityService, uriIdentityService);
 
-		const connection = remoteAgentService.getConnection();
-		if (connection) {
-			const remoteFileSystemProvider = this._register(new RemoteFileSystemProvider(remoteAgentService));
-			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
-		}
 
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 		//
@@ -232,6 +202,12 @@ class DesktopMain extends Disposable {
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
+		const connection = remoteAgentService.getConnection();
+		if (connection) {
+			const remoteFileSystemProvider = this._register(new RemoteFileSystemProvider(remoteAgentService));
+			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
+		}
+
 		const services = await Promise.all([
 			this.createWorkspaceService().then(service => {
 
@@ -239,7 +215,7 @@ class DesktopMain extends Disposable {
 				serviceCollection.set(IWorkspaceContextService, service);
 
 				// Configuration
-				serviceCollection.set(IConfigurationService, new SimpleConfigurationService());
+				serviceCollection.set(IWorkbenchConfigurationService, new SimpleConfigurationService());
 
 				return service;
 			}),
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
index 5ed67ad69..1d117bd14 100644
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
@@ -76,7 +76,7 @@ export class DialogHandlerContribution extends Disposable implements IWorkbenchC
 			// Message
 			else if (this.currentDialog.args.showArgs) {
 				const args = this.currentDialog.args.showArgs;
-				result = this.useCustomDialog ?
+				result = this.useCustomDialog || args.options?.useCustom ?
 					await this.browserImpl.show(args.severity, args.message, args.buttons, args.options) :
 					await this.nativeImpl.show(args.severity, args.message, args.buttons, args.options);
 			}
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
index f56a97383..92d5612fb 100644
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import { fromNow } from 'vs/base/common/date';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
-import { isLinux, isWindows } from 'vs/base/common/platform';
+import { isLinux, isLinuxSnap, isWindows } from 'vs/base/common/platform';
 import Severity from 'vs/base/common/severity';
 import { MessageBoxOptions } from 'vs/base/parts/sandbox/common/electronTypes';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -159,9 +159,10 @@ export class NativeDialogHandler implements IDialogHandler {
 		let version = this.productService.version;
 		if (this.productService.target) {
 			version = `${version} (${this.productService.target} setup)`;
+		} else if (this.productService.darwinUniversalAssetId) {
+			version = `${version} (Universal)`;
 		}
 
-		const isSnap = process.platform === 'linux' && process.env.SNAP && process.env.SNAP_REVISION;
 		const osProps = await this.nativeHostService.getOSProperties();
 
 		const detailString = (useAgo: boolean): string => {
@@ -174,7 +175,7 @@ export class NativeDialogHandler implements IDialogHandler {
 				process.versions['chrome'],
 				process.versions['node'],
 				process.versions['v8'],
-				`${osProps.type} ${osProps.arch} ${osProps.release}${isSnap ? ' snap' : ''}`
+				`${osProps.type} ${osProps.arch} ${osProps.release}${isLinuxSnap ? ' snap' : ''}`
 			);
 		};
 
@@ -206,4 +207,3 @@ export class NativeDialogHandler implements IDialogHandler {
 		}
 	}
 }
-
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
new file mode 100644
index 000000000..802b1f9c5
--- /dev/null
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { URI } from 'vs/base/common/uri';
+import { IAction, Separator } from 'vs/base/common/actions';
+import { IMenuService, MenuId, IMenu, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
+import { isMacintosh } from 'vs/base/common/platform';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { IUpdateService } from 'vs/platform/update/common/update';
+import { MenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IMenubarData, IMenubarMenu, IMenubarKeybinding, IMenubarMenuItemSubmenu, IMenubarMenuItemAction, MenubarMenuItem } from 'vs/platform/menubar/common/menubar';
+import { IMenubarService } from 'vs/platform/menubar/electron-sandbox/menubar';
+import { withNullAsUndefined } from 'vs/base/common/types';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+
+export class NativeMenubarControl extends MenubarControl {
+
+	constructor(
+		@IMenuService menuService: IMenuService,
+		@IWorkspacesService workspacesService: IWorkspacesService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ILabelService labelService: ILabelService,
+		@IUpdateService updateService: IUpdateService,
+		@IStorageService storageService: IStorageService,
+		@INotificationService notificationService: INotificationService,
+		@IPreferencesService preferencesService: IPreferencesService,
+		@INativeWorkbenchEnvironmentService protected readonly environmentService: INativeWorkbenchEnvironmentService,
+		@IAccessibilityService accessibilityService: IAccessibilityService,
+		@IMenubarService private readonly menubarService: IMenubarService,
+		@IHostService hostService: IHostService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@ICommandService commandService: ICommandService,
+	) {
+		super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);
+
+		if (isMacintosh) {
+			this.menus['Preferences'] = this._register(this.menuService.createMenu(MenuId.MenubarPreferencesMenu, this.contextKeyService));
+			this.topLevelTitles['Preferences'] = localize('mPreferences', "Preferences");
+		}
+
+		for (const topLevelMenuName of Object.keys(this.topLevelTitles)) {
+			const menu = this.menus[topLevelMenuName];
+			if (menu) {
+				this._register(menu.onDidChange(() => this.updateMenubar()));
+			}
+		}
+
+		(async () => {
+			this.recentlyOpened = await this.workspacesService.getRecentlyOpened();
+
+			this.doUpdateMenubar();
+		})();
+
+		this.registerListeners();
+	}
+
+	protected doUpdateMenubar(): void {
+		// Since the native menubar is shared between windows (main process)
+		// only allow the focused window to update the menubar
+		if (!this.hostService.hasFocus) {
+			return;
+		}
+
+		// Send menus to main process to be rendered by Electron
+		const menubarData = { menus: {}, keybindings: {} };
+		if (this.getMenubarMenus(menubarData)) {
+			this.menubarService.updateMenubar(this.nativeHostService.windowId, menubarData);
+		}
+	}
+
+	private getMenubarMenus(menubarData: IMenubarData): boolean {
+		if (!menubarData) {
+			return false;
+		}
+
+		menubarData.keybindings = this.getAdditionalKeybindings();
+		for (const topLevelMenuName of Object.keys(this.topLevelTitles)) {
+			const menu = this.menus[topLevelMenuName];
+			if (menu) {
+				const menubarMenu: IMenubarMenu = { items: [] };
+				this.populateMenuItems(menu, menubarMenu, menubarData.keybindings);
+				if (menubarMenu.items.length === 0) {
+					return false; // Menus are incomplete
+				}
+				menubarData.menus[topLevelMenuName] = menubarMenu;
+			}
+		}
+
+		return true;
+	}
+
+	private populateMenuItems(menu: IMenu, menuToPopulate: IMenubarMenu, keybindings: { [id: string]: IMenubarKeybinding | undefined }) {
+		let groups = menu.getActions();
+		for (let group of groups) {
+			const [, actions] = group;
+
+			actions.forEach(menuItem => {
+
+				// use mnemonicTitle whenever possible
+				const title = typeof menuItem.item.title === 'string'
+					? menuItem.item.title
+					: menuItem.item.title.mnemonicTitle ?? menuItem.item.title.value;
+
+				if (menuItem instanceof SubmenuItemAction) {
+					const submenu = { items: [] };
+
+					if (!this.menus[menuItem.item.submenu.id]) {
+						const menu = this.menus[menuItem.item.submenu.id] = this.menuService.createMenu(menuItem.item.submenu, this.contextKeyService);
+						this._register(menu.onDidChange(() => this.updateMenubar()));
+					}
+
+					const menuToDispose = this.menuService.createMenu(menuItem.item.submenu, this.contextKeyService);
+					this.populateMenuItems(menuToDispose, submenu, keybindings);
+
+					let menubarSubmenuItem: IMenubarMenuItemSubmenu = {
+						id: menuItem.id,
+						label: title,
+						submenu: submenu
+					};
+
+					menuToPopulate.items.push(menubarSubmenuItem);
+					menuToDispose.dispose();
+				} else {
+					if (menuItem.id === 'workbench.action.openRecent') {
+						const actions = this.getOpenRecentActions().map(this.transformOpenRecentAction);
+						menuToPopulate.items.push(...actions);
+					}
+
+					let menubarMenuItem: IMenubarMenuItemAction = {
+						id: menuItem.id,
+						label: title
+					};
+
+					if (menuItem.checked) {
+						menubarMenuItem.checked = true;
+					}
+
+					if (!menuItem.enabled) {
+						menubarMenuItem.enabled = false;
+					}
+
+					keybindings[menuItem.id] = this.getMenubarKeybinding(menuItem.id);
+					menuToPopulate.items.push(menubarMenuItem);
+				}
+			});
+
+			menuToPopulate.items.push({ id: 'vscode.menubar.separator' });
+		}
+
+		if (menuToPopulate.items.length > 0) {
+			menuToPopulate.items.pop();
+		}
+	}
+
+	private transformOpenRecentAction(action: Separator | (IAction & { uri: URI })): MenubarMenuItem {
+		if (action instanceof Separator) {
+			return { id: 'vscode.menubar.separator' };
+		}
+
+		return {
+			id: action.id,
+			uri: action.uri,
+			enabled: action.enabled,
+			label: action.label
+		};
+	}
+
+	private getAdditionalKeybindings(): { [id: string]: IMenubarKeybinding } {
+		const keybindings: { [id: string]: IMenubarKeybinding } = {};
+		if (isMacintosh) {
+			const keybinding = this.getMenubarKeybinding('workbench.action.quit');
+			if (keybinding) {
+				keybindings['workbench.action.quit'] = keybinding;
+			}
+		}
+
+		return keybindings;
+	}
+
+	private getMenubarKeybinding(id: string): IMenubarKeybinding | undefined {
+		const binding = this.keybindingService.lookupKeybinding(id);
+		if (!binding) {
+			return undefined;
+		}
+
+		// first try to resolve a native accelerator
+		const electronAccelerator = binding.getElectronAccelerator();
+		if (electronAccelerator) {
+			return { label: electronAccelerator, userSettingsLabel: withNullAsUndefined(binding.getUserSettingsLabel()) };
+		}
+
+		// we need this fallback to support keybindings that cannot show in electron menus (e.g. chords)
+		const acceleratorLabel = binding.getLabel();
+		if (acceleratorLabel) {
+			return { label: acceleratorLabel, isNative: false, userSettingsLabel: withNullAsUndefined(binding.getUserSettingsLabel()) };
+		}
+
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index ea147a06b..c2258de11 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -24,9 +24,9 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { getTitleBarStyle } from 'vs/platform/windows/common/windows';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Codicon } from 'vs/base/common/codicons';
+import { NativeMenubarControl } from 'vs/workbench/electron-sandbox/parts/titlebar/menubarControl';
 
 export class TitlebarPart extends BrowserTitleBarPart {
-	private appIcon: HTMLElement | undefined;
 	private windowControls: HTMLElement | undefined;
 	private maxRestoreControl: HTMLElement | undefined;
 	private dragRegion: HTMLElement | undefined;
@@ -119,7 +119,6 @@ export class TitlebarPart extends BrowserTitleBarPart {
 	}
 
 	protected onConfigurationChanged(event: IConfigurationChangeEvent): void {
-
 		super.onConfigurationChanged(event);
 
 		if (event.affectsConfiguration('window.doubleClickIconToClose')) {
@@ -165,9 +164,13 @@ export class TitlebarPart extends BrowserTitleBarPart {
 	createContentArea(parent: HTMLElement): HTMLElement {
 		const ret = super.createContentArea(parent);
 
+		// Native menu controller
+		if (isMacintosh || getTitleBarStyle(this.configurationService) === 'native') {
+			this._register(this.instantiationService.createInstance(NativeMenubarControl));
+		}
+
 		// App Icon (Native Windows/Linux)
-		if (!isMacintosh) {
-			this.appIcon = DOM.prepend(this.element, DOM.$('div.window-appicon'));
+		if (this.appIcon) {
 			this.onUpdateAppIconDragBehavior();
 
 			this._register(DOM.addDisposableListener(this.appIcon, DOM.EventType.DBLCLICK, (e => {
diff --git a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts b/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
index ada7a23fa..6c09ccef3 100644
--- a/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
+++ b/src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
@@ -11,13 +11,9 @@ import { ISignService } from 'vs/platform/sign/common/sign';
 import { URI } from 'vs/base/common/uri';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
 import { Event } from 'vs/base/common/event';
-import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { IAddressProvider, ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
 import { ITelemetryData, ITelemetryInfo, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
-import { ExtensionIdentifier, IExtension, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { IExtension } from 'vs/platform/extensions/common/extensions';
 import { SimpleConfigurationService as BaseSimpleConfigurationService } from 'vs/editor/standalone/browser/simpleServices';
 import { InMemoryStorageService } from 'vs/platform/storage/common/storage';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -31,7 +27,7 @@ import { IWebviewService, WebviewContentOptions, WebviewElement, WebviewExtensio
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { AbstractTextFileService } from 'vs/workbench/services/textfile/browser/textFileService';
 import { IExtensionManagementServer, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { ITunnelProvider, ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
+import { ITunnelProvider, ITunnelService, RemoteTunnel, TunnelProviderFeatures } from 'vs/platform/remote/common/tunnel';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IManualSyncTask, IResourcePreview, ISyncResourceHandle, ISyncTask, IUserDataAutoSyncService, IUserDataSyncService, IUserDataSyncStore, IUserDataSyncStoreManagementService, SyncResource, SyncStatus, UserDataSyncStoreType } from 'vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncAccount, IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
@@ -56,6 +52,7 @@ import { Schemas } from 'vs/base/common/network';
 import { BrowserKeyboardLayoutService } from 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
 import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
 import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 
 
 //#region Environment
@@ -176,7 +173,7 @@ export class SimpleWorkspaceService implements IWorkspaceContextService {
 
 	getWorkspaceFolder(resource: URI): IWorkspaceFolder | null { return resource && resource.scheme === workspaceResource.scheme ? this.workspace.folders[0] : null; }
 	isInsideWorkspace(resource: URI): boolean { return resource && resource.scheme === workspaceResource.scheme; }
-	isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean { return true; }
+	isCurrentWorkspace(workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean { return true; }
 }
 
 //#endregion
@@ -191,7 +188,9 @@ export class SimpleStorageService extends InMemoryStorageService { }
 
 //#region Configuration
 
-export class SimpleConfigurationService extends BaseSimpleConfigurationService { }
+export class SimpleConfigurationService extends BaseSimpleConfigurationService implements IWorkbenchConfigurationService {
+	async whenRemoteConfigurationLoaded() { }
+}
 
 //#endregion
 
@@ -410,28 +409,6 @@ module.exports = testRunner;`);
 
 //#endregion
 
-//#region Remote
-
-export class SimpleRemoteAgentService implements IRemoteAgentService {
-
-	declare readonly _serviceBrand: undefined;
-
-	socketFactory: ISocketFactory = new BrowserSocketFactory(null);
-
-	getConnection(): IRemoteAgentConnection | null { return null; }
-	async getEnvironment(bail?: boolean): Promise<IRemoteAgentEnvironment | null> { return null; }
-	async getDiagnosticInfo(options: IDiagnosticInfoOptions): Promise<IDiagnosticInfo | undefined> { return undefined; }
-	async disableTelemetry(): Promise<void> { }
-	async logTelemetry(eventName: string, data?: ITelemetryData): Promise<void> { }
-	async flushTelemetry(): Promise<void> { }
-	async getRawEnvironment(): Promise<IRemoteAgentEnvironment | null> { return null; }
-	async scanExtensions(skipExtensions?: ExtensionIdentifier[]): Promise<IExtensionDescription[]> { return []; }
-	async scanSingleExtension(extensionLocation: URI, isBuiltin: boolean): Promise<IExtensionDescription | null> { return null; }
-	async whenExtensionsReady(): Promise<void> { }
-}
-
-//#endregion
-
 
 //#region Backup File
 
@@ -556,13 +533,16 @@ class SimpleTunnelService implements ITunnelService {
 	declare readonly _serviceBrand: undefined;
 
 	tunnels: Promise<readonly RemoteTunnel[]> = Promise.resolve([]);
-
+	canElevate: boolean = false;
+	canMakePublic = false;
 	onTunnelOpened = Event.None;
 	onTunnelClosed = Event.None;
 
+	canTunnel(uri: URI): boolean { return false; }
 	openTunnel(addressProvider: IAddressProvider | undefined, remoteHost: string | undefined, remotePort: number, localPort?: number): Promise<RemoteTunnel> | undefined { return undefined; }
+	async changeTunnelPrivacy(remoteHost: string, remotePort: number, isPublic: boolean): Promise<RemoteTunnel | undefined> { return undefined; }
 	async closeTunnel(remoteHost: string, remotePort: number): Promise<void> { }
-	setTunnelProvider(provider: ITunnelProvider | undefined): IDisposable { return Disposable.None; }
+	setTunnelProvider(provider: ITunnelProvider | undefined, features: TunnelProviderFeatures): IDisposable { return Disposable.None; }
 }
 
 registerSingleton(ITunnelService, SimpleTunnelService);
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 37afcaaf5..9e0cda7d8 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { localize } from 'vs/nls';
 import { URI } from 'vs/base/common/uri';
-import * as errors from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { equals } from 'vs/base/common/objects';
-import * as DOM from 'vs/base/browser/dom';
-import { IAction, Separator } from 'vs/base/common/actions';
+import { EventType, EventHelper, addDisposableListener, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
+import { Separator } from 'vs/base/common/actions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors } from 'vs/workbench/common/editor';
 import { IEditorService, IResourceEditorInputType } from 'vs/workbench/services/editor/common/editorService';
@@ -22,13 +22,12 @@ import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/c
 import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
-import { IMenuService, MenuId, IMenu, MenuItemAction, ICommandAction, SubmenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IMenuService, MenuId, IMenu, MenuItemAction, ICommandAction, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { LifecyclePhase, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { IWorkspaceFolderCreationData, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
 import { isWindows, isMacintosh } from 'vs/base/common/platform';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -39,15 +38,8 @@ import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessi
 import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { coalesce } from 'vs/base/common/arrays';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { MenubarControl } from '../browser/parts/titlebar/menubarControl';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { IUpdateService } from 'vs/platform/update/common/update';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IPreferencesService } from '../services/preferences/common/preferences';
-import { IMenubarData, IMenubarMenu, IMenubarKeybinding, IMenubarMenuItemSubmenu, IMenubarMenuItemAction, MenubarMenuItem } from 'vs/platform/menubar/common/menubar';
-import { IMenubarService } from 'vs/platform/menubar/electron-sandbox/menubar';
-import { withNullAsUndefined, assertIsDefined } from 'vs/base/common/types';
+import { assertIsDefined } from 'vs/base/common/types';
 import { IOpenerService, OpenOptions } from 'vs/platform/opener/common/opener';
 import { Schemas } from 'vs/base/common/network';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
@@ -55,7 +47,6 @@ import { posix, dirname } from 'vs/base/common/path';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { ITunnelService, extractLocalHostUriMetaDataForPortMapping } from 'vs/platform/remote/common/tunnel';
 import { IWorkbenchLayoutService, Parts, positionFromString, Position } from 'vs/workbench/services/layout/browser/layoutService';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IWorkingCopyService, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { AutoSaveMode, IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { Event } from 'vs/base/common/event';
@@ -64,6 +55,8 @@ import { IAddressProvider, IAddress } from 'vs/platform/remote/common/remoteAgen
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { AuthInfo } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
+import { env } from 'vs/base/common/process';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class NativeWindow extends Disposable {
 
@@ -102,7 +95,6 @@ export class NativeWindow extends Disposable {
 		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@ITunnelService private readonly tunnelService: ITunnelService,
@@ -112,7 +104,8 @@ export class NativeWindow extends Disposable {
 		@IProductService private readonly productService: IProductService,
 		@IRemoteAuthorityResolverService private readonly remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@IDialogService private readonly dialogService: IDialogService,
-		@IStorageService private readonly storageService: IStorageService
+		@IStorageService private readonly storageService: IStorageService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super();
 
@@ -122,13 +115,16 @@ export class NativeWindow extends Disposable {
 
 	private registerListeners(): void {
 
+		// Layout
+		this._register(addDisposableListener(window, EventType.RESIZE, e => this.onWindowResize(e, true)));
+
 		// React to editor input changes
 		this._register(this.editorService.onDidActiveEditorChange(() => this.updateTouchbarMenu()));
 
-		// prevent opening a real URL inside the shell
-		[DOM.EventType.DRAG_OVER, DOM.EventType.DROP].forEach(event => {
+		// prevent opening a real URL inside the window
+		[EventType.DRAG_OVER, EventType.DROP].forEach(event => {
 			window.document.body.addEventListener(event, (e: DragEvent) => {
-				DOM.EventHelper.stop(e);
+				EventHelper.stop(e);
 			});
 		});
 
@@ -173,7 +169,7 @@ export class NativeWindow extends Disposable {
 		// Error reporting from main
 		ipcRenderer.on('vscode:reportError', (event: unknown, error: string) => {
 			if (error) {
-				errors.onUnexpectedError(JSON.parse(error));
+				onUnexpectedError(JSON.parse(error));
 			}
 		});
 
@@ -188,13 +184,13 @@ export class NativeWindow extends Disposable {
 
 		// Shell Environment Issue Notifications
 		const choices: IPromptChoice[] = [{
-			label: nls.localize('learnMode', "Learn More"),
+			label: localize('learnMore', "Learn More"),
 			run: () => this.openerService.open('https://go.microsoft.com/fwlink/?linkid=2149667')
 		}];
 
 		ipcRenderer.on('vscode:showShellEnvSlowWarning', () => this.notificationService.prompt(
 			Severity.Warning,
-			nls.localize('shellEnvSlowWarning', "Resolving your shell environment is taking very long. Please review your shell configuration."),
+			localize('shellEnvSlowWarning', "Resolving your shell environment is taking very long. Please review your shell configuration."),
 			choices,
 			{
 				sticky: true,
@@ -204,7 +200,7 @@ export class NativeWindow extends Disposable {
 
 		ipcRenderer.on('vscode:showShellEnvTimeoutError', () => this.notificationService.prompt(
 			Severity.Error,
-			nls.localize('shellEnvTimeoutError', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration."),
+			localize('shellEnvTimeoutError', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration."),
 			choices
 		));
 
@@ -222,20 +218,20 @@ export class NativeWindow extends Disposable {
 		// Proxy Login Dialog
 		ipcRenderer.on('vscode:openProxyAuthenticationDialog', async (event: unknown, payload: { authInfo: AuthInfo, username?: string, password?: string, replyChannel: string }) => {
 			const rememberCredentials = this.storageService.getBoolean(NativeWindow.REMEMBER_PROXY_CREDENTIALS_KEY, StorageScope.GLOBAL);
-			const result = await this.dialogService.input(Severity.Warning, nls.localize('proxyAuthRequired', "Proxy Authentication Required"),
+			const result = await this.dialogService.input(Severity.Warning, localize('proxyAuthRequired', "Proxy Authentication Required"),
 				[
-					nls.localize({ key: 'loginButton', comment: ['&& denotes a mnemonic'] }, "&&Log In"),
-					nls.localize({ key: 'cancelButton', comment: ['&& denotes a mnemonic'] }, "&&Cancel")
+					localize({ key: 'loginButton', comment: ['&& denotes a mnemonic'] }, "&&Log In"),
+					localize({ key: 'cancelButton', comment: ['&& denotes a mnemonic'] }, "&&Cancel")
 				],
 				[
-					{ placeholder: nls.localize('username', "Username"), value: payload.username },
-					{ placeholder: nls.localize('password', "Password"), type: 'password', value: payload.password }
+					{ placeholder: localize('username', "Username"), value: payload.username },
+					{ placeholder: localize('password', "Password"), type: 'password', value: payload.password }
 				],
 				{
 					cancelId: 1,
-					detail: nls.localize('proxyDetail', "The proxy {0} requires a username and password.", `${payload.authInfo.host}:${payload.authInfo.port}`),
+					detail: localize('proxyDetail', "The proxy {0} requires a username and password.", `${payload.authInfo.host}:${payload.authInfo.port}`),
 					checkbox: {
-						label: nls.localize('rememberCredentials', "Remember my credentials"),
+						label: localize('rememberCredentials', "Remember my credentials"),
 						checked: rememberCredentials
 					}
 				});
@@ -303,8 +299,8 @@ export class NativeWindow extends Disposable {
 		if (isMacintosh && getTitleBarStyle(this.configurationService) === 'custom') {
 			const titlePart = assertIsDefined(this.layoutService.getContainer(Parts.TITLEBAR_PART));
 
-			this._register(DOM.addDisposableListener(titlePart, DOM.EventType.DBLCLICK, e => {
-				DOM.EventHelper.stop(e);
+			this._register(addDisposableListener(titlePart, EventType.DBLCLICK, e => {
+				EventHelper.stop(e);
 
 				this.nativeHostService.handleTitleDoubleClick();
 			}));
@@ -331,12 +327,28 @@ export class NativeWindow extends Disposable {
 		this.onDidChangeMaximized(this.environmentService.configuration.maximized ?? false);
 
 		// Detect panel position to determine minimum width
-		this._register(this.layoutService.onPanelPositionChange(pos => {
-			this.onDidPanelPositionChange(positionFromString(pos));
-		}));
+		this._register(this.layoutService.onPanelPositionChange(pos => this.onDidPanelPositionChange(positionFromString(pos))));
 		this.onDidPanelPositionChange(this.layoutService.getPanelPosition());
 	}
 
+	private onWindowResize(e: UIEvent, retry: boolean): void {
+		if (e.target === window) {
+			if (window.document && window.document.body && window.document.body.clientWidth === 0) {
+				// TODO@bpasero this is an electron issue on macOS when simple fullscreen is enabled
+				// where for some reason the window clientWidth is reported as 0 when switching
+				// between simple fullscreen and normal screen. In that case we schedule the layout
+				// call at the next animation frame once, in the hope that the dimensions are
+				// proper then.
+				if (retry) {
+					scheduleAtNextAnimationFrame(() => this.onWindowResize(e, false));
+				}
+				return;
+			}
+
+			this.layoutService.layout();
+		}
+	}
+
 	private updateDocumentEdited(isDirty = this.workingCopyService.hasDirty): void {
 		if ((!this.isDocumentedEdited && isDirty) || (this.isDocumentedEdited && !isDirty)) {
 			this.isDocumentedEdited = isDirty;
@@ -350,18 +362,19 @@ export class NativeWindow extends Disposable {
 	}
 
 	private getWindowMinimumWidth(panelPosition: Position = this.layoutService.getPanelPosition()): number {
+
 		// if panel is on the side, then return the larger minwidth
 		const panelOnSide = panelPosition === Position.LEFT || panelPosition === Position.RIGHT;
 		if (panelOnSide) {
 			return WindowMinimumSize.WIDTH_WITH_VERTICAL_PANEL;
 		}
-		else {
-			return WindowMinimumSize.WIDTH;
-		}
+
+		return WindowMinimumSize.WIDTH;
 	}
 
 	private onDidPanelPositionChange(pos: Position): void {
 		const minWidth = this.getWindowMinimumWidth(pos);
+
 		this.nativeHostService.setMinimumSize(minWidth, undefined);
 	}
 
@@ -447,11 +460,6 @@ export class NativeWindow extends Disposable {
 
 	private create(): void {
 
-		// Native menu controller
-		if (isMacintosh || getTitleBarStyle(this.configurationService) === 'native') {
-			this._register(this.instantiationService.createInstance(NativeMenubarControl));
-		}
-
 		// Handle open calls
 		this.setupOpenHandlers();
 
@@ -470,12 +478,23 @@ export class NativeWindow extends Disposable {
 
 			// Show warning message (unix only)
 			if (isAdmin && !isWindows) {
-				this.notificationService.warn(nls.localize('runningAsRoot', "It is not recommended to run {0} as root user.", this.productService.nameShort));
+				this.notificationService.warn(localize('runningAsRoot', "It is not recommended to run {0} as root user.", this.productService.nameShort));
 			}
 		});
 
 		// Touchbar menu (if enabled)
 		this.updateTouchbarMenu();
+
+		// Check for cyclic dependencies
+		if (require.hasDependencyCycle()) {
+			if (env['CI'] || env['BUILD_ARTIFACTSTAGINGDIRECTORY']) {
+				this.logService.error('Error: There is a dependency cycle in the AMD modules that needs to be resolved!');
+				this.nativeHostService.exit(37); // running on a build machine, just exit without showing a dialog
+			} else {
+				this.dialogService.show(Severity.Error, localize('loaderCycle', "There is a dependency cycle in the AMD modules that needs to be resolved!"), [localize('ok', "OK")]);
+				this.nativeHostService.openDevTools();
+			}
+		}
 	}
 
 	private setupOpenHandlers(): void {
@@ -486,7 +505,7 @@ export class NativeWindow extends Disposable {
 		};
 
 		// Handle external open() calls
-		this.openerService.setExternalOpener({
+		this.openerService.setDefaultExternalOpener({
 			openExternal: async (href: string) => {
 				const success = await this.nativeHostService.openExternal(href);
 				if (!success) {
@@ -667,199 +686,3 @@ export class NativeWindow extends Disposable {
 		return this.editorService.openEditors(resources);
 	}
 }
-
-class NativeMenubarControl extends MenubarControl {
-	constructor(
-		@IMenuService menuService: IMenuService,
-		@IWorkspacesService workspacesService: IWorkspacesService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@ILabelService labelService: ILabelService,
-		@IUpdateService updateService: IUpdateService,
-		@IStorageService storageService: IStorageService,
-		@INotificationService notificationService: INotificationService,
-		@IPreferencesService preferencesService: IPreferencesService,
-		@INativeWorkbenchEnvironmentService protected readonly environmentService: INativeWorkbenchEnvironmentService,
-		@IAccessibilityService accessibilityService: IAccessibilityService,
-		@IMenubarService private readonly menubarService: IMenubarService,
-		@IHostService hostService: IHostService,
-		@INativeHostService private readonly nativeHostService: INativeHostService
-	) {
-		super(
-			menuService,
-			workspacesService,
-			contextKeyService,
-			keybindingService,
-			configurationService,
-			labelService,
-			updateService,
-			storageService,
-			notificationService,
-			preferencesService,
-			environmentService,
-			accessibilityService,
-			hostService
-		);
-
-		if (isMacintosh) {
-			this.menus['Preferences'] = this._register(this.menuService.createMenu(MenuId.MenubarPreferencesMenu, this.contextKeyService));
-			this.topLevelTitles['Preferences'] = nls.localize('mPreferences', "Preferences");
-		}
-
-		for (const topLevelMenuName of Object.keys(this.topLevelTitles)) {
-			const menu = this.menus[topLevelMenuName];
-			if (menu) {
-				this._register(menu.onDidChange(() => this.updateMenubar()));
-			}
-		}
-
-		(async () => {
-			this.recentlyOpened = await this.workspacesService.getRecentlyOpened();
-
-			this.doUpdateMenubar();
-		})();
-
-		this.registerListeners();
-	}
-
-	protected doUpdateMenubar(): void {
-		// Since the native menubar is shared between windows (main process)
-		// only allow the focused window to update the menubar
-		if (!this.hostService.hasFocus) {
-			return;
-		}
-
-		// Send menus to main process to be rendered by Electron
-		const menubarData = { menus: {}, keybindings: {} };
-		if (this.getMenubarMenus(menubarData)) {
-			this.menubarService.updateMenubar(this.nativeHostService.windowId, menubarData);
-		}
-	}
-
-	private getMenubarMenus(menubarData: IMenubarData): boolean {
-		if (!menubarData) {
-			return false;
-		}
-
-		menubarData.keybindings = this.getAdditionalKeybindings();
-		for (const topLevelMenuName of Object.keys(this.topLevelTitles)) {
-			const menu = this.menus[topLevelMenuName];
-			if (menu) {
-				const menubarMenu: IMenubarMenu = { items: [] };
-				this.populateMenuItems(menu, menubarMenu, menubarData.keybindings);
-				if (menubarMenu.items.length === 0) {
-					return false; // Menus are incomplete
-				}
-				menubarData.menus[topLevelMenuName] = menubarMenu;
-			}
-		}
-
-		return true;
-	}
-
-	private populateMenuItems(menu: IMenu, menuToPopulate: IMenubarMenu, keybindings: { [id: string]: IMenubarKeybinding | undefined }) {
-		let groups = menu.getActions();
-		for (let group of groups) {
-			const [, actions] = group;
-
-			actions.forEach(menuItem => {
-
-				if (menuItem instanceof SubmenuItemAction) {
-					const submenu = { items: [] };
-
-					if (!this.menus[menuItem.item.submenu.id]) {
-						const menu = this.menus[menuItem.item.submenu.id] = this.menuService.createMenu(menuItem.item.submenu, this.contextKeyService);
-						this._register(menu.onDidChange(() => this.updateMenubar()));
-					}
-
-					const menuToDispose = this.menuService.createMenu(menuItem.item.submenu, this.contextKeyService);
-					this.populateMenuItems(menuToDispose, submenu, keybindings);
-
-					let menubarSubmenuItem: IMenubarMenuItemSubmenu = {
-						id: menuItem.id,
-						label: menuItem.label,
-						submenu: submenu
-					};
-
-					menuToPopulate.items.push(menubarSubmenuItem);
-					menuToDispose.dispose();
-				} else {
-					if (menuItem.id === 'workbench.action.openRecent') {
-						const actions = this.getOpenRecentActions().map(this.transformOpenRecentAction);
-						menuToPopulate.items.push(...actions);
-					}
-
-					let menubarMenuItem: IMenubarMenuItemAction = {
-						id: menuItem.id,
-						label: menuItem.label
-					};
-
-					if (menuItem.checked) {
-						menubarMenuItem.checked = true;
-					}
-
-					if (!menuItem.enabled) {
-						menubarMenuItem.enabled = false;
-					}
-
-					menubarMenuItem.label = this.calculateActionLabel(menubarMenuItem);
-					keybindings[menuItem.id] = this.getMenubarKeybinding(menuItem.id);
-					menuToPopulate.items.push(menubarMenuItem);
-				}
-			});
-
-			menuToPopulate.items.push({ id: 'vscode.menubar.separator' });
-		}
-
-		if (menuToPopulate.items.length > 0) {
-			menuToPopulate.items.pop();
-		}
-	}
-
-	private transformOpenRecentAction(action: Separator | (IAction & { uri: URI })): MenubarMenuItem {
-		if (action instanceof Separator) {
-			return { id: 'vscode.menubar.separator' };
-		}
-
-		return {
-			id: action.id,
-			uri: action.uri,
-			enabled: action.enabled,
-			label: action.label
-		};
-	}
-
-	private getAdditionalKeybindings(): { [id: string]: IMenubarKeybinding } {
-		const keybindings: { [id: string]: IMenubarKeybinding } = {};
-		if (isMacintosh) {
-			const keybinding = this.getMenubarKeybinding('workbench.action.quit');
-			if (keybinding) {
-				keybindings['workbench.action.quit'] = keybinding;
-			}
-		}
-
-		return keybindings;
-	}
-
-	private getMenubarKeybinding(id: string): IMenubarKeybinding | undefined {
-		const binding = this.keybindingService.lookupKeybinding(id);
-		if (!binding) {
-			return undefined;
-		}
-
-		// first try to resolve a native accelerator
-		const electronAccelerator = binding.getElectronAccelerator();
-		if (electronAccelerator) {
-			return { label: electronAccelerator, userSettingsLabel: withNullAsUndefined(binding.getUserSettingsLabel()) };
-		}
-
-		// we need this fallback to support keybindings that cannot show in electron menus (e.g. chords)
-		const acceleratorLabel = binding.getLabel();
-		if (acceleratorLabel) {
-			return { label: acceleratorLabel, isNative: false, userSettingsLabel: withNullAsUndefined(binding.getUserSettingsLabel()) };
-		}
-
-		return undefined;
-	}
-}
diff --git a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
index 1835f2775..147c47c5d 100644
--- a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
@@ -29,27 +29,12 @@ import { VSBuffer } from 'vs/base/common/buffer';
 import { TestWorkbenchConfiguration } from 'vs/workbench/test/electron-browser/workbenchTestServices';
 import { TestProductService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-
-const userdataDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupfileservice');
-const backupHome = path.join(userdataDir, 'Backups');
-const workspacesJsonPath = path.join(backupHome, 'workspaces.json');
-
-const workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/workspace');
-const workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
-const fooFile = URI.file(platform.isWindows ? 'c:\\Foo' : '/Foo');
-const customFile = URI.parse('customScheme://some/path');
-const customFileWithFragment = URI.parse('customScheme2://some/path#fragment');
-const barFile = URI.file(platform.isWindows ? 'c:\\Bar' : '/Bar');
-const fooBarFile = URI.file(platform.isWindows ? 'c:\\Foo Bar' : '/Foo Bar');
-const untitledFile = URI.from({ scheme: Schemas.untitled, path: 'Untitled-1' });
-const fooBackupPath = path.join(workspaceBackupPath, 'file', hashPath(fooFile));
-const barBackupPath = path.join(workspaceBackupPath, 'file', hashPath(barFile));
-const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', hashPath(untitledFile));
+import { insert } from 'vs/base/common/arrays';
 
 class TestWorkbenchEnvironmentService extends NativeWorkbenchEnvironmentService {
 
-	constructor(backupPath: string) {
-		super({ ...TestWorkbenchConfiguration, backupPath, 'user-data-dir': userdataDir }, TestProductService);
+	constructor(testDir: string, backupPath: string) {
+		super({ ...TestWorkbenchConfiguration, backupPath, 'user-data-dir': testDir }, TestProductService);
 	}
 }
 
@@ -60,9 +45,10 @@ export class NodeTestBackupFileService extends NativeBackupFileService {
 	private backupResourceJoiners: Function[];
 	private discardBackupJoiners: Function[];
 	discardedBackups: URI[];
+	private pendingBackupsArr: Promise<void>[];
 
-	constructor(workspaceBackupPath: string) {
-		const environmentService = new TestWorkbenchEnvironmentService(workspaceBackupPath);
+	constructor(testDir: string, workspaceBackupPath: string) {
+		const environmentService = new TestWorkbenchEnvironmentService(testDir, workspaceBackupPath);
 		const logService = new NullLogService();
 		const fileService = new FileService(logService);
 		const diskFileSystemProvider = new DiskFileSystemProvider(logService);
@@ -75,6 +61,11 @@ export class NodeTestBackupFileService extends NativeBackupFileService {
 		this.backupResourceJoiners = [];
 		this.discardBackupJoiners = [];
 		this.discardedBackups = [];
+		this.pendingBackupsArr = [];
+	}
+
+	async waitForAllBackups(): Promise<void> {
+		await Promise.all(this.pendingBackupsArr);
 	}
 
 	joinBackupResource(): Promise<void> {
@@ -82,7 +73,14 @@ export class NodeTestBackupFileService extends NativeBackupFileService {
 	}
 
 	async backup(resource: URI, content?: ITextSnapshot, versionId?: number, meta?: any, token?: CancellationToken): Promise<void> {
-		await super.backup(resource, content, versionId, meta, token);
+		const p = super.backup(resource, content, versionId, meta, token);
+		const removeFromPendingBackups = insert(this.pendingBackupsArr, p.then(undefined, undefined));
+
+		try {
+			await p;
+		} finally {
+			removeFromPendingBackups();
+		}
 
 		while (this.backupResourceJoiners.length) {
 			this.backupResourceJoiners.pop()!();
@@ -112,20 +110,43 @@ export class NodeTestBackupFileService extends NativeBackupFileService {
 }
 
 suite('BackupFileService', () => {
+
+	let testDir: string;
+	let backupHome: string;
+	let workspacesJsonPath: string;
+	let workspaceBackupPath: string;
+	let fooBackupPath: string;
+	let barBackupPath: string;
+	let untitledBackupPath: string;
+
 	let service: NodeTestBackupFileService;
 
-	setup(async () => {
-		service = new NodeTestBackupFileService(workspaceBackupPath);
+	let workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/workspace');
+	let fooFile = URI.file(platform.isWindows ? 'c:\\Foo' : '/Foo');
+	let customFile = URI.parse('customScheme://some/path');
+	let customFileWithFragment = URI.parse('customScheme2://some/path#fragment');
+	let barFile = URI.file(platform.isWindows ? 'c:\\Bar' : '/Bar');
+	let fooBarFile = URI.file(platform.isWindows ? 'c:\\Foo Bar' : '/Foo Bar');
+	let untitledFile = URI.from({ scheme: Schemas.untitled, path: 'Untitled-1' });
+
+	setup(async () => {
+		testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupfileservice');
+		backupHome = path.join(testDir, 'Backups');
+		workspacesJsonPath = path.join(backupHome, 'workspaces.json');
+		workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
+		fooBackupPath = path.join(workspaceBackupPath, 'file', hashPath(fooFile));
+		barBackupPath = path.join(workspaceBackupPath, 'file', hashPath(barFile));
+		untitledBackupPath = path.join(workspaceBackupPath, 'untitled', hashPath(untitledFile));
+
+		service = new NodeTestBackupFileService(testDir, workspaceBackupPath);
 
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
 		await pfs.mkdirp(backupHome);
 
 		return pfs.writeFile(workspacesJsonPath, '');
 	});
 
 	teardown(() => {
-		return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
+		return pfs.rimraf(testDir);
 	});
 
 	suite('hashPath', () => {
@@ -136,8 +157,8 @@ suite('BackupFileService', () => {
 			});
 			const actual = hashPath(uri);
 			// If these hashes change people will lose their backed up files!
-			assert.equal(actual, '13264068d108c6901b3592ea654fcd57');
-			assert.equal(actual, crypto.createHash('md5').update(uri.fsPath).digest('hex'));
+			assert.strictEqual(actual, '13264068d108c6901b3592ea654fcd57');
+			assert.strictEqual(actual, crypto.createHash('md5').update(uri.fsPath).digest('hex'));
 		});
 
 		test('should correctly hash the path for file scheme URIs', () => {
@@ -145,11 +166,11 @@ suite('BackupFileService', () => {
 			const actual = hashPath(uri);
 			// If these hashes change people will lose their backed up files!
 			if (platform.isWindows) {
-				assert.equal(actual, 'dec1a583f52468a020bd120c3f01d812');
+				assert.strictEqual(actual, 'dec1a583f52468a020bd120c3f01d812');
 			} else {
-				assert.equal(actual, '1effb2475fcfba4f9e8b8a1dbc8f3caf');
+				assert.strictEqual(actual, '1effb2475fcfba4f9e8b8a1dbc8f3caf');
 			}
-			assert.equal(actual, crypto.createHash('md5').update(uri.fsPath).digest('hex'));
+			assert.strictEqual(actual, crypto.createHash('md5').update(uri.fsPath).digest('hex'));
 		});
 	});
 
@@ -160,7 +181,7 @@ suite('BackupFileService', () => {
 			const workspaceHash = hashPath(workspaceResource);
 			const filePathHash = hashPath(backupResource);
 			const expectedPath = URI.file(path.join(backupHome, workspaceHash, Schemas.file, filePathHash)).with({ scheme: Schemas.userData }).toString();
-			assert.equal(service.toBackupResource(backupResource).toString(), expectedPath);
+			assert.strictEqual(service.toBackupResource(backupResource).toString(), expectedPath);
 		});
 
 		test('should get the correct backup path for untitled files', () => {
@@ -169,49 +190,49 @@ suite('BackupFileService', () => {
 			const workspaceHash = hashPath(workspaceResource);
 			const filePathHash = hashPath(backupResource);
 			const expectedPath = URI.file(path.join(backupHome, workspaceHash, Schemas.untitled, filePathHash)).with({ scheme: Schemas.userData }).toString();
-			assert.equal(service.toBackupResource(backupResource).toString(), expectedPath);
+			assert.strictEqual(service.toBackupResource(backupResource).toString(), expectedPath);
 		});
 	});
 
 	suite('backup', () => {
 		test('no text', async () => {
 			await service.backup(fooFile);
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\n`);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}\n`);
 			assert.ok(service.hasBackupSync(fooFile));
 		});
 
 		test('text file', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\ntest`);
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}\ntest`);
 			assert.ok(service.hasBackupSync(fooFile));
 		});
 
 		test('text file (with version)', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false), 666);
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\ntest`);
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false), 666);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}\ntest`);
 			assert.ok(!service.hasBackupSync(fooFile, 555));
 			assert.ok(service.hasBackupSync(fooFile, 666));
 		});
 
 		test('text file (with meta)', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false), undefined, { etag: '678', orphaned: true });
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()} {"etag":"678","orphaned":true}\ntest`);
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false), undefined, { etag: '678', orphaned: true });
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()} {"etag":"678","orphaned":true}\ntest`);
 			assert.ok(service.hasBackupSync(fooFile));
 		});
 
 		test('untitled file', async () => {
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
-			assert.equal(fs.existsSync(untitledBackupPath), true);
-			assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\ntest`);
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+			assert.strictEqual(fs.existsSync(untitledBackupPath), true);
+			assert.strictEqual(fs.readFileSync(untitledBackupPath).toString(), `${untitledFile.toString()}\ntest`);
 			assert.ok(service.hasBackupSync(untitledFile));
 		});
 
@@ -219,9 +240,9 @@ suite('BackupFileService', () => {
 			const model = createTextModel('test');
 
 			await service.backup(fooFile, model.createSnapshot());
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\ntest`);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}\ntest`);
 			assert.ok(service.hasBackupSync(fooFile));
 
 			model.dispose();
@@ -231,9 +252,9 @@ suite('BackupFileService', () => {
 			const model = createTextModel('test');
 
 			await service.backup(untitledFile, model.createSnapshot());
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
-			assert.equal(fs.existsSync(untitledBackupPath), true);
-			assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\ntest`);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+			assert.strictEqual(fs.existsSync(untitledBackupPath), true);
+			assert.strictEqual(fs.readFileSync(untitledBackupPath).toString(), `${untitledFile.toString()}\ntest`);
 
 			model.dispose();
 		});
@@ -243,9 +264,9 @@ suite('BackupFileService', () => {
 			const model = createTextModel(largeString);
 
 			await service.backup(fooFile, model.createSnapshot());
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\n${largeString}`);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			assert.strictEqual(fs.existsSync(fooBackupPath), true);
+			assert.strictEqual(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}\n${largeString}`);
 			assert.ok(service.hasBackupSync(fooFile));
 
 			model.dispose();
@@ -256,9 +277,9 @@ suite('BackupFileService', () => {
 			const model = createTextModel(largeString);
 
 			await service.backup(untitledFile, model.createSnapshot());
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
-			assert.equal(fs.existsSync(untitledBackupPath), true);
-			assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\n${largeString}`);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+			assert.strictEqual(fs.existsSync(untitledBackupPath), true);
+			assert.strictEqual(fs.readFileSync(untitledBackupPath).toString(), `${untitledFile.toString()}\n${largeString}`);
 			assert.ok(service.hasBackupSync(untitledFile));
 
 			model.dispose();
@@ -270,79 +291,79 @@ suite('BackupFileService', () => {
 			cts.cancel();
 			await promise;
 
-			assert.equal(fs.existsSync(fooBackupPath), false);
+			assert.strictEqual(fs.existsSync(fooBackupPath), false);
 			assert.ok(!service.hasBackupSync(fooFile));
 		});
 	});
 
 	suite('discardBackup', () => {
 		test('text file', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
 			assert.ok(service.hasBackupSync(fooFile));
 
 			await service.discardBackup(fooFile);
-			assert.equal(fs.existsSync(fooBackupPath), false);
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 0);
+			assert.strictEqual(fs.existsSync(fooBackupPath), false);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 0);
 			assert.ok(!service.hasBackupSync(fooFile));
 		});
 
 		test('untitled file', async () => {
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
 			await service.discardBackup(untitledFile);
-			assert.equal(fs.existsSync(untitledBackupPath), false);
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 0);
+			assert.strictEqual(fs.existsSync(untitledBackupPath), false);
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 0);
 		});
 	});
 
 	suite('discardBackups', () => {
 		test('text file', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
-			await service.backup(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 2);
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+			await service.backup(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 2);
 			await service.discardBackups();
-			assert.equal(fs.existsSync(fooBackupPath), false);
-			assert.equal(fs.existsSync(barBackupPath), false);
-			assert.equal(fs.existsSync(path.join(workspaceBackupPath, 'file')), false);
+			assert.strictEqual(fs.existsSync(fooBackupPath), false);
+			assert.strictEqual(fs.existsSync(barBackupPath), false);
+			assert.strictEqual(fs.existsSync(path.join(workspaceBackupPath, 'file')), false);
 		});
 
 		test('untitled file', async () => {
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
 			await service.discardBackups();
-			assert.equal(fs.existsSync(untitledBackupPath), false);
-			assert.equal(fs.existsSync(path.join(workspaceBackupPath, 'untitled')), false);
+			assert.strictEqual(fs.existsSync(untitledBackupPath), false);
+			assert.strictEqual(fs.existsSync(path.join(workspaceBackupPath, 'untitled')), false);
 		});
 
 		test('can backup after discarding all', async () => {
 			await service.discardBackups();
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
-			assert.equal(fs.existsSync(workspaceBackupPath), true);
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+			assert.strictEqual(fs.existsSync(workspaceBackupPath), true);
 		});
 	});
 
 	suite('getBackups', () => {
 		test('("file") - text file', async () => {
-			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
+			await service.backup(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 			const textFiles = await service.getBackups();
-			assert.deepEqual(textFiles.map(f => f.fsPath), [fooFile.fsPath]);
-			await service.backup(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
+			assert.deepStrictEqual(textFiles.map(f => f.fsPath), [fooFile.fsPath]);
+			await service.backup(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 			const textFiles_1 = await service.getBackups();
-			assert.deepEqual(textFiles_1.map(f => f.fsPath), [fooFile.fsPath, barFile.fsPath]);
+			assert.deepStrictEqual(textFiles_1.map(f => f.fsPath), [fooFile.fsPath, barFile.fsPath]);
 		});
 
 		test('("file") - untitled file', async () => {
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 			const textFiles = await service.getBackups();
-			assert.deepEqual(textFiles.map(f => f.fsPath), [untitledFile.fsPath]);
+			assert.deepStrictEqual(textFiles.map(f => f.fsPath), [untitledFile.fsPath]);
 		});
 
 		test('("untitled") - untitled file', async () => {
-			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false));
+			await service.backup(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 			const textFiles = await service.getBackups();
-			assert.deepEqual(textFiles.map(f => f.fsPath), ['Untitled-1']);
+			assert.deepStrictEqual(textFiles.map(f => f.fsPath), ['Untitled-1']);
 		});
 	});
 
@@ -451,10 +472,10 @@ suite('BackupFileService', () => {
 				orphaned: false
 			};
 
-			await service.backup(fooFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false), 1, meta);
+			await service.backup(fooFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false), 1, meta);
 
 			const fileContents = fs.readFileSync(fooBackupPath).toString();
-			assert.equal(fileContents.indexOf(fooFile.toString()), 0);
+			assert.strictEqual(fileContents.indexOf(fooFile.toString()), 0);
 
 			const metaIndex = fileContents.indexOf('{');
 			const newFileContents = fileContents.substring(0, metaIndex) + '{{' + fileContents.substr(metaIndex);
@@ -462,7 +483,7 @@ suite('BackupFileService', () => {
 
 			const backup = await service.resolve(fooFile);
 			assert.ok(backup);
-			assert.equal(contents, snapshotToString(backup!.value.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true)));
+			assert.strictEqual(contents, snapshotToString(backup!.value.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).textBuffer.createSnapshot(true)));
 			assert.ok(!backup!.meta);
 		});
 
@@ -523,7 +544,7 @@ suite('BackupFileService', () => {
 		test('should ignore invalid backups', async () => {
 			const contents = 'test\nand more stuff';
 
-			await service.backup(fooBarFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false), 1);
+			await service.backup(fooBarFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false), 1);
 
 			const backup = await service.resolve(fooBarFile);
 			if (!backup) {
@@ -547,115 +568,100 @@ suite('BackupFileService', () => {
 				expectedMeta = meta;
 			}
 
-			await service.backup(resource, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false), 1, meta);
+			await service.backup(resource, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false), 1, meta);
 
 			const backup = await service.resolve<IBackupTestMetaData>(resource);
 			assert.ok(backup);
-			assert.equal(contents, snapshotToString(backup!.value.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true)));
+			assert.strictEqual(contents, snapshotToString(backup!.value.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).textBuffer.createSnapshot(true)));
 
 			if (expectedMeta) {
-				assert.equal(backup!.meta!.etag, expectedMeta.etag);
-				assert.equal(backup!.meta!.size, expectedMeta.size);
-				assert.equal(backup!.meta!.mtime, expectedMeta.mtime);
-				assert.equal(backup!.meta!.orphaned, expectedMeta.orphaned);
+				assert.strictEqual(backup!.meta!.etag, expectedMeta.etag);
+				assert.strictEqual(backup!.meta!.size, expectedMeta.size);
+				assert.strictEqual(backup!.meta!.mtime, expectedMeta.mtime);
+				assert.strictEqual(backup!.meta!.orphaned, expectedMeta.orphaned);
 			} else {
 				assert.ok(!backup!.meta);
 			}
 		}
 	});
-});
-
-suite('BackupFilesModel', () => {
-
-	let service: NodeTestBackupFileService;
-
-	setup(async () => {
-		service = new NodeTestBackupFileService(workspaceBackupPath);
-
-		// Delete any existing backups completely and then re-create it.
-		await pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
-		await pfs.mkdirp(backupHome);
-
-		return pfs.writeFile(workspacesJsonPath, '');
-	});
-
-	teardown(() => {
-		return pfs.rimraf(backupHome, pfs.RimRafMode.MOVE);
-	});
-
-	test('simple', () => {
-		const model = new BackupFilesModel(service.fileService);
-
-		const resource1 = URI.file('test.html');
-
-		assert.equal(model.has(resource1), false);
-
-		model.add(resource1);
-
-		assert.equal(model.has(resource1), true);
-		assert.equal(model.has(resource1, 0), true);
-		assert.equal(model.has(resource1, 1), false);
-		assert.equal(model.has(resource1, 1, { foo: 'bar' }), false);
-
-		model.remove(resource1);
-
-		assert.equal(model.has(resource1), false);
-
-		model.add(resource1);
-
-		assert.equal(model.has(resource1), true);
-		assert.equal(model.has(resource1, 0), true);
-		assert.equal(model.has(resource1, 1), false);
-
-		model.clear();
-
-		assert.equal(model.has(resource1), false);
-
-		model.add(resource1, 1);
-
-		assert.equal(model.has(resource1), true);
-		assert.equal(model.has(resource1, 0), false);
-		assert.equal(model.has(resource1, 1), true);
-
-		const resource2 = URI.file('test1.html');
-		const resource3 = URI.file('test2.html');
-		const resource4 = URI.file('test3.html');
-
-		model.add(resource2);
-		model.add(resource3);
-		model.add(resource4, undefined, { foo: 'bar' });
-
-		assert.equal(model.has(resource1), true);
-		assert.equal(model.has(resource2), true);
-		assert.equal(model.has(resource3), true);
-
-		assert.equal(model.has(resource4), true);
-		assert.equal(model.has(resource4, undefined, { foo: 'bar' }), true);
-		assert.equal(model.has(resource4, undefined, { bar: 'foo' }), false);
-	});
-
-	test('resolve', async () => {
-		await pfs.mkdirp(path.dirname(fooBackupPath));
-		fs.writeFileSync(fooBackupPath, 'foo');
-		const model = new BackupFilesModel(service.fileService);
-
-		const resolvedModel = await model.resolve(URI.file(workspaceBackupPath));
-		assert.equal(resolvedModel.has(URI.file(fooBackupPath)), true);
-	});
-
-	test('get', () => {
-		const model = new BackupFilesModel(service.fileService);
-
-		assert.deepEqual(model.get(), []);
-
-		const file1 = URI.file('/root/file/foo.html');
-		const file2 = URI.file('/root/file/bar.html');
-		const untitled = URI.file('/root/untitled/bar.html');
-
-		model.add(file1);
-		model.add(file2);
-		model.add(untitled);
-
-		assert.deepEqual(model.get().map(f => f.fsPath), [file1.fsPath, file2.fsPath, untitled.fsPath]);
-	});
+
+	suite('BackupFilesModel', () => {
+
+		test('simple', () => {
+			const model = new BackupFilesModel(service.fileService);
+
+			const resource1 = URI.file('test.html');
+
+			assert.strictEqual(model.has(resource1), false);
+
+			model.add(resource1);
+
+			assert.strictEqual(model.has(resource1), true);
+			assert.strictEqual(model.has(resource1, 0), true);
+			assert.strictEqual(model.has(resource1, 1), false);
+			assert.strictEqual(model.has(resource1, 1, { foo: 'bar' }), false);
+
+			model.remove(resource1);
+
+			assert.strictEqual(model.has(resource1), false);
+
+			model.add(resource1);
+
+			assert.strictEqual(model.has(resource1), true);
+			assert.strictEqual(model.has(resource1, 0), true);
+			assert.strictEqual(model.has(resource1, 1), false);
+
+			model.clear();
+
+			assert.strictEqual(model.has(resource1), false);
+
+			model.add(resource1, 1);
+
+			assert.strictEqual(model.has(resource1), true);
+			assert.strictEqual(model.has(resource1, 0), false);
+			assert.strictEqual(model.has(resource1, 1), true);
+
+			const resource2 = URI.file('test1.html');
+			const resource3 = URI.file('test2.html');
+			const resource4 = URI.file('test3.html');
+
+			model.add(resource2);
+			model.add(resource3);
+			model.add(resource4, undefined, { foo: 'bar' });
+
+			assert.strictEqual(model.has(resource1), true);
+			assert.strictEqual(model.has(resource2), true);
+			assert.strictEqual(model.has(resource3), true);
+
+			assert.strictEqual(model.has(resource4), true);
+			assert.strictEqual(model.has(resource4, undefined, { foo: 'bar' }), true);
+			assert.strictEqual(model.has(resource4, undefined, { bar: 'foo' }), false);
+		});
+
+		test('resolve', async () => {
+			await pfs.mkdirp(path.dirname(fooBackupPath));
+			fs.writeFileSync(fooBackupPath, 'foo');
+			const model = new BackupFilesModel(service.fileService);
+
+			const resolvedModel = await model.resolve(URI.file(workspaceBackupPath));
+			assert.strictEqual(resolvedModel.has(URI.file(fooBackupPath)), true);
+		});
+
+		test('get', () => {
+			const model = new BackupFilesModel(service.fileService);
+
+			assert.deepStrictEqual(model.get(), []);
+
+			const file1 = URI.file('/root/file/foo.html');
+			const file2 = URI.file('/root/file/bar.html');
+			const untitled = URI.file('/root/untitled/bar.html');
+
+			model.add(file1);
+			model.add(file2);
+			model.add(untitled);
+
+			assert.deepStrictEqual(model.get().map(f => f.fsPath), [file1.fsPath, file2.fsPath, untitled.fsPath]);
+		});
+	});
+
 });
diff --git a/src/vs/workbench/services/clipboard/browser/clipboardService.ts b/src/vs/workbench/services/clipboard/browser/clipboardService.ts
index cd3e76e7c..7475c744b 100644
--- a/src/vs/workbench/services/clipboard/browser/clipboardService.ts
+++ b/src/vs/workbench/services/clipboard/browser/clipboardService.ts
@@ -3,8 +3,65 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from 'vs/nls';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
+import { BrowserClipboardService as BaseBrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { once } from 'vs/base/common/functional';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+
+export class BrowserClipboardService extends BaseBrowserClipboardService {
+
+	constructor(
+		@INotificationService private readonly notificationService: INotificationService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
+	) {
+		super();
+	}
+
+	async readText(type?: string): Promise<string> {
+		if (type) {
+			return super.readText(type);
+		}
+
+		try {
+			return await navigator.clipboard.readText();
+		} catch (error) {
+			if (!!this.environmentService.extensionTestsLocationURI) {
+				return ''; // do not ask for input in tests (https://github.com/microsoft/vscode/issues/112264)
+			}
+
+			return new Promise<string>(resolve => {
+
+				// Inform user about permissions problem (https://github.com/microsoft/vscode/issues/112089)
+				const listener = new DisposableStore();
+				const handle = this.notificationService.prompt(
+					Severity.Error,
+					localize('clipboardError', "Unable to read from the browser's clipboard. Please make sure you have granted access for this website to read from the clipboard."),
+					[{
+						label: localize('retry', "Retry"),
+						run: async () => {
+							listener.dispose();
+							resolve(await this.readText(type));
+						}
+					}, {
+						label: localize('learnMore', "Learn More"),
+						run: () => this.openerService.open('https://go.microsoft.com/fwlink/?linkid=2151362')
+					}],
+					{
+						sticky: true
+					}
+				);
+
+				// Always resolve the promise once the notification closes
+				listener.add(once(handle.onDidClose)(() => resolve('')));
+			});
+		}
+	}
+}
 
 registerSingleton(IClipboardService, BrowserClipboardService, true);
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index 973ef52ff..04f37bd3a 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as errors from 'vs/base/common/errors';
-import { Disposable, IDisposable, dispose, toDisposable, MutableDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, dispose, toDisposable, MutableDisposable, combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { FileChangeType, FileChangesEvent, IFileService, whenProviderRegistered, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { ConfigurationModel, ConfigurationModelParser, UserSettings } from 'vs/platform/configuration/common/configurationModels';
@@ -22,6 +21,7 @@ import { equals } from 'vs/base/common/objects';
 import { IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { hash } from 'vs/base/common/hash';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 
 export class UserConfiguration extends Disposable {
 
@@ -36,10 +36,11 @@ export class UserConfiguration extends Disposable {
 	constructor(
 		private readonly userSettingsResource: URI,
 		private readonly scopes: ConfigurationScope[] | undefined,
-		private readonly fileService: IFileService
+		private readonly fileService: IFileService,
+		private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
-		this.userConfiguration.value = new UserSettings(this.userSettingsResource, this.scopes, this.fileService);
+		this.userConfiguration.value = new UserSettings(this.userSettingsResource, this.scopes, uriIdentityService.extUri, this.fileService);
 		this._register(this.userConfiguration.value.onDidChange(() => this.reloadConfigurationScheduler.schedule()));
 		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.reload().then(configurationModel => this._onDidChangeConfiguration.fire(configurationModel)), 50));
 	}
@@ -53,9 +54,9 @@ export class UserConfiguration extends Disposable {
 			return this.userConfiguration.value!.loadConfiguration();
 		}
 
-		const folder = resources.dirname(this.userSettingsResource);
-		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY].map(name => ([name, resources.joinPath(folder, `${name}.json`)]));
-		const fileServiceBasedConfiguration = new FileServiceBasedConfiguration(folder.toString(), [this.userSettingsResource], standAloneConfigurationResources, this.scopes, this.fileService);
+		const folder = this.uriIdentityService.extUri.dirname(this.userSettingsResource);
+		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY].map(name => ([name, this.uriIdentityService.extUri.joinPath(folder, `${name}.json`)]));
+		const fileServiceBasedConfiguration = new FileServiceBasedConfiguration(folder.toString(), [this.userSettingsResource], standAloneConfigurationResources, this.scopes, this.fileService, this.uriIdentityService);
 		const configurationModel = await fileServiceBasedConfiguration.loadConfiguration();
 		this.userConfiguration.value = fileServiceBasedConfiguration;
 
@@ -88,11 +89,12 @@ class FileServiceBasedConfiguration extends Disposable {
 		private readonly settingsResources: URI[],
 		private readonly standAloneConfigurationResources: [string, URI][],
 		private readonly scopes: ConfigurationScope[] | undefined,
-		private fileService: IFileService
+		private fileService: IFileService,
+		private uriIdentityService: IUriIdentityService
 	) {
 		super();
 		this.allResources = [...this.settingsResources, ...this.standAloneConfigurationResources.map(([, resource]) => resource)];
-		this._register(combinedDisposable(...this.allResources.map(resource => this.fileService.watch(resources.dirname(resource)))));
+		this._register(combinedDisposable(...this.allResources.map(resource => this.fileService.watch(uriIdentityService.extUri.dirname(resource)))));
 		this._folderSettingsModelParser = new ConfigurationModelParser(name, this.scopes);
 		this._standAloneConfigurations = [];
 		this._cache = new ConfigurationModel();
@@ -165,7 +167,7 @@ class FileServiceBasedConfiguration extends Disposable {
 				return true;
 			}
 			// One of the resource's parent got deleted
-			if (this.allResources.some(resource => event.contains(resources.dirname(resource), FileChangeType.DELETED))) {
+			if (this.allResources.some(resource => event.contains(this.uriIdentityService.extUri.dirname(resource), FileChangeType.DELETED))) {
 				return true;
 			}
 			return false;
@@ -187,10 +189,14 @@ export class RemoteUserConfiguration extends Disposable {
 	private readonly _onDidChangeConfiguration: Emitter<ConfigurationModel> = this._register(new Emitter<ConfigurationModel>());
 	public readonly onDidChangeConfiguration: Event<ConfigurationModel> = this._onDidChangeConfiguration.event;
 
+	private readonly _onDidInitialize = this._register(new Emitter<ConfigurationModel>());
+	public readonly onDidInitialize = this._onDidInitialize.event;
+
 	constructor(
 		remoteAuthority: string,
 		configurationCache: IConfigurationCache,
 		fileService: IFileService,
+		uriIdentityService: IUriIdentityService,
 		remoteAgentService: IRemoteAgentService
 	) {
 		super();
@@ -198,13 +204,14 @@ export class RemoteUserConfiguration extends Disposable {
 		this._userConfiguration = this._cachedConfiguration = new CachedRemoteUserConfiguration(remoteAuthority, configurationCache);
 		remoteAgentService.getEnvironment().then(async environment => {
 			if (environment) {
-				const userConfiguration = this._register(new FileServiceBasedRemoteUserConfiguration(environment.settingsPath, REMOTE_MACHINE_SCOPES, this._fileService));
+				const userConfiguration = this._register(new FileServiceBasedRemoteUserConfiguration(environment.settingsPath, REMOTE_MACHINE_SCOPES, this._fileService, uriIdentityService));
 				this._register(userConfiguration.onDidChangeConfiguration(configurationModel => this.onDidUserConfigurationChange(configurationModel)));
 				this._userConfigurationInitializationPromise = userConfiguration.initialize();
 				const configurationModel = await this._userConfigurationInitializationPromise;
 				this._userConfiguration.dispose();
 				this._userConfiguration = userConfiguration;
 				this.onDidUserConfigurationChange(configurationModel);
+				this._onDidInitialize.fire(configurationModel);
 			}
 		});
 	}
@@ -256,7 +263,8 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	constructor(
 		private readonly configurationResource: URI,
 		private readonly scopes: ConfigurationScope[] | undefined,
-		private readonly fileService: IFileService
+		private readonly fileService: IFileService,
+		private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
 
@@ -279,7 +287,7 @@ class FileServiceBasedRemoteUserConfiguration extends Disposable {
 	}
 
 	private watchDirectory(): void {
-		const directory = resources.dirname(this.configurationResource);
+		const directory = this.uriIdentityService.extUri.dirname(this.configurationResource);
 		this.directoryWatcherDisposable = this.fileService.watch(directory);
 	}
 
@@ -389,8 +397,8 @@ export class WorkspaceConfiguration extends Disposable {
 
 	private readonly _fileService: IFileService;
 	private readonly _cachedConfiguration: CachedWorkspaceConfiguration;
-	private _workspaceConfiguration: IWorkspaceConfiguration;
-	private _workspaceConfigurationChangeDisposable: IDisposable = Disposable.None;
+	private _workspaceConfiguration: CachedWorkspaceConfiguration | FileServiceBasedWorkspaceConfiguration;
+	private _workspaceConfigurationDisposables = this._register(new DisposableStore());
 	private _workspaceIdentifier: IWorkspaceIdentifier | null = null;
 
 	private readonly _onDidUpdateConfiguration: Emitter<void> = this._register(new Emitter<void>());
@@ -458,10 +466,9 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 
 	private doInitialize(fileServiceBasedWorkspaceConfiguration: FileServiceBasedWorkspaceConfiguration): void {
-		this._workspaceConfiguration.dispose();
-		this._workspaceConfigurationChangeDisposable.dispose();
-		this._workspaceConfiguration = this._register(fileServiceBasedWorkspaceConfiguration);
-		this._workspaceConfigurationChangeDisposable = this._register(this._workspaceConfiguration.onDidChange(e => this.onDidWorkspaceConfigurationChange(true)));
+		this._workspaceConfigurationDisposables.clear();
+		this._workspaceConfiguration = this._workspaceConfigurationDisposables.add(fileServiceBasedWorkspaceConfiguration);
+		this._workspaceConfigurationDisposables.add(this._workspaceConfiguration.onDidChange(e => this.onDidWorkspaceConfigurationChange(true)));
 		this._initialized = true;
 	}
 
@@ -482,19 +489,7 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 }
 
-interface IWorkspaceConfiguration extends IDisposable {
-	readonly onDidChange: Event<void>;
-	workspaceConfigurationModelParser: WorkspaceConfigurationModelParser;
-	workspaceSettings: ConfigurationModel;
-	workspaceIdentifier: IWorkspaceIdentifier | null;
-	load(workspaceIdentifier: IWorkspaceIdentifier): Promise<void>;
-	getConfigurationModel(): ConfigurationModel;
-	getFolders(): IStoredWorkspaceFolder[];
-	getWorkspaceSettings(): ConfigurationModel;
-	reprocessWorkspaceSettings(): ConfigurationModel;
-}
-
-class FileServiceBasedWorkspaceConfiguration extends Disposable implements IWorkspaceConfiguration {
+class FileServiceBasedWorkspaceConfiguration extends Disposable {
 
 	workspaceConfigurationModelParser: WorkspaceConfigurationModelParser;
 	workspaceSettings: ConfigurationModel;
@@ -578,16 +573,14 @@ class FileServiceBasedWorkspaceConfiguration extends Disposable implements IWork
 	}
 }
 
-class CachedWorkspaceConfiguration extends Disposable implements IWorkspaceConfiguration {
+class CachedWorkspaceConfiguration {
 
-	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
-	readonly onDidChange: Event<void> = this._onDidChange.event;
+	readonly onDidChange: Event<void> = Event.None;
 
 	workspaceConfigurationModelParser: WorkspaceConfigurationModelParser;
 	workspaceSettings: ConfigurationModel;
 
 	constructor(private readonly configurationCache: IConfigurationCache) {
-		super();
 		this.workspaceConfigurationModelParser = new WorkspaceConfigurationModelParser('');
 		this.workspaceSettings = new ConfigurationModel();
 	}
@@ -643,16 +636,9 @@ class CachedWorkspaceConfiguration extends Disposable implements IWorkspaceConfi
 	}
 }
 
-export interface IFolderConfiguration extends IDisposable {
-	readonly onDidChange: Event<void>;
-	loadConfiguration(): Promise<ConfigurationModel>;
-	reprocess(): ConfigurationModel;
-}
+class CachedFolderConfiguration {
 
-class CachedFolderConfiguration extends Disposable implements IFolderConfiguration {
-
-	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
-	readonly onDidChange: Event<void> = this._onDidChange.event;
+	readonly onDidChange = Event.None;
 
 	private configurationModel: ConfigurationModel;
 	private readonly key: ConfigurationKey;
@@ -662,7 +648,6 @@ class CachedFolderConfiguration extends Disposable implements IFolderConfigurati
 		configFolderRelativePath: string,
 		private readonly configurationCache: IConfigurationCache
 	) {
-		super();
 		this.key = { type: 'folder', key: hash(join(folder.path, configFolderRelativePath)).toString(16) };
 		this.configurationModel = new ConfigurationModel();
 	}
@@ -694,13 +679,12 @@ class CachedFolderConfiguration extends Disposable implements IFolderConfigurati
 	}
 }
 
-export class FolderConfiguration extends Disposable implements IFolderConfiguration {
+export class FolderConfiguration extends Disposable {
 
 	protected readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	private folderConfiguration: IFolderConfiguration;
-	private folderConfigurationDisposable: IDisposable = Disposable.None;
+	private folderConfiguration: CachedFolderConfiguration | FileServiceBasedConfiguration;
 	private readonly configurationFolder: URI;
 	private cachedFolderConfiguration: CachedFolderConfiguration;
 
@@ -709,25 +693,24 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		configFolderRelativePath: string,
 		private readonly workbenchState: WorkbenchState,
 		fileService: IFileService,
+		uriIdentityService: IUriIdentityService,
 		private readonly configurationCache: IConfigurationCache
 	) {
 		super();
 
-		this.configurationFolder = resources.joinPath(workspaceFolder.uri, configFolderRelativePath);
+		this.configurationFolder = uriIdentityService.extUri.joinPath(workspaceFolder.uri, configFolderRelativePath);
 		this.cachedFolderConfiguration = new CachedFolderConfiguration(workspaceFolder.uri, configFolderRelativePath, configurationCache);
 		if (this.configurationCache.needsCaching(workspaceFolder.uri)) {
 			this.folderConfiguration = this.cachedFolderConfiguration;
 			whenProviderRegistered(workspaceFolder.uri, fileService)
 				.then(() => {
-					this.folderConfiguration.dispose();
-					this.folderConfigurationDisposable.dispose();
-					this.folderConfiguration = this.createFileServiceBasedConfiguration(fileService);
+					this.folderConfiguration = this._register(this.createFileServiceBasedConfiguration(fileService, uriIdentityService));
 					this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
 					this.onDidFolderConfigurationChange();
 				});
 		} else {
-			this.folderConfiguration = this.createFileServiceBasedConfiguration(fileService);
-			this.folderConfigurationDisposable = this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
+			this.folderConfiguration = this._register(this.createFileServiceBasedConfiguration(fileService, uriIdentityService));
+			this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
 		}
 	}
 
@@ -744,10 +727,10 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
 		this._onDidChange.fire();
 	}
 
-	private createFileServiceBasedConfiguration(fileService: IFileService) {
-		const settingsResources = [resources.joinPath(this.configurationFolder, `${FOLDER_SETTINGS_NAME}.json`)];
-		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY].map(name => ([name, resources.joinPath(this.configurationFolder, `${name}.json`)]));
-		return new FileServiceBasedConfiguration(this.configurationFolder.toString(), settingsResources, standAloneConfigurationResources, WorkbenchState.WORKSPACE === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES, fileService);
+	private createFileServiceBasedConfiguration(fileService: IFileService, uriIdentityService: IUriIdentityService) {
+		const settingsResources = [uriIdentityService.extUri.joinPath(this.configurationFolder, `${FOLDER_SETTINGS_NAME}.json`)];
+		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY].map(name => ([name, uriIdentityService.extUri.joinPath(this.configurationFolder, `${name}.json`)]));
+		return new FileServiceBasedConfiguration(this.configurationFolder.toString(), settingsResources, standAloneConfigurationResources, WorkbenchState.WORKSPACE === this.workbenchState ? FOLDER_SCOPES : WORKSPACE_SCOPES, fileService, uriIdentityService);
 	}
 
 	private updateCache(): Promise<void> {
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index 7a1b2cd45..80d5b6acd 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -10,20 +10,19 @@ import { equals } from 'vs/base/common/objects';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Queue, Barrier, runWhenIdle } from 'vs/base/common/async';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, toWorkspaceFolders, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService, Workspace as BaseWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkspaceFolder, toWorkspaceFolder, isWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationModel, DefaultConfigurationModel, ConfigurationChangeEvent, AllKeysConfigurationChangeEvent, mergeChanges } from 'vs/platform/configuration/common/configurationModels';
-import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, keyFromOverrideIdentifier, isConfigurationOverrides, IConfigurationData, IConfigurationService, IConfigurationValue, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides, keyFromOverrideIdentifier, isConfigurationOverrides, IConfigurationData, IConfigurationValue, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
 import { Configuration } from 'vs/workbench/services/configuration/common/configurationModels';
-import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
+import { FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId, IConfigurationCache, machineSettingsSchemaId, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings, machineOverridableSettings } from 'vs/platform/configuration/common/configurationRegistry';
-import { IWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IWorkspaceInitializationPayload, isSingleFolderWorkspaceInitializationPayload, ISingleFolderWorkspaceInitializationPayload, IEmptyWorkspaceInitializationPayload, useSlashForPath, getStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
+import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings, machineOverridableSettings, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { IWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, IWorkspaceInitializationPayload, IEmptyWorkspaceInitializationPayload, useSlashForPath, getStoredWorkspaceFolder, isSingleFolderWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ConfigurationEditingService, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditingService';
 import { WorkspaceConfiguration, FolderConfiguration, RemoteUserConfiguration, UserConfiguration } from 'vs/workbench/services/configuration/browser/configuration';
 import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { isEqual, dirname } from 'vs/base/common/resources';
 import { mark } from 'vs/base/common/performance';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IFileService } from 'vs/platform/files/common/files';
@@ -38,11 +37,12 @@ class Workspace extends BaseWorkspace {
 	initialized: boolean = false;
 }
 
-export class WorkspaceService extends Disposable implements IConfigurationService, IWorkspaceContextService {
+export class WorkspaceService extends Disposable implements IWorkbenchConfigurationService, IWorkspaceContextService {
 
 	public _serviceBrand: undefined;
 
 	private workspace!: Workspace;
+	private initRemoteUserConfigurationBarrier: Barrier;
 	private completeWorkspaceBarrier: Barrier;
 	private readonly configurationCache: IConfigurationCache;
 	private _configuration: Configuration;
@@ -70,6 +70,8 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	protected readonly _onDidChangeWorkbenchState: Emitter<WorkbenchState> = this._register(new Emitter<WorkbenchState>());
 	public readonly onDidChangeWorkbenchState: Event<WorkbenchState> = this._onDidChangeWorkbenchState.event;
 
+	private readonly configurationRegistry: IConfigurationRegistry;
+
 	// TODO@sandeep debt with cyclic dependencies
 	private configurationEditingService!: ConfigurationEditingService;
 	private jsonEditingService!: JSONEditingService;
@@ -86,13 +88,14 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	) {
 		super();
 
-		const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
+		this.configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 		// register defaults before creating default configuration model
 		// so that the model is not required to be updated after registering
 		if (environmentService.options?.configurationDefaults) {
-			configurationRegistry.registerDefaultConfigurations([environmentService.options.configurationDefaults]);
+			this.configurationRegistry.registerDefaultConfigurations([environmentService.options.configurationDefaults]);
 		}
 
+		this.initRemoteUserConfigurationBarrier = new Barrier();
 		this.completeWorkspaceBarrier = new Barrier();
 		this.defaultConfiguration = new DefaultConfigurationModel();
 		this.configurationCache = configurationCache;
@@ -101,12 +104,19 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		this.logService = logService;
 		this._configuration = new Configuration(this.defaultConfiguration, new ConfigurationModel(), new ConfigurationModel(), new ConfigurationModel(), new ResourceMap(), new ConfigurationModel(), new ResourceMap<ConfigurationModel>(), this.workspace);
 		this.cachedFolderConfigs = new ResourceMap<FolderConfiguration>();
-		this.localUserConfiguration = this._register(new UserConfiguration(environmentService.settingsResource, remoteAuthority ? LOCAL_MACHINE_SCOPES : undefined, fileService));
+		this.localUserConfiguration = this._register(new UserConfiguration(environmentService.settingsResource, remoteAuthority ? LOCAL_MACHINE_SCOPES : undefined, fileService, uriIdentityService));
 		this._register(this.localUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onLocalUserConfigurationChanged(userConfiguration)));
 		if (remoteAuthority) {
-			this.remoteUserConfiguration = this._register(new RemoteUserConfiguration(remoteAuthority, configurationCache, fileService, remoteAgentService));
-			this._register(this.remoteUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onRemoteUserConfigurationChanged(userConfiguration)));
+			const remoteUserConfiguration = this.remoteUserConfiguration = this._register(new RemoteUserConfiguration(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService));
+			this._register(remoteUserConfiguration.onDidInitialize(remoteUserConfigurationModel => {
+				this._register(remoteUserConfiguration.onDidChangeConfiguration(remoteUserConfigurationModel => this.onRemoteUserConfigurationChanged(remoteUserConfigurationModel)));
+				this.onRemoteUserConfigurationChanged(remoteUserConfigurationModel);
+				this.initRemoteUserConfigurationBarrier.open();
+			}));
+		} else {
+			this.initRemoteUserConfigurationBarrier.open();
 		}
+
 		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => {
 			this.onWorkspaceConfigurationChanged().then(() => {
@@ -115,7 +125,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 			});
 		}));
 
-		this._register(configurationRegistry.onDidUpdateConfiguration(configurationProperties => this.onDefaultConfigurationChanged(configurationProperties)));
+		this._register(this.configurationRegistry.onDidUpdateConfiguration(configurationProperties => this.onDefaultConfigurationChanged(configurationProperties)));
 
 		this.workspaceEditingQueue = new Queue<void>();
 	}
@@ -167,12 +177,19 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		return !!this.getWorkspaceFolder(resource);
 	}
 
-	public isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean {
+	public isCurrentWorkspace(workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean {
 		switch (this.getWorkbenchState()) {
 			case WorkbenchState.FOLDER:
-				return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && isEqual(workspaceIdentifier, this.workspace.folders[0].uri);
+				let folderUri: URI | undefined = undefined;
+				if (URI.isUri(workspaceIdOrFolder)) {
+					folderUri = workspaceIdOrFolder;
+				} else if (isSingleFolderWorkspaceIdentifier(workspaceIdOrFolder)) {
+					folderUri = workspaceIdOrFolder.uri;
+				}
+
+				return URI.isUri(folderUri) && this.uriIdentityService.extUri.isEqual(folderUri, this.workspace.folders[0].uri);
 			case WorkbenchState.WORKSPACE:
-				return isWorkspaceIdentifier(workspaceIdentifier) && this.workspace.id === workspaceIdentifier.id;
+				return isWorkspaceIdentifier(workspaceIdOrFolder) && this.workspace.id === workspaceIdOrFolder.id;
 		}
 		return false;
 	}
@@ -207,8 +224,8 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 
 			// Recompute current workspace folders if we have folders to add
 			const workspaceConfigPath = this.getWorkspace().configuration!;
-			const workspaceConfigFolder = dirname(workspaceConfigPath);
-			currentWorkspaceFolders = toWorkspaceFolders(newStoredFolders, workspaceConfigPath);
+			const workspaceConfigFolder = this.uriIdentityService.extUri.dirname(workspaceConfigPath);
+			currentWorkspaceFolders = toWorkspaceFolders(newStoredFolders, workspaceConfigPath, this.uriIdentityService.extUri);
 			const currentWorkspaceFolderUris = currentWorkspaceFolders.map(folder => folder.uri);
 
 			const storedFoldersToAdd: IStoredWorkspaceFolder[] = [];
@@ -224,7 +241,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 						continue;
 					}
 				} catch (e) { /* Ignore */ }
-				storedFoldersToAdd.push(getStoredWorkspaceFolder(folderURI, false, folderToAdd.name, workspaceConfigFolder, slashForPath));
+				storedFoldersToAdd.push(getStoredWorkspaceFolder(folderURI, false, folderToAdd.name, workspaceConfigFolder, slashForPath, this.uriIdentityService.extUri));
 			}
 
 			// Apply to array of newStoredFolders
@@ -256,7 +273,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	}
 
 	private contains(resources: URI[], toCheck: URI): boolean {
-		return resources.some(resource => isEqual(resource, toCheck));
+		return resources.some(resource => this.uriIdentityService.extUri.isEqual(resource, toCheck));
 	}
 
 	// Workspace Configuration Service Impl
@@ -280,13 +297,23 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
 	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget): Promise<void>;
 	updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError: boolean): Promise<void>;
-	updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void> {
-		return this.cyclicDependency.then(() => {
-			const overrides = isConfigurationOverrides(arg3) ? arg3 : undefined;
-			const target = this.deriveConfigurationTarget(key, value, overrides, overrides ? arg4 : arg3);
-			return target ? this.writeConfigurationValue(key, value, target, overrides, donotNotifyError)
-				: Promise.resolve();
-		});
+	async updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void> {
+		await this.cyclicDependency;
+		const overrides = isConfigurationOverrides(arg3) ? arg3 : undefined;
+		const target: ConfigurationTarget | undefined = overrides ? arg4 : arg3;
+		const targets: ConfigurationTarget[] = target ? [target] : [];
+
+		if (!targets.length) {
+			const inspect = this.inspect(key, overrides);
+			targets.push(...this.deriveConfigurationTargets(key, value, inspect));
+
+			// Remove the setting, if the value is same as default value and is updated only in user target
+			if (equals(value, inspect.defaultValue) && targets.length === 1 && (targets[0] === ConfigurationTarget.USER || targets[0] === ConfigurationTarget.USER_LOCAL)) {
+				value = undefined;
+			}
+		}
+
+		await Promise.all(targets.map(target => this.writeConfigurationValue(key, value, target, overrides, donotNotifyError)));
 	}
 
 	async reloadConfiguration(target?: ConfigurationTarget | IWorkspaceFolder): Promise<void> {
@@ -297,7 +324,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 			return;
 		}
 
-		if (IWorkspaceFolder.isIWorkspaceFolder(target)) {
+		if (isWorkspaceFolder(target)) {
 			await this.reloadWorkspaceFolderConfiguration(target);
 			return;
 		}
@@ -336,14 +363,18 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		return this._configuration.keys();
 	}
 
+	public async whenRemoteConfigurationLoaded(): Promise<void> {
+		await this.initRemoteUserConfigurationBarrier.wait();
+	}
+
 	async initialize(arg: IWorkspaceInitializationPayload): Promise<void> {
-		mark('willInitWorkspaceService');
+		mark('code/willInitWorkspaceService');
 
 		const workspace = await this.createWorkspace(arg);
 		await this.updateWorkspaceAndInitializeConfiguration(workspace);
 		this.checkAndMarkWorkspaceComplete();
 
-		mark('didInitWorkspaceService');
+		mark('code/didInitWorkspaceService');
 	}
 
 	acquireInstantiationService(instantiationService: IInstantiationService): void {
@@ -362,7 +393,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 			return this.createMultiFolderWorkspace(arg);
 		}
 
-		if (isSingleFolderWorkspaceInitializationPayload(arg)) {
+		if (isSingleFolderWorkspaceIdentifier(arg)) {
 			return this.createSingleFolderWorkspace(arg);
 		}
 
@@ -373,7 +404,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		return this.workspaceConfiguration.initialize({ id: workspaceIdentifier.id, configPath: workspaceIdentifier.configPath })
 			.then(() => {
 				const workspaceConfigPath = workspaceIdentifier.configPath;
-				const workspaceFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), workspaceConfigPath);
+				const workspaceFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), workspaceConfigPath, this.uriIdentityService.extUri);
 				const workspaceId = workspaceIdentifier.id;
 				const workspace = new Workspace(workspaceId, workspaceFolders, workspaceConfigPath, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
 				workspace.initialized = this.workspaceConfiguration.initialized;
@@ -381,14 +412,14 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 			});
 	}
 
-	private createSingleFolderWorkspace(singleFolder: ISingleFolderWorkspaceInitializationPayload): Promise<Workspace> {
-		const workspace = new Workspace(singleFolder.id, [toWorkspaceFolder(singleFolder.folder)], null, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
+	private createSingleFolderWorkspace(singleFolderWorkspaceIdentifier: ISingleFolderWorkspaceIdentifier): Promise<Workspace> {
+		const workspace = new Workspace(singleFolderWorkspaceIdentifier.id, [toWorkspaceFolder(singleFolderWorkspaceIdentifier.uri)], null, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
 		workspace.initialized = true;
 		return Promise.resolve(workspace);
 	}
 
-	private createEmptyWorkspace(emptyWorkspace: IEmptyWorkspaceInitializationPayload): Promise<Workspace> {
-		const workspace = new Workspace(emptyWorkspace.id, [], null, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
+	private createEmptyWorkspace(emptyWorkspacePayload: IEmptyWorkspaceInitializationPayload): Promise<Workspace> {
+		const workspace = new Workspace(emptyWorkspacePayload.id, [], null, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
 		workspace.initialized = true;
 		return Promise.resolve(workspace);
 	}
@@ -438,7 +469,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 
 			if (!this.localUserConfiguration.hasTasksLoaded) {
 				// Reload local user configuration again to load user tasks
-				runWhenIdle(() => this.reloadLocalUserConfiguration(), 5000);
+				this._register(runWhenIdle(() => this.reloadLocalUserConfiguration(), 5000));
 			}
 		});
 	}
@@ -587,7 +618,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 
 	private async onWorkspaceConfigurationChanged(): Promise<void> {
 		if (this.workspace && this.workspace.configuration) {
-			let newFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), this.workspace.configuration);
+			let newFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), this.workspace.configuration, this.uriIdentityService.extUri);
 
 			// Validate only if workspace is initialized
 			if (this.workspace.initialized) {
@@ -662,7 +693,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		return Promise.all([...folders.map(folder => {
 			let folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
 			if (!folderConfiguration) {
-				folderConfiguration = new FolderConfiguration(folder, FOLDER_CONFIG_FOLDER_NAME, this.getWorkbenchState(), this.fileService, this.configurationCache);
+				folderConfiguration = new FolderConfiguration(folder, FOLDER_CONFIG_FOLDER_NAME, this.getWorkbenchState(), this.fileService, this.uriIdentityService, this.configurationCache);
 				this._register(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
 				this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
 			}
@@ -736,31 +767,31 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 			});
 	}
 
-	private deriveConfigurationTarget(key: string, value: any, overrides: IConfigurationOverrides | undefined, target: ConfigurationTarget): ConfigurationTarget | undefined {
-		if (target) {
-			return target;
+	private deriveConfigurationTargets(key: string, value: any, inspect: IConfigurationValue<any>): ConfigurationTarget[] {
+		if (equals(value, inspect.value)) {
+			return [];
+		}
+
+		const definedTargets: ConfigurationTarget[] = [];
+		if (inspect.workspaceFolderValue !== undefined) {
+			definedTargets.push(ConfigurationTarget.WORKSPACE_FOLDER);
+		}
+		if (inspect.workspaceValue !== undefined) {
+			definedTargets.push(ConfigurationTarget.WORKSPACE);
+		}
+		if (inspect.userRemoteValue !== undefined) {
+			definedTargets.push(ConfigurationTarget.USER_REMOTE);
+		}
+		if (inspect.userLocalValue !== undefined) {
+			definedTargets.push(ConfigurationTarget.USER_LOCAL);
 		}
 
 		if (value === undefined) {
-			// Ignore. But expected is to remove the value from all targets
-			return undefined;
+			// Remove the setting in all defined targets
+			return definedTargets;
 		}
 
-		const inspect = this.inspect(key, overrides);
-		if (equals(value, inspect.value)) {
-			// No change. So ignore.
-			return undefined;
-		}
-
-		if (inspect.workspaceFolderValue !== undefined) {
-			return ConfigurationTarget.WORKSPACE_FOLDER;
-		}
-
-		if (inspect.workspaceValue !== undefined) {
-			return ConfigurationTarget.WORKSPACE;
-		}
-
-		return ConfigurationTarget.USER;
+		return [definedTargets[0] || ConfigurationTarget.USER];
 	}
 
 	private triggerConfigurationChange(change: IConfigurationChange, previous: { data: IConfigurationData, workspace?: Workspace } | undefined, target: ConfigurationTarget): void {
@@ -786,8 +817,14 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 
 	private toEditableConfigurationTarget(target: ConfigurationTarget, key: string): EditableConfigurationTarget | null {
 		if (target === ConfigurationTarget.USER) {
-			if (this.inspect(key).userRemoteValue !== undefined) {
-				return EditableConfigurationTarget.USER_REMOTE;
+			if (this.remoteUserConfiguration) {
+				const scope = this.configurationRegistry.getConfigurationProperties()[key]?.scope;
+				if (scope === ConfigurationScope.MACHINE || scope === ConfigurationScope.MACHINE_OVERRIDABLE) {
+					return EditableConfigurationTarget.USER_REMOTE;
+				}
+				if (this.inspect(key).userRemoteValue !== undefined) {
+					return EditableConfigurationTarget.USER_REMOTE;
+				}
 			}
 			return EditableConfigurationTarget.USER_LOCAL;
 		}
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index edec7c003..e54d141f4 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -5,6 +5,8 @@
 
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { URI } from 'vs/base/common/uri';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 export const FOLDER_CONFIG_FOLDER_NAME = '.vscode';
 export const FOLDER_SETTINGS_NAME = 'settings';
@@ -43,4 +45,13 @@ export interface IConfigurationCache {
 
 }
 
+export const IWorkbenchConfigurationService = createDecorator<IWorkbenchConfigurationService>('configurationService');
+export interface IWorkbenchConfigurationService extends IConfigurationService {
+	/**
+	 * A promise that resolves when the remote configuration is loaded in a remote window.
+	 * The promise is resolved immediately if the window is not remote.
+	 */
+	whenRemoteConfigurationLoaded(): Promise<void>;
+}
+
 export const TASKS_DEFAULT = '{\n\t\"version\": \"2.0.0\",\n\t\"tasks\": []\n}';
diff --git a/src/vs/workbench/services/configuration/common/configurationEditingService.ts b/src/vs/workbench/services/configuration/common/configurationEditingService.ts
index 71256640c..7c859c5be 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditingService.ts
@@ -5,7 +5,6 @@
 
 import * as nls from 'vs/nls';
 import { URI } from 'vs/base/common/uri';
-import * as resources from 'vs/base/common/resources';
 import * as json from 'vs/base/common/json';
 import { setProperty } from 'vs/base/common/jsonEdit';
 import { Queue } from 'vs/base/common/async';
@@ -29,6 +28,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { withUndefinedAsNull, withNullAsUndefined } from 'vs/base/common/types';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 
 export const enum ConfigurationEditingErrorCode {
 
@@ -155,7 +155,8 @@ export class ConfigurationEditingService {
 		@INotificationService private readonly notificationService: INotificationService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IRemoteAgentService remoteAgentService: IRemoteAgentService
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 		this.queue = new Queue<void>();
 		remoteAgentService.getEnvironment().then(environment => {
@@ -437,8 +438,8 @@ export class ConfigurationEditingService {
 	}
 
 	private defaultResourceValue(resource: URI): string {
-		const basename: string = resources.basename(resource);
-		const configurationValue: string = basename.substr(0, basename.length - resources.extname(resource).length);
+		const basename: string = this.uriIdentityService.extUri.basename(resource);
+		const configurationValue: string = basename.substr(0, basename.length - this.uriIdentityService.extUri.extname(resource).length);
 		switch (configurationValue) {
 			case TASKS_CONFIGURATION_KEY: return TASKS_DEFAULT;
 			default: return '{}';
@@ -585,7 +586,7 @@ export class ConfigurationEditingService {
 	private getConfigurationFileResource(target: EditableConfigurationTarget, relativePath: string, resource: URI | null | undefined): URI | null {
 		if (target === EditableConfigurationTarget.USER_LOCAL) {
 			if (relativePath) {
-				return resources.joinPath(resources.dirname(this.environmentService.settingsResource), relativePath);
+				return this.uriIdentityService.extUri.joinPath(this.uriIdentityService.extUri.dirname(this.environmentService.settingsResource), relativePath);
 			} else {
 				return this.environmentService.settingsResource;
 			}
diff --git a/src/vs/workbench/services/configuration/electron-browser/configurationCache.ts b/src/vs/workbench/services/configuration/electron-sandbox/configurationCache.ts
similarity index 54%
rename from src/vs/workbench/services/configuration/electron-browser/configurationCache.ts
rename to src/vs/workbench/services/configuration/electron-sandbox/configurationCache.ts
index 970ef48c7..e69c35e0c 100644
--- a/src/vs/workbench/services/configuration/electron-browser/configurationCache.ts
+++ b/src/vs/workbench/services/configuration/electron-sandbox/configurationCache.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as pfs from 'vs/base/node/pfs';
-import { join } from 'vs/base/common/path';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { IConfigurationCache, ConfigurationKey } from 'vs/workbench/services/configuration/common/configuration';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
+import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
+import { joinPath } from 'vs/base/common/resources';
+import { VSBuffer } from 'vs/base/common/buffer';
 
 export class ConfigurationCache implements IConfigurationCache {
 
 	private readonly cachedConfigurations: Map<string, CachedConfiguration> = new Map<string, CachedConfiguration>();
 
-	constructor(private readonly environmentService: INativeWorkbenchEnvironmentService) {
+	constructor(private readonly cacheHome: URI, private readonly fileService: IFileService) {
 	}
 
 	needsCaching(resource: URI): boolean {
@@ -38,32 +38,31 @@ export class ConfigurationCache implements IConfigurationCache {
 		const k = `${type}:${key}`;
 		let cachedConfiguration = this.cachedConfigurations.get(k);
 		if (!cachedConfiguration) {
-			cachedConfiguration = new CachedConfiguration({ type, key }, this.environmentService);
+			cachedConfiguration = new CachedConfiguration({ type, key }, this.cacheHome, this.fileService);
 			this.cachedConfigurations.set(k, cachedConfiguration);
 		}
 		return cachedConfiguration;
 	}
-
 }
 
-
 class CachedConfiguration {
 
-	private cachedConfigurationFolderPath: string;
-	private cachedConfigurationFilePath: string;
+	private cachedConfigurationFolderResource: URI;
+	private cachedConfigurationFileResource: URI;
 
 	constructor(
 		{ type, key }: ConfigurationKey,
-		environmentService: INativeWorkbenchEnvironmentService
+		cacheHome: URI,
+		private readonly fileService: IFileService
 	) {
-		this.cachedConfigurationFolderPath = join(environmentService.userDataPath, 'CachedConfigurations', type, key);
-		this.cachedConfigurationFilePath = join(this.cachedConfigurationFolderPath, type === 'workspaces' ? 'workspace.json' : 'configuration.json');
+		this.cachedConfigurationFolderResource = joinPath(cacheHome, 'CachedConfigurations', type, key);
+		this.cachedConfigurationFileResource = joinPath(this.cachedConfigurationFolderResource, type === 'workspaces' ? 'workspace.json' : 'configuration.json');
 	}
 
 	async read(): Promise<string> {
 		try {
-			const content = await pfs.readFile(this.cachedConfigurationFilePath);
-			return content.toString();
+			const content = await this.fileService.readFile(this.cachedConfigurationFileResource);
+			return content.value.toString();
 		} catch (e) {
 			return '';
 		}
@@ -72,18 +71,30 @@ class CachedConfiguration {
 	async save(content: string): Promise<void> {
 		const created = await this.createCachedFolder();
 		if (created) {
-			await pfs.writeFile(this.cachedConfigurationFilePath, content);
+			await this.fileService.writeFile(this.cachedConfigurationFileResource, VSBuffer.fromString(content));
 		}
 	}
 
-	remove(): Promise<void> {
-		return pfs.rimraf(this.cachedConfigurationFolderPath);
+	async remove(): Promise<void> {
+		try {
+			await this.fileService.del(this.cachedConfigurationFolderResource, { recursive: true, useTrash: false });
+		} catch (error) {
+			if ((<FileOperationError>error).fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
+				throw error;
+			}
+		}
 	}
 
-	private createCachedFolder(): Promise<boolean> {
-		return Promise.resolve(pfs.exists(this.cachedConfigurationFolderPath))
-			.then(undefined, () => false)
-			.then(exists => exists ? exists : pfs.mkdirp(this.cachedConfigurationFolderPath).then(() => true, () => false));
+	private async createCachedFolder(): Promise<boolean> {
+		if (await this.fileService.exists(this.cachedConfigurationFolderResource)) {
+			return true;
+		}
+		try {
+			await this.fileService.createFolder(this.cachedConfigurationFolderResource);
+			return true;
+		} catch (error) {
+			return false;
+		}
 	}
 }
 
diff --git a/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts
new file mode 100644
index 000000000..0f4946806
--- /dev/null
+++ b/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts
@@ -0,0 +1,395 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as sinon from 'sinon';
+import * as assert from 'assert';
+import * as json from 'vs/base/common/json';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { TestEnvironmentService, TestTextFileService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import * as uuid from 'vs/base/common/uuid';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
+import { ConfigurationEditingService, ConfigurationEditingErrorCode, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditingService';
+import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, USER_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { CommandService } from 'vs/workbench/services/commands/common/commandService';
+import { URI } from 'vs/base/common/uri';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { Schemas } from 'vs/base/common/network';
+import { IFileService } from 'vs/platform/files/common/files';
+import { KeybindingsEditingService, IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
+import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
+import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { joinPath } from 'vs/base/common/resources';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { ConfigurationCache } from 'vs/workbench/services/configuration/browser/configurationCache';
+import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentServiceImpl';
+import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { getSingleFolderWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
+
+const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
+
+suite('ConfigurationEditingService', () => {
+
+	let instantiationService: TestInstantiationService;
+	let environmentService: BrowserWorkbenchEnvironmentService;
+	let fileService: IFileService;
+	let workspaceService: WorkspaceService;
+	let testObject: ConfigurationEditingService;
+
+	const disposables = new DisposableStore();
+
+	suiteSetup(() => {
+		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationEditing.service.testSetting': {
+					'type': 'string',
+					'default': 'isSet'
+				},
+				'configurationEditing.service.testSettingTwo': {
+					'type': 'string',
+					'default': 'isSet'
+				},
+				'configurationEditing.service.testSettingThree': {
+					'type': 'string',
+					'default': 'isSet'
+				}
+			}
+		});
+	});
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(ROOT.scheme, fileSystemProvider));
+
+		const workspaceFolder = joinPath(ROOT, uuid.generateUuid());
+		await fileService.createFolder(workspaceFolder);
+
+		instantiationService = <TestInstantiationService>workbenchInstantiationService(undefined, disposables);
+		environmentService = TestEnvironmentService;
+		instantiationService.stub(IEnvironmentService, environmentService);
+		const remoteAgentService = disposables.add(instantiationService.createInstance(RemoteAgentService, null));
+		disposables.add(fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, logService))));
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+		instantiationService.stub(IWorkspaceContextService, workspaceService);
+
+		await workspaceService.initialize(getSingleFolderWorkspaceIdentifier(workspaceFolder));
+		instantiationService.stub(IConfigurationService, workspaceService);
+		instantiationService.stub(IKeybindingEditingService, disposables.add(instantiationService.createInstance(KeybindingsEditingService)));
+		instantiationService.stub(ITextFileService, disposables.add(instantiationService.createInstance(TestTextFileService)));
+		instantiationService.stub(ITextModelService, <ITextModelService>disposables.add(instantiationService.createInstance(TextModelResolverService)));
+		instantiationService.stub(ICommandService, CommandService);
+		testObject = instantiationService.createInstance(ConfigurationEditingService);
+	});
+
+	teardown(() => disposables.clear());
+
+	test('errors cases - invalid key', async () => {
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'unknown.key', value: 'value' });
+			assert.fail('Should fail with ERROR_UNKNOWN_KEY');
+		} catch (error) {
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY);
+		}
+	});
+
+	test('errors cases - no workspace', async () => {
+		await workspaceService.initialize({ id: uuid.generateUuid() });
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'configurationEditing.service.testSetting', value: 'value' });
+			assert.fail('Should fail with ERROR_NO_WORKSPACE_OPENED');
+		} catch (error) {
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED);
+		}
+	});
+
+	test('errors cases - invalid configuration', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString(',,,,,,,,,,,,,,'));
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' });
+			assert.fail('Should fail with ERROR_INVALID_CONFIGURATION');
+		} catch (error) {
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION);
+		}
+	});
+
+	test('errors cases - invalid global tasks configuration', async () => {
+		const resource = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(resource, VSBuffer.fromString(',,,,,,,,,,,,,,'));
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks.configurationEditing.service.testSetting', value: 'value' });
+			assert.fail('Should fail with ERROR_INVALID_CONFIGURATION');
+		} catch (error) {
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION);
+		}
+	});
+
+	test('errors cases - dirty', async () => {
+		instantiationService.stub(ITextFileService, 'isDirty', true);
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' });
+			assert.fail('Should fail with ERROR_CONFIGURATION_FILE_DIRTY error.');
+		} catch (error) {
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY);
+		}
+	});
+
+	test('dirty error is not thrown if not asked to save', async () => {
+		instantiationService.stub(ITextFileService, 'isDirty', true);
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' }, { donotSave: true });
+	});
+
+	test('do not notify error', async () => {
+		instantiationService.stub(ITextFileService, 'isDirty', true);
+		const target = sinon.stub();
+		instantiationService.stub(INotificationService, <INotificationService>{ prompt: target, _serviceBrand: undefined, notify: null!, error: null!, info: null!, warn: null!, status: null!, setFilter: null! });
+		try {
+			await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' }, { donotNotifyError: true });
+			assert.fail('Should fail with ERROR_CONFIGURATION_FILE_DIRTY error.');
+		} catch (error) {
+			assert.equal(false, target.calledOnce);
+			assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY);
+		}
+	});
+
+	test('write one setting - empty file', async () => {
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' });
+		const contents = await fileService.readFile(environmentService.settingsResource);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
+	});
+
+	test('write one setting - existing file', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' });
+
+		const contents = await fileService.readFile(environmentService.settingsResource);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
+		assert.equal(parsed['my.super.setting'], 'my.super.value');
+	});
+
+	test('remove an existing setting - existing file', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "my.super.setting": "my.super.value", "configurationEditing.service.testSetting": "value" }'));
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: undefined });
+
+		const contents = await fileService.readFile(environmentService.settingsResource);
+		const parsed = json.parse(contents.value.toString());
+		assert.deepEqual(Object.keys(parsed), ['my.super.setting']);
+		assert.equal(parsed['my.super.setting'], 'my.super.value');
+	});
+
+	test('remove non existing setting - existing file', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: undefined });
+
+		const contents = await fileService.readFile(environmentService.settingsResource);
+		const parsed = json.parse(contents.value.toString());
+		assert.deepEqual(Object.keys(parsed), ['my.super.setting']);
+		assert.equal(parsed['my.super.setting'], 'my.super.value');
+	});
+
+	test('write overridable settings to user settings', async () => {
+		const key = '[language]';
+		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key, value });
+
+		const contents = await fileService.readFile(environmentService.settingsResource);
+		const parsed = json.parse(contents.value.toString());
+		assert.deepEqual(parsed[key], value);
+	});
+
+	test('write overridable settings to workspace settings', async () => {
+		const key = '[language]';
+		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key, value });
+
+		const contents = await fileService.readFile(joinPath(workspaceService.getWorkspace().folders[0].uri, FOLDER_SETTINGS_PATH));
+		const parsed = json.parse(contents.value.toString());
+		assert.deepEqual(parsed[key], value);
+	});
+
+	test('write overridable settings to workspace folder settings', async () => {
+		const key = '[language]';
+		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
+		const folderSettingsFile = joinPath(workspaceService.getWorkspace().folders[0].uri, FOLDER_SETTINGS_PATH);
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE_FOLDER, { key, value }, { scopes: { resource: folderSettingsFile } });
+
+		const contents = await fileService.readFile(folderSettingsFile);
+		const parsed = json.parse(contents.value.toString());
+		assert.deepEqual(parsed[key], value);
+	});
+
+	test('write workspace standalone setting - empty file', async () => {
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks.service.testSetting', value: 'value' });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['service.testSetting'], 'value');
+	});
+
+	test('write user standalone setting - empty file', async () => {
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks.service.testSetting', value: 'value' });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['service.testSetting'], 'value');
+	});
+
+	test('write workspace standalone setting - existing file', async () => {
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks.service.testSetting', value: 'value' });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['service.testSetting'], 'value');
+		assert.equal(parsed['my.super.setting'], 'my.super.value');
+	});
+
+	test('write user standalone setting - existing file', async () => {
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks.service.testSetting', value: 'value' });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['service.testSetting'], 'value');
+		assert.equal(parsed['my.super.setting'], 'my.super.value');
+	});
+
+	test('write workspace standalone setting - empty file - full JSON', async () => {
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write user standalone setting - empty file - full JSON', async () => {
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write workspace standalone setting - existing file - full JSON', async () => {
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write user standalone setting - existing file - full JSON', async () => {
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": "my.super.value" }'));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write workspace standalone setting - existing file with JSON errors - full JSON', async () => {
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": ')); // invalid JSON
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write user standalone setting - existing file with JSON errors - full JSON', async () => {
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString('{ "my.super.setting": ')); // invalid JSON
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } });
+
+		const contents = await fileService.readFile(target);
+		const parsed = json.parse(contents.value.toString());
+		assert.equal(parsed['version'], '1.0.0');
+		assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+	});
+
+	test('write workspace standalone setting should replace complete file', async () => {
+		const target = joinPath(workspaceService.getWorkspace().folders[0].uri, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString(`{
+			"version": "1.0.0",
+			"tasks": [
+				{
+					"taskName": "myTask1"
+				},
+				{
+					"taskName": "myTask2"
+				}
+			]
+		}`));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] } });
+
+		const actual = await fileService.readFile(target);
+		const expected = JSON.stringify({ 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] }, null, '\t');
+		assert.equal(actual.value.toString(), expected);
+	});
+
+	test('write user standalone setting should replace complete file', async () => {
+		const target = joinPath(environmentService.userRoamingDataHome, USER_STANDALONE_CONFIGURATIONS['tasks']);
+		await fileService.writeFile(target, VSBuffer.fromString(`{
+			"version": "1.0.0",
+			"tasks": [
+				{
+					"taskName": "myTask1"
+				},
+				{
+					"taskName": "myTask2"
+				}
+			]
+		}`));
+
+		await testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] } });
+
+		const actual = await fileService.readFile(target);
+		const expected = JSON.stringify({ 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] }, null, '\t');
+		assert.equal(actual.value.toString(), expected);
+	});
+});
diff --git a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
new file mode 100644
index 000000000..82204f97a
--- /dev/null
+++ b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
@@ -0,0 +1,1985 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import { URI } from 'vs/base/common/uri';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
+import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/common/configurationEditingService';
+import { IFileService } from 'vs/platform/files/common/files';
+import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
+import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
+import { workbenchInstantiationService, RemoteFileSystemProvider, TestProductService, TestEnvironmentService, TestTextFileService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
+import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
+import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
+import { Schemas } from 'vs/base/common/network';
+import { joinPath, dirname, basename } from 'vs/base/common/resources';
+import { isLinux } from 'vs/base/common/platform';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
+import { SignService } from 'vs/platform/sign/browser/signService';
+import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
+import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { timeout } from 'vs/base/common/async';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import product from 'vs/platform/product/common/product';
+import { Event } from 'vs/base/common/event';
+import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { ConfigurationCache as BrowserConfigurationCache } from 'vs/workbench/services/configuration/browser/configurationCache';
+import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+import { RemoteAgentService } from 'vs/workbench/services/remote/browser/remoteAgentServiceImpl';
+import { RemoteAuthorityResolverService } from 'vs/platform/remote/browser/remoteAuthorityResolverService';
+import { hash } from 'vs/base/common/hash';
+
+function convertToWorkspacePayload(folder: URI): ISingleFolderWorkspaceIdentifier {
+	return {
+		id: hash(folder.toString()).toString(16),
+		uri: folder
+	};
+}
+
+class ConfigurationCache extends BrowserConfigurationCache {
+	needsCaching() { return false; }
+}
+
+const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
+
+suite('WorkspaceContextService - Folder', () => {
+
+	let folderName = 'Folder A', folder: URI, testObject: WorkspaceService;
+	const disposables = new DisposableStore();
+
+	setup(async () => {
+		const logService = new NullLogService();
+		const fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		folder = joinPath(ROOT, folderName);
+		await fileService.createFolder(folder);
+
+		const environmentService = TestEnvironmentService;
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, new RemoteAgentService(null, environmentService, { _serviceBrand: undefined, ...product }, new RemoteAuthorityResolverService(undefined, undefined), new SignService(undefined), new NullLogService()), new UriIdentityService(fileService), new NullLogService()));
+		await (<WorkspaceService>testObject).initialize(convertToWorkspacePayload(folder));
+	});
+
+	teardown(() => disposables.clear());
+
+	test('getWorkspace()', () => {
+		const actual = testObject.getWorkspace();
+
+		assert.equal(actual.folders.length, 1);
+		assert.equal(actual.folders[0].uri.path, folder.path);
+		assert.equal(actual.folders[0].name, folderName);
+		assert.equal(actual.folders[0].index, 0);
+		assert.ok(!actual.configuration);
+	});
+
+	test('getWorkbenchState()', () => {
+		const actual = testObject.getWorkbenchState();
+
+		assert.equal(actual, WorkbenchState.FOLDER);
+	});
+
+	test('getWorkspaceFolder()', () => {
+		const actual = testObject.getWorkspaceFolder(joinPath(folder, 'a'));
+
+		assert.equal(actual, testObject.getWorkspace().folders[0]);
+	});
+
+	test('isCurrentWorkspace() => true', () => {
+		assert.ok(testObject.isCurrentWorkspace(folder));
+	});
+
+	test('isCurrentWorkspace() => false', () => {
+		assert.ok(!testObject.isCurrentWorkspace(joinPath(dirname(folder), 'abc')));
+	});
+
+	test('workspace is complete', () => testObject.getCompleteWorkspace());
+});
+
+suite('WorkspaceContextService - Workspace', () => {
+
+	let testObject: WorkspaceService;
+	const disposables = new DisposableStore();
+
+	setup(async () => {
+		const logService = new NullLogService();
+		const fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const appSettingsHome = joinPath(ROOT, 'user');
+		const folderA = joinPath(ROOT, 'a');
+		const folderB = joinPath(ROOT, 'b');
+		const configResource = joinPath(ROOT, 'vsctests.code-workspace');
+		const workspace = { folders: [{ path: folderA.path }, { path: folderB.path }] };
+
+		await fileService.createFolder(appSettingsHome);
+		await fileService.createFolder(folderA);
+		await fileService.createFolder(folderB);
+		await fileService.writeFile(configResource, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+
+		const instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		const environmentService = TestEnvironmentService;
+		const remoteAgentService = disposables.add(instantiationService.createInstance(RemoteAgentService, null));
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+
+		instantiationService.stub(IWorkspaceContextService, testObject);
+		instantiationService.stub(IConfigurationService, testObject);
+		instantiationService.stub(IEnvironmentService, environmentService);
+
+		await testObject.initialize(getWorkspaceIdentifier(configResource));
+		testObject.acquireInstantiationService(instantiationService);
+	});
+
+	teardown(() => disposables.clear());
+
+	test('workspace folders', () => {
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 2);
+		assert.equal(basename(actual[0].uri), 'a');
+		assert.equal(basename(actual[1].uri), 'b');
+	});
+
+	test('getWorkbenchState()', () => {
+		const actual = testObject.getWorkbenchState();
+
+		assert.equal(actual, WorkbenchState.WORKSPACE);
+	});
+
+
+	test('workspace is complete', () => testObject.getCompleteWorkspace());
+
+});
+
+suite('WorkspaceContextService - Workspace Editing', () => {
+
+	let testObject: WorkspaceService, fileService: IFileService;
+	const disposables = new DisposableStore();
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const appSettingsHome = joinPath(ROOT, 'user');
+		const folderA = joinPath(ROOT, 'a');
+		const folderB = joinPath(ROOT, 'b');
+		const configResource = joinPath(ROOT, 'vsctests.code-workspace');
+		const workspace = { folders: [{ path: folderA.path }, { path: folderB.path }] };
+
+		await fileService.createFolder(appSettingsHome);
+		await fileService.createFolder(folderA);
+		await fileService.createFolder(folderB);
+		await fileService.writeFile(configResource, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+
+		const instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		const environmentService = TestEnvironmentService;
+		const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IWorkspaceContextService, testObject);
+		instantiationService.stub(IConfigurationService, testObject);
+		instantiationService.stub(IEnvironmentService, environmentService);
+
+		await testObject.initialize(getWorkspaceIdentifier(configResource));
+		instantiationService.stub(ITextFileService, disposables.add(instantiationService.createInstance(TestTextFileService)));
+		instantiationService.stub(ITextModelService, disposables.add(instantiationService.createInstance(TextModelResolverService)));
+		testObject.acquireInstantiationService(instantiationService);
+	});
+
+	teardown(() => disposables.clear());
+
+	test('add folders', async () => {
+		await testObject.addFolders([{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }]);
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 4);
+		assert.equal(basename(actual[0].uri), 'a');
+		assert.equal(basename(actual[1].uri), 'b');
+		assert.equal(basename(actual[2].uri), 'd');
+		assert.equal(basename(actual[3].uri), 'c');
+	});
+
+	test('add folders (at specific index)', async () => {
+		await testObject.addFolders([{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }], 0);
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 4);
+		assert.equal(basename(actual[0].uri), 'd');
+		assert.equal(basename(actual[1].uri), 'c');
+		assert.equal(basename(actual[2].uri), 'a');
+		assert.equal(basename(actual[3].uri), 'b');
+	});
+
+	test('add folders (at specific wrong index)', async () => {
+		await testObject.addFolders([{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }], 10);
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 4);
+		assert.equal(basename(actual[0].uri), 'a');
+		assert.equal(basename(actual[1].uri), 'b');
+		assert.equal(basename(actual[2].uri), 'd');
+		assert.equal(basename(actual[3].uri), 'c');
+	});
+
+	test('add folders (with name)', async () => {
+		await testObject.addFolders([{ uri: joinPath(ROOT, 'd'), name: 'DDD' }, { uri: joinPath(ROOT, 'c'), name: 'CCC' }]);
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 4);
+		assert.equal(basename(actual[0].uri), 'a');
+		assert.equal(basename(actual[1].uri), 'b');
+		assert.equal(basename(actual[2].uri), 'd');
+		assert.equal(basename(actual[3].uri), 'c');
+		assert.equal(actual[2].name, 'DDD');
+		assert.equal(actual[3].name, 'CCC');
+	});
+
+	test('add folders triggers change event', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+
+		const addedFolders = [{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }];
+		await testObject.addFolders(addedFolders);
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
+		assert.deepEqual(actual_1.removed, []);
+		assert.deepEqual(actual_1.changed, []);
+	});
+
+	test('remove folders', async () => {
+		await testObject.removeFolders([testObject.getWorkspace().folders[0].uri]);
+		const actual = testObject.getWorkspace().folders;
+
+		assert.equal(actual.length, 1);
+		assert.equal(basename(actual[0].uri), 'b');
+	});
+
+	test('remove folders triggers change event', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const removedFolder = testObject.getWorkspace().folders[0];
+		await testObject.removeFolders([removedFolder.uri]);
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added, []);
+		assert.deepEqual(actual_1.removed.map(r => r.uri.toString()), [removedFolder.uri.toString()]);
+		assert.deepEqual(actual_1.changed.map(c => c.uri.toString()), [testObject.getWorkspace().folders[0].uri.toString()]);
+	});
+
+	test('remove folders and add them back by writing into the file', async () => {
+		const folders = testObject.getWorkspace().folders;
+		await testObject.removeFolders([folders[0].uri]);
+
+		const promise = new Promise<void>((resolve, reject) => {
+			testObject.onDidChangeWorkspaceFolders(actual => {
+				try {
+					assert.deepEqual(actual.added.map(r => r.uri.toString()), [folders[0].uri.toString()]);
+					resolve();
+				} catch (error) {
+					reject(error);
+				}
+			});
+		});
+
+		const workspace = { folders: [{ path: folders[0].uri.path }, { path: folders[1].uri.path }] };
+		await fileService.writeFile(testObject.getWorkspace().configuration!, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+		await promise;
+	});
+
+	test('update folders (remove last and add to end)', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const addedFolders = [{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }];
+		const removedFolders = [testObject.getWorkspace().folders[1]].map(f => f.uri);
+		await testObject.updateFolders(addedFolders, removedFolders);
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
+		assert.deepEqual(actual_1.removed.map(r_1 => r_1.uri.toString()), removedFolders.map(a_1 => a_1.toString()));
+		assert.deepEqual(actual_1.changed, []);
+	});
+
+	test('update folders (rename first via add and remove)', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const addedFolders = [{ uri: joinPath(ROOT, 'a'), name: 'The Folder' }];
+		const removedFolders = [testObject.getWorkspace().folders[0]].map(f => f.uri);
+		await testObject.updateFolders(addedFolders, removedFolders, 0);
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added, []);
+		assert.deepEqual(actual_1.removed, []);
+		assert.deepEqual(actual_1.changed.map(r => r.uri.toString()), removedFolders.map(a => a.toString()));
+	});
+
+	test('update folders (remove first and add to end)', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const addedFolders = [{ uri: joinPath(ROOT, 'd') }, { uri: joinPath(ROOT, 'c') }];
+		const removedFolders = [testObject.getWorkspace().folders[0]].map(f => f.uri);
+		const changedFolders = [testObject.getWorkspace().folders[1]].map(f => f.uri);
+		await testObject.updateFolders(addedFolders, removedFolders);
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
+		assert.deepEqual(actual_1.removed.map(r_1 => r_1.uri.toString()), removedFolders.map(a_1 => a_1.toString()));
+		assert.deepEqual(actual_1.changed.map(r_2 => r_2.uri.toString()), changedFolders.map(a_2 => a_2.toString()));
+	});
+
+	test('reorder folders trigger change event', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const workspace = { folders: [{ path: testObject.getWorkspace().folders[1].uri.path }, { path: testObject.getWorkspace().folders[0].uri.path }] };
+		await fileService.writeFile(testObject.getWorkspace().configuration!, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+		await testObject.reloadConfiguration();
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added, []);
+		assert.deepEqual(actual_1.removed, []);
+		assert.deepEqual(actual_1.changed.map(c => c.uri.toString()), testObject.getWorkspace().folders.map(f => f.uri.toString()).reverse());
+	});
+
+	test('rename folders trigger change event', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeWorkspaceFolders(target);
+		const workspace = { folders: [{ path: testObject.getWorkspace().folders[0].uri.path, name: '1' }, { path: testObject.getWorkspace().folders[1].uri.path }] };
+		fileService.writeFile(testObject.getWorkspace().configuration!, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+		await testObject.reloadConfiguration();
+
+		assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
+		const actual_1 = (<IWorkspaceFoldersChangeEvent>target.args[0][0]);
+		assert.deepEqual(actual_1.added, []);
+		assert.deepEqual(actual_1.removed, []);
+		assert.deepEqual(actual_1.changed.map(c => c.uri.toString()), [testObject.getWorkspace().folders[0].uri.toString()]);
+	});
+
+});
+
+suite('WorkspaceService - Initialization', () => {
+
+	let configResource: URI, testObject: WorkspaceService, fileService: IFileService, environmentService: BrowserWorkbenchEnvironmentService;
+	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+	const disposables = new DisposableStore();
+
+	suiteSetup(() => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'initialization.testSetting1': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				},
+				'initialization.testSetting2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				}
+			}
+		});
+	});
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const appSettingsHome = joinPath(ROOT, 'user');
+		const folderA = joinPath(ROOT, 'a');
+		const folderB = joinPath(ROOT, 'b');
+		configResource = joinPath(ROOT, 'vsctests.code-workspace');
+		const workspace = { folders: [{ path: folderA.path }, { path: folderB.path }] };
+
+		await fileService.createFolder(appSettingsHome);
+		await fileService.createFolder(folderA);
+		await fileService.createFolder(folderB);
+		await fileService.writeFile(configResource, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+
+		const instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		environmentService = TestEnvironmentService;
+		const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IWorkspaceContextService, testObject);
+		instantiationService.stub(IConfigurationService, testObject);
+		instantiationService.stub(IEnvironmentService, environmentService);
+
+		await testObject.initialize({ id: '' });
+		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
+		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+		testObject.acquireInstantiationService(instantiationService);
+	});
+
+	teardown(() => disposables.clear());
+
+	test('initialize a folder workspace from an empty workspace with no configuration changes', async () => {
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "initialization.testSetting1": "userValue" }'));
+
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		const folder = joinPath(ROOT, 'a');
+		await testObject.initialize(convertToWorkspacePayload(folder));
+
+		assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
+		assert.equal(target.callCount, 3);
+		assert.deepEqual(target.args[0], [WorkbenchState.FOLDER]);
+		assert.deepEqual(target.args[1], [undefined]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).added.map(f => f.uri.toString()), [folder.toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).removed, []);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).changed, []);
+
+	});
+
+	test('initialize a folder workspace from an empty workspace with configuration changes', async () => {
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "initialization.testSetting1": "userValue" }'));
+
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		const folder = joinPath(ROOT, 'a');
+		await fileService.writeFile(joinPath(folder, '.vscode', 'settings.json'), VSBuffer.fromString('{ "initialization.testSetting1": "workspaceValue" }'));
+		await testObject.initialize(convertToWorkspacePayload(folder));
+
+		assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue');
+		assert.equal(target.callCount, 4);
+		assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepEqual(target.args[1], [WorkbenchState.FOLDER]);
+		assert.deepEqual(target.args[2], [undefined]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(f => f.uri.toString()), [folder.toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
+
+	});
+
+	test('initialize a multi root workspace from an empty workspace with no configuration changes', async () => {
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "initialization.testSetting1": "userValue" }'));
+
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		await testObject.initialize(getWorkspaceIdentifier(configResource));
+
+		assert.equal(target.callCount, 3);
+		assert.deepEqual(target.args[0], [WorkbenchState.WORKSPACE]);
+		assert.deepEqual(target.args[1], [undefined]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).added.map(folder => folder.uri.toString()), [joinPath(ROOT, 'a').toString(), joinPath(ROOT, 'b').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).removed, []);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).changed, []);
+
+	});
+
+	test('initialize a multi root workspace from an empty workspace with configuration changes', async () => {
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "initialization.testSetting1": "userValue" }'));
+
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		await fileService.writeFile(joinPath(ROOT, 'a', '.vscode', 'settings.json'), VSBuffer.fromString('{ "initialization.testSetting1": "workspaceValue1" }'));
+		await fileService.writeFile(joinPath(ROOT, 'b', '.vscode', 'settings.json'), VSBuffer.fromString('{ "initialization.testSetting2": "workspaceValue2" }'));
+		await testObject.initialize(getWorkspaceIdentifier(configResource));
+
+		assert.equal(target.callCount, 4);
+		assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1', 'initialization.testSetting2']);
+		assert.deepEqual(target.args[1], [WorkbenchState.WORKSPACE]);
+		assert.deepEqual(target.args[2], [undefined]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(folder => folder.uri.toString()), [joinPath(ROOT, 'a').toString(), joinPath(ROOT, 'b').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
+
+	});
+
+	test('initialize a folder workspace from a folder workspace with no configuration changes', async () => {
+
+		await testObject.initialize(convertToWorkspacePayload(joinPath(ROOT, 'a')));
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "initialization.testSetting1": "userValue" }'));
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		await testObject.initialize(convertToWorkspacePayload(joinPath(ROOT, 'b')));
+
+		assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
+		assert.equal(target.callCount, 1);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).added.map(folder_1 => folder_1.uri.toString()), [joinPath(ROOT, 'b').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).removed.map(folder_2 => folder_2.uri.toString()), [joinPath(ROOT, 'a').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).changed, []);
+
+	});
+
+	test('initialize a folder workspace from a folder workspace with configuration changes', async () => {
+
+		await testObject.initialize(convertToWorkspacePayload(joinPath(ROOT, 'a')));
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		await fileService.writeFile(joinPath(ROOT, 'b', '.vscode', 'settings.json'), VSBuffer.fromString('{ "initialization.testSetting1": "workspaceValue2" }'));
+		await testObject.initialize(convertToWorkspacePayload(joinPath(ROOT, 'b')));
+
+		assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue2');
+		assert.equal(target.callCount, 2);
+		assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).added.map(folder_1 => folder_1.uri.toString()), [joinPath(ROOT, 'b').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).removed.map(folder_2 => folder_2.uri.toString()), [joinPath(ROOT, 'a').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).changed, []);
+
+	});
+
+	test('initialize a multi folder workspace from a folder workspacce triggers change events in the right order', async () => {
+		await testObject.initialize(convertToWorkspacePayload(joinPath(ROOT, 'a')));
+		const target = sinon.spy();
+		testObject.onDidChangeWorkbenchState(target);
+		testObject.onDidChangeWorkspaceName(target);
+		testObject.onDidChangeWorkspaceFolders(target);
+		testObject.onDidChangeConfiguration(target);
+
+		await fileService.writeFile(joinPath(ROOT, 'a', '.vscode', 'settings.json'), VSBuffer.fromString('{ "initialization.testSetting1": "workspaceValue2" }'));
+		await testObject.initialize(getWorkspaceIdentifier(configResource));
+
+		assert.equal(target.callCount, 4);
+		assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
+		assert.deepEqual(target.args[1], [WorkbenchState.WORKSPACE]);
+		assert.deepEqual(target.args[2], [undefined]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(folder_1 => folder_1.uri.toString()), [joinPath(ROOT, 'b').toString()]);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
+		assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
+	});
+
+});
+
+suite('WorkspaceConfigurationService - Folder', () => {
+
+	let testObject: IConfigurationService, workspaceService: WorkspaceService, fileService: IFileService, environmentService: BrowserWorkbenchEnvironmentService;
+	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+	const disposables: DisposableStore = new DisposableStore();
+
+	suiteSetup(() => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
+				'configurationService.folder.machineSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				},
+				'configurationService.folder.machineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				},
+				'configurationService.folder.testSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				},
+				'configurationService.folder.languageSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
+				}
+			}
+		});
+	});
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const folder = joinPath(ROOT, 'a');
+		await fileService.createFolder(folder);
+
+		const instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		environmentService = TestEnvironmentService;
+		const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		workspaceService = testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IWorkspaceContextService, testObject);
+		instantiationService.stub(IConfigurationService, testObject);
+		instantiationService.stub(IEnvironmentService, environmentService);
+
+		await workspaceService.initialize(convertToWorkspacePayload(folder));
+		instantiationService.stub(IKeybindingEditingService, instantiationService.createInstance(KeybindingsEditingService));
+		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
+		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+		workspaceService.acquireInstantiationService(instantiationService);
+	});
+
+	teardown(() => disposables.clear());
+
+	test('defaults', () => {
+		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'applicationSetting': 'isSet', 'machineSetting': 'isSet', 'machineOverridableSetting': 'isSet', 'testSetting': 'isSet', 'languageSetting': 'isSet' } });
+	});
+
+	test('globals override defaults', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'userValue');
+	});
+
+	test('globals', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "testworkbench.editor.tabs": true }'));
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('testworkbench.editor.tabs'), true);
+	});
+
+	test('workspace settings', async () => {
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "testworkbench.editor.icons": true }'));
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('testworkbench.editor.icons'), true);
+	});
+
+	test('workspace settings override user settings', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'workspaceValue');
+	});
+
+	test('machine overridable settings override user Settings', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineOverridableSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.machineOverridableSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.machineOverridableSetting'), 'workspaceValue');
+	});
+
+	test('workspace settings override user settings after defaults are registered ', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.newSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.newSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.newSetting': {
+					'type': 'string',
+					'default': 'isSet'
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.folder.newSetting'), 'workspaceValue');
+	});
+
+	test('machine overridable settings override user settings after defaults are registered ', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.newMachineOverridableSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.newMachineOverridableSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.newMachineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.folder.newMachineOverridableSetting'), 'workspaceValue');
+	});
+
+	test('application settings are not read from workspace', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue');
+	});
+
+	test('application settings are not read from workspace when workspace folder uri is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('machine settings are not read from workspace', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.machineSetting": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('machine settings are not read from workspace when workspace folder uri is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.machineSetting": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('get application scope settings are not loaded after defaults are registered', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting-2": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.applicationSetting-2": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.applicationSetting-2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'userValue');
+	});
+
+	test('get application scope settings are not loaded after defaults are registered when workspace folder uri is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting-3": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.applicationSetting-3": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.applicationSetting-3': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('get machine scope settings are not loaded after defaults are registered', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting-2": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.machineSetting-2": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.machineSetting-2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'userValue');
+	});
+
+	test('get machine scope settings are not loaded after defaults are registered when workspace folder uri is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting-3": "userValue" }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.machineSetting-3": "workspaceValue" }'));
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.folder.machineSetting-3': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('reload configuration emits events after global configuraiton changes', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "testworkbench.editor.tabs": true }'));
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.reloadConfiguration();
+		assert.ok(target.called);
+	});
+
+	test('reload configuration emits events after workspace configuraiton changes', async () => {
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.reloadConfiguration();
+		assert.ok(target.called);
+	});
+
+	test('reload configuration should not emit event if no changes', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "testworkbench.editor.tabs": true }'));
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(() => { target(); });
+		await testObject.reloadConfiguration();
+		assert.ok(!target.called);
+	});
+
+	test('inspect', async () => {
+		let actual = testObject.inspect('something.missing');
+		assert.equal(actual.defaultValue, undefined);
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, undefined);
+
+		actual = testObject.inspect('configurationService.folder.testSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'isSet');
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.inspect('configurationService.folder.testSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, 'userValue');
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'userValue');
+
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.inspect('configurationService.folder.testSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, 'userValue');
+		assert.equal(actual.workspaceValue, 'workspaceValue');
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'workspaceValue');
+	});
+
+	test('keys', async () => {
+		let actual = testObject.keys();
+		assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
+		assert.deepEqual(actual.user, []);
+		assert.deepEqual(actual.workspace, []);
+		assert.deepEqual(actual.workspaceFolder, []);
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.keys();
+		assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
+		assert.deepEqual(actual.user, ['configurationService.folder.testSetting']);
+		assert.deepEqual(actual.workspace, []);
+		assert.deepEqual(actual.workspaceFolder, []);
+
+		await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.keys();
+		assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
+		assert.deepEqual(actual.user, ['configurationService.folder.testSetting']);
+		assert.deepEqual(actual.workspace, ['configurationService.folder.testSetting']);
+		assert.deepEqual(actual.workspaceFolder, []);
+	});
+
+	test('update user configuration', () => {
+		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER)
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'value'));
+	});
+
+	test('update workspace configuration', () => {
+		return testObject.updateValue('tasks.service.testSetting', 'value', ConfigurationTarget.WORKSPACE)
+			.then(() => assert.equal(testObject.getValue('tasks.service.testSetting'), 'value'));
+	});
+
+	test('update resource configuration', () => {
+		return testObject.updateValue('configurationService.folder.testSetting', 'value', { resource: workspaceService.getWorkspace().folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'value'));
+	});
+
+	test('update resource language configuration', () => {
+		return testObject.updateValue('configurationService.folder.languageSetting', 'value', { resource: workspaceService.getWorkspace().folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.languageSetting'), 'value'));
+	});
+
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
+	test('update machine setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.folder.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
+	});
+
+	test('update tasks configuration', () => {
+		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
+			.then(() => assert.deepEqual(testObject.getValue('tasks'), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }));
+	});
+
+	test('update user configuration should trigger change event before promise is resolve', () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER)
+			.then(() => assert.ok(target.called));
+	});
+
+	test('update workspace configuration should trigger change event before promise is resolve', () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.WORKSPACE)
+			.then(() => assert.ok(target.called));
+	});
+
+	test('update memory configuration', () => {
+		return testObject.updateValue('configurationService.folder.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'memoryValue'));
+	});
+
+	test('update memory configuration should trigger change event before promise is resolve', () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		return testObject.updateValue('configurationService.folder.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
+			.then(() => assert.ok(target.called));
+	});
+
+	test('remove setting from all targets', async () => {
+		const key = 'configurationService.folder.testSetting';
+		await testObject.updateValue(key, 'workspaceValue', ConfigurationTarget.WORKSPACE);
+		await testObject.updateValue(key, 'userValue', ConfigurationTarget.USER);
+
+		await testObject.updateValue(key, undefined);
+		await testObject.reloadConfiguration();
+
+		const actual = testObject.inspect(key, { resource: workspaceService.getWorkspace().folders[0].uri });
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+	});
+
+	test('update user configuration to default value when target is not passed', async () => {
+		await testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER);
+		await testObject.updateValue('configurationService.folder.testSetting', 'isSet');
+		assert.equal(testObject.inspect('configurationService.folder.testSetting').userValue, undefined);
+	});
+
+	test('update user configuration to default value when target is passed', async () => {
+		await testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER);
+		await testObject.updateValue('configurationService.folder.testSetting', 'isSet', ConfigurationTarget.USER);
+		assert.equal(testObject.inspect('configurationService.folder.testSetting').userValue, 'isSet');
+	});
+
+	test('update task configuration should trigger change event before promise is resolve', () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
+			.then(() => assert.ok(target.called));
+	});
+
+	test('no change event when there are no global tasks', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await timeout(5);
+		assert.ok(target.notCalled);
+	});
+
+	test('change event when there are global tasks', async () => {
+		await fileService.writeFile(joinPath(environmentService.userRoamingDataHome, 'tasks.json'), VSBuffer.fromString('{ "version": "1.0.0", "tasks": [{ "taskName": "myTask" }'));
+		return new Promise<void>((c) => testObject.onDidChangeConfiguration(() => c()));
+	});
+
+	test('creating workspace settings', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		await testObject.reloadConfiguration();
+		await new Promise<void>(async (c) => {
+			const disposable = testObject.onDidChangeConfiguration(e => {
+				assert.ok(e.affectsConfiguration('configurationService.folder.testSetting'));
+				assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'workspaceValue');
+				disposable.dispose();
+				c();
+			});
+			await fileService.writeFile(joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		});
+	});
+
+	test('deleting workspace settings', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "userValue" }'));
+		const workspaceSettingsResource = joinPath(workspaceService.getWorkspace().folders[0].uri, '.vscode', 'settings.json');
+		await fileService.writeFile(workspaceSettingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
+		await testObject.reloadConfiguration();
+		const e = await new Promise<IConfigurationChangeEvent>(async (c) => {
+			Event.once(testObject.onDidChangeConfiguration)(c);
+			await fileService.del(workspaceSettingsResource);
+		});
+		assert.ok(e.affectsConfiguration('configurationService.folder.testSetting'));
+		assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'userValue');
+	});
+});
+
+suite('WorkspaceConfigurationService-Multiroot', () => {
+
+	let workspaceContextService: IWorkspaceContextService, jsonEditingServce: IJSONEditingService, testObject: IConfigurationService, fileService: IFileService, environmentService: BrowserWorkbenchEnvironmentService;
+	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+	const disposables = new DisposableStore();
+
+	suiteSetup(() => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testSetting': {
+					'type': 'string',
+					'default': 'isSet'
+				},
+				'configurationService.workspace.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
+				'configurationService.workspace.machineSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				},
+				'configurationService.workspace.machineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				},
+				'configurationService.workspace.testResourceSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				},
+				'configurationService.workspace.testLanguageSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
+				}
+			}
+		});
+	});
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const appSettingsHome = joinPath(ROOT, 'user');
+		const folderA = joinPath(ROOT, 'a');
+		const folderB = joinPath(ROOT, 'b');
+		const configResource = joinPath(ROOT, 'vsctests.code-workspace');
+		const workspace = { folders: [{ path: folderA.path }, { path: folderB.path }] };
+
+		await fileService.createFolder(appSettingsHome);
+		await fileService.createFolder(folderA);
+		await fileService.createFolder(folderB);
+		await fileService.writeFile(configResource, VSBuffer.fromString(JSON.stringify(workspace, null, '\t')));
+
+		const instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		environmentService = TestEnvironmentService;
+		const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null);
+		instantiationService.stub(IRemoteAgentService, remoteAgentService);
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IWorkspaceContextService, workspaceService);
+		instantiationService.stub(IConfigurationService, workspaceService);
+		instantiationService.stub(IWorkbenchEnvironmentService, environmentService);
+		instantiationService.stub(IEnvironmentService, environmentService);
+
+		await workspaceService.initialize(getWorkspaceIdentifier(configResource));
+		instantiationService.stub(IKeybindingEditingService, instantiationService.createInstance(KeybindingsEditingService));
+		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
+		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+		workspaceService.acquireInstantiationService(instantiationService);
+
+		workspaceContextService = workspaceService;
+		jsonEditingServce = instantiationService.createInstance(JSONEditingService);
+		testObject = workspaceService;
+	});
+
+	teardown(() => disposables.clear());
+
+	test('application settings are not read from workspace', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue');
+	});
+
+	test('application settings are not read from workspace when folder is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.applicationSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.applicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('machine settings are not read from workspace', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.machineSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting'), 'userValue');
+	});
+
+	test('machine settings are not read from workspace when folder is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.folder.machineSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.machineSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('get application scope settings are not loaded after defaults are registered', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.newSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.newSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'userValue');
+	});
+
+	test('get application scope settings are not loaded after defaults are registered when workspace folder is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.newSetting-2": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newSetting-2': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.newSetting-2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('workspace settings override user settings after defaults are registered for machine overridable settings ', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.newMachineOverridableSetting": "userValue" }'));
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newMachineOverridableSetting': 'workspaceValue' } }], true);
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.newMachineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
+
+	});
+
+	test('application settings are not read from workspace folder', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.applicationSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue');
+	});
+
+	test('application settings are not read from workspace folder when workspace folder is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.applicationSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.workspace.applicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('machine settings are not read from workspace folder', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.machineSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.machineSetting": "workspaceFolderValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.workspace.machineSetting'), 'userValue');
+	});
+
+	test('machine settings are not read from workspace folder when workspace folder is passed', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.machineSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.machineSetting": "workspaceFolderValue" }'));
+
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.workspace.machineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('application settings are not read from workspace folder after defaults are registered', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.testNewApplicationSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewApplicationSetting": "workspaceFolderValue" }'));
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testNewApplicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('application settings are not read from workspace folder after defaults are registered', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.testNewMachineSetting": "userValue" }'));
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewMachineSetting": "workspaceFolderValue" }'));
+		await testObject.reloadConfiguration();
+
+		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
+
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testNewMachineSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				}
+			}
+		});
+
+		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
+	});
+
+	test('resource setting in folder is read after it is registered later', async () => {
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewResourceSetting2": "workspaceFolderValue" }'));
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['settings'], value: { 'configurationService.workspace.testNewResourceSetting2': 'workspaceValue' } }], true);
+		await testObject.reloadConfiguration();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testNewResourceSetting2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.workspace.testNewResourceSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
+	});
+
+	test('resource language setting in folder is read after it is registered later', async () => {
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewResourceLanguageSetting2": "workspaceFolderValue" }'));
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['settings'], value: { 'configurationService.workspace.testNewResourceLanguageSetting2': 'workspaceValue' } }], true);
+		await testObject.reloadConfiguration();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testNewResourceLanguageSetting2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.workspace.testNewResourceLanguageSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
+	});
+
+	test('machine overridable setting in folder is read after it is registered later', async () => {
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testNewMachineOverridableSetting2": "workspaceFolderValue" }'));
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['settings'], value: { 'configurationService.workspace.testNewMachineOverridableSetting2': 'workspaceValue' } }], true);
+		await testObject.reloadConfiguration();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.workspace.testNewMachineOverridableSetting2': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineOverridableSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
+	});
+
+	test('inspect', async () => {
+		let actual = testObject.inspect('something.missing');
+		assert.equal(actual.defaultValue, undefined);
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, undefined);
+
+		actual = testObject.inspect('configurationService.workspace.testResourceSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'isSet');
+
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.workspace.testResourceSetting": "userValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.inspect('configurationService.workspace.testResourceSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, 'userValue');
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'userValue');
+
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['settings'], value: { 'configurationService.workspace.testResourceSetting': 'workspaceValue' } }], true);
+		await testObject.reloadConfiguration();
+		actual = testObject.inspect('configurationService.workspace.testResourceSetting');
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, 'userValue');
+		assert.equal(actual.workspaceValue, 'workspaceValue');
+		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.value, 'workspaceValue');
+
+		await fileService.writeFile(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testResourceSetting": "workspaceFolderValue" }'));
+		await testObject.reloadConfiguration();
+		actual = testObject.inspect('configurationService.workspace.testResourceSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri });
+		assert.equal(actual.defaultValue, 'isSet');
+		assert.equal(actual.userValue, 'userValue');
+		assert.equal(actual.workspaceValue, 'workspaceValue');
+		assert.equal(actual.workspaceFolderValue, 'workspaceFolderValue');
+		assert.equal(actual.value, 'workspaceFolderValue');
+	});
+
+	test('get launch configuration', async () => {
+		const expectedLaunchConfiguration = {
+			'version': '0.1.0',
+			'configurations': [
+				{
+					'type': 'node',
+					'request': 'launch',
+					'name': 'Gulp Build',
+					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
+					'stopOnEntry': true,
+					'args': [
+						'watch-extension:json-client'
+					],
+					'cwd': '${workspaceFolder}'
+				}
+			]
+		};
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['launch'], value: expectedLaunchConfiguration }], true);
+		await testObject.reloadConfiguration();
+		const actual = testObject.getValue('launch');
+		assert.deepEqual(actual, expectedLaunchConfiguration);
+	});
+
+	test('inspect launch configuration', async () => {
+		const expectedLaunchConfiguration = {
+			'version': '0.1.0',
+			'configurations': [
+				{
+					'type': 'node',
+					'request': 'launch',
+					'name': 'Gulp Build',
+					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
+					'stopOnEntry': true,
+					'args': [
+						'watch-extension:json-client'
+					],
+					'cwd': '${workspaceFolder}'
+				}
+			]
+		};
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['launch'], value: expectedLaunchConfiguration }], true);
+		await testObject.reloadConfiguration();
+		const actual = testObject.inspect('launch').workspaceValue;
+		assert.deepEqual(actual, expectedLaunchConfiguration);
+	});
+
+
+	test('get tasks configuration', async () => {
+		const expectedTasksConfiguration = {
+			'version': '2.0.0',
+			'tasks': [
+				{
+					'label': 'Run Dev',
+					'type': 'shell',
+					'command': './scripts/code.sh',
+					'windows': {
+						'command': '.\\scripts\\code.bat'
+					},
+					'problemMatcher': []
+				}
+			]
+		};
+		await jsonEditingServce.write((workspaceContextService.getWorkspace().configuration!), [{ path: ['tasks'], value: expectedTasksConfiguration }], true);
+		await testObject.reloadConfiguration();
+		const actual = testObject.getValue('tasks');
+		assert.deepEqual(actual, expectedTasksConfiguration);
+	});
+
+	test('inspect tasks configuration', async () => {
+		const expectedTasksConfiguration = {
+			'version': '2.0.0',
+			'tasks': [
+				{
+					'label': 'Run Dev',
+					'type': 'shell',
+					'command': './scripts/code.sh',
+					'windows': {
+						'command': '.\\scripts\\code.bat'
+					},
+					'problemMatcher': []
+				}
+			]
+		};
+		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['tasks'], value: expectedTasksConfiguration }], true);
+		await testObject.reloadConfiguration();
+		const actual = testObject.inspect('tasks').workspaceValue;
+		assert.deepEqual(actual, expectedTasksConfiguration);
+	});
+
+	test('update user configuration', async () => {
+		await testObject.updateValue('configurationService.workspace.testSetting', 'userValue', ConfigurationTarget.USER);
+		assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'userValue');
+	});
+
+	test('update user configuration should trigger change event before promise is resolve', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.updateValue('configurationService.workspace.testSetting', 'userValue', ConfigurationTarget.USER);
+		assert.ok(target.called);
+	});
+
+	test('update workspace configuration', async () => {
+		await testObject.updateValue('configurationService.workspace.testSetting', 'workspaceValue', ConfigurationTarget.WORKSPACE);
+		assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'workspaceValue');
+	});
+
+	test('update workspace configuration should trigger change event before promise is resolve', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.updateValue('configurationService.workspace.testSetting', 'workspaceValue', ConfigurationTarget.WORKSPACE);
+		assert.ok(target.called);
+	});
+
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
+	test('update machine setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.workspace.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
+	});
+
+	test('update workspace folder configuration', () => {
+		const workspace = workspaceContextService.getWorkspace();
+		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
+			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testResourceSetting', { resource: workspace.folders[0].uri }), 'workspaceFolderValue'));
+	});
+
+	test('update resource language configuration in workspace folder', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		await testObject.updateValue('configurationService.workspace.testLanguageSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		assert.equal(testObject.getValue('configurationService.workspace.testLanguageSetting', { resource: workspace.folders[0].uri }), 'workspaceFolderValue');
+	});
+
+	test('update workspace folder configuration should trigger change event before promise is resolve', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		assert.ok(target.called);
+	});
+
+	test('update workspace folder configuration second time should trigger change event before promise is resolve', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		await testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue2', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		assert.ok(target.called);
+	});
+
+	test('update memory configuration', async () => {
+		await testObject.updateValue('configurationService.workspace.testSetting', 'memoryValue', ConfigurationTarget.MEMORY);
+		assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'memoryValue');
+	});
+
+	test('update memory configuration should trigger change event before promise is resolve', async () => {
+		const target = sinon.spy();
+		testObject.onDidChangeConfiguration(target);
+		await testObject.updateValue('configurationService.workspace.testSetting', 'memoryValue', ConfigurationTarget.MEMORY);
+		assert.ok(target.called);
+	});
+
+	test('remove setting from all targets', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		const key = 'configurationService.workspace.testResourceSetting';
+		await testObject.updateValue(key, 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		await testObject.updateValue(key, 'workspaceValue', ConfigurationTarget.WORKSPACE);
+		await testObject.updateValue(key, 'userValue', ConfigurationTarget.USER);
+
+		await testObject.updateValue(key, undefined, { resource: workspace.folders[0].uri });
+		await testObject.reloadConfiguration();
+
+		const actual = testObject.inspect(key, { resource: workspace.folders[0].uri });
+		assert.equal(actual.userValue, undefined);
+		assert.equal(actual.workspaceValue, undefined);
+		assert.equal(actual.workspaceFolderValue, undefined);
+	});
+
+	test('update tasks configuration in a folder', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		await testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER);
+		assert.deepEqual(testObject.getValue('tasks', { resource: workspace.folders[0].uri }), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] });
+	});
+
+	test('update launch configuration in a workspace', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		await testObject.updateValue('launch', { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true);
+		assert.deepEqual(testObject.getValue('launch'), { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] });
+	});
+
+	test('update tasks configuration in a workspace', async () => {
+		const workspace = workspaceContextService.getWorkspace();
+		const tasks = { 'version': '2.0.0', tasks: [{ 'label': 'myTask' }] };
+		await testObject.updateValue('tasks', tasks, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true);
+		assert.deepEqual(testObject.getValue('tasks'), tasks);
+	});
+
+	test('configuration of newly added folder is available on configuration change event', async () => {
+		const workspaceService = <WorkspaceService>testObject;
+		const uri = workspaceService.getWorkspace().folders[1].uri;
+		await workspaceService.removeFolders([uri]);
+		await fileService.writeFile(joinPath(uri, '.vscode', 'settings.json'), VSBuffer.fromString('{ "configurationService.workspace.testResourceSetting": "workspaceFolderValue" }'));
+
+		return new Promise<void>((c, e) => {
+			testObject.onDidChangeConfiguration(() => {
+				try {
+					assert.equal(testObject.getValue('configurationService.workspace.testResourceSetting', { resource: uri }), 'workspaceFolderValue');
+					c();
+				} catch (error) {
+					e(error);
+				}
+			});
+			workspaceService.addFolders([{ uri }]);
+		});
+	});
+});
+
+suite('WorkspaceConfigurationService - Remote Folder', () => {
+
+	let testObject: WorkspaceService, folder: URI,
+		machineSettingsResource: URI, remoteSettingsResource: URI, fileSystemProvider: InMemoryFileSystemProvider, resolveRemoteEnvironment: () => void,
+		instantiationService: TestInstantiationService, fileService: IFileService, environmentService: BrowserWorkbenchEnvironmentService;
+	const remoteAuthority = 'configuraiton-tests';
+	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+	const disposables = new DisposableStore();
+
+	suiteSetup(() => {
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.remote.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
+				'configurationService.remote.machineSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				},
+				'configurationService.remote.machineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				},
+				'configurationService.remote.testSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.RESOURCE
+				}
+			}
+		});
+	});
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(ROOT.scheme, fileSystemProvider);
+
+		const appSettingsHome = joinPath(ROOT, 'user');
+		folder = joinPath(ROOT, 'a');
+		await fileService.createFolder(folder);
+		await fileService.createFolder(appSettingsHome);
+		machineSettingsResource = joinPath(ROOT, 'machine-settings.json');
+		remoteSettingsResource = machineSettingsResource.with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
+
+		instantiationService = <TestInstantiationService>workbenchInstantiationService();
+		environmentService = TestEnvironmentService;
+		const remoteEnvironmentPromise = new Promise<Partial<IRemoteAgentEnvironment>>(c => resolveRemoteEnvironment = () => c({ settingsPath: remoteSettingsResource }));
+		const remoteAgentService = instantiationService.stub(IRemoteAgentService, <Partial<IRemoteAgentService>>{ getEnvironment: () => remoteEnvironmentPromise });
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		const configurationCache: IConfigurationCache = { read: () => Promise.resolve(''), write: () => Promise.resolve(), remove: () => Promise.resolve(), needsCaching: () => false };
+		testObject = disposables.add(new WorkspaceService({ configurationCache, remoteAuthority }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+		instantiationService.stub(IWorkspaceContextService, testObject);
+		instantiationService.stub(IConfigurationService, testObject);
+		instantiationService.stub(IEnvironmentService, environmentService);
+		instantiationService.stub(IFileService, fileService);
+	});
+
+	async function initialize(): Promise<void> {
+		await testObject.initialize(convertToWorkspacePayload(folder));
+		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
+		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+		testObject.acquireInstantiationService(instantiationService);
+	}
+
+	function registerRemoteFileSystemProvider(): void {
+		instantiationService.get(IFileService).registerProvider(Schemas.vscodeRemote, new RemoteFileSystemProvider(fileSystemProvider, remoteAuthority));
+	}
+
+	function registerRemoteFileSystemProviderOnActivation(): void {
+		const disposable = instantiationService.get(IFileService).onWillActivateFileSystemProvider(e => {
+			if (e.scheme === Schemas.vscodeRemote) {
+				disposable.dispose();
+				e.join(Promise.resolve().then(() => registerRemoteFileSystemProvider()));
+			}
+		});
+	}
+
+	teardown(() => disposables.clear());
+
+	test('remote settings override globals', async () => {
+		await fileService.writeFile(machineSettingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
+	});
+
+	test('remote settings override globals after remote provider is registered on activation', async () => {
+		await fileService.writeFile(machineSettingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
+		resolveRemoteEnvironment();
+		registerRemoteFileSystemProviderOnActivation();
+		await initialize();
+		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
+	});
+
+	test('remote settings override globals after remote environment is resolved', async () => {
+		await fileService.writeFile(machineSettingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
+		registerRemoteFileSystemProvider();
+		await initialize();
+		const promise = new Promise<void>((c, e) => {
+			testObject.onDidChangeConfiguration(event => {
+				try {
+					assert.equal(event.source, ConfigurationTarget.USER);
+					assert.deepEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
+					assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
+					c();
+				} catch (error) {
+					e(error);
+				}
+			});
+		});
+		resolveRemoteEnvironment();
+		return promise;
+	});
+
+	test('remote settings override globals after remote provider is registered on activation and remote environment is resolved', async () => {
+		await fileService.writeFile(machineSettingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
+		registerRemoteFileSystemProviderOnActivation();
+		await initialize();
+		const promise = new Promise<void>((c, e) => {
+			testObject.onDidChangeConfiguration(event => {
+				try {
+					assert.equal(event.source, ConfigurationTarget.USER);
+					assert.deepEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
+					assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
+					c();
+				} catch (error) {
+					e(error);
+				}
+			});
+		});
+		resolveRemoteEnvironment();
+		return promise;
+	});
+
+	test('machine settings in local user settings does not override defaults', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "globalValue" }'));
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'isSet');
+	});
+
+	test('machine overridable settings in local user settings does not override defaults', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.remote.machineOverridableSetting": "globalValue" }'));
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		assert.equal(testObject.getValue('configurationService.remote.machineOverridableSetting'), 'isSet');
+	});
+
+	test('non machine setting is written in local settings', async () => {
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		await testObject.updateValue('configurationService.remote.applicationSetting', 'applicationValue');
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.inspect('configurationService.remote.applicationSetting').userLocalValue, 'applicationValue');
+	});
+
+	test('machine setting is written in remote settings', async () => {
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		await testObject.updateValue('configurationService.remote.machineSetting', 'machineValue');
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.inspect('configurationService.remote.machineSetting').userRemoteValue, 'machineValue');
+	});
+
+	test('machine overridable setting is written in remote settings', async () => {
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		await testObject.updateValue('configurationService.remote.machineOverridableSetting', 'machineValue');
+		await testObject.reloadConfiguration();
+		assert.equal(testObject.inspect('configurationService.remote.machineOverridableSetting').userRemoteValue, 'machineValue');
+	});
+
+	test('machine settings in local user settings does not override defaults after defalts are registered ', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.remote.newMachineSetting": "userValue" }'));
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.remote.newMachineSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.remote.newMachineSetting'), 'isSet');
+	});
+
+	test('machine overridable settings in local user settings does not override defaults after defaults are registered ', async () => {
+		await fileService.writeFile(environmentService.settingsResource, VSBuffer.fromString('{ "configurationService.remote.newMachineOverridableSetting": "userValue" }'));
+		registerRemoteFileSystemProvider();
+		resolveRemoteEnvironment();
+		await initialize();
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.remote.newMachineOverridableSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.MACHINE_OVERRIDABLE
+				}
+			}
+		});
+		assert.equal(testObject.getValue('configurationService.remote.newMachineOverridableSetting'), 'isSet');
+	});
+
+});
+
+suite('ConfigurationService - Configuration Defaults', () => {
+
+	const disposableStore: DisposableStore = new DisposableStore();
+
+	suiteSetup(() => {
+		Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationService.defaultOverridesSetting': {
+					'type': 'string',
+					'default': 'isSet',
+				},
+			}
+		});
+	});
+
+	teardown(() => disposableStore.clear());
+
+	test('when default value is not overriden', () => {
+		const testObject = createConfigurationService({});
+		assert.deepEqual(testObject.getValue('configurationService.defaultOverridesSetting'), 'isSet');
+	});
+
+	test('when default value is overriden', () => {
+		const testObject = createConfigurationService({ 'configurationService.defaultOverridesSetting': 'overriddenValue' });
+		assert.deepEqual(testObject.getValue('configurationService.defaultOverridesSetting'), 'overriddenValue');
+	});
+
+	function createConfigurationService(configurationDefaults: Record<string, any>): IConfigurationService {
+		const remoteAgentService = (<TestInstantiationService>workbenchInstantiationService()).createInstance(RemoteAgentService, null);
+		const environmentService = new BrowserWorkbenchEnvironmentService({ logsPath: joinPath(ROOT, 'logs'), workspaceId: '', configurationDefaults }, TestProductService);
+		const fileService = new FileService(new NullLogService());
+		return disposableStore.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
+	}
+
+});
+
+function getWorkspaceId(configPath: URI): string {
+	let workspaceConfigPath = configPath.toString();
+	if (!isLinux) {
+		workspaceConfigPath = workspaceConfigPath.toLowerCase(); // sanitize for platform file system
+	}
+	return hash(workspaceConfigPath).toString(16);
+}
+
+export function getWorkspaceIdentifier(configPath: URI): IWorkspaceIdentifier {
+	return {
+		configPath,
+		id: getWorkspaceId(configPath)
+	};
+}
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
deleted file mode 100644
index f33ff6088..000000000
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
+++ /dev/null
@@ -1,394 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as sinon from 'sinon';
-import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as fs from 'fs';
-import * as json from 'vs/base/common/json';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestProductService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestWorkbenchConfiguration, TestTextFileService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
-import * as uuid from 'vs/base/common/uuid';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ConfigurationEditingService, ConfigurationEditingError, ConfigurationEditingErrorCode, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditingService';
-import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, USER_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { CommandService } from 'vs/workbench/services/commands/common/commandService';
-import { URI } from 'vs/base/common/uri';
-import { createHash } from 'crypto';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { IFileService } from 'vs/platform/files/common/files';
-import { ConfigurationCache } from 'vs/workbench/services/configuration/electron-browser/configurationCache';
-import { KeybindingsEditingService, IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
-import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
-import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-
-class TestWorkbenchEnvironmentService extends NativeWorkbenchEnvironmentService {
-
-	constructor(private _appSettingsHome: URI) {
-		super(TestWorkbenchConfiguration, TestProductService);
-	}
-
-	get appSettingsHome() { return this._appSettingsHome; }
-}
-
-suite('ConfigurationEditingService', () => {
-
-	let instantiationService: TestInstantiationService;
-	let testObject: ConfigurationEditingService;
-	let parentDir: string;
-	let workspaceDir: string;
-	let globalSettingsFile: string;
-	let globalTasksFile: string;
-	let workspaceSettingsDir;
-
-	const disposables = new DisposableStore();
-
-	suiteSetup(() => {
-		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationEditing.service.testSetting': {
-					'type': 'string',
-					'default': 'isSet'
-				},
-				'configurationEditing.service.testSettingTwo': {
-					'type': 'string',
-					'default': 'isSet'
-				},
-				'configurationEditing.service.testSettingThree': {
-					'type': 'string',
-					'default': 'isSet'
-				}
-			}
-		});
-	});
-
-	setup(async () => {
-		await setUpWorkspace();
-		await setUpServices();
-	});
-
-	async function setUpWorkspace(): Promise<void> {
-		const id = uuid.generateUuid();
-		parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		workspaceDir = path.join(parentDir, 'workspaceconfig', id);
-		globalSettingsFile = path.join(workspaceDir, 'settings.json');
-		globalTasksFile = path.join(workspaceDir, 'tasks.json');
-		workspaceSettingsDir = path.join(workspaceDir, '.vscode');
-
-		return await mkdirp(workspaceSettingsDir, 493);
-	}
-
-	async function setUpServices(noWorkspace: boolean = false): Promise<void> {
-		instantiationService = <TestInstantiationService>workbenchInstantiationService();
-		const environmentService = new TestWorkbenchEnvironmentService(URI.file(workspaceDir));
-		instantiationService.stub(IEnvironmentService, environmentService);
-		const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-		const fileService = disposables.add(new FileService(new NullLogService()));
-		const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-		fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-		instantiationService.stub(IFileService, fileService);
-		instantiationService.stub(IRemoteAgentService, remoteAgentService);
-		const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-		instantiationService.stub(IWorkspaceContextService, workspaceService);
-		await workspaceService.initialize(noWorkspace ? { id: '' } : { folder: URI.file(workspaceDir), id: createHash('md5').update(URI.file(workspaceDir).toString()).digest('hex') });
-		instantiationService.stub(IConfigurationService, workspaceService);
-		instantiationService.stub(IKeybindingEditingService, instantiationService.createInstance(KeybindingsEditingService));
-		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-		instantiationService.stub(ICommandService, CommandService);
-		testObject = instantiationService.createInstance(ConfigurationEditingService);
-	}
-
-	teardown(() => {
-		disposables.clear();
-		if (workspaceDir) {
-			return rimraf(workspaceDir, RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('errors cases - invalid key', () => {
-		return testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'unknown.key', value: 'value' })
-			.then(() => assert.fail('Should fail with ERROR_UNKNOWN_KEY'),
-				(error: ConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY));
-	});
-
-	test('errors cases - no workspace', () => {
-		return setUpServices(true)
-			.then(() => testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key: 'configurationEditing.service.testSetting', value: 'value' }))
-			.then(() => assert.fail('Should fail with ERROR_NO_WORKSPACE_OPENED'),
-				(error: ConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED));
-	});
-
-	function errorCasesInvalidConfig(file: string, key: string) {
-		fs.writeFileSync(file, ',,,,,,,,,,,,,,');
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key, value: 'value' })
-			.then(() => assert.fail('Should fail with ERROR_INVALID_CONFIGURATION'),
-				(error: ConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION));
-	}
-
-	test('errors cases - invalid configuration', () => {
-		return errorCasesInvalidConfig(globalSettingsFile, 'configurationEditing.service.testSetting');
-	});
-
-	test('errors cases - invalid global tasks configuration', () => {
-		return errorCasesInvalidConfig(globalTasksFile, 'tasks.configurationEditing.service.testSetting');
-	});
-
-	test('errors cases - dirty', () => {
-		instantiationService.stub(ITextFileService, 'isDirty', true);
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' })
-			.then(() => assert.fail('Should fail with ERROR_CONFIGURATION_FILE_DIRTY error.'),
-				(error: ConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY));
-	});
-
-	test('dirty error is not thrown if not asked to save', () => {
-		instantiationService.stub(ITextFileService, 'isDirty', true);
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' }, { donotSave: true })
-			.then(() => null, error => assert.fail('Should not fail.'));
-	});
-
-	test('do not notify error', () => {
-		instantiationService.stub(ITextFileService, 'isDirty', true);
-		const target = sinon.stub();
-		instantiationService.stub(INotificationService, <INotificationService>{ prompt: target, _serviceBrand: undefined, notify: null!, error: null!, info: null!, warn: null!, status: null!, setFilter: null! });
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' }, { donotNotifyError: true })
-			.then(() => assert.fail('Should fail with ERROR_CONFIGURATION_FILE_DIRTY error.'),
-				(error: ConfigurationEditingError) => {
-					assert.equal(false, target.calledOnce);
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY);
-				});
-	});
-
-	test('write one setting - empty file', () => {
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' })
-			.then(() => {
-				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
-			});
-	});
-
-	test('write one setting - existing file', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "my.super.setting": "my.super.value" }');
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: 'value' })
-			.then(() => {
-				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
-				assert.equal(parsed['my.super.setting'], 'my.super.value');
-			});
-	});
-
-	test('remove an existing setting - existing file', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "my.super.setting": "my.super.value", "configurationEditing.service.testSetting": "value" }');
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: undefined })
-			.then(() => {
-				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.deepEqual(Object.keys(parsed), ['my.super.setting']);
-				assert.equal(parsed['my.super.setting'], 'my.super.value');
-			});
-	});
-
-	test('remove non existing setting - existing file', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "my.super.setting": "my.super.value" }');
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key: 'configurationEditing.service.testSetting', value: undefined })
-			.then(() => {
-				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.deepEqual(Object.keys(parsed), ['my.super.setting']);
-				assert.equal(parsed['my.super.setting'], 'my.super.value');
-			});
-	});
-
-	test('write overridable settings to user settings', () => {
-		const key = '[language]';
-		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
-		return testObject.writeConfiguration(EditableConfigurationTarget.USER_LOCAL, { key, value })
-			.then(() => {
-				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.deepEqual(parsed[key], value);
-			});
-	});
-
-	test('write overridable settings to workspace settings', () => {
-		const key = '[language]';
-		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
-		return testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE, { key, value })
-			.then(() => {
-				const target = path.join(workspaceDir, FOLDER_SETTINGS_PATH);
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.deepEqual(parsed[key], value);
-			});
-	});
-
-	test('write overridable settings to workspace folder settings', () => {
-		const key = '[language]';
-		const value = { 'configurationEditing.service.testSetting': 'overridden value' };
-		const folderSettingsFile = path.join(workspaceDir, FOLDER_SETTINGS_PATH);
-		return testObject.writeConfiguration(EditableConfigurationTarget.WORKSPACE_FOLDER, { key, value }, { scopes: { resource: URI.file(folderSettingsFile) } })
-			.then(() => {
-				const contents = fs.readFileSync(folderSettingsFile).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.deepEqual(parsed[key], value);
-			});
-	});
-
-	function writeStandaloneSettingEmptyFile(configTarget: EditableConfigurationTarget, pathMap: any) {
-		return testObject.writeConfiguration(configTarget, { key: 'tasks.service.testSetting', value: 'value' })
-			.then(() => {
-				const target = path.join(workspaceDir, pathMap['tasks']);
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.equal(parsed['service.testSetting'], 'value');
-			});
-	}
-
-	test('write workspace standalone setting - empty file', () => {
-		return writeStandaloneSettingEmptyFile(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting - empty file', () => {
-		return writeStandaloneSettingEmptyFile(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-
-	function writeStandaloneSettingExitingFile(configTarget: EditableConfigurationTarget, pathMap: any) {
-		const target = path.join(workspaceDir, pathMap['tasks']);
-		fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
-		return testObject.writeConfiguration(configTarget, { key: 'tasks.service.testSetting', value: 'value' })
-			.then(() => {
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-				assert.equal(parsed['service.testSetting'], 'value');
-				assert.equal(parsed['my.super.setting'], 'my.super.value');
-			});
-	}
-
-	test('write workspace standalone setting - existing file', () => {
-		return writeStandaloneSettingExitingFile(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting - existing file', () => {
-		return writeStandaloneSettingExitingFile(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-
-	function writeStandaloneSettingEmptyFileFullJson(configTarget: EditableConfigurationTarget, pathMap: any) {
-		return testObject.writeConfiguration(configTarget, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
-			.then(() => {
-				const target = path.join(workspaceDir, pathMap['tasks']);
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-
-				assert.equal(parsed['version'], '1.0.0');
-				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-			});
-	}
-
-	test('write workspace standalone setting - empty file - full JSON', () => {
-		return writeStandaloneSettingEmptyFileFullJson(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting - empty file - full JSON', () => {
-		return writeStandaloneSettingEmptyFileFullJson(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-
-	function writeStandaloneSettingExistingFileFullJson(configTarget: EditableConfigurationTarget, pathMap: any) {
-		const target = path.join(workspaceDir, pathMap['tasks']);
-		fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
-		return testObject.writeConfiguration(configTarget, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
-			.then(() => {
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-
-				assert.equal(parsed['version'], '1.0.0');
-				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-			});
-	}
-
-	test('write workspace standalone setting - existing file - full JSON', () => {
-		return writeStandaloneSettingExistingFileFullJson(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting - existing file - full JSON', () => {
-		return writeStandaloneSettingExistingFileFullJson(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-
-	function writeStandaloneSettingExistingFileWithJsonErrorFullJson(configTarget: EditableConfigurationTarget, pathMap: any) {
-		const target = path.join(workspaceDir, pathMap['tasks']);
-		fs.writeFileSync(target, '{ "my.super.setting": '); // invalid JSON
-		return testObject.writeConfiguration(configTarget, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
-			.then(() => {
-				const contents = fs.readFileSync(target).toString('utf8');
-				const parsed = json.parse(contents);
-
-				assert.equal(parsed['version'], '1.0.0');
-				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-			});
-	}
-
-	test('write workspace standalone setting - existing file with JSON errors - full JSON', () => {
-		return writeStandaloneSettingExistingFileWithJsonErrorFullJson(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting - existing file with JSON errors - full JSON', () => {
-		return writeStandaloneSettingExistingFileWithJsonErrorFullJson(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-
-	function writeStandaloneSettingShouldReplace(configTarget: EditableConfigurationTarget, pathMap: any) {
-		const target = path.join(workspaceDir, pathMap['tasks']);
-		fs.writeFileSync(target, `{
-			"version": "1.0.0",
-			"tasks": [
-				{
-					"taskName": "myTask1"
-				},
-				{
-					"taskName": "myTask2"
-				}
-			]
-		}`);
-		return testObject.writeConfiguration(configTarget, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] } })
-			.then(() => {
-				const actual = fs.readFileSync(target).toString('utf8');
-				const expected = JSON.stringify({ 'version': '1.0.0', tasks: [{ 'taskName': 'myTask1' }] }, null, '\t');
-				assert.equal(actual, expected);
-			});
-	}
-
-	test('write workspace standalone setting should replace complete file', () => {
-		return writeStandaloneSettingShouldReplace(EditableConfigurationTarget.WORKSPACE, WORKSPACE_STANDALONE_CONFIGURATIONS);
-	});
-
-	test('write user standalone setting should replace complete file', () => {
-		return writeStandaloneSettingShouldReplace(EditableConfigurationTarget.USER_LOCAL, USER_STANDALONE_CONFIGURATIONS);
-	});
-});
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
deleted file mode 100644
index a7f455cd5..000000000
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
+++ /dev/null
@@ -1,2114 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as sinon from 'sinon';
-import * as fs from 'fs';
-import * as path from 'vs/base/common/path';
-import * as os from 'os';
-import { URI } from 'vs/base/common/uri';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import * as pfs from 'vs/base/node/pfs';
-import * as uuid from 'vs/base/common/uuid';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
-import { ISingleFolderWorkspaceInitializationPayload, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
-import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/common/configurationEditingService';
-import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
-import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { workbenchInstantiationService, RemoteFileSystemProvider, TestProductService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestWorkbenchConfiguration, TestTextFileService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
-import { createHash } from 'crypto';
-import { Schemas } from 'vs/base/common/network';
-import { originalFSPath, joinPath } from 'vs/base/common/resources';
-import { isLinux, isMacintosh } from 'vs/base/common/platform';
-import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { NullLogService } from 'vs/platform/log/common/log';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { ConfigurationCache } from 'vs/workbench/services/configuration/electron-browser/configurationCache';
-import { ConfigurationCache as BrowserConfigurationCache } from 'vs/workbench/services/configuration/browser/configurationCache';
-import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IConfigurationCache } from 'vs/workbench/services/configuration/common/configuration';
-import { SignService } from 'vs/platform/sign/browser/signService';
-import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
-import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { timeout } from 'vs/base/common/async';
-import { VSBuffer } from 'vs/base/common/buffer';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import product from 'vs/platform/product/common/product';
-import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { Event } from 'vs/base/common/event';
-import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
-
-class TestWorkbenchEnvironmentService extends NativeWorkbenchEnvironmentService {
-
-	constructor(private _appSettingsHome: URI) {
-		super(TestWorkbenchConfiguration, TestProductService);
-	}
-
-	get appSettingsHome() { return this._appSettingsHome; }
-
-}
-
-function setUpFolderWorkspace(folderName: string): Promise<{ parentDir: string, folderDir: string }> {
-	const id = uuid.generateUuid();
-	const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-	return setUpFolder(folderName, parentDir).then(folderDir => ({ parentDir, folderDir }));
-}
-
-function setUpFolder(folderName: string, parentDir: string): Promise<string> {
-	const folderDir = path.join(parentDir, folderName);
-	const workspaceSettingsDir = path.join(folderDir, '.vscode');
-	return Promise.resolve(pfs.mkdirp(workspaceSettingsDir, 493).then(() => folderDir));
-}
-
-function convertToWorkspacePayload(folder: URI): ISingleFolderWorkspaceInitializationPayload {
-	return {
-		id: createHash('md5').update(folder.fsPath).digest('hex'),
-		folder
-	} as ISingleFolderWorkspaceInitializationPayload;
-}
-
-function setUpWorkspace(folders: string[]): Promise<{ parentDir: string, configPath: URI }> {
-
-	const id = uuid.generateUuid();
-	const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-
-	return Promise.resolve(pfs.mkdirp(parentDir, 493)
-		.then(() => {
-			const configPath = path.join(parentDir, 'vsctests.code-workspace');
-			const workspace = { folders: folders.map(path => ({ path })) };
-			fs.writeFileSync(configPath, JSON.stringify(workspace, null, '\t'));
-
-			return Promise.all(folders.map(folder => setUpFolder(folder, parentDir)))
-				.then(() => ({ parentDir, configPath: URI.file(configPath) }));
-		}));
-
-}
-
-
-suite('WorkspaceContextService - Folder', () => {
-
-	let workspaceName = `testWorkspace${uuid.generateUuid()}`, parentResource: string, workspaceResource: string, workspaceContextService: IWorkspaceContextService;
-	const disposables = new DisposableStore();
-
-	setup(() => {
-		return setUpFolderWorkspace(workspaceName)
-			.then(({ parentDir, folderDir }) => {
-				parentResource = parentDir;
-				workspaceResource = folderDir;
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, new DiskFileSystemProvider(new NullLogService()), Schemas.userData, new NullLogService())));
-				workspaceContextService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, new RemoteAgentService(environmentService, { _serviceBrand: undefined, ...product }, new RemoteAuthorityResolverService(), new SignService(undefined), new NullLogService()), new UriIdentityService(fileService), new NullLogService()));
-				return (<WorkspaceService>workspaceContextService).initialize(convertToWorkspacePayload(URI.file(folderDir)));
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('getWorkspace()', () => {
-		const actual = workspaceContextService.getWorkspace();
-
-		assert.equal(actual.folders.length, 1);
-		assert.equal(actual.folders[0].uri.fsPath, URI.file(workspaceResource).fsPath);
-		assert.equal(actual.folders[0].name, workspaceName);
-		assert.equal(actual.folders[0].index, 0);
-		assert.ok(!actual.configuration);
-	});
-
-	test('getWorkbenchState()', () => {
-		const actual = workspaceContextService.getWorkbenchState();
-
-		assert.equal(actual, WorkbenchState.FOLDER);
-	});
-
-	test('getWorkspaceFolder()', () => {
-		const actual = workspaceContextService.getWorkspaceFolder(URI.file(path.join(workspaceResource, 'a')));
-
-		assert.equal(actual, workspaceContextService.getWorkspace().folders[0]);
-	});
-
-	test('isCurrentWorkspace() => true', () => {
-		assert.ok(workspaceContextService.isCurrentWorkspace(URI.file(workspaceResource)));
-	});
-
-	test('isCurrentWorkspace() => false', () => {
-		assert.ok(!workspaceContextService.isCurrentWorkspace(URI.file(workspaceResource + 'abc')));
-	});
-
-	test('workspace is complete', () => workspaceContextService.getCompleteWorkspace());
-});
-
-suite('WorkspaceContextService - Workspace', () => {
-
-	let parentResource: string, testObject: WorkspaceService, instantiationService: TestInstantiationService;
-	const disposables = new DisposableStore();
-
-	setup(() => {
-		return setUpWorkspace(['a', 'b'])
-			.then(({ parentDir, configPath }) => {
-
-				parentResource = parentDir;
-
-				instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-				instantiationService.stub(IRemoteAgentService, remoteAgentService);
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-
-				instantiationService.stub(IWorkspaceContextService, workspaceService);
-				instantiationService.stub(IConfigurationService, workspaceService);
-				instantiationService.stub(IEnvironmentService, environmentService);
-
-				return workspaceService.initialize(getWorkspaceIdentifier(configPath)).then(() => {
-					workspaceService.acquireInstantiationService(instantiationService);
-					testObject = workspaceService;
-				});
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('workspace folders', () => {
-		const actual = testObject.getWorkspace().folders;
-
-		assert.equal(actual.length, 2);
-		assert.equal(path.basename(actual[0].uri.fsPath), 'a');
-		assert.equal(path.basename(actual[1].uri.fsPath), 'b');
-	});
-
-	test('getWorkbenchState()', () => {
-		const actual = testObject.getWorkbenchState();
-
-		assert.equal(actual, WorkbenchState.WORKSPACE);
-	});
-
-
-	test('workspace is complete', () => testObject.getCompleteWorkspace());
-
-});
-
-suite('WorkspaceContextService - Workspace Editing', () => {
-
-	let parentResource: string, testObject: WorkspaceService, instantiationService: TestInstantiationService;
-	const disposables = new DisposableStore();
-
-	setup(() => {
-		return setUpWorkspace(['a', 'b'])
-			.then(({ parentDir, configPath }) => {
-
-				parentResource = parentDir;
-
-				instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-				instantiationService.stub(IRemoteAgentService, remoteAgentService);
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-
-				instantiationService.stub(IWorkspaceContextService, workspaceService);
-				instantiationService.stub(IConfigurationService, workspaceService);
-				instantiationService.stub(IEnvironmentService, environmentService);
-
-				return workspaceService.initialize(getWorkspaceIdentifier(configPath)).then(() => {
-					instantiationService.stub(IFileService, fileService);
-					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.acquireInstantiationService(instantiationService);
-
-					testObject = workspaceService;
-				});
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('add folders', () => {
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		return testObject.addFolders([{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }])
-			.then(() => {
-				const actual = testObject.getWorkspace().folders;
-
-				assert.equal(actual.length, 4);
-				assert.equal(path.basename(actual[0].uri.fsPath), 'a');
-				assert.equal(path.basename(actual[1].uri.fsPath), 'b');
-				assert.equal(path.basename(actual[2].uri.fsPath), 'd');
-				assert.equal(path.basename(actual[3].uri.fsPath), 'c');
-			});
-	});
-
-	test('add folders (at specific index)', () => {
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		return testObject.addFolders([{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }], 0)
-			.then(() => {
-				const actual = testObject.getWorkspace().folders;
-
-				assert.equal(actual.length, 4);
-				assert.equal(path.basename(actual[0].uri.fsPath), 'd');
-				assert.equal(path.basename(actual[1].uri.fsPath), 'c');
-				assert.equal(path.basename(actual[2].uri.fsPath), 'a');
-				assert.equal(path.basename(actual[3].uri.fsPath), 'b');
-			});
-	});
-
-	test('add folders (at specific wrong index)', () => {
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		return testObject.addFolders([{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }], 10)
-			.then(() => {
-				const actual = testObject.getWorkspace().folders;
-
-				assert.equal(actual.length, 4);
-				assert.equal(path.basename(actual[0].uri.fsPath), 'a');
-				assert.equal(path.basename(actual[1].uri.fsPath), 'b');
-				assert.equal(path.basename(actual[2].uri.fsPath), 'd');
-				assert.equal(path.basename(actual[3].uri.fsPath), 'c');
-			});
-	});
-
-	test('add folders (with name)', () => {
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		return testObject.addFolders([{ uri: URI.file(path.join(workspaceDir, 'd')), name: 'DDD' }, { uri: URI.file(path.join(workspaceDir, 'c')), name: 'CCC' }])
-			.then(() => {
-				const actual = testObject.getWorkspace().folders;
-
-				assert.equal(actual.length, 4);
-				assert.equal(path.basename(actual[0].uri.fsPath), 'a');
-				assert.equal(path.basename(actual[1].uri.fsPath), 'b');
-				assert.equal(path.basename(actual[2].uri.fsPath), 'd');
-				assert.equal(path.basename(actual[3].uri.fsPath), 'c');
-				assert.equal(actual[2].name, 'DDD');
-				assert.equal(actual[3].name, 'CCC');
-			});
-	});
-
-	test('add folders triggers change event', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		const addedFolders = [{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }];
-		return testObject.addFolders(addedFolders)
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
-				assert.deepEqual(actual.removed, []);
-				assert.deepEqual(actual.changed, []);
-			});
-	});
-
-	test('remove folders', () => {
-		return testObject.removeFolders([testObject.getWorkspace().folders[0].uri])
-			.then(() => {
-				const actual = testObject.getWorkspace().folders;
-				assert.equal(actual.length, 1);
-				assert.equal(path.basename(actual[0].uri.fsPath), 'b');
-			});
-	});
-
-	test('remove folders triggers change event', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const removedFolder = testObject.getWorkspace().folders[0];
-		return testObject.removeFolders([removedFolder.uri])
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added, []);
-				assert.deepEqual(actual.removed.map(r => r.uri.toString()), [removedFolder.uri.toString()]);
-				assert.deepEqual(actual.changed.map(c => c.uri.toString()), [testObject.getWorkspace().folders[0].uri.toString()]);
-			});
-	});
-
-	test('remove folders and add them back by writing into the file', async done => {
-		const folders = testObject.getWorkspace().folders;
-		await testObject.removeFolders([folders[0].uri]);
-
-		testObject.onDidChangeWorkspaceFolders(actual => {
-			try {
-				assert.deepEqual(actual.added.map(r => r.uri.toString()), [folders[0].uri.toString()]);
-				done();
-			} catch (error) {
-				done(error);
-			}
-		});
-
-		const workspace = { folders: [{ path: folders[0].uri.fsPath }, { path: folders[1].uri.fsPath }] };
-		await instantiationService.get(ITextFileService).write(testObject.getWorkspace().configuration!, JSON.stringify(workspace, null, '\t'));
-	});
-
-	test('update folders (remove last and add to end)', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		const addedFolders = [{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }];
-		const removedFolders = [testObject.getWorkspace().folders[1]].map(f => f.uri);
-		return testObject.updateFolders(addedFolders, removedFolders)
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
-				assert.deepEqual(actual.removed.map(r => r.uri.toString()), removedFolders.map(a => a.toString()));
-				assert.deepEqual(actual.changed, []);
-			});
-	});
-
-	test('update folders (rename first via add and remove)', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		const addedFolders = [{ uri: URI.file(path.join(workspaceDir, 'a')), name: 'The Folder' }];
-		const removedFolders = [testObject.getWorkspace().folders[0]].map(f => f.uri);
-		return testObject.updateFolders(addedFolders, removedFolders, 0)
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added, []);
-				assert.deepEqual(actual.removed, []);
-				assert.deepEqual(actual.changed.map(r => r.uri.toString()), removedFolders.map(a => a.toString()));
-			});
-	});
-
-	test('update folders (remove first and add to end)', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspaceDir = path.dirname(testObject.getWorkspace().folders[0].uri.fsPath);
-		const addedFolders = [{ uri: URI.file(path.join(workspaceDir, 'd')) }, { uri: URI.file(path.join(workspaceDir, 'c')) }];
-		const removedFolders = [testObject.getWorkspace().folders[0]].map(f => f.uri);
-		const changedFolders = [testObject.getWorkspace().folders[1]].map(f => f.uri);
-		return testObject.updateFolders(addedFolders, removedFolders)
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added.map(r => r.uri.toString()), addedFolders.map(a => a.uri.toString()));
-				assert.deepEqual(actual.removed.map(r => r.uri.toString()), removedFolders.map(a => a.toString()));
-				assert.deepEqual(actual.changed.map(r => r.uri.toString()), changedFolders.map(a => a.toString()));
-			});
-	});
-
-	test('reorder folders trigger change event', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspace = { folders: [{ path: testObject.getWorkspace().folders[1].uri.fsPath }, { path: testObject.getWorkspace().folders[0].uri.fsPath }] };
-		fs.writeFileSync(testObject.getWorkspace().configuration!.fsPath, JSON.stringify(workspace, null, '\t'));
-		return testObject.reloadConfiguration()
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added, []);
-				assert.deepEqual(actual.removed, []);
-				assert.deepEqual(actual.changed.map(c => c.uri.toString()), testObject.getWorkspace().folders.map(f => f.uri.toString()).reverse());
-			});
-	});
-
-	test('rename folders trigger change event', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeWorkspaceFolders(target);
-		const workspace = { folders: [{ path: testObject.getWorkspace().folders[0].uri.fsPath, name: '1' }, { path: testObject.getWorkspace().folders[1].uri.fsPath }] };
-		fs.writeFileSync(testObject.getWorkspace().configuration!.fsPath, JSON.stringify(workspace, null, '\t'));
-		return testObject.reloadConfiguration()
-			.then(() => {
-				assert.equal(target.callCount, 1, `Should be called only once but called ${target.callCount} times`);
-				const actual = <IWorkspaceFoldersChangeEvent>target.args[0][0];
-				assert.deepEqual(actual.added, []);
-				assert.deepEqual(actual.removed, []);
-				assert.deepEqual(actual.changed.map(c => c.uri.toString()), [testObject.getWorkspace().folders[0].uri.toString()]);
-			});
-	});
-
-});
-
-suite('WorkspaceService - Initialization', () => {
-
-	let parentResource: string, workspaceConfigPath: URI, testObject: WorkspaceService, globalSettingsFile: string;
-	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-	const disposables = new DisposableStore();
-
-	suiteSetup(() => {
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'initialization.testSetting1': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
-				},
-				'initialization.testSetting2': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
-				}
-			}
-		});
-	});
-
-	setup(() => {
-		return setUpWorkspace(['1', '2'])
-			.then(({ parentDir, configPath }) => {
-
-				parentResource = parentDir;
-				workspaceConfigPath = configPath;
-				globalSettingsFile = path.join(parentDir, 'settings.json');
-
-				const instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-				instantiationService.stub(IRemoteAgentService, remoteAgentService);
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-				instantiationService.stub(IWorkspaceContextService, workspaceService);
-				instantiationService.stub(IConfigurationService, workspaceService);
-				instantiationService.stub(IEnvironmentService, environmentService);
-
-				return workspaceService.initialize({ id: '' }).then(() => {
-					instantiationService.stub(IFileService, fileService);
-					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.acquireInstantiationService(instantiationService);
-					testObject = workspaceService;
-				});
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('initialize a folder workspace from an empty workspace with no configuration changes', () => {
-
-		fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
-
-		return testObject.reloadConfiguration()
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '1'))))
-					.then(() => {
-						assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
-						assert.equal(target.callCount, 3);
-						assert.deepEqual(target.args[0], [WorkbenchState.FOLDER]);
-						assert.deepEqual(target.args[1], [undefined]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).removed, []);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).changed, []);
-					});
-
-			});
-
-	});
-
-	test('initialize a folder workspace from an empty workspace with configuration changes', () => {
-
-		fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
-
-		return testObject.reloadConfiguration()
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				fs.writeFileSync(path.join(parentResource, '1', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue" }');
-
-				return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '1'))))
-					.then(() => {
-						assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue');
-						assert.equal(target.callCount, 4);
-						assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
-						assert.deepEqual(target.args[1], [WorkbenchState.FOLDER]);
-						assert.deepEqual(target.args[2], [undefined]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
-					});
-
-			});
-
-	});
-
-	test('initialize a multi root workspace from an empty workspace with no configuration changes', () => {
-
-		fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
-
-		return testObject.reloadConfiguration()
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				return testObject.initialize(getWorkspaceIdentifier(workspaceConfigPath))
-					.then(() => {
-						assert.equal(target.callCount, 3);
-						assert.deepEqual(target.args[0], [WorkbenchState.WORKSPACE]);
-						assert.deepEqual(target.args[1], [undefined]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath, URI.file(path.join(parentResource, '2')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).removed, []);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[2][0]).changed, []);
-					});
-
-			});
-
-	});
-
-	test('initialize a multi root workspace from an empty workspace with configuration changes', () => {
-
-		fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
-
-		return testObject.reloadConfiguration()
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				fs.writeFileSync(path.join(parentResource, '1', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue1" }');
-				fs.writeFileSync(path.join(parentResource, '2', '.vscode', 'settings.json'), '{ "initialization.testSetting2": "workspaceValue2" }');
-
-				return testObject.initialize(getWorkspaceIdentifier(workspaceConfigPath))
-					.then(() => {
-						assert.equal(target.callCount, 4);
-						assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1', 'initialization.testSetting2']);
-						assert.deepEqual(target.args[1], [WorkbenchState.WORKSPACE]);
-						assert.deepEqual(target.args[2], [undefined]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath, URI.file(path.join(parentResource, '2')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
-					});
-
-			});
-
-	});
-
-	test('initialize a folder workspace from a folder workspace with no configuration changes', () => {
-
-		return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '1'))))
-			.then(() => {
-				fs.writeFileSync(globalSettingsFile, '{ "initialization.testSetting1": "userValue" }');
-
-				return testObject.reloadConfiguration()
-					.then(() => {
-						const target = sinon.spy();
-						testObject.onDidChangeWorkbenchState(target);
-						testObject.onDidChangeWorkspaceName(target);
-						testObject.onDidChangeWorkspaceFolders(target);
-						testObject.onDidChangeConfiguration(target);
-
-						return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '2'))))
-							.then(() => {
-								assert.equal(testObject.getValue('initialization.testSetting1'), 'userValue');
-								assert.equal(target.callCount, 1);
-								assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '2')).fsPath]);
-								assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).removed.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath]);
-								assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[0][0]).changed, []);
-							});
-
-					});
-			});
-
-	});
-
-	test('initialize a folder workspace from a folder workspace with configuration changes', () => {
-
-		return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '1'))))
-			.then(() => {
-
-				const target = sinon.spy();
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				fs.writeFileSync(path.join(parentResource, '2', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue2" }');
-				return testObject.initialize(convertToWorkspacePayload(URI.file(path.join(parentResource, '2'))))
-					.then(() => {
-						assert.equal(testObject.getValue('initialization.testSetting1'), 'workspaceValue2');
-						assert.equal(target.callCount, 2);
-						assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '2')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).removed.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '1')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[1][0]).changed, []);
-					});
-			});
-
-	});
-
-	test('initialize a multi folder workspace from a folder workspacce triggers change events in the right order', () => {
-		const folderDir = path.join(parentResource, '1');
-		return testObject.initialize(convertToWorkspacePayload(URI.file(folderDir)))
-			.then(() => {
-
-				const target = sinon.spy();
-
-				testObject.onDidChangeWorkbenchState(target);
-				testObject.onDidChangeWorkspaceName(target);
-				testObject.onDidChangeWorkspaceFolders(target);
-				testObject.onDidChangeConfiguration(target);
-
-				fs.writeFileSync(path.join(parentResource, '1', '.vscode', 'settings.json'), '{ "initialization.testSetting1": "workspaceValue2" }');
-				return testObject.initialize(getWorkspaceIdentifier(workspaceConfigPath))
-					.then(() => {
-						assert.equal(target.callCount, 4);
-						assert.deepEqual((<IConfigurationChangeEvent>target.args[0][0]).affectedKeys, ['initialization.testSetting1']);
-						assert.deepEqual(target.args[1], [WorkbenchState.WORKSPACE]);
-						assert.deepEqual(target.args[2], [undefined]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).added.map(folder => folder.uri.fsPath), [URI.file(path.join(parentResource, '2')).fsPath]);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).removed, []);
-						assert.deepEqual((<IWorkspaceFoldersChangeEvent>target.args[3][0]).changed, []);
-					});
-			});
-	});
-
-});
-
-suite('WorkspaceConfigurationService - Folder', () => {
-
-	let workspaceName = `testWorkspace${uuid.generateUuid()}`, parentResource: string, workspaceDir: string, testObject: IConfigurationService, globalSettingsFile: string, globalTasksFile: string, workspaceService: WorkspaceService;
-	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-	let fileService: IFileService;
-	const disposables: DisposableStore = new DisposableStore();
-
-	suiteSetup(() => {
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.folder.applicationSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				},
-				'configurationService.folder.machineSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				},
-				'configurationService.folder.machineOverridableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE_OVERRIDABLE
-				},
-				'configurationService.folder.testSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
-				},
-				'configurationService.folder.languageSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
-				}
-			}
-		});
-	});
-
-	setup(() => {
-		return setUpFolderWorkspace(workspaceName)
-			.then(({ parentDir, folderDir }) => {
-
-				parentResource = parentDir;
-				workspaceDir = folderDir;
-				globalSettingsFile = path.join(parentDir, 'settings.json');
-				globalTasksFile = path.join(parentDir, 'tasks.json');
-
-				const instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-				instantiationService.stub(IRemoteAgentService, remoteAgentService);
-				fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-				instantiationService.stub(IWorkspaceContextService, workspaceService);
-				instantiationService.stub(IConfigurationService, workspaceService);
-				instantiationService.stub(IEnvironmentService, environmentService);
-
-				// Watch workspace configuration directory
-				disposables.add(fileService.watch(joinPath(URI.file(workspaceDir), '.vscode')));
-
-				return workspaceService.initialize(convertToWorkspacePayload(URI.file(folderDir))).then(() => {
-					instantiationService.stub(IFileService, fileService);
-					instantiationService.stub(IKeybindingEditingService, instantiationService.createInstance(KeybindingsEditingService));
-					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.acquireInstantiationService(instantiationService);
-					testObject = workspaceService;
-				});
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('defaults', () => {
-		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'applicationSetting': 'isSet', 'machineSetting': 'isSet', 'machineOverridableSetting': 'isSet', 'testSetting': 'isSet', 'languageSetting': 'isSet' } });
-	});
-
-	test('globals override defaults', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'userValue'));
-	});
-
-	test('globals', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "testworkbench.editor.tabs": true }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('testworkbench.editor.tabs'), true));
-	});
-
-	test('workspace settings', () => {
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "testworkbench.editor.icons": true }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('testworkbench.editor.icons'), true));
-	});
-
-	test('workspace settings override user settings', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'workspaceValue'));
-	});
-
-	test('machine overridable settings override user Settings', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineOverridableSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.machineOverridableSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.machineOverridableSetting'), 'workspaceValue'));
-	});
-
-	test('workspace settings override user settings after defaults are registered ', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.newSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.newSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.folder.newSetting': {
-							'type': 'string',
-							'default': 'isSet'
-						}
-					}
-				});
-
-				assert.equal(testObject.getValue('configurationService.folder.newSetting'), 'workspaceValue');
-			});
-	});
-
-	test('machine overridable settings override user settings after defaults are registered ', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.newMachineOverridableSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.newMachineOverridableSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.folder.newMachineOverridableSetting': {
-							'type': 'string',
-							'default': 'isSet',
-							scope: ConfigurationScope.MACHINE_OVERRIDABLE
-						}
-					}
-				});
-
-				assert.equal(testObject.getValue('configurationService.folder.newMachineOverridableSetting'), 'workspaceValue');
-			});
-	});
-
-	test('application settings are not read from workspace', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue');
-	});
-
-	test('application settings are not read from workspace when workspace folder uri is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('machine settings are not read from workspace', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.machineSetting": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('machine settings are not read from workspace when workspace folder uri is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.machineSetting": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('get application scope settings are not loaded after defaults are registered', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting-2": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting-2": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.folder.applicationSetting-2': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-2'), 'userValue');
-	});
-
-	test('get application scope settings are not loaded after defaults are registered when workspace folder uri is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting-3": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting-3": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.folder.applicationSetting-3': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('get machine scope settings are not loaded after defaults are registered', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting-2": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.machineSetting-2": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.folder.machineSetting-2': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-2'), 'userValue');
-	});
-
-	test('get machine scope settings are not loaded after defaults are registered when workspace folder uri is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting-3": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.machineSetting-3": "workspaceValue" }');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.folder.machineSetting-3': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting-3', { resource: workspaceService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('reload configuration emits events after global configuraiton changes', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "testworkbench.editor.tabs": true }');
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.reloadConfiguration().then(() => assert.ok(target.called));
-	});
-
-	test('reload configuration emits events after workspace configuraiton changes', () => {
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.reloadConfiguration().then(() => assert.ok(target.called));
-	});
-
-	test('reload configuration should not emit event if no changes', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "testworkbench.editor.tabs": true }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeConfiguration(() => { target(); });
-				return testObject.reloadConfiguration()
-					.then(() => assert.ok(!target.called));
-			});
-	});
-
-	test('inspect', () => {
-		let actual = testObject.inspect('something.missing');
-		assert.equal(actual.defaultValue, undefined);
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
-		assert.equal(actual.value, undefined);
-
-		actual = testObject.inspect('configurationService.folder.testSetting');
-		assert.equal(actual.defaultValue, 'isSet');
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
-		assert.equal(actual.value, 'isSet');
-
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-				actual = testObject.inspect('configurationService.folder.testSetting');
-				assert.equal(actual.defaultValue, 'isSet');
-				assert.equal(actual.userValue, 'userValue');
-				assert.equal(actual.workspaceValue, undefined);
-				assert.equal(actual.workspaceFolderValue, undefined);
-				assert.equal(actual.value, 'userValue');
-
-				fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
-
-				return testObject.reloadConfiguration()
-					.then(() => {
-						actual = testObject.inspect('configurationService.folder.testSetting');
-						assert.equal(actual.defaultValue, 'isSet');
-						assert.equal(actual.userValue, 'userValue');
-						assert.equal(actual.workspaceValue, 'workspaceValue');
-						assert.equal(actual.workspaceFolderValue, undefined);
-						assert.equal(actual.value, 'workspaceValue');
-					});
-			});
-	});
-
-	test('keys', () => {
-		let actual = testObject.keys();
-		assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
-		assert.deepEqual(actual.user, []);
-		assert.deepEqual(actual.workspace, []);
-		assert.deepEqual(actual.workspaceFolder, []);
-
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-				actual = testObject.keys();
-				assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
-				assert.deepEqual(actual.user, ['configurationService.folder.testSetting']);
-				assert.deepEqual(actual.workspace, []);
-				assert.deepEqual(actual.workspaceFolder, []);
-
-				fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
-
-				return testObject.reloadConfiguration()
-					.then(() => {
-						actual = testObject.keys();
-						assert.ok(actual.default.indexOf('configurationService.folder.testSetting') !== -1);
-						assert.deepEqual(actual.user, ['configurationService.folder.testSetting']);
-						assert.deepEqual(actual.workspace, ['configurationService.folder.testSetting']);
-						assert.deepEqual(actual.workspaceFolder, []);
-					});
-			});
-	});
-
-	test('update user configuration', () => {
-		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER)
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'value'));
-	});
-
-	test('update workspace configuration', () => {
-		return testObject.updateValue('tasks.service.testSetting', 'value', ConfigurationTarget.WORKSPACE)
-			.then(() => assert.equal(testObject.getValue('tasks.service.testSetting'), 'value'));
-	});
-
-	test('update resource configuration', () => {
-		return testObject.updateValue('configurationService.folder.testSetting', 'value', { resource: workspaceService.getWorkspace().folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'value'));
-	});
-
-	test('update resource language configuration', () => {
-		return testObject.updateValue('configurationService.folder.languageSetting', 'value', { resource: workspaceService.getWorkspace().folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.languageSetting'), 'value'));
-	});
-
-	test('update application setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
-	});
-
-	test('update machine setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.folder.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
-	});
-
-	test('update tasks configuration', () => {
-		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
-			.then(() => assert.deepEqual(testObject.getValue('tasks'), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }));
-	});
-
-	test('update user configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.USER)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update workspace configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.folder.testSetting', 'value', ConfigurationTarget.WORKSPACE)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update memory configuration', () => {
-		return testObject.updateValue('configurationService.folder.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'memoryValue'));
-	});
-
-	test('update memory configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.folder.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update task configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('no change event when there are no global tasks', async () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		await timeout(5);
-		assert.ok(target.notCalled);
-	});
-
-	test('change event when there are global tasks', () => {
-		fs.writeFileSync(globalTasksFile, '{ "version": "1.0.0", "tasks": [{ "taskName": "myTask" }');
-		return new Promise<void>((c) => testObject.onDidChangeConfiguration(() => c()));
-	});
-
-	test('creating workspace settings', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		await testObject.reloadConfiguration();
-		const workspaceSettingsResource = URI.file(path.join(workspaceDir, '.vscode', 'settings.json'));
-		await new Promise<void>(async (c) => {
-			const disposable = testObject.onDidChangeConfiguration(e => {
-				assert.ok(e.affectsConfiguration('configurationService.folder.testSetting'));
-				assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'workspaceValue');
-				disposable.dispose();
-				c();
-			});
-			await fileService.writeFile(workspaceSettingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
-		});
-	});
-
-	test('deleting workspace settings', async () => {
-		if (!isMacintosh) {
-			return;
-		}
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
-		const workspaceSettingsResource = URI.file(path.join(workspaceDir, '.vscode', 'settings.json'));
-		await fileService.writeFile(workspaceSettingsResource, VSBuffer.fromString('{ "configurationService.folder.testSetting": "workspaceValue" }'));
-		await testObject.reloadConfiguration();
-		const e = await new Promise<IConfigurationChangeEvent>(async (c) => {
-			Event.once(testObject.onDidChangeConfiguration)(c);
-			await fileService.del(workspaceSettingsResource);
-		});
-		assert.ok(e.affectsConfiguration('configurationService.folder.testSetting'));
-		assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'userValue');
-	});
-});
-
-suite('WorkspaceConfigurationService-Multiroot', () => {
-
-	let parentResource: string, workspaceContextService: IWorkspaceContextService, jsonEditingServce: IJSONEditingService, testObject: IConfigurationService, globalSettingsFile: string;
-	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-	const disposables = new DisposableStore();
-
-	suiteSetup(() => {
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.testSetting': {
-					'type': 'string',
-					'default': 'isSet'
-				},
-				'configurationService.workspace.applicationSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				},
-				'configurationService.workspace.machineSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				},
-				'configurationService.workspace.machineOverridableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE_OVERRIDABLE
-				},
-				'configurationService.workspace.testResourceSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
-				},
-				'configurationService.workspace.testLanguageSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
-				}
-			}
-		});
-	});
-
-	setup(() => {
-		return setUpWorkspace(['1', '2'])
-			.then(({ parentDir, configPath }) => {
-
-				parentResource = parentDir;
-				globalSettingsFile = path.join(parentDir, 'settings.json');
-
-				const instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteAgentService = instantiationService.createInstance(RemoteAgentService);
-				instantiationService.stub(IRemoteAgentService, remoteAgentService);
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				const diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache(environmentService) }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-
-				instantiationService.stub(IWorkspaceContextService, workspaceService);
-				instantiationService.stub(IConfigurationService, workspaceService);
-				instantiationService.stub(IWorkbenchEnvironmentService, environmentService);
-				instantiationService.stub(INativeWorkbenchEnvironmentService, environmentService);
-
-				return workspaceService.initialize(getWorkspaceIdentifier(configPath)).then(() => {
-					instantiationService.stub(IFileService, fileService);
-					instantiationService.stub(IKeybindingEditingService, instantiationService.createInstance(KeybindingsEditingService));
-					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.acquireInstantiationService(instantiationService);
-
-					workspaceContextService = workspaceService;
-					jsonEditingServce = instantiationService.createInstance(JSONEditingService);
-					testObject = workspaceService;
-				});
-			});
-	});
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('application settings are not read from workspace', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue');
-	});
-
-	test('application settings are not read from workspace when folder is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.applicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('machine settings are not read from workspace', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.machineSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting'), 'userValue');
-	});
-
-	test('machine settings are not read from workspace when folder is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.machineSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.machineSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.folder.machineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('get application scope settings are not loaded after defaults are registered', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.newSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.newSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting'), 'userValue');
-	});
-
-	test('get application scope settings are not loaded after defaults are registered when workspace folder is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.newSetting-2": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newSetting-2': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.newSetting-2': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newSetting-2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('workspace settings override user settings after defaults are registered for machine overridable settings ', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.newMachineOverridableSetting": "userValue" }');
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.newMachineOverridableSetting': 'workspaceValue' } }], true);
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.newMachineOverridableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE_OVERRIDABLE
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.newMachineOverridableSetting'), 'workspaceValue');
-
-	});
-
-	test('application settings are not read from workspace folder', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.applicationSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue');
-	});
-
-	test('application settings are not read from workspace folder when workspace folder is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.applicationSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.workspace.applicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('machine settings are not read from workspace folder', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.machineSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.machineSetting": "workspaceFolderValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.workspace.machineSetting'), 'userValue');
-	});
-
-	test('machine settings are not read from workspace folder when workspace folder is passed', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.machineSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.machineSetting": "workspaceFolderValue" }');
-
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.workspace.machineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('application settings are not read from workspace folder after defaults are registered', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.testNewApplicationSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewApplicationSetting": "workspaceFolderValue" }');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.testNewApplicationSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('application settings are not read from workspace folder after defaults are registered', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.testNewMachineSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewMachineSetting": "workspaceFolderValue" }');
-		await testObject.reloadConfiguration();
-
-		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
-
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.workspace.testNewMachineSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				}
-			}
-		});
-
-		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-
-		await testObject.reloadConfiguration();
-		assert.equal(testObject.getValue('configurationService.workspace.testNewMachineSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-	});
-
-	test('resource setting in folder is read after it is registered later', () => {
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewResourceSetting2": "workspaceFolderValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.testNewResourceSetting2': 'workspaceValue' } }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.workspace.testNewResourceSetting2': {
-							'type': 'string',
-							'default': 'isSet',
-							scope: ConfigurationScope.RESOURCE
-						}
-					}
-				});
-				assert.equal(testObject.getValue('configurationService.workspace.testNewResourceSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
-			});
-	});
-
-	test('resource language setting in folder is read after it is registered later', () => {
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewResourceLanguageSetting2": "workspaceFolderValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.testNewResourceLanguageSetting2': 'workspaceValue' } }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.workspace.testNewResourceLanguageSetting2': {
-							'type': 'string',
-							'default': 'isSet',
-							scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
-						}
-					}
-				});
-				assert.equal(testObject.getValue('configurationService.workspace.testNewResourceLanguageSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
-			});
-	});
-
-	test('machine overridable setting in folder is read after it is registered later', () => {
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewMachineOverridableSetting2": "workspaceFolderValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.testNewMachineOverridableSetting2': 'workspaceValue' } }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.workspace.testNewMachineOverridableSetting2': {
-							'type': 'string',
-							'default': 'isSet',
-							scope: ConfigurationScope.MACHINE_OVERRIDABLE
-						}
-					}
-				});
-				assert.equal(testObject.getValue('configurationService.workspace.testNewMachineOverridableSetting2', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'workspaceFolderValue');
-			});
-	});
-
-	test('inspect', () => {
-		let actual = testObject.inspect('something.missing');
-		assert.equal(actual.defaultValue, undefined);
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
-		assert.equal(actual.value, undefined);
-
-		actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-		assert.equal(actual.defaultValue, 'isSet');
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
-		assert.equal(actual.value, 'isSet');
-
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.testResourceSetting": "userValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => {
-				actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-				assert.equal(actual.defaultValue, 'isSet');
-				assert.equal(actual.userValue, 'userValue');
-				assert.equal(actual.workspaceValue, undefined);
-				assert.equal(actual.workspaceFolderValue, undefined);
-				assert.equal(actual.value, 'userValue');
-
-				return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['settings'], value: { 'configurationService.workspace.testResourceSetting': 'workspaceValue' } }], true)
-					.then(() => testObject.reloadConfiguration())
-					.then(() => {
-						actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-						assert.equal(actual.defaultValue, 'isSet');
-						assert.equal(actual.userValue, 'userValue');
-						assert.equal(actual.workspaceValue, 'workspaceValue');
-						assert.equal(actual.workspaceFolderValue, undefined);
-						assert.equal(actual.value, 'workspaceValue');
-
-						fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testResourceSetting": "workspaceFolderValue" }');
-
-						return testObject.reloadConfiguration()
-							.then(() => {
-								actual = testObject.inspect('configurationService.workspace.testResourceSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri });
-								assert.equal(actual.defaultValue, 'isSet');
-								assert.equal(actual.userValue, 'userValue');
-								assert.equal(actual.workspaceValue, 'workspaceValue');
-								assert.equal(actual.workspaceFolderValue, 'workspaceFolderValue');
-								assert.equal(actual.value, 'workspaceFolderValue');
-							});
-					});
-			});
-	});
-
-	test('get launch configuration', () => {
-		const expectedLaunchConfiguration = {
-			'version': '0.1.0',
-			'configurations': [
-				{
-					'type': 'node',
-					'request': 'launch',
-					'name': 'Gulp Build',
-					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
-					'stopOnEntry': true,
-					'args': [
-						'watch-extension:json-client'
-					],
-					'cwd': '${workspaceFolder}'
-				}
-			]
-		};
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['launch'], value: expectedLaunchConfiguration }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				const actual = testObject.getValue('launch');
-				assert.deepEqual(actual, expectedLaunchConfiguration);
-			});
-	});
-
-	test('inspect launch configuration', () => {
-		const expectedLaunchConfiguration = {
-			'version': '0.1.0',
-			'configurations': [
-				{
-					'type': 'node',
-					'request': 'launch',
-					'name': 'Gulp Build',
-					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
-					'stopOnEntry': true,
-					'args': [
-						'watch-extension:json-client'
-					],
-					'cwd': '${workspaceFolder}'
-				}
-			]
-		};
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['launch'], value: expectedLaunchConfiguration }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				const actual = testObject.inspect('launch').workspaceValue;
-				assert.deepEqual(actual, expectedLaunchConfiguration);
-			});
-	});
-
-
-	test('get tasks configuration', () => {
-		const expectedTasksConfiguration = {
-			'version': '2.0.0',
-			'tasks': [
-				{
-					'label': 'Run Dev',
-					'type': 'shell',
-					'command': './scripts/code.sh',
-					'windows': {
-						'command': '.\\scripts\\code.bat'
-					},
-					'problemMatcher': []
-				}
-			]
-		};
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['tasks'], value: expectedTasksConfiguration }], true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				const actual = testObject.getValue('tasks');
-				assert.deepEqual(actual, expectedTasksConfiguration);
-			});
-	});
-
-	test('inspect tasks configuration', async () => {
-		const expectedTasksConfiguration = {
-			'version': '2.0.0',
-			'tasks': [
-				{
-					'label': 'Run Dev',
-					'type': 'shell',
-					'command': './scripts/code.sh',
-					'windows': {
-						'command': '.\\scripts\\code.bat'
-					},
-					'problemMatcher': []
-				}
-			]
-		};
-		await jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ path: ['tasks'], value: expectedTasksConfiguration }], true);
-		await testObject.reloadConfiguration();
-		const actual = testObject.inspect('tasks').workspaceValue;
-		assert.deepEqual(actual, expectedTasksConfiguration);
-	});
-
-	test('update user configuration', () => {
-		return testObject.updateValue('configurationService.workspace.testSetting', 'userValue', ConfigurationTarget.USER)
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'userValue'));
-	});
-
-	test('update user configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.workspace.testSetting', 'userValue', ConfigurationTarget.USER)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update workspace configuration', () => {
-		return testObject.updateValue('configurationService.workspace.testSetting', 'workspaceValue', ConfigurationTarget.WORKSPACE)
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'workspaceValue'));
-	});
-
-	test('update workspace configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.workspace.testSetting', 'workspaceValue', ConfigurationTarget.WORKSPACE)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update application setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
-	});
-
-	test('update machine setting into workspace configuration in a workspace is not supported', () => {
-		return testObject.updateValue('configurationService.workspace.machineSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_MACHINE));
-	});
-
-	test('update workspace folder configuration', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testResourceSetting', { resource: workspace.folders[0].uri }), 'workspaceFolderValue'));
-	});
-
-	test('update resource language configuration in workspace folder', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		return testObject.updateValue('configurationService.workspace.testLanguageSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testLanguageSetting', { resource: workspace.folders[0].uri }), 'workspaceFolderValue'));
-	});
-
-	test('update workspace folder configuration should trigger change event before promise is resolve', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update workspace folder configuration second time should trigger change event before promise is resolve', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => {
-				const target = sinon.spy();
-				testObject.onDidChangeConfiguration(target);
-				return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue2', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-					.then(() => assert.ok(target.called));
-			});
-	});
-
-	test('update memory configuration', () => {
-		return testObject.updateValue('configurationService.workspace.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'memoryValue'));
-	});
-
-	test('update memory configuration should trigger change event before promise is resolve', () => {
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return testObject.updateValue('configurationService.workspace.testSetting', 'memoryValue', ConfigurationTarget.MEMORY)
-			.then(() => assert.ok(target.called));
-	});
-
-	test('update tasks configuration in a folder', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
-			.then(() => assert.deepEqual(testObject.getValue('tasks', { resource: workspace.folders[0].uri }), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }));
-	});
-
-	test('update launch configuration in a workspace', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		return testObject.updateValue('launch', { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.deepEqual(testObject.getValue('launch'), { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }));
-	});
-
-	test('update tasks configuration in a workspace', () => {
-		const workspace = workspaceContextService.getWorkspace();
-		const tasks = { 'version': '2.0.0', tasks: [{ 'label': 'myTask' }] };
-		return testObject.updateValue('tasks', tasks, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.deepEqual(testObject.getValue('tasks'), tasks));
-	});
-
-	test('configuration of newly added folder is available on configuration change event', async () => {
-		const workspaceService = <WorkspaceService>testObject;
-		const uri = workspaceService.getWorkspace().folders[1].uri;
-		await workspaceService.removeFolders([uri]);
-		fs.writeFileSync(path.join(uri.fsPath, '.vscode', 'settings.json'), '{ "configurationService.workspace.testResourceSetting": "workspaceFolderValue" }');
-
-		return new Promise<void>((c, e) => {
-			testObject.onDidChangeConfiguration(() => {
-				try {
-					assert.equal(testObject.getValue('configurationService.workspace.testResourceSetting', { resource: uri }), 'workspaceFolderValue');
-					c();
-				} catch (error) {
-					e(error);
-				}
-			});
-			workspaceService.addFolders([{ uri }]);
-		});
-	});
-});
-
-suite('WorkspaceConfigurationService - Remote Folder', () => {
-
-	let workspaceName = `testWorkspace${uuid.generateUuid()}`, parentResource: string, workspaceDir: string, testObject: WorkspaceService, globalSettingsFile: string, remoteSettingsFile: string, remoteSettingsResource: URI, instantiationService: TestInstantiationService, resolveRemoteEnvironment: () => void;
-	const remoteAuthority = 'configuraiton-tests';
-	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-	const disposables = new DisposableStore();
-	let diskFileSystemProvider: DiskFileSystemProvider;
-
-	suiteSetup(() => {
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.remote.applicationSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.APPLICATION
-				},
-				'configurationService.remote.machineSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				},
-				'configurationService.remote.machineOverridableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE_OVERRIDABLE
-				},
-				'configurationService.remote.testSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.RESOURCE
-				}
-			}
-		});
-	});
-
-	setup(() => {
-		return setUpFolderWorkspace(workspaceName)
-			.then(({ parentDir, folderDir }) => {
-
-				parentResource = parentDir;
-				workspaceDir = folderDir;
-				globalSettingsFile = path.join(parentDir, 'settings.json');
-				remoteSettingsFile = path.join(parentDir, 'remote-settings.json');
-				remoteSettingsResource = URI.file(remoteSettingsFile).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
-
-				instantiationService = <TestInstantiationService>workbenchInstantiationService();
-				const environmentService = new TestWorkbenchEnvironmentService(URI.file(parentDir));
-				const remoteEnvironmentPromise = new Promise<Partial<IRemoteAgentEnvironment>>(c => resolveRemoteEnvironment = () => c({ settingsPath: remoteSettingsResource }));
-				const remoteAgentService = instantiationService.stub(IRemoteAgentService, <Partial<IRemoteAgentService>>{ getEnvironment: () => remoteEnvironmentPromise });
-				const fileService = disposables.add(new FileService(new NullLogService()));
-				diskFileSystemProvider = disposables.add(new DiskFileSystemProvider(new NullLogService()));
-				fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-				fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService())));
-				const configurationCache: IConfigurationCache = { read: () => Promise.resolve(''), write: () => Promise.resolve(), remove: () => Promise.resolve(), needsCaching: () => false };
-				testObject = disposables.add(new WorkspaceService({ configurationCache, remoteAuthority }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-				instantiationService.stub(IWorkspaceContextService, testObject);
-				instantiationService.stub(IConfigurationService, testObject);
-				instantiationService.stub(IEnvironmentService, environmentService);
-				instantiationService.stub(IFileService, fileService);
-			});
-	});
-
-	async function initialize(): Promise<void> {
-		await testObject.initialize(convertToWorkspacePayload(URI.file(workspaceDir)));
-		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-		instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-		testObject.acquireInstantiationService(instantiationService);
-	}
-
-	function registerRemoteFileSystemProvider(): void {
-		instantiationService.get(IFileService).registerProvider(Schemas.vscodeRemote, new RemoteFileSystemProvider(diskFileSystemProvider, remoteAuthority));
-	}
-
-	function registerRemoteFileSystemProviderOnActivation(): void {
-		const disposable = instantiationService.get(IFileService).onWillActivateFileSystemProvider(e => {
-			if (e.scheme === Schemas.vscodeRemote) {
-				disposable.dispose();
-				e.join(Promise.resolve().then(() => registerRemoteFileSystemProvider()));
-			}
-		});
-	}
-
-	teardown(() => {
-		disposables.clear();
-		if (parentResource) {
-			return pfs.rimraf(parentResource, pfs.RimRafMode.MOVE);
-		}
-		return undefined;
-	});
-
-	test('remote settings override globals', async () => {
-		fs.writeFileSync(remoteSettingsFile, '{ "configurationService.remote.machineSetting": "remoteValue" }');
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
-	});
-
-	test('remote settings override globals after remote provider is registered on activation', async () => {
-		fs.writeFileSync(remoteSettingsFile, '{ "configurationService.remote.machineSetting": "remoteValue" }');
-		resolveRemoteEnvironment();
-		registerRemoteFileSystemProviderOnActivation();
-		await initialize();
-		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
-	});
-
-	test('remote settings override globals after remote environment is resolved', async () => {
-		fs.writeFileSync(remoteSettingsFile, '{ "configurationService.remote.machineSetting": "remoteValue" }');
-		registerRemoteFileSystemProvider();
-		await initialize();
-		const promise = new Promise<void>((c, e) => {
-			testObject.onDidChangeConfiguration(event => {
-				try {
-					assert.equal(event.source, ConfigurationTarget.USER);
-					assert.deepEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
-					assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
-					c();
-				} catch (error) {
-					e(error);
-				}
-			});
-		});
-		resolveRemoteEnvironment();
-		return promise;
-	});
-
-	test('remote settings override globals after remote provider is registered on activation and remote environment is resolved', async () => {
-		fs.writeFileSync(remoteSettingsFile, '{ "configurationService.remote.machineSetting": "remoteValue" }');
-		registerRemoteFileSystemProviderOnActivation();
-		await initialize();
-		const promise = new Promise<void>((c, e) => {
-			testObject.onDidChangeConfiguration(event => {
-				try {
-					assert.equal(event.source, ConfigurationTarget.USER);
-					assert.deepEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
-					assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
-					c();
-				} catch (error) {
-					e(error);
-				}
-			});
-		});
-		resolveRemoteEnvironment();
-		return promise;
-	});
-
-	test.skip('update remote settings', async () => {
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'isSet');
-		const promise = new Promise<void>((c, e) => {
-			testObject.onDidChangeConfiguration(event => {
-				try {
-					assert.equal(event.source, ConfigurationTarget.USER);
-					assert.deepEqual(event.affectedKeys, ['configurationService.remote.machineSetting']);
-					assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'remoteValue');
-					c();
-				} catch (error) {
-					e(error);
-				}
-			});
-		});
-		await instantiationService.get(IFileService).writeFile(remoteSettingsResource, VSBuffer.fromString('{ "configurationService.remote.machineSetting": "remoteValue" }'));
-		return promise;
-	});
-
-	test('machine settings in local user settings does not override defaults', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.remote.machineSetting": "globalValue" }');
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		assert.equal(testObject.getValue('configurationService.remote.machineSetting'), 'isSet');
-	});
-
-	test('machine overridable settings in local user settings does not override defaults', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.remote.machineOverridableSetting": "globalValue" }');
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		assert.equal(testObject.getValue('configurationService.remote.machineOverridableSetting'), 'isSet');
-	});
-
-	test('machine settings in local user settings does not override defaults after defalts are registered ', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.remote.newMachineSetting": "userValue" }');
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.remote.newMachineSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE
-				}
-			}
-		});
-		assert.equal(testObject.getValue('configurationService.remote.newMachineSetting'), 'isSet');
-	});
-
-	test('machine overridable settings in local user settings does not override defaults after defalts are registered ', async () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.remote.newMachineOverridableSetting": "userValue" }');
-		registerRemoteFileSystemProvider();
-		resolveRemoteEnvironment();
-		await initialize();
-		configurationRegistry.registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.remote.newMachineOverridableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					scope: ConfigurationScope.MACHINE_OVERRIDABLE
-				}
-			}
-		});
-		assert.equal(testObject.getValue('configurationService.remote.newMachineOverridableSetting'), 'isSet');
-	});
-
-});
-
-suite('ConfigurationService - Configuration Defaults', () => {
-
-	const disposableStore: DisposableStore = new DisposableStore();
-
-	suiteSetup(() => {
-		Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
-			'id': '_test',
-			'type': 'object',
-			'properties': {
-				'configurationService.defaultOverridesSetting': {
-					'type': 'string',
-					'default': 'isSet',
-				},
-			}
-		});
-	});
-
-	teardown(() => {
-		disposableStore.clear();
-	});
-
-	test('when default value is not overriden', () => {
-		const testObject = createConfiurationService({});
-		assert.deepEqual(testObject.getValue('configurationService.defaultOverridesSetting'), 'isSet');
-	});
-
-	test('when default value is overriden', () => {
-		const testObject = createConfiurationService({ 'configurationService.defaultOverridesSetting': 'overriddenValue' });
-		assert.deepEqual(testObject.getValue('configurationService.defaultOverridesSetting'), 'overriddenValue');
-	});
-
-	function createConfiurationService(configurationDefaults: Record<string, any>): IConfigurationService {
-		const remoteAgentService = (<TestInstantiationService>workbenchInstantiationService()).createInstance(RemoteAgentService);
-		const environmentService = new BrowserWorkbenchEnvironmentService({ logsPath: URI.file(''), workspaceId: '', configurationDefaults }, TestProductService);
-		const fileService = new FileService(new NullLogService());
-		return disposableStore.add(new WorkspaceService({ configurationCache: new BrowserConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService()));
-	}
-
-});
-
-function getWorkspaceId(configPath: URI): string {
-	let workspaceConfigPath = configPath.scheme === Schemas.file ? originalFSPath(configPath) : configPath.toString();
-	if (!isLinux) {
-		workspaceConfigPath = workspaceConfigPath.toLowerCase(); // sanitize for platform file system
-	}
-
-	return createHash('md5').update(workspaceConfigPath).digest('hex');
-}
-
-export function getWorkspaceIdentifier(configPath: URI): IWorkspaceIdentifier {
-	return {
-		configPath,
-		id: getWorkspaceId(configPath)
-	};
-}
diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
index 09a3e187b..09ea04d89 100644
--- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
+++ b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
@@ -23,7 +23,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ContextMenuService as HTMLContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { stripCodicons } from 'vs/base/common/codicons';
+import { stripIcons } from 'vs/base/common/iconLabels';
 import { coalesce } from 'vs/base/common/arrays';
 
 export class ContextMenuService extends Disposable implements IContextMenuService {
@@ -118,7 +118,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 		}
 	}
 
-	private createMenu(delegate: IContextMenuDelegate, entries: IAction[], onHide: () => void, submenuIds = new Set<string>()): IContextMenuItem[] {
+	private createMenu(delegate: IContextMenuDelegate, entries: readonly IAction[], onHide: () => void, submenuIds = new Set<string>()): IContextMenuItem[] {
 		const actionRunner = delegate.actionRunner || new ActionRunner();
 		return coalesce(entries.map(entry => this.createMenuItem(delegate, entry, actionRunner, onHide, submenuIds)));
 	}
@@ -137,7 +137,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 			}
 
 			return {
-				label: unmnemonicLabel(stripCodicons(entry.label)).trim(),
+				label: unmnemonicLabel(stripIcons(entry.label)).trim(),
 				submenu: this.createMenu(delegate, entry.actions, onHide, new Set([...submenuIds, entry.id]))
 			};
 		}
@@ -154,7 +154,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 			}
 
 			const item: IContextMenuItem = {
-				label: unmnemonicLabel(stripCodicons(entry.label)).trim(),
+				label: unmnemonicLabel(stripIcons(entry.label)).trim(),
 				checked: !!entry.checked,
 				type,
 				enabled: !!entry.enabled,
diff --git a/src/vs/workbench/services/credentials/browser/credentialsService.ts b/src/vs/workbench/services/credentials/browser/credentialsService.ts
index a0d03ec84..8dd3d74ee 100644
--- a/src/vs/workbench/services/credentials/browser/credentialsService.ts
+++ b/src/vs/workbench/services/credentials/browser/credentialsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICredentialsService, ICredentialsProvider } from 'vs/workbench/services/credentials/common/credentials';
+import { ICredentialsService, ICredentialsProvider, ICredentialsChangeEvent } from 'vs/workbench/services/credentials/common/credentials';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { Emitter } from 'vs/base/common/event';
@@ -13,7 +13,7 @@ export class BrowserCredentialsService extends Disposable implements ICredential
 
 	declare readonly _serviceBrand: undefined;
 
-	private _onDidChangePassword = this._register(new Emitter<void>());
+	private _onDidChangePassword = this._register(new Emitter<ICredentialsChangeEvent>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	private credentialsProvider: ICredentialsProvider;
@@ -35,13 +35,13 @@ export class BrowserCredentialsService extends Disposable implements ICredential
 	async setPassword(service: string, account: string, password: string): Promise<void> {
 		await this.credentialsProvider.setPassword(service, account, password);
 
-		this._onDidChangePassword.fire();
+		this._onDidChangePassword.fire({ service, account });
 	}
 
 	deletePassword(service: string, account: string): Promise<boolean> {
 		const didDelete = this.credentialsProvider.deletePassword(service, account);
 		if (didDelete) {
-			this._onDidChangePassword.fire();
+			this._onDidChangePassword.fire({ service, account });
 		}
 
 		return didDelete;
diff --git a/src/vs/workbench/services/credentials/common/credentials.ts b/src/vs/workbench/services/credentials/common/credentials.ts
index b1280cd46..73b10f0c9 100644
--- a/src/vs/workbench/services/credentials/common/credentials.ts
+++ b/src/vs/workbench/services/credentials/common/credentials.ts
@@ -16,7 +16,12 @@ export interface ICredentialsProvider {
 	findCredentials(service: string): Promise<Array<{ account: string, password: string }>>;
 }
 
+export interface ICredentialsChangeEvent {
+	service: string
+	account: string;
+}
+
 export interface ICredentialsService extends ICredentialsProvider {
 	readonly _serviceBrand: undefined;
-	readonly onDidChangePassword: Event<void>;
+	readonly onDidChangePassword: Event<ICredentialsChangeEvent>;
 }
diff --git a/src/vs/workbench/services/credentials/electron-sandbox/credentialsService.ts b/src/vs/workbench/services/credentials/electron-sandbox/credentialsService.ts
index 18ad290ad..ba59fbff0 100644
--- a/src/vs/workbench/services/credentials/electron-sandbox/credentialsService.ts
+++ b/src/vs/workbench/services/credentials/electron-sandbox/credentialsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
+import { ICredentialsChangeEvent, ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Emitter } from 'vs/base/common/event';
@@ -13,7 +13,7 @@ export class KeytarCredentialsService extends Disposable implements ICredentials
 
 	declare readonly _serviceBrand: undefined;
 
-	private _onDidChangePassword: Emitter<void> = this._register(new Emitter());
+	private _onDidChangePassword: Emitter<ICredentialsChangeEvent> = this._register(new Emitter());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	constructor(@INativeHostService private readonly nativeHostService: INativeHostService) {
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
index 222e877c6..268b195ef 100644
--- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -20,11 +20,12 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import Severity from 'vs/base/common/severity';
 import { coalesce, distinct } from 'vs/base/common/arrays';
-import { trim } from 'vs/base/common/strings';
+import { compareIgnoreCase, trim } from 'vs/base/common/strings';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { Schemas } from 'vs/base/common/network';
+import { PLAINTEXT_EXTENSION } from 'vs/editor/common/modes/modesRegistry';
 
 export abstract class AbstractFileDialogService implements IFileDialogService {
 
@@ -275,7 +276,9 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		// Build the file filter by using our known languages
 		const ext: string | undefined = defaultUri ? resources.extname(defaultUri) : undefined;
 		let matchingFilter: IFilter | undefined;
-		const registeredLanguageFilters: IFilter[] = coalesce(this.modeService.getRegisteredLanguageNames().map(languageName => {
+
+		const registeredLanguageNames = this.modeService.getRegisteredLanguageNames().sort((a, b) => compareIgnoreCase(a, b));
+		const registeredLanguageFilters: IFilter[] = coalesce(registeredLanguageNames.map(languageName => {
 			const extensions = this.modeService.getExtensions(languageName);
 			if (!extensions || !extensions.length) {
 				return null;
@@ -283,10 +286,10 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 
 			const filter: IFilter = { name: languageName, extensions: distinct(extensions).slice(0, 10).map(e => trim(e, '.')) };
 
-			if (ext && extensions.indexOf(ext) >= 0) {
+			if (!matchingFilter && extensions.indexOf(ext || PLAINTEXT_EXTENSION /* https://github.com/microsoft/vscode/issues/115860 */) >= 0) {
 				matchingFilter = filter;
 
-				return null; // matching filter will be added last to the top
+				return null; // first matching filter will be added to the top
 			}
 
 			return filter;
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index e0eca9ebe..ba20c4d6d 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -34,6 +34,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { normalizeDriveLetter } from 'vs/base/common/labels';
 import { SaveReason } from 'vs/workbench/common/editor';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 
 export namespace OpenLocalFileCommand {
 	export const ID = 'workbench.action.files.openLocalFile';
@@ -138,6 +139,7 @@ export class SimpleFileDialog {
 		@IPathService protected readonly pathService: IPathService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		this.remoteAuthority = this.environmentService.remoteAuthority;
 		this.contextKey = RemoteFileDialogContext.bindTo(contextKeyService);
@@ -642,12 +644,16 @@ export class SimpleFileDialog {
 			return true;
 		} else if (force && (!equalsIgnoreCase(this.basenameWithTrailingSlash(quickPickItem.uri), (this.userEnteredPathSegment + this.autoCompletePathSegment)))) {
 			this.userEnteredPathSegment = '';
-			this.autoCompletePathSegment = this.trimTrailingSlash(itemBasename);
+			if (!this.accessibilityService.isScreenReaderOptimized()) {
+				this.autoCompletePathSegment = this.trimTrailingSlash(itemBasename);
+			}
 			this.activeItem = quickPickItem;
-			this.filePickBox.valueSelection = [this.pathFromUri(this.currentFolder, true).length, this.filePickBox.value.length];
-			// use insert text to preserve undo buffer
-			this.insertText(this.pathAppend(this.currentFolder, this.autoCompletePathSegment), this.autoCompletePathSegment);
-			this.filePickBox.valueSelection = [this.filePickBox.value.length - this.autoCompletePathSegment.length, this.filePickBox.value.length];
+			if (!this.accessibilityService.isScreenReaderOptimized()) {
+				this.filePickBox.valueSelection = [this.pathFromUri(this.currentFolder, true).length, this.filePickBox.value.length];
+				// use insert text to preserve undo buffer
+				this.insertText(this.pathAppend(this.currentFolder, this.autoCompletePathSegment), this.autoCompletePathSegment);
+				this.filePickBox.valueSelection = [this.filePickBox.value.length - this.autoCompletePathSegment.length, this.filePickBox.value.length];
+			}
 			return true;
 		} else {
 			this.userEnteredPathSegment = startingBasename;
diff --git a/src/vs/workbench/services/editor/browser/codeEditorService.ts b/src/vs/workbench/services/editor/browser/codeEditorService.ts
index 89e432817..dfbc193a4 100644
--- a/src/vs/workbench/services/editor/browser/codeEditorService.ts
+++ b/src/vs/workbench/services/editor/browser/codeEditorService.ts
@@ -8,17 +8,19 @@ import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServ
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TextEditorOptions } from 'vs/workbench/common/editor';
+import { IWorkbenchEditorConfiguration, TextEditorOptions } from 'vs/workbench/common/editor';
 import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { isEqual } from 'vs/base/common/resources';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 export class CodeEditorService extends CodeEditorServiceImpl {
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super(themeService);
 	}
@@ -71,11 +73,13 @@ export class CodeEditorService extends CodeEditorServiceImpl {
 	private async doOpenCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
 
 		// Special case: we want to detect the request to open an editor that
-		// is different from the current one to decide wether the current editor
+		// is different from the current one to decide whether the current editor
 		// should be pinned or not. This ensures that the source of a navigation
 		// is not being replaced by the target. An example is "Goto definition"
 		// that otherwise would replace the editor everytime the user navigates.
+		const enablePreviewFromCodeNavigation = this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench?.editor?.enablePreviewFromCodeNavigation;
 		if (
+			!enablePreviewFromCodeNavigation &&              	// we only need to do this if the configuration requires it
 			source &&											// we need to know the origin of the navigation
 			!input.options?.pinned &&							// we only need to look at preview editors that open
 			!sideBySide &&										// we only need to care if editor opens in same group
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
index 458e5e411..5e0686ee5 100644
--- a/src/vs/workbench/services/editor/browser/editorService.ts
+++ b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -11,7 +11,7 @@ import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorIn
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ResourceMap } from 'vs/base/common/map';
 import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
-import { IFileService, FileOperationEvent, FileOperation, FileChangesEvent, FileChangeType, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
+import { IFileService, FileOperationEvent, FileOperation, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files';
 import { Schemas } from 'vs/base/common/network';
 import { Event, Emitter } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
@@ -251,8 +251,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				if (this.uriIdentityService.extUri.isEqual(source, resource)) {
 					targetResource = target; // file got moved
 				} else {
-					const ignoreCase = !this.fileService.hasCapability(resource, FileSystemProviderCapabilities.PathCaseSensitive);
-					const index = indexOfPath(resource.path, source.path, ignoreCase);
+					const index = indexOfPath(resource.path, source.path, this.uriIdentityService.extUri.ignorePathCasing(resource));
 					targetResource = joinPath(target, resource.path.substr(index + source.path.length + 1)); // parent folder got moved
 				}
 
@@ -757,6 +756,26 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#endregion
 
+	//#region findEditor()
+
+	findEditors(resource: URI, group: IEditorGroup | GroupIdentifier): IEditorInput[] {
+		if (!this.isOpen({ resource })) {
+			return [];
+		}
+
+		const canonicalResource = this.asCanonicalEditorResource(resource);
+		const targetGroup = typeof group === 'number' ? this.editorGroupService.getGroup(group) : group;
+		if (!targetGroup) {
+			return [];
+		}
+
+		return targetGroup.getEditors(EditorsOrder.SEQUENTIAL).filter(editor => {
+			return editor.resource && isEqual(editor.resource, canonicalResource);
+		});
+	}
+
+	//#endregion
+
 	//#region replaceEditors()
 
 	async replaceEditors(editors: IResourceEditorReplacement[], group: IEditorGroup | GroupIdentifier): Promise<void>;
@@ -1323,6 +1342,8 @@ export class DelegatingEditorService implements IEditorService {
 	isOpen(editor: IResourceEditorInput): boolean;
 	isOpen(editor: IEditorInput | IResourceEditorInput): boolean { return this.editorService.isOpen(editor as IResourceEditorInput /* TS fail */); }
 
+	findEditors(resource: URI, group: IEditorGroup | GroupIdentifier) { return this.editorService.findEditors(resource, group); }
+
 	overrideOpenEditor(handler: IOpenEditorOverrideHandler): IDisposable { return this.editorService.overrideOpenEditor(handler); }
 	getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined) { return this.editorService.getEditorOverrides(resource, options, group); }
 
diff --git a/src/vs/workbench/services/editor/common/editorOpenWith.ts b/src/vs/workbench/services/editor/common/editorOpenWith.ts
index 425fa2aba..7dc8cdfa3 100644
--- a/src/vs/workbench/services/editor/common/editorOpenWith.ts
+++ b/src/vs/workbench/services/editor/common/editorOpenWith.ts
@@ -9,14 +9,16 @@ import { IConfigurationNode, IConfigurationRegistry, Extensions } from 'vs/platf
 import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ICustomEditorInfo, IEditorService, IOpenEditorOverrideHandler, IOpenEditorOverrideEntry } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorInput, IEditorPane, IEditorInputFactoryRegistry, Extensions as EditorExtensions, EditorResourceAccessor } from 'vs/workbench/common/editor';
+import { IEditorInput, IEditorPane, IEditorInputFactoryRegistry, Extensions as EditorExtensions, EditorResourceAccessor, EditorOptions } from 'vs/workbench/common/editor';
 import { ITextEditorOptions, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { IEditorGroup, OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroup, IEditorGroupsService, OpenEditorContext, preferredSideBySideGroupDirection } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IKeyMods, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { URI } from 'vs/base/common/uri';
 import { extname, basename, isEqual } from 'vs/base/common/resources';
 import { Codicon } from 'vs/base/common/codicons';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { firstOrDefault } from 'vs/base/common/arrays';
 
 /**
  * Id of the default editor for open with.
@@ -30,14 +32,17 @@ export const DEFAULT_EDITOR_ID = 'default';
  * @param id Id of the editor to use. If not provided, the user is prompted for which editor to use.
  */
 export async function openEditorWith(
+	accessor: ServicesAccessor,
 	input: IEditorInput,
 	id: string | undefined,
 	options: IEditorOptions | ITextEditorOptions | undefined,
 	group: IEditorGroup,
-	editorService: IEditorService,
-	configurationService: IConfigurationService,
-	quickInputService: IQuickInputService,
 ): Promise<IEditorPane | undefined> {
+	const editorService = accessor.get(IEditorService);
+	const editorGroupsService = accessor.get(IEditorGroupsService);
+	const configurationService = accessor.get(IConfigurationService);
+	const quickInputService = accessor.get(IQuickInputService);
+
 	const resource = input.resource;
 	if (!resource) {
 		return;
@@ -77,51 +82,94 @@ export async function openEditorWith(
 			}] : undefined
 		};
 	});
+	type QuickPickItem = IQuickPickItem & {
+		readonly handler: IOpenEditorOverrideHandler;
+	};
 
-	const picker = quickInputService.createQuickPick<(IQuickPickItem & { handler: IOpenEditorOverrideHandler })>();
+	const picker = quickInputService.createQuickPick<QuickPickItem>();
 	picker.items = items;
 	if (items.length) {
 		picker.selectedItems = [items[0]];
 	}
 	picker.placeholder = nls.localize('promptOpenWith.placeHolder', "Select editor for '{0}'", basename(originalResource));
+	picker.canAcceptInBackground = true;
 
-	const pickedItem = await new Promise<(IQuickPickItem & { handler: IOpenEditorOverrideHandler }) | undefined>(resolve => {
-		picker.onDidAccept(() => {
-			resolve(picker.selectedItems.length === 1 ? picker.selectedItems[0] : undefined);
-			picker.dispose();
-		});
+	type PickedResult = {
+		readonly item: QuickPickItem;
+		readonly keyMods?: IKeyMods;
+		readonly openInBackground: boolean;
+	};
 
-		picker.onDidTriggerItemButton(e => {
-			const pick = e.item;
-			const id = pick.id;
-			resolve(pick); // open the view
-			picker.dispose();
+	function openEditor(picked: PickedResult) {
+		const targetGroup = getTargetGroup(group, picked.keyMods, configurationService, editorGroupsService);
 
-			// And persist the setting
-			if (pick && id) {
-				const newAssociation: CustomEditorAssociation = { viewType: id, filenamePattern: '*' + resourceExt };
-				const currentAssociations = [...configurationService.getValue<CustomEditorsAssociations>(customEditorsAssociationsSettingId)];
+		const openOptions: IEditorOptions = {
+			...options,
+			override: picked.item.id,
+			preserveFocus: picked.openInBackground || options?.preserveFocus,
+		};
+		return picked.item.handler.open(input, openOptions, targetGroup, OpenEditorContext.NEW_EDITOR)?.override;
+	}
 
-				// First try updating existing association
-				for (let i = 0; i < currentAssociations.length; ++i) {
-					const existing = currentAssociations[i];
-					if (existing.filenamePattern === newAssociation.filenamePattern) {
-						currentAssociations.splice(i, 1, newAssociation);
-						configurationService.updateValue(customEditorsAssociationsSettingId, currentAssociations);
-						return;
+	let picked: PickedResult | undefined;
+	try {
+		picked = await new Promise<PickedResult | undefined>(resolve => {
+			picker.onDidAccept(e => {
+				if (picker.selectedItems.length === 1) {
+					const result: PickedResult = {
+						item: picker.selectedItems[0],
+						keyMods: picker.keyMods,
+						openInBackground: e.inBackground
+					};
+
+					if (e.inBackground) {
+						openEditor(result);
+					} else {
+						resolve(result);
 					}
+				} else {
+					resolve(undefined);
 				}
+			});
 
-				// Otherwise, create a new one
-				currentAssociations.unshift(newAssociation);
-				configurationService.updateValue(customEditorsAssociationsSettingId, currentAssociations);
-			}
+			picker.onDidTriggerItemButton(e => {
+				const pick = e.item;
+				const id = pick.id;
+				resolve({ item: pick, openInBackground: false }); // open the view
+				picker.dispose();
+
+				// And persist the setting
+				if (pick && id) {
+					const newAssociation: CustomEditorAssociation = { viewType: id, filenamePattern: '*' + resourceExt };
+					const currentAssociations = [...configurationService.getValue<CustomEditorsAssociations>(customEditorsAssociationsSettingId)];
+
+					// First try updating existing association
+					for (let i = 0; i < currentAssociations.length; ++i) {
+						const existing = currentAssociations[i];
+						if (existing.filenamePattern === newAssociation.filenamePattern) {
+							currentAssociations.splice(i, 1, newAssociation);
+							configurationService.updateValue(customEditorsAssociationsSettingId, currentAssociations);
+							return;
+						}
+					}
+
+					// Otherwise, create a new one
+					currentAssociations.unshift(newAssociation);
+					configurationService.updateValue(customEditorsAssociationsSettingId, currentAssociations);
+				}
+			});
+
+			picker.show();
 		});
+	} finally {
+		picker.dispose();
+	}
 
-		picker.show();
-	});
+	if (!picked) {
+		return undefined;
+	}
 
-	return pickedItem?.handler.open(input, { ...options, override: pickedItem.id }, group, OpenEditorContext.NEW_EDITOR)?.override;
+	return openEditor(picked);
 }
 
 const builtinProviderDisplayName = nls.localize('builtinProviderDisplayName', "Built-in");
@@ -132,6 +180,23 @@ export const defaultEditorOverrideEntry = Object.freeze({
 	detail: builtinProviderDisplayName
 });
 
+/**
+ * Get the group to open the editor in by looking at the pressed keys from the picker.
+ */
+function getTargetGroup(
+	startingGroup: IEditorGroup,
+	keyMods: IKeyMods | undefined,
+	configurationService: IConfigurationService,
+	editorGroupsService: IEditorGroupsService,
+) {
+	if (keyMods?.alt || keyMods?.ctrlCmd) {
+		const direction = preferredSideBySideGroupDirection(configurationService);
+		const targetGroup = editorGroupsService.findGroup({ direction }, startingGroup.id);
+		return targetGroup ?? editorGroupsService.addGroup(startingGroup, direction);
+	}
+	return startingGroup;
+}
+
 /**
  * Get a list of all available editors, including the default text editor.
  */
@@ -155,7 +220,21 @@ export function getAllAvailableEditors(
 
 					const fileEditorInput = editorService.createEditorInput({ resource, forceFile: true });
 					const textOptions: IEditorOptions | ITextEditorOptions = options ? { ...options, override: false } : { override: false };
-					return { override: editorService.openEditor(fileEditorInput, textOptions, group) };
+					return {
+						override: (async () => {
+							// Try to replace existing editors for resource
+							const existingEditor = firstOrDefault(editorService.findEditors(resource, group));
+							if (existingEditor && !fileEditorInput.matches(existingEditor)) {
+								await editorService.replaceEditors([{
+									editor: existingEditor,
+									replacement: fileEditorInput,
+									options: options ? EditorOptions.create(options) : undefined,
+								}], group);
+							}
+
+							return editorService.openEditor(fileEditorInput, textOptions, group);
+						})()
+					};
 				}
 			},
 			{
@@ -169,7 +248,7 @@ export function getAllAvailableEditors(
 
 export const customEditorsAssociationsSettingId = 'workbench.editorAssociations';
 
-export const viewTypeSchamaAddition: IJSONSchema = {
+export const viewTypeSchemaAddition: IJSONSchema = {
 	type: 'string',
 	enum: []
 };
@@ -202,7 +281,7 @@ export const editorAssociationsConfigurationNode: IConfigurationNode = {
 								type: 'string',
 								description: nls.localize('editor.editorAssociations.viewType', "The unique id of the editor to use."),
 							},
-							viewTypeSchamaAddition
+							viewTypeSchemaAddition
 						]
 					},
 					'filenamePattern': {
@@ -222,8 +301,8 @@ export const DEFAULT_CUSTOM_EDITOR: ICustomEditorInfo = {
 };
 
 export function updateViewTypeSchema(enumValues: string[], enumDescriptions: string[]): void {
-	viewTypeSchamaAddition.enum = enumValues;
-	viewTypeSchamaAddition.enumDescriptions = enumDescriptions;
+	viewTypeSchemaAddition.enum = enumValues;
+	viewTypeSchemaAddition.enumDescriptions = enumDescriptions;
 
 	Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 		.notifyConfigurationSchemaUpdated(editorAssociationsConfigurationNode);
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index 73542a7a1..fc0f40a1c 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -175,7 +175,7 @@ export interface IEditorService {
 	 * identifier.
 	 *
 	 * @param order the order of the editors to use
-	 * @param options wether to exclude sticky editors or not
+	 * @param options whether to exclude sticky editors or not
 	 */
 	getEditors(order: EditorsOrder, options?: { excludeSticky?: boolean }): ReadonlyArray<IEditorIdentifier>;
 
@@ -233,6 +233,11 @@ export interface IEditorService {
 	isOpen(editor: IResourceEditorInput): boolean;
 	isOpen(editor: IEditorInput): boolean;
 
+	/**
+	 * Find the existing editors for a given resource.
+	 */
+	findEditors(resource: URI, group: IEditorGroup | GroupIdentifier): IEditorInput[];
+
 	/**
 	 * Get all available editor overrides for the editor input.
 	 */
diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
index f4a54339f..d12b33a11 100644
--- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
@@ -63,31 +63,31 @@ suite('EditorGroupsService', () => {
 
 		// always a root group
 		const rootGroup = part.groups[0];
-		assert.equal(part.groups.length, 1);
-		assert.equal(part.count, 1);
-		assert.equal(rootGroup, part.getGroup(rootGroup.id));
+		assert.strictEqual(part.groups.length, 1);
+		assert.strictEqual(part.count, 1);
+		assert.strictEqual(rootGroup, part.getGroup(rootGroup.id));
 		assert.ok(part.activeGroup === rootGroup);
-		assert.equal(rootGroup.label, 'Group 1');
+		assert.strictEqual(rootGroup.label, 'Group 1');
 
 		let mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 1);
-		assert.equal(mru[0], rootGroup);
+		assert.strictEqual(mru.length, 1);
+		assert.strictEqual(mru[0], rootGroup);
 
 		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
-		assert.equal(rightGroup, part.getGroup(rightGroup.id));
-		assert.equal(groupAddedCounter, 1);
-		assert.equal(part.groups.length, 2);
-		assert.equal(part.count, 2);
+		assert.strictEqual(rightGroup, part.getGroup(rightGroup.id));
+		assert.strictEqual(groupAddedCounter, 1);
+		assert.strictEqual(part.groups.length, 2);
+		assert.strictEqual(part.count, 2);
 		assert.ok(part.activeGroup === rootGroup);
-		assert.equal(rootGroup.label, 'Group 1');
-		assert.equal(rightGroup.label, 'Group 2');
+		assert.strictEqual(rootGroup.label, 'Group 1');
+		assert.strictEqual(rightGroup.label, 'Group 2');
 
 		mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 2);
-		assert.equal(mru[0], rootGroup);
-		assert.equal(mru[1], rightGroup);
+		assert.strictEqual(mru.length, 2);
+		assert.strictEqual(mru[0], rootGroup);
+		assert.strictEqual(mru[1], rightGroup);
 
-		assert.equal(activeGroupChangeCounter, 0);
+		assert.strictEqual(activeGroupChangeCounter, 0);
 
 		let rootGroupActiveChangeCounter = 0;
 		const rootGroupChangeListener = rootGroup.onDidGroupChange(e => {
@@ -105,62 +105,62 @@ suite('EditorGroupsService', () => {
 
 		part.activateGroup(rightGroup);
 		assert.ok(part.activeGroup === rightGroup);
-		assert.equal(activeGroupChangeCounter, 1);
-		assert.equal(rootGroupActiveChangeCounter, 1);
-		assert.equal(rightGroupActiveChangeCounter, 1);
+		assert.strictEqual(activeGroupChangeCounter, 1);
+		assert.strictEqual(rootGroupActiveChangeCounter, 1);
+		assert.strictEqual(rightGroupActiveChangeCounter, 1);
 
 		rootGroupChangeListener.dispose();
 		rightGroupChangeListener.dispose();
 
 		mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 2);
-		assert.equal(mru[0], rightGroup);
-		assert.equal(mru[1], rootGroup);
+		assert.strictEqual(mru.length, 2);
+		assert.strictEqual(mru[0], rightGroup);
+		assert.strictEqual(mru[1], rootGroup);
 
 		const downGroup = part.addGroup(rightGroup, GroupDirection.DOWN);
 		let didDispose = false;
 		downGroup.onWillDispose(() => {
 			didDispose = true;
 		});
-		assert.equal(groupAddedCounter, 2);
-		assert.equal(part.groups.length, 3);
+		assert.strictEqual(groupAddedCounter, 2);
+		assert.strictEqual(part.groups.length, 3);
 		assert.ok(part.activeGroup === rightGroup);
 		assert.ok(!downGroup.activeEditorPane);
-		assert.equal(rootGroup.label, 'Group 1');
-		assert.equal(rightGroup.label, 'Group 2');
-		assert.equal(downGroup.label, 'Group 3');
+		assert.strictEqual(rootGroup.label, 'Group 1');
+		assert.strictEqual(rightGroup.label, 'Group 2');
+		assert.strictEqual(downGroup.label, 'Group 3');
 
 		mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 3);
-		assert.equal(mru[0], rightGroup);
-		assert.equal(mru[1], rootGroup);
-		assert.equal(mru[2], downGroup);
+		assert.strictEqual(mru.length, 3);
+		assert.strictEqual(mru[0], rightGroup);
+		assert.strictEqual(mru[1], rootGroup);
+		assert.strictEqual(mru[2], downGroup);
 
 		const gridOrder = part.getGroups(GroupsOrder.GRID_APPEARANCE);
-		assert.equal(gridOrder.length, 3);
-		assert.equal(gridOrder[0], rootGroup);
-		assert.equal(gridOrder[0].index, 0);
-		assert.equal(gridOrder[1], rightGroup);
-		assert.equal(gridOrder[1].index, 1);
-		assert.equal(gridOrder[2], downGroup);
-		assert.equal(gridOrder[2].index, 2);
+		assert.strictEqual(gridOrder.length, 3);
+		assert.strictEqual(gridOrder[0], rootGroup);
+		assert.strictEqual(gridOrder[0].index, 0);
+		assert.strictEqual(gridOrder[1], rightGroup);
+		assert.strictEqual(gridOrder[1].index, 1);
+		assert.strictEqual(gridOrder[2], downGroup);
+		assert.strictEqual(gridOrder[2].index, 2);
 
 		part.moveGroup(downGroup, rightGroup, GroupDirection.DOWN);
-		assert.equal(groupMovedCounter, 1);
+		assert.strictEqual(groupMovedCounter, 1);
 
 		part.removeGroup(downGroup);
 		assert.ok(!part.getGroup(downGroup.id));
-		assert.equal(didDispose, true);
-		assert.equal(groupRemovedCounter, 1);
-		assert.equal(part.groups.length, 2);
+		assert.strictEqual(didDispose, true);
+		assert.strictEqual(groupRemovedCounter, 1);
+		assert.strictEqual(part.groups.length, 2);
 		assert.ok(part.activeGroup === rightGroup);
-		assert.equal(rootGroup.label, 'Group 1');
-		assert.equal(rightGroup.label, 'Group 2');
+		assert.strictEqual(rootGroup.label, 'Group 1');
+		assert.strictEqual(rightGroup.label, 'Group 2');
 
 		mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 2);
-		assert.equal(mru[0], rightGroup);
-		assert.equal(mru[1], rootGroup);
+		assert.strictEqual(mru.length, 2);
+		assert.strictEqual(mru[0], rightGroup);
+		assert.strictEqual(mru[1], rootGroup);
 
 		const rightGroupContextKeyService = part.activeGroup.scopedContextKeyService;
 		const rootGroupContextKeyService = rootGroup.scopedContextKeyService;
@@ -170,17 +170,17 @@ suite('EditorGroupsService', () => {
 		assert.ok(rightGroupContextKeyService !== rootGroupContextKeyService);
 
 		part.removeGroup(rightGroup);
-		assert.equal(groupRemovedCounter, 2);
-		assert.equal(part.groups.length, 1);
+		assert.strictEqual(groupRemovedCounter, 2);
+		assert.strictEqual(part.groups.length, 1);
 		assert.ok(part.activeGroup === rootGroup);
 
 		mru = part.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru.length, 1);
-		assert.equal(mru[0], rootGroup);
+		assert.strictEqual(mru.length, 1);
+		assert.strictEqual(mru[0], rootGroup);
 
 		part.removeGroup(rootGroup); // cannot remove root group
-		assert.equal(part.groups.length, 1);
-		assert.equal(groupRemovedCounter, 2);
+		assert.strictEqual(part.groups.length, 1);
+		assert.strictEqual(groupRemovedCounter, 2);
 		assert.ok(part.activeGroup === rootGroup);
 
 		part.setGroupOrientation(part.orientation === GroupOrientation.HORIZONTAL ? GroupOrientation.VERTICAL : GroupOrientation.HORIZONTAL);
@@ -206,14 +206,14 @@ suite('EditorGroupsService', () => {
 		const rightGroupInput = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
 		await rightGroup.openEditor(rightGroupInput, EditorOptions.create({ pinned: true }));
 
-		assert.equal(part.groups.length, 3);
+		assert.strictEqual(part.groups.length, 3);
 
 		part.saveState();
 		part.dispose();
 
 		let [restoredPart] = createPart(instantiationService);
 
-		assert.equal(restoredPart.groups.length, 3);
+		assert.strictEqual(restoredPart.groups.length, 3);
 		assert.ok(restoredPart.getGroup(rootGroup.id));
 		assert.ok(restoredPart.getGroup(rightGroup.id));
 		assert.ok(restoredPart.getGroup(downGroup.id));
@@ -241,38 +241,38 @@ suite('EditorGroupsService', () => {
 			}
 		});
 
-		assert.equal(rootGroup.index, 0);
-		assert.equal(rightGroup.index, 1);
-		assert.equal(downGroup.index, 2);
-		assert.equal(rootGroup.label, 'Group 1');
-		assert.equal(rightGroup.label, 'Group 2');
-		assert.equal(downGroup.label, 'Group 3');
+		assert.strictEqual(rootGroup.index, 0);
+		assert.strictEqual(rightGroup.index, 1);
+		assert.strictEqual(downGroup.index, 2);
+		assert.strictEqual(rootGroup.label, 'Group 1');
+		assert.strictEqual(rightGroup.label, 'Group 2');
+		assert.strictEqual(downGroup.label, 'Group 3');
 
 		part.removeGroup(rightGroup);
-		assert.equal(rootGroup.index, 0);
-		assert.equal(downGroup.index, 1);
-		assert.equal(rootGroup.label, 'Group 1');
-		assert.equal(downGroup.label, 'Group 2');
-		assert.equal(indexChangeCounter, 1);
-		assert.equal(groupIndexChangedCounter, 1);
+		assert.strictEqual(rootGroup.index, 0);
+		assert.strictEqual(downGroup.index, 1);
+		assert.strictEqual(rootGroup.label, 'Group 1');
+		assert.strictEqual(downGroup.label, 'Group 2');
+		assert.strictEqual(indexChangeCounter, 1);
+		assert.strictEqual(groupIndexChangedCounter, 1);
 
 		part.moveGroup(downGroup, rootGroup, GroupDirection.UP);
-		assert.equal(downGroup.index, 0);
-		assert.equal(rootGroup.index, 1);
-		assert.equal(downGroup.label, 'Group 1');
-		assert.equal(rootGroup.label, 'Group 2');
-		assert.equal(indexChangeCounter, 2);
-		assert.equal(groupIndexChangedCounter, 3);
+		assert.strictEqual(downGroup.index, 0);
+		assert.strictEqual(rootGroup.index, 1);
+		assert.strictEqual(downGroup.label, 'Group 1');
+		assert.strictEqual(rootGroup.label, 'Group 2');
+		assert.strictEqual(indexChangeCounter, 2);
+		assert.strictEqual(groupIndexChangedCounter, 3);
 
 		const newFirstGroup = part.addGroup(downGroup, GroupDirection.UP);
-		assert.equal(newFirstGroup.index, 0);
-		assert.equal(downGroup.index, 1);
-		assert.equal(rootGroup.index, 2);
-		assert.equal(newFirstGroup.label, 'Group 1');
-		assert.equal(downGroup.label, 'Group 2');
-		assert.equal(rootGroup.label, 'Group 3');
-		assert.equal(indexChangeCounter, 3);
-		assert.equal(groupIndexChangedCounter, 6);
+		assert.strictEqual(newFirstGroup.index, 0);
+		assert.strictEqual(downGroup.index, 1);
+		assert.strictEqual(rootGroup.index, 2);
+		assert.strictEqual(newFirstGroup.label, 'Group 1');
+		assert.strictEqual(downGroup.label, 'Group 2');
+		assert.strictEqual(rootGroup.label, 'Group 3');
+		assert.strictEqual(indexChangeCounter, 3);
+		assert.strictEqual(groupIndexChangedCounter, 6);
 
 		labelChangeListener.dispose();
 		groupIndexChangedListener.dispose();
@@ -304,17 +304,17 @@ suite('EditorGroupsService', () => {
 		await rootGroup.openEditor(input, EditorOptions.create({ pinned: true }));
 		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT, { activate: true });
 		const downGroup = part.copyGroup(rootGroup, rightGroup, GroupDirection.DOWN);
-		assert.equal(groupAddedCounter, 2);
-		assert.equal(downGroup.count, 1);
+		assert.strictEqual(groupAddedCounter, 2);
+		assert.strictEqual(downGroup.count, 1);
 		assert.ok(downGroup.activeEditor instanceof TestFileEditorInput);
 		part.mergeGroup(rootGroup, rightGroup, { mode: MergeGroupMode.COPY_EDITORS });
-		assert.equal(rightGroup.count, 1);
+		assert.strictEqual(rightGroup.count, 1);
 		assert.ok(rightGroup.activeEditor instanceof TestFileEditorInput);
 		part.mergeGroup(rootGroup, rightGroup, { mode: MergeGroupMode.MOVE_EDITORS });
-		assert.equal(rootGroup.count, 0);
+		assert.strictEqual(rootGroup.count, 0);
 		part.mergeGroup(rootGroup, downGroup);
-		assert.equal(groupRemovedCounter, 1);
-		assert.equal(rootGroupDisposed, true);
+		assert.strictEqual(groupRemovedCounter, 1);
+		assert.strictEqual(rootGroupDisposed, true);
 		groupAddedListener.dispose();
 		groupRemovedListener.dispose();
 		disposeListener.dispose();
@@ -343,9 +343,9 @@ suite('EditorGroupsService', () => {
 		assert.ok(currentOptions);
 
 		part.enforcePartOptions({ showTabs: false });
-		assert.equal(part.partOptions.showTabs, false);
-		assert.equal(newOptions.showTabs, false);
-		assert.equal(oldOptions, currentOptions);
+		assert.strictEqual(part.partOptions.showTabs, false);
+		assert.strictEqual(newOptions.showTabs, false);
+		assert.strictEqual(oldOptions, currentOptions);
 
 		part.dispose();
 	});
@@ -353,7 +353,7 @@ suite('EditorGroupsService', () => {
 	test('editor basics', async function () {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		await part.whenRestored;
 
@@ -402,56 +402,56 @@ suite('EditorGroupsService', () => {
 		await group.openEditor(input, EditorOptions.create({ pinned: true }));
 		await group.openEditor(inputInactive, EditorOptions.create({ inactive: true }));
 
-		assert.equal(group.isActive(input), true);
-		assert.equal(group.isActive(inputInactive), false);
-		assert.equal(group.isOpened(input), true);
-		assert.equal(group.isOpened(inputInactive), true);
-		assert.equal(group.isEmpty, false);
-		assert.equal(group.count, 2);
-		assert.equal(editorWillOpenCounter, 2);
-		assert.equal(editorDidOpenCounter, 2);
-		assert.equal(activeEditorChangeCounter, 1);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
-		assert.equal(group.getIndexOfEditor(input), 0);
-		assert.equal(group.getIndexOfEditor(inputInactive), 1);
+		assert.strictEqual(group.isActive(input), true);
+		assert.strictEqual(group.isActive(inputInactive), false);
+		assert.strictEqual(group.isOpened(input), true);
+		assert.strictEqual(group.isOpened(inputInactive), true);
+		assert.strictEqual(group.isEmpty, false);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(editorWillOpenCounter, 2);
+		assert.strictEqual(editorDidOpenCounter, 2);
+		assert.strictEqual(activeEditorChangeCounter, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.getIndexOfEditor(input), 0);
+		assert.strictEqual(group.getIndexOfEditor(inputInactive), 1);
 
-		assert.equal(group.previewEditor, inputInactive);
-		assert.equal(group.isPinned(inputInactive), false);
+		assert.strictEqual(group.previewEditor, inputInactive);
+		assert.strictEqual(group.isPinned(inputInactive), false);
 		group.pinEditor(inputInactive);
-		assert.equal(editorPinCounter, 1);
-		assert.equal(group.isPinned(inputInactive), true);
+		assert.strictEqual(editorPinCounter, 1);
+		assert.strictEqual(group.isPinned(inputInactive), true);
 		assert.ok(!group.previewEditor);
 
-		assert.equal(group.activeEditor, input);
-		assert.equal(group.activeEditorPane?.getId(), TEST_EDITOR_ID);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, input);
+		assert.strictEqual(group.activeEditorPane?.getId(), TEST_EDITOR_ID);
+		assert.strictEqual(group.count, 2);
 
 		const mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input);
-		assert.equal(mru[1], inputInactive);
+		assert.strictEqual(mru[0], input);
+		assert.strictEqual(mru[1], inputInactive);
 
 		await group.openEditor(inputInactive);
-		assert.equal(activeEditorChangeCounter, 2);
-		assert.equal(group.activeEditor, inputInactive);
+		assert.strictEqual(activeEditorChangeCounter, 2);
+		assert.strictEqual(group.activeEditor, inputInactive);
 
 		await group.openEditor(input);
 		await group.closeEditor(inputInactive);
 
-		assert.equal(activeEditorChangeCounter, 3);
-		assert.equal(editorCloseCounter, 1);
-		assert.equal(editorCloseCounter1, 1);
-		assert.equal(editorWillCloseCounter, 1);
+		assert.strictEqual(activeEditorChangeCounter, 3);
+		assert.strictEqual(editorCloseCounter, 1);
+		assert.strictEqual(editorCloseCounter1, 1);
+		assert.strictEqual(editorWillCloseCounter, 1);
 
 		assert.ok(inputInactive.gotDisposed);
 
-		assert.equal(group.activeEditor, input);
+		assert.strictEqual(group.activeEditor, input);
 
-		assert.equal(editorStickyCounter, 0);
+		assert.strictEqual(editorStickyCounter, 0);
 		group.stickEditor(input);
-		assert.equal(editorStickyCounter, 1);
+		assert.strictEqual(editorStickyCounter, 1);
 		group.unstickEditor(input);
-		assert.equal(editorStickyCounter, 2);
+		assert.strictEqual(editorStickyCounter, 2);
 
 		editorCloseListener.dispose();
 		editorWillCloseListener.dispose();
@@ -463,7 +463,7 @@ suite('EditorGroupsService', () => {
 	test('openEditors / closeEditors', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
@@ -473,23 +473,23 @@ suite('EditorGroupsService', () => {
 			{ editor: inputInactive }
 		]);
 
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
 
 		await group.closeEditors([input, inputInactive]);
 
 		assert.ok(input.gotDisposed);
 		assert.ok(inputInactive.gotDisposed);
 
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 		part.dispose();
 	});
 
 	test('closeEditors (one, opened in multiple groups)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const rightGroup = part.addGroup(group, GroupDirection.RIGHT);
 
@@ -511,7 +511,7 @@ suite('EditorGroupsService', () => {
 	test('closeEditors (except one)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -523,21 +523,21 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ except: input2 });
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditorByIndex(0), input2);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input2);
 		part.dispose();
 	});
 
 	test('closeEditors (except one, sticky editor)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -549,31 +549,31 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ except: input2, excludeSticky: true });
 
-		assert.equal(group.count, 2);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
 
 		await group.closeEditors({ except: input2 });
 
-		assert.equal(group.count, 1);
-		assert.equal(group.stickyCount, 0);
-		assert.equal(group.getEditorByIndex(0), input2);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.stickyCount, 0);
+		assert.strictEqual(group.getEditorByIndex(0), input2);
 		part.dispose();
 	});
 
 	test('closeEditors (saved only)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -585,20 +585,20 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ savedOnly: true });
-		assert.equal(group.count, 0);
+		assert.strictEqual(group.count, 0);
 		part.dispose();
 	});
 
 	test('closeEditors (saved only, sticky editor)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -610,27 +610,27 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ savedOnly: true, excludeSticky: true });
 
-		assert.equal(group.count, 1);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
 
 		await group.closeEditors({ savedOnly: true });
-		assert.equal(group.count, 0);
+		assert.strictEqual(group.count, 0);
 		part.dispose();
 	});
 
 	test('closeEditors (direction: right)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -642,22 +642,22 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ direction: CloseDirection.RIGHT, except: input2 });
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
 		part.dispose();
 	});
 
 	test('closeEditors (direction: right, sticky editor)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -669,29 +669,29 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ direction: CloseDirection.RIGHT, except: input2, excludeSticky: true });
-		assert.equal(group.count, 2);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
 
 		await group.closeEditors({ direction: CloseDirection.RIGHT, except: input2 });
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
 		part.dispose();
 	});
 
 	test('closeEditors (direction: left)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -703,22 +703,22 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ direction: CloseDirection.LEFT, except: input2 });
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input2);
-		assert.equal(group.getEditorByIndex(1), input3);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input2);
+		assert.strictEqual(group.getEditorByIndex(1), input3);
 		part.dispose();
 	});
 
 	test('closeEditors (direction: left, sticky editor)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input1 = new TestFileEditorInput(URI.file('foo/bar1'), TEST_EDITOR_INPUT_ID);
 		const input2 = new TestFileEditorInput(URI.file('foo/bar2'), TEST_EDITOR_INPUT_ID);
@@ -730,30 +730,30 @@ suite('EditorGroupsService', () => {
 			{ editor: input3 }
 		]);
 
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ direction: CloseDirection.LEFT, except: input2, excludeSticky: true });
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input1);
-		assert.equal(group.getEditorByIndex(1), input2);
-		assert.equal(group.getEditorByIndex(2), input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input1);
+		assert.strictEqual(group.getEditorByIndex(1), input2);
+		assert.strictEqual(group.getEditorByIndex(2), input3);
 
 		await group.closeEditors({ direction: CloseDirection.LEFT, except: input2 });
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input2);
-		assert.equal(group.getEditorByIndex(1), input3);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input2);
+		assert.strictEqual(group.getEditorByIndex(1), input3);
 		part.dispose();
 	});
 
 	test('closeAllEditors', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
@@ -763,19 +763,19 @@ suite('EditorGroupsService', () => {
 			{ editor: inputInactive }
 		]);
 
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
 
 		await group.closeAllEditors();
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 		part.dispose();
 	});
 
 	test('closeAllEditors (sticky editor)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
@@ -785,18 +785,18 @@ suite('EditorGroupsService', () => {
 			{ editor: inputInactive }
 		]);
 
-		assert.equal(group.count, 2);
-		assert.equal(group.stickyCount, 1);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.stickyCount, 1);
 
 		await group.closeAllEditors({ excludeSticky: true });
 
-		assert.equal(group.count, 1);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input);
 
 		await group.closeAllEditors();
 
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		part.dispose();
 	});
@@ -804,7 +804,7 @@ suite('EditorGroupsService', () => {
 	test('moveEditor (same group)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
@@ -818,13 +818,13 @@ suite('EditorGroupsService', () => {
 		});
 
 		await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]);
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
 		group.moveEditor(inputInactive, group, { index: 0 });
-		assert.equal(editorMoveCounter, 1);
-		assert.equal(group.getEditorByIndex(0), inputInactive);
-		assert.equal(group.getEditorByIndex(1), input);
+		assert.strictEqual(editorMoveCounter, 1);
+		assert.strictEqual(group.getEditorByIndex(0), inputInactive);
+		assert.strictEqual(group.getEditorByIndex(1), input);
 		editorGroupChangeListener.dispose();
 		part.dispose();
 	});
@@ -832,7 +832,7 @@ suite('EditorGroupsService', () => {
 	test('moveEditor (across groups)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const rightGroup = part.addGroup(group, GroupDirection.RIGHT);
 
@@ -840,21 +840,21 @@ suite('EditorGroupsService', () => {
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
 
 		await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]);
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
 		group.moveEditor(inputInactive, rightGroup, { index: 0 });
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(rightGroup.count, 1);
-		assert.equal(rightGroup.getEditorByIndex(0), inputInactive);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(rightGroup.count, 1);
+		assert.strictEqual(rightGroup.getEditorByIndex(0), inputInactive);
 		part.dispose();
 	});
 
 	test('copyEditor (across groups)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const rightGroup = part.addGroup(group, GroupDirection.RIGHT);
 
@@ -862,33 +862,33 @@ suite('EditorGroupsService', () => {
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
 
 		await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]);
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
 		group.copyEditor(inputInactive, rightGroup, { index: 0 });
-		assert.equal(group.count, 2);
-		assert.equal(group.getEditorByIndex(0), input);
-		assert.equal(group.getEditorByIndex(1), inputInactive);
-		assert.equal(rightGroup.count, 1);
-		assert.equal(rightGroup.getEditorByIndex(0), inputInactive);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.getEditorByIndex(1), inputInactive);
+		assert.strictEqual(rightGroup.count, 1);
+		assert.strictEqual(rightGroup.getEditorByIndex(0), inputInactive);
 		part.dispose();
 	});
 
 	test('replaceEditors', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
 
 		await group.openEditor(input);
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditorByIndex(0), input);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditorByIndex(0), input);
 
 		await group.replaceEditors([{ editor: input, replacement: inputInactive }]);
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditorByIndex(0), inputInactive);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditorByIndex(0), inputInactive);
 		part.dispose();
 	});
 
@@ -897,8 +897,8 @@ suite('EditorGroupsService', () => {
 		const rootGroup = part.activeGroup;
 		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
 
-		assert.equal(rightGroup, part.findGroup({ direction: GroupDirection.RIGHT }, rootGroup));
-		assert.equal(rootGroup, part.findGroup({ direction: GroupDirection.LEFT }, rightGroup));
+		assert.strictEqual(rightGroup, part.findGroup({ direction: GroupDirection.RIGHT }, rootGroup));
+		assert.strictEqual(rootGroup, part.findGroup({ direction: GroupDirection.LEFT }, rightGroup));
 
 		part.dispose();
 	});
@@ -908,8 +908,8 @@ suite('EditorGroupsService', () => {
 		const rootGroup = part.activeGroup;
 		const downGroup = part.addGroup(rootGroup, GroupDirection.DOWN);
 
-		assert.equal(downGroup, part.findGroup({ direction: GroupDirection.DOWN }, rootGroup));
-		assert.equal(rootGroup, part.findGroup({ direction: GroupDirection.UP }, downGroup));
+		assert.strictEqual(downGroup, part.findGroup({ direction: GroupDirection.DOWN }, rootGroup));
+		assert.strictEqual(rootGroup, part.findGroup({ direction: GroupDirection.UP }, downGroup));
 
 		part.dispose();
 	});
@@ -920,14 +920,14 @@ suite('EditorGroupsService', () => {
 		const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
 		const downGroup = part.addGroup(rightGroup, GroupDirection.DOWN);
 
-		assert.equal(rootGroup, part.findGroup({ location: GroupLocation.FIRST }));
-		assert.equal(downGroup, part.findGroup({ location: GroupLocation.LAST }));
+		assert.strictEqual(rootGroup, part.findGroup({ location: GroupLocation.FIRST }));
+		assert.strictEqual(downGroup, part.findGroup({ location: GroupLocation.LAST }));
 
-		assert.equal(rightGroup, part.findGroup({ location: GroupLocation.NEXT }, rootGroup));
-		assert.equal(rootGroup, part.findGroup({ location: GroupLocation.PREVIOUS }, rightGroup));
+		assert.strictEqual(rightGroup, part.findGroup({ location: GroupLocation.NEXT }, rootGroup));
+		assert.strictEqual(rootGroup, part.findGroup({ location: GroupLocation.PREVIOUS }, rightGroup));
 
-		assert.equal(downGroup, part.findGroup({ location: GroupLocation.NEXT }, rightGroup));
-		assert.equal(rightGroup, part.findGroup({ location: GroupLocation.PREVIOUS }, downGroup));
+		assert.strictEqual(downGroup, part.findGroup({ location: GroupLocation.NEXT }, rightGroup));
+		assert.strictEqual(rightGroup, part.findGroup({ location: GroupLocation.PREVIOUS }, downGroup));
 
 		part.dispose();
 	});
@@ -937,7 +937,7 @@ suite('EditorGroupsService', () => {
 
 		part.applyLayout({ groups: [{ groups: [{}, {}] }, { groups: [{}, {}] }], orientation: GroupOrientation.HORIZONTAL });
 
-		assert.equal(part.groups.length, 4);
+		assert.strictEqual(part.groups.length, 4);
 
 		part.dispose();
 	});
@@ -947,7 +947,7 @@ suite('EditorGroupsService', () => {
 
 		part.centerLayout(true);
 
-		assert.equal(part.isLayoutCentered(), true);
+		assert.strictEqual(part.isLayoutCentered(), true);
 
 		part.dispose();
 	});
@@ -958,11 +958,11 @@ suite('EditorGroupsService', () => {
 
 		await part.whenRestored;
 
-		assert.equal(group.stickyCount, 0);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 0);
+		assert.strictEqual(group.stickyCount, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 0);
 
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
 		const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID);
@@ -970,39 +970,39 @@ suite('EditorGroupsService', () => {
 		await group.openEditor(input, EditorOptions.create({ pinned: true }));
 		await group.openEditor(inputInactive, EditorOptions.create({ inactive: true }));
 
-		assert.equal(group.stickyCount, 0);
-		assert.equal(group.isSticky(input), false);
-		assert.equal(group.isSticky(inputInactive), false);
+		assert.strictEqual(group.stickyCount, 0);
+		assert.strictEqual(group.isSticky(input), false);
+		assert.strictEqual(group.isSticky(inputInactive), false);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 2);
 
 		group.stickEditor(input);
 
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input), true);
-		assert.equal(group.isSticky(inputInactive), false);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input), true);
+		assert.strictEqual(group.isSticky(inputInactive), false);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 1);
 
 		group.unstickEditor(input);
 
-		assert.equal(group.stickyCount, 0);
-		assert.equal(group.isSticky(input), false);
-		assert.equal(group.isSticky(inputInactive), false);
+		assert.strictEqual(group.stickyCount, 0);
+		assert.strictEqual(group.isSticky(input), false);
+		assert.strictEqual(group.isSticky(inputInactive), false);
 
-		assert.equal(group.getIndexOfEditor(input), 0);
-		assert.equal(group.getIndexOfEditor(inputInactive), 1);
+		assert.strictEqual(group.getIndexOfEditor(input), 0);
+		assert.strictEqual(group.getIndexOfEditor(inputInactive), 1);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 2);
 
 		let editorMoveCounter = 0;
 		const editorGroupChangeListener = group.onDidGroupChange(e => {
@@ -1014,42 +1014,42 @@ suite('EditorGroupsService', () => {
 
 		group.stickEditor(inputInactive);
 
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input), false);
-		assert.equal(group.isSticky(inputInactive), true);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input), false);
+		assert.strictEqual(group.isSticky(inputInactive), true);
 
-		assert.equal(group.getIndexOfEditor(input), 1);
-		assert.equal(group.getIndexOfEditor(inputInactive), 0);
-		assert.equal(editorMoveCounter, 1);
+		assert.strictEqual(group.getIndexOfEditor(input), 1);
+		assert.strictEqual(group.getIndexOfEditor(inputInactive), 0);
+		assert.strictEqual(editorMoveCounter, 1);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 1);
 
 		const inputSticky = new TestFileEditorInput(URI.file('foo/bar/sticky'), TEST_EDITOR_INPUT_ID);
 
 		await group.openEditor(inputSticky, EditorOptions.create({ sticky: true }));
 
-		assert.equal(group.stickyCount, 2);
-		assert.equal(group.isSticky(input), false);
-		assert.equal(group.isSticky(inputInactive), true);
-		assert.equal(group.isSticky(inputSticky), true);
+		assert.strictEqual(group.stickyCount, 2);
+		assert.strictEqual(group.isSticky(input), false);
+		assert.strictEqual(group.isSticky(inputInactive), true);
+		assert.strictEqual(group.isSticky(inputSticky), true);
 
-		assert.equal(group.getIndexOfEditor(inputInactive), 0);
-		assert.equal(group.getIndexOfEditor(inputSticky), 1);
-		assert.equal(group.getIndexOfEditor(input), 2);
+		assert.strictEqual(group.getIndexOfEditor(inputInactive), 0);
+		assert.strictEqual(group.getIndexOfEditor(inputSticky), 1);
+		assert.strictEqual(group.getIndexOfEditor(input), 2);
 
 		await group.openEditor(input, EditorOptions.create({ sticky: true }));
 
-		assert.equal(group.stickyCount, 3);
-		assert.equal(group.isSticky(input), true);
-		assert.equal(group.isSticky(inputInactive), true);
-		assert.equal(group.isSticky(inputSticky), true);
+		assert.strictEqual(group.stickyCount, 3);
+		assert.strictEqual(group.isSticky(input), true);
+		assert.strictEqual(group.isSticky(inputInactive), true);
+		assert.strictEqual(group.isSticky(inputSticky), true);
 
-		assert.equal(group.getIndexOfEditor(inputInactive), 0);
-		assert.equal(group.getIndexOfEditor(inputSticky), 1);
-		assert.equal(group.getIndexOfEditor(input), 2);
+		assert.strictEqual(group.getIndexOfEditor(inputInactive), 0);
+		assert.strictEqual(group.getIndexOfEditor(inputSticky), 1);
+		assert.strictEqual(group.getIndexOfEditor(input), 2);
 
 		editorGroupChangeListener.dispose();
 		part.dispose();
@@ -1058,7 +1058,7 @@ suite('EditorGroupsService', () => {
 	test('moveEditor with context (across groups)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const rightGroup = part.addGroup(group, GroupDirection.RIGHT);
 
@@ -1069,7 +1069,7 @@ suite('EditorGroupsService', () => {
 			firstOpenEditorContext = e.context;
 		});
 		await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]);
-		assert.equal(firstOpenEditorContext, undefined);
+		assert.strictEqual(firstOpenEditorContext, undefined);
 
 		const waitForEditorWillOpen = new Promise<OpenEditorContext | undefined>(resolve => {
 			Event.once(rightGroup.onWillOpenEditor)(e => resolve(e.context));
@@ -1077,14 +1077,14 @@ suite('EditorGroupsService', () => {
 
 		group.moveEditor(inputInactive, rightGroup, { index: 0 });
 		const context = await waitForEditorWillOpen;
-		assert.equal(context, OpenEditorContext.MOVE_EDITOR);
+		assert.strictEqual(context, OpenEditorContext.MOVE_EDITOR);
 		part.dispose();
 	});
 
 	test('copyEditor with context (across groups)', async () => {
 		const [part] = createPart();
 		const group = part.activeGroup;
-		assert.equal(group.isEmpty, true);
+		assert.strictEqual(group.isEmpty, true);
 
 		const rightGroup = part.addGroup(group, GroupDirection.RIGHT);
 		const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID);
@@ -1096,7 +1096,7 @@ suite('EditorGroupsService', () => {
 
 		group.copyEditor(inputInactive, rightGroup, { index: 0 });
 		const context = await waitForEditorWillOpen;
-		assert.equal(context, OpenEditorContext.COPY_EDITOR);
+		assert.strictEqual(context, OpenEditorContext.COPY_EDITOR);
 		part.dispose();
 	});
 });
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index c315aa1b8..96ce45db5 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -94,36 +94,36 @@ suite('EditorService', () => {
 		// Open input
 		let editor = await service.openEditor(input, { pinned: true });
 
-		assert.equal(editor?.getId(), TEST_EDITOR_ID);
-		assert.equal(editor, service.activeEditorPane);
-		assert.equal(1, service.count);
-		assert.equal(input, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].editor);
-		assert.equal(input, service.getEditors(EditorsOrder.SEQUENTIAL)[0].editor);
-		assert.equal(input, service.activeEditor);
-		assert.equal(service.visibleEditorPanes.length, 1);
-		assert.equal(service.visibleEditorPanes[0], editor);
+		assert.strictEqual(editor?.getId(), TEST_EDITOR_ID);
+		assert.strictEqual(editor, service.activeEditorPane);
+		assert.strictEqual(1, service.count);
+		assert.strictEqual(input, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].editor);
+		assert.strictEqual(input, service.getEditors(EditorsOrder.SEQUENTIAL)[0].editor);
+		assert.strictEqual(input, service.activeEditor);
+		assert.strictEqual(service.visibleEditorPanes.length, 1);
+		assert.strictEqual(service.visibleEditorPanes[0], editor);
 		assert.ok(!service.activeTextEditorControl);
 		assert.ok(!service.activeTextEditorMode);
-		assert.equal(service.visibleTextEditorControls.length, 0);
-		assert.equal(service.isOpen(input), true);
-		assert.equal(service.isOpen({ resource: input.resource }), true);
-		assert.equal(activeEditorChangeEventCounter, 1);
-		assert.equal(visibleEditorChangeEventCounter, 1);
+		assert.strictEqual(service.visibleTextEditorControls.length, 0);
+		assert.strictEqual(service.isOpen(input), true);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), true);
+		assert.strictEqual(activeEditorChangeEventCounter, 1);
+		assert.strictEqual(visibleEditorChangeEventCounter, 1);
 
 		// Close input
 		await editor?.group?.closeEditor(input);
 
-		assert.equal(0, service.count);
-		assert.equal(0, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length);
-		assert.equal(0, service.getEditors(EditorsOrder.SEQUENTIAL).length);
-		assert.equal(didCloseEditorListenerCounter, 1);
-		assert.equal(activeEditorChangeEventCounter, 2);
-		assert.equal(visibleEditorChangeEventCounter, 2);
+		assert.strictEqual(0, service.count);
+		assert.strictEqual(0, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length);
+		assert.strictEqual(0, service.getEditors(EditorsOrder.SEQUENTIAL).length);
+		assert.strictEqual(didCloseEditorListenerCounter, 1);
+		assert.strictEqual(activeEditorChangeEventCounter, 2);
+		assert.strictEqual(visibleEditorChangeEventCounter, 2);
 		assert.ok(input.gotDisposed);
 
 		// Open again 2 inputs (disposed editors are ignored!)
 		await service.openEditor(input, { pinned: true });
-		assert.equal(0, service.count);
+		assert.strictEqual(0, service.count);
 
 		// Open again 2 inputs (recreate because disposed)
 		input = new TestFileEditorInput(URI.parse('my://resource-basics'), TEST_EDITOR_INPUT_ID);
@@ -132,40 +132,40 @@ suite('EditorService', () => {
 		await service.openEditor(input, { pinned: true });
 		editor = await service.openEditor(otherInput, { pinned: true });
 
-		assert.equal(2, service.count);
-		assert.equal(otherInput, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].editor);
-		assert.equal(input, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].editor);
-		assert.equal(input, service.getEditors(EditorsOrder.SEQUENTIAL)[0].editor);
-		assert.equal(otherInput, service.getEditors(EditorsOrder.SEQUENTIAL)[1].editor);
-		assert.equal(service.visibleEditorPanes.length, 1);
-		assert.equal(service.isOpen(input), true);
-		assert.equal(service.isOpen({ resource: input.resource }), true);
-		assert.equal(service.isOpen(otherInput), true);
-		assert.equal(service.isOpen({ resource: otherInput.resource }), true);
+		assert.strictEqual(2, service.count);
+		assert.strictEqual(otherInput, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].editor);
+		assert.strictEqual(input, service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].editor);
+		assert.strictEqual(input, service.getEditors(EditorsOrder.SEQUENTIAL)[0].editor);
+		assert.strictEqual(otherInput, service.getEditors(EditorsOrder.SEQUENTIAL)[1].editor);
+		assert.strictEqual(service.visibleEditorPanes.length, 1);
+		assert.strictEqual(service.isOpen(input), true);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), true);
+		assert.strictEqual(service.isOpen(otherInput), true);
+		assert.strictEqual(service.isOpen({ resource: otherInput.resource }), true);
 
-		assert.equal(activeEditorChangeEventCounter, 4);
-		assert.equal(visibleEditorChangeEventCounter, 4);
+		assert.strictEqual(activeEditorChangeEventCounter, 4);
+		assert.strictEqual(visibleEditorChangeEventCounter, 4);
 
 		const stickyInput = new TestFileEditorInput(URI.parse('my://resource3-basics'), TEST_EDITOR_INPUT_ID);
 		await service.openEditor(stickyInput, { sticky: true });
 
-		assert.equal(3, service.count);
+		assert.strictEqual(3, service.count);
 
 		const allSequentialEditors = service.getEditors(EditorsOrder.SEQUENTIAL);
-		assert.equal(allSequentialEditors.length, 3);
-		assert.equal(stickyInput, allSequentialEditors[0].editor);
-		assert.equal(input, allSequentialEditors[1].editor);
-		assert.equal(otherInput, allSequentialEditors[2].editor);
+		assert.strictEqual(allSequentialEditors.length, 3);
+		assert.strictEqual(stickyInput, allSequentialEditors[0].editor);
+		assert.strictEqual(input, allSequentialEditors[1].editor);
+		assert.strictEqual(otherInput, allSequentialEditors[2].editor);
 
 		const sequentialEditorsExcludingSticky = service.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true });
-		assert.equal(sequentialEditorsExcludingSticky.length, 2);
-		assert.equal(input, sequentialEditorsExcludingSticky[0].editor);
-		assert.equal(otherInput, sequentialEditorsExcludingSticky[1].editor);
+		assert.strictEqual(sequentialEditorsExcludingSticky.length, 2);
+		assert.strictEqual(input, sequentialEditorsExcludingSticky[0].editor);
+		assert.strictEqual(otherInput, sequentialEditorsExcludingSticky[1].editor);
 
 		const mruEditorsExcludingSticky = service.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true });
-		assert.equal(mruEditorsExcludingSticky.length, 2);
-		assert.equal(input, sequentialEditorsExcludingSticky[0].editor);
-		assert.equal(otherInput, sequentialEditorsExcludingSticky[1].editor);
+		assert.strictEqual(mruEditorsExcludingSticky.length, 2);
+		assert.strictEqual(input, sequentialEditorsExcludingSticky[0].editor);
+		assert.strictEqual(otherInput, sequentialEditorsExcludingSticky[1].editor);
 
 		activeEditorChangeListener.dispose();
 		visibleEditorChangeListener.dispose();
@@ -184,39 +184,39 @@ suite('EditorService', () => {
 		await part.whenRestored;
 
 		const editor1 = await service.openEditor(sideBySideInput, { pinned: true });
-		assert.equal(part.activeGroup.count, 1);
+		assert.strictEqual(part.activeGroup.count, 1);
 
-		assert.equal(service.isOpen(input), false);
-		assert.equal(service.isOpen(otherInput), false);
-		assert.equal(service.isOpen(sideBySideInput), true);
-		assert.equal(service.isOpen({ resource: input.resource }), false);
-		assert.equal(service.isOpen({ resource: otherInput.resource }), true);
+		assert.strictEqual(service.isOpen(input), false);
+		assert.strictEqual(service.isOpen(otherInput), false);
+		assert.strictEqual(service.isOpen(sideBySideInput), true);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), false);
+		assert.strictEqual(service.isOpen({ resource: otherInput.resource }), true);
 
 		const editor2 = await service.openEditor(input, { pinned: true });
-		assert.equal(part.activeGroup.count, 2);
+		assert.strictEqual(part.activeGroup.count, 2);
 
-		assert.equal(service.isOpen(input), true);
-		assert.equal(service.isOpen(otherInput), false);
-		assert.equal(service.isOpen(sideBySideInput), true);
-		assert.equal(service.isOpen({ resource: input.resource }), true);
-		assert.equal(service.isOpen({ resource: otherInput.resource }), true);
+		assert.strictEqual(service.isOpen(input), true);
+		assert.strictEqual(service.isOpen(otherInput), false);
+		assert.strictEqual(service.isOpen(sideBySideInput), true);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), true);
+		assert.strictEqual(service.isOpen({ resource: otherInput.resource }), true);
 
 		await editor2?.group?.closeEditor(input);
-		assert.equal(part.activeGroup.count, 1);
+		assert.strictEqual(part.activeGroup.count, 1);
 
-		assert.equal(service.isOpen(input), false);
-		assert.equal(service.isOpen(otherInput), false);
-		assert.equal(service.isOpen(sideBySideInput), true);
-		assert.equal(service.isOpen({ resource: input.resource }), false);
-		assert.equal(service.isOpen({ resource: otherInput.resource }), true);
+		assert.strictEqual(service.isOpen(input), false);
+		assert.strictEqual(service.isOpen(otherInput), false);
+		assert.strictEqual(service.isOpen(sideBySideInput), true);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), false);
+		assert.strictEqual(service.isOpen({ resource: otherInput.resource }), true);
 
 		await editor1?.group?.closeEditor(sideBySideInput);
 
-		assert.equal(service.isOpen(input), false);
-		assert.equal(service.isOpen(otherInput), false);
-		assert.equal(service.isOpen(sideBySideInput), false);
-		assert.equal(service.isOpen({ resource: input.resource }), false);
-		assert.equal(service.isOpen({ resource: otherInput.resource }), false);
+		assert.strictEqual(service.isOpen(input), false);
+		assert.strictEqual(service.isOpen(otherInput), false);
+		assert.strictEqual(service.isOpen(sideBySideInput), false);
+		assert.strictEqual(service.isOpen({ resource: input.resource }), false);
+		assert.strictEqual(service.isOpen({ resource: otherInput.resource }), false);
 
 		part.dispose();
 	});
@@ -232,12 +232,12 @@ suite('EditorService', () => {
 
 		// Open editors
 		await service.openEditors([{ editor: input }, { editor: otherInput }]);
-		assert.equal(part.activeGroup.count, 2);
+		assert.strictEqual(part.activeGroup.count, 2);
 
 		// Replace editors
 		await service.replaceEditors([{ editor: input, replacement: replaceInput }], part.activeGroup);
-		assert.equal(part.activeGroup.count, 2);
-		assert.equal(part.activeGroup.getIndexOfEditor(replaceInput), 0);
+		assert.strictEqual(part.activeGroup.count, 2);
+		assert.strictEqual(part.activeGroup.getIndexOfEditor(replaceInput), 0);
 
 		part.dispose();
 	});
@@ -255,17 +255,17 @@ suite('EditorService', () => {
 		const fileEditorInput2 = service.createEditorInput({ resource: fileResource2 });
 		assert.ok(fileEditorInput2);
 
-		assert.notEqual(fileEditorInput1, fileEditorInput2);
+		assert.notStrictEqual(fileEditorInput1, fileEditorInput2);
 
 		const fileEditorInput1Again = service.createEditorInput({ resource: fileResource1 });
-		assert.equal(fileEditorInput1Again, fileEditorInput1);
+		assert.strictEqual(fileEditorInput1Again, fileEditorInput1);
 
 		fileEditorInput1Again.dispose();
 
 		assert.ok(fileEditorInput1.isDisposed());
 
 		const fileEditorInput1AgainAndAgain = service.createEditorInput({ resource: fileResource1 });
-		assert.notEqual(fileEditorInput1AgainAndAgain, fileEditorInput1);
+		assert.notStrictEqual(fileEditorInput1AgainAndAgain, fileEditorInput1);
 		assert.ok(!fileEditorInput1AgainAndAgain.isDisposed());
 
 		// Cached Input (Resource)
@@ -277,17 +277,17 @@ suite('EditorService', () => {
 		const input2 = service.createEditorInput({ resource: resource2 });
 		assert.ok(input2);
 
-		assert.notEqual(input1, input2);
+		assert.notStrictEqual(input1, input2);
 
 		const input1Again = service.createEditorInput({ resource: resource1 });
-		assert.equal(input1Again, input1);
+		assert.strictEqual(input1Again, input1);
 
 		input1Again.dispose();
 
 		assert.ok(input1.isDisposed());
 
 		const input1AgainAndAgain = service.createEditorInput({ resource: resource1 });
-		assert.notEqual(input1AgainAndAgain, input1);
+		assert.notStrictEqual(input1AgainAndAgain, input1);
 		assert.ok(!input1AgainAndAgain.isDisposed());
 	});
 
@@ -311,34 +311,34 @@ suite('EditorService', () => {
 		let inputDifferentCase = service.createEditorInput({ resource: toResource.call(this, '/INDEX.html') });
 
 		if (!isLinux) {
-			assert.equal(input, inputDifferentCase);
-			assert.equal(input.resource?.toString(), inputDifferentCase.resource?.toString());
+			assert.strictEqual(input, inputDifferentCase);
+			assert.strictEqual(input.resource?.toString(), inputDifferentCase.resource?.toString());
 		} else {
-			assert.notEqual(input, inputDifferentCase);
-			assert.notEqual(input.resource?.toString(), inputDifferentCase.resource?.toString());
+			assert.notStrictEqual(input, inputDifferentCase);
+			assert.notStrictEqual(input.resource?.toString(), inputDifferentCase.resource?.toString());
 		}
 
 		// Typed Input
-		assert.equal(service.createEditorInput(input), input);
-		assert.equal(service.createEditorInput({ editor: input }), input);
+		assert.strictEqual(service.createEditorInput(input), input);
+		assert.strictEqual(service.createEditorInput({ editor: input }), input);
 
 		// Untyped Input (file, encoding)
 		input = service.createEditorInput({ resource: toResource.call(this, '/index.html'), encoding: 'utf16le', options: { selection: { startLineNumber: 1, startColumn: 1 } } });
 		assert(input instanceof FileEditorInput);
 		contentInput = <FileEditorInput>input;
-		assert.equal(contentInput.getPreferredEncoding(), 'utf16le');
+		assert.strictEqual(contentInput.getPreferredEncoding(), 'utf16le');
 
 		// Untyped Input (file, mode)
 		input = service.createEditorInput({ resource: toResource.call(this, '/index.html'), mode });
 		assert(input instanceof FileEditorInput);
 		contentInput = <FileEditorInput>input;
-		assert.equal(contentInput.getPreferredMode(), mode);
+		assert.strictEqual(contentInput.getPreferredMode(), mode);
 
 		// Untyped Input (file, different mode)
 		input = service.createEditorInput({ resource: toResource.call(this, '/index.html'), mode: 'text' });
 		assert(input instanceof FileEditorInput);
 		contentInput = <FileEditorInput>input;
-		assert.equal(contentInput.getPreferredMode(), 'text');
+		assert.strictEqual(contentInput.getPreferredMode(), 'text');
 
 		// Untyped Input (untitled)
 		input = service.createEditorInput({ options: { selection: { startLineNumber: 1, startColumn: 1 } } });
@@ -348,13 +348,13 @@ suite('EditorService', () => {
 		input = service.createEditorInput({ contents: 'Hello Untitled', options: { selection: { startLineNumber: 1, startColumn: 1 } } });
 		assert(input instanceof UntitledTextEditorInput);
 		let model = await input.resolve() as UntitledTextEditorModel;
-		assert.equal(model.textEditorModel?.getValue(), 'Hello Untitled');
+		assert.strictEqual(model.textEditorModel?.getValue(), 'Hello Untitled');
 
 		// Untyped Input (untitled with mode)
 		input = service.createEditorInput({ mode, options: { selection: { startLineNumber: 1, startColumn: 1 } } });
 		assert(input instanceof UntitledTextEditorInput);
 		model = await input.resolve() as UntitledTextEditorModel;
-		assert.equal(model.getMode(), mode);
+		assert.strictEqual(model.getMode(), mode);
 
 		// Untyped Input (untitled with file path)
 		input = service.createEditorInput({ resource: URI.file('/some/path.txt'), forceUntitled: true, options: { selection: { startLineNumber: 1, startColumn: 1 } } });
@@ -434,16 +434,16 @@ suite('EditorService', () => {
 		await service.openEditor(input, { pinned: true }, rightGroup);
 
 		const editors = service.editors;
-		assert.equal(editors.length, 2);
-		assert.equal(editors[0], input);
-		assert.equal(editors[1], input);
+		assert.strictEqual(editors.length, 2);
+		assert.strictEqual(editors[0], input);
+		assert.strictEqual(editors[1], input);
 
 		// Close input
 		await rootGroup.closeEditor(input);
-		assert.equal(input.isDisposed(), false);
+		assert.strictEqual(input.isDisposed(), false);
 
 		await rightGroup.closeEditor(input);
-		assert.equal(input.isDisposed(), true);
+		assert.strictEqual(input.isDisposed(), true);
 
 		part.dispose();
 	});
@@ -461,15 +461,15 @@ suite('EditorService', () => {
 		await service.openEditor(input1, { pinned: true }, rootGroup);
 		let editor = await service.openEditor(input1, { pinned: true, preserveFocus: true }, SIDE_GROUP);
 
-		assert.equal(part.activeGroup, rootGroup);
-		assert.equal(part.count, 2);
-		assert.equal(editor?.group, part.groups[1]);
+		assert.strictEqual(part.activeGroup, rootGroup);
+		assert.strictEqual(part.count, 2);
+		assert.strictEqual(editor?.group, part.groups[1]);
 
 		// Open to the side uses existing neighbour group if any
 		editor = await service.openEditor(input2, { pinned: true, preserveFocus: true }, SIDE_GROUP);
-		assert.equal(part.activeGroup, rootGroup);
-		assert.equal(part.count, 2);
-		assert.equal(editor?.group, part.groups[1]);
+		assert.strictEqual(part.activeGroup, rootGroup);
+		assert.strictEqual(part.count, 2);
+		assert.strictEqual(editor?.group, part.groups[1]);
 
 		part.dispose();
 	});
@@ -488,23 +488,23 @@ suite('EditorService', () => {
 		let editor = await service.openEditor(input2, { pinned: true, preserveFocus: true, activation: EditorActivation.ACTIVATE }, SIDE_GROUP);
 		const sideGroup = editor?.group;
 
-		assert.equal(part.activeGroup, sideGroup);
+		assert.strictEqual(part.activeGroup, sideGroup);
 
 		editor = await service.openEditor(input1, { pinned: true, preserveFocus: true, activation: EditorActivation.PRESERVE }, rootGroup);
-		assert.equal(part.activeGroup, sideGroup);
+		assert.strictEqual(part.activeGroup, sideGroup);
 
 		editor = await service.openEditor(input1, { pinned: true, preserveFocus: true, activation: EditorActivation.ACTIVATE }, rootGroup);
-		assert.equal(part.activeGroup, rootGroup);
+		assert.strictEqual(part.activeGroup, rootGroup);
 
 		editor = await service.openEditor(input2, { pinned: true, activation: EditorActivation.PRESERVE }, sideGroup);
-		assert.equal(part.activeGroup, rootGroup);
+		assert.strictEqual(part.activeGroup, rootGroup);
 
 		editor = await service.openEditor(input2, { pinned: true, activation: EditorActivation.ACTIVATE }, sideGroup);
-		assert.equal(part.activeGroup, sideGroup);
+		assert.strictEqual(part.activeGroup, sideGroup);
 
 		part.arrangeGroups(GroupsArrangement.MINIMIZE_OTHERS);
 		editor = await service.openEditor(input1, { pinned: true, preserveFocus: true, activation: EditorActivation.RESTORE }, rootGroup);
-		assert.equal(part.activeGroup, sideGroup);
+		assert.strictEqual(part.activeGroup, sideGroup);
 
 		part.dispose();
 	});
@@ -526,12 +526,12 @@ suite('EditorService', () => {
 		});
 
 		function assertActiveEditorChangedEvent(expected: boolean) {
-			assert.equal(activeEditorChangeEventFired, expected, `Unexpected active editor change state (got ${activeEditorChangeEventFired}, expected ${expected})`);
+			assert.strictEqual(activeEditorChangeEventFired, expected, `Unexpected active editor change state (got ${activeEditorChangeEventFired}, expected ${expected})`);
 			activeEditorChangeEventFired = false;
 		}
 
 		function assertVisibleEditorsChangedEvent(expected: boolean) {
-			assert.equal(visibleEditorChangeEventFired, expected, `Unexpected visible editors change state (got ${visibleEditorChangeEventFired}, expected ${expected})`);
+			assert.strictEqual(visibleEditorChangeEventFired, expected, `Unexpected visible editors change state (got ${visibleEditorChangeEventFired}, expected ${expected})`);
 			visibleEditorChangeEventFired = false;
 		}
 
@@ -740,7 +740,7 @@ suite('EditorService', () => {
 		});
 
 		function assertActiveEditorChangedEvent(expected: number) {
-			assert.equal(activeEditorChangeEvents, expected, `Unexpected active editor change state (got ${activeEditorChangeEvents}, expected ${expected})`);
+			assert.strictEqual(activeEditorChangeEvents, expected, `Unexpected active editor change state (got ${activeEditorChangeEvents}, expected ${expected})`);
 			activeEditorChangeEvents = 0;
 		}
 
@@ -774,9 +774,9 @@ suite('EditorService', () => {
 		// Open untitled input
 		let editor = await service.openEditor({});
 
-		assert.equal(service.activeEditorPane, editor);
-		assert.equal(service.activeTextEditorControl, editor?.getControl());
-		assert.equal(service.activeTextEditorMode, 'plaintext');
+		assert.strictEqual(service.activeEditorPane, editor);
+		assert.strictEqual(service.activeTextEditorControl, editor?.getControl());
+		assert.strictEqual(service.activeTextEditorMode, 'plaintext');
 
 		part.dispose();
 	});
@@ -822,7 +822,7 @@ suite('EditorService', () => {
 		await service.openEditor(sameInput1, { pinned: true }, SIDE_GROUP);
 
 		await service.save({ groupId: rootGroup.id, editor: input1 });
-		assert.equal(input1.gotSaved, true);
+		assert.strictEqual(input1.gotSaved, true);
 
 		input1.gotSaved = false;
 		input1.gotSavedAs = false;
@@ -833,7 +833,7 @@ suite('EditorService', () => {
 		sameInput1.dirty = true;
 
 		await service.save({ groupId: rootGroup.id, editor: input1 }, { saveAs: true });
-		assert.equal(input1.gotSavedAs, true);
+		assert.strictEqual(input1.gotSavedAs, true);
 
 		input1.gotSaved = false;
 		input1.gotSavedAs = false;
@@ -844,8 +844,8 @@ suite('EditorService', () => {
 		sameInput1.dirty = true;
 
 		const revertRes = await service.revertAll();
-		assert.equal(revertRes, true);
-		assert.equal(input1.gotReverted, true);
+		assert.strictEqual(revertRes, true);
+		assert.strictEqual(input1.gotReverted, true);
 
 		input1.gotSaved = false;
 		input1.gotSavedAs = false;
@@ -856,9 +856,9 @@ suite('EditorService', () => {
 		sameInput1.dirty = true;
 
 		const saveRes = await service.saveAll();
-		assert.equal(saveRes, true);
-		assert.equal(input1.gotSaved, true);
-		assert.equal(input2.gotSaved, true);
+		assert.strictEqual(saveRes, true);
+		assert.strictEqual(input1.gotSaved, true);
+		assert.strictEqual(input2.gotSaved, true);
 
 		input1.gotSaved = false;
 		input1.gotSavedAs = false;
@@ -873,13 +873,13 @@ suite('EditorService', () => {
 
 		await service.saveAll({ saveAs: true });
 
-		assert.equal(input1.gotSavedAs, true);
-		assert.equal(input2.gotSavedAs, true);
+		assert.strictEqual(input1.gotSavedAs, true);
+		assert.strictEqual(input2.gotSavedAs, true);
 
 		// services dedupes inputs automatically
-		assert.equal(sameInput1.gotSaved, false);
-		assert.equal(sameInput1.gotSavedAs, false);
-		assert.equal(sameInput1.gotReverted, false);
+		assert.strictEqual(sameInput1.gotSaved, false);
+		assert.strictEqual(sameInput1.gotSavedAs, false);
+		assert.strictEqual(sameInput1.gotReverted, false);
 
 		part.dispose();
 	});
@@ -901,9 +901,9 @@ suite('EditorService', () => {
 		await service.openEditor(sameInput1, { pinned: true }, SIDE_GROUP);
 
 		const revertRes = await service.revertAll({ excludeSticky: true });
-		assert.equal(revertRes, true);
-		assert.equal(input1.gotReverted, false);
-		assert.equal(sameInput1.gotReverted, true);
+		assert.strictEqual(revertRes, true);
+		assert.strictEqual(input1.gotReverted, false);
+		assert.strictEqual(sameInput1.gotReverted, true);
 
 		input1.gotSaved = false;
 		input1.gotSavedAs = false;
@@ -918,10 +918,10 @@ suite('EditorService', () => {
 		sameInput1.dirty = true;
 
 		const saveRes = await service.saveAll({ excludeSticky: true });
-		assert.equal(saveRes, true);
-		assert.equal(input1.gotSaved, false);
-		assert.equal(input2.gotSaved, true);
-		assert.equal(sameInput1.gotSaved, true);
+		assert.strictEqual(saveRes, true);
+		assert.strictEqual(input1.gotSaved, false);
+		assert.strictEqual(input2.gotSaved, true);
+		assert.strictEqual(sameInput1.gotSaved, true);
 
 		part.dispose();
 	});
@@ -949,7 +949,7 @@ suite('EditorService', () => {
 		await service.openEditor(input1, { pinned: true });
 		await service.openEditor(input2, { pinned: true });
 
-		assert.equal(rootGroup.activeEditor, input2);
+		assert.strictEqual(rootGroup.activeEditor, input2);
 
 		const activeEditorChangePromise = awaitActiveEditorChange(service);
 		accessor.fileService.fireAfterOperation(new FileOperationEvent(input2.resource, FileOperation.DELETE));
@@ -958,9 +958,9 @@ suite('EditorService', () => {
 		}
 
 		if (dirty) {
-			assert.equal(rootGroup.activeEditor, input2);
+			assert.strictEqual(rootGroup.activeEditor, input2);
 		} else {
-			assert.equal(rootGroup.activeEditor, input1);
+			assert.strictEqual(rootGroup.activeEditor, input1);
 		}
 
 		part.dispose();
@@ -993,15 +993,13 @@ suite('EditorService', () => {
 		}));
 		await activeEditorChangePromise;
 
-		assert.equal(rootGroup.activeEditor, movedInput);
+		assert.strictEqual(rootGroup.activeEditor, movedInput);
 
 		part.dispose();
 	});
 
 	function awaitActiveEditorChange(editorService: IEditorService): Promise<void> {
-		return new Promise(c => {
-			Event.once(editorService.onDidActiveEditorChange)(c);
-		});
+		return Event.toPromise(Event.once(editorService.onDidActiveEditorChange));
 	}
 
 	test('file watcher gets installed for out of workspace files', async function () {
@@ -1013,15 +1011,15 @@ suite('EditorService', () => {
 		await part.whenRestored;
 
 		await service.openEditor(input1, { pinned: true });
-		assert.equal(accessor.fileService.watches.length, 1);
-		assert.equal(accessor.fileService.watches[0].toString(), input1.resource.toString());
+		assert.strictEqual(accessor.fileService.watches.length, 1);
+		assert.strictEqual(accessor.fileService.watches[0].toString(), input1.resource.toString());
 
 		const editor = await service.openEditor(input2, { pinned: true });
-		assert.equal(accessor.fileService.watches.length, 1);
-		assert.equal(accessor.fileService.watches[0].toString(), input2.resource.toString());
+		assert.strictEqual(accessor.fileService.watches.length, 1);
+		assert.strictEqual(accessor.fileService.watches[0].toString(), input2.resource.toString());
 
 		await editor?.group?.closeAllEditors();
-		assert.equal(accessor.fileService.watches.length, 0);
+		assert.strictEqual(accessor.fileService.watches.length, 0);
 
 		part.dispose();
 	});
@@ -1069,7 +1067,7 @@ suite('EditorService', () => {
 		await service.openEditor(input1, { pinned: true });
 
 		assert.ok(overrideCalled);
-		assert.equal(service.activeEditor, input2);
+		assert.strictEqual(service.activeEditor, input2);
 
 		handler.dispose();
 		part.dispose();
@@ -1094,4 +1092,52 @@ suite('EditorService', () => {
 
 		part.dispose();
 	});
+
+	test('findEditors', async () => {
+		const [part, service] = createEditorService();
+
+		const input = new TestFileEditorInput(URI.parse('my://resource-openEditors'), TEST_EDITOR_INPUT_ID);
+		const otherInput = new TestFileEditorInput(URI.parse('my://resource2-openEditors'), TEST_EDITOR_INPUT_ID);
+
+		await part.whenRestored;
+
+		// Open editors
+		await service.openEditors([{ editor: input }, { editor: otherInput }]);
+		assert.strictEqual(part.activeGroup.count, 2);
+
+		// Try using find editors for opened editors
+		{
+			const found = service.findEditors(input.resource, part.activeGroup);
+			assert.strictEqual(found.length, 1);
+			assert.strictEqual(found[0], input);
+		}
+		{
+			const found = service.findEditors(otherInput.resource, part.activeGroup);
+			assert.strictEqual(found.length, 1);
+			assert.strictEqual(found[0], otherInput);
+		}
+
+		// Make sure we don't find non-opened editors
+		{
+			const found = service.findEditors(URI.parse('my://no-such-resource'), part.activeGroup);
+			assert.strictEqual(found.length, 0);
+		}
+
+		// Make sure we don't find editors across groups
+		{
+			const newEditor = await service.openEditor(new TestFileEditorInput(URI.parse('my://other-group-resource'), TEST_EDITOR_INPUT_ID), { pinned: true, preserveFocus: true }, SIDE_GROUP);
+
+			const found = service.findEditors(input.resource, newEditor!.group!.id);
+			assert.strictEqual(found.length, 0);
+		}
+
+		// Check we don't find editors after closing them
+		await part.activeGroup.closeAllEditors();
+		{
+			const found = service.findEditors(input.resource, part.activeGroup);
+			assert.strictEqual(found.length, 0);
+		}
+
+		part.dispose();
+	});
 });
diff --git a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
index 5f927c557..a1353fad4 100644
--- a/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorsObserver.test.ts
@@ -17,7 +17,6 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { EditorsObserver } from 'vs/workbench/browser/parts/editor/editorsObserver';
 import { timeout } from 'vs/base/common/async';
 import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { isWeb } from 'vs/base/common/platform';
 
 const TEST_EDITOR_ID = 'MyTestEditorForEditorsObserver';
 const TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorsObserver';
@@ -66,19 +65,19 @@ suite('EditorsObserver', function () {
 		});
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 0);
-		assert.equal(onDidMostRecentlyActiveEditorsChangeCalled, false);
+		assert.strictEqual(currentEditorsMRU.length, 0);
+		assert.strictEqual(onDidMostRecentlyActiveEditorsChangeCalled, false);
 
 		const input1 = new TestFileEditorInput(URI.parse('foo://bar1'), TEST_SERIALIZABLE_EDITOR_INPUT_ID);
 
 		await part.activeGroup.openEditor(input1, EditorOptions.create({ pinned: true }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 1);
-		assert.equal(currentEditorsMRU[0].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(onDidMostRecentlyActiveEditorsChangeCalled, true);
-		assert.equal(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 1);
+		assert.strictEqual(currentEditorsMRU[0].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(onDidMostRecentlyActiveEditorsChangeCalled, true);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
 
 		const input2 = new TestFileEditorInput(URI.parse('foo://bar2'), TEST_SERIALIZABLE_EDITOR_INPUT_ID);
 		const input3 = new TestFileEditorInput(URI.parse('foo://bar3'), TEST_SERIALIZABLE_EDITOR_INPUT_ID);
@@ -87,50 +86,50 @@ suite('EditorsObserver', function () {
 		await part.activeGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		await part.activeGroup.openEditor(input2, EditorOptions.create({ pinned: true }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input2);
-		assert.equal(currentEditorsMRU[1].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input3);
-		assert.equal(currentEditorsMRU[2].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input2);
+		assert.strictEqual(currentEditorsMRU[1].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input3);
+		assert.strictEqual(currentEditorsMRU[2].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		onDidMostRecentlyActiveEditorsChangeCalled = false;
 		await part.activeGroup.closeEditor(input1);
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 2);
-		assert.equal(currentEditorsMRU[0].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input2);
-		assert.equal(currentEditorsMRU[1].groupId, part.activeGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input3);
-		assert.equal(onDidMostRecentlyActiveEditorsChangeCalled, true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 2);
+		assert.strictEqual(currentEditorsMRU[0].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input2);
+		assert.strictEqual(currentEditorsMRU[1].groupId, part.activeGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input3);
+		assert.strictEqual(onDidMostRecentlyActiveEditorsChangeCalled, true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		await part.activeGroup.closeAllEditors();
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 0);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), false);
-		assert.equal(observer.hasEditor(input3.resource), false);
+		assert.strictEqual(currentEditorsMRU.length, 0);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(observer.hasEditor(input3.resource), false);
 
 		part.dispose();
 		listener.dispose();
@@ -142,7 +141,7 @@ suite('EditorsObserver', function () {
 		const rootGroup = part.activeGroup;
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 0);
+		assert.strictEqual(currentEditorsMRU.length, 0);
 
 		const sideGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
 
@@ -152,22 +151,22 @@ suite('EditorsObserver', function () {
 		await sideGroup.openEditor(input1, EditorOptions.create({ pinned: true, activation: EditorActivation.ACTIVATE }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 2);
-		assert.equal(currentEditorsMRU[0].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 2);
+		assert.strictEqual(currentEditorsMRU[0].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
 
 		await rootGroup.openEditor(input1, EditorOptions.create({ pinned: true, activation: EditorActivation.ACTIVATE }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 2);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(currentEditorsMRU[1].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 2);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(currentEditorsMRU[1].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
 
 		// Opening an editor inactive should not change
 		// the most recent editor, but rather put it behind
@@ -176,39 +175,36 @@ suite('EditorsObserver', function () {
 		await rootGroup.openEditor(input2, EditorOptions.create({ inactive: true }));
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
 
 		await rootGroup.closeAllEditors();
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 1);
-		assert.equal(currentEditorsMRU[0].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(currentEditorsMRU.length, 1);
+		assert.strictEqual(currentEditorsMRU[0].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
 
 		await sideGroup.closeAllEditors();
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 0);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(currentEditorsMRU.length, 0);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
 
 		part.dispose();
 	});
 
 	test('copy group', async function () {
-		if (isWeb) {
-			this.skip();
-		}
 		const [part, observer] = await createEditorObserver();
 
 		const input1 = new TestFileEditorInput(URI.parse('foo://bar1'), TEST_SERIALIZABLE_EDITOR_INPUT_ID);
@@ -222,49 +218,51 @@ suite('EditorsObserver', function () {
 		await rootGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		const copiedGroup = part.copyGroup(rootGroup, rootGroup, GroupDirection.RIGHT);
+		await copiedGroup.whenRestored;
 		copiedGroup.setActive(true);
+		copiedGroup.focus();
 
 		currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 6);
-		assert.equal(currentEditorsMRU[0].groupId, copiedGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input3);
-		assert.equal(currentEditorsMRU[2].groupId, copiedGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input2);
-		assert.equal(currentEditorsMRU[3].groupId, copiedGroup.id);
-		assert.equal(currentEditorsMRU[3].editor, input1);
-		assert.equal(currentEditorsMRU[4].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[4].editor, input2);
-		assert.equal(currentEditorsMRU[5].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[5].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 6);
+		assert.strictEqual(currentEditorsMRU[0].groupId, copiedGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input3);
+		assert.strictEqual(currentEditorsMRU[2].groupId, copiedGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input2);
+		assert.strictEqual(currentEditorsMRU[3].groupId, copiedGroup.id);
+		assert.strictEqual(currentEditorsMRU[3].editor, input1);
+		assert.strictEqual(currentEditorsMRU[4].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[4].editor, input2);
+		assert.strictEqual(currentEditorsMRU[5].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[5].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		await rootGroup.closeAllEditors();
 
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		await copiedGroup.closeAllEditors();
 
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), false);
-		assert.equal(observer.hasEditor(input3.resource), false);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(observer.hasEditor(input3.resource), false);
 
 		part.dispose();
 	});
@@ -287,16 +285,16 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		storage.emitWillSaveState(WillSaveStateReason.SHUTDOWN);
 
@@ -304,16 +302,16 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		currentEditorsMRU = restoredObserver.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		part.clearState();
 		part.dispose();
@@ -339,16 +337,16 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
 
 		storage.emitWillSaveState(WillSaveStateReason.SHUTDOWN);
 
@@ -356,16 +354,16 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		currentEditorsMRU = restoredObserver.editors;
-		assert.equal(currentEditorsMRU.length, 3);
-		assert.equal(currentEditorsMRU[0].groupId, sideGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input3);
-		assert.equal(currentEditorsMRU[1].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[1].editor, input2);
-		assert.equal(currentEditorsMRU[2].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[2].editor, input1);
-		assert.equal(restoredObserver.hasEditor(input1.resource), true);
-		assert.equal(restoredObserver.hasEditor(input2.resource), true);
-		assert.equal(restoredObserver.hasEditor(input3.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 3);
+		assert.strictEqual(currentEditorsMRU[0].groupId, sideGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input3);
+		assert.strictEqual(currentEditorsMRU[1].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[1].editor, input2);
+		assert.strictEqual(currentEditorsMRU[2].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[2].editor, input1);
+		assert.strictEqual(restoredObserver.hasEditor(input1.resource), true);
+		assert.strictEqual(restoredObserver.hasEditor(input2.resource), true);
+		assert.strictEqual(restoredObserver.hasEditor(input3.resource), true);
 
 		part.clearState();
 		part.dispose();
@@ -385,10 +383,10 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		let currentEditorsMRU = observer.editors;
-		assert.equal(currentEditorsMRU.length, 1);
-		assert.equal(currentEditorsMRU[0].groupId, rootGroup.id);
-		assert.equal(currentEditorsMRU[0].editor, input1);
-		assert.equal(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(currentEditorsMRU.length, 1);
+		assert.strictEqual(currentEditorsMRU[0].groupId, rootGroup.id);
+		assert.strictEqual(currentEditorsMRU[0].editor, input1);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
 
 		storage.emitWillSaveState(WillSaveStateReason.SHUTDOWN);
 
@@ -396,8 +394,8 @@ suite('EditorsObserver', function () {
 		await part.whenRestored;
 
 		currentEditorsMRU = restoredObserver.editors;
-		assert.equal(currentEditorsMRU.length, 0);
-		assert.equal(restoredObserver.hasEditor(input1.resource), false);
+		assert.strictEqual(currentEditorsMRU.length, 0);
+		assert.strictEqual(restoredObserver.hasEditor(input1.resource), false);
 
 		part.clearState();
 		part.dispose();
@@ -423,45 +421,45 @@ suite('EditorsObserver', function () {
 		await rootGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 		await rootGroup.openEditor(input4, EditorOptions.create({ pinned: true }));
 
-		assert.equal(rootGroup.count, 3);
-		assert.equal(rootGroup.isOpened(input1), false);
-		assert.equal(rootGroup.isOpened(input2), true);
-		assert.equal(rootGroup.isOpened(input3), true);
-		assert.equal(rootGroup.isOpened(input4), true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(rootGroup.count, 3);
+		assert.strictEqual(rootGroup.isOpened(input1), false);
+		assert.strictEqual(rootGroup.isOpened(input2), true);
+		assert.strictEqual(rootGroup.isOpened(input3), true);
+		assert.strictEqual(rootGroup.isOpened(input4), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		input2.setDirty();
 		part.enforcePartOptions({ limit: { enabled: true, value: 1 } });
 
 		await timeout(0);
 
-		assert.equal(rootGroup.count, 2);
-		assert.equal(rootGroup.isOpened(input1), false);
-		assert.equal(rootGroup.isOpened(input2), true); // dirty
-		assert.equal(rootGroup.isOpened(input3), false);
-		assert.equal(rootGroup.isOpened(input4), true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), false);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(rootGroup.count, 2);
+		assert.strictEqual(rootGroup.isOpened(input1), false);
+		assert.strictEqual(rootGroup.isOpened(input2), true); // dirty
+		assert.strictEqual(rootGroup.isOpened(input3), false);
+		assert.strictEqual(rootGroup.isOpened(input4), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), false);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		const input5 = new TestFileEditorInput(URI.parse('foo://bar5'), TEST_EDITOR_INPUT_ID);
 		await sideGroup.openEditor(input5, EditorOptions.create({ pinned: true }));
 
-		assert.equal(rootGroup.count, 1);
-		assert.equal(rootGroup.isOpened(input1), false);
-		assert.equal(rootGroup.isOpened(input2), true); // dirty
-		assert.equal(rootGroup.isOpened(input3), false);
-		assert.equal(rootGroup.isOpened(input4), false);
-		assert.equal(sideGroup.isOpened(input5), true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), false);
-		assert.equal(observer.hasEditor(input4.resource), false);
-		assert.equal(observer.hasEditor(input5.resource), true);
+		assert.strictEqual(rootGroup.count, 1);
+		assert.strictEqual(rootGroup.isOpened(input1), false);
+		assert.strictEqual(rootGroup.isOpened(input2), true); // dirty
+		assert.strictEqual(rootGroup.isOpened(input3), false);
+		assert.strictEqual(rootGroup.isOpened(input4), false);
+		assert.strictEqual(sideGroup.isOpened(input5), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), false);
+		assert.strictEqual(observer.hasEditor(input4.resource), false);
+		assert.strictEqual(observer.hasEditor(input5.resource), true);
 
 		observer.dispose();
 		part.dispose();
@@ -487,51 +485,51 @@ suite('EditorsObserver', function () {
 		await rootGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 		await rootGroup.openEditor(input4, EditorOptions.create({ pinned: true }));
 
-		assert.equal(rootGroup.count, 3); // 1 editor got closed due to our limit!
-		assert.equal(rootGroup.isOpened(input1), false);
-		assert.equal(rootGroup.isOpened(input2), true);
-		assert.equal(rootGroup.isOpened(input3), true);
-		assert.equal(rootGroup.isOpened(input4), true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(rootGroup.count, 3); // 1 editor got closed due to our limit!
+		assert.strictEqual(rootGroup.isOpened(input1), false);
+		assert.strictEqual(rootGroup.isOpened(input2), true);
+		assert.strictEqual(rootGroup.isOpened(input3), true);
+		assert.strictEqual(rootGroup.isOpened(input4), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		await sideGroup.openEditor(input1, EditorOptions.create({ pinned: true }));
 		await sideGroup.openEditor(input2, EditorOptions.create({ pinned: true }));
 		await sideGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 		await sideGroup.openEditor(input4, EditorOptions.create({ pinned: true }));
 
-		assert.equal(sideGroup.count, 3);
-		assert.equal(sideGroup.isOpened(input1), false);
-		assert.equal(sideGroup.isOpened(input2), true);
-		assert.equal(sideGroup.isOpened(input3), true);
-		assert.equal(sideGroup.isOpened(input4), true);
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), true);
-		assert.equal(observer.hasEditor(input3.resource), true);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(sideGroup.count, 3);
+		assert.strictEqual(sideGroup.isOpened(input1), false);
+		assert.strictEqual(sideGroup.isOpened(input2), true);
+		assert.strictEqual(sideGroup.isOpened(input3), true);
+		assert.strictEqual(sideGroup.isOpened(input4), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), true);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		part.enforcePartOptions({ limit: { enabled: true, value: 1, perEditorGroup: true } });
 
 		await timeout(10);
 
-		assert.equal(rootGroup.count, 1);
-		assert.equal(rootGroup.isOpened(input1), false);
-		assert.equal(rootGroup.isOpened(input2), false);
-		assert.equal(rootGroup.isOpened(input3), false);
-		assert.equal(rootGroup.isOpened(input4), true);
+		assert.strictEqual(rootGroup.count, 1);
+		assert.strictEqual(rootGroup.isOpened(input1), false);
+		assert.strictEqual(rootGroup.isOpened(input2), false);
+		assert.strictEqual(rootGroup.isOpened(input3), false);
+		assert.strictEqual(rootGroup.isOpened(input4), true);
 
-		assert.equal(sideGroup.count, 1);
-		assert.equal(sideGroup.isOpened(input1), false);
-		assert.equal(sideGroup.isOpened(input2), false);
-		assert.equal(sideGroup.isOpened(input3), false);
-		assert.equal(sideGroup.isOpened(input4), true);
+		assert.strictEqual(sideGroup.count, 1);
+		assert.strictEqual(sideGroup.isOpened(input1), false);
+		assert.strictEqual(sideGroup.isOpened(input2), false);
+		assert.strictEqual(sideGroup.isOpened(input3), false);
+		assert.strictEqual(sideGroup.isOpened(input4), true);
 
-		assert.equal(observer.hasEditor(input1.resource), false);
-		assert.equal(observer.hasEditor(input2.resource), false);
-		assert.equal(observer.hasEditor(input3.resource), false);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), false);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(observer.hasEditor(input3.resource), false);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		observer.dispose();
 		part.dispose();
@@ -556,15 +554,15 @@ suite('EditorsObserver', function () {
 		await rootGroup.openEditor(input3, EditorOptions.create({ pinned: true }));
 		await rootGroup.openEditor(input4, EditorOptions.create({ pinned: true }));
 
-		assert.equal(rootGroup.count, 3);
-		assert.equal(rootGroup.isOpened(input1), true);
-		assert.equal(rootGroup.isOpened(input2), false);
-		assert.equal(rootGroup.isOpened(input3), true);
-		assert.equal(rootGroup.isOpened(input4), true);
-		assert.equal(observer.hasEditor(input1.resource), true);
-		assert.equal(observer.hasEditor(input2.resource), false);
-		assert.equal(observer.hasEditor(input3.resource), true);
-		assert.equal(observer.hasEditor(input4.resource), true);
+		assert.strictEqual(rootGroup.count, 3);
+		assert.strictEqual(rootGroup.isOpened(input1), true);
+		assert.strictEqual(rootGroup.isOpened(input2), false);
+		assert.strictEqual(rootGroup.isOpened(input3), true);
+		assert.strictEqual(rootGroup.isOpened(input4), true);
+		assert.strictEqual(observer.hasEditor(input1.resource), true);
+		assert.strictEqual(observer.hasEditor(input2.resource), false);
+		assert.strictEqual(observer.hasEditor(input3.resource), true);
+		assert.strictEqual(observer.hasEditor(input4.resource), true);
 
 		observer.dispose();
 		part.dispose();
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
index 7a93a5290..cd3b096a9 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionBisect.ts
@@ -11,8 +11,8 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { ContextKeyEqualsExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -21,7 +21,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
-import { timeout } from 'vs/base/common/async';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 // --- bisect service
 
@@ -74,6 +74,7 @@ class ExtensionBisectService implements IExtensionBisectService {
 	constructor(
 		@ILogService logService: ILogService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@IWorkbenchEnvironmentService private readonly _envService: IWorkbenchEnvironmentService
 	) {
 		const raw = _storageService.get(ExtensionBisectService._storageKey, StorageScope.GLOBAL);
 		this._state = BisectState.fromJSON(raw);
@@ -98,12 +99,26 @@ class ExtensionBisectService implements IExtensionBisectService {
 
 	isDisabledByBisect(extension: IExtension): boolean {
 		if (!this._state) {
+			// bisect isn't active
+			return false;
+		}
+		if (this._isRemoteResolver(extension)) {
+			// the current remote resolver extension cannot be disabled
 			return false;
 		}
 		const disabled = this._disabled.get(extension.identifier.id);
 		return disabled ?? false;
 	}
 
+	private _isRemoteResolver(extension: IExtension): boolean {
+		if (extension.manifest.enableProposedApi !== true) {
+			return false;
+		}
+		const idx = this._envService.remoteAuthority?.indexOf('+');
+		const activationEvent = `onResolveRemoteAuthority:${this._envService.remoteAuthority?.substr(0, idx)}`;
+		return Boolean(extension.manifest.activationEvents?.find(e => e === activationEvent));
+	}
+
 	async start(extensions: ILocalExtension[]): Promise<void> {
 		if (this._state) {
 			throw new Error('invalid state');
@@ -198,10 +213,16 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: 'extension.bisect.start',
-			title: localize('title.start', "Start Extension Bisect"),
+			title: { value: localize('title.start', "Start Extension Bisect"), original: 'Start Extension Bisect' },
 			category: localize('help', "Help"),
 			f1: true,
-			precondition: ExtensionBisectUi.ctxIsBisectActive.negate()
+			precondition: ExtensionBisectUi.ctxIsBisectActive.negate(),
+			menu: {
+				id: MenuId.ViewContainerTitle,
+				when: ContextKeyEqualsExpr.create('viewContainer', 'workbench.view.extensions'),
+				group: '2_enablement',
+				order: 3
+			}
 		});
 	}
 
@@ -289,8 +310,7 @@ registerAction2(class extends Action2 {
 				await extensionEnablementService.disableExtension({ id: done.id }, undefined);
 			}
 			if (res.choice === 0) {
-				issueService.openReporter({ extensionId: done.id });
-				await timeout(750); // workaround for https://github.com/microsoft/vscode/issues/111871
+				await issueService.openReporter({ extensionId: done.id });
 			}
 		}
 		await bisectService.reset();
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 94d47c9cd..42e950be7 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -79,10 +79,10 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 
 	getEnablementState(extension: IExtension): EnablementState {
 		if (this.extensionBisectService.isDisabledByBisect(extension)) {
-			return EnablementState.DisabledByEnvironemt;
+			return EnablementState.DisabledByEnvironment;
 		}
 		if (this._isDisabledInEnv(extension)) {
-			return EnablementState.DisabledByEnvironemt;
+			return EnablementState.DisabledByEnvironment;
 		}
 		if (this._isDisabledByExtensionKind(extension)) {
 			return EnablementState.DisabledByExtensionKind;
@@ -97,7 +97,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 			return false;
 		}
 		const enablementState = this.getEnablementState(extension);
-		if (enablementState === EnablementState.DisabledByEnvironemt || enablementState === EnablementState.DisabledByExtensionKind) {
+		if (enablementState === EnablementState.DisabledByEnvironment || enablementState === EnablementState.DisabledByExtensionKind) {
 			return false;
 		}
 		return true;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
index 380898ba5..31b04b854 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
@@ -34,7 +34,7 @@ export interface IWorkbenchExtensioManagementService extends IExtensionManagemen
 
 export const enum EnablementState {
 	DisabledByExtensionKind,
-	DisabledByEnvironemt,
+	DisabledByEnvironment,
 	DisabledGlobally,
 	DisabledWorkspace,
 	EnabledGlobally,
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index b1781e08b..a01fb6859 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -263,7 +263,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 				const isMachineScoped = await this.hasToFlagExtensionsMachineScoped([gallery]);
 				installOptions = { isMachineScoped, isBuiltin: false };
 			}
-			if (!installOptions.isMachineScoped) {
+			if (!installOptions.isMachineScoped && this.isExtensionsSyncEnabled()) {
 				if (this.extensionManagementServerService.localExtensionManagementServer && !servers.includes(this.extensionManagementServerService.localExtensionManagementServer)) {
 					servers.push(this.extensionManagementServerService.localExtensionManagementServer);
 				}
@@ -306,32 +306,36 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return this.extensionManagementServerService.localExtensionManagementServer;
 	}
 
+	private isExtensionsSyncEnabled(): boolean {
+		return this.userDataAutoSyncEnablementService.isEnabled() && this.userDataSyncResourceEnablementService.isResourceEnabled(SyncResource.Extensions);
+	}
+
 	private async hasToFlagExtensionsMachineScoped(extensions: IGalleryExtension[]): Promise<boolean> {
-		if (!this.userDataAutoSyncEnablementService.isEnabled() || !this.userDataSyncResourceEnablementService.isResourceEnabled(SyncResource.Extensions)) {
-			return false;
-		}
-		const result = await this.dialogService.show(
-			Severity.Info,
-			extensions.length === 1 ? localize('install extension', "Install Extension") : localize('install extensions', "Install Extensions"),
-			[
-				localize('install', "Install"),
-				localize('install and do no sync', "Install (Do not sync)"),
-				localize('cancel', "Cancel"),
-			],
-			{
-				cancelId: 2,
-				detail: extensions.length === 1
-					? localize('install single extension', "Would you like to install and synchronize '{0}' extension across your devices?", extensions[0].displayName)
-					: localize('install multiple extensions', "Would you like to install and synchronize extensions across your devices?")
+		if (this.isExtensionsSyncEnabled()) {
+			const result = await this.dialogService.show(
+				Severity.Info,
+				extensions.length === 1 ? localize('install extension', "Install Extension") : localize('install extensions', "Install Extensions"),
+				[
+					localize('install', "Install"),
+					localize('install and do no sync', "Install (Do not sync)"),
+					localize('cancel', "Cancel"),
+				],
+				{
+					cancelId: 2,
+					detail: extensions.length === 1
+						? localize('install single extension', "Would you like to install and synchronize '{0}' extension across your devices?", extensions[0].displayName)
+						: localize('install multiple extensions', "Would you like to install and synchronize extensions across your devices?")
+				}
+			);
+			switch (result.choice) {
+				case 0:
+					return false;
+				case 1:
+					return true;
 			}
-		);
-		switch (result.choice) {
-			case 0:
-				return false;
-			case 1:
-				return true;
+			throw canceled();
 		}
-		throw canceled();
+		return false;
 	}
 
 	getExtensionsReport(): Promise<IReportedExtension[]> {
diff --git a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
index 7259d0698..24826debc 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -458,7 +458,7 @@ suite('ExtensionEnablementService Test', () => {
 		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event, getInstalled: () => Promise.resolve([extension, aLocalExtension('pub.b')]) } as IExtensionManagementService);
 		testObject = new TestExtensionEnablementService(instantiationService);
 		assert.ok(!testObject.isEnabled(extension));
-		assert.deepEqual(testObject.getEnablementState(extension), EnablementState.DisabledByEnvironemt);
+		assert.deepEqual(testObject.getEnablementState(extension), EnablementState.DisabledByEnvironment);
 	});
 
 	test('test local workspace extension is disabled by kind', async () => {
diff --git a/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts b/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
index dc16b3575..e19cf5e1e 100644
--- a/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
+++ b/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts
@@ -11,7 +11,7 @@ import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { FileKind, IFileService } from 'vs/platform/files/common/files';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { isWorkspace, IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -107,7 +107,7 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 			: await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, localize('select for add', "Add extension recommendation to"));
 
 		for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
-			if (IWorkspace.isIWorkspace(workspaceOrWorkspaceFolder)) {
+			if (isWorkspace(workspaceOrWorkspaceFolder)) {
 				await this.addOrRemoveWorkspaceRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceExtensionsConfigContent, !isRecommended);
 			} else {
 				await this.addOrRemoveWorkspaceFolderRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceFolderExtensionsConfigContents.get(workspaceOrWorkspaceFolder.uri)!, !isRecommended);
@@ -133,7 +133,7 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 			: await this.pickWorkspaceOrFolders(workspace.folders, workspace.configuration ? workspace : undefined, localize('select for add', "Add extension recommendation to"));
 
 		for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
-			if (IWorkspace.isIWorkspace(workspaceOrWorkspaceFolder)) {
+			if (isWorkspace(workspaceOrWorkspaceFolder)) {
 				await this.addOrRemoveWorkspaceUnwantedRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceExtensionsConfigContent, !isUnwanted);
 			} else {
 				await this.addOrRemoveWorkspaceFolderUnwantedRecommendation(extensionId, workspaceOrWorkspaceFolder, workspaceFolderExtensionsConfigContents.get(workspaceOrWorkspaceFolder.uri)!, !isUnwanted);
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
index c6eb78294..983bee9a7 100644
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -84,10 +84,10 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 	protected _onExtensionHostCrashed(extensionHost: ExtensionHostManager, code: number, signal: string | null): void {
 		super._onExtensionHostCrashed(extensionHost, code, signal);
 		if (extensionHost.kind === ExtensionHostKind.LocalWebWorker) {
-			if (code === ExtensionHostExitCode.StartTimeout10s) {
+			if (code === ExtensionHostExitCode.StartTimeout60s) {
 				this._notificationService.prompt(
 					Severity.Error,
-					nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 10s."),
+					nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."),
 					[]
 				);
 				return;
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
index cffb14079..ff3f106bf 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -30,6 +30,7 @@ import { canceled, onUnexpectedError } from 'vs/base/common/errors';
 import { Barrier } from 'vs/base/common/async';
 import { FileAccess } from 'vs/base/common/network';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
+import { NewWorkerMessage, TerminateWorkerMessage } from 'vs/workbench/services/extensions/common/polyfillNestedWorker.protocol';
 
 export interface IWebWorkerExtensionHostInitData {
 	readonly autoStart: boolean;
@@ -40,6 +41,17 @@ export interface IWebWorkerExtensionHostDataProvider {
 	getInitData(): Promise<IWebWorkerExtensionHostInitData>;
 }
 
+const ttPolicy = window.trustedTypes?.createPolicy('webWorkerExtensionHost', { createScriptURL: value => value });
+
+const ttPolicyNestedWorker = window.trustedTypes?.createPolicy('webNestedWorkerExtensionHost', {
+	createScriptURL(value) {
+		if (value.startsWith('blob:')) {
+			return value;
+		}
+		throw new Error(value + ' is NOT allowed');
+	}
+});
+
 export class WebWorkerExtensionHost extends Disposable implements IExtensionHost {
 
 	public readonly kind = ExtensionHostKind.LocalWebWorker;
@@ -154,8 +166,8 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		};
 
 		startTimeout = setTimeout(() => {
-			rejectBarrier(ExtensionHostExitCode.StartTimeout10s, new Error('The Web Worker Extension Host did not start in 10s'));
-		}, 10000);
+			rejectBarrier(ExtensionHostExitCode.StartTimeout60s, new Error('The Web Worker Extension Host did not start in 60s'));
+		}, 60000);
 
 		this._register(dom.addDisposableListener(window, 'message', (event) => {
 			if (event.source !== iframe.contentWindow) {
@@ -217,20 +229,48 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		const emitter = new Emitter<VSBuffer>();
 
 		const url = getWorkerBootstrapUrl(FileAccess.asBrowserUri('../worker/extensionHostWorkerMain.js', require).toString(true), 'WorkerExtensionHost');
-		const worker = new Worker(url, { name: 'WorkerExtensionHost' });
+		const worker = new Worker(ttPolicy?.createScriptURL(url) as unknown as string ?? url, { name: 'WorkerExtensionHost' });
 
 		const barrier = new Barrier();
 		let port!: MessagePort;
 
+		const nestedWorker = new Map<string, Worker>();
+
 		worker.onmessage = (event) => {
-			const { data } = event;
-			if (barrier.isOpen() || !(data instanceof MessagePort)) {
+
+			const data: MessagePort | NewWorkerMessage | TerminateWorkerMessage = event.data;
+
+			if (data instanceof MessagePort) {
+				// receiving a message port which is used to communicate
+				// with the web worker extension host
+				if (barrier.isOpen()) {
+					console.warn('UNEXPECTED message', event);
+					this._onDidExit.fire([ExtensionHostExitCode.UnexpectedError, 'received a message port AFTER opening the barrier']);
+					return;
+				}
+				port = data;
+				barrier.open();
+
+
+			} else if (data?.type === '_newWorker') {
+				// receiving a message to create a new nested/child worker
+				const worker = new Worker((ttPolicyNestedWorker?.createScriptURL(data.url) ?? data.url) as string, data.options);
+				worker.postMessage(data.port, [data.port]);
+				worker.onerror = console.error.bind(console);
+				nestedWorker.set(data.id, worker);
+
+			} else if (data?.type === '_terminateWorker') {
+				// receiving a message to terminate nested/child worker
+				if (nestedWorker.has(data.id)) {
+					nestedWorker.get(data.id)!.terminate();
+					nestedWorker.delete(data.id);
+				}
+
+			} else {
+				// all other messages are an error
 				console.warn('UNEXPECTED message', event);
 				this._onDidExit.fire([ExtensionHostExitCode.UnexpectedError, 'UNEXPECTED message']);
-				return;
 			}
-			port = data;
-			barrier.open();
 		};
 
 		// await MessagePort and use it to directly communicate
@@ -325,7 +365,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 				appUriScheme: this._productService.urlProtocol,
 				appLanguage: platform.language,
 				extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
-				extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
+				extensionTestsLocationURI: undefined, // never run extension tests in web worker extension host
 				globalStorageHome: this._environmentService.globalStorageHome,
 				workspaceStorageHome: this._environmentService.workspaceStorageHome,
 				webviewResourceRoot: this._environmentService.webviewResourceRoot,
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index f9fbf7e59..c3aab1b7d 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -407,15 +407,14 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	//#endregion
 
 	protected async _initialize(): Promise<void> {
-		perf.mark('willLoadExtensions');
+		perf.mark('code/willLoadExtensions');
 		this._startExtensionHosts(true, []);
-		this.whenInstalledExtensionsRegistered().then(() => perf.mark('didLoadExtensions'));
 		await this._scanAndHandleExtensions();
 		this._releaseBarrier();
+		perf.mark('code/didLoadExtensions');
 	}
 
 	private _releaseBarrier(): void {
-		perf.mark('extensionHostReady');
 		this._installedExtensionsReady.open();
 		this._onDidRegisterExtensions.fire(undefined);
 		this._onDidChangeExtensionsStatus.fire(this._registry.getAllExtensionDescriptions().map(e => e.identifier));
@@ -465,7 +464,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 	protected _onExtensionHostCrashed(extensionHost: ExtensionHostManager, code: number, signal: string | null): void {
 		console.error('Extension host terminated unexpectedly. Code: ', code, ' Signal: ', signal);
-		this._stopExtensionHosts();
+		if (extensionHost.kind === ExtensionHostKind.LocalProcess) {
+			this._stopExtensionHosts();
+		}
 	}
 
 	//#region IExtensionService
@@ -644,11 +645,13 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 		const messageHandler = (msg: IMessage) => this._handleExtensionPointMessage(msg);
 		const availableExtensions = this._registry.getAllExtensionDescriptions();
 		const extensionPoints = ExtensionsRegistry.getExtensionPoints();
+		perf.mark('code/willHandleExtensionPoints');
 		for (const extensionPoint of extensionPoints) {
 			if (affectedExtensionPoints[extensionPoint.name]) {
 				AbstractExtensionService._handleExtensionPoint(extensionPoint, availableExtensions, messageHandler);
 			}
 		}
+		perf.mark('code/didHandleExtensionPoints');
 	}
 
 	private _handleExtensionPointMessage(msg: IMessage) {
@@ -699,9 +702,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 				});
 			}
 		}
-		perf.mark(`willHandleExtensionPoint/${extensionPoint.name}`);
 		extensionPoint.acceptUsers(users);
-		perf.mark(`didHandleExtensionPoint/${extensionPoint.name}`);
 	}
 
 	private _showMessageToUser(severity: Severity, msg: string): void {
diff --git a/src/vs/workbench/services/extensions/common/extensionHostMain.ts b/src/vs/workbench/services/extensions/common/extensionHostMain.ts
index b91ba18ad..0cb976362 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostMain.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostMain.ts
@@ -5,6 +5,7 @@
 
 import { timeout } from 'vs/base/common/async';
 import * as errors from 'vs/base/common/errors';
+import * as performance from 'vs/base/common/performance';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { IURITransformer } from 'vs/base/common/uriIpc';
@@ -36,6 +37,7 @@ export class ExtensionHostMain {
 	private _isTerminating: boolean;
 	private readonly _hostUtils: IHostUtils;
 	private readonly _extensionService: IExtHostExtensionService;
+	private readonly _logService: ILogService;
 	private readonly _disposables = new DisposableStore();
 
 	constructor(
@@ -64,11 +66,11 @@ export class ExtensionHostMain {
 		const terminalService = instaService.invokeFunction(accessor => accessor.get(IExtHostTerminalService));
 		this._disposables.add(terminalService);
 
-		const logService = instaService.invokeFunction(accessor => accessor.get(ILogService));
-		this._disposables.add(logService);
+		this._logService = instaService.invokeFunction(accessor => accessor.get(ILogService));
 
-		logService.info('extension host started');
-		logService.trace('initData', initData);
+		performance.mark(`code/extHost/didCreateServices`);
+		this._logService.info('extension host started');
+		this._logService.trace('initData', initData);
 
 		// ugly self - inject
 		// must call initialize *after* creating the extension service
@@ -110,12 +112,14 @@ export class ExtensionHostMain {
 		});
 	}
 
-	terminate(): void {
+	terminate(reason: string): void {
 		if (this._isTerminating) {
 			// we are already shutting down...
 			return;
 		}
 		this._isTerminating = true;
+		this._logService.info(`extension host terminating: ${reason}`);
+		this._logService.flush();
 
 		this._disposables.dispose();
 
@@ -127,7 +131,12 @@ export class ExtensionHostMain {
 
 		// Give extensions 1 second to wrap up any async dispose, then exit in at most 4 seconds
 		setTimeout(() => {
-			Promise.race([timeout(4000), extensionsDeactivated]).finally(() => this._hostUtils.exit());
+			Promise.race([timeout(4000), extensionsDeactivated]).finally(() => {
+				this._logService.info(`exiting with code 0`);
+				this._logService.flush();
+				this._logService.dispose();
+				this._hostUtils.exit(0);
+			});
 		}, 1000);
 	}
 
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index b25ff919d..51d14fbcf 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -182,6 +182,7 @@ export class ExtensionHostManager extends Disposable {
 		this._register(this._rpcProtocol.onDidChangeResponsiveState((responsiveState: ResponsiveState) => this._onDidChangeResponsiveState.fire(responsiveState)));
 		const extHostContext: IExtHostContext = {
 			remoteAuthority: this._extensionHost.remoteAuthority,
+			extensionHostKind: this.kind,
 			getProxy: <T>(identifier: ProxyIdentifier<T>): T => this._rpcProtocol!.getProxy(identifier),
 			set: <T, R extends T>(identifier: ProxyIdentifier<T>, instance: R): R => this._rpcProtocol!.set(identifier, instance),
 			assertRegistered: (identifiers: ProxyIdentifier<any>[]): void => this._rpcProtocol!.assertRegistered(identifiers),
@@ -260,12 +261,12 @@ export class ExtensionHostManager extends Disposable {
 		const authorityPlusIndex = remoteAuthority.indexOf('+');
 		if (authorityPlusIndex === -1) {
 			// This authority does not need to be resolved, simply parse the port number
-			const pieces = remoteAuthority.split(':');
+			const lastColon = remoteAuthority.lastIndexOf(':');
 			return Promise.resolve({
 				authority: {
 					authority: remoteAuthority,
-					host: pieces[0],
-					port: parseInt(pieces[1], 10),
+					host: remoteAuthority.substring(0, lastColon),
+					port: parseInt(remoteAuthority.substring(lastColon + 1), 10),
 					connectionToken: undefined
 				}
 			});
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
index c60299a9a..46a8e5f45 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
@@ -8,7 +8,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
 export const enum ExtensionHostExitCode {
 	// nodejs uses codes 1-13 and exit codes >128 are signal exits
 	VersionMismatch = 55,
-	StartTimeout10s = 56,
+	StartTimeout60s = 56,
 	UnexpectedError = 81,
 }
 
@@ -20,6 +20,8 @@ export interface IExtHostSocketMessage {
 	type: 'VSCODE_EXTHOST_IPC_SOCKET';
 	initialDataChunk: string;
 	skipWebSocketFrames: boolean;
+	permessageDeflate: boolean;
+	inflateBytes: string;
 }
 
 export interface IExtHostReduceGraceTimeMessage {
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index c454bf39e..f261f99b5 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -305,6 +305,11 @@ export const schema: IJSONSchema = {
 						body: 'onCustomEditor:${9:viewType}',
 						description: nls.localize('vscode.extension.activationEvents.onCustomEditor', 'An activation event emitted whenever the specified custom editor becomes visible.'),
 					},
+					{
+						label: 'onNotebook',
+						body: 'onNotebook:${10:viewType}',
+						description: nls.localize('vscode.extension.activationEvents.onNotebook', 'An activation event emitted whenever the specified notebook document is opened.'),
+					},
 					{
 						label: '*',
 						description: nls.localize('vscode.extension.activationEvents.star', 'An activation event emitted on VS Code startup. To ensure a great end user experience, please use this activation event in your extension only when no other activation events combination works in your use-case.'),
diff --git a/src/vs/workbench/services/extensions/common/polyfillNestedWorker.protocol.ts b/src/vs/workbench/services/extensions/common/polyfillNestedWorker.protocol.ts
new file mode 100644
index 000000000..be78ebd12
--- /dev/null
+++ b/src/vs/workbench/services/extensions/common/polyfillNestedWorker.protocol.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+export interface NewWorkerMessage {
+	type: '_newWorker';
+	id: string;
+	port: any /* MessagePort */;
+	url: string;
+	options: any /* WorkerOptions */ | undefined;
+}
+
+export interface TerminateWorkerMessage {
+	type: '_terminateWorker';
+	id: string;
+}
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
index eddbd5f01..7e8a66b2b 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
@@ -57,6 +57,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 	public readonly onExit: Event<[number, string | null]> = this._onExit.event;
 
 	private _protocol: PersistentProtocol | null;
+	private _hasLostConnection: boolean;
 	private _terminating: boolean;
 	private readonly _isExtensionDevHost: boolean;
 
@@ -77,6 +78,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 		super();
 		this.remoteAuthority = this._initDataProvider.remoteAuthority;
 		this._protocol = null;
+		this._hasLostConnection = false;
 		this._terminating = false;
 
 		this._register(this._lifecycleService.onShutdown(reason => this.dispose()));
@@ -130,7 +132,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 					this._extensionHostDebugService.attachSession(this._environmentService.debugExtensionHost.debugId, debugPort, this._initDataProvider.remoteAuthority);
 				}
 
-				protocol.onClose(() => {
+				protocol.onDidDispose(() => {
 					this._onExtHostConnectionLost();
 				});
 
@@ -188,6 +190,11 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 	}
 
 	private _onExtHostConnectionLost(): void {
+		if (this._hasLostConnection) {
+			// avoid re-entering this method
+			return;
+		}
+		this._hasLostConnection = true;
 
 		if (this._isExtensionDevHost && this._environmentService.debugExtensionHost.debugId) {
 			this._extensionHostDebugService.close(this._environmentService.debugExtensionHost.debugId);
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index e76e7793d..8911db6ca 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -246,6 +246,24 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 				signal,
 				extensionIds: activatedExtensions.map(e => e.value)
 			});
+
+			for (const extensionId of activatedExtensions) {
+				type ExtensionHostCrashExtensionClassification = {
+					code: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					signal: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					extensionId: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+				};
+				type ExtensionHostCrashExtensionEvent = {
+					code: number;
+					signal: string | null;
+					extensionId: string;
+				};
+				this._telemetryService.publicLog2<ExtensionHostCrashExtensionEvent, ExtensionHostCrashExtensionClassification>('extensionHostCrashExtension', {
+					code,
+					signal,
+					extensionId: extensionId.value
+				});
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
index 5ec4c4bba..728b98d3b 100644
--- a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
@@ -45,6 +45,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IOutputChannelRegistry, Extensions } from 'vs/workbench/services/output/common/output';
 import { isUUID } from 'vs/base/common/uuid';
 import { join } from 'vs/base/common/path';
+import { Readable, Writable } from 'stream';
+import { StringDecoder } from 'string_decoder';
 
 export interface ILocalProcessExtensionHostInitData {
 	readonly autoStart: boolean;
@@ -55,6 +57,11 @@ export interface ILocalProcessExtensionHostDataProvider {
 	getInitData(): Promise<ILocalProcessExtensionHostInitData>;
 }
 
+const enum NativeLogMarkers {
+	Start = 'START_NATIVE_LOG',
+	End = 'END_NATIVE_LOG',
+}
+
 export class LocalProcessExtensionHost implements IExtensionHost {
 
 	public readonly kind = ExtensionHostKind.LocalProcess;
@@ -151,13 +158,12 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 			this._messageProtocol = Promise.all([
 				this._tryListenOnPipe(),
 				this._tryFindDebugPort()
-			]).then(data => {
-				const pipeName = data[0];
-				const portNumber = data[1];
+			]).then(([pipeName, portNumber]) => {
 				const env = objects.mixin(objects.deepClone(process.env), {
-					AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
-					PIPE_LOGGING: 'true',
-					VERBOSE_LOGGING: true,
+					VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
+					VSCODE_PIPE_LOGGING: 'true',
+					VSCODE_VERBOSE_LOGGING: true,
+					VSCODE_LOG_NATIVE: this._isExtensionDevHost,
 					VSCODE_IPC_HOOK_EXTHOST: pipeName,
 					VSCODE_HANDLES_UNCAUGHT_ERRORS: true,
 					VSCODE_LOG_STACK: !this._isExtensionDevTestFromCli && (this._isExtensionDevHost || !this._environmentService.isBuilt || this._productService.quality !== 'stable' || this._environmentService.verbose),
@@ -196,6 +202,10 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 					opts.execArgv = ['--inspect-port=0'];
 				}
 
+				if (this._environmentService.args['prof-v8-extensions']) {
+					opts.execArgv.unshift('--prof');
+				}
+
 				// On linux crash reporter needs to be started on child node processes explicitly
 				if (platform.isLinux) {
 					const crashReporterStartOptions: CrashReporterStartOptions = {
@@ -217,7 +227,7 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 					// For https://github.com/microsoft/vscode/issues/105743
 					const extHostCrashDirectory = this._environmentService.crashReporterDirectory || this._environmentService.userDataPath;
 					opts.env.BREAKPAD_DUMP_LOCATION = join(extHostCrashDirectory, `${ExtensionHostLogFileName} Crash Reports`);
-					opts.env.CRASH_REPORTER_START_OPTIONS = JSON.stringify(crashReporterStartOptions);
+					opts.env.VSCODE_CRASH_REPORTER_START_OPTIONS = JSON.stringify(crashReporterStartOptions);
 				}
 
 				// Run Extension Host as fork of current process
@@ -225,13 +235,11 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 
 				// Catch all output coming from the extension host process
 				type Output = { data: string, format: string[] };
-				this._extensionHostProcess.stdout!.setEncoding('utf8');
-				this._extensionHostProcess.stderr!.setEncoding('utf8');
-				const onStdout = Event.fromNodeEventEmitter<string>(this._extensionHostProcess.stdout!, 'data');
-				const onStderr = Event.fromNodeEventEmitter<string>(this._extensionHostProcess.stderr!, 'data');
+				const onStdout = this._handleProcessOutputStream(this._extensionHostProcess.stdout!);
+				const onStderr = this._handleProcessOutputStream(this._extensionHostProcess.stderr!);
 				const onOutput = Event.any(
-					Event.map(onStdout, o => ({ data: `%c${o}`, format: [''] })),
-					Event.map(onStderr, o => ({ data: `%c${o}`, format: ['color: red'] }))
+					Event.map(onStdout.event, o => ({ data: `%c${o}`, format: [''] })),
+					Event.map(onStderr.event, o => ({ data: `%c${o}`, format: ['color: red'] }))
 				);
 
 				// Debounce all output, so we can render it in the Chrome console as a group
@@ -497,11 +505,6 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 
 			// Send to local console
 			log(entry, 'Extension Host');
-
-			// Broadcast to other windows if we are in development mode
-			if (this._environmentService.debugExtensionHost.debugId && (!this._environmentService.isBuilt || this._isExtensionDevHost)) {
-				this._extensionHostDebugService.logToSession(this._environmentService.debugExtensionHost.debugId, entry);
-			}
 		}
 	}
 
@@ -525,6 +528,44 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 		this._onExit.fire([code, signal]);
 	}
 
+	private _handleProcessOutputStream(stream: Readable) {
+		let last = '';
+		let isOmitting = false;
+		const event = new Emitter<string>();
+		const decoder = new StringDecoder('utf-8');
+		stream.pipe(new Writable({
+			write(chunk, _encoding, callback) {
+				// not a fancy approach, but this is the same approach used by the split2
+				// module which is well-optimized (https://github.com/mcollina/split2)
+				last += typeof chunk === 'string' ? chunk : decoder.write(chunk);
+				let lines = last.split(/\r?\n/g);
+				last = lines.pop()!;
+
+				// protected against an extension spamming and leaking memory if no new line is written.
+				if (last.length > 10_000) {
+					lines.push(last);
+					last = '';
+				}
+
+				for (const line of lines) {
+					if (isOmitting) {
+						if (line === NativeLogMarkers.End) {
+							isOmitting = false;
+						}
+					} else if (line === NativeLogMarkers.Start) {
+						isOmitting = true;
+					} else if (line.length) {
+						event.fire(line + '\n');
+					}
+				}
+
+				callback();
+			}
+		}));
+
+		return event;
+	}
+
 	public async enableInspectPort(): Promise<boolean> {
 		if (typeof this._inspectPort === 'number') {
 			return true;
@@ -614,7 +655,7 @@ export class LocalProcessExtensionHost implements IExtensionHost {
 		// to communicate this back to the main side to terminate the debug session
 		if (this._isExtensionDevHost && !this._isExtensionDevTestFromCli && !this._isExtensionDevDebug && this._environmentService.debugExtensionHost.debugId) {
 			this._extensionHostDebugService.terminateSession(this._environmentService.debugExtensionHost.debugId);
-			event.join(timeout(100 /* wait a bit for IPC to get delivered */));
+			event.join(timeout(100 /* wait a bit for IPC to get delivered */), 'join.extensionDevelopment');
 		}
 	}
 }
diff --git a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
index e39d131fe..fe69f179c 100644
--- a/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
+++ b/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
@@ -6,6 +6,7 @@
 import * as nativeWatchdog from 'native-watchdog';
 import * as net from 'net';
 import * as minimist from 'minimist';
+import * as performance from 'vs/base/common/performance';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event } from 'vs/base/common/event';
 import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
@@ -92,7 +93,7 @@ interface IRendererConnection {
 
 // This calls exit directly in case the initialization is not finished and we need to exit
 // Otherwise, if initialization completed we go to extensionHostMain.terminate()
-let onTerminate = function () {
+let onTerminate = function (reason: string) {
 	nativeExit();
 };
 
@@ -109,8 +110,8 @@ function _createExtHostProtocol(): Promise<PersistentProtocol> {
 
 			const reconnectionGraceTime = ProtocolConstants.ReconnectionGraceTime;
 			const reconnectionShortGraceTime = ProtocolConstants.ReconnectionShortGraceTime;
-			const disconnectRunner1 = new RunOnceScheduler(() => onTerminate(), reconnectionGraceTime);
-			const disconnectRunner2 = new RunOnceScheduler(() => onTerminate(), reconnectionShortGraceTime);
+			const disconnectRunner1 = new RunOnceScheduler(() => onTerminate('renderer disconnected for too long (1)'), reconnectionGraceTime);
+			const disconnectRunner2 = new RunOnceScheduler(() => onTerminate('renderer disconnected for too long (2)'), reconnectionShortGraceTime);
 
 			process.on('message', (msg: IExtHostSocketMessage | IExtHostReduceGraceTimeMessage, handle: net.Socket) => {
 				if (msg && msg.type === 'VSCODE_EXTHOST_IPC_SOCKET') {
@@ -119,7 +120,8 @@ function _createExtHostProtocol(): Promise<PersistentProtocol> {
 					if (msg.skipWebSocketFrames) {
 						socket = new NodeSocket(handle);
 					} else {
-						socket = new WebSocketNodeSocket(new NodeSocket(handle));
+						const inflateBytes = VSBuffer.wrap(Buffer.from(msg.inflateBytes, 'base64'));
+						socket = new WebSocketNodeSocket(new NodeSocket(handle), msg.permessageDeflate, inflateBytes, false);
 					}
 					if (protocol) {
 						// reconnection case
@@ -130,7 +132,7 @@ function _createExtHostProtocol(): Promise<PersistentProtocol> {
 					} else {
 						clearTimeout(timer);
 						protocol = new PersistentProtocol(socket, initialDataChunk);
-						protocol.onClose(() => onTerminate());
+						protocol.onDidDispose(() => onTerminate('renderer disconnected'));
 						resolve(protocol);
 
 						// Wait for rich client to reconnect
@@ -191,7 +193,7 @@ async function createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 			protocol.onMessage((msg) => {
 				if (isMessageOfType(msg, MessageType.Terminate)) {
 					this._terminating = true;
-					onTerminate();
+					onTerminate('received terminate message from renderer');
 				} else {
 					this._onMessage.fire(msg);
 				}
@@ -263,11 +265,23 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 			});
 
 			// Kill oneself if one's parent dies. Much drama.
+			let epermErrors = 0;
 			setInterval(function () {
 				try {
 					process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
+					epermErrors = 0;
 				} catch (e) {
-					onTerminate();
+					if (e && e.code === 'EPERM') {
+						// Even if the parent process is still alive,
+						// some antivirus software can lead to an EPERM error to be thrown here.
+						// Let's terminate only if we get 3 consecutive EPERM errors.
+						epermErrors++;
+						if (epermErrors >= 3) {
+							onTerminate(`parent process ${initData.parentPid} does not exist anymore (3 x EPERM): ${e.message} (code: ${e.code}) (errno: ${e.errno})`);
+						}
+					} else {
+						onTerminate(`parent process ${initData.parentPid} does not exist anymore: ${e.message} (code: ${e.code}) (errno: ${e.errno})`);
+					}
 				}
 			}, 1000);
 
@@ -295,9 +309,11 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 }
 
 export async function startExtensionHostProcess(): Promise<void> {
-
+	performance.mark(`code/extHost/willConnectToRenderer`);
 	const protocol = await createExtHostProtocol();
+	performance.mark(`code/extHost/didConnectToRenderer`);
 	const renderer = await connectToRenderer(protocol);
+	performance.mark(`code/extHost/didWaitForInitData`);
 	const { initData } = renderer;
 	// setup things
 	patchProcess(!!initData.environment.extensionTestsLocationURI); // to support other test frameworks like Jasmin that use process.exit (https://github.com/microsoft/vscode/issues/37708)
@@ -331,5 +347,5 @@ export async function startExtensionHostProcess(): Promise<void> {
 	);
 
 	// rewrite onTerminate-function to be a proper shutdown
-	onTerminate = () => extensionHostMain.terminate();
+	onTerminate = (reason: string) => extensionHostMain.terminate(reason);
 }
diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts
index 94f0a9dea..c19a1f5ba 100644
--- a/src/vs/workbench/services/extensions/node/extensionPoints.ts
+++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts
@@ -12,7 +12,7 @@ import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages';
 import * as types from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import * as pfs from 'vs/base/node/pfs';
-import { getGalleryExtensionId, groupByExtension, ExtensionIdentifierWithVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getGalleryExtensionId, groupByExtension, ExtensionIdentifierWithVersion, getExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isValidExtensionVersion } from 'vs/platform/extensions/common/extensionValidator';
 import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { Translations, ILog } from 'vs/workbench/services/extensions/common/extensionPoints';
@@ -47,10 +47,19 @@ abstract class ExtensionManifestHandler {
 
 class ExtensionManifestParser extends ExtensionManifestHandler {
 
+	private static _fastParseJSON(text: string, errors: json.ParseError[]): any {
+		try {
+			return JSON.parse(text);
+		} catch (err) {
+			// invalid JSON, let's get good errors
+			return json.parse(text, errors);
+		}
+	}
+
 	public parse(): Promise<IExtensionDescription> {
 		return pfs.readFile(this._absoluteManifestPath).then((manifestContents) => {
 			const errors: json.ParseError[] = [];
-			const manifest = json.parse(manifestContents.toString(), errors);
+			const manifest = ExtensionManifestParser._fastParseJSON(manifestContents.toString(), errors);
 			if (json.getNodeType(manifest) !== 'object') {
 				this._log.error(this._absoluteFolderPath, nls.localize('jsonParseInvalidType', "Invalid manifest file {0}: Not an JSON object.", this._absoluteManifestPath));
 			} else if (errors.length === 0) {
@@ -326,7 +335,7 @@ class ExtensionManifestValidator extends ExtensionManifestHandler {
 		}
 
 		// id := `publisher.name`
-		extensionDescription.id = `${extensionDescription.publisher}.${extensionDescription.name}`;
+		extensionDescription.id = getExtensionId(extensionDescription.publisher, extensionDescription.name);
 		extensionDescription.identifier = new ExtensionIdentifier(extensionDescription.id);
 
 		extensionDescription.extensionLocation = URI.file(this._absoluteFolderPath);
diff --git a/src/vs/workbench/services/extensions/node/proxyResolver.ts b/src/vs/workbench/services/extensions/node/proxyResolver.ts
index 3050bc6e2..d520ce8bd 100644
--- a/src/vs/workbench/services/extensions/node/proxyResolver.ts
+++ b/src/vs/workbench/services/extensions/node/proxyResolver.ts
@@ -397,7 +397,7 @@ function tlsPatches(originals: typeof tls) {
 	};
 
 	function patch(original: typeof tls.createSecureContext): typeof tls.createSecureContext {
-		return function (details: tls.SecureContextOptions): ReturnType<typeof tls.createSecureContext> {
+		return function (details?: tls.SecureContextOptions): ReturnType<typeof tls.createSecureContext> {
 			const context = original.apply(null, arguments as any);
 			const certs = (details as any)._vscodeAdditionalCaCerts;
 			if (certs) {
@@ -498,7 +498,7 @@ async function readWindowsCaCertificates() {
 	const winCA = await import('vscode-windows-ca-certs');
 
 	let ders: any[] = [];
-	const store = winCA();
+	const store = new winCA.Crypt32();
 	try {
 		let der: any;
 		while (der = store.next()) {
diff --git a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
new file mode 100644
index 000000000..6d8c49438
--- /dev/null
+++ b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ExtensionService as BrowserExtensionService } from 'vs/workbench/services/extensions/browser/extensionService';
+import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/abstractExtensionService';
+
+suite('BrowserExtensionService', () => {
+	test('pickRunningLocation', () => {
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation([], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation([], false, true), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation([], true, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation([], true, true), ExtensionRunningLocation.None);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui'], true, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui'], true, true), ExtensionRunningLocation.Remote);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace'], true, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace'], true, true), ExtensionRunningLocation.Remote);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web'], false, true), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web'], true, true), ExtensionRunningLocation.LocalWebWorker);
+
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], true, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], true, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], true, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], true, true), ExtensionRunningLocation.Remote);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], true, true), ExtensionRunningLocation.Remote);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], true, true), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], true, true), ExtensionRunningLocation.LocalWebWorker);
+
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], true, true), ExtensionRunningLocation.Remote);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], true, true), ExtensionRunningLocation.LocalWebWorker);
+
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], true, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], false, false), ExtensionRunningLocation.None);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], false, true), ExtensionRunningLocation.Remote);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
+		assert.deepStrictEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], true, true), ExtensionRunningLocation.Remote);
+	});
+});
diff --git a/src/vs/workbench/services/extensions/test/common/extensionsUtil.test.ts b/src/vs/workbench/services/extensions/test/common/extensionsUtil.test.ts
index b5c5671dd..4ca1afc4e 100644
--- a/src/vs/workbench/services/extensions/test/common/extensionsUtil.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/extensionsUtil.test.ts
@@ -10,7 +10,7 @@ import { IExtensionManifest, ExtensionKind } from 'vs/platform/extensions/common
 suite('ExtensionKind', () => {
 
 	function check(manifest: Partial<IExtensionManifest>, expected: ExtensionKind[]): void {
-		assert.deepEqual(deduceExtensionKind(<IExtensionManifest>manifest), expected);
+		assert.deepStrictEqual(deduceExtensionKind(<IExtensionManifest>manifest), expected);
 	}
 
 	test('declarative with extension dependencies => workspace', () => {
diff --git a/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
index 976d2b1cc..5264e3d78 100644
--- a/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
+++ b/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
@@ -56,7 +56,7 @@ suite('RPCProtocol', () => {
 	test('simple call', function (done) {
 		delegate = (a1: number, a2: number) => a1 + a2;
 		bProxy.$m(4, 1).then((res: number) => {
-			assert.equal(res, 5);
+			assert.strictEqual(res, 5);
 			done(null);
 		}, done);
 	});
@@ -64,7 +64,7 @@ suite('RPCProtocol', () => {
 	test('simple call without result', function (done) {
 		delegate = (a1: number, a2: number) => { };
 		bProxy.$m(4, 1).then((res: number) => {
-			assert.equal(res, undefined);
+			assert.strictEqual(res, undefined);
 			done(null);
 		}, done);
 	});
@@ -80,7 +80,7 @@ suite('RPCProtocol', () => {
 		b.buffer[2] = 3;
 		b.buffer[3] = 4;
 		bProxy.$m(b, 2).then((res: number) => {
-			assert.equal(res, 3);
+			assert.strictEqual(res, 3);
 			done(null);
 		}, done);
 	});
@@ -96,10 +96,10 @@ suite('RPCProtocol', () => {
 		};
 		bProxy.$m(4, 1).then((res: VSBuffer) => {
 			assert.ok(res instanceof VSBuffer);
-			assert.equal(res.buffer[0], 1);
-			assert.equal(res.buffer[1], 2);
-			assert.equal(res.buffer[2], 3);
-			assert.equal(res.buffer[3], 4);
+			assert.strictEqual(res.buffer[0], 1);
+			assert.strictEqual(res.buffer[1], 2);
+			assert.strictEqual(res.buffer[2], 3);
+			assert.strictEqual(res.buffer[3], 4);
 			done(null);
 		}, done);
 	});
@@ -121,7 +121,7 @@ suite('RPCProtocol', () => {
 			return a1 + 1;
 		};
 		bProxy.$m(4, CancellationToken.None).then((res: number) => {
-			assert.equal(res, 5);
+			assert.strictEqual(res, 5);
 			done(null);
 		}, done);
 	});
@@ -138,7 +138,7 @@ suite('RPCProtocol', () => {
 		let tokenSource = new CancellationTokenSource();
 		let p = bProxy.$m(4, tokenSource.token);
 		p.then((res: number) => {
-			assert.equal(res, 7);
+			assert.strictEqual(res, 7);
 		}, (err) => {
 			assert.fail('should not receive error');
 		}).finally(done);
@@ -152,7 +152,7 @@ suite('RPCProtocol', () => {
 		bProxy.$m(4, 1).then((res) => {
 			assert.fail('unexpected');
 		}, (err) => {
-			assert.equal(err.message, 'nope');
+			assert.strictEqual(err.message, 'nope');
 		}).finally(done);
 	});
 
@@ -163,7 +163,7 @@ suite('RPCProtocol', () => {
 		bProxy.$m(4, 1).then((res) => {
 			assert.fail('unexpected');
 		}, (err) => {
-			assert.equal(err, undefined);
+			assert.strictEqual(err, undefined);
 		}).finally(done);
 	});
 
@@ -174,7 +174,7 @@ suite('RPCProtocol', () => {
 			return circular;
 		};
 		bProxy.$m(4, 1).then((res) => {
-			assert.equal(res, null);
+			assert.strictEqual(res, null);
 		}, (err) => {
 			assert.fail('unexpected');
 		}).finally(done);
@@ -188,18 +188,18 @@ suite('RPCProtocol', () => {
 		bProxy.$m(4, 1).then((res) => {
 			assert.fail('unexpected');
 		}, (err) => {
-			assert.equal(err.what, 'what');
+			assert.strictEqual(err.what, 'what');
 		}).finally(done);
 	});
 
 	test('undefined arguments arrive as null', function () {
 		delegate = (a1: any, a2: any) => {
-			assert.equal(typeof a1, 'undefined');
-			assert.equal(a2, null);
+			assert.strictEqual(typeof a1, 'undefined');
+			assert.strictEqual(a2, null);
 			return 7;
 		};
 		return bProxy.$m(undefined, null).then((res) => {
-			assert.equal(res, 7);
+			assert.strictEqual(res, 7);
 		});
 	});
 
diff --git a/src/vs/workbench/services/extensions/test/electron-browser/extensionService.test.ts b/src/vs/workbench/services/extensions/test/electron-browser/extensionService.test.ts
deleted file mode 100644
index 77a803dfa..000000000
--- a/src/vs/workbench/services/extensions/test/electron-browser/extensionService.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import { ExtensionService as BrowserExtensionService } from 'vs/workbench/services/extensions/browser/extensionService';
-import { ExtensionRunningLocation } from 'vs/workbench/services/extensions/common/abstractExtensionService';
-
-suite('BrowserExtensionService', () => {
-	test('pickRunningLocation', () => {
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation([], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation([], false, true), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation([], true, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation([], true, true), ExtensionRunningLocation.None);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui'], true, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui'], true, true), ExtensionRunningLocation.Remote);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace'], true, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace'], true, true), ExtensionRunningLocation.Remote);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web'], false, true), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web'], true, true), ExtensionRunningLocation.LocalWebWorker);
-
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], true, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace'], true, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], true, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui'], true, true), ExtensionRunningLocation.Remote);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web'], true, true), ExtensionRunningLocation.Remote);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web'], true, true), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui'], true, true), ExtensionRunningLocation.LocalWebWorker);
-
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'web', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['ui', 'workspace', 'web'], true, true), ExtensionRunningLocation.Remote);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'ui', 'workspace'], true, true), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['web', 'workspace', 'ui'], true, true), ExtensionRunningLocation.LocalWebWorker);
-
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'ui', 'web'], true, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], false, false), ExtensionRunningLocation.None);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], false, true), ExtensionRunningLocation.Remote);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], true, false), ExtensionRunningLocation.LocalWebWorker);
-		assert.deepEqual(BrowserExtensionService.pickRunningLocation(['workspace', 'web', 'ui'], true, true), ExtensionRunningLocation.Remote);
-	});
-});
diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts
index dd554377b..0bb6e4bbe 100644
--- a/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts
+++ b/src/vs/workbench/services/extensions/worker/extensionHostWorker.ts
@@ -10,7 +10,9 @@ import { isMessageOfType, MessageType, createMessageOfType } from 'vs/workbench/
 import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
 import { ExtensionHostMain } from 'vs/workbench/services/extensions/common/extensionHostMain';
 import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
+import { NestedWorker } from 'vs/workbench/services/extensions/worker/polyfillNestedWorker';
 import * as path from 'vs/base/common/path';
+import * as performance from 'vs/base/common/performance';
 
 import 'vs/workbench/api/common/extHost.common.services';
 import 'vs/workbench/api/worker/extHost.worker.services';
@@ -23,6 +25,8 @@ declare namespace self {
 	let close: any;
 	let postMessage: any;
 	let addEventListener: any;
+	let removeEventListener: any;
+	let dispatchEvent: any;
 	let indexedDB: { open: any, [k: string]: any };
 	let caches: { open: any, [k: string]: any };
 }
@@ -46,13 +50,24 @@ self.addEventListener = () => console.trace(`'addEventListener' has been blocked
 (<any>self)['webkitResolveLocalFileSystemURL'] = undefined;
 
 if ((<any>self).Worker) {
-	// make sure new Worker(...) always uses data:
+	const ttPolicy = (<any>self).trustedTypes?.createPolicy('extensionHostWorker', { createScriptURL: (value: string) => value });
+
+	// make sure new Worker(...) always uses blob: (to maintain current origin)
 	const _Worker = (<any>self).Worker;
 	Worker = <any>function (stringUrl: string | URL, options?: WorkerOptions) {
 		const js = `importScripts('${stringUrl}');`;
 		options = options || {};
 		options.name = options.name || path.basename(stringUrl.toString());
-		return new _Worker(`data:text/javascript;charset=utf-8,${encodeURIComponent(js)}`, options);
+		const blob = new Blob([js], { type: 'application/javascript' });
+		const blobUrl = URL.createObjectURL(blob);
+		return new _Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) : blobUrl, options);
+	};
+
+} else {
+	(<any>self).Worker = class extends NestedWorker {
+		constructor(stringOrUrl: string | URL, options?: WorkerOptions) {
+			super(nativePostMessage, stringOrUrl, { name: path.basename(stringOrUrl.toString()), ...options });
+		}
 	};
 }
 
@@ -97,7 +112,7 @@ class ExtensionWorker {
 			if (isMessageOfType(msg, MessageType.Terminate)) {
 				// handle terminate-message right here
 				terminating = true;
-				onTerminate();
+				onTerminate('received terminate message from renderer');
 				return;
 			}
 
@@ -133,13 +148,13 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 	});
 }
 
-let onTerminate = nativeClose;
+let onTerminate = (reason: string) => nativeClose();
 
 (function create(): void {
 	const res = new ExtensionWorker();
-
+	performance.mark(`code/extHost/willConnectToRenderer`);
 	connectToRenderer(res.protocol).then(data => {
-
+		performance.mark(`code/extHost/didWaitForInitData`);
 		const extHostMain = new ExtensionHostMain(
 			data.protocol,
 			data.initData,
@@ -147,6 +162,6 @@ let onTerminate = nativeClose;
 			null,
 		);
 
-		onTerminate = () => extHostMain.terminate();
+		onTerminate = (reason: string) => extHostMain.terminate(reason);
 	});
 })();
diff --git a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html
index 392b4b4ae..d8387db2f 100644
--- a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; child-src 'self' data:; script-src 'unsafe-eval' 'sha256-DhNBVT9y4y9LG937ZrEbN5CwALd+WSpQnG3z5u1MOFk=' http: https:; connect-src http: https:" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; child-src 'self' data: blob:; script-src 'unsafe-eval' 'sha256-LU+tuagpyx5mKuYgHsSvz9593ZGS6yeLPRvzq1lKXlY=' http: https:; connect-src http: https: ws: wss:" />
 	</head>
 	<body>
 	<script>
@@ -22,13 +22,31 @@
 
 	try {
 		const worker = new Worker('extensionHostWorkerMain.js', { name: 'WorkerExtensionHost' });
+		const nestedWorkers = new Map();
 
 		worker.onmessage = (event) => {
 			const { data } = event;
-			window.parent.postMessage({
-				vscodeWebWorkerExtHostId,
-				data
-			}, '*', [data]);
+
+			if (data?.type === '_newWorker') {
+				const { id, port, url, options } = data;
+				const newWorker = new Worker(url, options);
+				newWorker.postMessage(port, [port]);
+				worker.onerror = console.error.bind(console);
+				nestedWorkers.set(id, newWorker);
+
+			} else if (data?.type === '_terminateWorker') {
+				const { id } = data;
+				if(nestedWorkers.has(id)) {
+					nestedWorkers.get(id).terminate();
+					nestedWorkers.delete(id);
+				}
+			} else {
+				worker.onerror = console.error.bind(console);
+				window.parent.postMessage({
+					vscodeWebWorkerExtHostId,
+					data
+				}, '*', [data]);
+			}
 		};
 
 		worker.onerror = (event) => {
diff --git a/src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html
index cb781b7e9..fbff5dcfd 100644
--- a/src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; child-src 'self' data:; script-src 'unsafe-eval' 'sha256-DhNBVT9y4y9LG937ZrEbN5CwALd+WSpQnG3z5u1MOFk=' https:; connect-src https:" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; child-src 'self' data: blob:; script-src 'unsafe-eval' 'sha256-LU+tuagpyx5mKuYgHsSvz9593ZGS6yeLPRvzq1lKXlY=' https:; connect-src https: wss:" />
 	</head>
 	<body>
 	<script>
@@ -22,13 +22,31 @@
 
 	try {
 		const worker = new Worker('extensionHostWorkerMain.js', { name: 'WorkerExtensionHost' });
+		const nestedWorkers = new Map();
 
 		worker.onmessage = (event) => {
 			const { data } = event;
-			window.parent.postMessage({
-				vscodeWebWorkerExtHostId,
-				data
-			}, '*', [data]);
+
+			if (data?.type === '_newWorker') {
+				const { id, port, url, options } = data;
+				const newWorker = new Worker(url, options);
+				newWorker.postMessage(port, [port]);
+				worker.onerror = console.error.bind(console);
+				nestedWorkers.set(id, newWorker);
+
+			} else if (data?.type === '_terminateWorker') {
+				const { id } = data;
+				if(nestedWorkers.has(id)) {
+					nestedWorkers.get(id).terminate();
+					nestedWorkers.delete(id);
+				}
+			} else {
+				worker.onerror = console.error.bind(console);
+				window.parent.postMessage({
+					vscodeWebWorkerExtHostId,
+					data
+				}, '*', [data]);
+			}
 		};
 
 		worker.onerror = (event) => {
diff --git a/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts b/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
new file mode 100644
index 000000000..f70257daf
--- /dev/null
+++ b/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { NewWorkerMessage, TerminateWorkerMessage } from 'vs/workbench/services/extensions/common/polyfillNestedWorker.protocol';
+
+declare function postMessage(data: any, transferables?: Transferable[]): void;
+
+declare type MessageEventHandler = ((ev: MessageEvent<any>) => any) | null;
+
+const _bootstrapFnSource = (function _bootstrapFn(workerUrl: string) {
+
+	const listener: EventListener = (event: Event): void => {
+		// uninstall handler
+		self.removeEventListener('message', listener);
+
+		// get data
+		const port = <MessagePort>(<MessageEvent>event).data;
+
+		// postMessage
+		// onmessage
+		Object.defineProperties(self, {
+			'postMessage': {
+				value(data: any, transferOrOptions?: any) {
+					port.postMessage(data, transferOrOptions);
+				}
+			},
+			'onmessage': {
+				get() {
+					return port.onmessage;
+				},
+				set(value: MessageEventHandler) {
+					port.onmessage = value;
+				}
+			}
+			// todo onerror
+		});
+
+		port.addEventListener('message', msg => {
+			self.dispatchEvent(new MessageEvent('message', { data: msg.data }));
+		});
+
+		port.start();
+
+		// fake recursively nested worker
+		self.Worker = <any>class { constructor() { throw new TypeError('Nested workers from within nested worker are NOT supported.'); } };
+
+		// load module
+		importScripts(workerUrl);
+	};
+
+	self.addEventListener('message', listener);
+}).toString();
+
+
+export class NestedWorker extends EventTarget implements Worker {
+
+	onmessage: ((this: Worker, ev: MessageEvent<any>) => any) | null = null;
+	onmessageerror: ((this: Worker, ev: MessageEvent<any>) => any) | null = null;
+	onerror: ((this: AbstractWorker, ev: ErrorEvent) => any) | null = null;
+
+	readonly terminate: () => void;
+	readonly postMessage: (message: any, options?: any) => void;
+
+	constructor(nativePostMessage: typeof postMessage, stringOrUrl: string | URL, options?: WorkerOptions) {
+		super();
+
+		// create bootstrap script
+		const bootstrap = `((${_bootstrapFnSource})('${stringOrUrl}'))`;
+		const blob = new Blob([bootstrap], { type: 'application/javascript' });
+		const blobUrl = URL.createObjectURL(blob);
+
+		const channel = new MessageChannel();
+		const id = blobUrl; // works because blob url is unique, needs ID pool otherwise
+
+		const msg: NewWorkerMessage = {
+			type: '_newWorker',
+			id,
+			port: channel.port2,
+			url: blobUrl,
+			options,
+		};
+		nativePostMessage(msg, [channel.port2]);
+
+		// worker-impl: functions
+		this.postMessage = channel.port1.postMessage.bind(channel.port1);
+		this.terminate = () => {
+			const msg: TerminateWorkerMessage = {
+				type: '_terminateWorker',
+				id
+			};
+			channel.port1.postMessage(msg);
+			URL.revokeObjectURL(blobUrl);
+
+			channel.port1.close();
+			channel.port2.close();
+		};
+
+		// worker-impl: events
+		Object.defineProperties(this, {
+			'onmessage': {
+				get() {
+					return channel.port1.onmessage;
+				},
+				set(value: MessageEventHandler) {
+					channel.port1.onmessage = value;
+				}
+			},
+			'onmessageerror': {
+				get() {
+					return channel.port1.onmessageerror;
+				},
+				set(value: MessageEventHandler) {
+					channel.port1.onmessageerror = value;
+				}
+			},
+			// todo onerror
+		});
+
+		channel.port1.addEventListener('messageerror', evt => {
+			const msgEvent = new MessageEvent('messageerror', { data: evt.data });
+			this.dispatchEvent(msgEvent);
+		});
+
+		channel.port1.addEventListener('message', evt => {
+			const msgEvent = new MessageEvent('message', { data: evt.data });
+			this.dispatchEvent(msgEvent);
+		});
+
+		channel.port1.start();
+	}
+}
diff --git a/src/vs/workbench/services/gettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/services/gettingStarted/common/gettingStartedContent.ts
index 3869a6cea..7cb282874 100644
--- a/src/vs/workbench/services/gettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/services/gettingStarted/common/gettingStartedContent.ts
@@ -4,12 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
+import { Codicon } from 'vs/base/common/codicons';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
+
+
+const setupIcon = registerIcon('getting-started-setup', Codicon.heart, localize('getting-started-setup-icon', "Icon used for the setup category of getting started"));
+const beginnerIcon = registerIcon('getting-started-beginner', Codicon.lightbulb, localize('getting-started-beginner-icon', "Icon used for the beginner category of getting started"));
+const codespacesIcon = registerIcon('getting-started-codespaces', Codicon.github, localize('getting-started-codespaces-icon', "Icon used for the codespaces category of getting started"));
+
 
 type GettingStartedItem = {
 	id: string
 	title: string,
 	description: string,
-	button: { title: string, command: string },
+	button:
+	| { title: string, command?: never, link: string }
+	| { title: string, command: string, link?: never },
 	doneOn: { commandExecuted: string, eventFired?: never } | { eventFired: string, commandExecuted?: never, }
 	when?: string,
 	media: { type: 'image', path: string, altText: string },
@@ -19,7 +30,7 @@ type GettingStartedCategory = {
 	id: string
 	title: string,
 	description: string,
-	codicon: string,
+	icon: ThemeIcon,
 	when?: string,
 	content:
 	| { type: 'items', items: GettingStartedItem[] }
@@ -30,141 +41,208 @@ type GettingStartedContent = GettingStartedCategory[];
 
 export const content: GettingStartedContent = [
 	{
-		id: 'Beginner',
-		title: localize('gettingStarted.beginner.title', "Get Started"),
-		codicon: 'lightbulb',
-		description: localize('gettingStarted.beginner.description', "Get to know your new editor"),
+		id: 'Codespaces',
+		title: localize('gettingStarted.codespaces.title', "Primer on Codespaces"),
+		icon: codespacesIcon,
+		when: 'remoteName == codespaces',
+		description: localize('gettingStarted.codespaces.description', "Get up and running with your instant code environment."),
+		content: {
+			type: 'items',
+			items: [
+				{
+					id: 'runProjectTask',
+					title: localize('gettingStarted.runProject.title', "Build & run your app"),
+					description: localize('gettingStarted.runProject.description', "Build, run & debug your code in the cloud, right from the browser."),
+					button: {
+						title: localize('gettingStarted.runProject.button', "Start Debugging (F5)"),
+						command: 'workbench.action.debug.selectandstart'
+					},
+					doneOn: { commandExecuted: 'workbench.action.debug.selectandstart' },
+					media: { type: 'image', altText: 'Node.js project running debug mode and paused.', path: 'runProject.png' },
+				},
+				{
+					id: 'forwardPortsTask',
+					title: localize('gettingStarted.forwardPorts.title', "Access your running application"),
+					description: localize('gettingStarted.forwardPorts.description', "Ports running within your codespace are automatically forwarded to the web, so you can open them in your browser."),
+					button: {
+						title: localize('gettingStarted.forwardPorts.button', "Show Ports Panel"),
+						command: '~remote.forwardedPorts.focus'
+					},
+					doneOn: { commandExecuted: '~remote.forwardedPorts.focus' },
+					media: { type: 'image', altText: 'Ports panel.', path: 'forwardPorts.png' },
+				},
+				{
+					id: 'pullRequests',
+					title: localize('gettingStarted.pullRequests.title', "Pull requests at your fingertips"),
+					description: localize('gettingStarted.pullRequests.description', "Bring your GitHub workflow closer to your code, so you can review pull requests, add comments, merge branches, and more."),
+					button: {
+						title: localize('gettingStarted.pullRequests.button', "Open GitHub View"),
+						command: 'workbench.view.extension.github-pull-requests'
+					},
+					doneOn: { commandExecuted: 'workbench.view.extension.github-pull-requests' },
+					media: { type: 'image', altText: 'Preview for reviewing a pull request.', path: 'pullRequests.png' },
+				},
+				{
+					id: 'remoteTerminal',
+					title: localize('gettingStarted.remoteTerminal.title', "Run tasks in the integrated terminal"),
+					description: localize('gettingStarted.remoteTerminal.description', "Perform quick command-line tasks using the built-in terminal."),
+					button: {
+						title: localize('gettingStarted.remoteTerminal.button', "Focus Terminal"),
+						command: 'terminal.focus'
+					},
+					doneOn: { commandExecuted: 'terminal.focus' },
+					media: { type: 'image', altText: 'Remote terminal showing npm commands.', path: 'remoteTerminal.png' },
+				},
+				{
+					id: 'openVSC',
+					title: localize('gettingStarted.openVSC.title', "Develop remotely in VS Code"),
+					description: localize('gettingStarted.openVSC.description', "Access the power of your cloud development environment from your local VS Code. Set it up by installing the GitHub Codespaces extension and connecting your GitHub account."),
+					button: {
+						title: localize('gettingStarted.openVSC.button', "Open in VS Code"),
+						command: 'github.codespaces.openInStable'
+					},
+					when: 'isWeb',
+					doneOn: { commandExecuted: 'github.codespaces.openInStable' },
+					media: { type: 'image', altText: 'Preview of the Open in VS Code command.', path: 'openVSC.png' },
+				}
+			]
+		}
+	},
+
+	{
+		id: 'Setup',
+		title: localize('gettingStarted.setup.title', "Quick Setup"),
+		description: localize('gettingStarted.setup.description', "Extend and customize VS Code to make it yours."),
+		icon: setupIcon,
+		when: 'remoteName != codespaces',
 		content: {
 			type: 'items',
 			items: [
 				{
 					id: 'pickColorTheme',
-					description: localize('pickColorTask.description', "Modify the colors in the user interface to suit your preferences and work environment."),
-					title: localize('pickColorTask.title', "Color Theme"),
-					button: { title: localize('pickColorTask.button', "Find a Theme"), command: 'workbench.action.selectTheme' },
+					title: localize('gettingStarted.pickColor.title', "Customize the look with themes"),
+					description: localize('gettingStarted.pickColor.description', "Pick a color theme to match your taste and mood while coding."),
+					button: { title: localize('gettingStarted.pickColor.button', "Pick a Theme"), command: 'workbench.action.selectTheme' },
 					doneOn: { eventFired: 'themeSelected' },
-					media: { type: 'image', altText: 'ColorTheme', path: 'ColorTheme.jpg', }
+					media: { type: 'image', altText: 'Color theme preview for dark and light theme.', path: 'colorTheme.png', }
 				},
-
-				{
-					id: 'findKeybindingsExtensions',
-					description: localize('findKeybindingsTask.description', "Find keyboard shortcuts for Vim, Sublime, Atom and others."),
-					title: localize('findKeybindingsTask.title', "Configure Keybindings"),
-					button: {
-						title: localize('findKeybindingsTask.button', "Search for Keymaps"),
-						command: 'workbench.extensions.action.showRecommendedKeymapExtensions'
-					},
-					doneOn: { commandExecuted: 'workbench.extensions.action.showRecommendedKeymapExtensions' },
-					media: { type: 'image', altText: 'Extensions', path: 'Extensions.jpg', }
-				},
-
 				{
 					id: 'findLanguageExtensions',
-					description: localize('findLanguageExtsTask.description', "Get support for your languages like JavaScript, Python, Java, Azure, Docker, and more."),
-					title: localize('findLanguageExtsTask.title', "Languages & Tools"),
+					title: localize('gettingStarted.findLanguageExts.title', "Code in any language, without switching editors"),
+					description: localize('gettingStarted.findLanguageExts.description', "VS Code supports over 50+ programming languages. While many are built-in, others can be easily installed as extensions in one click."),
 					button: {
-						title: localize('findLanguageExtsTask.button', "Install Language Support"),
+						title: localize('gettingStarted.findLanguageExts.button', "Browse Language Extensions"),
 						command: 'workbench.extensions.action.showLanguageExtensions',
 					},
 					doneOn: { commandExecuted: 'workbench.extensions.action.showLanguageExtensions' },
-					media: { type: 'image', altText: 'Languages', path: 'Languages.jpg', }
+					media: { type: 'image', altText: 'Language extensions', path: 'languageExtensions.png', }
+				},
+				{
+					id: 'settingsSync',
+					title: localize('gettingStarted.settingsSync.title', "Sync your favorite setup"),
+					description: localize('gettingStarted.settingsSync.description', "Never lose the perfect VS Code setup! Settings Sync will back up and share settings, keybindings & extensions across several VS Code instances."),
+					when: 'syncStatus != uninitialized',
+					button: {
+						title: localize('gettingStarted.settingsSync.button', "Enable Settings Sync"),
+						command: 'workbench.userDataSync.actions.turnOn',
+					},
+					doneOn: { eventFired: 'sync-enabled' },
+					media: { type: 'image', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.png', }
 				},
-
 				{
 					id: 'pickAFolderTask-Mac',
-					description: localize('gettingStartedOpenFolder.description', "Open a project folder to get started!"),
-					title: localize('gettingStartedOpenFolder.title', "Open Folder"),
+					title: localize('gettingStarted.setup.OpenFolder.title', "Open your project"),
+					description: localize('gettingStarted.setup.OpenFolder.description', "Open a project folder to get started!"),
 					when: 'isMac',
 					button: {
-						title: localize('gettingStartedOpenFolder.button', "Pick a Folder"),
+						title: localize('gettingStarted.setup.OpenFolder.button', "Pick a Folder"),
 						command: 'workbench.action.files.openFileFolder'
 					},
 					doneOn: { commandExecuted: 'workbench.action.files.openFileFolder' },
-					media: { type: 'image', altText: 'OpenFolder', path: 'OpenFolder.jpg' }
+					media: { type: 'image', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.png' }
 				},
-
 				{
 					id: 'pickAFolderTask-Other',
-					description: localize('gettingStartedOpenFolder.description', "Open a project folder to get started!"),
-					title: localize('gettingStartedOpenFolder.title', "Open Folder"),
+					title: localize('gettingStarted.setup.OpenFolder.title', "Open your project"),
+					description: localize('gettingStarted.setup.OpenFolder.description2', "Open a folder to get started!"),
 					when: '!isMac',
 					button: {
-						title: localize('gettingStartedOpenFolder.button', "Pick a Folder"),
+						title: localize('gettingStarted.setup.OpenFolder.button', "Pick a Folder"),
 						command: 'workbench.action.files.openFolder'
 					},
 					doneOn: { commandExecuted: 'workbench.action.files.openFolder' },
-					media: { type: 'image', altText: 'OpenFolder', path: 'OpenFolder.jpg' }
+					media: { type: 'image', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.png' }
 				}
 			]
 		}
 	},
 
 	{
-		id: 'Intermediate',
-		title: localize('gettingStarted.intermediate.title', "Essentials"),
-		codicon: 'heart',
-		description: localize('gettingStarted.intermediate.description', "Must know features you'll love"),
+		id: 'Beginner',
+		title: localize('gettingStarted.beginner.title', "Learn the Fundamentals"),
+		icon: beginnerIcon,
+		description: localize('gettingStarted.beginner.description', "Save time with these must-have shortcuts & features."),
 		content: {
 			type: 'items',
 			items: [
 				{
 					id: 'commandPaletteTask',
-					description: localize('commandPaletteTask.description', "The easiest way to find everything VS Code can do. If you\'re ever looking for a feature, check here first!"),
-					title: localize('commandPaletteTask.title', "Command Palette"),
+					title: localize('gettingStarted.commandPalette.title', "Find & run commands"),
+					description: localize('gettingStarted.commandPalette.description', "The easiest way to find everything VS Code can do. If you're ever looking for a feature or a shortcut, check here first!"),
 					button: {
-						title: localize('commandPaletteTask.button', "View All Commands"),
+						title: localize('gettingStarted.commandPalette.button', "Open Command Palette"),
 						command: 'workbench.action.showCommands'
 					},
 					doneOn: { commandExecuted: 'workbench.action.showCommands' },
-					media: { type: 'image', altText: 'gif of a custom tree hover', path: 'https://code.visualstudio.com/assets/updates/1_51/custom-tree-hover.gif' },
+					media: { type: 'image', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.png' },
+				},
+				{
+					id: 'terminal',
+					title: localize('gettingStarted.terminal.title', "Run tasks in the integrated terminal"),
+					description: localize('gettingStarted.terminal.description', "Quickly run shell commands and monitor build output, right next to your code."),
+					when: 'remoteName != codespaces',
+					button: {
+						title: localize('gettingStarted.terminal.button', "Open Terminal"),
+						command: 'workbench.action.terminal.toggleTerminal'
+					},
+					doneOn: { commandExecuted: 'workbench.action.terminal.toggleTerminal' },
+					media: { type: 'image', altText: 'Integrated terminal running a few npm commands', path: 'terminal.png' },
+				},
+				{
+					id: 'extensions',
+					title: localize('gettingStarted.extensions.title', "Limitless extensibility"),
+					description: localize('gettingStarted.extensions.description', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities."),
+					button: {
+						title: localize('gettingStarted.extensions.button', "Browse Recommended Extensions"),
+						command: 'workbench.extensions.action.showRecommendedExtensions'
+					},
+					doneOn: { commandExecuted: 'workbench.extensions.action.showRecommendedExtensions' },
+					media: { type: 'image', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions.png' },
+				},
+				{
+					id: 'settings',
+					title: localize('gettingStarted.settings.title', "Everything is a setting"),
+					description: localize('gettingStarted.settings.description', "Optimize every part of VS Code's look & feel to your liking. Enabling Settings Sync lets you share your personal tweaks across machines."),
+					button: {
+						title: localize('gettingStarted.settings.button', "Tweak my Settings"),
+						command: 'workbench.action.openSettings'
+					},
+					doneOn: { commandExecuted: 'workbench.action.openSettings' },
+					media: { type: 'image', altText: 'VS Code Settings', path: 'settings.png' },
+				},
+				{
+					id: 'videoTutorial',
+					title: localize('gettingStarted.videoTutorial.title', "Lean back and learn"),
+					description: localize('gettingStarted.videoTutorial.description', "Watch the first in a series of short & practical video tutorials for VS Code's key features."),
+					button: {
+						title: localize('gettingStarted.videoTutorial.button', "Watch Tutorial"),
+						link: 'https://aka.ms/vscode-getting-started-video'
+					},
+					doneOn: { eventFired: 'linkOpened:https://aka.ms/vscode-getting-started-video' },
+					media: { type: 'image', altText: 'VS Code Settings', path: 'tutorialVideo.png' },
 				}
 			]
 		}
-	},
-
-	{
-		id: 'Advanced',
-		title: localize('gettingStarted.advanced.title', "Tips & Tricks"),
-		codicon: 'tools',
-		description: localize('gettingStarted.advanced.description', "Favorites from VS Code experts"),
-		content: {
-			type: 'items',
-			items: []
-		}
-	},
-
-	{
-		id: 'OpenFolder-Mac',
-		title: localize('gettingStarted.openFolder.title', "Open Folder"),
-		codicon: 'folder-opened',
-		when: 'isMac',
-		description: localize('gettingStarted.openFolder.description', "Open a project and start working"),
-		content: {
-			type: 'command',
-			command: 'workbench.action.files.openFileFolder'
-		}
-	},
-
-	{
-		id: 'OpenFolder-Other',
-		title: localize('gettingStarted.openFolder.title', "Open Folder"),
-		codicon: 'folder-opened',
-		description: localize('gettingStarted.openFolder.description', "Open a project and start working"),
-		when: '!isMac',
-		content: {
-			type: 'command',
-			command: 'workbench.action.files.openFolder'
-		}
-	},
-
-	{
-		id: 'InteractivePlayground',
-		title: localize('gettingStarted.playground.title', "Interactive Playground"),
-		codicon: 'library',
-		description: localize('gettingStarted.interactivePlayground.description', "Learn essential editor features"),
-		content: {
-			type: 'command',
-			command: 'workbench.action.showInteractivePlayground'
-		}
 	}
+
 ];
diff --git a/src/vs/workbench/services/gettingStarted/common/gettingStartedRegistry.ts b/src/vs/workbench/services/gettingStarted/common/gettingStartedRegistry.ts
index 5272c6311..0bb3220d7 100644
--- a/src/vs/workbench/services/gettingStarted/common/gettingStartedRegistry.ts
+++ b/src/vs/workbench/services/gettingStarted/common/gettingStartedRegistry.ts
@@ -8,6 +8,7 @@ import { FileAccess } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { content } from 'vs/workbench/services/gettingStarted/common/gettingStartedContent';
 
 export const enum GettingStartedCategory {
@@ -23,7 +24,9 @@ export interface IGettingStartedTask {
 	category: GettingStartedCategory | string,
 	when: ContextKeyExpression,
 	order: number,
-	button: { title: string, command: string },
+	button:
+	| { title: string, command?: never, link: string }
+	| { title: string, command: string, link?: never },
 	doneOn: { commandExecuted: string, eventFired?: never } | { eventFired: string, commandExecuted?: never, }
 	media: { type: 'image', path: URI, altText: string },
 }
@@ -32,7 +35,7 @@ export interface IGettingStartedCategoryDescriptor {
 	id: GettingStartedCategory | string
 	title: string
 	description: string
-	codicon: string
+	icon: ThemeIcon
 	when: ContextKeyExpression
 	content:
 	| { type: 'items' }
@@ -43,7 +46,7 @@ export interface IGettingStartedCategory {
 	id: GettingStartedCategory | string
 	title: string
 	description: string
-	codicon: string
+	icon: ThemeIcon
 	when: ContextKeyExpression
 	content:
 	| { type: 'items', items: IGettingStartedTask[] }
diff --git a/src/vs/workbench/services/gettingStarted/common/gettingStartedService.ts b/src/vs/workbench/services/gettingStarted/common/gettingStartedService.ts
index 243926c63..b5784ee9d 100644
--- a/src/vs/workbench/services/gettingStarted/common/gettingStartedService.ts
+++ b/src/vs/workbench/services/gettingStarted/common/gettingStartedService.ts
@@ -12,6 +12,8 @@ import { Memento } from 'vs/workbench/common/memento';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
 
 export const IGettingStartedService = createDecorator<IGettingStartedService>('gettingStartedService');
 
@@ -43,7 +45,7 @@ export interface IGettingStartedService {
 	progressByEvent(eventName: string): void;
 }
 
-export class GettingStartedService implements IGettingStartedService {
+export class GettingStartedService extends Disposable implements IGettingStartedService {
 	declare readonly _serviceBrand: undefined;
 
 	private readonly _onDidAddTask = new Emitter<IGettingStartedTaskWithProgress>();
@@ -65,7 +67,10 @@ export class GettingStartedService implements IGettingStartedService {
 		@IStorageService private readonly storageService: IStorageService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IContextKeyService private readonly contextService: IContextKeyService,
+		@IUserDataAutoSyncEnablementService  readonly userDataAutoSyncEnablementService: IUserDataAutoSyncEnablementService,
 	) {
+		super();
+
 		this.memento = new Memento('gettingStartedService', this.storageService);
 		this.taskProgress = this.memento.getMemento(StorageScope.GLOBAL, StorageTarget.USER);
 
@@ -75,13 +80,17 @@ export class GettingStartedService implements IGettingStartedService {
 			}
 		});
 
-		this.registry.onDidAddCategory(category => this._onDidAddCategory.fire(this.getCategoryProgress(category)));
-		this.registry.onDidAddTask(task => {
+		this._register(this.registry.onDidAddCategory(category => this._onDidAddCategory.fire(this.getCategoryProgress(category))));
+		this._register(this.registry.onDidAddTask(task => {
 			this.registerDoneListeners(task);
 			this._onDidAddTask.fire(this.getTaskProgress(task));
-		});
+		}));
 
-		this.commandService.onDidExecuteCommand(command => this.progressByCommand(command.commandId));
+		this._register(this.commandService.onDidExecuteCommand(command => this.progressByCommand(command.commandId)));
+
+		this._register(userDataAutoSyncEnablementService.onDidChangeEnablement(() => {
+			if (userDataAutoSyncEnablementService.isEnabled()) { this.progressByEvent('sync-enabled'); }
+		}));
 	}
 
 	private registerDoneListeners(task: IGettingStartedTask) {
diff --git a/src/vs/workbench/services/gettingStarted/common/media/ColorTheme.jpg b/src/vs/workbench/services/gettingStarted/common/media/ColorTheme.jpg
deleted file mode 100644
index 49882b12150373b5c38646c43c208090f6950371..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101006
zcmeEv2|QHY|NotZvCEpBEZGv-2}81H-xU(FWnYrgkfJ2AR?1qkQz5b>OCe=nO3I$K
zLP%ofe`kt^Qjh2ReU{(%^?%0ex@Yd3d+#~te%ANrbI!%Q!1M##)Rong0SE*DE`xsn
zW&j9K@^v^00GgTr9{>OZ03L)AfPp0l_y<5306bh70MsFjYh^tM&$l{I00?ma;NR+)
zfqU!+yfXIeZ+mDmbhQS)TrzC6jMsv#iWwl>VejSTCM_uF;<?+(#`TEpZfjR(L0>C3
z!9BZ$1OXYOubY*%ldTuq5nDS47g_cXWtHq~4mPsv#$uX6nr@1=_719k9=7^^S_amB
zPS#R3>_|B_8DD8%XE$eCFDo`*=VLCO(!R3nxQk1JW$a-=b~aoUFDF@c6HOg9MOP17
zHnH8JyM@@nvpsB%O6%=c{&p_-O_u#zBaa_HzWcbyZdVUG!97w^Qi4Llg2KWAU=0D!
z6E0p>z5*_u9IIE@Z|iC8;o#=w;OfGLy`t3-S8p#_c6LGV4uaoqfi14JRgUf7&%Yz^
z?+E-m0{@P{za#MP2>kyy0>4>1wl1KFa~!l~0L(i;Qpeua%hl7~)s0PLw-6w?PfZh!
zHM+nLuFQoiZtGwUdl>=TgO3LgUY%OpcN#NDo};FyXsM&8t*mxH31|0_->`CXI|khb
z0M0I69(pSK*i1~#*bu{@!G;eY08v1|%G%RSK}Y8R_L{4E-1XP~Ep*|`JD^<vd#$y@
zTPsl5fMyYBAL@YBkJxxxJA>sy0DzyhcJuH80DMXCILC1>H*EP3Sf=&>8wi%&uw}ci
z<+IrGk+0>exH<-UieQ}_(1IngvhuJ40J0MBIGc~P9e5qG7hqY)#m2z}0LTfzvYfTO
zl?_-{1<Sjfon5hIupYp3WZiY_)|IWSj;vkN%F1r7{IxIOnc$80J9xSsvpRwM@@M{Y
zKIRRM7w)qY{7+)<p{fV&sljo3;pD1;Et7!dDVHN!+F+RyEH65MJ^EUP64`sJ8iHl8
zK9tGYQxR*V(}HCo8>{^qV3`RlE4v)i!ai^8@gqkal-0m8NFh*P2QM`Pu#7$Tysf8_
zK3E2?553{xs`u?)&>KfR6cxUmn`h+#mcG`n^>#AE9>-q)g}trX>h<UR><x^;<6xU%
zL_Q8iT40$BEYo^A>0{diwgJZJXRnAoj;rJ0t%q$tCwN@i)<tC>SO(hzvpDLZjO{zN
zzK63XSi-dpcHZ7W4SO!wPFTE`y#e+aW3Q8AZG~$;9at{0by4^>CNK+IPZMn0aQ(8e
z-LC|e!M?*<Y+Ve$^%vIf=Cu!dFYLLqZpU!E0oI2T*&b8D9%l#3OrAda-_C{0d3hLM
zkAv-mYq@#pV8;+_C;W(`l{%L0!S=v?fdhadupeLpyus}V;0ibb4oy?VQ{cC+zbFG%
zfCpd)*a8CIj;x+xjQhm}{I3uA0q+18u#V^2dHZm`+5$e{@s+isU(Xc)j^cjx!JXj*
zyan&z3}^ty!0+B**%mx!^=?MMFnGja?fdH8t--b)12^n%KOR#6dvyT3E4G&R>UG)3
zS8L)c;qS*+#aG7Xg)_kA;CtZ*!2j~#CJdK^ORcu{xB7T*@mlc)@jCJP@m^Xwobgz#
zv3fl~6X*x;^L4Cj!Es#IXZTL=s$%eca9QyB;I-kja0WmCE(+dB0geRkEe0M{{MH+6
z?^j2DeXrK~0Q@%U-|7(x5kd*K6Ur0ve19exADP%%3$bJRbv(X~+Sj%oSsT~Y7W{bs
z-+plbY`}JEd~54kP1t!@0jv&I1#5tn!-@emSS73k_6$~mEq}YeGVUqbt=&xz_l%vu
zC*!bIXSKgp;1TRSv2@@mlr1zawEXodUbenoAl(9ru5Kqh9PI49*c3p?Z_B3UV!eA8
zo3N0u5CCBH2(}IYe5A$c2MF!c-;M>j1AuH227@X4?brcw04M}`jA-b$W86ldH~^2=
zM_7A%_<X${9J|8<hyZesqv!z^fCJzG`y&j91A75^KnYL>v;hOa6tDoP&K{&^58ya(
z3J3&(fr}sr5evivNx)4Y1IPvL0mVQ$Pz5{z8i5v|6L<wu&j>IHOalwR7YGD`fRI9{
zAoLJc2p5DOA`Fp)$U&4K2OxS7Q^;Y69mECV4LJn~f?R||LE<4PkW9#3$OA|fqyf?j
zc?lVSj6-H2OHde;1WFBMhVFz4LM5RJPz|U7)EsIDb%**v&qBkYSD~rU9O!*$6|@oB
z3GIhYLg!%sj2K1>+W`}RNx~Fi+AuTNQJ4qpG%OSr2TO(J!AimB+z#u9O~F3H@!?c(
zHn;#t!K!dWxHa4zei|MIkB4W#@55{1?eGEkG#rgbipPY<k0*_%hG&9jhj$z=7%vX*
zHeM0lW00Fh@D}j#@oDk7@g+cRG{twsKZzfPpMal_{|LVoe+Yjbfk4nB_z|)QZG;uV
z3lWUChR8uwBH9omh(!Wo0#*WH0%Za-0vCca1aSme1P=+?2u2CM5N;#nB9tc7CbS_u
zK^Q@Ji?EcinQ(;g3lRkoH<2un0g)q7AkkH#Jfg=$y+j|0iHX^XrHFNj9f$*nuM*!O
zt|uNK{!Bti!bhS=a)`v6B%CCj<PphBl8>aMq&rFFNzF*TNW)1pNoz>okS>x@k?kf^
zBeNkxkzFUdPu52Eo}7@Ji(G-+g4~Zhj=X@pnS5#+;kKRI6t`JzJH74twg=m~x6M;f
zQS716rf{YRqsXFYpctb>Q0}BuqO_qrOL>#BhH{7sM#Vv;NM%hGM0JbmG1Uk)J~cPB
z8nq+!Me1DYChBP#N*YlbBN|_t>ogTK{j@OJowRDS$7myH@6mSAE^TMtuCU#9`-Sa!
z+uOE(qGP0!r?aICrOT)5q+6nAqgSGLqK~96rhm-<XW(PdWjM}|$ncn9ijkUeFQYYM
zDC0fG9wsOgACn%_Nv4}j&zR<!S(sIr-I%X2*Dz19(6Y$0II_gBJY*SXrDBz1bzqHQ
ztz?~GqhV8EJH~dEt(I+i2h$GK9o{=qb~Nqy!p_ZZ$bN=BpZzrl5r-tlQH~gnYL016
zR!&XMQ=HkHJzRubl3ey&SGel9KJDb*X}mLJXYtN4ZaQu?Za?m9?p_{J9wd)DPbyCb
zFFvm%uM=+qZwnukPmIr=?>b*IKa^jb-+@1YzjYVhE~#BEyHa;`3y=sX2>1wO3k>Y0
z-F;y9ncc;^-wSdInh8b<)(N78#DtCs-4c4WhjNelo-=z&_sk0O30n(a7w!-t6;T#J
ziIj-Ui1LftiYAJ_5Tg>)6blin7F!XQ5cd$z6Cao0lsGJLL!w)fT2e<cOtM}IPimhO
zN~&Dyv$VLhm-Id94|@gnI_=HcJ0`;|V=Hq@W=NJ@)=D--wqK4-?yy|4Tt9LL(h8Z1
z9F*sfw~@asKdQj1;HZ$J@P41rK97Ax`#vd3EBY%w+7H{WvOjcxlM<zpp;Elk8)bH7
zJLPQUX%#V*lPZr?@l-WbBUQWAnANP+GS#NlCDi@ZYc)tT^flr&1`qHZ@HkMa3Ds2B
zjMnVc;?i=_D%J+H)wH9vU+Zw|xa*YZ;_K?@Ue|rAw@2@kUY$ObzNLPa{(`|ig9w9H
zhCGJehSf&oMu&_tjXoLgH;yvyHxV@PH)%9wFm*63F+-RcncX&<Kd5vt_Tb1Nu|vU!
zy3D!Fea#yz7%YxiR9KQ*T3Hqx#yf0$IP37Tm9|x?)%+2)BR7srTPs>$v7WS%w~4VC
zx0SVxvK>7tdo=3kn4PR$wB5Kp(mu|9%0bZ~-eJa3)iKHOlasbnx)bJ@@v(eo0_Vfd
z4_qi+oLp*MSzLWxTiy8Gg5CPvrQKuQr#&=0ZhJyJ%{@!Js6m7MnKzI3Iqv}<IiKr3
zi^q+Q7x+^6y7)dj!FS@qiBUggzqFI^lh!AzPwhArcxu33!9V3R<n)o#)hG_sS=2~?
zN<c;+QJ_=c^D{zcqRz|(83&b~Wj-5lcIceSx$I!FV2|MLki8*E=i%oa&Np2Uxp3_Q
zI@Big=|!Q7aTk}vtizsO+H>jZB~19y@TLgyh{VhImt8J*MIs|Jq9~&LqK2Y1qwmMC
z#e~Mp#ahNT#EHfwT_L*SeWm~EfvY9gIIms4wj6IC-+6uC_52%5H!j@xlwgz4mMEW?
zm&BZOF=;8;A^Am$O3MAzovCp*@o)Ove0$62R$ZE8TIOwr+ZS)Iq`Rc|XXs_rW=dpc
zW-(<&WJ9yPv&VA|<+SAP&n?Ll$V<tm&A)gDxZ{0i;_l(QUH3HZRToGW<P~xi-YB9f
z3cU}xf8zdhv3+rWiD^me1N8^hrF%<@%66Bfm+vUQUO`h4@sQ}@*@u`)zsmVXZjYv_
z?5c*UEvsMEnACLC>ee<r)_7e1MEOZgokCq@y=;AXgLK1#r;<;L8^s&%KNEXa^jz$D
zQImMn{bq^gk`}3!(pH()hi%BVs`mZuPdd~(8auT*Te}RqUUVPo?tfwPV(jIymoq&+
zJzri0^y2k~zTWma?hVtM)IQ$6{C@HNih=zD&j$4eUkzCgO%8hwFOQskOZql$lyx+7
zOn9t(TzR}@;^4%{q}$||so-}M?{2*3d0+TJ{=>6rlj)Hej~UEt*hl)0>2soU)$=;@
zZx);vzI+N@q+iVVEcv-^$#`k>%kgEz^3@gIl~S|@x)<Y&!MIs@SmA5|Y-j>{6bx9*
zrUL+}DF9HlfcC?|uYMk`1}<>%tpvJ4xYF1Cy7E_F5ciun0OWxMthuiE2mtPY+fI4#
z+TeyY)eYnUsEEkg1|GqFJdcV9;|dTG570DO#9%%$0|25F09HIOm@f$!%*rj$S9l2k
zkKDidm)P3)+W;V09$V_9vkAcN*MBgN015)U7JNAvgdKoVKwuOQOfA3)wjB>NOu)}-
zWe5}o$HPYu5E2oC6^gb2PzVeLg~Rahu%H0MAN(DFQ{YkV*rR|?rE7&?cc&H(j7%Zm
z*mt*zMz3|6Q{;%p8A2l3?R4}ETsygWc=<%d#3dx9q!sroDXXZesp}gU8X1EonYE4W
zQ9FAFM^7(rpX0tK{DRJ&3l2GdAv7vFCN}QM)obyoH*clgPS429x>rzGbicUdL1}eO
z?c*nP^$kzk+B-VCx?jBP85kTI9(g-DHa;;k`*Ci5;nU*hC2YSS0PJhG)_V3`zbL?d
zLE&&19D(f@1bQ6YU=(n?9eeO86?73+?o{l;fdth1B2(^G5psy=P179lXeFZM6dmB2
z!FCPTv#oXP%zxCgwT}JPuUDY?jEDOW;NgL05&;1*IcVh&lT(vpKh$*8xDVa84-@XQ
z1N-4x`(VI}KtSV+kPx({2)A)F&@yoU;Sc6D7-zG=^Z+C<2uMsY3IGXw?7M)Rm7ZW-
zsKWqCTyCAc%W4=PvRwxQ+($0)@&_kFLwSDK$b2?AxLL)2>{wJ>Q~;5>nL41(b1NBI
z<{H9{=HE;H#Tf&nCYFT0JI#!$AF;v!&Zs&47DSI_!H4B2W^(kK%DF7F1;?4Bm!HsT
zWFZ*9)pE&D;G`Hpt*i7uvl)b-<<c=g0E(~Ja0dp6$ix8stWR@W9`U4x0^e_#mMstf
z|Gql)4l#kgBWLTWJ}?C!233<`>UYs?9Xsy5zN4z8oeV@TXWve=MD%EL<;3Y1R6nK*
zmWh?*{tz*u-6Dg`e(5-EZmw`o^!0;c-X{iuk2vSW8Xfy)Y05D`-YjZNIY65A{-Ox_
zlpO|m7=Zzpay9L$?>p0@>lwK(9WOk1p*LNUgY(9;yM?z!f?W1M!#u(K4*y*qPXdKP
zU#XwbBH;17(So?P%^=q5j3ir|vC|OUu|_jT+M8&(*sFJj+#srw^Hq6#0Yp5h0a88S
zKWyRu>PCs>EG+d>V*hRHc9{NvR$(On;)J8ztaoxOsQRJbC^xBK^#2RW&3a?eGrsW7
z`vhC4*hJkDqyec86j^vWpav@`P82UGJrj?c+;Pd;jo1y+u$M8<-{~Zp3Q3A;?n5g^
zV}J`e%^{Vuc-PSn4`Kj$^;<a?Dr&wU>-y#>?t>(!f&mzEXlJ%xDD*eeFjrP8*Eq~z
ztE3}-hv^KBHe-l|h(&>gcZLI+qj-kqZTfA~I(M2{r|ln1ePVka40$AGhua@u*qhBb
z>8$*6_d6yT7fIQwIk~fjrL&e~dAT<i<7K5M_8hws+SHOsQbJTq(P$l8cWAJ}G1`dX
zI7o$;n=!4w&x2(Sc8T3p3m#_mEoEAd?or;FT~S>k8g#l_0ZMD(I`l)v&kgbvzOK3*
z++DeYiEm9QibqUe1fAth5evyi)f;_8mo;F36o!`R{N<3`%6`-m%;<D32H0`1dFcZ;
z`m8-n4kSFX#@fnRqSngE5cJd7C*8J#mY?zL`{rvffUWwFJ&+p814{t^VGI9PHwae3
z@fH@w0D5}y&H$GWiX1iUb{AA<l}o&nVR?-MAC|*ukqh0Rx|0R`bHB);8g{f`fOnG^
zKs_!0Xg>W)5_0(R7;0f21ElG77wABgsQ+g+JXO@t1Zoj6o9(T~y10~thAd~jCV`e9
zw`VnEjk&49lt00RSqv_<hN~!6iM=r<9BlqfYLA@%hye=fwDw+@@@9PzFR{G%3e|TD
z0}zd%Suj97t?SZf*A)nVSsoQQc!5VTKz<wsXrWA!pE&NNtEAdQ4q6M5U$nsEN6~uS
zCl0ZsU;vJV1PoyDd^s&|_WBqns6TfkVcNDp=Zt-ysdk|z2P$vG))_kslz%!+elNUB
zJhsb+ONW-tb}4Y48uD!1xbJ1@S&6jc=Nsx5*n*ZP(-Q>|=Gt5xSE93@J$`{FLo3Dc
zo^|w4^MW!+<8q!DpbunpBIG?W*Uul5&@07@I*5bTDT|hRF;%wSGU3@J;WwZNFP0+h
zDGOo@kTedq9|Js@Xg<3uUqFoBw)Bjue!W$x5}(KeZT&-BfY)iZj$A>!+=Os5V#x*m
zV!RUAZA5ySXN;~q9<{DK(>w4Vw(x&-BLqnrs;Aec17*P3NK+57&$-X~t3lMwXdY4X
z;WOhD>RmoM)DQS#xo`>tL@9z#^;I`IR>R`Cg~%5<46uQ3ey|b$G1G4grYX^73{cmB
z0j9}Ej3#a&XXcU1u+N62ba-xwyD-4zt{@CxiTont{kj`(aKU8WoXmm1q^&>B`Vq{_
zF8WoP<a_SBZ@O=onfMmeJai6@bS3R9Q?)T=3OE5AzBD;LZl1L8_96yAF7$nxM?Q&o
z_k24V^{(>61nLq|f0MfZ!8)Us26wS@_v$FGSYLL_64s_1O;fVX^X=BTuhF=d(SiNc
zyJJI=k}~v=3I60Ru}kdc><c{k&adCRQ8F~8j#9q?h^Y0q7}xj&g!zALE-R9|PMr7l
z==Ix^#XVDgZyr$lJn0c(;Iv_W*}GT7nlS>U{yrl$`Z$Av615&Zrv3Msu<)3-xuRz8
zuG@P;CWHu(fp8;lY6vJJs}1u}&CO`Zq-9Ok=~$<}kD%BH=f(h3hd`z*@E#;RGD}-r
zQX;_U4Kegw3?Q{$XEl2kuKV(T(VXT2`IS&j-GK+f%j-Z2Dh?!h<*@6j;s_Ueu?&)Y
z<ik324+a=ZPbM$I0Cs(!Ii*=wDp2DFMN^$a$c?tx54QIAw)da=Jzfn>5f6CNm|v<p
zjA%>wXv;*kq=PrXm)a{aL(+LRk~L+tEr9hu&}Bc-DOqn!%_eByIh~-36Q4+5qNqoz
z7byWAAX5eVI-&iMvz$rGhOFzqcvI__(L_EY$6s_-Wp7W<2}dnBjvE?MvjbT-!Dufu
zL5V-S>RSU5n2z74(@i-2Z}v=ia|RHiz=VSrv!;>V(a8hJ#HSto+5-_O&-GFR1a%GL
zjF?Ykc6OHPz%n**zP={_b<i)tnf;WP+u9fa#SLP3DEscBKd6`dBUV7tYt@!#bwW2M
z&8m7KzxZK*woIp&*-ub*&Fd(#1JG5X{(CmfqXzWWI*frYbnxQ&XcFl9XY_R-y5){T
zi4Tjos3Gx>GT9bxWp9VQMRaAiz#ByJ5s^lE2B$+1EuBO>Fs;zkXz7`blbtcKj4!^l
z!2gJ-_+#E~=l^x0;*+>62+IZdOSE$hIisT$IA<L;nA%Xo*em&B(xt`f=}Le_YF19p
z!@+b@nu<#R)_(t)&V_>pJ1EvPxd5&mX}3gy;4;>bzFCPEphCA?p`L#dKlP9mwWj|;
zKm;@gzxOLY{{4su4P*T_oB6q0QSw0@ONKj-)a?wQx%!|{-yU?|i(t{Stkqc^peE0u
zhMWdFPgIPoS?qKy@LWb-GFlr7LP}$8_YX#THZJ7&nY!`}UWV}4_LQNvoLghPETn+u
z76jr?1mGs)O^)f>B7yOv)LQI1BJ*tBU5_RC8IRW;@>*Wf!N;R{$-1cMOdi)L+sZ@>
z4_xj_EHw@(I(0kRtwp;>%8#`<sXi$Ua5pf_e#M_4H;|hbZJj@?k}*$X^moD=88*?2
z#vhaMq7JxKI2QffJ%V545G={;QgXF6<Vhy(FjR_+OE)zvowkQ!MIGq;ZrHHU2mDsr
zE%2XcVQ>J0)4dG>?~wNfl{^M}hkCh@D1Do!K4SpR5Je17oWH^sR}sJA`rqI0Px&6K
zw$DvUG^(+9#G>+P=KOFApvKLeyK4KZZC|R=?TAGEl0;Xz7LgN{Kt5ok=k3B6WH6RY
zD$Ort9{oQ4UUcR_Nis3D9+aFt?x!8%13S&Cj{zPbV-IGnGjGQZ<BTn1Joj9u_{Ym#
za*TvbMx)1~>mhgr;lkuBH>lp+Zufp})~K(^SgW4)76a%Dds&aU2R3U3C3bvP@+?jb
z<t16wRG989(KoRVZSKhvq^UD+OZ5C96DWxJ_E5n`*Swsxqk1~<`1ao4yMjz~lBkK=
z<@Y*U>d|iFnZxocno9Y~GfvwbR}SRV$X%*mAq8yOvT1h2TvlNV?}*VsxO#Fgd<r2Q
zE|D<eCVBl5wKSBJk;h&p0H-S?H98?Tbh`?@K!5>Wo^vn6Dm_S3>tC(?RJ4lB)Fj-b
zb)XG9Pa9@n#nN{qz1eq`yvDY4Q-k@ztXBE$8Ci}~6?{)sSzolk#@3k#>fnVaqhdf0
zO^?A$QJ%nQqw+uG00J4GmM<-=0U7!KFpyz5a-EgWd;WH##B}<oVa5h{D3cunnD9wQ
z3C^Dh5CoqJ#AtL8#gJ>{f(n_*`ni=d;-eTV<|749tZU2A%chZ{hNLNp(MbnWPi$&h
zXOb`bYhwTaZRnD<ju}z{u*C4z&v4m-qN1!_%+@B<ROZEPB2~7fp~S=lGDo%DA)(6(
zHcNgIFAEnwvK*yrsFz&9-#ecd@<cs%pfU9kWf?)Ub%i4a2<bFdyh{W;qezrh59_qd
z6dya-;rec_QA*GyoN`a1bd(?Dy{5aypdd}J(!v+>J*4SxfZ+$0y7k=CW}P!dw?6q%
zeFpAc=u(Dd>Rv|e8lBEOwrrRpo_K}SEz()xYQ!5jS)gB1^|?E;&zZNI7I#gZ>jg3q
zPAL<);~%D+EJ`f#6#0o)4y1%LHWcqqZ=sbr=^0U7mZj~UdnT0UmdKW{e4b<kN1@BT
z9W}gg)_we~^O_9)K2J!M^q*GDqJ3XodW7N_Pddc#q*b)>qz3BU>qAGV-*U>DmocFP
zo71c<os7G$fKd@j(PQPx)I;`jtleD!JlYQ4j&Jv#PZVdqN?|7Lb1q{-4?=Cr(JU-k
z9Wk@augpp}xo3Cxp2qi+&1h*Q{fe2L`KN-VxL$;0JrN(BnOthY53e}s;AF=Vc>Dg?
zpj2$#j70iq!!p8g_!~F<wV*vAC}$|CZ90uTMtcHih6Nst>$d*EXixHG4_;8goqzS@
zWP4Vj3TcE{!5a4S8`gs3WKyx0r`9`?dD0tfu{p>><<ysrO03-Od;DeX;(so{q(_O^
z89<w*A%5C$d{Q$`4+HScW!P_EWzdiW{zG=gvf<I!5BL{5vu+}ms*E?v2<(Ny4f-1z
zvyPvGu^22uWQg@M?R)eE5Xa87ez{nw(k@!I*Ma_R?BOusT9KeaH#N4SsonDjbKQD<
zPwu}jLH8)`P(X4f0w&3<EUcZ!CrHph7VYI_zOUnzMME6r9)#~4;<I&7vtOCL=KO9}
zR)=TeRZbosUixG-4{Oh6#gm6HpckC&ObS)?6u)FUm%w`S7w3luD_BCWFEE!~GBnUR
z56ub#Bmp9CYCSq^_qKxMm--`ALI(~Sbc8obN=c!G_xdA~)Zg;C7HSVOTJ9-NeRbb1
zY-un+OswLFx!Dlgu`_b)5iNd6o+gDG@x;FlWaJRijaF>}Il>5QapQZ`?Y#aUYSNJ}
zHIv4CQ7Z%U**Kkyb4Fu8Ac%{Lch$_>)@?og1+Dyr^;?Lm-Tcb$gO3|A`!!=9x`|Ex
zpB>|+KNA)Y5E2Rd8S>f+J{ni!Jl9;Drm{KX{UIxFeR~MOK%NQTyl%+K;p|QIAmld`
zf1RVNh~*U6vvR=<v$5^l<F#_C2~WMQ>I<kzx9sqHd%HtWU|C_%S)6&-=QGcj8@P0z
zKoIoHd*;P@92vx~W%c(xx)<9ou_IuvzUr}t)ol}p$g4R!Ok!r;J66<&JI!4*OSgk)
zMbw#ZgGs&>+<udR|7)O_tM9j+Y?BG}Wp=#Fc>{bxyF47WU~_F|hhdM=oSt6l?73Cx
z>+kq(Ex`X33Di)NCscI+kwDRI+YJOdF?IT%b(RktH=q{<a;oq(b&v1%K=G+~jPAU?
zIb~w~kbi_azgHTtt>Di884>Y<Txt)o&p1$XCyk11h#De54JD}Gnk`NgswO@y-KMrv
z&M<2Z@SfZP8t|)dAT<9Ct67=Bl@H{(=4(RfZv|geO?Vo{<%tgnv(K|<sqrIWfx0?)
zGrR0kGWmsXshP^wr2&?y@p*Z|g_|4EtB&5+eQK0W5VIz*D+<muKbN)ZakwTtPD*wo
zBK7@~{%_2KUC2p1i!31!(xLI&)R+1lFZa6;1M05<k$EH7w6PGK!Use8i%ju^oWpIn
z05KHwQD_`ENv9mss3Cr#=eVZ&5;T9#mss9Z;7qEnOyG>NJ2$S=@+->v?Kd9yG_R?8
zKLg;r3Nmc6C&EcIJ<D>rBA>N^{QK~g+k4N_BVz%6A%$oI3uVt{ZS{>ZiYUim#Bs_a
zq<`A+5;Y`U$tWB(fNIM5#R$;A@4fqMoD1x_cedZdF%lI0KSw*)H0-U5D~B^CR4coP
zfJ%_F@eU>pEISsNK0vcR$^K<XAASc%f*CdFJBFL{$vWfo2WRtp$Q^>&0_>cAzc}vw
z;9h%W3uPiC!<j;_>$P_}lFKgJTDx9n2?<&rgQdqcSNCWT3n)G-xdExTe1jLc51DH{
z=_g|Z<!|Jbd8H9i^15m=$ZRP;_=9VH;ukGm83}~1^CN4d<+!fX2h!kJr{wGlw&%(l
z2*$`|PNz>NlZl7+v=%yuIUKq|p|I^)6idxA+VFlUS<or7KJ|x3OMrf)a$WjU<bf6h
zjgp3p@WE%(2gJ*5vdQ=H@!?$XQTug}#do43a$#D!1q4RkAk4C~PKa(aUh!0;X!>XQ
zq<NrYJA#!2^o{sD_?}9layLV<IU&*V5H=6Tg8GAjZIQi|Z8z6M>)MmvL~}rIWSR8q
zw+Z(q;+X=FKzULF!uDK6i8rk3cMacusTr5w1|kvPKdQCw*`GqX@;bS&_UoDhgi9?^
zSJz)P40hzzt;b;8Z<h(KL)HIdPfm|2Fj}4@N`dZ^EZ@aF*3s%y<`)^9*Q^s9oCgXz
znq3|-;1Kfhz|>5H>eF(DeH0^&^_1M}EY*RiAI5_(r@(GRyD5Oy^zLl>pkwaOG27oH
z4fTk!=ecD30JTTik&4A{T?!Y63_i&fap9U`h~px|>o}JBp>eB?#O^i7L1!;33@h3<
zeQ-Yw#$)B0?L^PxxJ$=eTp9BTf<Ek-gBI~O&5fyCkWul>G{3aaB`~rt<b4!j6}s~L
z?aSA>B6McL@5sE9BbZ8d(M=mUKR?X6f*<>Krt7NAcpT$m-5UbAV<!P>ba2@OPl-u&
ztBite-u_cJ>V*9luYVwSpOBsODgW|VJYBWCct$LsXOhjd!;Ow*bg~6a)2G7T$nZ3T
zuU|;6E*_kvh(lbq2KSS-SHB<9>U67h4&g`)ahm17IN4Q(B)X|)os|lG))D{=M=5st
zo?^~c4;<d3nAlW@OcsUM)eODs5kp54<CUNiJf95IvED{9<fhu2r8-`26xD>v54`RR
zJU0sKmX*xD|8RR$wRdS{MJU10-iyk$5-n6=hUD9PgPr#cq!dK9bt?D5E}?IIVO5l;
zFP(oT;aBmv7Qyoj;CR@Ak76?VX7wQU{>=O_c=7&-<A|ONlMWPgbJv(;t=yglO4qYj
zWF$uQ4H;rN`KyM(I3N$4B61Z+QGG^j(*l71a41XU)w>P1e<AGGh;u}*4jRB9)o*zA
zB2)2*_I|?o`Sh>n;aJ#+ue{IKp9jkD3lHEQvhZn`(kY76G_4+}f~gS+KO0whP9~63
ziQS(uj<}GT<UCE33Z3o^1s*7|v4w@2eMLEMf%4B_B&HIU2J9+u`D~n~u-Oy%;h0G{
z({girTL4Em`|=!1k+%U)b$dV^G;|F*&Bn#avL$dqv$dleh4|Onajf%a@(t-wT|^a|
zS~D~|e#<iMTuVUn62duM{mTUVjXrg0?b#*4?fap=?xVi>$cfWMCs>1*4+!R5Ra=O8
z{tTA!X@NUq`6NTy3+)FJ)J8^0x#NDfj%cWLL`m&)8=4^1Jdx$Fbn2)^Lz~cEs)i-9
z+qY|^z&v3Mrqe93tn`ts#uIcBv-qW?yCp&n6b5UTUsg_^poSe1wX~l}%w}#>ZXNfz
z6ibQ$1n5u^D24Y<ZM+pZT)kjl6_HzsXxs{>-_2!WrPnmf7uXvgUNpye)miMM!zdfu
z5kgt~eq|I%3&JTa@7jRJ^qbc~?vmzDsV|o_Ny8@lXr3;HKb<8`@phN!u`c<1Gsdef
zJ$YF&JN|u8mRgpE429@S)2q%ai4_sI`TS3y3g-Bk*?maea%_$<y<?gIht(R?(tPWr
z`Olr|?58DrLllj8IAj=rn@Sp-Cr>bc)6$zgQ;)m)kw%d<bCU++3LKI0+wC)=4o$yy
zXc~|!1o8$D6$VFldDw#iXthnB_(s?f<j%6w1`r12gVB$&+3@J73x6}N{tQ0F<>ZhG
z>_~=xmxPn|oogN-*Zp1crg7NU90|eI9Er_A$DCFa16s_iaH8<e=v(bt9XzvNNEDVR
zVHRmW!wzrvNYlBj$688&gC2+<&t>R&bG+>j&Bq}{pwDzgatzeYo2tAGc1r-EB(p<(
z*eEpbmSa%(!$P2bfVk1a(Qo6an@6`dT<9B_{1>3olWwtWXUh8C=O6dFGx@))d~{qC
zqF-yaWZyL?sdDYO#I`3=!!uE`$ZJ_|m|7SfTk3W+U-$Qn8hOw|?wX%J(w6OeT<Jkv
z|6<6&&v|d(iXvy9YisRg@?s9D@acFHPk3BPqYvL+BF|<v9$)s<&BD_v9J4eu`GIqc
zc4Xt6i({NFNG=%ik`J}653M3cxa4IO%CkyzL^lC)D{YWhvGN4D#UKaiN#~Qsg=ZD;
z8u=gr1f+rQF1wpXYYNm}5}h)CF<ihDt=qbRvVV=H8b`^TYHZ8Vm8Z7P9KN`CWi|r`
zR{!AorfxAWI-M_0l6p9-SQgKei2AS&Oiw7u%zsVmedV4%gLD2X3~P&1V2tCK`-JDS
zV$*dRx1Cn89F?ceNIpYGx`~zWgO2)n9fP~ImeG$gIYJhbX0r`|&=h4nf$zo#)Tw`q
zLuYvM;z6h6GjGK%D_3>9HPLyogLJS_0P4!KZUy;YC&pL#_UGb!wQ@?7%yQ#rgAN@$
z2EJ#J?}xpA5inh|$9@=T9;_innXXz^Jfg>Gbz;I{?nfgIJjw9H!|5f%(0r_y1O%@(
zVUs-`4q3<)#KK)`gYhlW6%S6jQq)kjhmdZ_*O<KYUF7R)3g!BQwLg|Z8LAo-p=fZP
z&&^jXO}By0z1h+XNKxYFRSepS()#`x>bKH2Ax7m%fxC}}JL?As8;09kY48!F+CLTG
ze~U!^LC(PbQZ)XiZ;gjEm~4T^P9P~7>)aywDeD%Eq$m*c9kRCGzuQ>Wzh(YvHkqJJ
z7@ST~m_>b9Z=;;uz&OUB&y{A9_0fM|E}6jor%*yDV2Jg@9XE|539RO{ZHyajnk`xR
zeYWKK{N0XCIbuCa)hW3L8JH6>F|^*k7eeO<G^Hla++*?cYyaUP{X#JmF|pQSz|}`o
zn7BU65S0MBfsfLDjaBpYVgT|X!>s4c)1ZyAhUVd{>+j4IE^HvFQyFWo|7L=%b3Xn^
zCfgSB#5WNPzc0{MPl_L7^3+NV;Jp_sDcV!K^L3?|!B1IjRa`=2pmorw+`0l*0f1e3
zdvrtQcLVUlpx{K=KMMGOIlJqpPOM4G4V>^Dgi9cA71Wl|Kp(agVOFUs&w(ExVxO6I
zKAj^?@%PW?%d`%ZuVSN$@OyYZL(Z}(fSyS~N+v%3_iYnsE{?=<z7pJ~rt&IfLrt*m
zpuyMp<)-k@x_IRlrlD>n+nd+W^t>TF`Vp)G;G)^pqUnM*uXSeh?&;55z9cR=99!$o
z>*Er7lM@XMpjVPp9lr3)BU9NTs|J1=KY@hm5b_G#nZvspsy)mD<>OV4<uW-OP9PeC
zW&5q?is_qIlQ}R~llx_<Sx3tgJu?|@xBoT!;z&|Q{YI!d5425{F{mn&?~+#3f@@O%
z_pi)FoK(!Fv2ZPyi-C}SM<45H=g)%rH=283DkU}x<>DVrrQ|CwupZHRSoq>Ldi(Mi
zwA+GIKaROlcn)po5ehs@&Cwu}vl;I-^!p{?z-KbTTc<m&3#RMxJ+0x_%E4xWW#4_8
zKLvt4>c7MCf0MY(XYS0oS5BcG!HGIS69~>rtIr0_Ssev$XV0>!wp(RnjMn&7bCTow
zB7D4dY=E%Z7#<)%L$aOr6Ytwss!_MyAJ7RkcNpNb&XxiM`Qyj4)B9?C8_Jbm^3T&P
zukf9thO{n5n1z_e?<~F)c|=e6MXzVXf$2SlUIJROJD1JXgO&Jn0z2$Vn%nMXB$Fnb
zG>9;&l+fLAY2R7;3HL-Txgw{U_zr2&w!)b!rt<WMT<DtfB&G7e2UVG6k(YuJ8@ye`
zVI$aL{c%3)8v*{>O<JW=<ypLb?^{ut<zz(%a{*p3SfjqtnO&3TtIFWJJ>u3mxmX7f
z*3L3W3B3^tlqv1uB&}2Yi7l4>{8LC<4$gMffs6jaQsKiUq7<p&V*YCch^41LnrZpn
z+&Ao;QPdxqGkP{a*iQ%AsdlvaX@ac7J$1{#M;Z25(F*mw{c5&Y{efw$s9sF}TrzQy
znTh8|?m@msI6&}OYMut!hiiVFatXNVtJ3&~eKL~=*e!uN@zchWlScf)x5JN=ORxv*
zZdE0)imXrjsiOURY+BfvR+$~%X-+D-aRU}&uM0`uJNKS?IrPvk(dm9^$UE`2SMPb>
z-rPCR;X+rxWH6`iGN?LuN^rm_foQ_%`nA|kw;vlc?YZpX8Sa}GZF0w1|3G4uWutH&
z%x{~*=!+rz!i?0FeXq&%s~@tKv>d+XVr$BB6hWAfyxZTsp;^Y*Sc&?2NgGxyBe$Hc
zzma@@-^fXcI&dnxyDLf!bq*zc=9e}bPCxuirX^rw$O^cb9=Fc<PVm(qu3-<L{f=9p
ze+C0!R~*32I{GfN*uC@5ocMNimX9RyVGK5T#Vk{8hv&O-&Es}bqCIQeh{Y=7q|}+b
zX}q@8aHJh=AG(|}l%59I8wl63Mpk9g1cl{F2Z#``^|u<|3X_}@Q$3T82$ILTp6dcv
zKa^o@%8GT`>ZRd%!bra6G<arxe+zyr4T&cL3_&|?xce$v`ZwX@-#z&);nCkefAIUS
zNRpc=9^fmFvKz68iBbh)sHs0?e`qMLJa-^Cnx?7&Bc<&LuoZh~8uhJhZoiZAk<Jfh
zXZP?xdsJB`wX?*muvEKoYR#X4X8j2`@Y-CtpBcAjOz$secLgwWrbtdWMskH~o9**#
z*xbNl3fCDn9CjOGFBpINn9L|Z)KMZ#ax_1ekPRDyjS3JkRcB&QZ}Bpw6H{tQsY=Fg
z{Q;H%ErxZ+49}0&J;eYC#;F0KRn6?7DNH#xyjfzsO%K`HLpr|GYkyPxbycN*+p}&F
ze*Ip-|C~ItpT69yqF}@qIs7&NxAw^<#0?GQGYBgN36sQdmm6Ojn^uCuBS7e@OvW!o
zu*~bmWL9MthNT3P0(z-8o*MMG|5`m_HSPY(*hz>AB*J{LQYM-8$;2`G6g4aUymPo`
z@~0qStFt%$vz+hWcO3Oi-s!!Gfxz2_hAnG5&7^1Tf5q8`8cYHJk@}5%vzC48XKL`T
z;oL%SMv)Vbdl2Y}i@Xt6Y}Pijb=XFCcrHs=SqF4Jf$&Wq$2xU*Bd6Y@5M=#1kL;P2
zC4-`C?U6<|uOs=<UXY{f&i#7~i|_3q*q;u|X5Q(kHGCSn|8@POJWa-CkkzCXmPnss
zQ^fYL*9m~o?MA4P;3?hVPUC$cJ-IDd$DXHEPnvqkz-xmfST7Y;%VbhCR$R@bpF90{
zpz}1Q*dV*%Wd-_w1hid`n_)rQ4XbDUpiTLt9)xwooP`RVY{7S?&Pg-LeD^bi*1O*@
zqrXn@vkqLhwz;9-@Ufx7x%748w*v@cFyn#7+@&7&%5c)o$Iome>$~Qs1K$WjuBIJq
z+-ovD_H|J@1Q)6wHgc9_zB~*DEmJ_x!kFo_!4j_3|CG+(!on!)cxhF*{#>Ynl?mPm
z^@bOjoRJjsxjM!Q5-U#{ThMxBTs1Ooc$#lN7`inS1K1#&23W8r6(BFekTVlI?3FEw
zjX^kY)bY2a{6fxrlMOd=42JdXlZitImb^2Lg85duP!;yrtM>_itp|URcZFTd4Hs9~
zm}fO#XS`to!RA5W4bbnV${#AlK}n7>O9iz@SL~i4G9f>3Vv;}gTfGoc&5hl?alXl|
zh|?`@q=d!|xCsN*l4_@HbFSJtRldr!;2xr9;{K6aTRq>*`>QX<16`XQ`ki*&0P7GU
zID(8ht|FiMim7808Iy_UKoj7fQu}`q8oW+>pHp<RhsM&_R99Sr(!BSSr|HySA}WkL
z_epdbp!>CTkF)%B)L3T(NAz347;QGCO42pQicMk3tq6+MI{!Rg05gY$F{F;^^rO8~
zG;K+Q>|xTOQL5Ku>vFMEQS{ryJ?pg10DJfivLZ*xeY4B)u^a|;tO;_z>v6JujoNyD
zjoRV|@aihSnHYG!SD+id{}=PV{x=f4*O@h&h}%`MyJ4RiB@2pK0cwa!x*1>l6UNA{
z>}?8F$=IC#4P*BQzC(<$(+9FNuo<W=t4=L0?=B_=T-GcmIPP)_Ow-45!}2s6Q&9nb
za60fNAk`mO*i858O<5&1B|w=y%;$HbEbE+D_9&sDmQHq}8!V&_1|G^xp4b_py6T`*
z{hB1d+Mx}5Jtg!V18+{tNjz|N0%)86b8(0*WNL@<EhMD(Iv&?>aFIJY9NntoVGq5G
zcixbmJDKJ#c}P)ax0g?T(8`n``mB<du;ut^23Fg4T^E-+$^$FZOQ`w4r5jyG9Obw>
zP2*p_wMsmdQlxTU8JPg+Ua#rtATHG~euRF{hyfIK-mT|Tzf;AmkQX~INHu;S*W)8k
zGmCw1`YUc^QxQjH+p@Y`V<!76^F)qo(tGAGz$De2R5BTDXhp{OCkESgvqR+9PQbma
zUWDGn1&y|b-Tp!)tyfQL<vn1GI2{zaU>x3oZ-~t*$k0^%#;+$Qtev~by?zzV0An>c
z;)gP9n1R*({X!AAm2oyGeC*0N>upvX>i)YH_c|s1yLC6lhDE`YPuU@!6XW2DKpVux
zs#y7FW+n)$QF1!i9L@-c;|>5O>>=~fC-TM?Nc1KqM6EhKAB6M^J6(?YVm#yZ&N+>?
zu)Xzu`3n6?$Rc^|Lat=F;6MTkx%eXgQiEGB)ffUc_uQ~7bmijAVp+{S@y>D`RF9GF
z=gW95Rqn3dba6dOvE<78=uRJbV3Im*lsfo^y3kGrPiI@wZ6Qsa(&^ZytKdo#H6rDD
z`8#Q)j99KA8w%!A>y7PDN}i`#XP^_4Totvam4=x#D3<SuG>LTh<VB^Wo&kq%OG~Vj
z#h?~dmL&_6W?%QsxeUlY44N0KF}58Nrkv<{eR|4`<TPi*xIA4C?e&%1jI^?(*BN~~
zJ`|!Z3>FtzQayL(z0-Q8iiGoafAVm62_gWw;%!`Yg^(=gh-ZYfaP~Z$b(r+<gpa3*
zMWeG2TQ(C_FH6WwGTBY_8JS|ei=;NYrl0L|;e){E>X|5(OS|yPZeswO2|<^TVUAOF
z58KhqeD|-}imgl;wVY8qti~KLfg*Y{6I<))SS>0wYfaRrr-t6IgI9-IRF#oz*Z64u
z!rNs;7JYM`2JAwAHOs`r>xWa9nb2_Z$wObK1^jhut6?D(P`PPd&aArK*#;wF$Qsl6
zq61sSNdL&*0~>saHQN!_oMyVl6yN5?VHaJ)CV1j+T!^TfdBX}=*o6qc14aI>g$Ut%
zzhNS40eM?&Kwjy`fc)P-;WCfv@h7S`hkATHTF*P(C*@_1MmC<&ZYwM8PsVp;?cI(6
z;%NKx2eUE2V+Q*JlSe|EmD}$tiz_(OTTh;&=bmtCF02rCr90G+J@LM}^H7dX=Fs>Q
zf}SJFsm0sLuDpGBuJxDM+KEa%$rY!#X|6fpaTV>Rm$|QtdHV;#JwMNAI=jnGX`k%(
zr}S0t;W(&{cslW{_e(Ih*!HtU8c*Ve_H{HkUEk+cI~<EZBrZx;&58At<v5zx8|p@B
z0}zYj1H}wUp+%$?kS_scFs}wl*heBw##}|a6y!x`R?U*2+Ai3!yOO2>V^4kQ!Iej~
zJB&SDWsV!o^wxSrWq8Xy6XqAJ)g|=e?{sM?K=pAT!9-NG9&NIh1@lCWi~QS=3L42v
z3Cz^Gs&-pR_bwBp5PVhm9BCYJ*?KnVMFjex)1|!Znx#v3L(RAABgeW~y(6Y2=Fq_b
z!gJ2TAN9+K?R`$zh^W1kCGT!4d#7RC!l6{ualRsMPcUD=jZdQiB4ea>6HnhTwzO5Z
zUWgiabt>6990MqZk>7S|8iRFuJ-3#RHEY*=91}&tYXgiH%bfAQkVkCVmM_|vTCDPn
zlCn|o==`$36H5h^iqQ;9$j$^W)ssHvQIUyzPb+ea%hNw(w!AYQADqt(aK|JLV}SYk
zJn_=XZH~0nJcZ_>7~tl?l|kf%%KXJ{-oMZkSXJk6sE~bX0AIN+n1L=`(Vc4)C0iaI
z1EE>{eJgt&_zfaMWtUi64#M~L5M3XV<LT=Fa4zr?-_~l}a$fj`04+8ze1nCsDJ1Zp
zTJRgro2<(6s40GH5xXt{V%%_SL!JNFv*N)ENB9AWuTKap8kQd6Q6k<vME=t$R&Hh&
zQMQXsZA*&hU9D%;WUsm}FLa+YIlZGb+N?ePg_W&k;!fGCD8-iceMi$eJ1b(#UYkp*
z4$&VK8zy(o@V#i{uV2&E?D*iV`74jtO(&^(N!s5F776%F)YbT16)M+rz7c(9`1sPh
zCRw$7%QFPdDH^`iobCZx;1s^Z>fYH3jhZ(iiLaa=*O$r*Tbq(gF6>aqZALgQ@Na8n
zV7+&!?nXAMQThFe(c^dDwUzbspK?EZ!Iky_grfJA^rf0?l9|Pz`i1A)9|k%(Ixar>
zd~A+48Y%mPU3ao9e>}dkbyrV~T2UdYg30>$m%8Ys_`$it@)?(O+I)Z3E4B{kJh^8p
z=<@j`$fQN2+IVue8+N6uEe1Hqu4~N*JkCK{S6p&=clT062l)}ty1UtD7ll8Jx=Obs
zCfh`;#FzB&zzPsmaY@pjyKTG>9N<FaS!N*@@^)K&VGeV0a1C?Ty5+CDXVF;XH=y#b
z)8*^<2ba&T(>W2W3N{JF2ju@w_!OcfYkf4ci_4-s9thOEo~Ct|XYx7d9IgT-tNX8f
zx#g_$SFBj%SYY+N3uZI<FTbGGXhT-tyCCqx4OVaTXY6UdrB*zrhFnuR^c4^J4Td)W
z7j2_q#;S7p?PDO$zXfPGolj(?)kv?G%rYLx$!Ky*%~RQ?<rjY$z(-IQ{>+2;)e0ZP
zrqc@vxyceldbV_?`oXN0x>HVx=6j#S8^52*yIFDGzg6(f$_a2O<Lrm236HIVL>AGm
z(Nha8sN&10g`;SLJHE<q7raYnxL%pxo4cS!fMk(e0E~|-F;yLrObsXKqBCG;s|HuF
zkv#`um%-REMg8dklU0xBPudgQijc`S%QeoD2$SH*1q@ST&PaaE;oCUCdb<w1sZKZP
z^nVV>-z_*vlwfW6Np$I_n9LuZ+S~mIQarFTn0!SRHGZII%6q5}zyQP1_DQ&9<AuBL
ztRXiWfR5kgvn>FftJlEIx4^#*2JXIQL!6gv#-+piwcx;_Zv+fZzWrSSPS0^!K@1t`
z;aMDvmZveKM~`LmLc<Tn-&F$G05@Jxng1$D<&Un(@D~I-HubUp3yQ;+Ml5ye5rDCi
z_<AN!dFrwBd&2X#zh#xE-`z9$SSusDEr8ABTIq~_7T?_Z5Y<ntn{SgNwjL7x@JRbJ
zXAd`ab!m{mX#N2L!x9>9Vui(%TOgHzxQ-Z?{XPCLF?r{@qsc@?j&P1q<T<IshQlBA
zapeAOK8{I=OyHV@b4xX0C8WYsRriDpC>103&e5?H+3rvpo^^EmDK~Dgjj(v&&ld&z
zp1TlRUT22is7|S4o-S;`?elp?hrKZ#QtwrA0b5<O;-1~<>HE3MLmKzJQs_;OZa(7A
z|MlfDST6W$*P>eoq^_}?!+u#M=}^EfCNZWz*^BOXW(%yH243phf*)JQ&77B^V79tO
zDhgcZKc>;*v4zw$d=wOOs7dVGF>Ld#*Btjho8vaW9`7yI0m)>9K659&_K2=T&tB{4
zj8hLxhJ)lO3TThiRd8wDpE^DB*hDo_n#|uGnzip;LqE8R^aZNkFCB&7*mdg?^;fea
z_=0a{z8KfZeY~8gCvpsd_kb-il<*xWS@S%|X%|lq+7t&*de&D_A9Ih=LU6g8Gt&~E
z`z8rkx3UUNq3CPzQG*AxT{W+-&go7#$(15W9qSG}B={`Ue9nD*tS@9XnJjpyhGGBY
z0wZxi@g2cugiRkZ-Yt54(9>SXC-*hyKs<eLLP)i$iZc<}&;9@dP>e^7Geq>fyA~&P
zwNz3j`#3$?qBG%m=0s_I_?x35$A<axIhUrTL?PV=87nD#kD8d4zlw<g4#FhaFaWy)
z+w_yjV`rLmOYmp=t%TeQzmS2`ku5qK%pA>bhuH*ETJ4sz_5SdpKeQs*p}@)PLdk=p
z_Cq^HJWg=m0bQ$Pl3WeV2W{^)i|RiaG1K{lHs?jumfr375V~`}kgbm2Qt{Ao_6;04
z{W6TbIbHk*ftvq98~j0#%6j26$V5sht8dF_v=GAuW7u2P-ZEqRH}lbdH(o#W9+gB}
z57xFfRdFbQuf_ljiZpcZ1nJ+4d(wX@D$K4#R)JOVIdEbay}Qfh17~^byJvCY<&yjf
zk3Ml{EYvA<70j=A^wo}P6%>+$%?|E&Nx6ECX-;<XV72jwG)v8a>x0Q5J9jb@`<>>9
z{A_HF0SFett_&G&<2z6(uCPOa^>O&M>{ekhyX`}yv~_Al_d7&i7}16wW^_4GUq3mf
zWZEHPc_O1>ft;keO;y><`~k-pIcx&OH}#&Qt*Gqyy~v>wEn+@NPKuW0boT7eX2$2{
z8n`aN-IayiKP8meeBx{?nbMu^yTH-KAzrNbwBllj;*%+FHq@S;(yWh3geDKu{Ut&L
z1Nt~9D8pZ0SVq8R#Kt-jhYo_l4G?A8LKvyS_+Y2?^oLlQ*c|z%g!PQ_PxeBZM=cD^
z=hH9l790t08ho-h`0_h|iOm1JBk)$t+~t!o??P^hb%UWoU~@<OBu5Dg%k=PeBlm1g
z?=wxx^7Y(F$^AqrL&W~VT_)Crm#nXjB<LJ=mKFIhZs?Unk(Qgj;BymrP>iOi;&>?J
zD>FBjOnS}ElET;LWLbTuT~SlF1p;7^t02hJ(CBjY3ic`L*?+Y+Pnb;lI8A!iV(8v%
z?WuR-5NFqA#Q^P7hux$mC-oQi^&KcJiRZ61<$AOyJ1mT>GC~~~o71#FZY#fRX;yo{
zk&)8{!Ocv7Y%0H3_NtPmIlYl9p(xDf9et0&u=`Ys)0zJ%8L;IQ^fz&B!3j2hmuvfH
zxX0_S@zc3n{7=Q4oD%GwP}#rp=F}Nb1)^?J1WO(YY{)mxlQ5a~zMt*46ndxu-exTc
zWb{D8$jB8Y4QY2?@XE&@_cMHI!LPRK?rd89BTj2c=sg)*vBz&xtW!7>4@huscc~Ky
zOgdzpo@=}4<8OXSX(h?o_fy;*s<$H11@?49oI{CMC+G6|YFSu=%mZm|JQm%5br>eu
ztfP`9o0$6A-d!3UxILIX$f%7wl2Z-3ZJ248Dlw=%vYlqk<6u?pxCYJOsVfvW?}Za^
zlU6N=)hqVDR-W*EWnL*ERPB*LERLcbPh6SI?0&xNCo`)4`KS_}&pZ+NUjLc4Xm~ic
z@wDy3D|X^(>8~~E&mDJ`<osge{Mh>;Wuj9AdCzmVcO3VZ3!>C&?l2`e4tSZ9X;U9$
z%zmw9%=gNIBaVN(L9&WjGGD7*bj&N8Zc5<gHTEXr{-mpMvcP-$D~HV+=X90SRJJlV
zp|q0F!o<w7xaUdtW#@3kR<#M)g2_YR>T_e;S!f@WbflMc<k2{PEN{3$DJ#`)on|zH
ze<f{aEZNO8!Ny9f!`jcJ=tp~v1>H0IUMn!?);^ngB9w*7&mS_^ipU&mPDv0nzMM?v
z1{`s}{AfhsLp%^sQ+o8u&IGxeSs8n>r{K{6lA{rxMnltSwbEy|`<Yi?_phqG)}XuS
z_HulA;$eQq*xj+DmwqzmYE%i~LXu5tjgUT?##a-^7w)Jzxr%UlkO)VNk1y)rk6v`$
zwfjT&RFLNr@dmcBS}&Hx`8>U^DHQ)3Z=6%dy+><H>1i*plZ7JfS6?u9ulp+&UHH4X
z>09=fzW1O0%I`n(%}h(nw_h<kwy;3PajoT?^-|bE{g7<7dMGf9BzNkvU@R;xcv$RJ
zX50YFP7Gi@fSR8$m=Qd0Y*_H%p=Cjjd5K|I;F)Vc;)xG8J}nuiHs5k6Hokyzhsv~u
z@l$-Z@sfO(7~8zqs9e#R>-<VP;#oXBIX&??tA+-S5}M=2JD(K{t{4rewVk~manFI1
zBKt5C38gkteH6@+pzU+;ASS1(o^X$iAyfSX3z}!WWKi0+Y?XV+tS<XeD!~X|XrVO_
z86|%#k-zoB+@ydO%+-He>|VPJx#Vz_0ge3(1<j|pNju*ZyXTnHEjSSpLqif?PRWHN
zDYR9{r3TaG4w|s(L?%~f^aFfmn!OGtV3>4k3k_{zr2em1$3N4IbsLj4S`eFP#=jBt
zU9Z*tjPg%4<7T1pA7cw+pqu9P>g6fh)8i}#pG~A#KQ_otUO+cgVt_=;#aRq+39<Ka
zi&m4<2W4-Xn=8>M3?NfEGXlP_6nW1T1B_ll%Tx}@`+I~eFI)PFWaP3=UB>{Q!QUeU
z7hBg?hfT&HM+d*OCMem1$q0QIpjmMF1nNn|y811whd`eNx&2Mp1Yhrc2_5U_2kg?>
z=9V2<*)6rZ3NJB48Hbs+Ywf;eFrJ+^78-h`{!07&P3*t)dB4i1=pk)u{m+)Yp45gP
zrY8G7k1j>b-25W_34H>6bJ>2W!g2)Vc9J3KDSGe{&B?Xn=%xy=tEddHM{@bb;OQ(+
z(q}76ZYo)<`vqB$j~Y#y0AHn--HA5-gt(izod2Gu)wpu)_}UF8=25XLRa1^A{x6}T
z|271C1pki6H`@7^M*iiR{}nkBy(S<RXf_pSx6n=C+ta@aPT6zoWGfdaIM;sBo|<g_
zDu`bgfP$0wMF;qw+JV$U+JAKU<BG~+yH?WimF5oAC6;Qe*p<DcJz~qTA?fO^=DEI4
zNL{qp3two{h|Iww&#uCrzekQnw|O}V3|6(pf7$hA@Art8rO+wf#Vh?u@MXT~`Qi)n
z<aZk+UWt?MbP&1!cHfChbYyhi^Le9a2J!*&6$EP52t=1J86CAN(6tc30HlcN5Oh%G
zXMS(+6}+Hg2o72VSD{eoTaGQo07C|lsSe{XFn3U4c?Ska{(x40jhe|q4kV+uftf+a
zF#wlK<zgprQjBH@Io*OHK#lDM(YRvEWygp`d*oT<95a{~eJ~#_CeQL*$+vk~l(m|5
z34}I>bHO)4Gu+(RCLP4TP5O6~{-vdVIqqM%^nXoM7XS9Tw{m4<1Q;LaI&o<7hIlXQ
zz1Kdh^G|b78&w3||Ej#lv}O+Fe`d%>y}N?GXf~XkJJY><$+&W%5d$dYdKj?6&ZBp&
znCL2L3KZ26Gd43mDcHT(2!-udt#8)7e1e+pMR4epmpOZN+v8IjgKV0Kg95pMHLq36
zx5;woe|j~|)P<j$_1Z~d)^Ynu#fN|aM3+XH#(*qP9?)^(J9SsH!cv<<90Vrn>pM{+
zSC)yFjFg-vDrXzfcq{zu4?|$f1j`seWDX7L)kyGFR_K`O&?0MF&rFM|^p`17Coj<Q
zbR0h_Ni(rMKFoq7&Y!i)r{Vvx_ulbT_y7O+kySDpgp8wX8diijTslUw_ZG>@9w8hp
z>STnd$jIK3Ei1B<P4*^4hm3>c_&txt)w-^C*XQ%TKG*wu`@R3D^YYry=j*W__s8Su
z<er?m>6(GMW1zn;a}vMUG(fJu$Uk(r$Nlx|Ca0eJ@7@)jiHdhoew9G<R(7Pry5q7q
z3wmrO0lDa#Yem`MVB<j2L>u6}cv?S&G1iAG=&k?*_a<LU4VG3@L2%t)wLjO+TJP3G
ztzN3Cu&R6AsGPcGpT#*FQ8{`-O08sezcZ|(^GB=JY8?$5uB6ti-p<S@;6xIQ8octE
zC{!jM*APw#<4lP*g}Y#RP_G!F#rZ`Y$wD5s@w<!i9{F~2xN%i)&U%dZC!d?(tUY(`
ztwTsi35kP@25F;&?ae@PF>a&kKGvSw`H=>PJN$~g5`)gFH1V!#5X2;UbSGa;bemSH
zKotZWc+#rX+*S`2Xg&MnlIqpm@mKU0BkpufTIzM)>6~;u!-wR^RM>@F_7bi3rfbKD
zS&zYJ<(!B6PK>>7Z?SsLVot`Kdwth*EPZro;G-dKRG04q%L~~S2OFFcX03))9^xHy
zl(t`NDD=P48dz4QcrHUPha}Fn?jW2}Gx2k38YHWJgs=aN`wk{1b|M*18{A($B1gFm
zc{&8*5PJ~sZ(yn3S%|a07%e-|A$5JBmYe&^v0%mYV=pEwh1MZ=P7_0&r!(!%$0!1c
ziFHA|pdwSdHX+el&ui+O<5j))!op0^^tAC8TNEn&u`W~|Mz>dNlyp&S!S3n$4K70c
z3mvb*?h3XB8(&<VDs9g?;HYI*rI2|xE<7aV2`8s@2`V!%(lW^i{apK+?by?c*ZX?0
z6NP*eS=$f|38DQ%agLK(Y>v;0t86aYzNj1*OZ6=y#i%R>KVX~Xx9fP9M1u*a80;-f
zwk=*u8#?y1<An1j^pM5VyV|FAEh=3u<|cdTc8nTUS?R0NmpdKS9>V-+s9lE0()Y1t
zQs#Z09+i=x^~1+NYB(8t*J`raMSM44q_`GrAL4C6MjD2+F}vz@Pc>}md@0aDcEcOW
zT_)*nMp(HZU)Vfo(RS`|Mo-U#(E?=|Ow$_<qCaJw*b+iY^|(E+*e0ZFS&eU@Tz${@
zD4l<-mDZ;h?WlD$t{~5VAzz0j#FDTq>M4bjs54v)!q8j7v0%B;ok_M9W|myDdUdb<
zZPU{Oa<dCpb4{bGV>7(+XRn@4??;?OiyP$6dwGRDX<@e=LZC>wIN}QVMD6@wOTyZS
zo#mug7(9zn(^wg9ijPaWmB(kd6lHHMz($QC#asLkgNa!7b*4DvhxGLR?1Mu?QVipk
zeQXi)R5dRZ56C5`JW!rqIO=R73~QPS5gTu9iZ#CFW7=vS;bQOTDUO2m`ajcQl6d}V
z$l4b|x-k4)e7#vEr>q>6m1>q`U?BJ;-pbr8s?*P@=E$U}In+zrtD^@+sjVf(h2-|{
zS=mxNt~p#C&4A=|*)z`n{IyaTDbu(U;Y5fVM3uI;O<y`F+j`%ed9@*1AYpL`vsm70
z|4qj<R5e)$jf?njww(l_z%$?7vINTvuQ}x)7g2<6&7C4Kw=WhiVk4TLD})}tD6x2K
zUkDq^l@E>*?<*<W51Qw;sXI4I_iJ{HbY}EB3+-l6dv_J;(7M?*D@DQ`0;1k01$y5t
z2OOp>>dYs)K+-51u%F0an0|!3I(tTERd=-_Y0kBe9U0PlYooB&*5(S=1IduUEIDF^
z-E;4I-)M>Uam3xL`bp^c{~kNR9la=>bK*{X!xgLR@{eel3Z+_`xC!+)cR70B$7?-6
z9e#SFy@${awJ9CV3%gx7TlgAw^~}PcLp@w|SIRrc*pqzZ_=}DCr0`HV@!-_(K+3SY
z`K7Z$grx2qmGt<Jp<QpZ#K^(I8$5Af{k!e<U(t(Nrg7GXuDISE&E9Wo&1PaVtx_Vd
zLx;Za!l5*z^wJ3|D&1$+{b)2wT+C1?@V!<ML4WLeNUJ%cX`rvtLN<K%s<H@Ks^Nyq
z@`*h}cbptX5Y!ZWuZ6|s;@2a32X?Up6>Ab4QpDC4Z5f>pm8}S=nGEzQG7DiN4b0%n
z*u6qP&uDeOL&1rEKwngj#b0MIQ2t;8OY{oWu2dB{-J$5H>)^Y+{8i1`au%&ph&|YR
zX0hVny2LV{`^j8b(45ZD?wFUsZV?>I1Rt`Jj?=d`ymFLAbnm$~eo1^$Ok^d?RI#F@
zJv+8DL%&We?=H(_QNG7P*rIHs@DA*O?vn0u=n!kvLNaZTa=R}4&YOb0?yR@T1Epo_
znNPn*rj-Z|H8Vyj(AizOJH&HWsU0H(+;Wn+CL0lJ-yqEh>XTf8-m=dmj*>suwjbQH
zG9h5ei>i3Jf55Aypm!a*(isk7&4DC2Np1)0B9x=Dbeu)yZ~Ig851tQ}HnmNYmb<(P
zxs+3?mT75H)l(HsXYM6f)2GAkke`)BcZ1Wgk+{)kiCFhG+;jhx?zL?Q-_Zxv)LvIk
zTdh#sWs35yRR_yevpui?$eQB3acH1*(_Gu-QnUC$%R><|ck@D15$2roI%5xC9IfkV
zGQk@tkG_#;ry_2~l5J|4{3;>Xu13ndI*3?CXrp6wRexo-84U(q<L>1=#JMPdWiJnO
z+NG<f`?6rQplvDmY#Fs!OX_<a5qMcxcdE5bs?w^p4jVi|-`wPY5VTT7;dGsm(8eu+
zaR$YOYAokTLWOjprc^hdQ~B9z@p)>Sy<(-+OF_19i`l+s7P`>uE?!6C^qRD%Llhnk
z$OgN4I$h@zey3otXd4`l4%N1<_moeRv?MuRmOz)d)w$pQ=vK?i%}|{y(X?$@@8*xy
zR>W4?P~C6Z_vqpShu3DTien<Acr{MR)Rywo$-zhmS4V6f59UfjpYANroX2nD=etce
z4W2UW3*D?Q&ncG{CDkG`Y&sr(%W}j<N~)sg-AO}gY7aM`VwVT;$*<xk9p3x6XCKad
z+qhV0YNc9IXxb@$WLKZi&BUNBx%T}sNh|D#Ipm4jmK&?TUHBlL&kT=Q*e!b*QJF3z
zyXYNJ!s1Q8C>^<#Y;MCWXEnp=t1Z7Y!b8ke_m~m$p_ac?Z7c>YOPClI6=%6&``A}h
zPu*nm3VkmBzP<d6a&>bdPX4S3y1fgR;*T@ifOImPs?+)Z+EUqh-eotBvBnOgj;#D6
zCEau>h8O&&PTA`PVqD*AuMDE4xfNiFU1#*Jkm!p?97VQsN-Ga2D)wAxyJ?m9)Z?+b
zy6asw+cpup3S#uacx_9{3;I`PC7b6x?zIF@h7UYjuW;tjr#C-6&X6{y;|8rc`~Z1k
zLAw`DSZyHXk>$FsaP)dQx$vcR<cBVwI;zUTz%#}@6@A27r3cN04?I;F#*^$X+<I)<
zm+z@IVJ*Vo=g)M9DSArh_{oqX1%lB`87w5H3EQ4kI^0w8n4XAg4=q$66*hBDz>dY-
z#=zsP4jW|oJ+WNU(d}&!XzWm!D)m*4XR$FT<rq1rZ$_zg-Xty~@OBOBMOMnZ`?ahd
z_}+7)Cg~{ip1n*f+Vd!-sj5<J85hIV7eeKSI|RgR$rPYU{JeqzyJg(<SOZat_7KMC
zl>ogNv(DF<%dH<o-YdQLroQ0LV|}skX$XXPHmPh+IU|}>o5B257c5u2VKuwJy?aRK
zG_bh>o|nGDJa_0WvJSZN!ZrGEXP(#r2DzcFC-$~|M^hFBrO15f@5zce&FhGyxlZcw
zv#Tf$q^C~hRVxW}=;fO58z@}^;XI4nZAd}P#_{wAr#jJ4taK!7({dXU*Y_+P#m`l-
zSM=mw5C`Nz)ooQEW~4OI(nk^NY>YJ9kiz#{99H>8M#0;VqW0x2o%KU@*fq6{w^X_D
z)_j(#A|iY5%3pgnHi&(9cZ<eFlm3QwS6SSPgtVqq>jOl{fq?Kd2bKj7ii<Ssktq6z
z_b(kcg<fYpM;NuAe(U6vrDb|aA8lfh{f?q<IY5JMP0eBI=wrUq@9LFEMVCa8HQjl0
z+!v^@VLaiDbK<%=jF&I-7Snt92YT#pR_k)nD>HdFI2hc@b=055LWC=@Qq#p$isJOr
zYo(#N>HewbE10}Y-4lz*j^qc3(03rc>H4_N<~vL5fjIp(q<-?kHpB+8tk%=%vc5(I
zjK(?)_XqP{)cei63ecXM<y4`KsPJWn7~K(ZXpOnhwc{5`G~9YGQSXxA(XQXDHs4sy
zmdrlcDX<wsYG4?a>m^gY5r3$-@b;mQ!GR0C>Mqi=5;OCG-j<AWr;Db@7iT(}9e{&w
z)c4Bab+s=uO+bujX}~&O&V2NEYxz;heW*MK&}!^~VB8yah|t3)5_JU*NSVb7AJz^;
zZu3hUe3?nF`)Akd6rv3WHccKSy)i)hZZs}UHRo+X<(YbQ8+ng~aP&PB0gsSeBi3KC
zDt+m3%6-tUX^~$|$NR%fYaU{Os2VZe^){^08cX*;t+b$PxheMoKqTGaQ8}7t)5Rc1
zOFJ{8>iY_DfMG}!^$d>9@qW|%E?RkRWt!@(OT9%oZAo6|L{I+njua~jXo&wl8G4mz
zRuxGxCADoxPgc3_?lDiZD-LH|vD6(8Gl#Nj1ut}SyG&_qL(1J46S}=76T%t!QIlcU
zOLQb{9B4IOS5omje{MdfQ&8B~_2AAaF%wV_T2>q`y(yM^c3+&Hv>POxzIZ*rLSc+d
z)8;ootnUoW2uPYHp4^7Bjrx}?G%yz)jk>7=G~Za{B14O>(PVD<pnLKL=bV7lTW@1A
zvMVbS-fW#KQJ2~eJ!?I+`((zH-d!CX)2fnasS6+SeI==83)<z6m#Vfv!<gf8YZYB{
zXqlO_C@3Gcy)g8wIQWjV!ezNZ6Sh`8S+Uq>#6UlcwgTMQ9i_|0_?!|r`$^naUm7wT
z9w{g;D6;0Bqvq4ok0n(uBqe!Fq)ER&29>cTRJGx^TB`g0_6o)P-pGp=3(oq(DfQ5o
zAP2*lL4sS4e8e?R1upv^VY(I}=se#)(aS!uQIm@|&p2g@#xtmKh-Phb>EBXQ=v=n6
zk?eStIXOtop$jLWo0z!AA9T*zfj>73TDuKlUuAf)nPYvZCMedp2~(dXue0dqkAZn~
zd*oUwPeBDa&!k@uc{~z#uWp*rkHKnwC}xqk#)HxxxWAWlk5>j7?|PMcwoxiulZmGe
z7AA0gIzvT4`Gtg2cpVGr#VyV*W*n#=w%w7PmJrQSsNnsQmQ`KW&V;^HHO}V>c@gtH
zFYbG0W}@2rWK6Zo1<E>|l^BMHEDBY76*e>SWN5eA8D*r<T@H&<V<JBBx~CZnTA@8=
zmhXn8UcQ|0Znw1$%W@Xbf^9?g%8bcu5mhYdQecmUVh=rd8MHx$n8<@-;3v(QW44T9
zK46KZ;7%2&JS+>M)f(hlVgdPaY(s7(E;3_p7_A>C26zUU+<ORPrS)wHeq3DfFj^OJ
z0QUA2$icKC7AX-`9cUm~C9^T%H?|?S<9q92PuW5I=$f4ds8KgUot)93vMlHDl(8*o
z!OBZ+Ltd&Ps$Qe-f=gmPUXm?Oao2e!#W6-Byk)k?qSb1(VyvHAr6W-XyhhX_HTDMV
z<7+6`A))(PZEegUhz{HkY*w}*3t09mJv~do{Lh!(>CHMRq{pD1d4r*tf}xCj8cHZ`
zDA4tjJ3|3Ep%SQ(QKMR17NV+Q=hcHS4|ZN1dq@e)4=G}z6x<wYgnd8u-xI-S`tS7o
zmni<r3jdW9@&9M?F>&C<xm~W&vhy{1Km~jwzA?vQ?m(A;Ro~zSLnFm2wuWDdmsi|R
zmM<=N*U<lXyuiz9_}g<}qZcu<09R0lm45-WkIIhHII^;WNfhCl{^e88f%2=p>|?Mk
z!fnWsA<(8lXdUSOZOGe`Ko6pT9xVU-Dv5Ghh|!ClGT@OFA0G)6UL86BNK(WnMKiYz
z8N^7<&8?ri8fiQ5*!=W-gpC0hX#h}m*8$pZM^h<)9e2OpAwM@fNZs>b>Ar$M*ER&L
zjR5e7x5qy{zGIPiY|l32Vd1AoZmg|I%{8r`JE9ZVMG*Q%%lt`S^AqX5`PqjP9BsO1
z-P~F1W$?2g6A_dBbwe;?$u5r#Nf4&)<uW2sO0g>Ed-l95Ib^|T=t81!-9mrtTNp`W
z*73&UtfpKK3pw(F-$Kc<)U;9XY(L4pUKc+o*wKzO?JYi;+nH{DG=I`pTRWj%#qSbL
zHe*rS%Ai!0ICU9nLn!95om`0UAwm7-rIB#8H_Mruh=ZQ)1^#fV{(GVgt8x@u%Of$}
zW%}75ARm`{E{0DJ%J9(4c}~NH3QpbmJ|&A8dtf-I;sf}C_uf^YBaG1U-Y`T<4_4R=
zeAu33Y~D7c;{k{%Ri1`DjR(NT2P+>$t+;P*Lv9w1zsGDL#>0&;3Q$xy#%miAla2Ai
zUDo#dRTS@l;nOm?<@tIDIl2uQJ%I)$56oztyb1JFh{qlP7|fX8A3mqFC5%8|AlRxP
z4A!XU)$03i0_NWC@NuQSU3&;}4CXI9hMs7e+3Lg5(7{z;`owHQFt>n-@>1*d6uQCG
znk$V=M{f}^b=BSGu$!)8WJ=WFHiUVZ2#MLkQNbo0(XtJ}{+9E}p!sG8cjKzlI}h=p
z2OmzBZb9B$D<q^9TWl7ofFVXrux&;kwm}*Dy$l2z3H$DEvB#Ulg~^zv_b`c+?3Q7)
zc14~RFx-Hr%?-uT_jiAri@%tk0r9%cmR2tA4{O*%C+Dfa^Z;@tslyq5KkVpjd3x0Y
z@v8j8GRd!ug98kMaVQ2iid}L4efw{|#ee7i&p6<}l=EM%{Un6`D|7xU?{~D<zgc2(
z0%hvmhWLGQ#qMwNtS(nP@|u22Mzs#K^mmF~bsJJuy%i6e#<AuR?QO^+<yFqr3-dDw
zpg=1cZ}|I<2g@4)I{@{x!lGpz3nI9hxTp-~7_?7d8`89f{p~4E+pnr&H5qqw`z98N
zCdMAzhV+SI5fw{RejqTT2uz!`)qAid02{cM0SsdAMnq%H3epH@-S>^$Ba-74eP@@;
zKHc2W1DG8rwjq>ZB7-%rM#(2NqG|3O95{A4eM9A4GA2VjM}EC$2(jI{6m)wW%Pl5_
z?M1vz$bwQ0ddfl<b!MTfK+(fl?YrI-NT*!l<W;JnNy6uqLwa-6Fwr7;6>Df>iN^fZ
za-=!%ic(GxFX*ALF6LBZ^;=Ee(APc!i_)Cvc*@<EIBH;&CO+T-aD6P1iND$+xZq(t
zB}N4a`TyO)^Xg#ac#Ir1a>(<_1a9$EY@ECjq%~}~slsERNgfNOg!IjwA>|+YobD*r
z*D@H9jG^kqK{F0@oiqk9TtF4|0i#Nrh;2w)li?M^yJL3i`$}05?~Z^@f#IdI#gF`5
zLBugw@^h!5|L|Yp3vpmXiDS@BCorO<qK$WXAaY3Qce`R97{byK<5tsoUNB8FrLmao
zw;<u3a_Z|QDIa62T}v%@U`rxjs5XDd^Bln8^eBTY5^RH&`&L%{y8z_@Rg)+rr_aCv
zd*Sqo-kzK0O*jmF-e_d~hxeEO)|#5C0ogbih$sXfs+$m&Rm;9=^ATs?c~DQmF6fl&
zbTVR6aZ{lMvx3-s+aqItrD@fj`S`(<bsu(Owg|a*qRjW>vJCplG9s0@yl23w+Q)aF
zyFR@o4_G2Yof<Yvhr&8P47jX<bfJlra**bH6Hf^l*!k-VFU3>N@=B1^&?KAqE8~Mx
zI!%1&erLCo8i)`j7{td@01w%6)QAEG!=3W+UalM;Pr>nJJmtHOr-*#K*MH>Wc4Px9
z7}mq&HXsvll7<b4hy)yys2I~C=P(4Yv5aTnLso$7NN9~KBZPL*C1@)j5Q~!PDn4>i
zqRyw3c^l$Du|=OhO*IpJj0Qz<lVa;8V%f3hQ4cq7;0rjVD#y<%`u-F5%?t1X>c4Ua
zHV-^e>4>qpf>u9_N;E5M1=Iz`D>$4=SPe>^ePxMJTiMzNlIxG2s=&QiV`u9|>#9I=
zIT5nV(ulxJk5+v-`;2usKZK}T6|z)ETgQ%qtQR2Hve6bXbcmK{05$VY1O*xSb5Qbf
z&ROqcZJu(e=<x3T`nJq)Cx&M{AND0=%$^OboM0nXENvyO$<r#tNTFR!B0SI^Ds5KF
zNZ#6o2ux<)nX6OwK}k+35hE8#c2;58?goXAcMwaWRy#W6Y@&VGkf%K0#{SRTcyosv
z!%|5P<>=l`Pdq_Cg4ds2w4Bk{6^WJP0Xa9ss#Q_I!9Ka<{HohW&Ajd9#*@3B*;b5C
z8LjoNcLfMxVWt>FaN3&D;)j!)^O%`JXYre$D)HPJ*2DV-hAV)IGv{z$DF2Jg?;LgH
zV5)={y9=IdLl_HU77&s;0@Fo2;8Gkjx|qZQH(hzy??dYTY|y32Scp<B1*~uamQ$ib
za&{`?TY%PJWHpqt9C&%S17k=RAfa&w9B@6IY;XsP;-cUXLEM1>72I{W1GXHv>u?AD
zFK=kF^E|L(_a3>O0r1M>p8qh}1S!E!)$1t^UDSF5y4o0RQLfaDJ%{<lW4ZT!!uZ`U
zFfped191>aVvrqK0NeyLNo^UdW_U@d^f2NbE7;LpT2)N@|CnlViVZ@?l`10UfH5N-
zF`E9ol^CPK$N^g!2LlSQ5BtPRo;Y68%<_w~5@+tp%u`^43C_-}#!ch<$g!+KcF8SM
zg&Ag}&X|t{`oreHrE-%Q&4F1;Hw^a|1ZQSr+>>57?B^6XpEJqeW+q%jd?UD?_>JcK
zmzjs_B+$p7%;?%aIh1Zkp5kgy9S~wmeas>Mv1dXUjCaDDYSjA-;Ed^)&{fLkK%g}n
z=8OR~PBSwax(!j0gDrEHK-QPaq(<vrx}6~;Pq%SNWJ@Pc%V7yFjXSlM#$Npfoi8br
z0NQhEa#@+Ue|V2KvqkyIE?W$LlACS6w2z)xXS5VE%fpNQzHlUuBQ%x$8WMeTB|8pw
z$svYe81d$W(G~-l=YmJXN7n860KF5lBsvSjS${ar9mJdm?>DUSNsoTw+)N?Nb?};=
zAg$dMrkjhXKMGxI!8U6##>2gYcCDTP7AiBmIlo%}T+_jO2DgtWWvUX~2!283W~CKt
z`f7_9tsIg6aGzKBG}axqwPdk*yals_*qrFDjdXW#5M^m8B4nq*e;jn~HMSktv(YiJ
z0JG+*S!AKzDXDi=!*;i#<m_pxVAZB$p|D5XwsyLK_oLqMa_!AtAwwfXax@kyI)z3t
zvu7`>$itPdhlC>`=Qu55cm2n25X60a)dYMC&?fFcNR*t!9)sj+5DBCT@cXFn^bK5x
z$^9^zn$T5{+=PprFED-$t%+Gu#Lxl_cyfy|e~N0B5f><S8Ohy-T!4W+lPmSFOo5i5
zM1F5L{ipsdI!qCSep0Ho4Y7r8obDksSo8D4D3@~sd=F6a*4HxGQFR?Fmnh3QH?X(4
zyS<4>F=}lxTYw&C&g4&Y&Bg2@^5(XP$Ce|OBXnO4jAOj&0x`eAW;xvf+eeq#y)?!0
zR#y{a<DMbjYPn1d?}JTvE>dsZvV$!<^_Y)j-({}$fMS@%kG9#A!js@fBD(iR#n;~p
z(GF;<-z^$+*+1IeL4r{X?nMWD!SqVRvZ6rtYbX|;ExVYF^duhH!msw2#xV713}aXX
zE3B4Ei%gfiWn*mLA1Op+)Y_McI8_oyU|*SvpD710di9D8k;Ch)E2owfTI#$6U)N50
z(v8xQ;VT#2t~zPV`v7jTr&8Or<-GsnU3f2QJm+^X|G1?be}z{yGY<AOSrrtXjg=~*
zdf)SAqg#VY?#-pb&;&$_Ii_Os@R=xP>{S@BE#7o1P_CC=pXzj+>DEgubPaAC;he$T
zGHHX84V(aIB-!ifgNPKn>h&&UwhQ)21;w-koq!5pu>T0`@}Klb+u?g$KgH(=KV~fV
zXIy(x#5|TBQ9pg*BbKVO=@RkYv6gjqMiPJ>i@^rzE^Vwp4}s*95K3tapsJQVdLC%e
z{Xb?+E>nQw*m}RQmQ4^scsp*0FuXC^0^CKtZHWCg1n^Qzx*UcV0Of9-L?#3Gsth`M
zs5r^ZY3xLBhV_B<L&0ZKS#DlD8F{dF&+0%m`_rk?G32X(jqH~dxrP3vQe(%Jj5^*g
zSL9j=g$`Di=r~O_GmA`LK5I_k%yPB+B!+J-2r&(+96-@WE@Clay#xu_kipVksT=;V
z4M{`{_g0{rB^SpQsyY-=53Ywyi3Z42cQe9KH^a|5(Q`mdh}oOi33d_j5m`^`e(9fs
zTNd(HNFPYN%C9YauCksDUkoft`;+zOjF$_i)Y$#?DgUY4oIrmOWDSqjVFEo6TLn1R
zM_<8p8$u47aP9!bCxuv~$D_-YqooD_{WtsqwssJlGH0k~m^}7=ooxst3qMkH<M<`s
zH(-$Pe*}>GKPXLNyoDoI&)><_x)mb?`dd=mtyqBKY&iExYqe3FL&Sk`5ks5>a_XWj
z`0tz6<B09{|91%{-eL{)a*LSK$03-Q&<A62;K&FMEI`ZpEX+AreMr!M^cLHj!=0Mv
zWM|ftMm5Jv)T;fjwmv-cHi2OOJx5L}pT9!V+(l?RV7euNP^C=;fR|Dj)Kw$a89<D3
z(*~e#qm%S_P9tbYJ%vyp$^LXlMwYA~faTF3jMDlfBk%tMGV*bHbOOhU0HlxWowW(?
z6hH5Vv3HpJ@r(&tiQTJgKD->64?0HeO3q>9Qku*JJg*g9Mcjg@$Nlw1-tgPb;HZ!I
z6ZQ3#E|eXtMl3P8J;#m?Z-}M8p3{vX1;MHdGUKUp8=y#vn;9%i@I`XrI(gxP7RP@{
zdZk-la2w~|k8#7gP!@Dlze-W}SjEir`ul=P8m2Ff>?hsaO4LlLq7EMX%`<V&{Tu%6
zfm{TQqgBG+PVYyFSy2e;PdlVe;cFt}8QO>sIEq=JnEa8JK58tIN5cd*IIjgts!Gms
za#;thG%I%-3me><ROA}CBC*I+SCpo%VlPM)=BqxT+AWfMr17yv(ZX|C*nahg)D}tU
z-2SP}A}PCm#m;yh<O?txA^<DC+K;o3?N<hH@*=oH33xEW8=SLdx%jsiA7Dab2oVEd
zpG>B^f=2~tNHOsk&5j*IY=~JmatA!DGX{%EP<}5*{+7R0eY9_>gk05F?wGjnz_=nc
zmULqed#El&ay^mC4ev0?u>12Du7d@Z>fh7ZN?qs7Qzn+QIUObB%$$-sci;u`HFfST
zZd)Iw@IKn&3pZv(x-S;+)irvK_h(P)sVfunwj<w~6(a4*g;yA?`SkW2e28_}XeB(%
z0alZJ@#l@<zjhA9K2mwbXDV+yb83eTK&*fPNMXPS`KcdGa&M97ia2oTGoi1q$8Ezv
zBjsNud<e^k=9~SN4&3_~M{C`&hg+UXtOaw<JjUv`c~8j~?|IiRGg_nDrf<B~<4FIA
z=ITjkW6}+^DDvJ455E-K{3!T|OVk3{neiHW>2@nh{jJ?L*1a+OO2v0dm<C`m%Na=4
z0UC{~KlqDnaH`+Ff9-$&-wBsUgm^0{AqOZy{h_&n@V$9M>h*Sc{&QZ`?N3rJ13FK@
z)0)@5&xP>Y=pre$?5ZHKwm$*h&G?c&A`2Mc>ZeZCZA@WcVNyCzKffN8c536}!}$zt
z^s@X5T#1zWWG*faVZzCpr&$#xU!-$7SNqYfy;n~l+~B-(^mOCnj@due3_ogumLD`h
z%=dyn!>t7?*K!@Pzz%4lyEM9}_x~tdq<Gen<|t{XJf#x<P03J9y6ax&YxctIsj)=;
z{m1r3XL!V*(gi@RwAynYd0Jy}Gg|1V7AFV(qqrO0NJy^PHU!Fv26|7g>&EZfUltj}
zqkIbIS?>|wniI4pHZ&3SOZMmijpRc}9`n3l2w-(~l%kJ6aKc*9K+KQlagbEE4}VIc
z*+l^7_L}*ZLKnZy6EG4BSlDYDvIZ>mws}JrLs0Cv&W=3^Y_==dAgd2)-O1HZrLKo6
z=vfc!ZJ^HU2e@-l&};cYx5ba#m1yU=d4r`x+!cOc{KT8NPKam-ahXHd3iOukMHKP7
ztyH(9>ix5ZM@t1A6qCt=udChY+;>QoxAoptWx^<_nwUM<{jz=RHwD~EWiliL^{uEc
z3Rp93zHp?F>SR*Ewh3o|kfCLi;oGf9L)290RTDQJE<Q|Dt$uw4dO<9GN|ytF)<&(;
z5FefML?0bF`Wu6&R-O^xoQyX<#m1#lA0<?nsM2qgJx%8`{8e6Ps$Hib*l$o+9Yi&V
z=C9SYExtUd!lu1INl$#O{s1RNnD(uNSbD)$EJl>rubj;=Qls}!;$b5~27LK@(~B;q
z=vLx8xHXwUgXUkABoTc^Y|am!MSDlh4khEsVJ0V8*RQRm6|64lH!=q;ieE2aeV*sD
z_mCQk6;EAjS7K7UG$B>i<>hs8i>%**q`|VBV`0*fmLC@Qi{26|q2li!!}G37D!?*&
zLsr2`U7BLr#l<1BN_<L{uDjCPL*J2p?`60g6|{&$KKXkMZZ(!*Q-fv+l7*bCsf-3Q
zOGPF8rwJj_!Ow<$lGFvkDhsMR>OVa^N)MIh;@FYyP1!wS5QpTdd{wj!(Fg76Q><`$
z8I9ob%{BgB&q3}vo=#U8<U?VCy3^X=mECd&lu8gJUZ&0y8V?r?-0U8D=bw|XP*JJl
zk`-4&tKY}DT|eA~>RU}b=bJS>T7e0S_~g&19e+r#^qnH^!k7c@nEv9=sOVp=6$LXX
z8~gVdG#~jj^}?+wn^bhnIp;&~MUCx=)%0>+2D81Sp@h7-AbZfto4q>`tSE%Dt2sF>
zffNx_pkz$?*K*{`3O98DtaKM4$mR!1%nud4g3#TWlz7b|A`Dr(#h3eL3=T-<S27Rf
zCU(?mD~%v(efZucm)g<xjokQy#Yll!L;*+jU_!Sc)Z35&QDD^MyLWk<^sShPL4VfR
z=|9?~*~xkRu8W9wJr2olvgTsQtjHV}1GQ`Ag)h82qzRHR3ZB(QD%j>e+x#R$D?|RW
zsAHb|gwN|dJ_HTER=-HdATHHl>oHF|V2`&nNwp$fj8c+Zd=m-+CB&!Xb>=5UCpr>M
zg7zM4%#v33;Jz04N}4<9*;ZsZmx2E66UQ>=54w^*8<19~(3ds<6-tn$VInt==^8`M
z4o{fH^N5Af{bf{mO*tR?ZY0k$XX?#@)VI0s;0-d7K5jwg;8NRQzfS5GYgEH`hY7q}
zN(?$h-~+nv{TJeS^6uQAN)fv~Z9z<sD*EtRR9v~j^OEB7l8DtM>2UW!z!<`pt_Yhb
zrLqg);rJ2?nl=B5JW(6FGj&gfrs=Smg`Pp3we65DcD-o8!z9(+KmSZ>a`md7(<8n2
zg^4EZA==@lAs!LuYzAmRitgx+lKvDl)BG$TAeaAMb0fv<kqKkw8&$ma#vIb<vRju#
za|@;tE}4ryoM=}s_#zW<ob*4G3!mi#2dknCQ65v|D>}XR6y3S08pwOqDNlF=Ig;Xu
zm8;7{@_z6=vc|t=eSNVjFfw3*e;vvg^ZbtW4YS8#>+IrRLK(=vJ(QtSP+-|FM(H9j
zXRY~g!S>*KcVAlEEfpUQy#0qx?Y;p~OZm!x#x;<hQc{Bxr^fjl>qXQxdc*3wSB$@G
zeG`!QJaM?+Q*8#WMfGbLk&(<aeDKD=_@YeUBtDGGGSs_m<ha$nMW*)C<tF|*&-bDh
z9@u2g73eBVPUw0HsU5R(5*qM7*Z}J|O*<<wanbe)f~1_*5OcPh?zO3Pe6NZ8TyCWX
z{X12+p~@?xGVD*q*lULG6zERaqp4q<JAQ^YaqM)rIAJyWV)P{5q*DWo-%(nyoXc%f
zrZvwDt$-RWE#vB#s3?&NFMfc2U_Z;h){hQq6jy0!&cie5URtPiDb9(Ich_2II7oS6
znVG2Y1jcM^6HS)6T9~5$n{)?#Azw-G%=MQh#U)=1DSWU3=&!KqKN|Z>S30c}Ccd_m
zfS>eOnn&2`HA_yzM8t1$!U8+G_}i6jw2q4uj;ha2CTn6iGb^8ih~%|L4%p%fib>_p
z9_U;o3adeO38zqZG|ta{E3A5d6C=}2b4ApkH5&7u0+Dw98)x}>%y&+4*SD$|=M>*r
zi~&wD0Z<?xy<+$eUU8uG-xxYH%+KS)E-4;d@0h>5W+ErU;FoFbJR<>tkdpr(JQ5NU
zV#zPA2q=3*aO`S+fbmQo#{}4El6~I#c7DG@KM`Kd`@nQzfHbJ;DR&YxQ;_bI#Saev
zBJqD{n1BCyelbb&k5Ox?k^^QxmMzp+<Z3|0QI`d)0Lq_`C~gY>_hedZjzQcqNYg~r
zp*8w`My0<Hy7|YbwC9=xp_Oj$_<{4{cd-JS@?sA|R6e*ehCTUt11{F%tPm&m)VLd+
zZ4!qrSBy`>pcB>}Prq#a>56<LQ{2f}CO<tzjJn!rNeN>FvN!Ly7`vu5-j*K*xn9H=
zh|u~W-mYegWLkOdq;sHwxO5JZBO{>dySN#}e{lLF_8yS}h=?G<+>EB>o-&Blz7H0;
zBA%~_<f8i-m+tKQUm7ns9ju>=g;iyBal^(jT=TkbfbdKL_R;Th#NgZDN0HTnHyuc;
z%_IXjjU9l~@bzAMiT)<`5m#nZ>xmKmk~zGuMeqOb&cP>Ym>Z|?DL|MAZ<FvT*y#4{
z_FV&c+%S>8E@QgL2Vz@XgMVmsP~OkGkM}A%2}z*_hv)!wUC@1isLGsu@%!c<>KmMp
z<9?VGUHo&Ev}{C%Xn-vuwyG<ZuWChU#i6aSa@!D43H2#fIQuKH!e7nU=;Q{Nl>|Va
zoatiWHGNhRCR9hubrl7R(sH(V6MsFyg(xrE?u6!KFiqT(N_=F<^7<;z;OUn)=f%fk
zP-&LVduf)H@y?J0KY2tnEv+&uNp+MNM1CRP#|GcxUqW)E0k|FI7ccJHZMEoeG&4+1
z?kQV{b5LM%tA;7a&Q-;FS!GfQ?HU{0hIk>k3bL~Jl8-*)tOrh0(#^`AxF<-n`=(Ep
zQ`3CFl>Xo^e{CdE-n>O?3rV=7PWNy`^K!00ax3|DAha$0{qS$4aK!!8Km=6$aetPs
zi(OS}SCe8UT21eoE0QA}pKpB2$s5}EBsB}x1E4Z#hns!A9nUx8#B*!`;W3iu>KTAe
zQ0e*B#=xO@_)SFP3iKNTesr$*n@kcexlS>TALEPtV!x-Yz^I*2JujeZl-rQ@TiM65
zglYao*nJr(Cq5RsoXKs?1PQqi+KZ^o^MM#E6XE3+<Fmq4l=+@L=3&}6Jd-ATA<(RE
zTzu;-{^Pie0o_t!F|8hqRsJ7y!<U4iD*WK9&3%ZK6ug|;C7!diY=t)S-GnQqogJ~)
zm<-Yz7QC#i{**EPXCZ;FCtr)#K+Nfz`TtCFct1${>>nNfpQJ;zIuPUnEo5#Kqpyak
z^EX+$P9_#v8wd{R({x?qF1k+99A=`p2hVMyM{5*zy98FpAc-LyA3WSmYdapCVf*fd
z)}3)xG-1;|*Xxet<UCqLKH|c0`7VQOHpF@rtqU|~!m0WCMagfzoZJJ|*VOnj%ZOjh
zbg8EE@tB=vnmBxp^IEIq@v@~eJ^Obpo{(eM0QHb&27~z><brXiG*OK*p)GjNW=w0h
zf_~&P&WLWj3x(m!0k0mPxQck(k?BG^8D$bf9>S1d+MTYgzkc4>nUAHEiopt#ZkjAt
ztPyeEO!5p#;<KmBTuZFiC&vtZ7SSIxQkP`g>)T<hfeL)NS8spz&A&hdZvL^8&I!_A
zC~k4fS20|uiq|_P)bLSfKp>fv>iVCV4|0GUZs<D!4OgVdREfJ;*&CPpq=<8=kQ<XO
zsm(Kxd^D5i(D&Nrv*tN}MZ3pIRqkjl->^?cFN-Celj>!{5Y77&%kQ{EI8y#lA;x`5
z_I*~2t<Z<7V-W*;^Hkv4v=2VH6bhewjBZ@M;Sc4<-tZl3Epf+mOV`5@V&&I1F88-=
z-b41Cro<(Tji?a~r%*CmHL&F;)=k`<7#v37*ZBTZTwh{0o(Yw-TxO&m?;%D-qjk0U
zOijGdrs!l0SJxM6BiO~`PV_A6@;MC3KX499l@5nEQEGNIM>IW93IpAFv=;*CC>=m1
z4NSwAi@uSuDr)`xrSsRS0+W0W>}GWBD-(@5H{eToOE7jLM%URPL3Te8BpD<;zcLJd
zwk-!1P^WL0wTJ~C3Ss0)^tw{r`r)Ary3bpGIN3WNq8K?d_wc8u{B?()o7w3t%#Tq3
z<(oLtpM9%hKkHQmaUIW1x;HP__Q*Am`PlQ<pRPMbPJC)+&uEL^HY7KHZmusd@kDNR
zS#FeIPvcT0Mc9zNHpE@Ero@~?NhyGPCZ;bEE2F@UeX$?liFz&Yr)Qw5i(0o2OTR4a
z%kO1>YMBMy$kpnM*y^bYx~^b1s^ck4fjkw&$x<Hu{!-To{-yOhO!SUa>c*zW<W4Px
zhov+pScOOAKPA!=9xsycuno9DialChvZz!&4;`;*cU!A0Da$W=)%vm|Agb+1oU=h}
zL948&w6H;DAyX^yo<-^^!@Y|X*N&jGQ5yp@sEn~;<s6u+5X%Ymi#}3Rqi#p8RWjZ9
z5a7i-KB!fN#Y0<E>?svak;yO|8rYk8ZfX~)Y-6MA^*ywWOto@&a;I5H)}wbU?_bYW
zYUkcDFP4pbat2G^#U!wNdo5wMmt=$#>q0l!D^YvermJeP_&L_NebDM)jWCk*sI=>~
zYkiTPhpuX8+fzN9zkCG{YvS^=x5@}BE+>LLbf9o+!zZJd#a+MQNE2gHBwQ-=DsmJ~
zss5vM`Xc~S`ar=Ol;~sCT^Sv;<ivwiprPz%9rEQ@J-D&$akk=Ee4NiI)3A%Q3|?I4
z>PXcm70HZzM_`QuLLbu3?-c;}zHjtA{8;+F>CiW-3Ou)s9f!gqUTH6whN`|HS$N$a
znJI|mlK5IW{B%2Zmm)D+cC{__l($mi9z0UPNv!#ZhesC*LPJlY%he9V8s}e)fc!gL
z%Ug?fm{21E#DE&Ws~swRR;C2N?+TuP%pH`rICPg9$Af>K&BPxMNVLDx**#xYB2nsC
zmzr|<!XD~}-XFFhT+e^>4y6S4zb<lUF&$9vR3;V^E4?R37yPF4R0m&rswOQ_&cfxs
zlhLq82o(uRiyuNhS-O3+<yS^wQ4qnt-elo3OtXlpf;K8jE>gU6X_SO2KAb;|WqhY7
zq>W>9>G6hq4&`Rq{pK0$IM{MQS%2seU$A|7S+nwv=-Df1w73)#v~;RW`^(mkL-`uc
z<wVud!~4@y7{5<ve&-)(=8My8cxO}v)v5I?OM>>+(xXNQ%muV{EILRle=*44C9iGS
zntS)WoXR6ZgM~Nx*F|_L@$O6q@*7g4=3bOjv|`9$HHh1qQ`ny7CFe~lmOU3Wxx**$
z!wHO0yFw&KwBlck+wJylQvm(t3=5ML;%6P|j+N*)2!{!!O<dm<yBW_yC9G_(KIU^;
z2`z&#TbUa(xBxKM=Z9l3VJT-67L{H^Gok`ou8AM$Z6>82$y|8i5PS?-O-c>pWpN0B
z;4_^R&W<@HCO#+InU$A5+3R4=|AH&felbUrb_1FCWm2HOn6*?J3yurEsF>!+d0!3R
za;oD*P?Y$D_lS8+W9rag#-_<F*Ba;`l{7M$tqx#|xNwj+2$kX7mK3ha?6czn=>>;w
zeyiTVX{zr$)4XN}W%%5K!x%h}=SkBzX1b9-4K?6$7RRd{Wt!NTyR&!guFtRv=ZxSF
zjBk%Hwo*ASqeC<)u<;RnkS#C<3v;)dlshvjuD&_kn7grLr3YaN4Q&A8L-rf-@iobO
z-WJ}UAgZn&{98NyvXO4vS#>&fHCZA!$xAV%OnEq!1Q-Jk?p^p#d~#JHKKU*gZ~pAo
z)W<&hD(61BE}8{6x#IJUo$Z7g2C58(?MJ*#&N}>kkQ5;6?T1c|j}~5s;qVNJdkwWf
z3gQf+su-mRn+1CS!Xd6`!j$1Uz-uUfePghV*B(oPjE{w=rR_C8AdxwLV}(lW4~z~t
z#C)KacztwajUnLTKJ`)G-C5D;1A1VARJxp4QW7pX6E{8Upt|n(PeuXvx%QUR;TP%v
zQsFSfEb~$50r{#`#{8!ce0<<W{^6(GNkQ!#Pb;LBgH%p#!D@Zj!Y|&sB8(A@co{u8
zeFjx_3(gY6ZRZsFd#3T9l?2nBF=Q(+QqSMemjUyhk@P4rSjn4rNY<AN@YlIJa?wYd
z|0(yqbB_Zh>y$?A{6wfLn^qU61M}0}r}G2hIr;go*BRm5_vi>h68!P5Jr2EQbXY~=
zux@v%LzXplN!JiT&)R{3dg`PZ?c%xug-dO}8-|EqObLE(5dYvn{E>=ALekIBVV&m&
zJi5pqAMQ>2P|33Xz!&Rs94`t^u+QF2K>ZtH{hGceT&0Q?xurR~6-9&+FR63{|7Lu-
zOL&2INv5YbMd77?r07N`Wj~JIzbN~!FaLd;gD{YorFEA^k<DGtc6%`{ZJR33mIkcG
zrBo&ega$C)H@g4d?K=E`HT^cohI1W0A&fr5@9%46xOIGsF#03@vuYo&_Y@kiEgxDb
z+HFj$D4BIBQ_nzvnE1Y!3|O&to)XzO%Rnyq*76TECSHhiNLC#!)m;ZG6hrltlF?#j
z-);iqR$^Yb<p2Q1(BscmjH>qO?p|bhTzFwdf;2z3{|+1dDmahpj~%Mtoh@lI_^~?3
zl??01+6NOslSZAbgm)ubi)G!#`Z3%bA&N>YUy&nDkpCw}>HbfWalRI3Z!r6=WOS=0
zq?7K~qoT|?79UMvs@h8HtQJK}XYG>I`G>rsvhsr!^?lSb8A%ixTD8$i;85F6f83(x
zz{}GU8y#I5L|rtLvw1+K{urA36CB>}a`tywd_o5x%tp1W!eSP&RIZtqfeWejjZyY3
z5=Q^jPtxI~0Mg1b_XP=~1ay(OH~p_+R<#R@-RJ_<SE!2V?{E=I-LsBNjg1=dYHD3!
z%)@JKQ>o!Q|NP#TOrqQuTjdAM$|eRX5Fqqz(i|<Oe|#2BrNadpb}cw9Gc-#%x!%L1
ze}E+?cjp-NNuQWzX(h-VI5QtU;tCv+--GL)eCU7LRsIpD{c8nQI~pJnl0y>Df`TMB
zkv?U3ma6Jyd5r<Uly<oNuUAd&o(M40XDkc2RBA(KW7VBha_nw?ssIt3iX~V;;YLSJ
z$}HrkuGJ?}7ioht{6wsUspnMrhwAR@zm2^#SrN7ek5aIAJpq&UUXhSeBjE>{jQbcx
z`bR>=`^Qg$I;=0D;s{V<fM_`VRWjvYm0^W&8d4AW#Z2oxRSeCV99d%wYf%dx5+wH{
zP$rg#YZVsj^tAb@XmWhRg`Y;evoAiAQhAs2oIIS3x83IuQl#xWqE|EMJ~c26QN~Z_
zo7$ue#9y&PrL76s2-R0`c_+`QzlF>-e0{sGw*PX*8c)B*dF9m)`~p6hGVzbOm9p<M
zgqcdd;xXww@r#`w`vn9S{cZs4M49paLOw9M2P+P`b$B77E)N>U4K&y|UK<-{jAzn3
zm5uR&V?n@HBnJ4;K{GIl39gQ3(BCZcFxgR;hAw+Y)tD`hbhZx2+xCxLX2kmDVVcBb
z?jW3m*8HU4p>Ig7xSE?2x-;((Gdy%YrJEQ_@;zMY$S)Ne5<N=~$l&7^)IKlM$>^KU
zN#aYVeetjYUJzVKfJj`1TlvR8$am8LQITo?s3JHQfkHSrW~FV+=h<8ZhSsV<BA8N{
zbdNNU^|mocmY?HD|3d--U;J-ioo``Mqv_v<UvXKMgE-dt3MI9}I$!4@{}t=tB#Xu+
zX;MD|XV6C8IX57)dc$Ljo7_iMm>6)65?nR^`2n90P(AoM>(7Isfn)w{()@sN9@XjU
zev(+J`a{Qb&VnqZqy$(9#r}j|_Jx6NmW~Edvla%w3o6fZbIgU=BEMrcpjAFQi{SSk
z&!?A{qQ$O^22o%R_Fxpoj&mJ9N6=YQ)=1Nq;AZr$p8A;Zn~TSYWW;u}pITz@;vWrK
zKlPppl-C-b+#-MNbMPgUaM_5;GJCA$hEP*V-`0$CFWtc^k9mWE={BR#-pHfnwk7$+
z&x%6Ym)NhnJxmC$Pc+bWA)w#qou3REH0+;?KGYeiiQ1Y7zrwrh)}pf2P3)^Sun+FV
zY%`wi2cwxEZ}(>HPr8$JYY$Pj-BRuJQ%4VqRU_^m(u7vx#`{{So|0(zShnB$)ySfn
zh42Y?t<{l-x5b14Q<N%*b52d>;hYA%U#yr@#$(@woH=$OKTLCqrJAWva%Cmm-&Vjs
zCFA|ki;vIBs?sr_r;~NBFWBYj3lwobw!dm@l8=cpYW^S;SjJyBsX8oWeIWl;YPdrl
zUWa(Ttq6IYkea03sp`vjoMx|*<Xc*k21nj~(0}-`X|cfi%E7{hJR>gNna)nuE@Vwz
zgebR@4fpzMX~9*hYj8>-`^(?EUw;97jR)~R+!C=XhHt5&F^?mmm8Mgpcpem5brdb9
zg^~TaC)Evf<!buVegtJqm=;o!&X)O9LPnMlXMNH=avaF|&$Kn}*sp-FaW25;fBzD%
z@NL;%k;l*Q3Qb>oQaHQ<VoA~SAP9Hv^bDY?{nefU-Fc<Mw-aGPrgJ(1IQd}KH)Oj1
zm3IL4RO&Z;`!x^mY_p#OHN7~*2hDPZUc;n0?^BNW!c2&~lUGa#{<Xo1s$7fTZRnrb
z)wq3s32TX)KdM(+O8PZlrt<TY;(ou!O#h@fL$?!cI<t{W0%K4zY6Hs=CSp#aq=U!j
zt-SWCbZMP0wssXf*AydS+Z0+$tSY|9AlfZG9ijEy?Mh8Kv=F^_%!pXYIcK(zdQra`
zf7h9MOq21s0v_2nFa4+S#khOSpBniX(sW#C7ohCMsHLRKIXSlpv{h2mDytLqhx*{@
zkK~9E9@_B0c%fb=l4r*z-5HA#)|9u-zcU(W+*=h=Suo(w!<uuia)lCa(Tr-=Xg?OJ
z?I!xt)%#Fu{=tmlCVEQ;Qn?STP4@__{ihvZTw9~9tJ(5x;^c02FAh6<bD`Tj3hKQr
zoFD2rw+Ca6sZVU)Jk2oR$N@p`$@EkyDL%{=YIVwpe7dP55EE>3Kxk;s5waUM)+l*|
z8w^)!J)PP;@e|zg^w0-n8}FOClaiIwBn_@9FVnjy%c|8eaMcB3g=Vo#xuBDsU6uVw
zzvbOMP4d>4SpuU2oBZ(ysRP}Q8`A9%4fGdt$C_9)RPmt>H(UE2f)D-C$xky#-YERG
z*P@-<Z7KPYkjtqABZqkI<_DYe>k$LPyDVGp)|d~-;h$NXPMKFWmmQqK3_TY`#MJtA
zG8G4m6$Oz92id78Sax0#SL6k;=!>^-ibt#DW0Rot&tX=dUo7cRS8dE8cNe?G#P~Xe
zua0uI{t8Iqs<*yYo3zzhSDnI_PHnM^iRN9Qvfn2Sr|iQ&jI20S{ys`%jWJ&;ndnLE
z9})e|eosdMbMEsXdvi3*jNaahOScx+V<jCmK(uajV{T6U;h~f`<e%Q+9|);Bi1P!y
zn$t+k<{gkfT*>Ch*7_cJ>X1u=Tm0te^*_l=@7g(*Yj^p><7Ji3?wj2z&+usas*@|a
zeR$J<>qaFpKL~s0#dU+5nd-uIQ0bLSus^sRS(E>qCn~5B!PQH^Lz>Lgx~uIE@jR3e
zb;qjE6FpF=0rmUJL<Fnt67G{%4`&<ja~Ny*O3v$03&Qyp9n0z*Bq;xtbpKZcW<S*}
z|4tML)jW*Alk*AM?`5l%NWpWPgr-EpUIjZF`+fOyw0mhfoNqhb-&<){dU|EiYQ^ZL
zICYz+%orjMeM9~3`Dg8F^X&^>A+kq>s}6S1G%?0HGt^2?7h!bKqvONGo)VoH(RjJb
z1+L|ix8-(U+M3{)f9<~hunqNK+%L$}bP@kNY9W_3S7*?DN`?N2-kSaMY~k@K6*YA3
zS=7mSd`FiGVym{9zR3cciR;Vm2#bI{Z_osVivD<~D~-uHP|<frjCwaFti5@=;yYcM
z9_!T+-uoclLKj?ylC_P}_Hnou`?!_(K1Qcqpambjct&M3)3ryfEK;Mm{HjGTqBRj|
z7R-Ea4;03~zuu_CZFzCt$*|i~E~O#ey3ldRKz=RZ{=|4Ixes|Ig!lpgCe*y&`*w(a
z5!UBSrg>bkNmHrttj1ac&HZU|8U1N4kKoQL;u>GH8uTwzw0=z_-&-la)QBQY!J%*>
zDBDTyDNBR{v{Be@Qm5uF!z)Jxc0&a!GF$)*?+ic9YYJ{%t{1+O!bCZ<+DR5cDPnMe
z%FZv*WxkS<1;hKZvAnmLMo<=+!cPwP2hw%t>YNM7;DJj?uzqD`|DdjMruUN~?xhOm
zo_1V9XhKs=p0auWc<_t@&nb>1mb*-i5nkFqy9~GQKOuUY{vAg1m+DisY%aelazCv!
zt)|;+z61XScFk@|4w86?E3RKtrh{#0c09T7(}{pFlRzH0b3Q>U%UpiRs`!1pmacT`
zB%hHbzZ3wU^VN<%)HlAklJXWmNmEO?9+X(hYad#pz;|ejjw@siW|esBNCpxA7gCRe
zT2P+N@C02)PKK|hs)q0Gd4p4uVx>+&k=I2IL#E%RUh<U%`JyN9thoL#Nc4{jBp}{@
z)}`aut2+NT+?2q=(J(^N65+(&SbFk9!W)W+aTtr2XhbUfBO84d$9OD`0ye=NMVTzY
z7Y&+p1SVVq3Xcm^_M{}<F{4LaJ*+*cqs5%<psIm)?`?g*UZ!CFMG&@wR(4+w&a=r+
z)5W{50%!U&4Nj$VZ$a&bF0bM<dpE1*9dKBxloN)}+r>2#m-74;Vfi=k(6`ZppMtl3
z$iVzX9-5F2zRuJj0BPNGnm$zTP=U!Axs%7=c&Hb2r$YwZ5k{!=ZvrxSlsPO-Id$6*
z-KW#nMr<-Wa#phZsOW<;kSev3vE+_P*RNb#J1N!a(UEn$k7z}$waWwY_Q@kQgL?1y
z_QWj5@56rg@lO2<kw)e$M{VtYL%UEgh~iZRpT~xmwIdQT#gQo=Nk1iv0FFCJ6X=!j
zMdp7k-~RDP#CNiS;_pvda%RomEe;Tr(>xN|^E9I;I6>G-!Dr@@rP3Mls<^nHBMCmy
zxyt!xLBEM0UnLTxHll!5db1PPPUA2?K+1SHISrpnHiG#E2yV|Agz4K{2-bO4Wg?#D
zaX8!uiED`PGo;<;eQGtLGA|~*xJWqg4RrKv)q)i>?gz&UtLgHde-?OJJWTG|anKay
z>st_+eQKbf_PL`%<ex?Ic1`YNZc;zxak?vk0NVj2d|~ee@ox$Os(Zc$7o>*2B4_{3
zy`IH>X9#Br{v1jG#F2JkfqQ=-C`81gS1xVNC+^(Pe7BEf@2!dG<n9=HxdZPcuPOZ$
zGDx(8Dk9D|8R*MncU<zTNVM&cB{25CAwl0I%n)z<)*h}`lE-TX>Qlm0W69>M!=k)s
zT&OM;hwTIauVg;APJC=*3+?FkIsRw1GB7?M8hUrn#!NxEH#WAcx<Em51KrDhed7-9
z_;AWcu0<P+V>#>vA^4$<s{(k2-_h+q3o;n}Oh%u6iT~abL(Z%hlsWT?X%B2}X{^8+
zLw7|!7d>PPV186TjY$AXgMefiJASBETmk-6Xz0vu5|X6k6GDTG`H65UONc5Jso>Lk
zfjl*QK?_pPK+V|95ImYwF#?3*7bg*6QWBc~3J0LPhnV>WupYhXe1^GEUS3vRrWy}z
zNj$UbSC-SxlaX-Zk@5*s=1c6n33!`-Ao=+}t_41nY2!a13J|@8R2r0A{&;;)3jAeA
zvK{%nlahbRF&`aE4i>x+dqN1C=;4>8NRElE-nlL>uB&&)hFQ)~yhq%+)QTs;LVx2r
z2tNth*bx-TokmP+r9aHHmTyKQ)jqh2=i$YFM^s-6pPg-4i3?yA&w0?I_o99;Wm9$I
z#ucg<12L82Tph<n)KF9a#8l;6V||UbabV~DFDA*QCak#HB38OEo#^vc%AW}?NR~;7
z$J9^LT>qO2$E>?AHf*wT#|G(S$_e_1W)F2Q-8#+68m95|Dm`QVip)!Bzz_@CY^=X!
z7ura%eY`^;@4Bc<2&X)uo9b`mV1ZfF{<+X*h^IB&3$!^Q(^#aydO8PfegK`CplQR<
zW0z0l4exfFJRV=r=_!{S2}*}pr~)STSB~6b8Ns6bCqf_%>=BUlS|CR#{@xNxuEf4c
zDG%th=1kU;&eZpE*Mi}~ZSgjl3O}Fr<T^T8`-&(9s$#?=H1u_L+ASKDYYI%vNUGZo
z4J)Y@akws4Uuw$;X}<)RbJeE{TUux~kl{Xw0P2f#=RSY*pZx;cG*2cls>bsFYwx<_
zn#`7V5CjFKDIgsIMfysSPHa@AOK&0|Aiakgiipxd0qIEZNbgO0kzS<tUPF<R5WZLT
z?!D-GUESU9?svc6{=qMANZuspoH;XdW}bOQgu02XDp;pGosGQ3%peK9o<M`XU+UFH
z-=pJi`Y*C`C_Qdx(5yJ*@6kUE@BrI!BlzS?|IG;|Wke%GSrqyB@H9v{Tz^u%-Pye)
zLwQXna_ikk0<1F8`pB7Z<Il9I!EsC)vNArc65OWXkvVx^gq88bfi!x>Mc^d6_^-(N
zFG}vq$4^HrA1)vz_JRZd<_Gg_0bi>J144m7<vs_>dl^L*qan&DL7hXPpKJC1I)kRM
zzX5)Sr0iuz+?xjDs+<?&XVqbe%XxW<J~APDYlaK8r5X*dU6i{X0;HxkSdn78b>na}
zoI^ZYWl~QBtCZ*X_WgYSb{wQoR!j|&d(RriS9b$>I<%U^CcHH6{<9_Y=l6(0FEqcR
zH}Sz~b-8oSVLRJ@c@V1CvClX}bXWmhWXeZ*`DPJsfs%NI<C>0vb`L`2d|KH#Lfla_
zwCR$1L+4KDreeW3+#0C*Qc914MJHOvJ1X`Uc;lb052>&;$I}X+U<}c1T4Uo?e7i)6
zk3@sy&g{82L=*Mu_L~HO3o6PpXNm5fx$$UD@J32w3r?04E$VFPf#$S7;$_D(@W(Tz
zhj@k}h%1zN7>AfDRfmUA<o#@cy+j!PK*QEzsmY7SMjR5DIC%yeO}65=Y4j|^5s}m`
zTx8m*w4E5ipW-M#kP!c!2T`5C4DV-%^N+<yg+G{9_ZNI3fhZD}KnWDO$0UI_4<N$-
zRYrADMz#@495P|wiS{JX@1joMUgpm*Jtp%6ZLIy?U@<^L9OGm^6ZuaPEFV6?)gI;G
zukxnHU6oTqA1#J$W4t{vmOUlb4I2mDE8w60>oGF)E7_LL!r({(6Z5gWKSEIOoACTU
zg`eQxvGxh_P|#s}q8B|Z78{^(<Mo<fY+5D7xZ`#WH8Cz-Rh?-X!;@TOPyS~H^k3GK
zo;dg-fRdN)FegKun=M08%9Em94du5X_W&suR~WDbI;Jm=^kIG-=!aEU^q4YmUussB
zp~gj*2fZY`z}TXbj6!;ca`Gl=zAPhSiVhD(1@o`g>r1Ue5N4@^twB*SfMApia^VT5
zS6!#fyz&<#0T1#%ntR`id4~jhss>N=%;b2O%=+kdqmnlTz5<PSG*i+aPy}yAeMP;{
zQ0DF)p0}?$Jb)taWZ&FVf8&Ur3mc2DoT$Qm!ZlQCH?HSqrA0bNgcD>OPj>l{pjOj*
zCqhD_6)p&E*66HST?VN4bz^blVWyr?J$i(E`unWChzCWzI+ewS#qqu^v~$9241xM1
z=uMQ@55niGCNCX^RxKFz9f8(+09r_L$UvR{{x#<-0C{P}I?~^MY5}zqNrwQJ?wL-7
zcIv%WyF>eEYDlI=Up-8Ca?n*4r-#N}!%p))vJbi`Z3WcWqX_}H@A>SoW9yIlok?;)
zrF@nF{=x9Cuyn2AId|o}+mCq2vNH`jZ_;1{ip5?}Nw-jmoD&pDRJ<<An~F$dLcNx%
za8|WYuw4E_tkOPz0f&nl<0EGSZi-+C2p!{;7ef%>DSi%t|H8{aIoJ6@SmgY&az>(L
z|0U`|2Kq<JBK#B$iLn3&6))S3{$+{OZ+e@*R2=>wzt~B!|5H-izbeK5{?s<Wqj)YE
zO`$LI!)qgF%KiQ;0Qnh^KZ?s+&Ay{`mD{8-CleEJOTuVh;ICP_-o(jR_MWJs<&V+m
zQ<#Fy?JLeo^&UQn0x@2Hr0gfQF7_L4oIpiw^@v4sO6G?dF=<{hcePOov~^Sy4bPOF
zSnOwBUc^B<BQejnQ}w?&?Z<>D29>abZrP$SFhE4~mj`$WwxQLehrH8LFk9Ez62D;?
z7_&>^TXy`Md^euX)Q8wO>nNyb0oZJi>_~v2q9X}987xS31nRs4@CsMu0S(l=wsAbh
zfeRl;yy*(AdXmh!DCUBgs0ykeg@FBla&442nZ9QhA_Oqbizqt--q6R{WXod=eLJmu
ztISlrtXVAD%CxV!#dP$ft8WXN+0}qm0B!K)ckG9Ifp$BFz;)r^7lKsr`gz{3dRBtk
zl`p*7k`*I&i=HqAT3>KZSpAGY`refEAKdQ0SfC$y^b_qDssY@IW>Vo{m4Z}1Z|c=2
z5-2Z)#AqdmYZgEBTK`*1L-2_UkU;X7BH*tp5&ol5W@!}Jge{SG*HL>4goHpUTt&3n
zwhIh->^!abQWaOed6GJLx<a9qEoZI3IRa@EJ&dAL%f=|)&a#j6>w0U&P3^*~!cbAs
z(q8Gq>y`7>Xz+1l_?Y-bV%NVvDEQNU{L2e~e~oJXeiGi368M8Q>*TFJa&5>^JXA}a
zr~9<d>DGdwY=BGcIkxjxT^i$(!%>NwW}jewy}s#~BRBb&qDaEz^w71qjB~C3V6#m6
zh2PTf6Ak89QM8}_f4cRU`$hI=BA84U;730^X_g2^98c0nFMECt+5gMPD^cXbF0n=8
zjTNq%gqRl;n;-O(gM$A7)RZYG$DgDHFoRJVUypSKg#b=v61;I)One-2Xz=4?TL1gd
z<o`@c@HcBjeg*`8O_G6<pnk{Bi~FI$NclHHS6v$7GCNF*=KYh+<rzqRWwrl22kG9e
z&72)hliycN^1I`yC$nF_>)KF71EbC&CL(7iBm9$FmAlG%{dp1?;MpbV{k4$(DFQk(
zabfXK1N_M-lX`rSQT$%^(7(VhI4Q6UkpN$DBM@OMIhNAw_oij@k`;}a(u@6H0L}iW
zHYG3_B8$0Riv5a;`ECRa)_8>&KwS<f)Bj+`?7L0=N%Q~N_0K^<`j(G^!7)N0s|h!@
zYZ<Dlc{ojo<ju_B%b$+*KwZd*^Zy@~)zc2in-khgKY>ZA(~I)<vvZu6kV&auwOD^r
z-N%2VdhetR{@!bb^3Jn@x|3B=N^t>~>VWE4YOn5aJgTP23PYY(skP_uq&v_4V%&c(
zQDJmox##RfP>Tgk$vdCE533I>=IMG0ltCyiKhdYSs_;pdR{_se;=Iy7$;oF2`cK39
z9wwY$ySb27@J1H@g_wh%(UA1tNCN+Hk^Xermp=hW0vK|vT3VKX;@HFtEC)~5;#nyf
z)xf5pSSvubDSw&IV>+82r|F%9MALF-fHm&>b5Ma%(k2$5-HgS8(`2{V*Yr_^!lX^K
zUHHOVN-D<AnQaS5$OI{0;R!fVZ~l+`+doag?;*YUwa@zlm3${$f&Y-t`{kziXVfJw
zfEe4yx1hAgP(d{0mis_X#vqOUu;GJzRN$7Iznt8Lu!)cRLjW=0Z}o@3yq1bjObd_q
zm%EAA`{F|Lt_Vee1)q+F>Kr&xIVtY6PJz%YQu{zY;8WqZ{KK!okN#=!zk}@U!WU%C
zzjO)uS1I@R)FFL2H9z{CL7xsnYOyUKl6eP^b?LU3S7*R7i?Rbe7qhX}?;L>!GC$CX
z4KNNAZ^xcZ0apH)ye<4#%qhgai@ixFNCdad2b3{reG2kad!!RRqAAd~{U*gu6w8|-
zyuFx>i~(EAl4iQGh?_We6n9FRuZI0bNa%NRynTWRocM$O@8>XnbTNMG{q)CS3#W@H
zp|q^T^MT7U3h&ul{j<9EA8fitkV#ygPPSChcfELRRWdGI0r0E=`n8Wq|4eX7+KkOs
z7!&}Qxd+XrG+UiON7HACerIWC&f&-@%8qf&6ALCKr^%c;vpOv))#kKhf1HN>ybL?;
zAH-=VA3s0meYG_Euk)tA@I+7Z&_X`&lHp0jxp1wnDOhi7^~!tA$$Le$m<ef02;aO;
z{cM*E$ay{}ixeW3c7A+`KxT)C=FA)C@_q+)J`?RACw-Jpt8_Aa_~KE*2<l;{)OO}S
zvau<N(bq)U?Y7sIUuu?_;|>WpbfPD`1a^V1|GaYU(z%h_H~i)L^O~6~8fkYqUV$>&
z8ZGgqQWH)n)^AC|7wka)%j}__+ws3h;h&riaa7dK?j8ybXgRwmO2S=u9cDbooYW^e
zT)7C*j@v?~x&>##B`2g)yT?Rk5b<N#v@*$~1XsvnZwH7_Qt2FohyNVn|CN7o@=H!$
z|3IUkf9dWY1c83lhy7MG<~Luvg+@j~U*iI=rFJ0|PiY^P)(J17{Gdv@n>`SCAip=4
z_rjbM1SSDFWmW~e=FeGHc=B?*y2_S$n{xVrZe_S6(G0~Xlo!+&GIh;)f4<W?qd9xl
znPwkj`2oOk0B~<yJ?Yth$Mv7%ru<-IxPR=Z{{vEcQlNhH`u91`zX!?xi%0u^;PFp7
zz<qBlSL1CST+P$`9V=abD&qp1uYroexWUu5ZX@Ex`#_&@#W5#d8#ql?p9VqcqX<WD
z!{p4;NB~mdSMY@X3E#!6?e)An^Gp#9<~@|X{l+FAs7IA5^2oGG53tV*==EfF49eIt
znyn51{?wlIRP-C|n7C}s!NZ_i`Lm>f%MYHA6uSM+YW^=z1Ap1`?`bRe+uZd34xw<;
zar?h?{p0nppTc7VD^RS;bIVou<?#AYI9TE-n|CViTRZc2)H5bE@J4<dXU3!r#doF`
zA$rs39tnG1of%>lCfX%Z;b(<%!)_@yrun~`d}enMWvhVTfZQC`_hv6&klg!{@0+rF
z;DUWm=<6l0=cOZ%lFd$bbh+V1L_NjTy_&2=LGpa&3nSiPESj@!mo4ICm0?Sbv&7nd
zr$LUZLJpMml<vIiwVKqhL}X{rW6Y!_4hDQR3%?RR3+KfSnsF~!3y{|J0(~b*pF(1A
z#kL$%DsiJ3qzPfjQtBkKTE#kOtBqkZRyD06WKF`p<6z|{6b9Mi^*0|&y=7o-+otW>
zAT|{j(J=}?96SOU@*El(AjVgUk<Bq53wL%84HkyA*^={%^XG24K$`gF-(MZQ@~Q=~
z52@Z2SZX1L=FY-3po60W!#f$G<*Vbxqh*JY^V@OF9Mzo_MU^3sgQvMyFt{l_bO$7o
zor;)0W)7P-td$_G+q#36uKrTG`cH;H*YD!f_{(<OmqzzXdOow?)x+ff{SIUZxP*@a
z+7`f>71O+lIJ;*s34M;CS_b1AVNwwv&dtEaQ@S@7GP)VUz1eUha6D7T#DUAZfU%0i
z5woBdNdo@pl<A^bwD@tHk>M`b?vmD)qbJVNa`U#J!G!6Mb{z#}PlO~)BB#Gj4C&7U
zWqBwf6!_e@_AtX_XLPu@yYf2X;-0CYrS^oxjf3e`ZZ^Dfk;~FIne?1$vvsngDoG(6
zj`v_A_IDFhhQ)PCOEzzkQp*M9__@=1P=s}G$6~8Y*A?aM<sdX&icFoY&*`~de%aRG
zgpv(~Wv}vNFNZ%eKoaF6>+R$YuTDe5SftSIeo&96toI#z-5_OD8oIK91h73G`lY8P
z+L%0$W9Md88Y9Zy!$(XPV?NqtM^s*gT&X18>oz{G1D7a$T3l!cYOOm&^?T}u8Kb7>
zGvy)}vLTu3FmVKO-8~qn3+46oON?1L6kMJ&K#N^H?f?D->HHB$R~Xh`N&5&39|Vea
zk3}r6jEYPX)tEjHxe*Ta=SXig&GjE$9i6?a1hRRpc73ryF3}F!$m&UPaf8;L@Xe$c
z3&nX|x`2!|;@b_>*A!<Ji1EqR=!(Qa8zcY<5B!}qJb(hK-_BzayWD7DR}CnjY$Xk+
zpgYC7r0&a#L@8Z{ip65IN{TV8sk;JcK18;J<-!pDiS0~1cPZD(0U8s<S;Z`9L(qQz
zvXrXFrCO_Pa)u#WlWDf(vf{F-I{`e^WPtjaq<&S0uzOvzOP=O{p{hz$q7_*rCDR@K
z)?ff*RdkrZ&U*0(wDg9~YV9=Nu=hfee)Ju`I`hCi1$B+8a=4ni{ySFG{*+#^uV|mZ
z|1$0Kr}U=zf3JO<P&eqNG(C_&XLjQuNE8bRv$AoY3L17A_0}DeefM+w?xeTYHNmne
zr(I}4QgWTn@_{8E{em|PCyMGER3pYwmO}fFKzh{yT0Z6>XfE$`&e_}8?*kmHK2?*-
zK)+E9X_m}5HkFZm+8cYXCvwSL%x>zgm=E)0C-bW(k3wiB<O?G<`k?vDrtc2Rqzh-m
zu27Z-plmtLpGCggu$!?9b**~rkGtn7Wqhx0m+r2z+#v~}f7|PqT?w}p^?@(utGF49
zy_nxIII<VuC`Lgw#J^s6=)y$-;meyf+A=STs$fTU5Nw6kt&;%VJsM&82Q%~^9rOlG
zjdBAp>mpCh2b`tNSz-4Z%z8XsYugFQL{OQTbR!n`8_{pkg+|(6(11^C4!*48C43$3
z|BMA_NgWOJeid^OnQaYhzRsd**0?cmn`G&NGVlb9jy#9p%gOKMcSzS5aY}Jsp)zF<
zmOhJl*{8^v?U1p}nHwRpk?c3!nGcjGidY2bH}mTz-;B+0qjGhAtnEtNKEY?5t+62-
zWjD?0I&i>M_mtPkF9OhJ!t=8_c&PcS;2SiiFAo#>FsLhOAEM%(p`wU?gIG8Y0R2D(
z6r*^L44mUCp+BVEe)@pqeO$P)5xe-h4E#Pdf&asH2oKT?pmBLNJOX$Ue{s9=ua?35
zDn%dnl_20R|NE~B27VbF{GHE#oWFZM2f?!UJ`2IQwbIYJdj7`4Hf9}*H&+_5ecg-b
z*3Vf8>}N&PXc9WgOqu$S5N1v>=5`4*7y1nfDp3<LJVKEZ%n;NL;hq_22N=>9bQ`Nv
zukIBJQe!Q6ye_{tp1Z<_sFOh`Hy+fKEourv2Btc^_}O9Z>V4&WHVU*Qgx#v(_h@m0
zcki<4^+~n;RLf7YKja1a2=)RK7mUBq5Q-2wj7fS&;G1Eh#9ur+`j+eAVV56973cJ;
zUtoU!RoS8+4Y&Ne_y2ds0smkq=T8d5bj=~D_8991kgS!Z1$pBa_ElBeeDv_B_z5vm
zve=OXyWUmvKutS!J-{zA&<BttB0Q3hKrR3Q4t37*BE9bR2=%Z7c~?AP;Fbu2ah(X-
z;g1voir&2Azqq%1TOP1dvTH}6?100kQsLl9O-LEi5xU8wiBPB9$SwyMOa#IEgse!G
z$`IOX0Kc$>SegxqM|7$YD-$jLyS5gxQz%2C+#NE318?Htf*}LYfhGYTsVL|-J}5NK
ze`QI1d}k9!>%z>TX6-?x$1L<o&CLFAp<~P7u+L$)lZZ+~w$5JB5$LBXxakonf4O0~
ztxoR25;x7+hVEQUzXw~mN#@ZzS2S{ZSa;~?wXyE`C78u8Nuk0xUD3dwEbmVID&-2Y
zAdk+&`oolgN7ZYh^)sVt{xxEp9k{n@k_efc;tyl`{qv!D2YvR}PBjjJ2M_h(B5-h~
zBESK5^2N^5?)8k-hvg+c35ry&hkKz?GU2D{p`Y&T`sn`=s*)`PQaZkq^7xC>wxv%W
zf9`j^s$jHwwX)Q&eFT*@v)~ptaV!(vzkZ5D%3@Ktd~-pCPrP5WkHD=p249p%-}tHD
z9LL`;{?<zW-WlqTq@e6&VU918!xXu8g}+(mEGPi-2uDU1`i={F1QKAbT1P+;@`PI2
zG@pbr|5&;*#}|phtz_Pt&%SyUtl-<%phyf)IOx~?<^o%pmuJzuxR*zES|&*9Z7h?-
zu>cBoAv=~;H8;Er;apA;k$R7}$NhILW4cRrMSR;V=oRGL&eWjUQ2XAl8$Yo%G`v7L
z$G5Lll5~_c3_%(Z0HCXjRl`AjycWDqzP%1NJ_5yQ0KDmX*T2ZV?;2~?ldL~OlI?-v
zg!3y$Abn)lmf&5-l}PRN)CM+tMO;C8$cj~O)#f=cLdbH6ToXWzqD@yw*vS@UBT!x9
zD$pDsz!r``uS1bHJ&!=olcDeWVH?2nnB(WZJq3d6fL3xN>#GWOT1WWv$5r4U39I}8
z6-Rdj3IL$}(^gd*h5W$u-U1_BF^)i_alP=WGUORc1*H6L74q&@DPtFS(#Y}V5hxb;
zQ1>H{Z#Up$5AM1C`&-f&yP%Ush!eMT9f7d)rZ5hHKDL`^ln4`Vxi#ea-sShI`-)>n
zp#2N&DcL{;k4GL173l`uKZS$j5<xJ>Jg3~g0JL+&g~CdirOMz{6P}!=vziV-M`|hF
zxC$a9VMiU#0l-E)a|XOOO1V+!Oa<+fIs#GMIs!E;d^YkUP$2)3*S6-KDi|01uc1T#
z9>?G7@wZ$#t^d70{?=E2>)pTY$5&kdeolbr12`fbfp)P0&t_G_S_3!)eP+-7KR2w_
zvQ|Ul>r$+HSIy+(X7&}b%T_{7X@1klM;v<vS0j&|mH$U734GMO;|oRJ?l}TgL$~pi
zc5<=-w?+lJhl6xuq^NB1+?ZbQm!!nRY$@z#X5nP?rCsxy8$lnWYS;!h#EhwJIN_-D
zWogzcggY$G%a+Bg$SFH-VkN@6ief42NZ)8qEy~~ME+u8R7NZ^5+1)5#Gd7y^eH?5d
zzg7#yq}-q5<sp07C}~&-<nCT*dE6FuVMy}<Vca}z@gjKy5^+1Pw2$TnNf2uo*^AxD
zm$5X1&#*49nAs6jB^D<1iyda=WOmPLw(uy_RBJ^?cyh1GNZE{QF1-^53NBPHLI&!q
z_C0`p+t9;g4K9slm?=^V`f>aSWH8`6;OdLysLJvr*L)G0-%8ZGbB0Nqo9!*}Hn|uA
zgR@gj%sf+qB{(kFuX|9b9%Mv(J6iQHS-@`fK{-8>xncj9))1wYRs~k7G?ZP&pwuW{
z4zhL?PWhqPPKWNCE4H9aZ{&8pCH0y7WdRYRA>Z`FC}Z@wS5Yxsx)d2sjEeG`J5HB5
zXK#jHZ=M-7zJx8>Qi);N3GaWFlcEX<Y7xnU=2g5gIEO8NH_g83x@%RhvwX0TM3Dz8
ziR9@Kn8+moM0p<G0VZgUF~2l?yw>JpVZcz0KwB46PcyG+1M)cv&`d&2-8z~{j-%h+
z%aY)IhOUy;Nc=g$xS&&&RR&L}^ZGKhaciAOulraj<4#t8>=2(@&KS5jw4fsJv|Jot
zIZR4A_lDvYahBvW^vV~>NpBoa*9;qDhUuA#_PpHRCg{CV-=4pv{N&6dPr23)A@CHK
zS*-mjK{;ij7#Llbc8>@V*N5ooK5fdS9vHkKEKL)md;95A(I8dYnCr6fe6FXZ93A9P
zBds8#@c{(7w7B*F$%3)f(B_rxpCE1^P{}?WYFvAK41B?YF)X2a#ddfPDxM!^JXu^`
zfiBy_vLjma&I6-lC#|%Nut-HWtIPm@I86CXG{+>GcM}8ODW3X!*{Q|dR^EI2KB|XN
z&sSj4p34Vakfeckgf^RqY)h+MOdNHuGRwVruZI>^K+8EdFZu_%F70dp26WMCl)8oQ
za)zNFO!a!5Ozi#~O_l&g)n=xHlZv6Oa(*VtMfw&V-x;m-(gJJWC*4@-4mdb>Lly6l
z)RL9+Ht?a5b5YDAycX%a@`s=H?vOq!DRQkT_98|lAm6=KjSSYN*WVpb+1}JY$jno#
zZtEyF`&bwK#{Z@O4!~hpJPd~zn?5codL>0>B(Fn$$-aLsdy2*;SJ@!&FzEe<yle1H
zd^;9sviKbR4UBunrl=5wwb^(%hLMJ}ne)|nO&D2>;aOP&$h+|Ig9HD4MS3yUp0U9v
z_P%Q|y4<d`;r(Db(-urz@ip)mcg8(KtcdiPo+-_7zLlD3j7sOI<v7^IZdJ8KB0MsF
z8^X2Z5go6gV4B?W3fO%byjG*!VYr0(W=y^0l)(q=8$EX`%8R4V*ccbm-edepX#j(m
z$;rH)#Lw3*so`alcF0+5LM0_$d_Eo9Ebsdctb2EpxqfQqO`I@Lp!-lwKq|%!W`U}t
zbMCz9WMR%=(i5c(J{ux3mNwlpOBPs9h#E+4*lF$k8o_B6?i3wmOndp_eox~Zu>}uL
z$Ni54)zqP8E-p&09g>C_PMURs6qbn^t05eyyK>h8&#bxwG|ab8l?N><s=R-CU?hx3
z8)(;sx0$|1JiKBk@?c|hbuPz7OP`wU{@k^M0Gi^Cjchf0xdKwvyS-M1aLDQOF*g1H
zKd(DJxO}L}yuE&oa%OP9*^-F^V{Xb|knZrJ?JifNgcr35DuE8awy9dQJHZ><$<}36
z#d0yK5<e!pXJ=7gb);l@ZAtjS>v`kvF$LZ+B@UNjT+j7TbKOboY7e{eEW>KpU|K#e
zfFr2*A!Onqh<!Yh5R0rn)N==GS-!%v6*rG9)CQBtRJLvdgQL|L`{UZ21BB#;swKR+
z$Q75O%wKybfBrGW`NEqJF8{z~kMvS)Wt=k|AD`<)$!>6@Us!pVDBLZH(;Cz7jnclv
z%Q+W8B6ZnMiI!Vg>*0dvYT#I|VOID-=K>L7KOuVpzWCEtnss^e#Z5oasS=X=$Jv)(
z(inf_5n#A#rLMokw01j%T#O&(e)@r&6h)%(mHfvBvhvoqnja-|C!r$_jLVbAuTIPP
zs13X0i_FF_D+P&%VK_z?S7)g}bPK~)=hSnB>y;?#%nXY|YZcfG(F)^Da>~}P6H%Da
z&LpdsmFZdkw2W6{oz@7TSQz(Tn6#jpj+{B26Z!DmmK(2iQfJ$}n0>;GBhd1k>EUU{
zQw5yoAHn71{T4%8eZ8rv8BUKb=Hp22XO#Xt@~jx~fW>gm{u~@49O|LE!ybze3ju6y
zbfDYvmBWsw6T-{pkWE&2PORpf!JEk42-dK9Q&V=nBAt1`lAWxV3IR*@0!ewST&IK!
z!vKbYd~{i-4KoQ#f^HG``q>um{;?e$(_I~jsy1ntxrI2d+n8%eV!-sSCqsu#5Ak>2
zDcWvyAVr+`KJ}UmO=Nz}9`*(6xqyA64-jC8gwP?Upa%km&C7wWMIHit9T$xuwzWga
zUe?}DSi(N{EX_pKqSD?7D~I``JUAt`oqeaIcu#SXURBatDzv`HoIFpx)$C(oM5E^A
zNBg6ei2EbcRF6WdeXO!Q$8NyRzpbBm)+6b4t66kyhT1e~Rz0?BV_v)qVQIis3s2{C
zmknsPPF@PUe3eUnKfbs@%)@PCyn19e7R$!MkrCFK6nGdthTA*)Zg`Y--SY9~1()1}
z7><YABgv?#*{m=e&mAc&Lq!$zJffGj`fzf4_Yt<}rD``EGs8|n+7AnrxOk2NJw`<u
zO5EW`Ah~e1+zxiuQE&bXOdQHFet5(Y=%OyNf1}EcU&`X1#@J%eu;lyQNafbq_#z8Y
zx|jVf{91T3=421^u7f~qVgew7l`aG>?5zIw{*J`eah34v3<mfkt7SauHR7v7WPV<%
zuq=m3f~bn!x(=M-QBc=m0p<CotNf+@ZJ3QP!JL#LzXE2<Hr;XwapgXEdO|`Lc(l5)
z+l9wFUDca0%xG;|U(a=jhsOMwqTDlCK3w7Rw>0WuoBddtUPFz8y;KoRVF5OFmxYbs
zL1JJP*brzHNeR(lCD`-hQ{COP8oq1zUf9`<Pf2(Y+u_2lNC`n1jP7>lT@_njM`Bdf
z1^X5PTzsWrwc5?*3;1I5o@&vzxF-~5>&{MeoHnSuV3d_UHAq$7YhGLbh;$bhPK>Q%
zvRBR7-x04LLcsxJtwGZ!j7Z6sN-Te0*3_#&0BN5dQhPmIf`$p&_wtHf>Yr*@Qe`Y2
zqMxwwyK913O7@fBgpWeU(@d%=n1;WW70R<I<Pbe7V5b=(;XqqMsMdy_T5(|>Z%BH=
zBG*t5Q%DHW06Je7LHos3%-icoTuHHMcMYv{171ImR5b$<Ajxj~WR6GMIjwe^rkKW!
zhhP-(sG_7|FJ|g&)}=K+*qi$wMc+QhK%5q`q9i*4L8s1NPzXhzm+NF=S(CD4WTa<a
z_qd2M_3A{`%3le7v=KxNt(ArZ@gS7REDc~aX79-&K9;)?ZNA!va<LhcK^aB``8Jv+
z_UJ?b4G^k{u+J~&ak8AG^kj!r)h>9at1TtfWMeW`WYC`pIJ0{SFOkXFq*x8J#M*(?
z-|@`Qu8*#0HWR0+;kBK|-t$4E9+nKEG{m9Jm}F+EXnxx$+BMNs8~!gGl@lS(%QdBH
z(&M8dsO1*wCerh0K5fE=^`_IJ*;&*+TC$4r6fXFuoiO4Z1>f!&PK~nHjWG?Z8e1(p
zcsoS!@TW%KtNW0fBO0jOr+E3^PpGy8TeI6QI9IlWE&LgCW2D8XT^PE6A|z>)M+CxR
z6DUGfl~}GU<=Sy7O=bP+!hM)WAP7g=8H7G+7ps;3DFl}vGhe;EW94NSS|Dxc4L6&j
z!rU>gGlOyaW75})b*{Z<PV%4dfALd?-Xz~y4jkP23-3>dMh*}T#Bnk;lY-lW9^%Ia
z;YcN4fKl6)?0HP_L>0|HC<7gVa&zBmHlaxE>G7#L-rX2U8wO7q=qCXG?@lXPkN}yZ
z;fm6rSzlBXnm$7~P+$5!jiugOy5wf1tFD&+yON=w;hH@=z781j!Je1haGiv^ly>CA
z`rcGNV<uG&X6AIbi-$))^fGND%LmfV>sONHqtBa4tmKZ`>8VE9Uzv>MmB=8o>o0u4
zpP{!g%Q#;wyC7zjTtg@X>oI!!sAY~MPvF*W3=e9qUu5_?_${aDJ`fi7XWi>MbWMkL
z;2`Xv4Mo8!Qg*E6$=7zTFJ$_!oL5Ccpwq2L4(P)t<6E^yAPP-b+Q;o9P?*zX2gRHK
zLC(K!J@IY_duUtb#=O5}btUr=sErjld<0tMg_R!gO=-G0N~Hk_vO~9ywoL%_S?+6I
z_E>NW=Z=OlfcxlZI09`0hvlYDfHTK>a+;1vMFPCkctxQk?A@tbO%q<rl+xYSb#fVb
zDr46$O|;cpsZc?sI~~R8N1%-igy|9J<~qU`@KuR`#3Ps#VBq090?`1KarFaSY}9k&
zA0Rd#_KSGE)l!Z?A!c`58j)ywr}7HaWeSM#WI5f&Pzo<8#sMk4l67_P7astG;y?d+
zR+dyH?-brYt4dpZdl)_>GplDNB5#J1GJ*}pT=<0V8ArN~?~_m>S^W1DoB_6tSX-np
zkZkZyY%B9<XIopFJDAMMnqg}>R5}7h3%)9}s69Qxt|l^9=a;eAV}=o^9{Srqfo0Mn
zcrAId;`Z9T;RuJqAi0<D`o_0pR;aErV$jJFZP7%p{cft;jQ10+37B1PoK(^L_B8d(
z-?DJ+%jdQlPRHUi^xqD+K35u$QE};^HD#uS^(c_R$b(fKqE>BkfInquKc8|otjPA5
z%q0~S4uzmcTs%6u*a-)duJeoX*#%hd#i99QO}dWSbRZBPh#PfL9r`_^vwRv?R`vPx
z0ZHT-Umy`f4n#WM9D$}5Em<bN<82Fb>hI>klf!!)qZ*{?K??kAgk-@ZiMBXNhW71a
z1GUSx4xEP-O(7Uw+>^$umz`JmP{yKuwdT;1<L9I$;udEt0}?QL)6fG9=!`yeuM~W8
z<wM!lh<Gyj)cdSnkCC1&&$ldj)@KwQQ+NKJ)0BXoOwo;^moKOvomGEc!9(VOUW)S@
zBi#Z<>Q@RFrR${0<1-C!lR;WUu@l(Q$>Bi~k_W11wwte99lFZ$!nKBH-Dg)|IrF!E
z8sm9!`2AP!wdr5H)+)snd4oZPq)zJPjJo##Gc?ciE<6P!PwD2unEZ{;i2;VlExwS6
zkk1^xS=joMl~l<bb%~liKD#RT3;FnR!9VQ-aVPPExs4}8_<8Lam-rq|q&8JAx-R-W
zU{{wiw-|VNV^O^*@8P*3wFz_em@n`D)#{Xlnw7L>6{IG`4y8#d%vNr>pgUMx_c8Aw
zcw~yV%tc!F5|Jz1#pWShrb$|iO3b}HF!p_OZaAErcMsjM+D}Kmdh&S<PXkmXs8+VJ
z=L)-0%cIAaOrGK`+-d?p&no&tHh~o5N!d_qEmoW3Jg+C)cPepZxJz&eL?AK|i`kmB
z{_XpCfN{N(Q6K-!3HX7na8}3``W@?o?*-&RPm1&x$}B$27Ax`!!Eb4XPcrh&o#LlE
z!eaJH(e_ts`q_>n1150t+TYW~@_&B1RPBvt6nLFhp2JOM&t6no!h6An>tF`jnft8`
zw=j3h@@Zz-a8tHb#2xmvvLc)3^QqpTEUBC(g3ix`;aBG8&lEDoSob<b+@U+VR|+x~
zL6^^UVNhLoIac`1y^stjv{p~mjrGCGe&&_keQr3{pzt~u<v6^|vLlP}buo;fuHRBw
z#Msc}r3+at?(N%=emell=nKE%vq6$Ae~-j}QY@2<<$F3fh^vJ-gJ|{sv73?7g2a#k
zuz<_0k+8UGM0Bb8g}XqbI*0d#g&}+uPuAEmGw3W-<IURIxZ8O#!`kTu?hejHb5O!e
z`0@VHHF2hIyCH94In(r=d(FoWyjkuXFNYdN>^APTKJAdj;oS0__4pXYr>a?Vr98bx
z>_IA}YnE}heuIFF0sxMcS)x2wkV$cNhxIHZL^E$ugQkcucf`g`f7lT}`h((fbR$nS
zr>UwbA%deTo1cK$O<6Ghs$SpaR?=3Z^MQ?YqnrLrHWQJPE;Sg<jFp|v*C6w?Hh1p#
zSaTUt{Zu$`CKT`5(v5_)8oPNPX>??`qasX1{Ov|_uAgnUlK*OID^*b*rkJ0d^Lj{(
zovp5?(6TZme!(iMTp!c6CJs0(LH|aomH~YeyYZET*X})S7NQ^PWnegU{-lt&UZp1o
zk-qxi*&zba%lz}NryeNGm!KEhg9bK`1=f@AEgCg)Yr@}6@pMu=jYoA~u_yUB+^Xq5
z)c7Kz(b90;RF{9;xVXzV!`E`|WyKps)K-S~F%jILX@TYW(rc)xu%Z|9uo$l$$_r|&
zA*M+zsRKGsPBkR#GPs;_m?|}W8jY=a36g`qL{$8?huRQc9IxKNWH#|U*ghxlZ87<a
z?4Qza6cvTA5ohQHjorQx^1_RZVi3*zCPl>*4hBL22KLJ0mrC7pkP~AuK}!%py+A^b
zBF}bx^BRifqAVo4x(aVclR#~`)Fd!_1S5!tx}?(GxJySKR1~`Dc4itQmVCJtI!Ob=
zIYe6rufqXH`~mcx$Q0$l*)iz&F5qybpbj`+-!pw+Xv{c;9j|pY$})p4FjckX8C%g?
zA9fG!{l_xp+QmF`<+uCi92irwnIm-G@;3P{v{>Lw2uawcE~&W4SCxiO&@o&Ij3M40
zkz@!4Ibmc21ev%6!LY11Qy1Qd+0ZyiNg5hl2@sEEd`*rbOG!-Jeztj=!Wc$b-v#7O
z*q`*9MHpV1_UmsaY|t+9u!-gFpbHX~WcL}s`kXo9uRDWFid-*kDsBl7wj-0qD37uq
zo*0d+yp)&c`Jg|0;zfa$<GGN4HPUVr&}H>bT;&gu_&3Q7`p2&1?^PHWPejSKkBj!k
zDr5T{Kz<tHuhVM@Irj?v{zK7XstH^nNLE3{6AG$6lY$BbsT*sXcbKw3(n@e_jLrut
z8i{uCPi#snqmk<GBb)h|UCdx_b-DQ|MDFyvFfE6-XJ?K(rK^MiTU`kqd4u-OlUQ<)
zG_SLOr80p)Ut3YA?3m=OAX@`67tlx}9mtG_^Yk$j2f-rcnS`!Y<mE-K($x_Ko5CQ@
z#xOo3DYh%jmzdp%STN}Jr^?3w0#eisPnm(lUQT^S`N=YWM(e(wMmw4_eZwI}cdDD0
z4CE#W<0s+1e2Ovkf}}2$tz`;9n?m>uH}0@#&FEMY%tn*J1j{CwMc|6HyH|%Sd`ZdE
zmKH|kyId9I{GL*3<U{=H4(7eBFQo0c&5WuUDfI@VrFeJAKR69U5pXo}QF<L!ok*b1
z?d#{<Z3$)*N8U}`!!nWBOtAwQfy`z$!BKYaKhY)<j6)PBLwy_{Qb=5_ue(;VrF%F;
UVNY+Qb4Z`)^mIri?`ZIU01kl=djJ3c

diff --git a/src/vs/workbench/services/gettingStarted/common/media/Extensions.jpg b/src/vs/workbench/services/gettingStarted/common/media/Extensions.jpg
deleted file mode 100644
index 5d6a2c8ad549895ccd876d961742e128d86e89aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103983
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
Rfq^gbA9F<fH)niz=r1dg;+6ma

diff --git a/src/vs/workbench/services/gettingStarted/common/media/Languages.jpg b/src/vs/workbench/services/gettingStarted/common/media/Languages.jpg
deleted file mode 100644
index 2f7972525be09232904ab4e8aedb9fe22451ee28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101550
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
Hq}l%i%0@E;

diff --git a/src/vs/workbench/services/gettingStarted/common/media/OpenFolder.jpg b/src/vs/workbench/services/gettingStarted/common/media/OpenFolder.jpg
deleted file mode 100644
index 4f7c71ae8cdd8472f25e2289b0c38116411f8dc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103714
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%0DPhuKX#Kxh4X?(sj>S@9K?<mSkenXAb7IT}))
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

diff --git a/src/vs/workbench/services/gettingStarted/common/media/colorTheme.png b/src/vs/workbench/services/gettingStarted/common/media/colorTheme.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cb8d76969403e7dd8d534104e28169898206cc0
GIT binary patch
literal 48327
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/commandPalette.png b/src/vs/workbench/services/gettingStarted/common/media/commandPalette.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b52579327a4495bd1be3e1bf7b4c210f9de1fcb
GIT binary patch
literal 32283
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
Js@T2$-vG)<#P0wA

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/extensions.png b/src/vs/workbench/services/gettingStarted/common/media/extensions.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad10d13cb3057d1a6db21654cd2a963592c9c809
GIT binary patch
literal 77651
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
Ml(ZFV<)IP(2dw7YZ~y=R

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/forwardPorts.png b/src/vs/workbench/services/gettingStarted/common/media/forwardPorts.png
new file mode 100644
index 0000000000000000000000000000000000000000..a04f070a8a72fdd0a1847d86285c0929684795d2
GIT binary patch
literal 31517
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/github.png b/src/vs/workbench/services/gettingStarted/common/media/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..aed8305f05f2d3b22aa87d5916614a56ab0e6c1b
GIT binary patch
literal 38564
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%0AI
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
S)UeVf@UykHvnsbZee*w|#n-_A

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/languageExtensions.png b/src/vs/workbench/services/gettingStarted/common/media/languageExtensions.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bf613a0f2bad8b83adfb67699688969a24e3dcf
GIT binary patch
literal 85147
zcmX`S1z1$y^Egb$l2X#$EDh4#r8Jk`rKFT@l%>0+kw$8P1wk5@M!G>tQW{i3=|7+E
z?|t6;Jaf+6xo76YoSZo~R`;bE0f-uef`USzp{}ftf`WlSK|zniL4Ts?oE^P+iduBF
z4OQsr>F<}+#>U1L78capwI6rv#eA!JdU_fg8&x!PN=i###GPJW-{|V;1_uQQ2?;@=
z)=#WVOw8%&Y5)HH1F3mDJUkHF=Kpc#*xf&p3#u5SMWg4F<bg&tG&HzoHQ%oR8BO0<
z(|&qYu+=Lg>EwZ%1hmV__hE`Oqkyo7c;MLhgpi=%;Lxzc>(^@P>gDC-a5&uD+#)qK
zRa#m)Iy$<eqvOk$FJF6lgMxxRJw5aD^V!(g;}<g4pUOe*t^d+M`{_aXFVK2|`zN4$
z&@N<t-xrC3s`Xw&S;5fX>UcrxZLa{O>a?~@jLxV~KDOJ<@?*Ouvr#Q^SS<Pc$u*HW
zK8fJ1cV0yb$nt!X^SJHW1A-6$zM9=c_4GoD5l9GmsxCkYCZnJPN0vW*DS85s7BsX+
z5eh{-<V5uTUn(weWMmK86X*jVyoZhdaX!&@m(3T~f^72(D5b(9du^QFo!0a3U9HpP
z9i-0QssH_Q<V^FQ*k10z(Y+%Yd}EoLcR}y!+urE{eG){olYLja{~Q~l#uJ0;gAv9@
zh8sjS+T(vJ5Q-L)KPOf2v1+IbkMrLouW*w_F$^%+fWOKN{kX>-`QwmaJN)=)`8tZp
z|6|<?C*N0jnr*Yq1Y;=r^IBr0ZWXhE^RxLM?xlyo9B2zUcojQ|5c2mA+F$Vi_>X?y
zVXipIhwr7)Ymq5+mC<<$0jaj5b?4hcmX?1*kkBq#ilu5lMVreIJcL!_`L{FeG@zFN
zL!-+djUw`#Lzd)AG;@e=Le*iJCBGEy8MCqJYGiIPJKd5|$n@6wVaY8fvwcH-!^tkf
zH#4re@<9ROA*XijB^<wG`*U#Oxv68CIEIKFjsu>F#H(3wu~XGbok6y-mhdpyaDz&y
zsh|lGCz7&rcfiRWx*g%6E{|co$JsZYzXO$y8f0^{O#2p}!!<P`@yG>QkcVe{^?S9v
zuAcL;!EI~i565{w@^I-B9o<O#T~SLd(cjJRHFBRy9sm_#bb6cYL*wDw`FP<ES+RW-
zjlT2*`UnA~=>9-r0IFAc=^C!8ILro66%8e7>Rfe7)*1%?NqVpk;P_plG*t@2*xN3)
z*HhpHRREUip;siWF&``3@e~G})%Hp^K4mitnn}EYC9@D-V`7zk(gB@rwu`rp3CJq$
zhY63nf75@<O!kTpt%)>vR8B7XC#gVT|A2Yx0MG50f?DS<Uxfzb2;5|63hST^%nU>A
zvWoFNwe^R#lQyN1QlP*CiNE@w=5w5*rCo_9&g-aldC!?(nK6^OH$PMyuHG=S?<g_o
ztnadYUTWCq*RB;f_UNKraNkAzsyJc5Fh+1Djp5#nar9Go<LqsME~p|^m;zUWQ7IOy
zCA@@RX2RGm_t~;)3`jzEr_4PtG7SZF&mIz~_7>KZO0%Yk5ymdNlGPYsLFQXHVcLst
zP!aI2m~CN^2*O}&@IfY9-EI~{Tnr=t_ImJ&sjv9PZpBpPrVbwOK9L<r4!M;dJwr2o
zWp8w4@aRixE819u9rHmH$Mw}Bg*(3)wKP&#)tfhIFxSM$WUB6v)@Uwz)XV&8g;|tk
zknESiC%%0Z!C%(c78P;#L#-n5>u0cZ%a1zWLt{kA?Ej97!n67ghizrB;CHQPf&D_~
z{Um=_cu*2{)`a3Pz{0A&xcs<)aA@@85|CwIET4yNf>$an1y)1B!v)^|9vxwME3L!A
zf*7MrjGUVtq?S$ekKZoR5R-z`2F7(XK|ctN)qZ%?-g4RcAh)KMk}LYv(_$-&F7wV?
zYReOD9UxgLXVu4Dazg~mpuzN~@I@)QP_krM-SEW-B**`g%4y%PMifqo+Qnwvoirtd
zV#cRult^XSKz9*!L%gZqV<YoyAIGIxP2L<YrXM#>95virl(;-eU8NO&5i@w1=-1)O
zWi=GKd+z~BwbNB}3R*{Z8AF;Gle3~~IkQQ8BDHm$N^4Y&9LrX-#|6f-(ccV4c`!|I
zHz&<Cq-QF8MPJZFrfE`1N<<Ne`=T2!GobRI1JzuF93)~_V8O?>oma!UXJMUmG;`hK
zKkly0*@jwTU-*z*Y-Rl<V!-XFOdi>cuC$BLw8NBD5t&npj{Jl=ZFph1STf+u6mhsK
z-$HMDOL%Rl@H(#A+|#;JnL~Q3IQ}q3%)dMbDr*r%-ZU24id_nO*_w$m<zhnznA3i*
zb;GqTw3a3zya*r$%!<I9gZ9$)5MG`nF&r?<YJXLfXoo$?c%-0y72bKK<48XxI&W_I
zZ<2q6fa)YIdY9^<$mqyHKFiujo2Vwsp&}qXUY&tL6?B3?l<x#VsP;elpcCz^)%__{
zJ0e;lSXgm$(Z9n(HfHz85$RP>ow3u6^>Im~z|D8v^%X>ap$9Piu_P~w5u|Y0GNeC4
zY(>s7|7oVgD*85QZ>dLy_1SNs)^+6z^EQS7adnDb!rk-l^`OO*S&V<$r9nI@jJ%Lf
zYEQEWoa4m0v-j&!!DX@}__@7}QpYzd^!Py~42r^4O=KfI$t4&UNbE*&@q7jZTVW)t
z_??nt_HMjrQLbDfF0*1Gqv<!r$jseyim*dT^EwE2ZdT%TI75Uzdr!?|hfZNVJumU~
zB&6_Bn&cU9STGf^YO7Pw|9aD5d1sPY-5o9lx=jNn@}h=18j=?gQ98pBwY2M3dKh$J
z%ARVNA`0rlsudbh+xUTm<SgpX`s5u)D4~gQP}3>)XMv1Zq#a8{i*^01?Wi<Ty_|!z
z-_W*<ueeJigQosl2weCboc{$-!Y&6&q?nyd-+KaPQ{rfNbRU!<p{?XSm>PsU=vt|L
zlIEf>)=fbd#EyPOwp=~ZIRnIqK@W0Sde!n-%{D!EjI<Z1Ke5V7B=*keGO5%E6c?kA
zBS(0lvI0_Y%ZDGh@Sh;vBTl*cX*ZC(7~A4(zZ>!XZQSXQPG1t+nrc0FmtP7aMwz5C
z0gT1n%21+LJOW7mJwJfM<bvo_)}zc<w%{3Uq;5AHcBV2F=rvX&57<9~z_lq)Vhs)1
zSMbiK@?<Kr`kbSW5#6M~#;;9u=MN;g)z29y)}E8TBQWl7E8kI3hWr-L95GYW6r@Ib
z18Smd{U-j6gO_7~1(Be1kr4k%6nrL4cg-9kVEKw+9>H!~LjLbHdZvfu%lTs$Ap6nc
zX74#{;A5kCeCPhX(5QdziP+ggw;%Fz-ICB8<_w3h-MQemQ&*p=FO}FLitn%}ycsn(
zLE)dT-r!Vo?^wyoqY2}F6ba$}<f9hBp7G81FeUe&<z_hH(Jn%$B8mt$&~4$pmoB`@
zfAkvJdxV4hV{rTt7x*XOm8)1r*3Cx^v#+d{wnWDZMuH;Zkh#q%`neukB2)|+I-=ad
z&bQxNB9zV0C=#i%HIZ*!DRuB?-;X{@(Jg#0yj$2f*LWCF48GaSm3tVS+_7%-a3X5>
z$mpH$KH3P~tdNOerCK&4vqa{o(cH!^g(T)?9PQ-jCmkf!(d(NuyLqNV?CupI-Qq)Y
zeAyS2<!P$RXaDt_XzjYkEp^Ht;Ek9}0-)nBV!yRAKOJat28-n;MNBJ>&x|<XX2MkF
z1!=6cH;f(anFi1C!DCZGXj<I8-^yrmkB`^#t!aHoe{`w&-19O?fR*}$JcPklU{yA_
zsHUj-gY`ZlM#4?_hySjd@`?`ak82PITL=x}MyP7d=lP{a%;6Ru(2w1^!1m76<ckvO
z#s2V~yn66rvHd<m-#yk%!cbJA?n21;)jpHp@p{HM3DTL-E-PE3r4Ghd<S?DST_W`T
z<$nDP{Mh9`Ei7-+&}GKwPWT$W=sI{%n6_NOLzMZFNc<d}e&g0I=IjygRop|iMy!{w
zQW_a*CcjdpjQ{Mld@CcOe@mFzNr=WG{VOI$LT{Sh!!nd@Ttxc2Pn#?C>G?hdK%3_I
zV10;yomNzB{+o)(d$bIHY|!{PzS19QaFvXPhnm_?$;>Gf-JWbXi$=GUL{A*XZR%~>
zCbJU;B<m^ZNEg3Ysn5|SeffjE5VNHqDYpn+`e$xX8#e!S!=3EH^NXjQj+i8PyL7DW
zH^Fqj!S`=kTWE=RFg$|%#J%5=lY-#}MHlBHcr*t6xAF}?<-OQV^EE*GJMP5+PWi@(
zK@BCvKu_B*J%W?$BIWI~zmBcyJX&r7#3qBHUJnKm@BqtKhZBzS4S5SbgcW+Le`3em
zZ${Oo+}_7s`k}<nv7Jb*gwFZ8QZi#j(bu0$ZMn;R5WpZ38Ln(e>>|@TiNl(z+^kJ}
zZpPg#rZ@1BM6j5S*>59tp}snETD5Zg3R&GQt@o|qzn$rV$-uQw-VdC+MCoCvK;zgQ
z*eO|-Ra*-iP5}1HtDJx5{6T&x)dIv3P+fN>mf|3h#orHmo}{|8xS@<r#rn(vH7&RQ
zs06AWQNG^MfBk(n{_`L|?{S+m+8mS*?MZ^n`*dj=ocHVD;XN<{Z?5e{<|h#tcs*wH
z&~v5O$VkX0J|4zsZzDn+_Wz^A;C!gcV`qsCf*6c9+B*^xKwNA1goEJ&x8{af9hp91
zkq}dWV&TR#s13pd0KosfQ{YfgP~75XM%qI|Ay6n2K#>_aAI($3KncdcGqx&|3})uR
z!t3d+IV@FE?hN@0CVry#EbBapeu~k06rYg)58YBh5W_h-cGFhWaWIkJC(u;Bp|+w#
z4Yd^Ktv*`(W^c^6s`yCJIB4*y8I1{IP_5(uA;rNXrnnQPE#L*q0}MELoZun^gq4g!
z7eM(hkcXo7mLOogXdt}*1y@Q?)JV)HY9uBZ1tS>rzw|re0mm`4snUTqetv{t4T6W)
zR`=&7awc7_az=3@LKRv3PeSK}{u0m7y2UY`rYA-))?G>av*x((!NlI~pm&<Q%sMA;
zA!7*iXjIWZwVSnZ?ex{UYZKPtt8upKddl8&efd*OvrqSCS<$v^y0#7l&7XZ!=YTpy
zld+c89_VAje0$EqcGO<W?0M<wqS=&Dh$+Bt^;G(d1%0w-q9%C@gEv+=xuaQPUsDBp
z)6^1~j><C-zH1!GI6PQ1`6Q|PZ@Sz@zL#B^EQp&w4n0-(DE_0@TB7+7>aPdxDXiXt
zwTDGKN3KJm_QJm*b-M!vOX)iz9Q!uYbIQ)2NmTUE?n1Zx*_&@|?MirNM6_~ZMK4P6
zljlUGc5=$tlB+N_ChQy}lYh&O>&;wnzHp8AM={QgO{_Ba_O$W-=gX?{TUkbAQDo<k
zcyN3a7CXGiO0O*1;_ap$Ea;3(vqSv#M_CZuI7sJM+uzv^@SHne?KW)Cou@fFt9eoJ
zQE?>+*^5afHb@@x(<8`h+Ub*6`dphu{&Aqo>X&#+hP`vDoBY;WNpw7!@2~D6s212v
zq9R8VX_A^phWE`E^N|vZ>^_+<sllD(L!bs*M?9jB@T;kCTD{iqfz+f@iEgDPn~bop
z*D1fL04hZc->9;VDLN|l(FfjS<k-iB8M`GII5hW4;4P|+y-{yWf8MU~UX<c^QUxty
z39RmJ5Hl9;Reyj3c3bOKf6Z24AHlUs%}DA`D@HkrPkBtIn3i!^&C~J4m3{_VK`#u)
zrEn9jKmI&)95n$qZ+2rRtvs*8w5G#_zQJe|nV?<{Sb;f!k6jDv8>ooO!|S#%;O|;w
zt)qOtWkAc{O5p92qY%gEMc}?3jTuWt?Ha=ua2xd7D05Vtl=V~1swW<F+&~Mc;=`v;
z#{me@a#ShtMV}KmEXwro+nR+lVTw*-7Pa$|repH-eaFAa)voMKl?SIYa;3NTAVNjM
zORrL;z*rO!si>93-YxFv6wMP(*P&w1T&Yl3aRGMud=cB%VEOTG6m180B4HDEDZ~fV
zZhh_Yb~c_wrPb8+rPy6lnTyn==sMwKI+ReD49(oSlZ%0y7(OD6DB%>9@vU&;9?9ab
z>`XjarWb1W8ljlJW0*2)+U3QwGZSTK^Fc3vY~@e;c%fuQ2yrJ&W<f1I?STTMfRz6j
zA^x-K)hL%(NyS2O3MGz?$RGk9bsLd(ojF=P`h6t3&gB?#gmWNUzGc8MFO%*#jjmK7
z+U_;M5mL<763URKB|y5{z?MUzx*3Z$6s8wtAA=9qd>0?SH$097j^#jQy^-U`ex47@
z@Kh~MhC&EDQlDjkeXi6XwV|FR+lHS@XbX7wnLL+-@UWx3#??^f98$us#>`2j^pemv
zud9f}aVEFlMSE02p$)r);G`b{kLl^fH5<l#LIG5!Dv~HXqYufVa{s4Ef}vQ$l)Z`7
zf8fteDb4er1j@Iz2*I|u>a1Ns2_l|*>fQz)Rb)xh>K>NXKfm9|`1R^G^&;2+|L_+K
z7iNTy2KMNPM$H71^C6b<Q5*ZiP5j#nd?5`~zUpL!1=f>DW`*=mZ1ds=zxj$9_^Jk|
z0O#?2(#gY@V<fn05*8u%wZu5t+>`{k=qXBo*_BY279(xM8Tl&}zZ~;Wa*T6b%Ea&6
zO4F9cf`mx!I`W2_;Qx)PjO!c+SBO1CL65z11OLnX=`kVLy7&bNHfe|Slx7E(RTT;b
zoLiEwWc(OE?Xw*wv!_)GCU`Im#?_XYR^wcb)W=b$+#p1btX3nbY2IXqJ{2@th<<*<
z;gAYoA2Q}iaTXcXlH#3zqyjYlhQj7WStmu|KLc4%vjkPJc|SalSJ`@n7Nxg|&*N=u
z(K70Fx8O<>*4;An3ipg^q5Vt^i{9B6@{Qa7^-E;$&!T~Z!e0ixT6Op??PX&cg#QlI
z)gboRf)Va0#uZqZ8Hfiq#0L)ivX)SLD|8BP`$1uZ0Qw}g92WddyEk8Z#ZNPwVm!na
z9kA8~f}=vd<qE@p-pTaYFfc0>FSi;0WkgJgsOLuzf|xn&sar2?AvwYb@nPB;Tb)pQ
zc-<BbIIWF2`cIn>Jmg`!8NL6E-6SdlLL7CIJ=&B1W$RvjKM{3EqAwULvq71Kd^O4P
zdLY$ZSmVn}yvhYPdfcJyR7AKt^C@y>hB6w}53>6g-6dpW=vrNTht_e63Q$dMqim+g
z!thR-xA*VP{KCSSyl0fP-8&Z3`TTX&!iJ|y(y8%C(Vgl{;Brz#FVfE*0PknHIG`_h
zGuDWsX<=|g-cbpGKh2q>@v8*{8bAK)?fOdEUiS)jg#b@J8l}1K!)v|x(>|E=S7X>b
z1Z0*?=TO^Z6#mW+$}eZ@qY}!NR;(~L#PJa}Po(m<m`aBg??XutSpm5}mT`3g13tqD
zVmPisYg`6p^pAizI-Wh9I4rch>bpBWc$iwS%}WM%@bKgzRY4s<<2CClV1rd)%43@s
zqw$XO`{q&iRIkOKszFq08Mj99U7|w8c)NlshmnVkab5&29-Np9^#xGD>W6=xnH)Fi
zE2Y6~p7&Tw?LuI%XYa7YCXSXaDcw#lkvP`ksN)8+rwdJN;hebV>&k3Q-467sB?Gr&
z2Ny!*pE)jP4;i{pOoZl+tc(yS!Fgg{@Jq0dF6zyudMhjbUnYptcxC(h2}E$TD1|gi
z{9<wXYu~Rq0=$9r&nSV``u34(7b;`9ykjNnME{gIo;F?=h?)MjCP7$XYMV&MXM0q#
zC-wTh4NyLMss<10rOsf!KU3CPWa=g=Q1{$gGQnE3Pv4lU@TzA0Ju61-t4a8gj^7GH
zx1wY3!&YT-*#&+k{wIo87vv*sIg^J|CQ-=1)gSOqbS-D;s0_5%kc0SAbW;Xuj24`F
ze|?y7Z}I*q@8#961{Nm021TNCi@shoS~t7PCrbc`&g>cE773|?yiIdGA3vp?mCy8Z
zweX0Owv6V7#<|2uu_I0c-xOgX!wf7g#MO8*RyZENFqrnuN^mR#{zzWMrZ?+cD;?RL
zkuX>jUVwYqzj)?-KPaXTl-{n~-OP<WH9l|IbF}z2uhD;kozHj^a|ARB((kU`P`_RN
zA*wFUxH`0P{hAIw>by6p*4sO1V^1Qh&6W6VADz3d$&WpK?9{^WbX|r~tn$7G|Ewh<
z%88}qWA;yVRn^ZlKE;DrqT#}JTU^;Puu>_aH$>WfsxN*%s0rekUHL1W{k<OeUYE3X
z@UnG>RO-cF%v_oMTV2uf75FW;F4l4JUG)#Pxz)HFR@lwM?r00gO~sDQF5|1OmbpIm
zKrYv%=FIrXedAX`=f=_c5H`xLV5z;@SGWwAE#`0aD;wmF4EPwr9a!-~T&2wvYX5yb
zn8330<LkVwnJEo(J?r5pXe#9Y=kj0{zNP7;Qj%pmedzSKvUGV*;Qa1>&cF4&he%?+
z*L9Ez(fF7uEZ6GfMd+yR8TJAnIwVma7e`L1sWWpZ?4e*+2PUBDwa|HxB#GB?9>Nk~
z>N&w;`BnUe&_YJAj<xoNy&cU}3YR;n+ih+pel^6OuXE={$FCN-bd5EMk{KWqf34*W
z39Z#VPgg#&eYYXy>Ty+zyvRKMkxTD?|LOMC9(k&&1X~DvG|`+)Bl>XOudC`NPMYK>
z?MQ5G+TU$`2NqC+7Xl+pcUT^JnCz2|&rHF8zqB^AJA&xuPT4P9?Z)liVPAZ$Pp1;}
zFxlS@yR^QVU=+2Xj4Bz3{~i3CwWVD(%W~p=(n!x`$Jds9gEf0!<>fH5-QRzlpzh^5
z2?bVgWk4LCn^m*9obqV1(U|>2Ln4@+M9z8b;?vdGg<y(s+v@+4y-gySpF2Caa<y{G
zSg%g=6<vQNL{Sl9_nomQjVu>@>(yq_3u1<TXACdraqBkkY!p(9&2t9x9`k}ZNRvrZ
z{+IwlMup-Z)Peuyx!j*2+AyY?S+B{HWnhw}hxHDQ9w9oR{egT_p|?E>fnta<$^mC2
zF@BU@s!QCW1J~4XGxSoUt{VZS8mfcxfCg8mNpCN8uOgd@H}oWeT)8(aQBb;B`ImL!
z?!xcM=yof#Adps3(Yis$HbHO6LGPAE{AuHEY*r*DGm}zfT|OdA9gsWDQvjg};;YzG
zEO4^E>WWg!zAe;B(|5tZwrr}oj*sxxbC{hBLC0mhAh``&!t>?6X=dvkx7?4_b&N%8
z{%1&;f?y|M+R({5$6-}AN-b#mCk(AkE^KmH#P4ft3J)*e-+f83n~p2?U@bU{IHqU8
z?wkKgCy(D-`V#af6R}M5@^1;>4HL}2eh)oWH%n*&q0Y!D`(6;v5%jucyOls`Gwk_j
zAqts!_eA%j7dgBAXKD%e<wyfN<JV!z#hljf#mf%HCao7{X6})J>fN7&lJ+=owBEn@
zyj+Xa6#Qv2po86DcgvpSFVfjbN2rC%!iib@Y0f|;sA+($Rf9c!oe=yL9r)yIut6Hy
z+ypZ+JOrqp&AN69i%Zo#G60DriV4>_js4k5RWKtxM6Xq>xNXD2^6#rARuNGH6I%nn
z&k6Hs(IO@*nYl~`2H1uK(ewPIGX-W@40ZkOk#(?v!xt<Ga%6xO9zX%tj2;jk+sXd+
z$3H|T|I7`;cyzhmXb&`Xfe*mQ%Z!70m>7_XaDipvXnQop&=!QP&Db%{J5y$|Lp>!N
z8!ml^um-e&fH<Wdqtyk~4YJc@KMD2YS#pH7Ph8buG@6SOs*9I)(B|UL@edZ>t1{1T
z*zUU1enAXXrMf0yqMCStdJ@KOQC!HHIS5BF1b_&6K9mVKP6=Vx@KFF7$_^PWS{jq!
zb9p~oOnJ|qCB1~XqUWe3uGUSkNaBkQ6pET<(-b)>Kx-6=neG5Fl6yb3t&%=}>ehZ_
zwM=E4U$q#`oA;+z;)IWw`3)Rr2pN7ly&#lej6`d3_~W|H<6(zZHde5%A@55sk>(ML
zvbrRFVkq{?Ovg{Y1*Ru1@O=S?eow@+97aAwULQK|P_;btR3!;`v>)HN2+v>E+o4E!
z=9nLP4HrFY>Y=dd&aZ0#U6;p2l@_aJEC)(24%_V+kan7+GtOn6`>2oRnBQ2}WRTBB
zZ_dhNBf2KT_(2MUq$0IN8}UJ{v0lf9bj7h7-0MPkd802=DEkkEfzk(PCG&yxp#wzJ
z3r<q!+?zRiE&<n;_%oV!Nt^r&73@sP{wfG4C~MfDcydk^=oY64k^1u!I0c=*Z1)7n
zR&Yk>kIJkIYVK`ljzZ8VLO2nb6o}>Do#z1>lpc>a=Oyn^t5-rJm6c<N6=`y21Wbex
zAO)!u`0yp$7<%be+JmdRH#WrqA=p?Eh9e$T(looqfcbum*p=EPM&!UnrRn`C4EWTI
z1>SSRgqItUEHK_;z+W^}Rr;v%1?BZ|lN&m6{!HO#Ut4*}&YwVj5@+G#@oSN8;p!l4
zI!W{Q24Y5?Yf4;PQUZ(#f{YU$4W#{|1s<x9W@dz==%#wV$88BN4KFaNT+#>J?gOae
z-D(+qemhQ}fT{La?S|Gd;OF!U$B3(GjBU&LzFzg`zZjRQ`t)Iv`h+fr(EGP+n=_t3
zEc|oNbgXV_0NeZ0K1FX?Uj%8)49gl0+$CCNU!!EUBf>Ffy@ed98a;nTl8e296}@Yt
zpeXWXv?Jo`KKE3sCfbPi5*lBF0iQ3cxZL=NRQ!E1*=I>GNgf!6cS41@patHbWLl#f
zHAe5Icme%YxqT!N!w#k05EXgB1y4Xm6@?@g6O8$5aSw5vmnaJ6jowWT#!QBfKN?@k
zXMC02eu(Ob_>6CRW!`||eS!!C{a)(3F^aY)S-KNCARH<Ssy`B$ltNqDKwRks2+`AJ
z4%DH4<4He-KYYYe%gXG#$@?g*4keB$c0B04;k5&QzvAqAY|}(1!h-IrnVEDa4y$Jt
z+U-O(53dNm<na*A#q^r8?AZ)0Z)0Y^M&iIXtrg`EOGF0A59P;lMbFGx8k5>|hdA-8
z4XHrhJ`%~A!c9s_<Ed3YoA#0=Bm(YV7vDBP2;QfZC0=!+)6oI=e!>)q&jJ70TCGp!
z!fL(jG?HwbD!Nh{?M-KYyjuT!UO)b*ki5c399c?lMr2H7T>4Y@P16Xp{A&5}ahv*h
z+Q5P$XUT<gnplqQ1^dve$z;Jhgu{(p7yT9@zb>-Vb?Jj*T#t(GyXZ*JU$@~YJ$lV+
zd@X3%;`h>x>S1UGYP``YA)tW8`ez6Q&mVMPU=xBAqC)7>#8q^A=rPBk)e@8}BNYQG
zJRKWY4>sNnOMu;9iUjCuXQ0(A*`WeB%a;jasPQ8(6{{J{JAB}iWT0F>R7DpWG?z?q
zOry2VR#q17g05v#C_8iic_zc10sw2U9daYC_|uNXmU-U0qRO3hfiu-Jk@sk$c7&r<
z$)1pmKGQmlx)KEy0wJ)x!}pT~SfpPb)20z5V+i0`3&JLgI4yQ31-(GYz8OZS-mm7e
znpd<-3{c0XU%mJo!C8V9l}Vu`o(Ju*-JB4DDA1N;mn~At{4Q<Tpv4~i9Snl{J1pUm
zvjV97p#Ig*eL|*DqU}K@qMBP}pb?d<d`Xc$Y8$*9tHQdbArk9!dYjm){^Iw))yg<n
z!@Enh^RI089~Z4EIXyVmGQ->aAUWVZO}{de*O6K)Hh!{3Z@~<={6E7Q3_i||B)&uC
zsdd_?1=zg+Kz^`T*0AJYxu4TWe?eC(LZkbtRt7N~H2De(oNf<<h4I|4&m-Z>NE?S-
z7O<ZXB-G>;HaJ}ZOl6<nT|vr-Hycf4##70SkoIlG#RBgdeX2h)Rea)<BJ;cg<>}6)
ztxo=-LU6)NCbtpVKM^r#Yx_d4nBRR=zDeKO&HJQvzIhH0t4!=m3$mg@bUwF1&vdF^
z|BGHzZ0v&gm7XUKUejBLMTSMa5A_KM>Y(H|JGw2b3srHcbk2fKTRaaCf@J)veiwCl
zF4-*op>FSd9`+l-SEzMu{q^r_fWXN3VB+!!!H7=b?}O;O8C|D3{n9|A*V;Dlru5$n
zeI{>A!a#u{JiHe%<Cu5x@;@HCGz+Lwm&e;Dn1wKysNvsAnN+w??+)CRwP5)J&=Y=5
zT4`p7qe0@bm`)Oam^@oQ<BDuk;>wE)wuFNW^4q1(t~~+0Up!zm%xO1s1TpPLSXZNI
z79XOHeim&&$<NxJmBv;uNLcX%^4Rir$J!}SPLa!Rp4M;iVXg~WGoH+;9@`|gGAOYh
zP!nRb$!&y5V3?Us*uSrjrsSMv@J8HdK-acnCpVpx7-aJd+=MU0hGCDGu8G8o{O~j3
z;Y3s+uTh>7ZT6d|qG0^u_V3G%A<C@_6>KrRzU3|x&#$?C?dUF_SKf0Xxa%(T%B}S4
zD1co=T1<o@7<s0tWM}~L1G-W$6ZI;^O-m;PvS5xV8q6$4G4d}JX(bTDSxbx+r^O=5
zsUPAJ6quYap8Is9h07c4l<J1A<54$NxIX(?N1B^nES}`p#uT3rPBOs_O%aYiLV9i_
zC>3S*pZ^yBK^j$z&a)pa0YAKM$tz5<mmVLV&-^F_KY7daVkNokd)NL$F|xWTZC4!b
z0Z;{hWKae*b5rU=4ZT-XqRBaL359UzfZ_M0(KGahWLzAPF=;H`P4b$%B2p@4gy2@@
zn&Dhp3Hi?%YRtr)<mn%%D&t%{XoJOV>Q;BQ2Y66<*nQer?1rS73-#HwX+L173Ttvn
zAXL5bu;5m2_<sk3e_PDUN$#~P=^WTP1Cd61PltN<dqdYwFHt|hI>b8Rm9?MPH@FmH
z>Pskh@+TQW9%<u?d)#|N=FBoj3G7U4@jSiOuqMO%F!6k1(tI`<j`DQlDko%IX{9HL
zfh#5<2O3-mzKblpk)9vV^{lQ)VQyVDQlt}ORvAixI;CisDJU_Fn0~VJh6p~77QkE>
zZBY9`sTmW91%7z6T!N+=(`hAD@^PAMx%@pX{`+R002m#<@qTBw7CLV`5cNwB`OqPb
zvmgN$Hc922Sytrf!mu;^U@;`Y6H8H)C|_A6>Czp^B%RWz!7zpqhdNq{&cjw?fom`<
z3;VF-kjsZv;Vrd0An@5<d*JZ!(9@(EI^ekV^|)N_ESv89XR^CcD+qgmlDW$Sls&&<
z-g)=!!?RbCh$vn6iszUMzOSX1vy!cU9k~UKdOMGALr)k8+D~Ku(oxuc?T}DhrOS)~
z<y*{X0oYbyMxx-iH!;-;j_rZdGBl}S9kq-<Kg0U(ONB&n`Gp4@#PeAnv4QCkOXsTW
zS2SFkmEI604utHdDYA(om;s1Hkt}wx3d%G{$ah9b?WppsR|3JxifoB6^X6)+L9M|q
zps6pAj&xq2Mi48K5rkV10xOAa75uKXzY{`){=BEsojnG<Z(i!&M7;g+)OeSiWGMmi
zgupEyRQCrZGqD0j+B0677SH+B{bxYvw!Y+8fPFWP-Ag*<mF{5@gyFcP4jqM!{+=E>
z#cCy&%m=p5IpS0@k&tfJejiPMUBvgjUhL1X;4)l<{^s9rPz_oPt~r-4KU-L~+t|t;
zNTm>lZStJ}K|Id&A4ElA^-pJO47TEVxw?09KM3{fqK)`lzn&qa-(~<SC;WI|ABM=d
zI{N5l!qI^FyG(;BDfs@X%`D7*8|OGsePlncXDst<z3T+AQSQ}ZzwWGm?jSKp+t^FB
zz(m&{x?q4|{9@G-6TpdkTZ^+SD}r<Zwo&R4dz5{|<!E^2{BzgzK)u>vi?DgVjkXd?
zrqVGpVa-ZS;5Z$H#)29p#`k1|v)KJh{*lORDYzW_nzi}w`xmjz-|tF9!L-U30%8ER
z=@}xe8g?Gb%vRjqmy5>JV?mW~nEkX)2y=?ySfWtZOCqL1F<Y2^)(x_9NU2yo3l>$3
z+wV-{q=ibAR2*U?EP4SLYMU|gEd5Ej%^cyxkPJV;QZs+!@KfWq=R^t=uw5f~79qI9
z+LEZr>?eW`6>MC;UqL@+?(rPpV~6v6uPV1GSi4!e2n_0wL`cE|f5iBtKh3T0Eu$~h
zm3fb`F`4B~5kl-0DjJOG&rT6b_Gy|u8m^a8(UH@W7}pZ;GQ%-Zh*KIVBE_riM1{lP
z@HI`^i_#^n!(Q6MIBI6e#lUKQzmG6S)V*x|-OP$DViirLf~rrU7Q2-vB)H(sX)H7s
zE8md1NO*-tZhpx}+GtK{G(L2&VvOA(Uwq>`y`*Gg9bXwZa<*ihPYUk0HG6uBc#8|n
zo}YAWbuU9z#x%`BJ;BTeZGFriqXd7qQp}|F%^)c^^=tSWE#8WP36^0Q`f~Fx$+gRo
zF?7J*&~oz_M?Ud*vVYw1z(H#L^XzWIl!r{Fi>^CaY>Js8JY=9ucW36)HAG2liY{u)
zQ>il&+1lSGZ|hghWDN6+Fbz7d*38>nDQ~CI325B7@=fpe-a!Pf@(PEB3gRs|eXakx
zeGLil10EJO8vA+!qwVFLLdr@%kV2llvicQR8ik3cX{7Brx8Uvc=3HOb;MXsEL2L6l
zm7%cmWzR)|MBr{Jz7F{X*DbqnFvO~0%u(jm`8#rX%;yr(12^O{^I4~G?Gvtpn!tj<
zH?9=-^S+UNX4Zo@H`nLydlLime#ka_T{SViyFWR*XqN)hQru-cUtP@a)6|$Gp~Op`
zib^YBS3W`tzpPXB|0{Pj@nz`EYRtA3s!7@`dNgJ#rOSt@QwkMpjJD^`X%T*Z@4uRe
z5{VpCHKui1F-$p@sWYpX`i9;8D%^Cu2t`>s`SI1*B!y76wNpFgA2}(mcT$QUymf-=
ztj&o>7IrxY66ST?ZxjSym(sWpLAAc~EGA#|ZMfmX1vWv9Iy-TK#~_y|V954h0WZ|2
zlaN^@P4Ne<{)5|flL@U#z;A*#=K=4DD{GaV*Nfn7X>o*$ecW@k^CqoD2z-RlTa*Q2
z{vYYvZpS2pP!v1%gW9+C2muV&#7np5cp?{dpCd+%cT#E10@|FT;+1%}31JM)pE_{3
zFf-J_K99Mb%mP$_yg;sfmZ*h)rhCxp8X6uVdUT^Lv;}TSO-KQ(kQ*1tQ%)3oTMy8c
zqqKcD>EiYb_V%NEq8j$b(F1d&QG~Xdm57xOSWR+<v>GweBKNKP{$cc!nQ*ckxZXE1
z1AuUSFtlkN<Ee~6v&t~ad#7OjEJtjqBLXUepm#?{L>Zd*@F2|SIbK|b&1vY&*6SSS
z6~A}}rK}94jAmlqG6Lb1o}*0U>5V85t>gMl6D3hojT8HNl#*_rJ5e8Ax8I`I(7tk8
zY8a_u;e!7$JTW(wX;TsX`(F3yH2V>WrU&Sj8`Tloe2ufG37*88Yt%ShaHU_ET+{^P
zfsyQpIW`QOEh~Ep@M=s7`a#y*jX@XUshjn4bIfXtZQyXGF#F5Km~g@Ondt>W#X4=3
zcab96cX$?(Vv>YXSQPAnV#@6kv$~SqVhGUU*T7<eauG_NPI^o;G;s3|irD5ALNNZG
z+MC81jh3$bFg(7{i#>vMNXk6c3Q^OtGeJuZry=CJ=K#W5hJ#S{h0^v*H$#3ExrI%<
zye;jXvBJl2eVNyveeOY*F2(~V^YS&FCO!FH);KDh*13U=6{28YczgS)2V38glM|!U
z3%>@Zd@v^>sx&a18R5vgTg9?K2xD8Z1u92C)igL;*bCio#@qFD@c?`7@Do*<p<V)H
zAWlta2Jo(O?*sIg=LZaBz9Iai3X&XS`Az?ghy7S9%`RHuO~Qf4Fv^|=?BP<+1SS<m
z<Uo@ilu4XOw>XWdNMh228<FOv@S6Q7;2?nxL0p-d;nYKLPyo{MTG4>$&?qd#lLI7k
zC3HM+2Q3fynr|dIYuEtK94&aArtp<yqqmhc2Hx%VcmS}#VSz<)tqOQiqj`gP2s&rM
z*n@`3>`3pTd)SUg!*EX(jp--*RK74_MlP>QFq1>pFW9(~Pm23#V7ICFAA>1^;&ZC)
zVr*k?^cN5)Hn<ZHk;Gb8%`cvN=S$Nogj{A@AcQv?L@=_BeC*%)5*UBR!%2D=muaxP
z`a<j9>?;o$MB2t4ETWJeK<-cLz7Q+5D#ON!h}DgaW)c`jxrIKB2r^^O-wAc{E$SQK
z1i?YD$CWq=cbWbku?-RUBAC`FVt}ypfDgH~d@{>?`yFRN&%>t)baZgSx$ssBk#gP7
zgIGwD<{>wQ1ou#kgpnsfr%pPZemNUM@9!w;><ZjP5tQPd`Fyb5C?;>x2<3_>E}?>d
zq&o9Xj1G~yliNY$#@>LMe;1d3lWqRsBzG3^L<?x5JW#RiAm#QzYc|<U>7EW&{>+cU
z^fT2dfys;g?qkx^FGC2$ct~uov!hUV(J{ChK7i>-mB_ZVT!*0Vb$(J&R<;r`A{k1s
zvn7hI6IahyBp$6-dTbRxvIhdUJ#>M1!ci&KMDE?<D8{eHQSm+>R;>ob+^o_4>ydCe
zFA73ATC$su=Mo%YFWMqdS(Cf})3nU7`o;uUg0arc%;}j`YDm?TWR?Qo5F=Y7Q7bJn
zTEls*^Z=Q!$v+EDu(A5Myaf5g%R;Nz*`$PXQQ;@2plGKF6nfzpN)ASFtK?`6vT09L
zT?l=SyQzI=1FNFw7y>h?A;f>a)u$E-Xo`cEa>IWV2HsABP(DPSy3__E|25jnUnAXo
zysSI!jF2{Rh^U!Rq{{8Y?{sz|#5^^`ez5Y(ukl|UC>PMg&Js)$^rH>z=K`e3_=tQ=
zV|yiZWB9ch1}~(|S1Phx5L|=c8{GPiszTV#W6&pYgOxtbNBvrF#++w`viYwrz!7UP
z{r1J{rg37;lH0;pE@6P#V$X-6CVTA#Am<%NN%y=%mqu|Vo76kYf7;yU&hNADBlZ%L
zd1XQ>Vr~<0g}n-AtAfQ5VRkWpKqD+~nx&_|MDl<{fIhseUq}}NAOO|mMFW%yAn_*z
zXS(9opy5eDieIyTkMYT-R%(5Nuk{)?2m)<|^FL#nzrc_#^3vEg<ZaeY)BvlK4t`?q
z;qE*`f%o?KW*8@$GQ+*0cGG4f6><f9CyN0n2?T1%UmSKdM%m@+cnr_~1(^LKpZv13
zu&85K6ey~7b$L#L_%~0b|7|zkaLQ?izsd5>^vWbSXGmggFOcWwG+Nd9+v929#O-lg
zplabYvFrgWG~U)D-EUEw*eoD23%~CaC5t?BaK$Od*GUGE@`o(u1vyYPPSUuWPY(EI
zx~rc|+ZH_xZy4n6);QquHZVq`+x)^!4OR{j6d_T?6bt?g*Dy8XkY)WMEf3-ioBvZk
z75|(|=?o35L-~&C^+iTnwM2w5MCShYx7_k?{{n@WRWy^k>qyn>4Z7s`{@s>a5ItGi
zy6sq=3s_@ib_(9G%E8GOr7Th5v(ktWsZdeb?yK>DH2ogsTYfK>NTbUSSPf+=K~toe
zdcw>+lUeR9OO4E<?U9^Fvl_&f83fmyHnrLWAjy0gS3nQw-3m(0=zeQUAh5O)%yOkS
zX3X*^?bY`ahDPn!UZ8p@({y?YvbyuR=<>38da#+zBQkx?5Dk(QoX*dB$~)}ZYkG4z
zG8_^>waV5RKMKB}xU7$b#H&CO&0Nk$eURKWljQA-+>r6a^mw(=$eEL4nNcIqXg-3$
z$;ql)i={?lbo)(cITKu!<6U4%rj@Nm1#K5^{S1vML62m(L#A$+=mCN8^o%dnB07&Q
z3O5x*FC0SL<d})3MY%)rmnbz=aEGyP>FbVz_bg!$go%L2-?BMs=dNj|O?d0FEe6ft
zEo&5M5oYF@1u%6qSJ-LrNow&ZNO05l(+57+&PV0W#;bb!NKp#DXbD+4IRic4z>lN;
zC47>8k{)7IbcrG}b9{6@lb}!e1=baMo_IIf9{v63X)fi9w4?VU-g0fKlX|yy4}D3c
z7HoT$?@T&LA=9HbRu!Ztn(WoSFVXkguM|{5a@Gw9zx~q<^?5LoTtbO|EBo$u!+RJO
z!>+3BUop;T`@5U#)UVBii!D==oba5GoE0>!-3$k)9y)ggaxUXLWsgv+P*ei9$Sy)R
zw7Hi*7{CLsNr@n59%nVfvB0Vy%*KNmux_?%PHjl7L?Co`UtT};L+*5VWHzczZ}kw0
zCkf@yTYNw0u`JrI<aqj5ljf+B^l<)ns!BP}*&prC@XcvkLIr|N96Q>2CE1jRVhAOh
zy>Au%ahedWo;*HUuT9q+;BYN_QCs6!u*VBGvYGx#i}tho9{8}W^t$jX4jj|XIr(&8
zI13ZWY*YN5ZDs)3>Ce|Zqi94l$@epEfPx}fpRebiV720w1ySm+#ME$$lr_%MU5U)#
zX=<JP(LHI8Z}wf4bTI`O5GNv-e)bnFSmgQMbVp+f*hxz3?6n8_<^`^-Z!%vvhm${;
zTzAZ<*lTH9508(%!&QhgT1L`rfd|a4NYD2MFE0st@@u%r26q^(;?Lr8K#9Y)zk4<I
zs#G5FGy1{onPkaZAGgK4!<BcU2v)8zOhzFH)dza|)De`vRUMuP@#$>fpP#rn^!t6U
z(|C1MI(s|U?`_W@kt1%<sJPK)+_mj(zyrR;$6AB~N<1^R=Z8?@Y*hHp>el^nj4(&o
zaJ{M-Ck3%IrkcWGEI6iUe-j;mnR~Kc?pT-JV1c<9H2w_eufmKFYMv-s2U;&NjddX&
zr>ISZIfYs+O_69|F>KU=_;rqhpr&wzL!xgPRx0m*+qU6DJ?bzsMdFS?%+#DF0(Qp%
z9{0?@w)RPcZzfYY^Am(TOh-Z-BpTJeelY}IRB6)sDDaCfITNx@P`(i}YkrY4)tj|+
zdJ<#uv3J?=GT%v#fOWb~RzS2$p~|U!xmsejuaAn~YRy^?ipe<YKM?YG4TU`C1glfh
zY3o7Q;PB_lx$<G&pi$Vs5G&UXxo^+k=H5RT%}hwp&IS$QkAf2cX?0j{qrm~HCocXG
z8O0#N48m0PI%X!s6K|1rheSoyn=WWxZLRuGCLthB_3ULDWd-t*#8~5;#kiUv@ZN*h
zy_<z)nhVZsF>6BAx4ie8D;Db+XvFw?*@R{gEkkZ@v2Wfq#CZAqJ}~m~-<x`^)*$~D
z$+N!Xjw93>LD~0ruTd)E$ubv<cc_6JTNIS+a4;`6K41#>pQ?-y-wCcoT#OAXZataP
zNqD02(aZ6H8TAy*aaB3z$a!=gunlu!Nn?`;1uwcn**Gp8l)*tNCSgCrZy|jOHJ;L1
z-$a%=Lu4aIM6PH*%s0G%pJFt3W#<()n27q^1ZBal1uan@vQP}q3q(ZY63KKE+B(g<
za;%^j4}47FoL+#c*AQAz_TTs}vPJwf54mz#WjkJE`taI~_@=gLuNk?;kD?Vac@fu3
zQmhB&M3fbAfm;U!?W$m+G>A&N_)pY;*5;(NF|eNv*zghuLL{0w4N23(lK|nyOOV}J
zD?yR^TgoX4UHUgsVM4_(7QcVvK?FvYvtl5=e2f;|Bslf2PgvuIFS1CFUL6$#pVmg`
z-!j!E7-GTAF=pS*)6%)|`|f;Qm_5XOC07r^y;h7Iz{|8qWTMII6@rZC*y8!-^&Y~=
zwV}n8#XczT;@&@w6CQ8`eB6pXV}KEa*CYVp9qz%|mxSE&Ic@0PCeP;eqNTV)2>>!k
zup}!!%7TdjAeGnS4s%Iwm=k#ys#E(V_mJw8*wmWdb5ZU-I1hAm6>79{`$+%xQ^xRC
zB3Y(JdT8$mv<OSz=Or_dCesB^|27H9mSI<~KA+%a_^Axy>4MH6A_{~@8xg?kh`nj9
z10^G2e>+%g7Kxb{X9a0_F<3G}4sx-DRP`%vaG3u)*_l?tL|n$d1iT%Gg@m2EsOqvy
z8%NyPXnN+~)R~5u0B3p6z}n62?l^e83bGub<be=-Pk|sb+w7W-h%|gk4C~dgDRh8<
z;cs7&i(T?UUsVDp|CsDYjD;<d&;5=K&LV%2+<y4}b)n=^kOsqL9&n8>dtog1C0ms>
z@uuZfDtZ?QYsM&YjNpwvJwPP#7j#6~e60|=hnp3{OlDITHU!dA>j`_qhfc9?S88a_
zN3k^D-Aa_cIZjv~72XkL)3sjhN5C-JQ}=?p|3@HX?Ih3^ICkm#ELL-T-~*Wke|h?&
zsFmRds+POb&M?!cO>g8+iBzwueiJSmy1Nt(CVR@wpLbi0XW!cH_U1Vjqa!jWVY_r6
zQ7EWszfmF5O83np$){@R0q}QQtW*3+HW#7bV{1TMGv2QFc*qPIs;!|JX$75cW-OE+
zDNmtg+SA8al80&(V!9KTHRA4Usn`Oy&g6=b&)$+TLtj{VqQR+;YO6}-=A3FYEI#fp
zZC5L1v}4r{Nx|NF?Cx<h8bWGcFH|rg;s$*2@s6qo>487zMH1OK;VN@Vl0^BQwfUQ*
z9#|iR+r}z6Bs5W*e#JUo&GCR~y~yxEty$mE@mP+UmMAkT-fmU;)?jD8wEx((KxRaq
zQ`lsZTOQ%qjhg9A_Po>tkkrY%Yz!?)vn=Pn5!VOQ9Q9tIWJb5d_J-9dR)>=BEJ~!;
zgGK$5wKIqf0t<RG0<O410LeXy6GHeo`NAwGb3_AmiInR_&AMAh>e>;1bM3d89&Xz+
zQ@<b$7gQ`>O^p)WLL%8Dqoq(pU(XjOPx_x<u-{eGHno|pOVbiR?>?=U9L67b?UToR
zN&_tRE@Vq~aLn*8)jU$ISfIh5ThY26^azn_DJg2OuuA^`vx)@jlzuanq@i)A<^tc7
z?K!xSu7?g}^qb+qIb2&TMAaB0nW~;M2yH%6>Fuy!WB-a}7;w|R`Wb9D#3=T5s55@W
z2una|$;$C4)E*sp0W}O$Iu;90K3Vdum`#5RCRC=z2GxIR*={o#0o!H-ul;<}D}_ip
zdxP8SgAD9_vgYxS!pl@_((pp61c}}}!~AFV`n5vR_>Rpvb^S`i#+`3g7D?%ZdzTNc
z9|g{r&&w<G29svY6()KJzTa4Xstc#52+gRf@lC}*Pu>DB=g#>c;{C1n>IXns8JFc%
z)}20jEao}s-GcNVkMokul?H_C60NGG?C%UR3RwB%&JK?5qPD2M#^Kuaxym!L7r{a%
zk(ryIPG@(_3L>0Q24jP@ktgTT$wbL_mrCTHa31Wn!iQO4awst|peC^OkI7EQ%1<OU
z4;b|WU#ZtJp-heM8buuzj8r_5Y<10!;5w^Ic-dnOqu2eYT1UNo10?#aGRACLgI~8~
zq(-yj;P$IYG?c(4*~`^tPrbtCSU_nD{`YWp(qBl|YBRO~37Yf?HG&N|6B_dy1GuI`
z+L1oFnh<gxWSWyn{)ftCQjwEwS8b~XcUUOtSN}aVR9%uy9A|F-vl*))TN!HiObm*7
zlOAJmKR41QUrXG-3m^EVEsleD=w7R9IpT1se{*EbkBMS$-D?_oiXe<YzvDYEX6)5e
zz9=G6$czmX`H{5kKj4V7h;EEZv7Ik$XnM&E(R0B@O6DXvY<xuuF2<2ZlADC<nKE^?
zAIv4=P$8V#^ejSYHbB40Cg;hYxKgUmT@?u9sVzym3m#;;2DiIV7#B4Oc@%5BvO~@;
zf34_wG(YX=$EB>EX_q6CYXmGw0ZhPR;p2?W5jQ+5me$xD<yY5=N2>iE0%2uX(lm0w
z(GIH1zDt#Up1?xSCI848`P4*5lyDHds_eE6r3QtEC3^m75|*0JNs>{s!7ZJs$hbCX
zb=hPT94SF<O@M+4C_@E}7ms5>M+rlH<tC5mH=$^7+st0g66a`*n*Lg4eh~kHn_Gcf
zzSf*EnK4t*KuM3xD`*BSg_f-Hzo`@%HR#7zi&tOlG#vS_1SdAxjegW*urbYWW>}=^
z6sX+}$6&y6N0T^rVibtPQ^i>)Up^1>Sie2Ju_wR;!h*yb=<CCtWON0-Y^EAGS+Mku
z=6)S2b!bDsnQu_tvo(2Hi=s8j{Nc@op4g27<b;jc<^NIj)p1dM&-+XF(kop`FC9{f
zbSk}EdKaVxX-NSoDFvickY<6Uq+uyZX%<B~1tcV;f4o26zkdIn8|U0PXXc*Q+&l9;
zgA%+hFFNu<ssXM<MvkJeZwZiyU7U((M1&$z=7n?QkMh~Kn!aa()9){TYI});7}}=W
z*gcQ|>O2<7N5sQrr?xPx)F*)3wAbBUZ0+{sH4|*kj{}Nh117Pvfv~gxvo@c2Dyr0c
z<_@0uIfv#$AGswt;tgnI^n4-SCE1qBY!S__$r~|;msM3n*M8hY#Tmq(|AsYUBk`Fe
zO1xe(gr?;5P+5??X<1QL{Mpn&)nHC(+@<DrAB6CDLUONALhj3H;RnF9>zm-sz#B1g
z;Cl&LMt&;ZGhw8=tX&ERt8MCcLZt@<1M5!`)h0H>*Dxz|*DR(18~F`KtEUX-vln5#
zZ0`jjO7seWXE^wl9&_`&%}Jp(>^59TwAXDiGR0U*-%kbSFB6CcE+S|`n2NKz;muZk
z*jp&uB#8qMxBcz-d;Iv--)IBsr?9z@ezev5%|M%F!P*rM=6Pz6E=?+I^un^_ZF%75
zhBun56S6r(P}7}7=OMPR-Ios}R5SUZjS4$Xe=gwJ=d%&eYSq(4*YDYtdZ;{s^B-+j
zF`2dt+3q552We1rdO!uJqEToi14?F(GmKary#Kah#7!mlUc126_JA>xU~B#YmHabV
zd$`+dcU>AkvAE3*`pg534_YQC*nQ~C+-4i(CReV6W1yB6PA?7Z+P@2NlZS=$U4E}9
z4ZKWIrsm_vijjmcCtK)cMPjExsch@$?TM>5_b*0YqC_4UW|{xlD__XII*QQ|-8=r?
zn4+w6*ZGr}#0KKq=Q+$!+F--5n?0L{1+vBYg50G^y>KXhqhM=`jY0ne8{m^t!-Q99
z$How}5#HmhzmMD|S&R@GKb{q)n3kgy3p7{%i8PZ7a8XtB6uUi|xDLOfFrEmDFIgy&
zuB+rI+}TS_{Jw~n^y;y(ic2{eVC2#SfT7KaVj-N%OSuF{|5&yK7vF=rg%|5Mv0a5{
zIQBnvh{_rcg4s*DGn{Hh4y4hOFB~hfqtTiR@7ueHbto(bh93*VJBGY~sU>_s1#v;z
z3jXZ`?PW%NFf}8|6U2smVOA|6VZh}^`j0zY(6U1SQiste1b~;20n7#0UxXFN_T+6e
z;;ai*sm%4XB5KSefLgMHRPtWGs<Zux*4(p$(0<@@e%%ulQNmbQT^oW|y-B7nh7Fy<
zg*StsZQYXWo+%+komi-tZhbXeh<46WrJ7nq5g2ZWVD^0THZ`DD?8AJpK&X)c5Fy2i
z2(xIj?#SVRx=s5+P)S7W{%ET0FkCSaVkCL@U^z}ce3cr7djo5Ee{1V+McKoXAnAP#
zZD~b!|FnQdZ!<vzJnvVmUTE|3?M~s$l|&=@35a-v!-aID)g`t;q7-$=hYNd_EOJ>O
zgJxgI1tSYkR4Dj#{5v*~7Hjg%oF3eEPm9Nz3=(&<IY2i+8G6bZU_Zs!OcsVn=}S$L
zVKbp{sZk(^W$`EWIJmpBCDSlN!AX2}UJ4U*%BKGgE4C9N=P_k{<wpPeD|8;LgMX!s
zIkGXO8C3>UQVhyX#kVxG0kLP5Nt!dsg-O%d&glV(nnsJbuvKD-z|CxL{CAi#MI%UE
zji_|R_qybA*9Pe-^&-62uhcP4ixuG!@%d*iqY@!~5;z#Xm9H9N@G9|}jx|b{S&Rfe
zMrlLCCpJA>vhw!QBTo!wXRG1eKYbO@Gpk;Ehw4bX3Yb1Uzy{8ijj@+wP=O+??c${H
zzRaj81I2xPBN^?+s1{tz-buZ1clpzw9TMzJG2}QE5e%g7)5Ss<)Id;$M+r}kS(vSh
zLFtsD>sTl%#LM{Z(Q(QT6RdilX<UDN^L~gcPF}YqV?r5Dj`|ljPvb5^@`(GP{eY{=
zCwHZqXSpG^HguCtUg1r14jIKuZ|H!;UVlkAeK0mq=_*9FWE$=rT!&v*`?Pa+b0a9y
zAs*(0_V>)Ho~A{#|JdzrJns&;`t|Wa^;>yaPHl_T^3EU5ocmR>Phu+p_PL>5M>v1b
zl_4BUlh=s{fd$RBgDcPq&V=0K=V{7>@nM5J(RIIU1D;}mQWOd2u$(3JL0-OP@--lc
z17h$jz20)q0NBJG4A!H4Y>C4!q9Bm%59fp^BVG*NtzDt{6xkc*46ugZ2rfN9XC9!M
z$E2Zk4qC{!(EX9<ELR2;vX9uRl)pQsa3*V}<ChGyRp#>ablt4`QE0KRUeiNYEKIIz
zzdP+`Q#E6L?Vu|tTm$s1m<fghNfnpS>(!34fxD|_<Wb@hyc>0XBm*Z}73WZ`4zL6b
zTTq!QoeXhwukKVy1yDx_Ma*GUj3G|ZnsQsHXJ@krBHr(O0o)&+M(tNbUX{OueVp|+
z?HSgxdg9FjE7h*AJ*bk>Y}TT1q_9{(2Fm?<8ib$aX6nwSaYq8oOO4}Hyx>6)ywiw6
z6R+BqZdfFJr+=2ASUrgq%XLWs7alTvfG%H=_U!(>(E@^5f_zx=&O%jo_*etAN|jgn
z?9SyVF-5y_NQ&12&f`}7=z@6Po$1@I4@NhBLHT2NFyR<)GN=W}*?MF&S-1zO?nK~{
zAOnvOV}(XaOke|ZA$Zgl-Xs7g@&i^ZfBHzcJP3O8Pr@oqFlT)xDwLLcByP&MBKhhk
z6D)Yys6th%XU3eVJGPSo2%t<&uOl^462*nZqF&M?wz*J;Qz0qD(Kl=4s(@iGJ&+~{
zFLK>Wsd3`je@)Srv+%TOQKm`Rs5%OJI21ml1h1hi*{eic<(7oMx8?dEg%XaVL9Os^
zJcn=ac<v|di-TaOk6%M+SH0xA`4kK9Q$6kn+<UtpmP@{cN+SJI?oPbBwNiiRBi_Ma
zvCCA%)Aa3dRR;ulg{?&~Xd;Xa;SZ@-enRax*)AEPD_6SN$p$pC!87H=y0}mS?X`-H
zNQK7GqNgmgoG7R5&>6xOa-?G7>$HBH-N~Z+7kc}}?$i_b1e|;YSkof7(!Rpb9RB)A
zbB`WculrI<2Bp2Hd7#zR5D8J?BY{t}T06fOSBx<{C)(7e`7WYH&-8wMR1|dC^i%FN
zPHaU6%p4SpcO;3z4GE0Hhhj~4Go!Q#`Tn3~+!J>^+c?|2uwn&fpUTwe+<T`%G#+Ef
zE?72m(L>P}O<p*FIi)TJ9RnVr<grb7dn^XBiy`tjmC3|<SpjNc^zI?u*Ipxf#;xPK
zh@E;NW>C3^sl93=f>u%3tV5pCBW&@Y5@|N@N*%hONy6PpJmjr9(xj!8co*{=`(wXZ
zSi6*&nY$0?_Iq{iL2*w5;u8n$O+zg{49rl!URgd7g%eAu^+m1e3)(2%I6iZ-AgQ4A
zJH0#B3HOL6o0{P@zg*OVgBg5eBupR7|5)G2=7A8uN~6<XYVXYM7lY3~SRJ4G!Yx{8
zq>*0;B!5TSerf#Z+PCdDBVZ@R_ri)R_xDQT2l$3K<oNTqb}^gjNwG>f2^RNR{?eYm
z7k{F^R8XsCoJ5CuZ^xh*P@`3z^0{561je!QyMb40p+=(9-P%uQ9~OFPeiFm|OP`OW
z&^T7WOE_ds<E~K<b2Ofnm-l~mm`+}WvDp?xxrVXr{@bZ|8rINLO0X!OPbkbfrDpG^
zK*(jd|D?K4CPV+Djz2DHPNn>M1l{6=r4{$0{~^+wc-JTJ=?~V~M!%)yx4x$#SKP{C
zo6@bld8=_v$8Efee{664;k5dEMTBLC3OD_u%yS@6xG)H}%MABS4RP0;KuG#%*<VS#
za@z`jdHVC#C*ienrdaT>(Ioufk3U0rzOcEVxqbs=L!ORoLECLuefjQAkU6^gFW^Li
zr*Zc5!3}&^FfW_M-)Fku2T5}<Y1X0fU0I@2glf57=~J<AxiUK4gt}yuZt&U@GV9a^
zsf!?$?#By>==;bYVMNgz#E=MLp@fJ3a|Kp2;TI1D1XktW6`u$d9%w7hpfnU&;N%`S
z=<}y*j`s~Q$tx=$yj$OYf(i19bKi1M#vXYeO}IZr%+?xc^fR2Z+$~UuAis*xQ3PG^
z-{=Mpp-iM}ahy4vDG||Fko!@Q^1MpYZ+MYBdN-Kq0TsQtk^c>l`RR?&7BkU(F0(Sw
zldkGGW2A_nBqsSroZlId0<okm;Nl+lPWZnOfD_TavD=|8j*X>DU;E^44w_WueiDAJ
zAw_=s6@JogQ#lI#dzmyJ!%`l0^Pv)4+>1HqimC}CHnMjc@%>D6fT0gX^WFt0-Gx5^
zkKbb%ke<*+Y%FTqjQn-}l{5B2E(h10KIpWi0F`{oL~=S!sCD+2Ar_TXXj_djrh!d0
zcw02)Y!l3PxXN=MFYXKJWWAM~rLSQoFPZAPkoS=H(d+h4J@XXoM1@4u;@&SoaE(}R
z$^b!t{p@^kRm2KQfDif+JkP&)YTnJe_|q#5^^o4Qe|Md`&}iCMXu;y=L!)0U!=FM}
zn!opnRYOFXeDczb!N4?=?w=aKL_wyHIg3hBT-hcrRU@DxsjbAUl%}uBuo<>;)6AcU
z@ynR1dq0`)NSzpCZmr8l$GPcLB~mP&H+pty)5JC6#dkTzY3jh^fe##nBZVGglSoVa
z42(#)jQ=ykZ3&ivPyDS(Fl8F(^{UcRBzDElOhCpKOKM8JQyUUf)zs*x-f+)ep5cne
z>q9{_qfa{CbN1*u6S<VXcpptK_EJ;5OvT6>mB>piV@GyE=h#BQz7qaeNd7G;CR~EQ
zp-TTzsx@}uwk$S@apdPHgY9sz^TemiXKH2~W++dVK5G6p|McvrF>QVVsQ(J^yWU9^
zxc}AXU8$|n=VGYG$mvJG&b<58IH~wMVYcb?YqXPo5nf-1h^q<lr-hGHSgZd!gK^%_
zI^#eyQW09a<qC)E^&5^OWGH<`eI>XaKM3>j!LK?6-tuub;)UuL+wVA6IQH`Y<bN%q
zmO+}i+iH2)N`%@k?RJ3q%nq;92Cyp54U_H`qP1EQ0CQ^VSph?DhatX#qVUoLI$Gug
zP5oRh7eYN7c*GGIz?biLfD$z*x?slQkE7=0v@WM<BO%VELqAG+N4c@!t!L|^#xj_`
zH=La4mf&)Cd%1Q+KF-gyWF?U4kYrMQh7T3V>+!eW`}nw(-(f!2ivT)est2FB8x5as
zp*KMw;%77(=#Q;Ih0^eRC`uO};Nff5tUGg6_I&B*%3Kj6ZHYoV0hJYs2yMe?2_p%R
zma(+NtS8k6SQvNvc%50R%7vs>_5-PnA#~=x^W&{c^qhQKnBXXri)0oW%h__8=I4|X
zp+NLgXG;?mzyr+uyu5H@hQcPvlg*6M!<kfS>)QtfrPo+6uF3k2hhdy57@T1q*U?a;
zPaLp!L?4!C+rC?qKsiA!hQ{<n1jzhqZp)l*zb?8LP=i#y@8RaGz*M8muQe-T<N^zt
zSvl1H5)2$a##ic{!F!3=4-!GuzAN;=hH@$o5o$%~O2!KkEAp``OTGMU3m@dt@m4$_
z1O`Ds0Sh+&h9Tc1UXfi5&kz`(H{a5ZSSyqb5;NIS)-*I_r!N{8w*8)z5+ZSj>6!^`
zz?r{(OTWF$`sRx5(&O;#ibqNc{{1lKVU^&+SjLwVW|9)9;<0^(2hY4>wYm)q6CM*a
z4G_lIih)T~n(>Jj<9CudP~&gFso}~dHv9>$d;-Uj68L~9MBiuy7Z6YhmLQ#sbDZ-o
z$`QTemPU55yisovnk;bx2$s&<zBFFd9)IkRKQ^@^fW|bne1Q6CamA8ow=_mmcxy?p
zqlJj{ZXiYvqc|hH0X*>)D9Rx{qvgZ>O!are8)-sR%rdvL?;UeK5~Sj?01;6`ITa3c
z4plg`O#}Q!b(~{mxEVYUY52lrjsqMYWS}8KqAGb<fULZ*(5G{R37s#z0b~INX8kx5
zjq7?dDJzL;qOB|$3^+rT@dYSs$y6H_d~7{{w$=;0hCxI|S96Ccd@%eRJwz48N4IoO
zjAUEsY|7nS&R9<KdMuRF=2O{_30dCiW-hx+k5mc-K$w79xX_nQNx){IK+J<0@#BqY
zwB|S7xamu+ZffL<`fj_7TY9vA?~W+yOaYX#0Qnl`#3}{1pzPaNZu>{ZLh?*G-PMqE
zd1x*nVHIksl*}2sPi0r;j{~6%Dbp?V6Pzq;=g#o<f*7j|<^KYQ;CZuKe`2rBaIziL
z)H8bS9IE2Uu}%ZfNQ$?Or`1WY8yWE`8%4T&vu=$yEW8UZyz1K;c-FP=Prmu<*Q4Yo
ztc^eD^Vah3)}P49Jvq(aPCA??Qf2wTgyK3Q_Vebiu}c=7EGrKcd(Ea9(^%T#ZPsIK
z8YZ#qZEf%J*~!TX+t1Q|?}j&4g|Ji#Pmy-cSMbO*6Jf_x1@W_{PfkxzFdpsyHNWQ?
znRZZJ0#71wDgHEcn~%UXs3Jq&X|v8e?!(N1ov&!*%#-id$-gn;Vj7q*f`@O4rGLyF
zzX>2fW}Gg!xth>Qa*D)I|9d&lJz1Cj(;+Omz_0w5Wd_CfnT`G?9ov93;)@Nbl#@Ba
zzoJYX%lrI48+ds8KOsq=>oncO0X>c5j0&yqdgc~D(AT)oyApH^_L3M{<{32>Wss1R
z>iuI(EWdBn*d?m;n9gKe&{V5;T{(p5F&VTBiPdHQt|bsh9-#cqyfN=CM=!z7$270<
zzUI=)KYilTC<$g3i(HXR_XGl#KE@TzUG!V5@3Em`u^pIEsY|Tpxqb&T!b!n=RMM5?
z$iEg{gRO1&1E$hZ5orHfQDtI~!FbR37sr~q3lp&OM<OK7GpDGV930FB84xTqE(+gh
z3h)ojW<nJYci+;nlbp`Zfk}91<*-Xf+;C<f*(rNZe9e~3&+M2n?v0HJF=qq^a1M;)
z^9?45WQmRGVMy&^$vAu3o~X1mJO?CULBWxOYWzm>y9BMsalwp&ziQa_1S0M0&_~zH
zO$2TM9S2Iwzm<BioFDoBO^3wgejrc$gahGlQWPwlDU+SP1XrvjNx(jXLTwqxnNY|t
z#F7LK-~{Ib57T|Y6=fUE1+PH1ntO3C<7P^`a3b1g_NiWY0OLJ#=OEpu*d#lZ2RJA@
z51?u0Mmz>>DGh(_&gooZ7}F{HU#H?T;$b%TnE<47VN5{^GYl@91=jW5;EM7-0SB>a
zx_N<}IW!rMT*`8HKY~*4<?41?uef}-7K-1~Q<cSU%6`A7?^Yxa_cF)peu%m{2auq^
zmT+^}xmmZvIp>^qe7+~3A8b~Y9t=X=KhEtTj!!YcDp7#EU&Hd-CsBB`1G|zhyEvCf
z8ylsN1F;`+JAcwU`Mq7o8$~=f4rjmkYCbj?g*7}VjT{8OfqFj1Czw(Rc4CFxW=s42
z-c@7GbafEw8b3P>Gxh|o*1mllNyV3X7`)~Iq`jY!yCX&!UXAv8c%U<1(KhrqR2oaA
z|Em~g+4Yoj_hQ|1+2K3-9548HNE&(ltD5Kb{iD=Ro<J%99RALtkCIr#b^CXp9a<;+
zP86)InC3PAO7fPLM+!c8H1ZfBORuA{P8FMScpgk7+Rx|w@+x<zb|sKK?t!`_;_BCG
zblXL>FzsDKl-h7)H5rn{*v9l`5)*O5>In>RA+PM@(szzVqIwWpA>Ms(_jhjAehbr=
zKfSz1JD!x3I~w|VKc~BmGZv?`&DdlI_moFwRy0BTp8F0qWcx+?_b|XohRqnVEVWWX
z26x}U(@K*jnj9af*PNVVmH%*A`f2FIP$*3jyr<P*9-txRW89NRHY)cSk(7UHBaJk9
z`n(c??OJ9I<`38h6)F)YiJTa)z>tY{ff8M(^Vhuyjpyom!urc$FKL8BxHu8EeeXB-
zkaTN3M8{3c<y>fVI0&Uo6taTNB}7lz`FdlO5~@$PR8{@FYzYfkSB2MHQ=!x`1*tc~
zv=+30-s|d1eEwH@KXM2#D`QVN{B|nr<d1^SMqL}-nWNTP9|VXz*zp>}0*^Cxf;2Qz
zc}!T}-fhh#d93#S8r2r7`?RlMC|+c{Lw!hoT~T|q0%N7bL>5L*G#Ks`W+532dlQl>
z8Qj~mYZ}Z>8DoU8jcgRdsp@Ivn`d4END-I(0agMG=|3<EX0Mw&@sq)ZTk{P*Cgxk^
zT^ibS;&9<nesPd&&xeXwlx946d(iPoXDn*}^k(9t1hSA2JJ!x0kGjqB`G+9;Dz;f{
z-q**fytRLok^gRYrP<T?8l@D{oa;`!_fT{}d`Db02^Vgr^H{*hdoE$ke4=dsIuiWq
z(7w0|GjuuC_nd~W6si$%1K$oYk(lCQlGjgim`E#nnMT2n;q0#^j}Ch(skl$`UYTb!
zCbGSj{*oZ>BR%(oaR$9opds6g<9u+o$ot$07E`jaOp6+QVh0&>*`!muJJZ3)a$B_t
zp>mfN{Z79jf>=MI_B(Knv5;FOLY*AlnlX8Q+&-)0AVEj1uMzOh43azv>tHKN*x_34
zUyC?ZZxw7=rqyXl<ny#SF6L0%)FNAuQ<G}KqoLQ>A+M@KI78g&vp=Z0e_Pe*9?|tL
z*dz6W@yD?GVDr#^yh)u;Ez5b~ccvPe!htnXEqTQuEhq58hzD($rs7f9U6j)8{7{I!
zIEOIunTq4%M)Rtf^5e;z-d!gL*n`+f*Tfg!m;t)J*S~)k=6GBYT_hI3B<ySnV0)7`
z=T1U~B;$uslWvvk-W~1Q<lp(fVuL&r+I;Qd8eZPZ$(i!LhD*WGUwhgEiV091a!+n9
zt~VYi132=(U+nI}g+u#%Rv#pPBU;`t0xQ~^!RLP;R3Y4>eEl{Bx!jyX{#1pP>82il
zVvlH^q<ozN*ti;7GB$s+M?FOS2y1MTUzPTuvW`&f>(8jAbWKhcRi;gl_Al^Xcx~no
zLy`y@w%c*X9@~|{Njxz5qXl;-*lDL2<au!hMw<IW+1g$_^Bhs0MJtjU{871tmnM9q
zR$pN6nYQP%ha-|OBqKb}Qa&Vv417;$<)-@PmR8Od#SAp7(~t2BvWc;MlI}B!gbekr
z)~5fBh)mVg7JJzykLu{4w~BUOqZEz$z1y*kg_O4n&JETJpP9&hnWvV<4qph_P_bx+
zuLzZPMgQ3O(%YIe{(ZcvS|c|;gFNt`APOzJu5R&=Uv(wK-is&|2URGSJoQF_fFtTh
zI7|LB>z6{>S#0mwEZiEz>DM(cu-WHS?Y)?L{UX2pmV1N+F;rDcaKlNZhMRB<zl!nV
z3YjDMgXRdMd+#d|LG>jg-@FmlcGh+5L^!R)a6E21;)V}nbBaS?^Pi-AfF@IX0_P`E
zv`(%jP(uUpVU8n`2DEU250tH=wnY){yb6!R8)#+ICG>k|F0A)SpwD%#{I5FRorY4=
zFD^x$o>GH$v5-PK)!V~5*v=t?V&~66bF;{_NXWOM#x57MQx_Y7EYn&mWvU6<JTbZe
z#AVs^P<D1`HQNR&#520ZoQVVZxyXJVvLF&>^YRncN3?1Dn38oFhqc|7LJv{NrAWRR
zn+u7a24Qa?@Vv2pz=b<$T$l2rY8^-`fCb*IrST)*i5CmT<kJL#vFauNeDq@njGnX0
ze_6*+z+QMYB+XcJPFNA|Ff)zfV&KvqVVM?Eq~VGX;om2PdLwBPA9#DwyQw2ueaf9f
zc&-KTM3PvK-v-0WxB~C`x)8U%?@v!Z;Q{3EK^e@{)bW@`H~Y=NXU>T*p-*DRRzgJ5
z9q(BJ{ji*vRyKHuc4gc2o2`Yi)G3sMd>4;@2x(!NrWQG&Yc1-X;brehZ8ymP?d5=j
zju2^V=fJK$++>Oe=~vD}_ilD<3Lir<nkwtlw<x9N)O=by35Zig1P4o<@GBN^59L52
zq+9}}GS%4xUPnUs^9zvu2+|7#X{2f8#)Gjq969sYq+SyNKhB%~B!7ivV><{t=B0e%
zcG{Kk1V30dGAdcrOvZ(!4<!GTQm7Ho^_R%Q2CVMnpmo6~pF64#+O+;%(}$b_Jq$ne
zUoHp|g&nF9M&y5U3Q|#^qxTXhf>~8PSXl6L9PVI5G=tL~p^KWlk%&D(YDz2$A~ADz
zjvB2epjdJ=_UFWIN}ybCoYRyv?Nb^y2?6S5VQxrqq+AZuWKnn7@)){2s~-eoWB^x%
z7@@O`SFiDrBpMDn=om(Pa8d#{eXulWSYNGXjUITrRIpqIh9|l!?-Bu5$n2pwjB(n7
zFcMxATV80Nc(biXqGAec+zWf)?;?8gWMfAqyT>Q;ql?d-Kj`PploD0Bh}X&<W$Ld&
zD_dn{V=|qX;*g|FkaLwS4#e>8=q6|XwBE8$L=%UYj6;^V-gU{s>kf<}{=4Z0f)IRZ
zPUkh3TT4Sv{>rERd-jag;EP6(A=SIN%*{|MC6h-83Qs+aAG(^%oGX+-id+Xf(b_+5
z%f(Pmw3i>OdYcp}ZmRZ8A}JGGyG8{3!PT?tV>(Ba**qL$M49JL@JY->B#b}H9D<Ga
zVej3d8DvX7wEmJ$wPcO>yGN!Lw;=z71NmLo!dDE1pGTurIRi|9AL+fSEb?eK^Lo6^
zct91YO-!gwRX<HhcjEG(Y;f8YD^+gs;g2rNAqc9}`(>2MEnL$fs}&dWxMBpSWY;mP
zC$}DX7M>}$>@g<6kIwA<Fi!bU!rLS}VQAn33=3xP;OsTlaH@5m9H@eS?T-T0Y5^G?
z1A4MbM|8>?@|ov5mDe}D`R^?=tdr>}K@&l#qB*NASg}!>k7G$Ex}i!VBz~zT%Uw-m
zz=tu`{WmyTDl6`N79$@&?>c5nUGm}})xwLmO~R0jR^PjPBPr1&fc6z<+uhl5+<_YK
zgPmKI+S{bhUe*^>r}9<oc^LKCL-Y|v4(fHyE2@o$DBpK16noII&%A~?6&WL(D05!g
z8p@i_8q8j-3bk7cC*o$aFYe@bL&HjV(AcczoVAw)a5tBCeU+}*c}@ga5c|UhAAb_y
z4??ry0bc5J?$9(e!B=W?Y%P)(-%ZHJeg4jeRj4?bMrzQ`sus13YrJ=fW@uIRBY>#b
z=(7i4L%0AWiNzZ=DJqOL0T%Olk}nx`I2Kgwjd}b*8~(+=1@vTlZvRw5uw)PiNR9)^
zY%<oU(Y-s1XXPKoDoei0h`z+JFUXGF|Gqx&2jWv2%oxa8q2=m)P;-%mHs#j{iA>~q
zFm%R4WZW7zWM9@s%aftmrv*oF43VUi`#y44A4>kZ-&+7ZeH?G0DM+PJDfZluI3+yh
zW72TJ1%jjC4{fU*rR*dlI!RQSQ{TPd+bA2KXma3tR6Ti7vfqIb@R^1xl`winIW+0=
zdD2HCyR6y;PK3}Zj~oL!DYY!_FQMWS;v2Q5bao*XnM$;i=osz5z@wi_<j5T0^1S$@
zd96Y%yrKH#f>+4W-D<DitDszeQta5eA7X<#p4wX;OTH4^oQ)nv#%X+-5h4tUsx|#D
z3v21tmBx!^1%1i_4e6~9cpVV2{!^<lKI@t?S$rAdWp54!<1hcsd`K~_l<zfW^d?=k
z&RkqhE!RV|{)D1M%QSB^Hz0lFF6CHwfa_@BLONKS7pdfA=2I^t^ZXb5PxGmiZsgA6
zRi%0xnD};4o!Lis?E<=q^YyP2k1Jn|z{WN8M3MDE>9Hw&-LfF(Ur)TBVLESB|IR$@
zo;-p6Qt!O35?g4$8g&PL&%f30;jOVTfBoE-?U%x5huBszmIJG;RXb4u>oz0Oi=A&1
zqQsN=APXlYKY#O&(FWeD;5vtiZD5PF|1C?)+uyWDKmV2o&$h{LGTH6_;96}bKa}0i
zo0EKeZSlXQ6Y5wxtdu@mV~5nA)2^HvbiM7e3K-uYYh2U;PsZQ4sTe04KI16MS(?<9
z3T>=<{)jkb@^yMNqy5?~T4w)q%afp6=KYU^&M!3*PFD^%Uy1bbbZP{Dt?21D(v)Z7
zb+6pzevu!}sAWBj`^?1KzzhV^+<45ir;Tdgd==}*lz9EH*Pmq<kQX4x>%5I>uiJM2
zh2QNK@LPeP+3A5BTmEOZ&+P+orQ}Y8F}HV}6=E-6eghuYKpiV^d)}lmOzu8;>MLDr
z4<-Tm0QG8H-7g)tw*K*J9Pcd9oF03<#oX-P3b`O%CJ*1L{0+VqTF|z#oRShlLDHcG
zGdj`yKEU5drLTwT>b!ALF$VML_Ee1sUk3T4EM2J4*E92U&Zt$|*&csfq%jlb0o{V<
z_LG{9Z?wlTD(E?*&T2)Nk5oV(t=cDol3rVB<Uoc0;CQGp6d!|Sj`_Pli^D%yO8_^$
z<wYpNZqAP%V#oHOWkSBod~LRd>s9Ja^ZEsoJFoOjs6#D;mS;X@eOmcD+fqXXTwNh;
zBu;GLoElAS3AR!;fxpOiXG1vCC@Ns`s7`CkAXACk3thMh=h!oT**T4bP!)3yaZZ}a
zi`S7f`|Y-LZGTXOhGUc!RU7>bPzX+Jxc&Rry0Q9?2*PP`cD*>n7e+(GTHV@ys7r8Y
z%?4~#dsSOuhfMReCHA3X<~iKhTSPCr`rH-z(3$*kT;i_x^i|V6rdj<QmO*(yx#Nj|
zzOf_1x9=10FQ2nuJP=L=k2{|g79=*5HpobKpq4w-jQ>CA^sj&X0TrXJc&Z+_=fo&g
z9Q;s;pKm=u!l;;XUwpvGGLY}+NCjR)2MjW!<Vs=FUY+)sHy<Jzl5{qz3-KHzRLb$v
z-NHy`tu+Y3RL2`o?cc58Mq4`~`GRlQTG^08$Gd225!8!8xfidU8Oomen3Uf_s??WQ
zAs~NZhQs@9kN9R<N#19MKj*Bsqdw0JUBS}RjMw_nYpOfJDTA2qveLkW6nP{c;w}A}
z2nq?-{0EuZt&!?6g{!>OP{!cc%{Y!&K3PMd^@M%lgM*~?zZfV4`_N4aAuZ+kI8%}3
z`juU7-KB4^zu+UdL2;-c-#=LQMrdRLGcx+uKpw*<A6!f}CuIDe)`#|=k{4cm`5B2$
zQqW%#8xE$oAGF0M=}yBKvXNp9cZX!*o6d$Bc;E)M8x4iJRbuV_8Ylf)^g*O7WV8XE
z>AZv;`FsZyp5+4q$s##Q+((HFpYo6_#nwK{-k>w$5ACytFUTSrUxoIV;tP}+K3C#>
zm$Kxa3QWFZj8>9r5JNpes|!r1=%5R*bEx05+(imYOcZieRN>fmo`Asid2Mq-QGMWw
z0mqhcuhB$An$uG%e}|0=2-?~myel|Q13Z%6ecKEN==>*~7NSq^p?KfYEOi=~y5Qj-
zA*^K-WE(BndmHgD$Ouod(AH7jf}1>QJhXkJ(7ON=awx>u`Td(JQ8{K;awK6{scjp_
zGY$L92~rPy7+jZ!Lqahs)MvSyAo}4Y68y{ywgdK`!~I7Hujv^g(tesn`{A7!s+-cC
z1YYw4k&|?vU(5<`uaIxi#w{f>k3zLz@#86>lcb<tG-O=}Z#xcUli5(mmjq;0{=%&|
zvCJ@BNM#wp#-2J|rr~Cv6TIeMu`J(lTR|ce4|7W#GKv3riV~RQt~!w_Ttuv(7CoP<
z7J5yr@G*wI^jI#G7uX?$YQEi*{ehtUha61<LH*soJY<jU)JpGl{!%YPgDU800f%_v
zLJ9`rKH<3Iz=YzmkRdS3N(V;Uc*iPgv~c`8I@(Z9<Qy&N4{E5bpmGcsIf)ZneEOgD
zx^D6v4}XzCI?s9UIK#KQKp_rQSU_oUAM@Iy4pmCR!sL2pRs1iEC@w7Fed2rTia0n)
zO;Z+V*-V&n3cHtM7ZD--1-%;r=Fjo(g=JDD7mFj6j_F7peg@9?s2UV9%D#y2RX_W5
zLp2f518$FRxOqdg?aK4LzE^Mjt%i<iDrd7`Cl3rKwohV#oCsMe-*dgUDRQJYK+i8I
z)ME{=0Z9MbLA<3zQ2%S~TAl6F;XUKQFIfHxQMhj4PP`}L&PBgq?<U=z?DV;#y65n&
zkbWWs5JHgsYR^!@g)#8Zdvb8Xdsgs!dhq|65C1zthW!60|94%2{{9wrfbIVJJG}oj
z31L;5?QS!9im2tLpLMN^-}HD$(G|^(VpLxro5cI~*`^ExdZNfS@9wJbw38-Z%DS6B
zx95IqAk9rjJ^SF}i*0%Nw`@oBe><(dhKJn^A=%d(ah<;tLw;TgeU}hnP8|wHVE&v3
zlLF2d@a}Cz<0~4D8wWxhhvXn3ZS%;j{PYeNH7oqLM;6W?_ai?z^HWx&1V4Z}w0|3=
zGVr!jp2^Z09Hl!J-uqRW`6!pnKmZ+}@{46dBNL2yuu}V=2ngrz8&g8B1meeZ^}p|-
zBQYYzuUQ`I;~+>jkfXu<E0+|@v3}?u$|_%p%@c9$gu)=1AtS4i&(J$X>iW*#I0XMG
z+q`>G>ikPVeeUZ+8aS5CL8`KnR{r785QWcmp=uzqOZ|DV=GtGqUh5z3FAq(i-7*aF
zWuf~1{-nf>$v%i|J%wUQJ|Ux}&W`;cdP&_+T3QBhNx&I~Vq@NiTHCpKPdgErNd7L=
zCFHL8MvTUf^TmP~6U!+O`?<k5ySkZ9V8)RGYNnq*S*oGNdED`bR|v3%;|n|~%iOhz
zi<0z*+P3KUT}$u7F4OK9qC@D@<Mf(#Feaag{mGNiqJRj+Yv}!~;IxPHCg?r$6w?&x
zd3B5=ThXy$!7s^B>jpttC_PtSarsmYD>bM#o<3Q=&*3mvLl%o03ipu<J;8-^`vl^m
zp2dBT7L_Q-q?9+psGtDWnVnW5P9>LKOV6<*$^0En)ERFzyMZ^Zu7Oy(`Nwzjbx{p=
zc+Nyd%}0$zf2ssMn-Y<P5ar5Z|M9qzzZG!3xo=JU_n@mWIHmFnIPW1fp#1Tg9bNnG
zpG!S~-zw=>4QkzRz0}3_E#}<!lsVRdPux|b!qbZ^upms9OY63IQ8S-sh@k8Vp6{<U
zQ9H$Ry^Srmo!GjMvo4FRKD%aK9(T6i4&iB{*jVjp%0^Dx&YavoZM>7!4+jorC}_L8
z(ZL}zK11Fv{7>E}2z^^hBs6^{*hq=YCWU+&k;evv?aI9;8Bf(P)BtZ}OBp(hj;Bv9
zm#I~l^-(I-;$CB(2V2Pj9f-M$!}>Sx-U1bB=cMJy_o>FM%j(SwKjYwbx%2n>#;q3A
zAB;}xoU<0HF8?sPl$V>-8d}1o0XLmsiOxR0CR5c^7f-Kgk|{&-59S0UZI4$@+^5<}
zC-igh@8RFw|N22%rHybu#8TKs>FAM{%NW|5u3Lk%?}TgR1|K$h8=js&l846rX`)-J
zavo+Blyy}9%bXHX*9^+{zdSSSAI^PUUogj9ckw>)r+}FO(*J7cR50{(BIP2+NgCLQ
zw-ZRKf(bOolVYBjrjTJgsx@m|fA;LCF((BoywGCkTQ%-tKnI*!!72GIpjB^xUiDiF
zxJ$Go9x&N{zbU=j%75Bm>JQiBQ=?6!5(OfFBIB;|#Oy8(?V_3Qq9~7YXYS5U`<HbA
zU~2miTD^;0%hUe4Ouy&D0$@wqlCttkC6wffd5%|Em5zzqm)NfI)R5D5kn`D67^jKw
zaK*+G7|3~@B8eN@-i9sq1{dm01o^ZX|MdY}!x2e4$#z$wb{do2Wlfg?XP0Bk3nNI8
z5q!{v?L;H7j*rsjZ(!jaC6{B?dn|~vyX{C-(d==gpCJQsw~8_fmaE8E5;CNJM-Shy
z_)LWyZrGJ`cbA-q=3DxGFojT987J%GG=G_DJRAT$-|P$@HC4ydSF(G`Lb+;<!?R_f
z9{A32UHVdYB~d6#({2SbFdTJ^2egfSOi5U?OWilbjs2}~He?mj@Vym?5(9$NXTee~
z>}-ycJ7;fEx3){>0lzSb!b~TzPjE+8U?ev2c-QU=-L*MJ$yuJacL%1UDr<Ul!*c2<
z6}@&|+$0XQLM-_p>4Ipvko4|GECmWBIKJDODAyx(33lCR*ZxO6g_!WjxsrD3l0jY1
zvrRJ!>*UXb%B-N#v%^RFidCPvE-EVszeGM4AIF{o=;PRK1Zwfteqlp*aCsi0J)Wa$
zu!?3j;}{sky&!Wr`fm$9tMcnh6f#BNI5-IGUf;uqSZ|~#kY-TKuI!rlHpSnZp7JQz
zYunbh)vGgG(YD}S%P~a5*p<@Tu0<a+Z{VK#w(N!uxEk$|D6#xtF`I*{vx6EvzYi%U
zy&}2;o%UA+1r8sGjs}J-+<U~qzEXA#dp4sD=Q=uD`==^N#$LrId(~9HUT1A9N7~FK
z>?c+3SMrPZv%}7B<~y>V5<rU$C}JZL|3G9b3V&8AKW<1Q0Kg<)d_qkRaLM>Zi<)@o
z-CXS2K68F68}xPyO*dEsceT3A9?}Vh&-cBv@Bnx<xr;(@v9eO@GbN(gPK+AEvDwX@
zmw6OWinM^9wsXcdxV6AdvISU25Y4BibS?MkZvk3AjG0(YIV&(7oUf{ncb1HL`8<KB
zk}c$w!BzUOU-jR%C3$zS^W9PM>3k3fdCR-iA-bSVZiZ3%YJ<z^4kXW9_Jr8(u!4nl
zq{#qgm%B6MQyVVh*1Z+CA64sit}?0U%iAy=vFm@10g433nU&m9Z(nJ-oL^%&yI@Fm
zpS9)2D#t1w@cpro7(T4v!|*%{N>COro{vLefUT!b7h5Yi(74n2Av;JNzDrq|L`qcJ
zMG7d_un8ETYsW)bf20>!eHTZexnf*hDf?N~Y_M4%^^&)Ruk@>k1atDKfS4R7`X;$S
z*Fds#<JN_$Zga=Ryr7NOMBB1l8+(aMR59RwY#`9hJrK;V)1J0{-Y#B0U#gOnd`s8x
z(F1!pSlNqGFPhQVOQzRVzszMRz{%BNDQhD)2TCr@EX#1}2VY5IqJjR7aaYKGM_Qh+
z4DPX}Onimu#)+*agPRKCXm2G@Y3RKpjKg{V92d9v-9OgeRw_Uwl$7GlJIM4r?i^Tz
zh@h}rylG0$muS-_R;`;7)hmSsu1s{^NtR-d_&m14uZ=al`G=bU%lFo)<)ln;>XDSh
z3xaJ-2voUA%<`a!YKJ+s><|Xq4${~dzKK6J9%0ABxOOfLEWN;L_=%j|B{OQS>dm~Y
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
IM6N<$g4+!|`~Uy|

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/openFolder.png b/src/vs/workbench/services/gettingStarted/common/media/openFolder.png
new file mode 100644
index 0000000000000000000000000000000000000000..420ba92c2e99b515d54c75ec955d16b5d3bdeaf7
GIT binary patch
literal 35888
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/openVSC.png b/src/vs/workbench/services/gettingStarted/common/media/openVSC.png
new file mode 100644
index 0000000000000000000000000000000000000000..74720cbe861c723b96fdf7e6c28157e7e2bc46e7
GIT binary patch
literal 16170
zcmajG2|QG9`#)}H$Tk=yON1<ANhxcVQduI~I27hY8`;<F%ZMylvI_|jgOhBLZ6+y8
zwv4hbAxqY*S^j5yp6B`hf8YP}`~AFLX3l-?`?~Jy-1oJ-uWRn}^rrqbW=0-H3JMBl
z?dw;JC@5$k3JU5l25R`ujpYRg_)GDoo{1J3jn2%>JUl#{nwt9a=g-d04t#yhS#NlB
z%-`SN*4DP6p~1t$L-Odar>Dm-x|bSkPOF<%{L)4RGhuT#(l>@l^x!`V_#3{+&sVkJ
zil(5r6sLVf!^E3%aiquS^cQy8n`ZJh_c7(0hleFC>a-=6S6-e9S?Ya}%e}D@a9a6`
z^4@}X2{HCZmO`EN;X&P@UZ4q9<B@@kfW98~29&8%#s+YF+(eqmEp*V3Xsi%j`q&$6
zLoI!81fiOHbJ7+1x^O$gi{Qi#{Fo^CxNvgf>3y^w0QrijY~aG0(oa?O&2mvOZ7QSf
z@yqXsR2(Q#JmSu~k4mb+v;!QZr>B{ME5nIB9IafQ@I;=wA}CRGP3g>w3-8Di-}|^L
z8cbV@`wlk8j3FcO%jdvg1XFMemooY^38X>Q5S4=XP`{9O2qDGN6OT2Sf@ww3!6Fbu
zB(N~KBhG@s(m72?;1^N|YRXsk1YYWjL3%(c#0Fn&Z<Fbfz|^x?K9ux`qAYZEL-|Uk
zD<RU3%W16Wl}t2dRm@V82J^eqz39U)8KHNk*4*(w2sn?ZrncH^%1V%h)x$=P;!j$E
z>^8OwXg(l!QqU8qAx82JSp4B<<pfMl=C-U^YVIXF(_xlOJ}f~Ns@JjX4z^KAbvOpR
zc<b?!Q8gz;Q+8G)@X=3F<+bkT&7m>=K+D6G1wG)0llRM}H4NbLIbXT4%E31vV030`
zxnL_IJ=PPjc5}jNU9o01Jbmuj9I{-s@%zkFf8T{bZy64fm1zroFxQ6N+ioGDYZzWR
zaCL8Q;L<BAf%~JkvuH?OXYg(DJ6%nY7p(4XRNhp)+Ole?$wBh-u_4sz4zmMNt*H{b
zMiD%xiF~B43}yU7=@L&hKP6eHd_-_PQ5nB221&Gje#C7PeH;BY;z63!?OK6&pzCl?
zYGQ-c)NLsZnq=Z2sRTtt`0SGgX1&5{acWrKo&NEIojU@G21D`vFRJvhoyUt(vm<W7
za{AC69@NV`d0=y%BbnGEd3yQmSC_fb(M#spw3tu*Gxi!Jz+sgSwFGSrmhfRJEw8rt
z0neU&oww9<M|iD~aHfh^znZn$xeZ&;$J?0TM@2sJkpjX!+z33}iZM|U4ZPL4?Oq6%
zaIW=-0dGzQSH2^G)bJiKr7W>tO<B2$t#pa^WzS3+qaRpCPWJAv^O3Bq>CUdt2aBTJ
z5d}5ufd7qeegfY_{PvpU!1uP^-6y@g04n>6nrkJ!BE#0TTMyDoWIi59-1*X&9x6St
z&q3O|P%h*XYo~}opeJ|zomZs=YjHmsZwGuuaZ9yY1m|lU4;&s7;RFuU@Ml%MtsV<h
zz*=|_UrwwoOfJ2ea@gLb>jkUs-Ky;s>)C4jfvCmI=d*_o5fzaQ?;KOuf;}25Wv-g%
z>P9q$cu0@DC5BMf;!>d|*xEv1Q(-^@<19?dXke+Aj{`OhMs#o(Y%;W-z<1ahCbZKa
z^^}`f1pIL9z<4j8GP)ZUMHDt!2Ked<Hdq-Qd^bEy*GmsJ5pN?ZCUOS^3+M@3(H#O6
zY!Lrqs_V4~vs%g11F!^5>_3K9L$<rywKn8&uo=pNf>0C7LIrss8(A2B^`n8i%M%ud
zNas0e=s;=sP>F1ws35YCwKytW>;wyZB|X9pRDWzaI9ZFE6@h3l{kQZ@?R(CGF2{oV
zOZ|^uSG<a8EZkvMMzfrP<XZdBH1Yt3rkU%-43-3XK}e{zGM1{iGc|InDe^&y$JesT
zZV|uZqWH5{m;82hz8BAQ<;KKk_7$JK`U`o9jRUi|(M45!?ax*d56t31IU)b=;SXgF
zkyi8L4BY+dX#zX@)>{Ix{du9YI-5GY9?vpA^VoNl@vuFjSU|HB?+X{$pW-EPyxH2c
zo-eCPVY|Fz%NX9@VArHXweW=(^I)QIWmyS5UX7h?@CkZP1;|W7$%%unM`?jK^|8{)
zqdaFCvtG(bM)WI4d~lP=F_fj?Kw<q_*}2tMQ*HHm*JN$NeZLoMT-A6}KsocmYy$cz
zvr}iWc8{+0mc_8u`>fn*!HA^Y5q}`)&F3K38muvpP+&41A&R&mPua<-K}?s7H**Fi
zAWm(mAde@86Thu$+~T`U7}+vRk_3uH1(pTr+CBc5Eu8t5E8Bl7jVU02Ih>0{(qWb4
z>y?|t2@L(j7~Hlx#;X##bb{*wwOk@cvDyQN7mR-IqyW{}9l97f4}P`MbHvmF+Tc0S
zxMcy_iT4U`h>@4@4S(*grnoETNljk9>;a5k+(r52ny$<%R^$y`3+sGT4bX%XGMI@H
zZKUG_Z&jqu6Fz`XuJZ^^G=HO9IQuz!r0}BSRB72yH}PG_Lf0WszSS@#YwHsA!kz>3
zSqT&Dw2n%X)Yp%qH;>i+DEg6lOG2Es2~4znCMn3Q!N55_*+=2+{n_xB7KMkMhruPj
zG6MM2LhTP4-7X%)HTYreMlPYMj$a}4gGbYK!Sq}&yTse2e#~iawciT4>1&?hK7Qw^
z)J^rVE8)|$WeI{UXZQ8KzIFy)-Mu0|%Ya|s0$VJ=sluqNhgN+=b_8wr#K?+<T|gw?
zaT~OtpgI$kD+l|_A8}bveT=YSM5PzfePsoc2IG+C!Tn@McOd!P+Slh2Zu;}k9@X7C
zil)aRV8k1$^?|d8CNqo~6qLz+Q?{*sTJLOEl=jD-auwrVRM~0gc(R0Zp%yUM`Z>bW
z1rZe&fZ`F5K_xwvb|C^27Uy?^=c!kE%*kyQ?8e`6{^gl(Ht)|V<DCI7%7r}^NfhId
zV|H9w4ClRYEp`na5z|W<#K99ZXYJ9lQp>9(2?q5ONcDQ70$&CE<{*ot#oJ%dy<(~~
zn){atH28jD#+W;OcL_z&8dmW<Sw26xhU=LTr?yg%MdclDxLBf&Glg?GFc+JjD8@|}
zxiGRhz0;X0WV@n#C2ih<dBBsI5&fosiuB&!v>|xIs*F{Vmz3mhao~F+oGT{xV`n&v
z?ymA%)w9<PDVi$!Gd-_`vYorz#7}qJR+W7dZ`dU}IT&50%GDF@k<qdEe85H-?>`n3
z_$!-o;oBMckHO6Aycor=;CnMF?05H0ltYw^FxPw9)vH3Xg(QX`&srOkM4H*c^rC$?
ziiKG!of472KOw3RQOUEmfEwC;bMaEE_sY7dX2CaFOA1$y!keEfS$H28)TNCVb<;e>
zg&MKS7H~B2Qk>M5S<5C^z5FOKq1q&O`AxPsk>5@xM=eEb6Zv{tDtV?JM}_~UdiW@E
z^%Ng!Z4pXD55ClDmd!4`dF@@{4XfxX`#o&**YGxV<q^|>R-uib_j&w*>eV9NN;9#R
zMMI^L=XNKC6fAVVJocbK#hA@&;Ll9-yV64)6qOQkF*JO<M(@g+7a<B;zBWGIWD9iH
z^X=KpB{m8RJaUv4Z8DKmSc_$ygiIWE##Qi}lu+`!>~OAY!WZeI@kpxjPg`$^NGw9n
zU0EM2susr%od0H9^@&!WWBp}|J<NdxefdY6?SfL{vAWha=$bR|{PSt6hyL2<pcfB+
zn+I{-VpyKw3Qk(@p+E5?*yyn{cPg_Bu)}cjri}|*szf<IM(S6OO+6s;feDz;nUP#h
zVqDBt#*g;(=d$u|WQ|tP?q;Cw$(#n;6(-_jKZTmOh9+&CSLMSui<+{QGG0{YOJ<Bt
zx=r`^!B5Qlmf<S~8VhGnu1LJq@qWG{9(PkR$ThrG2s%i}I#lWD?){bSgh@Bx<?9Gp
zlK5#eufpy2=P8lu{A<0?VRL3wo<Y*Y{QIf>tt=87OO#pM#oW7rNFb+sP502WUJ0#w
ze*e2x{t&ZZ#gBxjMUfZGq)7JAnrf=|QpQ21l3&M%lj1Gmd7~EX!|xUc=MpF|zt|nt
zsFcvDDmYnRTa{*6)f2~#zfYZ`98U$C2DZ8*Q|HBpg2rlfj<eXyCmKclxJ)I<X)%ss
z5=)aXe`8!_ruF8rFXK}=XfA>Ik@>l|KY!hHy1<uU9Ov>y%v4gR{#Z%Sjkh}6bu&<e
z+|M={fnz`p8y{(F*X=q*Lup~QY|Mp$F`w74WnN5k!g||c!wBI1<&mc+s}w%Qt!#CG
zT-cEm#e@6H((V!rcPJw1ly2dd57oG<XD^uF`=VI$DI){*<wd#O_uw!>WR=Rny4x%v
z-QwT@9jS&Bb8Gx_q#4(8xn&oNeGEKcUb3NrpOcg>3mtzCB}=^W0K+RC<;aa!tE}{x
zmUK_q%=razP84I*4|<HL-t1v~1EVr}5lRijYLzOBXL6!SaUE*VovG!htlj%@T=2m6
zFx|IT0Z(rNmkBKGO+{_dg&XeaPta&*5fdPd-F_M7t`3UhE4Re(r4UgQ43^9xl*8XS
zFob~d40#wMQ&<=u>N|W(sX2*F8GREFgRx0D(FmwPzJjU2@P33Re9u|rBTMl`SUjdh
zI2D*@Hq+!piNWGEvFL*0=-Y_5M5?eb0+lja8Lz4XPUw852<w-7^~?|^r4z$PK9Vvp
zq(gZEdk?{qqC0II6-E6<bfo>hzWx3Fv8kE4gXFU{NC~_(#{!NJ$-Vhit2*f<-K*3a
z#vO6{hszG7rxDa8^%r=Yr07+eXi48Jn%8e9_<Uz1a3i8@?_HV{8lNrKW_Zt)1aj%x
z0-su2{lWKTR;SUToYub@qB&QMe+UcZl@#)0-s(T`7_V%+r&W&uI%J#9;k0x+whtML
z)ypvmUEo|S(}J5g$R5d{-91gIq5+7<l=WPCVW2_TC_<EwAhuaCSJld{9Rsx(`rQK&
z(F_>Y1vSGHB(>tZK(x#gHLRx6WuS%W`jwzYFbOI=7Bz85dB*eJL_FlTCl<-T%Mev9
zI)PDX0jS0lh!REN(}aXHEopRuUc$w&>8a}6pDm$_RONzyPyPV}K=B3bc8Q-uTTo;h
z^f@9Z@T+a0{&w$#6|n9dD<LhWSf&|La%s3r5V$^QGzO|(GdJZD4Q!DB4NqWJ=Gi!z
z1ucO(m$EH|SM@B~OnQX1M#1h))jyQnwk`ptzzNc>39ICnh4*H^SlJ0yKw?b0r+K9_
zH>YtVszVz{Y|O04%s<ULj@e@~GAj20ob*eOj^(!>RF6=8!5mMJ#yg6NXcykf9|+u(
zUk2lCzQ}eyzAh(YF!z;OyT}NC#?e~4VT&wFvWQ|@h3u10sg}ml_-F=8&MS7G>E_dr
zh`{$}9!jHkd23XvkF|@gI-zFG!jiy}8^7HJZn#ovS2_Ds>oDFRyvm@N&-4YVu3rDl
zKFTE7leJ6FfpPu7JNUJrh_K-cXx#-yRQd7|lJ)ybgf)+XOVl;iT6)5Dp3auQN>*Az
zX=yx#W7o^;VF{Hw0KtwsIv^lmc)~uQj_ol!=pf87-!|!NQcn3BmzZ+%bPr+pqK;!C
zE;-fwufXD$j30l@2@(-(5=03wMlybRZD%Xx8;LFXvM7Z(p@Z|+0~xfK<}WeL$K5|#
z`j0XF&gpSTn?)4kxL`#?v`aVE#_rgi0C%n$<}kJY%Ift_wPs8IRHK>>ir)sleIZDs
zvKN{XkeI0)$@m*)Oo;Z4mxAaMS)e7KzzLEEIB^s3Z(GNi{t2m<!y_>lNz`~Lyb12R
zF2UVXWI`q2Hgeud`*TG1LsfhT4rd{P20KZ$>rPT&{7=8Yvo}P)4!dW!vSuuKznqhP
zkpY^jepb>22uk7WVbdY=d9{$I=Ae^3g;Vs!)HL2_J`ZjYLkLBgOT{-6p<faYvw9t;
z9*8<uxFjNkSuZ@BA)dU}#g5SspGQv&858cP@!5p`y(h@tr@!_3HQTJQK({lSn^LRW
z!UKJ7<G>klLXpo+{K;!$FOZ~9+tdmBDr3&k7B8Oij|c?tPsR65+>aWx-C|XfNd^1;
z0WF06TY;SIPrXvEAHAyOQyq4hv^k<@GQc%u#_q6bxAT9cp2OnT++i&i108N2*IA-3
z9ScwDJ-$_B)U%qsSsO6*K!0H0^oa*mM;y?oyS<bMbs$QQzl+vlExnHEE$B;nFkb{+
zui+TzfacBIB9Wv!;n^IYh2KZ{x{p?EsAi$k8)usNa}3sGd}nLNUMKkVSg$@b;|e$&
z;0vXpm1B%-y)-XspQ(FOH}WtgEor3A;`)8HJpR2)i}Z6)IvtqlGw}`O1HScc9e6B=
zZ!^1LfS?2^ft{ja94!OW%Y7CmHWY<1;bIU(aUFm^ES4b(kWyCU3c$d0bmP~5Y0ERp
ziqPO_)d`yLsDBOkzqKE6k_o8bkMJ;v4fQVu|FdmJ9u*Et79=hRbN?5?|7`b*9St~z
zra+>|qy9xeZj)GpA&UPdv($B-mx02sab~n2ms~sLZmW?nUN;Czy!Qrd_18wRzoFc{
z>gv@4T2djC->dx;8%aTemegt2BE=^})B$#oNcZJ5dKuBqhB?gBO1%znQ-JweHBatr
zCjNp-adHH$@cwfQ#d|*$IoGrSJ%miP<oUBAivqYLcE`&(5i69X)slMgkPkfj>QfdZ
z_iXuhu3oT`hEVi%{$*c6huz7Xij!|F3fo6KSR4qYvT4Xo7KEg#P^JIREtSfhbLMkr
zr?Tp*lh$>-FI2GBX(BNxr|{FqiOjborQV#+ix#Q`+A3=7&G|amF@NhcmGF)lz;m17
z3zY2@`(0Z_g4G=rKp5t(*;V}4chijN!(6qgNKaM*<IwE_evV|vhJ?fh9;t%LmPf@O
zK6rpGGxZCwe&}Kh+qQ<(%{)wsxNlWjw)c6>zQNJ|7L1Zr!Z&CD=JlrjJOxP1o4Etz
zmZ{}d!N73RrFwdv(zns#VD%~d;Oav|vjA<NFHD!XXIAh1cvR(4TG}llfhs@jej|d3
z4dbw5=e8{ZcD~mY&zJKz&&ui=x**p_C^6zb|5W7{v`Ys{UDX-6kF$O~-j=#L=M;-5
znH4;L_-d!+9Z`k;0Wv@Qj4=V0BtMI1&y*kmI`qiCWo#D_#Pe^4k`5Ko>cDd!6{mA~
zehH9Y6p8wF!p?0%>nkbdZlN`%7w+^p(`#=#W{u_xiLSo8)|9N)8F(H|jjh(<G-MS6
zp~%;0cSQA?v8JyPY1R?*U_<kPtJ-%jScgqrYniE8k;#6_fBW{fI`ZDnWpA8Mu72FX
zCu(gu9RS;r=txH%3o`l9dbH@--=ou29}1)CZ^X0b*!#%{p2GLW*emD&iuU62*B@r=
zgM%~1ILxO|x~_A#fBC}Zc~@`yc{=I7O^HCj*WY!?;U_qL?=UtDSTnl=4EE?tpHMi{
z;fr1^eSblRsGS>yI>ixmF`4(-#&jc~28Uu-%w<Bk46O<Oh>QE-{mMI%m7<d9?N0-h
z@emuyTiuu-H`Wy|ETgD>?-Hmi^3dYj{COvrs|=edEkb-K0#9~t5M-s*OJNocTcFP{
z!?RoIoG1ze6UZlh;WU~;360w@(VNmdNua{&L_i0^`Ivtk!K^;d^7(%Tc&zzR|I_`|
z|NPevw*U%ZG|u$Gk)f(GEQq|RHv=g25bPv-X`e>2-(e{B+lYKSDn(|GB(>l1&4nmZ
zkwW+s)j#(@$~ai=2q=h!sa6LNU|>o`YRVuM!mT5rAhHXC?}PrQ&{!P?Vf+jw5*0@_
zf4HY9F%B0-z7QsJRX>^#b!H?ON6Qy@zCax)qjm?H!m}w;kqJ<Z08CaJdUD&PwP%wO
zenfd8GDAOv)?fI^x6@@{4&zZKL-eUgDr-|#vfrD%#IvwN_m4Ld)%WXv_K(D?SMDuy
z!^;)LQvARYpm2vh0c&REEqg8U{E7-n$yqGh4|K^3qF<{vU<xnOOQI&Ad?xc(kqFuC
z{tN)<Ywa!{t(XTk-|n4VJv;ai+}<KDyvJmI6)xXB)?gSN9>`2y{x-AUOu94tUc-i@
zmd~8<CT0FD;s(W+i)!uLjj3<b)u*P<!K-)eFG0fEd?uj+_qH@tNb_jvcZ&SMAHw3<
zyz={*>$$w+a(Q6|@J=iYoAEK|zRSU{B@Ym3nY(3lSap@~YN61jbZ!hS+82;zKB@4#
zTdH!7+gKClu~fVnwvqqNXbG9paz#obJWnf+%;Y0ku6IyFbdqaL{7e*doPRT_myiH&
zRpxflV^I5fR6{9?7n<=JplbBioGj028#O}F{+PC4wvkdDp+P(LI$2#^8s@cuoq}?b
zak_L&bie$rYi%&hB&HrA>2L<GeWN<ibkArX5d$e*J+X90XPXwc(USz}TrR)k?`qc7
zS7&|C>^i(zNoBR{$yEfMSmmW!wW<+Hh6O9&#p43vU@&y4mIIRvsSs@L_&j1*u=p$#
z4XeG<rm2@P;k=jI*7Sqqem9OwGF!~yC!=9~s%n@w0KkRZw1;0}!?YGg&&jdo5(k5z
zOFkUQC}pno-W5|I81mUl%1A|`7>fBl_Ih4KI}3=7C@$&~YQ5(UVDXC5%2ia-Ti!ll
zT83jZ8>S~7>RoXEh3oJlv^fkVQM)e|b7qSy^5XLMrLHFR*+^bfJToHGAn-^Hq$Ei6
zlAN--_Z{Wlpw#w`4YM+_ku0w|axB%^sro+_wd31eE=xsjG7u!BxR#UxiUO_Q3J8N9
z%!H!2%JDZj-SUp{9rUi-q!&!VP@Z1K=S2Ryo7yE?41b$B$8^29*f5F<Pm}Tj9B9`D
zS*tS1p+7aLEPaW5kyyH$jie$_{kjN?LG_@52*>WGL^e<meTsbJ<^QGq9|9O}z=|q}
z{x`w@((eA1$aZuC{(!xaCIHXy|8J}3!oh<)0FL;taSTi#<$r6d=l*NJ5w;<Z`fu%^
zs|C1!gP&h8Fd<OA{-^CM1>>Z7377^ye2UqO`ln;<XIPlzoshH~ye^}pQ3@F!{d`L-
zyNABcbkXt^kqSu?MrWHxdz`%+j2`w#5*Lhv&~Cd!j{=<G-=^%$z6TOua4{gz(s%l#
zG#zXz(mk-`?F%{mM2@_ilj<iNYr7NKt^*u%y33{bcu=+5UH-aaU*o&)T%IprSC&-8
zAbDD4VES%BVKg*n%CR(ZoT>M;QOZ2rmv0K7Kzc&?oCKy8Vg54O`78|K4zI&8@o|mR
z=@#By3Sqa4WRnt6M*B+O=afVq|4}otHT&)qPAiOmVca)aSU~8NwJ}`&O%bOBEE{W%
z=lPBnT8?Um=XV~s1eMyM7gRyYGb1CS!zujxdBisV%dC7N=;~2rc>lRXPWeisf6wYW
z@30h$+@(ZF`UxeoBC~|i3x>d{$KIQ2A~eY4&Tj#b5`KXxs;<NR2S{nGx$gR{ABig5
z46Qdn1iJz9lz5znKloN)@dCUq#riSHxsJbfVMzboJe>B0yFu}wzYO|sL0HQ^WMP7G
z?zLRimUb!5l3l(HEYe?2shbjWZZ#~^00;Li60WrpsQLp|?D$YC=9<+WCy!?(^yb=t
z&6|h!Q__)CUiOd}eM_WoH6aAQKkh*e8xnW!T6TFK4CO12?F}DOC+z0&i;s+47?_y2
zU}-LGFM{{!md4&+*MJqy{zFd<^fkUzO868gh<CZX@Q)kUs{1GEeWGWB`Mop+W0*YP
z5X8b{fx=i;OC0Iyf`%a(Sa;Vz&-Rb{202KZXUR&}T?AbvN2^~q04*~z!#lbPM_~vK
zU`Wz3A<_A^IvMIRBNk3!V+3qg9ghM=-d~rdB6%|5gDU{X--SDVKOO!N=Zp?d;|l*j
zV4mYlLs8|EFc^VP(gjpjJl;lul-;oG&qJAFqe_m@w6*5yBODxOakR_~3s<ySeXrnX
z-GS~xvQ&BqIBvpAa)}{|1qS>txxq~PN5bSSe4qrn;3?q;s)bmR73WxBiYiESp695q
zf;j2OtWF5o<iNNrN*=L$3DpD($co@*!c3!w`}kl&pK#N}QZ`gKs6j*&`@w4>4xWKT
z_TXnFgjnf#9Z`9Q%O{tSlLj0KN%H<o58Dyy{29EPHQ9}Xh~nh=*Mng~!3t5ln<d#H
zX=D&~Qx7DhWzgaqnO+a!=;{3&y7cvZ5!BHjnBCzQ`<9$w6eWp<C3!Zn?g*(8ewVGA
zUWt2q9aza`EcWZKf;y(!t+R-+FP9nYw;zHUIxzTJz**tAtarr0{K`0}Nsk=27ATAF
zg85@<H#~^0+b861_*fG{b~%FJQ1R8HUn4x<z^LuT^L{_^Ir_l$iB1HQEr0SWIN}#H
zq(86#!ma@v=`izPS2>h1!G?{reVv;SNeycIh$v{^UseccAi)KZmwr`}!th>o3ic>l
zilXy(aQ$}a8MZUkim&{9QmaT-wT-7uX@C5-=<AQWx8b*+=)-Y~Fh)>O(F)%<hN}$h
zwk9Mz9$xYIp)%~a;2Ep=5XG_7yNfa?IeoqTuGNE#+3JQ!pT58s(0495*lFA?^!aX0
zFuDqg;7^L+EnMFLibzuPdgv?XzazMo(rzu-D+hiytL!$0LB-usWL(Atf@`~8N!4mc
zg_h0MMciC5G~*@FX9MRVPElI|xz>6>oPlSUJ0Oggp<9pw^E=afPdS*#S$_@b;fd|Y
zyK8e_(OQjzG;FN>{H=<8Y?{SrQlm6l|Dvo2nvIl`?V|@+#hx#|!WH2;_2GI_oQc5a
zFQ-9=fc3xY9@phlvJ1BmQI>*mOz}vAo(ZJNgrxU;a%t6+087l;LvzGB=gc@zdDrrO
zL0?b7$Uzui9-hC{!HNPODsW;P%Tsok2)#GaYAxD8Oef<>IK&}}O)9vO)i^K>()e#2
z;N0_$?R^|=k+bhHM3fElz6a3e{V@w+zwHaY!R7xE3s44w*VF+rHecM~B?Ut&fj5C9
z=tAq&eSbuhh9C@+`Zu(<UT{s$RP9Lyihw`xZxFr(kV2#uVe%dBdA`y<I;SX8B0vz#
zce=E_{<SyLhK%%!r|RSj7ftv42;~k=Bz4#geol=03nrB*DTgNwiH|x7qs_k+1ysA!
zXD-rf1H&#Ae*MeZTf5J9xRJ?a#pPbY=*>{FRFmpv`~Jz@1F;8M^B0xT;!<p+y3J6s
z@_MR#htB~#Y(w`+?CyCJ62_bkuuCt9K2r`O+AyKP*cNeZFHC%5t&R4u9!KjD_47a(
zhSEt;WQD2OZoW9U&sKfj8aLf|3VlhlP|}~A+f)oc)J(e&Z{CT~XJsr7Z_8cKd%mQb
zvHyC$vYoXjE_-<Fk}9rx8J4&+1bP<#ZJ(9WRCXz!j2`?<{TGZiVW@82Fi*xhun)B3
zAcKq*=A%>}{!qeS)%XX>lU)G$#=oKc|F<2ZPcCx6c>^5H|25$M-2OKK40B+wh$cI{
zBZ8y$KHLAc+VG$1!^<9V!T-pJCMO>MrHvnj^OGZ);Q@(nCK}241floL8A;#7d&i@2
zw96D=nt1?MufQ1l#9=)-a<C<<5W=M%vcH}XpVtMjZ=}iKgbnq%b5|b*AB;E;7fyDv
zKS?nF_Pv0chphW%aD0lwiDZhP_xfdZn2ut;T0G=Fbra~_=Q1w~n)w_N2Lm0_G)Ho;
z&8HjIxcumqxz*@1ZFY~%QfrrBL>CX|6?gHc!7nPZn8P~40SAg81a>y8J&m}|#~|4;
zzzwi;izd_+khvsrB;O&$B`R7@$3ruV`MzI!DPj`%<L3j(`4}X%6b1E?{72Ek?WaNW
z`Gz@QlwQiHj!?=02S`HoM~SRI<~Ndx7mJ~y_iX?vXTlO(=7YO7;W8Pqq>8hZAm<Qx
z2G@UB3Kfvi)CZjWma$jI>AfgO0^1o7#rx9Ic7o&!?>)xx>==XOFe(eNu+8fHz!(6@
z{yN=Q(_F>%6x!o7`sP)j%UJUin2Bg#?%*yU$l*NdS&F&YP>6P^>OUEfx|~<tBK+_!
zy(2}hB%Udwb+$geQL`$QCnFa=etR(mQupbiJzYXAQW&kQq@W}wwa!X^t);mqIo=n>
z7&wnP7@)28tTy*V0&=j(0Z<uP<Y#Jo_&+=IKZ#x2^RKpuA#{RZ=CIW#)@9Q8UvBm6
zzs;~o;j{=mw){+vrkEsX_`~YS?O?fKkCA2A84KgVz^I>h)x1xk^Cya58}1{%k)JmC
z(oSDwVm4ZL!|zS873Ga(dS5a|uYab0&ERv9xykI%NwR9$d1F|ZvD3x;9I)EqXkiT@
zD^CRs#>g59|9^7%P!8E9Q{Sd0C%yW&^?|TNo^d3({5O@U|4(AiK`!yV^Z>bzQtt(V
z#1Xi8Ol}|Dclg*J^H1{2PR8LD+$4<oQI`wokaT1S=cVy-uq7f<71DU4Ba?h!1>_%D
zS<Yjyzk%%^I?Rb9hz<`bDL;z!pTa6l|DhAdQ<2g8c^Uj27zDvNfd%)`=>JT|V*o#z
z4m|H5IY*JW`!5V2@rf2k`&$(D5%g`EK=&q$-;bm_0$^=N#Y-5b!B3);Mkce_4}$*4
zQ3&Imf}sFuP~3Q@S8b1|Ms}jD#kU9oHvsYcwLfM7(`ICJ?W?0116NbY`R?rpQ80w5
zpo3GE$#F3lro6^grmzWg!uEb%67NE6uO$~hHt5($HB(wJXc>QpbD{uaSp6=WHKLEI
zm^{_|J|719xuxotvzFkx0mH&fR_2rW-RUypegA(j+|(6CJ4<{&reTJOymyh$r%8=F
zC;s31M~OQi!)X8aIJ}w*s;BV&pKA{*UB6o$K_og{<wVVsYw*&o@SVa>dcZQkAZdt@
zUTA*=u=1cbqdwXr7^)L4e`_ws^HA()pObJNAK*$0jA2z2cF%jq94Wyqg3`qk@P?9n
zHGnB^M|dY;*ylr-zd?4*@J}>LFm#*w3TDa({X5HB`Fjd)ahVM1s&F2U{vmik7#w;U
zJ3|43$iD%=2<&9xr)o2>fsq^wQ+jQIuc748Z1CYOgNGJ?(V*VzgQXbr<-#N~-fVz2
zXNvMkVIujyev^)Y_wnc7`2j9{@Y2BmG;5jW*5QL^Di>;)%WPuH%&yW9?&vUddI4QS
zTd%`Jq$b)H14LlVj4x(f*t>$UtP(@lO&9I`EX8xe5d%(97G7-PJl2z{hAtbxc$gec
zrftO}TRtbZhW(KOGe6u49|+rYq9MEU_3$f6b+qE=q|W6pGZc?DSSHX-fBb;2Z7{a4
zWN?Sok~8}{YnwRYi=Fp2Gnm%OY%F!-l6&ma7vDVU-1`F9ZbrfSjABb(0DnI(Z;zaF
z3KJ=-u5-YdF1+@6I&JsG!X1XtRJh9BmInM%Rk&le$>3v4ptgSD`K{+=t}p+V+p&9C
z>KB^<EVSKl(DVs$<k1$_6)R)1Urk)Q$KP)UjGEnN*Qp+G48Z5-;ce;3vCUk5vGszR
z>32rhq5ECK%jk}M$4B3-#Q!ieFC+QgH7$O4RtT=7f%!=Z7joZ!+qHGv@_H<c_m;*F
zcBMIm-F+WpG<2w~V@c0J0q60^WD>pC@FS1UrCA1ihy^B#3^#|sxM?fPYD%!^TcQ`3
zl>3_g(lF&~oI0UxT7%O<s26fIIWuCnv1^|JCBHOr7?8lD`NDJ}vg~DEf7q8_zCwQr
zY-ZNkLSh`|Ctn(754#Ja`<_(DgDu?Pk5H(BJsHMt$>VlS3gpZI&O?4g%e)o`P4D>l
z>lEG)Dz5R&f^6RwSW%HPmuXh}t}w1KZqm;;100y`<cZ^O#p29}n?-GL3#&5T4dn9z
zHo5so$rCi>YMfs(q_efmD9NI;^$sVGRudq*Ql<3u>49dD&t5F&3XBV<Y?$Gn(^Smi
zQU)8ThwpD<pN+BnTI-pSuCU5RgB$y$vj}@%EBVe80azh}pbn?Zo=zS`wT^_?g7cPx
z?)zqh-o50Vk@jWxbg1q5o1Jo>^KikD!Tx$w-HklInu5QFhZFbJwpZ4*2|Sz&;n@rC
zl*vk9N}o+Smz%|E(7#(uD58*`Fs$+w1p8w*cHfeJ1hF6CLM1Etw5e`X6O49uH|5V{
zp20t+wpi|i?UE8K5o-sg^HUt-7h??)A<xFQ54{yZ(+js!$c5D6xIcd~M6J~7c5;_X
zx5%XuJYTwEfZg_Cx7Qfmp-tB_9SXWTVhk1!7OWqs<&I<BIwAo6r!s;el^iHk2(2R!
zA_8n9g#aul2#h}w0YbvyKHC4$rG-G%ko$GT;Qp{MZ172#wC8AGG8Tby1Q<~N@IWME
zC!WCl|4WxiBaVTzo<*M>)_(?|Zgz#?AwC$pgJev`g8!K{OvD_P1b{i!fR=htQ_4+<
zhKY%(nd%~%hH2hflZFY6ZbqVqAvW}i$Q7uGfJ8SFn3<X_X7A4)^UP=sK7MTb<7IB_
z_5o|%uk3W$%=mG~i#K}%y%$U(uhIv;yf6IRDPez7rB3&|9kzs<c2yPGUo1MvQrzG4
z3L4qadv!Bg^7cta^(nS6ra7PP>bZ4A!)h~=0my<GjTn-S@T0^!oNS8ldy=@L|5U4)
z^FaE^bfuNvh{z*(s3Pp;87ih4Mtq;Xcpbk`?=<dN@-`DMMj4Nxjv7?FJ0&Dt22Q+q
z0=?6&v)?Vh*|hD^9eSaVkCbu5UTtvF(x<dlsO)}HQ+e|%mL0~8TcY*iu~b7~y?+YS
z-=z7$jJ*ob)e^q=5KHS{NC|aV8Uzo5l|&yed5G#J%Xp;xohzpg)~O9#QTLwxIisdv
z9U7f)Z#&7t?Rv&s5$&^W=fMm=D3ZQjMMEe|O(_PsB*aHm)0!XY+{C9O{PNZg(fnQH
z`7c6X5un5ROoBo*2lz4f3$^)7v9=CZB5#N7|6OzWSMeiD_d(v_kC!9<V3VRWmblmU
zh{@q%!N$mBTV{L&m2=Q^4nv#aAeeOj8!R5GF!-(#7p=W3J*mo^;j3a>=$W+@3B#)s
zycr^-v<U@{KXToEW?DTjR6^v<viO&p&VHB2lXT>vKikKV0dc>Rg$HU?Xnc>Wgs8v5
z#>Mbq_Cn}JmmgJsh!%A$xM#7#_}%Q&*~LsAZ<9ssMQPB!ga=TfO==3cZd6+*x=#Hw
zhErvmNp%aNPhn|4J{}{H`q17+{hm#?`Kla*{&q_#Jcqiz{tU!NGOFYO3WI2=+f|05
zMaTaLc~fA%y_jK%dgf#CrSs8=dx%JG7MHMJQei3I&MrC(1(&L2_RGV2+g^h>8>Gdr
zE~u*V-t*k1ymH@pFJLu5Q8kha=#=18|EioVUiPRo#FypRop#@QuFgrdu=a&}Py%zG
zI>Z9L#MaJ-`~HI5_bge^B=(ai@tnnx&Myg3k3%WZr@ygn>fhM%unX_E!_IM@q*zF9
zLTVWX)W}ds@}Xj1-#>=mZGDhpIxO;$26#B@sqdm3p0l6w!B}yaEZTy6)Y3S$dQGOt
z0eyJO8)A9>xr?n^Rgdd`WpM>GzLz6DS=l`0K~^rG5gX?59dMQg`0xt~G2~f&AfWcB
z%W!RNAgG0@Nk=B_NP_x5iuhn6!LZ922rxVys;yOyW&c*w9@jMa5u9)-wj|o^Gh+Ss
z)XUuETXP;WM^$%o@FsT+&$@n?{$7&09|7u2+A!PK-6T%_9(YrSW5&k{JRF&xb@1F#
z#5SFPvc@4#11~wPgpWn}iuHTPC_0kLybyn*a!bbO@UdRBsPcrx^=$2Tlf0zoe931N
zvi}6SVFh!uJbv>g+hdvWn`X>-qxK*z+{qk2W@n#XRT=tqMV59grw6u(r;LE@Gr2!V
z?=h9RhFxBa7vdH(zD7?^e0xQUDV}ppdV<b{HPpZrXt>EIXx;V{uZinQO!ydYS6E$f
zC?TRUEW)`}`Hf{^pfH##z8H1~5^rq#&K_7$zgOE}QTqaFBk-RG9-T;F5#nOI@Uqp~
z{`-8H{P9lmlEgHXqo~?N2|5(f2O3!f0~a8`l=}Wo<n+fo-=>$rX-Ov*>(@)jDjs0-
zZ1V99q3vw8V)5R1!|KC6@cqw^h-ih>whuy<NY=dEVPavU!Y)tE(Qd>emlC|GP~wQV
zkExSl>xIUvtu}E9Unh(bg;C9_mN8x)$MftOgtKx(@;W{%bHP4uo`<By6nr;6aqfAO
zL}SL%xJ3L{PxSKKowXC4+l`AO!S|>Q*`62%-C6qE==ejnQtl#6Y2)S#3Ui7}eQAT+
zmYPDT(B>;r2mD$F>~~poVdre7xd?xf-xbjq?}CqSgkd{(1*j&+bt16SMBLFCFhnu}
z9!5hxpN_diKITPbrr9h9f&@+Sd9h}4Ymfsz)}BUVFA5)h&qv~Y{GV7M;Dc%AG{pya
zQTQ#8UIt7(JA5om4uN5Y=OkPSF+JTJN$i?BgKjRWnjid7EfYc;{vAY+?p{yDwoLTE
zJky7SVahuQ(t&TYkUPQWRC7_vZ;s}+5Xl^Di3l(u3y*Hl>F=VEgioS{RQei*VriR`
zZbCZnVfcN?5cvRQ6%;(BCIg0fj4VtVO|j#85*8%rhyd%^!5-{*8~C(6-lFe*QJ?G`
zxO_!`iSO<Ey{IC;x8jPxc(uVN-|&7Rl}oc4%}Ug;NOofe05=EeaVkV(-@n<XIOO<!
zzu>PTS?<vf4;zak5KOlbw8ir_Q12*-LKNLRe~0;@j<*1OkPd+v2{kpBSs}A2x|m&S
z5{n?o_}))Fsr=|8w&OskbM)|o7B-yCMpuTV_WOC|E5Qw)%jJ<pWfkX1nj(9FG!o-K
zm~SWPYAWMN>%o<x7|zoDe)}NW2LtD3#c!hh-$?{%u?O9)=@B1ZN-Sa=TjFxgHp_E1
zT=Mi~F5b`ypPn4sIcLrG-an$NLcRMM(^#>EX*#z?OJMk4^QYBkZx3DduXY>}csJ=m
zy)AZi8Chku2<f30t`F~WHSQgA%#E<7K)0S9?HD}lJc|Vfzn@ZN0>)Xd>NO&O-w+Q#
z{q)&s-mfi(2&;NFpfJ-|m~|**cBiIy>jV$@nJu^`{MOG4853-|#v&?Tz<mZl3uVQM
zw<5wpTz<!MHmNDWQzt3!)s1!z_xm^AZ;Ko|aqP~g_FB6+Y?-pwK4W;Lm3ugSBW&|!
z^rT6LRgb13Z|09n*Z5@;r^N22;)!;AtGg}Bb~71<S9z_LA*0`rMdNXRbi%BRCb@=|
zr%6}Yb&mdaE&c-v)ln!J^yN^l!MQ$2<Vs1KQj^MybC7c@IC1cDoCjDC^vtv(`h@TR
zn92FdCJE6KuP77_B)66<#l}BU*#1TcQ{anHF~@Bf8-mo0RfKM*-uk<Hky9!*AAzrd
zJb~0rfdb9(VJKMMX+VnMb^oJdz9~@f29@dw;JeBMF>~CR6<zpj<T8kF$@!*7X(y9i
zChpt5oMZ7ww`h{eAusa%>=^~B_7AmIAIrMFzk6n^Oa-vGN#glX)g?6iNnAEbp&>k3
zbdMX)k)Ux|d6rWqRk5X)sg@_m2<J}K<!XmpT-BFN3%;m+)$FO{pi91rbyz!ntX`WZ
zlvqLRU9)7G_O%oiS9d0~vFYb&$5h(SK~;-^%yU?26ADQp*e{Ek$!p&PS3X5(|56Hk
zOa>fn-wO5I*fw`GT!&t)1l9Z&lV<+w?S3{apEwv9u=4Slq8ye!H$(izGC;i$Oo0n+
z{l0MerOOG{%MM8UaIXD=r`7MfKYf<E>`t8*-nr@>p(^V8##y%W_Zu(7m?kqmopNE~
zaQ%thi_zBf3(p2Pp8qU7=G5NFm%M;75d3)S<!@97I&9;r=0l&ewYGR$gNwd7(Hy$r
z8#xK#w4xRhr$iQ*pv0~1q`1EhipeXp3@aHj$LhVDff72D$4nb$Wlv1S8Gp+uWFX~<
z7N=kW{q4uUp$p)>wM9MInxfmrLgpgF^rTUd@52h))FIzPb5&3ut@KmA@+NCA?tIbO
zGO;zK(oLG+onln@!4+zabHm2J5s*j-^dm2g>wz~z71C;EwWB?zw&NlctZ*!Z#1cj1
zP|$6WgMgih+;z>jZA#21@}G@7`1DyJG59V}Go%|neT~>0n?VzoN0Us)`04@ng!i?~
z&SvA&DI-?e^}5?AJ1lrL@{e|5mm(jA_?gN2^g$nppcW_%SzjN&z+0&`fr8|iC!c3T
zxJ%cBN~nEFHCIAshLlN#emQd@Vkw2q1{v7&qKk4_1;2HZnu(6|4HR5&R6XJHnMLyx
z?*48s2x1xD>a?sqm%4s8BVW0x2y*+$&z{=E$S@VBxA=xAq~C<xI(3#dd5xCu*=(Gi
zG0n>fkLs`PfdcXn$sW+d_Rsp=<6BGL;Q?k<@LbSdbjVndW>8*Hl!~;?Jx6g4hc+o~
zn~%zV^6p6%ig@@?d(}--oie&QlCaX=ezU?ybt-$HbN#t*$_n4Ns3i~ScSJ^PPt)$J
z-8V$JQ*Q^^6+(s1$*t~ddAU&GkJDYe?kG-DVrANi@C%kI38p;`44ENB8))wy`JT-1
zFh8yJ8Ns>3n+7njxtN&+j$@g)OA8#S?2DPgTNcHuYv-V27`OYB`1%4mRIA{p6F^#$
z#k@S84s*Y@%L<_zy5bg|6nMKC8=$&%a^Puhkm1_^kqTA0TzSSZ4*<-}E3#>MI1O>K
zEDSH50D_AA+Vq!^4Z%EsHg%I0fUd3kzWbCY*D9;JODAVTrTV@nrRcd6E^)}|@@801
zYE$|n&rvTRKBn18rq*rs>^+9>Ps2QcKvQP)!XMMtRQY;6dxrfkzT}6ehVpgQ!K!)3
z*K|Hz51Bpm?c<cip10K2KS=^t1s*aVD}4>W;n?tLi-#m&M!j&pTEho}O;eaR#}Hto
zR!~3X(j)r9lL4KwX3`#%A^hx4rUIka#xtUk_7q?({Opt2vv`Gh&jkXgEh78}Ui{eN
zVA@Y9j~Rk?Op^A_7tp=VsWI$w0Y>vBZQ}(a?d>T)S{}chUdR44UB7Ru(}dT=&E)=w
zC6Ve2;Tsr3{B7WtKva+aK!J%jc?K%u8%yYtpFg(E1^K;|o!3_1sksFt5M7;bWk%|(
zOm;r`(cDF=^6dD?m9w=K%om*xR@bS0>)=PbTSr%-7Jv!Z^ZOY1XZ0s^%zV3vFe<XQ
zV27R75Iv)|Zg}wc_q_KBZnbt$<4JhF>s0UnTcmk$@8zqja|+y6d@?rY$8HggR9;HQ
zrc6w)%FPZTfyXyl{@x<M+OHeWuPuS9n2Y*wsVQ~?Z>f2b4L`{>)A-7c%h@ID1@Cxk
zOeAUYcGpna5(ZIBy?0)*DK?Vw!~AKc-_WQAGrr|Z($J?hE$c52MTftOd`METi>5G-
zaFLd&=Af!fw#nv??@$m@d@>WjkCGr>$EtE(6JDQ;_?iA%zJ{?UZ7I--8O;=QiDq1=
zm@`fWP|%re#IJM-<V2{6hB&opUQftq#JEe~v{P`ooWQ_WU}oPdDcWPxk7Cw4`E;1&
zejRQ(j}CLds>Vm!z4+Ej<XRn4v=XICm{L@=%<Uf_fu+S2L?75JQDbYBqbBuFHir6}
z;OuMEqF(oV6B%ccQ;$lbo$6!eg~s1Qly>>DoKFl>^=<_vE(KQi4_b?TrtUC3_QIy)
zQPWP1Ob#m!t978iGIq?FTqlrs1)m{cjCY@$(u;7ys1XMj2F{^riWwXc>}XkX=6{Tg
zBdc)?C>U1ag%pS|ER=$)4>0^eqF;~)B(pVBabVd03m2wgB<jC#K}Y^~E<!ZACHw{u
zL$gIR@B7o_w;>@GL4c_fiFe!O9-dKcndEJ@h~+G$Zx0Ns&c|FPOFevFGTBx&8LP2Z
z_E#$cyYXnMY#_toBJruRDEfNYlQU@ETKLVkJ-bIAH6hNZ3<W0{kdT00I$oB3I|hm0
zIJvuSX^L*Iwf&$8tua^r{&LSeRMMb92L5fFM)HkC_4(q(Rqw$Ae=c<h^V@5BY+to{
z==X1IVJ{vjioZ-fRy@M*zzV=)2OAUx_z3v|>>>RuZv9_n+6PAmcNm+g*zm;^A+)Ce
zN(PLYD8NC{%-HO6oDDAxxKT9E%OFsvfLV%=4WYXs^3-hj`!|3f?1n(LD7pzQ8zrAZ
nHyLQcFEA3QXclac6l49jk|?`wSG2+Jty5@g>0c?;#D@Gob<T7o

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/pullRequests.png b/src/vs/workbench/services/gettingStarted/common/media/pullRequests.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b6ca14eaeba14fa0e8ffc9e15913e53e780e22c
GIT binary patch
literal 44364
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/remoteTerminal.png b/src/vs/workbench/services/gettingStarted/common/media/remoteTerminal.png
new file mode 100644
index 0000000000000000000000000000000000000000..58152dfdc9d743d03c043b26dccace6cc499ea8e
GIT binary patch
literal 42347
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
N%-GVX$pDw|{{Rk~2C4u6

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/runProject.png b/src/vs/workbench/services/gettingStarted/common/media/runProject.png
new file mode 100644
index 0000000000000000000000000000000000000000..77c4bae64b1327f50cb6d4412fd2a4522ad634dd
GIT binary patch
literal 100705
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/settings.png b/src/vs/workbench/services/gettingStarted/common/media/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b4cf11fc957a26c226264411399add4ac91c4b
GIT binary patch
literal 26205
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%0D_5dx_~1jZ}wd)BPT
zS0CLk{q2=0_|vyBA8eM-t!~1$KTK)_hb;OoI_Sq(Z@IR(i#k*V3Vg3$GP<hXkF_h|
zvTIJYP-38l5V5TEHm!E}9N|ddRN0ElI=ML31-3|K7hIqoM!8hvwec@HdFK$gyw2o{
z<ug@YVZn<zT3ISq=3gPQAk@OuWP@;=zIZbMg)1n^&iJ<|5u40bD7m5}U!tvs-Nlyr
zjaENoe<PTuH%=T-Mso-eVGbJ)36o>?J5JnU?)ziqh=5AL4<<;BzCp@9RX%Y*CETBy
z#*S2a`01!ZEUUt(yg-E%WKVC2B#zCR+w!Zu9+7m$BU_hSJ%%%I?dA7|E_BpaPr9o-
zs$MyyrTA4L^yqsH(zJ}6sm0mhd}Ns}^TR%Eo+?c?r4Kb*ZAYgS(;v2!K))6V|L1)t
z>woS#doiB;kINex6-|54Nez7b|KXMY9?)(bS>952pRPYU|5>UjYb(_#f+PMLK<Ako

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/settingsSync.png b/src/vs/workbench/services/gettingStarted/common/media/settingsSync.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bbed4ff98a7fff993f276a7c4ca0e6db1765388
GIT binary patch
literal 36021
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
Y2S<I1w*@d0Q2+n{07*qoM6N<$g2b-xcK`qY

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/terminal.png b/src/vs/workbench/services/gettingStarted/common/media/terminal.png
new file mode 100644
index 0000000000000000000000000000000000000000..649a200a5044726874f1a4da935d351001dc7d6f
GIT binary patch
literal 25762
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
TsnLJE!a`F`Pqkhd9{GO&Uu;w%

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/gettingStarted/common/media/tutorialVideo.png b/src/vs/workbench/services/gettingStarted/common/media/tutorialVideo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b21902be10624f58c9a2dff911446e7b073683f
GIT binary patch
literal 51891
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

literal 0
HcmV?d00001

diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index 61c461c75..25cb4dd61 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -25,6 +25,7 @@ import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/commo
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { BeforeShutdownEvent, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ILogService } from 'vs/platform/log/common/log';
+import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
 
 /**
  * A workspace to open in the workbench can either be:
@@ -126,8 +127,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 			case HostShutdownReason.Keyboard:
 				const confirmBeforeClose = this.configurationService.getValue<'always' | 'keyboardOnly' | 'never'>('window.confirmBeforeClose');
 				if (confirmBeforeClose === 'always' || (confirmBeforeClose === 'keyboardOnly' && this.shutdownReason === HostShutdownReason.Keyboard)) {
-					this.logService.warn(`Unload veto: window.confirmBeforeClose=${confirmBeforeClose}`);
-					e.veto(true);
+					e.veto(true, 'veto.confirmBeforeClose');
 				}
 				break;
 
@@ -339,7 +339,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 		}
 
 		if (isWorkspaceToOpen(openable)) {
-			return this.labelService.getWorkspaceLabel({ id: '', configPath: openable.workspaceUri }, { verbose: true });
+			return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: true });
 		}
 
 		return this.labelService.getUriLabel(openable.fileUri);
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
index d038c042d..f799d7a89 100644
--- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -50,6 +50,7 @@ import { BrowserFeatures, KeyboardSupport } from 'vs/base/browser/canIUse';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { dirname } from 'vs/base/common/resources';
+import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
 
 interface ContributedKeyBinding {
 	command: string;
@@ -594,7 +595,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 	}
 
 	private static _getAllCommandsAsComment(boundCommands: Map<string, boolean>): string {
-		const unboundCommands = KeybindingResolver.getAllUnboundCommands(boundCommands);
+		const unboundCommands = getAllUnboundCommands(boundCommands);
 		let pretty = unboundCommands.sort().join('\n// - ');
 		return '// ' + nls.localize('unboundCommands', "Here are other available commands: ") + '\n// - ' + pretty;
 	}
diff --git a/src/vs/workbench/services/keybinding/browser/unboundCommands.ts b/src/vs/workbench/services/keybinding/browser/unboundCommands.ts
new file mode 100644
index 000000000..3959126c8
--- /dev/null
+++ b/src/vs/workbench/services/keybinding/browser/unboundCommands.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
+import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
+import { MenuRegistry, MenuId, isIMenuItem } from 'vs/platform/actions/common/actions';
+
+export function getAllUnboundCommands(boundCommands: Map<string, boolean>): string[] {
+	const unboundCommands: string[] = [];
+	const seenMap: Map<string, boolean> = new Map<string, boolean>();
+	const addCommand = (id: string, includeCommandWithArgs: boolean) => {
+		if (seenMap.has(id)) {
+			return;
+		}
+		seenMap.set(id, true);
+		if (id[0] === '_' || id.indexOf('vscode.') === 0) { // private command
+			return;
+		}
+		if (boundCommands.get(id) === true) {
+			return;
+		}
+		if (!includeCommandWithArgs) {
+			const command = CommandsRegistry.getCommand(id);
+			if (command && typeof command.description === 'object'
+				&& isNonEmptyArray((<ICommandHandlerDescription>command.description).args)) { // command with args
+				return;
+			}
+		}
+		unboundCommands.push(id);
+	};
+
+	// Add all commands from Command Palette
+	for (const menuItem of MenuRegistry.getMenuItems(MenuId.CommandPalette)) {
+		if (isIMenuItem(menuItem)) {
+			addCommand(menuItem.command.id, true);
+		}
+	}
+
+	// Add all editor actions
+	for (const editorAction of EditorExtensionsRegistry.getEditorActions()) {
+		addCommand(editorAction.id, true);
+	}
+
+	for (const id of CommandsRegistry.getCommands().keys()) {
+		addCommand(id, false);
+	}
+
+	return unboundCommands;
+}
diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
index 4def81275..47555a68a 100644
--- a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -66,32 +66,11 @@ export class WindowsNativeResolvedKeybinding extends BaseResolvedKeybinding<Simp
 		return this._mapper.getAriaLabelForKeyCode(keybinding.keyCode);
 	}
 
-	private _keyCodeToElectronAccelerator(keyCode: KeyCode): string | null {
-		if (keyCode >= KeyCode.NUMPAD_0 && keyCode <= KeyCode.NUMPAD_DIVIDE) {
-			// Electron cannot handle numpad keys
-			return null;
-		}
-
-		switch (keyCode) {
-			case KeyCode.UpArrow:
-				return 'Up';
-			case KeyCode.DownArrow:
-				return 'Down';
-			case KeyCode.LeftArrow:
-				return 'Left';
-			case KeyCode.RightArrow:
-				return 'Right';
-		}
-
-		// electron menus always do the correct rendering on Windows
-		return KeyCodeUtils.toString(keyCode);
-	}
-
 	protected _getElectronAccelerator(keybinding: SimpleKeybinding): string | null {
 		if (keybinding.isDuplicateModifierCase()) {
 			return null;
 		}
-		return this._keyCodeToElectronAccelerator(keybinding.keyCode);
+		return this._mapper.getElectronAcceleratorForKeyBinding(keybinding);
 	}
 
 	protected _getUserSettingsLabel(keybinding: SimpleKeybinding): string | null {
@@ -409,6 +388,53 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
 		return KeyCodeUtils.toUserSettingsGeneral(keyCode);
 	}
 
+	public getElectronAcceleratorForKeyBinding(keybinding: SimpleKeybinding): string | null {
+		if (!this.isUSStandard) {
+			// See https://github.com/electron/electron/issues/26888
+			// Electron does not render accelerators respecting the current keyboard layout since 3.x
+			const keyCode = keybinding.keyCode;
+			const isOEMKey = (
+				keyCode === KeyCode.US_SEMICOLON
+				|| keyCode === KeyCode.US_EQUAL
+				|| keyCode === KeyCode.US_COMMA
+				|| keyCode === KeyCode.US_MINUS
+				|| keyCode === KeyCode.US_DOT
+				|| keyCode === KeyCode.US_SLASH
+				|| keyCode === KeyCode.US_BACKTICK
+				|| keyCode === KeyCode.US_OPEN_SQUARE_BRACKET
+				|| keyCode === KeyCode.US_BACKSLASH
+				|| keyCode === KeyCode.US_CLOSE_SQUARE_BRACKET
+				|| keyCode === KeyCode.OEM_8
+				|| keyCode === KeyCode.OEM_102
+			);
+			if (isOEMKey) {
+				return null;
+			}
+		}
+		return this._keyCodeToElectronAccelerator(keybinding.keyCode);
+	}
+
+	private _keyCodeToElectronAccelerator(keyCode: KeyCode): string | null {
+		if (keyCode >= KeyCode.NUMPAD_0 && keyCode <= KeyCode.NUMPAD_DIVIDE) {
+			// Electron cannot handle numpad keys
+			return null;
+		}
+
+		switch (keyCode) {
+			case KeyCode.UpArrow:
+				return 'Up';
+			case KeyCode.DownArrow:
+				return 'Down';
+			case KeyCode.LeftArrow:
+				return 'Left';
+			case KeyCode.RightArrow:
+				return 'Right';
+		}
+
+		// electron menus always do the correct rendering on Windows
+		return KeyCodeUtils.toString(keyCode);
+	}
+
 	private _getLabelForKeyCode(keyCode: KeyCode): string {
 		return this._keyCodeToLabel[keyCode] || KeyCodeUtils.toString(KeyCode.Unknown);
 	}
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/browserKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
similarity index 88%
rename from src/vs/workbench/services/keybinding/test/electron-browser/browserKeyboardMapper.test.ts
rename to src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
index 320ddbada..d6aea0fce 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/browserKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/browserKeyboardMapper.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin'; // 15%
+import 'vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin';
 import 'vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin';
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
 import { BrowserKeyboardMapperFactoryBase } from 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
@@ -41,12 +41,12 @@ suite('keyboard layout loader', () => {
 	let instance = new TestKeyboardMapperFactory(notitifcationService, storageService, commandService);
 
 	test('load default US keyboard layout', () => {
-		assert.notEqual(instance.activeKeyboardLayout, null);
+		assert.notStrictEqual(instance.activeKeyboardLayout, null);
 	});
 
 	test('isKeyMappingActive', () => {
 		instance.setUSKeyboardLayout();
-		assert.equal(instance.isKeyMappingActive({
+		assert.strictEqual(instance.isKeyMappingActive({
 			KeyA: {
 				value: 'a',
 				valueIsDeadKey: false,
@@ -59,7 +59,7 @@ suite('keyboard layout loader', () => {
 			}
 		}), true);
 
-		assert.equal(instance.isKeyMappingActive({
+		assert.strictEqual(instance.isKeyMappingActive({
 			KeyA: {
 				value: 'a',
 				valueIsDeadKey: false,
@@ -82,7 +82,7 @@ suite('keyboard layout loader', () => {
 			}
 		}), true);
 
-		assert.equal(instance.isKeyMappingActive({
+		assert.strictEqual(instance.isKeyMappingActive({
 			KeyZ: {
 				value: 'y',
 				valueIsDeadKey: false,
@@ -110,8 +110,8 @@ suite('keyboard layout loader', () => {
 				withShiftAltGrIsDeadKey: false
 			}
 		});
-		assert.equal(!!instance.activeKeyboardLayout!.isUSStandard, false);
-		assert.equal(instance.isKeyMappingActive({
+		assert.strictEqual(!!instance.activeKeyboardLayout!.isUSStandard, false);
+		assert.strictEqual(instance.isKeyMappingActive({
 			KeyZ: {
 				value: 'y',
 				valueIsDeadKey: false,
@@ -125,13 +125,13 @@ suite('keyboard layout loader', () => {
 		}), true);
 
 		instance.setUSKeyboardLayout();
-		assert.equal(instance.activeKeyboardLayout!.isUSStandard, true);
+		assert.strictEqual(instance.activeKeyboardLayout!.isUSStandard, true);
 	});
 
 	test('Switch keyboard layout info', () => {
 		instance.setKeyboardLayout('com.apple.keylayout.German');
-		assert.equal(!!instance.activeKeyboardLayout!.isUSStandard, false);
-		assert.equal(instance.isKeyMappingActive({
+		assert.strictEqual(!!instance.activeKeyboardLayout!.isUSStandard, false);
+		assert.strictEqual(instance.isKeyMappingActive({
 			KeyZ: {
 				value: 'y',
 				valueIsDeadKey: false,
@@ -145,6 +145,6 @@ suite('keyboard layout loader', () => {
 		}), true);
 
 		instance.setUSKeyboardLayout();
-		assert.equal(instance.activeKeyboardLayout!.isUSStandard, true);
+		assert.strictEqual(instance.activeKeyboardLayout!.isUSStandard, true);
 	});
 });
diff --git a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
new file mode 100644
index 000000000..4ed82cbc7
--- /dev/null
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts
@@ -0,0 +1,315 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as json from 'vs/base/common/json';
+import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes';
+import { OS } from 'vs/base/common/platform';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IFileService } from 'vs/platform/files/common/files';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
+import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { ILogService, NullLogService } from 'vs/platform/log/common/log';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
+import { TestBackupFileService, TestEditorGroupsService, TestEditorService, TestEnvironmentService, TestLifecycleService, TestPathService, TestTextFileService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { Schemas } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
+import { ILabelService } from 'vs/platform/label/common/label';
+import { LabelService } from 'vs/workbench/services/label/common/labelService';
+import { IFilesConfigurationService, FilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { WorkingCopyFileService, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
+import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
+import { TestTextResourcePropertiesService, TestContextService, TestWorkingCopyService } from 'vs/workbench/test/common/workbenchTestServices';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
+import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
+import { joinPath } from 'vs/base/common/resources';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { VSBuffer } from 'vs/base/common/buffer';
+
+interface Modifiers {
+	metaKey?: boolean;
+	ctrlKey?: boolean;
+	altKey?: boolean;
+	shiftKey?: boolean;
+}
+
+const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
+
+suite('KeybindingsEditing', () => {
+
+	const disposables = new DisposableStore();
+	let instantiationService: TestInstantiationService, fileService: IFileService, environmentService: IEnvironmentService;
+	let testObject: KeybindingsEditingService;
+
+	setup(async () => {
+		const logService = new NullLogService();
+		fileService = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(ROOT.scheme, fileSystemProvider));
+
+		const userFolder = joinPath(ROOT, 'User');
+		await fileService.createFolder(userFolder);
+		environmentService = TestEnvironmentService;
+
+		instantiationService = new TestInstantiationService();
+
+		const configService = new TestConfigurationService();
+		configService.setUserConfiguration('files', { 'eol': '\n' });
+
+		instantiationService.stub(IEnvironmentService, environmentService);
+		instantiationService.stub(IPathService, new TestPathService());
+		instantiationService.stub(IConfigurationService, configService);
+		instantiationService.stub(IWorkspaceContextService, new TestContextService());
+		const lifecycleService = new TestLifecycleService();
+		instantiationService.stub(ILifecycleService, lifecycleService);
+		instantiationService.stub(IContextKeyService, <IContextKeyService>instantiationService.createInstance(MockContextKeyService));
+		instantiationService.stub(IEditorGroupsService, new TestEditorGroupsService());
+		instantiationService.stub(IEditorService, new TestEditorService());
+		instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IModeService, ModeServiceImpl);
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(ILabelService, disposables.add(instantiationService.createInstance(LabelService)));
+		instantiationService.stub(IFilesConfigurationService, disposables.add(instantiationService.createInstance(FilesConfigurationService)));
+		instantiationService.stub(ITextResourcePropertiesService, new TestTextResourcePropertiesService(instantiationService.get(IConfigurationService)));
+		instantiationService.stub(IUndoRedoService, instantiationService.createInstance(UndoRedoService));
+		instantiationService.stub(IThemeService, new TestThemeService());
+		instantiationService.stub(IModelService, disposables.add(instantiationService.createInstance(ModelServiceImpl)));
+		fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService())));
+		instantiationService.stub(IFileService, fileService);
+		instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService));
+		instantiationService.stub(IWorkingCopyService, disposables.add(new TestWorkingCopyService()));
+		instantiationService.stub(IWorkingCopyFileService, disposables.add(instantiationService.createInstance(WorkingCopyFileService)));
+		instantiationService.stub(ITextFileService, disposables.add(instantiationService.createInstance(TestTextFileService)));
+		instantiationService.stub(ITextModelService, disposables.add(instantiationService.createInstance(TextModelResolverService)));
+		instantiationService.stub(IBackupFileService, new TestBackupFileService());
+
+		testObject = disposables.add(instantiationService.createInstance(KeybindingsEditingService));
+
+	});
+
+	teardown(() => disposables.clear());
+
+	test('errors cases - parse errors', async () => {
+		await fileService.writeFile(environmentService.keybindingsResource, VSBuffer.fromString(',,,,,,,,,,,,,,'));
+		try {
+			await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined);
+			assert.fail('Should fail with parse errors');
+		} catch (error) {
+			assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.');
+		}
+	});
+
+	test('errors cases - parse errors 2', async () => {
+		await fileService.writeFile(environmentService.keybindingsResource, VSBuffer.fromString('[{"key": }]'));
+		try {
+			await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined);
+			assert.fail('Should fail with parse errors');
+		} catch (error) {
+			assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.');
+		}
+	});
+
+	test('errors cases - dirty', () => {
+		instantiationService.stub(ITextFileService, 'isDirty', true);
+		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined)
+			.then(() => assert.fail('Should fail with dirty error'),
+				error => assert.equal(error.message, 'Unable to write because the keybindings configuration file is dirty. Please save it first and then try again.'));
+	});
+
+	test('errors cases - did not find an array', async () => {
+		await fileService.writeFile(environmentService.keybindingsResource, VSBuffer.fromString('{"key": "alt+c", "command": "hello"}'));
+		try {
+			await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined);
+			assert.fail('Should fail');
+		} catch (error) {
+			assert.equal(error.message, 'Unable to write to the keybindings configuration file. It has an object which is not of type Array. Please open the file to clean up and try again.');
+		}
+	});
+
+	test('edit a default keybinding to an empty file', async () => {
+		await fileService.writeFile(environmentService.keybindingsResource, VSBuffer.fromString(''));
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('edit a default keybinding to an empty array', async () => {
+		await writeToKeybindingsFile();
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined);
+		return assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('edit a default keybinding in an existing array', async () => {
+		await writeToKeybindingsFile({ command: 'b', key: 'shift+c' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'shift+c', command: 'b' }, { key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined);
+		return assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('add another keybinding', async () => {
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
+		await testObject.addKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined);
+		return assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('add a new default keybinding', async () => {
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
+		await testObject.addKeybinding(aResolvedKeybindingItem({ command: 'a' }), 'alt+c', undefined);
+		return assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('add a new default keybinding using edit', async () => {
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a' }), 'alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('edit an user keybinding', async () => {
+		await writeToKeybindingsFile({ key: 'escape', command: 'b' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'b' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'b', isDefault: false }), 'alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('edit an user keybinding with more than one element', async () => {
+		await writeToKeybindingsFile({ key: 'escape', command: 'b' }, { key: 'alt+shift+g', command: 'c' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'b' }, { key: 'alt+shift+g', command: 'c' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'b', isDefault: false }), 'alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('remove a default keybinding', async () => {
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }];
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('remove a default keybinding should not ad duplicate entries', async () => {
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }];
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('remove a user keybinding', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: 'b' });
+		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'b', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } }, isDefault: false }));
+		assert.deepEqual(await getUserKeybindings(), []);
+	});
+
+	test('reset an edited keybinding', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: 'b' });
+		await testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } }, isDefault: false }));
+		assert.deepEqual(await getUserKeybindings(), []);
+	});
+
+	test('reset a removed keybinding', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
+		await testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }));
+		assert.deepEqual(await getUserKeybindings(), []);
+	});
+
+	test('reset multiple removed keybindings', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
+		await writeToKeybindingsFile({ key: 'alt+shift+c', command: '-b' });
+		await writeToKeybindingsFile({ key: 'escape', command: '-b' });
+		await testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }));
+		assert.deepEqual(await getUserKeybindings(), []);
+	});
+
+	test('add a new keybinding to unassigned keybinding', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('add when expression', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', 'editorTextFocus');
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('update command and when expression', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', 'editorTextFocus');
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('update when expression', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus && !editorReadonly' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false, when: 'editorTextFocus && !editorReadonly' }), 'shift+alt+c', 'editorTextFocus');
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	test('remove when expression', async () => {
+		await writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' });
+		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a' }];
+		await testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', undefined);
+		assert.deepEqual(await getUserKeybindings(), expected);
+	});
+
+	async function writeToKeybindingsFile(...keybindings: IUserFriendlyKeybinding[]): Promise<void> {
+		await fileService.writeFile(environmentService.keybindingsResource, VSBuffer.fromString(JSON.stringify(keybindings || [])));
+	}
+
+	async function getUserKeybindings(): Promise<IUserFriendlyKeybinding[]> {
+		return json.parse((await fileService.readFile(environmentService.keybindingsResource)).value.toString());
+	}
+
+	function aResolvedKeybindingItem({ command, when, isDefault, firstPart, chordPart }: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
+		const aSimpleKeybinding = function (part: { keyCode: KeyCode, modifiers?: Modifiers }): SimpleKeybinding {
+			const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
+			return new SimpleKeybinding(ctrlKey!, shiftKey!, altKey!, metaKey!, part.keyCode);
+		};
+		let parts: SimpleKeybinding[] = [];
+		if (firstPart) {
+			parts.push(aSimpleKeybinding(firstPart));
+			if (chordPart) {
+				parts.push(aSimpleKeybinding(chordPart));
+			}
+		}
+		const keybinding = parts.length > 0 ? new USLayoutResolvedKeybinding(new ChordKeybinding(parts), OS) : undefined;
+		return new ResolvedKeybindingItem(keybinding, command || 'some command', null, when ? ContextKeyExpr.deserialize(when) : undefined, isDefault === undefined ? true : isDefault, null, false);
+	}
+
+});
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingIO.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
similarity index 95%
rename from src/vs/workbench/services/keybinding/test/electron-browser/keybindingIO.test.ts
rename to src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
index 99a2ef11a..3a873b4e8 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingIO.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
@@ -18,7 +18,7 @@ suite('keybindingIO', () => {
 		function testOneSerialization(keybinding: number, expected: string, msg: string, OS: OperatingSystem): void {
 			let usLayoutResolvedKeybinding = new USLayoutResolvedKeybinding(createKeybinding(keybinding, OS)!, OS);
 			let actualSerialized = usLayoutResolvedKeybinding.getUserSettingsLabel();
-			assert.equal(actualSerialized, expected, expected + ' - ' + msg);
+			assert.strictEqual(actualSerialized, expected, expected + ' - ' + msg);
 		}
 		function testSerialization(keybinding: number, expectedWin: string, expectedMac: string, expectedLinux: string): void {
 			testOneSerialization(keybinding, expectedWin, 'win', OperatingSystem.Windows);
@@ -29,7 +29,7 @@ suite('keybindingIO', () => {
 		function testOneDeserialization(keybinding: string, _expected: number, msg: string, OS: OperatingSystem): void {
 			let actualDeserialized = KeybindingParser.parseKeybinding(keybinding, OS);
 			let expected = createKeybinding(_expected, OS);
-			assert.deepEqual(actualDeserialized, expected, keybinding + ' - ' + msg);
+			assert.deepStrictEqual(actualDeserialized, expected, keybinding + ' - ' + msg);
 		}
 		function testDeserialization(inWin: string, inMac: string, inLinux: string, expected: number): void {
 			testOneDeserialization(inWin, expected, 'win', OperatingSystem.Windows);
@@ -117,7 +117,7 @@ suite('keybindingIO', () => {
 	});
 
 	test('deserialize scan codes', () => {
-		assert.deepEqual(
+		assert.deepStrictEqual(
 			KeybindingParser.parseUserBinding('ctrl+shift+[comma] ctrl+/'),
 			[new ScanCodeBinding(true, true, false, false, ScanCode.Comma), new SimpleKeybinding(true, false, false, false, KeyCode.US_SLASH)]
 		);
@@ -127,34 +127,34 @@ suite('keybindingIO', () => {
 		let strJSON = `[{ "key": "ctrl+k ctrl+f", "command": ["firstcommand", "seccondcommand"] }]`;
 		let userKeybinding = <IUserFriendlyKeybinding>JSON.parse(strJSON)[0];
 		let keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.equal(keybindingItem.command, null);
+		assert.strictEqual(keybindingItem.command, null);
 	});
 
 	test('issue #10452 - invalid when', () => {
 		let strJSON = `[{ "key": "ctrl+k ctrl+f", "command": "firstcommand", "when": [] }]`;
 		let userKeybinding = <IUserFriendlyKeybinding>JSON.parse(strJSON)[0];
 		let keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.equal(keybindingItem.when, null);
+		assert.strictEqual(keybindingItem.when, undefined);
 	});
 
 	test('issue #10452 - invalid key', () => {
 		let strJSON = `[{ "key": [], "command": "firstcommand" }]`;
 		let userKeybinding = <IUserFriendlyKeybinding>JSON.parse(strJSON)[0];
 		let keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.deepEqual(keybindingItem.parts, []);
+		assert.deepStrictEqual(keybindingItem.parts, []);
 	});
 
 	test('issue #10452 - invalid key 2', () => {
 		let strJSON = `[{ "key": "", "command": "firstcommand" }]`;
 		let userKeybinding = <IUserFriendlyKeybinding>JSON.parse(strJSON)[0];
 		let keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.deepEqual(keybindingItem.parts, []);
+		assert.deepStrictEqual(keybindingItem.parts, []);
 	});
 
 	test('test commands args', () => {
 		let strJSON = `[{ "key": "ctrl+k ctrl+f", "command": "firstcommand", "when": [], "args": { "text": "theText" } }]`;
 		let userKeybinding = <IUserFriendlyKeybinding>JSON.parse(strJSON)[0];
 		let keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.equal(keybindingItem.commandArgs.text, 'theText');
+		assert.strictEqual(keybindingItem.commandArgs.text, 'theText');
 	});
 });
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
deleted file mode 100644
index 4b4bc13a9..000000000
--- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as json from 'vs/base/common/json';
-import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes';
-import { OS } from 'vs/base/common/platform';
-import * as uuid from 'vs/base/common/uuid';
-import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IFileService } from 'vs/platform/files/common/files';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
-import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import { TestBackupFileService, TestEditorGroupsService, TestEditorService, TestLifecycleService, TestPathService, TestProductService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { FileService } from 'vs/platform/files/common/fileService';
-import { Schemas } from 'vs/base/common/network';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { URI } from 'vs/base/common/uri';
-import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
-import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
-import { TestWorkbenchConfiguration, TestTextFileService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { IFilesConfigurationService, FilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { WorkingCopyFileService, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
-import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
-import { TestTextResourcePropertiesService, TestContextService, TestWorkingCopyService } from 'vs/workbench/test/common/workbenchTestServices';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
-import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
-import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
-
-class TestWorkbenchEnvironmentService extends NativeWorkbenchEnvironmentService {
-
-	constructor(private _appSettingsHome: URI) {
-		super(TestWorkbenchConfiguration, TestProductService);
-	}
-
-	get appSettingsHome() { return this._appSettingsHome; }
-}
-
-interface Modifiers {
-	metaKey?: boolean;
-	ctrlKey?: boolean;
-	altKey?: boolean;
-	shiftKey?: boolean;
-}
-
-suite('KeybindingsEditing', () => {
-
-	let instantiationService: TestInstantiationService;
-	let testObject: KeybindingsEditingService;
-	let testDir: string;
-	let keybindingsFile: string;
-
-	setup(() => {
-		return setUpWorkspace().then(() => {
-			keybindingsFile = path.join(testDir, 'keybindings.json');
-
-			instantiationService = new TestInstantiationService();
-
-			const environmentService = new TestWorkbenchEnvironmentService(URI.file(testDir));
-
-			const configService = new TestConfigurationService();
-			configService.setUserConfiguration('files', { 'eol': '\n' });
-
-			instantiationService.stub(IEnvironmentService, environmentService);
-			instantiationService.stub(IPathService, new TestPathService());
-			instantiationService.stub(IConfigurationService, configService);
-			instantiationService.stub(IWorkspaceContextService, new TestContextService());
-			const lifecycleService = new TestLifecycleService();
-			instantiationService.stub(ILifecycleService, lifecycleService);
-			instantiationService.stub(IContextKeyService, <IContextKeyService>instantiationService.createInstance(MockContextKeyService));
-			instantiationService.stub(IEditorGroupsService, new TestEditorGroupsService());
-			instantiationService.stub(IEditorService, new TestEditorService());
-			instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
-			instantiationService.stub(ITelemetryService, NullTelemetryService);
-			instantiationService.stub(IModeService, ModeServiceImpl);
-			instantiationService.stub(ILogService, new NullLogService());
-			instantiationService.stub(ILabelService, instantiationService.createInstance(LabelService));
-			instantiationService.stub(IFilesConfigurationService, instantiationService.createInstance(FilesConfigurationService));
-			instantiationService.stub(ITextResourcePropertiesService, new TestTextResourcePropertiesService(instantiationService.get(IConfigurationService)));
-			instantiationService.stub(IUndoRedoService, instantiationService.createInstance(UndoRedoService));
-			instantiationService.stub(IThemeService, new TestThemeService());
-			instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
-			const fileService = new FileService(new NullLogService());
-			const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
-			fileService.registerProvider(Schemas.file, diskFileSystemProvider);
-			fileService.registerProvider(Schemas.userData, new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, new NullLogService()));
-			instantiationService.stub(IFileService, fileService);
-			instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService));
-			instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
-			instantiationService.stub(IWorkingCopyFileService, instantiationService.createInstance(WorkingCopyFileService));
-			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
-			instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-			instantiationService.stub(IBackupFileService, new TestBackupFileService());
-
-			testObject = instantiationService.createInstance(KeybindingsEditingService);
-		});
-	});
-
-	async function setUpWorkspace(): Promise<void> {
-		testDir = path.join(os.tmpdir(), 'vsctests', uuid.generateUuid());
-		return await mkdirp(testDir, 493);
-	}
-
-	teardown(() => {
-		return new Promise<void>((c) => {
-			if (testDir) {
-				rimraf(testDir, RimRafMode.MOVE).then(c, c);
-			} else {
-				c(undefined);
-			}
-		}).then(() => testDir = null!);
-	});
-
-	test('errors cases - parse errors', () => {
-		fs.writeFileSync(keybindingsFile, ',,,,,,,,,,,,,,');
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined)
-			.then(() => assert.fail('Should fail with parse errors'),
-				error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.'));
-	});
-
-	test('errors cases - parse errors 2', () => {
-		fs.writeFileSync(keybindingsFile, '[{"key": }]');
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined)
-			.then(() => assert.fail('Should fail with parse errors'),
-				error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. Please open it to correct errors/warnings in the file and try again.'));
-	});
-
-	test('errors cases - dirty', () => {
-		instantiationService.stub(ITextFileService, 'isDirty', true);
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined)
-			.then(() => assert.fail('Should fail with dirty error'),
-				error => assert.equal(error.message, 'Unable to write because the keybindings configuration file is dirty. Please save it first and then try again.'));
-	});
-
-	test('errors cases - did not find an array', () => {
-		fs.writeFileSync(keybindingsFile, '{"key": "alt+c", "command": "hello"}');
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape } }), 'alt+c', undefined)
-			.then(() => assert.fail('Should fail with dirty error'),
-				error => assert.equal(error.message, 'Unable to write to the keybindings configuration file. It has an object which is not of type Array. Please open the file to clean up and try again.'));
-	});
-
-	test('edit a default keybinding to an empty file', () => {
-		fs.writeFileSync(keybindingsFile, '');
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('edit a default keybinding to an empty array', () => {
-		writeToKeybindingsFile();
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('edit a default keybinding in an existing array', () => {
-		writeToKeybindingsFile({ command: 'b', key: 'shift+c' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'shift+c', command: 'b' }, { key: 'alt+c', command: 'a' }, { key: 'escape', command: '-a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('add another keybinding', () => {
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
-		return testObject.addKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('add a new default keybinding', () => {
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
-		return testObject.addKeybinding(aResolvedKeybindingItem({ command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('add a new default keybinding using edit', () => {
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a' }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('edit an user keybinding', () => {
-		writeToKeybindingsFile({ key: 'escape', command: 'b' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'b' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'b', isDefault: false }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('edit an user keybinding with more than one element', () => {
-		writeToKeybindingsFile({ key: 'escape', command: 'b' }, { key: 'alt+shift+g', command: 'c' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: 'b' }, { key: 'alt+shift+g', command: 'c' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ firstPart: { keyCode: KeyCode.Escape }, command: 'b', isDefault: false }), 'alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('remove a default keybinding', () => {
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }];
-		return testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }))
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('remove a default keybinding should not ad duplicate entries', async () => {
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }];
-		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
-		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
-		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
-		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
-		await testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'a', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } } }));
-		assert.deepEqual(getUserKeybindings(), expected);
-	});
-
-	test('remove a user keybinding', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: 'b' });
-		return testObject.removeKeybinding(aResolvedKeybindingItem({ command: 'b', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } }, isDefault: false }))
-			.then(() => assert.deepEqual(getUserKeybindings(), []));
-	});
-
-	test('reset an edited keybinding', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: 'b' });
-		return testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', firstPart: { keyCode: KeyCode.KEY_C, modifiers: { altKey: true } }, isDefault: false }))
-			.then(() => assert.deepEqual(getUserKeybindings(), []));
-	});
-
-	test('reset a removed keybinding', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
-		return testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }))
-			.then(() => assert.deepEqual(getUserKeybindings(), []));
-	});
-
-	test('reset multiple removed keybindings', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-b' });
-		writeToKeybindingsFile({ key: 'alt+shift+c', command: '-b' });
-		writeToKeybindingsFile({ key: 'escape', command: '-b' });
-		return testObject.resetKeybinding(aResolvedKeybindingItem({ command: 'b', isDefault: false }))
-			.then(() => assert.deepEqual(getUserKeybindings(), []));
-	});
-
-	test('add a new keybinding to unassigned keybinding', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('add when expression', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-a' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', 'editorTextFocus')
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('update command and when expression', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', 'editorTextFocus')
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('update when expression', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus && !editorReadonly' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a', when: 'editorTextFocus' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false, when: 'editorTextFocus && !editorReadonly' }), 'shift+alt+c', 'editorTextFocus')
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	test('remove when expression', () => {
-		writeToKeybindingsFile({ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' });
-		const expected: IUserFriendlyKeybinding[] = [{ key: 'alt+c', command: '-a', when: 'editorTextFocus && !editorReadonly' }, { key: 'shift+alt+c', command: 'a' }];
-		return testObject.editKeybinding(aResolvedKeybindingItem({ command: 'a', isDefault: false }), 'shift+alt+c', undefined)
-			.then(() => assert.deepEqual(getUserKeybindings(), expected));
-	});
-
-	function writeToKeybindingsFile(...keybindings: IUserFriendlyKeybinding[]) {
-		fs.writeFileSync(keybindingsFile, JSON.stringify(keybindings || []));
-	}
-
-	function getUserKeybindings(): IUserFriendlyKeybinding[] {
-		return json.parse(fs.readFileSync(keybindingsFile).toString('utf8'));
-	}
-
-	function aResolvedKeybindingItem({ command, when, isDefault, firstPart, chordPart }: { command?: string, when?: string, isDefault?: boolean, firstPart?: { keyCode: KeyCode, modifiers?: Modifiers }, chordPart?: { keyCode: KeyCode, modifiers?: Modifiers } }): ResolvedKeybindingItem {
-		const aSimpleKeybinding = function (part: { keyCode: KeyCode, modifiers?: Modifiers }): SimpleKeybinding {
-			const { ctrlKey, shiftKey, altKey, metaKey } = part.modifiers || { ctrlKey: false, shiftKey: false, altKey: false, metaKey: false };
-			return new SimpleKeybinding(ctrlKey!, shiftKey!, altKey!, metaKey!, part.keyCode);
-		};
-		let parts: SimpleKeybinding[] = [];
-		if (firstPart) {
-			parts.push(aSimpleKeybinding(firstPart));
-			if (chordPart) {
-				parts.push(aSimpleKeybinding(chordPart));
-			}
-		}
-		const keybinding = parts.length > 0 ? new USLayoutResolvedKeybinding(new ChordKeybinding(parts), OS) : undefined;
-		return new ResolvedKeybindingItem(keybinding, command || 'some command', null, when ? ContextKeyExpr.deserialize(when) : undefined, isDefault === undefined ? true : isDefault, null, false);
-	}
-
-});
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts
index 0bde164b1..9d6b49f2e 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts
@@ -65,13 +65,12 @@ export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMa
 	const filePath = path.normalize(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/electron-browser/${file}`));
 
 	return readFile(filePath).then((buff) => {
-		let expected = buff.toString();
-		const actual = mapper.dumpDebugInfo();
+		const expected = buff.toString().replace(/\r\n/g, '\n');
+		const actual = mapper.dumpDebugInfo().replace(/\r\n/g, '\n');
 		if (actual !== expected && writeFileIfDifferent) {
 			const destPath = filePath.replace(/vscode[\/\\]out[\/\\]vs/, 'vscode/src/vs');
 			writeFile(destPath, actual);
 		}
-
-		assert.deepEqual(actual.split(/\r\n|\n/), expected.split(/\r\n|\n/));
+		assert.deepEqual(actual, expected);
 	});
 }
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts
index 7126a022e..b16e44bc9 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts
@@ -1465,11 +1465,11 @@ function _assertKeybindingTranslation(mapper: MacLinuxKeyboardMapper, OS: Operat
 
 	const actualHardwareKeypresses = mapper.simpleKeybindingToScanCodeBinding(runtimeKeybinding);
 	if (actualHardwareKeypresses.length === 0) {
-		assert.deepEqual([], expected, `simpleKeybindingToHardwareKeypress -- "${keybindingLabel}" -- actual: "[]" -- expected: "${expected}"`);
+		assert.deepStrictEqual([], expected, `simpleKeybindingToHardwareKeypress -- "${keybindingLabel}" -- actual: "[]" -- expected: "${expected}"`);
 		return;
 	}
 
 	const actual = actualHardwareKeypresses
 		.map(k => UserSettingsLabelProvider.toLabel(OS, [k], (keybinding) => ScanCodeUtils.toString(keybinding.scanCode)));
-	assert.deepEqual(actual, expected, `simpleKeybindingToHardwareKeypress -- "${keybindingLabel}" -- actual: "${actual}" -- expected: "${expected}"`);
+	assert.deepStrictEqual(actual, expected, `simpleKeybindingToHardwareKeypress -- "${keybindingLabel}" -- actual: "${actual}" -- expected: "${expected}"`);
 }
diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts
index d6855dd3a..76213a160 100644
--- a/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts
@@ -97,7 +97,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 			[{
 				label: 'Ctrl+^',
 				ariaLabel: 'Control+^',
-				electronAccelerator: 'Ctrl+]',
+				electronAccelerator: null,
 				userSettingsLabel: 'ctrl+oem_6',
 				isWYSIWYG: false,
 				isChord: false,
@@ -121,7 +121,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 			{
 				label: 'Ctrl+^',
 				ariaLabel: 'Control+^',
-				electronAccelerator: 'Ctrl+]',
+				electronAccelerator: null,
 				userSettingsLabel: 'ctrl+oem_6',
 				isWYSIWYG: false,
 				isChord: false,
@@ -137,7 +137,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 			[{
 				label: 'Shift+^',
 				ariaLabel: 'Shift+^',
-				electronAccelerator: 'Shift+]',
+				electronAccelerator: null,
 				userSettingsLabel: 'shift+oem_6',
 				isWYSIWYG: false,
 				isChord: false,
@@ -153,7 +153,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 			[{
 				label: 'Ctrl+§',
 				ariaLabel: 'Control+§',
-				electronAccelerator: 'Ctrl+/',
+				electronAccelerator: null,
 				userSettingsLabel: 'ctrl+oem_2',
 				isWYSIWYG: false,
 				isChord: false,
@@ -169,7 +169,7 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 			[{
 				label: 'Ctrl+Shift+§',
 				ariaLabel: 'Control+Shift+§',
-				electronAccelerator: 'Ctrl+Shift+/',
+				electronAccelerator: null,
 				userSettingsLabel: 'ctrl+shift+oem_2',
 				isWYSIWYG: false,
 				isChord: false,
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 74dc864bf..0b87296bf 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -11,16 +11,17 @@ import { Emitter } from 'vs/base/common/event';
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWorkspaceContextService, IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService, IWorkspace, isWorkspace } from 'vs/platform/workspace/common/workspace';
 import { basenameOrAuthority, basename, joinPath, dirname } from 'vs/base/common/resources';
 import { tildify, getPathLabel } from 'vs/base/common/labels';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, WORKSPACE_EXTENSION, toWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isSingleFolderWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent } from 'vs/platform/label/common/label';
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from 'vs/base/common/glob';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { hasDriveLetter } from 'vs/base/common/extpath';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint<ResourceLabelFormatter[]>({
 	extensionPoint: 'resourceLabelFormatters',
@@ -73,10 +74,6 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
 const sepRegexp = /\//g;
 const labelMatchingRegexp = /\$\{(scheme|authority|path|(query)\.(.+?))\}/g;
 
-function hasDriveLetter(path: string): boolean {
-	return !!(path && path[2] === ':');
-}
-
 class ResourceLabelFormattersHandler implements IWorkbenchContribution {
 	private formattersDisposables = new Map<ResourceLabelFormatter, IDisposable>();
 
@@ -115,7 +112,7 @@ export class LabelService extends Disposable implements ILabelService {
 
 		this.formatters.forEach(formatter => {
 			if (formatter.scheme === resource.scheme) {
-				if (!bestResult && !formatter.authority) {
+				if (!formatter.authority && (!bestResult || formatter.priority)) {
 					bestResult = formatter;
 					return;
 				}
@@ -152,6 +149,8 @@ export class LabelService extends Disposable implements ILabelService {
 			while (relativeLabel[overlap] && relativeLabel[overlap] === baseResourceLabel[overlap]) { overlap++; }
 			if (!relativeLabel[overlap] || relativeLabel[overlap] === formatting.separator) {
 				relativeLabel = relativeLabel.substring(1 + overlap);
+			} else if (overlap === baseResourceLabel.length && baseResource.uri.path === '/') {
+				relativeLabel = relativeLabel.substring(overlap);
 			}
 
 			const hasMultipleRoots = this.contextService.getWorkspace().folders.length > 1;
@@ -181,44 +180,60 @@ export class LabelService extends Disposable implements ILabelService {
 		return paths.basename(label);
 	}
 
-	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWorkspace), options?: { verbose: boolean }): string {
-		if (IWorkspace.isIWorkspace(workspace)) {
+	getWorkspaceLabel(workspace: IWorkspace | IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, options?: { verbose: boolean }): string {
+		if (isWorkspace(workspace)) {
 			const identifier = toWorkspaceIdentifier(workspace);
-			if (!identifier) {
-				return '';
+			if (identifier) {
+				return this.getWorkspaceLabel(identifier, options);
 			}
 
-			workspace = identifier;
+			return '';
 		}
 
-		// Workspace: Single Folder
+		// Workspace: Single Folder (as URI)
+		if (URI.isUri(workspace)) {
+			return this.doGetSingleFolderWorkspaceLabel(workspace, options);
+		}
+
+		// Workspace: Single Folder (as workspace identifier)
 		if (isSingleFolderWorkspaceIdentifier(workspace)) {
-			// Folder on disk
-			const label = options && options.verbose ? this.getUriLabel(workspace) : basename(workspace) || '/';
-			return this.appendWorkspaceSuffix(label, workspace);
+			return this.doGetSingleFolderWorkspaceLabel(workspace.uri, options);
 		}
 
+		// Workspace: Multi Root
 		if (isWorkspaceIdentifier(workspace)) {
-			// Workspace: Untitled
-			if (isUntitledWorkspace(workspace.configPath, this.environmentService)) {
-				return localize('untitledWorkspace', "Untitled (Workspace)");
-			}
-
-			// Workspace: Saved
-			let filename = basename(workspace.configPath);
-			if (filename.endsWith(WORKSPACE_EXTENSION)) {
-				filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
-			}
-			let label;
-			if (options && options.verbose) {
-				label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspace.configPath), filename)));
-			} else {
-				label = localize('workspaceName', "{0} (Workspace)", filename);
-			}
-			return this.appendWorkspaceSuffix(label, workspace.configPath);
+			return this.doGetWorkspaceLabel(workspace.configPath, options);
 		}
-		return '';
 
+		return '';
+	}
+
+	private doGetWorkspaceLabel(workspaceUri: URI, options?: { verbose: boolean }): string {
+
+		// Workspace: Untitled
+		if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
+			return localize('untitledWorkspace', "Untitled (Workspace)");
+		}
+
+		// Workspace: Saved
+		let filename = basename(workspaceUri);
+		if (filename.endsWith(WORKSPACE_EXTENSION)) {
+			filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		}
+
+		let label;
+		if (options && options.verbose) {
+			label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspaceUri), filename)));
+		} else {
+			label = localize('workspaceName', "{0} (Workspace)", filename);
+		}
+
+		return this.appendWorkspaceSuffix(label, workspaceUri);
+	}
+
+	private doGetSingleFolderWorkspaceLabel(folderUri: URI, options?: { verbose: boolean }): string {
+		const label = options && options.verbose ? this.getUriLabel(folderUri) : basename(folderUri) || '/';
+		return this.appendWorkspaceSuffix(label, folderUri);
 	}
 
 	getSeparator(scheme: string, authority?: string): '/' | '\\' {
@@ -268,7 +283,7 @@ export class LabelService extends Disposable implements ILabelService {
 		});
 
 		// convert \c:\something => C:\something
-		if (formatting.normalizeDriveLetter && hasDriveLetter(label)) {
+		if (formatting.normalizeDriveLetter && hasDriveLetter(label.substr(1))) {
 			label = label.charAt(1).toUpperCase() + label.substr(2);
 		}
 
diff --git a/src/vs/workbench/services/label/test/browser/label.test.ts b/src/vs/workbench/services/label/test/browser/label.test.ts
index 7f25ff892..7a032c477 100644
--- a/src/vs/workbench/services/label/test/browser/label.test.ts
+++ b/src/vs/workbench/services/label/test/browser/label.test.ts
@@ -160,7 +160,7 @@ suite('URI Label', () => {
 });
 
 
-suite('multi-root worksapce', () => {
+suite('multi-root workspace', () => {
 	let labelService: LabelService;
 
 	setup(() => {
@@ -171,7 +171,7 @@ suite('multi-root worksapce', () => {
 		labelService = new LabelService(
 			TestEnvironmentService,
 			new TestContextService(
-				new Workspace('test-workspaace', [
+				new Workspace('test-workspace', [
 					new WorkspaceFolder({ uri: sources, index: 0, name: 'Sources' }, { uri: sources.toString() }),
 					new WorkspaceFolder({ uri: tests, index: 1, name: 'Tests' }, { uri: tests.toString() }),
 					new WorkspaceFolder({ uri: other, index: 2, name: resources.basename(other) }, { uri: other.toString() }),
@@ -179,7 +179,7 @@ suite('multi-root worksapce', () => {
 			new TestPathService());
 	});
 
-	test('labels of files in multiroot workspaces are the foldername folloed by offset from the folder', () => {
+	test('labels of files in multiroot workspaces are the foldername followed by offset from the folder', () => {
 		labelService.registerFormatter({
 			scheme: 'file',
 			formatting: {
@@ -250,3 +250,57 @@ suite('multi-root worksapce', () => {
 		});
 	});
 });
+
+suite('workspace at FSP root', () => {
+	let labelService: LabelService;
+
+	setup(() => {
+		const rootFolder = URI.parse('myscheme://myauthority/');
+
+		labelService = new LabelService(
+			TestEnvironmentService,
+			new TestContextService(
+				new Workspace('test-workspace', [
+					new WorkspaceFolder({ uri: rootFolder, index: 0, name: 'FSProotFolder' }, { uri: rootFolder.toString() }),
+				])),
+			new TestPathService());
+		labelService.registerFormatter({
+			scheme: 'myscheme',
+			formatting: {
+				label: '${scheme}://${authority}${path}',
+				separator: '/',
+				tildify: false,
+				normalizeDriveLetter: false,
+				workspaceSuffix: '',
+				authorityPrefix: '',
+				stripPathStartingSeparator: false
+			}
+		});
+	});
+
+	test('non-relative label', () => {
+
+		const tests = {
+			'myscheme://myauthority/myFile1.txt': 'myscheme://myauthority/myFile1.txt',
+			'myscheme://myauthority/folder/myFile2.txt': 'myscheme://myauthority/folder/myFile2.txt',
+		};
+
+		Object.entries(tests).forEach(([uriString, label]) => {
+			const generated = labelService.getUriLabel(URI.parse(uriString), { relative: false });
+			assert.equal(generated, label);
+		});
+	});
+
+	test('relative label', () => {
+
+		const tests = {
+			'myscheme://myauthority/myFile1.txt': 'myFile1.txt',
+			'myscheme://myauthority/folder/myFile2.txt': 'folder/myFile2.txt',
+		};
+
+		Object.entries(tests).forEach(([uriString, label]) => {
+			const generated = labelService.getUriLabel(URI.parse(uriString), { relative: true });
+			assert.equal(generated, label);
+		});
+	});
+});
diff --git a/src/vs/workbench/services/label/test/electron-browser/label.test.ts b/src/vs/workbench/services/label/test/electron-browser/label.test.ts
index bb467cb48..24c474bdd 100644
--- a/src/vs/workbench/services/label/test/electron-browser/label.test.ts
+++ b/src/vs/workbench/services/label/test/electron-browser/label.test.ts
@@ -32,12 +32,12 @@ suite('URI Label', () => {
 		});
 
 		const uri1 = TestWorkspace.folders[0].uri.with({ path: TestWorkspace.folders[0].uri.path.concat('/a/b/c/d') });
-		assert.equal(labelService.getUriLabel(uri1, { relative: true }), isWindows ? 'a\\b\\c\\d' : 'a/b/c/d');
-		assert.equal(labelService.getUriLabel(uri1, { relative: false }), isWindows ? 'C:\\testWorkspace\\a\\b\\c\\d' : '/testWorkspace/a/b/c/d');
-		assert.equal(labelService.getUriBasenameLabel(uri1), 'd');
+		assert.strictEqual(labelService.getUriLabel(uri1, { relative: true }), isWindows ? 'a\\b\\c\\d' : 'a/b/c/d');
+		assert.strictEqual(labelService.getUriLabel(uri1, { relative: false }), isWindows ? 'C:\\testWorkspace\\a\\b\\c\\d' : '/testWorkspace/a/b/c/d');
+		assert.strictEqual(labelService.getUriBasenameLabel(uri1), 'd');
 
 		const uri2 = URI.file('c:\\1/2/3');
-		assert.equal(labelService.getUriLabel(uri2, { relative: false }), isWindows ? 'C:\\1\\2\\3' : '/c:\\1/2/3');
-		assert.equal(labelService.getUriBasenameLabel(uri2), '3');
+		assert.strictEqual(labelService.getUriLabel(uri2, { relative: false }), isWindows ? 'C:\\1\\2\\3' : '/c:\\1/2/3');
+		assert.strictEqual(labelService.getUriBasenameLabel(uri2), '3');
 	});
 });
diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts
index a405e8973..59e29ef7a 100644
--- a/src/vs/workbench/services/layout/browser/layoutService.ts
+++ b/src/vs/workbench/services/layout/browser/layoutService.ts
@@ -43,7 +43,7 @@ export function positionToString(position: Position): string {
 	}
 }
 
-const positionsByString: { [key: string]: Position } = {
+const positionsByString: { [key: string]: Position; } = {
 	[positionToString(Position.LEFT)]: Position.LEFT,
 	[positionToString(Position.RIGHT)]: Position.RIGHT,
 	[positionToString(Position.BOTTOM)]: Position.BOTTOM
@@ -62,7 +62,7 @@ export function panelOpensMaximizedSettingToString(setting: PanelOpensMaximizedO
 	}
 }
 
-const panelOpensMaximizedByString: { [key: string]: PanelOpensMaximizedOptions } = {
+const panelOpensMaximizedByString: { [key: string]: PanelOpensMaximizedOptions; } = {
 	[panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.ALWAYS)]: PanelOpensMaximizedOptions.ALWAYS,
 	[panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.NEVER)]: PanelOpensMaximizedOptions.NEVER,
 	[panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.REMEMBER_LAST)]: PanelOpensMaximizedOptions.REMEMBER_LAST
@@ -106,6 +106,11 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 */
 	readonly onPartVisibilityChange: Event<void>;
 
+	/**
+	 * Run a layout of the workbench.
+	 */
+	layout(): void;
+
 	/**
 	 * Asks the part service if all parts have been fully restored. For editor part
 	 * this means that the contents of editors have loaded.
@@ -194,6 +199,11 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 */
 	getMenubarVisibility(): MenuBarVisibility;
 
+	/**
+	 * Toggles the menu bar visibility.
+	 */
+	toggleMenuBar(): void;
+
 	/**
 	 * Gets the current panel position. Note that the panel can be hidden too.
 	 */
diff --git a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
index d9e5aed88..fe323702d 100644
--- a/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/browser/lifecycleService.ts
@@ -16,6 +16,7 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 	declare readonly _serviceBrand: undefined;
 
 	private beforeUnloadDisposable: IDisposable | undefined = undefined;
+	private expectedUnload = false;
 
 	constructor(
 		@ILogService readonly logService: ILogService
@@ -32,19 +33,37 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 	}
 
 	private onBeforeUnload(event: BeforeUnloadEvent): void {
+		if (this.expectedUnload) {
+			this.logService.info('[lifecycle] onBeforeUnload expected, ignoring once');
+
+			this.expectedUnload = false;
+
+			return; // ignore expected unload only once
+		}
+
 		this.logService.info('[lifecycle] onBeforeUnload triggered');
 
 		this.doShutdown(() => {
+
 			// Veto handling
 			event.preventDefault();
 			event.returnValue = localize('lifecycleVeto', "Changes that you made may not be saved. Please check press 'Cancel' and try again.");
 		});
 	}
 
+	withExpectedUnload(callback: Function): void {
+		this.expectedUnload = true;
+		try {
+			callback();
+		} finally {
+			this.expectedUnload = false;
+		}
+	}
+
 	shutdown(): void {
 		this.logService.info('[lifecycle] shutdown triggered');
 
-		// Remove beforeunload listener that would prevent shutdown
+		// Remove `beforeunload` listener that would prevent shutdown
 		this.beforeUnloadDisposable?.dispose();
 
 		// Handle shutdown without veto support
@@ -58,12 +77,17 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 
 		// Before Shutdown
 		this._onBeforeShutdown.fire({
-			veto(value) {
+			veto(value, id) {
 				if (typeof handleVeto === 'function') {
+					if (value instanceof Promise) {
+						logService.error(`[lifecycle] Long running operations before shutdown are unsupported in the web (id: ${id})`);
+
+						value = true; // implicitly vetos since we cannot handle promises in web
+					}
+
 					if (value === true) {
-						veto = true;
-					} else if (value instanceof Promise && !veto) {
-						logService.error('[lifecycle] Long running onBeforeShutdown currently not supported in the web');
+						logService.info(`[lifecycle]: Unload was prevented (id: ${id})`);
+
 						veto = true;
 					}
 				}
@@ -80,8 +104,8 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 
 		// No Veto: continue with Will Shutdown
 		this._onWillShutdown.fire({
-			join() {
-				logService.error('[lifecycle] Long running onWillShutdown currently not supported in the web');
+			join(promise, id) {
+				logService.error(`[lifecycle] Long running operations during shutdown are unsupported in the web (id: ${id})`);
 			},
 			reason: ShutdownReason.QUIT
 		});
diff --git a/src/vs/workbench/services/lifecycle/common/lifecycle.ts b/src/vs/workbench/services/lifecycle/common/lifecycle.ts
index 876edba7d..355cd4926 100644
--- a/src/vs/workbench/services/lifecycle/common/lifecycle.ts
+++ b/src/vs/workbench/services/lifecycle/common/lifecycle.ts
@@ -22,8 +22,11 @@ export interface BeforeShutdownEvent {
 	/**
 	 * Allows to veto the shutdown. The veto can be a long running operation but it
 	 * will block the application from closing.
+	 *
+	 * @param id to identify the veto operation in case it takes very long or never
+	 * completes.
 	 */
-	veto(value: boolean | Promise<boolean>): void;
+	veto(value: boolean | Promise<boolean>, id: string): void;
 
 	/**
 	 * The reason why the application will be shutting down.
@@ -44,8 +47,11 @@ export interface WillShutdownEvent {
 	/**
 	 * Allows to join the shutdown. The promise can be a long running operation but it
 	 * will block the application from closing.
+	 *
+	 * @param id to identify the join operation in case it takes very long or never
+	 * completes.
 	 */
-	join(promise: Promise<void>): void;
+	join(promise: Promise<void>, id: string): void;
 
 	/**
 	 * The reason why the application is shutting down.
diff --git a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
index a7e52e488..a7116f0df 100644
--- a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
@@ -49,7 +49,7 @@ export abstract class AbstractLifecycleService extends Disposable implements ILi
 		this.logService.trace(`lifecycle: phase changed (value: ${value})`);
 
 		this._phase = value;
-		mark(`LifecyclePhase/${LifecyclePhaseToString(value)}`);
+		mark(`code/LifecyclePhase/${LifecyclePhaseToString(value)}`);
 
 		const barrier = this.phaseWhen.get(this._phase);
 		if (barrier) {
diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
index e9fb6c211..61716c228 100644
--- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
@@ -16,11 +16,15 @@ import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import Severity from 'vs/base/common/severity';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { disposableTimeout } from 'vs/base/common/async';
 
 export class NativeLifecycleService extends AbstractLifecycleService {
 
 	private static readonly LAST_SHUTDOWN_REASON_KEY = 'lifecyle.lastShutdownReason';
 
+	private static readonly BEFORE_SHUTDOWN_WARNING_DELAY = 5000;
+	private static readonly WILL_SHUTDOWN_WARNING_DELAY = 5000;
+
 	declare readonly _serviceBrand: undefined;
 
 	private shutdownReason: ShutdownReason | undefined;
@@ -51,7 +55,7 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 			startupKind = StartupKind.NewWindow;
 		}
 
-		this.logService.trace(`lifecycle: starting up (startup kind: ${this._startupKind})`);
+		this.logService.trace(`[lifecycle] starting up (startup kind: ${this._startupKind})`);
 
 		return startupKind;
 	}
@@ -61,16 +65,16 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 
 		// Main side indicates that window is about to unload, check for vetos
 		ipcRenderer.on('vscode:onBeforeUnload', (event: unknown, reply: { okChannel: string, cancelChannel: string, reason: ShutdownReason }) => {
-			this.logService.trace(`lifecycle: onBeforeUnload (reason: ${reply.reason})`);
+			this.logService.trace(`[lifecycle] onBeforeUnload (reason: ${reply.reason})`);
 
 			// trigger onBeforeShutdown events and veto collecting
 			this.handleBeforeShutdown(reply.reason).then(veto => {
 				if (veto) {
-					this.logService.trace('lifecycle: onBeforeUnload prevented via veto');
+					this.logService.trace('[lifecycle] onBeforeUnload prevented via veto');
 
 					ipcRenderer.send(reply.cancelChannel, windowId);
 				} else {
-					this.logService.trace('lifecycle: onBeforeUnload continues without veto');
+					this.logService.trace('[lifecycle] onBeforeUnload continues without veto');
 
 					this.shutdownReason = reply.reason;
 					ipcRenderer.send(reply.okChannel, windowId);
@@ -80,7 +84,7 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 
 		// Main side indicates that we will indeed shutdown
 		ipcRenderer.on('vscode:onWillUnload', async (event: unknown, reply: { replyChannel: string, reason: ShutdownReason }) => {
-			this.logService.trace(`lifecycle: onWillUnload (reason: ${reply.reason})`);
+			this.logService.trace(`[lifecycle] onWillUnload (reason: ${reply.reason})`);
 
 			// trigger onWillShutdown events and joining
 			await this.handleWillShutdown(reply.reason);
@@ -100,35 +104,71 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 		});
 	}
 
-	private handleBeforeShutdown(reason: ShutdownReason): Promise<boolean> {
+	private async handleBeforeShutdown(reason: ShutdownReason): Promise<boolean> {
+		const logService = this.logService;
 		const vetos: (boolean | Promise<boolean>)[] = [];
+		const pendingVetos = new Set<string>();
 
 		this._onBeforeShutdown.fire({
-			veto(value) {
+			veto(value, id) {
 				vetos.push(value);
-			},
-			reason
-		});
 
-		return handleVetos(vetos, error => this.onShutdownError(reason, error));
-	}
+				// Log any veto instantly
+				if (value === true) {
+					logService.info(`[lifecycle]: Shutdown was prevented (id: ${id})`);
+				}
 
-	private async handleWillShutdown(reason: ShutdownReason): Promise<void> {
-		const joiners: Promise<void>[] = [];
-
-		this._onWillShutdown.fire({
-			join(promise) {
-				if (promise) {
-					joiners.push(promise);
+				// Track promise completion
+				else if (value instanceof Promise) {
+					pendingVetos.add(id);
+					value.then(veto => {
+						if (veto === true) {
+							logService.info(`[lifecycle]: Shutdown was prevented (id: ${id})`);
+						}
+					}).finally(() => pendingVetos.delete(id));
 				}
 			},
 			reason
 		});
 
+		const longRunningBeforeShutdownWarning = disposableTimeout(() => {
+			logService.warn(`[lifecycle] onBeforeShutdown is taking a long time, pending operations: ${Array.from(pendingVetos).join(', ')}`);
+		}, NativeLifecycleService.BEFORE_SHUTDOWN_WARNING_DELAY);
+
+		try {
+			return await handleVetos(vetos, error => this.onShutdownError(reason, error));
+		} finally {
+			longRunningBeforeShutdownWarning.dispose();
+		}
+	}
+
+	private async handleWillShutdown(reason: ShutdownReason): Promise<void> {
+		const joiners: Promise<void>[] = [];
+		const pendingJoiners = new Set<string>();
+
+		this._onWillShutdown.fire({
+			join(promise, id) {
+				if (promise) {
+					joiners.push(promise);
+
+					// Track promise completion
+					pendingJoiners.add(id);
+					promise.finally(() => pendingJoiners.delete(id));
+				}
+			},
+			reason
+		});
+
+		const longRunningWillShutdownWarning = disposableTimeout(() => {
+			this.logService.warn(`[lifecycle] onWillShutdown is taking a long time, pending operations: ${Array.from(pendingJoiners).join(', ')}`);
+		}, NativeLifecycleService.WILL_SHUTDOWN_WARNING_DELAY);
+
 		try {
 			await Promise.all(joiners);
 		} catch (error) {
 			this.onShutdownError(reason, error);
+		} finally {
+			longRunningWillShutdownWarning.dispose();
 		}
 	}
 
diff --git a/src/vs/workbench/services/log/electron-browser/logService.ts b/src/vs/workbench/services/log/electron-browser/logService.ts
index c230f8920..7169b6cf7 100644
--- a/src/vs/workbench/services/log/electron-browser/logService.ts
+++ b/src/vs/workbench/services/log/electron-browser/logService.ts
@@ -39,7 +39,7 @@ export class NativeLogService extends DelegatedLogService {
 			bufferSpdLogService = disposables.add(new BufferLogService(environmentService.configuration.logLevel));
 			loggers.push(
 				disposables.add(new ConsoleLogService(environmentService.configuration.logLevel)),
-				bufferSpdLogService,
+				bufferSpdLogService
 			);
 		}
 
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 70b48e530..2c52dc75f 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -76,15 +76,13 @@ export class NotificationService extends Disposable implements INotificationServ
 			const neverShowAgainAction = toDispose.add(new Action(
 				'workbench.notification.neverShowAgain',
 				nls.localize('neverShowAgain', "Don't Show Again"),
-				undefined, true, () => {
+				undefined, true, async () => {
 
 					// Close notification
 					handle.close();
 
 					// Remember choice
 					this.storageService.store(id, true, scope, StorageTarget.USER);
-
-					return Promise.resolve();
 				}));
 
 			// Insert as primary or secondary action
diff --git a/src/vs/workbench/services/outline/browser/outline.ts b/src/vs/workbench/services/outline/browser/outline.ts
new file mode 100644
index 000000000..b88bc02c6
--- /dev/null
+++ b/src/vs/workbench/services/outline/browser/outline.ts
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { IDataSource, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Event } from 'vs/base/common/event';
+import { FuzzyScore } from 'vs/base/common/filters';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchDataTreeOptions } from 'vs/platform/list/browser/listService';
+import { IEditorPane } from 'vs/workbench/common/editor';
+
+export const IOutlineService = createDecorator<IOutlineService>('IOutlineService');
+
+export const enum OutlineTarget {
+	OutlinePane = 1,
+	Breadcrumbs = 2,
+	QuickPick = 4
+}
+
+export interface IOutlineService {
+	_serviceBrand: undefined;
+	onDidChange: Event<void>;
+	canCreateOutline(editor: IEditorPane): boolean;
+	createOutline(editor: IEditorPane, target: OutlineTarget, token: CancellationToken): Promise<IOutline<any> | undefined>;
+	registerOutlineCreator(creator: IOutlineCreator<any, any>): IDisposable;
+}
+
+export interface IOutlineCreator<P extends IEditorPane, E> {
+	matches(candidate: IEditorPane): candidate is P;
+	createOutline(editor: P, target: OutlineTarget, token: CancellationToken): Promise<IOutline<E> | undefined>;
+}
+
+export interface IBreadcrumbsDataSource<E> {
+	getBreadcrumbElements(): readonly E[];
+}
+
+export interface IOutlineComparator<E> {
+	compareByPosition(a: E, b: E): number;
+	compareByType(a: E, b: E): number;
+	compareByName(a: E, b: E): number;
+}
+
+export interface IQuickPickOutlineElement<E> {
+	readonly element: E;
+	readonly label: string;
+	readonly iconClasses?: string[];
+	readonly ariaLabel?: string;
+	readonly description?: string;
+}
+
+export interface IQuickPickDataSource<E> {
+	getQuickPickElements(): Iterable<IQuickPickOutlineElement<E>>;
+}
+
+export interface IOutlineListConfig<E> {
+	readonly breadcrumbsDataSource: IBreadcrumbsDataSource<E>;
+	readonly treeDataSource: IDataSource<IOutline<E>, E>;
+	readonly delegate: IListVirtualDelegate<E>;
+	readonly renderers: ITreeRenderer<E, FuzzyScore, any>[];
+	readonly comparator: IOutlineComparator<E>;
+	readonly options: IWorkbenchDataTreeOptions<E, FuzzyScore>;
+	readonly quickPickDataSource: IQuickPickDataSource<E>;
+}
+
+export interface OutlineChangeEvent {
+	affectOnlyActiveElement?: true
+}
+
+export interface IOutline<E> {
+
+	readonly config: IOutlineListConfig<E>;
+	readonly outlineKind: string;
+
+	readonly isEmpty: boolean;
+	readonly activeElement: E | undefined;
+	readonly onDidChange: Event<OutlineChangeEvent>;
+
+	reveal(entry: E, options: IEditorOptions, sideBySide: boolean): Promise<void> | void;
+	preview(entry: E): IDisposable;
+	captureViewState(): IDisposable;
+	dispose(): void;
+}
+
+
+export const enum OutlineConfigKeys {
+	'icons' = 'outline.icons',
+	'problemsEnabled' = 'outline.problems.enabled',
+	'problemsColors' = 'outline.problems.colors',
+	'problemsBadges' = 'outline.problems.badges'
+}
diff --git a/src/vs/workbench/services/outline/browser/outlineService.ts b/src/vs/workbench/services/outline/browser/outlineService.ts
new file mode 100644
index 000000000..02f080fde
--- /dev/null
+++ b/src/vs/workbench/services/outline/browser/outlineService.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { LinkedList } from 'vs/base/common/linkedList';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IEditorPane } from 'vs/workbench/common/editor';
+import { IOutline, IOutlineCreator, IOutlineService, OutlineTarget } from 'vs/workbench/services/outline/browser/outline';
+import { Event, Emitter } from 'vs/base/common/event';
+
+class OutlineService implements IOutlineService {
+
+	declare _serviceBrand: undefined;
+
+	private readonly _factories = new LinkedList<IOutlineCreator<any, any>>();
+
+	private readonly _onDidChange = new Emitter<void>();
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+
+	canCreateOutline(pane: IEditorPane): boolean {
+		for (let factory of this._factories) {
+			if (factory.matches(pane)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	async createOutline(pane: IEditorPane, target: OutlineTarget, token: CancellationToken): Promise<IOutline<any> | undefined> {
+		for (let factory of this._factories) {
+			if (factory.matches(pane)) {
+				return await factory.createOutline(pane, target, token);
+			}
+		}
+		return undefined;
+	}
+
+	registerOutlineCreator(creator: IOutlineCreator<any, any>): IDisposable {
+		const rm = this._factories.push(creator);
+		this._onDidChange.fire();
+		return toDisposable(() => {
+			rm();
+			this._onDidChange.fire();
+		});
+	}
+}
+
+
+registerSingleton(IOutlineService, OutlineService, true);
diff --git a/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
similarity index 94%
rename from src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
rename to src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
index 7946b7903..fd75f3371 100644
--- a/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
+++ b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
@@ -16,7 +16,8 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { EditorModel } from 'vs/workbench/common/editor';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
+import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
+import { IKeybindingItemEntry, KeybindingMatches, KeybindingMatch, IKeybindingItem } from 'vs/workbench/services/preferences/common/preferences';
 
 export const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
 
@@ -24,44 +25,6 @@ const SOURCE_DEFAULT = localize('default', "Default");
 const SOURCE_EXTENSION = localize('extension', "Extension");
 const SOURCE_USER = localize('user', "User");
 
-export interface KeybindingMatch {
-	ctrlKey?: boolean;
-	shiftKey?: boolean;
-	altKey?: boolean;
-	metaKey?: boolean;
-	keyCode?: boolean;
-}
-
-export interface KeybindingMatches {
-	firstPart: KeybindingMatch;
-	chordPart: KeybindingMatch;
-}
-
-export interface IListEntry {
-	id: string;
-	templateId: string;
-}
-
-export interface IKeybindingItemEntry extends IListEntry {
-	keybindingItem: IKeybindingItem;
-	commandIdMatches?: IMatch[];
-	commandLabelMatches?: IMatch[];
-	commandDefaultLabelMatches?: IMatch[];
-	sourceMatches?: IMatch[];
-	whenMatches?: IMatch[];
-	keybindingMatches?: KeybindingMatches;
-}
-
-export interface IKeybindingItem {
-	keybinding: ResolvedKeybinding;
-	keybindingItem: ResolvedKeybindingItem;
-	commandLabel: string;
-	commandDefaultLabel: string;
-	command: string;
-	source: string;
-	when: string;
-}
-
 interface ModifierLabels {
 	ui: ModLabels;
 	aria: ModLabels;
@@ -99,9 +62,9 @@ export class KeybindingsEditorModel extends EditorModel {
 				.map(keybindingItem => (<IKeybindingItemEntry>{ id: KeybindingsEditorModel.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID }));
 		}
 
-		if (/@source:\s*(user|default)/i.test(searchValue)) {
+		if (/@source:\s*(user|default|extension)/i.test(searchValue)) {
 			keybindingItems = this.filterBySource(keybindingItems, searchValue);
-			searchValue = searchValue.replace(/@source:\s*(user|default)/i, '');
+			searchValue = searchValue.replace(/@source:\s*(user|default|extension)/i, '');
 		} else {
 			const keybindingMatches = /@keybinding:\s*((\".+\")|(\S+))/i.exec(searchValue);
 			if (keybindingMatches && (keybindingMatches[2] || keybindingMatches[3])) {
@@ -190,7 +153,7 @@ export class KeybindingsEditorModel extends EditorModel {
 		}
 
 		const commandsWithDefaultKeybindings = this.keybindingsService.getDefaultKeybindings().map(keybinding => keybinding.command);
-		for (const command of KeybindingResolver.getAllUnboundCommands(boundCommands)) {
+		for (const command of getAllUnboundCommands(boundCommands)) {
 			const keybindingItem = new ResolvedKeybindingItem(undefined, command, null, undefined, commandsWithDefaultKeybindings.indexOf(command) === -1, null, false);
 			this._keybindingItemsSortedByPrecedence.push(KeybindingsEditorModel.toKeybindingEntry(command, keybindingItem, workbenchActionsRegistry, actionLabels));
 		}
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/browser/preferencesEditorInput.ts
similarity index 99%
rename from src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
rename to src/vs/workbench/services/preferences/browser/preferencesEditorInput.ts
index 18fee0975..f679a2c6d 100644
--- a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesEditorInput.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { EditorInput, SideBySideEditorInput, Verbosity } from 'vs/workbench/common/editor';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
-import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 7cf56fbc3..5559f5d1e 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -30,7 +30,7 @@ import { IJSONEditingService } from 'vs/workbench/services/configuration/common/
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { GroupDirection, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, getSettingsTargetName, IKeybindingsEditorOptions, IKeybindingsEditorPane, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, SettingsEditorOptions, USE_SPLIT_JSON_SETTING } from 'vs/workbench/services/preferences/common/preferences';
-import { DefaultPreferencesEditorInput, KeybindingsEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { DefaultPreferencesEditorInput, KeybindingsEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/browser/preferencesEditorInput';
 import { defaultKeybindingsContents, DefaultKeybindingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel, DefaultRawSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@@ -246,7 +246,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			jsonEditor;
 
 		if (!this.workspaceSettingsResource) {
-			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
+			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder or workspace first to create workspace or folder settings."));
 			return Promise.reject(null);
 		}
 
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 736eeef7f..2e9547816 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -18,7 +18,9 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { EditorOptions, IEditorPane } from 'vs/workbench/common/editor';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { IMatch } from 'vs/base/common/filters';
+import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 
 export enum SettingValueType {
 	Null = 'null',
@@ -241,6 +243,41 @@ export function getSettingsTargetName(target: ConfigurationTarget, resource: URI
 	return '';
 }
 
+export interface KeybindingMatch {
+	ctrlKey?: boolean;
+	shiftKey?: boolean;
+	altKey?: boolean;
+	metaKey?: boolean;
+	keyCode?: boolean;
+}
+
+export interface KeybindingMatches {
+	firstPart: KeybindingMatch;
+	chordPart: KeybindingMatch;
+}
+
+export interface IKeybindingItemEntry {
+	id: string;
+	templateId: string;
+	keybindingItem: IKeybindingItem;
+	commandIdMatches?: IMatch[];
+	commandLabelMatches?: IMatch[];
+	commandDefaultLabelMatches?: IMatch[];
+	sourceMatches?: IMatch[];
+	whenMatches?: IMatch[];
+	keybindingMatches?: KeybindingMatches;
+}
+
+export interface IKeybindingItem {
+	keybinding: ResolvedKeybinding;
+	keybindingItem: ResolvedKeybindingItem;
+	commandLabel: string;
+	commandDefaultLabel: string;
+	command: string;
+	source: string;
+	when: string;
+}
+
 export interface IKeybindingsEditorPane extends IEditorPane {
 
 	readonly activeKeybindingEntry: IKeybindingItemEntry | null;
diff --git a/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
similarity index 99%
rename from src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
rename to src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
index 9f344836f..73ff43831 100644
--- a/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
+++ b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts
@@ -15,11 +15,12 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsEditorModel, IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
 
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/preferences';
 
 interface Modifiers {
 	metaKey?: boolean;
diff --git a/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts b/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
index cdc53cda4..afe18caf1 100644
--- a/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
+++ b/src/vs/workbench/services/progress/test/browser/progressIndicator.test.ts
@@ -21,6 +21,7 @@ class TestViewlet implements IViewlet {
 	readonly onDidBlur = Event.None;
 	readonly onDidFocus = Event.None;
 
+	hasFocus() { return false; }
 	getId(): string { return this.id; }
 	getTitle(): string { return this.id; }
 	getActions(): IAction[] { return []; }
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
index 5a9684c38..e3406ca12 100644
--- a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
@@ -3,14 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as nls from 'vs/nls';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { AbstractRemoteAgentService } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IWebSocketFactory, BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
 import { ILogService } from 'vs/platform/log/common/log';
+import { Severity } from 'vs/platform/notification/common/notification';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 
 export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
 
@@ -25,3 +34,60 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		super(new BrowserSocketFactory(webSocketFactory), environmentService, productService, remoteAuthorityResolverService, signService, logService);
 	}
 }
+
+class RemoteConnectionFailureNotificationContribution implements IWorkbenchContribution {
+
+	constructor(
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IHostService private readonly _hostService: IHostService,
+		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+	) {
+		// Let's cover the case where connecting to fetch the remote extension info fails
+		remoteAgentService.getRawEnvironment()
+			.then(undefined, (err) => {
+
+				type RemoteConnectionFailureClassification = {
+					web: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					message: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+				};
+				type RemoteConnectionFailureEvent = {
+					web: boolean;
+					remoteName: string | undefined;
+					message: string;
+				};
+				this._telemetryService.publicLog2<RemoteConnectionFailureEvent, RemoteConnectionFailureClassification>('remoteConnectionFailure', {
+					web: true,
+					remoteName: getRemoteName(this._environmentService.remoteAuthority),
+					message: err ? err.message : ''
+				});
+
+				if (!RemoteAuthorityResolverError.isHandled(err)) {
+					this._presentConnectionError(err);
+				}
+			});
+	}
+
+	private async _presentConnectionError(err: any): Promise<void> {
+		const res = await this._dialogService.show(
+			Severity.Error,
+			nls.localize('connectionError', "An unexpected error occurred that requires a reload of this page."),
+			[
+				nls.localize('reload', "Reload")
+			],
+			{
+				detail: nls.localize('connectionErrorDetail', "The workbench failed to connect to the server (Error: {0})", err ? err.message : '')
+			}
+		);
+
+		if (res.choice === 0) {
+			this._hostService.reload();
+		}
+	}
+
+}
+
+const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
+workbenchRegistry.registerWorkbenchContribution(RemoteConnectionFailureNotificationContribution, LifecyclePhase.Ready);
diff --git a/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts b/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
new file mode 100644
index 000000000..4879d4b60
--- /dev/null
+++ b/src/vs/workbench/services/remote/browser/tunnelServiceImpl.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
+import { AbstractTunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+
+export class TunnelService extends AbstractTunnelService {
+	constructor(
+		@ILogService logService: ILogService,
+		@IWorkbenchEnvironmentService private environmentService: IWorkbenchEnvironmentService
+	) {
+		super(logService);
+	}
+
+	protected retainOrCreateTunnel(_addressProvider: IAddressProvider, remoteHost: string, remotePort: number, localPort: number | undefined, elevateIfNeeded: boolean, isPublic: boolean): Promise<RemoteTunnel | undefined> | undefined {
+		const existing = this.getTunnelFromMap(remoteHost, remotePort);
+		if (existing) {
+			++existing.refcount;
+			return existing.value;
+		}
+
+		if (this._tunnelProvider) {
+			return this.createWithProvider(this._tunnelProvider, remoteHost, remotePort, localPort, elevateIfNeeded, isPublic);
+		}
+		return undefined;
+	}
+
+	canTunnel(uri: URI): boolean {
+		return super.canTunnel(uri) && !!this.environmentService.remoteAuthority;
+	}
+}
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index 1feea3dd9..9440bcf7a 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -3,20 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IChannel, IServerChannel, getDelayedChannel, IPCLogger } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/common/ipc.net';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { connectRemoteAgentManagement, IConnectionOptions, ISocketFactory, PersistentConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
 import { RemoteExtensionEnvironmentChannelClient } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
 import { Emitter } from 'vs/base/common/event';
 import { ISignService } from 'vs/platform/sign/common/sign';
@@ -198,27 +193,10 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 			ipcLogger: false ? new IPCLogger(`Local \u2192 Remote`, `Remote \u2192 Local`) : null
 		};
 		const connection = this._register(await connectRemoteAgentManagement(options, this.remoteAuthority, `renderer`));
+		connection.protocol.onDidDispose(() => {
+			connection.dispose();
+		});
 		this._register(connection.onDidStateChange(e => this._onDidStateChange.fire(e)));
 		return connection.client;
 	}
 }
-
-class RemoteConnectionFailureNotificationContribution implements IWorkbenchContribution {
-
-	constructor(
-		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-		@INotificationService notificationService: INotificationService,
-	) {
-		// Let's cover the case where connecting to fetch the remote extension info fails
-		remoteAgentService.getRawEnvironment()
-			.then(undefined, err => {
-				if (!RemoteAuthorityResolverError.isHandled(err)) {
-					notificationService.error(nls.localize('connectionError', "Failed to connect to the remote extension host server (Error: {0})", err ? err.message : ''));
-				}
-			});
-	}
-
-}
-
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(RemoteConnectionFailureNotificationContribution, LifecyclePhase.Ready);
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
index 710c75897..24000d04e 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as platform from 'vs/base/common/platform';
+import * as performance from 'vs/base/common/performance';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IExtensionDescription, ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
@@ -41,6 +42,7 @@ export interface IRemoteAgentEnvironmentDTO {
 	workspaceStorageHome: UriComponents;
 	userHome: UriComponents;
 	os: platform.OperatingSystem;
+	marks: performance.PerformanceMark[]
 }
 
 export class RemoteExtensionEnvironmentChannelClient {
@@ -63,7 +65,8 @@ export class RemoteExtensionEnvironmentChannelClient {
 			globalStorageHome: URI.revive(data.globalStorageHome),
 			workspaceStorageHome: URI.revive(data.workspaceStorageHome),
 			userHome: URI.revive(data.userHome),
-			os: data.os
+			os: data.os,
+			marks: data.marks
 		};
 	}
 
diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
index 0f0454457..d78bfd03a 100644
--- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts
+++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
@@ -14,6 +14,8 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { TunnelInformation, TunnelDescription, IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IAddressProvider } from 'vs/platform/remote/common/remoteAgentConnection';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { isNumber, isObject, isString } from 'vs/base/common/types';
 
 export const IRemoteExplorerService = createDecorator<IRemoteExplorerService>('remoteExplorerService');
 export const REMOTE_EXPLORER_TYPE_KEY: string = 'remote.explorerType';
@@ -27,6 +29,12 @@ export enum TunnelType {
 	Add = 'Add'
 }
 
+export enum TunnelPrivacy {
+	ConstantPrivate = 'ConstantPrivate', // private, and changing is unsupported
+	Private = 'Private',
+	Public = 'Public'
+}
+
 export interface ITunnelItem {
 	tunnelType: TunnelType;
 	remoteHost: string;
@@ -35,8 +43,10 @@ export interface ITunnelItem {
 	localPort?: number;
 	name?: string;
 	closeable?: boolean;
+	privacy?: TunnelPrivacy;
 	description?: string;
-	readonly iconClasses?: string;
+	wideDescription?: string;
+	readonly icon?: ThemeIcon;
 	readonly label: string;
 }
 
@@ -46,9 +56,10 @@ export interface Tunnel {
 	localAddress: string;
 	localPort?: number;
 	name?: string;
-	description?: string;
 	closeable?: boolean;
+	privacy: TunnelPrivacy;
 	runningProcess: string | undefined;
+	pid: number | undefined;
 	source?: string;
 }
 
@@ -57,7 +68,7 @@ export function makeAddress(host: string, port: number): string {
 }
 
 export function parseAddress(address: string): { host: string, port: number } | undefined {
-	const matches = address.match(/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\:|localhost:)?([0-9]+)$/);
+	const matches = address.match(/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\:|localhost:|[a-zA-Z]+:)?([0-9]+)$/);
 	if (!matches) {
 		return undefined;
 	}
@@ -103,6 +114,118 @@ export function mapHasAddressLocalhostOrAllInterfaces<T>(map: Map<string, T>, ho
 	return undefined;
 }
 
+export enum OnPortForward {
+	Notify = 'notify',
+	OpenBrowser = 'openBrowser',
+	Silent = 'silent',
+	Ignore = 'ignore'
+}
+
+interface Attributes {
+	label: string | undefined;
+	onAutoForward: OnPortForward | undefined,
+	elevateIfNeeded: boolean | undefined;
+}
+
+interface PortAttributes extends Attributes {
+	port: number | { start: number, end: number };
+}
+
+export class PortsAttributes extends Disposable {
+	private static SETTING = 'remote.portsAttributes';
+	private static RANGE = /^(\d+)\-(\d+)$/;
+	private portsAttributes: PortAttributes[] = [];
+	private _onDidChangeAttributes = new Emitter<void>();
+	public readonly onDidChangeAttributes = this._onDidChangeAttributes.event;
+
+	constructor(private readonly configurationService: IConfigurationService) {
+		super();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(PortsAttributes.SETTING)) {
+				this.updateAttributes();
+			}
+		}));
+		this.updateAttributes();
+	}
+
+	private updateAttributes() {
+		this.portsAttributes = this.readSetting();
+		this._onDidChangeAttributes.fire();
+	}
+
+	getAttributes(port: number): Attributes | undefined {
+		let index = this.findNextIndex(port, this.portsAttributes, 0);
+		const attributes: Attributes = {
+			label: undefined,
+			onAutoForward: undefined,
+			elevateIfNeeded: undefined
+		};
+		while (index >= 0) {
+			const found = this.portsAttributes[index];
+			if (found.port === port) {
+				attributes.onAutoForward = found.onAutoForward ?? attributes.onAutoForward;
+				attributes.elevateIfNeeded = (found.elevateIfNeeded !== undefined) ? found.elevateIfNeeded : attributes.elevateIfNeeded;
+				attributes.label = found.label ?? attributes.label;
+			} else {
+				// It's a range, which means that if the attribute is already set, we keep it
+				attributes.onAutoForward = attributes.onAutoForward ?? found.onAutoForward;
+				attributes.elevateIfNeeded = (attributes.elevateIfNeeded !== undefined) ? attributes.elevateIfNeeded : found.elevateIfNeeded;
+				attributes.label = attributes.label ?? found.label;
+			}
+			index = this.findNextIndex(port, this.portsAttributes, index + 1);
+		}
+		if (attributes.onAutoForward !== undefined || attributes.elevateIfNeeded !== undefined || attributes.label !== undefined) {
+			return attributes;
+		}
+		return undefined;
+	}
+
+	private findNextIndex(port: number, attributes: PortAttributes[], fromIndex: number): number {
+		if (fromIndex >= attributes.length) {
+			return -1;
+		}
+		const sliced = attributes.slice(fromIndex);
+		const foundIndex = sliced.findIndex((value) => {
+			return isNumber(value.port) ? (value.port === port) : (port >= value.port.start && port <= value.port.end);
+		});
+		return foundIndex >= 0 ? foundIndex + fromIndex : -1;
+	}
+
+	private readSetting(): PortAttributes[] {
+		const settingValue = this.configurationService.getValue(PortsAttributes.SETTING);
+		if (!settingValue || !isObject(settingValue)) {
+			return [];
+		}
+
+		const attributes: PortAttributes[] = [];
+		for (let portNumber in settingValue) {
+			const setting = (<any>settingValue)[portNumber];
+			let port: number | { start: number, end: number } | undefined = undefined;
+			if (portNumber !== undefined) {
+				if (Number(portNumber)) {
+					port = Number(portNumber);
+				} else if (isString(portNumber) && PortsAttributes.RANGE.test(portNumber)) {
+					const match = (<string>portNumber).match(PortsAttributes.RANGE);
+					port = { start: Number(match![1]), end: Number(match![2]) };
+				}
+			}
+			if (!port) {
+				continue;
+			}
+			attributes.push({
+				port,
+				elevateIfNeeded: setting.elevateIfPrivileged,
+				onAutoForward: setting.onAutoForward,
+				label: setting.label
+			});
+		}
+		attributes.sort((a, b) => {
+			return (isNumber(a.port) ? a.port : a.port.start) - (isNumber(b.port) ? b.port : b.port.start);
+		});
+		return attributes;
+	}
+}
+
 export class TunnelModel extends Disposable {
 	readonly forwarded: Map<string, Tunnel>;
 	readonly detected: Map<string, Tunnel>;
@@ -113,15 +236,16 @@ export class TunnelModel extends Disposable {
 	public onClosePort: Event<{ host: string, port: number }> = this._onClosePort.event;
 	private _onPortName: Emitter<{ host: string, port: number }> = new Emitter();
 	public onPortName: Event<{ host: string, port: number }> = this._onPortName.event;
-	private _candidates: Map<string, { host: string, port: number, detail: string }>;
+	private _candidates: Map<string, CandidatePort> | undefined;
 	private _onCandidatesChanged: Emitter<Map<string, { host: string, port: number }>> = new Emitter();
 	// onCandidateChanged returns the removed candidates
 	public onCandidatesChanged: Event<Map<string, { host: string, port: number }>> = this._onCandidatesChanged.event;
-	private _candidateFilter: ((candidates: { host: string, port: number, detail: string }[]) => Promise<{ host: string, port: number, detail: string }[]>) | undefined;
+	private _candidateFilter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined;
 	private tunnelRestoreValue: string | undefined;
 	private _onEnvironmentTunnelsSet: Emitter<void> = new Emitter();
 	public onEnvironmentTunnelsSet: Event<void> = this._onEnvironmentTunnelsSet.event;
 	private _environmentTunnelsSet: boolean = false;
+	private portsAttributes: PortsAttributes;
 
 	constructor(
 		@ITunnelService private readonly tunnelService: ITunnelService,
@@ -131,20 +255,23 @@ export class TunnelModel extends Disposable {
 		@IRemoteAuthorityResolverService private readonly remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 	) {
 		super();
+		this.portsAttributes = new PortsAttributes(configurationService);
 		this.tunnelRestoreValue = this.storageService.get(TUNNELS_TO_RESTORE, StorageScope.WORKSPACE);
-		this._candidates = new Map();
 		this.forwarded = new Map();
 		this.remoteTunnels = new Map();
 		this.tunnelService.tunnels.then(tunnels => {
 			tunnels.forEach(tunnel => {
 				if (tunnel.localAddress) {
 					const key = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
+					const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? new Map(), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
 					this.forwarded.set(key, {
 						remotePort: tunnel.tunnelRemotePort,
 						remoteHost: tunnel.tunnelRemoteHost,
 						localAddress: tunnel.localAddress,
 						localPort: tunnel.tunnelLocalPort,
-						runningProcess: mapHasAddressLocalhostOrAllInterfaces(this._candidates, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort)?.detail
+						runningProcess: matchingCandidate?.detail,
+						pid: matchingCandidate?.pid,
+						privacy: this.makeTunnelPrivacy(tunnel.public)
 					});
 					this.remoteTunnels.set(key, tunnel);
 				}
@@ -155,13 +282,16 @@ export class TunnelModel extends Disposable {
 		this._register(this.tunnelService.onTunnelOpened(tunnel => {
 			const key = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
 			if ((!this.forwarded.has(key)) && tunnel.localAddress) {
+				const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? new Map(), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
 				this.forwarded.set(key, {
 					remoteHost: tunnel.tunnelRemoteHost,
 					remotePort: tunnel.tunnelRemotePort,
 					localAddress: tunnel.localAddress,
 					localPort: tunnel.tunnelLocalPort,
 					closeable: true,
-					runningProcess: mapHasAddressLocalhostOrAllInterfaces(this._candidates, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort)?.detail
+					runningProcess: matchingCandidate?.detail,
+					pid: matchingCandidate?.pid,
+					privacy: this.makeTunnelPrivacy(tunnel.public)
 				});
 			}
 			this.storeForwarded();
@@ -176,14 +306,23 @@ export class TunnelModel extends Disposable {
 				this._onClosePort.fire(address);
 			}
 		}));
+
+		this._register(this.portsAttributes.onDidChangeAttributes(this.updateAttributes, this));
+	}
+
+	private makeTunnelPrivacy(isPublic: boolean) {
+		return isPublic ? TunnelPrivacy.Public : this.tunnelService.canMakePublic ? TunnelPrivacy.Private : TunnelPrivacy.ConstantPrivate;
 	}
 
 	async restoreForwarded() {
 		if (this.configurationService.getValue('remote.restoreForwardedPorts')) {
 			if (this.tunnelRestoreValue) {
-				(<Tunnel[] | undefined>JSON.parse(this.tunnelRestoreValue))?.forEach(tunnel => {
-					this.forward({ host: tunnel.remoteHost, port: tunnel.remotePort }, tunnel.localPort, tunnel.name);
-				});
+				const tunnels = <Tunnel[] | undefined>JSON.parse(this.tunnelRestoreValue) ?? [];
+				for (let tunnel of tunnels) {
+					if (!mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort)) {
+						await this.forward({ host: tunnel.remoteHost, port: tunnel.remotePort }, tunnel.localPort, tunnel.name, undefined, undefined, tunnel.privacy === TunnelPrivacy.Public);
+					}
+				}
 			}
 		}
 	}
@@ -194,7 +333,7 @@ export class TunnelModel extends Disposable {
 		}
 	}
 
-	async forward(remote: { host: string, port: number }, local?: number, name?: string, source?: string): Promise<RemoteTunnel | void> {
+	async forward(remote: { host: string, port: number }, local?: number, name?: string, source?: string, elevateIfNeeded?: boolean, isPublic?: boolean): Promise<RemoteTunnel | void> {
 		const existingTunnel = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, remote.host, remote.port);
 		if (!existingTunnel) {
 			const authority = this.environmentService.remoteAuthority;
@@ -202,17 +341,22 @@ export class TunnelModel extends Disposable {
 				getAddress: async () => { return (await this.remoteAuthorityResolverService.resolveAuthority(authority)).authority; }
 			} : undefined;
 
-			const tunnel = await this.tunnelService.openTunnel(addressProvider, remote.host, remote.port, local);
+			const attributes = this.portsAttributes.getAttributes(local !== undefined ? local : remote.port);
+
+			const tunnel = await this.tunnelService.openTunnel(addressProvider, remote.host, remote.port, local, (!elevateIfNeeded) ? attributes?.elevateIfNeeded : elevateIfNeeded, isPublic);
 			if (tunnel && tunnel.localAddress) {
+				const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? new Map(), remote.host, remote.port);
 				const newForward: Tunnel = {
 					remoteHost: tunnel.tunnelRemoteHost,
 					remotePort: tunnel.tunnelRemotePort,
 					localPort: tunnel.tunnelLocalPort,
-					name: name,
+					name: name ?? attributes?.label,
 					closeable: true,
 					localAddress: tunnel.localAddress,
-					runningProcess: mapHasAddressLocalhostOrAllInterfaces(this._candidates, remote.host, remote.port)?.detail,
-					source
+					runningProcess: matchingCandidate?.detail,
+					pid: matchingCandidate?.pid,
+					source,
+					privacy: this.makeTunnelPrivacy(tunnel.public)
 				};
 				const key = makeAddress(remote.host, remote.port);
 				this.forwarded.set(key, newForward);
@@ -257,12 +401,15 @@ export class TunnelModel extends Disposable {
 	addEnvironmentTunnels(tunnels: TunnelDescription[] | undefined): void {
 		if (tunnels) {
 			tunnels.forEach(tunnel => {
+				const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? new Map(), tunnel.remoteAddress.host, tunnel.remoteAddress.port);
 				this.detected.set(makeAddress(tunnel.remoteAddress.host, tunnel.remoteAddress.port), {
 					remoteHost: tunnel.remoteAddress.host,
 					remotePort: tunnel.remoteAddress.port,
 					localAddress: typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port),
 					closeable: false,
-					runningProcess: mapHasAddressLocalhostOrAllInterfaces(this._candidates, tunnel.remoteAddress.host, tunnel.remoteAddress.port)?.detail
+					runningProcess: matchingCandidate?.detail,
+					pid: matchingCandidate?.pid,
+					privacy: TunnelPrivacy.ConstantPrivate
 				});
 			});
 		}
@@ -271,11 +418,11 @@ export class TunnelModel extends Disposable {
 		this._onForwardPort.fire();
 	}
 
-	setCandidateFilter(filter: ((candidates: { host: string, port: number, detail: string }[]) => Promise<{ host: string, port: number, detail: string }[]>) | undefined): void {
+	setCandidateFilter(filter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined): void {
 		this._candidateFilter = filter;
 	}
 
-	async setCandidates(candidates: { host: string, port: number, detail: string }[]) {
+	async setCandidates(candidates: CandidatePort[]) {
 		let processedCandidates = candidates;
 		if (this._candidateFilter) {
 			// When an extension provides a filter, we do the filtering on the extension host before the candidates are set here.
@@ -286,29 +433,26 @@ export class TunnelModel extends Disposable {
 		this._onCandidatesChanged.fire(removedCandidates);
 	}
 
-	private polishProcessDetail(detail: string): string {
-		const nullIndex = detail.indexOf('\0');
-		return detail.substr(0, nullIndex > 0 ? nullIndex : detail.length).trim();
-	}
-
 	// Returns removed candidates
-	private updateInResponseToCandidates(candidates: { host: string, port: number, detail: string }[]): Map<string, { host: string, port: number }> {
-		const removedCandidates = this._candidates;
-		this._candidates = new Map();
+	private updateInResponseToCandidates(candidates: CandidatePort[]): Map<string, { host: string, port: number }> {
+		const removedCandidates = this._candidates ?? new Map();
+		const candidatesMap = new Map();
+		this._candidates = candidatesMap;
 		candidates.forEach(value => {
-			const detail = this.polishProcessDetail(value.detail);
 			const addressKey = makeAddress(value.host, value.port);
-			this._candidates.set(addressKey, {
+			candidatesMap.set(addressKey, {
 				host: value.host,
 				port: value.port,
-				detail
+				detail: value.detail,
+				pid: value.pid
 			});
 			if (removedCandidates.has(addressKey)) {
 				removedCandidates.delete(addressKey);
 			}
 			const forwardedValue = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, value.host, value.port);
 			if (forwardedValue) {
-				forwardedValue.runningProcess = detail;
+				forwardedValue.runningProcess = value.detail;
+				forwardedValue.pid = value.pid;
 			}
 		});
 		removedCandidates.forEach((_value, key) => {
@@ -319,18 +463,41 @@ export class TunnelModel extends Disposable {
 			const forwardedValue = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, parsedAddress.host, parsedAddress.port);
 			if (forwardedValue) {
 				forwardedValue.runningProcess = undefined;
+				forwardedValue.pid = undefined;
 			}
 			const detectedValue = mapHasAddressLocalhostOrAllInterfaces(this.detected, parsedAddress.host, parsedAddress.port);
 			if (detectedValue) {
 				detectedValue.runningProcess = undefined;
+				detectedValue.pid = undefined;
 			}
 		});
 		return removedCandidates;
 	}
 
-	get candidates(): { host: string, port: number, detail: string }[] {
-		return Array.from(this._candidates.values());
+	get candidates(): CandidatePort[] {
+		return this._candidates ? Array.from(this._candidates.values()) : [];
 	}
+
+	get candidatesOrUndefined(): CandidatePort[] | undefined {
+		return this._candidates ? this.candidates : undefined;
+	}
+
+	private updateAttributes() {
+		// If the label changes in the attributes, we should update it.
+		for (let forwarded of this.forwarded.values()) {
+			const attributes = this.portsAttributes.getAttributes(forwarded.remotePort);
+			if (attributes && attributes.label && attributes.label !== forwarded.name) {
+				this.name(forwarded.remoteHost, forwarded.remotePort, attributes.label);
+			}
+		}
+	}
+}
+
+export interface CandidatePort {
+	host: string;
+	port: number;
+	detail: string;
+	pid: number;
 }
 
 export interface IRemoteExplorerService {
@@ -341,12 +508,15 @@ export interface IRemoteExplorerService {
 	onDidChangeEditable: Event<ITunnelItem | undefined>;
 	setEditable(tunnelItem: ITunnelItem | undefined, data: IEditableData | null): void;
 	getEditableData(tunnelItem: ITunnelItem | undefined): IEditableData | undefined;
-	forward(remote: { host: string, port: number }, localPort?: number, name?: string, source?: string): Promise<RemoteTunnel | void>;
+	forward(remote: { host: string, port: number }, localPort?: number, name?: string, source?: string, elevateIfNeeded?: boolean, isPublic?: boolean): Promise<RemoteTunnel | void>;
 	close(remote: { host: string, port: number }): Promise<void>;
 	setTunnelInformation(tunnelInformation: TunnelInformation | undefined): void;
-	setCandidateFilter(filter: ((candidates: { host: string, port: number, detail: string }[]) => Promise<{ host: string, port: number, detail: string }[]>) | undefined): IDisposable;
-	onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): void;
+	setCandidateFilter(filter: ((candidates: CandidatePort[]) => Promise<CandidatePort[]>) | undefined): IDisposable;
+	onFoundNewCandidates(candidates: CandidatePort[]): void;
 	restore(): Promise<void>;
+	enablePortsFeatures(): void;
+	onEnabledPortsFeatures: Event<void>;
+	portsFeaturesEnabled: boolean;
 }
 
 class RemoteExplorerService implements IRemoteExplorerService {
@@ -358,6 +528,9 @@ class RemoteExplorerService implements IRemoteExplorerService {
 	private _editable: { tunnelItem: ITunnelItem | undefined, data: IEditableData } | undefined;
 	private readonly _onDidChangeEditable: Emitter<ITunnelItem | undefined> = new Emitter();
 	public readonly onDidChangeEditable: Event<ITunnelItem | undefined> = this._onDidChangeEditable.event;
+	private readonly _onEnabledPortsFeatures: Emitter<void> = new Emitter();
+	public readonly onEnabledPortsFeatures: Event<void> = this._onEnabledPortsFeatures.event;
+	private _portsFeaturesEnabled: boolean = false;
 
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
@@ -388,8 +561,8 @@ class RemoteExplorerService implements IRemoteExplorerService {
 		return this._tunnelModel;
 	}
 
-	forward(remote: { host: string, port: number }, local?: number, name?: string, source?: string): Promise<RemoteTunnel | void> {
-		return this.tunnelModel.forward(remote, local, name, source);
+	forward(remote: { host: string, port: number }, local?: number, name?: string, source?: string, elevateIfNeeded?: boolean, isPublic?: boolean): Promise<RemoteTunnel | void> {
+		return this.tunnelModel.forward(remote, local, name, source, elevateIfNeeded, isPublic);
 	}
 
 	close(remote: { host: string, port: number }): Promise<void> {
@@ -416,7 +589,7 @@ class RemoteExplorerService implements IRemoteExplorerService {
 			this._editable.data : undefined;
 	}
 
-	setCandidateFilter(filter: (candidates: { host: string, port: number, detail: string }[]) => Promise<{ host: string, port: number, detail: string }[]>): IDisposable {
+	setCandidateFilter(filter: (candidates: CandidatePort[]) => Promise<CandidatePort[]>): IDisposable {
 		if (!filter) {
 			return {
 				dispose: () => { }
@@ -430,13 +603,22 @@ class RemoteExplorerService implements IRemoteExplorerService {
 		};
 	}
 
-	onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): void {
+	onFoundNewCandidates(candidates: CandidatePort[]): void {
 		this.tunnelModel.setCandidates(candidates);
 	}
 
 	restore(): Promise<void> {
 		return this.tunnelModel.restoreForwarded();
 	}
+
+	enablePortsFeatures(): void {
+		this._portsFeaturesEnabled = true;
+		this._onEnabledPortsFeatures.fire();
+	}
+
+	get portsFeaturesEnabled(): boolean {
+		return this._portsFeaturesEnabled;
+	}
 }
 
 registerSingleton(IRemoteExplorerService, RemoteExplorerService, true);
diff --git a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
similarity index 60%
rename from src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
rename to src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
index a0cc5572f..92f51dc00 100644
--- a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/electron-browser/tunnelServiceImpl.ts
@@ -3,23 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
-import { AbstractRemoteAgentService } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
-import { ISignService } from 'vs/platform/sign/common/sign';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { ISignService } from 'vs/platform/sign/common/sign';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { BaseTunnelService } from 'vs/platform/remote/node/tunnelService';
+import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { URI } from 'vs/base/common/uri';
 
-export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
-	constructor(
-		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@IProductService productService: IProductService,
-		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
-		@ISignService signService: ISignService,
+export class TunnelService extends BaseTunnelService {
+	public constructor(
 		@ILogService logService: ILogService,
+		@ISignService signService: ISignService,
+		@IProductService productService: IProductService,
+		@IRemoteAgentService _remoteAgentService: IRemoteAgentService,
+		@IWorkbenchEnvironmentService private environmentService: IWorkbenchEnvironmentService
 	) {
-		super(nodeSocketFactory, environmentService, productService, remoteAuthorityResolverService, signService, logService);
+		super(nodeSocketFactory, logService, signService, productService);
+	}
+
+	canTunnel(uri: URI): boolean {
+		return super.canTunnel(uri) && !!this.environmentService.remoteAuthority;
 	}
 }
diff --git a/src/vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl.ts
new file mode 100644
index 000000000..d30623f6f
--- /dev/null
+++ b/src/vs/workbench/services/remote/electron-sandbox/remoteAgentServiceImpl.ts
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vs/platform/remote/common/remoteAuthorityResolver';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
+import { AbstractRemoteAgentService } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
+import { ISignService } from 'vs/platform/sign/common/sign';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
+
+export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
+	constructor(
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IProductService productService: IProductService,
+		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
+		@ISignService signService: ISignService,
+		@ILogService logService: ILogService,
+	) {
+		super(new BrowserSocketFactory(null), environmentService, productService, remoteAuthorityResolverService, signService, logService);
+	}
+}
+
+class RemoteConnectionFailureNotificationContribution implements IWorkbenchContribution {
+
+	constructor(
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@INotificationService notificationService: INotificationService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		// Let's cover the case where connecting to fetch the remote extension info fails
+		remoteAgentService.getRawEnvironment()
+			.then(undefined, err => {
+
+				type RemoteConnectionFailureClassification = {
+					web: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					remoteName: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+					message: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' };
+				};
+				type RemoteConnectionFailureEvent = {
+					web: boolean;
+					remoteName: string | undefined;
+					message: string;
+				};
+				telemetryService.publicLog2<RemoteConnectionFailureEvent, RemoteConnectionFailureClassification>('remoteConnectionFailure', {
+					web: false,
+					remoteName: getRemoteName(environmentService.remoteAuthority),
+					message: err ? err.message : '',
+				});
+
+				if (!RemoteAuthorityResolverError.isHandled(err)) {
+					notificationService.error(nls.localize('connectionError', "Failed to connect to the remote extension host server (Error: {0})", err ? err.message : ''));
+				}
+			});
+	}
+
+}
+
+const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
+workbenchRegistry.registerWorkbenchContribution(RemoteConnectionFailureNotificationContribution, LifecyclePhase.Ready);
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index cfa4b7f2b..1ba6a4ef1 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -15,7 +15,7 @@ import { IFilesConfiguration } from 'vs/platform/files/common/files';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 import { Event } from 'vs/base/common/event';
-import { relative } from 'vs/base/common/path';
+import * as paths from 'vs/base/common/path';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 export const VIEWLET_ID = 'workbench.view.search';
@@ -77,6 +77,8 @@ export interface ICommonQueryProps<U extends UriComponents> {
 	excludePattern?: glob.IExpression;
 	extraFileResources?: U[];
 
+	onlyOpenEditors?: boolean;
+
 	maxResults?: number;
 	usingSearchPaths?: boolean;
 }
@@ -365,12 +367,16 @@ export interface ISearchConfigurationProperties {
 	seedOnFocus: boolean;
 	seedWithNearestWord: boolean;
 	searchOnTypeDebouncePeriod: number;
+	mode: 'view' | 'reuseEditor' | 'newEditor';
 	searchEditor: {
 		doubleClickBehaviour: 'selectWord' | 'goToLocation' | 'openLocationToSide',
 		reusePriorSearchConfiguration: boolean,
 		defaultNumberOfContextLines: number | null,
 		experimental: {}
 	};
+	experimental: {
+		searchInOpenEditors: boolean
+	}
 	sortOrder: SearchSortOrder;
 }
 
@@ -406,21 +412,25 @@ export function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, fsPath:
 		return false;
 	}
 
-	if (queryProps.includePattern && !glob.match(queryProps.includePattern, fsPath)) {
-		return false;
-	}
+	if (queryProps.includePattern || queryProps.usingSearchPaths) {
+		if (queryProps.includePattern && glob.match(queryProps.includePattern, fsPath)) {
+			return true;
+		}
 
-	// If searchPaths are being used, the extra file must be in a subfolder and match the pattern, if present
-	if (queryProps.usingSearchPaths) {
-		return !!queryProps.folderQueries && queryProps.folderQueries.every(fq => {
-			const searchPath = fq.folder.fsPath;
-			if (extpath.isEqualOrParent(fsPath, searchPath)) {
-				const relPath = relative(searchPath, fsPath);
-				return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
-			} else {
-				return false;
-			}
-		});
+		// If searchPaths are being used, the extra file must be in a subfolder and match the pattern, if present
+		if (queryProps.usingSearchPaths) {
+			return !!queryProps.folderQueries && queryProps.folderQueries.some(fq => {
+				const searchPath = fq.folder.fsPath;
+				if (extpath.isEqualOrParent(fsPath, searchPath)) {
+					const relPath = paths.relative(searchPath, fsPath);
+					return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
+				} else {
+					return false;
+				}
+			});
+		}
+
+		return false;
 	}
 
 	return true;
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index e1e2b6b55..daf00408c 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as arrays from 'vs/base/common/arrays';
+import { DeferredPromise } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { canceled } from 'vs/base/common/errors';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -13,13 +14,13 @@ import { StopWatch } from 'vs/base/common/stopwatch';
 import { URI as uri } from 'vs/base/common/uri';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IFileService } from 'vs/platform/files/common/files';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { deserializeSearchError, FileMatch, ICachedSearchStats, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, ISearchComplete, ISearchEngineStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, ITextQuery, pathIncludedInQuery, QueryType, SearchError, SearchErrorCode, SearchProviderType, isFileMatch, isProgressMessage } from 'vs/workbench/services/search/common/search';
+import { deserializeSearchError, FileMatch, ICachedSearchStats, IFileMatch, IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, ISearchComplete, ISearchEngineStats, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, isFileMatch, isProgressMessage, ITextQuery, pathIncludedInQuery, QueryType, SearchError, SearchErrorCode, SearchProviderType } from 'vs/workbench/services/search/common/search';
 import { addContextToEditorMatches, editorMatchesToTextSearchResults } from 'vs/workbench/services/search/common/searchHelpers';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class SearchService extends Disposable implements ISearchService {
 
@@ -514,41 +515,3 @@ export class RemoteSearchService extends SearchService {
 }
 
 registerSingleton(ISearchService, RemoteSearchService, true);
-
-export type ValueCallback<T = any> = (value: T | Promise<T>) => void;
-export class DeferredPromise<T> {
-
-	private completeCallback!: ValueCallback<T>;
-	private errorCallback!: (err: any) => void;
-
-	public p: Promise<T>;
-
-	constructor() {
-		this.p = new Promise<T>((c, e) => {
-			this.completeCallback = c;
-			this.errorCallback = e;
-		});
-	}
-
-	public complete(value: T) {
-		return new Promise<void>(resolve => {
-			this.completeCallback(value);
-			resolve();
-		});
-	}
-
-	public error(err: any) {
-		return new Promise<void>(resolve => {
-			this.errorCallback(err);
-			resolve();
-		});
-	}
-
-	public cancel() {
-		new Promise<void>(resolve => {
-			this.errorCallback(canceled());
-			resolve();
-		});
-	}
-}
-
diff --git a/src/vs/workbench/services/search/electron-browser/searchService.ts b/src/vs/workbench/services/search/electron-browser/searchService.ts
index ea15e40b5..09160857d 100644
--- a/src/vs/workbench/services/search/electron-browser/searchService.ts
+++ b/src/vs/workbench/services/search/electron-browser/searchService.ts
@@ -67,9 +67,9 @@ export class DiskSearch implements ISearchResultProvider {
 			// results in the forked process inheriting `--inspect-brk=xxx`.
 			freshExecArgv: true,
 			env: {
-				AMD_ENTRYPOINT: 'vs/workbench/services/search/node/searchApp',
-				PIPE_LOGGING: 'true',
-				VERBOSE_LOGGING: verboseLogging
+				VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/search/node/searchApp',
+				VSCODE_PIPE_LOGGING: 'true',
+				VSCODE_VERBOSE_LOGGING: verboseLogging
 			},
 			useQueue: true
 		};
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index 074d3528f..da0483de3 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -385,13 +385,7 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
 
 	if (otherIncludes && otherIncludes.length) {
 		const uniqueOthers = new Set<string>();
-		otherIncludes.forEach(other => {
-			if (!other.endsWith('/**')) {
-				other += '/**';
-			}
-
-			uniqueOthers.add(other);
-		});
+		otherIncludes.forEach(other => { uniqueOthers.add(other); });
 
 		args.push('-g', '!*');
 		uniqueOthers
@@ -508,10 +502,6 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
  */
 export function spreadGlobComponents(globArg: string): string[] {
 	const components = splitGlobAware(globArg, '/');
-	if (components[components.length - 1] !== '**') {
-		components.push('**');
-	}
-
 	return components.map((_, i) => components.slice(0, i + 1).join('/'));
 }
 
diff --git a/src/vs/workbench/services/search/test/electron-browser/rawSearchService.test.ts b/src/vs/workbench/services/search/test/electron-browser/rawSearchService.test.ts
index 1be58f545..ddeb47d95 100644
--- a/src/vs/workbench/services/search/test/electron-browser/rawSearchService.test.ts
+++ b/src/vs/workbench/services/search/test/electron-browser/rawSearchService.test.ts
@@ -12,6 +12,7 @@ import { URI } from 'vs/base/common/uri';
 import { IFileQuery, IFileSearchStats, IFolderQuery, IProgressMessage, IRawFileMatch, ISearchEngine, ISearchEngineStats, ISearchEngineSuccess, ISearchProgressItem, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, ISerializedSearchSuccess, isFileMatch, QueryType } from 'vs/workbench/services/search/common/search';
 import { IProgressCallback, SearchService as RawSearchService } from 'vs/workbench/services/search/node/rawSearchService';
 import { DiskSearch } from 'vs/workbench/services/search/electron-browser/searchService';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 
 const TEST_FOLDER_QUERIES = [
 	{ folder: URI.file(path.normalize('/some/where')) }
@@ -70,9 +71,7 @@ class TestSearchEngine implements ISearchEngine<IRawFileMatch> {
 	}
 }
 
-const testTimeout = 5000;
-
-suite('RawSearchService', () => {
+flakySuite('RawSearchService', () => {
 
 	const rawSearch: IFileQuery = {
 		type: QueryType.File,
@@ -91,7 +90,6 @@ suite('RawSearchService', () => {
 	};
 
 	test('Individual results', async function () {
-		this.timeout(testTimeout);
 		let i = 5;
 		const Engine = TestSearchEngine.bind(null, () => i-- ? rawMatch : null);
 		const service = new RawSearchService();
@@ -111,7 +109,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Batch results', async function () {
-		this.timeout(testTimeout);
 		let i = 25;
 		const Engine = TestSearchEngine.bind(null, () => i-- ? rawMatch : null);
 		const service = new RawSearchService();
@@ -133,7 +130,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Collect batched results', async function () {
-		this.timeout(testTimeout);
 		const uriPath = '/some/where';
 		let i = 25;
 		const Engine = TestSearchEngine.bind(null, () => i-- ? rawMatch : null);
@@ -171,7 +167,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Multi-root with include pattern and maxResults', async function () {
-		this.timeout(testTimeout);
 		const service = new RawSearchService();
 
 		const query: IFileQuery = {
@@ -189,7 +184,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Handles maxResults=0 correctly', async function () {
-		this.timeout(testTimeout);
 		const service = new RawSearchService();
 
 		const query: IFileQuery = {
@@ -208,7 +202,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Multi-root with include pattern and exists', async function () {
-		this.timeout(testTimeout);
 		const service = new RawSearchService();
 
 		const query: IFileQuery = {
@@ -227,7 +220,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Sorted results', async function () {
-		this.timeout(testTimeout);
 		const paths = ['bab', 'bbc', 'abb'];
 		const matches: IRawFileMatch[] = paths.map(relativePath => ({
 			base: path.normalize('/some/where'),
@@ -260,7 +252,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Sorted result batches', async function () {
-		this.timeout(testTimeout);
 		let i = 25;
 		const Engine = TestSearchEngine.bind(null, () => i-- ? rawMatch : null);
 		const service = new RawSearchService();
@@ -287,7 +278,6 @@ suite('RawSearchService', () => {
 	});
 
 	test('Cached results', function () {
-		this.timeout(testTimeout);
 		const paths = ['bcb', 'bbc', 'aab'];
 		const matches: IRawFileMatch[] = paths.map(relativePath => ({
 			base: path.normalize('/some/where'),
diff --git a/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
index 427de8a4f..11e5dd788 100644
--- a/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/fileSearch.integrationTest.ts
@@ -7,6 +7,7 @@ import * as assert from 'assert';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import * as path from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 import { IFileQuery, IFolderQuery, ISerializedSearchProgressItem, isProgressMessage, QueryType } from 'vs/workbench/services/search/common/search';
 import { SearchService } from 'vs/workbench/services/search/node/rawSearchService';
 
@@ -41,8 +42,7 @@ async function doSearchTest(query: IFileQuery, expectedResultCount: number | Fun
 	assert.equal(results.length, expectedResultCount, `rg ${results.length} !== ${expectedResultCount}`);
 }
 
-suite('FileSearch-integration', function () {
-	this.timeout(1000 * 60); // increase timeout for this suite
+flakySuite('FileSearch-integration', function () {
 
 	test('File - simple', () => {
 		const config: IFileQuery = {
diff --git a/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts b/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
index 14b965051..9b3d7cfa7 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts
@@ -13,11 +13,7 @@ suite('RipgrepFileSearch - etc', () => {
 		assert.equal(fixDriveC(getAbsoluteGlob(folder, glob)), expectedResult, JSON.stringify(params));
 	}
 
-	test('getAbsoluteGlob_win', () => {
-		if (!platform.isWindows) {
-			return;
-		}
-
+	(!platform.isWindows ? test.skip : test)('getAbsoluteGlob_win', () => {
 		[
 			['C:/foo/bar', 'glob/**', '/foo\\bar\\glob\\**'],
 			['c:/', 'glob/**', '/glob\\**'],
@@ -32,11 +28,7 @@ suite('RipgrepFileSearch - etc', () => {
 		].forEach(testGetAbsGlob);
 	});
 
-	test('getAbsoluteGlob_posix', () => {
-		if (platform.isWindows) {
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('getAbsoluteGlob_posix', () => {
 		[
 			['/foo/bar', 'glob/**', '/foo/bar/glob/**'],
 			['/', 'glob/**', '/glob/**'],
diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts
index 34d9c2bad..33a9868c1 100644
--- a/src/vs/workbench/services/search/test/node/search.test.ts
+++ b/src/vs/workbench/services/search/test/node/search.test.ts
@@ -11,6 +11,7 @@ import { joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { IFolderQuery, QueryType, IRawFileMatch } from 'vs/workbench/services/search/common/search';
 import { Engine as FileSearchEngine, FileWalker } from 'vs/workbench/services/search/node/fileSearch';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 
 const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = URI.file(path.join(TEST_FIXTURES, 'examples'));
@@ -29,12 +30,9 @@ const MULTIROOT_QUERIES: IFolderQuery[] = [
 	{ folder: MORE_FIXTURES }
 ];
 
-const testTimeout = 5000;
-
-suite('FileSearchEngine', () => {
+flakySuite('FileSearchEngine', () => {
 
 	test('Files: *.js', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -54,7 +52,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: maxResults', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -74,7 +71,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: maxResults without Ripgrep', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -94,7 +90,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: exists', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -116,7 +111,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: not exists', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -138,7 +132,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: exists without Ripgrep', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -160,7 +153,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: not exists without Ripgrep', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -182,7 +174,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: examples/com*', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -202,7 +193,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: examples (fuzzy)', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -222,7 +212,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: multiroot', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: MULTIROOT_QUERIES,
@@ -242,7 +231,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: multiroot with includePattern and maxResults', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: MULTIROOT_QUERIES,
@@ -266,7 +254,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: multiroot with includePattern and exists', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: MULTIROOT_QUERIES,
@@ -291,7 +278,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: NPE (CamelCase)', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -311,7 +297,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.*', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -331,7 +316,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.as', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -351,7 +335,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* without derived', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -375,7 +358,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* exclude folder without wildcard', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -396,7 +378,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: exclude folder without wildcard #36438', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY_36438,
@@ -416,7 +397,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: include folder without wildcard #36438', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY_36438,
@@ -436,7 +416,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* exclude folder with leading wildcard', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -457,7 +436,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* exclude folder with trailing wildcard', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -478,7 +456,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* exclude with unicode', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -499,7 +476,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: *.* include with unicode', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -520,7 +496,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: multiroot with exclude', function (done: () => void) {
-		this.timeout(testTimeout);
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: EXAMPLES_FIXTURES,
@@ -555,7 +530,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: Unicode and Spaces', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -578,7 +552,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: no results', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -598,7 +571,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: relative path matched once', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -621,7 +593,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: Include pattern, single files', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: ROOT_FOLDER_QUERY,
@@ -646,7 +617,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: extraFiles only', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: [],
@@ -674,7 +644,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: extraFiles only (with include)', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: [],
@@ -703,7 +672,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: extraFiles only (with exclude)', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: [],
@@ -729,7 +697,6 @@ suite('FileSearchEngine', () => {
 	});
 
 	test('Files: no dupes in nested folders', function (done: () => void) {
-		this.timeout(testTimeout);
 		const engine = new FileSearchEngine({
 			type: QueryType.File,
 			folderQueries: [
@@ -752,15 +719,9 @@ suite('FileSearchEngine', () => {
 	});
 });
 
-suite('FileWalker', () => {
-
-	test('Find: exclude subfolder', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
+flakySuite('FileWalker', () => {
 
+	(platform.isWindows ? test.skip : test)('Find: exclude subfolder', function (done: () => void) {
 		const file0 = './more/file.txt';
 		const file1 = './examples/subfolder/subfile.txt';
 
@@ -790,13 +751,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: folder excludes', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: folder excludes', function (done: () => void) {
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: URI.file(TEST_FIXTURES),
@@ -817,13 +772,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: exclude multiple folders', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: exclude multiple folders', function (done: () => void) {
 		const file0 = './index.html';
 		const file1 = './examples/small.js';
 		const file2 = './more/file.txt';
@@ -848,13 +797,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: exclude folder path suffix', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: exclude folder path suffix', function (done: () => void) {
 		const file0 = './examples/company.js';
 		const file1 = './examples/subfolder/subfile.txt';
 
@@ -876,13 +819,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: exclude subfolder path suffix', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: exclude subfolder path suffix', function (done: () => void) {
 		const file0 = './examples/subfolder/subfile.txt';
 		const file1 = './examples/subfolder/anotherfolder/anotherfile.txt';
 
@@ -904,13 +841,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: exclude folder path', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: exclude folder path', function (done: () => void) {
 		const file0 = './examples/company.js';
 		const file1 = './examples/subfolder/subfile.txt';
 
@@ -932,13 +863,7 @@ suite('FileWalker', () => {
 		});
 	});
 
-	test('Find: exclude combination of paths', function (done: () => void) {
-		this.timeout(testTimeout);
-		if (platform.isWindows) {
-			done();
-			return;
-		}
-
+	(platform.isWindows ? test.skip : test)('Find: exclude combination of paths', function (done: () => void) {
 		const filesIn = [
 			'./examples/subfolder/subfile.txt',
 			'./examples/company.js',
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index f2ad6f9a9..6b93dd11b 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -11,6 +11,7 @@ import * as glob from 'vs/base/common/glob';
 import { URI } from 'vs/base/common/uri';
 import { deserializeSearchError, IFolderQuery, ISearchRange, ITextQuery, ITextSearchContext, ITextSearchMatch, QueryType, SearchErrorCode, ISerializedFileMatch } from 'vs/workbench/services/search/common/search';
 import { TextSearchEngineAdapter } from 'vs/workbench/services/search/node/textSearchAdapter';
+import { flakySuite } from 'vs/base/test/node/testUtils';
 
 const TEST_FIXTURES = path.normalize(getPathFromAmdModule(require, './fixtures'));
 const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples');
@@ -46,8 +47,7 @@ function doSearchTest(query: ITextQuery, expectedResultCount: number | Function)
 	});
 }
 
-suite('TextSearch-integration', function () {
-	this.timeout(1000 * 60); // increase timeout for this suite
+flakySuite('TextSearch-integration', function () {
 
 	test('Text: GameOfLife', () => {
 		const config: ITextQuery = {
diff --git a/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts b/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts
deleted file mode 100644
index 07a248a9a..000000000
--- a/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Client } from 'vs/base/parts/ipc/common/ipc.net';
-import { connect } from 'vs/base/parts/ipc/node/ipc.net';
-import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
-
-export class SharedProcessService implements ISharedProcessService {
-
-	declare readonly _serviceBrand: undefined;
-
-	private withSharedProcessConnection: Promise<Client<string>>;
-	private sharedProcessMainChannel: IChannel;
-
-	constructor(
-		@IMainProcessService mainProcessService: IMainProcessService,
-		@INativeHostService nativeHostService: INativeHostService,
-		@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService
-	) {
-		this.sharedProcessMainChannel = mainProcessService.getChannel('sharedProcess');
-
-		this.withSharedProcessConnection = this.whenSharedProcessReady()
-			.then(() => connect(environmentService.sharedIPCHandle, `window:${nativeHostService.windowId}`));
-	}
-
-	whenSharedProcessReady(): Promise<void> {
-		return this.sharedProcessMainChannel.call('whenSharedProcessReady');
-	}
-
-	getChannel(channelName: string): IChannel {
-		return getDelayedChannel(this.withSharedProcessConnection.then(connection => connection.getChannel(channelName)));
-	}
-
-	registerChannel(channelName: string, channel: IServerChannel<string>): void {
-		this.withSharedProcessConnection.then(connection => connection.registerChannel(channelName, channel));
-	}
-
-	toggleSharedProcessWindow(): Promise<void> {
-		return this.sharedProcessMainChannel.call('toggleSharedProcessWindow');
-	}
-}
-
-registerSingleton(ISharedProcessService, SharedProcessService, true);
diff --git a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
index acabe9e4d..40ca288cf 100644
--- a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
@@ -10,12 +10,13 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
-import { TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
+import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/electron-browser/workbenchCommonProperties';
+import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/electron-sandbox/workbenchCommonProperties';
 import { TelemetryService as BaseTelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ClassifiedEvent, StrictPropertyCheck, GDPRClassification } from 'vs/platform/telemetry/common/gdprTypings';
+import { IFileService } from 'vs/platform/files/common/files';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
@@ -30,6 +31,7 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
 		@IStorageService storageService: IStorageService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@IFileService fileService: IFileService
 	) {
 		super();
 
@@ -37,7 +39,7 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 			const channel = sharedProcessService.getChannel('telemetryAppender');
 			const config: ITelemetryServiceConfig = {
 				appender: new TelemetryAppenderClient(channel),
-				commonProperties: resolveWorkbenchCommonProperties(storageService, productService.commit, productService.version, environmentService.machineId, productService.msftInternalDomains, environmentService.installSourcePath, environmentService.remoteAuthority),
+				commonProperties: resolveWorkbenchCommonProperties(storageService, fileService, environmentService.os.release, productService.commit, productService.version, environmentService.machineId, productService.msftInternalDomains, environmentService.installSourcePath, environmentService.remoteAuthority),
 				piiPaths: [environmentService.appRoot, environmentService.extensionsPath],
 				sendErrorTelemetry: true
 			};
diff --git a/src/vs/workbench/services/telemetry/electron-browser/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/electron-sandbox/workbenchCommonProperties.ts
similarity index 88%
rename from src/vs/workbench/services/telemetry/electron-browser/workbenchCommonProperties.ts
rename to src/vs/workbench/services/telemetry/electron-sandbox/workbenchCommonProperties.ts
index 889e127c8..1c6e0dc12 100644
--- a/src/vs/workbench/services/telemetry/electron-browser/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/electron-sandbox/workbenchCommonProperties.ts
@@ -4,13 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
+import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
 import { instanceStorageKey, firstSessionDateStorageKey, lastSessionDateStorageKey } from 'vs/platform/telemetry/common/telemetry';
 import { cleanRemoteAuthority } from 'vs/platform/telemetry/common/telemetryUtils';
 import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { IFileService } from 'vs/platform/files/common/files';
 
 export async function resolveWorkbenchCommonProperties(
 	storageService: IStorageService,
+	fileService: IFileService,
+	release: string,
 	commit: string | undefined,
 	version: string | undefined,
 	machineId: string,
@@ -18,7 +21,7 @@ export async function resolveWorkbenchCommonProperties(
 	installSourcePath: string,
 	remoteAuthority?: string
 ): Promise<{ [name: string]: string | boolean | undefined }> {
-	const result = await resolveCommonProperties(commit, version, machineId, msftInternalDomains, installSourcePath, undefined);
+	const result = await resolveCommonProperties(fileService, release, process.arch, commit, version, machineId, msftInternalDomains, installSourcePath);
 	const instanceId = storageService.get(instanceStorageKey, StorageScope.GLOBAL)!;
 	const firstSessionDate = storageService.get(firstSessionDateStorageKey, StorageScope.GLOBAL)!;
 	const lastSessionDate = storageService.get(lastSessionDateStorageKey, StorageScope.GLOBAL)!;
diff --git a/src/vs/workbench/services/telemetry/test/electron-browser/commonProperties.test.ts b/src/vs/workbench/services/telemetry/test/electron-browser/commonProperties.test.ts
index 5e32c886f..627abe254 100644
--- a/src/vs/workbench/services/telemetry/test/electron-browser/commonProperties.test.ts
+++ b/src/vs/workbench/services/telemetry/test/electron-browser/commonProperties.test.ts
@@ -6,11 +6,16 @@ import * as assert from 'assert';
 import * as path from 'vs/base/common/path';
 import * as os from 'os';
 import * as fs from 'fs';
-import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/electron-browser/workbenchCommonProperties';
+import { resolveWorkbenchCommonProperties } from 'vs/workbench/services/telemetry/electron-sandbox/workbenchCommonProperties';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { IStorageService, StorageScope, InMemoryStorageService, StorageTarget } from 'vs/platform/storage/common/storage';
-import { mkdirp, rimraf, RimRafMode } from 'vs/base/node/pfs';
+import { mkdirp, rimraf } from 'vs/base/node/pfs';
 import { timeout } from 'vs/base/common/async';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { Schemas } from 'vs/base/common/network';
+import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
 
 suite('Telemetry - common properties', function () {
 	const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'telemetryservice');
@@ -19,19 +24,28 @@ suite('Telemetry - common properties', function () {
 	const commit: string = (undefined)!;
 	const version: string = (undefined)!;
 	let testStorageService: IStorageService;
+	let testFileService: IFileService;
+	let diskFileSystemProvider: DiskFileSystemProvider;
 
 	setup(() => {
 		testStorageService = new InMemoryStorageService();
+		const logService = new NullLogService();
+		testFileService = new FileService(logService);
+
+		diskFileSystemProvider = new DiskFileSystemProvider(logService);
+		testFileService.registerProvider(Schemas.file, diskFileSystemProvider);
 	});
 
-	teardown(done => {
-		rimraf(parentDir, RimRafMode.MOVE).then(done, done);
+	teardown(() => {
+		diskFileSystemProvider.dispose();
+
+		return rimraf(parentDir);
 	});
 
 	test('default', async function () {
 		await mkdirp(parentDir);
 		fs.writeFileSync(installSource, 'my.install.source');
-		const props = await resolveWorkbenchCommonProperties(testStorageService, commit, version, 'someMachineId', undefined, installSource);
+		const props = await resolveWorkbenchCommonProperties(testStorageService, testFileService, os.release(), commit, version, 'someMachineId', undefined, installSource);
 		assert.ok('commitHash' in props);
 		assert.ok('sessionID' in props);
 		assert.ok('timestamp' in props);
@@ -52,7 +66,7 @@ suite('Telemetry - common properties', function () {
 		assert.ok('common.instanceId' in props, 'instanceId');
 		assert.ok('common.machineId' in props, 'machineId');
 		fs.unlinkSync(installSource);
-		const props_1 = await resolveWorkbenchCommonProperties(testStorageService, commit, version, 'someMachineId', undefined, installSource);
+		const props_1 = await resolveWorkbenchCommonProperties(testStorageService, testFileService, os.release(), commit, version, 'someMachineId', undefined, installSource);
 		assert.ok(!('common.source' in props_1));
 	});
 
@@ -60,14 +74,14 @@ suite('Telemetry - common properties', function () {
 
 		testStorageService.store('telemetry.lastSessionDate', new Date().toUTCString(), StorageScope.GLOBAL, StorageTarget.MACHINE);
 
-		const props = await resolveWorkbenchCommonProperties(testStorageService, commit, version, 'someMachineId', undefined, installSource);
+		const props = await resolveWorkbenchCommonProperties(testStorageService, testFileService, os.release(), commit, version, 'someMachineId', undefined, installSource);
 		assert.ok('common.lastSessionDate' in props); // conditional, see below
 		assert.ok('common.isNewSession' in props);
 		assert.equal(props['common.isNewSession'], 0);
 	});
 
 	test('values chance on ask', async function () {
-		const props = await resolveWorkbenchCommonProperties(testStorageService, commit, version, 'someMachineId', undefined, installSource);
+		const props = await resolveWorkbenchCommonProperties(testStorageService, testFileService, os.release(), commit, version, 'someMachineId', undefined, installSource);
 		let value1 = props['common.sequence'];
 		let value2 = props['common.sequence'];
 		assert.ok(value1 !== value2, 'seq');
diff --git a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
index ed4d36052..c73fb058a 100644
--- a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
+++ b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
@@ -445,11 +445,11 @@ class TMTokenizationSupport implements ITokenizationSupport {
 		return this._actual.getInitialState();
 	}
 
-	tokenize(line: string, state: IState, offsetDelta: number): TokenizationResult {
+	tokenize(line: string, hasEOL: boolean, state: IState, offsetDelta: number): TokenizationResult {
 		throw new Error('Not supported!');
 	}
 
-	tokenize2(line: string, state: StackElement, offsetDelta: number): TokenizationResult2 {
+	tokenize2(line: string, hasEOL: boolean, state: StackElement, offsetDelta: number): TokenizationResult2 {
 		if (offsetDelta !== 0) {
 			throw new Error('Unexpected: offsetDelta should be 0.');
 		}
diff --git a/src/vs/workbench/services/textfile/browser/browserTextFileService.ts b/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
index 3e67665f8..47cc41a27 100644
--- a/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/browserTextFileService.ts
@@ -14,13 +14,11 @@ export class BrowserTextFileService extends AbstractTextFileService {
 		super.registerListeners();
 
 		// Lifecycle
-		this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdown(event.reason)));
+		this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdown(event.reason), 'veto.textFiles'));
 	}
 
-	protected onBeforeShutdown(reason: ShutdownReason): boolean {
+	private onBeforeShutdown(reason: ShutdownReason): boolean {
 		if (this.files.models.some(model => model.hasState(TextFileEditorModelState.PENDING_SAVE))) {
-			this.logService.warn('Unload veto: pending file saves');
-
 			return true; // files are pending to be saved: veto
 		}
 
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
index 4ecca900e..80266b791 100644
--- a/src/vs/workbench/services/textfile/browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -30,7 +30,7 @@ import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel'
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { isValidBasename } from 'vs/base/common/extpath';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IWorkingCopyFileService, IFileOperationUndoRedoInfo, ICreateFileOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
@@ -38,6 +38,7 @@ import { UTF8, UTF8_with_bom, UTF16be, UTF16le, encodingExists, toEncodeReadable
 import { consumeStream } from 'vs/base/common/stream';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 /**
  * The workbench file service implementation implements the raw file service spec and adds additional methods on top.
@@ -148,10 +149,17 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		return [bufferStream, decoder];
 	}
 
-	async create(resource: URI, value?: string | ITextSnapshot, options?: ICreateFileOptions): Promise<IFileStatWithMetadata> {
-		const readable = await this.getEncodedReadable(resource, value);
+	async create(operations: { resource: URI, value?: string | ITextSnapshot, options?: ICreateFileOptions }[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		const operationsWithContents: ICreateFileOperation[] = await Promise.all(operations.map(async o => {
+			const contents = await this.getEncodedReadable(o.resource, o.value);
+			return {
+				resource: o.resource,
+				contents,
+				overwrite: o.options?.overwrite
+			};
+		}));
 
-		return this.workingCopyFileService.create(resource, readable, options);
+		return this.workingCopyFileService.create(operationsWithContents, undoInfo, token);
 	}
 
 	async write(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<IFileStatWithMetadata> {
@@ -160,9 +168,9 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		return this.fileService.writeFile(resource, readable, options);
 	}
 
-	private async getEncodedReadable(resource: URI, value?: string | ITextSnapshot): Promise<VSBuffer | VSBufferReadable | undefined>;
-	private async getEncodedReadable(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable>;
-	private async getEncodedReadable(resource: URI, value?: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable | undefined> {
+	async getEncodedReadable(resource: URI, value?: string | ITextSnapshot): Promise<VSBuffer | VSBufferReadable | undefined>;
+	async getEncodedReadable(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable>;
+	async getEncodedReadable(resource: URI, value?: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable | undefined> {
 
 		// check for encoding
 		const { encoding, addBOM } = await this.encoding.getWriteEncoding(resource, options);
@@ -243,7 +251,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		// However, this will only work if the source exists
 		// and is not orphaned, so we need to check that too.
 		if (this.fileService.canHandleResource(source) && this.uriIdentityService.extUri.isEqual(source, target) && (await this.fileService.exists(source))) {
-			await this.workingCopyFileService.move([{ source, target }]);
+			await this.workingCopyFileService.move([{ file: { source, target } }]);
 
 			return this.save(target, options);
 		}
@@ -321,7 +329,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 
 			// create target file adhoc if it does not exist yet
 			if (!targetExists) {
-				await this.create(target, '');
+				await this.create([{ resource: target, value: '' }]);
 			}
 
 			try {
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 40827e31f..a6f0de819 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -837,6 +837,9 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			this.logService.trace(`[text file model] handleSaveSuccess(${versionId}) - not setting dirty to false because versionId did change meanwhile`, this.resource.toString(true));
 		}
 
+		// Update orphan state given save was successful
+		this.setOrphaned(false);
+
 		// Emit Save Event
 		this._onDidSave.fire(options.reason ?? SaveReason.EXPLICIT);
 	}
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 73618d523..94833e2bf 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -17,6 +17,7 @@ import { IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCo
 import { IUntitledTextEditorModelManager } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
+import { IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 
 export const ITextFileService = createDecorator<ITextFileService>('textFileService');
 
@@ -91,10 +92,15 @@ export interface ITextFileService extends IDisposable {
 	write(resource: URI, value: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<IFileStatWithMetadata>;
 
 	/**
-	 * Create a file. If the file exists it will be overwritten with the contents if
+	 * Create files. If the file exists it will be overwritten with the contents if
 	 * the options enable to overwrite.
 	 */
-	create(resource: URI, contents?: string | ITextSnapshot, options?: { overwrite?: boolean }): Promise<IFileStatWithMetadata>;
+	create(operations: { resource: URI, value?: string | ITextSnapshot, options?: { overwrite?: boolean } }[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
+
+	/**
+	 * Returns the readable that uses the appropriate encoding.
+	 */
+	getEncodedReadable(resource: URI, value?: string | ITextSnapshot, options?: IWriteTextFileOptions): Promise<VSBuffer | VSBufferReadable | undefined>;
 }
 
 export interface IReadTextFileOptions extends IReadFileOptions {
diff --git a/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts
index edf301656..a3b6d2200 100644
--- a/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts
@@ -112,7 +112,7 @@ export class NativeTextFileService extends AbstractTextFileService {
 				const fileStat = await stat(resource.fsPath);
 
 				// try to change mode to writeable
-				await chmod(resource.fsPath, fileStat.mode | 128);
+				await chmod(resource.fsPath, fileStat.mode | 0o200 /* File mode indicating writable by owner (fs.constants.S_IWUSR) */);
 			}
 		} catch (error) {
 			// ignore and simply retry the operation
@@ -132,7 +132,7 @@ export class NativeTextFileService extends AbstractTextFileService {
 				let isReadonly = false;
 				try {
 					const fileStat = await stat(resource.fsPath);
-					if (!(fileStat.mode & 128)) {
+					if (!(fileStat.mode & 0o200 /* File mode indicating writable by owner (fs.constants.S_IWUSR) */)) {
 						isReadonly = true;
 					}
 				} catch (error) {
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
index 0020a94b7..a4e499393 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
@@ -48,7 +48,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		await model.load();
 
-		assert.equal(onDidLoadCounter, 1);
+		assert.strictEqual(onDidLoadCounter, 1);
 
 		let onDidChangeContentCounter = 0;
 		model.onDidChangeContent(() => onDidChangeContentCounter++);
@@ -58,17 +58,17 @@ suite('Files - TextFileEditorModel', () => {
 
 		model.updateTextEditorModel(createTextBufferFactory('bar'));
 
-		assert.equal(onDidChangeContentCounter, 1);
-		assert.equal(onDidChangeDirtyCounter, 1);
+		assert.strictEqual(onDidChangeContentCounter, 1);
+		assert.strictEqual(onDidChangeDirtyCounter, 1);
 
 		model.updateTextEditorModel(createTextBufferFactory('foo'));
 
-		assert.equal(onDidChangeContentCounter, 2);
-		assert.equal(onDidChangeDirtyCounter, 1);
+		assert.strictEqual(onDidChangeContentCounter, 2);
+		assert.strictEqual(onDidChangeDirtyCounter, 1);
 
 		await model.revert();
 
-		assert.equal(onDidChangeDirtyCounter, 2);
+		assert.strictEqual(onDidChangeDirtyCounter, 2);
 
 		model.dispose();
 	});
@@ -76,7 +76,7 @@ suite('Files - TextFileEditorModel', () => {
 	test('isTextFileEditorModel', async function () {
 		const model = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined);
 
-		assert.equal(isTextFileEditorModel(model), true);
+		assert.strictEqual(isTextFileEditorModel(model), true);
 
 		model.dispose();
 	});
@@ -86,7 +86,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		await model.load();
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 0);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 0);
 
 		let savedEvent = false;
 		model.onDidSave(() => savedEvent = true);
@@ -98,8 +98,8 @@ suite('Files - TextFileEditorModel', () => {
 		assert.ok(getLastModifiedTime(model) <= Date.now());
 		assert.ok(model.hasState(TextFileEditorModelState.DIRTY));
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 
 		let workingCopyEvent = false;
 		accessor.workingCopyService.onDidChangeDirty(e => {
@@ -118,8 +118,8 @@ suite('Files - TextFileEditorModel', () => {
 		assert.ok(savedEvent);
 		assert.ok(workingCopyEvent);
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 0);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), false);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 0);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), false);
 
 		savedEvent = false;
 
@@ -173,8 +173,8 @@ suite('Files - TextFileEditorModel', () => {
 			assert.ok(model.isDirty());
 			assert.ok(saveErrorEvent);
 
-			assert.equal(accessor.workingCopyService.dirtyCount, 1);
-			assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+			assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+			assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 		} finally {
 			accessor.fileService.writeShouldThrowError = undefined;
 		}
@@ -182,7 +182,7 @@ suite('Files - TextFileEditorModel', () => {
 		await model.save({ force: true });
 
 		assert.ok(savedEvent);
-		assert.ok(!model.isDirty());
+		assert.strictEqual(model.isDirty(), false);
 
 		model.dispose();
 		assert.ok(!accessor.modelService.getModel(model.resource));
@@ -209,8 +209,8 @@ suite('Files - TextFileEditorModel', () => {
 			assert.ok(model.isDirty());
 			assert.ok(saveErrorEvent);
 
-			assert.equal(accessor.workingCopyService.dirtyCount, 1);
-			assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+			assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+			assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 
 			model.dispose();
 		} finally {
@@ -239,8 +239,8 @@ suite('Files - TextFileEditorModel', () => {
 			assert.ok(model.isDirty());
 			assert.ok(saveErrorEvent);
 
-			assert.equal(accessor.workingCopyService.dirtyCount, 1);
-			assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+			assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+			assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 
 			model.dispose();
 		} finally {
@@ -255,7 +255,7 @@ suite('Files - TextFileEditorModel', () => {
 		model.onDidChangeEncoding(() => encodingEvent = true);
 
 		model.setEncoding('utf8', EncodingMode.Encode); // no-op
-		assert.equal(getLastModifiedTime(model), -1);
+		assert.strictEqual(getLastModifiedTime(model), -1);
 
 		assert.ok(!encodingEvent);
 
@@ -288,7 +288,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		await model.load();
 
-		assert.equal(model.textEditorModel!.getModeId(), mode);
+		assert.strictEqual(model.textEditorModel!.getModeId(), mode);
 
 		model.dispose();
 		assert.ok(!accessor.modelService.getModel(model.resource));
@@ -334,13 +334,13 @@ suite('Files - TextFileEditorModel', () => {
 
 		await model.load({ contents: createTextBufferFactory('Hello World') });
 
-		assert.equal(model.textEditorModel?.getValue(), 'Hello World');
-		assert.equal(model.isDirty(), true);
+		assert.strictEqual(model.textEditorModel?.getValue(), 'Hello World');
+		assert.strictEqual(model.isDirty(), true);
 
 		await model.load({ contents: createTextBufferFactory('Hello Changes') });
 
-		assert.equal(model.textEditorModel?.getValue(), 'Hello Changes');
-		assert.equal(model.isDirty(), true);
+		assert.strictEqual(model.textEditorModel?.getValue(), 'Hello Changes');
+		assert.strictEqual(model.isDirty(), true);
 
 		// verify that we do not mark the model as saved when undoing once because
 		// we never really had a saved state
@@ -369,17 +369,17 @@ suite('Files - TextFileEditorModel', () => {
 		model.updateTextEditorModel(createTextBufferFactory('foo'));
 		assert.ok(model.isDirty());
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 
 		await model.revert();
-		assert.ok(!model.isDirty());
-		assert.equal(model.textEditorModel!.getValue(), 'Hello Html');
-		assert.equal(eventCounter, 1);
+		assert.strictEqual(model.isDirty(), false);
+		assert.strictEqual(model.textEditorModel!.getValue(), 'Hello Html');
+		assert.strictEqual(eventCounter, 1);
 
 		assert.ok(workingCopyEvent);
-		assert.equal(accessor.workingCopyService.dirtyCount, 0);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), false);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 0);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), false);
 
 		model.dispose();
 	});
@@ -402,17 +402,17 @@ suite('Files - TextFileEditorModel', () => {
 		model.updateTextEditorModel(createTextBufferFactory('foo'));
 		assert.ok(model.isDirty());
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 
 		await model.revert({ soft: true });
-		assert.ok(!model.isDirty());
-		assert.equal(model.textEditorModel!.getValue(), 'foo');
-		assert.equal(eventCounter, 1);
+		assert.strictEqual(model.isDirty(), false);
+		assert.strictEqual(model.textEditorModel!.getValue(), 'foo');
+		assert.strictEqual(eventCounter, 1);
 
 		assert.ok(workingCopyEvent);
-		assert.equal(accessor.workingCopyService.dirtyCount, 0);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), false);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 0);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), false);
 
 		model.dispose();
 	});
@@ -436,8 +436,8 @@ suite('Files - TextFileEditorModel', () => {
 		await model.textEditorModel!.undo();
 		assert.ok(model.isDirty());
 
-		assert.equal(accessor.workingCopyService.dirtyCount, 1);
-		assert.equal(accessor.workingCopyService.isDirty(model.resource), true);
+		assert.strictEqual(accessor.workingCopyService.dirtyCount, 1);
+		assert.strictEqual(accessor.workingCopyService.isDirty(model.resource), true);
 	});
 
 	test('Update Dirty', async function () {
@@ -453,7 +453,7 @@ suite('Files - TextFileEditorModel', () => {
 		assert.ok(model.isDirty());
 
 		await model.revert({ soft: true });
-		assert.ok(!model.isDirty());
+		assert.strictEqual(model.isDirty(), false);
 
 		model.onDidChangeDirty(() => eventCounter++);
 
@@ -466,12 +466,12 @@ suite('Files - TextFileEditorModel', () => {
 
 		model.setDirty(true);
 		assert.ok(model.isDirty());
-		assert.equal(eventCounter, 1);
+		assert.strictEqual(eventCounter, 1);
 		assert.ok(workingCopyEvent);
 
 		model.setDirty(false);
-		assert.ok(!model.isDirty());
-		assert.equal(eventCounter, 2);
+		assert.strictEqual(model.isDirty(), false);
+		assert.strictEqual(eventCounter, 2);
 
 		model.dispose();
 	});
@@ -496,7 +496,7 @@ suite('Files - TextFileEditorModel', () => {
 		assert.ok(!model.isDirty());
 
 		await model.save({ force: true });
-		assert.equal(saveEvent, false);
+		assert.strictEqual(saveEvent, false);
 
 		await model.revert({ soft: true });
 		assert.ok(!model.isDirty());
@@ -517,7 +517,7 @@ suite('Files - TextFileEditorModel', () => {
 		model = await model.load() as TextFileEditorModel;
 
 		assert.ok(model);
-		assert.equal(getLastModifiedTime(model), mtime);
+		assert.strictEqual(getLastModifiedTime(model), mtime);
 		model.dispose();
 	});
 
@@ -569,7 +569,7 @@ suite('Files - TextFileEditorModel', () => {
 		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined);
 
 		model.onDidSave(() => {
-			assert.equal(snapshotToString(model.createSnapshot()!), eventCounter === 1 ? 'bar' : 'foobar');
+			assert.strictEqual(snapshotToString(model.createSnapshot()!), eventCounter === 1 ? 'bar' : 'foobar');
 			assert.ok(!model.isDirty());
 			eventCounter++;
 		});
@@ -588,14 +588,14 @@ suite('Files - TextFileEditorModel', () => {
 		assert.ok(model.isDirty());
 
 		await model.save();
-		assert.equal(eventCounter, 2);
+		assert.strictEqual(eventCounter, 2);
 
 		participant.dispose();
 		model.updateTextEditorModel(createTextBufferFactory('foobar'));
 		assert.ok(model.isDirty());
 
 		await model.save();
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 
 		model.dispose();
 	});
@@ -614,7 +614,7 @@ suite('Files - TextFileEditorModel', () => {
 		model.updateTextEditorModel(createTextBufferFactory('foo'));
 
 		await model.save({ skipSaveParticipants: true });
-		assert.equal(eventCounter, 0);
+		assert.strictEqual(eventCounter, 0);
 
 		participant.dispose();
 		model.dispose();
@@ -645,7 +645,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		const now = Date.now();
 		await model.save();
-		assert.equal(eventCounter, 2);
+		assert.strictEqual(eventCounter, 2);
 		assert.ok(Date.now() - now >= 10);
 
 		model.dispose();
@@ -700,7 +700,7 @@ suite('Files - TextFileEditorModel', () => {
 		const p4 = model.save();
 
 		await Promise.all([p1, p2, p3, p4]);
-		assert.equal(participations.length, 1);
+		assert.strictEqual(participations.length, 1);
 
 		model.dispose();
 		participant.dispose();
@@ -740,7 +740,7 @@ suite('Files - TextFileEditorModel', () => {
 				const newSavePromise = model.save();
 
 				// assert that this is the same promise as the outer one
-				assert.equal(savePromise, newSavePromise);
+				assert.strictEqual(savePromise, newSavePromise);
 			}
 		});
 
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
index 57e8eff87..396928a87 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModelManager.test.ts
@@ -98,21 +98,21 @@ suite('Files - TextFileEditorModelManager', () => {
 
 		const model1 = await modelPromise;
 		assert.ok(model1);
-		assert.equal(model1.getEncoding(), encoding);
-		assert.equal(manager.get(resource), model1);
+		assert.strictEqual(model1.getEncoding(), encoding);
+		assert.strictEqual(manager.get(resource), model1);
 
 		const model2 = await manager.resolve(resource, { encoding });
-		assert.equal(model2, model1);
+		assert.strictEqual(model2, model1);
 		model1.dispose();
 
 		const model3 = await manager.resolve(resource, { encoding });
 		assert.notEqual(model3, model2);
-		assert.equal(manager.get(resource), model3);
+		assert.strictEqual(manager.get(resource), model3);
 		model3.dispose();
 
-		assert.equal(events.length, 2);
-		assert.equal(events[0].resource.toString(), model1.resource.toString());
-		assert.equal(events[1].resource.toString(), model2.resource.toString());
+		assert.strictEqual(events.length, 2);
+		assert.strictEqual(events[0].resource.toString(), model1.resource.toString());
+		assert.strictEqual(events[1].resource.toString(), model2.resource.toString());
 
 		listener.dispose();
 
@@ -128,12 +128,12 @@ suite('Files - TextFileEditorModelManager', () => {
 		const resource = URI.file('/test.html');
 
 		const model = await manager.resolve(resource, { contents: createTextBufferFactory('Hello World') });
-		assert.equal(model.textEditorModel?.getValue(), 'Hello World');
-		assert.equal(model.isDirty(), true);
+		assert.strictEqual(model.textEditorModel?.getValue(), 'Hello World');
+		assert.strictEqual(model.isDirty(), true);
 
 		await manager.resolve(resource, { contents: createTextBufferFactory('More Changes') });
-		assert.equal(model.textEditorModel?.getValue(), 'More Changes');
-		assert.equal(model.isDirty(), true);
+		assert.strictEqual(model.textEditorModel?.getValue(), 'More Changes');
+		assert.strictEqual(model.isDirty(), true);
 
 		model.dispose();
 		manager.dispose();
@@ -151,8 +151,8 @@ suite('Files - TextFileEditorModelManager', () => {
 		await secondModelPromise;
 		const model = await thirdModelPromise;
 
-		assert.equal(model.textEditorModel?.getValue(), 'More Changes');
-		assert.equal(model.isDirty(), true);
+		assert.strictEqual(model.textEditorModel?.getValue(), 'More Changes');
+		assert.strictEqual(model.isDirty(), true);
 
 		model.dispose();
 		manager.dispose();
@@ -228,13 +228,13 @@ suite('Files - TextFileEditorModelManager', () => {
 		});
 
 		const model1 = await manager.resolve(resource1, { encoding: 'utf8' });
-		assert.equal(loadedCounter, 1);
+		assert.strictEqual(loadedCounter, 1);
 
 		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: resource1, type: FileChangeType.DELETED }], false));
 		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: resource1, type: FileChangeType.ADDED }], false));
 
 		const model2 = await manager.resolve(resource2, { encoding: 'utf8' });
-		assert.equal(loadedCounter, 2);
+		assert.strictEqual(loadedCounter, 2);
 
 		model1.updateTextEditorModel(createTextBufferFactory('changed'));
 		model1.updatePreferredEncoding('utf16');
@@ -247,11 +247,11 @@ suite('Files - TextFileEditorModelManager', () => {
 		model2.dispose();
 
 		await model1.revert();
-		assert.equal(gotDirtyCounter, 2);
-		assert.equal(gotNonDirtyCounter, 2);
-		assert.equal(revertedCounter, 1);
-		assert.equal(savedCounter, 1);
-		assert.equal(encodingCounter, 2);
+		assert.strictEqual(gotDirtyCounter, 2);
+		assert.strictEqual(gotNonDirtyCounter, 2);
+		assert.strictEqual(revertedCounter, 1);
+		assert.strictEqual(savedCounter, 1);
+		assert.strictEqual(encodingCounter, 2);
 
 		model1.dispose();
 		model2.dispose();
@@ -289,15 +289,15 @@ suite('Files - TextFileEditorModelManager', () => {
 			canDispose = await canDisposePromise;
 		})();
 
-		assert.equal(canDispose, false);
+		assert.strictEqual(canDispose, false);
 		model.revert({ soft: true });
 
 		await timeout(0);
 
-		assert.equal(canDispose, true);
+		assert.strictEqual(canDispose, true);
 
 		let canDispose2 = manager.canDispose(model as TextFileEditorModel);
-		assert.equal(canDispose2, true);
+		assert.strictEqual(canDispose2, true);
 
 		manager.dispose();
 	});
@@ -313,10 +313,10 @@ suite('Files - TextFileEditorModelManager', () => {
 		const resource = toResource.call(this, '/path/index_something.txt');
 
 		let model = await manager.resolve(resource, { mode });
-		assert.equal(model.textEditorModel!.getModeId(), mode);
+		assert.strictEqual(model.textEditorModel!.getModeId(), mode);
 
 		model = await manager.resolve(resource, { mode: 'text' });
-		assert.equal(model.textEditorModel!.getModeId(), PLAINTEXT_MODE_ID);
+		assert.strictEqual(model.textEditorModel!.getModeId(), PLAINTEXT_MODE_ID);
 
 		model.dispose();
 		manager.dispose();
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
index 8507b7f88..19a8a497c 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileService.test.ts
@@ -58,7 +58,7 @@ suite('Files - TextFileService', () => {
 		assert.ok(accessor.textFileService.isDirty(model.resource));
 
 		const res = await accessor.textFileService.save(model.resource);
-		assert.equal(res?.toString(), model.resource.toString());
+		assert.strictEqual(res?.toString(), model.resource.toString());
 		assert.ok(!accessor.textFileService.isDirty(model.resource));
 	});
 
@@ -71,7 +71,7 @@ suite('Files - TextFileService', () => {
 		assert.ok(accessor.textFileService.isDirty(model.resource));
 
 		const res = await accessor.textFileService.save(model.resource);
-		assert.equal(res?.toString(), model.resource.toString());
+		assert.strictEqual(res?.toString(), model.resource.toString());
 		assert.ok(!accessor.textFileService.isDirty(model.resource));
 	});
 
@@ -85,7 +85,7 @@ suite('Files - TextFileService', () => {
 		assert.ok(accessor.textFileService.isDirty(model.resource));
 
 		const res = await accessor.textFileService.saveAs(model.resource);
-		assert.equal(res!.toString(), model.resource.toString());
+		assert.strictEqual(res!.toString(), model.resource.toString());
 		assert.ok(!accessor.textFileService.isDirty(model.resource));
 	});
 
@@ -114,21 +114,21 @@ suite('Files - TextFileService', () => {
 
 		const disposable1 = accessor.workingCopyFileService.addFileOperationParticipant({
 			participate: async files => {
-				assert.equal(files[0].target, model.resource.toString());
+				assert.strictEqual(files[0].target.toString(), model.resource.toString());
 				eventCounter++;
 			}
 		});
 
 		const disposable2 = accessor.workingCopyFileService.onDidRunWorkingCopyFileOperation(e => {
-			assert.equal(e.operation, FileOperation.CREATE);
-			assert.equal(e.files[0].target.toString(), model.resource.toString());
+			assert.strictEqual(e.operation, FileOperation.CREATE);
+			assert.strictEqual(e.files[0].target.toString(), model.resource.toString());
 			eventCounter++;
 		});
 
-		await accessor.textFileService.create(model.resource, 'Foo');
+		await accessor.textFileService.create([{ resource: model.resource, value: 'Foo' }]);
 		assert.ok(!accessor.textFileService.isDirty(model.resource));
 
-		assert.equal(eventCounter, 2);
+		assert.strictEqual(eventCounter, 2);
 
 		disposable1.dispose();
 		disposable2.dispose();
@@ -141,7 +141,7 @@ suite('Files - TextFileService', () => {
 		});
 
 		let suggested = accessor.textFileService.suggestFilename('shleem', 'Untitled-1');
-		assert.equal(suggested, 'Untitled-1');
+		assert.strictEqual(suggested, 'Untitled-1');
 	});
 
 	test('Filename Suggestion - Suggest prefix with first extension', () => {
@@ -152,7 +152,7 @@ suite('Files - TextFileService', () => {
 		});
 
 		let suggested = accessor.textFileService.suggestFilename('plumbus1', 'Untitled-1');
-		assert.equal(suggested, 'Untitled-1.shleem');
+		assert.strictEqual(suggested, 'Untitled-1.shleem');
 	});
 
 	test('Filename Suggestion - Suggest filename if there are no extensions', () => {
@@ -162,7 +162,7 @@ suite('Files - TextFileService', () => {
 		});
 
 		let suggested = accessor.textFileService.suggestFilename('plumbus2', 'Untitled-1');
-		assert.equal(suggested, 'plumbus');
+		assert.strictEqual(suggested, 'plumbus');
 	});
 
 });
diff --git a/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts b/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
index 71f8242e6..dab4b4e62 100644
--- a/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
+++ b/src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts
@@ -53,142 +53,142 @@ export default function createSuite(params: Params) {
 	test('create - no encoding - content empty', async () => {
 		const resource = URI.file(join(testDir, 'small_new.txt'));
 
-		await service.create(resource);
+		await service.create([{ resource }]);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, 0 /* no BOM */);
+		assert.strictEqual(res.byteLength, 0 /* no BOM */);
 	});
 
 	test('create - no encoding - content provided (string)', async () => {
 		const resource = URI.file(join(testDir, 'small_new.txt'));
 
-		await service.create(resource, 'Hello World');
+		await service.create([{ resource, value: 'Hello World' }]);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.toString(), 'Hello World');
-		assert.equal(res.byteLength, 'Hello World'.length);
+		assert.strictEqual(res.toString(), 'Hello World');
+		assert.strictEqual(res.byteLength, 'Hello World'.length);
 	});
 
 	test('create - no encoding - content provided (snapshot)', async () => {
 		const resource = URI.file(join(testDir, 'small_new.txt'));
 
-		await service.create(resource, stringToSnapshot('Hello World'));
+		await service.create([{ resource, value: stringToSnapshot('Hello World') }]);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.toString(), 'Hello World');
-		assert.equal(res.byteLength, 'Hello World'.length);
+		assert.strictEqual(res.toString(), 'Hello World');
+		assert.strictEqual(res.byteLength, 'Hello World'.length);
 	});
 
 	test('create - UTF 16 LE - no content', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf16le'));
 
-		await service.create(resource);
+		await service.create([{ resource }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF16le);
+		assert.strictEqual(detectedEncoding, UTF16le);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, UTF16le_BOM.length);
+		assert.strictEqual(res.byteLength, UTF16le_BOM.length);
 	});
 
 	test('create - UTF 16 LE - content provided', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf16le'));
 
-		await service.create(resource, 'Hello World');
+		await service.create([{ resource, value: 'Hello World' }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF16le);
+		assert.strictEqual(detectedEncoding, UTF16le);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, 'Hello World'.length * 2 /* UTF16 2bytes per char */ + UTF16le_BOM.length);
+		assert.strictEqual(res.byteLength, 'Hello World'.length * 2 /* UTF16 2bytes per char */ + UTF16le_BOM.length);
 	});
 
 	test('create - UTF 16 BE - no content', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf16be'));
 
-		await service.create(resource);
+		await service.create([{ resource }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF16be);
+		assert.strictEqual(detectedEncoding, UTF16be);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, UTF16le_BOM.length);
+		assert.strictEqual(res.byteLength, UTF16le_BOM.length);
 	});
 
 	test('create - UTF 16 BE - content provided', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf16be'));
 
-		await service.create(resource, 'Hello World');
+		await service.create([{ resource, value: 'Hello World' }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF16be);
+		assert.strictEqual(detectedEncoding, UTF16be);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, 'Hello World'.length * 2 /* UTF16 2bytes per char */ + UTF16be_BOM.length);
+		assert.strictEqual(res.byteLength, 'Hello World'.length * 2 /* UTF16 2bytes per char */ + UTF16be_BOM.length);
 	});
 
 	test('create - UTF 8 BOM - no content', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf8bom'));
 
-		await service.create(resource);
+		await service.create([{ resource }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, UTF8_BOM.length);
+		assert.strictEqual(res.byteLength, UTF8_BOM.length);
 	});
 
 	test('create - UTF 8 BOM - content provided', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf8bom'));
 
-		await service.create(resource, 'Hello World');
+		await service.create([{ resource, value: 'Hello World' }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, 'Hello World'.length + UTF8_BOM.length);
+		assert.strictEqual(res.byteLength, 'Hello World'.length + UTF8_BOM.length);
 	});
 
 	test('create - UTF 8 BOM - empty content - snapshot', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf8bom'));
 
-		await service.create(resource, createTextModel('').createSnapshot());
+		await service.create([{ resource, value: createTextModel('').createSnapshot() }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, UTF8_BOM.length);
+		assert.strictEqual(res.byteLength, UTF8_BOM.length);
 	});
 
 	test('create - UTF 8 BOM - content provided - snapshot', async () => {
 		const resource = URI.file(join(testDir, 'small_new.utf8bom'));
 
-		await service.create(resource, createTextModel('Hello World').createSnapshot());
+		await service.create([{ resource, value: createTextModel('Hello World').createSnapshot() }]);
 
-		assert.equal(await exists(resource.fsPath), true);
+		assert.strictEqual(await exists(resource.fsPath), true);
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		const res = await readFile(resource.fsPath);
-		assert.equal(res.byteLength, 'Hello World'.length + UTF8_BOM.length);
+		assert.strictEqual(res.byteLength, 'Hello World'.length + UTF8_BOM.length);
 	});
 
 	test('write - use encoding (UTF 16 BE) - small content as string', async () => {
@@ -211,12 +211,12 @@ export default function createSuite(params: Params) {
 		await service.write(resource, content, { encoding });
 
 		const detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, encoding);
+		assert.strictEqual(detectedEncoding, encoding);
 
 		const resolved = await service.readStream(resource);
-		assert.equal(resolved.encoding, encoding);
+		assert.strictEqual(resolved.encoding, encoding);
 
-		assert.equal(snapshotToString(resolved.value.create(isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(false)), expectedContent);
+		assert.strictEqual(snapshotToString(resolved.value.create(isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).textBuffer.createSnapshot(false)), expectedContent);
 	}
 
 	test('write - use encoding (cp1252)', async () => {
@@ -244,18 +244,18 @@ export default function createSuite(params: Params) {
 
 	async function testEncodingKeepsData(resource: URI, encoding: string, expected: string) {
 		let resolved = await service.readStream(resource, { encoding });
-		const content = snapshotToString(resolved.value.create(isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(false));
-		assert.equal(content, expected);
+		const content = snapshotToString(resolved.value.create(isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
+		assert.strictEqual(content, expected);
 
 		await service.write(resource, content, { encoding });
 
 		resolved = await service.readStream(resource, { encoding });
-		assert.equal(snapshotToString(resolved.value.create(DefaultEndOfLine.CRLF).createSnapshot(false)), content);
+		assert.strictEqual(snapshotToString(resolved.value.create(DefaultEndOfLine.CRLF).textBuffer.createSnapshot(false)), content);
 
 		await service.write(resource, createTextModel(content).createSnapshot(), { encoding });
 
 		resolved = await service.readStream(resource, { encoding });
-		assert.equal(snapshotToString(resolved.value.create(DefaultEndOfLine.CRLF).createSnapshot(false)), content);
+		assert.strictEqual(snapshotToString(resolved.value.create(DefaultEndOfLine.CRLF).textBuffer.createSnapshot(false)), content);
 	}
 
 	test('write - no encoding - content as string', async () => {
@@ -266,7 +266,7 @@ export default function createSuite(params: Params) {
 		await service.write(resource, content);
 
 		const resolved = await service.readStream(resource);
-		assert.equal(resolved.value.getFirstLineText(999999), content);
+		assert.strictEqual(resolved.value.getFirstLineText(999999), content);
 	});
 
 	test('write - no encoding - content as snapshot', async () => {
@@ -277,14 +277,14 @@ export default function createSuite(params: Params) {
 		await service.write(resource, createTextModel(content).createSnapshot());
 
 		const resolved = await service.readStream(resource);
-		assert.equal(resolved.value.getFirstLineText(999999), content);
+		assert.strictEqual(resolved.value.getFirstLineText(999999), content);
 	});
 
 	test('write - encoding preserved (UTF 16 LE) - content as string', async () => {
 		const resource = URI.file(join(testDir, 'some_utf16le.css'));
 
 		const resolved = await service.readStream(resource);
-		assert.equal(resolved.encoding, UTF16le);
+		assert.strictEqual(resolved.encoding, UTF16le);
 
 		await testEncoding(URI.file(join(testDir, 'some_utf16le.css')), UTF16le, 'Hello\nWorld', 'Hello\nWorld');
 	});
@@ -293,7 +293,7 @@ export default function createSuite(params: Params) {
 		const resource = URI.file(join(testDir, 'some_utf16le.css'));
 
 		const resolved = await service.readStream(resource);
-		assert.equal(resolved.encoding, UTF16le);
+		assert.strictEqual(resolved.encoding, UTF16le);
 
 		await testEncoding(URI.file(join(testDir, 'some_utf16le.css')), UTF16le, createTextModel('Hello\nWorld').createSnapshot(), 'Hello\nWorld');
 	});
@@ -302,67 +302,67 @@ export default function createSuite(params: Params) {
 		const resource = URI.file(join(testDir, 'index.html'));
 
 		let detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 
 		const content = (await readFile(resource.fsPath)).toString() + 'updates';
 		await service.write(resource, content, { encoding: UTF8_with_bom });
 
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		// ensure BOM preserved if enforced
 		await service.write(resource, content, { encoding: UTF8_with_bom });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		// allow to remove BOM
 		await service.write(resource, content, { encoding: UTF8 });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 
 		// BOM does not come back
 		await service.write(resource, content, { encoding: UTF8 });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 	});
 
 	test('write - UTF8 variations - content as snapshot', async () => {
 		const resource = URI.file(join(testDir, 'index.html'));
 
 		let detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 
 		const model = createTextModel((await readFile(resource.fsPath)).toString() + 'updates');
 		await service.write(resource, model.createSnapshot(), { encoding: UTF8_with_bom });
 
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		// ensure BOM preserved if enforced
 		await service.write(resource, model.createSnapshot(), { encoding: UTF8_with_bom });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		// allow to remove BOM
 		await service.write(resource, model.createSnapshot(), { encoding: UTF8 });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 
 		// BOM does not come back
 		await service.write(resource, model.createSnapshot(), { encoding: UTF8 });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 	});
 
 	test('write - preserve UTF8 BOM - content as string', async () => {
 		const resource = URI.file(join(testDir, 'some_utf8_bom.txt'));
 
 		let detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 
 		await service.write(resource, 'Hello World', { encoding: detectedEncoding! });
 		detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 	});
 
 	test('write - ensure BOM in empty file - content as string', async () => {
@@ -371,7 +371,7 @@ export default function createSuite(params: Params) {
 		await service.write(resource, '', { encoding: UTF8_with_bom });
 
 		let detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 	});
 
 	test('write - ensure BOM in empty file - content as snapshot', async () => {
@@ -380,7 +380,7 @@ export default function createSuite(params: Params) {
 		await service.write(resource, createTextModel('').createSnapshot(), { encoding: UTF8_with_bom });
 
 		let detectedEncoding = await detectEncodingByBOM(resource.fsPath);
-		assert.equal(detectedEncoding, UTF8_with_bom);
+		assert.strictEqual(detectedEncoding, UTF8_with_bom);
 	});
 
 	test('readStream - small text', async () => {
@@ -398,12 +398,12 @@ export default function createSuite(params: Params) {
 	async function testReadStream(resource: URI): Promise<void> {
 		const result = await service.readStream(resource);
 
-		assert.equal(result.name, basename(resource.fsPath));
-		assert.equal(result.size, (await stat(resource.fsPath)).size);
+		assert.strictEqual(result.name, basename(resource.fsPath));
+		assert.strictEqual(result.size, (await stat(resource.fsPath)).size);
 
 		const content = (await readFile(resource.fsPath)).toString();
-		assert.equal(
-			snapshotToString(result.value.create(DefaultEndOfLine.LF).createSnapshot(false)),
+		assert.strictEqual(
+			snapshotToString(result.value.create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false)),
 			snapshotToString(createTextModel(content).createSnapshot(false)));
 	}
 
@@ -422,9 +422,9 @@ export default function createSuite(params: Params) {
 	async function testRead(resource: URI): Promise<void> {
 		const result = await service.read(resource);
 
-		assert.equal(result.name, basename(resource.fsPath));
-		assert.equal(result.size, (await stat(resource.fsPath)).size);
-		assert.equal(result.value, (await readFile(resource.fsPath)).toString());
+		assert.strictEqual(result.name, basename(resource.fsPath));
+		assert.strictEqual(result.size, (await stat(resource.fsPath)).size);
+		assert.strictEqual(result.value, (await readFile(resource.fsPath)).toString());
 	}
 
 	test('readStream - encoding picked up (CP1252)', async () => {
@@ -432,8 +432,8 @@ export default function createSuite(params: Params) {
 		const encoding = 'windows1252';
 
 		const result = await service.readStream(resource, { encoding });
-		assert.equal(result.encoding, encoding);
-		assert.equal(result.value.getFirstLineText(999999), 'Private = "Persönlicheß Information"');
+		assert.strictEqual(result.encoding, encoding);
+		assert.strictEqual(result.value.getFirstLineText(999999), 'Private = "Persönlicheß Information"');
 	});
 
 	test('read - encoding picked up (CP1252)', async () => {
@@ -441,8 +441,8 @@ export default function createSuite(params: Params) {
 		const encoding = 'windows1252';
 
 		const result = await service.read(resource, { encoding });
-		assert.equal(result.encoding, encoding);
-		assert.equal(result.value, 'Private = "Persönlicheß Information"');
+		assert.strictEqual(result.encoding, encoding);
+		assert.strictEqual(result.value, 'Private = "Persönlicheß Information"');
 	});
 
 	test('read - encoding picked up (binary)', async () => {
@@ -450,8 +450,8 @@ export default function createSuite(params: Params) {
 		const encoding = 'binary';
 
 		const result = await service.read(resource, { encoding });
-		assert.equal(result.encoding, encoding);
-		assert.equal(result.value, 'Private = "Persönlicheß Information"');
+		assert.strictEqual(result.encoding, encoding);
+		assert.strictEqual(result.value, 'Private = "Persönlicheß Information"');
 	});
 
 	test('read - encoding picked up (base64)', async () => {
@@ -459,37 +459,37 @@ export default function createSuite(params: Params) {
 		const encoding = 'base64';
 
 		const result = await service.read(resource, { encoding });
-		assert.equal(result.encoding, encoding);
-		assert.equal(result.value, btoa('Private = "Persönlicheß Information"'));
+		assert.strictEqual(result.encoding, encoding);
+		assert.strictEqual(result.value, btoa('Private = "Persönlicheß Information"'));
 	});
 
 	test('readStream - user overrides BOM', async () => {
 		const resource = URI.file(join(testDir, 'some_utf16le.css'));
 
 		const result = await service.readStream(resource, { encoding: 'windows1252' });
-		assert.equal(result.encoding, 'windows1252');
+		assert.strictEqual(result.encoding, 'windows1252');
 	});
 
 	test('readStream - BOM removed', async () => {
 		const resource = URI.file(join(testDir, 'some_utf8_bom.txt'));
 
 		const result = await service.readStream(resource);
-		assert.equal(result.value.getFirstLineText(999999), 'This is some UTF 8 with BOM file.');
+		assert.strictEqual(result.value.getFirstLineText(999999), 'This is some UTF 8 with BOM file.');
 	});
 
 	test('readStream - invalid encoding', async () => {
 		const resource = URI.file(join(testDir, 'index.html'));
 
 		const result = await service.readStream(resource, { encoding: 'superduper' });
-		assert.equal(result.encoding, 'utf8');
+		assert.strictEqual(result.encoding, 'utf8');
 	});
 
 	test('readStream - encoding override', async () => {
 		const resource = URI.file(join(testDir, 'some.utf16le'));
 
 		const result = await service.readStream(resource, { encoding: 'windows1252' });
-		assert.equal(result.encoding, 'utf16le');
-		assert.equal(result.value.getFirstLineText(999999), 'This is some UTF 16 with BOM file.');
+		assert.strictEqual(result.encoding, 'utf16le');
+		assert.strictEqual(result.value.getFirstLineText(999999), 'This is some UTF 16 with BOM file.');
 	});
 
 	test('readStream - large Big5', async () => {
@@ -528,11 +528,11 @@ export default function createSuite(params: Params) {
 		const resource = URI.file(join(testDir, `lorem_${encoding}.txt`));
 
 		const result = await service.readStream(resource, { encoding });
-		assert.equal(result.encoding, encoding);
+		assert.strictEqual(result.encoding, encoding);
 
-		const contents = snapshotToString(result.value.create(DefaultEndOfLine.LF).createSnapshot(false));
+		const contents = snapshotToString(result.value.create(DefaultEndOfLine.LF).textBuffer.createSnapshot(false));
 
-		assert.equal(contents.indexOf(needle), 0);
+		assert.strictEqual(contents.indexOf(needle), 0);
 		assert.ok(contents.indexOf(needle, 10) > 0);
 	}
 
@@ -540,21 +540,21 @@ export default function createSuite(params: Params) {
 		const resource = URI.file(join(testDir, 'utf16_le_nobom.txt'));
 
 		const result = await service.readStream(resource);
-		assert.equal(result.encoding, 'utf16le');
+		assert.strictEqual(result.encoding, 'utf16le');
 	});
 
 	test('readStream - UTF16 BE (no BOM)', async () => {
 		const resource = URI.file(join(testDir, 'utf16_be_nobom.txt'));
 
 		const result = await service.readStream(resource);
-		assert.equal(result.encoding, 'utf16be');
+		assert.strictEqual(result.encoding, 'utf16be');
 	});
 
 	test('readStream - autoguessEncoding', async () => {
 		const resource = URI.file(join(testDir, 'some_cp1252.txt'));
 
 		const result = await service.readStream(resource, { autoGuessEncoding: true });
-		assert.equal(result.encoding, 'windows1252');
+		assert.strictEqual(result.encoding, 'windows1252');
 	});
 
 	test('readStream - FILE_IS_BINARY', async () => {
@@ -568,10 +568,10 @@ export default function createSuite(params: Params) {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.textFileOperationResult, TextFileOperationResult.FILE_IS_BINARY);
+		assert.strictEqual(error!.textFileOperationResult, TextFileOperationResult.FILE_IS_BINARY);
 
 		const result = await service.readStream(URI.file(join(testDir, 'small.txt')), { acceptTextOnly: true });
-		assert.equal(result.name, 'small.txt');
+		assert.strictEqual(result.name, 'small.txt');
 	});
 
 	test('read - FILE_IS_BINARY', async () => {
@@ -585,9 +585,9 @@ export default function createSuite(params: Params) {
 		}
 
 		assert.ok(error);
-		assert.equal(error!.textFileOperationResult, TextFileOperationResult.FILE_IS_BINARY);
+		assert.strictEqual(error!.textFileOperationResult, TextFileOperationResult.FILE_IS_BINARY);
 
 		const result = await service.read(URI.file(join(testDir, 'small.txt')), { acceptTextOnly: true });
-		assert.equal(result.name, 'small.txt');
+		assert.strictEqual(result.name, 'small.txt');
 	});
 }
diff --git a/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts
index 722fb0cc3..59579ff13 100644
--- a/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts
+++ b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts
@@ -8,15 +8,13 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { Schemas } from 'vs/base/common/network';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { rimraf, RimRafMode, copy, readFile, exists, stat } from 'vs/base/node/pfs';
+import { rimraf, copy, readFile, exists, stat } from 'vs/base/node/pfs';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { NullLogService } from 'vs/platform/log/common/log';
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
+import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { tmpdir } from 'os';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'vs/base/common/path';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { detectEncodingByBOM } from 'vs/workbench/services/textfile/test/node/encoding/encoding.test';
 import { workbenchInstantiationService, TestNativeTextFileServiceWithEncodingOverrides } from 'vs/workbench/test/electron-browser/workbenchTestServices';
@@ -25,22 +23,12 @@ import { IWorkingCopyFileService, WorkingCopyFileService } from 'vs/workbench/se
 import { TestWorkingCopyService } from 'vs/workbench/test/common/workbenchTestServices';
 import { UriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentityService';
 
-suite('Files - NativeTextFileService i/o', function () {
-	const parentDir = getRandomTestPath(tmpdir(), 'vsctests', 'textfileservice');
-
+flakySuite('Files - NativeTextFileService i/o', function () {
 	const disposables = new DisposableStore();
 
 	let service: ITextFileService;
 	let testDir: string;
 
-	// Given issues such as https://github.com/microsoft/vscode/issues/78602
-	// and https://github.com/microsoft/vscode/issues/92334 we see random test
-	// failures when accessing the native file system. To diagnose further, we
-	// retry node.js file access tests up to 3 times to rule out any random disk
-	// issue and increase the timeout.
-	this.retries(3);
-	this.timeout(1000 * 10);
-
 	createSuite({
 		setup: async () => {
 			const instantiationService = workbenchInstantiationService();
@@ -59,8 +47,7 @@ suite('Files - NativeTextFileService i/o', function () {
 
 			service = instantiationService.createChild(collection).createInstance(TestNativeTextFileServiceWithEncodingOverrides);
 
-			const id = generateUuid();
-			testDir = join(parentDir, id);
+			testDir = getRandomTestPath(tmpdir(), 'vsctests', 'textfileservice');
 			const sourceDir = getPathFromAmdModule(require, './fixtures');
 
 			await copy(sourceDir, testDir);
@@ -68,12 +55,12 @@ suite('Files - NativeTextFileService i/o', function () {
 			return { service, testDir };
 		},
 
-		teardown: async () => {
+		teardown: () => {
 			(<TextFileEditorModelManager>service.files).dispose();
 
 			disposables.clear();
 
-			await rimraf(parentDir, RimRafMode.MOVE);
+			return rimraf(testDir);
 		},
 
 		exists,
diff --git a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
index 379304303..5f22081ec 100644
--- a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
+++ b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
@@ -83,42 +83,42 @@ suite('Encoding', () => {
 		const file = getPathFromAmdModule(require, './fixtures/not-exist.css');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 	});
 
 	test('detectBOM UTF-8', async () => {
 		const file = getPathFromAmdModule(require, './fixtures/some_utf8.css');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf8bom');
+		assert.strictEqual(detectedEncoding, 'utf8bom');
 	});
 
 	test('detectBOM UTF-16 LE', async () => {
 		const file = getPathFromAmdModule(require, './fixtures/some_utf16le.css');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf16le');
+		assert.strictEqual(detectedEncoding, 'utf16le');
 	});
 
 	test('detectBOM UTF-16 BE', async () => {
 		const file = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf16be');
+		assert.strictEqual(detectedEncoding, 'utf16be');
 	});
 
 	test('detectBOM ANSI', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 	});
 
 	test('detectBOM ANSI', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
 
 		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
+		assert.strictEqual(detectedEncoding, null);
 	});
 
 	test('resolve terminal encoding (detect)', async function () {
@@ -131,7 +131,7 @@ suite('Encoding', () => {
 
 		const enc = await terminalEncoding.resolveTerminalEncoding();
 		assert.ok(await encoding.encodingExists(enc));
-		assert.equal(enc, 'utf16le');
+		assert.strictEqual(enc, 'utf16le');
 	});
 
 	test('detectEncodingFromBuffer (JSON saved as PNG)', async function () {
@@ -139,86 +139,86 @@ suite('Encoding', () => {
 
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
+		assert.strictEqual(mimes.seemsBinary, false);
 	});
 
 	test('detectEncodingFromBuffer (PNG saved as TXT)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.png.txt');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
+		assert.strictEqual(mimes.seemsBinary, true);
 	});
 
 	test('detectEncodingFromBuffer (XML saved as PNG)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.xml.png');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
+		assert.strictEqual(mimes.seemsBinary, false);
 	});
 
 	test('detectEncodingFromBuffer (QWOFF saved as TXT)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.qwoff.txt');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
+		assert.strictEqual(mimes.seemsBinary, true);
 	});
 
 	test('detectEncodingFromBuffer (CSS saved as QWOFF)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.css.qwoff');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
+		assert.strictEqual(mimes.seemsBinary, false);
 	});
 
 	test('detectEncodingFromBuffer (PDF)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.pdf');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
+		assert.strictEqual(mimes.seemsBinary, true);
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/utf16_le_nobom.txt');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.encoding, encoding.UTF16le);
-		assert.equal(mimes.seemsBinary, false);
+		assert.strictEqual(mimes.encoding, encoding.UTF16le);
+		assert.strictEqual(mimes.seemsBinary, false);
 	});
 
 	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/utf16_be_nobom.txt');
 		const buffer = await readExactlyByFile(file, 512);
 		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.encoding, encoding.UTF16be);
-		assert.equal(mimes.seemsBinary, false);
+		assert.strictEqual(mimes.encoding, encoding.UTF16be);
+		assert.strictEqual(mimes.seemsBinary, false);
 	});
 
 	test('autoGuessEncoding (UTF8)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some_file.css');
 		const buffer = await readExactlyByFile(file, 512 * 8);
 		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'utf8');
+		assert.strictEqual(mimes.encoding, 'utf8');
 	});
 
 	test('autoGuessEncoding (ASCII)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
 		const buffer = await readExactlyByFile(file, 512 * 8);
 		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, null);
+		assert.strictEqual(mimes.encoding, null);
 	});
 
 	test('autoGuessEncoding (ShiftJIS)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.shiftjis.txt');
 		const buffer = await readExactlyByFile(file, 512 * 8);
 		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'shiftjis');
+		assert.strictEqual(mimes.encoding, 'shiftjis');
 	});
 
 	test('autoGuessEncoding (CP1252)', async function () {
 		const file = getPathFromAmdModule(require, './fixtures/some.cp1252.txt');
 		const buffer = await readExactlyByFile(file, 512 * 8);
 		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'windows1252');
+		assert.strictEqual(mimes.encoding, 'windows1252');
 	});
 
 	async function readAndDecodeFromDisk(path: string, fileEncoding: string | null) {
@@ -265,7 +265,7 @@ suite('Encoding', () => {
 		assert.ok(stream);
 
 		const content = await readAllAsString(stream);
-		assert.equal(content, 'ABCABCABC');
+		assert.strictEqual(content, 'ABCABCABC');
 	});
 
 	test('toDecodeStream - some stream, expect too much data', async function () {
@@ -281,7 +281,7 @@ suite('Encoding', () => {
 		assert.ok(stream);
 
 		const content = await readAllAsString(stream);
-		assert.equal(content, 'ABCABCABC');
+		assert.strictEqual(content, 'ABCABCABC');
 	});
 
 	test('toDecodeStream - some stream, no data', async function () {
@@ -294,7 +294,7 @@ suite('Encoding', () => {
 		assert.ok(stream);
 
 		const content = await readAllAsString(stream);
-		assert.equal(content, '');
+		assert.strictEqual(content, '');
 	});
 
 	test('toDecodeStream - encoding, utf16be', async function () {
@@ -303,12 +303,12 @@ suite('Encoding', () => {
 
 		const { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
 
-		assert.equal(detected.encoding, 'utf16be');
-		assert.equal(detected.seemsBinary, false);
+		assert.strictEqual(detected.encoding, 'utf16be');
+		assert.strictEqual(detected.seemsBinary, false);
 
 		const expected = await readAndDecodeFromDisk(path, detected.encoding);
 		const actual = await readAllAsString(stream);
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	});
 
 	test('toDecodeStream - empty file', async function () {
@@ -318,7 +318,7 @@ suite('Encoding', () => {
 
 		const expected = await readAndDecodeFromDisk(path, detected.encoding);
 		const actual = await readAllAsString(stream);
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	});
 
 	test('toDecodeStream - decodes buffer entirely', async function () {
@@ -336,7 +336,7 @@ suite('Encoding', () => {
 		const expected = new TextDecoder().decode(incompleteEmojis);
 		const actual = await readAllAsString(stream);
 
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	});
 
 	test('toDecodeStream - some stream (GBK issue #101856)', async function () {
@@ -348,10 +348,10 @@ suite('Encoding', () => {
 		assert.ok(stream);
 
 		const content = await readAllAsString(stream);
-		assert.equal(content.length, 65537);
+		assert.strictEqual(content.length, 65537);
 	});
 
-	(isWindows /* unsupported OS */ ? test.skip : test)('toDecodeStream - some stream (UTF-8 issue #102202)', async function () {
+	(isWindows /* TODO@bpasero why does this fail on windows */ ? test.skip : test)('toDecodeStream - some stream (UTF-8 issue #102202)', async function () {
 		const path = getPathFromAmdModule(require, './fixtures/issue_102202.txt');
 		const source = streamToBufferReadableStream(fs.createReadStream(path));
 
@@ -362,7 +362,7 @@ suite('Encoding', () => {
 		const content = await readAllAsString(stream);
 		const lines = content.split('\n');
 
-		assert.equal(lines[981].toString(), '啊啊啊啊啊啊aaa啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊，啊啊啊啊啊啊啊啊啊啊啊。');
+		assert.strictEqual(lines[981].toString(), '啊啊啊啊啊啊aaa啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊，啊啊啊啊啊啊啊啊啊啊啊。');
 	});
 
 	test('toEncodeReadable - encoding, utf16be', async function () {
@@ -378,7 +378,7 @@ suite('Encoding', () => {
 			VSBuffer.concat
 		).toString();
 
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	});
 
 	test('toEncodeReadable - empty readable to utf8', async function () {
@@ -393,7 +393,7 @@ suite('Encoding', () => {
 			VSBuffer.concat
 		).toString();
 
-		assert.equal(actual, '');
+		assert.strictEqual(actual, '');
 	});
 
 	[{
@@ -421,7 +421,7 @@ suite('Encoding', () => {
 			const expected = VSBuffer.wrap(Buffer.from(relatedBom)).toString();
 			const actual = streams.consumeReadable(await encodedReadable, VSBuffer.concat).toString();
 
-			assert.equal(actual, expected);
+			assert.strictEqual(actual, expected);
 		});
 	});
 
@@ -431,7 +431,7 @@ suite('Encoding', () => {
 				continue; // skip over encodings from us
 			}
 
-			assert.equal(iconv.encodingExists(enc), true, enc);
+			assert.strictEqual(iconv.encodingExists(enc), true, enc);
 		}
 	});
 });
diff --git a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
index a8abe3cce..fb0e1386d 100644
--- a/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
@@ -56,7 +56,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 		const model = await input.resolve();
 		assert.ok(model);
-		assert.equal(snapshotToString(((model as ResourceEditorModel).createSnapshot()!)), 'Hello Test');
+		assert.strictEqual(snapshotToString(((model as ResourceEditorModel).createSnapshot()!)), 'Hello Test');
 		let disposed = false;
 		let disposedPromise = new Promise<void>(resolve => {
 			Event.once(model.onDispose)(() => {
@@ -67,7 +67,7 @@ suite('Workbench - TextModelResolverService', () => {
 		input.dispose();
 
 		await disposedPromise;
-		assert.equal(disposed, true);
+		assert.strictEqual(disposed, true);
 		dispose.dispose();
 	});
 
@@ -83,7 +83,7 @@ suite('Workbench - TextModelResolverService', () => {
 		const editorModel = model.textEditorModel;
 
 		assert.ok(editorModel);
-		assert.equal(editorModel.getValue(), 'Hello Html');
+		assert.strictEqual(editorModel.getValue(), 'Hello Html');
 
 		let disposed = false;
 		Event.once(model.onDispose)(() => {
@@ -92,7 +92,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 		ref.dispose();
 		await timeout(0);  // due to the reference resolving the model first which is async
-		assert.equal(disposed, true);
+		assert.strictEqual(disposed, true);
 	});
 
 	test('resolved dirty file eventually disposes', async function () {
@@ -112,12 +112,12 @@ suite('Workbench - TextModelResolverService', () => {
 
 		ref.dispose();
 		await timeout(0);
-		assert.equal(disposed, false); // not disposed because model still dirty
+		assert.strictEqual(disposed, false); // not disposed because model still dirty
 
 		loadedModel.revert();
 
 		await timeout(0);
-		assert.equal(disposed, true); // now disposed because model got reverted
+		assert.strictEqual(disposed, true); // now disposed because model got reverted
 	});
 
 	test('resolved dirty file does not dispose when new reference created', async function () {
@@ -137,19 +137,19 @@ suite('Workbench - TextModelResolverService', () => {
 
 		ref1.dispose();
 		await timeout(0);
-		assert.equal(disposed, false); // not disposed because model still dirty
+		assert.strictEqual(disposed, false); // not disposed because model still dirty
 
 		const ref2 = await accessor.textModelResolverService.createModelReference(textModel.resource);
 
 		loadedModel.revert();
 
 		await timeout(0);
-		assert.equal(disposed, false); // not disposed because we got another ref meanwhile
+		assert.strictEqual(disposed, false); // not disposed because we got another ref meanwhile
 
 		ref2.dispose();
 
 		await timeout(0);
-		assert.equal(disposed, true); // now disposed because last ref got disposed
+		assert.strictEqual(disposed, true); // now disposed because last ref got disposed
 	});
 
 	test('resolve untitled', async () => {
@@ -160,7 +160,7 @@ suite('Workbench - TextModelResolverService', () => {
 		await input.resolve();
 		const ref = await accessor.textModelResolverService.createModelReference(input.resource);
 		const model = ref.object;
-		assert.equal(untitledModel, model);
+		assert.strictEqual(untitledModel, model);
 		const editorModel = model.textEditorModel;
 		assert.ok(editorModel);
 		ref.dispose();
@@ -170,7 +170,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 	test('even loading documents should be refcounted', async () => {
 		let resolveModel!: Function;
-		let waitForIt = new Promise(c => resolveModel = c);
+		let waitForIt = new Promise(resolve => resolveModel = resolve);
 
 		const disposable = accessor.textModelResolverService.registerTextModelContentProvider('test', {
 			provideTextContent: async (resource: URI): Promise<ITextModel> => {
@@ -195,7 +195,7 @@ suite('Workbench - TextModelResolverService', () => {
 		const model2 = modelRef2.object;
 		const textModel = model1.textEditorModel;
 
-		assert.equal(model1, model2, 'they are the same model');
+		assert.strictEqual(model1, model2, 'they are the same model');
 		assert(!textModel.isDisposed(), 'the text model should not be disposed');
 
 		modelRef1.dispose();
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index a19c6fb87..65f25cd64 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, ThemeSettings, IWorkbenchProductIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -131,7 +131,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		this.fileIconThemeSequencer = new Sequencer();
 
 		this.productIconThemeWatcher = new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentProductIconTheme.bind(this));
-		this.productIconThemeRegistry = new ThemeRegistry(productIconThemesExtPoint, ProductIconThemeData.fromExtensionTheme, true, ProductIconThemeData.defaultTheme, true);
+		this.productIconThemeRegistry = new ThemeRegistry(productIconThemesExtPoint, ProductIconThemeData.fromExtensionTheme, true, ProductIconThemeData.defaultTheme);
 		this.onProductIconThemeChange = new Emitter<IWorkbenchProductIconTheme>();
 		this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
 		this.productIconThemeSequencer = new Sequencer();
@@ -140,6 +140,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		// themes are loaded asynchronously, we need to initialize
 		// a color theme document with good defaults until the theme is loaded
 		let themeData: ColorThemeData | undefined = ColorThemeData.fromStorageData(this.storageService);
+		if (themeData && this.settings.colorTheme !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
+			// the web has different defaults than the desktop, therefore do not restore when the setting is the default theme and the storage doesn't match that.
+			themeData = undefined;
+		}
 
 		// the preferred color scheme (high contrast, light, dark) has changed since the last start
 		const preferredColorScheme = this.getPreferredColorScheme();
@@ -410,7 +414,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.onColorThemeChange.event;
 	}
 
-	public setColorTheme(themeId: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchColorTheme | null> {
+	public setColorTheme(themeId: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchColorTheme | null> {
 		return this.colorThemeSequencer.queue(() => {
 			if (!themeId) {
 				return Promise.resolve(null);
@@ -429,16 +433,20 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 				themeData.setCustomizations(this.settings);
 				return this.applyTheme(themeData, settingsTarget);
 			}, error => {
-				return Promise.reject(new Error(nls.localize('error.cannotloadtheme', "Unable to load {0}: {1}", themeData.location!.toString(), error.message)));
+				return Promise.reject(new Error(nls.localize('error.cannotloadtheme', "Unable to load {0}: {1}", themeData.location?.toString(), error.message)));
 			});
 		});
 	}
 
 	private reloadCurrentColorTheme() {
 		return this.colorThemeSequencer.queue(async () => {
-			await this.currentColorTheme.reload(this.extensionResourceLoaderService);
-			this.currentColorTheme.setCustomizations(this.settings);
-			await this.applyTheme(this.currentColorTheme, undefined, false);
+			try {
+				await this.currentColorTheme.reload(this.extensionResourceLoaderService);
+				this.currentColorTheme.setCustomizations(this.settings);
+				await this.applyTheme(this.currentColorTheme, undefined, false);
+			} catch (error) {
+				this.logService.info('Unable to reload {0}: {1}', this.currentColorTheme.location?.toString());
+			}
 		});
 	}
 
@@ -468,7 +476,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		_applyRules([...cssRules].join('\n'), colorThemeRulesClassName);
 	}
 
-	private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget | undefined | 'auto', silent = false): Promise<IWorkbenchColorTheme | null> {
+	private applyTheme(newTheme: ColorThemeData, settingsTarget: ThemeSettingTarget, silent = false): Promise<IWorkbenchColorTheme | null> {
 		this.updateDynamicCSSRules(newTheme);
 
 		if (this.currentColorTheme.id) {
@@ -547,7 +555,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 	}
 
 
-	public async setFileIconTheme(iconTheme: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchFileIconTheme> {
+	public async setFileIconTheme(iconTheme: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchFileIconTheme> {
 		return this.fileIconThemeSequencer.queue(async () => {
 			iconTheme = iconTheme || '';
 			if (iconTheme === this.currentFileIconTheme.id && this.currentFileIconTheme.isLoaded) {
@@ -623,7 +631,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		return this.onProductIconThemeChange.event;
 	}
 
-	public async setProductIconTheme(iconTheme: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchProductIconTheme> {
+	public async setProductIconTheme(iconTheme: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchProductIconTheme> {
 		return this.productIconThemeSequencer.queue(async () => {
 			iconTheme = iconTheme || '';
 			if (iconTheme === this.currentProductIconTheme.id && this.currentProductIconTheme.isLoaded) {
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index 0cd5d178a..cb4dc5694 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -515,7 +515,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 			id: this.id,
 			label: this.label,
 			settingsId: this.settingsId,
-			themeTokenColors: this.themeTokenColors.map(tc => ({ settings: tc.settings, scope: tc.scope })), // don't pesist names
+			themeTokenColors: this.themeTokenColors.map(tc => ({ settings: tc.settings, scope: tc.scope })), // don't persist names
 			semanticTokenRules: this.semanticTokenRules.map(SemanticTokenRule.toJSONObject),
 			extensionData: ExtensionData.toJSONObject(this.extensionData),
 			themeSemanticHighlighting: this.themeSemanticHighlighting,
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
index 461ce1b6a..36d32cc4b 100644
--- a/src/vs/workbench/services/themes/common/themeConfiguration.ts
+++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -12,7 +12,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { textmateColorsSchemaId, textmateColorGroupSchemaId } from 'vs/workbench/services/themes/common/colorThemeSchema';
 import { workbenchColorsSchemaId } from 'vs/platform/theme/common/colorRegistry';
 import { tokenStylingSchemaId } from 'vs/platform/theme/common/tokenClassificationRegistry';
-import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, IExperimentalSemanticTokenColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, IExperimentalSemanticTokenColorCustomizations, ThemeSettingTarget } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { isMacintosh, isWeb, isWindows } from 'vs/base/common/platform';
 
@@ -293,21 +293,26 @@ export class ThemeConfiguration {
 		return this.configurationService.getValue<IExperimentalSemanticTokenColorCustomizations>(ThemeSettings.TOKEN_COLOR_CUSTOMIZATIONS_EXPERIMENTAL);
 	}
 
-	public async setColorTheme(theme: IWorkbenchColorTheme, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchColorTheme> {
+	public async setColorTheme(theme: IWorkbenchColorTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchColorTheme> {
 		await this.writeConfiguration(ThemeSettings.COLOR_THEME, theme.settingsId, settingsTarget);
 		return theme;
 	}
 
-	public async setFileIconTheme(theme: IWorkbenchFileIconTheme, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchFileIconTheme> {
+	public async setFileIconTheme(theme: IWorkbenchFileIconTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchFileIconTheme> {
 		await this.writeConfiguration(ThemeSettings.FILE_ICON_THEME, theme.settingsId, settingsTarget);
 		return theme;
 	}
 
-	public async setProductIconTheme(theme: IWorkbenchProductIconTheme, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchProductIconTheme> {
+	public async setProductIconTheme(theme: IWorkbenchProductIconTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchProductIconTheme> {
 		await this.writeConfiguration(ThemeSettings.PRODUCT_ICON_THEME, theme.settingsId, settingsTarget);
 		return theme;
 	}
 
+	public isDefaultColorTheme(): boolean {
+		let settings = this.configurationService.inspect(ThemeSettings.COLOR_THEME);
+		return settings && settings.default?.value === settings.value;
+	}
+
 	public findAutoConfigurationTarget(key: string) {
 		let settings = this.configurationService.inspect(key);
 		if (!types.isUndefined(settings.workspaceFolderValue)) {
@@ -320,7 +325,7 @@ export class ThemeConfiguration {
 		return ConfigurationTarget.USER;
 	}
 
-	private async writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget | 'auto' | undefined): Promise<void> {
+	private async writeConfiguration(key: string, value: any, settingsTarget: ThemeSettingTarget): Promise<void> {
 		if (settingsTarget === undefined) {
 			return;
 		}
diff --git a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
index 86a6a82f3..ec402a27c 100644
--- a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
+++ b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
@@ -10,7 +10,6 @@ import * as resources from 'vs/base/common/resources';
 import { ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { ExtensionData, IThemeExtensionPoint, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
 
-import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import { Event, Emitter } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
 
@@ -127,8 +126,7 @@ export class ThemeRegistry<T extends IThemeData> {
 		private readonly themesExtPoint: IExtensionPoint<IThemeExtensionPoint[]>,
 		private create: (theme: IThemeExtensionPoint, themeLocation: URI, extensionData: ExtensionData) => T,
 		private idRequired = false,
-		private builtInTheme: T | undefined = undefined,
-		private isProposedApi = false
+		private builtInTheme: T | undefined = undefined
 	) {
 		this.extensionThemes = [];
 		this.initialize();
@@ -144,9 +142,6 @@ export class ThemeRegistry<T extends IThemeData> {
 			}
 			this.extensionThemes.length = 0;
 			for (let ext of extensions) {
-				if (this.isProposedApi) {
-					checkProposedApiEnabled(ext.description);
-				}
 				let extensionData: ExtensionData = {
 					extensionId: ext.description.identifier.value,
 					extensionPublisher: ext.description.publisher,
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 53e7674b1..ab7072398 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -58,21 +58,23 @@ export interface IWorkbenchProductIconTheme extends IWorkbenchTheme {
 	readonly settingsId: string;
 }
 
+export type ThemeSettingTarget = ConfigurationTarget | undefined | 'auto';
+
 
 export interface IWorkbenchThemeService extends IThemeService {
 	readonly _serviceBrand: undefined;
-	setColorTheme(themeId: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchColorTheme | null>;
+	setColorTheme(themeId: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchColorTheme | null>;
 	getColorTheme(): IWorkbenchColorTheme;
 	getColorThemes(): Promise<IWorkbenchColorTheme[]>;
 	onDidColorThemeChange: Event<IWorkbenchColorTheme>;
 	restoreColorTheme(): void;
 
-	setFileIconTheme(iconThemeId: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchFileIconTheme>;
+	setFileIconTheme(iconThemeId: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchFileIconTheme>;
 	getFileIconTheme(): IWorkbenchFileIconTheme;
 	getFileIconThemes(): Promise<IWorkbenchFileIconTheme[]>;
 	onDidFileIconThemeChange: Event<IWorkbenchFileIconTheme>;
 
-	setProductIconTheme(iconThemeId: string | undefined, settingsTarget: ConfigurationTarget | undefined | 'auto'): Promise<IWorkbenchProductIconTheme>;
+	setProductIconTheme(iconThemeId: string | undefined, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchProductIconTheme>;
 	getProductIconTheme(): IWorkbenchProductIconTheme;
 	getProductIconThemes(): Promise<IWorkbenchProductIconTheme[]>;
 	onDidProductIconThemeChange: Event<IWorkbenchProductIconTheme>;
diff --git a/src/vs/workbench/services/themes/test/electron-browser/color-theme.json b/src/vs/workbench/services/themes/test/electron-browser/color-theme.json
new file mode 100644
index 000000000..fc9f7098c
--- /dev/null
+++ b/src/vs/workbench/services/themes/test/electron-browser/color-theme.json
@@ -0,0 +1,50 @@
+{
+	"type": "dark",
+	"tokenColors": [
+		{
+			"scope": "comment",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": "string",
+			"settings": {
+				"foreground": "#444444"
+			}
+		},
+		{
+			"scope": "constant.numeric",
+			"settings": {
+				"foreground": "#555555"
+			}
+		},
+		{
+			"scope": "variable",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#111111"
+			}
+		},
+		{
+			"scope": "keyword",
+			"settings": {
+				"foreground": "#666666"
+			}
+		},
+		{
+			"scope": "entity.name.type, entity.name.class, entity.name.namespace, entity.name.scope-resolution",
+			"settings": {
+				"fontStyle": "underline",
+				"foreground": "#333333"
+			}
+		},
+		{
+			"scope": "entity.name.function",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#333333"
+			}
+		}
+	]
+}
diff --git a/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts b/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts
index 07d9b97cb..581739b7e 100644
--- a/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts
+++ b/src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts
@@ -12,16 +12,14 @@ import { isString } from 'vs/base/common/types';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
-import { Schemas } from 'vs/base/common/network';
-import { URI } from 'vs/base/common/uri';
-import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { FileAccess, Schemas } from 'vs/base/common/network';
 import { ExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService';
 import { ITokenStyle } from 'vs/platform/theme/common/themeService';
 
 const undefinedStyle = { bold: undefined, underline: undefined, italic: undefined };
 const unsetStyle = { bold: false, underline: false, italic: false };
 
-function ts(foreground: string | undefined, styleFlags: { bold?: boolean; underline?: boolean; italic?: boolean } | undefined): TokenStyle {
+function ts(foreground: string | undefined, styleFlags: { bold?: boolean; underline?: boolean; italic?: boolean; } | undefined): TokenStyle {
 	const foregroundColor = isString(foreground) ? Color.fromHex(foreground) : undefined;
 	return new TokenStyle(foregroundColor, styleFlags && styleFlags.bold, styleFlags && styleFlags.underline, styleFlags && styleFlags.italic);
 }
@@ -65,7 +63,7 @@ function assertTokenStyleMetaData(colorIndex: string[], actual: ITokenStyle | un
 }
 
 
-function assertTokenStyles(themeData: ColorThemeData, expected: { [qualifiedClassifier: string]: TokenStyle }, language = 'typescript') {
+function assertTokenStyles(themeData: ColorThemeData, expected: { [qualifiedClassifier: string]: TokenStyle; }, language = 'typescript') {
 	const colorIndex = themeData.tokenColorMap;
 
 	for (let qualifiedClassifier in expected) {
@@ -88,124 +86,22 @@ suite('Themes - TokenStyleResolving', () => {
 	fileService.registerProvider(Schemas.file, diskFileSystemProvider);
 
 
-	test('color defaults - monokai', async () => {
+	test('color defaults', async () => {
 		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-monokai/themes/monokai-color-theme.json');
-		themeData.location = URI.file(themeLocation);
+		themeData.location = FileAccess.asFileUri('./color-theme.json', require);
 		await themeData.ensureLoaded(extensionResourceLoaderService);
 
 		assert.equal(themeData.isLoaded, true);
 
 		assertTokenStyles(themeData, {
-			'comment': ts('#88846f', undefinedStyle),
-			'variable': ts('#F8F8F2', unsetStyle),
-			'type': ts('#A6E22E', { bold: false, underline: true, italic: false }),
-			'function': ts('#A6E22E', unsetStyle),
-			'string': ts('#E6DB74', undefinedStyle),
-			'number': ts('#AE81FF', undefinedStyle),
-			'keyword': ts('#F92672', undefinedStyle)
+			'comment': ts('#000000', undefinedStyle),
+			'variable': ts('#111111', unsetStyle),
+			'type': ts('#333333', { bold: false, underline: true, italic: false }),
+			'function': ts('#333333', unsetStyle),
+			'string': ts('#444444', undefinedStyle),
+			'number': ts('#555555', undefinedStyle),
+			'keyword': ts('#666666', undefinedStyle)
 		});
-
-	});
-
-	test('color defaults - dark+', async () => {
-		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/dark_plus.json');
-		themeData.location = URI.file(themeLocation);
-		await themeData.ensureLoaded(extensionResourceLoaderService);
-
-		assert.equal(themeData.isLoaded, true);
-
-		assertTokenStyles(themeData, {
-			'comment': ts('#6A9955', undefinedStyle),
-			'variable': ts('#9CDCFE', undefinedStyle),
-			'type': ts('#4EC9B0', undefinedStyle),
-			'function': ts('#DCDCAA', undefinedStyle),
-			'string': ts('#CE9178', undefinedStyle),
-			'number': ts('#B5CEA8', undefinedStyle),
-			'keyword': ts('#C586C0', undefinedStyle)
-		});
-
-	});
-
-	test('color defaults - light vs', async () => {
-		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/light_vs.json');
-		themeData.location = URI.file(themeLocation);
-		await themeData.ensureLoaded(extensionResourceLoaderService);
-
-		assert.equal(themeData.isLoaded, true);
-
-		assertTokenStyles(themeData, {
-			'comment': ts('#008000', undefinedStyle),
-			'variable': ts(undefined, undefinedStyle),
-			'type': ts(undefined, undefinedStyle),
-			'function': ts(undefined, undefinedStyle),
-			'string': ts('#a31515', undefinedStyle),
-			'number': ts('#098658', undefinedStyle),
-			'keyword': ts('#0000ff', undefinedStyle)
-		});
-
-	});
-
-	test('color defaults - hc', async () => {
-		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/hc_black.json');
-		themeData.location = URI.file(themeLocation);
-		await themeData.ensureLoaded(extensionResourceLoaderService);
-
-		assert.equal(themeData.isLoaded, true);
-
-		assertTokenStyles(themeData, {
-			'comment': ts('#7ca668', undefinedStyle),
-			'variable': ts('#9CDCFE', undefinedStyle),
-			'type': ts('#4EC9B0', undefinedStyle),
-			'function': ts('#DCDCAA', undefinedStyle),
-			'string': ts('#ce9178', undefinedStyle),
-			'number': ts('#b5cea8', undefinedStyle),
-			'keyword': ts('#C586C0', undefinedStyle)
-		});
-
-	});
-
-	test('color defaults - kimbie dark', async () => {
-		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json');
-		themeData.location = URI.file(themeLocation);
-		await themeData.ensureLoaded(extensionResourceLoaderService);
-
-		assert.equal(themeData.isLoaded, true);
-
-		assertTokenStyles(themeData, {
-			'comment': ts('#a57a4c', undefinedStyle),
-			'variable': ts('#dc3958', undefinedStyle),
-			'type': ts('#f06431', undefinedStyle),
-			'function': ts('#8ab1b0', undefinedStyle),
-			'string': ts('#889b4a', undefinedStyle),
-			'number': ts('#f79a32', undefinedStyle),
-			'keyword': ts('#98676a', undefinedStyle)
-		});
-
-	});
-
-	test('color defaults - abyss', async () => {
-		const themeData = ColorThemeData.createUnloadedTheme('foo');
-		const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-abyss/themes/abyss-color-theme.json');
-		themeData.location = URI.file(themeLocation);
-		await themeData.ensureLoaded(extensionResourceLoaderService);
-
-		assert.equal(themeData.isLoaded, true);
-
-		assertTokenStyles(themeData, {
-			'comment': ts('#384887', undefinedStyle),
-			'variable': ts(undefined, unsetStyle),
-			'type': ts('#ffeebb', { underline: true, bold: false, italic: false }),
-			'function': ts('#ddbb88', unsetStyle),
-			'string': ts('#22aa44', undefinedStyle),
-			'number': ts('#f280d0', undefinedStyle),
-			'keyword': ts('#225588', undefinedStyle)
-		});
-
 	});
 
 	test('resolveScopes', async () => {
diff --git a/src/vs/workbench/services/timer/browser/timerService.ts b/src/vs/workbench/services/timer/browser/timerService.ts
index 53ad8e85e..f4bc25a60 100644
--- a/src/vs/workbench/services/timer/browser/timerService.ts
+++ b/src/vs/workbench/services/timer/browser/timerService.ts
@@ -14,6 +14,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { Barrier } from 'vs/base/common/async';
 
 /* __GDPR__FRAGMENT__
 	"IMemoryInfo" : {
@@ -53,8 +54,8 @@ export interface IMemoryInfo {
 		"timers.ellapsedPanelRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedEditorRestore" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedWorkbench" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-		"timers.ellapsedTimersToTimersComputed" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"timers.ellapsedNlsGeneration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"timers.ellapsedWaitForShellEnv" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
 		"platform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 		"release" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 		"arch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
@@ -166,11 +167,19 @@ export interface IStartupMetrics {
 		 */
 		readonly ellapsedNlsGeneration?: number;
 
+		/**
+		 * The time it took to load the main bundle.
+		 *
+		 * * Happens in the main-process
+		 * * Measured with the `willLoadMainBundle` and `didLoadMainBundle` performance marks.
+		 */
+		readonly ellapsedLoadMainBundle?: number;
+
 		/**
 		 * The time it took to tell electron to open/restore a renderer (browser window).
 		 *
 		 * * Happens in the main-process
-		 * * Measured with the `main:appReady` and `main:loadWindow` performance marks.
+		 * * Measured with the `main:appReady` and `code/willOpenNewWindow` performance marks.
 		 * * This can be compared between insider and stable builds.
 		 * * It is our code running here and we should monitor this carefully for regressions.
 		 */
@@ -181,7 +190,7 @@ export interface IStartupMetrics {
 		 * of load the main-bundle (`workbench.desktop.main.js`).
 		 *
 		 * * Happens in the main-process *and* the renderer-process
-		 * * Measured with the `main:loadWindow` and `willLoadWorkbenchMain` performance marks.
+		 * * Measured with the `code/willOpenNewWindow` and `willLoadWorkbenchMain` performance marks.
 		 * * This can be compared between insider and stable builds.
 		 * * It is mostly not our code running here and we can only observe what's happening.
 		 *
@@ -202,7 +211,7 @@ export interface IStartupMetrics {
 		 * and load the initial set of values.
 		 *
 		 * * Happens in the renderer-process
-		 * * Measured with the `willInitWorkspaceStorage` and `didInitWorkspaceStorage` performance marks.
+		 * * Measured with the `code/willInitWorkspaceStorage` and `code/didInitWorkspaceStorage` performance marks.
 		 */
 		readonly ellapsedWorkspaceStorageInit: number;
 
@@ -303,10 +312,6 @@ export interface IStartupMetrics {
 		 * * Measured with the `renderer/started` and `didStartWorkbench` performance marks
 		 */
 		readonly ellapsedRenderer: number;
-
-		// the time it took to generate this object.
-		// remove?
-		readonly ellapsedTimersToTimersComputed: number;
 	};
 
 	readonly hasAccessibilitySupport: boolean;
@@ -323,18 +328,79 @@ export interface IStartupMetrics {
 
 export interface ITimerService {
 	readonly _serviceBrand: undefined;
-	readonly startupMetrics: Promise<IStartupMetrics>;
+
+	/**
+	 * A promise that resolved when startup timings and perf marks
+	 * are available. This depends on lifecycle phases and extension
+	 * hosts being started.
+	 */
+	whenReady(): Promise<boolean>;
+
+	/**
+	 * Startup metrics. Can ONLY be accessed after `whenReady` has resolved.
+	 */
+	readonly startupMetrics: IStartupMetrics;
+
+	/**
+	 * Deliver performance marks from a source, like the main process or extension hosts.
+	 * The source argument acts as an identifier and therefore it must be unique.
+	 */
+	setPerformanceMarks(source: string, marks: perf.PerformanceMark[]): void;
+
+	/**
+	 * Get all currently known performance marks by source. There is no sorting of the
+	 * returned tuples but the marks of a tuple are guaranteed to be sorted by start times.
+	 */
+	getPerformanceMarks(): [source: string, marks: readonly perf.PerformanceMark[]][];
 }
 
 export const ITimerService = createDecorator<ITimerService>('timerService');
 
+
+class PerfMarks {
+
+	private readonly _entries: [string, perf.PerformanceMark[]][] = [];
+
+	setMarks(source: string, entries: perf.PerformanceMark[]): void {
+		this._entries.push([source, entries]);
+	}
+
+	getDuration(from: string, to: string): number {
+		const fromEntry = this._findEntry(from);
+		if (!fromEntry) {
+			return 0;
+		}
+		const toEntry = this._findEntry(to);
+		if (!toEntry) {
+			return 0;
+		}
+		return toEntry.startTime - fromEntry.startTime;
+	}
+
+	private _findEntry(name: string): perf.PerformanceMark | void {
+		for (let [, marks] of this._entries) {
+			for (let i = marks.length - 1; i >= 0; i--) {
+				if (marks[i].name === name) {
+					return marks[i];
+				}
+			}
+		}
+	}
+
+	getEntries() {
+		return this._entries.slice(0);
+	}
+}
+
 export type Writeable<T> = { -readonly [P in keyof T]: Writeable<T[P]> };
 
 export abstract class AbstractTimerService implements ITimerService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _startupMetrics: Promise<IStartupMetrics>;
+	private readonly _barrier = new Barrier();
+	private readonly _marks = new PerfMarks();
+	private _startupMetrics?: IStartupMetrics;
 
 	constructor(
 		@ILifecycleService private readonly _lifecycleService: ILifecycleService,
@@ -347,23 +413,42 @@ export abstract class AbstractTimerService implements ITimerService {
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 	) {
-		this._startupMetrics = Promise.all([
+		Promise.all([
 			this._extensionService.whenInstalledExtensionsRegistered(),
 			_lifecycleService.when(LifecyclePhase.Restored)
-		])
-			.then(() => this._computeStartupMetrics())
-			.then(metrics => {
-				this._reportStartupTimes(metrics);
-				return metrics;
-			});
+		]).then(() => {
+			// set perf mark from renderer
+			this.setPerformanceMarks('renderer', perf.getMarks());
+			return this._computeStartupMetrics();
+		}).then(metrics => {
+			this._startupMetrics = metrics;
+			this._reportStartupTimes(metrics);
+			this._barrier.open();
+		});
 	}
 
-	get startupMetrics(): Promise<IStartupMetrics> {
+	whenReady(): Promise<boolean> {
+		return this._barrier.wait();
+	}
+
+	get startupMetrics(): IStartupMetrics {
+		if (!this._startupMetrics) {
+			throw new Error('illegal state, MUST NOT access startupMetrics before whenReady has resolved');
+		}
 		return this._startupMetrics;
 	}
 
-	private _reportStartupTimes(metrics: IStartupMetrics): void {
+	setPerformanceMarks(source: string, marks: perf.PerformanceMark[]): void {
+		// Perf marks are a shared resource because anyone can generate them
+		// and because of that we only accept marks that start with 'code/'
+		this._marks.setMarks(source, marks.filter(mark => mark.name.startsWith('code/')));
+	}
 
+	getPerformanceMarks(): [source: string, marks: readonly perf.PerformanceMark[]][] {
+		return this._marks.getEntries();
+	}
+
+	private _reportStartupTimes(metrics: IStartupMetrics): void {
 		// report IStartupMetrics as telemetry
 		/* __GDPR__
 			"startupTimeVaried" : {
@@ -374,23 +459,42 @@ export abstract class AbstractTimerService implements ITimerService {
 		*/
 		this._telemetryService.publicLog('startupTimeVaried', metrics);
 
-		// report raw timers as telemetry
-		type Durations = { entries: string; };
-		type DurationsClassification = { entries: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth' } };
-		this._telemetryService.publicLog2<Durations, DurationsClassification>('startup.timers.raw', { entries: JSON.stringify(perf.getEntries()) });
+
+		// report raw timers as telemetry. each mark is send a separate telemetry
+		// event and it is "normalized" to a relative timestamp where the first mark
+		// defines the start
+		for (const [source, marks] of this.getPerformanceMarks()) {
+			type Mark = { source: string; name: string; relativeStartTime: number; startTime: number; };
+			type MarkClassification = {
+				source: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth'; },
+				name: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth'; },
+				relativeStartTime: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; },
+				startTime: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; },
+			};
+
+			let lastMark: perf.PerformanceMark = marks[0];
+			for (const mark of marks) {
+				let delta = mark.startTime - lastMark.startTime;
+				this._telemetryService.publicLog2<Mark, MarkClassification>('startup.timer.mark', {
+					source,
+					name: mark.name,
+					relativeStartTime: delta,
+					startTime: mark.startTime
+				});
+				lastMark = mark;
+			}
+		}
 	}
 
 	private async _computeStartupMetrics(): Promise<IStartupMetrics> {
-
-		const now = Date.now();
 		const initialStartup = this._isInitialStartup();
-		const startMark = initialStartup ? 'main:started' : 'main:loadWindow';
+		const startMark = initialStartup ? 'code/didStartMain' : 'code/willOpenNewWindow';
 
 		const activeViewlet = this._viewletService.getActiveViewlet();
 		const activePanel = this._panelService.getActivePanel();
 		const info: Writeable<IStartupMetrics> = {
 			version: 2,
-			ellapsed: perf.getDuration(startMark, 'didStartWorkbench'),
+			ellapsed: this._marks.getDuration(startMark, 'code/didStartWorkbench'),
 
 			// reflections
 			isLatestVersion: Boolean(await this._updateService.isLatestVersion()),
@@ -403,24 +507,24 @@ export abstract class AbstractTimerService implements ITimerService {
 
 			// timers
 			timers: {
-				ellapsedAppReady: initialStartup ? perf.getDuration('main:started', 'main:appReady') : undefined,
-				ellapsedNlsGeneration: initialStartup ? perf.getDuration('nlsGeneration:start', 'nlsGeneration:end') : undefined,
-				ellapsedWindowLoad: initialStartup ? perf.getDuration('main:appReady', 'main:loadWindow') : undefined,
-				ellapsedWindowLoadToRequire: perf.getDuration('main:loadWindow', 'willLoadWorkbenchMain'),
-				ellapsedRequire: perf.getDuration('willLoadWorkbenchMain', 'didLoadWorkbenchMain'),
-				ellapsedWaitForShellEnv: perf.getDuration('willWaitForShellEnv', 'didWaitForShellEnv'),
-				ellapsedWorkspaceStorageInit: perf.getDuration('willInitWorkspaceStorage', 'didInitWorkspaceStorage'),
-				ellapsedWorkspaceServiceInit: perf.getDuration('willInitWorkspaceService', 'didInitWorkspaceService'),
-				ellapsedRequiredUserDataInit: perf.getDuration('willInitRequiredUserData', 'didInitRequiredUserData'),
-				ellapsedOtherUserDataInit: perf.getDuration('willInitOtherUserData', 'didInitOtherUserData'),
-				ellapsedExtensions: perf.getDuration('willLoadExtensions', 'didLoadExtensions'),
-				ellapsedEditorRestore: perf.getDuration('willRestoreEditors', 'didRestoreEditors'),
-				ellapsedViewletRestore: perf.getDuration('willRestoreViewlet', 'didRestoreViewlet'),
-				ellapsedPanelRestore: perf.getDuration('willRestorePanel', 'didRestorePanel'),
-				ellapsedWorkbench: perf.getDuration('willStartWorkbench', 'didStartWorkbench'),
-				ellapsedExtensionsReady: perf.getDuration(startMark, 'didLoadExtensions'),
-				ellapsedRenderer: perf.getDuration('renderer/started', 'didStartWorkbench'),
-				ellapsedTimersToTimersComputed: Date.now() - now,
+				ellapsedAppReady: initialStartup ? this._marks.getDuration('code/didStartMain', 'code/mainAppReady') : undefined,
+				ellapsedNlsGeneration: initialStartup ? this._marks.getDuration('code/willGenerateNls', 'code/didGenerateNls') : undefined,
+				ellapsedLoadMainBundle: initialStartup ? this._marks.getDuration('code/willLoadMainBundle', 'code/didLoadMainBundle') : undefined,
+				ellapsedWindowLoad: initialStartup ? this._marks.getDuration('code/mainAppReady', 'code/willOpenNewWindow') : undefined,
+				ellapsedWindowLoadToRequire: this._marks.getDuration('code/willOpenNewWindow', 'code/willLoadWorkbenchMain'),
+				ellapsedRequire: this._marks.getDuration('code/willLoadWorkbenchMain', 'code/didLoadWorkbenchMain'),
+				ellapsedWaitForShellEnv: this._marks.getDuration('code/willWaitForShellEnv', 'code/didWaitForShellEnv'),
+				ellapsedWorkspaceStorageInit: this._marks.getDuration('code/willInitWorkspaceStorage', 'code/didInitWorkspaceStorage'),
+				ellapsedWorkspaceServiceInit: this._marks.getDuration('code/willInitWorkspaceService', 'code/didInitWorkspaceService'),
+				ellapsedRequiredUserDataInit: this._marks.getDuration('code/willInitRequiredUserData', 'code/didInitRequiredUserData'),
+				ellapsedOtherUserDataInit: this._marks.getDuration('code/willInitOtherUserData', 'code/didInitOtherUserData'),
+				ellapsedExtensions: this._marks.getDuration('code/willLoadExtensions', 'code/didLoadExtensions'),
+				ellapsedEditorRestore: this._marks.getDuration('code/willRestoreEditors', 'code/didRestoreEditors'),
+				ellapsedViewletRestore: this._marks.getDuration('code/willRestoreViewlet', 'code/didRestoreViewlet'),
+				ellapsedPanelRestore: this._marks.getDuration('code/willRestorePanel', 'code/didRestorePanel'),
+				ellapsedWorkbench: this._marks.getDuration('code/willStartWorkbench', 'code/didStartWorkbench'),
+				ellapsedExtensionsReady: this._marks.getDuration(startMark, 'code/didLoadExtensions'),
+				ellapsedRenderer: this._marks.getDuration('code/didStartRenderer', 'code/didStartWorkbench')
 			},
 
 			// system info
diff --git a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
index 1192fb673..cfd5a0444 100644
--- a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
+++ b/src/vs/workbench/services/timer/electron-sandbox/timerService.ts
@@ -33,6 +33,7 @@ export class TimerService extends AbstractTimerService {
 		@ITelemetryService telemetryService: ITelemetryService,
 	) {
 		super(lifecycleService, contextService, extensionService, updateService, viewletService, panelService, editorService, accessibilityService, telemetryService);
+		this.setPerformanceMarks('main', _environmentService.configuration.perfMarks);
 	}
 
 	protected _isInitialStartup(): boolean {
@@ -82,7 +83,7 @@ export class TimerService extends AbstractTimerService {
 //#region cached data logic
 
 export function didUseCachedData(): boolean {
-	// TODO@Ben TODO@Jo need a different way to figure out if cached data was used
+	// TODO@bpasero TODO@jrieken need a different way to figure out if cached data was used
 	if (context.sandbox) {
 		return true;
 	}
diff --git a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
index 2048b160b..1bfd85b2c 100644
--- a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
+++ b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
@@ -36,17 +36,17 @@ suite('Untitled text editors', () => {
 
 		const input1 = instantiationService.createInstance(UntitledTextEditorInput, service.create());
 		await input1.resolve();
-		assert.equal(service.get(input1.resource), input1.model);
+		assert.strictEqual(service.get(input1.resource), input1.model);
 
 		assert.ok(service.get(input1.resource));
 		assert.ok(!service.get(URI.file('testing')));
 
 		const input2 = instantiationService.createInstance(UntitledTextEditorInput, service.create());
-		assert.equal(service.get(input2.resource), input2.model);
+		assert.strictEqual(service.get(input2.resource), input2.model);
 
 		// get()
-		assert.equal(service.get(input1.resource), input1.model);
-		assert.equal(service.get(input2.resource), input2.model);
+		assert.strictEqual(service.get(input1.resource), input1.model);
+		assert.strictEqual(service.get(input2.resource), input2.model);
 
 		// revert()
 		await input1.revert(0);
@@ -55,7 +55,7 @@ suite('Untitled text editors', () => {
 
 		// dirty
 		const model = await input2.resolve();
-		assert.equal(await service.resolve({ untitledResource: input2.resource }), model);
+		assert.strictEqual(await service.resolve({ untitledResource: input2.resource }), model);
 		assert.ok(service.get(model.resource));
 
 		assert.ok(!input2.isDirty());
@@ -66,12 +66,12 @@ suite('Untitled text editors', () => {
 
 		const resource = await resourcePromise;
 
-		assert.equal(resource.toString(), input2.resource.toString());
+		assert.strictEqual(resource.toString(), input2.resource.toString());
 
 		assert.ok(input2.isDirty());
 
 		assert.ok(workingCopyService.isDirty(input2.resource));
-		assert.equal(workingCopyService.dirtyCount, 1);
+		assert.strictEqual(workingCopyService.dirtyCount, 1);
 
 		await input1.revert(0);
 		await input2.revert(0);
@@ -81,7 +81,7 @@ suite('Untitled text editors', () => {
 		assert.ok(!model.isDirty());
 
 		assert.ok(!workingCopyService.isDirty(input2.resource));
-		assert.equal(workingCopyService.dirtyCount, 0);
+		assert.strictEqual(workingCopyService.dirtyCount, 0);
 
 		await input1.revert(0);
 		assert.ok(input1.isDisposed());
@@ -129,12 +129,12 @@ suite('Untitled text editors', () => {
 		const model = service.create({ associatedResource: file });
 		const untitled = instantiationService.createInstance(UntitledTextEditorInput, model);
 		assert.ok(untitled.isDirty());
-		assert.equal(model, onDidChangeDirtyModel);
+		assert.strictEqual(model, onDidChangeDirtyModel);
 
 		const resolvedModel = await untitled.resolve();
 
 		assert.ok(resolvedModel.hasAssociatedFilePath);
-		assert.equal(untitled.isDirty(), true);
+		assert.strictEqual(untitled.isDirty(), true);
 
 		untitled.dispose();
 		listener.dispose();
@@ -169,13 +169,13 @@ suite('Untitled text editors', () => {
 		assert.ok(!model1.isDirty());
 
 		const model2 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ initialValue: 'Hello World' })).resolve();
-		assert.equal(snapshotToString(model2.createSnapshot()!), 'Hello World');
+		assert.strictEqual(snapshotToString(model2.createSnapshot()!), 'Hello World');
 
 		const input = instantiationService.createInstance(UntitledTextEditorInput, service.create());
 
 		const model3 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ untitledResource: input.resource })).resolve();
 
-		assert.equal(model3.resource.toString(), input.resource.toString());
+		assert.strictEqual(model3.resource.toString(), input.resource.toString());
 
 		const file = URI.file(join('C:\\', '/foo/file44.txt'));
 		const model4 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ associatedResource: file })).resolve();
@@ -214,7 +214,7 @@ suite('Untitled text editors', () => {
 		// dirty
 		const model = await untitled.resolve();
 		assert.ok(model.isDirty());
-		assert.equal(workingCopyService.dirtyCount, 1);
+		assert.strictEqual(workingCopyService.dirtyCount, 1);
 
 		untitled.dispose();
 		model.dispose();
@@ -228,7 +228,7 @@ suite('Untitled text editors', () => {
 		const service = accessor.untitledTextEditorService;
 		const input = service.create();
 
-		assert.equal(input.getMode(), defaultLanguage);
+		assert.strictEqual(input.getMode(), defaultLanguage);
 
 		config.setUserConfiguration('files', { 'defaultLanguage': undefined });
 
@@ -244,7 +244,7 @@ suite('Untitled text editors', () => {
 		const service = accessor.untitledTextEditorService;
 		const model = service.create();
 
-		assert.equal(model.getMode(), 'typescript');
+		assert.strictEqual(model.getMode(), 'typescript');
 
 		config.setUserConfiguration('files', { 'defaultLanguage': undefined });
 		accessor.editorService.activeTextEditorMode = undefined;
@@ -261,7 +261,7 @@ suite('Untitled text editors', () => {
 		const service = accessor.untitledTextEditorService;
 		const input = service.create({ mode });
 
-		assert.equal(input.getMode(), mode);
+		assert.strictEqual(input.getMode(), mode);
 
 		config.setUserConfiguration('files', { 'defaultLanguage': undefined });
 
@@ -279,14 +279,14 @@ suite('Untitled text editors', () => {
 		const input = instantiationService.createInstance(UntitledTextEditorInput, service.create({ mode }));
 
 		assert.ok(input.model.hasModeSetExplicitly);
-		assert.equal(input.getMode(), mode);
+		assert.strictEqual(input.getMode(), mode);
 
 		const model = await input.resolve();
-		assert.equal(model.getMode(), mode);
+		assert.strictEqual(model.getMode(), mode);
 
 		input.setMode('plaintext');
 
-		assert.equal(input.getMode(), PLAINTEXT_MODE_ID);
+		assert.strictEqual(input.getMode(), PLAINTEXT_MODE_ID);
 
 		input.dispose();
 		model.dispose();
@@ -307,7 +307,7 @@ suite('Untitled text editors', () => {
 		input.setMode('plaintext');
 		assert.ok(input.model.hasModeSetExplicitly);
 
-		assert.equal(input.getMode(), PLAINTEXT_MODE_ID);
+		assert.strictEqual(input.getMode(), PLAINTEXT_MODE_ID);
 
 		input.dispose();
 		model.dispose();
@@ -321,13 +321,13 @@ suite('Untitled text editors', () => {
 
 		service.onDidChangeEncoding(model => {
 			counter++;
-			assert.equal(model.resource.toString(), input.resource.toString());
+			assert.strictEqual(model.resource.toString(), input.resource.toString());
 		});
 
 		// encoding
 		const model = await input.resolve();
 		model.setEncoding('utf16');
-		assert.equal(counter, 1);
+		assert.strictEqual(counter, 1);
 		input.dispose();
 		model.dispose();
 	});
@@ -340,13 +340,13 @@ suite('Untitled text editors', () => {
 
 		service.onDidChangeLabel(model => {
 			counter++;
-			assert.equal(model.resource.toString(), input.resource.toString());
+			assert.strictEqual(model.resource.toString(), input.resource.toString());
 		});
 
 		// label
 		const model = await input.resolve();
 		model.textEditorModel.setValue('Foo Bar');
-		assert.equal(counter, 1);
+		assert.strictEqual(counter, 1);
 		input.dispose();
 		model.dispose();
 	});
@@ -359,13 +359,13 @@ suite('Untitled text editors', () => {
 
 		service.onDidDispose(model => {
 			counter++;
-			assert.equal(model.resource.toString(), input.resource.toString());
+			assert.strictEqual(model.resource.toString(), input.resource.toString());
 		});
 
 		const model = await input.resolve();
-		assert.equal(counter, 0);
+		assert.strictEqual(counter, 0);
 		model.dispose();
-		assert.equal(counter, 1);
+		assert.strictEqual(counter, 1);
 	});
 
 	test('model#onDidChangeContent', async function () {
@@ -379,16 +379,16 @@ suite('Untitled text editors', () => {
 
 		model.textEditorModel.setValue('foo');
 
-		assert.equal(counter, 1, 'Dirty model should trigger event');
+		assert.strictEqual(counter, 1, 'Dirty model should trigger event');
 		model.textEditorModel.setValue('bar');
 
-		assert.equal(counter, 2, 'Content change when dirty should trigger event');
+		assert.strictEqual(counter, 2, 'Content change when dirty should trigger event');
 		model.textEditorModel.setValue('');
 
-		assert.equal(counter, 3, 'Manual revert should trigger event');
+		assert.strictEqual(counter, 3, 'Manual revert should trigger event');
 		model.textEditorModel.setValue('foo');
 
-		assert.equal(counter, 4, 'Dirty model should trigger event');
+		assert.strictEqual(counter, 4, 'Dirty model should trigger event');
 
 		input.dispose();
 		model.dispose();
@@ -421,43 +421,43 @@ suite('Untitled text editors', () => {
 		model.onDidChangeName(() => counter++);
 
 		model.textEditorModel.setValue('foo');
-		assert.equal(input.getName(), 'foo');
-		assert.equal(model.name, 'foo');
+		assert.strictEqual(input.getName(), 'foo');
+		assert.strictEqual(model.name, 'foo');
 
-		assert.equal(counter, 1);
+		assert.strictEqual(counter, 1);
 		model.textEditorModel.setValue('bar');
-		assert.equal(input.getName(), 'bar');
-		assert.equal(model.name, 'bar');
+		assert.strictEqual(input.getName(), 'bar');
+		assert.strictEqual(model.name, 'bar');
 
-		assert.equal(counter, 2);
+		assert.strictEqual(counter, 2);
 		model.textEditorModel.setValue('');
-		assert.equal(input.getName(), 'Untitled-1');
-		assert.equal(model.name, 'Untitled-1');
+		assert.strictEqual(input.getName(), 'Untitled-1');
+		assert.strictEqual(model.name, 'Untitled-1');
 
 		model.textEditorModel.setValue('        ');
-		assert.equal(input.getName(), 'Untitled-1');
-		assert.equal(model.name, 'Untitled-1');
+		assert.strictEqual(input.getName(), 'Untitled-1');
+		assert.strictEqual(model.name, 'Untitled-1');
 
 		model.textEditorModel.setValue('([]}'); // require actual words
-		assert.equal(input.getName(), 'Untitled-1');
-		assert.equal(model.name, 'Untitled-1');
+		assert.strictEqual(input.getName(), 'Untitled-1');
+		assert.strictEqual(model.name, 'Untitled-1');
 
 		model.textEditorModel.setValue('([]}hello   '); // require actual words
-		assert.equal(input.getName(), '([]}hello');
-		assert.equal(model.name, '([]}hello');
+		assert.strictEqual(input.getName(), '([]}hello');
+		assert.strictEqual(model.name, '([]}hello');
 
 		model.textEditorModel.setValue('12345678901234567890123456789012345678901234567890'); // trimmed at 40chars max
-		assert.equal(input.getName(), '1234567890123456789012345678901234567890');
-		assert.equal(model.name, '1234567890123456789012345678901234567890');
+		assert.strictEqual(input.getName(), '1234567890123456789012345678901234567890');
+		assert.strictEqual(model.name, '1234567890123456789012345678901234567890');
 
 		model.textEditorModel.setValue('123456789012345678901234567890123456789🌞'); // do not break grapehems (#111235)
-		assert.equal(input.getName(), '123456789012345678901234567890123456789');
-		assert.equal(model.name, '123456789012345678901234567890123456789');
+		assert.strictEqual(input.getName(), '123456789012345678901234567890123456789');
+		assert.strictEqual(model.name, '123456789012345678901234567890123456789');
 
-		assert.equal(counter, 6);
+		assert.strictEqual(counter, 6);
 
 		model.textEditorModel.setValue('Hello\nWorld');
-		assert.equal(counter, 7);
+		assert.strictEqual(counter, 7);
 
 		function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
 			let range = new Range(
@@ -476,7 +476,7 @@ suite('Untitled text editors', () => {
 		}
 
 		model.textEditorModel.applyEdits([createSingleEditOp('hello', 2, 2)]);
-		assert.equal(counter, 7); // change was not on first line
+		assert.strictEqual(counter, 7); // change was not on first line
 
 		input.dispose();
 		model.dispose();
@@ -484,7 +484,7 @@ suite('Untitled text editors', () => {
 		const inputWithContents = instantiationService.createInstance(UntitledTextEditorInput, service.create({ initialValue: 'Foo' }));
 		model = await inputWithContents.resolve();
 
-		assert.equal(inputWithContents.getName(), 'Foo');
+		assert.strictEqual(inputWithContents.getName(), 'Foo');
 
 		inputWithContents.dispose();
 		model.dispose();
@@ -501,10 +501,10 @@ suite('Untitled text editors', () => {
 
 		model.textEditorModel.setValue('foo');
 
-		assert.equal(counter, 1, 'Dirty model should trigger event');
+		assert.strictEqual(counter, 1, 'Dirty model should trigger event');
 		model.textEditorModel.setValue('bar');
 
-		assert.equal(counter, 1, 'Another change does not fire event');
+		assert.strictEqual(counter, 1, 'Another change does not fire event');
 
 		input.dispose();
 		model.dispose();
@@ -521,10 +521,10 @@ suite('Untitled text editors', () => {
 
 		model.setEncoding('utf16');
 
-		assert.equal(counter, 1, 'Dirty model should trigger event');
+		assert.strictEqual(counter, 1, 'Dirty model should trigger event');
 		model.setEncoding('utf16');
 
-		assert.equal(counter, 1, 'Another change to same encoding does not fire event');
+		assert.strictEqual(counter, 1, 'Another change to same encoding does not fire event');
 
 		input.dispose();
 		model.dispose();
diff --git a/src/vs/workbench/services/userData/browser/userDataInit.ts b/src/vs/workbench/services/userData/browser/userDataInit.ts
index 23e3b451a..d4624409f 100644
--- a/src/vs/workbench/services/userData/browser/userDataInit.ts
+++ b/src/vs/workbench/services/userData/browser/userDataInit.ts
@@ -29,6 +29,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IExtensionService, toExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { mark } from 'vs/base/common/performance';
+import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
 
 export const IUserDataInitializationService = createDecorator<IUserDataInitializationService>('IUserDataInitializationService');
 export interface IUserDataInitializationService {
@@ -191,11 +192,12 @@ class WorkbenchExtensionsInitializer extends ExtensionsInitializer {
 		@IExtensionGalleryService galleryService: IExtensionGalleryService,
 		@IGlobalExtensionEnablementService extensionEnablementService: IGlobalExtensionEnablementService,
 		@IStorageService storageService: IStorageService,
+		@IIgnoredExtensionsManagementService ignoredExtensionsManagementService: IIgnoredExtensionsManagementService,
 		@IFileService fileService: IFileService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IUserDataSyncLogService logService: IUserDataSyncLogService,
 	) {
-		super(extensionManagementService, galleryService, extensionEnablementService, storageService, fileService, environmentService, logService);
+		super(extensionManagementService, galleryService, extensionEnablementService, storageService, ignoredExtensionsManagementService, fileService, environmentService, logService);
 	}
 
 	protected async initializeRemoteExtensions(remoteExtensions: ISyncExtension[]): Promise<ILocalExtension[]> {
@@ -234,9 +236,9 @@ class InitializeOtherResourcesContribution implements IWorkbenchContribution {
 
 	private async initializeOtherResource(userDataInitializeService: IUserDataInitializationService, instantiationService: IInstantiationService): Promise<void> {
 		if (await userDataInitializeService.requiresInitialization()) {
-			mark('willInitOtherUserData');
+			mark('code/willInitOtherUserData');
 			await userDataInitializeService.initializeOtherResources(instantiationService);
-			mark('didInitOtherUserData');
+			mark('code/didInitOtherUserData');
 		}
 	}
 }
diff --git a/src/vs/workbench/services/userData/test/electron-browser/fileUserDataProvider.test.ts b/src/vs/workbench/services/userData/test/browser/fileUserDataProvider.test.ts
similarity index 90%
rename from src/vs/workbench/services/userData/test/electron-browser/fileUserDataProvider.test.ts
rename to src/vs/workbench/services/userData/test/browser/fileUserDataProvider.test.ts
index 5c5e55c53..0f30300b0 100644
--- a/src/vs/workbench/services/userData/test/electron-browser/fileUserDataProvider.test.ts
+++ b/src/vs/workbench/services/userData/test/browser/fileUserDataProvider.test.ts
@@ -4,9 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as os from 'os';
-import * as path from 'vs/base/common/path';
-import * as uuid from 'vs/base/common/uuid';
 import { IFileService, FileChangeType, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, FileType, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { NullLogService } from 'vs/platform/log/common/log';
@@ -15,18 +12,25 @@ import { URI } from 'vs/base/common/uri';
 import { FileUserDataProvider } from 'vs/workbench/services/userData/common/fileUserDataProvider';
 import { dirname, isEqual, joinPath } from 'vs/base/common/resources';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
 import { DisposableStore, IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { TestProductService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { NativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
-import { TestWorkbenchConfiguration } from 'vs/workbench/test/electron-browser/workbenchTestServices';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+
+const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
+
+class TestWorkbenchEnvironmentService extends BrowserWorkbenchEnvironmentService {
+	constructor(private readonly appSettingsHome: URI) {
+		super(Object.create(null), TestProductService);
+	}
+	get userRoamingDataHome() { return this.appSettingsHome.with({ scheme: Schemas.userData }); }
+}
 
 suite('FileUserDataProvider', () => {
 
 	let testObject: IFileService;
-	let rootResource: URI;
 	let userDataHomeOnDisk: URI;
 	let backupWorkspaceHomeOnDisk: URI;
 	let environmentService: IWorkbenchEnvironmentService;
@@ -35,32 +39,24 @@ suite('FileUserDataProvider', () => {
 
 	setup(async () => {
 		const logService = new NullLogService();
-		testObject = new FileService(logService);
-		disposables.add(testObject);
+		testObject = disposables.add(new FileService(logService));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(testObject.registerProvider(ROOT.scheme, fileSystemProvider));
 
-		const diskFileSystemProvider = new DiskFileSystemProvider(logService);
-		disposables.add(diskFileSystemProvider);
-		disposables.add(testObject.registerProvider(Schemas.file, diskFileSystemProvider));
+		userDataHomeOnDisk = joinPath(ROOT, 'User');
+		const backupHome = joinPath(ROOT, 'Backups');
+		backupWorkspaceHomeOnDisk = joinPath(backupHome, 'workspaceId');
+		await testObject.createFolder(userDataHomeOnDisk);
+		await testObject.createFolder(backupWorkspaceHomeOnDisk);
 
-		const workspaceId = 'workspaceId';
-		rootResource = URI.file(path.join(os.tmpdir(), 'vsctests', uuid.generateUuid()));
-		userDataHomeOnDisk = joinPath(rootResource, 'User');
-		const backupHome = joinPath(rootResource, 'Backups');
-		backupWorkspaceHomeOnDisk = joinPath(backupHome, workspaceId);
-		await Promise.all([testObject.createFolder(userDataHomeOnDisk), testObject.createFolder(backupWorkspaceHomeOnDisk)]);
+		environmentService = new TestWorkbenchEnvironmentService(userDataHomeOnDisk);
 
-		environmentService = new NativeWorkbenchEnvironmentService({ ...TestWorkbenchConfiguration, 'user-data-dir': rootResource.fsPath, backupPath: backupWorkspaceHomeOnDisk.fsPath }, TestProductService);
-
-		fileUserDataProvider = new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, logService);
+		fileUserDataProvider = new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, logService);
 		disposables.add(fileUserDataProvider);
 		disposables.add(testObject.registerProvider(Schemas.userData, fileUserDataProvider));
 	});
 
-	teardown(async () => {
-		fileUserDataProvider.dispose(); // need to dispose first, otherwise del will fail (https://github.com/microsoft/vscode/issues/106283)
-		await testObject.del(rootResource, { recursive: true });
-		disposables.clear();
-	});
+	teardown(() => disposables.clear());
 
 	test('exists return false when file does not exist', async () => {
 		const exists = await testObject.exists(environmentService.settingsResource);
@@ -307,14 +303,14 @@ suite('FileUserDataProvider - Watching', () => {
 
 	let testObject: FileUserDataProvider;
 	const disposables = new DisposableStore();
-	const rootFileResource = URI.file(path.join(os.tmpdir(), 'vsctests', uuid.generateUuid()));
+	const rootFileResource = joinPath(ROOT, 'User');
 	const rootUserDataResource = rootFileResource.with({ scheme: Schemas.userData });
 
 	const fileEventEmitter: Emitter<readonly IFileChange[]> = new Emitter<readonly IFileChange[]>();
 	disposables.add(fileEventEmitter);
 
 	setup(() => {
-		testObject = disposables.add(new FileUserDataProvider(Schemas.file, new TestFileSystemProvider(fileEventEmitter.event), Schemas.userData, new NullLogService()));
+		testObject = disposables.add(new FileUserDataProvider(rootFileResource.scheme, new TestFileSystemProvider(fileEventEmitter.event), Schemas.userData, new NullLogService()));
 	});
 
 	teardown(() => disposables.clear());
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
index d0e5a5068..e8db74c6f 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts
@@ -24,12 +24,9 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable
 	setEnablement(enabled: boolean) {
 		if (this.enabled !== enabled) {
 			this.enabled = enabled;
-			if (this.workbenchEnvironmentService.options?.settingsSyncOptions) {
-				if (this.workbenchEnvironmentService.options.settingsSyncOptions?.enablementHandler) {
-					this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
-				}
-			} else {
-				super.setEnablement(enabled);
+			super.setEnablement(enabled);
+			if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {
+				this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
 			}
 		}
 	}
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index fb60356c3..8daa50d6e 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -30,6 +30,7 @@ import { isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { IViewsService, ViewContainerLocation, IViewDescriptorService } from 'vs/workbench/common/views';
 import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
+import { isWeb } from 'vs/base/common/platform';
 
 type UserAccountClassification = {
 	id: { classification: 'EndUserPseudonymizedInformation', purpose: 'BusinessInsight' };
@@ -268,7 +269,9 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 		const syncTitle = SYNC_TITLE;
 		const title = `${syncTitle} [(${localize('show log', "show log")})](command:${SHOW_SYNC_LOG_COMMAND_ID})`;
 		const manualSyncTask = await this.userDataSyncService.createManualSyncTask();
-		const disposable = this.lifecycleService.onBeforeShutdown(e => e.veto(this.onBeforeShutdown(manualSyncTask)));
+		const disposable = isWeb
+			? Disposable.None /* In web long running shutdown handlers will not work */
+			: this.lifecycleService.onBeforeShutdown(e => e.veto(this.onBeforeShutdown(manualSyncTask), 'veto.settingsSync'));
 
 		try {
 			await this.syncBeforeTurningOn(title, manualSyncTask);
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
index a721466c9..35e2e56e0 100644
--- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts
+++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ViewContainerLocation, IViewDescriptorService, ViewContainer, IViewsRegistry, IViewContainersRegistry, IViewDescriptor, Extensions as ViewExtensions, ViewVisibilityState, defaultViewIcon } from 'vs/workbench/common/views';
-import { IContextKey, RawContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ViewContainerLocation, IViewDescriptorService, ViewContainer, IViewsRegistry, IViewContainersRegistry, IViewDescriptor, Extensions as ViewExtensions, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from 'vs/workbench/common/views';
+import { IContextKey, RawContextKey, IContextKeyService, ContextKeyExpr, ContextKeyEqualsExpr, ContextKeyFalseExpr, ContextKeyOrExpr, ContextKeyTrueExpr, ContextKeyAndExpr, ContextKeyDefinedExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService, StorageScope, IStorageValueChangeEvent, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { toDisposable, DisposableStore, Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer, ViewPaneContainerAction, ViewsSubMenu } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { generateUuid } from 'vs/base/common/uuid';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { getViewsStateStorageId, ViewContainerModel } from 'vs/workbench/services/views/common/viewContainerModel';
 import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions';
 import { localize } from 'vs/nls';
@@ -44,6 +44,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	readonly onDidChangeContainerLocation: Event<{ viewContainer: ViewContainer, from: ViewContainerLocation, to: ViewContainerLocation }> = this._onDidChangeContainerLocation.event;
 
 	private readonly viewContainerModels: Map<ViewContainer, { viewContainerModel: ViewContainerModel, disposable: IDisposable; }>;
+	private readonly viewsVisibilityActionDisposables: Map<ViewContainer, DisposableStore>;
 	private readonly activeViewContextKeys: Map<string, IContextKey<boolean>>;
 	private readonly movableViewContextKeys: Map<string, IContextKey<boolean>>;
 	private readonly defaultViewLocationContextKeys: Map<string, IContextKey<boolean>>;
@@ -101,6 +102,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 		super();
 
 		this.viewContainerModels = new Map<ViewContainer, { viewContainerModel: ViewContainerModel, disposable: IDisposable; }>();
+		this.viewsVisibilityActionDisposables = new Map<ViewContainer, DisposableStore>();
 		this.activeViewContextKeys = new Map<string, IContextKey<boolean>>();
 		this.movableViewContextKeys = new Map<string, IContextKey<boolean>>();
 		this.defaultViewLocationContextKeys = new Map<string, IContextKey<boolean>>();
@@ -133,6 +135,8 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 		this._register(toDisposable(() => {
 			this.viewContainerModels.forEach(({ disposable }) => disposable.dispose());
 			this.viewContainerModels.clear();
+			this.viewsVisibilityActionDisposables.forEach(disposables => disposables.dispose());
+			this.viewsVisibilityActionDisposables.clear();
 		}));
 
 		this._register(this.storageService.onDidChangeValue((e) => { this.onDidStorageChange(e); }));
@@ -681,6 +685,22 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 			this.onDidChangeActiveViews({ added: viewContainerModel.activeViewDescriptors, removed: [] });
 			viewContainerModel.onDidChangeActiveViewDescriptors(changed => this.onDidChangeActiveViews(changed), this, disposables);
 
+			this.onDidChangeVisibleViews({ added: [...viewContainerModel.visibleViewDescriptors], removed: [] });
+			viewContainerModel.onDidAddVisibleViewDescriptors(added => this.onDidChangeVisibleViews({ added: added.map(({ viewDescriptor }) => viewDescriptor), removed: [] }), this, disposables);
+			viewContainerModel.onDidRemoveVisibleViewDescriptors(removed => this.onDidChangeVisibleViews({ added: [], removed: removed.map(({ viewDescriptor }) => viewDescriptor) }), this, disposables);
+
+			this.registerViewsVisibilityActions(viewContainerModel);
+			disposables.add(Event.any(
+				viewContainerModel.onDidChangeActiveViewDescriptors,
+				viewContainerModel.onDidAddVisibleViewDescriptors,
+				viewContainerModel.onDidRemoveVisibleViewDescriptors,
+				viewContainerModel.onDidMoveVisibleViewDescriptors
+			)(e => this.registerViewsVisibilityActions(viewContainerModel!)));
+			disposables.add(toDisposable(() => {
+				this.viewsVisibilityActionDisposables.get(viewContainer)?.dispose();
+				this.viewsVisibilityActionDisposables.delete(viewContainer);
+			}));
+
 			disposables.add(this.registerResetViewContainerAction(viewContainer));
 
 			this.viewContainerModels.set(viewContainer, { viewContainerModel: viewContainerModel, disposable: disposables });
@@ -718,6 +738,85 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 		});
 	}
 
+	private onDidChangeVisibleViews({ added, removed }: { added: IViewDescriptor[], removed: IViewDescriptor[]; }): void {
+		this.contextKeyService.bufferChangeEvents(() => {
+			added.forEach(viewDescriptor => this.getOrCreateVisibleViewContextKey(viewDescriptor).set(true));
+			removed.forEach(viewDescriptor => this.getOrCreateVisibleViewContextKey(viewDescriptor).set(false));
+		});
+	}
+
+	private registerViewsVisibilityActions(viewContainerModel: ViewContainerModel): void {
+		let disposables = this.viewsVisibilityActionDisposables.get(viewContainerModel.viewContainer);
+		if (!disposables) {
+			disposables = new DisposableStore();
+			this.viewsVisibilityActionDisposables.set(viewContainerModel.viewContainer, disposables);
+		}
+		disposables.clear();
+		viewContainerModel.activeViewDescriptors.forEach((viewDescriptor, index) => {
+			if (!viewDescriptor.remoteAuthority) {
+				disposables?.add(registerAction2(class extends ViewPaneContainerAction<ViewPaneContainer> {
+					constructor() {
+						super({
+							id: `${viewDescriptor.id}.toggleVisibility`,
+							viewPaneContainerId: viewContainerModel.viewContainer.id,
+							precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyTrueExpr.INSTANCE : ContextKeyFalseExpr.INSTANCE,
+							toggled: ContextKeyDefinedExpr.create(`${viewDescriptor.id}.visible`),
+							title: viewDescriptor.name,
+							menu: [{
+								id: ViewsSubMenu,
+								group: '1_toggleViews',
+								when: ContextKeyAndExpr.create([
+									ContextKeyEqualsExpr.create('viewContainer', viewContainerModel.viewContainer.id),
+									ContextKeyEqualsExpr.create('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
+								]),
+								order: index,
+							}, {
+								id: MenuId.ViewContainerTitleContext,
+								when: ContextKeyAndExpr.create([
+									ContextKeyEqualsExpr.create('viewContainer', viewContainerModel.viewContainer.id),
+								]),
+								order: index,
+								group: '1_toggleVisibility'
+							}, {
+								id: MenuId.ViewTitleContext,
+								when: ContextKeyAndExpr.create([
+									viewContainerModel.visibleViewDescriptors.length > 1 ? ContextKeyOrExpr.create(viewContainerModel.visibleViewDescriptors.map(v => ContextKeyEqualsExpr.create('view', v.id))) : ContextKeyFalseExpr.INSTANCE
+								]),
+								order: index,
+								group: '2_toggleVisibility'
+							}]
+						});
+					}
+					async runInViewPaneContainer(serviceAccessor: ServicesAccessor, viewPaneContainer: ViewPaneContainer): Promise<void> {
+						viewPaneContainer.toggleViewVisibility(viewDescriptor.id);
+					}
+				}));
+				disposables?.add(registerAction2(class extends ViewPaneContainerAction<ViewPaneContainer> {
+					constructor() {
+						super({
+							id: `${viewDescriptor.id}.removeView`,
+							viewPaneContainerId: viewContainerModel.viewContainer.id,
+							title: localize('hideView', "Hide '{0}'", viewDescriptor.name),
+							precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyTrueExpr.INSTANCE : ContextKeyFalseExpr.INSTANCE,
+							menu: [{
+								id: MenuId.ViewTitleContext,
+								when: ContextKeyAndExpr.create([
+									ContextKeyEqualsExpr.create('view', viewDescriptor.id),
+									ContextKeyDefinedExpr.create(`${viewDescriptor.id}.visible`),
+								]),
+								group: '1_hide',
+								order: 1
+							}]
+						});
+					}
+					async runInViewPaneContainer(serviceAccessor: ServicesAccessor, viewPaneContainer: ViewPaneContainer): Promise<void> {
+						viewPaneContainer.toggleViewVisibility(viewDescriptor.id);
+					}
+				}));
+			}
+		});
+	}
+
 	private registerResetViewContainerAction(viewContainer: ViewContainer): IDisposable {
 		const that = this;
 		return registerAction2(class ResetViewLocationAction extends Action2 {
@@ -732,7 +831,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 						id: MenuId.ViewContainerTitleContext,
 						when: ContextKeyExpr.or(
 							ContextKeyExpr.and(
-								ContextKeyExpr.equals('container', viewContainer.id),
+								ContextKeyExpr.equals('viewContainer', viewContainer.id),
 								ContextKeyExpr.equals(`${viewContainer.id}.defaultViewContainerLocation`, false)
 							)
 						)
@@ -783,6 +882,16 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 		return contextKey;
 	}
 
+	private getOrCreateVisibleViewContextKey(viewDescriptor: IViewDescriptor): IContextKey<boolean> {
+		const activeContextKeyId = `${viewDescriptor.id}.visible`;
+		let contextKey = this.activeViewContextKeys.get(activeContextKeyId);
+		if (!contextKey) {
+			contextKey = new RawContextKey(activeContextKeyId, false).bindTo(this.contextKeyService);
+			this.activeViewContextKeys.set(activeContextKeyId, contextKey);
+		}
+		return contextKey;
+	}
+
 	private getOrCreateMovableViewContextKey(viewDescriptor: IViewDescriptor): IContextKey<boolean> {
 		const movableViewContextKeyId = `${viewDescriptor.id}.canMove`;
 		let contextKey = this.movableViewContextKeys.get(movableViewContextKeyId);
diff --git a/src/vs/workbench/services/views/common/viewContainerModel.ts b/src/vs/workbench/services/views/common/viewContainerModel.ts
index 811fd8dbc..5b5ba4e09 100644
--- a/src/vs/workbench/services/views/common/viewContainerModel.ts
+++ b/src/vs/workbench/services/views/common/viewContainerModel.ts
@@ -316,14 +316,14 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 	readonly onDidMoveVisibleViewDescriptors: Event<{ from: IViewDescriptorRef; to: IViewDescriptorRef; }> = this._onDidMoveVisibleViewDescriptors.event;
 
 	constructor(
-		private readonly container: ViewContainer,
+		readonly viewContainer: ViewContainer,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		super();
 
 		this._register(Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(this.contextKeys))(() => this.onDidChangeContext()));
-		this.viewDescriptorsState = this._register(instantiationService.createInstance(ViewDescriptorsState, container.storageId || `${container.id}.state`));
+		this.viewDescriptorsState = this._register(instantiationService.createInstance(ViewDescriptorsState, viewContainer.storageId || `${viewContainer.id}.state`));
 		this._register(this.viewDescriptorsState.onDidChangeStoredState(items => this.updateVisibility(items)));
 
 		this._register(Event.any(
@@ -340,15 +340,15 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 
 	private updateContainerInfo(): void {
 		/* Use default container info if one of the visible view descriptors belongs to the current container by default */
-		const useDefaultContainerInfo = this.container.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || this.visibleViewDescriptors.some(v => Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).getViewContainer(v.id) === this.container);
-		const title = useDefaultContainerInfo ? this.container.name : this.visibleViewDescriptors[0]?.containerTitle || this.visibleViewDescriptors[0]?.name || '';
+		const useDefaultContainerInfo = this.viewContainer.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || this.visibleViewDescriptors.some(v => Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).getViewContainer(v.id) === this.viewContainer);
+		const title = useDefaultContainerInfo ? this.viewContainer.name : this.visibleViewDescriptors[0]?.containerTitle || this.visibleViewDescriptors[0]?.name || '';
 		let titleChanged: boolean = false;
 		if (this._title !== title) {
 			this._title = title;
 			titleChanged = true;
 		}
 
-		const icon = useDefaultContainerInfo ? this.container.icon : this.visibleViewDescriptors[0]?.containerIcon || defaultViewIcon;
+		const icon = useDefaultContainerInfo ? this.viewContainer.icon : this.visibleViewDescriptors[0]?.containerIcon || defaultViewIcon;
 		let iconChanged: boolean = false;
 		if (!this.isEqualIcon(icon)) {
 			this._icon = icon;
@@ -425,13 +425,17 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 		}
 
 		if (added.length) {
-			this._onDidAddVisibleViewDescriptors.fire(added);
+			this.triggerOnDidAddVisibleViewDescriptors(added);
 		}
 		if (removed.length) {
 			this._onDidRemoveVisibleViewDescriptors.fire(removed);
 		}
 	}
 
+	private triggerOnDidAddVisibleViewDescriptors(added: IAddedViewDescriptorRef[]) {
+		this._onDidAddVisibleViewDescriptors.fire(added.sort((a, b) => a.index - b.index));
+	}
+
 	isCollapsed(id: string): boolean {
 		return !!this.find(id).viewDescriptorItem.state.collapsed;
 	}
@@ -530,7 +534,7 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 			this._onDidChangeActiveViewDescriptors.fire(({ added: addedActiveDescriptors, removed: [] }));
 		}
 		if (addedVisibleItems.length) {
-			this._onDidAddVisibleViewDescriptors.fire(addedVisibleItems);
+			this.triggerOnDidAddVisibleViewDescriptors(addedVisibleItems);
 		}
 	}
 
@@ -616,7 +620,7 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 			this._onDidRemoveVisibleViewDescriptors.fire(removedVisibleItems);
 		}
 		if (addedVisibleItems.length) {
-			this._onDidAddVisibleViewDescriptors.fire(addedVisibleItems);
+			this.triggerOnDidAddVisibleViewDescriptors(addedVisibleItems);
 		}
 	}
 
diff --git a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
index 5d0e14113..83f93b254 100644
--- a/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
+++ b/src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts
@@ -464,4 +464,55 @@ suite('ViewContainerModel', () => {
 		assert.equal(target.elements.length, 0);
 	});
 
+	test('added view descriptors are in ascending order in the event', async function () {
+		container = ViewContainerRegistry.registerViewContainer({ id: 'test', name: 'test', ctorDescriptor: new SyncDescriptor(<any>{}) }, ViewContainerLocation.Sidebar);
+		const testObject = viewDescriptorService.getViewContainerModel(container);
+		const target = disposableStore.add(new ViewDescriptorSequence(testObject));
+
+		ViewsRegistry.registerViews([{
+			id: 'view5',
+			ctorDescriptor: null!,
+			name: 'Test View 5',
+			canToggleVisibility: true,
+			order: 5
+		}, {
+			id: 'view2',
+			ctorDescriptor: null!,
+			name: 'Test View 2',
+			canToggleVisibility: true,
+			order: 2
+		}], container);
+
+		assert.equal(target.elements.length, 2);
+		assert.equal(target.elements[0].id, 'view2');
+		assert.equal(target.elements[1].id, 'view5');
+
+		ViewsRegistry.registerViews([{
+			id: 'view4',
+			ctorDescriptor: null!,
+			name: 'Test View 4',
+			canToggleVisibility: true,
+			order: 4
+		}, {
+			id: 'view3',
+			ctorDescriptor: null!,
+			name: 'Test View 3',
+			canToggleVisibility: true,
+			order: 3
+		}, {
+			id: 'view1',
+			ctorDescriptor: null!,
+			name: 'Test View 1',
+			canToggleVisibility: true,
+			order: 1
+		}], container);
+
+		assert.equal(target.elements.length, 5);
+		assert.equal(target.elements[0].id, 'view1');
+		assert.equal(target.elements[1].id, 'view2');
+		assert.equal(target.elements[2].id, 'view3');
+		assert.equal(target.elements[3].id, 'view4');
+		assert.equal(target.elements[4].id, 'view5');
+	});
+
 });
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
index f4b04294e..87d5005df 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant.ts
@@ -3,14 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import { raceCancellation } from 'vs/base/common/async';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkingCopyFileOperationParticipant } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { URI } from 'vs/base/common/uri';
+import { IWorkingCopyFileOperationParticipant, SourceTargetPair, IFileOperationUndoRedoInfo } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { FileOperation } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { LinkedList } from 'vs/base/common/linkedList';
@@ -20,7 +16,6 @@ export class WorkingCopyFileOperationParticipant extends Disposable {
 	private readonly participants = new LinkedList<IWorkingCopyFileOperationParticipant>();
 
 	constructor(
-		@IProgressService private readonly progressService: IProgressService,
 		@ILogService private readonly logService: ILogService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
@@ -32,55 +27,19 @@ export class WorkingCopyFileOperationParticipant extends Disposable {
 		return toDisposable(() => remove());
 	}
 
-	async participate(files: { source?: URI, target: URI }[], operation: FileOperation, undoRedoGroupId: number | undefined, isUndoing: boolean | undefined, token: CancellationToken | undefined): Promise<void> {
+	async participate(files: SourceTargetPair[], operation: FileOperation, undoInfo: IFileOperationUndoRedoInfo | undefined, token: CancellationToken | undefined): Promise<void> {
 		const timeout = this.configurationService.getValue<number>('files.participants.timeout');
 		if (timeout <= 0) {
 			return; // disabled
 		}
 
-		const cts = new CancellationTokenSource(token);
-		const timer = setTimeout(() => cts.cancel(), timeout);
-
-		return this.progressService.withProgress({
-			location: ProgressLocation.Notification,
-			title: this.progressLabel(operation),
-			cancellable: true,
-			delay: Math.min(timeout / 2, 3000)
-		}, async progress => {
-
-			// For each participant
-			for (const participant of this.participants) {
-				if (cts.token.isCancellationRequested) {
-					break;
-				}
-				try {
-					const promise = participant.participate(files, operation, undoRedoGroupId, isUndoing, progress, timeout, cts.token);
-					await raceCancellation(promise, cts.token);
-				} catch (err) {
-					this.logService.warn(err);
-				}
+		// For each participant
+		for (const participant of this.participants) {
+			try {
+				await participant.participate(files, operation, undoInfo, timeout, token ?? CancellationToken.None);
+			} catch (err) {
+				this.logService.warn(err);
 			}
-		}, () => {
-			// user cancel
-			cts.cancel();
-
-		}).finally(() => {
-			// cleanup
-			cts.dispose();
-			clearTimeout(timer);
-		});
-	}
-
-	private progressLabel(operation: FileOperation): string {
-		switch (operation) {
-			case FileOperation.CREATE:
-				return localize('msg-create', "Running 'File Create' participants...");
-			case FileOperation.MOVE:
-				return localize('msg-rename', "Running 'File Rename' participants...");
-			case FileOperation.COPY:
-				return localize('msg-copy', "Running 'File Copy' participants...");
-			case FileOperation.DELETE:
-				return localize('msg-delete', "Running 'File Delete' participants...");
 		}
 	}
 
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
index 0e7855750..29503d782 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
@@ -13,13 +13,12 @@ import { IFileService, FileOperation, IFileStatWithMetadata } from 'vs/platform/
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IWorkingCopyService, IWorkingCopy } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
-import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
 import { WorkingCopyFileOperationParticipant } from 'vs/workbench/services/workingCopy/common/workingCopyFileOperationParticipant';
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
 
 export const IWorkingCopyFileService = createDecorator<IWorkingCopyFileService>('workingCopyFileService');
 
-interface SourceTargetPair {
+export interface SourceTargetPair {
 
 	/**
 	 * The source resource that is defined for move operations.
@@ -32,6 +31,19 @@ interface SourceTargetPair {
 	readonly target: URI
 }
 
+export interface IFileOperationUndoRedoInfo {
+
+	/**
+	 * Id of the undo group that the file operation belongs to.
+	 */
+	undoRedoGroupId?: number;
+
+	/**
+	 * Flag indicates if the operation is an undo.
+	 */
+	isUndoing?: boolean
+}
+
 export interface WorkingCopyFileEvent extends IWaitUntil {
 
 	/**
@@ -60,14 +72,34 @@ export interface IWorkingCopyFileOperationParticipant {
 	participate(
 		files: SourceTargetPair[],
 		operation: FileOperation,
-		undoRedoGroupId: number | undefined,
-		isUndoing: boolean | undefined,
-		progress: IProgress<IProgressStep>,
+		undoInfo: IFileOperationUndoRedoInfo | undefined,
 		timeout: number,
 		token: CancellationToken
 	): Promise<void>;
 }
 
+export interface ICreateOperation {
+	resource: URI;
+	overwrite?: boolean;
+}
+
+export interface ICreateFileOperation extends ICreateOperation {
+	contents?: VSBuffer | VSBufferReadable | VSBufferReadableStream,
+}
+
+export interface IDeleteOperation {
+	resource: URI;
+	useTrash?: boolean;
+	recursive?: boolean;
+}
+
+export interface IMoveOperation {
+	file: Required<SourceTargetPair>;
+	overwrite?: boolean;
+}
+
+export interface ICopyOperation extends IMoveOperation { }
+
 /**
  * Returns the working copies for a given resource.
  */
@@ -132,7 +164,7 @@ export interface IWorkingCopyFileService {
 	 * Working copy owners can listen to the `onWillRunWorkingCopyFileOperation` and
 	 * `onDidRunWorkingCopyFileOperation` events to participate.
 	 */
-	create(resource: URI, contents?: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata>;
+	create(operations: ICreateFileOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
 
 	/**
 	 * Will create a folder and any parent folder that needs to be created.
@@ -143,7 +175,7 @@ export interface IWorkingCopyFileService {
 	 * Note: events will only be emitted for the provided resource, but not any
 	 * parent folders that are being created as part of the operation.
 	 */
-	createFolder(resource: URI, options?: { undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata>;
+	createFolder(operations: ICreateOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
 
 	/**
 	 * Will move working copies matching the provided resources and corresponding children
@@ -152,7 +184,7 @@ export interface IWorkingCopyFileService {
 	 * Working copy owners can listen to the `onWillRunWorkingCopyFileOperation` and
 	 * `onDidRunWorkingCopyFileOperation` events to participate.
 	 */
-	move(files: Required<SourceTargetPair>[], options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
+	move(operations: IMoveOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
 
 	/**
 	 * Will copy working copies matching the provided resources and corresponding children
@@ -161,7 +193,7 @@ export interface IWorkingCopyFileService {
 	 * Working copy owners can listen to the `onWillRunWorkingCopyFileOperation` and
 	 * `onDidRunWorkingCopyFileOperation` events to participate.
 	 */
-	copy(files: Required<SourceTargetPair>[], options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
+	copy(operations: ICopyOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]>;
 
 	/**
 	 * Will delete working copies matching the provided resources and children
@@ -170,7 +202,7 @@ export interface IWorkingCopyFileService {
 	 * Working copy owners can listen to the `onWillRunWorkingCopyFileOperation` and
 	 * `onDidRunWorkingCopyFileOperation` events to participate.
 	 */
-	delete(resources: URI[], options?: { useTrash?: boolean, recursive?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<void>;
+	delete(operations: IDeleteOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<void>;
 
 	//#endregion
 
@@ -222,7 +254,7 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		super();
 
 		// register a default working copy provider that uses the working copy service
-		this.registerWorkingCopyProvider(resource => {
+		this._register(this.registerWorkingCopyProvider(resource => {
 			return this.workingCopyService.workingCopies.filter(workingCopy => {
 				if (this.fileService.canHandleResource(resource)) {
 					// only check for parents if the resource can be handled
@@ -233,44 +265,49 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 
 				return this.uriIdentityService.extUri.isEqual(workingCopy.resource, resource);
 			});
-		});
+		}));
 	}
 
 
 	//#region File operations
 
-	create(resource: URI, contents?: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata> {
-		return this.doCreateFileOrFolder(resource, true, contents, options, token);
+	create(operations: ICreateFileOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		return this.doCreateFileOrFolder(operations, true, undoInfo, token);
 	}
 
-	createFolder(resource: URI, options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata> {
-		return this.doCreateFileOrFolder(resource, false, undefined, options, token);
+	createFolder(operations: ICreateOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		return this.doCreateFileOrFolder(operations, false, undoInfo, token);
 	}
 
-	async doCreateFileOrFolder(resource: URI, isFile: boolean, contents?: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata> {
+	async doCreateFileOrFolder(operations: (ICreateFileOperation | ICreateOperation)[], isFile: boolean, undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		if (operations.length === 0) {
+			return [];
+		}
 
 		// validate create operation before starting
 		if (isFile) {
-			const validateCreate = await this.fileService.canCreateFile(resource, options);
-			if (validateCreate instanceof Error) {
-				throw validateCreate;
+			const validateCreates = await Promise.all(operations.map(operation => this.fileService.canCreateFile(operation.resource, { overwrite: operation.overwrite })));
+			const error = validateCreates.find(validateCreate => validateCreate instanceof Error);
+			if (error instanceof Error) {
+				throw error;
 			}
 		}
 
 		// file operation participant
-		await this.runFileOperationParticipants([{ target: resource }], FileOperation.CREATE, options?.undoRedoGroupId, options?.isUndoing, token);
+		const files = operations.map(operation => ({ target: operation.resource }));
+		await this.runFileOperationParticipants(files, FileOperation.CREATE, undoInfo, token);
 
 		// before events
-		const event = { correlationId: this.correlationIds++, operation: FileOperation.CREATE, files: [{ target: resource }] };
+		const event = { correlationId: this.correlationIds++, operation: FileOperation.CREATE, files };
 		await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None);
 
 		// now actually create on disk
-		let stat: IFileStatWithMetadata;
+		let stats: IFileStatWithMetadata[];
 		try {
 			if (isFile) {
-				stat = await this.fileService.createFile(resource, contents, { overwrite: options?.overwrite });
+				stats = await Promise.all(operations.map(operation => this.fileService.createFile(operation.resource, (operation as ICreateFileOperation).contents, { overwrite: operation.overwrite })));
 			} else {
-				stat = await this.fileService.createFolder(resource);
+				stats = await Promise.all(operations.map(operation => this.fileService.createFolder(operation.resource)));
 			}
 		} catch (error) {
 
@@ -283,23 +320,22 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		// after event
 		await this._onDidRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None);
 
-		return stat;
+		return stats;
 	}
 
-	async move(files: Required<SourceTargetPair>[], options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
-		return this.doMoveOrCopy(files, true, options, token);
+	async move(operations: IMoveOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		return this.doMoveOrCopy(operations, true, undoInfo, token);
 	}
 
-	async copy(files: Required<SourceTargetPair>[], options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
-		return this.doMoveOrCopy(files, false, options, token);
+	async copy(operations: ICopyOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
+		return this.doMoveOrCopy(operations, false, undoInfo, token);
 	}
 
-	private async doMoveOrCopy(files: Required<SourceTargetPair>[], move: boolean, options?: { overwrite?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
-		const overwrite = options?.overwrite;
+	private async doMoveOrCopy(operations: IMoveOperation[] | ICopyOperation[], move: boolean, undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> {
 		const stats: IFileStatWithMetadata[] = [];
 
 		// validate move/copy operation before starting
-		for (const { source, target } of files) {
+		for (const { file: { source, target }, overwrite } of operations) {
 			const validateMoveOrCopy = await (move ? this.fileService.canMove(source, target, overwrite) : this.fileService.canCopy(source, target, overwrite));
 			if (validateMoveOrCopy instanceof Error) {
 				throw validateMoveOrCopy;
@@ -307,15 +343,15 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		}
 
 		// file operation participant
-		await this.runFileOperationParticipants(files, move ? FileOperation.MOVE : FileOperation.COPY, options?.undoRedoGroupId, options?.isUndoing, token);
+		const files = operations.map(o => o.file);
+		await this.runFileOperationParticipants(files, move ? FileOperation.MOVE : FileOperation.COPY, undoInfo, token);
 
 		// before event
 		const event = { correlationId: this.correlationIds++, operation: move ? FileOperation.MOVE : FileOperation.COPY, files };
 		await this._onWillRunWorkingCopyFileOperation.fireAsync(event, CancellationToken.None);
 
 		try {
-			for (const { source, target } of files) {
-
+			for (const { file: { source, target }, overwrite } of operations) {
 				// if source and target are not equal, handle dirty working copies
 				// depending on the operation:
 				// - move: revert both source and target (if any)
@@ -346,19 +382,19 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		return stats;
 	}
 
-	async delete(resources: URI[], options?: { useTrash?: boolean, recursive?: boolean, undoRedoGroupId?: number, isUndoing?: boolean }, token?: CancellationToken): Promise<void> {
+	async delete(operations: IDeleteOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<void> {
 
 		// validate delete operation before starting
-		for (const resource of resources) {
-			const validateDelete = await this.fileService.canDelete(resource, options);
+		for (const operation of operations) {
+			const validateDelete = await this.fileService.canDelete(operation.resource, { recursive: operation.recursive, useTrash: operation.useTrash });
 			if (validateDelete instanceof Error) {
 				throw validateDelete;
 			}
 		}
 
 		// file operation participant
-		const files = resources.map(target => ({ target }));
-		await this.runFileOperationParticipants(files, FileOperation.DELETE, options?.undoRedoGroupId, options?.isUndoing, token);
+		const files = operations.map(operation => ({ target: operation.resource }));
+		await this.runFileOperationParticipants(files, FileOperation.DELETE, undoInfo, token);
 
 		// before events
 		const event = { correlationId: this.correlationIds++, operation: FileOperation.DELETE, files };
@@ -367,15 +403,15 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		// check for any existing dirty working copies for the resource
 		// and do a soft revert before deleting to be able to close
 		// any opened editor with these working copies
-		for (const resource of resources) {
-			const dirtyWorkingCopies = this.getDirty(resource);
+		for (const operation of operations) {
+			const dirtyWorkingCopies = this.getDirty(operation.resource);
 			await Promise.all(dirtyWorkingCopies.map(dirtyWorkingCopy => dirtyWorkingCopy.revert({ soft: true })));
 		}
 
 		// now actually delete from disk
 		try {
-			for (const resource of resources) {
-				await this.fileService.del(resource, options);
+			for (const operation of operations) {
+				await this.fileService.del(operation.resource, { recursive: operation.recursive, useTrash: operation.useTrash });
 			}
 		} catch (error) {
 
@@ -400,8 +436,8 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 		return this.fileOperationParticipants.addFileOperationParticipant(participant);
 	}
 
-	private runFileOperationParticipants(files: SourceTargetPair[], operation: FileOperation, undoRedoGroupId: number | undefined, isUndoing: boolean | undefined, token: CancellationToken | undefined): Promise<void> {
-		return this.fileOperationParticipants.participate(files, operation, undoRedoGroupId, isUndoing, token);
+	private runFileOperationParticipants(files: SourceTargetPair[], operation: FileOperation, undoInfo: IFileOperationUndoRedoInfo | undefined, token: CancellationToken | undefined): Promise<void> {
+		return this.fileOperationParticipants.participate(files, operation, undoInfo, token);
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts b/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
index 7c0a76886..09fe8d064 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/workingCopyFileService.test.ts
@@ -13,6 +13,7 @@ import { URI } from 'vs/base/common/uri';
 import { FileOperation } from 'vs/platform/files/common/files';
 import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { ICopyOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 
 suite('WorkingCopyFileService', () => {
 
@@ -52,10 +53,10 @@ suite('WorkingCopyFileService', () => {
 		let sourceModel: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
 		(<TestTextFileEditorModelManager>accessor.textFileService.files).add(sourceModel.resource, sourceModel);
 
-		const eventCounter = await testEventsMoveOrCopy([{ source: sourceModel.resource, target: sourceModel.resource }], true);
+		const eventCounter = await testEventsMoveOrCopy([{ file: { source: sourceModel.resource, target: sourceModel.resource }, overwrite: true }], true);
 
 		sourceModel.dispose();
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 	});
 
 	test('move - one source == target and another source != target', async function () {
@@ -67,14 +68,14 @@ suite('WorkingCopyFileService', () => {
 		(<TestTextFileEditorModelManager>accessor.textFileService.files).add(targetModel2.resource, targetModel2);
 
 		const eventCounter = await testEventsMoveOrCopy([
-			{ source: sourceModel1.resource, target: sourceModel1.resource },
-			{ source: sourceModel2.resource, target: targetModel2.resource }
+			{ file: { source: sourceModel1.resource, target: sourceModel1.resource }, overwrite: true },
+			{ file: { source: sourceModel2.resource, target: targetModel2.resource }, overwrite: true }
 		], true);
 
 		sourceModel1.dispose();
 		sourceModel2.dispose();
 		targetModel2.dispose();
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 	});
 
 	test('move multiple - dirty file', async function () {
@@ -96,10 +97,10 @@ suite('WorkingCopyFileService', () => {
 		let sourceModel: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file.txt'), 'utf8', undefined);
 		(<TestTextFileEditorModelManager>accessor.textFileService.files).add(sourceModel.resource, sourceModel);
 
-		const eventCounter = await testEventsMoveOrCopy([{ source: sourceModel.resource, target: sourceModel.resource }]);
+		const eventCounter = await testEventsMoveOrCopy([{ file: { source: sourceModel.resource, target: sourceModel.resource }, overwrite: true }]);
 
 		sourceModel.dispose();
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 	});
 
 	test('copy - one source == target and another source != target', async function () {
@@ -111,14 +112,14 @@ suite('WorkingCopyFileService', () => {
 		(<TestTextFileEditorModelManager>accessor.textFileService.files).add(targetModel2.resource, targetModel2);
 
 		const eventCounter = await testEventsMoveOrCopy([
-			{ source: sourceModel1.resource, target: sourceModel1.resource },
-			{ source: sourceModel2.resource, target: targetModel2.resource }
+			{ file: { source: sourceModel1.resource, target: sourceModel1.resource }, overwrite: true },
+			{ file: { source: sourceModel2.resource, target: targetModel2.resource }, overwrite: true }
 		]);
 
 		sourceModel1.dispose();
 		sourceModel2.dispose();
 		targetModel2.dispose();
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 	});
 
 	test('copy multiple - dirty file', async function () {
@@ -141,24 +142,24 @@ suite('WorkingCopyFileService', () => {
 		(<TestTextFileEditorModelManager>accessor.textFileService.files).add(model2.resource, model2);
 
 		let dirty = accessor.workingCopyFileService.getDirty(model1.resource);
-		assert.equal(dirty.length, 0);
+		assert.strictEqual(dirty.length, 0);
 
 		await model1.load();
 		model1.textEditorModel!.setValue('foo');
 
 		dirty = accessor.workingCopyFileService.getDirty(model1.resource);
-		assert.equal(dirty.length, 1);
-		assert.equal(dirty[0], model1);
+		assert.strictEqual(dirty.length, 1);
+		assert.strictEqual(dirty[0], model1);
 
 		dirty = accessor.workingCopyFileService.getDirty(toResource.call(this, '/path'));
-		assert.equal(dirty.length, 1);
-		assert.equal(dirty[0], model1);
+		assert.strictEqual(dirty.length, 1);
+		assert.strictEqual(dirty[0], model1);
 
 		await model2.load();
 		model2.textEditorModel!.setValue('bar');
 
 		dirty = accessor.workingCopyFileService.getDirty(toResource.call(this, '/path'));
-		assert.equal(dirty.length, 2);
+		assert.strictEqual(dirty.length, 2);
 
 		model1.dispose();
 		model2.dispose();
@@ -197,42 +198,42 @@ suite('WorkingCopyFileService', () => {
 
 		const participant = accessor.workingCopyFileService.addFileOperationParticipant({
 			participate: async (files, operation) => {
-				assert.equal(files.length, 1);
+				assert.strictEqual(files.length, 1);
 				const file = files[0];
-				assert.equal(file.target.toString(), resource.toString());
-				assert.equal(operation, FileOperation.CREATE);
+				assert.strictEqual(file.target.toString(), resource.toString());
+				assert.strictEqual(operation, FileOperation.CREATE);
 				eventCounter++;
 			}
 		});
 
 		const listener1 = accessor.workingCopyFileService.onWillRunWorkingCopyFileOperation(e => {
-			assert.equal(e.files.length, 1);
+			assert.strictEqual(e.files.length, 1);
 			const file = e.files[0];
-			assert.equal(file.target.toString(), resource.toString());
-			assert.equal(e.operation, FileOperation.CREATE);
+			assert.strictEqual(file.target.toString(), resource.toString());
+			assert.strictEqual(e.operation, FileOperation.CREATE);
 			correlationId = e.correlationId;
 			eventCounter++;
 		});
 
 		const listener2 = accessor.workingCopyFileService.onDidRunWorkingCopyFileOperation(e => {
-			assert.equal(e.files.length, 1);
+			assert.strictEqual(e.files.length, 1);
 			const file = e.files[0];
-			assert.equal(file.target.toString(), resource.toString());
-			assert.equal(e.operation, FileOperation.CREATE);
-			assert.equal(e.correlationId, correlationId);
+			assert.strictEqual(file.target.toString(), resource.toString());
+			assert.strictEqual(e.operation, FileOperation.CREATE);
+			assert.strictEqual(e.correlationId, correlationId);
 			eventCounter++;
 		});
 
-		await accessor.workingCopyFileService.createFolder(resource);
+		await accessor.workingCopyFileService.createFolder([{ resource }]);
 
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 
 		participant.dispose();
 		listener1.dispose();
 		listener2.dispose();
 	});
 
-	async function testEventsMoveOrCopy(files: { source: URI, target: URI }[], move?: boolean): Promise<number> {
+	async function testEventsMoveOrCopy(files: ICopyOperation[], move?: boolean): Promise<number> {
 		let eventCounter = 0;
 
 		const participant = accessor.workingCopyFileService.addFileOperationParticipant({
@@ -250,9 +251,9 @@ suite('WorkingCopyFileService', () => {
 		});
 
 		if (move) {
-			await accessor.workingCopyFileService.move(files, { overwrite: true });
+			await accessor.workingCopyFileService.move(files);
 		} else {
-			await accessor.workingCopyFileService.copy(files, { overwrite: true });
+			await accessor.workingCopyFileService.copy(files);
 		}
 
 		participant.dispose();
@@ -288,13 +289,13 @@ suite('WorkingCopyFileService', () => {
 					const { target, source } = files[i];
 					const { targetModel, sourceModel } = models[i];
 
-					assert.equal(target.toString(), targetModel.resource.toString());
-					assert.equal(source?.toString(), sourceModel.resource.toString());
+					assert.strictEqual(target.toString(), targetModel.resource.toString());
+					assert.strictEqual(source?.toString(), sourceModel.resource.toString());
 				}
 
 				eventCounter++;
 
-				assert.equal(operation, move ? FileOperation.MOVE : FileOperation.COPY);
+				assert.strictEqual(operation, move ? FileOperation.MOVE : FileOperation.COPY);
 			}
 		});
 
@@ -305,40 +306,40 @@ suite('WorkingCopyFileService', () => {
 				const { target, source } = files[i];
 				const { targetModel, sourceModel } = models[i];
 
-				assert.equal(target.toString(), targetModel.resource.toString());
-				assert.equal(source?.toString(), sourceModel.resource.toString());
+				assert.strictEqual(target.toString(), targetModel.resource.toString());
+				assert.strictEqual(source?.toString(), sourceModel.resource.toString());
 			}
 
 			eventCounter++;
 
 			correlationId = e.correlationId;
-			assert.equal(e.operation, move ? FileOperation.MOVE : FileOperation.COPY);
+			assert.strictEqual(e.operation, move ? FileOperation.MOVE : FileOperation.COPY);
 		});
 
 		const listener2 = accessor.workingCopyFileService.onDidRunWorkingCopyFileOperation(e => {
 			for (let i = 0; i < e.files.length; i++) {
 				const { target, source } = files[i];
 				const { targetModel, sourceModel } = models[i];
-				assert.equal(target.toString(), targetModel.resource.toString());
-				assert.equal(source?.toString(), sourceModel.resource.toString());
+				assert.strictEqual(target.toString(), targetModel.resource.toString());
+				assert.strictEqual(source?.toString(), sourceModel.resource.toString());
 			}
 
 			eventCounter++;
 
-			assert.equal(e.operation, move ? FileOperation.MOVE : FileOperation.COPY);
-			assert.equal(e.correlationId, correlationId);
+			assert.strictEqual(e.operation, move ? FileOperation.MOVE : FileOperation.COPY);
+			assert.strictEqual(e.correlationId, correlationId);
 		});
 
 		if (move) {
-			await accessor.workingCopyFileService.move(models.map(model => ({ source: model.sourceModel.resource, target: model.targetModel.resource })), { overwrite: true });
+			await accessor.workingCopyFileService.move(models.map(model => ({ file: { source: model.sourceModel.resource, target: model.targetModel.resource }, options: { overwrite: true } })));
 		} else {
-			await accessor.workingCopyFileService.copy(models.map(model => ({ source: model.sourceModel.resource, target: model.targetModel.resource })), { overwrite: true });
+			await accessor.workingCopyFileService.copy(models.map(model => ({ file: { source: model.sourceModel.resource, target: model.targetModel.resource }, options: { overwrite: true } })));
 		}
 
 		for (let i = 0; i < models.length; i++) {
 			const { sourceModel, targetModel } = models[i];
 
-			assert.equal(targetModel.textEditorModel!.getValue(), 'foo' + i);
+			assert.strictEqual(targetModel.textEditorModel!.getValue(), 'foo' + i);
 
 			if (move) {
 				assert.ok(!accessor.textFileService.isDirty(sourceModel.resource));
@@ -350,7 +351,7 @@ suite('WorkingCopyFileService', () => {
 			sourceModel.dispose();
 			targetModel.dispose();
 		}
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 
 		participant.dispose();
 		listener1.dispose();
@@ -377,9 +378,9 @@ suite('WorkingCopyFileService', () => {
 				for (let i = 0; i < models.length; i++) {
 					const model = models[i];
 					const file = files[i];
-					assert.equal(file.target.toString(), model.resource.toString());
+					assert.strictEqual(file.target.toString(), model.resource.toString());
 				}
-				assert.equal(operation, FileOperation.DELETE);
+				assert.strictEqual(operation, FileOperation.DELETE);
 				eventCounter++;
 			}
 		});
@@ -388,9 +389,9 @@ suite('WorkingCopyFileService', () => {
 			for (let i = 0; i < models.length; i++) {
 				const model = models[i];
 				const file = e.files[i];
-				assert.equal(file.target.toString(), model.resource.toString());
+				assert.strictEqual(file.target.toString(), model.resource.toString());
 			}
-			assert.equal(e.operation, FileOperation.DELETE);
+			assert.strictEqual(e.operation, FileOperation.DELETE);
 			correlationId = e.correlationId;
 			eventCounter++;
 		});
@@ -399,20 +400,20 @@ suite('WorkingCopyFileService', () => {
 			for (let i = 0; i < models.length; i++) {
 				const model = models[i];
 				const file = e.files[i];
-				assert.equal(file.target.toString(), model.resource.toString());
+				assert.strictEqual(file.target.toString(), model.resource.toString());
 			}
-			assert.equal(e.operation, FileOperation.DELETE);
-			assert.equal(e.correlationId, correlationId);
+			assert.strictEqual(e.operation, FileOperation.DELETE);
+			assert.strictEqual(e.correlationId, correlationId);
 			eventCounter++;
 		});
 
-		await accessor.workingCopyFileService.delete(models.map(m => m.resource));
+		await accessor.workingCopyFileService.delete(models.map(m => ({ resource: m.resource })));
 		for (const model of models) {
 			assert.ok(!accessor.workingCopyService.isDirty(model.resource));
 			model.dispose();
 		}
 
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 
 		participant.dispose();
 		listener1.dispose();
@@ -432,37 +433,37 @@ suite('WorkingCopyFileService', () => {
 
 		const participant = accessor.workingCopyFileService.addFileOperationParticipant({
 			participate: async (files, operation) => {
-				assert.equal(files.length, 1);
+				assert.strictEqual(files.length, 1);
 				const file = files[0];
-				assert.equal(file.target.toString(), model.resource.toString());
-				assert.equal(operation, FileOperation.CREATE);
+				assert.strictEqual(file.target.toString(), model.resource.toString());
+				assert.strictEqual(operation, FileOperation.CREATE);
 				eventCounter++;
 			}
 		});
 
 		const listener1 = accessor.workingCopyFileService.onWillRunWorkingCopyFileOperation(e => {
-			assert.equal(e.files.length, 1);
+			assert.strictEqual(e.files.length, 1);
 			const file = e.files[0];
-			assert.equal(file.target.toString(), model.resource.toString());
-			assert.equal(e.operation, FileOperation.CREATE);
+			assert.strictEqual(file.target.toString(), model.resource.toString());
+			assert.strictEqual(e.operation, FileOperation.CREATE);
 			correlationId = e.correlationId;
 			eventCounter++;
 		});
 
 		const listener2 = accessor.workingCopyFileService.onDidRunWorkingCopyFileOperation(e => {
-			assert.equal(e.files.length, 1);
+			assert.strictEqual(e.files.length, 1);
 			const file = e.files[0];
-			assert.equal(file.target.toString(), model.resource.toString());
-			assert.equal(e.operation, FileOperation.CREATE);
-			assert.equal(e.correlationId, correlationId);
+			assert.strictEqual(file.target.toString(), model.resource.toString());
+			assert.strictEqual(e.operation, FileOperation.CREATE);
+			assert.strictEqual(e.correlationId, correlationId);
 			eventCounter++;
 		});
 
-		await accessor.workingCopyFileService.create(resource, contents);
+		await accessor.workingCopyFileService.create([{ resource, contents }]);
 		assert.ok(!accessor.workingCopyService.isDirty(model.resource));
 		model.dispose();
 
-		assert.equal(eventCounter, 3);
+		assert.strictEqual(eventCounter, 3);
 
 		participant.dispose();
 		listener1.dispose();
diff --git a/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts b/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
index df5f7b2e0..314cd18f9 100644
--- a/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts
@@ -25,83 +25,83 @@ suite('WorkingCopyService', () => {
 		const onDidUnregister: IWorkingCopy[] = [];
 		service.onDidUnregister(copy => onDidUnregister.push(copy));
 
-		assert.equal(service.hasDirty, false);
-		assert.equal(service.dirtyCount, 0);
-		assert.equal(service.workingCopies.length, 0);
-		assert.equal(service.isDirty(URI.file('/')), false);
+		assert.strictEqual(service.hasDirty, false);
+		assert.strictEqual(service.dirtyCount, 0);
+		assert.strictEqual(service.workingCopies.length, 0);
+		assert.strictEqual(service.isDirty(URI.file('/')), false);
 
 		// resource 1
 		const resource1 = URI.file('/some/folder/file.txt');
 		const copy1 = new TestWorkingCopy(resource1);
 		const unregister1 = service.registerWorkingCopy(copy1);
 
-		assert.equal(service.workingCopies.length, 1);
-		assert.equal(service.workingCopies[0], copy1);
-		assert.equal(onDidRegister.length, 1);
-		assert.equal(onDidRegister[0], copy1);
-		assert.equal(service.dirtyCount, 0);
-		assert.equal(service.isDirty(resource1), false);
-		assert.equal(service.hasDirty, false);
+		assert.strictEqual(service.workingCopies.length, 1);
+		assert.strictEqual(service.workingCopies[0], copy1);
+		assert.strictEqual(onDidRegister.length, 1);
+		assert.strictEqual(onDidRegister[0], copy1);
+		assert.strictEqual(service.dirtyCount, 0);
+		assert.strictEqual(service.isDirty(resource1), false);
+		assert.strictEqual(service.hasDirty, false);
 
 		copy1.setDirty(true);
 
-		assert.equal(copy1.isDirty(), true);
-		assert.equal(service.dirtyCount, 1);
-		assert.equal(service.dirtyWorkingCopies.length, 1);
-		assert.equal(service.dirtyWorkingCopies[0], copy1);
-		assert.equal(service.workingCopies.length, 1);
-		assert.equal(service.workingCopies[0], copy1);
-		assert.equal(service.isDirty(resource1), true);
-		assert.equal(service.hasDirty, true);
-		assert.equal(onDidChangeDirty.length, 1);
-		assert.equal(onDidChangeDirty[0], copy1);
+		assert.strictEqual(copy1.isDirty(), true);
+		assert.strictEqual(service.dirtyCount, 1);
+		assert.strictEqual(service.dirtyWorkingCopies.length, 1);
+		assert.strictEqual(service.dirtyWorkingCopies[0], copy1);
+		assert.strictEqual(service.workingCopies.length, 1);
+		assert.strictEqual(service.workingCopies[0], copy1);
+		assert.strictEqual(service.isDirty(resource1), true);
+		assert.strictEqual(service.hasDirty, true);
+		assert.strictEqual(onDidChangeDirty.length, 1);
+		assert.strictEqual(onDidChangeDirty[0], copy1);
 
 		copy1.setContent('foo');
 
-		assert.equal(onDidChangeContent.length, 1);
-		assert.equal(onDidChangeContent[0], copy1);
+		assert.strictEqual(onDidChangeContent.length, 1);
+		assert.strictEqual(onDidChangeContent[0], copy1);
 
 		copy1.setDirty(false);
 
-		assert.equal(service.dirtyCount, 0);
-		assert.equal(service.isDirty(resource1), false);
-		assert.equal(service.hasDirty, false);
-		assert.equal(onDidChangeDirty.length, 2);
-		assert.equal(onDidChangeDirty[1], copy1);
+		assert.strictEqual(service.dirtyCount, 0);
+		assert.strictEqual(service.isDirty(resource1), false);
+		assert.strictEqual(service.hasDirty, false);
+		assert.strictEqual(onDidChangeDirty.length, 2);
+		assert.strictEqual(onDidChangeDirty[1], copy1);
 
 		unregister1.dispose();
 
-		assert.equal(onDidUnregister.length, 1);
-		assert.equal(onDidUnregister[0], copy1);
-		assert.equal(service.workingCopies.length, 0);
+		assert.strictEqual(onDidUnregister.length, 1);
+		assert.strictEqual(onDidUnregister[0], copy1);
+		assert.strictEqual(service.workingCopies.length, 0);
 
 		// resource 2
 		const resource2 = URI.file('/some/folder/file-dirty.txt');
 		const copy2 = new TestWorkingCopy(resource2, true);
 		const unregister2 = service.registerWorkingCopy(copy2);
 
-		assert.equal(onDidRegister.length, 2);
-		assert.equal(onDidRegister[1], copy2);
-		assert.equal(service.dirtyCount, 1);
-		assert.equal(service.isDirty(resource2), true);
-		assert.equal(service.hasDirty, true);
+		assert.strictEqual(onDidRegister.length, 2);
+		assert.strictEqual(onDidRegister[1], copy2);
+		assert.strictEqual(service.dirtyCount, 1);
+		assert.strictEqual(service.isDirty(resource2), true);
+		assert.strictEqual(service.hasDirty, true);
 
-		assert.equal(onDidChangeDirty.length, 3);
-		assert.equal(onDidChangeDirty[2], copy2);
+		assert.strictEqual(onDidChangeDirty.length, 3);
+		assert.strictEqual(onDidChangeDirty[2], copy2);
 
 		copy2.setContent('foo');
 
-		assert.equal(onDidChangeContent.length, 2);
-		assert.equal(onDidChangeContent[1], copy2);
+		assert.strictEqual(onDidChangeContent.length, 2);
+		assert.strictEqual(onDidChangeContent[1], copy2);
 
 		unregister2.dispose();
 
-		assert.equal(onDidUnregister.length, 2);
-		assert.equal(onDidUnregister[1], copy2);
-		assert.equal(service.dirtyCount, 0);
-		assert.equal(service.hasDirty, false);
-		assert.equal(onDidChangeDirty.length, 4);
-		assert.equal(onDidChangeDirty[3], copy2);
+		assert.strictEqual(onDidUnregister.length, 2);
+		assert.strictEqual(onDidUnregister[1], copy2);
+		assert.strictEqual(service.dirtyCount, 0);
+		assert.strictEqual(service.hasDirty, false);
+		assert.strictEqual(onDidChangeDirty.length, 4);
+		assert.strictEqual(onDidChangeDirty[3], copy2);
 	});
 
 	test('registry - multiple copies on same resource throws', () => {
diff --git a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
index 8a6d94c1e..a851ffe26 100644
--- a/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts
@@ -221,6 +221,7 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 		}
 
 		// Allow to save the workspace of the current window
+		// if we have an identical match on the path
 		if (isEqual(workspaceIdentifier.configPath, path)) {
 			return this.saveWorkspace(workspaceIdentifier);
 		}
@@ -251,8 +252,8 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 
 		// Read the contents of the workspace file, update it to new location and save it.
 		const raw = await this.fileService.readFile(configPathURI);
-		const newRawWorkspaceContents = rewriteWorkspaceFileForNewLocation(raw.value.toString(), configPathURI, isFromUntitledWorkspace, targetConfigPathURI);
-		await this.textFileService.create(targetConfigPathURI, newRawWorkspaceContents, { overwrite: true });
+		const newRawWorkspaceContents = rewriteWorkspaceFileForNewLocation(raw.value.toString(), configPathURI, isFromUntitledWorkspace, targetConfigPathURI, this.uriIdentityService.extUri);
+		await this.textFileService.create([{ resource: targetConfigPathURI, value: newRawWorkspaceContents, options: { overwrite: true } }]);
 	}
 
 	protected async saveWorkspace(workspace: IWorkspaceIdentifier): Promise<void> {
@@ -273,8 +274,8 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 
 		// Finally, we need to re-create the file as it was deleted
 		const newWorkspace: IStoredWorkspace = { folders: [] };
-		const newRawWorkspaceContents = rewriteWorkspaceFileForNewLocation(JSON.stringify(newWorkspace, null, '\t'), configPathURI, false, configPathURI);
-		await this.textFileService.create(configPathURI, newRawWorkspaceContents);
+		const newRawWorkspaceContents = rewriteWorkspaceFileForNewLocation(JSON.stringify(newWorkspace, null, '\t'), configPathURI, false, configPathURI, this.uriIdentityService.extUri);
+		await this.textFileService.create([{ resource: configPathURI, value: newRawWorkspaceContents }]);
 	}
 
 	private handleWorkspaceConfigurationEditingError(error: JSONEditingError): void {
diff --git a/src/vs/workbench/services/workspaces/browser/workspaces.ts b/src/vs/workbench/services/workspaces/browser/workspaces.ts
index 9234604c9..3b90080dc 100644
--- a/src/vs/workbench/services/workspaces/browser/workspaces.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspaces.ts
@@ -3,13 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { URI } from 'vs/base/common/uri';
 import { hash } from 'vs/base/common/hash';
 
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// NOTE: DO NOT CHANGE. IDENTIFIERS HAVE TO REMAIN STABLE
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 export function getWorkspaceIdentifier(workspacePath: URI): IWorkspaceIdentifier {
 	return {
-		id: hash(workspacePath.toString()).toString(16),
+		id: getWorkspaceId(workspacePath),
 		configPath: workspacePath
 	};
 }
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// NOTE: DO NOT CHANGE. IDENTIFIERS HAVE TO REMAIN STABLE
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+export function getSingleFolderWorkspaceIdentifier(folderPath: URI): ISingleFolderWorkspaceIdentifier {
+	return {
+		id: getWorkspaceId(folderPath),
+		uri: folderPath
+	};
+}
+
+function getWorkspaceId(uri: URI): string {
+	return hash(uri.toString()).toString(16);
+}
diff --git a/src/vs/workbench/services/workspaces/browser/workspacesService.ts b/src/vs/workbench/services/workspaces/browser/workspacesService.ts
index d8280a2dd..6d6b1d770 100644
--- a/src/vs/workbench/services/workspaces/browser/workspacesService.ts
+++ b/src/vs/workbench/services/workspaces/browser/workspacesService.ts
@@ -16,6 +16,8 @@ import { IFileService, FileOperationError, FileOperationResult } from 'vs/platfo
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { joinPath } from 'vs/base/common/resources';
 import { VSBuffer } from 'vs/base/common/buffer';
+import { isWindows } from 'vs/base/common/platform';
+import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 
 export class BrowserWorkspacesService extends Disposable implements IWorkspacesService {
 
@@ -32,6 +34,7 @@ export class BrowserWorkspacesService extends Disposable implements IWorkspacesS
 		@ILogService private readonly logService: ILogService,
 		@IFileService private readonly fileService: IFileService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
 
@@ -134,7 +137,7 @@ export class BrowserWorkspacesService extends Disposable implements IWorkspacesS
 		const storedWorkspaceFolder: IStoredWorkspaceFolder[] = [];
 		if (folders) {
 			for (const folder of folders) {
-				storedWorkspaceFolder.push(getStoredWorkspaceFolder(folder.uri, true, folder.name, this.environmentService.untitledWorkspacesHome));
+				storedWorkspaceFolder.push(getStoredWorkspaceFolder(folder.uri, true, folder.name, this.environmentService.untitledWorkspacesHome, !isWindows, this.uriIdentityService.extUri));
 			}
 		}
 
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
index c48fc29d8..82b6a3254 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from 'vs/nls';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing';
 import { URI } from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { IWorkspacesService, isUntitledWorkspace, IWorkspaceIdentifier, hasWorkspaceFileExtension } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspacesService, isUntitledWorkspace, IWorkspaceIdentifier, hasWorkspaceFileExtension, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { WorkspaceService } from 'vs/workbench/services/configuration/browser/configurationService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -66,7 +66,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 		this.lifecycleService.onBeforeShutdown(e => {
 			const saveOperation = this.saveUntitledBeforeShutdown(e.reason);
 			if (saveOperation) {
-				e.veto(saveOperation);
+				e.veto(saveOperation, 'veto.untitledWorkspace');
 			}
 		});
 	}
@@ -92,16 +92,14 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 			CANCEL
 		}
 
-		const buttons: { label: string; result: ConfirmResult; }[] = [
-			{ label: mnemonicButtonLabel(nls.localize('save', "Save")), result: ConfirmResult.SAVE },
-			{ label: mnemonicButtonLabel(nls.localize('doNotSave', "Don't Save")), result: ConfirmResult.DONT_SAVE },
-			{ label: nls.localize('cancel', "Cancel"), result: ConfirmResult.CANCEL }
+		const buttons = [
+			{ label: mnemonicButtonLabel(localize('save', "Save")), result: ConfirmResult.SAVE },
+			{ label: mnemonicButtonLabel(localize('doNotSave', "Don't Save")), result: ConfirmResult.DONT_SAVE },
+			{ label: localize('cancel', "Cancel"), result: ConfirmResult.CANCEL }
 		];
-		const message = nls.localize('saveWorkspaceMessage', "Do you want to save your workspace configuration as a file?");
-		const detail = nls.localize('saveWorkspaceDetail', "Save your workspace if you plan to open it again.");
-		const cancelId = 2;
-
-		const { choice } = await this.dialogService.show(Severity.Warning, message, buttons.map(button => button.label), { detail, cancelId });
+		const message = localize('saveWorkspaceMessage', "Do you want to save your workspace configuration as a file?");
+		const detail = localize('saveWorkspaceDetail', "Save your workspace if you plan to open it again.");
+		const { choice } = await this.dialogService.show(Severity.Warning, message, buttons.map(button => button.label), { detail, cancelId: 2 });
 
 		switch (buttons[choice].result) {
 
@@ -111,7 +109,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 
 			// Don't Save: delete workspace
 			case ConfirmResult.DONT_SAVE:
-				this.workspacesService.deleteUntitledWorkspace(workspaceIdentifier);
+				await this.workspacesService.deleteUntitledWorkspace(workspaceIdentifier);
 				return false;
 
 			// Save: save workspace, but do not veto unload if path provided
@@ -126,13 +124,13 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 
 					// Make sure to add the new workspace to the history to find it again
 					const newWorkspaceIdentifier = await this.workspacesService.getWorkspaceIdentifier(newWorkspacePath);
-					this.workspacesService.addRecentlyOpened([{
+					await this.workspacesService.addRecentlyOpened([{
 						label: this.labelService.getWorkspaceLabel(newWorkspaceIdentifier, { verbose: true }),
 						workspace: newWorkspaceIdentifier
 					}]);
 
 					// Delete the untitled one
-					this.workspacesService.deleteUntitledWorkspace(workspaceIdentifier);
+					await this.workspacesService.deleteUntitledWorkspace(workspaceIdentifier);
 				} catch (error) {
 					// ignore
 				}
@@ -146,13 +144,13 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 		const windows = await this.nativeHostService.getWindows();
 
 		// Prevent overwriting a workspace that is currently opened in another window
-		if (windows.some(window => !!window.workspace && this.uriIdentityService.extUri.isEqual(window.workspace.configPath, path))) {
+		if (windows.some(window => isWorkspaceIdentifier(window.workspace) && this.uriIdentityService.extUri.isEqual(window.workspace.configPath, path))) {
 			await this.dialogService.show(
 				Severity.Info,
-				nls.localize('workspaceOpenedMessage', "Unable to save workspace '{0}'", basename(path)),
-				[nls.localize('ok', "OK")],
+				localize('workspaceOpenedMessage', "Unable to save workspace '{0}'", basename(path)),
+				[localize('ok', "OK")],
 				{
-					detail: nls.localize('workspaceOpenedDetail', "The workspace is already opened in another window. Please close that window first and then try again.")
+					detail: localize('workspaceOpenedDetail', "The workspace is already opened in another window. Please close that window first and then try again.")
 				}
 			);
 
diff --git a/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
new file mode 100644
index 000000000..fdfcf9e33
--- /dev/null
+++ b/src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { URI } from 'vs/base/common/uri';
+import { getWorkspaceIdentifier, getSingleFolderWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';
+
+suite('Workspaces', () => {
+	test('workspace identifiers are stable', function () {
+
+		// workspace identifier
+		assert.strictEqual(getWorkspaceIdentifier(URI.parse('vscode-remote:/hello/test')).id, '474434e4');
+
+		// single folder identifier
+		assert.strictEqual(getSingleFolderWorkspaceIdentifier(URI.parse('vscode-remote:/hello/test'))?.id, '474434e4');
+	});
+});
diff --git a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
index c33328c2c..81760cea3 100644
--- a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts
@@ -35,20 +35,21 @@ import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDep
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 
 import 'vs/editor/contrib/codeAction/codeAction';
 import 'vs/editor/contrib/codelens/codelens';
 import 'vs/editor/contrib/colorPicker/color';
 import 'vs/editor/contrib/format/format';
 import 'vs/editor/contrib/gotoSymbol/goToCommands';
-import 'vs/editor/contrib/gotoSymbol/documentSymbols';
+import 'vs/editor/contrib/documentSymbols/documentSymbols';
 import 'vs/editor/contrib/hover/getHover';
 import 'vs/editor/contrib/links/getLinks';
 import 'vs/editor/contrib/parameterHints/provideSignatureHelp';
 import 'vs/editor/contrib/smartSelect/smartSelect';
 import 'vs/editor/contrib/suggest/suggest';
 import 'vs/editor/contrib/rename/rename';
-import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import 'vs/editor/contrib/inlineHints/inlineHintsController';
 
 const defaultSelector = { scheme: 'far' };
 const model: ITextModel = createTextModel(
@@ -200,11 +201,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			return commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeWorkspaceSymbolProvider', 'testing').then(value => {
 
 				for (let info of value) {
-					assert.ok(info instanceof types.SymbolInformation);
-					assert.equal(info.name, 'testing');
-					assert.equal(info.kind, types.SymbolKind.Array);
+					assert.strictEqual(info instanceof types.SymbolInformation, true);
+					assert.strictEqual(info.name, 'testing');
+					assert.strictEqual(info.kind, types.SymbolKind.Array);
 				}
-				assert.equal(value.length, 3);
+				assert.strictEqual(value.length, 3);
 			});
 		});
 	});
@@ -219,11 +220,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		await rpcProtocol.sync();
 		let symbols = await commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeWorkspaceSymbolProvider', '');
-		assert.equal(symbols.length, 1);
+		assert.strictEqual(symbols.length, 1);
 
 		await rpcProtocol.sync();
 		symbols = await commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeWorkspaceSymbolProvider', '*');
-		assert.equal(symbols.length, 1);
+		assert.strictEqual(symbols.length, 1);
 	});
 
 	// --- formatting
@@ -237,7 +238,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		await rpcProtocol.sync();
 		let edits = await commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeFormatDocumentProvider', model.uri);
-		assert.equal(edits.length, 1);
+		assert.strictEqual(edits.length, 1);
 	});
 
 
@@ -256,10 +257,10 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		const edit = await commands.executeCommand<vscode.WorkspaceEdit>('vscode.executeDocumentRenameProvider', model.uri, new types.Position(0, 12), 'newNameOfThis');
 
 		assert.ok(edit);
-		assert.equal(edit.has(model.uri), true);
+		assert.strictEqual(edit.has(model.uri), true);
 		const textEdits = edit.get(model.uri);
-		assert.equal(textEdits.length, 1);
-		assert.equal(textEdits[0].newText, 'newNameOfThis');
+		assert.strictEqual(textEdits.length, 1);
+		assert.strictEqual(textEdits[0].newText, 'newNameOfThis');
 	});
 
 	// --- definition
@@ -294,7 +295,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Location[]>('vscode.executeDefinitionProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 4);
+				assert.strictEqual(values.length, 4);
 				for (let v of values) {
 					assert.ok(v.uri instanceof URI);
 					assert.ok(v.range instanceof types.Range);
@@ -315,7 +316,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<(vscode.Location | vscode.LocationLink)[]>('vscode.executeDefinitionProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				for (let v of values) {
 					if (isLocation(v)) {
 						assert.ok(v.uri instanceof URI);
@@ -352,7 +353,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Location[]>('vscode.executeDeclarationProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 4);
+				assert.strictEqual(values.length, 4);
 				for (let v of values) {
 					assert.ok(v.uri instanceof URI);
 					assert.ok(v.range instanceof types.Range);
@@ -373,7 +374,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<(vscode.Location | vscode.LocationLink)[]>('vscode.executeDeclarationProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				for (let v of values) {
 					if (isLocation(v)) {
 						assert.ok(v.uri instanceof URI);
@@ -421,7 +422,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Location[]>('vscode.executeTypeDefinitionProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 4);
+				assert.strictEqual(values.length, 4);
 				for (const v of values) {
 					assert.ok(v.uri instanceof URI);
 					assert.ok(v.range instanceof types.Range);
@@ -442,7 +443,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<(vscode.Location | vscode.LocationLink)[]>('vscode.executeTypeDefinitionProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				for (let v of values) {
 					if (isLocation(v)) {
 						assert.ok(v.uri instanceof URI);
@@ -490,7 +491,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Location[]>('vscode.executeImplementationProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 4);
+				assert.strictEqual(values.length, 4);
 				for (const v of values) {
 					assert.ok(v.uri instanceof URI);
 					assert.ok(v.range instanceof types.Range);
@@ -511,7 +512,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<(vscode.Location | vscode.LocationLink)[]>('vscode.executeImplementationProvider', model.uri, new types.Position(0, 0)).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				for (let v of values) {
 					if (isLocation(v)) {
 						assert.ok(v.uri instanceof URI);
@@ -540,13 +541,13 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		}));
 
 		return commands.executeCommand<vscode.Location[]>('vscode.executeReferenceProvider', model.uri, new types.Position(0, 0)).then(values => {
-			assert.equal(values.length, 1);
+			assert.strictEqual(values.length, 1);
 			let [first] = values;
-			assert.equal(first.uri.toString(), 'some:uri/path');
-			assert.equal(first.range.start.line, 0);
-			assert.equal(first.range.start.character, 1);
-			assert.equal(first.range.end.line, 0);
-			assert.equal(first.range.end.character, 5);
+			assert.strictEqual(first.uri.toString(), 'some:uri/path');
+			assert.strictEqual(first.range.start.line, 0);
+			assert.strictEqual(first.range.start.character, 1);
+			assert.strictEqual(first.range.end.line, 0);
+			assert.strictEqual(first.range.end.character, 5);
 		});
 	});
 
@@ -564,12 +565,12 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.SymbolInformation[]>('vscode.executeDocumentSymbolProvider', model.uri).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				let [first, second] = values;
-				assert.ok(first instanceof types.SymbolInformation);
-				assert.ok(second instanceof types.SymbolInformation);
-				assert.equal(first.name, 'testing2');
-				assert.equal(second.name, 'testing1');
+				assert.strictEqual(first instanceof types.SymbolInformation, true);
+				assert.strictEqual(second instanceof types.SymbolInformation, true);
+				assert.strictEqual(first.name, 'testing2');
+				assert.strictEqual(second.name, 'testing1');
 			});
 		});
 	});
@@ -592,14 +593,14 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<(vscode.SymbolInformation & vscode.DocumentSymbol)[]>('vscode.executeDocumentSymbolProvider', model.uri).then(values => {
-				assert.equal(values.length, 2);
+				assert.strictEqual(values.length, 2);
 				let [first, second] = values;
-				assert.ok(first instanceof types.SymbolInformation);
-				assert.ok(!(first instanceof types.DocumentSymbol));
-				assert.ok(second instanceof types.SymbolInformation);
-				assert.equal(first.name, 'DocumentSymbol');
-				assert.equal(first.children.length, 1);
-				assert.equal(second.name, 'SymbolInformation');
+				assert.strictEqual(first instanceof types.SymbolInformation, true);
+				assert.strictEqual(first instanceof types.DocumentSymbol, false);
+				assert.strictEqual(second instanceof types.SymbolInformation, true);
+				assert.strictEqual(first.name, 'DocumentSymbol');
+				assert.strictEqual(first.children.length, 1);
+				assert.strictEqual(second.name, 'SymbolInformation');
 			});
 		});
 	});
@@ -629,37 +630,37 @@ suite('ExtHostLanguageFeatureCommands', function () {
 				assert.ok(list instanceof types.CompletionList);
 				let values = list.items;
 				assert.ok(Array.isArray(values));
-				assert.equal(values.length, 4);
+				assert.strictEqual(values.length, 4);
 				let [first, second, third, fourth] = values;
-				assert.equal(first.label, 'item1');
-				assert.equal(first.textEdit, undefined);// no text edit, default ranges
+				assert.strictEqual(first.label, 'item1');
+				assert.strictEqual(first.textEdit, undefined);// no text edit, default ranges
 				assert.ok(!types.Range.isRange(first.range));
 
-				assert.equal(second.label, 'item2');
-				assert.equal(second.textEdit!.newText, 'foo');
-				assert.equal(second.textEdit!.range.start.line, 0);
-				assert.equal(second.textEdit!.range.start.character, 4);
-				assert.equal(second.textEdit!.range.end.line, 0);
-				assert.equal(second.textEdit!.range.end.character, 8);
+				assert.strictEqual(second.label, 'item2');
+				assert.strictEqual(second.textEdit!.newText, 'foo');
+				assert.strictEqual(second.textEdit!.range.start.line, 0);
+				assert.strictEqual(second.textEdit!.range.start.character, 4);
+				assert.strictEqual(second.textEdit!.range.end.line, 0);
+				assert.strictEqual(second.textEdit!.range.end.character, 8);
 
-				assert.equal(third.label, 'item3');
-				assert.equal(third.textEdit!.newText, 'foobar');
-				assert.equal(third.textEdit!.range.start.line, 0);
-				assert.equal(third.textEdit!.range.start.character, 1);
-				assert.equal(third.textEdit!.range.end.line, 0);
-				assert.equal(third.textEdit!.range.end.character, 6);
+				assert.strictEqual(third.label, 'item3');
+				assert.strictEqual(third.textEdit!.newText, 'foobar');
+				assert.strictEqual(third.textEdit!.range.start.line, 0);
+				assert.strictEqual(third.textEdit!.range.start.character, 1);
+				assert.strictEqual(third.textEdit!.range.end.line, 0);
+				assert.strictEqual(third.textEdit!.range.end.character, 6);
 
-				assert.equal(fourth.label, 'item4');
-				assert.equal(fourth.textEdit, undefined);
+				assert.strictEqual(fourth.label, 'item4');
+				assert.strictEqual(fourth.textEdit, undefined);
 
 				const range: any = fourth.range!;
 				assert.ok(types.Range.isRange(range));
-				assert.equal(range.start.line, 0);
-				assert.equal(range.start.character, 1);
-				assert.equal(range.end.line, 0);
-				assert.equal(range.end.character, 4);
+				assert.strictEqual(range.start.line, 0);
+				assert.strictEqual(range.start.character, 1);
+				assert.strictEqual(range.end.line, 0);
+				assert.strictEqual(range.end.character, 4);
 				assert.ok(fourth.insertText instanceof types.SnippetString);
-				assert.equal((<types.SnippetString>fourth.insertText).value, 'foo$0bar');
+				assert.strictEqual((<types.SnippetString>fourth.insertText).value, 'foo$0bar');
 			});
 		});
 	});
@@ -676,7 +677,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.CompletionList>('vscode.executeCompletionItemProvider', model.uri, new types.Position(0, 4)).then(list => {
 				assert.ok(list instanceof types.CompletionList);
-				assert.equal(list.isIncomplete, true);
+				assert.strictEqual(list.isIncomplete, true);
 			});
 		});
 	});
@@ -710,7 +711,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		);
 
 		assert.ok(list instanceof types.CompletionList);
-		assert.equal(resolveCount, 2);
+		assert.strictEqual(resolveCount, 2);
 
 	});
 
@@ -737,13 +738,13 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		);
 
 		assert.ok(list instanceof types.CompletionList);
-		assert.equal(list.items.length, 4);
+		assert.strictEqual(list.items.length, 4);
 
 		let [a, b, c, d] = list.items;
-		assert.equal(a.preselect, true);
-		assert.equal(b.preselect, undefined);
-		assert.equal(c.preselect, true);
-		assert.equal(d.preselect, undefined);
+		assert.strictEqual(a.preselect, true);
+		assert.strictEqual(b.preselect, undefined);
+		assert.strictEqual(c.preselect, true);
+		assert.strictEqual(d.preselect, undefined);
 	});
 
 	test('executeCompletionItemProvider doesn\'t capture commitCharacters #58228', async function () {
@@ -766,11 +767,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		);
 
 		assert.ok(list instanceof types.CompletionList);
-		assert.equal(list.items.length, 2);
+		assert.strictEqual(list.items.length, 2);
 
 		let [a, b] = list.items;
-		assert.deepEqual(a.commitCharacters, ['a', 'b']);
-		assert.equal(b.commitCharacters, undefined);
+		assert.deepStrictEqual(a.commitCharacters, ['a', 'b']);
+		assert.strictEqual(b.commitCharacters, undefined);
 	});
 
 	test('vscode.executeCompletionItemProvider returns the wrong CompletionItemKinds in insiders #95715', async function () {
@@ -793,11 +794,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		);
 
 		assert.ok(list instanceof types.CompletionList);
-		assert.equal(list.items.length, 2);
+		assert.strictEqual(list.items.length, 2);
 
 		const [a, b] = list.items;
-		assert.equal(a.kind, types.CompletionItemKind.Method);
-		assert.equal(b.kind, types.CompletionItemKind.Property);
+		assert.strictEqual(a.kind, types.CompletionItemKind.Method);
+		assert.strictEqual(b.kind, types.CompletionItemKind.Property);
 	});
 
 	// --- signatureHelp
@@ -840,11 +841,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Command[]>('vscode.executeCodeActionProvider', model.uri, new types.Range(0, 0, 1, 1)).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				let [first] = value;
-				assert.equal(first.title, 'Title');
-				assert.equal(first.command, 'testing');
-				assert.deepEqual(first.arguments, [1, 2, true]);
+				assert.strictEqual(first.title, 'Title');
+				assert.strictEqual(first.command, 'testing');
+				assert.deepStrictEqual(first.arguments, [1, 2, true]);
 			});
 		});
 	});
@@ -866,13 +867,13 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.CodeAction[]>('vscode.executeCodeActionProvider', model.uri, new types.Range(0, 0, 1, 1)).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				const [first] = value;
 				assert.ok(first.command);
-				assert.equal(first.command!.command, 'command');
-				assert.equal(first.command!.title, 'command_title');
-				assert.equal(first.kind!.value, 'foo');
-				assert.equal(first.title, 'title');
+				assert.strictEqual(first.command!.command, 'command');
+				assert.strictEqual(first.command!.title, 'command_title');
+				assert.strictEqual(first.kind!.value, 'foo');
+				assert.strictEqual(first.title, 'title');
 
 			});
 		});
@@ -897,7 +898,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.CodeAction[]>('vscode.executeCodeActionProvider', model.uri, selection).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				const [first] = value;
 				assert.ok(first.command);
 				assert.ok(first.command!.arguments![1] instanceof types.Selection);
@@ -926,9 +927,9 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.CodeAction[]>('vscode.executeCodeActionProvider', model.uri, selection).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				const [first] = value;
-				assert.equal(first.isPreferred, true);
+				assert.strictEqual(first.isPreferred, true);
 			});
 		});
 	});
@@ -957,11 +958,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		await rpcProtocol.sync();
 
 		const value = await commands.executeCommand<vscode.CodeAction[]>('vscode.executeCodeActionProvider', model.uri, selection, undefined, 1000);
-		assert.equal(didCallResolve, 1);
-		assert.equal(value.length, 1);
+		assert.strictEqual(didCallResolve, 1);
+		assert.strictEqual(value.length, 1);
 
 		const [first] = value;
-		assert.equal(first.title, 'title'); // does NOT change
+		assert.strictEqual(first.title, 'title'); // does NOT change
 		assert.ok(first.edit); // is set
 	});
 
@@ -983,14 +984,14 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.CodeLens[]>('vscode.executeCodeLensProvider', model.uri).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				const [first] = value;
 
-				assert.equal(first.command!.title, 'Title');
-				assert.equal(first.command!.command, 'cmd');
-				assert.equal(first.command!.arguments![0], 1);
-				assert.equal(first.command!.arguments![1], true);
-				assert.equal(first.command!.arguments![2], complexArg);
+				assert.strictEqual(first.command!.title, 'Title');
+				assert.strictEqual(first.command!.command, 'cmd');
+				assert.strictEqual(first.command!.arguments![0], 1);
+				assert.strictEqual(first.command!.arguments![1], true);
+				assert.strictEqual(first.command!.arguments![2], complexArg);
 			});
 		});
 	});
@@ -1019,14 +1020,14 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		let value = await commands.executeCommand<vscode.CodeLens[]>('vscode.executeCodeLensProvider', model.uri, 2);
 
-		assert.equal(value.length, 3); // the resolve argument defines the number of results being returned
-		assert.equal(resolveCount, 2);
+		assert.strictEqual(value.length, 3); // the resolve argument defines the number of results being returned
+		assert.strictEqual(resolveCount, 2);
 
 		resolveCount = 0;
 		value = await commands.executeCommand<vscode.CodeLens[]>('vscode.executeCodeLensProvider', model.uri);
 
-		assert.equal(value.length, 4);
-		assert.equal(resolveCount, 0);
+		assert.strictEqual(value.length, 4);
+		assert.strictEqual(resolveCount, 0);
 	});
 
 	test('Links, back and forth', function () {
@@ -1039,14 +1040,14 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.DocumentLink[]>('vscode.executeLinkProvider', model.uri).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				let [first] = value;
 
-				assert.equal(first.target + '', 'foo:bar');
-				assert.equal(first.range.start.line, 0);
-				assert.equal(first.range.start.character, 0);
-				assert.equal(first.range.end.line, 0);
-				assert.equal(first.range.end.character, 20);
+				assert.strictEqual(first.target + '', 'foo:bar');
+				assert.strictEqual(first.range.start.line, 0);
+				assert.strictEqual(first.range.start.character, 0);
+				assert.strictEqual(first.range.end.line, 0);
+				assert.strictEqual(first.range.end.character, 20);
 			});
 		});
 	});
@@ -1065,12 +1066,12 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		await rpcProtocol.sync();
 
 		const links1 = await commands.executeCommand<vscode.DocumentLink[]>('vscode.executeLinkProvider', model.uri);
-		assert.equal(links1.length, 1);
-		assert.equal(links1[0].target, undefined);
+		assert.strictEqual(links1.length, 1);
+		assert.strictEqual(links1[0].target, undefined);
 
 		const links2 = await commands.executeCommand<vscode.DocumentLink[]>('vscode.executeLinkProvider', model.uri, 1000);
-		assert.equal(links2.length, 1);
-		assert.equal(links2[0].target!.toString(), URI.parse('foo:bar').toString());
+		assert.strictEqual(links2.length, 1);
+		assert.strictEqual(links2[0].target!.toString(), URI.parse('foo:bar').toString());
 
 	});
 
@@ -1091,36 +1092,36 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.ColorInformation[]>('vscode.executeDocumentColorProvider', model.uri).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				let [first] = value;
 
-				assert.equal(first.color.red, 0.1);
-				assert.equal(first.color.green, 0.2);
-				assert.equal(first.color.blue, 0.3);
-				assert.equal(first.color.alpha, 0.4);
-				assert.equal(first.range.start.line, 0);
-				assert.equal(first.range.start.character, 0);
-				assert.equal(first.range.end.line, 0);
-				assert.equal(first.range.end.character, 20);
+				assert.strictEqual(first.color.red, 0.1);
+				assert.strictEqual(first.color.green, 0.2);
+				assert.strictEqual(first.color.blue, 0.3);
+				assert.strictEqual(first.color.alpha, 0.4);
+				assert.strictEqual(first.range.start.line, 0);
+				assert.strictEqual(first.range.start.character, 0);
+				assert.strictEqual(first.range.end.line, 0);
+				assert.strictEqual(first.range.end.character, 20);
 			});
 		}).then(() => {
 			const color = new types.Color(0.5, 0.6, 0.7, 0.8);
 			const range = new types.Range(0, 0, 0, 20);
 			return commands.executeCommand<vscode.ColorPresentation[]>('vscode.executeColorPresentationProvider', color, { uri: model.uri, range }).then(value => {
-				assert.equal(value.length, 1);
+				assert.strictEqual(value.length, 1);
 				let [first] = value;
 
-				assert.equal(first.label, '#ABC');
-				assert.equal(first.textEdit!.newText, '#ABC');
-				assert.equal(first.textEdit!.range.start.line, 1);
-				assert.equal(first.textEdit!.range.start.character, 0);
-				assert.equal(first.textEdit!.range.end.line, 1);
-				assert.equal(first.textEdit!.range.end.character, 20);
-				assert.equal(first.additionalTextEdits!.length, 1);
-				assert.equal(first.additionalTextEdits![0].range.start.line, 2);
-				assert.equal(first.additionalTextEdits![0].range.start.character, 20);
-				assert.equal(first.additionalTextEdits![0].range.end.line, 2);
-				assert.equal(first.additionalTextEdits![0].range.end.character, 20);
+				assert.strictEqual(first.label, '#ABC');
+				assert.strictEqual(first.textEdit!.newText, '#ABC');
+				assert.strictEqual(first.textEdit!.range.start.line, 1);
+				assert.strictEqual(first.textEdit!.range.start.character, 0);
+				assert.strictEqual(first.textEdit!.range.end.line, 1);
+				assert.strictEqual(first.textEdit!.range.end.character, 20);
+				assert.strictEqual(first.additionalTextEdits!.length, 1);
+				assert.strictEqual(first.additionalTextEdits![0].range.start.line, 2);
+				assert.strictEqual(first.additionalTextEdits![0].range.start.character, 20);
+				assert.strictEqual(first.additionalTextEdits![0].range.end.line, 2);
+				assert.strictEqual(first.additionalTextEdits![0].range.end.character, 20);
 			});
 		});
 	});
@@ -1135,12 +1136,93 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		return rpcProtocol.sync().then(() => {
 			return commands.executeCommand<vscode.Hover[]>('vscode.executeHoverProvider', model.uri, new types.Position(1, 1)).then(value => {
-				assert.equal(value.length, 1);
-				assert.equal(value[0].contents.length, 1);
+				assert.strictEqual(value.length, 1);
+				assert.strictEqual(value[0].contents.length, 1);
 			});
 		});
 	});
 
+	// --- inline hints
+
+	test('Inline Hints, back and forth', async function () {
+		disposables.push(extHost.registerInlineHintsProvider(nullExtensionDescription, defaultSelector, <vscode.InlineHintsProvider>{
+			provideInlineHints() {
+				return [new types.InlineHint('Foo', new types.Range(0, 1, 2, 3), undefined, true, false)];
+			}
+		}));
+
+		await rpcProtocol.sync();
+
+		const value = await commands.executeCommand<vscode.InlineHint[]>('vscode.executeInlineHintProvider', model.uri, new types.Range(0, 0, 20, 20));
+		assert.strictEqual(value.length, 1);
+
+		const [first] = value;
+		assert.strictEqual(first.text, 'Foo');
+		assert.strictEqual(first.range.start.line, 0);
+		assert.strictEqual(first.range.start.character, 1);
+		assert.strictEqual(first.range.end.line, 2);
+		assert.strictEqual(first.range.end.character, 3);
+	});
+
+	test('Inline Hints, merge', async function () {
+		disposables.push(extHost.registerInlineHintsProvider(nullExtensionDescription, defaultSelector, <vscode.InlineHintsProvider>{
+			provideInlineHints() {
+				return [new types.InlineHint('Bar', new types.Range(10, 11, 12, 13), undefined, true, false)];
+			}
+		}));
+
+		disposables.push(extHost.registerInlineHintsProvider(nullExtensionDescription, defaultSelector, <vscode.InlineHintsProvider>{
+			provideInlineHints() {
+				return [new types.InlineHint('Foo', new types.Range(0, 1, 2, 3), new types.MarkdownString('**Hello**'), true, false)];
+			}
+		}));
+
+		await rpcProtocol.sync();
+
+		const value = await commands.executeCommand<vscode.InlineHint[]>('vscode.executeInlineHintProvider', model.uri, new types.Range(0, 0, 20, 20));
+		assert.strictEqual(value.length, 2);
+
+		const [first, second] = value;
+		assert.strictEqual(first.text, 'Foo');
+		assert.strictEqual(first.range.start.line, 0);
+		assert.strictEqual(first.range.start.character, 1);
+		assert.strictEqual(first.range.end.line, 2);
+		assert.strictEqual(first.range.end.character, 3);
+		assert.ok(first.description instanceof types.MarkdownString);
+		assert.strictEqual((<types.MarkdownString>first.description).value, '**Hello**');
+
+		assert.strictEqual(second.text, 'Bar');
+		assert.strictEqual(second.range.start.line, 10);
+		assert.strictEqual(second.range.start.character, 11);
+		assert.strictEqual(second.range.end.line, 12);
+		assert.strictEqual(second.range.end.character, 13);
+	});
+
+	test('Inline Hints, bad provider', async function () {
+		disposables.push(extHost.registerInlineHintsProvider(nullExtensionDescription, defaultSelector, <vscode.InlineHintsProvider>{
+			provideInlineHints() {
+				return [new types.InlineHint('Foo', new types.Range(0, 1, 2, 3), undefined, true, false)];
+			}
+		}));
+		disposables.push(extHost.registerInlineHintsProvider(nullExtensionDescription, defaultSelector, <vscode.InlineHintsProvider>{
+			provideInlineHints() {
+				throw new Error();
+			}
+		}));
+
+		await rpcProtocol.sync();
+
+		const value = await commands.executeCommand<vscode.InlineHint[]>('vscode.executeInlineHintProvider', model.uri, new types.Range(0, 0, 20, 20));
+		assert.strictEqual(value.length, 1);
+
+		const [first] = value;
+		assert.strictEqual(first.text, 'Foo');
+		assert.strictEqual(first.range.start.line, 0);
+		assert.strictEqual(first.range.start.character, 1);
+		assert.strictEqual(first.range.end.line, 2);
+		assert.strictEqual(first.range.end.character, 3);
+	});
+
 	// --- selection ranges
 
 	test('Selection Range, back and forth', async function () {
@@ -1155,7 +1237,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		await rpcProtocol.sync();
 		let value = await commands.executeCommand<vscode.SelectionRange[]>('vscode.executeSelectionRangeProvider', model.uri, [new types.Position(0, 10)]);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		assert.ok(value[0].parent);
 	});
 
@@ -1190,16 +1272,16 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		const root = await commands.executeCommand<vscode.CallHierarchyItem[]>('vscode.prepareCallHierarchy', model.uri, new types.Position(0, 0));
 
 		assert.ok(Array.isArray(root));
-		assert.equal(root.length, 1);
-		assert.equal(root[0].name, 'ROOT');
+		assert.strictEqual(root.length, 1);
+		assert.strictEqual(root[0].name, 'ROOT');
 
 		const incoming = await commands.executeCommand<vscode.CallHierarchyIncomingCall[]>('vscode.provideIncomingCalls', root[0]);
-		assert.equal(incoming.length, 1);
-		assert.equal(incoming[0].from.name, 'INCOMING');
+		assert.strictEqual(incoming.length, 1);
+		assert.strictEqual(incoming[0].from.name, 'INCOMING');
 
 		const outgoing = await commands.executeCommand<vscode.CallHierarchyOutgoingCall[]>('vscode.provideOutgoingCalls', root[0]);
-		assert.equal(outgoing.length, 1);
-		assert.equal(outgoing[0].to.name, 'OUTGOING');
+		assert.strictEqual(outgoing.length, 1);
+		assert.strictEqual(outgoing[0].to.name, 'OUTGOING');
 	});
 
 	test('selectionRangeProvider on inner array always returns outer array #91852', async function () {
@@ -1215,11 +1297,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 
 		await rpcProtocol.sync();
 		let value = await commands.executeCommand<vscode.SelectionRange[]>('vscode.executeSelectionRangeProvider', model.uri, [new types.Position(0, 10)]);
-		assert.equal(value.length, 1);
-		assert.equal(value[0].range.start.line, 0);
-		assert.equal(value[0].range.start.character, 10);
-		assert.equal(value[0].range.end.line, 0);
-		assert.equal(value[0].range.end.character, 10);
+		assert.strictEqual(value.length, 1);
+		assert.strictEqual(value[0].range.start.line, 0);
+		assert.strictEqual(value[0].range.start.character, 10);
+		assert.strictEqual(value[0].range.end.line, 0);
+		assert.strictEqual(value[0].range.end.character, 10);
 	});
 
 	test('selectionRangeProvider on inner array always returns outer array #91852', async function () {
@@ -1240,14 +1322,14 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			model.uri,
 			[new types.Position(0, 0), new types.Position(0, 10)]
 		);
-		assert.equal(value.length, 2);
-		assert.equal(value[0].range.start.line, 0);
-		assert.equal(value[0].range.start.character, 0);
-		assert.equal(value[0].range.end.line, 0);
-		assert.equal(value[0].range.end.character, 0);
-		assert.equal(value[1].range.start.line, 0);
-		assert.equal(value[1].range.start.character, 10);
-		assert.equal(value[1].range.end.line, 0);
-		assert.equal(value[1].range.end.character, 10);
+		assert.strictEqual(value.length, 2);
+		assert.strictEqual(value[0].range.start.line, 0);
+		assert.strictEqual(value[0].range.start.character, 0);
+		assert.strictEqual(value[0].range.end.line, 0);
+		assert.strictEqual(value[0].range.end.character, 0);
+		assert.strictEqual(value[1].range.start.line, 0);
+		assert.strictEqual(value[1].range.start.character, 10);
+		assert.strictEqual(value[1].range.end.line, 0);
+		assert.strictEqual(value[1].range.end.character, 10);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts b/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts
index f6adea9dd..70bbcc2c2 100644
--- a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts
@@ -47,17 +47,17 @@ suite('ExtHostBulkEdits.applyWorkspaceEdit', () => {
 		let edit = new extHostTypes.WorkspaceEdit();
 		edit.replace(resource, new extHostTypes.Range(0, 0, 0, 0), 'hello');
 		await bulkEdits.applyWorkspaceEdit(edit);
-		assert.equal(workspaceResourceEdits.edits.length, 1);
+		assert.strictEqual(workspaceResourceEdits.edits.length, 1);
 		const [first] = workspaceResourceEdits.edits;
 		assertType(first._type === WorkspaceEditType.Text);
-		assert.equal(first.modelVersionId, 1337);
+		assert.strictEqual(first.modelVersionId, 1337);
 	});
 
 	test('does not use version id if document is not available', async () => {
 		let edit = new extHostTypes.WorkspaceEdit();
 		edit.replace(URI.parse('foo:bar2'), new extHostTypes.Range(0, 0, 0, 0), 'hello');
 		await bulkEdits.applyWorkspaceEdit(edit);
-		assert.equal(workspaceResourceEdits.edits.length, 1);
+		assert.strictEqual(workspaceResourceEdits.edits.length, 1);
 		const [first] = workspaceResourceEdits.edits;
 		assertType(first._type === WorkspaceEditType.Text);
 		assert.ok(typeof first.modelVersionId === 'undefined');
diff --git a/src/vs/workbench/test/browser/api/extHostCommands.test.ts b/src/vs/workbench/test/browser/api/extHostCommands.test.ts
index 7a60a85fe..2ecab2e8d 100644
--- a/src/vs/workbench/test/browser/api/extHostCommands.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostCommands.test.ts
@@ -31,8 +31,8 @@ suite('ExtHostCommands', function () {
 			new NullLogService()
 		);
 		commands.registerCommand(true, 'foo', (): any => { }).dispose();
-		assert.equal(lastUnregister!, 'foo');
-		assert.equal(CommandsRegistry.getCommand('foo'), undefined);
+		assert.strictEqual(lastUnregister!, 'foo');
+		assert.strictEqual(CommandsRegistry.getCommand('foo'), undefined);
 
 	});
 
@@ -57,7 +57,7 @@ suite('ExtHostCommands', function () {
 		reg.dispose();
 		reg.dispose();
 		reg.dispose();
-		assert.equal(unregisterCounter, 1);
+		assert.strictEqual(unregisterCounter, 1);
 	});
 
 	test('execute with retry', async function () {
@@ -70,12 +70,12 @@ suite('ExtHostCommands', function () {
 			}
 			async $executeCommand<T>(id: string, args: any[], retry: boolean): Promise<T | undefined> {
 				count++;
-				assert.equal(retry, count === 1);
+				assert.strictEqual(retry, count === 1);
 				if (count === 1) {
-					assert.equal(retry, true);
+					assert.strictEqual(retry, true);
 					throw new Error('$executeCommand:retry');
 				} else {
-					assert.equal(retry, false);
+					assert.strictEqual(retry, false);
 					return <any>17;
 				}
 			}
@@ -87,7 +87,7 @@ suite('ExtHostCommands', function () {
 		);
 
 		const result = await commands.executeCommand('fooo', [this, true]);
-		assert.equal(result, 17);
-		assert.equal(count, 2);
+		assert.strictEqual(result, 17);
+		assert.strictEqual(count, 2);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts
index ba291bffd..430eaf3e9 100644
--- a/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostConfiguration.test.ts
@@ -59,12 +59,12 @@ suite('ExtHostConfiguration', function () {
 			}
 		});
 
-		assert.equal(extHostConfig.getConfiguration('search.exclude')['**/node_modules'], true);
-		assert.equal(extHostConfig.getConfiguration('search.exclude').get('**/node_modules'), true);
-		assert.equal(extHostConfig.getConfiguration('search').get<any>('exclude')['**/node_modules'], true);
+		assert.strictEqual(extHostConfig.getConfiguration('search.exclude')['**/node_modules'], true);
+		assert.strictEqual(extHostConfig.getConfiguration('search.exclude').get('**/node_modules'), true);
+		assert.strictEqual(extHostConfig.getConfiguration('search').get<any>('exclude')['**/node_modules'], true);
 
-		assert.equal(extHostConfig.getConfiguration('search.exclude').has('**/node_modules'), true);
-		assert.equal(extHostConfig.getConfiguration('search').has('exclude.**/node_modules'), true);
+		assert.strictEqual(extHostConfig.getConfiguration('search.exclude').has('**/node_modules'), true);
+		assert.strictEqual(extHostConfig.getConfiguration('search').has('exclude.**/node_modules'), true);
 	});
 
 	test('has/get', () => {
@@ -83,18 +83,18 @@ suite('ExtHostConfiguration', function () {
 		const config = all.getConfiguration('farboo');
 
 		assert.ok(config.has('config0'));
-		assert.equal(config.get('config0'), true);
-		assert.equal(config.get('config4'), '');
-		assert.equal(config['config0'], true);
-		assert.equal(config['config4'], '');
+		assert.strictEqual(config.get('config0'), true);
+		assert.strictEqual(config.get('config4'), '');
+		assert.strictEqual(config['config0'], true);
+		assert.strictEqual(config['config4'], '');
 
 		assert.ok(config.has('nested.config1'));
-		assert.equal(config.get('nested.config1'), 42);
+		assert.strictEqual(config.get('nested.config1'), 42);
 		assert.ok(config.has('nested.config2'));
-		assert.equal(config.get('nested.config2'), 'Das Pferd frisst kein Reis.');
+		assert.strictEqual(config.get('nested.config2'), 'Das Pferd frisst kein Reis.');
 
 		assert.ok(config.has('nested'));
-		assert.deepEqual(config.get('nested'), { config1: 42, config2: 'Das Pferd frisst kein Reis.' });
+		assert.deepStrictEqual(config.get('nested'), { config1: 42, config2: 'Das Pferd frisst kein Reis.' });
 	});
 
 	test('can modify the returned configuration', function () {
@@ -118,37 +118,37 @@ suite('ExtHostConfiguration', function () {
 		let testObject = all.getConfiguration();
 		let actual = testObject.get<any>('farboo')!;
 		actual['nested']['config1'] = 41;
-		assert.equal(41, actual['nested']['config1']);
+		assert.strictEqual(41, actual['nested']['config1']);
 		actual['farboo1'] = 'newValue';
-		assert.equal('newValue', actual['farboo1']);
+		assert.strictEqual('newValue', actual['farboo1']);
 
 		testObject = all.getConfiguration();
 		actual = testObject.get('farboo')!;
-		assert.equal(actual['nested']['config1'], 42);
-		assert.equal(actual['farboo1'], undefined);
+		assert.strictEqual(actual['nested']['config1'], 42);
+		assert.strictEqual(actual['farboo1'], undefined);
 
 		testObject = all.getConfiguration();
 		actual = testObject.get('farboo')!;
-		assert.equal(actual['config0'], true);
+		assert.strictEqual(actual['config0'], true);
 		actual['config0'] = false;
-		assert.equal(actual['config0'], false);
+		assert.strictEqual(actual['config0'], false);
 
 		testObject = all.getConfiguration();
 		actual = testObject.get('farboo')!;
-		assert.equal(actual['config0'], true);
+		assert.strictEqual(actual['config0'], true);
 
 		testObject = all.getConfiguration();
 		actual = testObject.inspect('farboo')!;
 		actual['value'] = 'effectiveValue';
-		assert.equal('effectiveValue', actual['value']);
+		assert.strictEqual('effectiveValue', actual['value']);
 
 		testObject = all.getConfiguration('workbench');
 		actual = testObject.get('colorCustomizations')!;
 		actual['statusBar.foreground'] = undefined;
-		assert.equal(actual['statusBar.foreground'], undefined);
+		assert.strictEqual(actual['statusBar.foreground'], undefined);
 		testObject = all.getConfiguration('workbench');
 		actual = testObject.get('colorCustomizations')!;
-		assert.equal(actual['statusBar.foreground'], 'somevalue');
+		assert.strictEqual(actual['statusBar.foreground'], 'somevalue');
 	});
 
 	test('Stringify returned configuration', function () {
@@ -173,7 +173,7 @@ suite('ExtHostConfiguration', function () {
 
 		const testObject = all.getConfiguration();
 		let actual: any = testObject.get('farboo');
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'config0': true,
 			'nested': {
 				'config1': 42,
@@ -182,11 +182,11 @@ suite('ExtHostConfiguration', function () {
 			'config4': ''
 		}), JSON.stringify(actual));
 
-		assert.deepEqual(undefined, JSON.stringify(testObject.get('unknownkey')));
+		assert.deepStrictEqual(undefined, JSON.stringify(testObject.get('unknownkey')));
 
 		actual = testObject.get('farboo')!;
 		actual['config0'] = false;
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'config0': false,
 			'nested': {
 				'config1': 42,
@@ -197,14 +197,14 @@ suite('ExtHostConfiguration', function () {
 
 		actual = testObject.get<any>('workbench')!['colorCustomizations']!;
 		actual['statusBar.background'] = 'anothervalue';
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'statusBar.foreground': 'somevalue',
 			'statusBar.background': 'anothervalue'
 		}), JSON.stringify(actual));
 
 		actual = testObject.get('workbench');
 		actual['unknownkey'] = 'somevalue';
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'colorCustomizations': {
 				'statusBar.foreground': 'somevalue'
 			},
@@ -218,7 +218,7 @@ suite('ExtHostConfiguration', function () {
 			'statusBar.background': `#0ff`,
 			'statusBar.foreground': `#ff0`,
 		};
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'statusBar.background': `#0ff`,
 			'statusBar.foreground': `#ff0`,
 		}), JSON.stringify(actual));
@@ -229,7 +229,7 @@ suite('ExtHostConfiguration', function () {
 			'statusBar.background': `#0ff`,
 			'statusBar.foreground': `#ff0`,
 		};
-		assert.deepEqual(JSON.stringify({
+		assert.deepStrictEqual(JSON.stringify({
 			'statusBar.background': `#0ff`,
 			'statusBar.foreground': `#ff0`,
 		}), JSON.stringify(actual));
@@ -292,16 +292,16 @@ suite('ExtHostConfiguration', function () {
 		);
 
 		let actual = testObject.getConfiguration().inspect('editor.wordWrap')!;
-		assert.equal(actual.defaultValue, 'off');
-		assert.equal(actual.globalValue, 'on');
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.strictEqual(actual.defaultValue, 'off');
+		assert.strictEqual(actual.globalValue, 'on');
+		assert.strictEqual(actual.workspaceValue, undefined);
+		assert.strictEqual(actual.workspaceFolderValue, undefined);
 
 		actual = testObject.getConfiguration('editor').inspect('wordWrap')!;
-		assert.equal(actual.defaultValue, 'off');
-		assert.equal(actual.globalValue, 'on');
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.strictEqual(actual.defaultValue, 'off');
+		assert.strictEqual(actual.globalValue, 'on');
+		assert.strictEqual(actual.workspaceValue, undefined);
+		assert.strictEqual(actual.workspaceFolderValue, undefined);
 	});
 
 	test('inspect in single root context', function () {
@@ -341,28 +341,28 @@ suite('ExtHostConfiguration', function () {
 		);
 
 		let actual1 = testObject.getConfiguration().inspect('editor.wordWrap')!;
-		assert.equal(actual1.defaultValue, 'off');
-		assert.equal(actual1.globalValue, 'on');
-		assert.equal(actual1.workspaceValue, 'bounded');
-		assert.equal(actual1.workspaceFolderValue, undefined);
+		assert.strictEqual(actual1.defaultValue, 'off');
+		assert.strictEqual(actual1.globalValue, 'on');
+		assert.strictEqual(actual1.workspaceValue, 'bounded');
+		assert.strictEqual(actual1.workspaceFolderValue, undefined);
 
 		actual1 = testObject.getConfiguration('editor').inspect('wordWrap')!;
-		assert.equal(actual1.defaultValue, 'off');
-		assert.equal(actual1.globalValue, 'on');
-		assert.equal(actual1.workspaceValue, 'bounded');
-		assert.equal(actual1.workspaceFolderValue, undefined);
+		assert.strictEqual(actual1.defaultValue, 'off');
+		assert.strictEqual(actual1.globalValue, 'on');
+		assert.strictEqual(actual1.workspaceValue, 'bounded');
+		assert.strictEqual(actual1.workspaceFolderValue, undefined);
 
 		let actual2 = testObject.getConfiguration(undefined, workspaceUri).inspect('editor.wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'bounded');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'bounded');
 
 		actual2 = testObject.getConfiguration('editor', workspaceUri).inspect('wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'bounded');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'bounded');
 	});
 
 	test('inspect in multi root context', function () {
@@ -418,66 +418,66 @@ suite('ExtHostConfiguration', function () {
 		);
 
 		let actual1 = testObject.getConfiguration().inspect('editor.wordWrap')!;
-		assert.equal(actual1.defaultValue, 'off');
-		assert.equal(actual1.globalValue, 'on');
-		assert.equal(actual1.workspaceValue, 'bounded');
-		assert.equal(actual1.workspaceFolderValue, undefined);
+		assert.strictEqual(actual1.defaultValue, 'off');
+		assert.strictEqual(actual1.globalValue, 'on');
+		assert.strictEqual(actual1.workspaceValue, 'bounded');
+		assert.strictEqual(actual1.workspaceFolderValue, undefined);
 
 		actual1 = testObject.getConfiguration('editor').inspect('wordWrap')!;
-		assert.equal(actual1.defaultValue, 'off');
-		assert.equal(actual1.globalValue, 'on');
-		assert.equal(actual1.workspaceValue, 'bounded');
-		assert.equal(actual1.workspaceFolderValue, undefined);
+		assert.strictEqual(actual1.defaultValue, 'off');
+		assert.strictEqual(actual1.globalValue, 'on');
+		assert.strictEqual(actual1.workspaceValue, 'bounded');
+		assert.strictEqual(actual1.workspaceFolderValue, undefined);
 
 		actual1 = testObject.getConfiguration('editor').inspect('lineNumbers')!;
-		assert.equal(actual1.defaultValue, 'on');
-		assert.equal(actual1.globalValue, undefined);
-		assert.equal(actual1.workspaceValue, undefined);
-		assert.equal(actual1.workspaceFolderValue, undefined);
+		assert.strictEqual(actual1.defaultValue, 'on');
+		assert.strictEqual(actual1.globalValue, undefined);
+		assert.strictEqual(actual1.workspaceValue, undefined);
+		assert.strictEqual(actual1.workspaceFolderValue, undefined);
 
 		let actual2 = testObject.getConfiguration(undefined, firstRoot).inspect('editor.wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'off');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'off');
 
 		actual2 = testObject.getConfiguration('editor', firstRoot).inspect('wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'off');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'off');
 
 		actual2 = testObject.getConfiguration('editor', firstRoot).inspect('lineNumbers')!;
-		assert.equal(actual2.defaultValue, 'on');
-		assert.equal(actual2.globalValue, undefined);
-		assert.equal(actual2.workspaceValue, undefined);
-		assert.equal(actual2.workspaceFolderValue, 'relative');
+		assert.strictEqual(actual2.defaultValue, 'on');
+		assert.strictEqual(actual2.globalValue, undefined);
+		assert.strictEqual(actual2.workspaceValue, undefined);
+		assert.strictEqual(actual2.workspaceFolderValue, 'relative');
 
 		actual2 = testObject.getConfiguration(undefined, secondRoot).inspect('editor.wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'on');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'on');
 
 		actual2 = testObject.getConfiguration('editor', secondRoot).inspect('wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
-		assert.equal(actual2.workspaceFolderValue, 'on');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.workspaceFolderValue, 'on');
 
 		actual2 = testObject.getConfiguration(undefined, thirdRoot).inspect('editor.wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
 		assert.ok(Object.keys(actual2).indexOf('workspaceFolderValue') !== -1);
-		assert.equal(actual2.workspaceFolderValue, undefined);
+		assert.strictEqual(actual2.workspaceFolderValue, undefined);
 
 		actual2 = testObject.getConfiguration('editor', thirdRoot).inspect('wordWrap')!;
-		assert.equal(actual2.defaultValue, 'off');
-		assert.equal(actual2.globalValue, 'on');
-		assert.equal(actual2.workspaceValue, 'bounded');
+		assert.strictEqual(actual2.defaultValue, 'off');
+		assert.strictEqual(actual2.globalValue, 'on');
+		assert.strictEqual(actual2.workspaceValue, 'bounded');
 		assert.ok(Object.keys(actual2).indexOf('workspaceFolderValue') !== -1);
-		assert.equal(actual2.workspaceFolderValue, undefined);
+		assert.strictEqual(actual2.workspaceFolderValue, undefined);
 	});
 
 	test('inspect with language overrides', function () {
@@ -527,26 +527,26 @@ suite('ExtHostConfiguration', function () {
 		);
 
 		let actual = testObject.getConfiguration(undefined, { uri: firstRoot, languageId: 'typescript' }).inspect('editor.wordWrap')!;
-		assert.equal(actual.defaultValue, 'off');
-		assert.equal(actual.globalValue, 'bounded');
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, 'bounded');
-		assert.equal(actual.defaultLanguageValue, undefined);
-		assert.equal(actual.globalLanguageValue, undefined);
-		assert.equal(actual.workspaceLanguageValue, 'unbounded');
-		assert.equal(actual.workspaceFolderLanguageValue, 'unbounded');
-		assert.deepEqual(actual.languageIds, ['markdown', 'typescript']);
+		assert.strictEqual(actual.defaultValue, 'off');
+		assert.strictEqual(actual.globalValue, 'bounded');
+		assert.strictEqual(actual.workspaceValue, undefined);
+		assert.strictEqual(actual.workspaceFolderValue, 'bounded');
+		assert.strictEqual(actual.defaultLanguageValue, undefined);
+		assert.strictEqual(actual.globalLanguageValue, undefined);
+		assert.strictEqual(actual.workspaceLanguageValue, 'unbounded');
+		assert.strictEqual(actual.workspaceFolderLanguageValue, 'unbounded');
+		assert.deepStrictEqual(actual.languageIds, ['markdown', 'typescript']);
 
 		actual = testObject.getConfiguration(undefined, { uri: secondRoot, languageId: 'typescript' }).inspect('editor.wordWrap')!;
-		assert.equal(actual.defaultValue, 'off');
-		assert.equal(actual.globalValue, 'bounded');
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
-		assert.equal(actual.defaultLanguageValue, undefined);
-		assert.equal(actual.globalLanguageValue, undefined);
-		assert.equal(actual.workspaceLanguageValue, 'unbounded');
-		assert.equal(actual.workspaceFolderLanguageValue, undefined);
-		assert.deepEqual(actual.languageIds, ['markdown', 'typescript']);
+		assert.strictEqual(actual.defaultValue, 'off');
+		assert.strictEqual(actual.globalValue, 'bounded');
+		assert.strictEqual(actual.workspaceValue, undefined);
+		assert.strictEqual(actual.workspaceFolderValue, undefined);
+		assert.strictEqual(actual.defaultLanguageValue, undefined);
+		assert.strictEqual(actual.globalLanguageValue, undefined);
+		assert.strictEqual(actual.workspaceLanguageValue, 'unbounded');
+		assert.strictEqual(actual.workspaceFolderLanguageValue, undefined);
+		assert.deepStrictEqual(actual.languageIds, ['markdown', 'typescript']);
 	});
 
 
@@ -560,12 +560,12 @@ suite('ExtHostConfiguration', function () {
 		});
 
 		let config = all.getConfiguration('farboo.config0');
-		assert.equal(config.get(''), undefined);
-		assert.equal(config.has(''), false);
+		assert.strictEqual(config.get(''), undefined);
+		assert.strictEqual(config.has(''), false);
 
 		config = all.getConfiguration('farboo');
-		assert.equal(config.get('config0'), true);
-		assert.equal(config.has('config0'), true);
+		assert.strictEqual(config.get('config0'), true);
+		assert.strictEqual(config.has('config0'), true);
 	});
 
 	test('getConfiguration vs get', function () {
@@ -578,12 +578,12 @@ suite('ExtHostConfiguration', function () {
 		});
 
 		let config = all.getConfiguration('farboo.config0');
-		assert.equal(config.get(''), undefined);
-		assert.equal(config.has(''), false);
+		assert.strictEqual(config.get(''), undefined);
+		assert.strictEqual(config.has(''), false);
 
 		config = all.getConfiguration('farboo');
-		assert.equal(config.get('config0'), true);
-		assert.equal(config.has('config0'), true);
+		assert.strictEqual(config.get('config0'), true);
+		assert.strictEqual(config.has('config0'), true);
 	});
 
 	test('name vs property', function () {
@@ -595,8 +595,8 @@ suite('ExtHostConfiguration', function () {
 		const config = all.getConfiguration('farboo');
 
 		assert.ok(config.has('get'));
-		assert.equal(config.get('get'), 'get-prop');
-		assert.deepEqual(config['get'], config.get);
+		assert.strictEqual(config.get('get'), 'get-prop');
+		assert.deepStrictEqual(config['get'], config.get);
 		assert.throws(() => config['get'] = <any>'get-prop');
 	});
 
@@ -612,7 +612,7 @@ suite('ExtHostConfiguration', function () {
 		let config = allConfig.getConfiguration('foo');
 		config.update('bar', 42);
 
-		assert.equal(shape.lastArgs[0], null);
+		assert.strictEqual(shape.lastArgs[0], null);
 	});
 
 	test('update/section to key', function () {
@@ -628,16 +628,16 @@ suite('ExtHostConfiguration', function () {
 		let config = allConfig.getConfiguration('foo');
 		config.update('bar', 42, true);
 
-		assert.equal(shape.lastArgs[0], ConfigurationTarget.USER);
-		assert.equal(shape.lastArgs[1], 'foo.bar');
-		assert.equal(shape.lastArgs[2], 42);
+		assert.strictEqual(shape.lastArgs[0], ConfigurationTarget.USER);
+		assert.strictEqual(shape.lastArgs[1], 'foo.bar');
+		assert.strictEqual(shape.lastArgs[2], 42);
 
 		config = allConfig.getConfiguration('');
 		config.update('bar', 42, true);
-		assert.equal(shape.lastArgs[1], 'bar');
+		assert.strictEqual(shape.lastArgs[1], 'bar');
 
 		config.update('foo.bar', 42, true);
-		assert.equal(shape.lastArgs[1], 'foo.bar');
+		assert.strictEqual(shape.lastArgs[1], 'foo.bar');
 	});
 
 	test('update, what is #15834', function () {
@@ -649,8 +649,8 @@ suite('ExtHostConfiguration', function () {
 		}, shape);
 
 		allConfig.getConfiguration('editor').update('formatOnSave', { extensions: ['ts'] });
-		assert.equal(shape.lastArgs[1], 'editor.formatOnSave');
-		assert.deepEqual(shape.lastArgs[2], { extensions: ['ts'] });
+		assert.strictEqual(shape.lastArgs[1], 'editor.formatOnSave');
+		assert.deepStrictEqual(shape.lastArgs[2], { extensions: ['ts'] });
 	});
 
 	test('update/error-state not OK', function () {
@@ -698,7 +698,7 @@ suite('ExtHostConfiguration', function () {
 		const configEventData: IConfigurationChange = { keys: ['farboo.updatedConfig', 'farboo.newConfig'], overrides: [] };
 		testObject.onDidChangeConfiguration(e => {
 
-			assert.deepEqual(testObject.getConfiguration().get('farboo'), {
+			assert.deepStrictEqual(testObject.getConfiguration().get('farboo'), {
 				'config': false,
 				'updatedConfig': true,
 				'newConfig': true,
diff --git a/src/vs/workbench/test/browser/api/extHostDecorations.test.ts b/src/vs/workbench/test/browser/api/extHostDecorations.test.ts
index 4e78842c7..0c926b504 100644
--- a/src/vs/workbench/test/browser/api/extHostDecorations.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostDecorations.test.ts
@@ -68,17 +68,17 @@ suite('ExtHostDecorations', function () {
 			return extHostDecorations.$provideDecorations(handle, [{ id: idx, uri: URI.parse('test:///file') }], CancellationToken.None);
 		});
 
-		assert.equal(calledA, true);
-		assert.equal(calledB, true);
+		assert.strictEqual(calledA, true);
+		assert.strictEqual(calledB, true);
 
-		assert.equal(requests.length, 2);
+		assert.strictEqual(requests.length, 2);
 		const [first, second] = requests;
 
 		const firstResult = await Promise.race([first, timeout(30).then(() => false)]);
-		assert.equal(typeof firstResult, 'boolean'); // never finishes...
+		assert.strictEqual(typeof firstResult, 'boolean'); // never finishes...
 
 		const secondResult = await Promise.race([second, timeout(30).then(() => false)]);
-		assert.equal(typeof secondResult, 'object');
+		assert.strictEqual(typeof secondResult, 'object');
 	});
 
 });
diff --git a/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts b/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts
index db7351cfc..68fd8bca0 100644
--- a/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostDiagnostics.test.ts
@@ -45,26 +45,26 @@ suite('ExtHostDiagnostics', () => {
 
 	test('diagnostic collection, forEach, clear, has', function () {
 		let collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
-		assert.equal(collection.name, 'test');
+		assert.strictEqual(collection.name, 'test');
 		collection.dispose();
 		assert.throws(() => collection.name);
 
 		let c = 0;
 		collection = new DiagnosticCollection('test', 'test', 100, new DiagnosticsShape(), new Emitter());
 		collection.forEach(() => c++);
-		assert.equal(c, 0);
+		assert.strictEqual(c, 0);
 
 		collection.set(URI.parse('foo:bar'), [
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
 		]);
 		collection.forEach(() => c++);
-		assert.equal(c, 1);
+		assert.strictEqual(c, 1);
 
 		c = 0;
 		collection.clear();
 		collection.forEach(() => c++);
-		assert.equal(c, 0);
+		assert.strictEqual(c, 0);
 
 		collection.set(URI.parse('foo:bar1'), [
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-1'),
@@ -75,7 +75,7 @@ suite('ExtHostDiagnostics', () => {
 			new Diagnostic(new Range(0, 0, 1, 1), 'message-2')
 		]);
 		collection.forEach(() => c++);
-		assert.equal(c, 2);
+		assert.strictEqual(c, 2);
 
 		assert.ok(collection.has(URI.parse('foo:bar1')));
 		assert.ok(collection.has(URI.parse('foo:bar2')));
@@ -105,7 +105,7 @@ suite('ExtHostDiagnostics', () => {
 		});
 
 		array = collection.get(URI.parse('foo:bar')) as Diagnostic[];
-		assert.equal(array.length, 2);
+		assert.strictEqual(array.length, 2);
 
 		collection.dispose();
 	});
@@ -121,10 +121,10 @@ suite('ExtHostDiagnostics', () => {
 		]);
 
 		let array = collection.get(uri);
-		assert.equal(array.length, 2);
+		assert.strictEqual(array.length, 2);
 		let [first, second] = array;
-		assert.equal(first.message, 'message-1');
-		assert.equal(second.message, 'message-2');
+		assert.strictEqual(first.message, 'message-1');
+		assert.strictEqual(second.message, 'message-2');
 
 		// clear
 		collection.delete(uri);
@@ -152,10 +152,10 @@ suite('ExtHostDiagnostics', () => {
 		]);
 
 		array = collection.get(uri);
-		assert.equal(array.length, 2);
+		assert.strictEqual(array.length, 2);
 		[first, second] = array;
-		assert.equal(first.message, 'message-2');
-		assert.equal(second.message, 'message-3');
+		assert.strictEqual(first.message, 'message-2');
+		assert.strictEqual(second.message, 'message-3');
 
 		collection.dispose();
 	});
@@ -172,21 +172,21 @@ suite('ExtHostDiagnostics', () => {
 		let uri = URI.parse('sc:hightower');
 
 		collection.set([[uri, [new Diagnostic(new Range(0, 0, 1, 1), 'error')]]]);
-		assert.equal(collection.get(uri).length, 1);
-		assert.equal(collection.get(uri)[0].message, 'error');
-		assert.equal(lastEntries.length, 1);
+		assert.strictEqual(collection.get(uri).length, 1);
+		assert.strictEqual(collection.get(uri)[0].message, 'error');
+		assert.strictEqual(lastEntries.length, 1);
 		let [[, data1]] = lastEntries;
-		assert.equal(data1.length, 1);
-		assert.equal(data1[0].message, 'error');
+		assert.strictEqual(data1.length, 1);
+		assert.strictEqual(data1[0].message, 'error');
 		lastEntries = undefined!;
 
 		collection.set([[uri, [new Diagnostic(new Range(0, 0, 1, 1), 'warning')]]]);
-		assert.equal(collection.get(uri).length, 1);
-		assert.equal(collection.get(uri)[0].message, 'warning');
-		assert.equal(lastEntries.length, 1);
+		assert.strictEqual(collection.get(uri).length, 1);
+		assert.strictEqual(collection.get(uri)[0].message, 'warning');
+		assert.strictEqual(lastEntries.length, 1);
 		let [[, data2]] = lastEntries;
-		assert.equal(data2.length, 1);
-		assert.equal(data2[0].message, 'warning');
+		assert.strictEqual(data2.length, 1);
+		assert.strictEqual(data2[0].message, 'warning');
 		lastEntries = undefined!;
 	});
 
@@ -207,12 +207,12 @@ suite('ExtHostDiagnostics', () => {
 		let diag = new Diagnostic(new Range(0, 0, 0, 1), 'ffff');
 
 		collection.set(uri, [diag]);
-		assert.equal(changeCount, 1);
-		assert.equal(eventCount, 1);
+		assert.strictEqual(changeCount, 1);
+		assert.strictEqual(eventCount, 1);
 
 		collection.set(uri, [diag]);
-		assert.equal(changeCount, 2);
-		assert.equal(eventCount, 2);
+		assert.strictEqual(changeCount, 2);
+		assert.strictEqual(eventCount, 2);
 	});
 
 	test('diagnostics collection, tuples and undefined (small array), #15585', function () {
@@ -232,8 +232,8 @@ suite('ExtHostDiagnostics', () => {
 			[uri2, [diag]],
 		]);
 
-		assert.equal(collection.get(uri).length, 1);
-		assert.equal(collection.get(uri2).length, 1);
+		assert.strictEqual(collection.get(uri).length, 1);
+		assert.strictEqual(collection.get(uri2).length, 1);
 	});
 
 	test('diagnostics collection, tuples and undefined (large array), #15585', function () {
@@ -254,8 +254,8 @@ suite('ExtHostDiagnostics', () => {
 
 		for (let i = 0; i < 500; i++) {
 			let uri = URI.parse('sc:hightower#' + i);
-			assert.equal(collection.has(uri), true);
-			assert.equal(collection.get(uri).length, 1);
+			assert.strictEqual(collection.has(uri), true);
+			assert.strictEqual(collection.get(uri).length, 1);
 		}
 	});
 
@@ -278,12 +278,12 @@ suite('ExtHostDiagnostics', () => {
 		}
 
 		collection.set(uri, diagnostics);
-		assert.equal(collection.get(uri).length, 500);
-		assert.equal(lastEntries.length, 1);
-		assert.equal(lastEntries[0][1].length, 251);
-		assert.equal(lastEntries[0][1][0].severity, MarkerSeverity.Error);
-		assert.equal(lastEntries[0][1][200].severity, MarkerSeverity.Warning);
-		assert.equal(lastEntries[0][1][250].severity, MarkerSeverity.Info);
+		assert.strictEqual(collection.get(uri).length, 500);
+		assert.strictEqual(lastEntries.length, 1);
+		assert.strictEqual(lastEntries[0][1].length, 251);
+		assert.strictEqual(lastEntries[0][1][0].severity, MarkerSeverity.Error);
+		assert.strictEqual(lastEntries[0][1][200].severity, MarkerSeverity.Warning);
+		assert.strictEqual(lastEntries[0][1][250].severity, MarkerSeverity.Info);
 	});
 
 	test('diagnostic eventing', async function () {
@@ -295,19 +295,19 @@ suite('ExtHostDiagnostics', () => {
 		let diag3 = new Diagnostic(new Range(1, 1, 2, 3), 'diag3');
 
 		let p = Event.toPromise(emitter.event).then(a => {
-			assert.equal(a.length, 1);
-			assert.equal(a[0].toString(), 'aa:bb');
+			assert.strictEqual(a.length, 1);
+			assert.strictEqual(a[0].toString(), 'aa:bb');
 			assert.ok(URI.isUri(a[0]));
 		});
 		collection.set(URI.parse('aa:bb'), []);
 		await p;
 
 		p = Event.toPromise(emitter.event).then(e => {
-			assert.equal(e.length, 2);
+			assert.strictEqual(e.length, 2);
 			assert.ok(URI.isUri(e[0]));
 			assert.ok(URI.isUri(e[1]));
-			assert.equal(e[0].toString(), 'aa:bb');
-			assert.equal(e[1].toString(), 'aa:cc');
+			assert.strictEqual(e[0].toString(), 'aa:bb');
+			assert.strictEqual(e[1].toString(), 'aa:cc');
 		});
 		collection.set([
 			[URI.parse('aa:bb'), [diag1]],
@@ -316,7 +316,7 @@ suite('ExtHostDiagnostics', () => {
 		await p;
 
 		p = Event.toPromise(emitter.event).then(e => {
-			assert.equal(e.length, 2);
+			assert.strictEqual(e.length, 2);
 			assert.ok(URI.isUri(e[0]));
 			assert.ok(URI.isUri(e[1]));
 		});
@@ -333,7 +333,7 @@ suite('ExtHostDiagnostics', () => {
 		// delete
 		collection.set(URI.parse('aa:bb'), [diag1]);
 		let p = Event.toPromise(emitter.event).then(e => {
-			assert.equal(e[0].toString(), 'aa:bb');
+			assert.strictEqual(e[0].toString(), 'aa:bb');
 		});
 		collection.delete(URI.parse('aa:bb'));
 		await p;
@@ -341,7 +341,7 @@ suite('ExtHostDiagnostics', () => {
 		// set->undefined (as delete)
 		collection.set(URI.parse('aa:bb'), [diag1]);
 		p = Event.toPromise(emitter.event).then(e => {
-			assert.equal(e[0].toString(), 'aa:bb');
+			assert.strictEqual(e[0].toString(), 'aa:bb');
 		});
 		collection.set(URI.parse('aa:bb'), undefined!);
 		await p;
@@ -353,13 +353,13 @@ suite('ExtHostDiagnostics', () => {
 			$changeMany(owner: string, entries: [UriComponents, IMarkerData[]][]) {
 
 				let [[, data]] = entries;
-				assert.equal(entries.length, 1);
-				assert.equal(data.length, 1);
+				assert.strictEqual(entries.length, 1);
+				assert.strictEqual(data.length, 1);
 
 				let [diag] = data;
-				assert.equal(diag.relatedInformation!.length, 2);
-				assert.equal(diag.relatedInformation![0].message, 'more1');
-				assert.equal(diag.relatedInformation![1].message, 'more2');
+				assert.strictEqual(diag.relatedInformation!.length, 2);
+				assert.strictEqual(diag.relatedInformation![0].message, 'more1');
+				assert.strictEqual(diag.relatedInformation![1].message, 'more2');
 				done();
 			}
 		}, new Emitter<any>());
@@ -400,9 +400,9 @@ suite('ExtHostDiagnostics', () => {
 		collection1.clear();
 		collection2.clear();
 
-		assert.equal(ownerHistory.length, 2);
-		assert.equal(ownerHistory[0], 'foo');
-		assert.equal(ownerHistory[1], 'foo0');
+		assert.strictEqual(ownerHistory.length, 2);
+		assert.strictEqual(ownerHistory[0], 'foo');
+		assert.strictEqual(ownerHistory[1], 'foo0');
 	});
 
 	test('Error updating diagnostics from extension #60394', function () {
@@ -420,14 +420,14 @@ suite('ExtHostDiagnostics', () => {
 		array.push(diag1, diag2);
 
 		collection.set(URI.parse('test:me'), array);
-		assert.equal(callCount, 1);
+		assert.strictEqual(callCount, 1);
 
 		collection.set(URI.parse('test:me'), array);
-		assert.equal(callCount, 2); // equal array
+		assert.strictEqual(callCount, 2); // equal array
 
 		array.push(diag2);
 		collection.set(URI.parse('test:me'), array);
-		assert.equal(callCount, 3); // same but un-equal array
+		assert.strictEqual(callCount, 3); // same but un-equal array
 	});
 
 	test('Diagnostics created by tasks aren\'t accessible to extensions #47292', async function () {
@@ -461,11 +461,11 @@ suite('ExtHostDiagnostics', () => {
 		const p1 = Event.toPromise(diags.onDidChangeDiagnostics);
 		diags.$acceptMarkersChange([[uri, data]]);
 		await p1;
-		assert.equal(diags.getDiagnostics(uri).length, 1);
+		assert.strictEqual(diags.getDiagnostics(uri).length, 1);
 
 		const p2 = Event.toPromise(diags.onDidChangeDiagnostics);
 		diags.$acceptMarkersChange([[uri, []]]);
 		await p2;
-		assert.equal(diags.getDiagnostics(uri).length, 0);
+		assert.strictEqual(diags.getDiagnostics(uri).length, 0);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts
index 4519c6154..9de6d4235 100644
--- a/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostDocumentData.test.ts
@@ -19,14 +19,14 @@ suite('ExtHostDocumentData', () => {
 
 	function assertPositionAt(offset: number, line: number, character: number) {
 		let position = data.document.positionAt(offset);
-		assert.equal(position.line, line);
-		assert.equal(position.character, character);
+		assert.strictEqual(position.line, line);
+		assert.strictEqual(position.character, character);
 	}
 
 	function assertOffsetAt(line: number, character: number, offset: number) {
 		let pos = new Position(line, character);
 		let actual = data.document.offsetAt(pos);
-		assert.equal(actual, offset);
+		assert.strictEqual(actual, offset);
 	}
 
 	setup(function () {
@@ -58,7 +58,7 @@ suite('ExtHostDocumentData', () => {
 		}, URI.parse('foo:bar'), [], '\n', 1, 'text', true);
 
 		return data.document.save().then(() => {
-			assert.equal(saved.toString(), 'foo:bar');
+			assert.strictEqual(saved.toString(), 'foo:bar');
 
 			data.dispose();
 
@@ -74,13 +74,13 @@ suite('ExtHostDocumentData', () => {
 		data.dispose();
 
 		const { document } = data;
-		assert.equal(document.lineCount, 4);
-		assert.equal(document.lineAt(0).text, 'This is line one');
+		assert.strictEqual(document.lineCount, 4);
+		assert.strictEqual(document.lineAt(0).text, 'This is line one');
 	});
 
 	test('lines', () => {
 
-		assert.equal(data.document.lineCount, 4);
+		assert.strictEqual(data.document.lineCount, 4);
 
 		assert.throws(() => data.document.lineAt(-1));
 		assert.throws(() => data.document.lineAt(data.document.lineCount));
@@ -89,11 +89,11 @@ suite('ExtHostDocumentData', () => {
 		assert.throws(() => data.document.lineAt(0.8));
 
 		let line = data.document.lineAt(0);
-		assert.equal(line.lineNumber, 0);
-		assert.equal(line.text.length, 16);
-		assert.equal(line.text, 'This is line one');
-		assert.equal(line.isEmptyOrWhitespace, false);
-		assert.equal(line.firstNonWhitespaceCharacterIndex, 0);
+		assert.strictEqual(line.lineNumber, 0);
+		assert.strictEqual(line.text.length, 16);
+		assert.strictEqual(line.text, 'This is line one');
+		assert.strictEqual(line.isEmptyOrWhitespace, false);
+		assert.strictEqual(line.firstNonWhitespaceCharacterIndex, 0);
 
 		data.onEvents({
 			changes: [{
@@ -107,31 +107,31 @@ suite('ExtHostDocumentData', () => {
 		});
 
 		// line didn't change
-		assert.equal(line.text, 'This is line one');
-		assert.equal(line.firstNonWhitespaceCharacterIndex, 0);
+		assert.strictEqual(line.text, 'This is line one');
+		assert.strictEqual(line.firstNonWhitespaceCharacterIndex, 0);
 
 		// fetch line again
 		line = data.document.lineAt(0);
-		assert.equal(line.text, '\t This is line one');
-		assert.equal(line.firstNonWhitespaceCharacterIndex, 2);
+		assert.strictEqual(line.text, '\t This is line one');
+		assert.strictEqual(line.firstNonWhitespaceCharacterIndex, 2);
 	});
 
 	test('line, issue #5704', function () {
 
 		let line = data.document.lineAt(0);
 		let { range, rangeIncludingLineBreak } = line;
-		assert.equal(range.end.line, 0);
-		assert.equal(range.end.character, 16);
-		assert.equal(rangeIncludingLineBreak.end.line, 1);
-		assert.equal(rangeIncludingLineBreak.end.character, 0);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.end.character, 16);
+		assert.strictEqual(rangeIncludingLineBreak.end.line, 1);
+		assert.strictEqual(rangeIncludingLineBreak.end.character, 0);
 
 		line = data.document.lineAt(data.document.lineCount - 1);
 		range = line.range;
 		rangeIncludingLineBreak = line.rangeIncludingLineBreak;
-		assert.equal(range.end.line, 3);
-		assert.equal(range.end.character, 29);
-		assert.equal(rangeIncludingLineBreak.end.line, 3);
-		assert.equal(rangeIncludingLineBreak.end.character, 29);
+		assert.strictEqual(range.end.line, 3);
+		assert.strictEqual(range.end.character, 29);
+		assert.strictEqual(rangeIncludingLineBreak.end.line, 3);
+		assert.strictEqual(rangeIncludingLineBreak.end.character, 29);
 
 	});
 
@@ -245,28 +245,28 @@ suite('ExtHostDocumentData', () => {
 		], '\n', 1, 'text', false);
 
 		let range = data.document.getWordRangeAtPosition(new Position(0, 2))!;
-		assert.equal(range.start.line, 0);
-		assert.equal(range.start.character, 0);
-		assert.equal(range.end.line, 0);
-		assert.equal(range.end.character, 4);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.start.character, 0);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.end.character, 4);
 
 		// ignore bad regular expresson /.*/
 		assert.throws(() => data.document.getWordRangeAtPosition(new Position(0, 2), /.*/)!);
 
 		range = data.document.getWordRangeAtPosition(new Position(0, 5), /[a-z+]+/)!;
-		assert.equal(range.start.line, 0);
-		assert.equal(range.start.character, 5);
-		assert.equal(range.end.line, 0);
-		assert.equal(range.end.character, 14);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.start.character, 5);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.end.character, 14);
 
 		range = data.document.getWordRangeAtPosition(new Position(0, 17), /[a-z+]+/)!;
-		assert.equal(range.start.line, 0);
-		assert.equal(range.start.character, 15);
-		assert.equal(range.end.line, 0);
-		assert.equal(range.end.character, 18);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.start.character, 15);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.end.character, 18);
 
 		range = data.document.getWordRangeAtPosition(new Position(0, 11), /yy/)!;
-		assert.equal(range, undefined);
+		assert.strictEqual(range, undefined);
 	});
 
 	test('getWordRangeAtPosition doesn\'t quite use the regex as expected, #29102', function () {
@@ -279,22 +279,22 @@ suite('ExtHostDocumentData', () => {
 		], '\n', 1, 'text', false);
 
 		let range = data.document.getWordRangeAtPosition(new Position(0, 0), /\/\*.+\*\//);
-		assert.equal(range, undefined);
+		assert.strictEqual(range, undefined);
 
 		range = data.document.getWordRangeAtPosition(new Position(1, 0), /\/\*.+\*\//)!;
-		assert.equal(range.start.line, 1);
-		assert.equal(range.start.character, 0);
-		assert.equal(range.end.line, 1);
-		assert.equal(range.end.character, 14);
+		assert.strictEqual(range.start.line, 1);
+		assert.strictEqual(range.start.character, 0);
+		assert.strictEqual(range.end.line, 1);
+		assert.strictEqual(range.end.character, 14);
 
 		range = data.document.getWordRangeAtPosition(new Position(3, 0), /("|').*\1/);
-		assert.equal(range, undefined);
+		assert.strictEqual(range, undefined);
 
 		range = data.document.getWordRangeAtPosition(new Position(3, 1), /("|').*\1/)!;
-		assert.equal(range.start.line, 3);
-		assert.equal(range.start.character, 1);
-		assert.equal(range.end.line, 3);
-		assert.equal(range.end.character, 10);
+		assert.strictEqual(range.start.line, 3);
+		assert.strictEqual(range.start.character, 1);
+		assert.strictEqual(range.end.line, 3);
+		assert.strictEqual(range.end.character, 10);
 	});
 
 
@@ -307,13 +307,13 @@ suite('ExtHostDocumentData', () => {
 		], '\n', 1, 'text', false);
 
 		let range = data.document.getWordRangeAtPosition(new Position(0, 1_177_170), regex)!;
-		assert.equal(range, undefined);
+		assert.strictEqual(range, undefined);
 
 		const pos = new Position(0, 1177170);
 		range = data.document.getWordRangeAtPosition(pos)!;
 		assert.ok(range);
 		assert.ok(range.contains(pos));
-		assert.equal(data.document.getText(range), 'TaskDefinition');
+		assert.strictEqual(data.document.getText(range), 'TaskDefinition');
 	});
 
 	test('Rename popup sometimes populates with text on the left side omitted #96013', function () {
@@ -326,10 +326,10 @@ suite('ExtHostDocumentData', () => {
 		], '\n', 1, 'text', false);
 
 		let range = data.document.getWordRangeAtPosition(new Position(0, 27), regex)!;
-		assert.equal(range.start.line, 0);
-		assert.equal(range.end.line, 0);
-		assert.equal(range.start.character, 4);
-		assert.equal(range.end.character, 28);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.start.character, 4);
+		assert.strictEqual(range.end.character, 28);
 	});
 
 	test('Custom snippet $TM_SELECTED_TEXT not show suggestion #108892', function () {
@@ -340,11 +340,11 @@ suite('ExtHostDocumentData', () => {
 
 		const pos = new Position(0, 55);
 		const range = data.document.getWordRangeAtPosition(pos)!;
-		assert.equal(range.start.line, 0);
-		assert.equal(range.end.line, 0);
-		assert.equal(range.start.character, 47);
-		assert.equal(range.end.character, 61);
-		assert.equal(data.document.getText(range), 'soprannominato');
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.end.line, 0);
+		assert.strictEqual(range.start.character, 47);
+		assert.strictEqual(range.end.character, 61);
+		assert.strictEqual(data.document.getText(range), 'soprannominato');
 	});
 });
 
@@ -365,7 +365,7 @@ suite('ExtHostDocumentData updates line mapping', () => {
 		let line = 0, character = 0, previousIsCarriageReturn = false;
 		for (let offset = 0; offset <= allText.length; offset++) {
 			// The position coordinate system cannot express the position between \r and \n
-			let position = new Position(line, character + (previousIsCarriageReturn ? -1 : 0));
+			const position = new Position(line, character + (previousIsCarriageReturn ? -1 : 0));
 
 			if (direction === AssertDocumentLineMappingDirection.OffsetToPosition) {
 				let actualPosition = doc.document.positionAt(offset);
diff --git a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts
index c1509ad3c..a89f12a7a 100644
--- a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts
@@ -68,8 +68,8 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			sub.dispose();
 
 			assert.ok(event);
-			assert.equal(event.reason, TextDocumentSaveReason.Manual);
-			assert.equal(typeof event.waitUntil, 'function');
+			assert.strictEqual(event.reason, TextDocumentSaveReason.Manual);
+			assert.strictEqual(typeof event.waitUntil, 'function');
 		});
 	});
 
@@ -100,7 +100,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			sub.dispose();
 
 			const [first] = values;
-			assert.equal(first, false);
+			assert.strictEqual(first, false);
 		});
 	});
 
@@ -128,11 +128,11 @@ suite('ExtHostDocumentSaveParticipant', () => {
 
 		let counter = 0;
 		let sub1 = participant.getOnWillSaveTextDocumentEvent(nullExtensionDescription)(function (event) {
-			assert.equal(counter++, 0);
+			assert.strictEqual(counter++, 0);
 		});
 
 		let sub2 = participant.getOnWillSaveTextDocumentEvent(nullExtensionDescription)(function (event) {
-			assert.equal(counter++, 1);
+			assert.strictEqual(counter++, 1);
 		});
 
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(() => {
@@ -156,7 +156,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		await participant.$participateInSave(resource, SaveReason.EXPLICIT);
 
 		sub.dispose();
-		assert.equal(callCount, 2);
+		assert.strictEqual(callCount, 2);
 	});
 
 	test('event delivery, overall timeout', () => {
@@ -182,8 +182,8 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			sub2.dispose();
 			sub3.dispose();
 
-			assert.equal(callCount, 2);
-			assert.equal(values.length, 2);
+			assert.strictEqual(callCount, 2);
+			assert.strictEqual(values.length, 2);
 		});
 	});
 
@@ -226,18 +226,19 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		});
 	});
 
-	test('event delivery, waitUntil will timeout', () => {
+	test('event delivery, waitUntil will timeout', function () {
+
 		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, mainThreadBulkEdits, { timeout: 5, errors: 3 });
 
 		let sub = participant.getOnWillSaveTextDocumentEvent(nullExtensionDescription)(function (event) {
-			event.waitUntil(timeout(15));
+			event.waitUntil(timeout(100));
 		});
 
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(values => {
 			sub.dispose();
 
 			const [first] = values;
-			assert.equal(first, false);
+			assert.strictEqual(first, false);
 		});
 	});
 
@@ -278,7 +279,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(() => {
 			sub.dispose();
 
-			assert.equal(dto.edits.length, 2);
+			assert.strictEqual(dto.edits.length, 2);
 			assert.ok((<IWorkspaceTextEditDto>dto.edits[0]).edit);
 			assert.ok((<IWorkspaceTextEditDto>dto.edits[1]).edit);
 		});
@@ -314,8 +315,8 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(values => {
 			sub.dispose();
 
-			assert.equal(edits, undefined);
-			assert.equal(values[0], false);
+			assert.strictEqual(edits, undefined);
+			assert.strictEqual(values[0], false);
 		});
 
 	});
@@ -350,16 +351,16 @@ suite('ExtHostDocumentSaveParticipant', () => {
 
 		let sub1 = participant.getOnWillSaveTextDocumentEvent(nullExtensionDescription)(function (e) {
 			// the document state we started with
-			assert.equal(document.version, 1);
-			assert.equal(document.getText(), 'foo');
+			assert.strictEqual(document.version, 1);
+			assert.strictEqual(document.getText(), 'foo');
 
 			e.waitUntil(Promise.resolve([TextEdit.insert(new Position(0, 0), 'bar')]));
 		});
 
 		let sub2 = participant.getOnWillSaveTextDocumentEvent(nullExtensionDescription)(function (e) {
 			// the document state AFTER the first listener kicked in
-			assert.equal(document.version, 2);
-			assert.equal(document.getText(), 'barfoo');
+			assert.strictEqual(document.version, 2);
+			assert.strictEqual(document.getText(), 'barfoo');
 
 			e.waitUntil(Promise.resolve([TextEdit.insert(new Position(0, 0), 'bar')]));
 		});
@@ -369,8 +370,8 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			sub2.dispose();
 
 			// the document state AFTER eventing is done
-			assert.equal(document.version, 3);
-			assert.equal(document.getText(), 'barbarfoo');
+			assert.strictEqual(document.version, 3);
+			assert.strictEqual(document.getText(), 'barbarfoo');
 		});
 
 	});
@@ -390,7 +391,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(() => {
 			sub.dispose();
-			assert.equal(didLogSomething, true);
+			assert.strictEqual(didLogSomething, true);
 		});
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts
index e3f031a03..6456bae1d 100644
--- a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts
@@ -39,7 +39,7 @@ suite('ExtHostDocumentsAndEditors', () => {
 				try {
 
 					for (const data of e) {
-						assert.equal(data.document.isClosed, true);
+						assert.strictEqual(data.document.isClosed, true);
 					}
 					resolve(undefined);
 				} catch (e) {
diff --git a/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts b/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts
index 0d26033ab..805e8f4e1 100644
--- a/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostFileSystemEventService.test.ts
@@ -20,14 +20,14 @@ suite('ExtHostFileSystemEventService', () => {
 		};
 
 		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher('**/somethingInteresting', false, false, false);
-		assert.equal(watcher1.ignoreChangeEvents, false);
-		assert.equal(watcher1.ignoreCreateEvents, false);
-		assert.equal(watcher1.ignoreDeleteEvents, false);
+		assert.strictEqual(watcher1.ignoreChangeEvents, false);
+		assert.strictEqual(watcher1.ignoreCreateEvents, false);
+		assert.strictEqual(watcher1.ignoreDeleteEvents, false);
 
 		const watcher2 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher('**/somethingBoring', true, true, true);
-		assert.equal(watcher2.ignoreChangeEvents, true);
-		assert.equal(watcher2.ignoreCreateEvents, true);
-		assert.equal(watcher2.ignoreDeleteEvents, true);
+		assert.strictEqual(watcher2.ignoreChangeEvents, true);
+		assert.strictEqual(watcher2.ignoreCreateEvents, true);
+		assert.strictEqual(watcher2.ignoreDeleteEvents, true);
 	});
 
 });
diff --git a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
index 82e27a2ea..44aec4a90 100644
--- a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts
@@ -20,7 +20,7 @@ import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
 import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
-import { getDocumentSymbols } from 'vs/editor/contrib/gotoSymbol/documentSymbols';
+import { getDocumentSymbols } from 'vs/editor/contrib/documentSymbols/documentSymbols';
 import * as modes from 'vs/editor/common/modes';
 import { getCodeLensModel } from 'vs/editor/contrib/codelens/codelens';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition, getDeclarationsAtPosition, getReferencesAtPosition } from 'vs/editor/contrib/gotoSymbol/goToSymbol';
@@ -127,7 +127,7 @@ suite('ExtHostLanguageFeatures', function () {
 	// --- outline
 
 	test('DocumentSymbols, register/deregister', async () => {
-		assert.equal(modes.DocumentSymbolProviderRegistry.all(model).length, 0);
+		assert.strictEqual(modes.DocumentSymbolProviderRegistry.all(model).length, 0);
 		let d1 = extHost.registerDocumentSymbolProvider(defaultExtension, defaultSelector, new class implements vscode.DocumentSymbolProvider {
 			provideDocumentSymbols() {
 				return <vscode.SymbolInformation[]>[];
@@ -135,7 +135,7 @@ suite('ExtHostLanguageFeatures', function () {
 		});
 
 		await rpcProtocol.sync();
-		assert.equal(modes.DocumentSymbolProviderRegistry.all(model).length, 1);
+		assert.strictEqual(modes.DocumentSymbolProviderRegistry.all(model).length, 1);
 		d1.dispose();
 		return rpcProtocol.sync();
 
@@ -155,7 +155,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getDocumentSymbols(model, true, CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 	});
 
 	test('DocumentSymbols, data conversion', async () => {
@@ -167,10 +167,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getDocumentSymbols(model, true, CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let entry = value[0];
-		assert.equal(entry.name, 'test');
-		assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(entry.name, 'test');
+		assert.deepStrictEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 	});
 
 	// --- code lens
@@ -190,7 +190,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getCodeLensModel(model, CancellationToken.None);
-		assert.equal(value.lenses.length, 1);
+		assert.strictEqual(value.lenses.length, 1);
 	});
 
 	test('CodeLens, do not resolve a resolved lens', async () => {
@@ -208,11 +208,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getCodeLensModel(model, CancellationToken.None);
-		assert.equal(value.lenses.length, 1);
+		assert.strictEqual(value.lenses.length, 1);
 		const [data] = value.lenses;
 		const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
-		assert.equal(symbol!.command!.id, 'id');
-		assert.equal(symbol!.command!.title, 'Title');
+		assert.strictEqual(symbol!.command!.id, 'id');
+		assert.strictEqual(symbol!.command!.title, 'Title');
 	});
 
 	test('CodeLens, missing command', async () => {
@@ -225,11 +225,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getCodeLensModel(model, CancellationToken.None);
-		assert.equal(value.lenses.length, 1);
+		assert.strictEqual(value.lenses.length, 1);
 		let [data] = value.lenses;
 		const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
-		assert.equal(symbol!.command!.id, 'missing');
-		assert.equal(symbol!.command!.title, '!!MISSING: command!!');
+		assert.strictEqual(symbol!.command!.id, 'missing');
+		assert.strictEqual(symbol!.command!.title, '!!MISSING: command!!');
 	});
 
 	// --- definition
@@ -244,10 +244,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
-		assert.equal(entry.uri.toString(), model.uri.toString());
+		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
+		assert.strictEqual(entry.uri.toString(), model.uri.toString());
 	});
 
 	test('Definition, one or many', async () => {
@@ -265,7 +265,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 2);
+		assert.strictEqual(value.length, 2);
 	});
 
 	test('Definition, registration order', async () => {
@@ -284,10 +284,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 2);
+		assert.strictEqual(value.length, 2);
 		// let [first, second] = value;
-		assert.equal(value[0].uri.authority, 'second');
-		assert.equal(value[1].uri.authority, 'first');
+		assert.strictEqual(value[0].uri.authority, 'second');
+		assert.strictEqual(value[1].uri.authority, 'first');
 	});
 
 	test('Definition, evil provider', async () => {
@@ -305,7 +305,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 	});
 
 	// -- declaration
@@ -320,10 +320,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getDeclarationsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
-		assert.equal(entry.uri.toString(), model.uri.toString());
+		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
+		assert.strictEqual(entry.uri.toString(), model.uri.toString());
 	});
 
 	// --- implementation
@@ -338,10 +338,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getImplementationsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
-		assert.equal(entry.uri.toString(), model.uri.toString());
+		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
+		assert.strictEqual(entry.uri.toString(), model.uri.toString());
 	});
 
 	// --- type definition
@@ -356,10 +356,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getTypeDefinitionsAtPosition(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
-		assert.equal(entry.uri.toString(), model.uri.toString());
+		assert.deepStrictEqual(entry.range, { startLineNumber: 2, startColumn: 3, endLineNumber: 4, endColumn: 5 });
+		assert.strictEqual(entry.uri.toString(), model.uri.toString());
 	});
 
 	// --- extra info
@@ -374,9 +374,9 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
-			assert.equal(value.length, 1);
+			assert.strictEqual(value.length, 1);
 			let [entry] = value;
-			assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
+			assert.deepStrictEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
 		});
 	});
 
@@ -391,9 +391,9 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
-			assert.equal(value.length, 1);
+			assert.strictEqual(value.length, 1);
 			let [entry] = value;
-			assert.deepEqual(entry.range, { startLineNumber: 4, startColumn: 1, endLineNumber: 9, endColumn: 8 });
+			assert.deepStrictEqual(entry.range, { startLineNumber: 4, startColumn: 1, endLineNumber: 9, endColumn: 8 });
 		});
 	});
 
@@ -414,10 +414,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getHover(model, new EditorPosition(1, 1), CancellationToken.None);
-		assert.equal(value.length, 2);
+		assert.strictEqual(value.length, 2);
 		let [first, second] = (value as modes.Hover[]);
-		assert.equal(first.contents[0].value, 'registered second');
-		assert.equal(second.contents[0].value, 'registered first');
+		assert.strictEqual(first.contents[0].value, 'registered second');
+		assert.strictEqual(second.contents[0].value, 'registered first');
 	});
 
 
@@ -436,7 +436,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		getHover(model, new EditorPosition(1, 1), CancellationToken.None).then(value => {
-			assert.equal(value.length, 1);
+			assert.strictEqual(value.length, 1);
 		});
 	});
 
@@ -452,10 +452,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = (await getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
-		assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
+		assert.deepStrictEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
+		assert.strictEqual(entry.kind, modes.DocumentHighlightKind.Text);
 	});
 
 	test('Occurrences, order 1/2', async () => {
@@ -473,10 +473,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = (await getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
-		assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
+		assert.deepStrictEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 5 });
+		assert.strictEqual(entry.kind, modes.DocumentHighlightKind.Text);
 	});
 
 	test('Occurrences, order 2/2', async () => {
@@ -494,10 +494,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = (await getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [entry] = value;
-		assert.deepEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 3 });
-		assert.equal(entry.kind, modes.DocumentHighlightKind.Text);
+		assert.deepStrictEqual(entry.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 3 });
+		assert.strictEqual(entry.kind, modes.DocumentHighlightKind.Text);
 	});
 
 	test('Occurrences, evil provider', async () => {
@@ -516,7 +516,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getOccurrencesAtPosition(model, new EditorPosition(1, 2), CancellationToken.None);
-		assert.equal(value!.length, 1);
+		assert.strictEqual(value!.length, 1);
 	});
 
 	// --- references
@@ -537,10 +537,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getReferencesAtPosition(model, new EditorPosition(1, 2), false, CancellationToken.None);
-		assert.equal(value.length, 2);
+		assert.strictEqual(value.length, 2);
 		let [first, second] = value;
-		assert.equal(first.uri.path, '/second');
-		assert.equal(second.uri.path, '/first');
+		assert.strictEqual(first.uri.path, '/second');
+		assert.strictEqual(second.uri.path, '/first');
 	});
 
 	test('References, data conversion', async () => {
@@ -553,10 +553,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getReferencesAtPosition(model, new EditorPosition(1, 2), false, CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [item] = value;
-		assert.deepEqual(item.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
-		assert.equal(item.uri.toString(), model.uri.toString());
+		assert.deepStrictEqual(item.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(item.uri.toString(), model.uri.toString());
 	});
 
 	test('References, evil provider', async () => {
@@ -574,7 +574,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await getReferencesAtPosition(model, new EditorPosition(1, 2), false, CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 	});
 
 	// --- quick fix
@@ -592,12 +592,12 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None);
-		assert.equal(actions.length, 2);
+		assert.strictEqual(actions.length, 2);
 		const [first, second] = actions;
-		assert.equal(first.action.title, 'Testing1');
-		assert.equal(first.action.command!.id, 'test1');
-		assert.equal(second.action.title, 'Testing2');
-		assert.equal(second.action.command!.id, 'test2');
+		assert.strictEqual(first.action.title, 'Testing1');
+		assert.strictEqual(first.action.command!.id, 'test1');
+		assert.strictEqual(second.action.title, 'Testing2');
+		assert.strictEqual(second.action.command!.id, 'test2');
 	});
 
 	test('Quick Fix, code action data conversion', async () => {
@@ -616,12 +616,12 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None);
-		assert.equal(actions.length, 1);
+		assert.strictEqual(actions.length, 1);
 		const [first] = actions;
-		assert.equal(first.action.title, 'Testing1');
-		assert.equal(first.action.command!.title, 'Testing1Command');
-		assert.equal(first.action.command!.id, 'test1');
-		assert.equal(first.action.kind, 'test.scope');
+		assert.strictEqual(first.action.title, 'Testing1');
+		assert.strictEqual(first.action.command!.title, 'Testing1Command');
+		assert.strictEqual(first.action.command!.id, 'test1');
+		assert.strictEqual(first.action.kind, 'test.scope');
 	});
 
 
@@ -639,7 +639,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None);
-		assert.equal(actions.length, 1);
+		assert.strictEqual(actions.length, 1);
 	});
 
 	test('Quick Fix, evil provider', async () => {
@@ -657,7 +657,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { validActions: actions } = await getCodeActions(model, model.getFullModelRange(), { type: modes.CodeActionTriggerType.Manual }, Progress.None, CancellationToken.None);
-		assert.equal(actions.length, 1);
+		assert.strictEqual(actions.length, 1);
 	});
 
 	// --- navigate types
@@ -678,11 +678,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getWorkspaceSymbols('');
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [first] = value;
 		const [, symbols] = first;
-		assert.equal(symbols.length, 1);
-		assert.equal(symbols[0].name, 'testing');
+		assert.strictEqual(symbols.length, 1);
+		assert.strictEqual(symbols[0].name, 'testing');
 	});
 
 	// --- rename
@@ -715,7 +715,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await rename(model, new EditorPosition(1, 1), 'newName');
-		assert.equal(value.rejectReason, 'evil');
+		assert.strictEqual(value.rejectReason, 'evil');
 	});
 
 	test('Rename, evil provider 2/2', async () => {
@@ -736,7 +736,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await rename(model, new EditorPosition(1, 1), 'newName');
-		assert.equal(value.edits.length, 1);
+		assert.strictEqual(value.edits.length, 1);
 	});
 
 	test('Rename, ordering', async () => {
@@ -759,7 +759,7 @@ suite('ExtHostLanguageFeatures', function () {
 		await rpcProtocol.sync();
 		const value = await rename(model, new EditorPosition(1, 1), 'newName');
 		// least relevant rename provider
-		assert.equal(value.edits.length, 2);
+		assert.strictEqual(value.edits.length, 2);
 	});
 
 	test('Multiple RenameProviders don\'t respect all possible PrepareRename handlers, #98352', async function () {
@@ -793,7 +793,7 @@ suite('ExtHostLanguageFeatures', function () {
 		await rpcProtocol.sync();
 		await rename(model, new EditorPosition(1, 1), 'newName');
 
-		assert.deepEqual(called, [true, true, true, false]);
+		assert.deepStrictEqual(called, [true, true, true, false]);
 	});
 
 	test('Multiple RenameProviders don\'t respect all possible PrepareRename handlers, #98352', async function () {
@@ -825,7 +825,7 @@ suite('ExtHostLanguageFeatures', function () {
 		await rename(model, new EditorPosition(1, 1), 'newName');
 
 		// first provider has NO prepare which means it is taken by default
-		assert.deepEqual(called, [false, false, true]);
+		assert.deepStrictEqual(called, [false, false, true]);
 	});
 
 	// --- parameter hints
@@ -863,7 +863,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = await provideSignatureHelp(model, new EditorPosition(1, 1), { triggerKind: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None);
-		assert.equal(value, undefined);
+		assert.strictEqual(value, undefined);
 	});
 
 	// --- suggestions
@@ -884,8 +884,8 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { items } = await provideSuggestionItems(model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<modes.CompletionItemKind>().add(modes.CompletionItemKind.Snippet)));
-		assert.equal(items.length, 1);
-		assert.equal(items[0].completion.insertText, 'testing2');
+		assert.strictEqual(items.length, 1);
+		assert.strictEqual(items[0].completion.insertText, 'testing2');
 	});
 
 	test('Suggest, order 2/3', async () => {
@@ -904,8 +904,8 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { items } = await provideSuggestionItems(model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<modes.CompletionItemKind>().add(modes.CompletionItemKind.Snippet)));
-		assert.equal(items.length, 1);
-		assert.equal(items[0].completion.insertText, 'weak-selector');
+		assert.strictEqual(items.length, 1);
+		assert.strictEqual(items[0].completion.insertText, 'weak-selector');
 	});
 
 	test('Suggest, order 2/3', async () => {
@@ -924,9 +924,9 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { items } = await provideSuggestionItems(model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<modes.CompletionItemKind>().add(modes.CompletionItemKind.Snippet)));
-		assert.equal(items.length, 2);
-		assert.equal(items[0].completion.insertText, 'strong-1'); // sort by label
-		assert.equal(items[1].completion.insertText, 'strong-2');
+		assert.strictEqual(items.length, 2);
+		assert.strictEqual(items[0].completion.insertText, 'strong-1'); // sort by label
+		assert.strictEqual(items[1].completion.insertText, 'strong-2');
 	});
 
 	test('Suggest, evil provider', async () => {
@@ -946,7 +946,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const { items } = await provideSuggestionItems(model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<modes.CompletionItemKind>().add(modes.CompletionItemKind.Snippet)));
-		assert.equal(items[0].container.incomplete, false);
+		assert.strictEqual(items[0].container.incomplete, false);
 	});
 
 	test('Suggest, CompletionList', async () => {
@@ -959,7 +959,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		provideSuggestionItems(model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<modes.CompletionItemKind>().add(modes.CompletionItemKind.Snippet))).then(model => {
-			assert.equal(model.items[0].container.incomplete, true);
+			assert.strictEqual(model.items[0].container.incomplete, true);
 		});
 	});
 
@@ -980,13 +980,13 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = (await getDocumentFormattingEditsUntilResult(NullWorkerService, model, { insertSpaces: true, tabSize: 4 }, CancellationToken.None))!;
-		assert.equal(value.length, 2);
+		assert.strictEqual(value.length, 2);
 		let [first, second] = value;
-		assert.equal(first.text, 'testing');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
-		assert.equal(second.eol, EndOfLineSequence.LF);
-		assert.equal(second.text, '');
-		assert.deepEqual(second.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(first.text, 'testing');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(second.eol, EndOfLineSequence.LF);
+		assert.strictEqual(second.text, '');
+		assert.deepStrictEqual(second.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 	});
 
 	test('Format Doc, evil provider', async () => {
@@ -1022,10 +1022,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = (await getDocumentFormattingEditsUntilResult(NullWorkerService, model, { insertSpaces: true, tabSize: 4 }, CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [first] = value;
-		assert.equal(first.text, 'testing');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(first.text, 'testing');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 	});
 
 	test('Format Range, data conversion', async () => {
@@ -1037,10 +1037,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = (await getDocumentRangeFormattingEditsUntilResult(NullWorkerService, model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }, CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [first] = value;
-		assert.equal(first.text, 'testing');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(first.text, 'testing');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 	});
 
 	test('Format Range, + format_doc', async () => {
@@ -1061,13 +1061,13 @@ suite('ExtHostLanguageFeatures', function () {
 		}));
 		await rpcProtocol.sync();
 		const value = (await getDocumentRangeFormattingEditsUntilResult(NullWorkerService, model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }, CancellationToken.None))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [first] = value;
-		assert.equal(first.text, 'range2');
-		assert.equal(first.range.startLineNumber, 3);
-		assert.equal(first.range.startColumn, 4);
-		assert.equal(first.range.endLineNumber, 5);
-		assert.equal(first.range.endColumn, 6);
+		assert.strictEqual(first.text, 'range2');
+		assert.strictEqual(first.range.startLineNumber, 3);
+		assert.strictEqual(first.range.startColumn, 4);
+		assert.strictEqual(first.range.endLineNumber, 5);
+		assert.strictEqual(first.range.endColumn, 6);
 	});
 
 	test('Format Range, evil provider', async () => {
@@ -1091,10 +1091,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		const value = (await getOnTypeFormattingEdits(NullWorkerService, model, new EditorPosition(1, 1), ';', { insertSpaces: true, tabSize: 2 }))!;
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		const [first] = value;
-		assert.equal(first.text, ';');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
+		assert.strictEqual(first.text, ';');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 });
 	});
 
 	test('Links, data conversion', async () => {
@@ -1109,11 +1109,11 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let { links } = await getLinks(model, CancellationToken.None);
-		assert.equal(links.length, 1);
+		assert.strictEqual(links.length, 1);
 		let [first] = links;
-		assert.equal(first.url, 'foo:bar#3');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 2, endColumn: 2 });
-		assert.equal(first.tooltip, 'tooltip');
+		assert.strictEqual(first.url?.toString(), 'foo:bar#3');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 2, endColumn: 2 });
+		assert.strictEqual(first.tooltip, 'tooltip');
 	});
 
 	test('Links, evil provider', async () => {
@@ -1132,10 +1132,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let { links } = await getLinks(model, CancellationToken.None);
-		assert.equal(links.length, 1);
+		assert.strictEqual(links.length, 1);
 		let [first] = links;
-		assert.equal(first.url, 'foo:bar#3');
-		assert.deepEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 2, endColumn: 2 });
+		assert.strictEqual(first.url?.toString(), 'foo:bar#3');
+		assert.deepStrictEqual(first.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 2, endColumn: 2 });
 	});
 
 	test('Document colors, data conversion', async () => {
@@ -1151,10 +1151,10 @@ suite('ExtHostLanguageFeatures', function () {
 
 		await rpcProtocol.sync();
 		let value = await getColors(model, CancellationToken.None);
-		assert.equal(value.length, 1);
+		assert.strictEqual(value.length, 1);
 		let [first] = value;
-		assert.deepEqual(first.colorInfo.color, { red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4 });
-		assert.deepEqual(first.colorInfo.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 21 });
+		assert.deepStrictEqual(first.colorInfo.color, { red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4 });
+		assert.deepStrictEqual(first.colorInfo.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 21 });
 	});
 
 	// -- selection ranges
@@ -1171,7 +1171,7 @@ suite('ExtHostLanguageFeatures', function () {
 		await rpcProtocol.sync();
 
 		provideSelectionRanges(model, [new Position(1, 17)], { selectLeadingAndTrailingWhitespace: true }, CancellationToken.None).then(ranges => {
-			assert.equal(ranges.length, 1);
+			assert.strictEqual(ranges.length, 1);
 			assert.ok(ranges[0].length >= 2);
 		});
 	});
diff --git a/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts
index 50f8ae572..3327a19d9 100644
--- a/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostMessagerService.test.ts
@@ -101,28 +101,28 @@ suite('ExtHostMessageService', function () {
 	test('propagte handle on select', async function () {
 
 		let service = new MainThreadMessageService(null!, new EmptyNotificationService(notification => {
-			assert.equal(notification.actions!.primary!.length, 1);
+			assert.strictEqual(notification.actions!.primary!.length, 1);
 			platform.setImmediate(() => notification.actions!.primary![0].run());
 		}), emptyCommandService, emptyDialogService);
 
 		const handle = await service.$showMessage(1, 'h', {}, [{ handle: 42, title: 'a thing', isCloseAffordance: true }]);
-		assert.equal(handle, 42);
+		assert.strictEqual(handle, 42);
 	});
 
 	suite('modal', () => {
 		test('calls dialog service', async () => {
 			const service = new MainThreadMessageService(null!, emptyNotificationService, emptyCommandService, new class extends mock<IDialogService>() {
 				show(severity: Severity, message: string, buttons: string[]) {
-					assert.equal(severity, 1);
-					assert.equal(message, 'h');
-					assert.equal(buttons.length, 2);
-					assert.equal(buttons[1], 'Cancel');
+					assert.strictEqual(severity, 1);
+					assert.strictEqual(message, 'h');
+					assert.strictEqual(buttons.length, 2);
+					assert.strictEqual(buttons[1], 'Cancel');
 					return Promise.resolve({ choice: 0 });
 				}
 			} as IDialogService);
 
 			const handle = await service.$showMessage(1, 'h', { modal: true }, [{ handle: 42, title: 'a thing', isCloseAffordance: false }]);
-			assert.equal(handle, 42);
+			assert.strictEqual(handle, 42);
 		});
 
 		test('returns undefined when cancelled', async () => {
@@ -133,19 +133,19 @@ suite('ExtHostMessageService', function () {
 			} as IDialogService);
 
 			const handle = await service.$showMessage(1, 'h', { modal: true }, [{ handle: 42, title: 'a thing', isCloseAffordance: false }]);
-			assert.equal(handle, undefined);
+			assert.strictEqual(handle, undefined);
 		});
 
 		test('hides Cancel button when not needed', async () => {
 			const service = new MainThreadMessageService(null!, emptyNotificationService, emptyCommandService, new class extends mock<IDialogService>() {
 				show(severity: Severity, message: string, buttons: string[]) {
-					assert.equal(buttons.length, 1);
+					assert.strictEqual(buttons.length, 1);
 					return Promise.resolve({ choice: 0 });
 				}
 			} as IDialogService);
 
 			const handle = await service.$showMessage(1, 'h', { modal: true }, [{ handle: 42, title: 'a thing', isCloseAffordance: true }]);
-			assert.equal(handle, 42);
+			assert.strictEqual(handle, 42);
 		});
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts
index 9b3a4c2ec..7619a7b33 100644
--- a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts
@@ -104,14 +104,14 @@ suite('NotebookCell#Document', function () {
 		const d1 = extHostDocuments.getDocument(c1.uri);
 
 		assert.ok(d1);
-		assert.equal(d1.languageId, c1.language);
-		assert.equal(d1.version, 1);
+		assert.strictEqual(d1.languageId, c1.language);
+		assert.strictEqual(d1.version, 1);
 		assert.ok(d1.notebook === notebook.notebookDocument);
 
 		const d2 = extHostDocuments.getDocument(c2.uri);
 		assert.ok(d2);
-		assert.equal(d2.languageId, c2.language);
-		assert.equal(d2.version, 1);
+		assert.strictEqual(d2.languageId, c2.language);
+		assert.strictEqual(d2.version, 1);
 		assert.ok(d2.notebook === notebook.notebookDocument);
 	});
 
@@ -197,7 +197,7 @@ suite('NotebookCell#Document', function () {
 		for (let cell of notebook.notebookDocument.cells) {
 			const doc = extHostDocuments.getDocument(cell.uri);
 			assert.ok(doc);
-			assert.equal(extHostDocuments.getDocument(cell.uri).isClosed, false);
+			assert.strictEqual(extHostDocuments.getDocument(cell.uri).isClosed, false);
 			docs.push(doc);
 			addData.push({
 				EOL: '\n',
@@ -218,7 +218,7 @@ suite('NotebookCell#Document', function () {
 		// notebook is still open -> cell documents stay open
 		for (let cell of notebook.notebookDocument.cells) {
 			assert.ok(extHostDocuments.getDocument(cell.uri));
-			assert.equal(extHostDocuments.getDocument(cell.uri).isClosed, false);
+			assert.strictEqual(extHostDocuments.getDocument(cell.uri).isClosed, false);
 		}
 
 		// close notebook -> docs are closed
@@ -227,13 +227,13 @@ suite('NotebookCell#Document', function () {
 			assert.throws(() => extHostDocuments.getDocument(cell.uri));
 		}
 		for (let doc of docs) {
-			assert.equal(doc.isClosed, true);
+			assert.strictEqual(doc.isClosed, true);
 		}
 	});
 
 	test('cell document goes when cell is removed', async function () {
 
-		assert.equal(notebook.notebookDocument.cells.length, 2);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 2);
 		const [cell1, cell2] = notebook.notebookDocument.cells;
 
 		extHostNotebooks.$acceptModelChanged(notebook.uri, {
@@ -246,25 +246,25 @@ suite('NotebookCell#Document', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1);
-		assert.equal(cell1.document.isClosed, true); // ref still alive!
-		assert.equal(cell2.document.isClosed, false);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1);
+		assert.strictEqual(cell1.document.isClosed, true); // ref still alive!
+		assert.strictEqual(cell2.document.isClosed, false);
 
 		assert.throws(() => extHostDocuments.getDocument(cell1.uri));
 	});
 
 	test('cell document knows notebook', function () {
 		for (let cells of notebook.notebookDocument.cells) {
-			assert.equal(cells.document.notebook === notebook.notebookDocument, true);
+			assert.strictEqual(cells.document.notebook === notebook.notebookDocument, true);
 		}
 	});
 
 	test('cell#index', function () {
 
-		assert.equal(notebook.notebookDocument.cells.length, 2);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 2);
 		const [first, second] = notebook.notebookDocument.cells;
-		assert.equal(first.index, 0);
-		assert.equal(second.index, 1);
+		assert.strictEqual(first.index, 0);
+		assert.strictEqual(second.index, 1);
 
 		// remove first cell
 		extHostNotebooks.$acceptModelChanged(notebook.uri, {
@@ -275,8 +275,8 @@ suite('NotebookCell#Document', function () {
 			}]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1);
-		assert.equal(second.index, 0);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1);
+		assert.strictEqual(second.index, 0);
 
 		extHostNotebooks.$acceptModelChanged(notebookUri, {
 			versionId: notebook.notebookDocument.version + 1,
@@ -302,7 +302,7 @@ suite('NotebookCell#Document', function () {
 			}]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 3);
-		assert.equal(second.index, 2);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 3);
+		assert.strictEqual(second.index, 2);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts b/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts
index e49a0c930..5cd6fcf79 100644
--- a/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostNotebookConcatDocument.test.ts
@@ -91,27 +91,27 @@ suite('NotebookConcatDocument', function () {
 
 	test('empty', function () {
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
-		assert.equal(doc.getText(), '');
-		assert.equal(doc.version, 0);
+		assert.strictEqual(doc.getText(), '');
+		assert.strictEqual(doc.version, 0);
 
-		// assert.equal(doc.locationAt(new Position(0, 0)), undefined);
-		// assert.equal(doc.positionAt(SOME_FAKE_LOCATION?), undefined);
+		// assert.strictEqual(doc.locationAt(new Position(0, 0)), undefined);
+		// assert.strictEqual(doc.positionAt(SOME_FAKE_LOCATION?), undefined);
 	});
 
 
 	function assertLocation(doc: vscode.NotebookConcatTextDocument, pos: Position, expected: Location, reverse = true) {
 		const actual = doc.locationAt(pos);
-		assert.equal(actual.uri.toString(), expected.uri.toString());
-		assert.equal(actual.range.isEqual(expected.range), true);
+		assert.strictEqual(actual.uri.toString(), expected.uri.toString());
+		assert.strictEqual(actual.range.isEqual(expected.range), true);
 
 		if (reverse) {
 			// reverse - offset
 			const offset = doc.offsetAt(pos);
-			assert.equal(doc.positionAt(offset).isEqual(pos), true);
+			assert.strictEqual(doc.positionAt(offset).isEqual(pos), true);
 
 			// reverse - pos
 			const actualPosition = doc.positionAt(actual);
-			assert.equal(actualPosition.isEqual(pos), true);
+			assert.strictEqual(actualPosition.isEqual(pos), true);
 		}
 	}
 
@@ -151,13 +151,13 @@ suite('NotebookConcatDocument', function () {
 		}, false);
 
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 
-		assert.equal(doc.contains(cellUri1), true);
-		assert.equal(doc.contains(cellUri2), true);
-		assert.equal(doc.contains(URI.parse('some://miss/path')), false);
+		assert.strictEqual(doc.contains(cellUri1), true);
+		assert.strictEqual(doc.contains(cellUri2), true);
+		assert.strictEqual(doc.contains(URI.parse('some://miss/path')), false);
 	});
 
 	test('location, position mapping', function () {
@@ -189,7 +189,7 @@ suite('NotebookConcatDocument', function () {
 		}, false);
 
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
@@ -224,8 +224,8 @@ suite('NotebookConcatDocument', function () {
 				}
 			]
 		}, false);
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 1);
-		assert.equal(doc.version, 1);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 1);
+		assert.strictEqual(doc.version, 1);
 		assertLines(doc, 'Hello', 'World', 'Hello World!');
 
 		assertLocation(doc, new Position(0, 0), new Location(notebook.notebookDocument.cells[0].uri, new Position(0, 0)));
@@ -252,8 +252,8 @@ suite('NotebookConcatDocument', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2);
-		assert.equal(doc.version, 2);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2);
+		assert.strictEqual(doc.version, 2);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
 		assertLocation(doc, new Position(0, 0), new Location(notebook.notebookDocument.cells[0].uri, new Position(0, 0)));
 		assertLocation(doc, new Position(4, 0), new Location(notebook.notebookDocument.cells[1].uri, new Position(1, 0)));
@@ -271,8 +271,8 @@ suite('NotebookConcatDocument', function () {
 				}
 			]
 		}, false);
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 1);
-		assert.equal(doc.version, 3);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 1);
+		assert.strictEqual(doc.version, 3);
 		assertLines(doc, 'Hello', 'World', 'Hello World!');
 		assertLocation(doc, new Position(0, 0), new Location(notebook.notebookDocument.cells[0].uri, new Position(0, 0)));
 		assertLocation(doc, new Position(2, 2), new Location(notebook.notebookDocument.cells[0].uri, new Position(2, 2)));
@@ -310,8 +310,8 @@ suite('NotebookConcatDocument', function () {
 				}
 			]
 		}, false);
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2);
-		assert.equal(doc.version, 1);
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2);
+		assert.strictEqual(doc.version, 1);
 
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
 		assertLocation(doc, new Position(0, 0), new Location(notebook.notebookDocument.cells[0].uri, new Position(0, 0)));
@@ -322,7 +322,7 @@ suite('NotebookConcatDocument', function () {
 
 		// offset math
 		let cell1End = doc.offsetAt(new Position(2, 12));
-		assert.equal(doc.positionAt(cell1End).isEqual(new Position(2, 12)), true);
+		assert.strictEqual(doc.positionAt(cell1End).isEqual(new Position(2, 12)), true);
 
 		extHostDocuments.$acceptModelChanged(notebook.notebookDocument.cells[0].uri, {
 			versionId: 0,
@@ -337,7 +337,7 @@ suite('NotebookConcatDocument', function () {
 		assertLines(doc, 'Hello', 'World', 'Hi World!', 'Hallo', 'Welt', 'Hallo Welt!');
 		assertLocation(doc, new Position(2, 12), new Location(notebook.notebookDocument.cells[0].uri, new Position(2, 9)), false);
 
-		assert.equal(doc.positionAt(cell1End).isEqual(new Position(3, 2)), true);
+		assert.strictEqual(doc.positionAt(cell1End).isEqual(new Position(3, 2)), true);
 
 	});
 
@@ -403,12 +403,12 @@ suite('NotebookConcatDocument', function () {
 	function assertOffsetAtPosition(doc: vscode.NotebookConcatTextDocument, offset: number, expected: { line: number, character: number }, reverse = true) {
 		const actual = doc.positionAt(offset);
 
-		assert.equal(actual.line, expected.line);
-		assert.equal(actual.character, expected.character);
+		assert.strictEqual(actual.line, expected.line);
+		assert.strictEqual(actual.character, expected.character);
 
 		if (reverse) {
 			const actualOffset = doc.offsetAt(actual);
-			assert.equal(actualOffset, offset);
+			assert.strictEqual(actualOffset, offset);
 		}
 	}
 
@@ -441,7 +441,7 @@ suite('NotebookConcatDocument', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
@@ -457,16 +457,16 @@ suite('NotebookConcatDocument', function () {
 	function assertLocationAtPosition(doc: vscode.NotebookConcatTextDocument, pos: { line: number, character: number }, expected: { uri: URI, line: number, character: number }, reverse = true) {
 
 		const actual = doc.locationAt(new Position(pos.line, pos.character));
-		assert.equal(actual.uri.toString(), expected.uri.toString());
-		assert.equal(actual.range.start.line, expected.line);
-		assert.equal(actual.range.end.line, expected.line);
-		assert.equal(actual.range.start.character, expected.character);
-		assert.equal(actual.range.end.character, expected.character);
+		assert.strictEqual(actual.uri.toString(), expected.uri.toString());
+		assert.strictEqual(actual.range.start.line, expected.line);
+		assert.strictEqual(actual.range.end.line, expected.line);
+		assert.strictEqual(actual.range.start.character, expected.character);
+		assert.strictEqual(actual.range.end.character, expected.character);
 
 		if (reverse) {
 			const actualPos = doc.positionAt(actual);
-			assert.equal(actualPos.line, pos.line);
-			assert.equal(actualPos.character, pos.character);
+			assert.strictEqual(actualPos.line, pos.line);
+			assert.strictEqual(actualPos.character, pos.character);
 		}
 	}
 
@@ -498,7 +498,7 @@ suite('NotebookConcatDocument', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
@@ -539,14 +539,14 @@ suite('NotebookConcatDocument', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
 
-		assert.equal(doc.getText(new Range(0, 0, 0, 0)), '');
-		assert.equal(doc.getText(new Range(0, 0, 1, 0)), 'Hello\n');
-		assert.equal(doc.getText(new Range(2, 0, 4, 0)), 'Hello World!\nHallo\n');
+		assert.strictEqual(doc.getText(new Range(0, 0, 0, 0)), '');
+		assert.strictEqual(doc.getText(new Range(0, 0, 1, 0)), 'Hello\n');
+		assert.strictEqual(doc.getText(new Range(2, 0, 4, 0)), 'Hello World!\nHallo\n');
 	});
 
 	test('validateRange/Position', function () {
@@ -577,15 +577,15 @@ suite('NotebookConcatDocument', function () {
 			]
 		}, false);
 
-		assert.equal(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
+		assert.strictEqual(notebook.notebookDocument.cells.length, 1 + 2); // markdown and code
 
 		let doc = new ExtHostNotebookConcatDocument(extHostNotebooks, extHostDocuments, notebook.notebookDocument, undefined);
 		assertLines(doc, 'Hello', 'World', 'Hello World!', 'Hallo', 'Welt', 'Hallo Welt!');
 
 
 		function assertPosition(actual: vscode.Position, expectedLine: number, expectedCh: number) {
-			assert.equal(actual.line, expectedLine);
-			assert.equal(actual.character, expectedCh);
+			assert.strictEqual(actual.line, expectedLine);
+			assert.strictEqual(actual.character, expectedCh);
 		}
 
 
diff --git a/src/vs/workbench/test/browser/api/extHostTesting.test.ts b/src/vs/workbench/test/browser/api/extHostTesting.test.ts
index 9ed0f4b25..1be5d1bc1 100644
--- a/src/vs/workbench/test/browser/api/extHostTesting.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostTesting.test.ts
@@ -4,24 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { MirroredTestCollection, OwnedTestCollection, SingleUseTestCollection } from 'vs/workbench/api/common/extHostTesting';
+import { MirroredTestCollection, TestItemFilteredWrapper } from 'vs/workbench/api/common/extHostTesting';
 import * as convert from 'vs/workbench/api/common/extHostTypeConverters';
-import { TestRunState, TestState } from 'vs/workbench/api/common/extHostTypes';
-import { TestDiffOpType, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
-import { TestChangeEvent, TestItem } from 'vscode';
-
-const stubTest = (label: string): TestItem => ({
-	label,
-	location: undefined,
-	state: new TestState(TestRunState.Unset),
-	debuggable: true,
-	runnable: true,
-	description: ''
-});
+import { TestDiffOpType } from 'vs/workbench/contrib/testing/common/testCollection';
+import { stubTest, testStubs } from 'vs/workbench/contrib/testing/common/testStubs';
+import { TestOwnedTestCollection, TestSingleUseCollection } from 'vs/workbench/contrib/testing/test/common/ownedTestCollection';
+import { TestChangeEvent, TestItem, TextDocument } from 'vscode';
+import { URI } from 'vs/base/common/uri';
+import { Location } from 'vs/editor/common/modes';
+import { Range } from 'vs/editor/common/core/range';
 
 const simplify = (item: TestItem) => {
 	if ('toJSON' in item) {
 		item = (item as any).toJSON();
+		delete (item as any).id;
+		delete (item as any).providerId;
+		delete (item as any).testId;
 	}
 
 	return { ...item, children: undefined };
@@ -41,44 +39,6 @@ const assertTreeListEqual = (a: ReadonlyArray<Readonly<TestItem>>, b: ReadonlyAr
 	a.forEach((_, i) => assertTreesEqual(a[i], b[i]));
 };
 
-const stubNestedTests = () => ({
-	...stubTest('root'),
-	children: [
-		{ ...stubTest('a'), children: [stubTest('aa'), stubTest('ab')] },
-		stubTest('b'),
-	]
-});
-
-class TestOwnedTestCollection extends OwnedTestCollection {
-	public get idToInternal() {
-		return this.testIdToInternal;
-	}
-
-	public createForHierarchy(publishDiff: (diff: TestsDiff) => void = () => undefined) {
-		return new TestSingleUseCollection(this.testIdToInternal, publishDiff);
-	}
-}
-
-class TestSingleUseCollection extends SingleUseTestCollection {
-	private idCounter = 0;
-
-	public get itemToInternal() {
-		return this.testItemToInternal;
-	}
-
-	public get currentDiff() {
-		return this.diff;
-	}
-
-	protected getId() {
-		return String(this.idCounter++);
-	}
-
-	public setDiff(diff: TestsDiff) {
-		this.diff = diff;
-	}
-}
-
 class TestMirroredCollection extends MirroredTestCollection {
 	public changeEvent!: TestChangeEvent;
 
@@ -102,37 +62,37 @@ suite('ExtHost Testing', () => {
 
 	teardown(() => {
 		single.dispose();
-		assert.deepEqual(owned.idToInternal.size, 0, 'expected owned ids to be empty after dispose');
+		assert.strictEqual(owned.idToInternal.size, 0, 'expected owned ids to be empty after dispose');
 	});
 
 	suite('OwnedTestCollection', () => {
 		test('adds a root recursively', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			assert.deepStrictEqual(single.collectDiff(), [
 				[TestDiffOpType.Add, { id: '0', providerId: 'pid', parent: null, item: convert.TestItem.from(stubTest('root')) }],
-				[TestDiffOpType.Add, { id: '1', providerId: 'pid', parent: '0', item: convert.TestItem.from(stubTest('a')) }],
-				[TestDiffOpType.Add, { id: '2', providerId: 'pid', parent: '1', item: convert.TestItem.from(stubTest('aa')) }],
-				[TestDiffOpType.Add, { id: '3', providerId: 'pid', parent: '1', item: convert.TestItem.from(stubTest('ab')) }],
-				[TestDiffOpType.Add, { id: '4', providerId: 'pid', parent: '0', item: convert.TestItem.from(stubTest('b')) }],
+				[TestDiffOpType.Add, { id: '1', providerId: 'pid', parent: '0', item: convert.TestItem.from(stubTest('a'), 'root') }],
+				[TestDiffOpType.Add, { id: '2', providerId: 'pid', parent: '1', item: convert.TestItem.from(stubTest('aa'), 'root\0a') }],
+				[TestDiffOpType.Add, { id: '3', providerId: 'pid', parent: '1', item: convert.TestItem.from(stubTest('ab'), 'root\0a') }],
+				[TestDiffOpType.Add, { id: '4', providerId: 'pid', parent: '0', item: convert.TestItem.from(stubTest('b'), 'root') }],
 			]);
 		});
 
 		test('no-ops if items not changed', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			single.collectDiff();
 			assert.deepStrictEqual(single.collectDiff(), []);
 		});
 
 		test('watches property mutations', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			single.collectDiff();
 			tests.children![0].description = 'Hello world'; /* item a */
 			single.onItemChange(tests, 'pid');
 			assert.deepStrictEqual(single.collectDiff(), [
-				[TestDiffOpType.Update, { id: '1', parent: '0', providerId: 'pid', item: convert.TestItem.from({ ...stubTest('a'), description: 'Hello world' }) }],
+				[TestDiffOpType.Update, { id: '1', parent: '0', providerId: 'pid', item: convert.TestItem.from({ ...stubTest('a'), description: 'Hello world' }, 'root') }],
 			]);
 
 			single.onItemChange(tests, 'pid');
@@ -140,7 +100,7 @@ suite('ExtHost Testing', () => {
 		});
 
 		test('removes children', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			single.collectDiff();
 			tests.children!.splice(0, 1);
@@ -154,7 +114,7 @@ suite('ExtHost Testing', () => {
 		});
 
 		test('adds new children', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			single.collectDiff();
 			const child = stubTest('ac');
@@ -162,7 +122,7 @@ suite('ExtHost Testing', () => {
 			single.onItemChange(tests, 'pid');
 
 			assert.deepStrictEqual(single.collectDiff(), [
-				[TestDiffOpType.Add, { id: '5', providerId: 'pid', parent: '1', item: convert.TestItem.from(child) }],
+				[TestDiffOpType.Add, { id: '5', providerId: 'pid', parent: '1', item: convert.TestItem.from(child, 'root\0a') }],
 			]);
 			assert.deepStrictEqual([...owned.idToInternal.keys()].sort(), ['0', '1', '2', '3', '4', '5']);
 			assert.strictEqual(single.itemToInternal.size, 6);
@@ -174,7 +134,7 @@ suite('ExtHost Testing', () => {
 		setup(() => m = new TestMirroredCollection());
 
 		test('mirrors creation of the root', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			m.apply(single.collectDiff());
 			assertTreesEqual(m.rootTestItems[0], owned.getTestById('0')!.actual);
@@ -182,7 +142,7 @@ suite('ExtHost Testing', () => {
 		});
 
 		test('mirrors node deletion', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			m.apply(single.collectDiff());
 			tests.children!.splice(0, 1);
@@ -194,7 +154,7 @@ suite('ExtHost Testing', () => {
 		});
 
 		test('mirrors node addition', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			m.apply(single.collectDiff());
 			tests.children![0].children!.push(stubTest('ac'));
@@ -206,7 +166,7 @@ suite('ExtHost Testing', () => {
 		});
 
 		test('mirrors node update', () => {
-			const tests = stubNestedTests();
+			const tests = testStubs.nested();
 			single.addRoot(tests, 'pid');
 			m.apply(single.collectDiff());
 			tests.children![0].description = 'Hello world'; /* item a */
@@ -217,9 +177,9 @@ suite('ExtHost Testing', () => {
 		});
 
 		suite('MirroredChangeCollector', () => {
-			let tests = stubNestedTests();
+			let tests = testStubs.nested();
 			setup(() => {
-				tests = stubNestedTests();
+				tests = testStubs.nested();
 				single.addRoot(tests, 'pid');
 				m.apply(single.collectDiff());
 			});
@@ -264,7 +224,7 @@ suite('ExtHost Testing', () => {
 			});
 
 			test('is a no-op if a node is added and removed', () => {
-				const nested = stubNestedTests();
+				const nested = testStubs.nested();
 				tests.children.push(nested);
 				single.onItemChange(tests, 'pid');
 				tests.children.pop();
@@ -306,5 +266,141 @@ suite('ExtHost Testing', () => {
 				assert.strictEqual(m.changeEvent.commonChangeAncestor?.label, 'root');
 			});
 		});
+
+		suite('TestItemFilteredWrapper', () => {
+			const stubTestWithLocation = (label: string, location: Location): TestItem => {
+				const t = stubTest(label);
+				t.location = location as any;
+				return t;
+			};
+
+			const location1: Location = {
+				range: new Range(0, 0, 0, 0),
+				uri: URI.parse('file:///foo.ts')
+			};
+
+			const location2: Location = {
+				range: new Range(0, 0, 0, 0),
+				uri: URI.parse('file:///bar.ts')
+			};
+
+			const location3: Location = {
+				range: new Range(0, 0, 0, 0),
+				uri: URI.parse('file:///baz.ts')
+			};
+
+			const textDocumentFilter = {
+				uri: location1.uri
+			} as TextDocument;
+
+			let testsWithLocation: TestItem;
+			setup(() => {
+				testsWithLocation = {
+					...stubTest('root'),
+					children: [
+						{
+							...stubTestWithLocation('a', location1),
+							children: [stubTestWithLocation('aa', location1), stubTestWithLocation('ab', location1)]
+						},
+						{
+							...stubTestWithLocation('b', location2),
+							children: [stubTestWithLocation('ba', location2), stubTestWithLocation('bb', location2)]
+						},
+						{
+							...stubTestWithLocation('b', location3),
+						}
+					],
+				};
+			});
+
+			teardown(() => {
+				TestItemFilteredWrapper.removeFilter(textDocumentFilter);
+			});
+
+			test('gets all actual properties', () => {
+				const testItem: TestItem = stubTest('test1');
+				const wrapper: TestItemFilteredWrapper = TestItemFilteredWrapper.getWrapperForTestItem(testItem, textDocumentFilter);
+
+				assert.strictEqual(testItem.debuggable, wrapper.debuggable);
+				assert.strictEqual(testItem.description, wrapper.description);
+				assert.strictEqual(testItem.label, wrapper.label);
+				assert.strictEqual(testItem.location, wrapper.location);
+				assert.strictEqual(testItem.runnable, wrapper.runnable);
+				assert.strictEqual(testItem.state, wrapper.state);
+			});
+
+			test('gets no children if nothing matches Uri filter', () => {
+				let tests: TestItem = testStubs.nested();
+				const wrapper = TestItemFilteredWrapper.getWrapperForTestItem(tests, textDocumentFilter);
+				assert.strictEqual(wrapper.children.length, 0);
+			});
+
+			test('filter is applied to children', () => {
+				const wrapper = TestItemFilteredWrapper.getWrapperForTestItem(testsWithLocation, textDocumentFilter);
+				assert.strictEqual(wrapper.label, 'root');
+				assert.strictEqual(wrapper.children.length, 1);
+				assert.strictEqual(wrapper.children[0] instanceof TestItemFilteredWrapper, true);
+				assert.strictEqual(wrapper.children[0].label, 'a');
+			});
+
+			test('can get if node has matching filter', () => {
+				const rootWrapper = TestItemFilteredWrapper.getWrapperForTestItem(testsWithLocation, textDocumentFilter);
+
+				const invisible = testsWithLocation.children![1];
+				const invisibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(invisible, textDocumentFilter);
+				const visible = testsWithLocation.children![0];
+				const visibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(visible, textDocumentFilter);
+
+				// The root is always visible
+				assert.strictEqual(rootWrapper.hasNodeMatchingFilter, true);
+				assert.strictEqual(invisibleWrapper.hasNodeMatchingFilter, false);
+				assert.strictEqual(visibleWrapper.hasNodeMatchingFilter, true);
+			});
+
+			test('can get visible parent', () => {
+				const rootWrapper = TestItemFilteredWrapper.getWrapperForTestItem(testsWithLocation, textDocumentFilter);
+
+				const invisible = testsWithLocation.children![1];
+				const invisibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(invisible, textDocumentFilter);
+				const visible = testsWithLocation.children![0];
+				const visibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(visible, textDocumentFilter);
+
+				// The root is always visible
+				assert.strictEqual(rootWrapper.visibleParent, rootWrapper);
+				assert.strictEqual(invisibleWrapper.visibleParent, rootWrapper);
+				assert.strictEqual(visibleWrapper.visibleParent, visibleWrapper);
+			});
+
+			test('can reset cached value of hasNodeMatchingFilter', () => {
+				TestItemFilteredWrapper.getWrapperForTestItem(testsWithLocation, textDocumentFilter);
+
+				const invisible = testsWithLocation.children![1];
+				const invisibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(invisible, textDocumentFilter);
+
+				assert.strictEqual(invisibleWrapper.hasNodeMatchingFilter, false);
+				invisible.location = location1 as any;
+				assert.strictEqual(invisibleWrapper.hasNodeMatchingFilter, false);
+				invisibleWrapper.reset();
+				assert.strictEqual(invisibleWrapper.hasNodeMatchingFilter, true);
+			});
+
+			test('can reset cached value of hasNodeMatchingFilter of parents up to visible parent', () => {
+				const rootWrapper = TestItemFilteredWrapper.getWrapperForTestItem(testsWithLocation, textDocumentFilter);
+
+				const invisibleParent = testsWithLocation.children![1];
+				const invisibleParentWrapper = TestItemFilteredWrapper.getWrapperForTestItem(invisibleParent, textDocumentFilter);
+				const invisible = invisibleParent.children![1];
+				const invisibleWrapper = TestItemFilteredWrapper.getWrapperForTestItem(invisible, textDocumentFilter);
+
+				assert.strictEqual(invisibleParentWrapper.hasNodeMatchingFilter, false);
+				invisible.location = location1 as any;
+				assert.strictEqual(invisibleParentWrapper.hasNodeMatchingFilter, false);
+				invisibleWrapper.reset();
+				assert.strictEqual(invisibleParentWrapper.hasNodeMatchingFilter, true);
+
+				// the root should be undefined due to the reset.
+				assert.strictEqual((rootWrapper as any).matchesFilter, undefined);
+			});
+		});
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts
index 931313c55..6e59c522f 100644
--- a/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostTextEditor.test.ts
@@ -27,12 +27,12 @@ suite('ExtHostTextEditor', () => {
 
 		assert.ok(editor.document);
 		editor._acceptViewColumn(3);
-		assert.equal(3, editor.viewColumn);
+		assert.strictEqual(3, editor.viewColumn);
 
 		editor.dispose();
 
 		assert.throws(() => editor._acceptViewColumn(2));
-		assert.equal(3, editor.viewColumn);
+		assert.strictEqual(3, editor.viewColumn);
 
 		assert.ok(editor.document);
 		assert.throws(() => editor._acceptOptions(null!));
@@ -50,13 +50,13 @@ suite('ExtHostTextEditor', () => {
 			}, new NullLogService(), doc, [], { cursorStyle: 0, insertSpaces: true, lineNumbers: 1, tabSize: 4, indentSize: 4 }, [], 1);
 
 		await editor.edit(edit => { });
-		assert.equal(applyCount, 0);
+		assert.strictEqual(applyCount, 0);
 
 		await editor.edit(edit => { edit.setEndOfLine(1); });
-		assert.equal(applyCount, 1);
+		assert.strictEqual(applyCount, 1);
 
 		await editor.edit(edit => { edit.delete(new Range(0, 0, 1, 1)); });
-		assert.equal(applyCount, 2);
+		assert.strictEqual(applyCount, 2);
 	});
 });
 
@@ -70,7 +70,7 @@ suite('ExtHostTextEditorOptions', () => {
 		let mockProxy: MainThreadTextEditorsShape = {
 			dispose: undefined!,
 			$trySetOptions: (id: string, options: ITextEditorConfigurationUpdate) => {
-				assert.equal(id, '1');
+				assert.strictEqual(id, '1');
 				calls.push(options);
 				return Promise.resolve(undefined);
 			},
@@ -109,7 +109,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: opts.cursorStyle,
 			lineNumbers: opts.lineNumbers
 		};
-		assert.deepEqual(actual, expected);
+		assert.deepStrictEqual(actual, expected);
 	}
 
 	test('can set tabSize to the same value', () => {
@@ -121,7 +121,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can change tabSize to positive integer', () => {
@@ -133,7 +133,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 1 }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 1 }]);
 	});
 
 	test('can change tabSize to positive float', () => {
@@ -145,7 +145,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 2 }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 2 }]);
 	});
 
 	test('can change tabSize to a string number', () => {
@@ -157,7 +157,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 2 }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 2 }]);
 	});
 
 	test('tabSize can request indentation detection', () => {
@@ -169,7 +169,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 'auto' }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 'auto' }]);
 	});
 
 	test('ignores invalid tabSize 1', () => {
@@ -181,7 +181,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid tabSize 2', () => {
@@ -193,7 +193,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid tabSize 3', () => {
@@ -205,7 +205,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid tabSize 4', () => {
@@ -217,7 +217,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can set indentSize to the same value', () => {
@@ -229,7 +229,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can change indentSize to positive integer', () => {
@@ -241,7 +241,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ indentSize: 1 }]);
+		assert.deepStrictEqual(calls, [{ indentSize: 1 }]);
 	});
 
 	test('can change indentSize to positive float', () => {
@@ -253,7 +253,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ indentSize: 2 }]);
+		assert.deepStrictEqual(calls, [{ indentSize: 2 }]);
 	});
 
 	test('can change indentSize to a string number', () => {
@@ -265,7 +265,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ indentSize: 2 }]);
+		assert.deepStrictEqual(calls, [{ indentSize: 2 }]);
 	});
 
 	test('indentSize can request to use tabSize', () => {
@@ -277,7 +277,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ indentSize: 'tabSize' }]);
+		assert.deepStrictEqual(calls, [{ indentSize: 'tabSize' }]);
 	});
 
 	test('indentSize cannot request indentation detection', () => {
@@ -289,7 +289,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid indentSize 1', () => {
@@ -301,7 +301,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid indentSize 2', () => {
@@ -313,7 +313,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid indentSize 3', () => {
@@ -325,7 +325,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('ignores invalid indentSize 4', () => {
@@ -337,7 +337,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can set insertSpaces to the same value', () => {
@@ -349,7 +349,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can set insertSpaces to boolean', () => {
@@ -361,7 +361,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ insertSpaces: true }]);
+		assert.deepStrictEqual(calls, [{ insertSpaces: true }]);
 	});
 
 	test('can set insertSpaces to false string', () => {
@@ -373,7 +373,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can set insertSpaces to truey', () => {
@@ -385,7 +385,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ insertSpaces: true }]);
+		assert.deepStrictEqual(calls, [{ insertSpaces: true }]);
 	});
 
 	test('insertSpaces can request indentation detection', () => {
@@ -397,7 +397,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ insertSpaces: 'auto' }]);
+		assert.deepStrictEqual(calls, [{ insertSpaces: 'auto' }]);
 	});
 
 	test('can set cursorStyle to same value', () => {
@@ -409,7 +409,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can change cursorStyle', () => {
@@ -421,7 +421,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Block,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block }]);
+		assert.deepStrictEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block }]);
 	});
 
 	test('can set lineNumbers to same value', () => {
@@ -433,7 +433,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can change lineNumbers', () => {
@@ -445,7 +445,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.Off
 		});
-		assert.deepEqual(calls, [{ lineNumbers: RenderLineNumbersType.Off }]);
+		assert.deepStrictEqual(calls, [{ lineNumbers: RenderLineNumbersType.Off }]);
 	});
 
 	test('can do bulk updates 0', () => {
@@ -462,7 +462,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, []);
+		assert.deepStrictEqual(calls, []);
 	});
 
 	test('can do bulk updates 1', () => {
@@ -477,7 +477,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 'auto', insertSpaces: true }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 'auto', insertSpaces: true }]);
 	});
 
 	test('can do bulk updates 2', () => {
@@ -492,7 +492,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Line,
 			lineNumbers: RenderLineNumbersType.On
 		});
-		assert.deepEqual(calls, [{ tabSize: 3, insertSpaces: 'auto' }]);
+		assert.deepStrictEqual(calls, [{ tabSize: 3, insertSpaces: 'auto' }]);
 	});
 
 	test('can do bulk updates 3', () => {
@@ -507,7 +507,7 @@ suite('ExtHostTextEditorOptions', () => {
 			cursorStyle: TextEditorCursorStyle.Block,
 			lineNumbers: RenderLineNumbersType.Relative
 		});
-		assert.deepEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block, lineNumbers: RenderLineNumbersType.Relative }]);
+		assert.deepStrictEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block, lineNumbers: RenderLineNumbersType.Relative }]);
 	});
 
 });
diff --git a/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts
index a25792b91..8c67b327a 100644
--- a/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostTreeViews.test.ts
@@ -91,24 +91,24 @@ suite('ExtHostTreeView', function () {
 		return testObject.$getChildren('testNodeTreeProvider')
 			.then(elements => {
 				const actuals = elements.map(e => e.handle);
-				assert.deepEqual(actuals, ['0/0:a', '0/0:b']);
+				assert.deepStrictEqual(actuals, ['0/0:a', '0/0:b']);
 				return Promise.all([
 					testObject.$getChildren('testNodeTreeProvider', '0/0:a')
 						.then(children => {
 							const actuals = children.map(e => e.handle);
-							assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/0:ab']);
+							assert.deepStrictEqual(actuals, ['0/0:a/0:aa', '0/0:a/0:ab']);
 							return Promise.all([
-								testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)),
-								testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:ab').then(children => assert.equal(children.length, 0))
+								testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:aa').then(children => assert.strictEqual(children.length, 0)),
+								testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:ab').then(children => assert.strictEqual(children.length, 0))
 							]);
 						}),
 					testObject.$getChildren('testNodeTreeProvider', '0/0:b')
 						.then(children => {
 							const actuals = children.map(e => e.handle);
-							assert.deepEqual(actuals, ['0/0:b/0:ba', '0/0:b/0:bb']);
+							assert.deepStrictEqual(actuals, ['0/0:b/0:ba', '0/0:b/0:bb']);
 							return Promise.all([
-								testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:ba').then(children => assert.equal(children.length, 0)),
-								testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:bb').then(children => assert.equal(children.length, 0))
+								testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:ba').then(children => assert.strictEqual(children.length, 0)),
+								testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:bb').then(children => assert.strictEqual(children.length, 0))
 							]);
 						})
 				]);
@@ -119,24 +119,24 @@ suite('ExtHostTreeView', function () {
 		return testObject.$getChildren('testNodeWithIdTreeProvider')
 			.then(elements => {
 				const actuals = elements.map(e => e.handle);
-				assert.deepEqual(actuals, ['1/a', '1/b']);
+				assert.deepStrictEqual(actuals, ['1/a', '1/b']);
 				return Promise.all([
 					testObject.$getChildren('testNodeWithIdTreeProvider', '1/a')
 						.then(children => {
 							const actuals = children.map(e => e.handle);
-							assert.deepEqual(actuals, ['1/aa', '1/ab']);
+							assert.deepStrictEqual(actuals, ['1/aa', '1/ab']);
 							return Promise.all([
-								testObject.$getChildren('testNodeWithIdTreeProvider', '1/aa').then(children => assert.equal(children.length, 0)),
-								testObject.$getChildren('testNodeWithIdTreeProvider', '1/ab').then(children => assert.equal(children.length, 0))
+								testObject.$getChildren('testNodeWithIdTreeProvider', '1/aa').then(children => assert.strictEqual(children.length, 0)),
+								testObject.$getChildren('testNodeWithIdTreeProvider', '1/ab').then(children => assert.strictEqual(children.length, 0))
 							]);
 						}),
 					testObject.$getChildren('testNodeWithIdTreeProvider', '1/b')
 						.then(children => {
 							const actuals = children.map(e => e.handle);
-							assert.deepEqual(actuals, ['1/ba', '1/bb']);
+							assert.deepStrictEqual(actuals, ['1/ba', '1/bb']);
 							return Promise.all([
-								testObject.$getChildren('testNodeWithIdTreeProvider', '1/ba').then(children => assert.equal(children.length, 0)),
-								testObject.$getChildren('testNodeWithIdTreeProvider', '1/bb').then(children => assert.equal(children.length, 0))
+								testObject.$getChildren('testNodeWithIdTreeProvider', '1/ba').then(children => assert.strictEqual(children.length, 0)),
+								testObject.$getChildren('testNodeWithIdTreeProvider', '1/bb').then(children => assert.strictEqual(children.length, 0))
 							]);
 						})
 				]);
@@ -146,7 +146,7 @@ suite('ExtHostTreeView', function () {
 	test('construct highlights tree', () => {
 		return testObject.$getChildren('testNodeWithHighlightsTreeProvider')
 			.then(elements => {
-				assert.deepEqual(removeUnsetKeys(elements), [{
+				assert.deepStrictEqual(removeUnsetKeys(elements), [{
 					handle: '1/a',
 					label: { label: 'a', highlights: [[0, 2], [3, 5]] },
 					collapsibleState: TreeItemCollapsibleState.Collapsed
@@ -158,7 +158,7 @@ suite('ExtHostTreeView', function () {
 				return Promise.all([
 					testObject.$getChildren('testNodeWithHighlightsTreeProvider', '1/a')
 						.then(children => {
-							assert.deepEqual(removeUnsetKeys(children), [{
+							assert.deepStrictEqual(removeUnsetKeys(children), [{
 								handle: '1/aa',
 								parentHandle: '1/a',
 								label: { label: 'aa', highlights: [[0, 2], [3, 5]] },
@@ -172,7 +172,7 @@ suite('ExtHostTreeView', function () {
 						}),
 					testObject.$getChildren('testNodeWithHighlightsTreeProvider', '1/b')
 						.then(children => {
-							assert.deepEqual(removeUnsetKeys(children), [{
+							assert.deepStrictEqual(removeUnsetKeys(children), [{
 								handle: '1/ba',
 								parentHandle: '1/b',
 								label: { label: 'ba', highlights: [[0, 2], [3, 5]] },
@@ -200,7 +200,7 @@ suite('ExtHostTreeView', function () {
 			testObject.$getChildren('testNodeWithIdTreeProvider')
 				.then(elements => {
 					const actuals = elements.map(e => e.handle);
-					assert.deepEqual(actuals, ['1/a', '1/b']);
+					assert.deepStrictEqual(actuals, ['1/a', '1/b']);
 					return testObject.$getChildren('testNodeWithIdTreeProvider', '1/a')
 						.then(() => testObject.$getChildren('testNodeWithIdTreeProvider', '1/b'))
 						.then(() => assert.fail('Should fail with duplicate id'))
@@ -212,7 +212,7 @@ suite('ExtHostTreeView', function () {
 
 	test('refresh root', function (done) {
 		target.onRefresh.event(actuals => {
-			assert.equal(undefined, actuals);
+			assert.strictEqual(undefined, actuals);
 			done();
 		});
 		onDidChangeTreeNode.fire(undefined);
@@ -221,8 +221,8 @@ suite('ExtHostTreeView', function () {
 	test('refresh a parent node', () => {
 		return new Promise((c, e) => {
 			target.onRefresh.event(actuals => {
-				assert.deepEqual(['0/0:b'], Object.keys(actuals));
-				assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
+				assert.deepStrictEqual(['0/0:b'], Object.keys(actuals));
+				assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:b']), {
 					handle: '0/0:b',
 					label: { label: 'b' },
 					collapsibleState: TreeItemCollapsibleState.Collapsed
@@ -235,8 +235,8 @@ suite('ExtHostTreeView', function () {
 
 	test('refresh a leaf node', function (done) {
 		target.onRefresh.event(actuals => {
-			assert.deepEqual(['0/0:b/0:bb'], Object.keys(actuals));
-			assert.deepEqual(removeUnsetKeys(actuals['0/0:b/0:bb']), {
+			assert.deepStrictEqual(['0/0:b/0:bb'], Object.keys(actuals));
+			assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:b/0:bb']), {
 				handle: '0/0:b/0:bb',
 				parentHandle: '0/0:b',
 				label: { label: 'bb' },
@@ -262,13 +262,13 @@ suite('ExtHostTreeView', function () {
 	test('refresh parent and child node trigger refresh only on parent - scenario 1', async () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.deepEqual(['0/0:b', '0/0:a/0:aa'], Object.keys(actuals));
-				assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
+				assert.deepStrictEqual(['0/0:b', '0/0:a/0:aa'], Object.keys(actuals));
+				assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:b']), {
 					handle: '0/0:b',
 					label: { label: 'b' },
 					collapsibleState: TreeItemCollapsibleState.Collapsed
 				});
-				assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
+				assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
 					handle: '0/0:a/0:aa',
 					parentHandle: '0/0:a',
 					label: { label: 'aa' },
@@ -285,13 +285,13 @@ suite('ExtHostTreeView', function () {
 	test('refresh parent and child node trigger refresh only on parent - scenario 2', async () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.deepEqual(['0/0:a/0:aa', '0/0:b'], Object.keys(actuals));
-				assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), {
+				assert.deepStrictEqual(['0/0:a/0:aa', '0/0:b'], Object.keys(actuals));
+				assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:b']), {
 					handle: '0/0:b',
 					label: { label: 'b' },
 					collapsibleState: TreeItemCollapsibleState.Collapsed
 				});
-				assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
+				assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), {
 					handle: '0/0:a/0:aa',
 					parentHandle: '0/0:a',
 					label: { label: 'aa' },
@@ -308,8 +308,8 @@ suite('ExtHostTreeView', function () {
 	test('refresh an element for label change', function (done) {
 		labels['a'] = 'aa';
 		target.onRefresh.event(actuals => {
-			assert.deepEqual(['0/0:a'], Object.keys(actuals));
-			assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), {
+			assert.deepStrictEqual(['0/0:a'], Object.keys(actuals));
+			assert.deepStrictEqual(removeUnsetKeys(actuals['0/0:a']), {
 				handle: '0/0:aa',
 				label: { label: 'aa' },
 				collapsibleState: TreeItemCollapsibleState.Collapsed
@@ -322,7 +322,7 @@ suite('ExtHostTreeView', function () {
 	test('refresh calls are throttled on roots', () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.equal(undefined, actuals);
+				assert.strictEqual(undefined, actuals);
 				resolve();
 			});
 			onDidChangeTreeNode.fire(undefined);
@@ -335,7 +335,7 @@ suite('ExtHostTreeView', function () {
 	test('refresh calls are throttled on elements', () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.deepEqual(['0/0:a', '0/0:b'], Object.keys(actuals));
+				assert.deepStrictEqual(['0/0:a', '0/0:b'], Object.keys(actuals));
 				resolve();
 			});
 
@@ -349,7 +349,7 @@ suite('ExtHostTreeView', function () {
 	test('refresh calls are throttled on unknown elements', () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.deepEqual(['0/0:a', '0/0:b'], Object.keys(actuals));
+				assert.deepStrictEqual(['0/0:a', '0/0:b'], Object.keys(actuals));
 				resolve();
 			});
 
@@ -363,7 +363,7 @@ suite('ExtHostTreeView', function () {
 	test('refresh calls are throttled on unknown elements and root', () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.equal(undefined, actuals);
+				assert.strictEqual(undefined, actuals);
 				resolve();
 			});
 
@@ -377,7 +377,7 @@ suite('ExtHostTreeView', function () {
 	test('refresh calls are throttled on elements and root', () => {
 		return runWithEventMerging((resolve) => {
 			target.onRefresh.event(actuals => {
-				assert.equal(undefined, actuals);
+				assert.strictEqual(undefined, actuals);
 				resolve();
 			});
 
@@ -396,7 +396,7 @@ suite('ExtHostTreeView', function () {
 		target.onRefresh.event(() => {
 			testObject.$getChildren('testNodeTreeProvider')
 				.then(elements => {
-					assert.deepEqual(elements.map(e => e.handle), ['0/0:a//0:b']);
+					assert.deepStrictEqual(elements.map(e => e.handle), ['0/0:a//0:b']);
 					done();
 				});
 		});
@@ -439,11 +439,11 @@ suite('ExtHostTreeView', function () {
 			testObject.$getChildren('testNodeTreeProvider')
 				.then(elements => {
 					const actuals = elements.map(e => e.handle);
-					assert.deepEqual(actuals, ['0/0:a', '0/0:b', '0/1:a', '0/0:d', '0/1:b', '0/0:f', '0/2:a']);
+					assert.deepStrictEqual(actuals, ['0/0:a', '0/0:b', '0/1:a', '0/0:d', '0/1:b', '0/0:f', '0/2:a']);
 					return testObject.$getChildren('testNodeTreeProvider', '0/1:b')
 						.then(elements => {
 							const actuals = elements.map(e => e.handle);
-							assert.deepEqual(actuals, ['0/1:b/0:h', '0/1:b/1:h', '0/1:b/0:j', '0/1:b/1:j', '0/1:b/2:h']);
+							assert.deepStrictEqual(actuals, ['0/1:b/0:h', '0/1:b/1:h', '0/1:b/0:j', '0/1:b/1:j', '0/1:b/2:h']);
 							done();
 						});
 				});
@@ -460,7 +460,7 @@ suite('ExtHostTreeView', function () {
 		target.onRefresh.event(() => {
 			testObject.$getChildren('testNodeTreeProvider')
 				.then(elements => {
-					assert.deepEqual(elements.map(e => e.handle), ['0/0:c']);
+					assert.deepStrictEqual(elements.map(e => e.handle), ['0/0:c']);
 					done();
 				});
 		});
@@ -475,7 +475,7 @@ suite('ExtHostTreeView', function () {
 
 		return testObject.$getChildren('testNodeTreeProvider')
 			.then(elements => {
-				assert.deepEqual(elements.map(e => e.handle), ['0/0:a', '0/0:b']);
+				assert.deepStrictEqual(elements.map(e => e.handle), ['0/0:a', '0/0:b']);
 			});
 	});
 
@@ -496,9 +496,9 @@ suite('ExtHostTreeView', function () {
 		return treeView.reveal({ key: 'a' })
 			.then(() => {
 				assert.ok(revealTarget.calledOnce);
-				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-				assert.deepEqual(expected, removeUnsetKeys(revealTarget.args[0][1]));
-				assert.deepEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
+				assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+				assert.deepStrictEqual(expected, removeUnsetKeys(revealTarget.args[0][1]));
+				assert.deepStrictEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
 			});
 	});
 
@@ -512,10 +512,10 @@ suite('ExtHostTreeView', function () {
 		return treeView.reveal({ key: 'aa' })
 			.then(() => {
 				assert.ok(revealTarget.calledOnce);
-				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-				assert.deepEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
-				assert.deepEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
-				assert.deepEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
+				assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+				assert.deepStrictEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
+				assert.deepStrictEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
+				assert.deepStrictEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
 			});
 	});
 
@@ -531,10 +531,10 @@ suite('ExtHostTreeView', function () {
 			.then(() => treeView.reveal({ key: 'aa' })
 				.then(() => {
 					assert.ok(revealTarget.calledOnce);
-					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-					assert.deepEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
-					assert.deepEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
-					assert.deepEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
+					assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+					assert.deepStrictEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
+					assert.deepStrictEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
+					assert.deepStrictEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
 				}));
 	});
 
@@ -558,10 +558,10 @@ suite('ExtHostTreeView', function () {
 		return treeView.reveal({ key: 'bac' }, { select: false, focus: false, expand: false })
 			.then(() => {
 				assert.ok(revealTarget.calledOnce);
-				assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-				assert.deepEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
-				assert.deepEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
-				assert.deepEqual({ select: false, focus: false, expand: false }, revealTarget.args[0][2]);
+				assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+				assert.deepStrictEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
+				assert.deepStrictEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
+				assert.deepStrictEqual({ select: false, focus: false, expand: false }, revealTarget.args[0][2]);
 			});
 	});
 
@@ -589,10 +589,10 @@ suite('ExtHostTreeView', function () {
 				return treeView.reveal({ key: 'ac' })
 					.then(() => {
 						assert.ok(revealTarget.calledOnce);
-						assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-						assert.deepEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
-						assert.deepEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
-						assert.deepEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
+						assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+						assert.deepStrictEqual(expected.item, removeUnsetKeys(revealTarget.args[0][1].item));
+						assert.deepStrictEqual(expected.parentChain, (<Array<any>>(revealTarget.args[0][1].parentChain)).map(arg => removeUnsetKeys(arg)));
+						assert.deepStrictEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][2]);
 					});
 			});
 	});
@@ -630,10 +630,10 @@ suite('ExtHostTreeView', function () {
 					return treeView.reveal({ key: 'bc' })
 						.then(() => {
 							assert.ok(revealTarget.calledOnce);
-							assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
-							assert.deepEqual({ handle: '0/0:b/0:bc', label: { label: 'bc' }, collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:b' }, removeUnsetKeys(revealTarget.args[0][1]));
-							assert.deepEqual([{ handle: '0/0:b', label: { label: 'b' }, collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
-							assert.deepEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][3]);
+							assert.deepStrictEqual('treeDataProvider', revealTarget.args[0][0]);
+							assert.deepStrictEqual({ handle: '0/0:b/0:bc', label: { label: 'bc' }, collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:b' }, removeUnsetKeys(revealTarget.args[0][1]));
+							assert.deepStrictEqual([{ handle: '0/0:b', label: { label: 'b' }, collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
+							assert.deepStrictEqual({ select: true, focus: false, expand: false }, revealTarget.args[0][3]);
 						});
 				});
 			});
diff --git a/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts b/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts
index c64d37147..0cc72cdd1 100644
--- a/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts
@@ -25,45 +25,45 @@ suite('ExtHostTypeConverter', function () {
 	test('MarkdownConvert - uris', function () {
 
 		let data = MarkdownString.from('Hello');
-		assert.equal(isEmptyObject(data.uris), true);
-		assert.equal(data.value, 'Hello');
+		assert.strictEqual(isEmptyObject(data.uris), true);
+		assert.strictEqual(data.value, 'Hello');
 
 		data = MarkdownString.from('Hello [link](foo)');
-		assert.equal(data.value, 'Hello [link](foo)');
-		assert.equal(isEmptyObject(data.uris), true); // no scheme, no uri
+		assert.strictEqual(data.value, 'Hello [link](foo)');
+		assert.strictEqual(isEmptyObject(data.uris), true); // no scheme, no uri
 
 		data = MarkdownString.from('Hello [link](www.noscheme.bad)');
-		assert.equal(data.value, 'Hello [link](www.noscheme.bad)');
-		assert.equal(isEmptyObject(data.uris), true); // no scheme, no uri
+		assert.strictEqual(data.value, 'Hello [link](www.noscheme.bad)');
+		assert.strictEqual(isEmptyObject(data.uris), true); // no scheme, no uri
 
 		data = MarkdownString.from('Hello [link](foo:path)');
-		assert.equal(data.value, 'Hello [link](foo:path)');
-		assert.equal(size(data.uris!), 1);
+		assert.strictEqual(data.value, 'Hello [link](foo:path)');
+		assert.strictEqual(size(data.uris!), 1);
 		assert.ok(!!data.uris!['foo:path']);
 
 		data = MarkdownString.from('hello@foo.bar');
-		assert.equal(data.value, 'hello@foo.bar');
-		assert.equal(size(data.uris!), 1);
+		assert.strictEqual(data.value, 'hello@foo.bar');
+		assert.strictEqual(size(data.uris!), 1);
 		// assert.ok(!!data.uris!['mailto:hello@foo.bar']);
 
 		data = MarkdownString.from('*hello* [click](command:me)');
-		assert.equal(data.value, '*hello* [click](command:me)');
-		assert.equal(size(data.uris!), 1);
+		assert.strictEqual(data.value, '*hello* [click](command:me)');
+		assert.strictEqual(size(data.uris!), 1);
 		assert.ok(!!data.uris!['command:me']);
 
 		data = MarkdownString.from('*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
-		assert.equal(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
-		assert.equal(size(data.uris!), 1);
+		assert.strictEqual(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
+		assert.strictEqual(size(data.uris!), 1);
 		assert.ok(!!data.uris!['file:///somepath/here']);
 
 		data = MarkdownString.from('*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
-		assert.equal(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
-		assert.equal(size(data.uris!), 1);
+		assert.strictEqual(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here)');
+		assert.strictEqual(size(data.uris!), 1);
 		assert.ok(!!data.uris!['file:///somepath/here']);
 
 		data = MarkdownString.from('*hello* [click](file:///somepath/here). [click](file:///somepath/here2)');
-		assert.equal(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here2)');
-		assert.equal(size(data.uris!), 2);
+		assert.strictEqual(data.value, '*hello* [click](file:///somepath/here). [click](file:///somepath/here2)');
+		assert.strictEqual(size(data.uris!), 2);
 		assert.ok(!!data.uris!['file:///somepath/here']);
 		assert.ok(!!data.uris!['file:///somepath/here2']);
 	});
@@ -72,12 +72,12 @@ suite('ExtHostTypeConverter', function () {
 
 		let data = MarkdownString.from('*hello* [click](command:npm.runScriptFromHover?%7B%22documentUri%22%3A%7B%22%24mid%22%3A1%2C%22external%22%3A%22file%3A%2F%2F%2Fc%253A%2Ffoo%2Fbaz.ex%22%2C%22path%22%3A%22%2Fc%3A%2Ffoo%2Fbaz.ex%22%2C%22scheme%22%3A%22file%22%7D%2C%22script%22%3A%22dev%22%7D)');
 		// assert that both uri get extracted but that the latter is only decoded once...
-		assert.equal(size(data.uris!), 2);
+		assert.strictEqual(size(data.uris!), 2);
 		forEach(data.uris!, entry => {
 			if (entry.value.scheme === 'file') {
 				assert.ok(URI.revive(entry.value).toString().indexOf('file:///c%3A') === 0);
 			} else {
-				assert.equal(entry.value.scheme, 'command');
+				assert.strictEqual(entry.value.scheme, 'command');
 			}
 		});
 	});
diff --git a/src/vs/workbench/test/browser/api/extHostTypes.test.ts b/src/vs/workbench/test/browser/api/extHostTypes.test.ts
index 9722d5dac..34acd549a 100644
--- a/src/vs/workbench/test/browser/api/extHostTypes.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostTypes.test.ts
@@ -12,7 +12,7 @@ import { assertType } from 'vs/base/common/types';
 function assertToJSON(a: any, expected: any) {
 	const raw = JSON.stringify(a);
 	const actual = JSON.parse(raw);
-	assert.deepEqual(actual, expected);
+	assert.deepStrictEqual(actual, expected);
 }
 
 suite('ExtHostTypes', function () {
@@ -20,14 +20,14 @@ suite('ExtHostTypes', function () {
 	test('URI, toJSON', function () {
 
 		let uri = URI.parse('file:///path/test.file');
-		assert.deepEqual(uri.toJSON(), {
+		assert.deepStrictEqual(uri.toJSON(), {
 			$mid: 1,
 			scheme: 'file',
 			path: '/path/test.file'
 		});
 
 		assert.ok(uri.fsPath);
-		assert.deepEqual(uri.toJSON(), {
+		assert.deepStrictEqual(uri.toJSON(), {
 			$mid: 1,
 			scheme: 'file',
 			path: '/path/test.file',
@@ -36,7 +36,7 @@ suite('ExtHostTypes', function () {
 		});
 
 		assert.ok(uri.toString());
-		assert.deepEqual(uri.toJSON(), {
+		assert.deepStrictEqual(uri.toJSON(), {
 			$mid: 1,
 			scheme: 'file',
 			path: '/path/test.file',
@@ -54,13 +54,13 @@ suite('ExtHostTypes', function () {
 			return 12;
 		});
 		d.dispose();
-		assert.equal(count, 1);
+		assert.strictEqual(count, 1);
 
 		d.dispose();
-		assert.equal(count, 1);
+		assert.strictEqual(count, 1);
 
 		types.Disposable.from(undefined!, { dispose() { count += 1; } }).dispose();
-		assert.equal(count, 2);
+		assert.strictEqual(count, 2);
 
 
 		assert.throws(() => {
@@ -83,8 +83,8 @@ suite('ExtHostTypes', function () {
 		assert.throws(() => (pos as any).line = 12);
 
 		let { line, character } = pos.toJSON();
-		assert.equal(line, 0);
-		assert.equal(character, 0);
+		assert.strictEqual(line, 0);
+		assert.strictEqual(character, 0);
 	});
 
 	test('Position, toJSON', function () {
@@ -120,11 +120,11 @@ suite('ExtHostTypes', function () {
 		let p2 = new types.Position(1, 2);
 		let p3 = new types.Position(0, 4);
 
-		assert.equal(p1.compareTo(p1), 0);
-		assert.equal(p2.compareTo(p1), -1);
-		assert.equal(p1.compareTo(p2), 1);
-		assert.equal(p2.compareTo(p3), 1);
-		assert.equal(p1.compareTo(p3), 1);
+		assert.strictEqual(p1.compareTo(p1), 0);
+		assert.strictEqual(p2.compareTo(p1), -1);
+		assert.strictEqual(p1.compareTo(p2), 1);
+		assert.strictEqual(p2.compareTo(p3), 1);
+		assert.strictEqual(p1.compareTo(p3), 1);
 	});
 
 	test('Position, translate', function () {
@@ -138,24 +138,24 @@ suite('ExtHostTypes', function () {
 		assert.ok(p1.translate(undefined) === p1);
 
 		let res = p1.translate(-1);
-		assert.equal(res.line, 0);
-		assert.equal(res.character, 3);
+		assert.strictEqual(res.line, 0);
+		assert.strictEqual(res.character, 3);
 
 		res = p1.translate({ lineDelta: -1 });
-		assert.equal(res.line, 0);
-		assert.equal(res.character, 3);
+		assert.strictEqual(res.line, 0);
+		assert.strictEqual(res.character, 3);
 
 		res = p1.translate(undefined, -1);
-		assert.equal(res.line, 1);
-		assert.equal(res.character, 2);
+		assert.strictEqual(res.line, 1);
+		assert.strictEqual(res.character, 2);
 
 		res = p1.translate({ characterDelta: -1 });
-		assert.equal(res.line, 1);
-		assert.equal(res.character, 2);
+		assert.strictEqual(res.line, 1);
+		assert.strictEqual(res.character, 2);
 
 		res = p1.translate(11);
-		assert.equal(res.line, 12);
-		assert.equal(res.character, 3);
+		assert.strictEqual(res.line, 12);
+		assert.strictEqual(res.character, 3);
 
 		assert.throws(() => p1.translate(null!));
 		assert.throws(() => p1.translate(null!, null!));
@@ -178,8 +178,8 @@ suite('ExtHostTypes', function () {
 		assert.ok(p1.with({ line: 1, character: 3 }) === p1);
 
 		let p2 = p1.with({ line: 0, character: 11 });
-		assert.equal(p2.line, 0);
-		assert.equal(p2.character, 11);
+		assert.strictEqual(p2.line, 0);
+		assert.strictEqual(p2.character, 11);
 
 		assert.throws(() => p1.with(null!));
 		assert.throws(() => p1.with(-9));
@@ -210,12 +210,12 @@ suite('ExtHostTypes', function () {
 	test('Range, sorting', function () {
 		// sorts start/end
 		let range = new types.Range(1, 0, 0, 0);
-		assert.equal(range.start.line, 0);
-		assert.equal(range.end.line, 1);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.end.line, 1);
 
 		range = new types.Range(0, 0, 1, 0);
-		assert.equal(range.start.line, 0);
-		assert.equal(range.end.line, 1);
+		assert.strictEqual(range.start.line, 0);
+		assert.strictEqual(range.end.line, 1);
 	});
 
 	test('Range, isEmpty|isSingleLine', function () {
@@ -254,26 +254,26 @@ suite('ExtHostTypes', function () {
 		let res: types.Range;
 
 		res = range.intersection(range)!;
-		assert.equal(res.start.line, 1);
-		assert.equal(res.start.character, 1);
-		assert.equal(res.end.line, 2);
-		assert.equal(res.end.character, 11);
+		assert.strictEqual(res.start.line, 1);
+		assert.strictEqual(res.start.character, 1);
+		assert.strictEqual(res.end.line, 2);
+		assert.strictEqual(res.end.character, 11);
 
 		res = range.intersection(new types.Range(2, 12, 4, 0))!;
-		assert.equal(res, undefined);
+		assert.strictEqual(res, undefined);
 
 		res = range.intersection(new types.Range(0, 0, 1, 0))!;
-		assert.equal(res, undefined);
+		assert.strictEqual(res, undefined);
 
 		res = range.intersection(new types.Range(0, 0, 1, 1))!;
 		assert.ok(res.isEmpty);
-		assert.equal(res.start.line, 1);
-		assert.equal(res.start.character, 1);
+		assert.strictEqual(res.start.line, 1);
+		assert.strictEqual(res.start.character, 1);
 
 		res = range.intersection(new types.Range(2, 11, 61, 1))!;
 		assert.ok(res.isEmpty);
-		assert.equal(res.start.line, 2);
-		assert.equal(res.start.character, 11);
+		assert.strictEqual(res.start.line, 2);
+		assert.strictEqual(res.start.character, 11);
 
 		assert.throws(() => range.intersection(null!));
 		assert.throws(() => range.intersection(undefined!));
@@ -286,14 +286,14 @@ suite('ExtHostTypes', function () {
 		let res: types.Range;
 		res = ran1.union(new types.Range(2, 2, 9, 9));
 		assert.ok(res.start === ran1.start);
-		assert.equal(res.end.line, 9);
-		assert.equal(res.end.character, 9);
+		assert.strictEqual(res.end.line, 9);
+		assert.strictEqual(res.end.character, 9);
 
 		ran1 = new types.Range(2, 1, 5, 3);
 		res = ran1.union(new types.Range(1, 0, 4, 2));
 		assert.ok(res.end === ran1.end);
-		assert.equal(res.start.line, 1);
-		assert.equal(res.start.character, 0);
+		assert.strictEqual(res.start.line, 1);
+		assert.strictEqual(res.start.character, 0);
 	});
 
 	test('Range, with', function () {
@@ -311,22 +311,22 @@ suite('ExtHostTypes', function () {
 		assert.ok(range.with({ end: new types.Position(2, 11) }) === range);
 
 		let res = range.with(undefined, new types.Position(9, 8));
-		assert.equal(res.end.line, 9);
-		assert.equal(res.end.character, 8);
-		assert.equal(res.start.line, 1);
-		assert.equal(res.start.character, 1);
+		assert.strictEqual(res.end.line, 9);
+		assert.strictEqual(res.end.character, 8);
+		assert.strictEqual(res.start.line, 1);
+		assert.strictEqual(res.start.character, 1);
 
 		res = range.with({ end: new types.Position(9, 8) });
-		assert.equal(res.end.line, 9);
-		assert.equal(res.end.character, 8);
-		assert.equal(res.start.line, 1);
-		assert.equal(res.start.character, 1);
+		assert.strictEqual(res.end.line, 9);
+		assert.strictEqual(res.end.character, 8);
+		assert.strictEqual(res.start.line, 1);
+		assert.strictEqual(res.start.character, 1);
 
 		res = range.with({ end: new types.Position(9, 8), start: new types.Position(2, 3) });
-		assert.equal(res.end.line, 9);
-		assert.equal(res.end.character, 8);
-		assert.equal(res.start.line, 2);
-		assert.equal(res.start.character, 3);
+		assert.strictEqual(res.end.line, 9);
+		assert.strictEqual(res.end.character, 8);
+		assert.strictEqual(res.start.line, 2);
+		assert.strictEqual(res.start.character, 3);
 
 		assert.throws(() => range.with(null!));
 		assert.throws(() => range.with(undefined, null!));
@@ -336,14 +336,14 @@ suite('ExtHostTypes', function () {
 
 		let range = new types.Range(1, 1, 2, 11);
 		let edit = new types.TextEdit(range, undefined!);
-		assert.equal(edit.newText, '');
+		assert.strictEqual(edit.newText, '');
 		assertToJSON(edit, { range: [{ line: 1, character: 1 }, { line: 2, character: 11 }], newText: '' });
 
 		edit = new types.TextEdit(range, null!);
-		assert.equal(edit.newText, '');
+		assert.strictEqual(edit.newText, '');
 
 		edit = new types.TextEdit(range, '');
-		assert.equal(edit.newText, '');
+		assert.strictEqual(edit.newText, '');
 	});
 
 	test('WorkspaceEdit', () => {
@@ -356,13 +356,13 @@ suite('ExtHostTypes', function () {
 
 		edit.set(a, [types.TextEdit.insert(new types.Position(0, 0), 'fff')]);
 		assert.ok(edit.has(a));
-		assert.equal(edit.size, 1);
+		assert.strictEqual(edit.size, 1);
 		assertToJSON(edit, [[a.toJSON(), [{ range: [{ line: 0, character: 0 }, { line: 0, character: 0 }], newText: 'fff' }]]]);
 
 		edit.insert(b, new types.Position(1, 1), 'fff');
 		edit.delete(b, new types.Range(0, 0, 0, 0));
 		assert.ok(edit.has(b));
-		assert.equal(edit.size, 2);
+		assert.strictEqual(edit.size, 2);
 		assertToJSON(edit, [
 			[a.toJSON(), [{ range: [{ line: 0, character: 0 }, { line: 0, character: 0 }], newText: 'fff' }]],
 			[b.toJSON(), [{ range: [{ line: 1, character: 1 }, { line: 1, character: 1 }], newText: 'fff' }, { range: [{ line: 0, character: 0 }, { line: 0, character: 0 }], newText: '' }]]
@@ -370,10 +370,10 @@ suite('ExtHostTypes', function () {
 
 		edit.set(b, undefined!);
 		assert.ok(!edit.has(b));
-		assert.equal(edit.size, 1);
+		assert.strictEqual(edit.size, 1);
 
 		edit.set(b, [types.TextEdit.insert(new types.Position(0, 0), 'ffff')]);
-		assert.equal(edit.get(b).length, 1);
+		assert.strictEqual(edit.get(b).length, 1);
 	});
 
 	test('WorkspaceEdit - keep order of text and file changes', function () {
@@ -385,21 +385,21 @@ suite('ExtHostTypes', function () {
 		edit.replace(URI.parse('foo:b'), new types.Range(3, 1, 3, 1), 'bazz');
 
 		const all = edit._allEntries();
-		assert.equal(all.length, 4);
+		assert.strictEqual(all.length, 4);
 
 		const [first, second, third, fourth] = all;
 		assertType(first._type === types.FileEditType.Text);
-		assert.equal(first.uri.toString(), 'foo:a');
+		assert.strictEqual(first.uri.toString(), 'foo:a');
 
 		assertType(second._type === types.FileEditType.File);
-		assert.equal(second.from!.toString(), 'foo:a');
-		assert.equal(second.to!.toString(), 'foo:b');
+		assert.strictEqual(second.from!.toString(), 'foo:a');
+		assert.strictEqual(second.to!.toString(), 'foo:b');
 
 		assertType(third._type === types.FileEditType.Text);
-		assert.equal(third.uri.toString(), 'foo:a');
+		assert.strictEqual(third.uri.toString(), 'foo:a');
 
 		assertType(fourth._type === types.FileEditType.Text);
-		assert.equal(fourth.uri.toString(), 'foo:b');
+		assert.strictEqual(fourth.uri.toString(), 'foo:b');
 	});
 
 	test('WorkspaceEdit - two edits for one resource', function () {
@@ -408,13 +408,13 @@ suite('ExtHostTypes', function () {
 		edit.insert(uri, new types.Position(0, 0), 'Hello');
 		edit.insert(uri, new types.Position(0, 0), 'Foo');
 
-		assert.equal(edit._allEntries().length, 2);
+		assert.strictEqual(edit._allEntries().length, 2);
 		let [first, second] = edit._allEntries();
 
 		assertType(first._type === types.FileEditType.Text);
 		assertType(second._type === types.FileEditType.Text);
-		assert.equal(first.edit.newText, 'Hello');
-		assert.equal(second.edit.newText, 'Foo');
+		assert.strictEqual(first.edit.newText, 'Hello');
+		assert.strictEqual(second.edit.newText, 'Foo');
 	});
 
 	test('DocumentLink', () => {
@@ -463,7 +463,7 @@ suite('ExtHostTypes', function () {
 
 		let info = new types.SymbolInformation('foo', types.SymbolKind.Array, new types.Range(1, 1, 2, 3));
 		assert.ok(info.location instanceof types.Location);
-		assert.equal(info.location.uri, undefined);
+		assert.strictEqual(info.location.uri, undefined);
 	});
 
 	test('SnippetString, builder-methods', function () {
@@ -471,78 +471,78 @@ suite('ExtHostTypes', function () {
 		let string: types.SnippetString;
 
 		string = new types.SnippetString();
-		assert.equal(string.appendText('I need $ and $').value, 'I need \\$ and \\$');
+		assert.strictEqual(string.appendText('I need $ and $').value, 'I need \\$ and \\$');
 
 		string = new types.SnippetString();
-		assert.equal(string.appendText('I need \\$').value, 'I need \\\\\\$');
+		assert.strictEqual(string.appendText('I need \\$').value, 'I need \\\\\\$');
 
 		string = new types.SnippetString();
 		string.appendPlaceholder('fo$o}');
-		assert.equal(string.value, '${1:fo\\$o\\}}');
+		assert.strictEqual(string.value, '${1:fo\\$o\\}}');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendTabstop(0).appendText('bar');
-		assert.equal(string.value, 'foo$0bar');
+		assert.strictEqual(string.value, 'foo$0bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendTabstop().appendText('bar');
-		assert.equal(string.value, 'foo$1bar');
+		assert.strictEqual(string.value, 'foo$1bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendTabstop(42).appendText('bar');
-		assert.equal(string.value, 'foo$42bar');
+		assert.strictEqual(string.value, 'foo$42bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendPlaceholder('farboo').appendText('bar');
-		assert.equal(string.value, 'foo${1:farboo}bar');
+		assert.strictEqual(string.value, 'foo${1:farboo}bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendPlaceholder('far$boo').appendText('bar');
-		assert.equal(string.value, 'foo${1:far\\$boo}bar');
+		assert.strictEqual(string.value, 'foo${1:far\\$boo}bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendPlaceholder(b => b.appendText('abc').appendPlaceholder('nested')).appendText('bar');
-		assert.equal(string.value, 'foo${1:abc${2:nested}}bar');
+		assert.strictEqual(string.value, 'foo${1:abc${2:nested}}bar');
 
 		string = new types.SnippetString();
 		string.appendVariable('foo');
-		assert.equal(string.value, '${foo}');
+		assert.strictEqual(string.value, '${foo}');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendVariable('TM_SELECTED_TEXT').appendText('bar');
-		assert.equal(string.value, 'foo${TM_SELECTED_TEXT}bar');
+		assert.strictEqual(string.value, 'foo${TM_SELECTED_TEXT}bar');
 
 		string = new types.SnippetString();
 		string.appendVariable('BAR', b => b.appendPlaceholder('ops'));
-		assert.equal(string.value, '${BAR:${1:ops}}');
+		assert.strictEqual(string.value, '${BAR:${1:ops}}');
 
 		string = new types.SnippetString();
 		string.appendVariable('BAR', b => { });
-		assert.equal(string.value, '${BAR}');
+		assert.strictEqual(string.value, '${BAR}');
 
 		string = new types.SnippetString();
 		string.appendChoice(['b', 'a', 'r']);
-		assert.equal(string.value, '${1|b,a,r|}');
+		assert.strictEqual(string.value, '${1|b,a,r|}');
 
 		string = new types.SnippetString();
 		string.appendChoice(['b,1', 'a,2', 'r,3']);
-		assert.equal(string.value, '${1|b\\,1,a\\,2,r\\,3|}');
+		assert.strictEqual(string.value, '${1|b\\,1,a\\,2,r\\,3|}');
 
 		string = new types.SnippetString();
 		string.appendChoice(['b', 'a', 'r'], 0);
-		assert.equal(string.value, '${0|b,a,r|}');
+		assert.strictEqual(string.value, '${0|b,a,r|}');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendChoice(['far', 'boo']).appendText('bar');
-		assert.equal(string.value, 'foo${1|far,boo|}bar');
+		assert.strictEqual(string.value, 'foo${1|far,boo|}bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendChoice(['far', '$boo']).appendText('bar');
-		assert.equal(string.value, 'foo${1|far,\\$boo|}bar');
+		assert.strictEqual(string.value, 'foo${1|far,\\$boo|}bar');
 
 		string = new types.SnippetString();
 		string.appendText('foo').appendPlaceholder('farboo').appendChoice(['far', 'boo']).appendText('bar');
-		assert.equal(string.value, 'foo${1:farboo}${2|far,boo|}bar');
+		assert.strictEqual(string.value, 'foo${1:farboo}${2|far,boo|}bar');
 	});
 
 	test('instanceof doesn\'t work for FileSystemError #49386', function () {
@@ -584,7 +584,7 @@ suite('ExtHostTypes', function () {
 		builder.push(1, 0, 5, 1, 1);
 		builder.push(1, 10, 4, 2, 2);
 		builder.push(2, 2, 3, 2, 2);
-		assert.deepEqual(toArr(builder.build().data), [
+		assert.deepStrictEqual(toArr(builder.build().data), [
 			1, 0, 5, 1, 1,
 			0, 10, 4, 2, 2,
 			1, 2, 3, 2, 2
@@ -596,7 +596,7 @@ suite('ExtHostTypes', function () {
 		builder.push(1, 0, 5, 1);
 		builder.push(1, 10, 4, 2);
 		builder.push(2, 2, 3, 2);
-		assert.deepEqual(toArr(builder.build().data), [
+		assert.deepStrictEqual(toArr(builder.build().data), [
 			1, 0, 5, 1, 0,
 			0, 10, 4, 2, 0,
 			1, 2, 3, 2, 0
@@ -609,7 +609,7 @@ suite('ExtHostTypes', function () {
 		builder.push(2, 10, 1, 2, 2);
 		builder.push(2, 15, 2, 3, 3);
 		builder.push(1, 0, 4, 4, 4);
-		assert.deepEqual(toArr(builder.build().data), [
+		assert.deepStrictEqual(toArr(builder.build().data), [
 			1, 0, 4, 4, 4,
 			1, 0, 5, 1, 1,
 			0, 10, 1, 2, 2,
@@ -621,7 +621,7 @@ suite('ExtHostTypes', function () {
 		const builder = new types.SemanticTokensBuilder();
 		builder.push(2, 10, 5, 1, 1);
 		builder.push(2, 2, 4, 2, 2);
-		assert.deepEqual(toArr(builder.build().data), [
+		assert.deepStrictEqual(toArr(builder.build().data), [
 			2, 2, 4, 2, 2,
 			0, 8, 5, 1, 1
 		]);
@@ -636,7 +636,7 @@ suite('ExtHostTypes', function () {
 		builder.push(new types.Range(1, 0, 1, 5), 'bType');
 		builder.push(new types.Range(2, 0, 2, 4), 'cType', ['mod0', 'mod5']);
 		builder.push(new types.Range(3, 0, 3, 3), 'dType', ['mod2', 'mod4']);
-		assert.deepEqual(toArr(builder.build().data), [
+		assert.deepStrictEqual(toArr(builder.build().data), [
 			1, 0, 5, 1, 0,
 			1, 0, 4, 2, 1 | (1 << 5),
 			1, 0, 3, 3, (1 << 2) | (1 << 4)
@@ -645,7 +645,7 @@ suite('ExtHostTypes', function () {
 
 	test('Markdown codeblock rendering is swapped #111604', function () {
 		const md = new types.MarkdownString().appendCodeblock('<img src=0 onerror="alert(1)">', 'html');
-		assert.deepEqual(md.value, '\n```html\n<img src=0 onerror="alert(1)">\n```\n');
+		assert.deepStrictEqual(md.value, '\n```html\n<img src=0 onerror="alert(1)">\n```\n');
 	});
 
 });
diff --git a/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts
index a3eacd6e2..894d43726 100644
--- a/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts
+++ b/src/vs/workbench/test/browser/api/extHostWorkspace.test.ts
@@ -52,7 +52,7 @@ suite('ExtHostWorkspace', function () {
 
 	function assertAsRelativePath(workspace: ExtHostWorkspace, input: string, expected: string, includeWorkspace?: boolean) {
 		const actual = workspace.getRelativePath(input, includeWorkspace);
-		assert.equal(actual, expected);
+		assert.strictEqual(actual, expected);
 	}
 
 	test('asRelativePath', () => {
@@ -116,19 +116,19 @@ suite('ExtHostWorkspace', function () {
 
 	test('getPath, legacy', function () {
 		let ws = createExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
-		assert.equal(ws.getPath(), undefined);
+		assert.strictEqual(ws.getPath(), undefined);
 
 		ws = createExtHostWorkspace(new TestRPCProtocol(), null!, new NullLogService());
-		assert.equal(ws.getPath(), undefined);
+		assert.strictEqual(ws.getPath(), undefined);
 
 		ws = createExtHostWorkspace(new TestRPCProtocol(), undefined!, new NullLogService());
-		assert.equal(ws.getPath(), undefined);
+		assert.strictEqual(ws.getPath(), undefined);
 
 		ws = createExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('Folder'), 0), aWorkspaceFolderData(URI.file('Another/Folder'), 1)] }, new NullLogService());
-		assert.equal(ws.getPath()!.replace(/\\/g, '/'), '/Folder');
+		assert.strictEqual(ws.getPath()!.replace(/\\/g, '/'), '/Folder');
 
 		ws = createExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.file('/Folder'), 0)] }, new NullLogService());
-		assert.equal(ws.getPath()!.replace(/\\/g, '/'), '/Folder');
+		assert.strictEqual(ws.getPath()!.replace(/\\/g, '/'), '/Folder');
 	});
 
 	test('WorkspaceFolder has name and index', function () {
@@ -136,10 +136,10 @@ suite('ExtHostWorkspace', function () {
 
 		const [one, two] = ws.getWorkspaceFolders()!;
 
-		assert.equal(one.name, 'One');
-		assert.equal(one.index, 0);
-		assert.equal(two.name, 'Two');
-		assert.equal(two.index, 1);
+		assert.strictEqual(one.name, 'One');
+		assert.strictEqual(one.index, 0);
+		assert.strictEqual(two.name, 'Two');
+		assert.strictEqual(two.index, 1);
 	});
 
 	test('getContainingWorkspaceFolder', () => {
@@ -154,40 +154,40 @@ suite('ExtHostWorkspace', function () {
 		}, new NullLogService());
 
 		let folder = ws.getWorkspaceFolder(URI.file('/foo/bar'));
-		assert.equal(folder, undefined);
+		assert.strictEqual(folder, undefined);
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/One/file/path.txt'))!;
-		assert.equal(folder.name, 'One');
+		assert.strictEqual(folder.name, 'One');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/file/path.txt'))!;
-		assert.equal(folder.name, 'Two');
+		assert.strictEqual(folder.name, 'Two');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nest'))!;
-		assert.equal(folder.name, 'Two');
+		assert.strictEqual(folder.name, 'Two');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested/file'))!;
-		assert.equal(folder.name, 'Nested');
+		assert.strictEqual(folder.name, 'Nested');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested/f'))!;
-		assert.equal(folder.name, 'Nested');
+		assert.strictEqual(folder.name, 'Nested');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested'), true)!;
-		assert.equal(folder.name, 'Two');
+		assert.strictEqual(folder.name, 'Two');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested/'), true)!;
-		assert.equal(folder.name, 'Two');
+		assert.strictEqual(folder.name, 'Two');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested'))!;
-		assert.equal(folder.name, 'Nested');
+		assert.strictEqual(folder.name, 'Nested');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two/Nested/'))!;
-		assert.equal(folder.name, 'Nested');
+		assert.strictEqual(folder.name, 'Nested');
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two'), true)!;
-		assert.equal(folder, undefined);
+		assert.strictEqual(folder, undefined);
 
 		folder = ws.getWorkspaceFolder(URI.file('/Coding/Two'), false)!;
-		assert.equal(folder.name, 'Two');
+		assert.strictEqual(folder.name, 'Two');
 	});
 
 	test('Multiroot change event should have a delta, #29641', function (done) {
@@ -203,8 +203,8 @@ suite('ExtHostWorkspace', function () {
 
 		let sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.added, []);
-				assert.deepEqual(e.removed, []);
+				assert.deepStrictEqual(e.added, []);
+				assert.deepStrictEqual(e.removed, []);
 			} catch (error) {
 				finish(error);
 			}
@@ -214,9 +214,9 @@ suite('ExtHostWorkspace', function () {
 
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.removed, []);
-				assert.equal(e.added.length, 1);
-				assert.equal(e.added[0].uri.toString(), 'foo:bar');
+				assert.deepStrictEqual(e.removed, []);
+				assert.strictEqual(e.added.length, 1);
+				assert.strictEqual(e.added[0].uri.toString(), 'foo:bar');
 			} catch (error) {
 				finish(error);
 			}
@@ -226,9 +226,9 @@ suite('ExtHostWorkspace', function () {
 
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.removed, []);
-				assert.equal(e.added.length, 1);
-				assert.equal(e.added[0].uri.toString(), 'foo:bar2');
+				assert.deepStrictEqual(e.removed, []);
+				assert.strictEqual(e.added.length, 1);
+				assert.strictEqual(e.added[0].uri.toString(), 'foo:bar2');
 			} catch (error) {
 				finish(error);
 			}
@@ -238,12 +238,12 @@ suite('ExtHostWorkspace', function () {
 
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.equal(e.removed.length, 2);
-				assert.equal(e.removed[0].uri.toString(), 'foo:bar');
-				assert.equal(e.removed[1].uri.toString(), 'foo:bar2');
+				assert.strictEqual(e.removed.length, 2);
+				assert.strictEqual(e.removed[0].uri.toString(), 'foo:bar');
+				assert.strictEqual(e.removed[1].uri.toString(), 'foo:bar2');
 
-				assert.equal(e.added.length, 1);
-				assert.equal(e.added[0].uri.toString(), 'foo:bar3');
+				assert.strictEqual(e.added.length, 1);
+				assert.strictEqual(e.added[0].uri.toString(), 'foo:bar3');
 			} catch (error) {
 				finish(error);
 			}
@@ -259,13 +259,13 @@ suite('ExtHostWorkspace', function () {
 		let firstFolder = ws.getWorkspaceFolders()![0];
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar2'), 0), aWorkspaceFolderData(URI.parse('foo:bar'), 1, 'renamed')] });
 
-		assert.equal(ws.getWorkspaceFolders()![1], firstFolder);
-		assert.equal(firstFolder.index, 1);
-		assert.equal(firstFolder.name, 'renamed');
+		assert.strictEqual(ws.getWorkspaceFolders()![1], firstFolder);
+		assert.strictEqual(firstFolder.index, 1);
+		assert.strictEqual(firstFolder.name, 'renamed');
 
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar3'), 0), aWorkspaceFolderData(URI.parse('foo:bar2'), 1), aWorkspaceFolderData(URI.parse('foo:bar'), 2)] });
-		assert.equal(ws.getWorkspaceFolders()![2], firstFolder);
-		assert.equal(firstFolder.index, 2);
+		assert.strictEqual(ws.getWorkspaceFolders()![2], firstFolder);
+		assert.strictEqual(firstFolder.index, 2);
 
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar3'), 0)] });
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar3'), 0), aWorkspaceFolderData(URI.parse('foo:bar'), 1)] });
@@ -276,18 +276,18 @@ suite('ExtHostWorkspace', function () {
 	test('updateWorkspaceFolders - invalid arguments', function () {
 		let ws = createExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [] }, new NullLogService());
 
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, null!, null!));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 0));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 1));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 1, 0));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, 0));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, -1));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, null!, null!));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 0));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 1));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 1, 0));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, 0));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, -1, -1));
 
 		ws = createExtHostWorkspace(new TestRPCProtocol(), { id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }, new NullLogService());
 
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 1, 1));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2));
-		assert.equal(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 1, asUpdateWorkspaceFolderData(URI.parse('foo:bar'))));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 1, 1));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2));
+		assert.strictEqual(false, ws.updateWorkspaceFolders(extensionDescriptor, 0, 1, asUpdateWorkspaceFolderData(URI.parse('foo:bar'))));
 	});
 
 	test('updateWorkspaceFolders - valid arguments', function (done) {
@@ -312,38 +312,38 @@ suite('ExtHostWorkspace', function () {
 		// Add one folder
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar'))));
-		assert.equal(1, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar'))));
+		assert.strictEqual(1, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
 
 		const firstAddedFolder = ws.getWorkspaceFolders()![0];
 
 		let gotEvent = false;
 		let sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.removed, []);
-				assert.equal(e.added.length, 1);
-				assert.equal(e.added[0].uri.toString(), 'foo:bar');
-				assert.equal(e.added[0], firstAddedFolder); // verify object is still live
+				assert.deepStrictEqual(e.removed, []);
+				assert.strictEqual(e.added.length, 1);
+				assert.strictEqual(e.added[0].uri.toString(), 'foo:bar');
+				assert.strictEqual(e.added[0], firstAddedFolder); // verify object is still live
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0)] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
 
 		//
 		// Add two more folders
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 1, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar1')), asUpdateWorkspaceFolderData(URI.parse('foo:bar2'))));
-		assert.equal(3, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
-		assert.equal(ws.workspace!.folders[2].uri.toString(), URI.parse('foo:bar2').toString());
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 1, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar1')), asUpdateWorkspaceFolderData(URI.parse('foo:bar2'))));
+		assert.strictEqual(3, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
+		assert.strictEqual(ws.workspace!.folders[2].uri.toString(), URI.parse('foo:bar2').toString());
 
 		const secondAddedFolder = ws.getWorkspaceFolders()![1];
 		const thirdAddedFolder = ws.getWorkspaceFolders()![2];
@@ -351,91 +351,91 @@ suite('ExtHostWorkspace', function () {
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.removed, []);
-				assert.equal(e.added.length, 2);
-				assert.equal(e.added[0].uri.toString(), 'foo:bar1');
-				assert.equal(e.added[1].uri.toString(), 'foo:bar2');
-				assert.equal(e.added[0], secondAddedFolder);
-				assert.equal(e.added[1], thirdAddedFolder);
+				assert.deepStrictEqual(e.removed, []);
+				assert.strictEqual(e.added.length, 2);
+				assert.strictEqual(e.added[0].uri.toString(), 'foo:bar1');
+				assert.strictEqual(e.added[1].uri.toString(), 'foo:bar2');
+				assert.strictEqual(e.added[0], secondAddedFolder);
+				assert.strictEqual(e.added[1], thirdAddedFolder);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0), aWorkspaceFolderData(URI.parse('foo:bar1'), 1), aWorkspaceFolderData(URI.parse('foo:bar2'), 2)] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![2], thirdAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![2], thirdAddedFolder); // verify object is still live
 
 		//
 		// Remove one folder
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 2, 1));
-		assert.equal(2, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 2, 1));
+		assert.strictEqual(2, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
 
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.added, []);
-				assert.equal(e.removed.length, 1);
-				assert.equal(e.removed[0], thirdAddedFolder);
+				assert.deepStrictEqual(e.added, []);
+				assert.strictEqual(e.removed.length, 1);
+				assert.strictEqual(e.removed[0], thirdAddedFolder);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0), aWorkspaceFolderData(URI.parse('foo:bar1'), 1)] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
 
 		//
 		// Rename folder
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar'), 'renamed 1'), asUpdateWorkspaceFolderData(URI.parse('foo:bar1'), 'renamed 2')));
-		assert.equal(2, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
-		assert.equal(ws.workspace!.folders[0].name, 'renamed 1');
-		assert.equal(ws.workspace!.folders[1].name, 'renamed 2');
-		assert.equal(ws.getWorkspaceFolders()![0].name, 'renamed 1');
-		assert.equal(ws.getWorkspaceFolders()![1].name, 'renamed 2');
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar'), 'renamed 1'), asUpdateWorkspaceFolderData(URI.parse('foo:bar1'), 'renamed 2')));
+		assert.strictEqual(2, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar1').toString());
+		assert.strictEqual(ws.workspace!.folders[0].name, 'renamed 1');
+		assert.strictEqual(ws.workspace!.folders[1].name, 'renamed 2');
+		assert.strictEqual(ws.getWorkspaceFolders()![0].name, 'renamed 1');
+		assert.strictEqual(ws.getWorkspaceFolders()![1].name, 'renamed 2');
 
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.deepEqual(e.added, []);
-				assert.equal(e.removed.length, []);
+				assert.deepStrictEqual(e.added, []);
+				assert.strictEqual(e.removed.length, 0);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar'), 0, 'renamed 1'), aWorkspaceFolderData(URI.parse('foo:bar1'), 1, 'renamed 2')] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
-		assert.equal(ws.workspace!.folders[0].name, 'renamed 1');
-		assert.equal(ws.workspace!.folders[1].name, 'renamed 2');
-		assert.equal(ws.getWorkspaceFolders()![0].name, 'renamed 1');
-		assert.equal(ws.getWorkspaceFolders()![1].name, 'renamed 2');
+		assert.strictEqual(ws.getWorkspaceFolders()![0], firstAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], secondAddedFolder); // verify object is still live
+		assert.strictEqual(ws.workspace!.folders[0].name, 'renamed 1');
+		assert.strictEqual(ws.workspace!.folders[1].name, 'renamed 2');
+		assert.strictEqual(ws.getWorkspaceFolders()![0].name, 'renamed 1');
+		assert.strictEqual(ws.getWorkspaceFolders()![1].name, 'renamed 2');
 
 		//
 		// Add and remove folders
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar3')), asUpdateWorkspaceFolderData(URI.parse('foo:bar4'))));
-		assert.equal(2, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar3').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar4').toString());
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar3')), asUpdateWorkspaceFolderData(URI.parse('foo:bar4'))));
+		assert.strictEqual(2, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar3').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar4').toString());
 
 		const fourthAddedFolder = ws.getWorkspaceFolders()![0];
 		const fifthAddedFolder = ws.getWorkspaceFolders()![1];
@@ -443,71 +443,71 @@ suite('ExtHostWorkspace', function () {
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.equal(e.added.length, 2);
-				assert.equal(e.added[0], fourthAddedFolder);
-				assert.equal(e.added[1], fifthAddedFolder);
-				assert.equal(e.removed.length, 2);
-				assert.equal(e.removed[0], firstAddedFolder);
-				assert.equal(e.removed[1], secondAddedFolder);
+				assert.strictEqual(e.added.length, 2);
+				assert.strictEqual(e.added[0], fourthAddedFolder);
+				assert.strictEqual(e.added[1], fifthAddedFolder);
+				assert.strictEqual(e.removed.length, 2);
+				assert.strictEqual(e.removed[0], firstAddedFolder);
+				assert.strictEqual(e.removed[1], secondAddedFolder);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar3'), 0), aWorkspaceFolderData(URI.parse('foo:bar4'), 1)] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], fourthAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], fifthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], fourthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], fifthAddedFolder); // verify object is still live
 
 		//
 		// Swap folders
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar4')), asUpdateWorkspaceFolderData(URI.parse('foo:bar3'))));
-		assert.equal(2, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar4').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar3').toString());
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 0, 2, asUpdateWorkspaceFolderData(URI.parse('foo:bar4')), asUpdateWorkspaceFolderData(URI.parse('foo:bar3'))));
+		assert.strictEqual(2, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar4').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar3').toString());
 
-		assert.equal(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
 
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.equal(e.added.length, 0);
-				assert.equal(e.removed.length, 0);
+				assert.strictEqual(e.added.length, 0);
+				assert.strictEqual(e.removed.length, 0);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
 			}
 		});
 		ws.$acceptWorkspaceData({ id: 'foo', name: 'Test', folders: [aWorkspaceFolderData(URI.parse('foo:bar4'), 0), aWorkspaceFolderData(URI.parse('foo:bar3'), 1)] }); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
-		assert.equal(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
-		assert.equal(fifthAddedFolder.index, 0);
-		assert.equal(fourthAddedFolder.index, 1);
+		assert.strictEqual(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
+		assert.strictEqual(fifthAddedFolder.index, 0);
+		assert.strictEqual(fourthAddedFolder.index, 1);
 
 		//
 		// Add one folder after the other without waiting for confirmation (not supported currently)
 		//
 
-		assert.equal(true, ws.updateWorkspaceFolders(extensionDescriptor, 2, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar5'))));
+		assert.strictEqual(true, ws.updateWorkspaceFolders(extensionDescriptor, 2, 0, asUpdateWorkspaceFolderData(URI.parse('foo:bar5'))));
 
-		assert.equal(3, ws.workspace!.folders.length);
-		assert.equal(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar4').toString());
-		assert.equal(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar3').toString());
-		assert.equal(ws.workspace!.folders[2].uri.toString(), URI.parse('foo:bar5').toString());
+		assert.strictEqual(3, ws.workspace!.folders.length);
+		assert.strictEqual(ws.workspace!.folders[0].uri.toString(), URI.parse('foo:bar4').toString());
+		assert.strictEqual(ws.workspace!.folders[1].uri.toString(), URI.parse('foo:bar3').toString());
+		assert.strictEqual(ws.workspace!.folders[2].uri.toString(), URI.parse('foo:bar5').toString());
 
 		const sixthAddedFolder = ws.getWorkspaceFolders()![2];
 
 		gotEvent = false;
 		sub = ws.onDidChangeWorkspace(e => {
 			try {
-				assert.equal(e.added.length, 1);
-				assert.equal(e.added[0], sixthAddedFolder);
+				assert.strictEqual(e.added.length, 1);
+				assert.strictEqual(e.added[0], sixthAddedFolder);
 				gotEvent = true;
 			} catch (error) {
 				finish(error);
@@ -520,12 +520,12 @@ suite('ExtHostWorkspace', function () {
 				aWorkspaceFolderData(URI.parse('foo:bar5'), 2)
 			]
 		}); // simulate acknowledgement from main side
-		assert.equal(gotEvent, true);
+		assert.strictEqual(gotEvent, true);
 		sub.dispose();
 
-		assert.equal(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
-		assert.equal(ws.getWorkspaceFolders()![2], sixthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![0], fifthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![1], fourthAddedFolder); // verify object is still live
+		assert.strictEqual(ws.getWorkspaceFolders()![2], sixthAddedFolder); // verify object is still live
 
 		finish();
 	});
@@ -591,10 +591,10 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
-				assert.equal(includePattern, 'foo');
-				assert.equal(_includeFolder, null);
-				assert.equal(excludePatternOrDisregardExcludes, null);
-				assert.equal(maxResults, 10);
+				assert.strictEqual(includePattern, 'foo');
+				assert.strictEqual(_includeFolder, null);
+				assert.strictEqual(excludePatternOrDisregardExcludes, null);
+				assert.strictEqual(maxResults, 10);
 				return Promise.resolve(null);
 			}
 		});
@@ -613,9 +613,9 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
-				assert.equal(includePattern, 'glob/**');
-				assert.deepEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
-				assert.equal(excludePatternOrDisregardExcludes, null);
+				assert.strictEqual(includePattern, 'glob/**');
+				assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
+				assert.strictEqual(excludePatternOrDisregardExcludes, null);
 				return Promise.resolve(null);
 			}
 		});
@@ -642,9 +642,9 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			$startFileSearch(includePattern: string, _includeFolder: UriComponents | null, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
-				assert.equal(includePattern, 'glob/**');
-				assert.deepEqual(_includeFolder, URI.file('/other/folder').toJSON());
-				assert.equal(excludePatternOrDisregardExcludes, false);
+				assert.strictEqual(includePattern, 'glob/**');
+				assert.deepStrictEqual(_includeFolder, URI.file('/other/folder').toJSON());
+				assert.strictEqual(excludePatternOrDisregardExcludes, false);
 				return Promise.resolve(null);
 			}
 		});
@@ -702,10 +702,10 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
 				mainThreadCalled = true;
-				assert.equal(query.pattern, 'foo');
-				assert.equal(folder, null);
-				assert.equal(options.includePattern, null);
-				assert.equal(options.excludePattern, null);
+				assert.strictEqual(query.pattern, 'foo');
+				assert.strictEqual(folder, null);
+				assert.strictEqual(options.includePattern, undefined);
+				assert.strictEqual(options.excludePattern, undefined);
 				return null;
 			}
 		});
@@ -723,10 +723,10 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
 				mainThreadCalled = true;
-				assert.equal(query.pattern, 'foo');
-				assert.equal(folder, null);
-				assert.equal(options.includePattern, '**/files');
-				assert.equal(options.excludePattern, null);
+				assert.strictEqual(query.pattern, 'foo');
+				assert.strictEqual(folder, null);
+				assert.strictEqual(options.includePattern, '**/files');
+				assert.strictEqual(options.excludePattern, undefined);
 				return null;
 			}
 		});
@@ -744,10 +744,10 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
 				mainThreadCalled = true;
-				assert.equal(query.pattern, 'foo');
-				assert.deepEqual(folder, URI.file('/other/folder').toJSON());
-				assert.equal(options.includePattern, 'glob/**');
-				assert.equal(options.excludePattern, null);
+				assert.strictEqual(query.pattern, 'foo');
+				assert.deepStrictEqual(folder, URI.file('/other/folder').toJSON());
+				assert.strictEqual(options.includePattern, 'glob/**');
+				assert.strictEqual(options.excludePattern, undefined);
 				return null;
 			}
 		});
@@ -783,10 +783,10 @@ suite('ExtHostWorkspace', function () {
 		rpcProtocol.set(MainContext.MainThreadWorkspace, new class extends mock<MainThreadWorkspace>() {
 			async $startTextSearch(query: IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
 				mainThreadCalled = true;
-				assert.equal(query.pattern, 'foo');
-				assert.deepEqual(folder, null);
-				assert.equal(options.includePattern, null);
-				assert.equal(options.excludePattern, 'glob/**'); // exclude folder is ignored...
+				assert.strictEqual(query.pattern, 'foo');
+				assert.deepStrictEqual(folder, null);
+				assert.strictEqual(options.includePattern, undefined);
+				assert.strictEqual(options.excludePattern, 'glob/**'); // exclude folder is ignored...
 				return null;
 			}
 		});
diff --git a/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts b/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts
index f761c11ce..65dc8e42b 100644
--- a/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadCommands.test.ts
@@ -15,7 +15,7 @@ suite('MainThreadCommands', function () {
 	test('dispose on unregister', function () {
 
 		const commands = new MainThreadCommands(SingleProxyRPCProtocol(null), undefined!, new class extends mock<IExtensionService>() { });
-		assert.equal(CommandsRegistry.getCommand('foo'), undefined);
+		assert.strictEqual(CommandsRegistry.getCommand('foo'), undefined);
 
 		// register
 		commands.$registerCommand('foo');
@@ -23,13 +23,13 @@ suite('MainThreadCommands', function () {
 
 		// unregister
 		commands.$unregisterCommand('foo');
-		assert.equal(CommandsRegistry.getCommand('foo'), undefined);
+		assert.strictEqual(CommandsRegistry.getCommand('foo'), undefined);
 	});
 
 	test('unregister all on dispose', function () {
 
 		const commands = new MainThreadCommands(SingleProxyRPCProtocol(null), undefined!, new class extends mock<IExtensionService>() { });
-		assert.equal(CommandsRegistry.getCommand('foo'), undefined);
+		assert.strictEqual(CommandsRegistry.getCommand('foo'), undefined);
 
 		commands.$registerCommand('foo');
 		commands.$registerCommand('bar');
@@ -39,8 +39,8 @@ suite('MainThreadCommands', function () {
 
 		commands.dispose();
 
-		assert.equal(CommandsRegistry.getCommand('foo'), undefined);
-		assert.equal(CommandsRegistry.getCommand('bar'), undefined);
+		assert.strictEqual(CommandsRegistry.getCommand('foo'), undefined);
+		assert.strictEqual(CommandsRegistry.getCommand('bar'), undefined);
 	});
 
 	test('activate and throw when needed', async function () {
@@ -70,18 +70,18 @@ suite('MainThreadCommands', function () {
 			await commands.$executeCommand('bazz', [1, 2, { n: 3 }], true);
 			assert.ok(false);
 		} catch (e) {
-			assert.deepEqual(activations, ['onCommand:bazz']);
-			assert.equal((<Error>e).message, '$executeCommand:retry');
+			assert.deepStrictEqual(activations, ['onCommand:bazz']);
+			assert.strictEqual((<Error>e).message, '$executeCommand:retry');
 		}
 
 		// case 2: no arguments and retry
 		runs.length = 0;
 		await commands.$executeCommand('bazz', [], true);
-		assert.deepEqual(runs, ['bazz']);
+		assert.deepStrictEqual(runs, ['bazz']);
 
 		// case 3: arguments and no retry
 		runs.length = 0;
 		await commands.$executeCommand('bazz', [1, 2, true], false);
-		assert.deepEqual(runs, ['bazz']);
+		assert.deepStrictEqual(runs, ['bazz']);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts
index db13edd95..23455e4ef 100644
--- a/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadConfiguration.test.ts
@@ -65,7 +65,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.resource', 'value', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update resource configuration without configuration target defaults to workspace in folder workspace when resource is provider', function () {
@@ -74,7 +74,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.resource', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update resource configuration without configuration target defaults to workspace in folder workspace when no resource is provider', function () {
@@ -83,7 +83,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.resource', 'value', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update window configuration without configuration target defaults to workspace in multi root workspace when no resource is provided', function () {
@@ -92,7 +92,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.window', 'value', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update window configuration without configuration target defaults to workspace in multi root workspace when resource is provided', function () {
@@ -101,7 +101,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.window', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update window configuration without configuration target defaults to workspace in folder workspace when resource is provider', function () {
@@ -110,7 +110,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.window', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update window configuration without configuration target defaults to workspace in folder workspace when no resource is provider', function () {
@@ -119,7 +119,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.window', 'value', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update resource configuration without configuration target defaults to folder', function () {
@@ -128,7 +128,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(null, 'extHostConfiguration.resource', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
 	});
 
 	test('update configuration with user configuration target', function () {
@@ -137,7 +137,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(ConfigurationTarget.USER, 'extHostConfiguration.window', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.USER, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.USER, target.args[0][3]);
 	});
 
 	test('update configuration with workspace configuration target', function () {
@@ -146,7 +146,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(ConfigurationTarget.WORKSPACE, 'extHostConfiguration.window', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('update configuration with folder configuration target', function () {
@@ -155,7 +155,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$updateConfigurationOption(ConfigurationTarget.WORKSPACE_FOLDER, 'extHostConfiguration.window', 'value', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
 	});
 
 	test('remove resource configuration without configuration target defaults to workspace in multi root workspace when no resource is provided', function () {
@@ -164,7 +164,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.resource', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove resource configuration without configuration target defaults to workspace in folder workspace when resource is provider', function () {
@@ -173,7 +173,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.resource', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove resource configuration without configuration target defaults to workspace in folder workspace when no resource is provider', function () {
@@ -182,7 +182,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.resource', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove window configuration without configuration target defaults to workspace in multi root workspace when no resource is provided', function () {
@@ -191,7 +191,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.window', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove window configuration without configuration target defaults to workspace in multi root workspace when resource is provided', function () {
@@ -200,7 +200,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.window', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove window configuration without configuration target defaults to workspace in folder workspace when resource is provider', function () {
@@ -209,7 +209,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.window', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove window configuration without configuration target defaults to workspace in folder workspace when no resource is provider', function () {
@@ -218,7 +218,7 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.window', undefined, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE, target.args[0][3]);
 	});
 
 	test('remove configuration without configuration target defaults to folder', function () {
@@ -227,6 +227,6 @@ suite('MainThreadConfiguration', function () {
 
 		testObject.$removeConfigurationOption(null, 'extHostConfiguration.resource', { resource: URI.file('abc') }, undefined);
 
-		assert.equal(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
+		assert.strictEqual(ConfigurationTarget.WORKSPACE_FOLDER, target.args[0][3]);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts
index 3f10f0cff..6f28fccec 100644
--- a/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadDiagnostics.test.ts
@@ -10,6 +10,7 @@ import { URI } from 'vs/base/common/uri';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { mock } from 'vs/workbench/test/common/workbenchTestServices';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
+import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
 
 
 suite('MainThreadDiagnostics', function () {
@@ -25,6 +26,7 @@ suite('MainThreadDiagnostics', function () {
 		let diag = new MainThreadDiagnostics(
 			new class implements IExtHostContext {
 				remoteAuthority = '';
+				extensionHostKind = ExtensionHostKind.LocalProcess;
 				assertRegistered() { }
 				set(v: any): any { return null; }
 				getProxy(): any {
@@ -51,8 +53,8 @@ suite('MainThreadDiagnostics', function () {
 			source: 'me'
 		}]]]);
 
-		assert.equal(markerService.read().length, 1);
+		assert.strictEqual(markerService.read().length, 1);
 		diag.dispose();
-		assert.equal(markerService.read().length, 0);
+		assert.strictEqual(markerService.read().length, 0);
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts
index f8f606f98..44e7a8a7e 100644
--- a/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadDocumentContentProviders.test.ts
@@ -23,13 +23,13 @@ suite('MainThreadDocumentContentProviders', function () {
 		let providers = new MainThreadDocumentContentProviders(new TestRPCProtocol(), null!, null!,
 			new class extends mock<IModelService>() {
 				getModel(_uri: URI) {
-					assert.equal(uri.toString(), _uri.toString());
+					assert.strictEqual(uri.toString(), _uri.toString());
 					return model;
 				}
 			},
 			new class extends mock<IEditorWorkerService>() {
 				computeMoreMinimalEdits(_uri: URI, data: TextEdit[] | undefined) {
-					assert.equal(model.getValue(), '1');
+					assert.strictEqual(model.getValue(), '1');
 					return Promise.resolve(data);
 				}
 			},
diff --git a/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts
index 7740d677a..57be38dfd 100644
--- a/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadDocuments.test.ts
@@ -32,7 +32,7 @@ suite('BoundModelReferenceCollection', () => {
 			});
 
 		await timeout(30);
-		assert.equal(didDispose, true);
+		assert.strictEqual(didDispose, true);
 	});
 
 	test('max size', () => {
@@ -66,7 +66,7 @@ suite('BoundModelReferenceCollection', () => {
 				}
 			});
 
-		assert.deepEqual(disposed, [0, 1]);
+		assert.deepStrictEqual(disposed, [0, 1]);
 	});
 
 	test('dispose uri', () => {
@@ -119,15 +119,15 @@ suite('BoundModelReferenceCollection', () => {
 			});
 
 		col.remove(URI.parse('test:///unknown'));
-		assert.equal(disposed.length, 0);
+		assert.strictEqual(disposed.length, 0);
 
 		col.remove(URI.parse('test:///farboo'));
-		assert.deepEqual(disposed, [0]);
+		assert.deepStrictEqual(disposed, [0]);
 
 		disposed = [];
 
 		col.remove(URI.parse('test:///boo'));
-		assert.deepEqual(disposed, [2, 3]);
+		assert.deepStrictEqual(disposed, [2, 3]);
 	});
 
 });
diff --git a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts
index d99fdd7ab..da3e167df 100644
--- a/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadDocumentsAndEditors.test.ts
@@ -110,14 +110,14 @@ suite('MainThreadDocumentsAndEditors', () => {
 
 		modelService.createModel('farboo', null);
 
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		const [delta] = deltas;
 
-		assert.equal(delta.addedDocuments!.length, 1);
-		assert.equal(delta.removedDocuments, undefined);
-		assert.equal(delta.addedEditors, undefined);
-		assert.equal(delta.removedEditors, undefined);
-		assert.equal(delta.newActiveEditor, null);
+		assert.strictEqual(delta.addedDocuments!.length, 1);
+		assert.strictEqual(delta.removedDocuments, undefined);
+		assert.strictEqual(delta.addedEditors, undefined);
+		assert.strictEqual(delta.removedEditors, undefined);
+		assert.strictEqual(delta.newActiveEditor, undefined);
 	});
 
 	test('ignore huge model', function () {
@@ -126,13 +126,13 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const model = modelService.createModel(hugeModelString, null);
 		assert.ok(model.isTooLargeForSyncing());
 
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		const [delta] = deltas;
-		assert.equal(delta.newActiveEditor, null);
-		assert.equal(delta.addedDocuments, undefined);
-		assert.equal(delta.removedDocuments, undefined);
-		assert.equal(delta.addedEditors, undefined);
-		assert.equal(delta.removedEditors, undefined);
+		assert.strictEqual(delta.newActiveEditor, null);
+		assert.strictEqual(delta.addedDocuments, undefined);
+		assert.strictEqual(delta.removedDocuments, undefined);
+		assert.strictEqual(delta.addedEditors, undefined);
+		assert.strictEqual(delta.removedEditors, undefined);
 	});
 
 	test('ignore simple widget model', function () {
@@ -141,13 +141,13 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const model = modelService.createModel('test', null, undefined, true);
 		assert.ok(model.isForSimpleWidget);
 
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		const [delta] = deltas;
-		assert.equal(delta.newActiveEditor, null);
-		assert.equal(delta.addedDocuments, undefined);
-		assert.equal(delta.removedDocuments, undefined);
-		assert.equal(delta.addedEditors, undefined);
-		assert.equal(delta.removedEditors, undefined);
+		assert.strictEqual(delta.newActiveEditor, null);
+		assert.strictEqual(delta.addedDocuments, undefined);
+		assert.strictEqual(delta.removedDocuments, undefined);
+		assert.strictEqual(delta.addedEditors, undefined);
+		assert.strictEqual(delta.removedEditors, undefined);
 	});
 
 	test('ignore huge model from editor', function () {
@@ -156,22 +156,22 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const model = modelService.createModel(hugeModelString, null);
 		const editor = myCreateTestCodeEditor(model);
 
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		deltas.length = 0;
-		assert.equal(deltas.length, 0);
+		assert.strictEqual(deltas.length, 0);
 
 		editor.dispose();
 	});
 
 	test('ignore editor w/o model', () => {
 		const editor = myCreateTestCodeEditor(undefined);
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		const [delta] = deltas;
-		assert.equal(delta.newActiveEditor, null);
-		assert.equal(delta.addedDocuments, undefined);
-		assert.equal(delta.removedDocuments, undefined);
-		assert.equal(delta.addedEditors, undefined);
-		assert.equal(delta.removedEditors, undefined);
+		assert.strictEqual(delta.newActiveEditor, null);
+		assert.strictEqual(delta.addedDocuments, undefined);
+		assert.strictEqual(delta.removedDocuments, undefined);
+		assert.strictEqual(delta.addedEditors, undefined);
+		assert.strictEqual(delta.removedEditors, undefined);
 
 		editor.dispose();
 	});
@@ -182,19 +182,19 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const model = modelService.createModel('farboo', null);
 		const editor = myCreateTestCodeEditor(model);
 
-		assert.equal(deltas.length, 2);
+		assert.strictEqual(deltas.length, 2);
 		const [first, second] = deltas;
-		assert.equal(first.addedDocuments!.length, 1);
-		assert.equal(first.newActiveEditor, null);
-		assert.equal(first.removedDocuments, undefined);
-		assert.equal(first.addedEditors, undefined);
-		assert.equal(first.removedEditors, undefined);
+		assert.strictEqual(first.addedDocuments!.length, 1);
+		assert.strictEqual(first.newActiveEditor, undefined);
+		assert.strictEqual(first.removedDocuments, undefined);
+		assert.strictEqual(first.addedEditors, undefined);
+		assert.strictEqual(first.removedEditors, undefined);
 
-		assert.equal(second.addedEditors!.length, 1);
-		assert.equal(second.addedDocuments, undefined);
-		assert.equal(second.removedDocuments, undefined);
-		assert.equal(second.removedEditors, undefined);
-		assert.equal(second.newActiveEditor, undefined);
+		assert.strictEqual(second.addedEditors!.length, 1);
+		assert.strictEqual(second.addedDocuments, undefined);
+		assert.strictEqual(second.removedDocuments, undefined);
+		assert.strictEqual(second.removedEditors, undefined);
+		assert.strictEqual(second.newActiveEditor, undefined);
 
 		editor.dispose();
 	});
@@ -208,14 +208,14 @@ suite('MainThreadDocumentsAndEditors', () => {
 		deltas.length = 0;
 
 		modelService.destroyModel(model.uri);
-		assert.equal(deltas.length, 1);
+		assert.strictEqual(deltas.length, 1);
 		const [first] = deltas;
 
-		assert.equal(first.newActiveEditor, null);
-		assert.equal(first.removedEditors!.length, 1);
-		assert.equal(first.removedDocuments!.length, 1);
-		assert.equal(first.addedDocuments, undefined);
-		assert.equal(first.addedEditors, undefined);
+		assert.strictEqual(first.newActiveEditor, undefined);
+		assert.strictEqual(first.removedEditors!.length, 1);
+		assert.strictEqual(first.removedDocuments!.length, 1);
+		assert.strictEqual(first.addedDocuments, undefined);
+		assert.strictEqual(first.addedEditors, undefined);
 
 		editor.dispose();
 	});
diff --git a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
index b413ec9fa..cace30fd3 100644
--- a/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadEditors.test.ts
@@ -19,7 +19,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { TestFileService, TestEditorService, TestEditorGroupsService, TestEnvironmentService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { TestFileService, TestEditorService, TestEditorGroupsService, TestEnvironmentService, TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { BulkEditService } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditService';
 import { NullLogService, ILogService } from 'vs/platform/log/common/log';
 import { ITextModelService, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
@@ -40,7 +40,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IWorkingCopyFileService, IMoveOperation, IDeleteOperation, ICopyOperation, ICreateFileOperation, ICreateOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService';
 import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
@@ -50,6 +50,9 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { TestTextResourcePropertiesService, TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
 import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
 import { extUri } from 'vs/base/common/resources';
+import { ITextSnapshot } from 'vs/editor/common/model';
+import { VSBuffer, VSBufferReadable } from 'vs/base/common/buffer';
+import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
 suite('MainThreadEditors', () => {
 
@@ -92,6 +95,7 @@ suite('MainThreadEditors', () => {
 		services.set(ICodeEditorService, new TestCodeEditorService());
 		services.set(IFileService, new TestFileService());
 		services.set(IEditorService, new TestEditorService());
+		services.set(ILifecycleService, new TestLifecycleService());
 		services.set(IEditorGroupsService, new TestEditorGroupsService());
 		services.set(ITextFileService, new class extends mock<ITextFileService>() {
 			isDirty() { return false; }
@@ -100,26 +104,40 @@ suite('MainThreadEditors', () => {
 				onDidRevert: Event.None,
 				onDidChangeDirty: Event.None
 			};
+			create(operations: { resource: URI }[]) {
+				for (const o of operations) {
+					createdResources.add(o.resource);
+				}
+				return Promise.resolve(Object.create(null));
+			}
+			async getEncodedReadable(resource: URI, value?: string | ITextSnapshot): Promise<VSBuffer | VSBufferReadable | undefined> {
+				return undefined;
+			}
 		});
 		services.set(IWorkingCopyFileService, new class extends mock<IWorkingCopyFileService>() {
 			onDidRunWorkingCopyFileOperation = Event.None;
-			create(resource: URI) {
-				createdResources.add(resource);
+			createFolder(operations: ICreateOperation[]): any {
+				this.create(operations);
+			}
+			create(operations: ICreateFileOperation[]) {
+				for (const operation of operations) {
+					createdResources.add(operation.resource);
+				}
 				return Promise.resolve(Object.create(null));
 			}
-			move(files: { source: URI, target: URI }[]) {
-				const { source, target } = files[0];
+			move(operations: IMoveOperation[]) {
+				const { source, target } = operations[0].file;
 				movedResources.set(source, target);
 				return Promise.resolve(Object.create(null));
 			}
-			copy(files: { source: URI, target: URI }[]) {
-				const { source, target } = files[0];
+			copy(operations: ICopyOperation[]) {
+				const { source, target } = operations[0].file;
 				copiedResources.set(source, target);
 				return Promise.resolve(Object.create(null));
 			}
-			delete(resources: URI[]) {
-				for (const resource of resources) {
-					deletedResources.add(resource);
+			delete(operations: IDeleteOperation[]) {
+				for (const operation of operations) {
+					deletedResources.add(operation.resource);
 				}
 				return Promise.resolve(undefined);
 			}
@@ -183,7 +201,7 @@ suite('MainThreadEditors', () => {
 		model.applyEdits([EditOperation.insert(new Position(0, 0), 'something')]);
 
 		return editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit] }).then((result) => {
-			assert.equal(result, false);
+			assert.strictEqual(result, false);
 		});
 	});
 
@@ -212,11 +230,11 @@ suite('MainThreadEditors', () => {
 
 		let p1 = editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit1] }).then((result) => {
 			// first edit request succeeds
-			assert.equal(result, true);
+			assert.strictEqual(result, true);
 		});
 		let p2 = editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit2] }).then((result) => {
 			// second edit request fails
-			assert.equal(result, false);
+			assert.strictEqual(result, false);
 		});
 		return Promise.all([p1, p2]);
 	});
@@ -229,10 +247,10 @@ suite('MainThreadEditors', () => {
 				{ _type: WorkspaceEditType.File, oldUri: resource, newUri: undefined, options: undefined }
 			]
 		}).then((result) => {
-			assert.equal(result, true);
-			assert.equal(movedResources.get(resource), resource);
-			assert.equal(createdResources.has(resource), true);
-			assert.equal(deletedResources.has(resource), true);
+			assert.strictEqual(result, true);
+			assert.strictEqual(movedResources.get(resource), resource);
+			assert.strictEqual(createdResources.has(resource), true);
+			assert.strictEqual(deletedResources.has(resource), true);
 		});
 	});
 });
diff --git a/src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts b/src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts
index 4d93df220..2888c4e22 100644
--- a/src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts
+++ b/src/vs/workbench/test/browser/api/mainThreadTreeViews.test.ts
@@ -17,6 +17,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ViewDescriptorService } from 'vs/workbench/services/views/browser/viewDescriptorService';
 import { CustomTreeView } from 'vs/workbench/browser/parts/views/treeView';
+import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
 
 suite('MainThreadHostTreeView', function () {
 	const testTreeViewId = 'testTreeView';
@@ -61,6 +62,7 @@ suite('MainThreadHostTreeView', function () {
 		mainThreadTreeViews = new MainThreadTreeViews(
 			new class implements IExtHostContext {
 				remoteAuthority = '';
+				extensionHostKind = ExtensionHostKind.LocalProcess;
 				assertRegistered() { }
 				set(v: any): any { return null; }
 				getProxy(): any {
diff --git a/src/vs/workbench/test/browser/api/testRPCProtocol.ts b/src/vs/workbench/test/browser/api/testRPCProtocol.ts
index d2d2b1c50..196bff1c5 100644
--- a/src/vs/workbench/test/browser/api/testRPCProtocol.ts
+++ b/src/vs/workbench/test/browser/api/testRPCProtocol.ts
@@ -8,6 +8,7 @@ import { CharCode } from 'vs/base/common/charCode';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { isThenable } from 'vs/base/common/async';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
+import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensions';
 
 export function SingleProxyRPCProtocol(thing: any): IExtHostContext & IExtHostRpcService {
 	return {
@@ -20,7 +21,8 @@ export function SingleProxyRPCProtocol(thing: any): IExtHostContext & IExtHostRp
 			return value;
 		},
 		assertRegistered: undefined!,
-		drain: undefined!
+		drain: undefined!,
+		extensionHostKind: ExtensionHostKind.LocalProcess
 	};
 }
 
@@ -28,6 +30,7 @@ export class TestRPCProtocol implements IExtHostContext, IExtHostRpcService {
 
 	public _serviceBrand: undefined;
 	public remoteAuthority = null!;
+	public extensionHostKind = ExtensionHostKind.LocalProcess;
 
 	private _callCountValue: number = 0;
 	private _idle?: Promise<any>;
diff --git a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts b/src/vs/workbench/test/browser/codeeditor.test.ts
similarity index 99%
rename from src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
rename to src/vs/workbench/test/browser/codeeditor.test.ts
index 224d20cfa..736e09570 100644
--- a/src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
+++ b/src/vs/workbench/test/browser/codeeditor.test.ts
@@ -10,7 +10,7 @@ import { workbenchInstantiationService, TestEditorService } from 'vs/workbench/t
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
-import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
+import { RangeHighlightDecorations } from 'vs/workbench/browser/codeeditor';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { Range, IRange } from 'vs/editor/common/core/range';
diff --git a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
index 4d7f774bf..cd0167186 100644
--- a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
@@ -6,12 +6,13 @@
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
 import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { EditorBreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
+import { BreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { FileKind } from 'vs/platform/files/common/files';
 import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices';
 import { Workspace } from 'vs/platform/workspace/test/common/testWorkspace';
-
+import { mock } from 'vs/base/test/common/mock';
+import { IOutlineService } from 'vs/workbench/services/outline/browser/outline';
 
 suite('Breadcrumb Model', function () {
 
@@ -33,7 +34,7 @@ suite('Breadcrumb Model', function () {
 
 	test('only uri, inside workspace', function () {
 
-		let model = new EditorBreadcrumbsModel(URI.parse('foo:/bar/baz/ws/some/path/file.ts'), URI.parse('foo:/bar/baz/ws/some/path/file.ts'), undefined, configService, configService, workspaceService);
+		let model = new BreadcrumbsModel(URI.parse('foo:/bar/baz/ws/some/path/file.ts'), undefined, configService, workspaceService, new class extends mock<IOutlineService>() { });
 		let elements = model.getElements();
 
 		assert.equal(elements.length, 3);
@@ -48,7 +49,7 @@ suite('Breadcrumb Model', function () {
 
 	test('display uri matters for FileElement', function () {
 
-		let model = new EditorBreadcrumbsModel(URI.parse('foo:/bar/baz/ws/some/PATH/file.ts'), URI.parse('foo:/bar/baz/ws/some/path/file.ts'), undefined, configService, configService, workspaceService);
+		let model = new BreadcrumbsModel(URI.parse('foo:/bar/baz/ws/some/PATH/file.ts'), undefined, configService, workspaceService, new class extends mock<IOutlineService>() { });
 		let elements = model.getElements();
 
 		assert.equal(elements.length, 3);
@@ -63,7 +64,7 @@ suite('Breadcrumb Model', function () {
 
 	test('only uri, outside workspace', function () {
 
-		let model = new EditorBreadcrumbsModel(URI.parse('foo:/outside/file.ts'), URI.parse('foo:/outside/file.ts'), undefined, configService, configService, workspaceService);
+		let model = new BreadcrumbsModel(URI.parse('foo:/outside/file.ts'), undefined, configService, workspaceService, new class extends mock<IOutlineService>() { });
 		let elements = model.getElements();
 
 		assert.equal(elements.length, 2);
diff --git a/src/vs/workbench/test/browser/parts/editor/editor.test.ts b/src/vs/workbench/test/browser/parts/editor/editor.test.ts
index 8ff03965e..f96868215 100644
--- a/src/vs/workbench/test/browser/parts/editor/editor.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editor.test.ts
@@ -41,38 +41,38 @@ suite('Workbench editor', () => {
 
 		const untitled = instantiationService.createInstance(UntitledTextEditorInput, service.create());
 
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled)!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled, { filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(untitled, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled)!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled, { filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(untitled, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
 		assert.ok(!EditorResourceAccessor.getCanonicalUri(untitled, { filterByScheme: Schemas.file }));
 
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled)!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled, { filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(untitled, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled)!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled, { filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(untitled, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
 		assert.ok(!EditorResourceAccessor.getOriginalUri(untitled, { filterByScheme: Schemas.file }));
 
 		const file = new TestEditorInput(URI.file('/some/path.txt'), 'editorResourceFileTest');
 
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file)!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file, { filterByScheme: Schemas.file })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(file, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file)!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file, { filterByScheme: Schemas.file })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(file, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
 		assert.ok(!EditorResourceAccessor.getCanonicalUri(file, { filterByScheme: Schemas.untitled }));
 
-		assert.equal(EditorResourceAccessor.getOriginalUri(file)!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(file, { filterByScheme: Schemas.file })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(file, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file)!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file, { supportSideBySide: SideBySideEditor.BOTH })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file, { filterByScheme: Schemas.file })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(file, { filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
 		assert.ok(!EditorResourceAccessor.getOriginalUri(file, { filterByScheme: Schemas.untitled }));
 
 		const diffEditorInput = instantiationService.createInstance(DiffEditorInput, 'name', 'description', untitled, file, undefined);
@@ -80,47 +80,47 @@ suite('Workbench editor', () => {
 		assert.ok(!EditorResourceAccessor.getCanonicalUri(diffEditorInput));
 		assert.ok(!EditorResourceAccessor.getCanonicalUri(diffEditorInput, { filterByScheme: Schemas.file }));
 
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
 
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
 
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.file }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.file }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
 
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.untitled }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
-		assert.equal((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.untitled }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getCanonicalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
 
 		assert.ok(!EditorResourceAccessor.getOriginalUri(diffEditorInput));
 		assert.ok(!EditorResourceAccessor.getOriginalUri(diffEditorInput, { filterByScheme: Schemas.file }));
 
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file })!.toString(), file.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file })!.toString(), file.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), file.resource.toString());
 
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: Schemas.untitled })!.toString(), untitled.resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.SECONDARY, filterByScheme: [Schemas.file, Schemas.untitled] })!.toString(), untitled.resource.toString());
 
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.file }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.file }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).primary.toString(), file.resource.toString());
 
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.untitled }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
-		assert.equal((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: Schemas.untitled }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
+		assert.strictEqual((EditorResourceAccessor.getOriginalUri(diffEditorInput, { supportSideBySide: SideBySideEditor.BOTH, filterByScheme: [Schemas.file, Schemas.untitled] }) as { primary: URI, secondary: URI }).secondary.toString(), untitled.resource.toString());
 
 
 		const resource = URI.file('/some/path.txt');
 		const preferredResource = URI.file('/some/PATH.txt');
 		const fileWithPreferredResource = new TestEditorInputWithPreferredResource(URI.file('/some/path.txt'), URI.file('/some/PATH.txt'), 'editorResourceFileTest');
 
-		assert.equal(EditorResourceAccessor.getCanonicalUri(fileWithPreferredResource)?.toString(), resource.toString());
-		assert.equal(EditorResourceAccessor.getOriginalUri(fileWithPreferredResource)?.toString(), preferredResource.toString());
+		assert.strictEqual(EditorResourceAccessor.getCanonicalUri(fileWithPreferredResource)?.toString(), resource.toString());
+		assert.strictEqual(EditorResourceAccessor.getOriginalUri(fileWithPreferredResource)?.toString(), preferredResource.toString());
 	});
 });
diff --git a/src/vs/workbench/test/browser/parts/editor/editorGroups.test.ts b/src/vs/workbench/test/browser/parts/editor/editorGroups.test.ts
index 20ca1df27..0eae91163 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorGroups.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorGroups.test.ts
@@ -239,7 +239,7 @@ suite('Workbench editor groups', () => {
 	test('Clone Group', function () {
 		const group = createGroup();
 
-		const input1 = input();
+		const input1 = input() as TestEditorInput;
 		const input2 = input();
 		const input3 = input();
 
@@ -253,20 +253,27 @@ suite('Workbench editor groups', () => {
 		assert.ok(group.isSticky(input2));
 
 		const clone = group.clone();
-		assert.notEqual(group.id, clone.id);
-		assert.equal(clone.count, 3);
+		assert.notStrictEqual(group.id, clone.id);
+		assert.strictEqual(clone.count, 3);
 
-		assert.equal(clone.isPinned(input1), true);
-		assert.equal(clone.isActive(input1), false);
-		assert.equal(clone.isSticky(input1), false);
+		let didEditorLabelChange = false;
+		const toDispose = clone.onDidEditorLabelChange(() => didEditorLabelChange = true);
+		input1.setLabel();
+		assert.ok(didEditorLabelChange);
 
-		assert.equal(clone.isPinned(input2), true);
-		assert.equal(clone.isActive(input2), false);
-		assert.equal(clone.isSticky(input2), true);
+		assert.strictEqual(clone.isPinned(input1), true);
+		assert.strictEqual(clone.isActive(input1), false);
+		assert.strictEqual(clone.isSticky(input1), false);
 
-		assert.equal(clone.isPinned(input3), false);
-		assert.equal(clone.isActive(input3), true);
-		assert.equal(clone.isSticky(input3), false);
+		assert.strictEqual(clone.isPinned(input2), true);
+		assert.strictEqual(clone.isActive(input2), false);
+		assert.strictEqual(clone.isSticky(input2), true);
+
+		assert.strictEqual(clone.isPinned(input3), false);
+		assert.strictEqual(clone.isActive(input3), true);
+		assert.strictEqual(clone.isSticky(input3), false);
+
+		toDispose.dispose();
 	});
 
 	test('contains()', function () {
@@ -281,82 +288,82 @@ suite('Workbench editor groups', () => {
 
 		group.openEditor(input1, { pinned: true, active: true });
 
-		assert.equal(group.contains(input1), true);
-		assert.equal(group.contains(input1, { strictEquals: true }), true);
-		assert.equal(group.contains(input1, { supportSideBySide: true }), true);
-		assert.equal(group.contains(input2), false);
-		assert.equal(group.contains(input2, { strictEquals: true }), false);
-		assert.equal(group.contains(input2, { supportSideBySide: true }), false);
-		assert.equal(group.contains(diffInput1), false);
-		assert.equal(group.contains(diffInput2), false);
+		assert.strictEqual(group.contains(input1), true);
+		assert.strictEqual(group.contains(input1, { strictEquals: true }), true);
+		assert.strictEqual(group.contains(input1, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(input2), false);
+		assert.strictEqual(group.contains(input2, { strictEquals: true }), false);
+		assert.strictEqual(group.contains(input2, { supportSideBySide: true }), false);
+		assert.strictEqual(group.contains(diffInput1), false);
+		assert.strictEqual(group.contains(diffInput2), false);
 
 		group.openEditor(input2, { pinned: true, active: true });
 
-		assert.equal(group.contains(input1), true);
-		assert.equal(group.contains(input2), true);
-		assert.equal(group.contains(diffInput1), false);
-		assert.equal(group.contains(diffInput2), false);
+		assert.strictEqual(group.contains(input1), true);
+		assert.strictEqual(group.contains(input2), true);
+		assert.strictEqual(group.contains(diffInput1), false);
+		assert.strictEqual(group.contains(diffInput2), false);
 
 		group.openEditor(diffInput1, { pinned: true, active: true });
 
-		assert.equal(group.contains(input1), true);
-		assert.equal(group.contains(input2), true);
-		assert.equal(group.contains(diffInput1), true);
-		assert.equal(group.contains(diffInput2), false);
+		assert.strictEqual(group.contains(input1), true);
+		assert.strictEqual(group.contains(input2), true);
+		assert.strictEqual(group.contains(diffInput1), true);
+		assert.strictEqual(group.contains(diffInput2), false);
 
 		group.openEditor(diffInput2, { pinned: true, active: true });
 
-		assert.equal(group.contains(input1), true);
-		assert.equal(group.contains(input2), true);
-		assert.equal(group.contains(diffInput1), true);
-		assert.equal(group.contains(diffInput2), true);
+		assert.strictEqual(group.contains(input1), true);
+		assert.strictEqual(group.contains(input2), true);
+		assert.strictEqual(group.contains(diffInput1), true);
+		assert.strictEqual(group.contains(diffInput2), true);
 
 		group.closeEditor(input1);
 
-		assert.equal(group.contains(input1), false);
-		assert.equal(group.contains(input1, { supportSideBySide: true }), true);
-		assert.equal(group.contains(input2), true);
-		assert.equal(group.contains(diffInput1), true);
-		assert.equal(group.contains(diffInput2), true);
+		assert.strictEqual(group.contains(input1), false);
+		assert.strictEqual(group.contains(input1, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(input2), true);
+		assert.strictEqual(group.contains(diffInput1), true);
+		assert.strictEqual(group.contains(diffInput2), true);
 
 		group.closeEditor(input2);
 
-		assert.equal(group.contains(input1), false);
-		assert.equal(group.contains(input1, { supportSideBySide: true }), true);
-		assert.equal(group.contains(input2), false);
-		assert.equal(group.contains(input2, { supportSideBySide: true }), true);
-		assert.equal(group.contains(diffInput1), true);
-		assert.equal(group.contains(diffInput2), true);
+		assert.strictEqual(group.contains(input1), false);
+		assert.strictEqual(group.contains(input1, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(input2), false);
+		assert.strictEqual(group.contains(input2, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(diffInput1), true);
+		assert.strictEqual(group.contains(diffInput2), true);
 
 		group.closeEditor(diffInput1);
 
-		assert.equal(group.contains(input1), false);
-		assert.equal(group.contains(input1, { supportSideBySide: true }), true);
-		assert.equal(group.contains(input2), false);
-		assert.equal(group.contains(input2, { supportSideBySide: true }), true);
-		assert.equal(group.contains(diffInput1), false);
-		assert.equal(group.contains(diffInput2), true);
+		assert.strictEqual(group.contains(input1), false);
+		assert.strictEqual(group.contains(input1, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(input2), false);
+		assert.strictEqual(group.contains(input2, { supportSideBySide: true }), true);
+		assert.strictEqual(group.contains(diffInput1), false);
+		assert.strictEqual(group.contains(diffInput2), true);
 
 		group.closeEditor(diffInput2);
 
-		assert.equal(group.contains(input1), false);
-		assert.equal(group.contains(input1, { supportSideBySide: true }), false);
-		assert.equal(group.contains(input2), false);
-		assert.equal(group.contains(input2, { supportSideBySide: true }), false);
-		assert.equal(group.contains(diffInput1), false);
-		assert.equal(group.contains(diffInput2), false);
+		assert.strictEqual(group.contains(input1), false);
+		assert.strictEqual(group.contains(input1, { supportSideBySide: true }), false);
+		assert.strictEqual(group.contains(input2), false);
+		assert.strictEqual(group.contains(input2, { supportSideBySide: true }), false);
+		assert.strictEqual(group.contains(diffInput1), false);
+		assert.strictEqual(group.contains(diffInput2), false);
 
 		const input3 = input(undefined, true, URI.parse('foo://bar'));
 
 		const input4 = input(undefined, true, URI.parse('foo://barsomething'));
 
 		group.openEditor(input3, { pinned: true, active: true });
-		assert.equal(group.contains(input4), false);
-		assert.equal(group.contains(input3), true);
+		assert.strictEqual(group.contains(input4), false);
+		assert.strictEqual(group.contains(input3), true);
 
 		group.closeEditor(input3);
 
-		assert.equal(group.contains(input3), false);
+		assert.strictEqual(group.contains(input3), false);
 	});
 
 	test('group serialization', function () {
@@ -374,33 +381,33 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input3, { pinned: false, active: true });
 
 		let deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 3);
-		assert.equal(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 3);
-		assert.equal(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
-		assert.equal(deserialized.isPinned(input1), true);
-		assert.equal(deserialized.isPinned(input2), true);
-		assert.equal(deserialized.isPinned(input3), false);
-		assert.equal(deserialized.isActive(input3), true);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 3);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 3);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
+		assert.strictEqual(deserialized.isPinned(input1), true);
+		assert.strictEqual(deserialized.isPinned(input2), true);
+		assert.strictEqual(deserialized.isPinned(input3), false);
+		assert.strictEqual(deserialized.isActive(input3), true);
 
 		// Case 2: inputs cannot be serialized
 		TestEditorInputFactory.disableSerialize = true;
 
 		deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
 
 		// Case 3: inputs cannot be deserialized
 		TestEditorInputFactory.disableSerialize = false;
 		TestEditorInputFactory.disableDeserialize = true;
 
 		deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
 	});
 
 	test('group serialization (sticky editor)', function () {
@@ -421,152 +428,152 @@ suite('Workbench editor groups', () => {
 		assert.ok(group.isSticky(input2));
 
 		let deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 3);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 3);
 
-		assert.equal(deserialized.isPinned(input1), true);
-		assert.equal(deserialized.isActive(input1), false);
-		assert.equal(deserialized.isSticky(input1), false);
+		assert.strictEqual(deserialized.isPinned(input1), true);
+		assert.strictEqual(deserialized.isActive(input1), false);
+		assert.strictEqual(deserialized.isSticky(input1), false);
 
-		assert.equal(deserialized.isPinned(input2), true);
-		assert.equal(deserialized.isActive(input2), false);
-		assert.equal(deserialized.isSticky(input2), true);
+		assert.strictEqual(deserialized.isPinned(input2), true);
+		assert.strictEqual(deserialized.isActive(input2), false);
+		assert.strictEqual(deserialized.isSticky(input2), true);
 
-		assert.equal(deserialized.isPinned(input3), false);
-		assert.equal(deserialized.isActive(input3), true);
-		assert.equal(deserialized.isSticky(input3), false);
+		assert.strictEqual(deserialized.isPinned(input3), false);
+		assert.strictEqual(deserialized.isActive(input3), true);
+		assert.strictEqual(deserialized.isSticky(input3), false);
 
 		// Case 2: inputs cannot be serialized
 		TestEditorInputFactory.disableSerialize = true;
 
 		deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 0);
-		assert.equal(deserialized.stickyCount, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 0);
+		assert.strictEqual(deserialized.stickyCount, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
 
 		// Case 3: inputs cannot be deserialized
 		TestEditorInputFactory.disableSerialize = false;
 		TestEditorInputFactory.disableDeserialize = true;
 
 		deserialized = createGroup(group.serialize());
-		assert.equal(group.id, deserialized.id);
-		assert.equal(deserialized.count, 0);
-		assert.equal(deserialized.stickyCount, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
-		assert.equal(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.id, deserialized.id);
+		assert.strictEqual(deserialized.count, 0);
+		assert.strictEqual(deserialized.stickyCount, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.SEQUENTIAL).length, 0);
+		assert.strictEqual(deserialized.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
 	});
 
 	test('One Editor', function () {
 		const group = createGroup();
 		const events = groupListener(group);
 
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
 
 		// Active && Pinned
 		const input1 = input();
 		const { editor: openedEditor, isNew } = group.openEditor(input1, { active: true, pinned: true });
-		assert.equal(openedEditor, input1);
-		assert.equal(isNew, true);
+		assert.strictEqual(openedEditor, input1);
+		assert.strictEqual(isNew, true);
 
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.isActive(input1), true);
-		assert.equal(group.isPinned(input1), true);
-		assert.equal(group.isPinned(0), true);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.isActive(input1), true);
+		assert.strictEqual(group.isPinned(input1), true);
+		assert.strictEqual(group.isPinned(0), true);
 
-		assert.equal(events.opened[0], input1);
-		assert.equal(events.activated[0], input1);
+		assert.strictEqual(events.opened[0], input1);
+		assert.strictEqual(events.activated[0], input1);
 
 		let editor = group.closeEditor(input1);
-		assert.equal(editor, input1);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[0].editor, input1);
-		assert.equal(events.closed[0].index, 0);
-		assert.equal(events.closed[0].replaced, false);
+		assert.strictEqual(editor, input1);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[0].editor, input1);
+		assert.strictEqual(events.closed[0].index, 0);
+		assert.strictEqual(events.closed[0].replaced, false);
 
 		// Active && Preview
 		const input2 = input();
 		group.openEditor(input2, { active: true, pinned: false });
 
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
-		assert.equal(group.activeEditor, input2);
-		assert.equal(group.isActive(input2), true);
-		assert.equal(group.isPinned(input2), false);
-		assert.equal(group.isPinned(0), false);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.activeEditor, input2);
+		assert.strictEqual(group.isActive(input2), true);
+		assert.strictEqual(group.isPinned(input2), false);
+		assert.strictEqual(group.isPinned(0), false);
 
-		assert.equal(events.opened[1], input2);
-		assert.equal(events.activated[1], input2);
+		assert.strictEqual(events.opened[1], input2);
+		assert.strictEqual(events.activated[1], input2);
 
 		group.closeEditor(input2);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[1].editor, input2);
-		assert.equal(events.closed[1].index, 0);
-		assert.equal(events.closed[1].replaced, false);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[1].editor, input2);
+		assert.strictEqual(events.closed[1].index, 0);
+		assert.strictEqual(events.closed[1].replaced, false);
 
 		editor = group.closeEditor(input2);
 		assert.ok(!editor);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[1].editor, input2);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[1].editor, input2);
 
 		// Nonactive && Pinned => gets active because its first editor
 		const input3 = input();
 		group.openEditor(input3, { active: false, pinned: true });
 
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.isActive(input3), true);
-		assert.equal(group.isPinned(input3), true);
-		assert.equal(group.isPinned(0), true);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.isActive(input3), true);
+		assert.strictEqual(group.isPinned(input3), true);
+		assert.strictEqual(group.isPinned(0), true);
 
-		assert.equal(events.opened[2], input3);
-		assert.equal(events.activated[2], input3);
+		assert.strictEqual(events.opened[2], input3);
+		assert.strictEqual(events.activated[2], input3);
 
 		group.closeEditor(input3);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[2].editor, input3);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[2].editor, input3);
 
-		assert.equal(events.opened[2], input3);
-		assert.equal(events.activated[2], input3);
+		assert.strictEqual(events.opened[2], input3);
+		assert.strictEqual(events.activated[2], input3);
 
 		group.closeEditor(input3);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[2].editor, input3);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[2].editor, input3);
 
 		// Nonactive && Preview => gets active because its first editor
 		const input4 = input();
 		group.openEditor(input4);
 
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
-		assert.equal(group.activeEditor, input4);
-		assert.equal(group.isActive(input4), true);
-		assert.equal(group.isPinned(input4), false);
-		assert.equal(group.isPinned(0), false);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.activeEditor, input4);
+		assert.strictEqual(group.isActive(input4), true);
+		assert.strictEqual(group.isPinned(input4), false);
+		assert.strictEqual(group.isPinned(0), false);
 
-		assert.equal(events.opened[3], input4);
-		assert.equal(events.activated[3], input4);
+		assert.strictEqual(events.opened[3], input4);
+		assert.strictEqual(events.activated[3], input4);
 
 		group.closeEditor(input4);
-		assert.equal(group.count, 0);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
-		assert.equal(group.activeEditor, undefined);
-		assert.equal(events.closed[3].editor, input4);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(events.closed[3].editor, input4);
 	});
 
 	test('Multiple Editors - Pinned and Active', function () {
@@ -580,67 +587,67 @@ suite('Workbench editor groups', () => {
 
 		// Pinned and Active
 		let openedEditorResult = group.openEditor(input1, { pinned: true, active: true });
-		assert.equal(openedEditorResult.editor, input1);
-		assert.equal(openedEditorResult.isNew, true);
+		assert.strictEqual(openedEditorResult.editor, input1);
+		assert.strictEqual(openedEditorResult.isNew, true);
 
 		openedEditorResult = group.openEditor(input1Copy, { pinned: true, active: true }); // opening copy of editor should still return existing one
-		assert.equal(openedEditorResult.editor, input1);
-		assert.equal(openedEditorResult.isNew, false);
+		assert.strictEqual(openedEditorResult.editor, input1);
+		assert.strictEqual(openedEditorResult.isNew, false);
 
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: true, active: true });
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.isActive(input1), false);
-		assert.equal(group.isPinned(input1), true);
-		assert.equal(group.isActive(input2), false);
-		assert.equal(group.isPinned(input2), true);
-		assert.equal(group.isActive(input3), true);
-		assert.equal(group.isPinned(input3), true);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.isActive(input1), false);
+		assert.strictEqual(group.isPinned(input1), true);
+		assert.strictEqual(group.isActive(input2), false);
+		assert.strictEqual(group.isPinned(input2), true);
+		assert.strictEqual(group.isActive(input3), true);
+		assert.strictEqual(group.isPinned(input3), true);
 
-		assert.equal(events.opened[0], input1);
-		assert.equal(events.opened[1], input2);
-		assert.equal(events.opened[2], input3);
+		assert.strictEqual(events.opened[0], input1);
+		assert.strictEqual(events.opened[1], input2);
+		assert.strictEqual(events.opened[2], input3);
 
-		assert.equal(events.activated[0], input1);
-		assert.equal(events.activated[1], input2);
-		assert.equal(events.activated[2], input3);
+		assert.strictEqual(events.activated[0], input1);
+		assert.strictEqual(events.activated[1], input2);
+		assert.strictEqual(events.activated[2], input3);
 
 		const mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input3);
-		assert.equal(mru[1], input2);
-		assert.equal(mru[2], input1);
+		assert.strictEqual(mru[0], input3);
+		assert.strictEqual(mru[1], input2);
+		assert.strictEqual(mru[2], input1);
 
 		// Add some tests where a matching input is used
 		// and verify that events carry the original input
 		const sameInput1 = input('1');
 		group.openEditor(sameInput1, { pinned: true, active: true });
-		assert.equal(events.activated[3], input1);
+		assert.strictEqual(events.activated[3], input1);
 
 		group.unpin(sameInput1);
-		assert.equal(events.unpinned[0], input1);
+		assert.strictEqual(events.unpinned[0], input1);
 
 		group.pin(sameInput1);
-		assert.equal(events.pinned[0], input1);
+		assert.strictEqual(events.pinned[0], input1);
 
 		group.stick(sameInput1);
-		assert.equal(events.sticky[0], input1);
+		assert.strictEqual(events.sticky[0], input1);
 
 		group.unstick(sameInput1);
-		assert.equal(events.unsticky[0], input1);
+		assert.strictEqual(events.unsticky[0], input1);
 
 		group.moveEditor(sameInput1, 1);
-		assert.equal(events.moved[0], input1);
+		assert.strictEqual(events.moved[0], input1);
 
 		group.closeEditor(sameInput1);
-		assert.equal(events.closed[0].editor, input1);
+		assert.strictEqual(events.closed[0].editor, input1);
 
 		closeAllEditors(group);
 
-		assert.equal(events.closed.length, 3);
-		assert.equal(group.count, 0);
+		assert.strictEqual(events.closed.length, 3);
+		assert.strictEqual(group.count, 0);
 	});
 
 	test('Multiple Editors - Preview editor moves to the side of the active one', function () {
@@ -654,12 +661,12 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: true, active: true });
 
-		assert.equal(input3, group.getEditors(EditorsOrder.SEQUENTIAL)[2]);
+		assert.strictEqual(input3, group.getEditors(EditorsOrder.SEQUENTIAL)[2]);
 
 		const input4 = input();
 		group.openEditor(input4, { pinned: false, active: true }); // this should cause the preview editor to move after input3
 
-		assert.equal(input4, group.getEditors(EditorsOrder.SEQUENTIAL)[2]);
+		assert.strictEqual(input4, group.getEditors(EditorsOrder.SEQUENTIAL)[2]);
 	});
 
 	test('Multiple Editors - Pinned and Active (DEFAULT_OPEN_EDITOR_DIRECTION = Direction.LEFT)', function () {
@@ -686,14 +693,14 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: true, active: true });
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input1);
 
 		closeAllEditors(group);
 
-		assert.equal(events.closed.length, 3);
-		assert.equal(group.count, 0);
+		assert.strictEqual(events.closed.length, 3);
+		assert.strictEqual(group.count, 0);
 	});
 
 	test('Multiple Editors - Pinned and Not Active', function () {
@@ -708,24 +715,24 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true });
 		group.openEditor(input3, { pinned: true });
 
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.isActive(input1), true);
-		assert.equal(group.isPinned(input1), true);
-		assert.equal(group.isPinned(0), true);
-		assert.equal(group.isActive(input2), false);
-		assert.equal(group.isPinned(input2), true);
-		assert.equal(group.isPinned(1), true);
-		assert.equal(group.isActive(input3), false);
-		assert.equal(group.isPinned(input3), true);
-		assert.equal(group.isPinned(2), true);
-		assert.equal(group.isPinned(input3), true);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.isActive(input1), true);
+		assert.strictEqual(group.isPinned(input1), true);
+		assert.strictEqual(group.isPinned(0), true);
+		assert.strictEqual(group.isActive(input2), false);
+		assert.strictEqual(group.isPinned(input2), true);
+		assert.strictEqual(group.isPinned(1), true);
+		assert.strictEqual(group.isActive(input3), false);
+		assert.strictEqual(group.isPinned(input3), true);
+		assert.strictEqual(group.isPinned(2), true);
+		assert.strictEqual(group.isPinned(input3), true);
 
 		const mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input1);
-		assert.equal(mru[1], input3);
-		assert.equal(mru[2], input2);
+		assert.strictEqual(mru[0], input1);
+		assert.strictEqual(mru[1], input3);
+		assert.strictEqual(mru[2], input2);
 	});
 
 	test('Multiple Editors - Preview gets overwritten', function () {
@@ -741,24 +748,24 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2); // overwrites preview
 		group.openEditor(input3); // overwrites preview
 
-		assert.equal(group.count, 1);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.isActive(input3), true);
-		assert.equal(group.isPinned(input3), false);
-		assert.equal(!group.isPinned(input3), true);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.isActive(input3), true);
+		assert.strictEqual(group.isPinned(input3), false);
+		assert.strictEqual(!group.isPinned(input3), true);
 
-		assert.equal(events.opened[0], input1);
-		assert.equal(events.opened[1], input2);
-		assert.equal(events.opened[2], input3);
-		assert.equal(events.closed[0].editor, input1);
-		assert.equal(events.closed[1].editor, input2);
-		assert.equal(events.closed[0].replaced, true);
-		assert.equal(events.closed[1].replaced, true);
+		assert.strictEqual(events.opened[0], input1);
+		assert.strictEqual(events.opened[1], input2);
+		assert.strictEqual(events.opened[2], input3);
+		assert.strictEqual(events.closed[0].editor, input1);
+		assert.strictEqual(events.closed[1].editor, input2);
+		assert.strictEqual(events.closed[0].replaced, true);
+		assert.strictEqual(events.closed[1].replaced, true);
 
 		const mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input3);
-		assert.equal(mru.length, 1);
+		assert.strictEqual(mru[0], input3);
+		assert.strictEqual(mru.length, 1);
 	});
 
 	test('Multiple Editors - set active', function () {
@@ -773,27 +780,27 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: false, active: true });
 
-		assert.equal(group.activeEditor, input3);
+		assert.strictEqual(group.activeEditor, input3);
 
 		let mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input3);
-		assert.equal(mru[1], input2);
-		assert.equal(mru[2], input1);
+		assert.strictEqual(mru[0], input3);
+		assert.strictEqual(mru[1], input2);
+		assert.strictEqual(mru[2], input1);
 
 		group.setActive(input3);
-		assert.equal(events.activated.length, 3);
+		assert.strictEqual(events.activated.length, 3);
 
 		group.setActive(input1);
-		assert.equal(events.activated[3], input1);
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.isActive(input1), true);
-		assert.equal(group.isActive(input2), false);
-		assert.equal(group.isActive(input3), false);
+		assert.strictEqual(events.activated[3], input1);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.isActive(input1), true);
+		assert.strictEqual(group.isActive(input2), false);
+		assert.strictEqual(group.isActive(input3), false);
 
 		mru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mru[0], input1);
-		assert.equal(mru[1], input3);
-		assert.equal(mru[2], input2);
+		assert.strictEqual(mru[0], input1);
+		assert.strictEqual(mru[1], input3);
+		assert.strictEqual(mru[2], input2);
 	});
 
 	test('Multiple Editors - pin and unpin', function () {
@@ -808,41 +815,41 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: false, active: true });
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 3);
 
 		group.pin(input3);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.isPinned(input3), true);
-		assert.equal(group.isActive(input3), true);
-		assert.equal(events.pinned[0], input3);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.isPinned(input3), true);
+		assert.strictEqual(group.isActive(input3), true);
+		assert.strictEqual(events.pinned[0], input3);
+		assert.strictEqual(group.count, 3);
 
 		group.unpin(input1);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.isPinned(input1), false);
-		assert.equal(group.isActive(input1), false);
-		assert.equal(events.unpinned[0], input1);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.isPinned(input1), false);
+		assert.strictEqual(group.isActive(input1), false);
+		assert.strictEqual(events.unpinned[0], input1);
+		assert.strictEqual(group.count, 3);
 
 		group.unpin(input2);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 2); // 2 previews got merged into one
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input3);
-		assert.equal(events.closed[0].editor, input1);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 2); // 2 previews got merged into one
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input3);
+		assert.strictEqual(events.closed[0].editor, input1);
+		assert.strictEqual(group.count, 2);
 
 		group.unpin(input3);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 1); // pinning replaced the preview
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
-		assert.equal(events.closed[1].editor, input2);
-		assert.equal(group.count, 1);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 1); // pinning replaced the preview
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
+		assert.strictEqual(events.closed[1].editor, input2);
+		assert.strictEqual(group.count, 1);
 	});
 
 	test('Multiple Editors - closing picks next from MRU list', function () {
@@ -861,37 +868,37 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input4, { pinned: true, active: true });
 		group.openEditor(input5, { pinned: true, active: true });
 
-		assert.equal(group.activeEditor, input5);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0], input5);
-		assert.equal(group.count, 5);
+		assert.strictEqual(group.activeEditor, input5);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0], input5);
+		assert.strictEqual(group.count, 5);
 
 		group.closeEditor(input5);
-		assert.equal(group.activeEditor, input4);
-		assert.equal(events.activated[5], input4);
-		assert.equal(group.count, 4);
+		assert.strictEqual(group.activeEditor, input4);
+		assert.strictEqual(events.activated[5], input4);
+		assert.strictEqual(group.count, 4);
 
 		group.setActive(input1);
 		group.setActive(input4);
 		group.closeEditor(input4);
 
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.count, 3);
 
 		group.closeEditor(input1);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 2);
 
 		group.setActive(input2);
 		group.closeEditor(input2);
 
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 1);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 1);
 
 		group.closeEditor(input3);
 
 		assert.ok(!group.activeEditor);
-		assert.equal(group.count, 0);
+		assert.strictEqual(group.count, 0);
 	});
 
 	test('Multiple Editors - closing picks next to the right', function () {
@@ -920,36 +927,36 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input4, { pinned: true, active: true });
 		group.openEditor(input5, { pinned: true, active: true });
 
-		assert.equal(group.activeEditor, input5);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0], input5);
-		assert.equal(group.count, 5);
+		assert.strictEqual(group.activeEditor, input5);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0], input5);
+		assert.strictEqual(group.count, 5);
 
 		group.closeEditor(input5);
-		assert.equal(group.activeEditor, input4);
-		assert.equal(events.activated[5], input4);
-		assert.equal(group.count, 4);
+		assert.strictEqual(group.activeEditor, input4);
+		assert.strictEqual(events.activated[5], input4);
+		assert.strictEqual(group.count, 4);
 
 		group.setActive(input1);
 		group.closeEditor(input1);
 
-		assert.equal(group.activeEditor, input2);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input2);
+		assert.strictEqual(group.count, 3);
 
 		group.setActive(input3);
 		group.closeEditor(input3);
 
-		assert.equal(group.activeEditor, input4);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, input4);
+		assert.strictEqual(group.count, 2);
 
 		group.closeEditor(input4);
 
-		assert.equal(group.activeEditor, input2);
-		assert.equal(group.count, 1);
+		assert.strictEqual(group.activeEditor, input2);
+		assert.strictEqual(group.count, 1);
 
 		group.closeEditor(input2);
 
 		assert.ok(!group.activeEditor);
-		assert.equal(group.count, 0);
+		assert.strictEqual(group.count, 0);
 	});
 
 	test('Multiple Editors - move editor', function () {
@@ -967,9 +974,9 @@ suite('Workbench editor groups', () => {
 
 		group.moveEditor(input1, 1);
 
-		assert.equal(events.moved[0], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input1);
+		assert.strictEqual(events.moved[0], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input1);
 
 		group.setActive(input1);
 		group.openEditor(input3, { pinned: true, active: true });
@@ -978,40 +985,40 @@ suite('Workbench editor groups', () => {
 
 		group.moveEditor(input4, 0);
 
-		assert.equal(events.moved[1], input4);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input4);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[3], input3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input5);
+		assert.strictEqual(events.moved[1], input4);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input4);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[3], input3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input5);
 
 		group.moveEditor(input4, 3);
 		group.moveEditor(input2, 1);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[3], input4);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input5);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[3], input4);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input5);
 
-		assert.equal(events.moved.length, 4);
+		assert.strictEqual(events.moved.length, 4);
 		group.moveEditor(input1, 0);
-		assert.equal(events.moved.length, 4);
+		assert.strictEqual(events.moved.length, 4);
 		group.moveEditor(input1, -1);
-		assert.equal(events.moved.length, 4);
+		assert.strictEqual(events.moved.length, 4);
 
 		group.moveEditor(input5, 4);
-		assert.equal(events.moved.length, 4);
+		assert.strictEqual(events.moved.length, 4);
 		group.moveEditor(input5, 100);
-		assert.equal(events.moved.length, 4);
+		assert.strictEqual(events.moved.length, 4);
 
 		group.moveEditor(input5, -1);
-		assert.equal(events.moved.length, 5);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input5);
+		assert.strictEqual(events.moved.length, 5);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input5);
 
 		group.moveEditor(input1, 100);
-		assert.equal(events.moved.length, 6);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input1);
+		assert.strictEqual(events.moved.length, 6);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[4], input1);
 	});
 
 	test('Multiple Editors - move editor across groups', function () {
@@ -1030,10 +1037,10 @@ suite('Workbench editor groups', () => {
 		group2.closeEditor(g2_input1);
 		group1.openEditor(g2_input1, { active: true, pinned: true, index: 1 });
 
-		assert.equal(group1.count, 3);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[0], g1_input1);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[1], g2_input1);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[2], g1_input2);
+		assert.strictEqual(group1.count, 3);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[0], g1_input1);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[1], g2_input1);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[2], g1_input2);
 	});
 
 	test('Multiple Editors - move editor across groups (input already exists in group 1)', function () {
@@ -1054,10 +1061,10 @@ suite('Workbench editor groups', () => {
 		group2.closeEditor(g2_input1);
 		group1.openEditor(g2_input1, { active: true, pinned: true, index: 0 });
 
-		assert.equal(group1.count, 3);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[0], g1_input2);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[1], g1_input1);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[2], g1_input3);
+		assert.strictEqual(group1.count, 3);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[0], g1_input2);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[1], g1_input1);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[2], g1_input3);
 	});
 
 	test('Multiple Editors - Pinned & Non Active', function () {
@@ -1065,30 +1072,30 @@ suite('Workbench editor groups', () => {
 
 		const input1 = input();
 		group.openEditor(input1);
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.previewEditor, input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
-		assert.equal(group.count, 1);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.previewEditor, input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
+		assert.strictEqual(group.count, 1);
 
 		const input2 = input();
 		group.openEditor(input2, { pinned: true, active: false });
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.previewEditor, input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.previewEditor, input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
+		assert.strictEqual(group.count, 2);
 
 		const input3 = input();
 		group.openEditor(input3, { pinned: true, active: false });
-		assert.equal(group.activeEditor, input1);
-		assert.equal(group.previewEditor, input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input2);
-		assert.equal(group.isPinned(input1), false);
-		assert.equal(group.isPinned(input2), true);
-		assert.equal(group.isPinned(input3), true);
-		assert.equal(group.count, 3);
+		assert.strictEqual(group.activeEditor, input1);
+		assert.strictEqual(group.previewEditor, input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input2);
+		assert.strictEqual(group.isPinned(input1), false);
+		assert.strictEqual(group.isPinned(input2), true);
+		assert.strictEqual(group.isPinned(input3), true);
+		assert.strictEqual(group.count, 3);
 	});
 
 	test('Multiple Editors - Close Others, Close Left, Close Right', function () {
@@ -1108,8 +1115,8 @@ suite('Workbench editor groups', () => {
 
 		// Close Others
 		closeEditors(group, group.activeEditor!);
-		assert.equal(group.activeEditor, input5);
-		assert.equal(group.count, 1);
+		assert.strictEqual(group.activeEditor, input5);
+		assert.strictEqual(group.count, 1);
 
 		closeAllEditors(group);
 		group.openEditor(input1, { active: true, pinned: true });
@@ -1120,13 +1127,13 @@ suite('Workbench editor groups', () => {
 		group.setActive(input3);
 
 		// Close Left
-		assert.equal(group.activeEditor, input3);
+		assert.strictEqual(group.activeEditor, input3);
 		closeEditors(group, group.activeEditor!, CloseDirection.LEFT);
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input4);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input5);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input4);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input5);
 
 		closeAllEditors(group);
 		group.openEditor(input1, { active: true, pinned: true });
@@ -1137,13 +1144,13 @@ suite('Workbench editor groups', () => {
 		group.setActive(input3);
 
 		// Close Right
-		assert.equal(group.activeEditor, input3);
+		assert.strictEqual(group.activeEditor, input3);
 		closeEditors(group, group.activeEditor!, CloseDirection.RIGHT);
-		assert.equal(group.activeEditor, input3);
-		assert.equal(group.count, 3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input3);
+		assert.strictEqual(group.activeEditor, input3);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], input1);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], input2);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[2], input3);
 	});
 
 	test('Multiple Editors - real user example', function () {
@@ -1152,118 +1159,118 @@ suite('Workbench editor groups', () => {
 		// [] -> /index.html/
 		const indexHtml = input('index.html');
 		let openedEditor = group.openEditor(indexHtml).editor;
-		assert.equal(openedEditor, indexHtml);
-		assert.equal(group.activeEditor, indexHtml);
-		assert.equal(group.previewEditor, indexHtml);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], indexHtml);
-		assert.equal(group.count, 1);
+		assert.strictEqual(openedEditor, indexHtml);
+		assert.strictEqual(group.activeEditor, indexHtml);
+		assert.strictEqual(group.previewEditor, indexHtml);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], indexHtml);
+		assert.strictEqual(group.count, 1);
 
 		// /index.html/ -> /index.html/
 		const sameIndexHtml = input('index.html');
 		openedEditor = group.openEditor(sameIndexHtml).editor;
-		assert.equal(openedEditor, indexHtml);
-		assert.equal(group.activeEditor, indexHtml);
-		assert.equal(group.previewEditor, indexHtml);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], indexHtml);
-		assert.equal(group.count, 1);
+		assert.strictEqual(openedEditor, indexHtml);
+		assert.strictEqual(group.activeEditor, indexHtml);
+		assert.strictEqual(group.previewEditor, indexHtml);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], indexHtml);
+		assert.strictEqual(group.count, 1);
 
 		// /index.html/ -> /style.css/
 		const styleCss = input('style.css');
 		openedEditor = group.openEditor(styleCss).editor;
-		assert.equal(openedEditor, styleCss);
-		assert.equal(group.activeEditor, styleCss);
-		assert.equal(group.previewEditor, styleCss);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], styleCss);
-		assert.equal(group.count, 1);
+		assert.strictEqual(openedEditor, styleCss);
+		assert.strictEqual(group.activeEditor, styleCss);
+		assert.strictEqual(group.previewEditor, styleCss);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], styleCss);
+		assert.strictEqual(group.count, 1);
 
 		// /style.css/ -> [/style.css/, test.js]
 		const testJs = input('test.js');
 		openedEditor = group.openEditor(testJs, { active: true, pinned: true }).editor;
-		assert.equal(openedEditor, testJs);
-		assert.equal(group.previewEditor, styleCss);
-		assert.equal(group.activeEditor, testJs);
-		assert.equal(group.isPinned(styleCss), false);
-		assert.equal(group.isPinned(testJs), true);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], styleCss);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], testJs);
-		assert.equal(group.count, 2);
+		assert.strictEqual(openedEditor, testJs);
+		assert.strictEqual(group.previewEditor, styleCss);
+		assert.strictEqual(group.activeEditor, testJs);
+		assert.strictEqual(group.isPinned(styleCss), false);
+		assert.strictEqual(group.isPinned(testJs), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], styleCss);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], testJs);
+		assert.strictEqual(group.count, 2);
 
 		// [/style.css/, test.js] -> [test.js, /index.html/]
 		const indexHtml2 = input('index.html');
 		group.openEditor(indexHtml2, { active: true });
-		assert.equal(group.activeEditor, indexHtml2);
-		assert.equal(group.previewEditor, indexHtml2);
-		assert.equal(group.isPinned(indexHtml2), false);
-		assert.equal(group.isPinned(testJs), true);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[0], testJs);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], indexHtml2);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, indexHtml2);
+		assert.strictEqual(group.previewEditor, indexHtml2);
+		assert.strictEqual(group.isPinned(indexHtml2), false);
+		assert.strictEqual(group.isPinned(testJs), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[0], testJs);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], indexHtml2);
+		assert.strictEqual(group.count, 2);
 
 		// make test.js active
 		const testJs2 = input('test.js');
 		group.setActive(testJs2);
-		assert.equal(group.activeEditor, testJs);
-		assert.equal(group.isActive(testJs2), true);
-		assert.equal(group.count, 2);
+		assert.strictEqual(group.activeEditor, testJs);
+		assert.strictEqual(group.isActive(testJs2), true);
+		assert.strictEqual(group.count, 2);
 
 		// [test.js, /indexHtml/] -> [test.js, index.html]
 		const indexHtml3 = input('index.html');
 		group.pin(indexHtml3);
-		assert.equal(group.isPinned(indexHtml3), true);
-		assert.equal(group.activeEditor, testJs);
+		assert.strictEqual(group.isPinned(indexHtml3), true);
+		assert.strictEqual(group.activeEditor, testJs);
 
 		// [test.js, index.html] -> [test.js, file.ts, index.html]
 		const fileTs = input('file.ts');
 		group.openEditor(fileTs, { active: true, pinned: true });
-		assert.equal(group.isPinned(fileTs), true);
-		assert.equal(group.count, 3);
-		assert.equal(group.activeEditor, fileTs);
+		assert.strictEqual(group.isPinned(fileTs), true);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.activeEditor, fileTs);
 
 		// [test.js, index.html, file.ts] -> [test.js, /file.ts/, index.html]
 		group.unpin(fileTs);
-		assert.equal(group.count, 3);
-		assert.equal(group.isPinned(fileTs), false);
-		assert.equal(group.activeEditor, fileTs);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.isPinned(fileTs), false);
+		assert.strictEqual(group.activeEditor, fileTs);
 
 		// [test.js, /file.ts/, index.html] -> [test.js, /other.ts/, index.html]
 		const otherTs = input('other.ts');
 		group.openEditor(otherTs, { active: true });
-		assert.equal(group.count, 3);
-		assert.equal(group.activeEditor, otherTs);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.activeEditor, otherTs);
 		assert.ok(group.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(testJs));
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], otherTs);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], otherTs);
 		assert.ok(group.getEditors(EditorsOrder.SEQUENTIAL)[2].matches(indexHtml));
 
 		// make index.html active
 		const indexHtml4 = input('index.html');
 		group.setActive(indexHtml4);
-		assert.equal(group.activeEditor, indexHtml2);
+		assert.strictEqual(group.activeEditor, indexHtml2);
 
 		// [test.js, /other.ts/, index.html] -> [test.js, /other.ts/]
 		group.closeEditor(indexHtml);
-		assert.equal(group.count, 2);
-		assert.equal(group.activeEditor, otherTs);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.activeEditor, otherTs);
 		assert.ok(group.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(testJs));
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL)[1], otherTs);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL)[1], otherTs);
 
 		// [test.js, /other.ts/] -> [test.js]
 		group.closeEditor(otherTs);
-		assert.equal(group.count, 1);
-		assert.equal(group.activeEditor, testJs);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.activeEditor, testJs);
 		assert.ok(group.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(testJs));
 
 		// [test.js] -> /test.js/
 		group.unpin(testJs);
-		assert.equal(group.count, 1);
-		assert.equal(group.activeEditor, testJs);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.activeEditor, testJs);
 		assert.ok(group.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(testJs));
-		assert.equal(group.isPinned(testJs), false);
+		assert.strictEqual(group.isPinned(testJs), false);
 
 		// /test.js/ -> []
 		group.closeEditor(testJs);
-		assert.equal(group.count, 0);
-		assert.equal(group.activeEditor, null);
-		assert.equal(group.previewEditor, null);
+		assert.strictEqual(group.count, 0);
+		assert.strictEqual(group.activeEditor, null);
+		assert.strictEqual(group.previewEditor, null);
 	});
 
 	test('Single Group, Single Editor - persist', function () {
@@ -1286,18 +1293,18 @@ suite('Workbench editor groups', () => {
 		const input1 = input();
 		group.openEditor(input1);
 
-		assert.equal(group.count, 1);
-		assert.equal(group.activeEditor!.matches(input1), true);
-		assert.equal(group.previewEditor!.matches(input1), true);
-		assert.equal(group.isActive(input1), true);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.activeEditor!.matches(input1), true);
+		assert.strictEqual(group.previewEditor!.matches(input1), true);
+		assert.strictEqual(group.isActive(input1), true);
 
 		// Create model again - should load from storage
 		group = inst.createInstance(EditorGroup, group.serialize());
 
-		assert.equal(group.count, 1);
-		assert.equal(group.activeEditor!.matches(input1), true);
-		assert.equal(group.previewEditor!.matches(input1), true);
-		assert.equal(group.isActive(input1), true);
+		assert.strictEqual(group.count, 1);
+		assert.strictEqual(group.activeEditor!.matches(input1), true);
+		assert.strictEqual(group.previewEditor!.matches(input1), true);
+		assert.strictEqual(group.isActive(input1), true);
 	});
 
 	test('Multiple Groups, Multiple editors - persist', function () {
@@ -1335,39 +1342,39 @@ suite('Workbench editor groups', () => {
 		group2.openEditor(g2_input2, { active: false, pinned: false });
 		group2.openEditor(g2_input3, { active: false, pinned: true });
 
-		assert.equal(group1.count, 3);
-		assert.equal(group2.count, 3);
-		assert.equal(group1.activeEditor!.matches(g1_input2), true);
-		assert.equal(group2.activeEditor!.matches(g2_input1), true);
-		assert.equal(group1.previewEditor!.matches(g1_input2), true);
-		assert.equal(group2.previewEditor!.matches(g2_input2), true);
+		assert.strictEqual(group1.count, 3);
+		assert.strictEqual(group2.count, 3);
+		assert.strictEqual(group1.activeEditor!.matches(g1_input2), true);
+		assert.strictEqual(group2.activeEditor!.matches(g2_input1), true);
+		assert.strictEqual(group1.previewEditor!.matches(g1_input2), true);
+		assert.strictEqual(group2.previewEditor!.matches(g2_input2), true);
 
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g1_input2), true);
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g1_input3), true);
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g1_input1), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g1_input2), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g1_input3), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g1_input1), true);
 
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g2_input1), true);
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g2_input3), true);
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g2_input2), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g2_input1), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g2_input3), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g2_input2), true);
 
 		// Create model again - should load from storage
 		group1 = inst.createInstance(EditorGroup, group1.serialize());
 		group2 = inst.createInstance(EditorGroup, group2.serialize());
 
-		assert.equal(group1.count, 3);
-		assert.equal(group2.count, 3);
-		assert.equal(group1.activeEditor!.matches(g1_input2), true);
-		assert.equal(group2.activeEditor!.matches(g2_input1), true);
-		assert.equal(group1.previewEditor!.matches(g1_input2), true);
-		assert.equal(group2.previewEditor!.matches(g2_input2), true);
+		assert.strictEqual(group1.count, 3);
+		assert.strictEqual(group2.count, 3);
+		assert.strictEqual(group1.activeEditor!.matches(g1_input2), true);
+		assert.strictEqual(group2.activeEditor!.matches(g2_input1), true);
+		assert.strictEqual(group1.previewEditor!.matches(g1_input2), true);
+		assert.strictEqual(group2.previewEditor!.matches(g2_input2), true);
 
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g1_input2), true);
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g1_input3), true);
-		assert.equal(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g1_input1), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g1_input2), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g1_input3), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g1_input1), true);
 
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g2_input1), true);
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g2_input3), true);
-		assert.equal(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g2_input2), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(g2_input1), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(g2_input3), true);
+		assert.strictEqual(group2.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(g2_input2), true);
 	});
 
 	test('Single group, multiple editors - persist (some not persistable)', function () {
@@ -1395,23 +1402,23 @@ suite('Workbench editor groups', () => {
 		group.openEditor(nonSerializableInput2, { active: true, pinned: false });
 		group.openEditor(serializableInput2, { active: false, pinned: true });
 
-		assert.equal(group.count, 3);
-		assert.equal(group.activeEditor!.matches(nonSerializableInput2), true);
-		assert.equal(group.previewEditor!.matches(nonSerializableInput2), true);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.activeEditor!.matches(nonSerializableInput2), true);
+		assert.strictEqual(group.previewEditor!.matches(nonSerializableInput2), true);
 
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(nonSerializableInput2), true);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(serializableInput2), true);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(serializableInput1), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(nonSerializableInput2), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(serializableInput2), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[2].matches(serializableInput1), true);
 
 		// Create model again - should load from storage
 		group = inst.createInstance(EditorGroup, group.serialize());
 
-		assert.equal(group.count, 2);
-		assert.equal(group.activeEditor!.matches(serializableInput2), true);
-		assert.equal(group.previewEditor, null);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.activeEditor!.matches(serializableInput2), true);
+		assert.strictEqual(group.previewEditor, null);
 
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(serializableInput2), true);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(serializableInput1), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[0].matches(serializableInput2), true);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)[1].matches(serializableInput1), true);
 	});
 
 	test('Single group, multiple editors - persist (some not persistable, sticky editors)', function () {
@@ -1439,14 +1446,14 @@ suite('Workbench editor groups', () => {
 		group.openEditor(nonSerializableInput2, { active: true, pinned: true, sticky: true });
 		group.openEditor(serializableInput2, { active: false, pinned: true });
 
-		assert.equal(group.count, 3);
-		assert.equal(group.stickyCount, 1);
+		assert.strictEqual(group.count, 3);
+		assert.strictEqual(group.stickyCount, 1);
 
 		// Create model again - should load from storage
 		group = inst.createInstance(EditorGroup, group.serialize());
 
-		assert.equal(group.count, 2);
-		assert.equal(group.stickyCount, 0);
+		assert.strictEqual(group.count, 2);
+		assert.strictEqual(group.stickyCount, 0);
 	});
 
 	test('Multiple groups, multiple editors - persist (some not persistable, causes empty group)', function () {
@@ -1480,9 +1487,9 @@ suite('Workbench editor groups', () => {
 		group1 = inst.createInstance(EditorGroup, group1.serialize());
 		group2 = inst.createInstance(EditorGroup, group2.serialize());
 
-		assert.equal(group1.count, 2);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(serializableInput1), true);
-		assert.equal(group1.getEditors(EditorsOrder.SEQUENTIAL)[1].matches(serializableInput2), true);
+		assert.strictEqual(group1.count, 2);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[0].matches(serializableInput1), true);
+		assert.strictEqual(group1.getEditors(EditorsOrder.SEQUENTIAL)[1].matches(serializableInput2), true);
 	});
 
 	test('Multiple Editors - Editor Dispose', function () {
@@ -1505,14 +1512,14 @@ suite('Workbench editor groups', () => {
 
 		input1.dispose();
 
-		assert.equal(group1Listener.disposed.length, 1);
-		assert.equal(group2Listener.disposed.length, 1);
+		assert.strictEqual(group1Listener.disposed.length, 1);
+		assert.strictEqual(group2Listener.disposed.length, 1);
 		assert.ok(group1Listener.disposed[0].matches(input1));
 		assert.ok(group2Listener.disposed[0].matches(input1));
 
 		input3.dispose();
-		assert.equal(group1Listener.disposed.length, 2);
-		assert.equal(group2Listener.disposed.length, 1);
+		assert.strictEqual(group1Listener.disposed.length, 2);
+		assert.strictEqual(group2Listener.disposed.length, 1);
 		assert.ok(group1Listener.disposed[1].matches(input3));
 	});
 
@@ -1528,7 +1535,7 @@ suite('Workbench editor groups', () => {
 		group1.setActive(input1);
 
 		group1.openEditor(input3, { active: true });
-		assert.equal(group1.indexOf(input3), 1);
+		assert.strictEqual(group1.indexOf(input3), 1);
 	});
 
 	test('Multiple Editors - Editor Emits Dirty and Label Changed', function () {
@@ -1564,24 +1571,24 @@ suite('Workbench editor groups', () => {
 		(<TestEditorInput>input1).setDirty();
 		(<TestEditorInput>input1).setLabel();
 
-		assert.equal(dirty1Counter, 1);
-		assert.equal(label1ChangeCounter, 1);
+		assert.strictEqual(dirty1Counter, 1);
+		assert.strictEqual(label1ChangeCounter, 1);
 
 		(<TestEditorInput>input2).setDirty();
 		(<TestEditorInput>input2).setLabel();
 
-		assert.equal(dirty2Counter, 1);
-		assert.equal(label2ChangeCounter, 1);
+		assert.strictEqual(dirty2Counter, 1);
+		assert.strictEqual(label2ChangeCounter, 1);
 
 		closeAllEditors(group2);
 
 		(<TestEditorInput>input2).setDirty();
 		(<TestEditorInput>input2).setLabel();
 
-		assert.equal(dirty2Counter, 1);
-		assert.equal(label2ChangeCounter, 1);
-		assert.equal(dirty1Counter, 1);
-		assert.equal(label1ChangeCounter, 1);
+		assert.strictEqual(dirty2Counter, 1);
+		assert.strictEqual(label2ChangeCounter, 1);
+		assert.strictEqual(dirty1Counter, 1);
+		assert.strictEqual(label1ChangeCounter, 1);
 	});
 
 	test('Sticky Editors', function () {
@@ -1596,98 +1603,98 @@ suite('Workbench editor groups', () => {
 		group.openEditor(input2, { pinned: true, active: true });
 		group.openEditor(input3, { pinned: false, active: true });
 
-		assert.equal(group.stickyCount, 0);
+		assert.strictEqual(group.stickyCount, 0);
 
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL).length, 3);
-		assert.equal(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 3);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
-		assert.equal(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL).length, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true }).length, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 3);
+		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true }).length, 3);
 
 		// Stick last editor should move it first and pin
 		group.stick(input3);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input1), false);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), true);
-		assert.equal(group.isPinned(input3), true);
-		assert.equal(group.indexOf(input1), 1);
-		assert.equal(group.indexOf(input2), 2);
-		assert.equal(group.indexOf(input3), 0);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input1), false);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), true);
+		assert.strictEqual(group.isPinned(input3), true);
+		assert.strictEqual(group.indexOf(input1), 1);
+		assert.strictEqual(group.indexOf(input2), 2);
+		assert.strictEqual(group.indexOf(input3), 0);
 
 		let sequentialAllEditors = group.getEditors(EditorsOrder.SEQUENTIAL);
-		assert.equal(sequentialAllEditors.length, 3);
+		assert.strictEqual(sequentialAllEditors.length, 3);
 		let sequentialEditorsExcludingSticky = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true });
-		assert.equal(sequentialEditorsExcludingSticky.length, 2);
+		assert.strictEqual(sequentialEditorsExcludingSticky.length, 2);
 		assert.ok(sequentialEditorsExcludingSticky.indexOf(input1) >= 0);
 		assert.ok(sequentialEditorsExcludingSticky.indexOf(input2) >= 0);
 		let mruAllEditors = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mruAllEditors.length, 3);
+		assert.strictEqual(mruAllEditors.length, 3);
 		let mruEditorsExcludingSticky = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true });
-		assert.equal(mruEditorsExcludingSticky.length, 2);
+		assert.strictEqual(mruEditorsExcludingSticky.length, 2);
 		assert.ok(mruEditorsExcludingSticky.indexOf(input1) >= 0);
 		assert.ok(mruEditorsExcludingSticky.indexOf(input2) >= 0);
 
 		// Sticking same editor again is a no-op
 		group.stick(input3);
-		assert.equal(group.isSticky(input3), true);
+		assert.strictEqual(group.isSticky(input3), true);
 
 		// Sticking last editor now should move it after sticky one
 		group.stick(input2);
-		assert.equal(group.stickyCount, 2);
-		assert.equal(group.isSticky(input1), false);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), true);
-		assert.equal(group.indexOf(input1), 2);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 0);
+		assert.strictEqual(group.stickyCount, 2);
+		assert.strictEqual(group.isSticky(input1), false);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), true);
+		assert.strictEqual(group.indexOf(input1), 2);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 0);
 
 		sequentialAllEditors = group.getEditors(EditorsOrder.SEQUENTIAL);
-		assert.equal(sequentialAllEditors.length, 3);
+		assert.strictEqual(sequentialAllEditors.length, 3);
 		sequentialEditorsExcludingSticky = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true });
-		assert.equal(sequentialEditorsExcludingSticky.length, 1);
+		assert.strictEqual(sequentialEditorsExcludingSticky.length, 1);
 		assert.ok(sequentialEditorsExcludingSticky.indexOf(input1) >= 0);
 		mruAllEditors = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mruAllEditors.length, 3);
+		assert.strictEqual(mruAllEditors.length, 3);
 		mruEditorsExcludingSticky = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true });
-		assert.equal(mruEditorsExcludingSticky.length, 1);
+		assert.strictEqual(mruEditorsExcludingSticky.length, 1);
 		assert.ok(mruEditorsExcludingSticky.indexOf(input1) >= 0);
 
 		// Sticking remaining editor also works
 		group.stick(input1);
-		assert.equal(group.stickyCount, 3);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), true);
-		assert.equal(group.indexOf(input1), 2);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 0);
+		assert.strictEqual(group.stickyCount, 3);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), true);
+		assert.strictEqual(group.indexOf(input1), 2);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 0);
 
 		sequentialAllEditors = group.getEditors(EditorsOrder.SEQUENTIAL);
-		assert.equal(sequentialAllEditors.length, 3);
+		assert.strictEqual(sequentialAllEditors.length, 3);
 		sequentialEditorsExcludingSticky = group.getEditors(EditorsOrder.SEQUENTIAL, { excludeSticky: true });
-		assert.equal(sequentialEditorsExcludingSticky.length, 0);
+		assert.strictEqual(sequentialEditorsExcludingSticky.length, 0);
 		mruAllEditors = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
-		assert.equal(mruAllEditors.length, 3);
+		assert.strictEqual(mruAllEditors.length, 3);
 		mruEditorsExcludingSticky = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, { excludeSticky: true });
-		assert.equal(mruEditorsExcludingSticky.length, 0);
+		assert.strictEqual(mruEditorsExcludingSticky.length, 0);
 
 		// Unsticking moves editor after sticky ones
 		group.unstick(input3);
-		assert.equal(group.stickyCount, 2);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 1);
-		assert.equal(group.indexOf(input2), 0);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.stickyCount, 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 1);
+		assert.strictEqual(group.indexOf(input2), 0);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		// Unsticking all works
 		group.unstick(input1);
 		group.unstick(input2);
-		assert.equal(group.stickyCount, 0);
-		assert.equal(group.isSticky(input1), false);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), false);
+		assert.strictEqual(group.stickyCount, 0);
+		assert.strictEqual(group.isSticky(input1), false);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), false);
 
 		group.moveEditor(input1, 0);
 		group.moveEditor(input2, 1);
@@ -1701,60 +1708,60 @@ suite('Workbench editor groups', () => {
 		const events = groupListener(group);
 
 		group.openEditor(input4, { pinned: true, active: true });
-		assert.equal(group.indexOf(input4), 2);
+		assert.strictEqual(group.indexOf(input4), 2);
 		group.closeEditor(input4);
 
-		assert.equal(events.closed[0].sticky, false);
+		assert.strictEqual(events.closed[0].sticky, false);
 
 		group.setActive(input2);
 
 		group.openEditor(input4, { pinned: true, active: true });
-		assert.equal(group.indexOf(input4), 2);
+		assert.strictEqual(group.indexOf(input4), 2);
 		group.closeEditor(input4);
 
-		assert.equal(events.closed[1].sticky, false);
+		assert.strictEqual(events.closed[1].sticky, false);
 
 		// Reset
-		assert.equal(group.stickyCount, 2);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.stickyCount, 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		// Moving a sticky editor works
 		group.moveEditor(input1, 1); // still moved within sticky range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 1);
-		assert.equal(group.indexOf(input2), 0);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 1);
+		assert.strictEqual(group.indexOf(input2), 0);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		group.moveEditor(input1, 0); // still moved within sticky range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		group.moveEditor(input1, 2); // moved out of sticky range
-		assert.equal(group.isSticky(input1), false);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 2);
-		assert.equal(group.indexOf(input2), 0);
-		assert.equal(group.indexOf(input3), 1);
+		assert.strictEqual(group.isSticky(input1), false);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 2);
+		assert.strictEqual(group.indexOf(input2), 0);
+		assert.strictEqual(group.indexOf(input3), 1);
 
 		group.moveEditor(input2, 2); // moved out of sticky range
-		assert.equal(group.isSticky(input1), false);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 1);
-		assert.equal(group.indexOf(input2), 2);
-		assert.equal(group.indexOf(input3), 0);
+		assert.strictEqual(group.isSticky(input1), false);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 1);
+		assert.strictEqual(group.indexOf(input2), 2);
+		assert.strictEqual(group.indexOf(input3), 0);
 
 		// Reset
 		group.moveEditor(input1, 0);
@@ -1762,89 +1769,89 @@ suite('Workbench editor groups', () => {
 		group.moveEditor(input3, 2);
 		group.stick(input1);
 		group.unstick(input2);
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		// Moving a unsticky editor in works
 		group.moveEditor(input3, 1); // still moved within unsticked range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 2);
-		assert.equal(group.indexOf(input3), 1);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 2);
+		assert.strictEqual(group.indexOf(input3), 1);
 
 		group.moveEditor(input3, 2); // still moved within unsticked range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 2);
 
 		group.moveEditor(input3, 0); // moved into sticky range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), false);
-		assert.equal(group.isSticky(input3), true);
-		assert.equal(group.indexOf(input1), 1);
-		assert.equal(group.indexOf(input2), 2);
-		assert.equal(group.indexOf(input3), 0);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), false);
+		assert.strictEqual(group.isSticky(input3), true);
+		assert.strictEqual(group.indexOf(input1), 1);
+		assert.strictEqual(group.indexOf(input2), 2);
+		assert.strictEqual(group.indexOf(input3), 0);
 
 		group.moveEditor(input2, 0); // moved into sticky range
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), true);
-		assert.equal(group.indexOf(input1), 2);
-		assert.equal(group.indexOf(input2), 0);
-		assert.equal(group.indexOf(input3), 1);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), true);
+		assert.strictEqual(group.indexOf(input1), 2);
+		assert.strictEqual(group.indexOf(input2), 0);
+		assert.strictEqual(group.indexOf(input3), 1);
 
 		// Closing a sticky editor updates state properly
 		group.stick(input1);
 		group.stick(input2);
 		group.unstick(input3);
-		assert.equal(group.stickyCount, 2);
+		assert.strictEqual(group.stickyCount, 2);
 		group.closeEditor(input1);
-		assert.equal(events.closed[2].sticky, true);
-		assert.equal(group.stickyCount, 1);
+		assert.strictEqual(events.closed[2].sticky, true);
+		assert.strictEqual(group.stickyCount, 1);
 		group.closeEditor(input2);
-		assert.equal(events.closed[3].sticky, true);
-		assert.equal(group.stickyCount, 0);
+		assert.strictEqual(events.closed[3].sticky, true);
+		assert.strictEqual(group.stickyCount, 0);
 
 		closeAllEditors(group);
-		assert.equal(group.stickyCount, 0);
+		assert.strictEqual(group.stickyCount, 0);
 
 		// Open sticky
 		group.openEditor(input1, { sticky: true });
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input1), true);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input1), true);
 
 		group.openEditor(input2, { pinned: true, active: true });
-		assert.equal(group.stickyCount, 1);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), false);
+		assert.strictEqual(group.stickyCount, 1);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), false);
 
 		group.openEditor(input2, { sticky: true });
-		assert.equal(group.stickyCount, 2);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
+		assert.strictEqual(group.stickyCount, 2);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
 
 		group.openEditor(input3, { pinned: true, active: true });
 		group.openEditor(input4, { pinned: false, active: true, sticky: true });
-		assert.equal(group.stickyCount, 3);
-		assert.equal(group.isSticky(input1), true);
-		assert.equal(group.isSticky(input2), true);
-		assert.equal(group.isSticky(input3), false);
-		assert.equal(group.isSticky(input4), true);
-		assert.equal(group.isPinned(input4), true);
+		assert.strictEqual(group.stickyCount, 3);
+		assert.strictEqual(group.isSticky(input1), true);
+		assert.strictEqual(group.isSticky(input2), true);
+		assert.strictEqual(group.isSticky(input3), false);
+		assert.strictEqual(group.isSticky(input4), true);
+		assert.strictEqual(group.isPinned(input4), true);
 
-		assert.equal(group.indexOf(input1), 0);
-		assert.equal(group.indexOf(input2), 1);
-		assert.equal(group.indexOf(input3), 3);
-		assert.equal(group.indexOf(input4), 2);
+		assert.strictEqual(group.indexOf(input1), 0);
+		assert.strictEqual(group.indexOf(input2), 1);
+		assert.strictEqual(group.indexOf(input3), 3);
+		assert.strictEqual(group.indexOf(input4), 2);
 	});
 });
diff --git a/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
index 21c86ec8f..44824465b 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
@@ -33,7 +33,7 @@ suite('Workbench editor input', () => {
 		});
 
 		input.dispose();
-		assert.equal(counter, 1);
+		assert.strictEqual(counter, 1);
 	});
 
 	test('DiffEditorInput', () => {
@@ -54,14 +54,14 @@ suite('Workbench editor input', () => {
 
 		let diffInput = instantiationService.createInstance(DiffEditorInput, 'name', 'description', input, otherInput, undefined);
 
-		assert.equal(diffInput.originalInput, input);
-		assert.equal(diffInput.modifiedInput, otherInput);
+		assert.strictEqual(diffInput.originalInput, input);
+		assert.strictEqual(diffInput.modifiedInput, otherInput);
 		assert(diffInput.matches(diffInput));
 		assert(!diffInput.matches(otherInput));
 		assert(!diffInput.matches(null));
 
 		diffInput.dispose();
-		assert.equal(counter, 0);
+		assert.strictEqual(counter, 0);
 	});
 
 	test('DiffEditorInput disposes when input inside disposes', function () {
@@ -89,6 +89,6 @@ suite('Workbench editor input', () => {
 		});
 
 		otherInput.dispose();
-		assert.equal(counter, 2);
+		assert.strictEqual(counter, 2);
 	});
 });
diff --git a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
index 69a3a66b2..69ef98b64 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
@@ -60,11 +60,11 @@ suite('Workbench editor model', () => {
 
 		const model = await m.load();
 		assert(model === m);
-		assert.equal(model.isDisposed(), false);
+		assert.strictEqual(model.isDisposed(), false);
 		assert.strictEqual(m.isResolved(), true);
 		m.dispose();
-		assert.equal(counter, 1);
-		assert.equal(model.isDisposed(), true);
+		assert.strictEqual(counter, 1);
+		assert.strictEqual(model.isDisposed(), true);
 	});
 
 	test('BaseTextEditorModel', async () => {
diff --git a/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts b/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
index 2fd3867b6..758ade90b 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorPane.test.ts
@@ -107,11 +107,11 @@ suite('Workbench EditorPane', () => {
 		assert(!e.input);
 
 		await e.setInput(input, options, Object.create(null), CancellationToken.None);
-		assert.strictEqual(input, e.input);
+		assert.strictEqual(<any>input, e.input);
 		const group = new TestEditorGroupView(1);
 		e.setVisible(true, group);
 		assert(e.isVisible());
-		assert.equal(e.group, group);
+		assert.strictEqual(e.group, group);
 		input.onDispose(() => {
 			assert(false);
 		});
@@ -139,8 +139,8 @@ suite('Workbench EditorPane', () => {
 		const dispose1 = EditorRegistry.registerEditor(d1, [new SyncDescriptor(MyInput)]);
 		const dispose2 = EditorRegistry.registerEditor(d2, [new SyncDescriptor(MyInput), new SyncDescriptor(MyOtherInput)]);
 
-		assert.equal(EditorRegistry.getEditors().length, oldEditorsCnt + 2);
-		assert.equal((<any>EditorRegistry).getEditorInputs().length, oldInputCnt + 3);
+		assert.strictEqual(EditorRegistry.getEditors().length, oldEditorsCnt + 2);
+		assert.strictEqual((<any>EditorRegistry).getEditorInputs().length, oldInputCnt + 3);
 
 		assert.strictEqual(EditorRegistry.getEditor(new MyInput()), d2);
 		assert.strictEqual(EditorRegistry.getEditor(new MyOtherInput()), d2);
@@ -209,12 +209,12 @@ suite('Workbench EditorPane', () => {
 		memento.saveEditorState(testGroup0, URI.file('/A'), { line: 3 });
 		res = memento.loadEditorState(testGroup0, URI.file('/A'));
 		assert.ok(res);
-		assert.equal(res!.line, 3);
+		assert.strictEqual(res!.line, 3);
 
 		memento.saveEditorState(testGroup1, URI.file('/A'), { line: 5 });
 		res = memento.loadEditorState(testGroup1, URI.file('/A'));
 		assert.ok(res);
-		assert.equal(res!.line, 5);
+		assert.strictEqual(res!.line, 5);
 
 		// Ensure capped at 3 elements
 		memento.saveEditorState(testGroup0, URI.file('/B'), { line: 1 });
@@ -276,15 +276,15 @@ suite('Workbench EditorPane', () => {
 		assert.ok(!res);
 
 		res = memento.loadEditorState(testGroup0, URI.file('/some/folder/file-moved.txt'));
-		assert.equal(res?.line, 1);
+		assert.strictEqual(res?.line, 1);
 
 		memento.moveEditorState(URI.file('/some/folder'), URI.file('/some/folder-moved'), extUri);
 
 		res = memento.loadEditorState(testGroup0, URI.file('/some/folder-moved/file-moved.txt'));
-		assert.equal(res?.line, 1);
+		assert.strictEqual(res?.line, 1);
 
 		res = memento.loadEditorState(testGroup0, URI.file('/some/folder-moved/file-2.txt'));
-		assert.equal(res?.line, 2);
+		assert.strictEqual(res?.line, 2);
 	});
 
 	test('EditoMemento - use with editor input', function () {
@@ -317,7 +317,7 @@ suite('Workbench EditorPane', () => {
 		memento.saveEditorState(testGroup0, testInputA, { line: 3 });
 		res = memento.loadEditorState(testGroup0, testInputA);
 		assert.ok(res);
-		assert.equal(res!.line, 3);
+		assert.strictEqual(res!.line, 3);
 
 		// State removed when input gets disposed
 		testInputA.dispose();
@@ -355,7 +355,7 @@ suite('Workbench EditorPane', () => {
 		memento.saveEditorState(testGroup0, testInputA.resource, { line: 3 });
 		res = memento.loadEditorState(testGroup0, testInputA);
 		assert.ok(res);
-		assert.equal(res!.line, 3);
+		assert.strictEqual(res!.line, 3);
 
 		// State not yet removed when input gets disposed
 		// because we used resource
@@ -371,7 +371,7 @@ suite('Workbench EditorPane', () => {
 		memento.saveEditorState(testGroup0, testInputB.resource, { line: 3 });
 		res = memento.loadEditorState(testGroup0, testInputB);
 		assert.ok(res);
-		assert.equal(res!.line, 3);
+		assert.strictEqual(res!.line, 3);
 
 		memento.clearEditorStateOnDispose(testInputB.resource, testInputB);
 
diff --git a/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts b/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
index a0fa7d56f..e8608159c 100644
--- a/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts
@@ -31,7 +31,7 @@ suite('Resource text editors', () => {
 		const model = await input.resolve();
 
 		assert.ok(model);
-		assert.equal(snapshotToString(((model as ResourceEditorModel).createSnapshot()!)), 'function test() {}');
+		assert.strictEqual(snapshotToString(((model as ResourceEditorModel).createSnapshot()!)), 'function test() {}');
 	});
 
 	test('custom mode', async () => {
@@ -46,9 +46,9 @@ suite('Resource text editors', () => {
 
 		const model = await input.resolve();
 		assert.ok(model);
-		assert.equal(model.textEditorModel.getModeId(), 'resource-input-test');
+		assert.strictEqual(model.textEditorModel.getModeId(), 'resource-input-test');
 
 		input.setMode('text');
-		assert.equal(model.textEditorModel.getModeId(), PLAINTEXT_MODE_ID);
+		assert.strictEqual(model.textEditorModel.getModeId(), PLAINTEXT_MODE_ID);
 	});
 });
diff --git a/src/vs/workbench/test/browser/quickAccess.test.ts b/src/vs/workbench/test/browser/quickAccess.test.ts
index ccaa36cdf..669467fa2 100644
--- a/src/vs/workbench/test/browser/quickAccess.test.ts
+++ b/src/vs/workbench/test/browser/quickAccess.test.ts
@@ -133,61 +133,61 @@ suite('QuickAccess', () => {
 		disposables.add(registry.registerQuickAccessProvider(providerDescriptor3));
 
 		accessor.quickInputService.quickAccess.show('test');
-		assert.equal(providerDefaultCalled, false);
-		assert.equal(provider1Called, true);
-		assert.equal(provider2Called, false);
-		assert.equal(provider3Called, false);
-		assert.equal(providerDefaultCanceled, false);
-		assert.equal(provider1Canceled, false);
-		assert.equal(provider2Canceled, false);
-		assert.equal(provider3Canceled, false);
-		assert.equal(providerDefaultDisposed, false);
-		assert.equal(provider1Disposed, false);
-		assert.equal(provider2Disposed, false);
-		assert.equal(provider3Disposed, false);
+		assert.strictEqual(providerDefaultCalled, false);
+		assert.strictEqual(provider1Called, true);
+		assert.strictEqual(provider2Called, false);
+		assert.strictEqual(provider3Called, false);
+		assert.strictEqual(providerDefaultCanceled, false);
+		assert.strictEqual(provider1Canceled, false);
+		assert.strictEqual(provider2Canceled, false);
+		assert.strictEqual(provider3Canceled, false);
+		assert.strictEqual(providerDefaultDisposed, false);
+		assert.strictEqual(provider1Disposed, false);
+		assert.strictEqual(provider2Disposed, false);
+		assert.strictEqual(provider3Disposed, false);
 		provider1Called = false;
 
 		accessor.quickInputService.quickAccess.show('test something');
-		assert.equal(providerDefaultCalled, false);
-		assert.equal(provider1Called, false);
-		assert.equal(provider2Called, true);
-		assert.equal(provider3Called, false);
-		assert.equal(providerDefaultCanceled, false);
-		assert.equal(provider1Canceled, true);
-		assert.equal(provider2Canceled, false);
-		assert.equal(provider3Canceled, false);
-		assert.equal(providerDefaultDisposed, false);
-		assert.equal(provider1Disposed, true);
-		assert.equal(provider2Disposed, false);
-		assert.equal(provider3Disposed, false);
+		assert.strictEqual(providerDefaultCalled, false);
+		assert.strictEqual(provider1Called, false);
+		assert.strictEqual(provider2Called, true);
+		assert.strictEqual(provider3Called, false);
+		assert.strictEqual(providerDefaultCanceled, false);
+		assert.strictEqual(provider1Canceled, true);
+		assert.strictEqual(provider2Canceled, false);
+		assert.strictEqual(provider3Canceled, false);
+		assert.strictEqual(providerDefaultDisposed, false);
+		assert.strictEqual(provider1Disposed, true);
+		assert.strictEqual(provider2Disposed, false);
+		assert.strictEqual(provider3Disposed, false);
 		provider2Called = false;
 		provider1Canceled = false;
 		provider1Disposed = false;
 
 		accessor.quickInputService.quickAccess.show('usedefault');
-		assert.equal(providerDefaultCalled, true);
-		assert.equal(provider1Called, false);
-		assert.equal(provider2Called, false);
-		assert.equal(provider3Called, false);
-		assert.equal(providerDefaultCanceled, false);
-		assert.equal(provider1Canceled, false);
-		assert.equal(provider2Canceled, true);
-		assert.equal(provider3Canceled, false);
-		assert.equal(providerDefaultDisposed, false);
-		assert.equal(provider1Disposed, false);
-		assert.equal(provider2Disposed, true);
-		assert.equal(provider3Disposed, false);
+		assert.strictEqual(providerDefaultCalled, true);
+		assert.strictEqual(provider1Called, false);
+		assert.strictEqual(provider2Called, false);
+		assert.strictEqual(provider3Called, false);
+		assert.strictEqual(providerDefaultCanceled, false);
+		assert.strictEqual(provider1Canceled, false);
+		assert.strictEqual(provider2Canceled, true);
+		assert.strictEqual(provider3Canceled, false);
+		assert.strictEqual(providerDefaultDisposed, false);
+		assert.strictEqual(provider1Disposed, false);
+		assert.strictEqual(provider2Disposed, true);
+		assert.strictEqual(provider3Disposed, false);
 
 		await timeout(1);
 
-		assert.equal(providerDefaultCanceled, true);
-		assert.equal(providerDefaultDisposed, true);
-		assert.equal(provider3Called, true);
+		assert.strictEqual(providerDefaultCanceled, true);
+		assert.strictEqual(providerDefaultDisposed, true);
+		assert.strictEqual(provider3Called, true);
 
 		await timeout(1);
 
-		assert.equal(provider3Canceled, true);
-		assert.equal(provider3Disposed, true);
+		assert.strictEqual(provider3Canceled, true);
+		assert.strictEqual(provider3Disposed, true);
 
 		disposables.dispose();
 
@@ -272,40 +272,40 @@ suite('QuickAccess', () => {
 		disposables.add(registry.registerQuickAccessProvider(fastAndSlowProviderDescriptor));
 
 		accessor.quickInputService.quickAccess.show('fast');
-		assert.equal(fastProviderCalled, true);
-		assert.equal(slowProviderCalled, false);
-		assert.equal(fastAndSlowProviderCalled, false);
+		assert.strictEqual(fastProviderCalled, true);
+		assert.strictEqual(slowProviderCalled, false);
+		assert.strictEqual(fastAndSlowProviderCalled, false);
 		fastProviderCalled = false;
 
 		accessor.quickInputService.quickAccess.show('slow');
 		await timeout(2);
 
-		assert.equal(fastProviderCalled, false);
-		assert.equal(slowProviderCalled, true);
-		assert.equal(slowProviderCanceled, false);
-		assert.equal(fastAndSlowProviderCalled, false);
+		assert.strictEqual(fastProviderCalled, false);
+		assert.strictEqual(slowProviderCalled, true);
+		assert.strictEqual(slowProviderCanceled, false);
+		assert.strictEqual(fastAndSlowProviderCalled, false);
 		slowProviderCalled = false;
 
 		accessor.quickInputService.quickAccess.show('bothFastAndSlow');
 		await timeout(2);
 
-		assert.equal(fastProviderCalled, false);
-		assert.equal(slowProviderCalled, false);
-		assert.equal(fastAndSlowProviderCalled, true);
-		assert.equal(fastAndSlowProviderCanceled, false);
+		assert.strictEqual(fastProviderCalled, false);
+		assert.strictEqual(slowProviderCalled, false);
+		assert.strictEqual(fastAndSlowProviderCalled, true);
+		assert.strictEqual(fastAndSlowProviderCanceled, false);
 		fastAndSlowProviderCalled = false;
 
 		accessor.quickInputService.quickAccess.show('slow');
 		accessor.quickInputService.quickAccess.show('bothFastAndSlow');
 		accessor.quickInputService.quickAccess.show('fast');
 
-		assert.equal(fastProviderCalled, true);
-		assert.equal(slowProviderCalled, true);
-		assert.equal(fastAndSlowProviderCalled, true);
+		assert.strictEqual(fastProviderCalled, true);
+		assert.strictEqual(slowProviderCalled, true);
+		assert.strictEqual(fastAndSlowProviderCalled, true);
 
 		await timeout(2);
-		assert.equal(slowProviderCanceled, true);
-		assert.equal(fastAndSlowProviderCanceled, true);
+		assert.strictEqual(slowProviderCanceled, true);
+		assert.strictEqual(fastAndSlowProviderCanceled, true);
 
 		disposables.dispose();
 
diff --git a/src/vs/workbench/test/browser/viewlet.test.ts b/src/vs/workbench/test/browser/viewlet.test.ts
index 15a1cb526..f2cac091a 100644
--- a/src/vs/workbench/test/browser/viewlet.test.ts
+++ b/src/vs/workbench/test/browser/viewlet.test.ts
@@ -49,6 +49,6 @@ suite('Viewlets', () => {
 		Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).registerViewlet(d);
 
 		assert(d === Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet('reg-test-id'));
-		assert.equal(oldCount + 1, Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlets().length);
+		assert.strictEqual(oldCount + 1, Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlets().length);
 	});
 });
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 83f8f0d0e..1f5675198 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -13,7 +13,7 @@ import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtil
 import { IEditorInputWithOptions, IEditorIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorInput, IEditorPane, IEditorCloseEvent, IEditorPartOptions, IRevertOptions, GroupIdentifier, EditorInput, EditorOptions, EditorsOrder, IFileEditorInput, IEditorInputFactoryRegistry, IEditorInputFactory, Extensions as EditorExtensions, ISaveOptions, IMoveResult, ITextEditorPane, ITextDiffEditorPane, IVisibleEditorPane, IEditorOpenContext } from 'vs/workbench/common/editor';
 import { IEditorOpeningEvent, EditorServiceImpl, IEditorGroupView, IEditorGroupsAccessor, IEditorGroupTitleDimensions } from 'vs/workbench/browser/parts/editor/editor';
 import { Event, Emitter } from 'vs/base/common/event';
-import { IBackupFileService, IResolvedBackup } from 'vs/workbench/services/backup/common/backup';
+import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService, Parts, Position as PartPosition } from 'vs/workbench/services/layout/browser/layoutService';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
@@ -23,7 +23,7 @@ import { IUntitledTextEditorService, UntitledTextEditorService } from 'vs/workbe
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ILifecycleService, BeforeShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { FileOperationEvent, IFileService, IFileStat, IResolveFileResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, FileDeleteOptions, FileOverwriteOptions, FileWriteOptions, FileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability } from 'vs/platform/files/common/files';
+import { FileOperationEvent, IFileService, IFileStat, IResolveFileResult, FileChangesEvent, IResolveFileOptions, ICreateFileOptions, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, FileType, FileDeleteOptions, FileOverwriteOptions, FileWriteOptions, FileOpenOptions, IFileStatWithMetadata, IResolveMetadataFileOptions, IWriteFileOptions, IReadFileOptions, IFileContent, IFileStreamContent, FileOperationError, IFileSystemProviderWithFileReadStreamCapability, FileReadStreamOptions } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -114,6 +114,10 @@ import { EncodingOracle, IEncodingOverride } from 'vs/workbench/services/textfil
 import { UTF16le, UTF16be, UTF8_with_bom } from 'vs/workbench/services/textfile/common/encoding';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 import { Iterable } from 'vs/base/common/iterator';
+import { InMemoryBackupFileService } from 'vs/workbench/services/backup/common/backupFileService';
+import { hash } from 'vs/base/common/hash';
+import { BrowserBackupFileService } from 'vs/workbench/services/backup/browser/backupFileService';
+import { FileService } from 'vs/platform/files/common/fileService';
 
 export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined);
@@ -123,15 +127,18 @@ export interface ITestInstantiationService extends IInstantiationService {
 	stub<T>(service: ServiceIdentifier<T>, ctor: any): T;
 }
 
-export function workbenchInstantiationService(overrides?: {
-	textFileService?: (instantiationService: IInstantiationService) => ITextFileService
-	pathService?: (instantiationService: IInstantiationService) => IPathService,
-	editorService?: (instantiationService: IInstantiationService) => IEditorService,
-	contextKeyService?: (instantiationService: IInstantiationService) => IContextKeyService,
-}): ITestInstantiationService {
+export function workbenchInstantiationService(
+	overrides?: {
+		textFileService?: (instantiationService: IInstantiationService) => ITextFileService;
+		pathService?: (instantiationService: IInstantiationService) => IPathService,
+		editorService?: (instantiationService: IInstantiationService) => IEditorService,
+		contextKeyService?: (instantiationService: IInstantiationService) => IContextKeyService,
+	},
+	disposables: DisposableStore = new DisposableStore()
+): ITestInstantiationService {
 	const instantiationService = new TestInstantiationService(new ServiceCollection([ILifecycleService, new TestLifecycleService()]));
 
-	instantiationService.stub(IWorkingCopyService, new TestWorkingCopyService());
+	instantiationService.stub(IWorkingCopyService, disposables.add(new TestWorkingCopyService()));
 	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
 	const contextKeyService = overrides?.contextKeyService ? overrides.contextKeyService(instantiationService) : instantiationService.createInstance(MockContextKeyService);
 	instantiationService.stub(IContextKeyService, contextKeyService);
@@ -140,10 +147,10 @@ export function workbenchInstantiationService(overrides?: {
 	instantiationService.stub(IWorkspaceContextService, workspaceContextService);
 	const configService = new TestConfigurationService();
 	instantiationService.stub(IConfigurationService, configService);
-	instantiationService.stub(IFilesConfigurationService, new TestFilesConfigurationService(contextKeyService, configService));
+	instantiationService.stub(IFilesConfigurationService, disposables.add(new TestFilesConfigurationService(contextKeyService, configService)));
 	instantiationService.stub(ITextResourceConfigurationService, new TestTextResourceConfigurationService(configService));
-	instantiationService.stub(IUntitledTextEditorService, instantiationService.createInstance(UntitledTextEditorService));
-	instantiationService.stub(IStorageService, new TestStorageService());
+	instantiationService.stub(IUntitledTextEditorService, disposables.add(instantiationService.createInstance(UntitledTextEditorService)));
+	instantiationService.stub(IStorageService, disposables.add(new TestStorageService()));
 	instantiationService.stub(IPathService, overrides?.pathService ? overrides.pathService(instantiationService) : new TestPathService());
 	const layoutService = new TestLayoutService();
 	instantiationService.stub(IWorkbenchLayoutService, layoutService);
@@ -151,39 +158,39 @@ export function workbenchInstantiationService(overrides?: {
 	const accessibilityService = new TestAccessibilityService();
 	instantiationService.stub(IAccessibilityService, accessibilityService);
 	instantiationService.stub(IFileDialogService, instantiationService.createInstance(TestFileDialogService));
-	instantiationService.stub(IModeService, instantiationService.createInstance(ModeServiceImpl));
+	instantiationService.stub(IModeService, disposables.add(instantiationService.createInstance(ModeServiceImpl)));
 	instantiationService.stub(IHistoryService, new TestHistoryService());
 	instantiationService.stub(ITextResourcePropertiesService, new TestTextResourcePropertiesService(configService));
 	instantiationService.stub(IUndoRedoService, instantiationService.createInstance(UndoRedoService));
 	const themeService = new TestThemeService();
 	instantiationService.stub(IThemeService, themeService);
-	instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
+	instantiationService.stub(IModelService, disposables.add(instantiationService.createInstance(ModelServiceImpl)));
 	const fileService = new TestFileService();
 	instantiationService.stub(IFileService, fileService);
 	instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService));
 	instantiationService.stub(IBackupFileService, new TestBackupFileService());
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
 	instantiationService.stub(INotificationService, new TestNotificationService());
-	instantiationService.stub(IUntitledTextEditorService, instantiationService.createInstance(UntitledTextEditorService));
+	instantiationService.stub(IUntitledTextEditorService, disposables.add(instantiationService.createInstance(UntitledTextEditorService)));
 	instantiationService.stub(IMenuService, new TestMenuService());
 	const keybindingService = new MockKeybindingService();
 	instantiationService.stub(IKeybindingService, keybindingService);
 	instantiationService.stub(IDecorationsService, new TestDecorationsService());
 	instantiationService.stub(IExtensionService, new TestExtensionService());
-	instantiationService.stub(IWorkingCopyFileService, instantiationService.createInstance(WorkingCopyFileService));
-	instantiationService.stub(ITextFileService, overrides?.textFileService ? overrides.textFileService(instantiationService) : <ITextFileService>instantiationService.createInstance(TestTextFileService));
+	instantiationService.stub(IWorkingCopyFileService, disposables.add(instantiationService.createInstance(WorkingCopyFileService)));
+	instantiationService.stub(ITextFileService, overrides?.textFileService ? overrides.textFileService(instantiationService) : disposables.add(<ITextFileService>instantiationService.createInstance(TestTextFileService)));
 	instantiationService.stub(IHostService, <IHostService>instantiationService.createInstance(TestHostService));
-	instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
+	instantiationService.stub(ITextModelService, <ITextModelService>disposables.add(instantiationService.createInstance(TextModelResolverService)));
 	instantiationService.stub(ILogService, new NullLogService());
 	const editorGroupService = new TestEditorGroupsService([new TestEditorGroupView(0)]);
 	instantiationService.stub(IEditorGroupsService, editorGroupService);
-	instantiationService.stub(ILabelService, <ILabelService>instantiationService.createInstance(LabelService));
+	instantiationService.stub(ILabelService, <ILabelService>disposables.add(instantiationService.createInstance(LabelService)));
 	const editorService = overrides?.editorService ? overrides.editorService(instantiationService) : new TestEditorService(editorGroupService);
 	instantiationService.stub(IEditorService, editorService);
-	instantiationService.stub(ICodeEditorService, new CodeEditorService(editorService, themeService));
+	instantiationService.stub(ICodeEditorService, disposables.add(new CodeEditorService(editorService, themeService, configService)));
 	instantiationService.stub(IViewletService, new TestViewletService());
 	instantiationService.stub(IListService, new TestListService());
-	instantiationService.stub(IQuickInputService, new QuickInputService(configService, instantiationService, keybindingService, contextKeyService, themeService, accessibilityService, layoutService));
+	instantiationService.stub(IQuickInputService, disposables.add(new QuickInputService(configService, instantiationService, keybindingService, contextKeyService, themeService, accessibilityService, layoutService)));
 
 	return instantiationService;
 }
@@ -432,6 +439,7 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 	private readonly _onMenubarVisibilityChange = new Emitter<Dimension>();
 	get onMenubarVisibilityChange(): Event<Dimension> { return this._onMenubarVisibilityChange.event; }
 
+	layout(): void { }
 	isRestored(): boolean { return true; }
 	hasFocus(_part: Parts): boolean { return false; }
 	focusPart(_part: Parts): void { }
@@ -446,16 +454,17 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 	isActivityBarHidden(): boolean { return false; }
 	setActivityBarHidden(_hidden: boolean): void { }
 	isSideBarHidden(): boolean { return false; }
-	setEditorHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }
-	setSideBarHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }
+	async setEditorHidden(_hidden: boolean): Promise<void> { }
+	async setSideBarHidden(_hidden: boolean): Promise<void> { }
 	isPanelHidden(): boolean { return false; }
-	setPanelHidden(_hidden: boolean): Promise<void> { return Promise.resolve(); }
+	async setPanelHidden(_hidden: boolean): Promise<void> { }
 	toggleMaximizedPanel(): void { }
 	isPanelMaximized(): boolean { return false; }
 	getMenubarVisibility(): MenuBarVisibility { throw new Error('not implemented'); }
+	toggleMenuBar(): void { }
 	getSideBarPosition() { return 0; }
 	getPanelPosition() { return 0; }
-	setPanelPosition(_position: PartPosition): Promise<void> { return Promise.resolve(); }
+	async setPanelPosition(_position: PartPosition): Promise<void> { }
 	addClass(_clazz: string): void { }
 	removeClass(_clazz: string): void { }
 	getMaximumEditorDimensions(): Dimension { throw new Error('not implemented'); }
@@ -501,7 +510,7 @@ export class TestViewletService implements IViewletService {
 export class TestPanelService implements IPanelService {
 	declare readonly _serviceBrand: undefined;
 
-	onDidPanelOpen = new Emitter<{ panel: IPanel, focus: boolean }>().event;
+	onDidPanelOpen = new Emitter<{ panel: IPanel, focus: boolean; }>().event;
 	onDidPanelClose = new Emitter<IPanel>().event;
 
 	async openPanel(id?: string, focus?: boolean): Promise<undefined> { return undefined; }
@@ -521,7 +530,7 @@ export class TestViewsService implements IViewsService {
 	declare readonly _serviceBrand: undefined;
 
 
-	onDidChangeViewContainerVisibility = new Emitter<{ id: string; visible: boolean; location: ViewContainerLocation }>().event;
+	onDidChangeViewContainerVisibility = new Emitter<{ id: string; visible: boolean; location: ViewContainerLocation; }>().event;
 	isViewContainerVisible(id: string): boolean { return true; }
 	getVisibleViewContainer(): ViewContainer | null { return null; }
 	openViewContainer(id: string, focus?: boolean): Promise<IPaneComposite | null> { return Promise.resolve(null); }
@@ -567,8 +576,8 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	findGroup(_scope: IFindGroupScope, _source?: number | IEditorGroup, _wrap?: boolean): IEditorGroup { throw new Error('not implemented'); }
 	activateGroup(_group: number | IEditorGroup): IEditorGroup { throw new Error('not implemented'); }
 	restoreGroup(_group: number | IEditorGroup): IEditorGroup { throw new Error('not implemented'); }
-	getSize(_group: number | IEditorGroup): { width: number, height: number } { return { width: 100, height: 100 }; }
-	setSize(_group: number | IEditorGroup, _size: { width: number, height: number }): void { }
+	getSize(_group: number | IEditorGroup): { width: number, height: number; } { return { width: 100, height: 100 }; }
+	setSize(_group: number | IEditorGroup, _size: { width: number, height: number; }): void { }
 	arrangeGroups(_arrangement: GroupsArrangement): void { }
 	applyLayout(_layout: EditorGroupLayout): void { }
 	setGroupOrientation(_orientation: GroupOrientation): void { }
@@ -631,10 +640,10 @@ export class TestEditorGroupView implements IEditorGroupView {
 	isActive(_editor: IEditorInput): boolean { return false; }
 	moveEditor(_editor: IEditorInput, _target: IEditorGroup, _options?: IMoveEditorOptions): void { }
 	copyEditor(_editor: IEditorInput, _target: IEditorGroup, _options?: ICopyEditorOptions): void { }
-	closeEditor(_editor?: IEditorInput, options?: ICloseEditorOptions): Promise<void> { return Promise.resolve(); }
-	closeEditors(_editors: IEditorInput[] | ICloseEditorsFilter, options?: ICloseEditorOptions): Promise<void> { return Promise.resolve(); }
-	closeAllEditors(options?: ICloseAllEditorsOptions): Promise<void> { return Promise.resolve(); }
-	replaceEditors(_editors: IEditorReplacement[]): Promise<void> { return Promise.resolve(); }
+	async closeEditor(_editor?: IEditorInput, options?: ICloseEditorOptions): Promise<void> { }
+	async closeEditors(_editors: IEditorInput[] | ICloseEditorsFilter, options?: ICloseEditorOptions): Promise<void> { }
+	async closeAllEditors(options?: ICloseAllEditorsOptions): Promise<void> { }
+	async replaceEditors(_editors: IEditorReplacement[]): Promise<void> { }
 	pinEditor(_editor?: IEditorInput): void { }
 	stickEditor(editor?: IEditorInput | undefined): void { }
 	unstickEditor(editor?: IEditorInput | undefined): void { }
@@ -700,6 +709,7 @@ export class TestEditorService implements EditorServiceImpl {
 
 	constructor(private editorGroupService?: IEditorGroupsService) { }
 	getEditors() { return []; }
+	findEditors() { return []; }
 	getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry][] { return []; }
 	overrideOpenEditor(_handler: IOpenEditorOverrideHandler): IDisposable { return toDisposable(() => undefined); }
 	registerCustomEditorViewTypesHandler(source: string, handler: ICustomEditorViewTypesHandler): IDisposable {
@@ -726,7 +736,7 @@ export class TestEditorService implements EditorServiceImpl {
 	saveAll(options?: ISaveEditorsOptions): Promise<boolean> { throw new Error('Method not implemented.'); }
 	revert(editors: IEditorIdentifier[], options?: IRevertOptions): Promise<boolean> { throw new Error('Method not implemented.'); }
 	revertAll(options?: IRevertAllEditorsOptions): Promise<boolean> { throw new Error('Method not implemented.'); }
-	whenClosed(editors: IResourceEditorInput[], options?: { waitForSaved: boolean }): Promise<void> { throw new Error('Method not implemented.'); }
+	whenClosed(editors: IResourceEditorInput[], options?: { waitForSaved: boolean; }): Promise<void> { throw new Error('Method not implemented.'); }
 }
 
 export class TestFileService implements IFileService {
@@ -766,7 +776,7 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	async resolveAll(toResolve: { resource: URI, options?: IResolveFileOptions }[]): Promise<IResolveFileResult[]> {
+	async resolveAll(toResolve: { resource: URI, options?: IResolveFileOptions; }[]): Promise<IResolveFileResult[]> {
 		const stats = await Promise.all(toResolve.map(resourceAndOption => this.resolve(resourceAndOption.resource, resourceAndOption.options)));
 
 		return stats.map(stat => ({ stat, success: true }));
@@ -870,7 +880,7 @@ export class TestFileService implements IFileService {
 		return false;
 	}
 
-	del(_resource: URI, _options?: { useTrash?: boolean, recursive?: boolean }): Promise<void> { return Promise.resolve(); }
+	async del(_resource: URI, _options?: { useTrash?: boolean, recursive?: boolean; }): Promise<void> { }
 
 	readonly watches: URI[] = [];
 	watch(_resource: URI): IDisposable {
@@ -888,27 +898,78 @@ export class TestFileService implements IFileService {
 	async canDelete(resource: URI, options?: { useTrash?: boolean | undefined; recursive?: boolean | undefined; } | undefined): Promise<Error | true> { return true; }
 }
 
-export class TestBackupFileService implements IBackupFileService {
-	declare readonly _serviceBrand: undefined;
+export class TestBackupFileService extends InMemoryBackupFileService {
+
+	constructor() {
+		super(resource => String(hash(resource.path)));
+	}
 
-	hasBackups(): Promise<boolean> { return Promise.resolve(false); }
-	hasBackup(_resource: URI): Promise<boolean> { return Promise.resolve(false); }
-	hasBackupSync(resource: URI, versionId?: number): boolean { return false; }
-	registerResourceForBackup(_resource: URI): Promise<void> { return Promise.resolve(); }
-	deregisterResourceForBackup(_resource: URI): Promise<void> { return Promise.resolve(); }
-	backup<T extends object>(_resource: URI, _content?: ITextSnapshot, versionId?: number, meta?: T): Promise<void> { return Promise.resolve(); }
-	getBackups(): Promise<URI[]> { return Promise.resolve([]); }
-	resolve<T extends object>(_backup: URI): Promise<IResolvedBackup<T> | undefined> { return Promise.resolve(undefined); }
-	discardBackup(_resource: URI): Promise<void> { return Promise.resolve(); }
-	discardBackups(): Promise<void> { return Promise.resolve(); }
 	parseBackupContent(textBufferFactory: ITextBufferFactory): string {
-		const textBuffer = textBufferFactory.create(DefaultEndOfLine.LF);
+		const textBuffer = textBufferFactory.create(DefaultEndOfLine.LF).textBuffer;
 		const lineCount = textBuffer.getLineCount();
 		const range = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
 		return textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
 	}
 }
 
+export class InMemoryTestBackupFileService extends BrowserBackupFileService {
+
+	readonly fileService: IFileService;
+
+	private backupResourceJoiners: Function[];
+	private discardBackupJoiners: Function[];
+
+	discardedBackups: URI[];
+
+	constructor() {
+		const environmentService = TestEnvironmentService;
+		const logService = new NullLogService();
+		const fileService = new FileService(logService);
+		fileService.registerProvider(Schemas.file, new InMemoryFileSystemProvider());
+		fileService.registerProvider(Schemas.userData, new InMemoryFileSystemProvider());
+
+		super(new TestContextService(TestWorkspace), environmentService, fileService, logService);
+
+		this.fileService = fileService;
+		this.backupResourceJoiners = [];
+		this.discardBackupJoiners = [];
+		this.discardedBackups = [];
+	}
+
+	joinBackupResource(): Promise<void> {
+		return new Promise(resolve => this.backupResourceJoiners.push(resolve));
+	}
+
+	joinDiscardBackup(): Promise<void> {
+		return new Promise(resolve => this.discardBackupJoiners.push(resolve));
+	}
+
+	async backup(resource: URI, content?: ITextSnapshot, versionId?: number, meta?: any, token?: CancellationToken): Promise<void> {
+		await super.backup(resource, content, versionId, meta, token);
+
+		while (this.backupResourceJoiners.length) {
+			this.backupResourceJoiners.pop()!();
+		}
+	}
+
+	async discardBackup(resource: URI): Promise<void> {
+		await super.discardBackup(resource);
+		this.discardedBackups.push(resource);
+
+		while (this.discardBackupJoiners.length) {
+			this.discardBackupJoiners.pop()!();
+		}
+	}
+
+	async getBackupContents(resource: URI): Promise<string> {
+		const backupResource = this.toBackupResource(resource);
+
+		const fileContents = await this.fileService.readFile(backupResource);
+
+		return fileContents.value.toString();
+	}
+}
+
 export class TestLifecycleService implements ILifecycleService {
 
 	declare readonly _serviceBrand: undefined;
@@ -925,7 +986,7 @@ export class TestLifecycleService implements ILifecycleService {
 	private readonly _onShutdown = new Emitter<void>();
 	get onShutdown(): Event<void> { return this._onShutdown.event; }
 
-	when(): Promise<void> { return Promise.resolve(); }
+	async when(): Promise<void> { }
 
 	fireShutdown(reason = ShutdownReason.QUIT): void {
 		this._onWillShutdown.fire({
@@ -993,6 +1054,8 @@ export class RemoteFileSystemProvider implements IFileSystemProvider {
 	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> { return this.diskFileSystemProvider.read!(fd, pos, data, offset, length); }
 	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> { return this.diskFileSystemProvider.write!(fd, pos, data, offset, length); }
 
+	readFileStream(resource: URI, opts: FileReadStreamOptions, token: CancellationToken): ReadableStreamEvents<Uint8Array> { return this.diskFileSystemProvider.readFileStream!(this.toFileResource(resource), opts, token); }
+
 	private toFileResource(resource: URI): URI { return resource.with({ scheme: Schemas.file, authority: '' }); }
 }
 
@@ -1051,7 +1114,7 @@ export class TestHostService implements IHostService {
 	async reload(): Promise<void> { }
 	async close(): Promise<void> { }
 
-	async focus(options?: { force: boolean }): Promise<void> { }
+	async focus(options?: { force: boolean; }): Promise<void> { }
 
 	async openWindow(arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> { }
 
diff --git a/src/vs/workbench/test/common/memento.test.ts b/src/vs/workbench/test/common/memento.test.ts
index edd54aea2..437688eae 100644
--- a/src/vs/workbench/test/common/memento.test.ts
+++ b/src/vs/workbench/test/common/memento.test.ts
@@ -23,7 +23,7 @@ suite('Memento', () => {
 		let memento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
 		memento.foo = [1, 2, 3];
 		let globalMemento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -34,18 +34,18 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: [1, 2, 3] });
+		assert.deepStrictEqual(memento, { foo: [1, 2, 3] });
 		globalMemento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: 'Hello World' });
+		assert.deepStrictEqual(memento, { foo: 'Hello World' });
 
 		// Assert the Mementos are stored properly in storage
-		assert.deepEqual(JSON.parse(storage.get('memento/memento.test', StorageScope.GLOBAL)!), { foo: [1, 2, 3] });
+		assert.deepStrictEqual(JSON.parse(storage.get('memento/memento.test', StorageScope.GLOBAL)!), { foo: [1, 2, 3] });
 
-		assert.deepEqual(JSON.parse(storage.get('memento/memento.test', StorageScope.WORKSPACE)!), { foo: 'Hello World' });
+		assert.deepStrictEqual(JSON.parse(storage.get('memento/memento.test', StorageScope.WORKSPACE)!), { foo: 'Hello World' });
 
 		// Delete Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
@@ -59,11 +59,11 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, {});
+		assert.deepStrictEqual(memento, {});
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, {});
+		assert.deepStrictEqual(memento, {});
 
 		// Assert the Mementos are also removed from storage
 		assert.strictEqual(storage.get('memento/memento.test', StorageScope.GLOBAL, null!), null);
@@ -87,13 +87,13 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: [1, 2, 3] });
+		assert.deepStrictEqual(memento, { foo: [1, 2, 3] });
 		let globalMemento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: 'Hello World' });
+		assert.deepStrictEqual(memento, { foo: 'Hello World' });
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
@@ -108,13 +108,13 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: [4, 5, 6] });
+		assert.deepStrictEqual(memento, { foo: [4, 5, 6] });
 		globalMemento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: 'World Hello' });
+		assert.deepStrictEqual(memento, { foo: 'World Hello' });
 
 		// Delete Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
@@ -128,11 +128,11 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, {});
+		assert.deepStrictEqual(memento, {});
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, {});
+		assert.deepStrictEqual(memento, {});
 	});
 
 	test('Save and Load - 2 Components with same id', () => {
@@ -160,20 +160,20 @@ suite('Memento', () => {
 
 		// Global
 		memento = myMemento.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: [1, 2, 3], bar: [1, 2, 3] });
+		assert.deepStrictEqual(memento, { foo: [1, 2, 3], bar: [1, 2, 3] });
 		let globalMemento = myMemento.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		memento = myMemento2.getMemento(context!, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: [1, 2, 3], bar: [1, 2, 3] });
+		assert.deepStrictEqual(memento, { foo: [1, 2, 3], bar: [1, 2, 3] });
 		globalMemento = myMemento2.getMemento(StorageScope.GLOBAL, StorageTarget.MACHINE);
-		assert.deepEqual(globalMemento, memento);
+		assert.deepStrictEqual(globalMemento, memento);
 
 		// Workspace
 		memento = myMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: 'Hello World', bar: 'Hello World' });
+		assert.deepStrictEqual(memento, { foo: 'Hello World', bar: 'Hello World' });
 
 		memento = myMemento2.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		assert.deepEqual(memento, { foo: 'Hello World', bar: 'Hello World' });
+		assert.deepStrictEqual(memento, { foo: 'Hello World', bar: 'Hello World' });
 	});
 });
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
index 765c140dc..11655e5ad 100644
--- a/src/vs/workbench/test/common/notifications.test.ts
+++ b/src/vs/workbench/test/common/notifications.test.ts
@@ -25,24 +25,24 @@ suite('Notifications', () => {
 		let item5 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message', actions: { primary: [new Action('id', 'label')] } })!;
 		let item6 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message', actions: { primary: [new Action('id', 'label')] }, progress: { infinite: true } })!;
 
-		assert.equal(item1.equals(item1), true);
-		assert.equal(item2.equals(item2), true);
-		assert.equal(item3.equals(item3), true);
-		assert.equal(item4.equals(item4), true);
-		assert.equal(item5.equals(item5), true);
+		assert.strictEqual(item1.equals(item1), true);
+		assert.strictEqual(item2.equals(item2), true);
+		assert.strictEqual(item3.equals(item3), true);
+		assert.strictEqual(item4.equals(item4), true);
+		assert.strictEqual(item5.equals(item5), true);
 
-		assert.equal(item1.equals(item2), true);
-		assert.equal(item1.equals(item3), false);
-		assert.equal(item1.equals(item4), false);
-		assert.equal(item1.equals(item5), false);
+		assert.strictEqual(item1.equals(item2), true);
+		assert.strictEqual(item1.equals(item3), false);
+		assert.strictEqual(item1.equals(item4), false);
+		assert.strictEqual(item1.equals(item5), false);
 
 		// Progress
-		assert.equal(item1.hasProgress, false);
-		assert.equal(item6.hasProgress, true);
+		assert.strictEqual(item1.hasProgress, false);
+		assert.strictEqual(item6.hasProgress, true);
 
 		// Message Box
-		assert.equal(item5.canCollapse, false);
-		assert.equal(item5.expanded, true);
+		assert.strictEqual(item5.canCollapse, false);
+		assert.strictEqual(item5.expanded, true);
 
 		// Events
 		let called = 0;
@@ -55,7 +55,7 @@ suite('Notifications', () => {
 		item1.collapse();
 		item1.collapse();
 
-		assert.equal(called, 2);
+		assert.strictEqual(called, 2);
 
 		called = 0;
 		item1.onDidChangeContent(e => {
@@ -67,7 +67,7 @@ suite('Notifications', () => {
 		item1.progress.infinite();
 		item1.progress.done();
 
-		assert.equal(called, 2);
+		assert.strictEqual(called, 2);
 
 		called = 0;
 		item1.onDidChangeContent(e => {
@@ -96,7 +96,7 @@ suite('Notifications', () => {
 
 		item1.updateActions({ primary: [new Action('id2', 'label')] });
 
-		assert.equal(called, 1);
+		assert.strictEqual(called, 1);
 
 		called = 0;
 		item1.onDidChangeVisibility(e => {
@@ -107,7 +107,7 @@ suite('Notifications', () => {
 		item1.updateVisibility(false);
 		item1.updateVisibility(false);
 
-		assert.equal(called, 2);
+		assert.strictEqual(called, 2);
 
 		called = 0;
 		item1.onDidClose(() => {
@@ -115,24 +115,24 @@ suite('Notifications', () => {
 		});
 
 		item1.close();
-		assert.equal(called, 1);
+		assert.strictEqual(called, 1);
 
 		// Error with Action
 		let item7 = NotificationViewItem.create({ severity: Severity.Error, message: createErrorWithActions('Hello Error', { actions: [new Action('id', 'label')] }) })!;
-		assert.equal(item7.actions!.primary!.length, 1);
+		assert.strictEqual(item7.actions!.primary!.length, 1);
 
 		// Filter
 		let item8 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' }, NotificationsFilter.SILENT)!;
-		assert.equal(item8.silent, true);
+		assert.strictEqual(item8.silent, true);
 
 		let item9 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' }, NotificationsFilter.OFF)!;
-		assert.equal(item9.silent, false);
+		assert.strictEqual(item9.silent, false);
 
 		let item10 = NotificationViewItem.create({ severity: Severity.Error, message: 'Error Message' }, NotificationsFilter.ERROR)!;
-		assert.equal(item10.silent, false);
+		assert.strictEqual(item10.silent, false);
 
 		let item11 = NotificationViewItem.create({ severity: Severity.Warning, message: 'Error Message' }, NotificationsFilter.ERROR)!;
-		assert.equal(item11.silent, true);
+		assert.strictEqual(item11.silent, true);
 	});
 
 	test('Model', () => {
@@ -154,40 +154,40 @@ suite('Notifications', () => {
 		let item3: INotification = { severity: Severity.Info, message: 'Info Message' };
 
 		let item1Handle = model.addNotification(item1);
-		assert.equal(lastNotificationEvent.item.severity, item1.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item1.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.ADD);
+		assert.strictEqual(lastNotificationEvent.item.severity, item1.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item1.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.ADD);
 
 		item1Handle.updateMessage('Error Message');
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
-		assert.equal(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.MESSAGE);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
+		assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.MESSAGE);
 
 		item1Handle.updateSeverity(Severity.Error);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
-		assert.equal(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.SEVERITY);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
+		assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.SEVERITY);
 
 		item1Handle.updateActions({ primary: [], secondary: [] });
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
-		assert.equal(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.ACTIONS);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
+		assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.ACTIONS);
 
 		item1Handle.progress.infinite();
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
-		assert.equal(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.PROGRESS);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.CHANGE);
+		assert.strictEqual(lastNotificationEvent.detail, NotificationViewItemContentChangeKind.PROGRESS);
 
 		let item2Handle = model.addNotification(item2);
-		assert.equal(lastNotificationEvent.item.severity, item2.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item2.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.ADD);
+		assert.strictEqual(lastNotificationEvent.item.severity, item2.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item2.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.ADD);
 
 		model.addNotification(item3);
-		assert.equal(lastNotificationEvent.item.severity, item3.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item3.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.ADD);
+		assert.strictEqual(lastNotificationEvent.item.severity, item3.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item3.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.ADD);
 
-		assert.equal(model.notifications.length, 3);
+		assert.strictEqual(model.notifications.length, 3);
 
 		let called = 0;
 		item1Handle.onDidClose(() => {
@@ -195,48 +195,48 @@ suite('Notifications', () => {
 		});
 
 		item1Handle.close();
-		assert.equal(called, 1);
-		assert.equal(model.notifications.length, 2);
-		assert.equal(lastNotificationEvent.item.severity, item1.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item1.message);
-		assert.equal(lastNotificationEvent.index, 2);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.REMOVE);
+		assert.strictEqual(called, 1);
+		assert.strictEqual(model.notifications.length, 2);
+		assert.strictEqual(lastNotificationEvent.item.severity, item1.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item1.message);
+		assert.strictEqual(lastNotificationEvent.index, 2);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.REMOVE);
 
 		model.addNotification(item2Duplicate);
-		assert.equal(model.notifications.length, 2);
-		assert.equal(lastNotificationEvent.item.severity, item2Duplicate.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item2Duplicate.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.ADD);
+		assert.strictEqual(model.notifications.length, 2);
+		assert.strictEqual(lastNotificationEvent.item.severity, item2Duplicate.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item2Duplicate.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.ADD);
 
 		item2Handle.close();
-		assert.equal(model.notifications.length, 1);
-		assert.equal(lastNotificationEvent.item.severity, item2Duplicate.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item2Duplicate.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.REMOVE);
+		assert.strictEqual(model.notifications.length, 1);
+		assert.strictEqual(lastNotificationEvent.item.severity, item2Duplicate.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item2Duplicate.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.REMOVE);
 
 		model.notifications[0].expand();
-		assert.equal(lastNotificationEvent.item.severity, item3.severity);
-		assert.equal(lastNotificationEvent.item.message.linkedText.toString(), item3.message);
-		assert.equal(lastNotificationEvent.index, 0);
-		assert.equal(lastNotificationEvent.kind, NotificationChangeType.EXPAND_COLLAPSE);
+		assert.strictEqual(lastNotificationEvent.item.severity, item3.severity);
+		assert.strictEqual(lastNotificationEvent.item.message.linkedText.toString(), item3.message);
+		assert.strictEqual(lastNotificationEvent.index, 0);
+		assert.strictEqual(lastNotificationEvent.kind, NotificationChangeType.EXPAND_COLLAPSE);
 
 		const disposable = model.showStatusMessage('Hello World');
-		assert.equal(model.statusMessage!.message, 'Hello World');
-		assert.equal(lastStatusMessageEvent.item.message, model.statusMessage!.message);
-		assert.equal(lastStatusMessageEvent.kind, StatusMessageChangeType.ADD);
+		assert.strictEqual(model.statusMessage!.message, 'Hello World');
+		assert.strictEqual(lastStatusMessageEvent.item.message, model.statusMessage!.message);
+		assert.strictEqual(lastStatusMessageEvent.kind, StatusMessageChangeType.ADD);
 		disposable.dispose();
 		assert.ok(!model.statusMessage);
-		assert.equal(lastStatusMessageEvent.kind, StatusMessageChangeType.REMOVE);
+		assert.strictEqual(lastStatusMessageEvent.kind, StatusMessageChangeType.REMOVE);
 
 		let disposable2 = model.showStatusMessage('Hello World 2');
 		const disposable3 = model.showStatusMessage('Hello World 3');
 
-		assert.equal(model.statusMessage!.message, 'Hello World 3');
+		assert.strictEqual(model.statusMessage!.message, 'Hello World 3');
 
 		disposable2.dispose();
-		assert.equal(model.statusMessage!.message, 'Hello World 3');
+		assert.strictEqual(model.statusMessage!.message, 'Hello World 3');
 
 		disposable3.dispose();
 		assert.ok(!model.statusMessage);
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index 08210ef22..a20de152e 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -10,16 +10,15 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService, IWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, Workspace } from 'vs/platform/workspace/common/workspace';
 import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { InMemoryStorageService, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 import { WorkingCopyService, IWorkingCopy, IWorkingCopyBackup, WorkingCopyCapabilities } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { NullExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IWorkingCopyFileService, IWorkingCopyFileOperationParticipant, WorkingCopyFileEvent } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
+import { IWorkingCopyFileService, IWorkingCopyFileOperationParticipant, WorkingCopyFileEvent, IDeleteOperation, ICopyOperation, IMoveOperation, IFileOperationUndoRedoInfo, ICreateFileOperation, ICreateOperation } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/common/buffer';
 import { ISaveOptions, IRevertOptions } from 'vs/workbench/common/editor';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
@@ -115,8 +114,8 @@ export class TestContextService implements IWorkspaceContextService {
 		return URI.file(join('C:\\', workspaceRelativePath));
 	}
 
-	isCurrentWorkspace(workspaceIdentifier: ISingleFolderWorkspaceIdentifier | IWorkspaceIdentifier): boolean {
-		return isSingleFolderWorkspaceIdentifier(workspaceIdentifier) && resources.isEqual(this.workspace.folders[0].uri, workspaceIdentifier);
+	isCurrentWorkspace(workspaceIdOrFolder: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI): boolean {
+		return URI.isUri(workspaceIdOrFolder) && resources.isEqual(this.workspace.folders[0].uri, workspaceIdOrFolder);
 	}
 }
 
@@ -196,18 +195,18 @@ export class TestWorkingCopyFileService implements IWorkingCopyFileService {
 
 	addFileOperationParticipant(participant: IWorkingCopyFileOperationParticipant): IDisposable { return Disposable.None; }
 
-	async delete(resources: URI[], options?: { useTrash?: boolean | undefined; recursive?: boolean | undefined; } | undefined): Promise<void> { }
+	async delete(operations: IDeleteOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<void> { }
 
 	registerWorkingCopyProvider(provider: (resourceOrFolder: URI) => IWorkingCopy[]): IDisposable { return Disposable.None; }
 
 	getDirty(resource: URI): IWorkingCopy[] { return []; }
 
-	create(resource: URI, contents?: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: { overwrite?: boolean | undefined; } | undefined): Promise<IFileStatWithMetadata> { throw new Error('Method not implemented.'); }
-	createFolder(resource: URI): Promise<IFileStatWithMetadata> { throw new Error('Method not implemented.'); }
+	create(operations: ICreateFileOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
+	createFolder(operations: ICreateOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
 
-	move(files: { source: URI; target: URI; }[], options?: { overwrite?: boolean }): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
+	move(operations: IMoveOperation[], undoInfo?: IFileOperationUndoRedoInfo): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
 
-	copy(files: { source: URI; target: URI; }[], options?: { overwrite?: boolean }): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
+	copy(operations: ICopyOperation[], undoInfo?: IFileOperationUndoRedoInfo, token?: CancellationToken): Promise<IFileStatWithMetadata[]> { throw new Error('Method not implemented.'); }
 }
 
 export function mock<T>(): Ctor<T> {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
index ff6d95047..0f2b63541 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -461,7 +461,7 @@ suite('ExtHostSearch', () => {
 				]);
 		});
 
-		test.skip('max results = 1', async () => {
+		test('max results = 1', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
@@ -497,7 +497,7 @@ suite('ExtHostSearch', () => {
 			assert(wasCanceled, 'Expected to be canceled when hitting limit');
 		});
 
-		test.skip('max results = 2', async () => {
+		test('max results = 2', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
@@ -533,7 +533,7 @@ suite('ExtHostSearch', () => {
 			assert(wasCanceled, 'Expected to be canceled when hitting limit');
 		});
 
-		test.skip('provider returns maxResults exactly', async () => {
+		test('provider returns maxResults exactly', async () => {
 			const reportedResults = [
 				joinPath(rootFolderA, 'file1.ts'),
 				joinPath(rootFolderA, 'file2.ts'),
diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
index 5bb6f74c6..ea7c53c05 100644
--- a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
@@ -52,7 +52,7 @@ export const TestWorkbenchConfiguration: INativeWorkbenchConfiguration = {
 	appRoot: '',
 	userEnv: {},
 	execPath: process.execPath,
-	perfEntries: [],
+	perfMarks: [],
 	colorScheme: { dark: true, highContrast: false },
 	os: { release: release() },
 	...parseArgs(process.argv, OPTIONS)
@@ -151,9 +151,6 @@ export class TestSharedProcessService implements ISharedProcessService {
 	getChannel(channelName: string): any { return undefined; }
 
 	registerChannel(channelName: string, channel: any): void { }
-
-	async toggleSharedProcessWindow(): Promise<void> { }
-	async whenSharedProcessReady(): Promise<void> { }
 }
 
 export class TestNativeHostService implements INativeHostService {
@@ -225,6 +222,7 @@ export class TestNativeHostService implements INativeHostService {
 	async exit(code: number): Promise<void> { }
 	async openDevTools(options?: Electron.OpenDevToolsOptions | undefined): Promise<void> { }
 	async toggleDevTools(): Promise<void> { }
+	async toggleSharedProcessWindow(): Promise<void> { }
 	async resolveProxy(url: string): Promise<string | undefined> { return undefined; }
 	async readClipboardText(type?: 'selection' | 'clipboard' | undefined): Promise<string> { return ''; }
 	async writeClipboardText(text: string, type?: 'selection' | 'clipboard' | undefined): Promise<void> { }
diff --git a/src/vs/workbench/test/node/api/extHostTunnelService.test.ts b/src/vs/workbench/test/node/api/extHostTunnelService.test.ts
new file mode 100644
index 000000000..d10b52100
--- /dev/null
+++ b/src/vs/workbench/test/node/api/extHostTunnelService.test.ts
@@ -0,0 +1,266 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as platform from 'vs/base/common/platform';
+import { findPorts, getSockets, loadConnectionTable, loadListeningPorts } from 'vs/workbench/api/node/extHostTunnelService';
+
+const tcp =
+	`  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
+	0: 00000000:0BBA 00000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2335214 1 0000000010173312 100 0 0 10 0
+	1: 00000000:1AF3 00000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2334514 1 000000008815920b 100 0 0 10 0
+	2: 0100007F:A9EA 0100007F:1AF3 01 00000000:00000000 00:00000000 00000000  1000        0 2334521 1 00000000a37d44c6 21 4 0 10 -1
+	3: 0100007F:E8B4 0100007F:98EF 01 00000000:00000000 00:00000000 00000000  1000        0 2334532 1 0000000031b88f06 21 4 0 10 -1
+	4: 0100007F:866C 0100007F:8783 01 00000000:00000000 00:00000000 00000000  1000        0 2334510 1 00000000cbf670bb 21 4 30 10 -1
+	5: 0100007F:1AF3 0100007F:A9EA 01 00000000:00000000 00:00000000 00000000  1000        0 2338989 1 0000000000bace62 21 4 1 10 -1
+`;
+const tcp6 =
+	`  sl  local_address                         remote_address                        st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
+	0: 00000000000000000000000000000000:815B 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2321070 1 00000000c44f3f02 100 0 0 10 0
+	1: 00000000000000000000000000000000:8783 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2334509 1 000000003915e812 100 0 0 10 0
+	2: 00000000000000000000000000000000:9907 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2284465 1 00000000f13b9374 100 0 0 10 0
+	3: 00000000000000000000000000000000:98EF 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2334531 1 00000000184cae9c 100 0 0 10 0
+	4: 00000000000000000000000000000000:8BCF 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000  1000        0 2329890 1 00000000c05a3466 100 0 0 10 0
+	5: 0000000000000000FFFF00000100007F:8783 0000000000000000FFFF00000100007F:866C 01 00000000:00000000 00:00000000 00000000  1000        0 2334511 1 00000000bf547132 21 4 1 10 -1
+	6: 0000000000000000FFFF00000100007F:98EF 0000000000000000FFFF00000100007F:E8B4 01 00000000:00000000 00:00000000 00000000  1000        0 2334533 1 0000000039d0bcd2 21 4 1 10 -1
+	7: 0000000000000000FFFF0000DFD317AC:9907 0000000000000000FFFF000001D017AC:C123 01 0000005A:00000000 01:00000017 00000000  1000        0 2311039 3 0000000067b6c8db 23 5 25 10 52
+	8: 0000000000000000FFFF0000DFD317AC:9907 0000000000000000FFFF000001D017AC:C124 01 00000000:00000000 00:00000000 00000000  1000        0 2311040 1 00000000230bb017 25 4 30 10 28
+	9: 0000000000000000FFFF0000DFD317AC:9907 0000000000000000FFFF000001D017AC:C213 01 00000000:00000000 00:00000000 00000000  1000        0 2331501 1 00000000957fcb4a 26 4 30 10 57
+	10: 0000000000000000FFFF0000DFD317AC:9907 0000000000000000FFFF000001D017AC:C214 01 00000000:00000000 00:00000000 00000000  1000        0 2331500 1 00000000d7f87ceb 25 4 28 10 -1
+`;
+
+const procSockets =
+	`ls: cannot access '/proc/8289/fd/255': No such file or directory
+			ls: cannot access '/proc/8289/fd/3': No such file or directory
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/230/fd/3 -> socket:[21862]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/0 -> socket:[2311043]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/1 -> socket:[2311045]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/19 -> socket:[2311040]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/2 -> socket:[2311047]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/20 -> socket:[2314928]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/22 -> socket:[2307042]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/24 -> socket:[2307051]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/25 -> socket:[2307044]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/27 -> socket:[2307046]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/29 -> socket:[2307053]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/3 -> socket:[2311049]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/30 -> socket:[2307048]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/32 -> socket:[2307055]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/33 -> socket:[2307067]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/34 -> socket:[2307057]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/35 -> socket:[2321483]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/37 -> socket:[2321070]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/41 -> socket:[2321485]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/42 -> socket:[2321074]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/43 -> socket:[2321487]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/44 -> socket:[2329890]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/45 -> socket:[2321489]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2504/fd/46 -> socket:[2334509]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/47 -> socket:[2334510]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/48 -> socket:[2329894]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/49 -> socket:[2334511]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/50 -> socket:[2334515]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/51 -> socket:[2334519]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/52 -> socket:[2334518]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/53 -> socket:[2334521]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/54 -> socket:[2334531]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/55 -> socket:[2334532]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/2504/fd/56 -> socket:[2334533]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2515/fd/3 -> socket:[2311053]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2719/fd/0 -> socket:[2307043]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2719/fd/1 -> socket:[2307045]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2719/fd/2 -> socket:[2307047]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2719/fd/3 -> socket:[2307049]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2725/fd/0 -> socket:[2307052]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2725/fd/1 -> socket:[2307054]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2725/fd/2 -> socket:[2307056]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2725/fd/20 -> socket:[2290617]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2725/fd/3 -> socket:[2307058]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2739/fd/0 -> socket:[2307052]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2739/fd/1 -> socket:[2307054]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2739/fd/2 -> socket:[2307056]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2739/fd/3 -> socket:[2290618]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2795/fd/0 -> socket:[2321484]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2795/fd/1 -> socket:[2321486]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2795/fd/2 -> socket:[2321488]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/2795/fd/3 -> socket:[2321490]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/18 -> socket:[2284465]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/19 -> socket:[2311039]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/23 -> socket:[2331501]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/24 -> socket:[2311052]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/25 -> socket:[2311042]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/26 -> socket:[2331504]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/27 -> socket:[2311051]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/29 -> socket:[2311044]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/314/fd/30 -> socket:[2321909]
+			lrwx------ 1 alex alex 64 Dec  8 14:59 /proc/314/fd/31 -> socket:[2311046]
+			lrwx------ 1 alex alex 64 Dec  8 15:14 /proc/314/fd/33 -> socket:[2311048]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/314/fd/35 -> socket:[2329692]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/314/fd/37 -> socket:[2331506]
+			lrwx------ 1 alex alex 64 Dec  8 15:20 /proc/314/fd/40 -> socket:[2331508]
+			lrwx------ 1 alex alex 64 Dec  8 15:20 /proc/314/fd/42 -> socket:[2331510]
+			lrwx------ 1 alex alex 64 Dec  8 15:17 /proc/314/fd/68 -> socket:[2322083]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4412/fd/20 -> socket:[2335214]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/0 -> socket:[2331505]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/1 -> socket:[2331507]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/2 -> socket:[2331509]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/23 -> socket:[2334514]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/24 -> socket:[2338989]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/26 -> socket:[2338276]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/27 -> socket:[2331500]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/3 -> socket:[2331511]
+			lrwx------ 1 alex alex 64 Dec  8 15:22 /proc/4496/fd/31 -> socket:[2338285]`;
+
+const processes: { pid: number, cwd: string, cmd: string }[] = [
+	{
+		pid: 230,
+		cwd: '/mnt/c/WINDOWS/system32',
+		cmd: 'dockerserve--addressunix:///home/alex/.docker/run/docker-cli-api.sock',
+	},
+	{
+		pid: 2504,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/uriTransformer.js--useHostProxy=',
+	},
+	{
+		pid: 2515,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=watcherService'
+	},
+	{
+		pid: 2526,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: '/bin/bash'
+	}, {
+		pid: 2719,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node--max-old-space-size=3072/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/node_modules/typescript/lib/tsserver.js--serverModepartialSemantic--useInferredProjectPerProjectRoot--disableAutomaticTypingAcquisition--cancellationPipeName/tmp/vscode-typescript1000/7cfa7171c0c00aacf1ee/tscancellation-602cd80b954818b6a2f7.tmp*--logVerbosityverbose--logFile/home/alex/.vscode-server-insiders/data/logs/20201208T145954/exthost2/vscode.typescript-language-features/tsserver-log-nxBt2m/tsserver.log--globalPluginstypescript-vscode-sh-plugin--pluginProbeLocations/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/typescript-language-features--localeen--noGetErrOnBackgroundUpdate--validateDefaultNpmLocation'
+	},
+	{
+		pid: 2725,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node--max-old-space-size=3072/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/node_modules/typescript/lib/tsserver.js--useInferredProjectPerProjectRoot--enableTelemetry--cancellationPipeName/tmp/vscode-typescript1000/7cfa7171c0c00aacf1ee/tscancellation-04a0b92f880c2fd535ae.tmp*--logVerbosityverbose--logFile/home/alex/.vscode-server-insiders/data/logs/20201208T145954/exthost2/vscode.typescript-language-features/tsserver-log-fqyBrs/tsserver.log--globalPluginstypescript-vscode-sh-plugin--pluginProbeLocations/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/typescript-language-features--localeen--noGetErrOnBackgroundUpdate--validateDefaultNpmLocation'
+	},
+	{
+		pid: 2739,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/node_modules/typescript/lib/typingsInstaller.js--globalTypingsCacheLocation/home/alex/.cache/typescript/4.1--enableTelemetry--logFile/home/alex/.vscode-server-insiders/data/logs/20201208T145954/exthost2/vscode.typescript-language-features/tsserver-log-fqyBrs/ti-2725.log--typesMapLocation/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/node_modules/typescript/lib/typesMap.json--validateDefaultNpmLocation'
+	},
+	{
+		pid: 2795,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/json-language-features/server/dist/node/jsonServerMain--node-ipc--clientProcessId=2504'
+	},
+	{
+		pid: 286,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: 'sh-c\"$VSCODE_WSL_EXT_LOCATION/ scripts / wslServer.sh\" bc13785d3dd99b4b0e9da9aed17bb79809a50804 insider .vscode-server-insiders 0  '
+	},
+	{
+		pid: 287,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: 'sh/mnt/c/Users/alros/.vscode-insiders/extensions/ms-vscode-remote.remote-wsl-0.52.0/scripts/wslServer.shbc13785d3dd99b4b0e9da9aed17bb79809a50804insider.vscode-server-insiders0'
+	},
+	{
+		pid: 3058,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: 'npm'
+	},
+	{
+		pid: 3070,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: 'sh-ctsc -watch -p ./'
+	},
+	{
+		pid: 3071,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: 'node/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample/node_modules/.bin/tsc-watch-p./'
+	},
+	{
+		pid: 312,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: 'sh/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/server.sh--port=0--use-host-proxy--enable-remote-auto-shutdown--print-ip-address'
+	},
+	{
+		pid: 314,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/main.js--port=0--use-host-proxy--enable-remote-auto-shutdown--print-ip-address'
+	},
+	{
+		pid: 3172,
+		cwd: '/home/alex',
+		cmd: '/bin/bash'
+	},
+	{
+		pid: 3610,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: '/bin/bash'
+	},
+	{
+		pid: 4412,
+		cwd: '/home/alex/repos/Microsoft/vscode-extension-samples/helloworld-sample',
+		cmd: 'http-server'
+	},
+	{
+		pid: 4496,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node--inspect-brk=0.0.0.0:6899/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/bootstrap-fork--type=extensionHost--uriTransformerPath=/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/out/vs/server/uriTransformer.js--useHostProxy='
+	},
+	{
+		pid: 4507,
+		cwd: '/mnt/c/Users/alros/AppData/Local/Programs/Microsoft VS Code Insiders',
+		cmd: '/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/node/home/alex/.vscode-server-insiders/bin/bc13785d3dd99b4b0e9da9aed17bb79809a50804/extensions/ms-vscode.js-debug/src/hash.bundle.js'
+	}
+];
+
+if (platform.isLinux) {
+	suite('ExtHostTunnelService', () => {
+		test('getSockets', function () {
+			const result = getSockets(procSockets);
+			assert.equal(result.length, 78);
+			// 4412 is the pid fo the http-server in the test data
+			assert.notEqual(result.find(value => value.pid === 4412), undefined);
+		});
+
+		test('loadConnectionTable', function () {
+			const result = loadConnectionTable(tcp);
+			assert.equal(result.length, 6);
+			assert.deepEqual(result[0], {
+				10: '1',
+				11: '0000000010173312',
+				12: '100',
+				13: '0',
+				14: '0',
+				15: '10',
+				16: '0',
+				inode: '2335214',
+				local_address: '00000000:0BBA',
+				rem_address: '00000000:0000',
+				retrnsmt: '00000000',
+				sl: '0:',
+				st: '0A',
+				timeout: '0',
+				tr: '00:00000000',
+				tx_queue: '00000000:00000000',
+				uid: '1000'
+			});
+		});
+
+		test('loadListeningPorts', function () {
+			const result = loadListeningPorts(tcp, tcp6);
+			// There should be 7 based on the input data. One of them should be 3002.
+			assert.equal(result.length, 7);
+			assert.notEqual(result.find(value => value.port === 3002), undefined);
+		});
+
+		test('findPorts', async function () {
+			const result = await findPorts(tcp, tcp6, procSockets, processes);
+			assert.equal(result.length, 1);
+			assert.equal(result[0].host, '0.0.0.0');
+			assert.equal(result[0].port, 3002);
+			assert.equal(result[0].detail, 'http-server');
+		});
+	});
+}
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index ba6663911..301cf0905 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -89,6 +89,7 @@ import 'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService'
 import 'vs/workbench/services/authentication/browser/authenticationService';
 import 'vs/workbench/services/hover/browser/hoverService';
 import 'vs/workbench/services/experiment/common/experimentService';
+import 'vs/workbench/services/outline/browser/outlineService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
@@ -213,6 +214,9 @@ import 'vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution';
 import 'vs/workbench/contrib/webviewView/browser/webviewView.contribution';
 import 'vs/workbench/contrib/customEditor/browser/customEditor.contribution';
 
+// External Uri Opener
+import 'vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution';
+
 // Extensions Management
 import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
 import 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
@@ -283,6 +287,7 @@ import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contributio
 import 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
 
 // Outline
+import 'vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline';
 import 'vs/workbench/contrib/outline/browser/outline.contribution';
 
 // Experiments
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 7f5f66e5a..745412cf1 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -23,13 +23,6 @@ import 'vs/workbench/workbench.sandbox.main';
 //#endregion
 
 
-//#region --- workbench actions
-
-import 'vs/workbench/electron-browser/actions/developerActions';
-
-//#endregion
-
-
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
 // NOTE: Please do NOT register services here. Use `registerSingleton()`
@@ -70,7 +63,6 @@ import 'vs/workbench/services/textfile/electron-browser/nativeTextFileService';
 import 'vs/workbench/services/extensions/electron-browser/extensionService';
 import 'vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService';
 import 'vs/workbench/services/extensionManagement/electron-browser/extensionTipsService';
-import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
 import 'vs/workbench/services/telemetry/electron-browser/telemetryService';
 import 'vs/workbench/services/backup/electron-browser/backupFileService';
 import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService';
@@ -78,7 +70,6 @@ import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncService'
 import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncAccountService';
 import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncStoreManagementService';
 import 'vs/workbench/services/userDataSync/electron-browser/userDataAutoSyncService';
-import 'vs/workbench/services/sharedProcess/electron-browser/sharedProcessService';
 import 'vs/workbench/services/localizations/electron-browser/localizationsService';
 import 'vs/workbench/services/diagnostics/electron-browser/diagnosticsService';
 
@@ -96,9 +87,11 @@ import 'vs/workbench/services/diagnostics/electron-browser/diagnosticsService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ITunnelService } from 'vs/platform/remote/common/tunnel';
-import { TunnelService } from 'vs/platform/remote/node/tunnelService';
+import { TunnelService } from 'vs/workbench/services/remote/electron-browser/tunnelServiceImpl';
+import { ISharedProcessService, SharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 
 registerSingleton(ITunnelService, TunnelService);
+registerSingleton(ISharedProcessService, SharedProcessService, true);
 
 //#endregion
 
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
index 0ccee7fa3..f511ee5c5 100644
--- a/src/vs/workbench/workbench.web.api.ts
+++ b/src/vs/workbench/workbench.web.api.ts
@@ -19,6 +19,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IProductConfiguration } from 'vs/platform/product/common/productService';
 import { mark } from 'vs/base/common/performance';
 import { ICredentialsProvider } from 'vs/workbench/services/credentials/common/credentials';
+import { TunnelProviderFeatures } from 'vs/platform/remote/common/tunnel';
 
 interface IResourceUriProvider {
 	(uri: URI): URI;
@@ -46,9 +47,14 @@ interface ITunnelProvider {
 	tunnelFactory?: ITunnelFactory;
 
 	/**
-	 * Support for filtering candidate ports
+	 * Support for filtering candidate ports.
 	 */
 	showPortCandidate?: IShowPortCandidate;
+
+	/**
+	 * The features that the tunnel provider supports.
+	 */
+	features?: TunnelProviderFeatures;
 }
 
 interface ITunnelFactory {
@@ -56,6 +62,7 @@ interface ITunnelFactory {
 }
 
 interface ITunnelOptions {
+
 	remoteAddress: { port: number, host: string };
 
 	/**
@@ -64,16 +71,20 @@ interface ITunnelOptions {
 	localAddressPort?: number;
 
 	label?: string;
+
+	public?: boolean;
 }
 
 export interface TunnelCreationOptions {
+
 	/**
 	 * True when the local operating system will require elevation to use the requested local port.
 	 */
 	elevationRequired?: boolean;
 }
 
-interface ITunnel extends IDisposable {
+interface ITunnel {
+
 	remoteAddress: { port: number, host: string };
 
 	/**
@@ -81,10 +92,14 @@ interface ITunnel extends IDisposable {
 	 */
 	localAddress: string;
 
+	public?: boolean;
+
 	/**
 	 * Implementers of Tunnel should fire onDidDispose when dispose is called.
 	 */
 	onDidDispose: Event<void>;
+
+	dispose(): Promise<void> | void;
 }
 
 interface IShowPortCandidate {
@@ -173,46 +188,6 @@ interface IInitialColorTheme {
 	colors?: { [colorId: string]: string };
 }
 
-interface IDefaultSideBarLayout {
-	visible?: boolean;
-	containers?: ({
-		id: 'explorer' | 'run' | 'scm' | 'search' | 'extensions' | 'remote' | string;
-		active: true;
-		order?: number;
-		views?: {
-			id: string;
-			order?: number;
-			visible?: boolean;
-			collapsed?: boolean;
-		}[];
-	} | {
-		id: 'explorer' | 'run' | 'scm' | 'search' | 'extensions' | 'remote' | string;
-		active?: false;
-		order?: number;
-		visible?: boolean;
-		views?: {
-			id: string;
-			order?: number;
-			visible?: boolean;
-			collapsed?: boolean;
-		}[];
-	})[];
-}
-
-interface IDefaultPanelLayout {
-	visible?: boolean;
-	containers?: ({
-		id: 'terminal' | 'debug' | 'problems' | 'output' | 'comments' | string;
-		order?: number;
-		active: true;
-	} | {
-		id: 'terminal' | 'debug' | 'problems' | 'output' | 'comments' | string;
-		order?: number;
-		active?: false;
-		visible?: boolean;
-	})[];
-}
-
 interface IDefaultView {
 	readonly id: string;
 }
@@ -241,6 +216,7 @@ interface IProductQualityChangeHandler {
  * Settings sync options
  */
 interface ISettingsSyncOptions {
+
 	/**
 	 * Is settings sync enabled
 	 */
@@ -442,10 +418,43 @@ interface IWorkbenchConstructionOptions {
 	//#endregion
 }
 
+interface IPerformanceMark {
+
+	/**
+	 * The name of a performace marker.
+	 */
+	readonly name: string;
+
+	/**
+	 * The UNIX timestamp at which the marker has been set.
+	 */
+	readonly startTime: number;
+}
+
 interface IWorkbench {
+
 	commands: {
+		/**
+		 * @see [executeCommand](#commands.executeCommand)
+		 */
 		executeCommand(command: string, ...args: any[]): Promise<unknown>;
-	},
+	}
+
+	env: {
+		/**
+		 * @see [retrievePerformanceMarks](#commands.retrievePerformanceMarks)
+		 */
+		retrievePerformanceMarks(): Promise<[string, readonly IPerformanceMark[]][]>;
+	}
+
+	/**
+	 * Triggers shutdown of the workbench programmatically. After this method is
+	 * called, the workbench is not usable anymore and the page needs to reload
+	 * or closed.
+	 *
+	 * This will also remove any `beforeUnload` handlers that would bring up a
+	 * confirmation dialog.
+	 */
 	shutdown: () => void;
 }
 
@@ -461,7 +470,7 @@ const workbenchPromise = new Promise<IWorkbench>(resolve => workbenchPromiseReso
 function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions): IDisposable {
 
 	// Mark start of workbench
-	mark('didLoadWorkbenchMain');
+	mark('code/didLoadWorkbenchMain');
 
 	// Assert that the workbench is not created more than once. We currently
 	// do not support this and require a full context switch to clean-up.
@@ -517,6 +526,26 @@ namespace commands {
 	}
 }
 
+namespace env {
+
+	/**
+	 * Retrieve performance marks that have been collected during startup. This function
+	 * returns tuples of source and marks. A source is a dedicated context, like
+	 * the renderer or an extension host.
+	 *
+	 * *Note* that marks can be collected on different machines and in different processes
+	 * and that therefore "different clocks" are used. So, comparing `startTime`-properties
+	 * across contexts should be taken with a grain of salt.
+	 *
+	 * @returns A promise that resolves to tuples of source and marks.
+	 */
+	export async function retrievePerformanceMarks(): Promise<[string, readonly IPerformanceMark[]][]> {
+		const workbench = await workbenchPromise;
+
+		return workbench.env.retrievePerformanceMarks();
+	}
+}
+
 export {
 
 	// Factory
@@ -599,8 +628,10 @@ export {
 	IDefaultView,
 	IDefaultEditor,
 	IDefaultLayout,
-	IDefaultPanelLayout,
-	IDefaultSideBarLayout
+
+	// Env
+	IPerformanceMark,
+	env
 };
 
 //#endregion
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index bc640014d..f3a1eb84c 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -67,7 +67,8 @@ import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/ex
 import { ExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionTipsService';
 import { IWorkbenchExtensioManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
-import { ITunnelService, TunnelService } from 'vs/platform/remote/common/tunnel';
+import { ITunnelService } from 'vs/platform/remote/common/tunnel';
+import { TunnelService } from 'vs/workbench/services/remote/browser/tunnelServiceImpl';
 import { ILoggerService } from 'vs/platform/log/common/log';
 import { FileLoggerService } from 'vs/platform/log/common/fileLogService';
 import { UserDataSyncMachinesService, IUserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines';
diff --git a/test/.mocharc.json b/test/.mocharc.json
new file mode 100644
index 000000000..1397b6053
--- /dev/null
+++ b/test/.mocharc.json
@@ -0,0 +1,5 @@
+{
+	"$schema": "https://json.schemastore.org/mocharc",
+	"ui": "tdd",
+	"timeout": 10000
+}
diff --git a/test/automation/package.json b/test/automation/package.json
index 8fced3ba8..78c3bce9f 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-automation",
-  "version": "1.39.0",
+  "version": "1.53.0",
   "description": "VS Code UI automation driver",
   "author": {
     "name": "Microsoft Corporation"
@@ -9,9 +9,9 @@
   "main": "./out/index.js",
   "private": true,
   "scripts": {
-    "prepare": "npm run compile",
     "compile": "npm run copy-driver && npm run copy-driver-definition && tsc",
-    "watch": "concurrently \"npm run watch-driver\" \"npm run watch-driver-definition\" \"tsc --watch\"",
+    "watch": "npm-run-all -lp watch-driver watch-driver-definition watch-tsc",
+    "watch-tsc": "tsc --watch --preserveWatchOutput",
     "copy-driver": "cpx src/driver.js out/",
     "watch-driver": "cpx src/driver.js out/ -w",
     "copy-driver-definition": "node tools/copy-driver-definition.js",
@@ -23,18 +23,16 @@
     "@types/debug": "4.1.5",
     "@types/mkdirp": "0.5.1",
     "@types/ncp": "2.0.1",
-    "@types/node": "^12.11.7",
+    "@types/node": "^12.19.9",
     "@types/tmp": "0.1.0",
-    "concurrently": "^3.5.1",
     "cpx": "^1.5.0",
-    "typescript": "3.7.5",
-    "watch": "^1.0.2",
-    "tree-kill": "1.2.2"
-  },
-  "dependencies": {
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
+    "npm-run-all": "^4.1.5",
     "tmp": "0.1.0",
-    "vscode-uri": "^2.0.3"
+    "tree-kill": "1.2.2",
+    "typescript": "3.7.5",
+    "vscode-uri": "^2.0.3",
+    "watch": "^1.0.2"
   }
 }
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index 2e09e3a5a..9f6480ab4 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -142,7 +142,7 @@ export class Application {
 		await this.code.waitForElement('.monaco-workbench');
 
 		if (this.remote) {
-			await this.code.waitForTextContent('.monaco-workbench .statusbar-item[id="status.host"]', ' TestResolver');
+			await this.code.waitForTextContent('.monaco-workbench .statusbar-item[id="status.host"]', ' TestResolver', undefined, 2000);
 		}
 
 		// wait a bit, since focus might be stolen off widgets
diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts
index 6307cc326..a947b1c10 100644
--- a/test/automation/src/code.ts
+++ b/test/automation/src/code.ts
@@ -282,14 +282,15 @@ export class Code {
 		await this.driver.exitApplication();
 	}
 
-	async waitForTextContent(selector: string, textContent?: string, accept?: (result: string) => boolean): Promise<string> {
+	async waitForTextContent(selector: string, textContent?: string, accept?: (result: string) => boolean, retryCount?: number): Promise<string> {
 		const windowId = await this.getActiveWindowId();
 		accept = accept || (result => textContent !== undefined ? textContent === result : !!result);
 
 		return await poll(
 			() => this.driver.getElements(windowId, selector).then(els => els.length > 0 ? Promise.resolve(els[0].textContent) : Promise.reject(new Error('Element not found for textContent'))),
 			s => accept!(typeof s === 'string' ? s : ''),
-			`get text content '${selector}'`
+			`get text content '${selector}'`,
+			retryCount
 		);
 	}
 
diff --git a/test/automation/yarn.lock b/test/automation/yarn.lock
index 11785373d..4e37fb4cd 100644
--- a/test/automation/yarn.lock
+++ b/test/automation/yarn.lock
@@ -26,10 +26,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.1.tgz#3b5c3a26393c19b400844ac422bd0f631a94d69d"
   integrity sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==
 
-"@types/node@^12.11.7":
-  version "12.12.26"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.26.tgz#213e153babac0ed169d44a6d919501e68f59dea9"
-  integrity sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/tmp@0.1.0":
   version "0.1.0"
@@ -205,6 +205,14 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -270,11 +278,6 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-commander@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
-  integrity sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -285,21 +288,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concurrently@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.6.1.tgz#2f95baec5c4051294dfbb55b57a3b98a3e2b45ec"
-  integrity sha512-/+ugz+gwFSEfTGUxn0KHkY+19XPRTXR8+7oUK/HxgiN1n7FjeJmkrbSiXAJfyQ0zORgJYPaenmymwon51YXH9Q==
-  dependencies:
-    chalk "^2.4.1"
-    commander "2.6.0"
-    date-fns "^1.23.0"
-    lodash "^4.5.1"
-    read-pkg "^3.0.0"
-    rx "2.3.24"
-    spawn-command "^0.0.2-1"
-    supports-color "^3.2.3"
-    tree-kill "^1.1.0"
-
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -337,10 +325,16 @@ cpx@^1.5.0:
     shell-quote "^1.6.1"
     subarg "^1.0.0"
 
-date-fns@^1.23.0:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
@@ -366,6 +360,13 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -410,6 +411,33 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -555,6 +583,11 @@ fsevents@^1.0.0:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -569,6 +602,15 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -608,21 +650,26 @@ glob@^7.0.5, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+graceful-fs@^4.1.11:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+graceful-fs@^4.1.2:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -659,10 +706,17 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 hosted-git-info@^2.1.4:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
-  integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 iconv-lite@^0.4.4:
   version "0.4.24"
@@ -727,6 +781,18 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-callable@^1.1.4, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -741,6 +807,11 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -807,6 +878,11 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-negative-zero@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -843,6 +919,20 @@ is-primitive@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
   integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
+is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^1.0.1"
+
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -853,6 +943,11 @@ isarray@1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -904,11 +999,6 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-lodash@^4.5.1:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -926,6 +1016,11 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
 merge@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
@@ -1062,6 +1157,11 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 node-pre-gyp@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -1116,6 +1216,21 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -1145,6 +1260,16 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
+object-inspect@^1.8.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -1152,6 +1277,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -1220,6 +1355,11 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -1232,6 +1372,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -1342,13 +1487,21 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0:
+resolve@^1.1.7:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.10.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -1361,11 +1514,6 @@ rimraf@^2.6.1, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rx@2.3.24:
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
-  integrity sha1-FPlQpCF9fjXapxu8vljv9o6ksrc=
-
 safe-buffer@^5.0.1, safe-buffer@^5.1.2:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
@@ -1393,7 +1541,7 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -1413,6 +1561,18 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
 shell-quote@^1.6.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.1.tgz#3161d969886fb14f9140c65245a5dd19b6f0b06b"
@@ -1474,36 +1634,31 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
-
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -1537,6 +1692,31 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string.prototype.padend@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
+  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
+string.prototype.trimend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -1575,13 +1755,6 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -1639,11 +1812,6 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-tree-kill@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
-  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
-
 typescript@3.7.5:
   version "3.7.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
@@ -1703,6 +1871,13 @@ watch@^1.0.2:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index beb4142c5..1b56f4ae9 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -1,17 +1,17 @@
 {
   "name": "code-oss-dev-integration-test",
   "version": "0.1.0",
+  "license": "MIT",
   "main": "./index.js",
   "scripts": {
-    "postinstall": "npm run compile",
-    "compile": "yarn tsc"
+    "compile": "tsc"
   },
   "devDependencies": {
     "@types/mkdirp": "0.5.1",
-    "@types/node": "^12.11.7",
+    "@types/node": "^12.19.9",
     "@types/optimist": "0.0.29",
-    "@types/rimraf": "2.0.2",
-    "@types/tmp": "^0.1.0",
+    "@types/rimraf": "^2.0.4",
+    "@types/tmp": "0.1.0",
     "rimraf": "^2.6.1",
     "tmp": "0.0.33",
     "tree-kill": "1.2.2",
diff --git a/test/integration/browser/yarn.lock b/test/integration/browser/yarn.lock
index 126da8138..d66658e6b 100644
--- a/test/integration/browser/yarn.lock
+++ b/test/integration/browser/yarn.lock
@@ -33,25 +33,25 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
   integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
 
-"@types/node@^12.11.7":
-  version "12.12.26"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.26.tgz#213e153babac0ed169d44a6d919501e68f59dea9"
-  integrity sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
 "@types/optimist@0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/optimist/-/optimist-0.0.29.tgz#a8873580b3a84b69ac1e687323b15fbbeb90479a"
   integrity sha1-qIc1gLOoS2msHmhzI7Ffu+uQR5o=
 
-"@types/rimraf@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
-  integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==
+"@types/rimraf@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/tmp@^0.1.0":
+"@types/tmp@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.1.0.tgz#19cf73a7bcf641965485119726397a096f0049bd"
   integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==
diff --git a/test/integration/electron/testrunner.js b/test/integration/electron/testrunner.js
new file mode 100644
index 000000000..47007fe80
--- /dev/null
+++ b/test/integration/electron/testrunner.js
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const paths = require('path');
+const glob = require('glob');
+// Linux: prevent a weird NPE when mocha on Linux requires the window size from the TTY
+// Since we are not running in a tty environment, we just implementt he method statically
+const tty = require('tty');
+if (!tty.getWindowSize) {
+	tty.getWindowSize = function () { return [80, 75]; };
+}
+const Mocha = require('mocha');
+
+let mocha = new Mocha({
+	ui: 'tdd',
+	useColors: true
+});
+
+exports.configure = function configure(opts) {
+	mocha = new Mocha(opts);
+};
+
+exports.run = function run(testsRoot, clb) {
+	// Enable source map support
+	require('source-map-support').install();
+
+	// Glob test files
+	glob('**/**.test.js', { cwd: testsRoot }, function (error, files) {
+		if (error) {
+			return clb(error);
+		}
+		try {
+			// Fill into Mocha
+			files.forEach(function (f) { return mocha.addFile(paths.join(testsRoot, f)); });
+			// Run the tests
+			mocha.run(function (failures) {
+				clb(null, failures);
+			});
+		}
+		catch (error) {
+			return clb(error);
+		}
+	});
+};
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index 52e4348c3..000000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,2 +0,0 @@
---ui tdd
---timeout 10000
\ No newline at end of file
diff --git a/test/monaco/.gitignore b/test/monaco/.gitignore
new file mode 100644
index 000000000..938680a42
--- /dev/null
+++ b/test/monaco/.gitignore
@@ -0,0 +1,3 @@
+/dist/**/*.js
+/dist/**/*.ttf
+/out/
diff --git a/test/monaco/.mocharc.json b/test/monaco/.mocharc.json
new file mode 100644
index 000000000..fd9de38be
--- /dev/null
+++ b/test/monaco/.mocharc.json
@@ -0,0 +1,5 @@
+{
+	"$schema": "https://json.schemastore.org/mocharc",
+	"ui": "bdd",
+	"timeout": 10000
+}
diff --git a/test/monaco/README.md b/test/monaco/README.md
new file mode 100644
index 000000000..68bb7051c
--- /dev/null
+++ b/test/monaco/README.md
@@ -0,0 +1,13 @@
+# Monaco Editor Test
+
+This directory contains scripts that are used to smoke test the Monaco Editor distribution.
+
+## Setup & Bundle
+
+	$test/monaco> yarn
+	$test/monaco> yarn run bundle
+
+## Compile and run tests
+
+	$test/monaco> yarn run compile
+	$test/monaco> yarn test
diff --git a/test/monaco/core.js b/test/monaco/core.js
new file mode 100644
index 000000000..bd1fe4ac4
--- /dev/null
+++ b/test/monaco/core.js
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as monaco from 'monaco-editor-core';
+
+self.MonacoEnvironment = {
+	getWorkerUrl: function (moduleId, label) {
+		return './editor.worker.bundle.js';
+	}
+}
+
+window.instance = monaco.editor.create(document.getElementById('container'), {
+	value: [
+		'from banana import *',
+		'',
+		'class Monkey:',
+		'	# Bananas the monkey can eat.',
+		'	capacity = 10',
+		'	def eat(self, N):',
+		'		\'\'\'Make the monkey eat N bananas!\'\'\'',
+		'		capacity = capacity - N*banana.size',
+		'',
+		'	def feeding_frenzy(self):',
+		'		eat(9.25)',
+		'		return "Yum yum"',
+	].join('\n'),
+	language: 'python'
+});
diff --git a/test/monaco/dist/core.html b/test/monaco/dist/core.html
new file mode 100644
index 000000000..35f656bec
--- /dev/null
+++ b/test/monaco/dist/core.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+	<div id="container" style="width:800px;height:600px;border:1px solid #ccc"></div>
+	<script src="./core.bundle.js"></script>
+</body>
+</html>
diff --git a/test/monaco/monaco.test.ts b/test/monaco/monaco.test.ts
new file mode 100644
index 000000000..092145c85
--- /dev/null
+++ b/test/monaco/monaco.test.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as playwright from 'playwright';
+import { assert } from 'chai';
+
+const PORT = 8563;
+
+const APP = `http://127.0.0.1:${PORT}/dist/core.html`;
+
+let browser: playwright.Browser;
+let page: playwright.Page;
+
+type BrowserType = 'chromium' | 'firefox' | 'webkit';
+
+const browserType: BrowserType = process.env.BROWSER as BrowserType || 'chromium';
+
+before(async function () {
+	this.timeout(20 * 1000);
+	console.log(`Starting browser: ${browserType}`);
+	browser = await playwright[browserType].launch({
+		headless: process.argv.includes('--headless'),
+	});
+});
+
+after(async function () {
+	this.timeout(20 * 1000);
+	await browser.close();
+});
+
+beforeEach(async function () {
+	this.timeout(20 * 1000);
+	page = await browser.newPage({
+		viewport: {
+			width: 800,
+			height: 600
+		}
+	});
+});
+
+afterEach(async () => {
+	await page.close();
+});
+
+describe('Basic loading', function (): void {
+	this.timeout(20000);
+
+	it('should fail because page has an error', async () => {
+		const pageErrors: any[] = [];
+		page.on('pageerror', (e) => {
+			console.log(e);
+			pageErrors.push(e);
+		});
+
+		page.on('pageerror', (e) => {
+			console.log(e);
+			pageErrors.push(e);
+		});
+
+		await page.goto(APP);
+		this.timeout(20000);
+
+		for (const e of pageErrors) {
+			throw e;
+		}
+	});
+});
+
+describe('API Integration Tests', function (): void {
+	this.timeout(20000);
+
+	beforeEach(async () => {
+		await page.goto(APP);
+	});
+
+	it('`monaco` is not exposed as global', async function (): Promise<any> {
+		assert.equal(await page.evaluate(`typeof monaco`), 'undefined');
+	});
+
+	it('Focus and Type', async function (): Promise<any> {
+		await page.evaluate(`
+		(function () {
+			instance.focus();
+			instance.trigger('keyboard', 'cursorHome');
+			instance.trigger('keyboard', 'type', {
+				text: 'a'
+			});
+		})()
+		`);
+		assert.equal(await page.evaluate(`instance.getModel().getLineContent(1)`), 'afrom banana import *');
+	});
+
+	it('Type and Undo', async function (): Promise<any> {
+		await page.evaluate(`
+		(function () {
+			instance.focus();
+			instance.trigger('keyboard', 'cursorHome');
+			instance.trigger('keyboard', 'type', {
+				text: 'a'
+			});
+			instance.getModel().undo();
+		})()
+		`);
+		assert.equal(await page.evaluate(`instance.getModel().getLineContent(1)`), 'from banana import *');
+	});
+
+	it('Multi Cursor', async function (): Promise<any> {
+		await page.evaluate(`
+		(function () {
+			instance.focus();
+			instance.trigger('keyboard', 'editor.action.insertCursorBelow');
+			instance.trigger('keyboard', 'editor.action.insertCursorBelow');
+			instance.trigger('keyboard', 'editor.action.insertCursorBelow');
+			instance.trigger('keyboard', 'editor.action.insertCursorBelow');
+			instance.trigger('keyboard', 'editor.action.insertCursorBelow');
+			instance.trigger('keyboard', 'type', {
+				text: '# '
+			});
+			instance.focus();
+		})()
+		`);
+
+		await page.waitForTimeout(1000);
+
+		assert.deepEqual(await page.evaluate(`
+			[
+				instance.getModel().getLineContent(1),
+				instance.getModel().getLineContent(2),
+				instance.getModel().getLineContent(3),
+				instance.getModel().getLineContent(4),
+				instance.getModel().getLineContent(5),
+				instance.getModel().getLineContent(6),
+				instance.getModel().getLineContent(7),
+			]
+		`), [
+			'# from banana import *',
+			'# ',
+			'# class Monkey:',
+			'# 	# Bananas the monkey can eat.',
+			'# 	capacity = 10',
+			'# 	def eat(self, N):',
+			'\t\t\'\'\'Make the monkey eat N bananas!\'\'\''
+		]);
+	});
+});
diff --git a/test/monaco/package.json b/test/monaco/package.json
new file mode 100644
index 000000000..872fde3fa
--- /dev/null
+++ b/test/monaco/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "test-monaco",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "compile": "node ../../node_modules/typescript/bin/tsc",
+    "bundle": "node ../../node_modules/webpack/bin/webpack --config ./webpack.config.js --bail",
+    "test": "node runner.js"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.2.14",
+    "chai": "^4.2.0"
+  }
+}
diff --git a/test/monaco/runner.js b/test/monaco/runner.js
new file mode 100644
index 000000000..29aa7eb12
--- /dev/null
+++ b/test/monaco/runner.js
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const yaserver = require('yaserver');
+const http = require('http');
+const cp = require('child_process');
+
+const PORT = 8563;
+
+yaserver.createServer({
+	rootDir: __dirname
+}).then((staticServer) => {
+	const server = http.createServer((request, response) => {
+		return staticServer.handle(request, response);
+	});
+	server.listen(PORT, '127.0.0.1', () => {
+		runTests().then(() => {
+			console.log(`All good`);
+			process.exit(0);
+		}, (err) => {
+			console.error(err);
+			process.exit(1);
+		})
+	});
+});
+
+function runTests() {
+	return (
+		runTest('chromium')
+			.then(() => runTest('firefox'))
+			// .then(() => runTest('webkit'))
+	);
+}
+
+function runTest(browser) {
+	return new Promise((resolve, reject) => {
+		const proc = cp.spawn('node', ['../../node_modules/mocha/bin/mocha', 'out/*.test.js', '--headless'], {
+			env: { BROWSER: browser, ...process.env },
+			stdio: 'inherit'
+		});
+		proc.on('error', reject);
+		proc.on('exit', (code) => {
+			if (code === 0) {
+				resolve();
+			} else {
+				reject(code);
+			}
+		});
+	})
+}
diff --git a/test/monaco/tsconfig.json b/test/monaco/tsconfig.json
new file mode 100644
index 000000000..24deb99dd
--- /dev/null
+++ b/test/monaco/tsconfig.json
@@ -0,0 +1,21 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es2016",
+		"strict": true,
+		"noUnusedParameters": false,
+		"noUnusedLocals": true,
+		"outDir": "out",
+		"sourceMap": true,
+		"declaration": true,
+		"lib": [
+			"es2016",
+			"dom"
+		]
+	},
+	"exclude": [
+		"node_modules",
+		"out",
+		"tools"
+	]
+}
diff --git a/test/monaco/webpack.config.js b/test/monaco/webpack.config.js
new file mode 100644
index 000000000..5e7e9c5f6
--- /dev/null
+++ b/test/monaco/webpack.config.js
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+
+module.exports = {
+	mode: 'production',
+	entry: {
+		"core": './core.js',
+		"editor.worker": '../../out-monaco-editor-core/esm/vs/editor/editor.worker.js',
+	},
+	output: {
+		globalObject: 'self',
+		filename: '[name].bundle.js',
+		path: path.resolve(__dirname, './dist')
+	},
+	module: {
+		rules: [
+			{
+				test: /\.css$/,
+				use: ['style-loader', 'css-loader'],
+			},
+			{
+				test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+				use: [
+					{
+						loader: 'file-loader',
+						options: {
+							name: '[name].[ext]',
+							outputPath: 'fonts/'
+						}
+					}
+				]
+			}
+		]
+	},
+	resolve: {
+		alias: {
+			'monaco-editor-core/esm/vs/editor/editor.worker': path.resolve(__dirname, '../../out-monaco-editor-core/esm/vs/editor/editor.worker.js'),
+			'monaco-editor-core': path.resolve(__dirname, '../../out-monaco-editor-core/esm/vs/editor/editor.main.js'),
+		}
+	},
+	stats: {
+		all: false,
+		modules: true,
+		errors: true,
+		warnings: true,
+		// our additional options
+		moduleTrace: true,
+		errorDetails: true,
+		chunks: true
+	}
+};
diff --git a/test/monaco/yarn.lock b/test/monaco/yarn.lock
new file mode 100644
index 000000000..f61353d11
--- /dev/null
+++ b/test/monaco/yarn.lock
@@ -0,0 +1,52 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/chai@^4.2.14":
+  version "4.2.14"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.14.tgz#44d2dd0b5de6185089375d976b4ec5caf6861193"
+  integrity sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==
+
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
+chai@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
+  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^3.0.1"
+    get-func-name "^2.0.0"
+    pathval "^1.1.0"
+    type-detect "^4.0.5"
+
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+
+deep-eql@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+  dependencies:
+    type-detect "^4.0.0"
+
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+
+pathval@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+
+type-detect@^4.0.0, type-detect@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 28acde77a..cb37f8db3 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -1,28 +1,27 @@
 {
   "name": "code-oss-dev-smoke-test",
   "version": "0.1.0",
+  "license": "MIT",
   "main": "./src/main.js",
   "scripts": {
-    "postinstall": "npm run compile",
     "compile": "yarn --cwd ../automation compile && tsc",
-    "watch": "concurrently \"yarn --cwd ../automation watch --preserveWatchOutput\" \"tsc --watch --preserveWatchOutput\"",
-    "mocha": "mocha"
+    "watch-automation": "yarn --cwd ../automation watch",
+    "watch-smoke": "tsc --watch --preserveWatchOutput",
+    "watch": "npm-run-all -lp watch-automation watch-smoke",
+    "mocha": "node ../node_modules/mocha/bin/mocha"
   },
   "devDependencies": {
     "@types/htmlparser2": "3.7.29",
     "@types/mkdirp": "0.5.1",
-    "@types/mocha": "2.2.41",
+    "@types/mocha": "^8.2.0",
     "@types/ncp": "2.0.1",
-    "@types/node": "^12.11.7",
-    "@types/rimraf": "2.0.2",
-    "concurrently": "^3.5.1",
+    "@types/node": "^12.19.9",
+    "@types/rimraf": "^2.0.4",
     "cpx": "^1.5.0",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
-    "mocha": "^6.1.4",
-    "mocha-junit-reporter": "^1.17.0",
-    "mocha-multi-reporters": "^1.1.7",
     "ncp": "^2.0.0",
+    "npm-run-all": "^4.1.5",
     "portastic": "^1.0.1",
     "rimraf": "^2.6.1",
     "strip-json-comments": "^2.0.1",
diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index 1deb87ebd..d5f6004bc 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -15,6 +15,8 @@ export function setup() {
 				return;
 			}
 
+			await app.workbench.settingsEditor.addUserSetting('webview.experimental.useIframes', 'true');
+
 			await app.workbench.extensions.openExtensionsViewlet();
 
 			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', true);
@@ -27,5 +29,11 @@ export function setup() {
 			await app.workbench.quickaccess.runCommand('Smoke Test Check');
 			await app.workbench.statusbar.waitForStatusbarText('smoke test', 'VS Code Smoke Test Check');
 		});
+
+		after(async function () {
+			const app = this.app as Application;
+			await app.workbench.settingsEditor.clearUserSettings();
+		});
+
 	});
 }
diff --git a/test/smoke/src/areas/notebook/notebook.test.ts b/test/smoke/src/areas/notebook/notebook.test.ts
index dd739a8ae..1d70ee93a 100644
--- a/test/smoke/src/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/areas/notebook/notebook.test.ts
@@ -54,7 +54,7 @@ export function setup() {
 			await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell');
 		});
 
-		it.skip('moves focus in and out of output', async function () {
+		it.skip('moves focus in and out of output', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/113882
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.executeActiveCell();
diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index e724b8c14..15257e6bf 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -34,7 +34,8 @@ export function setup() {
 			await app.workbench.search.hideQueryDetails();
 		});
 
-		it('dismisses result & checks for correct result number', async function () {
+		// https://github.com/microsoft/vscode/issues/115244
+		it.skip('dismisses result & checks for correct result number', async function () {
 			const app = this.app as Application;
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.removeFileMatch('app.js');
diff --git a/test/smoke/src/areas/workbench/launch.test.ts b/test/smoke/src/areas/workbench/launch.test.ts
index 3d1e4c42f..0365098ff 100644
--- a/test/smoke/src/areas/workbench/launch.test.ts
+++ b/test/smoke/src/areas/workbench/launch.test.ts
@@ -20,8 +20,8 @@ export function setup() {
 
 		afterEach(async function () {
 			if (app) {
-				if (this.currentTest.state === 'failed') {
-					const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
+				if (this.currentTest!.state === 'failed') {
+					const name = this.currentTest!.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
 					await app.captureScreenshot(name);
 				}
 			}
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index d0b5e698f..1101625ba 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -28,7 +28,7 @@ export function setup() {
 				return;
 			}
 
-			await app.workbench.explorer.waitForOpenEditorsViewTitle(title => /geöffnete editoren/i.test(title));
+			// await app.workbench.explorer.waitForOpenEditorsViewTitle(title => /geöffnete editoren/i.test(title));
 
 			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.waitForTitle(title => /suchen/i.test(title));
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 6bd6204c6..cf3c02b0e 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -34,11 +34,6 @@ import { setup as setupDataMultirootTests } from './areas/multiroot/multiroot.te
 import { setup as setupDataLocalizationTests } from './areas/workbench/localization.test';
 import { setup as setupLaunchTests } from './areas/workbench/launch.test';
 
-if (!/^v10/.test(process.version) && !/^v12/.test(process.version)) {
-	console.error('Error: Smoketest must be run using Node 10/12. Currently running', process.version);
-	process.exit(1);
-}
-
 const tmpDir = tmp.dirSync({ prefix: 't' }) as { name: string; removeCallback: Function; };
 const testDataPath = tmpDir.name;
 process.once('exit', () => rimraf.sync(testDataPath));
@@ -268,20 +263,20 @@ after(async function () {
 	if (opts.log) {
 		const logsDir = path.join(userDataDir, 'logs');
 		const destLogsDir = path.join(path.dirname(opts.log), 'logs');
-		await new Promise((c, e) => ncp(logsDir, destLogsDir, err => err ? e(err) : c()));
+		await new Promise((c, e) => ncp(logsDir, destLogsDir, err => err ? e(err) : c(undefined)));
 	}
 
-	await new Promise((c, e) => rimraf(testDataPath, { maxBusyTries: 10 }, err => err ? e(err) : c()));
+	await new Promise((c, e) => rimraf(testDataPath, { maxBusyTries: 10 }, err => err ? e(err) : c(undefined)));
 });
 
 describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	if (screenshotsPath) {
 		afterEach(async function () {
-			if (this.currentTest.state !== 'failed') {
+			if (this.currentTest!.state !== 'failed') {
 				return;
 			}
 			const app = this.app as Application;
-			const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
+			const name = this.currentTest!.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
 
 			await app.captureScreenshot(name);
 		});
@@ -290,7 +285,7 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	if (opts.log) {
 		beforeEach(async function () {
 			const app = this.app as Application;
-			const title = this.currentTest.fullTitle();
+			const title = this.currentTest!.fullTitle();
 
 			app.logger.log('*** Test start:', title);
 		});
diff --git a/test/smoke/src/utils.ts b/test/smoke/src/utils.ts
index 35d9ef41a..c987c1999 100644
--- a/test/smoke/src/utils.ts
+++ b/test/smoke/src/utils.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISuiteCallbackContext, ITestCallbackContext } from 'mocha';
+import { Suite, Context } from 'mocha';
 
-export function describeRepeat(n: number, description: string, callback: (this: ISuiteCallbackContext) => void): void {
+export function describeRepeat(n: number, description: string, callback: (this: Suite) => void): void {
 	for (let i = 0; i < n; i++) {
 		describe(`${description} (iteration ${i})`, callback);
 	}
 }
 
-export function itRepeat(n: number, description: string, callback: (this: ITestCallbackContext, done: MochaDone) => any): void {
+export function itRepeat(n: number, description: string, callback: (this: Context) => any): void {
 	for (let i = 0; i < n; i++) {
 		it(`${description} (iteration ${i})`, callback);
 	}
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 9ce4feaa1..a5050d6aa 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -33,10 +33,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mocha@2.2.41":
-  version "2.2.41"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608"
-  integrity sha1-4nzwgXFT658nE7LT9saPHhw8pgg=
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
 "@types/ncp@2.0.1":
   version "2.0.1"
@@ -50,35 +50,20 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
   integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
 
-"@types/node@^12.11.7":
-  version "12.12.34"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.34.tgz#0a5d6ae5d22612f0cf5f10320e1fc5d2a745dcb8"
-  integrity sha512-BneGN0J9ke24lBRn44hVHNeDlrXRYF+VRp0HbSUNnEZahXGAysHZIqnf/hER6aabdBgzM4YOV4jrR8gj4Zfi0g==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-"@types/rimraf@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
-  integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==
+"@types/rimraf@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -93,13 +78,6 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -223,11 +201,6 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -243,12 +216,15 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
 
-chalk@^2.0.1, chalk@^2.4.1:
+chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -257,11 +233,6 @@ chalk@^2.0.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
 chokidar@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -288,15 +259,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -317,11 +279,6 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-commander@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
-  integrity sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=
-
 commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -337,21 +294,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concurrently@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.6.1.tgz#2f95baec5c4051294dfbb55b57a3b98a3e2b45ec"
-  integrity sha512-/+ugz+gwFSEfTGUxn0KHkY+19XPRTXR8+7oUK/HxgiN1n7FjeJmkrbSiXAJfyQ0zORgJYPaenmymwon51YXH9Q==
-  dependencies:
-    chalk "^2.4.1"
-    commander "2.6.0"
-    date-fns "^1.23.0"
-    lodash "^4.5.1"
-    read-pkg "^3.0.0"
-    rx "2.3.24"
-    spawn-command "^0.0.2-1"
-    supports-color "^3.2.3"
-    tree-kill "^1.1.0"
-
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -384,22 +326,16 @@ cpx@^1.5.0:
     shell-quote "^1.6.1"
     subarg "^1.0.0"
 
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
-date-fns@^1.23.0:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
-debug@3.2.6, debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
-    ms "^2.1.1"
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
@@ -408,17 +344,12 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -447,11 +378,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -490,11 +416,6 @@ duplexer@^0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -512,22 +433,23 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
     has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -538,16 +460,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 exec-sh@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
@@ -654,20 +571,6 @@ find-index@^0.1.1:
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
   integrity sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=
 
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -705,10 +608,14 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -737,18 +644,6 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.0.5, glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -761,27 +656,22 @@ glob@^7.0.5, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+graceful-fs@^4.1.11:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
+graceful-fs@^4.1.2:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -824,11 +714,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@@ -885,21 +770,28 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.1:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
-is-callable@^1.1.4, is-callable@^1.1.5:
+is-callable@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -966,11 +858,6 @@ is-extglob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
   integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -978,6 +865,11 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
+is-negative-zero@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -1014,12 +906,12 @@ is-primitive@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
   integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
-is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
   dependencies:
-    has "^1.0.3"
+    has-symbols "^1.0.1"
 
 is-symbol@^1.0.2:
   version "1.0.3"
@@ -1055,14 +947,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -1102,26 +986,6 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash@^4.16.4, lodash@^4.17.15, lodash@^4.5.1:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-log-symbols@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -1139,14 +1003,10 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
 merge@^1.2.0:
   version "1.2.1"
@@ -1191,7 +1051,7 @@ micromatch@^3.1.10:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -1211,76 +1071,18 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.4, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^0.5.1:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
   integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
   dependencies:
     minimist "^1.2.5"
 
-mocha-junit-reporter@^1.17.0:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.3.tgz#941e219dd759ed732f8641e165918aa8b167c981"
-  integrity sha512-ed8LqbRj1RxZfjt/oC9t12sfrWsjZ3gNnbhV1nuj9R/Jb5/P3Xb4duv2eCfCDMYH+fEu0mqca7m4wsiVjsxsvA==
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
-mocha-multi-reporters@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
-  dependencies:
-    debug "^3.1.0"
-    lodash "^4.16.4"
-
-mocha@^6.1.4:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912"
-  integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "2.2.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.4"
-    ms "2.1.1"
-    node-environment-flags "1.0.5"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -1308,13 +1110,10 @@ ncp@^2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
-node-environment-flags@1.0.5:
+nice-try@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
-  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
@@ -1333,6 +1132,21 @@ normalize-path@^2.0.0, normalize-path@^2.0.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -1342,12 +1156,12 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+object-inspect@^1.8.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -1359,23 +1173,15 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@4.1.0, object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+object.assign@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.omit@^2.0.0:
   version "2.0.1"
@@ -1404,25 +1210,6 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-limit@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -1446,16 +1233,16 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -1468,6 +1255,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -1581,28 +1373,26 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0:
+resolve@^1.1.7:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
   integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.10.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -1615,11 +1405,6 @@ rimraf@^2.6.1:
   dependencies:
     glob "^7.1.3"
 
-rx@2.3.24:
-  version "2.3.24"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
-  integrity sha1-FPlQpCF9fjXapxu8vljv9o6ksrc=
-
 safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
@@ -1637,16 +1422,11 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"semver@2 || 3 || 4 || 5", semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -1657,6 +1437,18 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
 shell-quote@^1.6.1:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
@@ -1713,36 +1505,31 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
-
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -1751,11 +1538,6 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -1764,56 +1546,30 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.trimend@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
-  integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==
+string.prototype.padend@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
+  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.1"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+string.prototype.trimend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
 
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+string.prototype.trimstart@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2"
-  integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -1829,26 +1585,12 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-json-comments@2.0.1, strip-json-comments@^2.0.1:
+strip-json-comments@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -1860,20 +1602,6 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -1913,11 +1641,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tree-kill@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 typescript@3.7.5:
   version "3.7.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
@@ -1972,78 +1695,14 @@ watch@^1.0.2:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1.3.1:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
-
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
-yargs@13.3.2, yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js
index ba30a81e7..476050179 100644
--- a/test/unit/browser/index.js
+++ b/test/unit/browser/index.js
@@ -7,9 +7,9 @@
 
 const path = require('path');
 const glob = require('glob');
-const fs = require('fs');
 const events = require('events');
 const mocha = require('mocha');
+const createStatsCollector = require('../../../node_modules/mocha/lib/stats-collector');
 const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
 const minimatch = require('minimatch');
@@ -186,6 +186,7 @@ class EchoRunner extends events.EventEmitter {
 
 	constructor(event, title = '') {
 		super();
+		createStatsCollector(this);
 		event.on('start', () => this.emit('start'));
 		event.on('end', () => this.emit('end'));
 		event.on('suite', (suite) => this.emit('suite', EchoRunner.deserializeSuite(suite, title)));
@@ -205,10 +206,10 @@ class EchoRunner extends events.EventEmitter {
 			suites: suite.suites,
 			tests: suite.tests,
 			title: titleExtra && suite.title ? `${suite.title} - /${titleExtra}/` : suite.title,
+			titlePath: () => suite.titlePath,
 			fullTitle: () => suite.fullTitle,
 			timeout: () => suite.timeout,
 			retries: () => suite.retries,
-			enableTimeouts: () => suite.enableTimeouts,
 			slow: () => suite.slow,
 			bail: () => suite.bail
 		};
@@ -218,6 +219,7 @@ class EchoRunner extends events.EventEmitter {
 		return {
 			title: runnable.title,
 			fullTitle: () => titleExtra && runnable.fullTitle ? `${runnable.fullTitle} - /${titleExtra}/` : runnable.fullTitle,
+			titlePath: () => runnable.titlePath,
 			async: runnable.async,
 			slow: () => runnable.slow,
 			speed: runnable.speed,
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index 27f7ecd3c..4cde5243a 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -69,9 +69,9 @@
 				tests: suite.tests.map(serializeRunnable),
 				title: suite.title,
 				fullTitle: suite.fullTitle(),
+				titlePath: suite.titlePath(),
 				timeout: suite.timeout(),
 				retries: suite.retries(),
-				enableTimeouts: suite.enableTimeouts(),
 				slow: suite.slow(),
 				bail: suite.bail()
 			};
@@ -79,6 +79,7 @@
 		function serializeRunnable(runnable) {
 			return {
 				title: runnable.title,
+				titlePath: runnable.titlePath(),
 				fullTitle: runnable.fullTitle(),
 				async: runnable.async,
 				slow: runnable.slow(),
diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js
index 9aeaaccc8..33ff8c530 100644
--- a/test/unit/electron/index.js
+++ b/test/unit/electron/index.js
@@ -3,6 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// mocha disables running through electron by default. Note that this must
+// come before any mocha imports.
+process.env.MOCHA_COLORS = '1';
+
 const { app, BrowserWindow, ipcMain } = require('electron');
 const { tmpdir } = require('os');
 const { join } = require('path');
@@ -11,13 +15,13 @@ const mocha = require('mocha');
 const events = require('events');
 const MochaJUnitReporter = require('mocha-junit-reporter');
 const url = require('url');
+const createStatsCollector = require('mocha/lib/stats-collector');
+const FullJsonStreamReporter = require('../fullJsonStreamReporter');
 
 // Disable render process reuse, we still have
 // non-context aware native modules in the renderer.
 app.allowRendererProcessReuse = false;
 
-const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
-
 const optimist = require('optimist')
 	.describe('grep', 'only run tests matching <pattern>').alias('grep', 'g').alias('grep', 'f').string('grep')
 	.describe('run', 'only run tests from <file>').string('run')
@@ -25,7 +29,7 @@ const optimist = require('optimist')
 	.describe('build', 'run with build output (out-build)').boolean('build')
 	.describe('coverage', 'generate coverage report').boolean('coverage')
 	.describe('debug', 'open dev tools, keep window open, reuse app data').string('debug')
-	.describe('reporter', 'the mocha reporter').string('reporter').default('reporter', defaultReporterName)
+	.describe('reporter', 'the mocha reporter').string('reporter').default('reporter', 'spec')
 	.describe('reporter-options', 'the mocha reporter options').string('reporter-options').default('reporter-options', '')
 	.describe('tfs').string('tfs')
 	.describe('help', 'show the help').alias('help', 'h');
@@ -47,10 +51,10 @@ function deserializeSuite(suite) {
 		suites: suite.suites,
 		tests: suite.tests,
 		title: suite.title,
+		titlePath: () => suite.titlePath,
 		fullTitle: () => suite.fullTitle,
 		timeout: () => suite.timeout,
 		retries: () => suite.retries,
-		enableTimeouts: () => suite.enableTimeouts,
 		slow: () => suite.slow,
 		bail: () => suite.bail
 	};
@@ -59,6 +63,7 @@ function deserializeSuite(suite) {
 function deserializeRunnable(runnable) {
 	return {
 		title: runnable.title,
+		titlePath: () => runnable.titlePath,
 		fullTitle: () => runnable.fullTitle,
 		async: runnable.async,
 		slow: () => runnable.slow,
@@ -68,6 +73,15 @@ function deserializeRunnable(runnable) {
 	};
 }
 
+function importMochaReporter(name) {
+	if (name === 'full-json-stream') {
+		return FullJsonStreamReporter;
+	}
+
+	const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', name);
+	return require(reporterPath);
+}
+
 function deserializeError(err) {
 	const inspect = err.inspect;
 	err.inspect = () => inspect;
@@ -138,6 +152,7 @@ app.on('ready', () => {
 	win.loadURL(url.format({ pathname: path.join(__dirname, 'renderer.html'), protocol: 'file:', slashes: true }));
 
 	const runner = new IPCRunner();
+	createStatsCollector(runner);
 
 	if (argv.tfs) {
 		new mocha.reporters.Spec(runner);
@@ -148,11 +163,19 @@ app.on('ready', () => {
 			}
 		});
 	} else {
-		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
-		let Reporter;
+		// mocha patches symbols to use windows escape codes, but it seems like
+		// Electron mangles these in its output.
+		if (process.platform === 'win32') {
+			Object.assign(importMochaReporter('base').symbols, {
+				ok: '+',
+				err: 'X',
+				dot: '.',
+			});
+		}
 
+		let Reporter;
 		try {
-			Reporter = require(reporterPath);
+			Reporter = importMochaReporter(argv.reporter);
 		} catch (err) {
 			try {
 				Reporter = require(argv.reporter);
diff --git a/test/unit/electron/renderer.html b/test/unit/electron/renderer.html
index 1df0027e9..3931165d5 100644
--- a/test/unit/electron/renderer.html
+++ b/test/unit/electron/renderer.html
@@ -35,7 +35,8 @@
 
 		mocha.setup({
 			ui: 'tdd',
-			timeout: 5000
+			timeout: 5000,
+			forbidOnly: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' // disallow .only() when running on build machine
 		});
 		require('./renderer');
 	</script>
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index a1b6ef627..b67ff471e 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -5,6 +5,60 @@
 
 /*eslint-env mocha*/
 
+(function() {
+	const fs = require('fs');
+	const originals = {};
+	let logging = false;
+	let withStacks = false;
+
+	self.beginLoggingFS = (_withStacks) => {
+		logging = true;
+		withStacks = _withStacks || false;
+	};
+	self.endLoggingFS = () => {
+		logging = false;
+		withStacks = false;
+	};
+
+	function createSpy(element, cnt) {
+		return function(...args) {
+			if (logging) {
+				console.log(`calling ${element}: ` + args.slice(0, cnt).join(',') + (withStacks ? (`\n` + new Error().stack.split('\n').slice(2).join('\n')) : ''));
+			}
+			return originals[element].call(this, ...args);
+		};
+	}
+
+	function intercept(element, cnt) {
+		originals[element] = fs[element];
+		fs[element] = createSpy(element, cnt);
+	}
+
+	[
+		['realpathSync', 1],
+		['readFileSync', 1],
+		['openSync', 3],
+		['readSync', 1],
+		['closeSync', 1],
+		['readFile', 2],
+		['mkdir', 1],
+		['lstat', 1],
+		['stat', 1],
+		['watch', 1],
+		['readdir', 1],
+		['access', 2],
+		['open', 2],
+		['write', 1],
+		['fdatasync', 1],
+		['close', 1],
+		['read', 1],
+		['unlink', 1],
+		['rmdir', 1],
+	].forEach((element) => {
+		intercept(element[0], element[1]);
+	})
+})();
+
 const { ipcRenderer } = require('electron');
 const assert = require('assert');
 const path = require('path');
@@ -135,9 +189,9 @@ function serializeSuite(suite) {
 		tests: suite.tests.map(serializeRunnable),
 		title: suite.title,
 		fullTitle: suite.fullTitle(),
+		titlePath: suite.titlePath(),
 		timeout: suite.timeout(),
 		retries: suite.retries(),
-		enableTimeouts: suite.enableTimeouts(),
 		slow: suite.slow(),
 		bail: suite.bail()
 	};
@@ -147,6 +201,7 @@ function serializeRunnable(runnable) {
 	return {
 		title: runnable.title,
 		fullTitle: runnable.fullTitle(),
+		titlePath: runnable.titlePath(),
 		async: runnable.async,
 		slow: runnable.slow(),
 		speed: runnable.speed,
diff --git a/test/unit/fullJsonStreamReporter.js b/test/unit/fullJsonStreamReporter.js
new file mode 100644
index 000000000..6345fbbe8
--- /dev/null
+++ b/test/unit/fullJsonStreamReporter.js
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const { constants } = require('mocha/lib/runner');
+const BaseRunner = require('mocha/lib/reporters/base');
+
+const {
+	EVENT_TEST_PASS,
+	EVENT_TEST_FAIL,
+	EVENT_RUN_BEGIN,
+	EVENT_RUN_END,
+} = constants;
+
+/**
+ * Similar to the mocha JSON stream, but includes additional information
+ * on failure. Specifically, the mocha json-stream does not include unmangled
+ * expected versus actual results.
+ *
+ * Writes a superset of the data that json-stream normally would.
+ */
+module.exports = class FullJsonStreamReporter extends BaseRunner {
+	constructor(runner, options) {
+		super(runner, options);
+
+		const total = runner.total;
+		runner.once(EVENT_RUN_BEGIN, () => writeEvent(['start', { total }]));
+		runner.once(EVENT_RUN_END, () => writeEvent(['end', this.stats]));
+
+		runner.on(EVENT_TEST_PASS, test => writeEvent(['pass', clean(test)]));
+		runner.on(EVENT_TEST_FAIL, (test, err) => {
+			test = clean(test);
+			test.actual = err.actual;
+			test.expected = err.expected;
+			test.err = err.message;
+			test.stack = err.stack || null;
+			writeEvent(['fail', test]);
+		});
+	}
+}
+
+function writeEvent(event) {
+	process.stdout.write(JSON.stringify(event) + '\n');
+}
+
+const clean = test => ({
+	title: test.title,
+	fullTitle: test.fullTitle(),
+	duration: test.duration,
+	currentRetry: test.currentRetry()
+});
diff --git a/yarn.lock b/yarn.lock
index dd5e3e4ee..d54626739 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,11 +8,11 @@
   integrity sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=
 
 "@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.10.4"
 
 "@babel/code-frame@^7.8.3":
   version "7.8.3"
@@ -75,6 +75,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
 "@babel/helpers@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.3.tgz#382fbb0382ce7c4ce905945ab9641d688336ce85"
@@ -84,13 +89,13 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
 "@babel/highlight@^7.8.3":
@@ -140,22 +145,50 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@dsherret/to-absolute-glob@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
+  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
 "@electron/get@^1.0.1":
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
-  integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.3.tgz#fa2723385c4b565a34c4c82f46087aa2a5fbf6d0"
+  integrity sha512-NFwSnVZQK7dhOYF1NQCt+HGqgL1aNdj0LUSx75uCqnZJqyiWCVdAMFV4b4/kC8HjUJAnsvdSEmjEt4G2qNQ9+Q==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
+    filenamify "^4.1.0"
     fs-extra "^8.1.0"
     got "^9.6.0"
     progress "^2.0.3"
-    sanitize-filename "^1.6.2"
+    semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
+"@gulp-sourcemaps/identity-map@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz#a6e8b1abec8f790ec6be2b8c500e6e68037c0019"
+  integrity sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==
+  dependencies:
+    acorn "^6.4.1"
+    normalize-path "^3.0.0"
+    postcss "^7.0.16"
+    source-map "^0.6.0"
+    through2 "^3.0.1"
+
+"@gulp-sourcemaps/map-sources@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
+  integrity sha1-iQrnxdjId/bThIYCFazp1+yUW9o=
+  dependencies:
+    normalize-path "^2.0.1"
+    through2 "^2.0.3"
+
 "@istanbuljs/schema@^0.1.2":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
@@ -168,6 +201,34 @@
   dependencies:
     cross-spawn "^7.0.1"
 
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@npmcli/move-file@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464"
+  integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==
+  dependencies:
+    mkdirp "^1.0.4"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -180,6 +241,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@types/anymatch@*":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
+
 "@types/applicationinsights@0.20.0":
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/@types/applicationinsights/-/applicationinsights-0.20.0.tgz#fa7b36dc954f635fa9037cad27c378446b1048fb"
@@ -211,7 +277,21 @@
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
   integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
 
-"@types/debug@^4.1.5":
+"@types/copy-webpack-plugin@^6.0.3":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-6.4.0.tgz#225f86bc60a62052df39a110f7cbf7bc5156a0c1"
+  integrity sha512-f5mQG5c7xH3zLGrEmKgzLLFSGNB7Y4+4a+a1X4DvjgfbTEWEZUNNXUqGs5tBVCtb5qKPzm2z+6ixX3xirWmOCg==
+  dependencies:
+    "@types/webpack" "*"
+
+"@types/cssnano@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/cssnano/-/cssnano-4.0.0.tgz#f1bb29d6d0813861a3d87e02946b2988d0110d4e"
+  integrity sha512-BC/2ibKZfPIaBLBNzkitdW1IvvX/LKW6/QXGc4Su/tAJ7mQ3f2CKBuGCCKaqGAnoKwzfuC7G/recpkARwdOwuA==
+  dependencies:
+    postcss "5 - 7"
+
+"@types/debug@4.1.5":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
@@ -221,6 +301,11 @@
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
+"@types/expect@^1.20.4":
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
+  integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
+
 "@types/glob@^7.1.1":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
@@ -236,6 +321,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/gulp-postcss@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@types/gulp-postcss/-/gulp-postcss-8.0.0.tgz#f7e86d45e4999fd43e6d8c55b00504c88a67ad61"
+  integrity sha512-AVgjA03bpkYONKZpzuJviB9PzaNbDzrovYPbenj8/XxivUc35C/dIzJanyaQv7CFqfLLPLsqSalmtP3GLq6iag==
+  dependencies:
+    "@types/node" "*"
+    "@types/vinyl" "*"
+
 "@types/http-proxy-agent@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-agent/-/http-proxy-agent-2.0.1.tgz#2f95077f6bfe7adc39cc0f0042da85997ae77fc7"
@@ -248,25 +341,30 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
+"@types/json-schema@^7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+
 "@types/keytar@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@types/keytar/-/keytar-4.4.0.tgz#ca24e6ee6d0df10c003aafe26e93113b8faf0d8e"
   integrity sha512-cq/NkUUy6rpWD8n7PweNQQBpw2o0cf5v6fbkUVEpOB9VzzIvyPvSEId1/goIj+MciW2v1Lw5mRimKO01XgE9EA==
 
-"@types/minimatch@*":
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/minimist@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+"@types/minimist@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
-"@types/mocha@2.2.39":
-  version "2.2.39"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829"
-  integrity sha1-9o1j24tpw46VWLQHNSXPlsT3qCk=
+"@types/mocha@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44"
+  integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
 
 "@types/node@*":
   version "4.2.22"
@@ -279,19 +377,19 @@
   integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
 
 "@types/node@^12.0.12":
-  version "12.19.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.7.tgz#cf8b6ac088dd9182ac9a1d765f787a8d12490c04"
-  integrity sha512-zvjOU1g4CpPilbTDUATnZCUb/6lARMRAqzT7ILwl1P3YvU2leEcZ2+fw9+Jrw/paXB1CgQyXTrN4hWDtqT9O2A==
+  version "12.19.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182"
+  integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==
 
-"@types/node@^12.11.7":
-  version "12.12.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
-  integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
+"@types/node@^12.19.9":
+  version "12.19.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
+  integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
 
-"@types/node@^13.13.5":
-  version "13.13.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.28.tgz#b6d0628b0371d6c629d729c98322de314b640219"
-  integrity sha512-EM/qFeRH8ZCD+TlsaIPULyyFm9vOhFIvgskY2JmHbEsWsOPgN+rtjSXrcHGgJpob4Nu17VfO95FKewr0XY7iOQ==
+"@types/q@^1.5.1":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
+  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
 "@types/semver@^5.4.0", "@types/semver@^5.5.0":
   version "5.5.0"
@@ -303,6 +401,11 @@
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-1.16.36.tgz#74bb6ed7928597c1b3fb1b009005e94dc6eae357"
   integrity sha1-dLtu15KFl8Gz+xsAkAXpTcbq41c=
 
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
@@ -320,19 +423,38 @@
   dependencies:
     source-map "^0.6.1"
 
+"@types/vinyl@*":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.4.tgz#9a7a8071c8d14d3a95d41ebe7135babe4ad5995a"
+  integrity sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ==
+  dependencies:
+    "@types/expect" "^1.20.4"
+    "@types/node" "*"
+
 "@types/vscode-windows-registry@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/vscode-windows-registry/-/vscode-windows-registry-1.0.0.tgz#333eea7fd5743fa4c99dff13af16de2c08a586d0"
   integrity sha512-gyq9tIMbxry5GL2gY7J30E6R3EUx0cAin/k3wfsQez4C5uDWVJmJw142x6KFXtYX7xYQL/IXmm4cRqi4ghg05A==
 
-"@types/webpack@^4.4.10":
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.10.tgz#2ecf12589142bc531549140612815b7d8b076358"
-  integrity sha512-5vMiKzNcG19go5sR6++7ubRkBA+hjG4yO/2qwDQhAVfTGV8pqqatFqbrRCiJ2P9DbCilcp+tpXxYhPs2Zn7GyA==
+"@types/webpack-sources@*":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
+  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
   dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.7.3"
+
+"@types/webpack@*", "@types/webpack@^4.41.25":
+  version "4.41.25"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4"
+  integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==
+  dependencies:
+    "@types/anymatch" "*"
     "@types/node" "*"
     "@types/tapable" "*"
     "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
 "@types/windows-foreground-love@^0.3.0":
@@ -436,6 +558,11 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -596,30 +723,20 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-acorn-jsx@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
-  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
+acorn-jsx@^5.0.0, acorn-jsx@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-jsx@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn@^6.0.7, acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^6.0.2:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.7.tgz#490180ce18337270232d9488a44be83d9afb7fd3"
-  integrity sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==
-
-acorn@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
-
-acorn@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 agent-base@4:
   version "4.2.0"
@@ -654,82 +771,35 @@ agent-base@~4.2.1:
   dependencies:
     es6-promisify "^5.0.0"
 
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
-
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  integrity sha1-RBT/dKUIecII7l/cgm4ywwNUnto=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
-  integrity sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.1"
-
-ajv@^6.10.0, ajv@^6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.12.3:
-  version "6.12.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
-  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.9.1:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.5.3, ajv@^6.6.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.8.1.tgz#0890b93742985ebf8973cd365c5b23920ce3cb20"
-  integrity sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
@@ -739,6 +809,11 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
@@ -764,11 +839,11 @@ ansi-escapes@^3.2.0:
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
-  integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.11.0"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
@@ -794,11 +869,6 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
-
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -814,13 +884,6 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  integrity sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==
-  dependencies:
-    color-convert "^1.9.0"
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -841,6 +904,11 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
+any-promise@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -902,9 +970,9 @@ are-we-there-yet@~1.1.2:
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -935,12 +1003,7 @@ arr-filter@^1.1.1:
   dependencies:
     make-iterator "^1.0.0"
 
-arr-flatten@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
-  integrity sha1-5f/lTUXhnzLyFukeuZyM6JK7YEs=
-
-arr-flatten@^1.1.0:
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -962,11 +1025,21 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-back@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
+
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
   integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
+array-differ@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
+  integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
+
 array-each@^1.0.0, array-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
@@ -993,9 +1066,9 @@ array-slice@^0.2.3:
   integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
 
 array-slice@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
-  integrity sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-sort@^1.0.0:
   version "1.0.0"
@@ -1013,6 +1086,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -1028,11 +1106,16 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arrify@^1.0.0, arrify@^1.0.1:
+arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
+arrify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 asar@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
@@ -1045,19 +1128,22 @@ asar@^3.0.3:
   optionalDependencies:
     "@types/glob" "^7.1.1"
 
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
 
 asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
@@ -1065,10 +1151,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
   dependencies:
+    object-assign "^4.1.1"
     util "0.10.3"
 
 assign-symbols@^1.0.0:
@@ -1082,19 +1169,19 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-done@^1.2.0, async-done@^1.2.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.1.tgz#14b7b73667b864c8f02b5b253fc9c6eddb777f3e"
-  integrity sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
+  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.2"
-    process-nextick-args "^1.0.7"
+    process-nextick-args "^2.0.0"
     stream-exhaust "^1.0.1"
 
 async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-hook-jl@^1.7.6:
   version "1.7.6"
@@ -1124,11 +1211,11 @@ async-settle@^1.0.0:
     async-done "^1.2.2"
 
 async@^2.1.5:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.14"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1140,37 +1227,20 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
-  integrity sha1-ri1acpR38onWDdf5amMUoi3Wwio=
-
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
-  dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
 aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 azure-storage@^2.10.2:
   version "2.10.2"
@@ -1204,20 +1274,15 @@ bach@^1.0.0:
     async-settle "^1.0.0"
     now-and-later "^2.0.0"
 
-balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-js@^1.0.2, base64-js@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -1233,9 +1298,9 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  integrity sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -1250,14 +1315,14 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
-  integrity sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 binaryextensions@~1.0.0:
   version "1.0.1"
@@ -1292,22 +1357,22 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
-
 bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
-boolbase@~1.0.0:
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
+
+boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -1317,24 +1382,10 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
   integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1364,7 +1415,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1381,6 +1432,11 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -1417,26 +1473,28 @@ browserify-mime@~1.2.9:
   resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
   integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8=
 
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
   dependencies:
-    bn.js "^4.1.0"
+    bn.js "^5.0.0"
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
   dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -1445,13 +1503,16 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
+browserslist@^4.0.0:
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
+  integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
   dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
+    caniuse-lite "^1.0.30001173"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.634"
+    escalade "^3.1.1"
+    node-releases "^1.1.69"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -1474,9 +1535,9 @@ buffer-xor@^1.0.3:
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1490,34 +1551,15 @@ buffer@^5.5.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
+bytes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -1540,6 +1582,29 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
+cacache@^15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
+  dependencies:
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.0"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1568,10 +1633,37 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
 callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^3.0.0:
   version "3.0.0"
@@ -1583,20 +1675,25 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
-  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
+camelcase@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000760"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d"
-  integrity sha1-PqKUc+t4psywny63Osnh3r/sUo0=
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001173:
+  version "1.0.30001179"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz#b0803883b4471a6c62066fb1752756f8afc699c8"
+  integrity sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1614,16 +1711,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.1.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1632,15 +1720,6 @@ chalk@^2.1.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
 chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -1659,18 +1738,6 @@ charenc@~0.0.1:
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
   integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
 
-cheerio@^1.0.0-rc.1:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
-  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.0"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
-
 chokidar@*:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.3.tgz#b9270a565d14f02f6bfdd537a6a2bbf5549b8c8c"
@@ -1701,26 +1768,22 @@ chokidar@3.4.3:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chokidar@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
-  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
+chokidar@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65"
+  integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==
   dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "^1.2.7"
+    fsevents "~2.3.1"
 
-chokidar@^2.1.8:
+chokidar@^2.0.0, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -1739,10 +1802,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
-  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
+chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -1750,14 +1813,9 @@ chokidar@^3.4.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.4.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
-
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
+    fsevents "~2.3.1"
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -1802,18 +1860,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
-clap@^1.0.9:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
-  integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
-  dependencies:
-    chalk "^1.1.3"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -1824,6 +1870,11 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1844,9 +1895,14 @@ cli-spinners@^2.4.0:
   integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
 cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
 cliui@^3.2.0:
   version "3.2.0"
@@ -1866,6 +1922,15 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 cliui@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.1.tgz#a4cb67aad45cd83d8d05128fc9f4d8fbb887e6b3"
@@ -1898,23 +1963,23 @@ clone-stats@^1.0.0:
   integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
 clone@^1.0.0, clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
-  integrity sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
-  integrity sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
-  integrity sha1-pikNQT8hemEjL5XkWP84QYz7ARc=
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
   dependencies:
     inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
+    process-nextick-args "^2.0.0"
+    readable-stream "^2.3.5"
 
 cls-hooked@^4.2.2:
   version "4.2.2"
@@ -1925,18 +1990,20 @@ cls-hooked@^4.2.2:
     emitter-listener "^1.0.1"
     semver "^5.4.1"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
+coa@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
+    "@types/q" "^1.5.1"
+    chalk "^2.4.1"
     q "^1.1.2"
 
+code-block-writer@9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-9.4.1.tgz#1448fca79dfc7a3649000f4c85be6bc770604c4c"
+  integrity sha512-LHAB+DL4YZDcwK8y/kAxZ0Lf/ncwLh/Ux4cTVWbPwIdrf1gPxXiPcwpz8r8/KqXu1aD+Raz46EOxDjFlbyO6bA==
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1964,12 +2031,12 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0, color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
-  integrity sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==
+color-convert@^1.9.0, color-convert@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    color-name "^1.1.1"
+    color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -1978,102 +2045,74 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@^1.0.0, color-name@^1.1.1:
+color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
+color-string@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
   dependencies:
     color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
 
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
+color@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
   dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
+    color-convert "^1.9.1"
+    color-string "^1.5.4"
 
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
-  dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
-colors@^1.1.2:
+colorette@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
-  integrity sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
-colors@^1.3.3:
+colors@^1.1.2, colors@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
+command-line-args@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a"
+  integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==
   dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
-  dependencies:
-    delayed-stream "~1.0.0"
+    array-back "^3.0.1"
+    find-replace "^3.0.0"
+    lodash.camelcase "^4.3.0"
+    typical "^4.0.0"
 
 commander@*, commander@^2.11.0:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322"
   integrity sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg==
 
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-  integrity sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=
-
-commander@2.11.x, commander@^2.8.1:
+commander@2.11.x:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
   integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
 
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-  integrity sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=
-
 commander@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -2105,9 +2144,9 @@ commondir@^1.0.1:
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -2125,26 +2164,11 @@ concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.2:
     typedarray "^0.0.6"
 
 concat-with-sourcemaps@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
-  integrity sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
-    source-map "^0.5.1"
-
-concurrently@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.2.0.tgz#ead55121d08a0fc817085584c123cedec2e08975"
-  integrity sha512-XxcDbQ4/43d6CxR7+iV8IZXhur4KbmEJk1CetVMUqCy34z9l0DkszbY+/9wvmSnToTej0SYomc2WSRH+L0zVJw==
-  dependencies:
-    chalk "^2.4.2"
-    date-fns "^2.0.1"
-    lodash "^4.17.15"
-    read-pkg "^4.0.1"
-    rxjs "^6.5.2"
-    spawn-command "^0.0.2-1"
-    supports-color "^6.1.0"
-    tree-kill "^1.2.2"
-    yargs "^13.3.0"
+    source-map "^0.6.1"
 
 config-chain@^1.1.11, config-chain@^1.1.12:
   version "1.1.12"
@@ -2155,11 +2179,9 @@ config-chain@^1.1.11, config-chain@^1.1.12:
     proto-list "~1.2.1"
 
 console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
@@ -2179,19 +2201,7 @@ continuation-local-storage@^3.2.1:
     async-listener "^0.6.0"
     emitter-listener "^1.1.1"
 
-convert-source-map@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-  integrity sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=
-
-convert-source-map@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^1.7.0:
+convert-source-map@^1.0.0, convert-source-map@^1.1.1, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2223,39 +2233,52 @@ copy-props@^2.0.1:
     each-props "^1.3.0"
     is-plain-object "^2.0.1"
 
-copy-webpack-plugin@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
-  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
+copy-webpack-plugin@^6.0.3:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
+  integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
-    minimatch "^3.0.4"
-    p-limit "^1.0.0"
-    serialize-javascript "^1.4.0"
+    cacache "^15.0.5"
+    fast-glob "^3.2.4"
+    find-cache-dir "^3.3.1"
+    glob-parent "^5.1.1"
+    globby "^11.0.1"
+    loader-utils "^2.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^3.0.2"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
+    webpack-sources "^1.4.3"
 
 core-js@^3.6.5:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.0.tgz#0fc2d4941cadf80538b030648bb64d230b4da0ce"
-  integrity sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
+  integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
+
 create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.0.0"
+    elliptic "^6.5.3"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -2266,7 +2289,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -2303,13 +2326,6 @@ crypt@~0.0.1:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2334,11 +2350,19 @@ cson-parser@^1.3.3:
   dependencies:
     coffee-script "^1.10.0"
 
-css-color-names@0.0.4:
+css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
   integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
+css-declaration-sorter@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
+  integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
+  dependencies:
+    postcss "^7.0.1"
+    timsort "^0.3.0"
+
 css-loader@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.0.tgz#bb570d89c194f763627fcf1f80059c6832d009b2"
@@ -2357,76 +2381,135 @@ css-loader@^3.2.0:
     postcss-value-parser "^4.0.0"
     schema-utils "^2.0.0"
 
-css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
+css-select-base-adapter@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
+  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
 
-css-what@2.1:
+css-select@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-  integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
+  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^3.2.1"
+    domutils "^1.7.0"
+    nth-check "^1.0.2"
+
+css-tree@1.0.0-alpha.37:
+  version "1.0.0-alpha.37"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+  integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
+  dependencies:
+    mdn-data "2.0.4"
+    source-map "^0.6.1"
+
+css-tree@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
+  dependencies:
+    mdn-data "2.0.14"
+    source-map "^0.6.1"
+
+css-what@^3.2.1:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
+  integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
+
+css@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
+  dependencies:
+    inherits "^2.0.4"
+    source-map "^0.6.1"
+    source-map-resolve "^0.6.0"
 
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano@^3.0.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
+cssnano-preset-default@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
+  integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==
   dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
+    css-declaration-sorter "^4.0.1"
+    cssnano-util-raw-cache "^4.0.1"
+    postcss "^7.0.0"
+    postcss-calc "^7.0.1"
+    postcss-colormin "^4.0.3"
+    postcss-convert-values "^4.0.1"
+    postcss-discard-comments "^4.0.2"
+    postcss-discard-duplicates "^4.0.2"
+    postcss-discard-empty "^4.0.1"
+    postcss-discard-overridden "^4.0.1"
+    postcss-merge-longhand "^4.0.11"
+    postcss-merge-rules "^4.0.3"
+    postcss-minify-font-values "^4.0.2"
+    postcss-minify-gradients "^4.0.2"
+    postcss-minify-params "^4.0.2"
+    postcss-minify-selectors "^4.0.2"
+    postcss-normalize-charset "^4.0.1"
+    postcss-normalize-display-values "^4.0.2"
+    postcss-normalize-positions "^4.0.2"
+    postcss-normalize-repeat-style "^4.0.2"
+    postcss-normalize-string "^4.0.2"
+    postcss-normalize-timing-functions "^4.0.2"
+    postcss-normalize-unicode "^4.0.1"
+    postcss-normalize-url "^4.0.1"
+    postcss-normalize-whitespace "^4.0.2"
+    postcss-ordered-values "^4.1.2"
+    postcss-reduce-initial "^4.0.3"
+    postcss-reduce-transforms "^4.0.2"
+    postcss-svgo "^4.0.2"
+    postcss-unique-selectors "^4.0.1"
 
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
+cssnano-util-get-arguments@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
+  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
+
+cssnano-util-get-match@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
+  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
+
+cssnano-util-raw-cache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
+  integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
   dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
+    postcss "^7.0.0"
+
+cssnano-util-same-parent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
+  integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
+
+cssnano@^4.1.10:
+  version "4.1.10"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
+  integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==
+  dependencies:
+    cosmiconfig "^5.0.0"
+    cssnano-preset-default "^4.0.7"
+    is-resolvable "^1.0.0"
+    postcss "^7.0.0"
+
+csso@^4.0.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
+  dependencies:
+    css-tree "^1.1.2"
 
 cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-  integrity sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 "cssstyle@>= 0.2.21 < 0.3.0":
   version "0.2.37"
@@ -2435,17 +2518,18 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
-    es5-ext "^0.10.9"
+    es5-ext "^0.10.50"
+    type "^1.0.1"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -2454,27 +2538,19 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^2.0.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba"
-  integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
 debounce@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408"
   integrity sha512-ZQVKfRVlwRfD150ndzEK8M90ABT+Y/JQKs4Y7U4MXdpuoUkkrr4DwKbVux3YjylA5bUMUj0Nc3pMxPJX6N2QQQ==
 
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
+debug-fabulous@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
+  integrity sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==
   dependencies:
-    ms "0.7.1"
+    debug "3.X"
+    memoizee "0.4.X"
+    object-assign "4.X"
 
 debug@3.1.0:
   version "3.1.0"
@@ -2483,14 +2559,28 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@3.X:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@4:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  dependencies:
+    ms "2.1.2"
+
+debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2504,11 +2594,23 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2575,7 +2677,7 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -2604,24 +2706,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 delayed-stream@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.6.tgz#a2646cb7ec3d5d7774614670a7a65de0c173edbc"
@@ -2637,15 +2721,10 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-denodeify@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
-  integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE=
-
 des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2660,11 +2739,16 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
-detect-libc@^1.0.2, detect-libc@^1.0.3:
+detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
+detect-newline@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -2687,10 +2771,10 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
+diff@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -2701,20 +2785,12 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
+    path-type "^4.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -2723,51 +2799,50 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
+domelementtype@1, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
+domelementtype@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
 
 domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
-  integrity sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+domutils@^1.5.1, domutils@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
-  integrity sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=
+dot-prop@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    is-obj "^2.0.0"
 
 duplexer3@^0.1.4:
   version "0.1.4"
@@ -2779,20 +2854,10 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-duplexify@^3.2.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
-  integrity sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
+duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2808,11 +2873,12 @@ each-props@^1.3.0:
     object.defaults "^1.1.0"
 
 ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
 
 editorconfig@^0.15.0:
   version "0.15.0"
@@ -2853,24 +2919,24 @@ electron-rebuild@2.0.3:
     ora "^5.1.0"
     yargs "^16.0.0"
 
-electron-to-chromium@^1.2.7:
-  version "1.3.27"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
-  integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
+electron-to-chromium@^1.3.634:
+  version "1.3.642"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94"
+  integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==
 
-electron@9.3.5:
-  version "9.3.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-9.3.5.tgz#7967146b81e6d9b484773243fd4a4f671a50b884"
-  integrity sha512-EPmDsp7sO0UPtw7nLD1ufse/nBskP+ifXzBgUg9psCUlapkzuwYi6pmLAzKLW/bVjwgyUKwh1OKWILWfOeLGcQ==
+electron@11.2.1:
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.1.tgz#8641dd1a62911a1144e0c73c34fd9f37ccc65c2b"
+  integrity sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
     extract-zip "^1.0.3"
 
-elliptic@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-  integrity sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=
+elliptic@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2912,21 +2978,14 @@ encodeurl@^1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  integrity sha1-epDYM+/abPpurA9JSduw+tOmMgY=
-  dependencies:
-    once "^1.4.0"
-
-end-of-stream@^1.4.1:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+enhanced-resolve@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -2935,19 +2994,24 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
     memory-fs "^0.4.0"
     tapable "^1.0.0"
 
-enhanced-resolve@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
-  integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==
+enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
 env-paths@^2.2.0:
   version "2.2.0"
@@ -2955,40 +3019,78 @@ env-paths@^2.2.0:
   integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
 errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  integrity sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.35"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
-  integrity sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=
+es-abstract@^1.17.2:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
   dependencies:
-    es6-iterator "~2.0.1"
-    es6-symbol "~3.1.1"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.53"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
 
 es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -3009,22 +3111,22 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
-    d "1"
-    es5-ext "~0.10.14"
+    d "^1.0.1"
+    ext "^1.1.2"
 
-es6-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
+es6-weak-map@^2.0.1, es6-weak-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
 escalade@^3.0.2:
@@ -3032,21 +3134,21 @@ escalade@^3.0.2:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
   integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
 
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-  integrity sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 eslint-plugin-jsdoc@^19.1.0:
   version "19.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-19.1.0.tgz#fcc17f0378fdd6ee1c847a79b7211745cb05d014"
@@ -3061,22 +3163,6 @@ eslint-plugin-jsdoc@^19.1.0:
     semver "^6.3.0"
     spdx-expression-parse "^3.0.0"
 
-eslint-plugin-mocha@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz#7ec5d228bcb3735301701dfbc3376320a1ca3791"
-  integrity sha512-n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ==
-  dependencies:
-    eslint-utils "^2.1.0"
-    ramda "^0.27.1"
-
-eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -3086,19 +3172,14 @@ eslint-scope@^4.0.3:
     estraverse "^4.1.1"
 
 eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
-  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
-
-eslint-utils@^1.4.3:
+eslint-utils@^1.3.1, eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
@@ -3112,22 +3193,10 @@ eslint-utils@^2.0.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
-
-eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@6.8.0:
   version "6.8.0"
@@ -3173,34 +3242,34 @@ eslint@6.8.0:
     v8-compile-cache "^2.0.3"
 
 eslint@^5.0.1:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.13.0.tgz#ce71cc529c450eed9504530939aa97527861ede9"
-  integrity sha512-nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg==
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    ajv "^6.5.3"
+    ajv "^6.9.1"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
     debug "^4.0.1"
-    doctrine "^2.1.0"
-    eslint-scope "^4.0.0"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
     eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^5.0.0"
+    espree "^5.0.1"
     esquery "^1.0.1"
     esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
+    file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
     globals "^11.7.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.1.0"
-    js-yaml "^3.12.0"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.5"
+    lodash "^4.17.11"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
@@ -3211,61 +3280,68 @@ eslint@^5.0.1:
     semver "^5.5.1"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
-    table "^5.0.2"
+    table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"
-  integrity sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
   dependencies:
-    acorn "^6.0.2"
+    acorn "^6.0.7"
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
 espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
-
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-  integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
-  integrity sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=
+esrecurse@^4.1.0, esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
-    object-assign "^4.0.1"
+    estraverse "^5.2.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
 
 event-stream@3.3.4, event-stream@^3.3.4:
   version "3.3.4"
@@ -3294,9 +3370,9 @@ event-stream@~3.3.4:
     through "^2.3.8"
 
 events@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
-  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -3358,6 +3434,13 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+ext@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+  dependencies:
+    type "^2.0.0"
+
 extend-shallow@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -3380,20 +3463,15 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
-
-extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3441,21 +3519,17 @@ extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
-fancy-log@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fancy-log@^1.3.3:
+fancy-log@^1.3.2, fancy-log@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
@@ -3465,27 +3539,34 @@ fancy-log@^1.3.3:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
-fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
+  integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
+
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -3495,6 +3576,13 @@ fast-plist@0.1.2:
   resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8"
   integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg=
 
+fastq@^1.6.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
+  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
+  dependencies:
+    reusify "^1.0.4"
+
 fd-slicer@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -3522,20 +3610,12 @@ figures@^2.0.0:
     escape-string-regexp "^1.0.5"
 
 figures@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
-  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -3557,18 +3637,32 @@ file-uri-to-path@1.0.0:
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+
+filename-reserved-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
-  integrity sha1-mW4+gEebmLmJfxWopYs9CE6SZ3U=
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
+  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
+
+filenamify@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.2.0.tgz#c99716d676869585b3b5d328b3f06590d032e89f"
+  integrity sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==
+  dependencies:
+    filename-reserved-regex "^2.0.0"
+    strip-outer "^1.0.1"
+    trim-repeated "^1.0.0"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  integrity sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -3589,15 +3683,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -3607,11 +3692,35 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
   integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
 
+find-replace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
+  dependencies:
+    array-back "^3.0.1"
+
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3620,13 +3729,6 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -3634,6 +3736,14 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -3655,9 +3765,9 @@ findup-sync@^3.0.0:
     resolve-dir "^1.0.1"
 
 fined@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
-  integrity sha1-s33IRLdqL15wgeiE98CuNE8VNHY=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
     is-plain-object "^2.0.3"
@@ -3675,16 +3785,6 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
-flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
-  dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -3694,40 +3794,35 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
-flatted@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
-  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
-
-for-in@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.5.tgz#007374e2b6d5c67420a1479bdb75a04872b738c4"
-  integrity sha1-AHN04rbVxnQgoUeb23WgSHK3OMQ=
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-for-own@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072"
-  integrity sha1-AUm0GjkIjHUV9R6+HBOG1F+TUHI=
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
-    for-in "^0.1.5"
+    for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
@@ -3741,22 +3836,13 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 formatio@1.1.1:
@@ -3819,13 +3905,6 @@ fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
-  dependencies:
-    minipass "^2.2.1"
-
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -3857,12 +3936,12 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    bindings "^1.5.0"
+    nan "^2.12.1"
 
 fsevents@~2.1.1:
   version "2.1.1"
@@ -3874,17 +3953,22 @@ fsevents@~2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
+fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
+
 fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
@@ -3914,15 +3998,24 @@ gensync@^1.0.0-beta.1:
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
 get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-  integrity sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -3931,9 +4024,9 @@ get-stream@^4.0.0, get-stream@^4.1.0:
     pump "^3.0.0"
 
 get-stream@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
@@ -3987,10 +4080,10 @@ glob-parent@^3.0.0, glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
@@ -4024,25 +4117,30 @@ glob-stream@^6.1.0:
     to-absolute-glob "^2.0.0"
     unique-stream "^2.0.2"
 
-glob-watcher@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.3.tgz#88a8abf1c4d131eb93928994bc4a593c2e5dd626"
-  integrity sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==
+glob-watcher@^5.0.3:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
+  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
   dependencies:
     anymatch "^2.0.0"
     async-done "^1.2.0"
     chokidar "^2.0.0"
     is-negated-glob "^1.0.0"
     just-debounce "^1.0.0"
+    normalize-path "^3.0.0"
     object.defaults "^1.1.0"
 
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
+glob@7.1.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
     inherits "2"
-    minimatch "0.3"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
 
 glob@^5.0.13, glob@^5.0.3:
   version "5.0.15"
@@ -4055,42 +4153,6 @@ glob@^5.0.13, glob@^5.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.4, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-agent@^2.0.2:
   version "2.1.12"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
@@ -4150,20 +4212,15 @@ global-tunnel-ng@^2.7.1:
     npm-conf "^1.1.3"
     tunnel "^0.0.6"
 
-globals@^11.1.0:
+globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^11.7.0:
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50"
-  integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==
-
 globals@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
-  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
   dependencies:
     type-fest "^0.8.1"
 
@@ -4174,34 +4231,36 @@ globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+globby@^10.0.1:
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
   dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
 
-globby@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
   dependencies:
-    array-union "^1.0.1"
-    dir-glob "^2.0.0"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
 glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
-  integrity sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
 
@@ -4222,27 +4281,22 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@4.2.3, graceful-fs@^4.2.0:
+graceful-fs@4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.15, graceful-fs@^4.2.3:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
-gulp-atom-electron@^1.22.0:
+gulp-atom-electron@1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/gulp-atom-electron/-/gulp-atom-electron-1.22.0.tgz#0e2f4fe7c7310145c6c81d5660d0277cd8338d27"
   integrity sha512-K13Ze2+iRIvC1igl+BIbZdF8M2ZzEIM6LF+/j83oWNGNhe7+en77qT9y9rs6SipYeOyoInlbly+pzbFgvwpSHA==
@@ -4264,21 +4318,29 @@ gulp-atom-electron@^1.22.0:
     vinyl "^2.2.0"
     vinyl-fs "^3.0.3"
 
-gulp-azure-storage@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/gulp-azure-storage/-/gulp-azure-storage-0.10.0.tgz#7c3669b62c0e84002fd7539b231fba76bd8c1cf1"
-  integrity sha512-rrAUz3gpjgpiKanz+ahFIjVWoKTcjFQFqSHosI+RLkZUCh6WBS68g7Uj0hU92mk26xV1e7zC6ZcePpNUlShT3w==
+gulp-azure-storage@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/gulp-azure-storage/-/gulp-azure-storage-0.11.1.tgz#0e5f5d0f789da11206f1e5a9311a6cf7107877d7"
+  integrity sha512-csOwItwZV1P9GLsORVQy+CFwjYDdHNrBol89JlHdlhGx0fTgJBc1COTRZbjGRyRjgdUuVguo3YLl4ToJ10/SIQ==
   dependencies:
     azure-storage "^2.10.2"
     delayed-stream "0.0.6"
     event-stream "3.3.4"
     mime "^1.3.4"
-    optimist "^0.6.1"
     progress "^1.1.8"
     queue "^3.0.10"
     streamifier "^0.1.1"
     vinyl "^2.2.0"
     vinyl-fs "^3.0.3"
+    yargs "^15.3.0"
+
+gulp-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-bom/-/gulp-bom-3.0.0.tgz#b2f1ab0ef304ff5e593665b776ba517ef7ffb4ad"
+  integrity sha512-iw/J94F+MVlxG64Q17BSkHsyjpY17qHl3N3A/jDdrL77zQBkhKtTiKLqM4di9CUX/qFToyyeDsOWwH+rESBgmA==
+  dependencies:
+    plugin-error "^1.0.1"
+    through2 "^3.0.1"
 
 gulp-buffer@0.0.2:
   version "0.0.2"
@@ -4287,10 +4349,10 @@ gulp-buffer@0.0.2:
   dependencies:
     through2 "~0.4.0"
 
-gulp-cli@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.0.1.tgz#7847e220cb3662f2be8a6d572bf14e17be5a994b"
-  integrity sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==
+gulp-cli@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
+  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
   dependencies:
     ansi-colors "^1.0.1"
     archy "^1.0.0"
@@ -4300,15 +4362,15 @@ gulp-cli@^2.0.0:
     copy-props "^2.0.1"
     fancy-log "^1.3.2"
     gulplog "^1.0.0"
-    interpret "^1.1.0"
+    interpret "^1.4.0"
     isobject "^3.0.1"
-    liftoff "^2.5.0"
+    liftoff "^3.1.0"
     matchdep "^2.0.0"
     mute-stdout "^1.0.0"
     pretty-hrtime "^1.0.0"
     replace-homedir "^1.0.0"
     semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.0.1"
+    v8flags "^3.2.0"
     yargs "^7.1.0"
 
 gulp-concat@^2.6.1:
@@ -4320,17 +4382,6 @@ gulp-concat@^2.6.1:
     through2 "^2.0.0"
     vinyl "^2.0.0"
 
-gulp-cssnano@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/gulp-cssnano/-/gulp-cssnano-2.1.3.tgz#02007e2817af09b3688482b430ad7db807aebf72"
-  integrity sha512-r8qdX5pTXsBb/IRm9loE8Ijz8UiPW/URMC/bKJe4FPNHRaz4aEx8Bev03L0FYHd/7BSGu/ebmfumAkpGuTdenA==
-  dependencies:
-    buffer-from "^1.0.0"
-    cssnano "^3.0.0"
-    object-assign "^4.0.1"
-    plugin-error "^1.0.1"
-    vinyl-sourcemaps-apply "^0.2.1"
-
 gulp-eslint@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-5.0.0.tgz#2a2684095f774b2cf79310262078c56cc7a12b52"
@@ -4365,6 +4416,18 @@ gulp-gunzip@^1.0.0:
     through2 "~2.0.3"
     vinyl "~2.0.1"
 
+gulp-gzip@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/gulp-gzip/-/gulp-gzip-1.4.2.tgz#0422a94014248655b5b1a9eea1c2abee1d4f4337"
+  integrity sha512-ZIxfkUwk2XmZPTT9pPHrHUQlZMyp9nPhg2sfoeN27mBGpi7OaHnOD+WCN41NXjfJQ69lV1nQ9LLm1hYxx4h3UQ==
+  dependencies:
+    ansi-colors "^1.0.1"
+    bytes "^3.0.0"
+    fancy-log "^1.3.2"
+    plugin-error "^1.0.0"
+    stream-to-array "^2.3.0"
+    through2 "^2.0.3"
+
 gulp-json-editor@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/gulp-json-editor/-/gulp-json-editor-2.5.0.tgz#23aaa7d30f8425cf60cf1aefae098c257da11ada"
@@ -4386,6 +4449,16 @@ gulp-plumber@^1.2.0:
     plugin-error "^0.1.2"
     through2 "^2.0.3"
 
+gulp-postcss@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-9.0.0.tgz#2ade18809ab475dae743a88bd6501af0b04ee54e"
+  integrity sha512-5mSQ9CK8salSagrXgrVyILfEMy6I5rUGPRiR9rVjgJV9m/rwdZYUhekMr+XxDlApfc5ZdEJ8gXNZrU/TsgT5dQ==
+  dependencies:
+    fancy-log "^1.3.3"
+    plugin-error "^1.0.1"
+    postcss-load-config "^2.1.1"
+    vinyl-sourcemaps-apply "^0.2.1"
+
 gulp-remote-retry-src@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/gulp-remote-retry-src/-/gulp-remote-retry-src-0.6.0.tgz#fdcb5d5c9e67c31ae378a2a886ddad3d47913bb1"
@@ -4436,6 +4509,23 @@ gulp-sourcemaps@1.6.0:
     through2 "^2.0.0"
     vinyl "^1.0.0"
 
+gulp-sourcemaps@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz#2e154e1a2efed033c0e48013969e6f30337b2743"
+  integrity sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==
+  dependencies:
+    "@gulp-sourcemaps/identity-map" "^2.0.1"
+    "@gulp-sourcemaps/map-sources" "^1.0.0"
+    acorn "^6.4.1"
+    convert-source-map "^1.0.0"
+    css "^3.0.0"
+    debug-fabulous "^1.0.0"
+    detect-newline "^2.0.0"
+    graceful-fs "^4.0.0"
+    source-map "^0.6.0"
+    strip-bom-string "^1.0.0"
+    through2 "^2.0.0"
+
 gulp-symdest@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.1.tgz#b0a6df3d43a0537165946ab8e38c1b7080a66fac"
@@ -4481,13 +4571,13 @@ gulp-vinyl-zip@^2.1.2:
     yazl "^2.2.1"
 
 gulp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.0.tgz#95766c601dade4a77ed3e7b2b6dc03881b596366"
-  integrity sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
+  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
   dependencies:
-    glob-watcher "^5.0.0"
-    gulp-cli "^2.0.0"
-    undertaker "^1.0.0"
+    glob-watcher "^5.0.3"
+    gulp-cli "^2.2.0"
+    undertaker "^1.2.1"
     vinyl-fs "^3.0.0"
 
 gulplog@^1.0.0:
@@ -4502,23 +4592,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
-har-validator@~5.1.3:
+har-validator@~5.1.0, har-validator@~5.1.3:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
   integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
@@ -4533,16 +4607,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -4553,10 +4617,10 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
 has-unicode@^2.0.0:
   version "2.0.1"
@@ -4594,14 +4658,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg=
-  dependencies:
-    function-bind "^1.0.2"
-
-has@^1.0.3:
+has@^1.0.0, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -4609,30 +4666,31 @@ has@^1.0.3:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+hex-color-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
+  integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -4643,44 +4701,49 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
 homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
-  integrity sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+hsl-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
+  integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
+
+hsla-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
+  integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
 html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-  integrity sha1-ZouTd26q5V696POtRkswekljYl4=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
 html-escaper@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
   integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
 
-"htmlparser2@>= 3.7.3 < 4.0.0", htmlparser2@^3.9.1:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
-  integrity sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=
+"htmlparser2@>= 3.7.3 < 4.0.0":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^2.0.2"
+    readable-stream "^3.1.1"
 
 http-cache-semantics@^4.0.0:
   version "4.1.0"
@@ -4760,13 +4823,6 @@ iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.4:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 icss-utils@^4.0.0, icss-utils@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
@@ -4775,40 +4831,55 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
     postcss "^7.0.14"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 import-fresh@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  dependencies:
+    resolve-from "^3.0.0"
+
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -4822,12 +4893,17 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-infer-owner@^1.0.3:
+infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
@@ -4840,40 +4916,35 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-inherits@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-  integrity sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=
-
-ini@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 innosetup@6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/innosetup/-/innosetup-6.0.5.tgz#3001e54c638e4e19edd9ebdc6b1855b9ba8b0bbf"
   integrity sha512-XRvidEN0dcxe7NrGXBjl/clfNRfmyakSDtgKaJgvZ3ciKE5ArQOVGqUJcLyPhllqHhMzYGpbUF3ZTZvtKVDP2g==
 
-inquirer@^6.1.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
+inquirer@^6.2.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -4881,37 +4952,32 @@ inquirer@^6.1.0:
     cli-width "^2.0.0"
     external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.12"
     mute-stream "0.0.7"
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
-    through "^2.3.6"
-
-inquirer@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.1.tgz#13f7980eedc73c689feff3994b109c4e799c6ebb"
-  integrity sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.5.3"
-    string-width "^4.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-interpret@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+inquirer@^7.0.0:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
 
 interpret@^1.4.0:
   version "1.4.0"
@@ -4938,14 +5004,6 @@ is-absolute-url@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute@^0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
-  integrity sha1-IN5p89uULvLYe5wto28XIjWxtes=
-  dependencies:
-    is-relative "^0.2.1"
-    is-windows "^0.2.0"
-
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -4973,6 +5031,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@@ -4987,22 +5050,15 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^1.0.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
-  integrity sha1-z8hszV3FpS+oBIkRHGkgxFfi2Ys=
-
 is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
-  dependencies:
-    builtin-modules "^1.0.0"
+is-callable@^1.1.4, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-ci@^1.0.9:
   version "1.2.1"
@@ -5011,6 +5067,25 @@ is-ci@^1.0.9:
   dependencies:
     ci-info "^1.5.0"
 
+is-color-stop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
+  integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
+  dependencies:
+    css-color-names "^0.0.4"
+    hex-color-regex "^1.1.0"
+    hsl-regex "^1.0.0"
+    hsla-regex "^1.0.0"
+    rgb-regex "^1.0.1"
+    rgba-regex "^1.0.0"
+
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5025,6 +5100,11 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -5043,10 +5123,15 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
 is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
-  integrity sha1-LBMjg/ORmfjtwmjKAbmwB9IFzE0=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
@@ -5108,14 +5193,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -5132,7 +5210,12 @@ is-negated-glob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
   integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
-is-number@^2.0.2, is-number@^2.1.0:
+is-negative-zero@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
@@ -5156,30 +5239,21 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
-  integrity sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
-  integrity sha1-/AbloWg/vaE95mev9xe7wQpI838=
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-obj@^1.0.0, is-plain-obj@^1.1:
+is-plain-obj@^1.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -5197,17 +5271,17 @@ is-primitive@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
   integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+is-promise@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-relative@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
-  integrity sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=
+is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
   dependencies:
-    is-unc-path "^0.1.1"
+    has-symbols "^1.0.1"
 
 is-relative@^1.0.0:
   version "1.0.0"
@@ -5216,30 +5290,35 @@ is-relative@^1.0.0:
   dependencies:
     is-unc-path "^1.0.0"
 
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
+
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
+is-svg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
   dependencies:
     html-comment-regex "^1.1.0"
 
+is-symbol@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
-  integrity sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=
-  dependencies:
-    unc-path-regex "^0.1.0"
-
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
@@ -5262,11 +5341,6 @@ is-valid-glob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
   integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
 
-is-windows@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
-  integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw=
-
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -5366,24 +5440,11 @@ istextorbinary@1.0.2:
     binaryextensions "~1.0.0"
     textextensions "~1.0.0"
 
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  integrity sha1-jxDXl32NefL2/4YqgbBRPMslaGw=
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
 jpeg-js@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz#8b345b1ae4abde64c2da2fe67ea216a114ac279d"
   integrity sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw==
 
-js-base64@^2.1.9:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
-  integrity sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==
-
 js-beautify@^1.8.9:
   version "1.8.9"
   resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.8.9.tgz#08e3c05ead3ecfbd4f512c3895b1cda76c87d523"
@@ -5400,30 +5461,22 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.12.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
+js-yaml@3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^3.13.0, js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -5476,11 +5529,6 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5496,13 +5544,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -5527,6 +5568,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -5543,11 +5591,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
-
 jsonparse@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
@@ -5588,14 +5631,7 @@ kind-of@^1.1.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
   integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
 
-kind-of@^3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.0.4.tgz#7b8ecf18a4e17f8269d73b501c9f232c96887a74"
-  integrity sha1-e47PGKThf4Jp1ztQHJ8jLJaIenQ=
-  dependencies:
-    is-buffer "^1.0.2"
-
-kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
@@ -5615,9 +5651,9 @@ kind-of@^5.0.0, kind-of@^5.0.2:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 last-run@^1.1.0:
   version "1.1.1"
@@ -5668,13 +5704,13 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-liftoff@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
-  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
+liftoff@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
+  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
   dependencies:
     extend "^3.0.0"
-    findup-sync "^2.0.0"
+    findup-sync "^3.0.0"
     fined "^1.0.1"
     flagged-respawn "^1.0.0"
     is-plain-object "^2.0.4"
@@ -5682,13 +5718,6 @@ liftoff@^2.5.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-linkify-it@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-  integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=
-  dependencies:
-    uc.micro "^1.0.1"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -5700,12 +5729,22 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
@@ -5714,16 +5753,7 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.4.0:
+loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -5732,13 +5762,14 @@ loader-utils@^1.4.0:
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
-locate-path@^2.0.0:
+loader-utils@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
   dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
 
 locate-path@^3.0.0:
   version "3.0.0"
@@ -5748,11 +5779,30 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash._reinterpolate@~3.0.0:
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.clone@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
@@ -5784,31 +5834,36 @@ lodash.some@^4.2.2:
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
 lodash.template@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
+lodash@^4.17.13:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
-log-symbols@^4.0.0:
+log-symbols@4.0.0, log-symbols@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
   integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
@@ -5830,11 +5885,6 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
-
 lru-cache@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
@@ -5858,17 +5908,19 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-  integrity sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    pify "^3.0.0"
+    yallist "^4.0.0"
+
+lru-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
+  dependencies:
+    es5-ext "~0.10.2"
 
 make-dir@^2.0.0:
   version "2.1.0"
@@ -5885,6 +5937,13 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
+make-dir@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-iterator@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
@@ -5921,17 +5980,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it@^8.3.1:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d"
-  integrity sha512-tNuOCCfunY5v5uhcO2AUMArvKAyKMygX8tfup/JrgnsDqcCATQsAExBq7o5Ml9iMmO82bk6jYNLj6khcrl0JGA==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.3"
-
 matchdep@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
@@ -5949,12 +5997,12 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-math-expression-evaluator@^1.2.14:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
-  integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw=
+math-random@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-md5.js@1.3.4, md5.js@^1.3.4:
+md5.js@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
   integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
@@ -5962,6 +6010,15 @@ md5.js@1.3.4, md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
 md5@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
@@ -5971,10 +6028,15 @@ md5@^2.1.0:
     crypt "~0.0.1"
     is-buffer "~1.1.1"
 
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+mdn-data@2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
+
+mdn-data@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
 mem@^4.0.0:
   version "4.3.0"
@@ -5985,6 +6047,20 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
+memoizee@0.4.X:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
+  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.53"
+    es6-weak-map "^2.0.3"
+    event-emitter "^0.3.5"
+    is-promise "^2.2.2"
+    lru-queue "^0.1.0"
+    next-tick "^1.1.0"
+    timers-ext "^0.1.7"
+
 memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -6001,6 +6077,11 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
 merge-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32"
@@ -6015,6 +6096,11 @@ merge-stream@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
+merge2@^1.2.3, merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -6053,6 +6139,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.0, micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -6061,29 +6155,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
+mime-db@1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
-
-mime-types@^2.1.12, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
   dependencies:
-    mime-db "~1.30.0"
-
-mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
-  dependencies:
-    mime-db "~1.36.0"
+    mime-db "1.45.0"
 
 mime@^1.3.4:
   version "1.4.1"
@@ -6101,9 +6183,9 @@ mime@^2.4.6:
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-  integrity sha1-5md4PZLonb00KBi1IwudYqZyrRg=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
@@ -6130,32 +6212,14 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.3, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -6165,28 +6229,34 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
-  integrity sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
   dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
+    minipass "^3.0.0"
 
-minipass@^3.0.0:
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
   integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -6195,22 +6265,6 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6228,9 +6282,9 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -6240,34 +6294,22 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-mkdirp@^0.5.3, mkdirp@^0.5.4:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
+mocha-junit-reporter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-2.0.0.tgz#3bf990fce7a42c0d2b718f188553a25d9f24b9a2"
+  integrity sha512-20HoWh2HEfhqmigfXOKUhZQyX23JImskc37ZOhIjBKoBEsb+4cAFRJpAVhFpnvsztLklW/gFVzsrobjLwmX4lA==
   dependencies:
     debug "^2.2.0"
     md5 "^2.1.0"
@@ -6275,21 +6317,44 @@ mocha-junit-reporter@^1.17.0:
     strip-ansi "^4.0.0"
     xml "^1.0.0"
 
-mocha@^2.2.5:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  integrity sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=
+mocha-multi-reporters@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz#c73486bed5519e1d59c9ce39ac7a9792600e5676"
+  integrity sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==
   dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
+    debug "^4.1.1"
+    lodash "^4.17.15"
+
+mocha@^8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.2.1.tgz#f2fa68817ed0e53343d989df65ccd358bc3a4b39"
+  integrity sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.4.3"
+    debug "4.2.0"
+    diff "4.0.2"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.1.6"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.14.0"
+    log-symbols "4.0.0"
+    minimatch "3.0.4"
+    ms "2.1.2"
+    nanoid "3.1.12"
+    serialize-javascript "5.0.1"
+    strip-json-comments "3.1.1"
+    supports-color "7.2.0"
+    which "2.0.2"
+    wide-align "1.1.3"
+    workerpool "6.0.2"
+    yargs "13.3.2"
+    yargs-parser "13.1.2"
+    yargs-unparser "2.0.0"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6303,20 +6368,20 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 multimatch@^2.0.0:
   version "2.1.0"
@@ -6328,12 +6393,23 @@ multimatch@^2.0.0:
     arrify "^1.0.0"
     minimatch "^3.0.0"
 
+multimatch@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
+  integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    array-differ "^3.0.0"
+    array-union "^2.1.0"
+    arrify "^2.0.1"
+    minimatch "^3.0.4"
+
 mute-stdout@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
-mute-stream@0.0.7, mute-stream@~0.0.4:
+mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
@@ -6343,7 +6419,7 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.10.0:
+nan@^2.10.0, nan@^2.12.1:
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
@@ -6353,10 +6429,10 @@ nan@^2.13.2, nan@^2.14.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
-nan@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
+nanoid@3.1.12:
+  version "3.1.12"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
+  integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6400,29 +6476,25 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
-  integrity sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
+neo-async@^2.5.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-neo-async@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-  integrity sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==
+next-tick@1, next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-neo-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+next-tick@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 nice-try@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
-  integrity sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-abi@^2.19.1, node-abi@^2.7.0:
   version "2.19.3"
@@ -6431,12 +6503,7 @@ node-abi@^2.19.1, node-abi@^2.7.0:
   dependencies:
     semver "^5.4.1"
 
-node-addon-api@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.2.tgz#d8aad9781a5cfc4132cc2fecdbdd982534265217"
-  integrity sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==
-
-node-addon-api@^3.0.0:
+node-addon-api@^3.0.0, node-addon-api@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
   integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
@@ -6486,29 +6553,18 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-node-pty@0.10.0-beta17:
-  version "0.10.0-beta17"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta17.tgz#962d4a3f4dc6772385e0cad529c209cef3bc79e6"
-  integrity sha512-tn7EANQacnAvnOQCImvgag1DL0tVmUoY/1yIZbh3u/BBpvCcGHLZJNn7TXheodRLr6hmGSUS2VbfcUr9p0gOug==
+node-pty@0.10.0-beta19:
+  version "0.10.0-beta19"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta19.tgz#b7cbfba53f7b2a816efe8c9302dd083cc5874458"
+  integrity sha512-4UIOGMvpofUbe+ZniBUtY8zc/psMURSzbMonQgIhK7JlMQsUwcbkDIrKzStVLJX0FkeZpUNlsVtK7qqzHvrUZA==
   dependencies:
     nan "^2.14.0"
 
+node-releases@^1.1.69:
+  version "1.1.70"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
+  integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
+
 node.extend@~1.1.2:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.8.tgz#0aab3e63789f4e6d68b42bc00073ad1881243cf0"
@@ -6522,14 +6578,6 @@ noop-logger@^0.1.1:
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
   integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
 
-nopt@^4.0.1, nopt@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 nopt@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
@@ -6538,13 +6586,21 @@ nopt@^4.0.3:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
+    resolve "^1.10.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
@@ -6553,12 +6609,7 @@ normalize-path@^1.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
   integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
-normalize-path@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
-  integrity sha1-R4hqwWYnYNQmG32XnSQXCdPOP3o=
-
-normalize-path@^2.1.1:
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -6570,20 +6621,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
+normalize-url@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
 normalize-url@^4.1.0:
   version "4.5.0"
@@ -6591,17 +6632,12 @@ normalize-url@^4.1.0:
   integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
 
 now-and-later@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"
-  integrity sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
+  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
   dependencies:
     once "^1.3.2"
 
-npm-bundled@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
-  integrity sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==
-
 npm-conf@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -6610,13 +6646,20 @@ npm-conf@^1.1.3:
     config-chain "^1.1.11"
     pify "^3.0.0"
 
-npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
   dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -6625,7 +6668,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.0.1, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -6635,39 +6678,29 @@ npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
+nth-check@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-"nwmatcher@>= 1.3.4 < 2.0.0":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
-  integrity sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==
-
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
+"nwmatcher@>= 1.3.4 < 2.0.0", nwmatcher@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@4.X, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -6681,10 +6714,15 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
+object-inspect@^1.8.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-keys@~0.4.0:
   version "0.4.0"
@@ -6698,15 +6736,15 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.4:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.defaults@^1.0.0, object.defaults@^1.1.0:
   version "1.1.0"
@@ -6723,6 +6761,15 @@ object.entries-ponyfill@^1.0.1:
   resolved "https://registry.yarnpkg.com/object.entries-ponyfill/-/object.entries-ponyfill-1.0.1.tgz#29abdf77cbfbd26566dd1aa24e9d88f65433d256"
   integrity sha1-Kavfd8v70mVm3RqiTp2I9lQz0lY=
 
+object.getownpropertydescriptors@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
 object.map@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
@@ -6732,11 +6779,11 @@ object.map@^1.0.0:
     make-iterator "^1.0.0"
 
 object.omit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.0.tgz#868597333d54e60662940bb458605dd6ae12fe94"
-  integrity sha1-hoWXMz1U5gZilAu0WGBd1q4S/pQ=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
-    for-own "^0.1.3"
+    for-own "^0.1.4"
     is-extendable "^0.1.1"
 
 object.pick@^1.2.0, object.pick@^1.3.0:
@@ -6754,6 +6801,16 @@ object.reduce@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
+object.values@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+    has "^1.0.3"
+
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6769,9 +6826,9 @@ onetime@^2.0.0:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -6797,19 +6854,7 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-optionator@^0.8.3:
+optionator@^0.8.2, optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -6876,19 +6921,11 @@ os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  integrity sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
@@ -6924,33 +6961,19 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
-  integrity sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
+p-limit@^2.0.0, p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    p-limit "^1.1.0"
+    yocto-queue "^0.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
@@ -6959,59 +6982,75 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
 parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    cyclist "~0.2.2"
+    cyclist "^1.0.1"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
 parent-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
-  integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
   dependencies:
-    asn1.js "^4.0.0"
+    asn1.js "^5.2.0"
     browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
 parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
-  integrity sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
   dependencies:
-    is-absolute "^0.2.3"
+    is-absolute "^1.0.0"
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
@@ -7050,25 +7089,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse-semver@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/parse-semver/-/parse-semver-1.1.1.tgz#9a4afd6df063dc4826f93fba4a99cf223f666cb8"
-  integrity sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=
-  dependencies:
-    semver "^5.1.0"
-
 "parse5@>= 1.3.1 < 2.0.0":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
   integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=
 
-parse5@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
-  dependencies:
-    "@types/node" "*"
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -7096,12 +7121,17 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7116,11 +7146,6 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-  integrity sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
-
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -7154,6 +7179,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pause-stream@0.0.11, pause-stream@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -7162,9 +7192,9 @@ pause-stream@0.0.11, pause-stream@^0.0.11:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
-  integrity sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7182,16 +7212,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
-
-picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7219,13 +7249,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -7233,10 +7256,17 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-playwright@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.6.2.tgz#8631aec4d16b081d8ac414637b006099814a69d1"
-  integrity sha512-KiMmQuANG4O/ozpwxP8EwBBap0/liS3+wwkGo6nBJ4O4951y4ZsRPR1dqwsMOUD9wjsWf3ER+bAmQH5XmEO4Ig==
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+playwright@1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.7.1.tgz#841638811bc39eb2fed792ffaacbcc959a0aaf5e"
+  integrity sha512-dOSWME42wDedJ/PXv8k0zG0Kxd6d6R2OKA51/05++Z2ISdA4N58gHlWqlVKPDkBog1MI6lu/KNt7QDn19AybWQ==
   dependencies:
     debug "^4.1.1"
     extract-zip "^2.0.1"
@@ -7270,7 +7300,7 @@ plugin-error@0.1.2, plugin-error@^0.1.2:
     arr-union "^2.0.1"
     extend-shallow "^1.1.2"
 
-plugin-error@^1.0.1:
+plugin-error@^1.0.0, plugin-error@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
   integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
@@ -7290,144 +7320,131 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
+postcss-calc@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
+  integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==
   dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
+    postcss "^7.0.27"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.2"
 
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
+postcss-colormin@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
+  integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==
   dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
+    browserslist "^4.0.0"
+    color "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
+postcss-convert-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
+  integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
   dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
+postcss-discard-comments@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
+  integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
   dependencies:
-    postcss "^5.0.14"
+    postcss "^7.0.0"
 
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
+postcss-discard-duplicates@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
+  integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
   dependencies:
-    postcss "^5.0.4"
+    postcss "^7.0.0"
 
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
+postcss-discard-empty@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
+  integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
   dependencies:
-    postcss "^5.0.14"
+    postcss "^7.0.0"
 
-postcss-discard-overridden@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
+postcss-discard-overridden@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
+  integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
   dependencies:
-    postcss "^5.0.16"
+    postcss "^7.0.0"
 
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
-
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
-  integrity sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=
-  dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
-
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
+postcss-load-config@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
   dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
+    cosmiconfig "^5.0.0"
+    import-cwd "^2.0.0"
+
+postcss-merge-longhand@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
+  integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==
+  dependencies:
+    css-color-names "0.0.4"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    stylehacks "^4.0.0"
+
+postcss-merge-rules@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
+  integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    cssnano-util-same-parent "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
     vendors "^1.0.0"
 
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
+postcss-minify-font-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
+  integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
   dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
+postcss-minify-gradients@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
+  integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==
   dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
+    cssnano-util-get-arguments "^4.0.0"
+    is-color-stop "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
+postcss-minify-params@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
+  integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==
   dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
+    alphanum-sort "^1.0.0"
+    browserslist "^4.0.0"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
     uniqs "^2.0.0"
 
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
+postcss-minify-selectors@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
+  integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==
   dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
+    alphanum-sort "^1.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
 postcss-modules-extract-imports@^2.0.0:
   version "2.0.0"
@@ -7462,61 +7479,122 @@ postcss-modules-values@^3.0.0:
     icss-utils "^4.0.0"
     postcss "^7.0.6"
 
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
+postcss-normalize-charset@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
+  integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
   dependencies:
-    postcss "^5.0.5"
+    postcss "^7.0.0"
 
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
+postcss-normalize-display-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
+  integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-positions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
+  integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-repeat-style@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
+  integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-string@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
+  integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==
+  dependencies:
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-timing-functions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
+  integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-unicode@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
+  integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-url@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
+  integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
   dependencies:
     is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
+    normalize-url "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
+postcss-normalize-whitespace@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
+  integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
+postcss-ordered-values@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
+  integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
+postcss-reduce-initial@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
+  integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==
   dependencies:
-    postcss "^5.0.4"
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
 
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
+postcss-reduce-transforms@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
+  integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==
   dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
+    cssnano-util-get-match "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
+postcss-selector-parser@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
   dependencies:
-    flatten "^1.0.2"
+    dot-prop "^5.2.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -7529,53 +7607,48 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
+postcss-svgo@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
+  integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==
   dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
+    is-svg "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    svgo "^1.0.0"
 
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
+postcss-unique-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
+  integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
   dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
+    alphanum-sort "^1.0.0"
+    postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
+postcss-value-parser@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss-value-parser@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
+postcss-value-parser@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.16:
-  version "5.2.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
-  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
+"postcss@5 - 7", postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
   dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
 
 postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.21"
@@ -7612,11 +7685,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -7640,16 +7708,16 @@ prettyjson@^1.2.1:
     colors "^1.1.2"
     minimist "^1.2.0"
 
-process-nextick-args@^1.0.6, process-nextick-args@^1.0.7, process-nextick-args@~1.0.6:
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
   integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -7699,26 +7767,22 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
-psl@^1.1.28:
+psl@^1.1.24, psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
-  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^1.0.1:
   version "1.0.2"
@@ -7728,7 +7792,7 @@ pump@^1.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -7768,29 +7832,16 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-q@^1.0.1, q@^1.1.2:
+q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -7822,27 +7873,16 @@ queue@^4.2.1:
   dependencies:
     inherits "~2.0.0"
 
-ramda@^0.27.1:
-  version "0.27.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9"
-  integrity sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==
-
-randomatic@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.5.tgz#5e9ef5f2d573c67bd2b8124ae90b5156e457840b"
-  integrity sha1-Xp718tVzxnvSuBJK6QtRVuRXhAs=
+randomatic@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randombytes@^2.1.0:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -7894,26 +7934,19 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
+    load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
+    path-type "^3.0.0"
 
-read@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
-  dependencies:
-    mute-stream "~0.0.4"
-
-"readable-stream@1 || 2", readable-stream@^2.0.6, readable-stream@^2.3.3, readable-stream@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -7942,20 +7975,7 @@ read@^1.0.7:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.1.1, readable-stream@^3.4.0:
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7992,13 +8012,6 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
-readdirp@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
-  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
-  dependencies:
-    picomatch "^2.2.1"
-
 readdirp@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
@@ -8013,29 +8026,12 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=
-  dependencies:
-    balanced-match "^0.4.2"
-
 regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
-  integrity sha1-mxpsNdTQ3871cRrmUejp09cRQUU=
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -8083,16 +8079,11 @@ remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.5.4.tgz#64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5"
-  integrity sha1-ZOwMkeD0tHX5DVtkNlHj5uW2wtU=
-
-repeat-string@^1.6.1:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -8103,9 +8094,9 @@ replace-ext@0.0.1:
   integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
 
 replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
 replace-homedir@^1.0.0:
   version "1.0.0"
@@ -8125,61 +8116,7 @@ replacestream@^4.0.0:
     object-assign "^4.0.1"
     readable-stream "^2.0.2"
 
-"request@>= 2.44.0 < 3.0.0":
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.86.0, request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-request@^2.88.2:
+"request@>= 2.44.0 < 3.0.0", request@^2.85.0, request@^2.88.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -8205,6 +8142,32 @@ request@^2.88.2:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+request@^2.86.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 requestretry@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-4.0.0.tgz#4e9e7280a7d8561bf33e9925264cf026e2be3e89"
@@ -8266,12 +8229,13 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  integrity sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
-    path-parse "^1.0.5"
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
 
 resolve@^1.3.2:
   version "1.14.2"
@@ -8280,13 +8244,6 @@ resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.4.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
-  dependencies:
-    path-parse "^1.0.6"
-
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -8320,34 +8277,35 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
-rimraf@2, rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.2.8:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  integrity sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=
-  dependencies:
-    glob "^7.0.5"
+rgb-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
+  integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
 
-rimraf@^2.4.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
+rgba-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
+  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^2.6.3:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.2, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
+rimraf@2.6.3, rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -8355,11 +8313,6 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@~2.2.6:
-  version "2.2.8"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -8380,12 +8333,15 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -8394,33 +8350,19 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+rxjs@^6.4.0, rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.5.2:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
-  integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
-  dependencies:
-    tslib "^1.9.0"
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-rxjs@^6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
-  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
-safe-buffer@^5.1.0, safe-buffer@^5.1.2:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -8432,7 +8374,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -8447,19 +8389,12 @@ samsam@~1.1:
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
   integrity sha1-n1CHQZtNCR8jJXHn+lLpCw9VJiE=
 
-sanitize-filename@^1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
-  integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-  dependencies:
-    truncate-utf8-bytes "^1.0.0"
-
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
   integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
-sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1:
+sax@>=0.6.0, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -8481,6 +8416,15 @@ schema-utils@^2.0.0, schema-utils@^2.0.1:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -8493,32 +8437,27 @@ semver-greatest-satisfied-range@^1.1.0:
   dependencies:
     sver-compat "^1.5.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@^4.3.4:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
   integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
-semver@^5.0.1, semver@^5.4.1, semver@^5.5.0:
+semver@^5.4.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 semver@^6.0.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
   integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
-semver@^6.1.2, semver@^6.3.0:
+semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8535,15 +8474,17 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
+serialize-javascript@5.0.1, serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+  dependencies:
+    randombytes "^2.1.0"
 
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
   dependencies:
     randombytes "^2.1.0"
 
@@ -8552,20 +8493,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8609,20 +8540,25 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shell-quote@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+
 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==
 
-sigmund@^1.0.1, sigmund@~1.0.0:
+sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 simple-concat@^1.0.0:
   version "1.0.1"
@@ -8638,6 +8574,13 @@ simple-get@^3.0.3:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
 sinon@^1.17.2:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
@@ -8648,12 +8591,12 @@ sinon@^1.17.2:
     samsam "1.1.2"
     util ">=0.10.3 <1"
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.0.0, slice-ansi@^2.1.0:
+slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
   integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
@@ -8697,13 +8640,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 socks-proxy-agent@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
@@ -8720,29 +8656,37 @@ socks@~2.3.2:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-resolve@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+
+source-map-support@^0.3.2:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
+  integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
+  dependencies:
+    source-map "0.1.32"
+
 source-map-support@~0.5.12:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
@@ -8756,32 +8700,32 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+source-map@0.1.32:
+  version "0.1.32"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
+  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-  integrity sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=
+source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+sparkles@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdlog@^0.11.1:
   version "0.11.1"
@@ -8792,12 +8736,13 @@ spdlog@^0.11.1:
     mkdirp "^0.5.1"
     nan "^2.14.0"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  integrity sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
   version "2.2.0"
@@ -8812,16 +8757,6 @@ spdx-expression-parse@^3.0.0:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-  integrity sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=
-
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
-
 spdx-license-ids@^3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
@@ -8859,27 +8794,20 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  integrity sha1-US322mKHFEMW3EwY/hzx2UBzm+M=
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -8887,6 +8815,18 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
+ssri@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
+  integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==
+  dependencies:
+    minipass "^3.1.1"
+
+stable@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
+
 stack-chain@^1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
@@ -8906,9 +8846,9 @@ static-extend@^0.1.1:
     object-copy "^0.1.0"
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -8953,9 +8893,16 @@ stream-http@^2.7.2:
     xtend "^4.0.0"
 
 stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+stream-to-array@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353"
+  integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M=
+  dependencies:
+    any-promise "^1.1.0"
 
 streamfilter@^1.0.5:
   version "1.0.5"
@@ -8969,11 +8916,6 @@ streamifier@^0.1.1, streamifier@~0.1.1:
   resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"
   integrity sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -8983,7 +8925,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -9009,12 +8951,37 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+string.prototype.padend@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz#824c84265dbac46cade2b957b38b6a5d8d1683c5"
+  integrity sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==
   dependencies:
-    safe-buffer "~5.1.0"
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
+string.prototype.trimend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+string_decoder@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
 
 string_decoder@^1.1.1:
   version "1.2.0"
@@ -9028,18 +8995,13 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -9054,14 +9016,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
-  dependencies:
-    ansi-regex "^4.0.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -9083,6 +9038,11 @@ strip-bom-stream@^1.0.0:
     first-chunk-stream "^1.0.0"
     strip-bom "^2.0.0"
 
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -9090,20 +9050,32 @@ strip-bom@^2.0.0:
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-json-comments@3.1.1, strip-json-comments@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+strip-outer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+  dependencies:
+    escape-string-regexp "^1.0.2"
 
 style-loader@^1.0.0:
   version "1.0.0"
@@ -9113,6 +9085,15 @@ style-loader@^1.0.0:
     loader-utils "^1.2.3"
     schema-utils "^2.0.1"
 
+stylehacks@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
+  integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
+
 sudo-prompt@9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.1.1.tgz#73853d729770392caec029e2470db9c221754db0"
@@ -9125,38 +9106,19 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-  integrity sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=
+supports-color@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -9185,28 +9147,24 @@ sver-compat@^1.5.0:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
+svgo@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+  integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
   dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
+    chalk "^2.4.1"
+    coa "^2.0.2"
+    css-select "^2.0.0"
+    css-select-base-adapter "^0.1.1"
+    css-tree "1.0.0-alpha.37"
+    csso "^4.0.2"
+    js-yaml "^3.13.1"
     mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
-
-table@^5.0.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.2.2.tgz#61d474c9e4d8f4f7062c98c7504acb3c08aa738f"
-  integrity sha512-f8mJmuu9beQEDkKHLzOv4VxVYlU68NpdzjbGPl69i4Hx0sTopJuNxuzJd17iV2h24dAfa93u794OnDA5jqXvfQ==
-  dependencies:
-    ajv "^6.6.1"
-    lodash "^4.17.11"
-    slice-ansi "^2.0.0"
-    string-width "^2.1.1"
+    object.values "^1.1.0"
+    sax "~1.2.4"
+    stable "^0.1.8"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
 
 table@^5.2.3:
   version "5.4.6"
@@ -9218,12 +9176,7 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-  integrity sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==
-
-tapable@^1.1.3:
+tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
@@ -9258,20 +9211,7 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-tar@^6.0.1:
+tar@^6.0.1, tar@^6.0.2:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
   integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
@@ -9289,23 +9229,22 @@ tas-client-umd@0.1.2:
   integrity sha512-rT9BdDCejckqOTQL2ShX67QtTiAUGbmPm5ZTC8giXobBvZC6JuvBVy5G32hoGZ3Q0dpTvMfgpf3iVFNN2F7wzg==
 
 temp@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
+  integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==
   dependencies:
-    os-tmpdir "^1.0.0"
-    rimraf "~2.2.6"
+    rimraf "~2.6.2"
 
 terser-webpack-plugin@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
-  integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^3.1.0"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
@@ -9338,7 +9277,15 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2@2.0.3, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3:
+through2-filter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2@2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
@@ -9354,6 +9301,14 @@ through2@^0.6.0:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
+through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through2@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2"
@@ -9362,6 +9317,14 @@ through2@^3.0.0:
     readable-stream "2 || 3"
     xtend "~4.0.1"
 
+through2@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
+  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "2 || 3"
+
 through2@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
@@ -9381,18 +9344,24 @@ time-stamp@^1.0.0:
   integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
-tmp@0.0.29:
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
-  integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=
+timers-ext@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
-    os-tmpdir "~1.0.1"
+    es5-ext "~0.10.46"
+    next-tick "1"
+
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -9426,11 +9395,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-  integrity sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -9475,13 +9439,6 @@ to-through@^2.0.0:
   dependencies:
     through2 "^2.0.3"
 
-tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -9503,35 +9460,55 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-truncate-utf8-bytes@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
   dependencies:
-    utf8-byte-length "^1.0.1"
+    escape-string-regexp "^1.0.2"
 
-ts-loader@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.2.tgz#778d4464b24436873c78f7f9e914d88194c2a248"
-  integrity sha512-Z3Y1a7A0KZZ1s/mAZkt74l1NAF7Y5xUhD1V9VB8/1eUlUOk8Qa/oo46tO2Uu5kQ3wXypOlbv77lLQySjXEDcdw==
+ts-loader@^6.2.1:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
+  integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
     loader-utils "^1.0.2"
-    micromatch "^3.1.4"
-    semver "^5.0.1"
+    micromatch "^4.0.0"
+    semver "^6.0.0"
 
-tsec@googleinterns/tsec:
-  version "0.0.1"
-  resolved "https://codeload.github.com/googleinterns/tsec/tar.gz/bec3c527789daa9151be2bc8471cfefa4f44d167"
+ts-morph@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-3.1.3.tgz#bbfa1d14481ee23bdd1c030340ccf4a243cfc844"
+  integrity sha512-CwjgyJTtd3f8vBi7Vr0IOgdOY6Wi/Tq0MhieXOE2B5ns5WWRD7BwMNHtv+ZufKI/S2U/lMrh+Q3bOauE4tsv2g==
   dependencies:
-    "@types/node" "^13.13.5"
+    "@dsherret/to-absolute-glob" "^2.0.2"
+    code-block-writer "9.4.1"
+    fs-extra "^8.1.0"
+    glob-parent "^5.0.0"
+    globby "^10.0.1"
+    is-negated-glob "^1.0.0"
+    multimatch "^4.0.0"
+    typescript "^3.0.1"
 
-tslib@^1.8.1, tslib@^1.9.0:
+tsec@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.1.1.tgz#aed25d4aeea0d1f641d4c941c3da23db1a7d1ce2"
+  integrity sha512-hAQJlm4SXO5c8//rWNdIwa8CX9wcXeyxo0S+D5pgU+m88LEbXqd+FGyVaysbfnVf6yywpQFte3dpXaudOl+NeQ==
+  dependencies:
+    glob "^7.1.1"
+
+tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
 tsutils@^3.17.1:
   version "3.17.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -9551,11 +9528,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.4.tgz#2d3785a158c174c9a16dc2c046ec5fc5f1742213"
-  integrity sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=
-
 tunnel@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
@@ -9573,6 +9545,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
@@ -9583,13 +9560,15 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-typed-rest-client@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-0.9.0.tgz#f768cc0dc3f4e950f06e04825c36b3e7834aa1f2"
-  integrity sha1-92jMDcP06VDwbgSCXDaz54NKofI=
-  dependencies:
-    tunnel "0.0.4"
-    underscore "1.8.3"
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
+  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -9604,32 +9583,37 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
+typescript@4.2.0-dev.20201207:
+  version "4.2.0-dev.20201207"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201207.tgz#19a34bc7d2d42a7467c512c63f135587ac848807"
+  integrity sha512-fPHBDi/fgdX4WiRC7cFVv/aL069PgUaDWuLYUSHatWZujz/Lkc9bkf/zL3rKdNSCxlNKAMs3fhJv/yompOphZA==
+
 typescript@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
   integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
 
-typescript@^4.2.0-dev.20201119:
-  version "4.2.0-dev.20201119"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201119.tgz#d4a43511cd9931adac05e1a47b6425f6b0e76cc3"
-  integrity sha512-HIgv+D/0VpVYRTbcVVf9oac/0GtLKMqaufTcPgohNaFWlCOh4lq8syefANgENXTG5Q4VEC6xwDGzHW6EJAVr3A==
+typescript@^3.0.1:
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
+  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
-uc.micro@^1.0.1, uc.micro@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
-  integrity sha1-ftUNXg+an7ClczeSWfKndFjVAZI=
+typical@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
 
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
-unc-path-regex@^0.1.0, unc-path-regex@^0.1.2:
+unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@1.8.3, underscore@^1.8.2, underscore@^1.8.3, underscore@~1.8.3:
+underscore@^1.8.2, underscore@~1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
   integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
@@ -9639,55 +9623,42 @@ undertaker-registry@^1.0.0:
   resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
   integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
 
-undertaker@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.0.tgz#339da4646252d082dc378e708067299750e11b49"
-  integrity sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=
+undertaker@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18"
+  integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
   dependencies:
     arr-flatten "^1.0.1"
     arr-map "^2.0.0"
     bach "^1.0.0"
     collection-map "^1.0.0"
     es6-weak-map "^2.0.1"
+    fast-levenshtein "^1.0.0"
     last-run "^1.1.0"
     object.defaults "^1.0.0"
     object.reduce "^1.0.0"
     undertaker-registry "^1.0.0"
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  integrity sha1-iSIN32t1GuUrX3JISGNShZa7hME=
-  dependencies:
-    macaddress "^0.2.8"
-
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
   integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
-unique-filename@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-  integrity sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=
-  dependencies:
-    unique-slug "^2.0.0"
-
 unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -9696,19 +9667,19 @@ unique-filename@^1.1.1:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-  integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
 unique-stream@^2.0.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
-  integrity sha1-WqADz76Uxf+GbE59ZouxxNuts2k=
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
   dependencies:
-    json-stable-stringify "^1.0.0"
-    through2-filter "^2.0.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    through2-filter "^3.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
@@ -9720,6 +9691,11 @@ universalify@^1.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
+unquote@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -9728,20 +9704,15 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-uri-js@^4.2.1, uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -9750,11 +9721,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-join@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
-  integrity sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -9775,16 +9741,21 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-utf8-byte-length@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
-
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util.promisify@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
 util@0.10.3, "util@>=0.10.3 <1":
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -9799,25 +9770,20 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
   integrity sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==
 
 uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-
-v8-compile-cache@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
 
 v8-inspect-profiler@^0.0.20:
   version "0.0.20"
@@ -9826,10 +9792,10 @@ v8-inspect-profiler@^0.0.20:
   dependencies:
     chrome-remote-interface "0.26.1"
 
-v8flags@^3.0.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.2.tgz#fc5cd0c227428181e6c29b2992e4f8f1da5e0c9f"
-  integrity sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==
+v8flags@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
@@ -9839,12 +9805,12 @@ vali-date@^1.0.0:
   integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  integrity sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 validator@~9.4.1:
   version "9.4.1"
@@ -9857,9 +9823,9 @@ value-or-function@^3.0.0:
   integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
-  integrity sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
 verror@1.10.0:
   version "1.10.0"
@@ -9945,7 +9911,7 @@ vinyl@^1.0.0, vinyl@^1.2.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vinyl@^2.0.0, vinyl@^2.1.0:
+vinyl@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
   integrity sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=
@@ -9957,7 +9923,7 @@ vinyl@^2.0.0, vinyl@^2.1.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vinyl@^2.0.2, vinyl@^2.2.0:
+vinyl@^2.0.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
   integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
@@ -9969,6 +9935,18 @@ vinyl@^2.0.2, vinyl@^2.2.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
+vinyl@^2.1.0, vinyl@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
+  dependencies:
+    clone "^2.1.1"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
 vinyl@~2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
@@ -9987,33 +9965,10 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vsce@1.48.0:
-  version "1.48.0"
-  resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.48.0.tgz#31c1a4c6909c3b8bdc48b3d32cc8c8e94c7113a2"
-  integrity sha512-1qJn6QLRTu26FIvvMbK/gzHLLdxJVTg9CUTSnCjJHObCCF5CQ0F3FUv7t+5cT7i0J5v5YljrsRY09u7dPBcEnA==
-  dependencies:
-    cheerio "^1.0.0-rc.1"
-    commander "^2.8.1"
-    denodeify "^1.2.1"
-    glob "^7.0.6"
-    lodash "^4.17.10"
-    markdown-it "^8.3.1"
-    mime "^1.3.4"
-    minimatch "^3.0.3"
-    osenv "^0.1.3"
-    parse-semver "^1.1.1"
-    read "^1.0.7"
-    semver "^5.1.0"
-    tmp "0.0.29"
-    url-join "^1.1.0"
-    vso-node-api "6.1.2-preview"
-    yauzl "^2.3.1"
-    yazl "^2.2.2"
-
-vscode-debugprotocol@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.43.0.tgz#fe5bcfa7021c250e78c3cf203d392e98b5de268c"
-  integrity sha512-pnj+9wVS3yPYz/RXoYSN1tCv+D4139ueaY2WC7V6fUd9QZU8IE5s4r/lZUMJ9gAEGz2km/Iv4qcI7Fdlz5xS9w==
+vscode-debugprotocol@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz#79d11844f908cc5104afc303b3780ad2e5fd486a"
+  integrity sha512-qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ==
 
 vscode-nls-dev@^3.3.1:
   version "3.3.1"
@@ -10063,7 +10018,7 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-ripgrep@^1.11.1:
+vscode-ripgrep@^1.11.1, vscode-ripgrep@^1.6.2:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.11.1.tgz#9fa3c0a96c2939d5a2389f71218bd1bb6eaa8679"
   integrity sha512-oHJfpqeXuTQhOO+szqIObYOddwQ9o+lzd4PQLlTQN+sQ7ex8D1qqFip207O2iJyFc5oWE8Bekf4YHTibdbW66w==
@@ -10078,50 +10033,49 @@ vscode-sqlite3@4.0.10:
   dependencies:
     nan "^2.14.0"
 
+vscode-telemetry-extractor@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.6.0.tgz#e9d9c1d24863cce8d3d715f0287de3b31eb90c56"
+  integrity sha512-zSxvkbyAMa1lTRGIHfGg7gW2e9Sey+2zGYD19uNWCsVEfoXAr2NB6uzb0sNHtbZ2SSqxSePmFXzBAavsudT5fw==
+  dependencies:
+    command-line-args "^5.1.1"
+    ts-morph "^3.1.3"
+    vscode-ripgrep "^1.6.2"
+
 vscode-textmate@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
   integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
 
-vscode-windows-ca-certs@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.2.0.tgz#086f0f4de57e2760a35ac6920831bff246237115"
-  integrity sha512-YBrJRT0zos+Yb1Qdn73GD8QZr7pa2IE96b5Y1hmmp6XeR8aYB7Iiq5gDAF/+/AxL+caSR9KPZQ6jiYWh5biD7w==
+vscode-windows-ca-certs@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/vscode-windows-ca-certs/-/vscode-windows-ca-certs-0.3.0.tgz#324e1f8ba842bbf048a39e7c0ee8fe655e9adfcc"
+  integrity sha512-CYrpCEKmAFQJoZNReOrelNL+VKyebOVRCqL9evrBlVcpWQDliliJgU5RggGS8FPGtQ3jAKLQt9frF0qlxYYPKA==
   dependencies:
-    node-addon-api "1.6.2"
+    node-addon-api "^3.0.2"
 
 vscode-windows-registry@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.3.tgz#377e9a8bf75c0acac81a188282a4f16f748ecd47"
   integrity sha512-IXCwNAm+H5yPCn6JBz89T9AAMgy5xEN2LxbxrvHPlErmyQqCYtpCCjvisfgT2dCuaJ2T9FfiqIeIrOpDm2Jc4Q==
 
-vso-node-api@6.1.2-preview:
-  version "6.1.2-preview"
-  resolved "https://registry.yarnpkg.com/vso-node-api/-/vso-node-api-6.1.2-preview.tgz#aab3546df2451ecd894e071bb99b5df19c5fa78f"
-  integrity sha1-qrNUbfJFHs2JTgcbuZtd8Zxfp48=
-  dependencies:
-    q "^1.0.1"
-    tunnel "0.0.4"
-    typed-rest-client "^0.9.0"
-    underscore "^1.8.3"
-
-watchpack-chokidar2@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
-  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
     chokidar "^2.1.8"
 
-watchpack@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
-  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.0"
-    watchpack-chokidar2 "^2.0.0"
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
 
 wcwidth@^1.0.1:
   version "1.0.1"
@@ -10147,7 +10101,7 @@ webpack-cli@^3.3.12:
     v8-compile-cache "^2.1.1"
     yargs "^13.3.2"
 
-webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
   integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
@@ -10171,9 +10125,9 @@ webpack-stream@^5.2.1:
     webpack "^4.26.1"
 
 webpack@^4.26.1, webpack@^4.43.0:
-  version "4.43.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -10183,7 +10137,7 @@ webpack@^4.26.1, webpack@^4.43.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.5.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -10196,7 +10150,7 @@ webpack@^4.26.1, webpack@^4.43.0:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
 when@^3.7.7:
@@ -10204,11 +10158,6 @@ when@^3.7.7:
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
   integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
 
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
-
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -10224,28 +10173,21 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@^1.2.14, which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1, which@^2.0.2:
+which@2.0.2, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+which@^1.2.14, which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
@@ -10282,11 +10224,6 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -10294,6 +10231,11 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
+workerpool@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.2.tgz#e241b43d8d033f1beb52c7851069456039d1d438"
+  integrity sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -10311,6 +10253,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -10332,13 +10283,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -10365,6 +10309,14 @@ xml2js@0.2.8:
   dependencies:
     sax "0.5.x"
 
+xml2js@^0.4.17:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xml2js@^0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
@@ -10383,15 +10335,20 @@ xmlbuilder@^9.0.7:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmlbuilder@~9.0.1:
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
   integrity sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=
 
 xmldom@0.1.x:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
 
 "xmlhttprequest@>= 1.6.0 < 2.0.0":
   version "1.8.0"
@@ -10399,9 +10356,9 @@ xmldom@0.1.x:
   integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 xtend@~2.1.1:
   version "2.1.2"
@@ -10425,20 +10382,20 @@ xterm-addon-webgl@0.10.0-beta.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e"
   integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q==
 
-xterm@4.10.0-beta.4:
-  version "4.10.0-beta.4"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e"
-  integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA==
+xterm@4.10.0-beta.39:
+  version "4.10.0-beta.39"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.39.tgz#29c5ce3ed814d04e0bf2781cf9bd09e354b6e422"
+  integrity sha512-0qtknUlct48WyVj8tnoVvwn4Bz2+lmVBLIGKjifTvawRccw2QVXjTa5hUgNIbecgZv8PWZhseBREtccRbbqbuA==
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
 y18n@^5.0.1:
   version "5.0.1"
@@ -10450,16 +10407,32 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 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==
 
+yargs-parser@13.1.2, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@5.0.0-security.0:
+  version "5.0.0-security.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz#4ff7271d25f90ac15643b86076a2ab499ec9ee24"
+  integrity sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==
+  dependencies:
+    camelcase "^3.0.0"
+    object.assign "^4.1.0"
+
 yargs-parser@^13.1.0:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
@@ -10468,10 +10441,10 @@ yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -10481,12 +10454,31 @@ yargs-parser@^20.0.0:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.0.0.tgz#c65a1daaa977ad63cebdd52159147b789a4e19a9"
   integrity sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
   dependencies:
-    camelcase "^3.0.0"
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@13.3.2, yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
 
 yargs@^13.2.4:
   version "13.2.4"
@@ -10505,21 +10497,22 @@ yargs@^13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-yargs@^13.3.0, yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+yargs@^15.3.0:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
     require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^3.0.0"
+    string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.2"
+    yargs-parser "^18.1.2"
 
 yargs@^16.0.0:
   version "16.0.3"
@@ -10535,9 +10528,9 @@ yargs@^16.0.0:
     yargs-parser "^20.0.0"
 
 yargs@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"
+  integrity sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -10551,7 +10544,7 @@ yargs@^7.1.0:
     string-width "^1.0.2"
     which-module "^1.0.0"
     y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    yargs-parser "5.0.0-security.0"
 
 yaserver@^0.2.0:
   version "0.2.0"
@@ -10566,7 +10559,7 @@ yauzl@^2.10.0, yauzl@^2.9.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yauzl@^2.2.1, yauzl@^2.3.1:
+yauzl@^2.2.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
   integrity sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=
@@ -10574,13 +10567,18 @@ yauzl@^2.2.1, yauzl@^2.3.1:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
 
-yazl@^2.2.1, yazl@^2.2.2, yazl@^2.4.3:
+yazl@^2.2.1, yazl@^2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071"
   integrity sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=
   dependencies:
     buffer-crc32 "~0.2.3"
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 zone.js@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"